1 год назад · 0d9858bc9e
--- 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.2e2dde51e5cc6d58aa6e3a2f8ad31f7c.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.ded1e95a30c1862d0c74.js></script></body></html><script>function stopSafari() {
			
 
				+=======
			
 
				+    }</style><link href=./static/css/app.72c12c04ce17c8f3bf12deee6821475c.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.82e1ed40bf9ed0071fc3.js></script></body></html><script>function stopSafari() {
			
 
				+>>>>>>> beta
			
 
				     //阻止safari浏览器双击放大功能
			
 
				     let lastTouchEnd = 0  //更新手指弹起的时间
			
 
				     document.documentElement.addEventListener("touchstart", function (event) {
			
--- a/dist/static/css/app.72c12c04ce17c8f3bf12deee6821475c.css
+++ b/dist/static/css/app.72c12c04ce17c8f3bf12deee6821475c.css
--- a/dist/static/css/app.72c12c04ce17c8f3bf12deee6821475c.css.map
+++ b/dist/static/css/app.72c12c04ce17c8f3bf12deee6821475c.css.map
--- a/dist/static/js/app.82e1ed40bf9ed0071fc3.js
+++ b/dist/static/js/app.82e1ed40bf9ed0071fc3.js
--- a/dist/static/js/app.82e1ed40bf9ed0071fc3.js.map
+++ b/dist/static/js/app.82e1ed40bf9ed0071fc3.js.map
--- a/dist/static/js/app.ded1e95a30c1862d0c74.js.map
+++ b/dist/static/js/app.ded1e95a30c1862d0c74.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
@@ -6691,7 +6691,7 @@ export default {
 
				       } else if (i == 3) {
			
 
				         if (!this.cid) {
			
 
				           this.$message.error(
			
 
				-            "极简模式添加时不能添加模板，请添加课程后在修改添加模板"
			
 
				+            "极简模式添加时不能添加模板，请添加课程后再修改添加模板"
			
 
				           );
			
 
				           return;
			
 
				         }
			
@@ -6708,7 +6708,7 @@ export default {
 
				       } else if (i == 1) {
			
 
				         if (!this.cid) {
			
 
				           this.$message.error(
			
 
				-            "极简模式添加时不能添加模板，请添加课程后在修改添加模板"
			
 
				+            "极简模式添加时不能添加模板，请添加课程后再修改添加模板"
			
 
				           );
			
 
				           return;
			
 
				         }
			
@@ -6725,7 +6725,7 @@ export default {
 
				       } else if (i == 57) {
			
 
				         if (!this.cid) {
			
 
				           this.$message.error(
			
 
				-            "极简模式添加时不能添加模板，请添加课程后在修改添加模板"
			
 
				+            "极简模式添加时不能添加模板，请添加课程后再修改添加模板"
			
 
				           );
			
 
				           return;
			
 
				         }
			
--- a/src/components/pages/task/addCourse.vue
+++ b/src/components/pages/task/addCourse.vue
@@ -9290,7 +9290,7 @@ export default {
 
				       } else if (i == 3) {
			
 
				         if (!this.cid) {
			
 
				           this.$message.error(
			
 
				-            "任务模式添加时不能添加模板，请添加课程后在修改添加模板"
			
 
				+            "任务模式添加时不能添加模板，请添加课程后再修改添加模板"
			
 
				           );
			
 
				           return;
			
 
				         }
			
@@ -9307,7 +9307,7 @@ export default {
 
				       } else if (i == 1) {
			
 
				         if (!this.cid) {
			
 
				           this.$message.error(
			
 
				-            "任务模式添加时不能添加模板，请添加课程后在修改添加模板"
			
 
				+            "任务模式添加时不能添加模板，请添加课程后再修改添加模板"
			
 
				           );
			
 
				           return;
			
 
				         }
			
@@ -9324,7 +9324,7 @@ export default {
 
				       } else if (i == 57) {
			
 
				         if (!this.cid) {
			
 
				           this.$message.error(
			
 
				-            "任务模式添加时不能添加模板，请添加课程后在修改添加模板"
			
 
				+            "任务模式添加时不能添加模板，请添加课程后再修改添加模板"
			
 
				           );
			
 
				           return;
			
 
				         }