全文设置

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

@@ -29,7 +29,7 @@
       <div class="aduioLine-right">
         <SvgIcon
           v-if="config.isHasPY"
-          icon-class="PinYin"
+          icon-class="pin-btn"
           size="16"
           :class="['pinyin-16', config.isShowPY ? '' : 'disabled']"
           :style="{ color: themeColor }"
@@ -43,7 +43,7 @@
         <!-- <span :class="['EN-16', config.isShowEN ? '' : 'disabled']" @click="changeEN" v-if="config.isHasEN"></span> -->
         <SvgIcon
           v-if="config.isHasEN"
-          icon-class="PinYin"
+          icon-class="en-btn"
           size="16"
           :class="['EN-16', config.isShowEN ? '' : 'disabled']"
           :style="{ color: themeColor }"

src/views/book/courseware/preview/components/article/index.vue

@@ -718,23 +718,23 @@ export default {
   }
 
   .pinyin-16 {
-    background: url('@/assets/icon/pinyin-16-normal-red.png') no-repeat left top;
-    background-size: 100% 100%;
+    // background: url('@/assets/icon/pinyin-16-normal-red.png') no-repeat left top;
+    // background-size: 100% 100%;
 
-    &.disabled {
-      background: url('@/assets/icon/pinyin-16-disable-Black.png') no-repeat left top;
-      background-size: 100% 100%;
-    }
+    // &.disabled {
+    //   background: url('@/assets/icon/pinyin-16-disable-Black.png') no-repeat left top;
+    //   background-size: 100% 100%;
+    // }
   }
 
   .EN-16 {
-    background: url('@/assets/icon/EN-16-normal-red.png') no-repeat left top;
-    background-size: 100% 100%;
+    // background: url('@/assets/icon/EN-16-normal-red.png') no-repeat left top;
+    // background-size: 100% 100%;
 
-    &.disabled {
-      background: url('@/assets/icon/EN-16-disable-Black.png') no-repeat left top;
-      background-size: 100% 100%;
-    }
+    // &.disabled {
+    //   background: url('@/assets/icon/EN-16-disable-Black.png') no-repeat left top;
+    //   background-size: 100% 100%;
+    // }
   }
 }
 

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

@@ -26,12 +26,28 @@
         </template>
       </div>
       <div class="aduioLine-right">
-        <span
+        <!-- <span
           :class="['pinyin-16', config.isShowPY ? '' : 'disabled']"
           @click="changePinyin"
           v-if="config.isHasPY"
-        ></span>
-        <span :class="['EN-16', config.isShowEN ? '' : 'disabled']" @click="changeEN" v-if="config.isHasEN"></span>
+        ></span> -->
+        <SvgIcon
+          v-if="config.isHasPY"
+          icon-class="pin-btn"
+          size="16"
+          :class="['pinyin-16', config.isShowPY ? '' : 'disabled']"
+          :style="{ color: config.isShowPY ? (attrib ? attrib.topic_color : '') : '#DCDFE6' }"
+          @click="changePinyin"
+        />
+        <!-- <span :class="['EN-16', config.isShowEN ? '' : 'disabled']" @click="changeEN" v-if="config.isHasEN"></span> -->
+        <SvgIcon
+          v-if="config.isHasEN"
+          icon-class="en-btn"
+          size="16"
+          :class="['EN-16', config.isShowEN ? '' : 'disabled']"
+          :style="{ color: config.isShowEN ? (attrib ? attrib.topic_color : '') : '#DCDFE6' }"
+          @click="changeEN"
+        />
       </div>
     </div>
     <template v-if="resArr.length > 0">
@@ -548,6 +564,7 @@ export default {
     'colLength',
     'isPhone',
     'multilingual',
+    'attrib',
   ],
   components: {
     AudioLine,

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

@@ -23,12 +23,29 @@
         </template>
       </div>
       <div class="aduioLine-right">
-        <span
+        <!-- <span
           :class="['pinyin-16', config.isShowPY ? '' : 'disabled']"
           @click="changePinyin"
           v-if="config.isHasPY"
         ></span>
-        <span :class="['EN-16', config.isShowEN ? '' : 'disabled']" @click="changeEN" v-if="config.isHasEN"></span>
+        <span :class="['EN-16', config.isShowEN ? '' : 'disabled']" @click="changeEN" v-if="config.isHasEN"></span> -->
+        <SvgIcon
+          v-if="config.isHasPY"
+          icon-class="pin-btn"
+          size="16"
+          :class="['pinyin-16', config.isShowPY ? '' : 'disabled']"
+          :style="{ color: config.isShowPY ? (attrib ? attrib.topic_color : '') : '#DCDFE6' }"
+          @click="changePinyin"
+        />
+        <!-- <span :class="['EN-16', config.isShowEN ? '' : 'disabled']" @click="changeEN" v-if="config.isHasEN"></span> -->
+        <SvgIcon
+          v-if="config.isHasEN"
+          icon-class="en-btn"
+          size="16"
+          :class="['EN-16', config.isShowEN ? '' : 'disabled']"
+          :style="{ color: config.isShowEN ? (attrib ? attrib.topic_color : '') : '#DCDFE6' }"
+          @click="changeEN"
+        />
       </div>
     </div>
     <template v-if="resArr.length > 0">
@@ -378,7 +395,7 @@
         <Wordcard
           :word="word"
           :changeWordCard="changeWordCard"
-          :themeColor="themeColor"
+          :themeColor="attrib ? attrib.topic_color : '#e35454'"
           :currentTreeID="currentTreeID"
           :TaskModel="TaskModel"
           :writeList="curQue.Bookanswer.writeModel"
@@ -420,7 +437,7 @@ export default {
     'NNPENewWordList',
     'NNPEAnnotationList',
     'colorBox',
-    'themeColor',
+    'attrib',
     'noFont',
     'currentTreeID',
     'config',

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

@@ -31,12 +31,29 @@
       </div>
       <div class="aduioLine-right">
         <span :class="['Repeat-16', isRepeat ? '' : 'disabled']" @click="changeRepeat"></span>
-        <span
+        <!-- <span
           :class="['pinyin-16', config.isShowPY ? '' : 'disabled']"
           @click="changePinyin"
           v-if="config.isHasPY"
         ></span>
-        <span :class="['EN-16', config.isShowEN ? '' : 'disabled']" @click="changeEN" v-if="config.isHasEN"></span>
+        <span :class="['EN-16', config.isShowEN ? '' : 'disabled']" @click="changeEN" v-if="config.isHasEN"></span> -->
+        <SvgIcon
+          v-if="config.isHasPY"
+          icon-class="pin-btn"
+          size="16"
+          :class="['pinyin-16', config.isShowPY ? '' : 'disabled']"
+          :style="{ color: config.isShowPY ? (attrib ? attrib.topic_color : '') : '#DCDFE6' }"
+          @click="changePinyin"
+        />
+        <!-- <span :class="['EN-16', config.isShowEN ? '' : 'disabled']" @click="changeEN" v-if="config.isHasEN"></span> -->
+        <SvgIcon
+          v-if="config.isHasEN"
+          icon-class="en-btn"
+          size="16"
+          :class="['EN-16', config.isShowEN ? '' : 'disabled']"
+          :style="{ color: config.isShowEN ? (attrib ? attrib.topic_color : '') : '#DCDFE6' }"
+          @click="changeEN"
+        />
       </div>
     </div>
 
@@ -454,7 +471,7 @@
               />
               <div class="compare-box" v-if="curQue.mp3_list && curQue.mp3_list.length > 0">
                 <Audio-compare
-                  :themeColor="themeColor"
+                  :themeColor="attrib ? attrib.topic_color : '#e35454'"
                   :index="index"
                   :sentIndex="sentIndex"
                   :url="curQue.mp3_list[0].id"
@@ -532,7 +549,7 @@
     <div class="voice-full-screen" :id="'screen-' + mathNum">
       <Voicefullscreen
         v-if="isFull && resObj"
-        :themeColor="themeColor"
+        :themeColor="attrib ? attrib.topic_color : '#e35454'"
         :curQue="curQue"
         :sentList="resObj.sentList"
         :sentIndex="sentIndex"
@@ -567,7 +584,7 @@ export default {
     'curQue',
     'colorBox',
     'noFont',
-    'themeColor',
+    'attrib',
     'config',
     'NNPENewWordList',
     'currentTreeID',

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

@@ -23,12 +23,29 @@
         </template>
       </div>
       <div class="aduioLine-right">
-        <span
+        <!-- <span
           :class="['pinyin-16', config.isShowPY ? '' : 'disabled']"
           @click="changePinyin"
           v-if="config.isHasPY"
         ></span>
-        <span :class="['EN-16', config.isShowEN ? '' : 'disabled']" @click="changeEN" v-if="config.isHasEN"></span>
+        <span :class="['EN-16', config.isShowEN ? '' : 'disabled']" @click="changeEN" v-if="config.isHasEN"></span> -->
+        <SvgIcon
+          v-if="config.isHasPY"
+          icon-class="pin-btn"
+          size="16"
+          :class="['pinyin-16', config.isShowPY ? '' : 'disabled']"
+          :style="{ color: config.isShowPY ? (attrib ? attrib.topic_color : '') : '#DCDFE6' }"
+          @click="changePinyin"
+        />
+        <!-- <span :class="['EN-16', config.isShowEN ? '' : 'disabled']" @click="changeEN" v-if="config.isHasEN"></span> -->
+        <SvgIcon
+          v-if="config.isHasEN"
+          icon-class="en-btn"
+          size="16"
+          :class="['EN-16', config.isShowEN ? '' : 'disabled']"
+          :style="{ color: config.isShowEN ? (attrib ? attrib.topic_color : '') : '#DCDFE6' }"
+          @click="changeEN"
+        />
       </div>
     </div>
     <template v-if="resArr.length > 0">
@@ -360,7 +377,7 @@
         <Wordcard
           :word="word"
           :changeWordCard="changeWordCard"
-          :themeColor="themeColor"
+          :themeColor="attrib ? attrib.topic_color : '#e35454'"
           :currentTreeID="currentTreeID"
           :TaskModel="TaskModel"
           :writeList="curQue.Bookanswer.writeModel"
@@ -398,7 +415,7 @@ export default {
     'bodyLeft',
     'NNPENewWordList',
     'colorBox',
-    'themeColor',
+    'attrib',
     'noFont',
     'currentTreeID',
     'config',

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

@@ -67,7 +67,7 @@
             :wordFontsize="wordFontsize"
             :bodyLeft="bodyLeft"
             :bodyWidth="bodyWidth"
-            :themeColor="bookInfo.theme_color"
+            :attrib="data.unified_attrib"
             :noFont="noFont"
             v-if="!showPhrases && !showPractice && !showWord"
             :config="config"
@@ -81,7 +81,7 @@
             :titleFontsize="titleFontsize"
             :wordFontsize="wordFontsize"
             :NNPENewWordList="NNPENewWordList"
-            :themeColor="bookInfo.theme_color"
+            :attrib="data.unified_attrib"
             :noFont="noFont"
             :bodyLeft="bodyLeft"
             v-if="showPhrases"
@@ -97,7 +97,7 @@
             :curQue="data"
             :titleFontsize="titleFontsize"
             :wordFontsize="wordFontsize"
-            :themeColor="bookInfo.theme_color"
+            :attrib="data.unified_attrib"
             :noFont="noFont"
             :NNPENewWordList="NNPENewWordList"
             v-if="showPractice"
@@ -116,7 +116,7 @@
             :bodyLeft="bodyLeft"
             :bodyWidth="bodyWidth"
             :NNPENewWordList="NNPENewWordList"
-            :themeColor="bookInfo.theme_color"
+            :attrib="data.unified_attrib"
             :noFont="noFont"
             v-if="showWord"
             :config="config"
@@ -715,23 +715,27 @@ export default {
   }
 
   .pinyin-16 {
-    background: url('@/assets/icon/pinyin-16-normal-red.png') no-repeat left top;
-    background-size: 100% 100%;
+    cursor: pointer;
 
-    &.disabled {
-      background: url('@/assets/icon/pinyin-16-disable-Black.png') no-repeat left top;
-      background-size: 100% 100%;
-    }
+    // background: url('@/assets/icon/pinyin-16-normal-red.png') no-repeat left top;
+    // background-size: 100% 100%;
+
+    // &.disabled {
+    //   background: url('@/assets/icon/pinyin-16-disable-Black.png') no-repeat left top;
+    //   background-size: 100% 100%;
+    // }
   }
 
   .EN-16 {
-    background: url('@/assets/icon/EN-16-normal-red.png') no-repeat left top;
-    background-size: 100% 100%;
+    cursor: pointer;
 
-    &.disabled {
-      background: url('@/assets/icon/EN-16-disable-Black.png') no-repeat left top;
-      background-size: 100% 100%;
-    }
+    // background: url('@/assets/icon/EN-16-normal-red.png') no-repeat left top;
+    // background-size: 100% 100%;
+
+    // &.disabled {
+    //   background: url('@/assets/icon/EN-16-disable-Black.png') no-repeat left top;
+    //   background-size: 100% 100%;
+    // }
   }
 }
 

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

@@ -78,6 +78,7 @@
                             data.unified_attrib && data.unified_attrib.topic_color
                               ? data.unified_attrib.topic_color
                               : '',
+                          marginTop: '4px',
                         }"
                       />
                       <SvgIcon
@@ -105,6 +106,7 @@
                               data.unified_attrib && data.unified_attrib.topic_color
                                 ? data.unified_attrib.topic_color
                                 : '',
+                            marginTop: '4px',
                           }"
                         />
                         <SvgIcon
@@ -334,13 +336,8 @@
           </template>
           <template v-else>
             <div v-if="data.new_word_list && data.new_word_list.length > 0" v-show="wordShow" class="NPC-word-tile">
-              <div v-for="(items, index) in data.option_list" :key="index" class="NPC-word-tile-item">
-                <div
-                  v-for="(item, indexs) in items"
-                  :key="indexs"
-                  class="writeTop"
-                  :class="{ flipped: item.isFlipped }"
-                >
+              <div v-for="(item, index) in data.new_word_list" :key="index" class="NPC-word-tile-item">
+                <div class="writeTop" :class="{ flipped: item.isFlipped }">
                   <div
                     v-if="item.show_left"
                     class="left left-preview"