Merge branch 'master' of http://60.205.254.193:3000/GCLS/eep_page

src/views/book/courseware/preview/components/dialogue_article/NormalModelChs.vue

@@ -700,7 +700,12 @@ export default {
               sentIndex: sIndex, //在段落中句子索引
               articleSentIndex: asIndex, //在文章中句子索引
               wordIndex: wIndex, //单词的索引
-              pinyin: wItem.pinyin,
+              pinyin:
+                curQue.pinyin_type === 'pinyin'
+                  ? curQue.property.is_enable_sentence_case && wIndex === 0
+                    ? wItem.pinyin_up
+                    : wItem.pinyin
+                  : wItem.pinyin_tone,
               chs: wItem.chs,
               padding: true, //wItem.padding,
               className: wItem.className,

src/views/book/courseware/preview/components/dialogue_article/PhraseModelChs.vue

@@ -610,7 +610,12 @@ export default {
               paraIndex: dIndex, //段落索引
               sentIndex: sIndex, //在段落中句子索引
               wordIndex: wIndex, //单词的索引
-              pinyin: wItem.pinyin,
+              pinyin:
+                curQue.pinyin_type === 'pinyin'
+                  ? curQue.property.is_enable_sentence_case && wIndex === 0
+                    ? wItem.pinyin_up
+                    : wItem.pinyin
+                  : wItem.pinyin_tone,
               chs: wItem.chs,
               padding: true, //wItem.padding,
               className: wItem.className,

src/views/book/courseware/preview/components/dialogue_article/Practicechs.vue

@@ -776,7 +776,12 @@ export default {
               paraIndex: dIndex, //段落索引
               sentIndex: sIndex, //在段落中句子索引
               wordIndex: wIndex, //单词的索引
-              pinyin: wItem.pinyin,
+              pinyin:
+                curQue.pinyin_type === 'pinyin'
+                  ? curQue.property.is_enable_sentence_case && wIndex === 0
+                    ? wItem.pinyin_up
+                    : wItem.pinyin
+                  : wItem.pinyin_tone,
               chs: wItem.chs,
               padding: true,
               className: wItem.className,

src/views/book/courseware/preview/components/dialogue_article/WordModelChs.vue

@@ -570,7 +570,12 @@ export default {
               paraIndex: dIndex, //段落索引
               sentIndex: sIndex, //在段落中句子索引
               wordIndex: wIndex, //单词的索引
-              pinyin: wItem.pinyin,
+              pinyin:
+                curQue.pinyin_type === 'pinyin'
+                  ? curQue.property.is_enable_sentence_case && wIndex === 0
+                    ? wItem.pinyin_up
+                    : wItem.pinyin
+                  : wItem.pinyin_tone,
               chs: wItem.chs,
               padding: true,
               className: wItem.className,

src/views/book/courseware/preview/components/new_word/NewWordPreview.vue

@@ -815,7 +815,8 @@ export default {
 
         .NPC-word-tab-common {
           box-sizing: border-box;
-          width: 125px;
+
+          // width: 125px;
           padding-left: 8px;
         }
       }
@@ -912,7 +913,8 @@ export default {
   .NPC-word-tab-word {
     font-family: '楷体';
     font-size: 16px;
-    white-space: nowrap;
+
+    // white-space: nowrap;
 
     &.NPC-word-tab-word-red {
       color: #e35454;