guanchunjie il y a 3 ans
Parent
commit
bf14a507b7

+ 29 - 18
src/components/Adult/preview/DialogueArticleViewChs/AnswerModel.vue

@@ -73,7 +73,7 @@
                                 ? 'noFont'
                                 : '',
                             ]"
-                            >{{ pItem.pinyin }}</span
+                            >{{ pItem.pinyin | handlePY }}</span
                           >
                           <template v-if="!pItem.isHeng">
                             <span
@@ -106,10 +106,13 @@
                               pItem.className ? pItem.className : '',
                               noFont.indexOf(pItem.pinyin) > -1 ? 'noFont' : '',
                             ]"
-                            >{{ pItem.pinyin }}</span
+                            >{{ pItem.pinyin | handlePY }}</span
                           >
                         </span>
-                        <span class="NNPE-words-box" v-if="item.wordsList[pIndex + 1]">
+                        <span
+                          class="NNPE-words-box"
+                          v-if="item.wordsList[pIndex + 1]"
+                        >
                           <span
                             v-if="pyPosition == 'top'"
                             class="NNPE-pinyin"
@@ -121,7 +124,9 @@
                                 : '',
                             ]"
                             style="text-align: left"
-                            >{{ item.wordsList[pIndex + 1].pinyin }}</span
+                            >{{
+                              item.wordsList[pIndex + 1].pinyin | handlePY
+                            }}</span
                           >
 
                           <span
@@ -151,7 +156,9 @@
                                 : '',
                             ]"
                             style="text-align: left"
-                            >{{ item.wordsList[pIndex + 1].pinyin }}</span
+                            >{{
+                              item.wordsList[pIndex + 1].pinyin | handlePY
+                            }}</span
                           >
                         </span>
                       </template>
@@ -159,17 +166,14 @@
                       <!--下一个元素不是标点-->
                       <template v-else>
                         <span
-                          v-if="pyPosition == 'top'&&item.wordsList[pIndex + 1]"
+                          v-if="pyPosition == 'top'"
                           class="NNPE-pinyin"
                           :class="[
                             pItem.padding ? 'padding' : '',
                             pItem.className ? pItem.className : '',
-                            noFont.indexOf(item.wordsList[pIndex + 1].pinyin) >
-                            -1
-                              ? 'noFont'
-                              : '',
+                            noFont.indexOf(pItem.pinyin) > -1 ? 'noFont' : '',
                           ]"
-                          >{{ pItem.pinyin }}</span
+                          >{{ pItem.pinyin | handlePY }}</span
                         >
                         <template v-if="!pItem.isHeng">
                           <span
@@ -196,17 +200,14 @@
                           </div>
                         </template>
                         <span
-                          v-if="pyPosition == 'bottom'&&item.wordsList[pIndex + 1]"
+                          v-if="pyPosition == 'bottom'"
                           class="NNPE-pinyin"
                           :class="[
                             pItem.padding ? 'padding' : '',
                             pItem.className ? pItem.className : '',
-                            noFont.indexOf(item.wordsList[pIndex + 1].pinyin) >
-                            -1
-                              ? 'noFont'
-                              : '',
+                            noFont.indexOf(pItem.pinyin) > -1 ? 'noFont' : '',
                           ]"
-                          >{{ pItem.pinyin }}</span
+                          >{{ pItem.pinyin | handlePY }}</span
                         >
                       </template>
                     </template>
@@ -408,6 +409,16 @@ export default {
       });
       return str;
     },
+    handlePY(pinyin) {
+      let reg = /_{2,}/g;
+      let py = "";
+      if (reg.test(pinyin)) {
+        py = "";
+      } else {
+        py = pinyin;
+      }
+      return py;
+    },
   },
   data() {
     return {
@@ -416,7 +427,7 @@ export default {
       chsFhList: [",", "。", "“", ":", "》", "《", "?", "!", ";"],
       enFhList: [",", ".", ";", "?", "!", ":", ">", "<"],
       newWords: ["鱼", "辩礼义"],
-      noFont: ["~", "!", "@", "#", "$", "%", "^", "&", "*", "(", ")", "/"],
+      noFont: ["~", "!", "@", "#", "$", "%", "^", "&", "*", "(", ")", "/", "_"],
       oldHz: "",
       hz: "",
       top: 0,