Merge branch 'gcj'

src/components/Adult/Preview.vue

@@ -159,6 +159,8 @@
                     :cur-que="itemss.data"
                     :theme-color="themeColor"
                     :currentTreeID="currentTreeID"
+                    :indexs="indexs"
+                    :indexss="indexss"
                     v-if="refresh"
                   />
                 </template>

src/components/Adult/preview/DialogueArticleViewChs/AnswerModel.vue

@@ -90,10 +90,13 @@
                             >
                           </template>
                           <template v-else>
-                            <input
+                            <!-- <input
                               v-model="pItem.answer"
                               class="answer-input"
-                            />
+                            /> -->
+                            <div class="answer-input" contenteditable="true">
+                              {{ pItem.answer }}
+                            </div>
                           </template>
                           <span
                             v-if="pyPosition == 'bottom'"
@@ -186,7 +189,10 @@
                           >
                         </template>
                         <template v-else>
-                          <input v-model="pItem.answer" class="answer-input" />
+                          <!-- <input v-model="pItem.answer" class="answer-input" /> -->
+                          <div class="answer-input" contenteditable="true">
+                            {{ pItem.answer }}
+                          </div>
                         </template>
                         <span
                           v-if="pyPosition == 'bottom'"
@@ -302,7 +308,10 @@
                     }}</span>
                   </template>
                   <template v-else>
-                    <input v-model="pItem.answer" class="answer-input" />
+                    <!-- <input v-model="pItem.answer" class="answer-input" /> -->
+                    <div class="answer-input" contenteditable="true">
+                      {{ pItem.answer }}
+                    </div>
                   </template>
                 </div>
                 <div v-if="item.enwords" class="enwords">
@@ -782,19 +791,20 @@ export default {
         }
       }
       .answer-input {
-        height: 28px;
+        min-height: 31px;
         box-sizing: border-box;
         border: 0;
         border-bottom: 1px #000 solid;
         background: 0 0;
-        width: 100px;
+        min-width: 100px;
         outline: 0;
-        text-align: center;
+        text-align: left;
         font-family: "FZJCGFKTK";
         font-size: 20px;
         padding: 0 10px;
         box-sizing: border-box;
         color: #000000;
+        line-height: 150%;
       }
     }
     .enwords {

src/components/Adult/preview/DialogueArticleViewChs/NormalModelChs.vue

@@ -38,7 +38,7 @@
           v-for="(item, index) in resArr"
           :key="'detail' + index"
         >
-        <!-- {{curTime}}
+          <!-- {{curTime}}
         {{item.timeList[0].bg}}
         {{item.timeList[item.timeList.length - 1].ed}} -->
           <div :class="['article-content', isHasRemark ? 'hasRemark' : '']">
@@ -625,7 +625,7 @@ export default {
     justify-content: flex-start;
     align-items: flex-start;
     &.active {
-      background: rgba(0, 0, 0, 0.06);
+      // background: rgba(0, 0, 0, 0.06);
     }
     .article-content {
       width: 100%;

src/components/Adult/preview/WordPhrase.vue

@@ -58,7 +58,7 @@
                     @click="palyAudio(sItem.sIndex)"
                   ></span>
                   <audio
-                    :id="'word' + sItem.sIndex"
+                    :id="'word' + indexs + indexss + sItem.sIndex"
                     :src="sItem.mp3_list[0].id"
                   ></audio>
                 </template>
@@ -123,7 +123,7 @@ export default {
   components: {
     WordPhraseDetail,
   },
-  props: ["curQue", "themeColor", "currentTreeID"],
+  props: ["curQue", "themeColor", "currentTreeID", "indexs", "indexss"],
   data() {
     //这里存放数据
     return {
@@ -160,7 +160,9 @@ export default {
     palyAudio(sIndex) {
       let _this = this;
       _this.stopAudio();
-      let node = document.getElementById("word" + sIndex);
+      let node = document.getElementById(
+        "word" + _this.indexs + _this.indexss + sIndex
+      );
       _this.playWord = node;
       if (node) {
         this.mp3_index = sIndex;
@@ -505,8 +507,8 @@ export default {
         &.active {
           width: 16px;
           height: 16px;
-          background: url("../../../assets/NPC/icon-voice-play-white.png") no-repeat
-            left top;
+          background: url("../../../assets/NPC/icon-voice-play-white.png")
+            no-repeat left top;
           background-size: 100% 100%;
         }
       }

vue.config.js

@@ -42,7 +42,7 @@ module.exports = {
       // change xxx-api/login => mock/login
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://gcls.helxsoft.cn/`,
+        target: `http://gcls.utschool.cn/`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''