há 3 meses atrás · 0d302352c5
--- a/dist/index.html
+++ b/dist/index.html
@@ -32,7 +32,11 @@
 
				       width: 100%;
			
 
				       background: #e6eaf0;
			
 
				       font-family: '黑体';
			
 
				+<<<<<<< HEAD
			
 
				     }</style><link href=./static/css/app.29f8097eade2fefe091914ee9548558d.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3fb62e91643ccf3ef432.js></script><script type=text/javascript src=./static/js/vendor.bb486323f0fa002ba2e7.js></script><script type=text/javascript src=./static/js/app.cc12bde664aedebce6b8.js></script></body></html><script>function stopSafari() {
			
 
				+=======
			
 
				+    }</style><link href=./static/css/app.2e2b0aa6eef84fa889d965a8c35a7c95.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.161e82026ac2ae03ab6f.js></script><script type=text/javascript src=./static/js/vendor.bb486323f0fa002ba2e7.js></script><script type=text/javascript src=./static/js/app.dc0768bd65ebd75f9aea.js></script></body></html><script>function stopSafari() {
			
 
				+>>>>>>> beta
			
 
				     //阻止safari浏览器双击放大功能
			
 
				     let lastTouchEnd = 0  //更新手指弹起的时间
			
 
				     document.documentElement.addEventListener("touchstart", function (event) {
			
--- a/dist/static/css/app.29f8097eade2fefe091914ee9548558d.css.map
+++ b/dist/static/css/app.29f8097eade2fefe091914ee9548558d.css.map
--- a/dist/static/css/app.2e2b0aa6eef84fa889d965a8c35a7c95.css
+++ b/dist/static/css/app.2e2b0aa6eef84fa889d965a8c35a7c95.css
--- a/dist/static/css/app.2e2b0aa6eef84fa889d965a8c35a7c95.css.map
+++ b/dist/static/css/app.2e2b0aa6eef84fa889d965a8c35a7c95.css.map
--- a/dist/static/js/app.cc12bde664aedebce6b8.js
+++ b/dist/static/js/app.cc12bde664aedebce6b8.js
--- a/dist/static/js/app.cc12bde664aedebce6b8.js.map
+++ b/dist/static/js/app.cc12bde664aedebce6b8.js.map
--- a/dist/static/js/app.dc0768bd65ebd75f9aea.js
+++ b/dist/static/js/app.dc0768bd65ebd75f9aea.js
--- a/dist/static/js/app.dc0768bd65ebd75f9aea.js.map
+++ b/dist/static/js/app.dc0768bd65ebd75f9aea.js.map
--- a/dist/static/js/manifest.3fb62e91643ccf3ef432.js.map
+++ b/dist/static/js/manifest.3fb62e91643ccf3ef432.js.map
--- a/src/components/pages/course.vue
+++ b/src/components/pages/course.vue
@@ -1260,7 +1260,7 @@ export default {
 
				           this.ajax
			
 
				             .get(this.$store.state.api + "deleteCourse", params)
			
 
				             .then((res) => {
			
 
				-              loading.close();
			
 
				+              // loading.close();
			
 
				               this.isLoading = false;
			
 
				               this.$message.success("删除成功");
			
 
				               this.getCourse();
			
--- a/src/components/pages/task/addCourse.vue
+++ b/src/components/pages/task/addCourse.vue
@@ -6440,7 +6440,7 @@
 
				               >
			
 
				             </div>
			
 
				           </div>
			
 
				-          <!-- <div class="class_item" style="position:absolute; margin:0" v-if="grade2.length">            
			
 
				+          <!-- <div class="class_item" style="position:absolute; margin:0" v-if="grade2.length">
			
 
				             <el-checkbox v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox>
			
 
				           </div> -->
			
 
				           <el-checkbox-group
			
@@ -13737,7 +13737,6 @@ export default {
 
				             console.error(err);
			
 
				           });
			
 
				       });
			
 
				-      
			
 
				     }
			
 
				   },
			
 
				   beforeDestroy() {