Bladeren bron

Merge branch 'lhd'

natasha 1 maand geleden
bovenliggende
commit
5c3c3e8a0e

+ 30 - 21
src/views/book/courseware/preview/components/article/NormalModelChs.vue

@@ -116,7 +116,7 @@
                                   ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt'
                                   : '22px',
                             }"
-                            >{{ pItem.pinyin }}</span
+                            >{{ NumberList.indexOf(pItem.pinyin) == -1 ? pItem.pinyin : '' }}</span
                           >
                           <span
                             class="NNPE-chs"
@@ -185,7 +185,7 @@
                                     pItem.articleSentIndex,
                                   )
                                 "
-                                >{{ NumberList.indexOf(pItem.pinyin) == -1 ? pItem.chs[wIndex] : '' }}</span
+                                >{{ pItem.chs[wIndex] }}</span
                               >
                             </template>
                           </span>
@@ -212,7 +212,7 @@
                                   ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt'
                                   : '22px',
                             }"
-                            >{{ pItem.pinyin }}</span
+                            >{{ NumberList.indexOf(pItem.pinyin) == -1 ? pItem.pinyin : '' }}</span
                           >
                         </span>
                         <span class="NNPE-words-box">
@@ -239,7 +239,11 @@
                                   ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt'
                                   : '22px',
                             }"
-                            >{{ item.wordsList[pIndex + 1].pinyin }}</span
+                            >{{
+                              NumberList.indexOf(item.wordsList[pIndex + 1].pinyin) == -1
+                                ? item.wordsList[pIndex + 1].pinyin
+                                : ''
+                            }}</span
                           >
                           <span
                             class="NNPE-chs"
@@ -299,11 +303,7 @@
                                 pItem.articleSentIndex,
                               )
                             "
-                            >{{
-                              NumberList.indexOf(item.wordsList[pIndex + 1].pinyin) == -1
-                                ? item.wordsList[pIndex + 1].chs
-                                : ''
-                            }}</span
+                            >{{ item.wordsList[pIndex + 1].chs }}</span
                           >
                           <span
                             v-if="curQue.property.pinyin_position == 'bottom' && config.isShowPY && item.dhaspinyin"
@@ -328,7 +328,11 @@
                                   ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt'
                                   : '22px',
                             }"
-                            >{{ item.wordsList[pIndex + 1].pinyin }}</span
+                            >{{
+                              NumberList.indexOf(item.wordsList[pIndex + 1].pinyin) == -1
+                                ? item.wordsList[pIndex + 1].pinyin
+                                : ''
+                            }}</span
                           >
                         </span>
                         <span
@@ -363,7 +367,11 @@
                                   ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt'
                                   : '22px',
                             }"
-                            >{{ item.wordsList[pIndex + 2].pinyin }}</span
+                            >{{
+                              NumberList.indexOf(item.wordsList[pIndex + 2].pinyin) == -1
+                                ? item.wordsList[pIndex + 2].pinyin
+                                : ''
+                            }}</span
                           >
                           <span
                             class="NNPE-chs"
@@ -423,11 +431,7 @@
                                 pItem.articleSentIndex,
                               )
                             "
-                            >{{
-                              NumberList.indexOf(item.wordsList[pIndex + 2].pinyin) == -1
-                                ? item.wordsList[pIndex + 2].chs
-                                : ''
-                            }}</span
+                            >{{ item.wordsList[pIndex + 2].chs }}</span
                           >
                           <span
                             v-if="curQue.property.pinyin_position == 'bottom' && config.isShowPY && item.dhaspinyin"
@@ -452,7 +456,11 @@
                                   ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt'
                                   : '22px',
                             }"
-                            >{{ item.wordsList[pIndex + 2].pinyin }}</span
+                            >{{
+                              NumberList.indexOf(item.wordsList[pIndex + 2].pinyin) == -1
+                                ? item.wordsList[pIndex + 2].pinyin
+                                : ''
+                            }}</span
                           >
                         </span>
                       </template>
@@ -479,7 +487,7 @@
                             height:
                               attrib && attrib.pinyin_size ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt' : '22px',
                           }"
-                          >{{ pItem.pinyin }}</span
+                          >{{ NumberList.indexOf(pItem.pinyin) == -1 ? pItem.pinyin : '' }}</span
                         >
                         <span
                           class="NNPE-chs"
@@ -546,7 +554,7 @@
                                   pItem.articleSentIndex,
                                 )
                               "
-                              >{{ NumberList.indexOf(pItem.pinyin) == -1 ? pItem.chs[wIndex] : '' }}</span
+                              >{{ pItem.chs[wIndex] }}</span
                             >
                           </template>
                         </span>
@@ -572,7 +580,7 @@
                             height:
                               attrib && attrib.pinyin_size ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt' : '22px',
                           }"
-                          >{{ pItem.pinyin }}</span
+                          >{{ NumberList.indexOf(pItem.pinyin) == -1 ? pItem.pinyin : '' }}</span
                         >
                       </template>
                     </template>
@@ -1805,7 +1813,8 @@ export default {
     max-width: 100%;
     margin-top: -196px;
     overflow: auto;
-    box-shadow: 0 4px 16px rgba(0, 0, 0, 15%);
+
+    // box-shadow: 0 4px 16px rgba(0, 0, 0, 15%);
   }
 
   .NNPE-detail-box {

+ 32 - 23
src/views/book/courseware/preview/components/article/PhraseModelChs.vue

@@ -102,7 +102,7 @@
                                   ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt'
                                   : '22px',
                             }"
-                            >{{ pItem.pinyin }}</span
+                            >{{ NumberList.indexOf(pItem.pinyin) == -1 ? pItem.pinyin : '' }}</span
                           >
                           <span
                             :class="[
@@ -125,7 +125,7 @@
                                   : '',
                             }"
                             @click.stop="viewNotes($event, pItem.words ? pItem.words : pItem.chs)"
-                            >{{ NumberList.indexOf(pItem.pinyin) == -1 ? pItem.chs : '' }}</span
+                            >{{ pItem.chs }}</span
                           >
                           <span
                             v-if="curQue.property.pinyin_position == 'bottom' && config.isShowPY && item.dhaspinyin"
@@ -142,7 +142,7 @@
                                   ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt'
                                   : '22px',
                             }"
-                            >{{ pItem.pinyin }}</span
+                            >{{ NumberList.indexOf(pItem.pinyin) == -1 ? pItem.pinyin : '' }}</span
                           >
                         </span>
                         <span class="NNPE-words-box">
@@ -161,7 +161,11 @@
                                   : '22px',
                             }"
                             @click.stop="viewNotes($event, item.wordsList[pIndex + 1].pinyin)"
-                            >{{ item.wordsList[pIndex + 1].pinyin }}</span
+                            >{{
+                              NumberList.indexOf(item.wordsList[pIndex + 1].pinyin) == -1
+                                ? item.wordsList[pIndex + 1].pinyin
+                                : ''
+                            }}</span
                           >
                           <span
                             class="NNPE-chs"
@@ -182,11 +186,7 @@
                                   : item.wordsList[pIndex + 1].chs,
                               )
                             "
-                            >{{
-                              NumberList.indexOf(item.wordsList[pIndex + 1].pinyin) == -1
-                                ? item.wordsList[pIndex + 1].chs
-                                : ''
-                            }}</span
+                            >{{ item.wordsList[pIndex + 1].chs }}</span
                           >
                           <span
                             v-if="curQue.property.pinyin_position == 'bottom' && config.isShowPY && item.dhaspinyin"
@@ -203,7 +203,11 @@
                                   : '22px',
                             }"
                             @click.stop="viewNotes($event, item.wordsList[pIndex + 1].pinyin)"
-                            >{{ item.wordsList[pIndex + 1].pinyin }}</span
+                            >{{
+                              NumberList.indexOf(item.wordsList[pIndex + 1].pinyin) == -1
+                                ? item.wordsList[pIndex + 1].pinyin
+                                : ''
+                            }}</span
                           >
                         </span>
 
@@ -231,7 +235,11 @@
                                   : '22px',
                             }"
                             @click.stop="viewNotes($event, item.wordsList[pIndex + 2].pinyin)"
-                            >{{ item.wordsList[pIndex + 2].pinyin }}</span
+                            >{{
+                              NumberList.indexOf(item.wordsList[pIndex + 2].pinyin) == -1
+                                ? item.wordsList[pIndex + 2].pinyin
+                                : ''
+                            }}</span
                           >
                           <span
                             class="NNPE-chs"
@@ -252,11 +260,7 @@
                                   : item.wordsList[pIndex + 2].chs,
                               )
                             "
-                            >{{
-                              NumberList.indexOf(item.wordsList[pIndex + 2].pinyin) == -1
-                                ? item.wordsList[pIndex + 2].chs
-                                : ''
-                            }}</span
+                            >{{ item.wordsList[pIndex + 2].chs }}</span
                           >
                           <span
                             v-if="curQue.property.pinyin_position == 'bottom' && config.isShowPY && item.dhaspinyin"
@@ -273,7 +277,11 @@
                                   : '22px',
                             }"
                             @click.stop="viewNotes($event, item.wordsList[pIndex + 2].pinyin)"
-                            >{{ item.wordsList[pIndex + 2].pinyin }}</span
+                            >{{
+                              NumberList.indexOf(item.wordsList[pIndex + 2].pinyin) == -1
+                                ? item.wordsList[pIndex + 2].pinyin
+                                : ''
+                            }}</span
                           >
                         </span>
                       </template>
@@ -292,7 +300,7 @@
                               attrib && attrib.pinyin_size ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt' : '22px',
                           }"
                           @click.stop="viewNotes($event, pItem.pinyin)"
-                          >{{ pItem.pinyin }}</span
+                          >{{ NumberList.indexOf(pItem.pinyin) == -1 ? pItem.pinyin : '' }}</span
                         >
                         <span
                           class="NNPE-chs"
@@ -316,7 +324,7 @@
                                 : '',
                           }"
                           @click.stop="viewNotes($event, pItem.words ? pItem.words : pItem.chs)"
-                          >{{ NumberList.indexOf(pItem.pinyin) == -1 ? pItem.chs : '' }}</span
+                          >{{ pItem.chs }}</span
                         >
                         <span
                           v-if="curQue.property.pinyin_position == 'bottom' && config.isShowPY && item.dhaspinyin"
@@ -332,7 +340,7 @@
                               attrib && attrib.pinyin_size ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt' : '22px',
                           }"
                           @click.stop="viewNotes($event, pItem.pinyin)"
-                          >{{ pItem.pinyin }}</span
+                          >{{ NumberList.indexOf(pItem.pinyin) == -1 ? pItem.pinyin : '' }}</span
                         >
                       </template>
                     </template>
@@ -443,7 +451,7 @@
                                 lineHeight:
                                   attrib && attrib.font_size ? attrib.font_size.replace('pt', '') * 1.4 + 'pt' : '28px',
                               }"
-                              @click.stop="viewNotes($event, pItem.words ? pItem.words : pItem.chs)"
+                              @click.stop="viewNotes($event, pItem.words ? pItem.words : pItem.chs[wIndex])"
                               >{{ NumberList.indexOf(pItem.pinyin) == -1 ? pItem.chs[wIndex] : '' }}</span
                             >
                           </template>
@@ -657,7 +665,7 @@
                               lineHeight:
                                 attrib && attrib.font_size ? attrib.font_size.replace('pt', '') * 1.4 + 'pt' : '28px',
                             }"
-                            @click.stop="viewNotes($event, pItem.words ? pItem.words : pItem.chs)"
+                            @click.stop="viewNotes($event, pItem.words ? pItem.words : pItem.chs[wIndex])"
                             >{{ NumberList.indexOf(pItem.pinyin) == -1 ? pItem.chs[wIndex] : '' }}</span
                           >
                         </template>
@@ -1630,7 +1638,8 @@ export default {
     max-width: 100%;
     margin-top: -196px;
     overflow: auto;
-    box-shadow: 0 4px 16px rgba(0, 0, 0, 15%);
+
+    // box-shadow: 0 4px 16px rgba(0, 0, 0, 15%);
 
     //   width: 260px;
     //   height: 200px;

+ 24 - 8
src/views/book/courseware/preview/components/article/Practicechs.vue

@@ -124,7 +124,7 @@
                             height:
                               attrib && attrib.pinyin_size ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt' : '22px',
                           }"
-                          >{{ pItem.pinyin }}</span
+                          >{{ NumberList.indexOf(pItem.pinyin) == -1 ? pItem.pinyin : '' }}</span
                         >
                       </template>
                       <span
@@ -181,7 +181,7 @@
                             height:
                               attrib && attrib.pinyin_size ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt' : '22px',
                           }"
-                          >{{ pItem.pinyin }}</span
+                          >{{ NumberList.indexOf(pItem.pinyin) == -1 ? pItem.pinyin : '' }}</span
                         >
                       </template>
                     </span>
@@ -200,7 +200,11 @@
                             height:
                               attrib && attrib.pinyin_size ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt' : '22px',
                           }"
-                          >{{ item.sentArr[pIndex + 1].pinyin }}</span
+                          >{{
+                            NumberList.indexOf(item.sentArr[pIndex + 1].pinyin) == -1
+                              ? item.sentArr[pIndex + 1].pinyin
+                              : ''
+                          }}</span
                         >
                       </template>
                       <span class="NNPE-chs" style="text-align: left" :class="[sentIndex == index ? 'wordBlank' : '']">
@@ -254,7 +258,11 @@
                             height:
                               attrib && attrib.pinyin_size ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt' : '22px',
                           }"
-                          >{{ item.sentArr[pIndex + 1].pinyin }}</span
+                          >{{
+                            NumberList.indexOf(item.sentArr[pIndex + 1].pinyin) == -1
+                              ? item.sentArr[pIndex + 1].pinyin
+                              : ''
+                          }}</span
                         >
                       </template>
                     </span>
@@ -280,7 +288,11 @@
                             height:
                               attrib && attrib.pinyin_size ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt' : '22px',
                           }"
-                          >{{ item.sentArr[pIndex + 2].pinyin }}</span
+                          >{{
+                            NumberList.indexOf(item.sentArr[pIndex + 2].pinyin) == -1
+                              ? item.sentArr[pIndex + 2].pinyin
+                              : ''
+                          }}</span
                         >
                       </template>
                       <span class="NNPE-chs" style="text-align: left" :class="[sentIndex == index ? 'wordBlank' : '']">
@@ -334,7 +346,11 @@
                             height:
                               attrib && attrib.pinyin_size ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt' : '22px',
                           }"
-                          >{{ item.sentArr[pIndex + 2].pinyin }}</span
+                          >{{
+                            NumberList.indexOf(item.sentArr[pIndex + 2].pinyin) == -1
+                              ? item.sentArr[pIndex + 2].pinyin
+                              : ''
+                          }}</span
                         >
                       </template>
                     </span>
@@ -355,7 +371,7 @@
                           height:
                             attrib && attrib.pinyin_size ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt' : '22px',
                         }"
-                        >{{ pItem.pinyin }}</span
+                        >{{ NumberList.indexOf(pItem.pinyin) == -1 ? pItem.pinyin : '' }}</span
                       >
                     </template>
                     <span
@@ -417,7 +433,7 @@
                           height:
                             attrib && attrib.pinyin_size ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt' : '22px',
                         }"
-                        >{{ pItem.pinyin }}</span
+                        >{{ NumberList.indexOf(pItem.pinyin) == -1 ? pItem.pinyin : '' }}</span
                       >
                     </template>
                   </template>

+ 2 - 1
src/views/book/courseware/preview/components/article/Voicefullscreen.vue

@@ -1274,7 +1274,8 @@ export default {
     top: 50%;
     z-index: 9999;
     margin-top: -196px;
-    box-shadow: 0 4px 16px rgba(0, 0, 0, 15%);
+
+    // box-shadow: 0 4px 16px rgba(0, 0, 0, 15%);
   }
 
   &.bg1 {

+ 26 - 9
src/views/book/courseware/preview/components/article/WordModelChs.vue

@@ -96,7 +96,7 @@
                                   ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt'
                                   : '22px',
                             }"
-                            >{{ pItem.pinyin }}</span
+                            >{{ NumberList.indexOf(pItem.pinyin) == -1 ? pItem.pinyin : '' }}</span
                           >
                           <span
                             class="NNPE-chs"
@@ -144,7 +144,7 @@
                                   ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt'
                                   : '22px',
                             }"
-                            >{{ pItem.pinyin }}</span
+                            >{{ NumberList.indexOf(pItem.pinyin) == -1 ? pItem.pinyin : '' }}</span
                           >
                         </span>
                         <span class="NNPE-words-box" @click="showWordDetail($event, item.wordsList[pIndex + 1])">
@@ -159,7 +159,11 @@
                                   ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt'
                                   : '22px',
                             }"
-                            >{{ item.wordsList[pIndex + 1].pinyin }}</span
+                            >{{
+                              NumberList.indexOf(item.wordsList[pIndex + 1].pinyin) == -1
+                                ? item.wordsList[pIndex + 1].pinyin
+                                : ''
+                            }}</span
                           >
                           <span
                             class="NNPE-chs"
@@ -207,7 +211,11 @@
                                   ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt'
                                   : '22px',
                             }"
-                            >{{ item.wordsList[pIndex + 1].pinyin }}</span
+                            >{{
+                              NumberList.indexOf(item.wordsList[pIndex + 1].pinyin) == -1
+                                ? item.wordsList[pIndex + 1].pinyin
+                                : ''
+                            }}</span
                           >
                         </span>
                         <span
@@ -233,7 +241,11 @@
                                   ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt'
                                   : '22px',
                             }"
-                            >{{ item.wordsList[pIndex + 2].pinyin }}</span
+                            >{{
+                              NumberList.indexOf(item.wordsList[pIndex + 2].pinyin) == -1
+                                ? item.wordsList[pIndex + 2].pinyin
+                                : ''
+                            }}</span
                           >
                           <span
                             class="NNPE-chs"
@@ -292,7 +304,11 @@
                                   ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt'
                                   : '22px',
                             }"
-                            >{{ item.wordsList[pIndex + 2].pinyin }}</span
+                            >{{
+                              NumberList.indexOf(item.wordsList[pIndex + 2].pinyin) == -1
+                                ? item.wordsList[pIndex + 2].pinyin
+                                : ''
+                            }}</span
                           >
                         </span>
                       </template>
@@ -309,7 +325,7 @@
                             height:
                               attrib && attrib.pinyin_size ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt' : '22px',
                           }"
-                          >{{ pItem.pinyin }}</span
+                          >{{ NumberList.indexOf(pItem.pinyin) == -1 ? pItem.pinyin : '' }}</span
                         >
                         <span
                           class="NNPE-chs"
@@ -355,7 +371,7 @@
                             height:
                               attrib && attrib.pinyin_size ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt' : '22px',
                           }"
-                          >{{ pItem.pinyin }}</span
+                          >{{ NumberList.indexOf(pItem.pinyin) == -1 ? pItem.pinyin : '' }}</span
                         >
                       </template>
                     </template>
@@ -1431,7 +1447,8 @@ export default {
   max-width: 100%;
   margin-top: -196px;
   overflow: auto;
-  box-shadow: 0 4px 16px rgba(0, 0, 0, 15%);
+
+  // box-shadow: 0 4px 16px rgba(0, 0, 0, 15%);
 
   //   width: 260px;
   //   height: 200px;

+ 4 - 3
src/views/book/courseware/preview/components/article/components/Notecard.vue

@@ -64,8 +64,9 @@ export default {
   width: 642px;
   max-height: 261px;
   padding: 16px;
+  margin: 16px;
   overflow-y: auto;
-  background: rgb(236, 238, 243);
+  background: #ececec;
   border-radius: 8px;
   box-shadow: 0 2px 8px rgba(0, 0, 0, 15%);
 
@@ -123,8 +124,8 @@ export default {
 
   .closeBox {
     position: absolute;
-    top: 16px;
-    right: 24px;
+    top: 32px;
+    right: 32px;
     display: flex;
     justify-content: flex-end;
     width: 100%;

+ 36 - 16
src/views/book/courseware/preview/components/dialogue_article/NormalModelChs.vue

@@ -148,7 +148,7 @@
                                 item.timeList && item.timeList.length > 0 && item.timeList[pItem.sentIndex].ed,
                               )
                             "
-                            >{{ pItem.pinyin }}</span
+                            >{{ NumberList.indexOf(pItem.pinyin) === -1 ? pItem.pinyin : '' }}</span
                           >
                           <span
                             class="NNPE-chs"
@@ -228,7 +228,7 @@
                                 item.timeList && item.timeList.length > 0 && item.timeList[pItem.sentIndex].ed,
                               )
                             "
-                            >{{ pItem.pinyin }}</span
+                            >{{ NumberList.indexOf(pItem.pinyin) === -1 ? pItem.pinyin : '' }}</span
                           >
                         </span>
                         <span class="NNPE-words-box">
@@ -253,7 +253,11 @@
                                 item.timeList && item.timeList.length > 0 && item.timeList[pItem.sentIndex].ed,
                               )
                             "
-                            >{{ item.wordsList[pIndex + 1].pinyin }}</span
+                            >{{
+                              NumberList.indexOf(item.wordsList[pIndex + 1].pinyin) === -1
+                                ? item.wordsList[pIndex + 1].pinyin
+                                : ''
+                            }}</span
                           >
                           <span
                             class="NNPE-chs"
@@ -293,12 +297,14 @@
                                 item.timeList && item.timeList.length > 0 && item.timeList[pItem.sentIndex].ed,
                               )
                             "
-                            >{{
+                          >
+                            <!-- {{
                               NumberList.indexOf(item.wordsList[pIndex + 1].pinyin) == -1
                                 ? item.wordsList[pIndex + 1].chs
                                 : ''
-                            }}</span
-                          >
+                            }} -->
+                            {{ item.wordsList[pIndex + 1].chs }}
+                          </span>
                           <span
                             v-if="curQue.property.pinyin_position == 'bottom' && config.isShowPY && item.dhaspinyin"
                             class="NNPE-pinyin"
@@ -320,7 +326,11 @@
                                 item.timeList && item.timeList.length > 0 && item.timeList[pItem.sentIndex].ed,
                               )
                             "
-                            >{{ item.wordsList[pIndex + 1].pinyin }}</span
+                            >{{
+                              NumberList.indexOf(item.wordsList[pIndex + 1].pinyin) === -1
+                                ? item.wordsList[pIndex + 1].pinyin
+                                : ''
+                            }}</span
                           >
                         </span>
                         <span
@@ -355,7 +365,11 @@
                                 item.timeList && item.timeList.length > 0 && item.timeList[pItem.sentIndex].ed,
                               )
                             "
-                            >{{ item.wordsList[pIndex + 2].pinyin }}</span
+                            >{{
+                              NumberList.indexOf(item.wordsList[pIndex + 2].pinyin) === -1
+                                ? item.wordsList[pIndex + 2].pinyin
+                                : ''
+                            }}</span
                           >
                           <span
                             class="NNPE-chs"
@@ -395,12 +409,14 @@
                                 item.timeList && item.timeList.length > 0 && item.timeList[pItem.sentIndex].ed,
                               )
                             "
-                            >{{
+                          >
+                            <!-- {{
                               NumberList.indexOf(item.wordsList[pIndex + 2].pinyin) == -1
                                 ? item.wordsList[pIndex + 2].chs
                                 : ''
-                            }}</span
-                          >
+                            }} -->
+                            {{ item.wordsList[pIndex + 2].chs }}
+                          </span>
                           <span
                             v-if="curQue.property.pinyin_position == 'bottom' && config.isShowPY && item.dhaspinyin"
                             :class="[
@@ -424,7 +440,11 @@
                                 item.timeList && item.timeList.length > 0 && item.timeList[pItem.sentIndex].ed,
                               )
                             "
-                            >{{ item.wordsList[pIndex + 2].pinyin }}</span
+                            >{{
+                              NumberList.indexOf(item.wordsList[pIndex + 2].pinyin) === -1
+                                ? item.wordsList[pIndex + 2].pinyin
+                                : ''
+                            }}</span
                           >
                         </span>
                       </template>
@@ -451,7 +471,7 @@
                               item.timeList && item.timeList.length > 0 && item.timeList[pItem.sentIndex].ed,
                             )
                           "
-                          >{{ pItem.pinyin }}</span
+                          >{{ NumberList.indexOf(pItem.pinyin) === -1 ? pItem.pinyin : '' }}</span
                         >
 
                         <span
@@ -529,7 +549,7 @@
                               item.timeList && item.timeList.length > 0 && item.timeList[pItem.sentIndex].ed,
                             )
                           "
-                          >{{ pItem.pinyin }}</span
+                          >{{ NumberList.indexOf(pItem.pinyin) === -1 ? pItem.pinyin : '' }}</span
                         >
                       </template>
                     </template>
@@ -845,7 +865,6 @@ export default {
     handleData() {
       let resArr = [];
       let curQue = JSON.parse(JSON.stringify(this.curQue));
-
       let wordTimeList = curQue.wordTime;
       let asIndex = 0;
       let dhaspinyin = false; // 每段是否有拼音
@@ -1397,7 +1416,8 @@ export default {
     padding: 8px;
     margin-top: -130px;
     overflow: auto;
-    box-shadow: 0 4px 16px rgba(0, 0, 0, 15%);
+
+    // box-shadow: 0 4px 16px rgba(0, 0, 0, 15%);
   }
 
   .multilingual {

+ 30 - 21
src/views/book/courseware/preview/components/dialogue_article/PhraseModelChs.vue

@@ -119,7 +119,7 @@
                                   ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt'
                                   : '22px',
                             }"
-                            >{{ pItem.pinyin }}</span
+                            >{{ NumberList.indexOf(pItem.pinyin) === -1 ? pItem.pinyin : '' }}</span
                           >
                           <span
                             class="NNPE-chs"
@@ -142,7 +142,7 @@
                                   : '',
                             }"
                             @click.stop="viewNotes($event, pItem.words ? pItem.words : pItem.chs)"
-                            >{{ NumberList.indexOf(pItem.pinyin) == -1 ? pItem.chs : '' }}</span
+                            >{{ pItem.chs }}</span
                           >
                           <span
                             v-if="curQue.property.pinyin_position == 'bottom' && config.isShowPY && item.dhaspinyin"
@@ -159,7 +159,7 @@
                                   ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt'
                                   : '22px',
                             }"
-                            >{{ pItem.pinyin }}</span
+                            >{{ NumberList.indexOf(pItem.pinyin) === -1 ? pItem.pinyin : '' }}</span
                           >
                         </span>
                         <span class="NNPE-words-box">
@@ -176,7 +176,11 @@
                                   ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt'
                                   : '22px',
                             }"
-                            >{{ item.wordsList[pIndex + 1].pinyin }}</span
+                            >{{
+                              NumberList.indexOf(item.wordsList[pIndex + 1].pinyin) === -1
+                                ? item.wordsList[pIndex + 1].pinyin
+                                : ''
+                            }}</span
                           >
                           <span
                             class="NNPE-chs"
@@ -197,11 +201,7 @@
                                   : item.wordsList[pIndex + 1].chs,
                               )
                             "
-                            >{{
-                              NumberList.indexOf(item.wordsList[pIndex + 1].pinyin) == -1
-                                ? item.wordsList[pIndex + 1].chs
-                                : ''
-                            }}</span
+                            >{{ item.wordsList[pIndex + 1].chs }}</span
                           >
                           <span
                             v-if="curQue.property.pinyin_position == 'bottom' && config.isShowPY && item.dhaspinyin"
@@ -216,7 +216,11 @@
                                   ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt'
                                   : '22px',
                             }"
-                            >{{ item.wordsList[pIndex + 1].pinyin }}</span
+                            >{{
+                              NumberList.indexOf(item.wordsList[pIndex + 1].pinyin) === -1
+                                ? item.wordsList[pIndex + 1].pinyin
+                                : ''
+                            }}</span
                           >
                         </span>
                         <span
@@ -243,7 +247,11 @@
                                   : '22px',
                             }"
                             @click.stop="viewNotes($event, item.wordsList[pIndex + 2].pinyin)"
-                            >{{ item.wordsList[pIndex + 2].pinyin }}</span
+                            >{{
+                              NumberList.indexOf(item.wordsList[pIndex + 2].pinyin) === -1
+                                ? item.wordsList[pIndex + 2].pinyin
+                                : ''
+                            }}</span
                           >
                           <span
                             class="NNPE-chs"
@@ -273,11 +281,7 @@
                                   : item.wordsList[pIndex + 2].chs,
                               )
                             "
-                            >{{
-                              NumberList.indexOf(item.wordsList[pIndex + 2].pinyin) == -1
-                                ? item.wordsList[pIndex + 2].chs
-                                : ''
-                            }}</span
+                            >{{ item.wordsList[pIndex + 2].chs }}</span
                           >
                           <span
                             v-if="curQue.property.pinyin_position == 'bottom' && config.isShowPY && item.dhaspinyin"
@@ -294,7 +298,11 @@
                                   : '22px',
                             }"
                             @click.stop="viewNotes($event, item.wordsList[pIndex + 2].pinyin)"
-                            >{{ item.wordsList[pIndex + 2].pinyin }}</span
+                            >{{
+                              NumberList.indexOf(item.wordsList[pIndex + 2].pinyin) === -1
+                                ? item.wordsList[pIndex + 2].pinyin
+                                : ''
+                            }}</span
                           >
                         </span>
                       </template>
@@ -313,7 +321,7 @@
                               attrib && attrib.pinyin_size ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt' : '22px',
                           }"
                           @click.stop="viewNotes($event, pItem.pinyin)"
-                          >{{ pItem.pinyin }}</span
+                          >{{ NumberList.indexOf(pItem.pinyin) === -1 ? pItem.pinyin : '' }}</span
                         >
                         <span
                           v-if="pItem.chs != '#'"
@@ -338,7 +346,7 @@
                                 : '',
                           }"
                           @click.stop="viewNotes($event, pItem.words ? pItem.words : pItem.chs)"
-                          >{{ NumberList.indexOf(pItem.pinyin) == -1 ? pItem.chs : '' }}</span
+                          >{{ pItem.chs }}</span
                         >
                         <span
                           v-if="curQue.property.pinyin_position == 'bottom' && config.isShowPY && item.dhaspinyin"
@@ -354,7 +362,7 @@
                               attrib && attrib.pinyin_size ? attrib.pinyin_size.replace('pt', '') * 1.5 + 'pt' : '22px',
                           }"
                           @click.stop="viewNotes($event, pItem.pinyin)"
-                          >{{ pItem.pinyin }}</span
+                          >{{ NumberList.indexOf(pItem.pinyin) === -1 ? pItem.pinyin : '' }}</span
                         >
                       </template>
                     </template>
@@ -1385,7 +1393,8 @@ export default {
     max-width: 100%;
     margin-top: -196px;
     overflow: auto;
-    box-shadow: 0 4px 16px rgba(0, 0, 0, 15%);
+
+    // box-shadow: 0 4px 16px rgba(0, 0, 0, 15%);
   }
 
   .NNPE-noteDetail {

+ 2 - 1
src/views/book/courseware/preview/components/dialogue_article/WordModelChs.vue

@@ -1268,7 +1268,8 @@ export default {
   max-width: 100%;
   margin-top: -196px;
   overflow: auto;
-  box-shadow: 0 4px 16px rgba(0, 0, 0, 15%);
+
+  // box-shadow: 0 4px 16px rgba(0, 0, 0, 15%);
 
   //   width: 260px;
   //   height: 200px;