Merge branch 'master' into gcj

# Conflicts:
#	src/components/Adult/preview/AudioLine.vue

src/components/Adult/preview/AudioLine.vue

@@ -127,14 +127,7 @@ export default {
   mounted() {
     let _this = this;
     let audioId = _this.audioId;
-    _this.$refs[audioId].addEventListener("loadstart", function () {
-      _this.loading = _this.$loading({
-        lock: true,
-        text: "Loading",
-        spinner: "el-icon-loading",
-        background: "rgba(0, 0, 0, 0.7)",
-      });
-    });
+    _this.$refs[audioId].addEventListener("loadstart", function () {});
     _this.$refs[audioId].addEventListener("play", function () {
       _this.audio.playing = true;
       _this.audio.isPlaying = true;
@@ -209,7 +202,6 @@ export default {
       let _this = this;
       // setTimeout(() => {
       _this.audio.loading = false;
-      _this.loading.close();
 
       // }, 10000);
     },

src/components/Adult/preview/Picture.vue

@@ -15,6 +15,7 @@
                         :src="itemss.url"
                         fit="scale-down"
                         class="img_url"
+                        @click="playmicrophone(items.mp3_list[0].url,'mp3')"
                     >
                         <div slot="placeholder" class="image-slot">
                             <img src="../../../assets/common/icon-imgloading.png" />
@@ -400,6 +401,7 @@ export default {
         .img_url{
             width: 100%;
             height: 128px;
+            cursor: pointer;
         }
     // }
 }

src/components/Adult/preview/components/WordPhraseDetail.vue

@@ -382,6 +382,11 @@ export default {
           part2 = sent.substring(wordIndex, wordIndex + 1);
           part3 = sent.substring(wordIndex + 1);
         }
+        // let reg = new RegExp(`${item.word}`, "g");
+        // let result = sent.replace(
+        //   reg,
+        //   `<span style="color:#DE4444;">${item.word}</span>`
+        // );
         let res =
           part1 + '<span style="color:#DE4444;">' + part2 + "</span>" + part3;
         item.res = res;