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

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

@@ -454,7 +454,7 @@ export default {
       // 循环文章图片
       if (curQue.img_list) {
         curQue.img_list.forEach((item) => {
-          this.articleImg[item.imgNumber] = item.url;
+          this.articleImg[item.imgNumber] = item.id;
         });
       }
     },

src/components/Adult/preview/ArticleViewChs/PhraseModelChs.vue

@@ -365,7 +365,7 @@ export default {
       // 循环文章图片
       if (curQue.img_list) {
         curQue.img_list.forEach((item) => {
-          this.articleImg[item.imgNumber] = item.url;
+          this.articleImg[item.imgNumber] = item.id;
         });
       }
     },

src/components/Adult/preview/ArticleViewChs/WordModelChs.vue

@@ -398,7 +398,7 @@ export default {
       // 循环文章图片
       if (curQue.img_list) {
         curQue.img_list.forEach((item) => {
-          this.articleImg[item.imgNumber] = item.url;
+          this.articleImg[item.imgNumber] = item.id;
         });
       }
     },

src/components/Adult/preview/BgControl.vue

@@ -2,7 +2,7 @@
   <div v-if="curQue">
     <div
       class="bgimage"
-      :style="{ 'background-image': ' url(' + curQue.img_list[0].url + ')' }"
+      :style="{ 'background-image': ' url(' + curQue.img_list[0].id + ')' }"
       @click.stop="addModule"
       @click.right="RightClick"
       id="content"

src/components/Adult/preview/Dialogue.vue

@@ -9,7 +9,7 @@
       <template v-if="item.site == 'left'">
         <img
           v-if="item.img_list.length > 0"
-          :src="item.img_list[0].url"
+          :src="item.img_list[0].id"
           alt=""
         />
         <div>
@@ -20,14 +20,14 @@
             <audio
               :id="item.mp3_list[0].name + index"
               v-if="item.mp3_list.length > 0"
-              :src="item.mp3_list[0].url"
+              :src="item.mp3_list[0].id"
             ></audio>
           </div>
           <div class="imglist">
             <img
               v-for="it in item.img_list"
               :key="it.id"
-              :src="it.url"
+              :src="it.id"
               class="img"
             />
           </div>
@@ -42,14 +42,14 @@
             <audio
               :id="item.mp3_list[0].name + index"
               v-if="item.mp3_list.length > 0"
-              :src="item.mp3_list[0].url"
+              :src="item.mp3_list[0].id"
             ></audio>
           </div>
           <div class="imglist">
             <img
               v-for="it in item.img_list"
               :key="it.id"
-              :src="it.url"
+              :src="it.id"
               class="img"
             />
           </div>

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

@@ -4,12 +4,12 @@
     <div
       class="aduioLine-box"
       v-if="
-        curQue.mp3_list && curQue.mp3_list.length > 0 && curQue.mp3_list[0].url
+        curQue.mp3_list && curQue.mp3_list.length > 0 && curQue.mp3_list[0].id
       "
     >
       <AudioLine
         audioId="'answerAudio'"
-        :mp3="curQue.mp3_list[0].url"
+        :mp3="curQue.mp3_list[0].id"
         :getCurTime="getCurTime"
         ref="audioLine"
       />
@@ -659,7 +659,7 @@ export default {
       // 循环文章图片
       if (curQue.img_list) {
         curQue.img_list.forEach((item) => {
-          this.articleImg[item.imgNumber] = item.url;
+          this.articleImg[item.imgNumber] = item.id;
         });
       }
     },

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

@@ -610,7 +610,7 @@ export default {
       // 循环文章图片
       if (curQue.img_list) {
         curQue.img_list.forEach((item) => {
-          this.articleImg[item.imgNumber] = item.url;
+          this.articleImg[item.imgNumber] = item.id;
         });
       }
     },

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

@@ -543,7 +543,7 @@ export default {
       // 循环文章图片
       if (curQue.img_list) {
         curQue.img_list.forEach((item) => {
-          this.articleImg[item.imgNumber] = item.url;
+          this.articleImg[item.imgNumber] = item.id;
         });
       }
     },

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

@@ -9,7 +9,7 @@
     >
     <img
       v-else
-      :src="curRole.img_list[0] && curRole.img_list[0].url"
+      :src="curRole.img_list[0] && curRole.img_list[0].id"
       class="adult-book-input-roleImg"
     />
     <template v-if="type != 1 && curRole.detail.wordsList.length > 0">

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

@@ -553,7 +553,7 @@ export default {
       // 循环文章图片
       if (curQue.img_list) {
         curQue.img_list.forEach((item) => {
-          this.articleImg[item.imgNumber] = item.url;
+          this.articleImg[item.imgNumber] = item.id;
         });
       }
     },

src/components/Adult/preview/FillDrag.vue

@@ -22,7 +22,7 @@
           }"
         >
           <template v-if="imageList.length > 0">
-            <el-image :src="imageList[0].url" fit="fill" />
+            <el-image :src="imageList[0].id" fit="fill" />
           </template>
           <template v-else>
             {{ text }}
@@ -72,7 +72,7 @@
                 }"
               >
                 <template v-if="imageList.length > 0">
-                  <el-image :src="imageList[0].url" fit="fill" />
+                  <el-image :src="imageList[0].id" fit="fill" />
                 </template>
                 <template v-else>
                   {{ text }}

src/components/Adult/preview/Judge.vue

@@ -18,13 +18,13 @@
           <audio
             :id="item.name + index"
             v-if="curQue.mp3_list.length > 0"
-            :src="item.url"
+            :src="item.id"
           ></audio>
         </li>
       </ul>
       <ul v-if="curQue.img_list && curQue.img_list.length > 0" class="imglist">
         <li v-for="(item, index) in curQue.img_list" :key="item.id + index">
-          <img :src="item.url" class="img" />
+          <img :src="item.id" class="img" />
         </li>
       </ul>
     </div>

src/components/Adult/preview/Ligature.vue

@@ -14,7 +14,7 @@
             <div>
               <img
                 v-if="item.img_list.length > 0"
-                :src="item.img_list[0].url"
+                :src="item.img_list[0].id"
                 alt=""
               />
               <div class="text" :class="'left' + index">
@@ -117,7 +117,7 @@
             <div>
               <img
                 v-if="item.img_list.length > 0"
-                :src="item.img_list[0].url"
+                :src="item.img_list[0].id"
                 alt=""
               />
               <div class="text" :class="'right' + index">

src/components/Adult/preview/NewWordShow.vue

@@ -42,9 +42,9 @@
                 class="img-box"
                 v-for="(imgItem, imgIndex) in item.img_list"
                 :key="imgIndex"
-                @click="freeWrite(imgItem.url, imgIndex, 0)"
+                @click="freeWrite(imgItem.id, imgIndex, 0)"
               >
-                <el-image :src="imgItem.url" fit="scale-down" class="img_url">
+                <el-image :src="imgItem.id" fit="scale-down" class="img_url">
                   <div slot="placeholder" class="image-slot">
                     <img src="../../../assets/common/icon-imgloading.png" />
                   </div>

src/components/Adult/preview/Picture.vue

@@ -25,10 +25,10 @@
         </template>
       <div v-for="(itemss, indexss) in items.img_list" :key="indexss">
         <el-image
-          :src="itemss.url"
+          :src="itemss.id"
           fit="scale-down"
           class="img_url"
-          @click="playmicrophone(items.mp3_list[0].url, 'mp3')"
+          @click="playmicrophone(items.mp3_list[0].id, 'mp3')"
         >
           <div slot="placeholder" class="image-slot">
             <img src="../../../assets/common/icon-imgloading.png" />
@@ -189,7 +189,7 @@
         <template v-if="items.mp3_list.length > 0">
           <span
             :class="['voice', mp3Play]"
-            @click="playmicrophone(items.mp3_list[0].url, 'mp3')"
+            @click="playmicrophone(items.mp3_list[0].id, 'mp3')"
           ></span>
         </template>
         <Soundrecord

src/components/Adult/preview/PlayRecordView.vue

@@ -2,7 +2,7 @@
   <div class="PlayRecordView adult-book-preview-sty">
     <AudioLine
       audioId="playRecordAudio"
-      :mp3="curQue.mp3_list[0].url"
+      :mp3="curQue.mp3_list[0].id"
       :getCurTime="getCurTime"
       ref="audioLine"
     />

src/components/Adult/preview/Record.vue

@@ -4,7 +4,7 @@
     <ul v-for="(item,index) in curQue.queList" :key="index">
       <li v-for="(items, indexs) in item.option" :key="indexs">
           <b>{{ indexs+1 }}.</b>
-          <p v-for="(itemss,indexss) in items.mp3_list" :key="indexss" @click="handlePlayVoice(itemss.url,indexs,itemss.media_duration)">
+          <p v-for="(itemss,indexss) in items.mp3_list" :key="indexss" @click="handlePlayVoice(itemss.id,indexs,itemss.media_duration)">
               <!-- <audio :src="itemss.url"></audio> -->
               <span>{{playNumber==indexs?handleDateTime(playTotal-playtime):handleDateTime(itemss.media_duration)}}</span>
           </p>

src/components/Adult/preview/SelectTone.vue

@@ -4,12 +4,12 @@
     <div
       class="aduioLine-box"
       v-if="
-        curQue.mp3_list && curQue.mp3_list.length > 0 && curQue.mp3_list[0].url
+        curQue.mp3_list && curQue.mp3_list.length > 0 && curQue.mp3_list[0].id
       "
     >
       <AudioLine
         audioId="sentenceListenAudio"
-        :mp3="curQue.mp3_list[0].url"
+        :mp3="curQue.mp3_list[0].id"
         :getCurTime="getCurTime"
         :themeColor="themeColor"
         :ed="ed"

src/components/Adult/preview/SelectYinjie.vue

@@ -4,12 +4,12 @@
       <div
         class="aduioLine-box"
         v-if="
-            curQue.mp3_list && curQue.mp3_list.length > 0 && curQue.mp3_list[0].url
+            curQue.mp3_list && curQue.mp3_list.length > 0 && curQue.mp3_list[0].id
         "
         >
         <AudioLine
             audioId="SelectYinjieAudio"
-            :mp3="curQue.mp3_list[0].url"
+            :mp3="curQue.mp3_list[0].id"
             :getCurTime="getCurTime"
             :themeColor="themeColor"
             :ed="ed"

src/components/Adult/preview/SentenceListenRead.vue

@@ -4,12 +4,12 @@
     <div
       class="aduioLine-box"
       v-if="
-        curQue.mp3_list && curQue.mp3_list.length > 0 && curQue.mp3_list[0].url
+        curQue.mp3_list && curQue.mp3_list.length > 0 && curQue.mp3_list[0].id
       "
     >
       <AudioLine
         audioId="sentenceListenAudio"
-        :mp3="curQue.mp3_list[0].url"
+        :mp3="curQue.mp3_list[0].id"
         :getCurTime="getCurTime"
         :themeColor="themeColor"
         :ed="ed"

src/components/Adult/preview/Single.vue

@@ -13,7 +13,7 @@
             />
             <div v-for="(itemss,indexss) in itemI.topic.img_list" :key="indexss">
                 <el-image
-                    :src="itemss.url"
+                    :src="itemss.id"
                     fit="scale-down"
                     class="img_url"
                 >
@@ -35,7 +35,7 @@
                 <p :class="[item.font=='py'?'hasPinyin':item.font=='en'?'hasEn':item.font=='cn'?'hasCn':'']">{{ item.con }}</p>
                 <div v-for="(itemss,indexss) in item.img_list" :key="indexss">
                     <el-image
-                        :src="itemss.url"
+                        :src="itemss.id"
                         fit="scale-down"
                         class="img_urls"
                     >

src/components/Adult/preview/TextInputRecord.vue

@@ -5,12 +5,12 @@
     <div
       class="aduioLine-box"
       v-if="
-        curQue.mp3_list && curQue.mp3_list.length > 0 && curQue.mp3_list[0].url
+        curQue.mp3_list && curQue.mp3_list.length > 0 && curQue.mp3_list[0].id
       "
     >
       <AudioLine
         audioId="sentenceListenAudio"
-        :mp3="curQue.mp3_list[0].url"
+        :mp3="curQue.mp3_list[0].id"
         :getCurTime="getCurTime"
         :themeColor="themeColor"
         :ed="ed"

src/components/Adult/preview/Textdes.vue

@@ -5,12 +5,12 @@
     <p v-if="curQue.con" v-html="curQue.english"></p>
     <ul v-if="curQue.img_list && curQue.img_list.length > 0" class="imglist">
       <li v-for="(item, index) in curQue.img_list" :key="item.id">
-        <img :src="item.url" class="img" />
+        <img :src="item.id" class="img" />
       </li>
     </ul>
     <ul v-if="curQue.mp3_list && curQue.mp3_list.length > 0">
       <li v-for="(item, index) in curQue.mp3_list" :key="item.id">
-        <audio :src="item.url"></audio>
+        <audio :src="item.id"></audio>
       </li>
     </ul>
   </div>

src/components/Adult/preview/VideoControl.vue

@@ -101,14 +101,14 @@ export default {
       loop: false, //是否循环播放
       url: _this.curQue.definition_list[0].file_url,
       poster:
-        _this.curQue.img_list.length > 0 ? _this.curQue.img_list[0].url : "", //视频封面
+        _this.curQue.img_list.length > 0 ? _this.curQue.img_list[0].id : "", //视频封面
       height: "100%",
       width: "100%",
       keyShortcut: "off",
     });
     // 设置清晰度
     _this.player.emit("resourceReady", [
-      { name: "高清", url: _this.curQue.video_list[0].url },
+      { name: "高清", url: _this.curQue.video_list[0].id },
       { name: "标清", url: _this.curQue.definition_list[1].file_url },
       { name: "流畅", url: _this.curQue.definition_list[0].file_url },
     ]);

src/components/Adult/preview/WordPhrase.vue

@@ -36,12 +36,12 @@
           v-if="
             curQue.mp3_list &&
             curQue.mp3_list.length > 0 &&
-            curQue.mp3_list[0].url
+            curQue.mp3_list[0].id
           "
         >
           <AudioLine
             audioId="SelectYinjieAudio"
-            :mp3="curQue.mp3_list[0].url"
+            :mp3="curQue.mp3_list[0].id"
             :getCurTime="getCurTime"
             :themeColor="themeColor"
             :ed="ed"

src/components/Adult/preview/components/OptionTemp.vue

@@ -34,7 +34,7 @@
               }}</span>
               <template v-if="item.img_list && item.img_list.length > 0">
                 <div v-for="(itemss, indexss) in item.img_list" :key="indexss">
-                  <img :src="itemss.url" style="width: 32px; height: 32px" />
+                  <img :src="itemss.id" style="width: 32px; height: 32px" />
                 </div>
               </template>
               <template v-else>
@@ -66,7 +66,7 @@
             }}</span>
             <template v-if="item.img_list && item.img_list.length > 0">
               <div v-for="(itemss, indexss) in item.img_list" :key="indexss">
-                <img :src="itemss.url" style="width: 32px; height: 32px" />
+                <img :src="itemss.id" style="width: 32px; height: 32px" />
               </div>
             </template>
             <template v-else>