há 2 anos atrás · 344f00d579
--- a/dist/index.html
+++ b/dist/index.html
@@ -25,7 +25,11 @@
 
				       height: 100%;
			
 
				       width: 100%;
			
 
				       background: #e6eaf0;
			
 
				+<<<<<<< HEAD
			
 
				     }</style><link href=./static/css/app.26e7db2704fd831c7329543900ba59d8.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.f583576dfec9dfc9a295.js></script><script type=text/javascript src=./static/js/vendor.47326b7cf726c651fd28.js></script><script type=text/javascript src=./static/js/app.6900b86c8fa48b6a8e12.js></script></body></html><script>function stopSafari() {
			
 
				+=======
			
 
				+    }</style><link href=./static/css/app.efeb0754780e0a4e6a2c1ce6b17d40c1.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3512a67a6213c2df4180.js></script><script type=text/javascript src=./static/js/vendor.f1661c5ebfd33221b88f.js></script><script type=text/javascript src=./static/js/app.d1c7cdc1742088716f20.js></script></body></html><script>function stopSafari() {
			
 
				+>>>>>>> beta
			
 
				     //阻止safari浏览器双击放大功能
			
 
				     let lastTouchEnd = 0  //更新手指弹起的时间
			
 
				     document.documentElement.addEventListener("touchstart", function (event) {
			
--- a/dist/static/css/app.26e7db2704fd831c7329543900ba59d8.css
+++ b/dist/static/css/app.26e7db2704fd831c7329543900ba59d8.css
--- a/dist/static/css/app.26e7db2704fd831c7329543900ba59d8.css.map
+++ b/dist/static/css/app.26e7db2704fd831c7329543900ba59d8.css.map
--- a/dist/static/css/app.efeb0754780e0a4e6a2c1ce6b17d40c1.css
+++ b/dist/static/css/app.efeb0754780e0a4e6a2c1ce6b17d40c1.css
--- a/dist/static/css/app.efeb0754780e0a4e6a2c1ce6b17d40c1.css.map
+++ b/dist/static/css/app.efeb0754780e0a4e6a2c1ce6b17d40c1.css.map
--- a/dist/static/js/app.6900b86c8fa48b6a8e12.js.map
+++ b/dist/static/js/app.6900b86c8fa48b6a8e12.js.map
--- a/dist/static/js/app.d1c7cdc1742088716f20.js
+++ b/dist/static/js/app.d1c7cdc1742088716f20.js
--- a/dist/static/js/app.d1c7cdc1742088716f20.js.map
+++ b/dist/static/js/app.d1c7cdc1742088716f20.js.map
--- a/dist/static/js/manifest.f583576dfec9dfc9a295.js.map
+++ b/dist/static/js/manifest.f583576dfec9dfc9a295.js.map
--- a/src/components/pages/easy/addCourse.vue
+++ b/src/components/pages/easy/addCourse.vue
@@ -8893,7 +8893,7 @@ export default {
 
				   margin: 0 auto;
			
 
				   border-top: 2px solid rgb(228, 232, 237);
			
 
				   box-sizing: border-box;
			
 
				-  border-radius: 0px 5px;
			
 
				+  border-radius: 0px 0 5px 5px;
			
 
				 }
			
 
				 
			
 
				 .info_btn+.info_btn {
			
@@ -10561,7 +10561,7 @@ ol {
 
				   justify-content: flex-start;
			
 
				   align-items: center;
			
 
				   width: calc(100%);
			
 
				-  padding: 20px 0;
			
 
				+  padding: 10px 0;
			
 
				   margin: 0 auto;
			
 
				 }
			
 
				 
			
--- a/src/components/pages/task/addCourse.vue
+++ b/src/components/pages/task/addCourse.vue
@@ -11464,7 +11464,7 @@ export default {
 
				   margin: 0 auto;
			
 
				   border-top: 2px solid rgb(228, 232, 237);
			
 
				   box-sizing: border-box;
			
 
				-  border-radius: 0px 5px;
			
 
				+  border-radius: 0px 0 5px 5px;
			
 
				 }
			
 
				 
			
 
				 .info_btn+.info_btn {