Merge branch 'master' of http://221.216.211.14:3000/GCLS/GCLS_Page_Book_Component_NPC

src/components/Adult/preview/AudioLine.vue

@@ -141,6 +141,7 @@ export default {
       if (_this.hideSlider && _this.audio.currentTime * 1000 + 500 > _this.ed) {
         _this.$emit("sentPause", true);
       }
+      _this.$emit("handleListenRead", false);
     });
     _this.$refs[audioId].addEventListener("ended", function () {
       _this.audio.playing = false;

src/components/Adult/preview/InputHasRecord.vue

@@ -1,7 +1,7 @@
 <!--  -->
 <template>
   <div
-    class="Big-Book-prev-Textdes InputHasRecord"
+    class="Big-Book-prev-Textdes InputHasRecordNPC"
     :class="[curQue.guide ? 'NPC-zhedie' : '']"
     v-if="curQue"
   >
@@ -540,7 +540,7 @@ export default {
 }
 </style>
 <style lang="scss">
-.InputHasRecord {
+.InputHasRecordNPC {
   .textarea {
     &.textareaNoRecord {
       textarea {

src/components/Adult/preview/TextInputRecord.vue

@@ -13,6 +13,8 @@
         :mp3="curQue.mp3_list[0].url"
         :getCurTime="getCurTime"
         :themeColor="themeColor"
+        :ed="ed"
+        type="audioLine"
         ref="audioLine"
         @handleListenRead="handleListenRead"
       />
@@ -33,7 +35,7 @@
               ? 'active'
               : '',
           ]"
-          @click="handleChangeTime(curQue.wordTime[indexs].bg)"
+          @click="handleChangeTime(curQue.wordTime[indexs].bg,curQue.wordTime[indexs].ed)"
         ></a>
         <b v-if="items.number">{{ items.number }}</b>
         <span
@@ -84,16 +86,19 @@ export default {
       ],
       curTime: null,
       stopAudio: false,
+      ed: null,
     };
   },
   computed: {},
   watch: {},
   //方法集合
   methods: {
-    handleChangeTime(time) {
+    handleChangeTime(time,edTime) {
       let _this = this;
       _this.curTime = time;
+      _this.stopAudio = true
       _this.$refs.audioLine.onTimeupdateTime(time / 1000, true);
+      _this.ed = edTime
     },
     getCurTime(curTime) {
       this.curTime = curTime * 1000;
@@ -211,6 +216,9 @@ export default {
       }
       return con;
     },
+    emptyEd(){
+        this.ed = null;
+    }
   },
   //生命周期 - 创建完成（可以访问当前this实例）
   created() {