1 jaar geleden · 46e9894b12
--- 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.c01a56af562e5548c82762382bdb4726.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.bf1fef376c3713616319.js></script></body></html><script>function stopSafari() {
			
 
				+=======
			
 
				+    }</style><link href=./static/css/app.c6fcb0f46ef872852f4feda506700196.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.276aa68cb934d891962b.js></script></body></html><script>function stopSafari() {
			
 
				+>>>>>>> beta
			
 
				     //阻止safari浏览器双击放大功能
			
 
				     let lastTouchEnd = 0  //更新手指弹起的时间
			
 
				     document.documentElement.addEventListener("touchstart", function (event) {
			
--- a/dist/static/css/app.c01a56af562e5548c82762382bdb4726.css
+++ b/dist/static/css/app.c01a56af562e5548c82762382bdb4726.css
--- a/dist/static/css/app.c01a56af562e5548c82762382bdb4726.css.map
+++ b/dist/static/css/app.c01a56af562e5548c82762382bdb4726.css.map
--- a/dist/static/css/app.c6fcb0f46ef872852f4feda506700196.css
+++ b/dist/static/css/app.c6fcb0f46ef872852f4feda506700196.css
--- a/dist/static/css/app.c6fcb0f46ef872852f4feda506700196.css.map
+++ b/dist/static/css/app.c6fcb0f46ef872852f4feda506700196.css.map
--- a/dist/static/js/app.276aa68cb934d891962b.js
+++ b/dist/static/js/app.276aa68cb934d891962b.js
--- a/dist/static/js/app.276aa68cb934d891962b.js.map
+++ b/dist/static/js/app.276aa68cb934d891962b.js.map
--- a/dist/static/js/app.bf1fef376c3713616319.js.map
+++ b/dist/static/js/app.bf1fef376c3713616319.js.map
--- a/dist/static/js/manifest.f583576dfec9dfc9a295.js.map
+++ b/dist/static/js/manifest.f583576dfec9dfc9a295.js.map
--- a/src/components/pages/addCourse.vue
+++ b/src/components/pages/addCourse.vue
@@ -2472,7 +2472,7 @@
 
				                             <div class="tool">
			
 
				                               <div
			
 
				                                 class="whiteBIcon"
			
 
				-                                @click="addTools(57, itemTaskIndex, toolIndex)"
			
 
				+                                @click="openTools(itemTaskIndex, 57, toolIndex)"
			
 
				                               >
			
 
				                                 <img
			
 
				                                   src="../../assets/icon/fourthToolList/cocopi.png"
			
@@ -7955,6 +7955,17 @@ export default {
 
				           },
			
 
				           "*"
			
 
				         );
			
 
				+      } else if (i == 57) {
			
 
				+        window.parent.postMessage(
			
 
				+          {
			
 
				+            tools: "57y",
			
 
				+            cid: this.cid,
			
 
				+            stage: this.unitIndex,
			
 
				+            task: itemTaskIndex,
			
 
				+            tool: toolIndex,
			
 
				+          },
			
 
				+          "*"
			
 
				+        );
			
 
				       }
			
 
				     },
			
 
				     chapAddTools(i) {
			
--- a/src/components/pages/course.vue
+++ b/src/components/pages/course.vue
@@ -1179,6 +1179,7 @@ export default {
 
				           } else {
			
 
				             this.groupA = "0";
			
 
				           }
			
 
				+          this.$message.success("复制成功")
			
 
				           this.clear();
			
 
				         })
			
 
				         .catch((err) => {
			
--- a/src/components/pages/easy/addCourse.vue
+++ b/src/components/pages/easy/addCourse.vue
@@ -1742,9 +1742,7 @@
 
				                                 <div class="tool">
			
 
				                                   <div
			
 
				                                     class="whiteBIcon"
			
 
				-                                    @click="
			
 
				-                                      addTools(57, itemTaskIndex, toolIndex)
			
 
				-                                    "
			
 
				+                                    @click="openTools(itemTaskIndex, 57, toolIndex)"
			
 
				                                   >
			
 
				                                     <img
			
 
				                                       src="../../../assets/icon/fourthToolList/cocopi.png"
			
@@ -4187,7 +4185,7 @@
 
				                             <div class="tool">
			
 
				                               <div
			
 
				                                 class="whiteBIcon"
			
 
				-                                @click="addTools(57, itemTaskIndex, toolIndex)"
			
 
				+                                @click="openTools(itemTaskIndex, 57, toolIndex)"
			
 
				                               >
			
 
				                                 <img
			
 
				                                   src="../../../assets/icon/fourthToolList/cocopi.png"
			
@@ -9540,6 +9538,17 @@ export default {
 
				           },
			
 
				           "*"
			
 
				         );
			
 
				+      } else if (i == 57) {
			
 
				+        window.parent.postMessage(
			
 
				+          {
			
 
				+            tools: "57y",
			
 
				+            cid: this.cid,
			
 
				+            stage: this.unitIndex,
			
 
				+            task: itemTaskIndex,
			
 
				+            tool: toolIndex,
			
 
				+          },
			
 
				+          "*"
			
 
				+        );
			
 
				       }
			
 
				     },
			
 
				     chapAddTools(i) {
			
--- a/src/components/pages/scourse.vue
+++ b/src/components/pages/scourse.vue
@@ -678,6 +678,7 @@ export default {
 
				           } else {
			
 
				             this.groupA = "0";
			
 
				           }
			
 
				+          this.$message.success("复制成功")
			
 
				           this.clear()
			
 
				         })
			
 
				         .catch((err) => {
			
--- a/src/components/pages/task/addCourse.vue
+++ b/src/components/pages/task/addCourse.vue
@@ -1762,9 +1762,7 @@
 
				                                 <div class="tool">
			
 
				                                   <div
			
 
				                                     class="whiteBIcon"
			
 
				-                                    @click="
			
 
				-                                      addTools(57, itemTaskIndex, toolIndex)
			
 
				-                                    "
			
 
				+                                    @click="openTools(itemTaskIndex, 57, toolIndex)"
			
 
				                                   >
			
 
				                                     <img
			
 
				                                       src="../../../assets/icon/fourthToolList/cocopi.png"
			
@@ -4195,7 +4193,7 @@
 
				                             <div class="tool">
			
 
				                               <div
			
 
				                                 class="whiteBIcon"
			
 
				-                                @click="addTools(57, itemTaskIndex, toolIndex)"
			
 
				+                                @click="openTools(itemTaskIndex, 57, toolIndex)"
			
 
				                               >
			
 
				                                 <img
			
 
				                                   src="../../../assets/icon/fourthToolList/cocopi.png"
			
@@ -9533,6 +9531,17 @@ export default {
 
				           },
			
 
				           "*"
			
 
				         );
			
 
				+      } else if (i == 57) {
			
 
				+        window.parent.postMessage(
			
 
				+          {
			
 
				+            tools: "57y",
			
 
				+            cid: this.cid,
			
 
				+            stage: this.unitIndex,
			
 
				+            task: itemTaskIndex,
			
 
				+            tool: toolIndex,
			
 
				+          },
			
 
				+          "*"
			
 
				+        );
			
 
				       }
			
 
				     },
			
 
				     chapAddTools(i) {