Merge branch 'master' of http://60.205.254.193:3000/GCLS/GCLS_Page_TC

src/components/payment/Confirmorder.vue

@@ -26,7 +26,7 @@
       </div>
     </div>
     <div class="promotionCode">
-      <span class="sp1"> <!-- 使用优惠码 -->{{ $t("Key107") }} </span>
+      <span class="sp1"> <!-- 使用优惠码 -->{{ $t("Key475") }} </span>
       <input
         v-model="discount_code"
         type="text"
@@ -54,12 +54,12 @@
           >¥<span v-html="changePrice(data.price, 16)"></span
         ></span>
       </p>
-      <p class="p2">
+      <!-- <p class="p2">
         <span> {{ $t("Key54") }}： </span>
         <span class="co-value"
           >-¥<span v-html="changePrice(discount_money, 16)"></span
         ></span>
-      </p>
+      </p> -->
       <p class="p3">
         <span> {{ $t("Key55") }}： </span>
         <span class="co-value"

src/components/payment/Payment.vue

@@ -43,7 +43,7 @@
         <span> {{ $t("Key53") }}： </span>
         <span class="co-value">¥<span v-html="changePrice(data.price, 16)"></span></span>
       </p>
-      <p class="p2">
+      <!-- <p class="p2">
         <span> {{ $t("Key54") }}： </span>
         <span class="co-value"
           >-¥<span v-html="changePrice(data.discount_money, 16)"></span
@@ -58,7 +58,7 @@
               : $t("Key108")
           }}
         </span>
-      </p>
+      </p> -->
       <p class="p3">
         <span> {{ $t("Key55") }}： </span>
         <span class="co-value"

src/views/teacher-dev/Preview.vue

@@ -9,11 +9,12 @@
         <div class="text">
           <p class="p1">{{ data.name }}</p>
           <p class="p2">
+            {{$t('Key227')}}：
             <span v-for="(item, i) in data.teacher" :key="i + item">
               {{ item }}{{ i == data.teacher.length - 1 ? "" : "," }}
             </span>
           </p>
-          <p>{{ data.updateTime }}</p>
+          <!-- <p>{{ data.updateTime }}</p> -->
         </div>
         <div class="pay_collect" v-if="!Ispreview">
           <div class="price" v-if="!data.isPurchased">
@@ -452,7 +453,7 @@ export default {
         "Key58",
         "Key72",
         "Key94",
-        "Key107",
+        "Key475",
         "Key109",
         "Key131",
         "Key214",
@@ -468,6 +469,7 @@ export default {
         "Key576",
         "Key696",
         "Key697",
+        "Key227"
       ],
     });
     this.isData = true;

src/views/teacher-dev/index.vue

@@ -215,6 +215,19 @@ export default {
   },
   mounted() {
     this.getData();
+    window.addEventListener("scroll", () => {
+      let scrollTop =
+        window.pageYOffset ||
+        document.documentElement.scrollTop ||
+        document.body.scrollTop;
+      // 滚动条滚动的距离
+      let node = document.getElementsByClassName("nav_title")[0];
+      if (scrollTop > 120) {
+        node.classList.add("xiding_nav");
+      } else {
+        node.classList.remove("xiding_nav");
+      }
+    });
   },
 };
 </script>
@@ -246,6 +259,8 @@ export default {
     }
   }
   .nav_title {
+    width: 100%;
+
     background: #fff;
     .inner {
       width: 1200px;
@@ -264,6 +279,11 @@ export default {
       border-bottom: none;
     }
   }
+  .xiding_nav {
+    position: fixed;
+    top: 0;
+    z-index: 999;
+  }
   .main {
     min-height: 80vh;
     background: #f6f6f6;
@@ -282,4 +302,13 @@ export default {
     padding: 0;
   }
 }
+.nav_title {
+  .el-menu--horizontal > .el-menu-item {
+    height: 64px;
+    line-height: 64px;
+  }
+  .el-menu--horizontal > .el-menu-item.is-active {
+    font-weight: 600;
+  }
+}
 </style>

src/views/wordcard/cread.vue

@@ -537,7 +537,6 @@ export default {
           if (contentItem) option.push(contentItem);
         }
       }
-      console.log(option);
       let hz_str = "";
       if (data.typeIndex == 0) {
         option.forEach((item) => {
@@ -560,7 +559,7 @@ export default {
         .then((res) => {
           this.loading = false;
           for (let key in res) {
-            if (key != "status") {
+            if (key != "status" && key != ",") {
               res[key] = JSON.parse(res[key]);
             }
           }
@@ -615,6 +614,7 @@ export default {
           this.$set(data.option[i].hzDetail, "hz_json", res);
         });
         if (data.StorkesUnfold) {
+          let allArr = [];
           data.option.forEach((item) => {
             let arr = [];
             let hzLength = 1;
@@ -713,8 +713,6 @@ export default {
           }
           data.result = this.arrSplice(allArr, data.pageNumber);
           this.writeTableData = data;
-          clearInterval(timer);
-          timer = null;
         } else {
           let allArr = [];
           data.option.forEach((item) => {