高中选必 高中必修

src/components/common/AudioLine2.vue

@@ -28,33 +28,51 @@
           }}</span
         >
       </template>
-        <el-popover
-            class="NNPE-popover"
-            placement="bottom"
-            width="446"
-            trigger="hover"
-            @show="showPopover(1)"
-            @hide="hidePopover"
-            v-if="audioData&&(audioData.script||audioData.translation)">
-            <template slot="reference">
-                <!-- <img v-if="activeIndex==1" class="icon_popover" src="../../../assets/NNPE/icon-popover-actiive.png"/>
+      <el-popover
+        class="NNPE-popover"
+        placement="bottom"
+        width="446"
+        trigger="hover"
+        @show="showPopover(1)"
+        @hide="hidePopover"
+        v-if="audioData && (audioData.script || audioData.translation)"
+      >
+        <template slot="reference">
+          <!-- <img v-if="activeIndex==1" class="icon_popover" src="../../../assets/NNPE/icon-popover-actiive.png"/>
                 <img v-else class="icon_popover" src="../../../assets/NNPE/icon-popover.png" /> -->
-            </template>
-            <div class="popover-content">
-                <div class="popover-script" v-if="activeContent==1">
-                    {{audioData.script}}
-                    <div v-html="audioData.tinyscript" class="tiny-boxpopover-script"></div>
-                </div>
-                <div class="popover-script popover-translation" v-if="activeContent==2">
-                    {{audioData.translation}}
-                    <div v-html="audioData.tinytranslation" class="tiny-boxpopover-script"></div>
-                </div>
-                <div class="popover-bottom">
-                    <a :class="[activeContent==1?'active':'']" @click="activeContent=1">脚本</a>
-                    <a :class="[activeContent==2?'active':'']" @click="activeContent=2">译文</a>
-                </div>
-            </div>
-        </el-popover>
+        </template>
+        <div class="popover-content">
+          <div class="popover-script" v-if="activeContent == 1">
+            {{ audioData.script }}
+            <div
+              v-html="audioData.tinyscript"
+              class="tiny-boxpopover-script"
+            ></div>
+          </div>
+          <div
+            class="popover-script popover-translation"
+            v-if="activeContent == 2"
+          >
+            {{ audioData.translation }}
+            <div
+              v-html="audioData.tinytranslation"
+              class="tiny-boxpopover-script"
+            ></div>
+          </div>
+          <div class="popover-bottom">
+            <a
+              :class="[activeContent == 1 ? 'active' : '']"
+              @click="activeContent = 1"
+              >脚本</a
+            >
+            <a
+              :class="[activeContent == 2 ? 'active' : '']"
+              @click="activeContent = 2"
+              >译文</a
+            >
+          </div>
+        </div>
+      </el-popover>
     </div>
     <div class="audioLine2" v-else>
       <div
@@ -69,31 +87,43 @@
         ]"
         @click="PlayAudio"
       />
-        <el-popover
-            class="NNPE-popover"
-            placement="bottom"
-            width="446"
-            trigger="hover"
-            @show="showPopover(1)"
-            @hide="hidePopover"
-            v-if="audioData&&(audioData.script||audioData.translation)">
-            <template slot="reference">
-                <!-- <img v-if="activeIndex==1" class="icon_popover" src="../../../assets/NNPE/icon-popover-actiive.png"/>
+      <el-popover
+        class="NNPE-popover"
+        placement="bottom"
+        width="446"
+        trigger="hover"
+        @show="showPopover(1)"
+        @hide="hidePopover"
+        v-if="audioData && (audioData.script || audioData.translation)"
+      >
+        <template slot="reference">
+          <!-- <img v-if="activeIndex==1" class="icon_popover" src="../../../assets/NNPE/icon-popover-actiive.png"/>
                 <img v-else class="icon_popover" src="../../../assets/NNPE/icon-popover.png" /> -->
-            </template>
-            <div class="popover-content">
-                <div class="popover-script" v-if="activeContent==1">
-                    {{audioData.script}}
-                </div>
-                <div class="popover-script popover-translation" v-if="activeContent==2">
-                    {{audioData.translation}}
-                </div>
-                <div class="popover-bottom">
-                    <a :class="[activeContent==1?'active':'']" @click="activeContent=1">脚本</a>
-                    <a :class="[activeContent==2?'active':'']" @click="activeContent=2">译文</a>
-                </div>
-            </div>
-        </el-popover>
+        </template>
+        <div class="popover-content">
+          <div class="popover-script" v-if="activeContent == 1">
+            {{ audioData.script }}
+          </div>
+          <div
+            class="popover-script popover-translation"
+            v-if="activeContent == 2"
+          >
+            {{ audioData.translation }}
+          </div>
+          <div class="popover-bottom">
+            <a
+              :class="[activeContent == 1 ? 'active' : '']"
+              @click="activeContent = 1"
+              >脚本</a
+            >
+            <a
+              :class="[activeContent == 2 ? 'active' : '']"
+              @click="activeContent = 2"
+              >译文</a
+            >
+          </div>
+        </div>
+      </el-popover>
     </div>
     <audio
       :ref="audioId"
@@ -178,7 +208,7 @@ export default {
     "audio.playing": {
       handler(val) {
         this.$emit("playChange", val);
-        if (val) this.$emit("handleChangeStopAudio",this.audio.playing);
+        if (val) this.$emit("handleChangeStopAudio", this.audio.playing);
       },
     },
   },
@@ -188,8 +218,7 @@ export default {
   mounted() {
     let _this = this;
     let audioId = _this.audioId;
-    _this.$refs[audioId].addEventListener("loadstart", function () {
-    });
+    _this.$refs[audioId].addEventListener("loadstart", function () {});
     _this.$refs[audioId].addEventListener("play", function () {
       _this.audio.playing = true;
       _this.audio.isPlaying = true;
@@ -197,8 +226,9 @@ export default {
     });
     _this.$refs[audioId].addEventListener("pause", function () {
       _this.audio.playing = false;
+      _this.audio.isPlaying = false;
       if (_this.hideSlider && _this.audio.currentTime + 0.5 > _this.ed) {
-        _this.$emit("handleChangeStopAudio",false);
+        _this.$emit("handleChangeStopAudio", false);
       }
       _this.$emit("handleListenRead", false);
     });
@@ -234,15 +264,19 @@ export default {
     PlayAudio() {
       let audioId = this.audioId;
       let audio = document.getElementsByTagName("audio");
-      if(audio&&audio.length>0&&window.location.href.indexOf('GCLS-Learn')==-1){
+      if (
+        audio &&
+        audio.length > 0 &&
+        window.location.href.indexOf("GCLS-Learn") == -1
+      ) {
         audio.forEach((item) => {
-            if (item.src == this.mp3) {
+          if (item.src == this.mp3) {
             if (item.id !== audioId) {
-                item.pause();
+              item.pause();
             }
-            } else {
+          } else {
             item.pause();
-            }
+          }
         });
       }
       if (this.audio.playing) {
@@ -252,7 +286,7 @@ export default {
       } else {
         if (this.hideSlider) {
           this.$refs[audioId].play();
-        //   this.onTimeupdateTime(this.bg);
+          //   this.onTimeupdateTime(this.bg);
         } else {
           this.$refs[audioId].pause();
           this.$refs[audioId].play();
@@ -260,7 +294,7 @@ export default {
         this.audio.playing = true;
         this.isClick = true;
       }
-      this.$emit("handleChangeStopAudio",this.audio.playing);
+      this.$emit("handleChangeStopAudio", this.audio.playing);
     },
     oncanplaythrough() {
       let _this = this;
@@ -294,26 +328,25 @@ export default {
     },
     // 当音频当前时间改变后，进度条也要改变
     onTimeupdate(res) {
-      let _this = this
+      let _this = this;
       let audioId = this.audioId;
       this.audio.currentTime = res.target.currentTime;
       this.getCurTime(res.target.currentTime);
       this.playValue = (this.audio.currentTime / this.audio.maxTime) * 100;
       if (this.type == "audioLine") {
-          setTimeout(()=>{
-              if (!_this.isClick && _this.audio.currentTime > _this.ed) {
-                        if(_this.$refs[audioId]){
-                            _this.$refs[audioId].pause();
-                            _this.$emit("emptyEd");
-                        }
-                
-              }
-          },50)
+        setTimeout(() => {
+          if (!_this.isClick && _this.audio.currentTime > _this.ed) {
+            if (_this.$refs[audioId]) {
+              _this.$refs[audioId].pause();
+              _this.$emit("emptyEd");
+            }
+          }
+        }, 50);
       } else {
         if (this.hideSlider) {
           if (this.audio.currentTime + 0.5 > this.ed) {
             this.$refs[audioId].pause();
-            this.$emit("handleChangeStopAudio",false);
+            this.$emit("handleChangeStopAudio", false);
           }
         }
       }
@@ -325,11 +358,11 @@ export default {
       if (playFlag) {
         let audio = document.getElementsByTagName("audio");
         audio.forEach((item) => {
-            if (item.id !== audioId) {
-                item.pause();
-            }
+          if (item.id !== audioId) {
+            item.pause();
+          }
         });
-        
+
         this.$refs[audioId].play();
         this.audio.playing = true;
       }
@@ -369,13 +402,13 @@ export default {
       }
       return result;
     },
-    showPopover(e){
-        this.activeIndex = e
+    showPopover(e) {
+      this.activeIndex = e;
+    },
+    hidePopover() {
+      this.activeIndex = null;
+      this.activeContent = 1;
     },
-    hidePopover(){
-        this.activeIndex = null
-        this.activeContent = 1
-    }
   },
   // 生命周期-创建之前
   beforeCreated() {},

src/views/bookShelf/articleDetail.vue

@@ -1318,6 +1318,12 @@ export default {
                   if (item.vlCnName === "导出" || item.vlCnName === "导出词") {
                     item.vlCnName = "课标同根词";
                   }
+                  if (item.vlCnName === "必修") {
+                    item.vlCnName = "高中必修";
+                  }
+                  if (item.vlCnName === "选必") {
+                    item.vlCnName = "高中选必";
+                  }
                   item.value = item.vocabCount;
                   item = Object.assign(item, this.vocabularyType[item.vlId]);
                 }
@@ -1332,6 +1338,20 @@ export default {
                   ) {
                     item.word_explain.vl_level_name = "课标同根词";
                   }
+                  if (
+                    item.word_explain &&
+                    item.word_explain.vl_level_name &&
+                    item.word_explain.vl_level_name === "必修"
+                  ) {
+                    item.word_explain.vl_level_name = "高中必修";
+                  }
+                  if (
+                    item.word_explain &&
+                    item.word_explain.vl_level_name &&
+                    item.word_explain.vl_level_name === "选必"
+                  ) {
+                    item.word_explain.vl_level_name = "高中选必";
+                  }
                   item.collect = false;
                 });
               }

src/views/bookShelf/articlePeruseDetail.vue

@@ -346,7 +346,7 @@ export default {
               bg: "#FFE8F1",
             },
             xuanbi: {
-              text: "选必",
+              text: "高中选必",
               color: "#175DFF",
               bg: "#D9E2FC",
             },
@@ -387,7 +387,7 @@ export default {
               bg: "#FFE8F1",
             },
             xuanbi: {
-              text: "选必",
+              text: "高中选必",
               color: "#175DFF",
               bg: "#D9E2FC",
             },
@@ -426,7 +426,7 @@ export default {
               bg: "#F04F88",
             },
             xuanbi: {
-              text: "选必",
+              text: "高中选必",
               color: "#0A2E81",
               bg: "#5E89EF",
             },
@@ -465,7 +465,7 @@ export default {
               bg: "#F04F88",
             },
             xuanbi: {
-              text: "选必",
+              text: "高中选必",
               color: "#0A2E81",
               bg: "#5E89EF",
             },

src/views/bookShelf/components/PrintModel.vue

@@ -225,7 +225,13 @@
                     </div>
                   </template>
                 </div>
-                <template v-if="articleImg && articleImg[index]">
+                <template
+                  v-if="
+                    articleImg &&
+                    articleImg[index] &&
+                    printForm.range.indexOf('image') > -1
+                  "
+                >
                   <figure
                     v-for="(itemI, indexI) in articleImg[index]"
                     :key="indexI"

src/views/bookStore/Subscribe.vue

@@ -259,7 +259,7 @@
                         max-height="200px"
                         style="width: 317px"
                       >
-                        <el-table-column label="#" type="index" width="30">
+                        <el-table-column label="#" type="index" width="40">
                         </el-table-column>
                         <el-table-column
                           property="issue_no"

src/views/personalCenter/components/PersonalInfo.vue

@@ -289,12 +289,12 @@ export default {
           color: "#00C643",
         },
         3: {
-          text: "必修",
+          text: "高中必修",
           bg: "#E8F7FF",
           color: "#3491FA",
         },
         4: {
-          text: "选必",
+          text: "高中选必",
           bg: "#E8F3FF",
           color: "#165DFF",
         },
@@ -321,12 +321,12 @@ export default {
       },
       filtersTypeList: [
         {
-          text: "必修",
+          text: "高中必修",
           value: "3",
           checkBox: "",
         },
         {
-          text: "选必",
+          text: "高中选必",
           value: "4",
           checkBox: "",
         },

src/views/reporter/index.vue

@@ -4,7 +4,7 @@
       :headerBg="'#00ADEF'"
       :headerBorder="'#5C5C5C'"
       :userBg="'rgba(0, 0, 0, 0.24)'"
-      :LoginNavIndex="4"
+      :LoginNavIndex="3"
     />
     <!-- <ul class="option">
         <li class="option-item" :class="[typeValue===indexo?'active':'']" v-for="(itemo,indexo) in optionList" :key="indexo" @click="handleClick(indexo)">