Przeglądaj źródła

收藏 教材、课程0元不显示 生词卡片例句错误

natasha 2 lat temu
rodzic
commit
380d132a31

+ 6 - 5
src/components/Personalcenter/Mycollect.vue

@@ -166,11 +166,11 @@
                     language_type == 'AR' ? 'textLeft' : '',
                   ]"
                 >
-                  {{ item.create_time }}
+                  {{ item.create_time?item.create_time.split(" ")[0]:'' }}
                 </p>
 
                 <div class="order-btn">
-                  <div class="price">
+                  <div class="price" v-if="item.goods_price>0&&item.is_free_license=='false'">
                     ¥<span
                       class="price_num"
                       v-html="changePrice(item.goods_price, 24, 16)"
@@ -182,14 +182,15 @@
                     v-if="item.goods_is_buy == 'false'"
                     @click="reOrder(item)"
                   >
-                    {{ item.goods_type == 201 ? "加入课程" : $t("Key72") }}
+                    {{ item.goods_type == 201 ? $t("Key784") : $t("Key72") }}
                   </button>
                   <!-- 已购买 -->
                   <button
-                    class="goPay hasPay"
+                    class="goPay"
                     v-if="item.goods_is_buy == 'true'"
+                    @click.stop="jump(item)"
                   >
-                    {{ $t("Key73") }}
+                    {{ $t("Key390") }}
                   </button>
                 </div>
               </div>

+ 42 - 34
src/components/common/WordPhraseDetail.vue

@@ -327,42 +327,50 @@ export default {
     },
     handleExample(list) {
       list = list.map((item, index) => {
-        let wordIndex = null;
-        for (let i = 0; i < item.sentence.length; i++) {
-          if (item.sentence[i] == item.word) {
-            wordIndex = i;
+        let sentence = JSON.parse(JSON.stringify(item.sentence));
+        let res = "";
+        for (let i = 0; i < item.position_list.length; i++) {
+          let part1 = "";
+          let part2 = "";
+          let part3 = "";
+          if (item.position_list.length > 1) {
+            if (i == 0) {
+              part1 = sentence.substring(0, item.position_list[i].begin);
+              part2 = sentence.substring(
+                item.position_list[i].begin,
+                item.position_list[i].end
+              );
+              part3 = sentence.substring(
+                item.position_list[i].end,
+                item.position_list[i + 1].begin
+              );
+            } else if (i == item.position_list.length - 1) {
+              part2 = sentence.substring(
+                item.position_list[i].begin,
+                item.position_list[i].end
+              );
+              part3 = sentence.substring(item.position_list[i].end);
+            } else {
+              part2 = sentence.substring(
+                item.position_list[i].begin,
+                item.position_list[i].end
+              );
+              part3 = sentence.substring(
+                item.position_list[i].end,
+                item.position_list[i + 1].begin
+              );
+            }
+          } else {
+            part1 = sentence.substring(0, item.position_list[i].begin);
+            part2 = sentence.substring(
+              item.position_list[i].begin,
+              item.position_list[i].end
+            );
+            part3 = sentence.substring(item.position_list[i].end);
           }
+          res +=
+            part1 + '<span style="color:#DE4444;">' + part2 + "</span>" + part3;
         }
-        // let b = item.begin_position;
-        // let e = item.end_position;
-        // let sent = item.sentence;
-        // let part1 = sent.substring(0, b);
-        // let part2 = sent.substring(b, e);
-        // let part3 = sent.substring(e);
-        let sent = item.sentence;
-        let part1 = "";
-        let part2 = "";
-        let part3 = "";
-        if (wordIndex === 0) {
-          part1 = "";
-          part2 = sent.substring(0, 1);
-          part3 = sent.substring(1);
-        } else if (wordIndex === item.sentence.length - 1) {
-          part1 = sent.substring(0, wordIndex);
-          part2 = sent.substring(wordIndex);
-          part3 = "";
-        } else {
-          part1 = sent.substring(0, wordIndex);
-          part2 = sent.substring(wordIndex, wordIndex + 1);
-          part3 = sent.substring(wordIndex + 1);
-        }
-        // let reg = new RegExp(`${item.word}`, "g");
-        // let result = sent.replace(
-        //   reg,
-        //   `<span style="color:#DE4444;">${item.word}</span>`
-        // );
-        let res =
-          part1 + '<span style="color:#DE4444;">' + part2 + "</span>" + part3;
         item.res = res;
         return item;
       });

+ 2 - 0
src/views/Personalcenter.vue

@@ -479,6 +479,7 @@ export default {
           "Key232",
           "Key295",
           "Key361",
+          "Key390",
           "Key462",
           "Key463",
           "Key464",
@@ -577,6 +578,7 @@ export default {
           "Key750",
           "Key751",
           "Key752",
+          "Key784"
         ],
       });
       this.isData = true;