Jelajahi Sumber

Merge branch 'beta' into HK

lsc 1 tahun lalu
induk
melakukan
d20cefe8df

+ 4 - 0
dist/index.html

@@ -25,10 +25,14 @@
       height: 100%;
       width: 100%;
       background: #e6eaf0;
+<<<<<<< HEAD
 <<<<<<< 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
+=======
+    }</style><link href=./static/css/app.a245ba867f1626a832b4a35ff877bb95.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.f6931abbddb153e88dd3.js></script></body></html><script>function stopSafari() {
 >>>>>>> beta
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间

File diff ditekan karena terlalu besar
+ 1 - 0
dist/static/css/app.a245ba867f1626a832b4a35ff877bb95.css


File diff ditekan karena terlalu besar
+ 1 - 0
dist/static/css/app.a245ba867f1626a832b4a35ff877bb95.css.map


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/app.276aa68cb934d891962b.js


File diff ditekan karena terlalu besar
+ 0 - 0
dist/static/js/app.f6931abbddb153e88dd3.js


File diff ditekan karena terlalu besar
+ 1 - 0
dist/static/js/app.f6931abbddb153e88dd3.js.map


+ 6 - 0
src/components/pages/easy/addCourse.vue

@@ -9539,6 +9539,12 @@ export default {
           "*"
         );
       } else if (i == 57) {
+        if (!this.cid) {
+          this.$message.error(
+            "如果您需要在内容中添加模板,请在修改模式下进行添加。"
+          );
+          return;
+        }
         window.parent.postMessage(
           {
             tools: "57y",

+ 7 - 0
src/components/pages/task/addCourse.vue

@@ -8718,6 +8718,7 @@ export default {
           this.cid = res.data.courseId;
           this.courseUserid = this.userid;
           this.islogin = true;
+          this.steps = 4;
         })
         .catch((err) => {
           this.$message.error("网络不佳");
@@ -9532,6 +9533,12 @@ export default {
           "*"
         );
       } else if (i == 57) {
+        if (!this.cid) {
+          this.$message.error(
+            "如果您需要在内容中添加模板,请在修改模式下进行添加。"
+          );
+          return;
+        }
         window.parent.postMessage(
           {
             tools: "57y",

Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini