natasha 1 týždeň pred
rodič
commit
96f78731d2

+ 18 - 2
src/views/book/courseware/preview/components/dialogue_article/PhraseModelChs.vue

@@ -210,6 +210,10 @@
                               >
                               <span
                                 class="NNPE-chs"
+                                :class="[
+                                  newWordList.indexOf(item.wordsList[pIndex + 1].chs) > -1 ? 'newActive' : '',
+                                  item.wordsList[pIndex + 1].words ? 'newActive' : '',
+                                ]"
                                 style="text-align: left"
                                 :style="{
                                   fontFamily: item.wordsList[pIndex + 1].config.fontFamily,
@@ -217,7 +221,6 @@
                                   borderBottom:
                                     item.wordsList[pIndex + 1].config.border === 'dotted' ? '1px dotted' : '',
                                   fontWeight: item.wordsList[pIndex + 1].config.fontWeight,
-                                  color: item.wordsList[pIndex + 1].config.color,
                                   height:
                                     attrib && attrib.font_size
                                       ? attrib.font_size.replace('pt', '') * 1.4 + 'pt'
@@ -227,6 +230,12 @@
                                     attrib && attrib.font_size
                                       ? attrib.font_size.replace('pt', '') * 1.4 + 'pt'
                                       : '28px',
+                                  color:
+                                    newWordList.indexOf(pItem.chs) > -1 || pItem.words
+                                      ? attrib
+                                        ? attrib.topic_color
+                                        : item.wordsList[pIndex + 1].config.color
+                                      : item.wordsList[pIndex + 1].config.color,
                                 }"
                                 @click.stop="
                                   viewNotes(
@@ -304,6 +313,8 @@
                                   curTime <= item.timeList[pItem.sentIndex].ed
                                     ? 'wordActive'
                                     : '',
+                                  newWordList.indexOf(item.wordsList[pIndex + 2].chs) > -1 ? 'newActive' : '',
+                                  item.wordsList[pIndex + 2].words ? 'newActive' : '',
                                 ]"
                                 :style="{
                                   fontFamily: item.wordsList[pIndex + 2].config.fontFamily,
@@ -311,7 +322,6 @@
                                   borderBottom:
                                     item.wordsList[pIndex + 2].config.border === 'dotted' ? '1px dotted' : '',
                                   fontWeight: item.wordsList[pIndex + 2].config.fontWeight,
-                                  color: item.wordsList[pIndex + 2].config.color,
                                   height:
                                     attrib && attrib.font_size
                                       ? attrib.font_size.replace('pt', '') * 1.4 + 'pt'
@@ -321,6 +331,12 @@
                                     attrib && attrib.font_size
                                       ? attrib.font_size.replace('pt', '') * 1.4 + 'pt'
                                       : '28px',
+                                  color:
+                                    newWordList.indexOf(pItem.chs) > -1 || pItem.words
+                                      ? attrib
+                                        ? attrib.topic_color
+                                        : item.wordsList[pIndex + 2].config.color
+                                      : item.wordsList[pIndex + 2].config.color,
                                 }"
                                 @click.stop="
                                   viewNotes(