Pārlūkot izejas kodu

1.课文和对话课文释义符号显示在汉字旁,去掉拼音里的释义角标。
2.写一写卡片居中且加阴影。
3.字词卡片拼音对齐问题(拼音有空格时居中显示)

dsy 1 mēnesi atpakaļ
vecāks
revīzija
95337dc1ef

+ 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 {

+ 34 - 25
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,8 +451,8 @@
                                 lineHeight:
                                   attrib && attrib.font_size ? attrib.font_size.replace('pt', '') * 1.4 + 'pt' : '28px',
                               }"
-                              @click.stop="viewNotes($event, pItem.words ? pItem.words : pItem.chs)"
-                              >{{ NumberList.indexOf(pItem.pinyin) == -1 ? pItem.chs[wIndex] : '' }}</span
+                              @click.stop="viewNotes($event, pItem.words ? pItem.words : pItem.chs[wIndex])"
+                              >{{ pItem.chs[wIndex] }}</span
                             >
                           </template>
                         </span>
@@ -657,8 +665,8 @@
                               lineHeight:
                                 attrib && attrib.font_size ? attrib.font_size.replace('pt', '') * 1.4 + 'pt' : '28px',
                             }"
-                            @click.stop="viewNotes($event, pItem.words ? pItem.words : pItem.chs)"
-                            >{{ NumberList.indexOf(pItem.pinyin) == -1 ? pItem.chs[wIndex] : '' }}</span
+                            @click.stop="viewNotes($event, pItem.words ? pItem.words : pItem.chs[wIndex])"
+                            >{{ pItem.chs[wIndex] }}</span
                           >
                         </template>
                       </span>
@@ -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;

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

@@ -667,7 +667,7 @@ export default {
     border: none;
   }
 
-  .el-tabs--border-card > .el-tabs__header {
+  .el-tabs--border-card {
     background: #f3f3f3;
     border: none;
   }

+ 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%;

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

@@ -453,13 +453,13 @@ export default {
 <style lang="scss" scoped>
 .practice {
   width: 100%;
-  margin: 0 auto;
+  margin: 8px;
 
   //   max-height: 434px;
   overflow: hidden;
   background: #f3f3f3;
   border-radius: 8px;
-  box-shadow: 0 4px 16px rgba(0, 0, 0, 15%);
+  box-shadow: 0 4px 8px rgba(0, 0, 0, 15%);
 
   .clean-btn {
     position: absolute;

+ 5 - 4
src/views/book/courseware/preview/components/article/components/Wordcard.vue

@@ -181,7 +181,7 @@
         class="practiceBox practiceBoxStrock"
         v-if="isPraShow"
       > -->
-      <div v-if="isPraShow" class="practiceBox practiceBoxStrock" :style="{ width: isPhone ? '100%' : '504px' }">
+      <div v-if="isPraShow" class="practiceBox practiceBoxStrock" :style="{ width: isPhone ? '100%' : '520px' }">
         <Practice
           :change-pra-show="changePraShow"
           :cur="curData"
@@ -497,20 +497,20 @@ export default {
     background: rgba(0, 0, 0, 19%);
 
     &.practiceBoxStrock {
-      left: -252px;
       left: 50%;
       display: flex;
       align-items: center;
       justify-content: center;
       padding-top: 0;
+      margin-left: -260px;
       background: none;
     }
   }
 
   .closeBox {
     position: absolute;
-    top: 16px;
-    right: 24px;
+    top: 32px;
+    right: 32px;
     display: flex;
     justify-content: flex-end;
     width: 100%;
@@ -524,6 +524,7 @@ export default {
   min-width: 304px;
   max-width: 560px;
   padding: 30px 24px 24px;
+  margin: 16px;
 
   //   min-height: 360px;
   background: #fff;

+ 1 - 0
src/views/book/courseware/preview/components/article/index.vue

@@ -252,6 +252,7 @@ export default {
   },
   mixins: [PreviewMixin],
   inject: ['bookInfo'],
+  props: ['isMobile'],
   data() {
     return {
       data: getArticleData(),

+ 1 - 1
src/views/book/courseware/preview/components/character_base/components/FreewriteLettle.vue

@@ -502,7 +502,7 @@ export default {
     border: none;
   }
 
-  .el-tabs--border-card > .el-tabs__header {
+  .el-tabs--border-card {
     background: #f3f3f3;
     border: none;
   }

+ 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;

+ 14 - 5
src/views/book/courseware/preview/components/new_word/NewWordPreview.vue

@@ -571,7 +571,7 @@
                         </template>
 
                         <p
-                          v-if="item.pinyin && item.pinyin.split(' ').length === 1"
+                          v-if="item.pinyin && !item.pyhz"
                           :style="{
                             color:
                               data.unified_attrib && data.unified_attrib.topic_color
@@ -585,7 +585,7 @@
                         <div class="hz-box">
                           <div v-for="(itemh, indexh) in item.hz_info" :key="indexh" class="hz-item">
                             <p
-                              v-if="item.pinyin && item.pinyin.split(' ').length > 1"
+                              v-if="item.pinyin && item.pyhz"
                               :style="{
                                 color:
                                   data.unified_attrib && data.unified_attrib.topic_color
@@ -593,7 +593,7 @@
                                     : '',
                               }"
                             >
-                              {{ item.pinyin.split(' ')[indexh] ? item.pinyin.split(' ')[indexh] : '' }}
+                              {{ item.pinyin.split(' ')[indexh] ? item.pinyin.split(' ')[indexh] : '&nbsp;' }}
                             </p>
                             <Strockplay
                               class-name="adult-strockplay"
@@ -739,7 +739,6 @@ import writeTableZoom from './components/writeTableZoom.vue';
 
 export default {
   name: 'NewWordPreview',
-
   components: {
     SoundRecord,
     AudioLine,
@@ -754,6 +753,10 @@ export default {
       type: Object,
       default: null,
     },
+    isMobile: {
+      type: Boolean,
+      default: false,
+    },
   },
   data() {
     return {
@@ -960,9 +963,15 @@ export default {
         //     this.$set(item, 'pic_url', url_map[item.file_list[0]]);
         //   });
         // }
+        let flag = false;
+        if (item.pinyin) {
+          flag = item.pinyin.split(' ').length === item.new_word.length;
+        }
         this.$set(item, 'show_left', true);
         this.$set(item, 'isFlipped', false);
+        this.$set(item, 'pyhz', flag);
       });
+      console.log(this.data.new_word_list);
       option_list.forEach((item, index) => {
         optionRes = optionRes.concat(item);
         Bookanswer.push([]);
@@ -1568,7 +1577,7 @@ export default {
           }
 
           p {
-            margin: 0;
+            margin: 0 0 8px;
             font-family: 'League';
             font-size: 14px;
             font-feature-settings: 'cv01' on;

+ 4 - 4
src/views/book/courseware/preview/components/new_word/components/writeTableZoom.vue

@@ -105,7 +105,7 @@
               </div>
             </template>
             <p
-              v-if="data.pinyin && data.pinyin.split(' ').length === 1"
+              v-if="data.pinyin && !data.pyhz"
               :style="{ color: attrib && attrib.topic_color ? attrib.topic_color : '' }"
               class="pinyin-box"
             >
@@ -114,10 +114,10 @@
             <div class="hz-box">
               <div v-for="(itemh, indexh) in data.hz_info" :key="indexh" class="hz-item">
                 <p
-                  v-if="data.pinyin && data.pinyin.split(' ').length > 1"
+                  v-if="data.pinyin && data.pyhz"
                   :style="{ color: attrib && attrib.topic_color ? attrib.topic_color : '' }"
                 >
-                  {{ data.pinyin.split(' ')[indexh] ? data.pinyin.split(' ')[indexh] : '' }}
+                  {{ data.pinyin.split(' ')[indexh] ? data.pinyin.split(' ')[indexh] : '&nbsp;' }}
                 </p>
                 <Strockplay
                   class-name="adult-strockplay"
@@ -515,7 +515,7 @@ export default {
       padding: 36px;
 
       .pinyin-box {
-        margin-bottom: 8px;
+        margin-bottom: 12px;
         font-family: 'League';
         font-size: 22px;
         font-feature-settings: 'cv01' on;

+ 21 - 0
src/web_preview/index.vue

@@ -1,7 +1,11 @@
 <template>
   <div class="common-preview">
     <div class="common-preview__header">
+      <div class="menu-container">
+        {{ courseware_info.book_name }}
+      </div>
       <div class="courseware">
+        <span class="name-path">{{ courseware_info.name_path }}</span>
         <span class="flow-nodename">{{ courseware_info.cur_audit_flow_node_name }}</span>
         <slot name="middle" :courseware="courseware_info"></slot>
         <div class="group">
@@ -711,6 +715,14 @@ $total-width: $courseware-width + $courseware-left-margin + $courseware-right-ma
     border-top: $border;
     border-bottom: $border;
 
+    > .menu-container {
+      display: flex;
+      justify-content: space-between;
+      width: 360px;
+      padding: 4px 8px;
+      border-right: $border;
+    }
+
     > .courseware {
       display: flex;
       flex-grow: 1;
@@ -719,6 +731,15 @@ $total-width: $courseware-width + $courseware-left-margin + $courseware-right-ma
       justify-content: space-between;
       height: 40px;
 
+      .name-path {
+        min-width: 200px;
+        height: 40px;
+        padding: 4px 8px;
+        font-size: 14px;
+        line-height: 32px;
+        border-right: $border;
+      }
+
       .lang-select {
         :deep .el-input {
           width: 100px;