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

src/views/book/courseware/create/components/question/video_interaction/ExerciseAdd.vue

@@ -0,0 +1,21 @@
+<template>
+  <div class="Exercise-add">
+    <div class="main"></div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'ExerciseAdd',
+  components: {},
+  props: [''],
+  data() {
+    return {};
+  },
+  // 生命周期 - 创建完成（可以访问当前this实例）
+  created() {},
+  methods: {},
+};
+</script>
+
+<style lang="scss" scoped></style>

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

@@ -100,7 +100,7 @@
               ]"
             ></span>
           </div>
-          <div
+          <!-- <div
             :class="['op-btn', bgIndex == 1 ? 'op-btn-green' : '']"
             title="点击收藏后可在“个人中心”-“我的收藏”查看"
             @click="handleColl"
@@ -112,7 +112,7 @@
                 isCollArr[curSentIndex] && bgIndex == 1 ? 'coll-icon-yellow' : '',
               ]"
             ></span>
-          </div>
+          </div> -->
         </div>
         <div :class="['op-btn', bgIndex == 1 ? 'op-btn-green' : '']" @click="exitFullScreen">
           <span :class="['close-icon', bgIndex == 1 ? 'close-icon-white' : '']"></span>
@@ -1087,7 +1087,7 @@ export default {
       } else {
         _this.maxTime = maxTime;
       }
-      _this.checkCollStatus();
+      // _this.checkCollStatus();
     },
     pauseAudio() {
       let audio = document.getElementsByTagName('audio');

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

@@ -39,7 +39,7 @@
               </div>
             </div>
             <div v-if="TaskModel != 'ANSWER'" class="footer">
-              <div class="bg-box" @click="handleColl">
+              <!-- <div class="bg-box" @click="handleColl">
                 <template v-if="collFlag">
                   <img
                     :src="
@@ -69,7 +69,7 @@
                   />
                 </template>
                 {{ collFlag ? '已收藏' : '收藏' }}
-              </div>
+              </div> -->
             </div>
           </div>
           <template>
@@ -121,7 +121,7 @@
             </div>
             <div class="left-content-pra"></div>
             <div v-if="TaskModel != 'ANSWER'" class="footer">
-              <div class="bg-box" @click="handleColl">
+              <!-- <div class="bg-box" @click="handleColl">
                 <template v-if="collFlag">
                   <img
                     :src="
@@ -151,7 +151,7 @@
                   />
                 </template>
                 {{ collFlag ? '已收藏' : '收藏' }}
-              </div>
+              </div> -->
             </div>
           </div>
           <template>
@@ -237,7 +237,7 @@ export default {
     let color = _this.colorsList[_this.colorIndex];
     _this.hanzicolor = color;
     _this.hanziweight = 6;
-    _this.checkCollStatus();
+    // _this.checkCollStatus();
     const regExp = /Android|webOS|iPhone|BlackBerry|IEMobile|Opera Mini/i;
     this.isPhone = regExp.test(navigator.userAgent);
   },

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

@@ -67,7 +67,7 @@
                 <Audio :mp3="data.mp3Url" :theme-color="themeColor" :bg="bg" :ed="ed" />
               </template>
             </div>
-            <p class="jieshu" v-html="data.definition_list"></p>
+            <p v-if="data.definition_list.length > 0" class="jieshu" v-html="data.definition_list"></p>
           </div>
         </div>
         <div class="zhedie-white">

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

@@ -84,7 +84,7 @@
       </template>
       <div class="bwc-more-intp" @click="viewIntp">more</div>
       <div class="bwc-footer">
-        <button class="bwc-btn" @click="handleColl">
+        <!-- <button class="bwc-btn" @click="handleColl">
           <template v-if="!collFlag">
             <img
               :src="
@@ -114,7 +114,7 @@
             />
           </template>
           {{ collFlag ? '已收藏' : '收藏' }}
-        </button>
+        </button> -->
         <button
           v-if="word.detail.new_word.length == 1"
           class="bwc-btn bwc-btn2"
@@ -425,16 +425,17 @@ export default {
         // _this.mp3Url = _this.word.detail.mp3_list[0].id;
       }
       this.word.detail.mp3Url = this.mp3Url;
+      console.log(this.word.detail);
       if (_this.word.detail.definition_list && _this.word.detail.definition_list.length > 0) {
-        _this.word.detail.definition_list.forEach((item) => {
-          if (/^[\u4E00-\u9FA5]+$/.test(item)) {
-            this.defChsArr.push(item);
-          } else {
-            this.defEnArr.push(item);
-          }
-        });
+        // _this.word.detail.definition_list.forEach((item) => {
+        if (/^[\u4E00-\u9FA5]+$/.test(_this.word.detail.definition_list)) {
+          this.defChsArr.push(_this.word.detail.definition_list);
+        } else {
+          this.defEnArr.push(_this.word.detail.definition_list);
+        }
+        // });
       }
-      _this.checkCollStatus();
+      // _this.checkCollStatus();
     },
   }, // 如果页面有keep-alive缓存功能，这个函数会触发
 };
@@ -615,6 +616,10 @@ export default {
 
     .word-en {
       font-family: 'robot';
+
+      :deep p {
+        margin: 0;
+      }
     }
   }
 

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

@@ -65,8 +65,8 @@
                 <span class="chs">{{ item.roleDetail.detail.wordsList | handleChs }}</span>
               </div> -->
               <div class="roleDetail" v-if="item.roleDetail.fullName || item.roleDetail.fullPinyin">
-                <span class="pinyin">{{ item.roleDetail.fullPinyin }}</span>
                 <span class="chs">{{ item.roleDetail.fullName }}</span>
+                <span class="pinyin">{{ item.roleDetail.fullPinyin }}</span>
               </div>
               <div
                 class="para-con"
@@ -1187,7 +1187,7 @@ export default {
         height: 36px;
 
         .pinyin {
-          margin-right: 4px;
+          margin-left: 4px;
           font-family: 'League';
           font-size: 14px;
           line-height: 22px;

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

@@ -54,8 +54,8 @@
                 <span class="chs">{{ item.roleDetail.detail.wordsList | handleChs }}</span>
               </div> -->
               <div class="roleDetail" v-if="item.roleDetail.fullName || item.roleDetail.fullPinyin">
-                <span class="pinyin">{{ item.roleDetail.fullPinyin }}</span>
                 <span class="chs">{{ item.roleDetail.fullName }}</span>
+                <span class="pinyin">{{ item.roleDetail.fullPinyin }}</span>
               </div>
               <div class="para-con" :style="{ background: item.roleDetail.color.bg }">
                 <div
@@ -1227,7 +1227,7 @@ export default {
         height: 36px;
 
         .pinyin {
-          margin-right: 4px;
+          margin-left: 4px;
           font-family: 'League';
           font-size: 14px;
           line-height: 22px;

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

@@ -109,7 +109,7 @@
                 <div class="roleDetail" v-if="item.roleDetail.fullName || item.roleDetail.fullPinyin">
                   <span
                     :class="[
-                      'pinyin',
+                      'chs',
                       (curQue.wordTime &&
                         curQue.wordTime[index] &&
                         curTime >= curQue.wordTime[index].bg &&
@@ -118,11 +118,11 @@
                         ? 'color85'
                         : 'color45',
                     ]"
-                    >{{ item.roleDetail.fullPinyin }}</span
+                    >{{ item.roleDetail.fullName }}</span
                   >
                   <span
                     :class="[
-                      'chs',
+                      'pinyin',
                       (curQue.wordTime &&
                         curQue.wordTime[index] &&
                         curTime >= curQue.wordTime[index].bg &&
@@ -131,7 +131,7 @@
                         ? 'color85'
                         : 'color45',
                     ]"
-                    >{{ item.roleDetail.fullName }}</span
+                    >{{ item.roleDetail.fullPinyin }}</span
                   >
                 </div>
               </template>
@@ -1133,7 +1133,7 @@ export default {
         height: 36px;
 
         .pinyin {
-          margin-right: 4px;
+          margin-left: 4px;
           font-family: 'League';
           font-size: 14px;
           line-height: 22px;

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

@@ -52,8 +52,8 @@
                 <span class="chs">{{ item.roleDetail.detail.wordsList | handleChs }}</span>
               </div> -->
               <div class="roleDetail" v-if="item.roleDetail.fullName || item.roleDetail.fullPinyin">
-                <span class="pinyin">{{ item.roleDetail.fullPinyin }}</span>
                 <span class="chs">{{ item.roleDetail.fullName }}</span>
+                <span class="pinyin">{{ item.roleDetail.fullPinyin }}</span>
               </div>
               <div class="para-con" :style="{ background: item.roleDetail.color.bg }">
                 <div
@@ -1105,7 +1105,7 @@ export default {
         height: 36px;
 
         .pinyin {
-          margin-right: 4px;
+          margin-left: 4px;
           font-family: 'League';
           font-size: 14px;
           line-height: 22px;

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

@@ -504,10 +504,10 @@ export default {
   },
   watch: {
     data: {
-      handler(val) {
-        if (val) {
+      handler(val, oldVal) {
+        if (val !== oldVal) {
           if (this.is_change) return;
-          if (val.new_word_list[0].new_word) {
+          if (val && val.new_word_list[0].new_word) {
             // this.wordShow = isEnable(this.data.property.is_word_show);
             this.initData();
           }
@@ -678,9 +678,9 @@ export default {
       this.optionRes = JSON.parse(JSON.stringify(optionRes));
       this.$set(this.data, 'option_list', option_list);
       if (!this.isJudgingRightWrong) {
-        this.data.answer.answer_list = Bookanswer;
+        this.answer.answer_list = Bookanswer;
       }
-      if (this.showLang) {
+      if (this.showLang && this.data.multilingual) {
         this.data.multilingual.forEach((item) => {
           let trans_arr = item.translation.split('\n');
           this.$set(this.titleTrans, item.type, trans_arr[0] ? trans_arr[0] : '');
@@ -720,7 +720,7 @@ export default {
     handleWav(list, tmIndex, tmsIndex) {
       tmIndex = tmIndex || 0;
       tmsIndex = tmsIndex || 0;
-      this.$set(this.data.answer.answer_list[tmIndex][tmsIndex], 'recordList', list);
+      this.$set(this.answer.answer_list[tmIndex][tmsIndex], 'recordList', list);
     },
     // 翻面
     changeShowLeft(item) {
@@ -738,7 +738,7 @@ export default {
   @include preview-base;
 
   .NPC-zhedie {
-    width: 900px;
+    width: 1000px;
 
     // width: 780px;
     // margin-bottom: 24px;