Merge branch 'NPC-lhd'

src/components/Adult/Preview.vue

@@ -48,11 +48,11 @@
                 >
                   <div class="synthesis-box">
                     <div>
-                      <span class="pinyin">{{ itemCon.pinyin }}</span>
+                      <span class="pinyin" :class="[noFont.indexOf(itemCon.pinyin)>-1?'noFont':'']">{{ itemCon.pinyin }}</span>
                       <span class="hanzi content-con">{{ itemCon.chs }}</span>
                     </div>
                     <div style="text-align: left">
-                      <span class="pinyin">{{
+                      <span class="pinyin" :class="[noFont.indexOf(items.detail.wordsList[indexCon + 1].pinyin)>-1?'noFont':'']">{{
                         item.wordsList[indexCon + 1].pinyin
                       }}</span>
                       <span class="hanzi content-con">{{
@@ -62,7 +62,7 @@
                   </div>
                 </template>
                 <template v-else>
-                  <span class="pinyin">{{ itemCon.pinyin }}</span>
+                  <span class="pinyin" :class="[noFont.indexOf(itemCon.pinyin)>-1?'noFont':'']">{{ itemCon.pinyin }}</span>
                   <span class="hanzi content-con">{{ itemCon.chs }}</span>
                 </template>
               </div>
@@ -369,6 +369,7 @@ export default {
         },
       ],
       chsFhList: ["，", "。", "“", "：", "》", "《", "？", "！", "；"],
+      noFont: ['~','!','@','#','$','%','^','&','*','(',')'], // 对应不要拼音字体
       idArr: [], //当前的pid
     };
   },
@@ -597,6 +598,9 @@ export default {
           font-size: 14px;
           line-height: 22px;
           height: 22px;
+          &.noFont{
+            font-family: initial;
+          }
         }
         .synthesis-box {
           display: flex;

src/components/Adult/preview/CourseStart.vue

@@ -11,18 +11,18 @@
                         <template v-if="curQue.detail.wordsList[indexCon + 1] && curQue.detail.wordsList[indexCon + 1].chs && chsFhList.indexOf(curQue.detail.wordsList[indexCon + 1].chs) > -1">
                             <div class="synthesis-box">
                                 <div>
-                                    <span class="pinyin">{{itemCon.pinyin}}</span>
+                                    <span class="pinyin" :class="[noFont.indexOf(itemCon.pinyin)>-1?'noFont':'']">{{itemCon.pinyin}}</span>
                                     <span class="hanzi content-con">{{itemCon.chs}}</span>
                                 </div>
                                 <div style="text-align: left">
-                                    <span class="pinyin">{{curQue.detail.wordsList[indexCon + 1].pinyin}}</span>
+                                    <span class="pinyin" :class="[noFont.indexOf(items.detail.wordsList[indexCon + 1].pinyin)>-1?'noFont':'']">{{curQue.detail.wordsList[indexCon + 1].pinyin}}</span>
                                     <span class="hanzi content-con">{{curQue.detail.wordsList[indexCon + 1].chs}}</span>
                                 </div>
                             </div>
                             
                         </template>
                         <template v-else>
-                            <span class="pinyin">{{itemCon.pinyin}}</span>
+                            <span class="pinyin" :class="[noFont.indexOf(itemCon.pinyin)>-1?'noFont':'']">{{itemCon.pinyin}}</span>
                             <span class="hanzi content-con">{{itemCon.chs}}</span>
                         </template>
                     </div>
@@ -49,6 +49,7 @@ export default {
     //这里存放数据
     return {
       chsFhList: ["，", "。", "“", "：", "》", "《", "？", "！", "；"],
+      noFont: ['~','!','@','#','$','%','^','&','*','(',')'], // 对应不要拼音字体
     };
   },
   //计算属性 类似于data概念
@@ -149,6 +150,9 @@ export default {
             font-size: 24px;
             line-height: 32px;
             height: 32px;
+            &.noFont{
+                font-family: initial;
+            }
         }
         .synthesis-box{
             display: flex;

src/components/Adult/preview/InputHasRecord.vue

@@ -44,7 +44,7 @@
                                                 <template v-if="items.detail.wordsList[indexCon + 1] && items.detail.wordsList[indexCon + 1].chs && chsFhList.indexOf(items.detail.wordsList[indexCon + 1].chs) > -1">
                                                     <div class="synthesis-box">
                                                         <div>
-                                                            <span class="pinyin">{{itemCon.pinyin}}</span>
+                                                            <span class="pinyin" :class="[noFont.indexOf(itemCon.pinyin)>-1?'noFont':'']">{{itemCon.pinyin}}</span>
                                                             <span class="hanzi content-con">{{itemCon.chs}}</span>
                                                         </div>
                                                         <div style="text-align: left">
@@ -55,7 +55,7 @@
                                                     
                                                 </template>
                                                 <template v-else>
-                                                    <span class="pinyin">{{itemCon.pinyin}}</span>
+                                                    <span class="pinyin" :class="[noFont.indexOf(itemCon.pinyin)>-1?'noFont':'']">{{itemCon.pinyin}}</span>
                                                     <span class="hanzi content-con">{{itemCon.chs}}</span>
                                                 </template>
                                             </div>
@@ -87,7 +87,7 @@
                                     <template v-if="items.detail.wordsList[indexCon + 1] && items.detail.wordsList[indexCon + 1].chs && chsFhList.indexOf(items.detail.wordsList[indexCon + 1].chs) > -1">
                                         <div class="synthesis-box">
                                             <div>
-                                                <span class="pinyin">{{itemCon.pinyin}}</span>
+                                                <span class="pinyin" :class="[noFont.indexOf(itemCon.pinyin)>-1?'noFont':'']">{{itemCon.pinyin}}</span>
                                                 <span class="hanzi content-con">{{itemCon.chs}}</span>
                                             </div>
                                             <div style="text-align: left">
@@ -98,7 +98,7 @@
                                         
                                     </template>
                                     <template v-else>
-                                        <span class="pinyin">{{itemCon.pinyin}}</span>
+                                        <span class="pinyin" :class="[noFont.indexOf(itemCon.pinyin)>-1?'noFont':'']">{{itemCon.pinyin}}</span>
                                         <span class="hanzi content-con">{{itemCon.chs}}</span>
                                     </template>
                                 </div>

src/components/Adult/preview/SentenceInput.vue

@@ -21,18 +21,18 @@
                               <template v-if="items.detail.wordsList[indexCon + 1] && items.detail.wordsList[indexCon + 1].chs && chsFhList.indexOf(items.detail.wordsList[indexCon + 1].chs) > -1">
                                   <div class="synthesis-box">
                                       <div>
-                                            <span class="pinyin">{{itemCon.pinyin}}</span>
+                                            <span class="pinyin" :class="[noFont.indexOf(itemCon.pinyin)>-1?'noFont':'']">{{itemCon.pinyin}}</span>
                                             <span class="hanzi content-con">{{itemCon.chs}}</span>
                                         </div>
                                         <div style="text-align: left">
-                                            <span class="pinyin">{{items.detail.wordsList[indexCon + 1].pinyin}}</span>
+                                            <span class="pinyin" :class="[noFont.indexOf(items.detail.wordsList[indexCon + 1].pinyin)>-1?'noFont':'']">{{items.detail.wordsList[indexCon + 1].pinyin}}</span>
                                             <span class="hanzi content-con">{{items.detail.wordsList[indexCon + 1].chs}}</span>
                                         </div>
                                   </div>
                                   
                               </template>
                               <template v-else>
-                                    <span class="pinyin">{{itemCon.pinyin}}</span>
+                                    <span class="pinyin" :class="[noFont.indexOf(itemCon.pinyin)>-1?'noFont':'']">{{itemCon.pinyin}}</span>
                                     <span class="hanzi content-con">{{itemCon.chs}}</span>
                               </template>
                           </div>
@@ -79,6 +79,7 @@ export default {
         palyClass: '',
         dataType: [], // 题型
         chsFhList: ["，", "。", "“", "：", "》", "《", "？", "！", "；"],
+        noFont: ['~','!','@','#','$','%','^','&','*','(',')'], // 对应不要拼音字体
     };
   },
   computed: {},
@@ -284,6 +285,9 @@ export default {
                         line-height: 130%;
                         color: #000000;
                         height: 18px;
+                        &.noFont{
+                            font-family: initial;
+                        }
                     }
                     .synthesis-box{
                         display: flex;

src/components/Adult/preview/SentenceListenRead.vue

@@ -32,18 +32,18 @@
                                 <template v-if="items.detail.wordsList[indexCon + 1] && items.detail.wordsList[indexCon + 1].chs && chsFhList.indexOf(items.detail.wordsList[indexCon + 1].chs) > -1">
                                     <div class="synthesis-box">
                                         <div>
-                                                <span class="pinyin">{{itemCon.pinyin}}</span>
+                                                <span class="pinyin" :class="[noFont.indexOf(itemCon.pinyin)>-1?'noFont':'']">{{itemCon.pinyin}}</span>
                                                 <span class="hanzi content-con">{{itemCon.chs}}</span>
                                             </div>
                                             <div style="text-align: left">
-                                                <span class="pinyin">{{items.detail.wordsList[indexCon + 1].pinyin}}</span>
+                                                <span class="pinyin" :class="[noFont.indexOf(items.detail.wordsList[indexCon + 1].pinyin)>-1?'noFont':'']">{{items.detail.wordsList[indexCon + 1].pinyin}}</span>
                                                 <span class="hanzi content-con">{{items.detail.wordsList[indexCon + 1].chs}}</span>
                                             </div>
                                     </div>
                                     
                                 </template>
                                 <template v-else>
-                                        <span class="pinyin">{{itemCon.pinyin}}</span>
+                                        <span class="pinyin" :class="[noFont.indexOf(itemCon.pinyin)>-1?'noFont':'']">{{itemCon.pinyin}}</span>
                                         <span class="hanzi content-con">{{itemCon.chs}}</span>
                                 </template>
                             </div>
@@ -67,6 +67,7 @@ export default {
     return {
         curTime:0,
         chsFhList: ["，", "。", "“", "：", "》", "《", "？", "！", "；"],
+        noFont: ['~','!','@','#','$','%','^','&','*','(',')'], // 对应不要拼音字体
         stopAudio: false,
     };
   },
@@ -233,6 +234,9 @@ export default {
                         line-height: 130%;
                         color: #000000;
                         height: 18px;
+                        &.noFont{
+                            font-family: initial;
+                        }   
                     }
                     .synthesis-box{
                         display: flex;

src/components/Adult/preview/TextProblem.vue

@@ -12,22 +12,22 @@
                               <template v-if="item.detail.wordsList[indexCon + 1] && item.detail.wordsList[indexCon + 1].chs && chsFhList.indexOf(item.detail.wordsList[indexCon + 1].chs) > -1">
                                   <div class="synthesis-box">
                                       <div>
-                                            <span class="pinyin" v-if="item.detail.pyPosition=='top'">{{itemCon.pinyin}}</span>
+                                            <span class="pinyin" :class="[noFont.indexOf(itemCon.pinyin)>-1?'noFont':'']" v-if="item.detail.pyPosition=='top'">{{itemCon.pinyin}}</span>
                                             <span class="hanzi content-con">{{itemCon.chs}}</span>
-                                            <span class="pinyin" v-if="item.detail.pyPosition=='bottom'">{{itemCon.pinyin}}</span>
+                                            <span class="pinyin" :class="[noFont.indexOf(itemCon.pinyin)>-1?'noFont':'']" v-if="item.detail.pyPosition=='bottom'">{{itemCon.pinyin}}</span>
                                         </div>
                                         <div style="text-align: left">
-                                            <span class="pinyin" v-if="item.detail.pyPosition=='top'">{{item.detail.wordsList[indexCon + 1].pinyin}}</span>
+                                            <span class="pinyin" :class="[noFont.indexOf(items.detail.wordsList[indexCon + 1].pinyin)>-1?'noFont':'']" v-if="item.detail.pyPosition=='top'">{{item.detail.wordsList[indexCon + 1].pinyin}}</span>
                                             <span class="hanzi content-con">{{item.detail.wordsList[indexCon + 1].chs}}</span>
-                                            <span class="pinyin" v-if="item.detail.pyPosition=='bottom'">{{item.detail.wordsList[indexCon + 1].pinyin}}</span>
+                                            <span class="pinyin" :class="[noFont.indexOf(items.detail.wordsList[indexCon + 1].pinyin)>-1?'noFont':'']" v-if="item.detail.pyPosition=='bottom'">{{item.detail.wordsList[indexCon + 1].pinyin}}</span>
                                         </div>
                                   </div>
                                   
                               </template>
                               <template v-else>
-                                    <span class="pinyin" v-if="item.detail.pyPosition=='top'">{{itemCon.pinyin}}</span>
+                                    <span class="pinyin" :class="[noFont.indexOf(itemCon.pinyin)>-1?'noFont':'']" v-if="item.detail.pyPosition=='top'">{{itemCon.pinyin}}</span>
                                     <span class="hanzi content-con">{{itemCon.chs}}</span>
-                                    <span class="pinyin" v-if="item.detail.pyPosition=='bottom'">{{itemCon.pinyin}}</span>
+                                    <span class="pinyin" :class="[noFont.indexOf(itemCon.pinyin)>-1?'noFont':'']" v-if="item.detail.pyPosition=='bottom'">{{itemCon.pinyin}}</span>
                               </template>
                           </div>
                       </div>
@@ -51,6 +51,7 @@ export default {
   data() {
     return {
         chsFhList: ["，", "。", "“", "：", "》", "《", "？", "！", "；"],
+        noFont: ['~','!','@','#','$','%','^','&','*','(',')'], // 对应不要拼音字体
     };
   },
   computed: {},
@@ -162,6 +163,9 @@ export default {
                         line-height: 20px;
                         color: #000000;
                         height: 20px;
+                        &.noFont{
+                            font-family: initial;
+                        }
                     }
                     .synthesis-box{
                         display: flex;