7.4

App.vue

@@ -48,7 +48,6 @@ export default {
       const updateManager = uni.getUpdateManager();
       updateManager.onCheckForUpdate(function (res) {
         // 请求完新版本信息的回调
-        // console.log(res.hasUpdate);
       });
       updateManager.onUpdateReady(function (res) {
         uni.showModal({

activityPages/activityDetail/activityDetail.vue

@@ -12,7 +12,7 @@
         <!-- 内容部分 -->
         <view class="content">
           <view v-if="detailData.ActivityName" class="dialog-title" :class="1 == 1 ? 'brackets-title' : ''">{{ detailData.ActivityName }}</view>
-          <view class="audio-card">
+          <view class="audio-card" v-if="detailData.VoiceList && detailData.VoiceList.Url">
             <view class="card-title text_oneLine">
               {{ detailData.VoiceList.Name }}
             </view>
@@ -61,9 +61,9 @@
           <view v-if="detailData.Listndustrial.length" class="network dustrial-ui">
             <view class="network-left">产业标签：</view>
             <view class="network-right dustrial-content">
-              <view :class="['dustrial-li', item.IsJump && 'dustrial-item']" @click="goDustrialHandler(item)" v-for="item in detailData.Listndustrial" :key="item.IndustrialManagementId"
-                >{{ item.IndustryName }}
-                <image class="new_icon" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/new_icon.png" mode=""></image>
+              <view class="item" v-for="item in detailData.Listndustrial" :key="item.IndustrialManagementId">
+                <view :class="['dustrial-li', item.IsJump && 'dustrial-item']" @click="goDustrialHandler(item)">{{ item.IndustryName }} </view>
+                <image v-if="item.IndustryNewLabel" class="new_icon" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/new_report.png" mode=""></image>
               </view>
             </view>
           </view>
@@ -233,9 +233,9 @@
       <jurisdiction :idAct="id" :haveAuth="haveAuth" :industryMsg="industryMsg" :msgType="msgType" :sellerMobile="sellerMobile" :sellerName="sellerName"></jurisdiction>
     </view>
     <freeCharge class="free-charge" :isShowFreeBtn="isShowFree" />
-    <!-- <view v-show="showAudioBox"> -->
+    <view v-show="showAudioBox">
       <audioModule :showAudioPop="false" />
-    <!-- </view> -->
+    </view>
   </view>
 </template>
 
@@ -322,7 +322,8 @@ export default {
     },
     //几倍的播放数度
     isTimes() {
-      return this.$store.state.audioBg.multiple;
+      let isMultiple = this.curVoiceId === this.detailData.ActivityId ? this.$store.state.audioBg.multiple : 1;
+      return isMultiple;
     },
   },
   components: {
@@ -535,9 +536,6 @@ export default {
     },
     //快进 快退
     speedReverseHandler(type) {
-      if (!this.globalBgAudioManager.src) {
-        this.init();
-      }
       let isTime = type == "reverse" ? this.curTime - 15 : this.curTime + 15;
       isTime = isTime <= 0 ? 0 : isTime;
       this.globalBgAudioManager.seek(isTime);
@@ -553,12 +551,12 @@ export default {
       this.getActivityDetail();
     }
   },
-  // onShow() {
-  //   this.showAudioBox = true;
-  // },
-  // onHide() {
-  //   this.showAudioBox = false;
-  // },
+  onShow() {
+    this.showAudioBox = true;
+  },
+  onHide() {
+    this.showAudioBox = false;
+  },
   /**
    * 用户点击分享
    */
@@ -616,9 +614,9 @@ export default {
       color: #2c83ff;
     }
     .new_icon {
-      width: 26rpx;
-      height: 28rpx;
-      margin-left: 10rpx;
+      width: 60rpx;
+      height: 30rpx;
+      margin: 0 20rpx 20rpx 0;
     }
     .dialog-title {
       width: 682rpx;
@@ -671,6 +669,12 @@ export default {
     .dustrial-content {
       display: flex;
       flex-wrap: wrap;
+      .item {
+        display: flex;
+        align-items: center;
+        padding-left: 0;
+        margin-left: 0;
+      }
     }
     .network-zoom {
       .text_zoom {

activityPages/activitySearch/activitySearch.vue

@@ -162,7 +162,9 @@
         <view style="color: #a9afb8" @click="selectShow = false">取消</view>
       </u-popup>
     </view>
-    <audioModule :showAudioPop.sync="showAudioPop" />
+    <view v-if="showAudioBox">
+      <audioModule :showAudioPop.sync="showAudioPop" />
+    </view>
     <freeCharge class="free-charge" :isShowFreeBtn="isShowFree" />
   </view>
 </template>
@@ -204,6 +206,7 @@ export default {
       dynamicList: [],
       hotKeyWord: [],
       showAudioPop: false,
+      showAudioBox: false,
     };
   },
   mixins: [myMixin, myActivityMixin],
@@ -340,6 +343,10 @@ export default {
   onShow() {
     this.countryCcode(); //判断是否加区号
     this.$store.dispatch("statistics", { PageType: "ActivitSearch" });
+    this.showAudioBox = true;
+  },
+  onHide() {
+    this.showAudioBox = false
   },
   //load
   onLoad(option) {

activityPages/playBack/playBack.vue

@@ -64,9 +64,9 @@
       </view>
       <u-loadmore :status="status" icon-type="flower" :load-text="loadText" margin-top="20" v-if="totalPage > 1" />
     </view>
-    <!-- <view v-if="showAudioBox"> -->
+    <view v-if="showAudioBox">
       <audioModule :showAudioPop.sync="showAudioPop" />
-    <!-- </view> -->
+    </view>
   </view>
 </template>
 
@@ -231,12 +231,12 @@ export default {
     this.getActivityList();
     this.getUserSearchContent();
   },
-  // onShow() {
-  //   this.showAudioBox = true;
-  // },
-  // onHide() {
-  //   this.showAudioBox = false;
-  // },
+  onShow() {
+    this.showAudioBox = true;
+  },
+  onHide() {
+    this.showAudioBox = false;
+  },
   /* 触底 */
   onReachBottom: Throttle(function () {
     if (this.status === "nomore") return;

activityPages/themeActivity/themeActivity.vue

@@ -1,9 +1,9 @@
 <template>
   <view class="container theme-container">
     <view class="top-title" v-if="!type">
-      <view class="content-title">
-        <text>{{ contentLabel }}</text>
-        <image class="new_icon" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/new_icon.png" mode=""></image>
+      <view :class="['content-title', !contentDetail.IsJump && 'jump-title']" @click="jumpHandler">
+        <text>{{ contentDetail.Label }}</text>
+        <image v-if="contentDetail.IsNew" class="new_icon" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/new_report.png" mode=""></image>
       </view>
     </view>
     <!-- 活动列表 -->
@@ -112,6 +112,7 @@ export default {
       hasPermission: "", //是否有权限
       contentImg: "",
       contentLabel: "",
+      contentDetail: {},
       label: "",
       type: "",
       permissionIds: "",
@@ -141,7 +142,7 @@ export default {
           });
         }
         this.contentImg = res.Data.ImgUrl;
-        this.contentLabel = res.Data.Label;
+        this.contentDetail = res.Data;
         this.status = this.page_no < res.Data.Paging.Pages ? "loadmore" : "nomore";
         if (this.page_no === 1) {
           this.collectList = res.Data.List || [];
@@ -162,6 +163,17 @@ export default {
         }
       });
     },
+    jumpHandler() {
+      if (this.contentDetail.IsJump) {
+        if (this.contentDetail.IsResearch) {
+          //严选
+          this.$store.dispatch("checkHandle", "/reportPages/researchTheme/researchTheme?id=" + this.contentDetail.IndustrialManagementId);
+        } else {
+          //非严选
+          this.$store.dispatch("checkHandle", "/reportPages/IndustryReport/IndustryReport?id=" + this.contentDetail.IndustrialManagementId);
+        }
+      }
+    },
   },
   onLoad(option) {
     this.label = option.title;
@@ -210,21 +222,23 @@ export default {
     background-color: #fff;
     display: flex;
     align-items: center;
-    height: 96rpx;
     color: #3385ff;
     font-size: 30rpx;
+    padding: 30rpx 30rpx 20rpx;
     .content-title {
       display: flex;
       align-items: center;
       padding: 7rpx 12rpx;
       background-color: #f8f8fa;
-      margin-left: 30rpx;
       .new_icon {
-        width: 26rpx;
-        height: 28rpx;
+        width: 60rpx;
+        height: 30rpx;
         margin-left: 10rpx;
       }
     }
+    .jump-title {
+      color: #999;
+    }
   }
   .collect-ul {
     padding-top: 10rpx;

components/audioModule/index.vue

@@ -87,12 +87,6 @@ export default {
     // 几倍的播放速度
     isTimes() {
       return this.$store.state.audioBg.multiple;
-      // get() {
-      //   return this.$store.state.audioBg.multiple;
-      // },
-      // set(val) {
-      //   return this.$store.state.audioBg.multiple = val;
-      // },
     },
   },
   watch: {
@@ -105,9 +99,7 @@ export default {
   },
 
   created() {},
-  mounted() {
-    this.init();
-  },
+  mounted() {},
   methods: {
     //点击隐藏事件
     isShowMaskHandler() {
@@ -115,68 +107,85 @@ export default {
     },
     //数据初次加载
     init() {
-      let delyTime = 0;
-      if (this.showAudioPop) {
-        console.log(123,'showAudioPop');
-        this.globalBgAudioManager.stop();
-        delyTime = 300;
-      }
       const curAudio = this.$store.state.audioBg.list;
-      setTimeout(() => {
-        if (this.globalBgAudioManager.src != curAudio.Url) {
-          this.globalBgAudioManager.src = curAudio.Url;
-          this.globalBgAudioManager.title = curAudio.Name;
-          this.$store.commit("audioBg/updateAudioTime", 0);
-          this.$store.commit("audioBg/setMultiple", 1);
-        }
+      if (this.globalBgAudioManager.src != curAudio.Url && curAudio.Url) {
+        this.$store.commit("audioBg/setMultiple", 1);
+        this.$store.commit("audioBg/updateAudioTime", 0);
+        this.globalBgInit();
+        this.globalBgAudioManager.startTime = 0;
         this.globalBgAudioManager.playbackRate = this.isTimes;
-        this.audioTime = curAudio.PlaySeconds;
-        this.title = curAudio.Name;
-        this.activityTitle = this.$store.state.audioBg.activityTitle;
-        this.curTime = this.$store.state.audioBg.curTime;
-        this.play = !this.globalBgAudioManager.paused;
-        this.listenAudio();
-      }, delyTime);
+        this.curTime = 0;
+      } else {
+        this.curTime = parseInt(this.globalBgAudioManager.currentTime);
+      }
+      this.audioTime = curAudio.PlaySeconds;
+      this.title = curAudio.Name;
+      this.activityTitle = this.$store.state.audioBg.activityTitle;
+      this.play = !this.globalBgAudioManager.paused;
+      this.listenAudio();
+    },
+    //播放不同的,或者播放结束了
+    globalBgInit(type) {
+      const curAudio = this.$store.state.audioBg.list;
+      this.globalBgAudioManager.src = curAudio.Url;
+      this.globalBgAudioManager.title = curAudio.Name;
+      if (type == "onEnded") {
+        this.play = false;
+        this.globalBgAudioManager.pause();
+        this.$store.commit("audioBg/updateAudioPause", true);
+      }
     },
+
     //音频播放事件
     listenAudio() {
-      console.log('执行了');
       this.globalBgAudioManager.onPlay(async () => {
-        console.log("onPlay");
+        console.log("音频播放");
         this.play = true;
         this.$store.commit("audioBg/updateAudioPause", false);
         if (this.$store.state.audioBg.activityId) {
           activity.backAudioPlay({ ActivityId: this.$store.state.audioBg.activityId });
         }
       });
+
       this.globalBgAudioManager.onPause(() => {
         console.log("音频暂停");
         this.play = false;
         this.$store.commit("audioBg/updateAudioPause", true);
       });
+
       this.globalBgAudioManager.onStop(() => {
         console.log("音频停止");
-        this.$store.commit("audioBg/removeAudio");
-
-        // uni.getSystemInfo({
-        //   success: (res) => {
-        //     if (res.osName == "ios") {
-        //       console.log("ios");
-        //       this.play = false;
-        //       this.$store.commit("audioBg/removeAudio");
-        //     } else {
-        //       this.play = false;
-        //       this.$store.commit("audioBg/updateAudioPause", true);
-        //     }
-        //   },
-        // });
+        this.$emit("update:showAudioPop", false);
+        uni.getSystemInfo({
+          success: (res) => {
+            if (res.osName == "ios") {
+              this.play = false;
+              this.$store.commit("audioBg/removeAudio");
+            } else {
+              this.play = false;
+              this.$store.commit("audioBg/updateAudioPause", true);
+            }
+          },
+        });
       });
+
       this.globalBgAudioManager.onEnded(() => {
         console.log("音频onEnded");
-        this.play = false;
-        this.$store.commit("audioBg/updateAudioPause", true);
-        this.$store.commit("audioBg/setMultiple", 1);
+        // this.$store.commit("audioBg/updateAudioTime", 0);
+        this.curTime = 0;
+        uni.getSystemInfo({
+          success: (res) => {
+            if (res.osName == "ios") {
+              this.globalBgInit("onEnded");
+            } else {
+              this.play = false;
+              this.globalBgAudioManager.pause();
+              this.$store.commit("audioBg/updateAudioPause", true);
+            }
+          },
+        });
       });
+
       this.globalBgAudioManager.onError((e) => {
         console.log("音频onError", e);
         this.$store.commit("audioBg/removeAudio");
@@ -186,45 +195,43 @@ export default {
           icon: "none",
         });
       });
+
       //音频的播放时间更新
       this.globalBgAudioManager.onTimeUpdate(() => {
-        this.curTime = parseInt(this.globalBgAudioManager.currentTime);
-        this.$store.commit("audioBg/updateAudioTime", this.curTime);
+        if (this.globalBgAudioManager.src && parseInt(this.globalBgAudioManager.currentTime) !== 0) {
+          this.curTime = parseInt(this.globalBgAudioManager.currentTime);
+          this.$store.commit("audioBg/updateAudioTime", this.curTime);
+        }
       });
     },
     //拖动进度条
     handleAudioSliderChange(e) {
       const value = e.detail.value;
-      console.log(value, "value");
       this.globalBgAudioManager.seek(value);
     },
     //音频点击暂停播放
     handleChangePlayStatus() {
-      if (this.globalBgAudioManager.src) {
-        if (!this.globalBgAudioManager.paused) {
-          this.globalBgAudioManager.pause();
-        } else {
-          this.globalBgAudioManager.play();
-        }
+      if (!this.globalBgAudioManager.paused) {
+        this.globalBgAudioManager.pause();
       } else {
-        this.init();
+        this.globalBgAudioManager.play();
       }
     },
     //倍速播放
     isTimesHandler(i) {
+      console.log(this.curTime);
       let index = i == 3 ? 0 : i + 1;
       this.$store.commit("audioBg/setMultiple", this.timesTheSpeed[index].value);
       this.globalBgAudioManager.playbackRate = this.isTimes;
       this.globalBgAudioManager.startTime = this.curTime;
-      this.play = true;
+      if (this.globalBgAudioManager.paused) {
+        this.globalBgAudioManager.play();
+      }
     },
     //快进 快退
     speedReverseHandler(type) {
-      if (!this.globalBgAudioManager.src) {
-        this.init();
-      }
       let isTime = type == "reverse" ? this.curTime - 15 : this.curTime + 15;
-      isTime = isTime <= 0 ? 0 : isTime;
+      isTime = isTime <= 0 ? 0 : isTime >= this.audioTime ? this.audioTime : isTime;
       this.globalBgAudioManager.seek(isTime);
     },
   },

config/util.js

@@ -88,7 +88,6 @@ export const modal = (title='',content,callback = function() {}) => {
 	        if (res.confirm) {
 	            callback()
 	        } else if (res.cancel) {
-	            // console.log('用户点击取消');
 	        }
 	    }
 	});
@@ -105,7 +104,6 @@ export const modalShow = (title='',content,confirm,callback = function() {}) =>
 	        if (res.confirm) {
 	            callback()
 	        } else if (res.cancel) {
-	            // console.log('用户点击取消');
 	        }
 	    }
 	});
@@ -207,7 +205,6 @@ export const upload = ({
          sourceType: ['album', 'camera'],//图片来源
          success: function (res) {
             const tempFilePaths = res.tempFilePaths;//相当于src路径
-            //console.log(tempFilePaths);
             uni.showToast({
                title: '正在上传...',
                icon: 'loading',
@@ -256,7 +253,6 @@ export const upload = ({
          sourceType: ['album', 'camera'],
          success: function (res) {
             const tempFilePaths = res.tempFilePaths;
-				console.log(tempFilePaths)
             let uploadImgCount = 0;
             uni.showToast({
                title: '正在上传...',

pageMy/applyTrial/applyTrial.vue

@@ -70,7 +70,6 @@ export default {
     /* 上传图片 */
     ChooseFile() {
       this.$util.upload.Single(uploadurl, (res) => {
-        //console.log(res)
         let data = JSON.parse(res.data);
         if (data.Ret === 200) {
           this.fileList = data.Data.ResourceUrl.split();

pageMy/authGuide/authGuide.vue

@@ -87,7 +87,6 @@ export default {
     },
     //微信授权登录
     getUserInfo(e) {
-      console.log(e);
       if (e.detail.userInfo) {
         let userInfo = e.detail.userInfo;
         this.sendData(e.detail);
@@ -109,7 +108,6 @@ export default {
           },
         });
       }).catch((e) => {
-        // console.log(e)
       });
     },
   },

pageMy/chartPage/chartPage.vue

@@ -47,7 +47,6 @@ export default {
         this.chartData = res.Data;
         this.isCollection = res.Data.IsCollection;
         this.httpUrl = encodeURIComponent(res.Data.HttpUrl);
-        console.log(this.httpUrl);
         uni.setNavigationBarTitle({
           title: this.chartData.Title,
         });

pageMy/login/login.vue

@@ -89,7 +89,6 @@ export default {
     },
     /* 授权获取手机号 */
     getPhoneNumber(e) {
-      //console.log(e)
       if (e.detail.errMsg == "getPhoneNumber:ok") {
         // 点击了允许
         User.getPhoneNum({

pageMy/mySchedulepage/mySchedulepage.vue

@@ -102,7 +102,9 @@
       :mailboxBinding="mailboxBinding"
     />
     <freeCharge class="free-charge" :isShowFreeBtn="isShowFree" />
-    <audioModule :showAudioPop.sync="showAudioPop" />
+    <view v-if="showAudioBox">
+      <audioModule :showAudioPop.sync="showAudioPop" />
+    </view>
   </view>
 </template>
 
@@ -135,6 +137,7 @@ export default {
       isrefresh: true,
       activityTypeId: "",
       showAudioPop: false,
+      showAudioBox: false,
     };
   },
   computed: {
@@ -188,6 +191,10 @@ export default {
   },
   async onShow() {
     await this.$store.dispatch("checkHandle", "noGO");
+    this.showAudioBox = true;
+  },
+  onHide() {
+    this.showAudioBox = false;
   },
   /* 触底 */
   onReachBottom: Throttle(function () {

pageMy/reportDetail/reportDetail.vue

@@ -236,7 +236,6 @@ export default {
       // 跳转入口
       this.getDetail();
     }
-    console.log('show');
   },
   onLoad(option) {
     this.id = option.id ? option.id : "";
@@ -244,7 +243,6 @@ export default {
       this.errorDetails();
     }
     this.userIsShowAlert();
-    console.log('进来了');
   },
   /**
    * 用户点击分享

pageMy/search/search.vue

@@ -330,7 +330,6 @@ export default {
     this.pageNum++;
     this.resultList = this.resultList.concat(this.resultDataList.slice((this.pageNum - 1) * this.pageSize, this.pageNum * this.pageSize));
     this.status = this.pageNum * 10 < this.totalPage ? "loadmore" : "nomore";
-    console.log(this.status);
   }),
 };
 </script>

pages.json

@@ -347,7 +347,9 @@
       "van-icon": "/wxcomponents/vant/dist/icon/index",
       "van-radio": "/wxcomponents/vant/dist/radio/index",
       "van-radio-group": "/wxcomponents/vant/dist/radio-group/index",
-      "van-overlay": "/wxcomponents/vant/dist/overlay/index"
+      "van-overlay": "/wxcomponents/vant/dist/overlay/index",
+      "van-checkbox": "/wxcomponents/vant/dist/checkbox/index",
+      "van-checkbox-group": "/wxcomponents/vant/dist/checkbox-group/index"
     }
   },
   "tabBar": {

pages/activity/activity.vue

@@ -45,12 +45,12 @@
       <view class="content-list">
         <view class="half">
           <view class="activity-ltem" v-for="(item, index) in collectTypeList" :key="index" v-if="item.Position == 1">
-            <image class="zindex-one" :src="item.ImgUrl"></image>
+            <image class="zindex-one" :src="item.ImgUrl" lazy-load></image>
             <view class="content">
               <view class="item-img" @click="goDetails(item)"> </view>
               <view :style="{ 'background-image': 'url(' + item.ImgUrlBg + ')' }" class="activity-ui">
                 <view class="activity-li" :style="{ 'background-image': 'url(' + val.ImgUrlBg + ')' }" v-for="val in item.List" :key="val.KeyWord" @click="goDetails(val, item.Resource)">
-                  <image class="item-image" lazy-load src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/hot_activity.png"></image>
+                  <image v-if="val.IsNew" class="item-image" lazy-load src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/hot_activity.png"></image>
                   <text class="text_oneLine"> {{ val.KeyWord }}</text>
                 </view>
               </view>
@@ -59,12 +59,12 @@
         </view>
         <view class="half">
           <view class="activity-ltem" v-for="(item, index) in collectTypeList" :key="index" v-if="item.Position == 2">
-            <image class="zindex-one" :src="item.ImgUrl"></image>
+            <image class="zindex-one" :src="item.ImgUrl" lazy-load></image>
             <view class="content">
               <view class="item-img" @click="goDetails(item)"> </view>
               <view :style="{ 'background-image': 'url(' + item.ImgUrlBg + ')' }" class="activity-ui">
                 <view class="activity-li" :style="{ 'background-image': 'url(' + val.ImgUrlBg + ')' }" v-for="val in item.List" :key="val.KeyWord" @click="goDetails(val, item.Resource)">
-                  <image class="item-image" lazy-load src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/hot_activity.png"></image>
+                  <image v-if="val.IsNew" class="item-image" lazy-load src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/hot_activity.png"></image>
                   <text class="text_oneLine"> {{ val.KeyWord }}</text>
                 </view>
               </view>

pages/reportForm/index.scss

@@ -208,8 +208,12 @@
         color: #333333;
         font-size: 28rpx;
         font-weight: 400;
+        display: flex;
+      }
+      .checkbox-ui {
+        display: flex;
+        align-items: center;
       }
-
       .menu-items-tow {
         display: flex;
         padding: 30rpx 30rpx 20rpx;

pages/reportForm/reportForm.vue

@@ -70,31 +70,12 @@
             <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/property_ico.png" style="height: 50rpx"></image>
             <text class="text-sub">细分产业</text>
           </view>
-          <!-- <van-dropdown-menu active-color="#333333">
-            <van-dropdown-item id="menuItem" @open="isscroll" :title="overallArrangementName">
-              <view class="menu-items">
-                <view class="menu-items-box" @click="overallBtn(index, item)" v-for="(item, index) in overallArrangement" :key="item.id">
-                  <view class="items-box">
-                    <u-icon v-show="item.isShow" name="checkbox-mark" color="#2C83FF" size="24"> </u-icon>
-                  </view>
-                  <text>{{ item.name }}</text>
-                </view>
-              </view>
-              <view class="replacement-box">
-                <view class="replacement">
-                  <text @click="replacementBtn" class="replacement-box">重置</text>
-                  <text @click="replacementConfirm">确定</text>
-                </view>
-              </view>
-            </van-dropdown-item>
-          </van-dropdown-menu> -->
-          <!-- <view class="new-recommend">
-            <text :class="[pitchOnId == item.id ? 'items-act' : '']" v-for="(item, index) in pitchOn" :key="item.id" @click="pitchClick(item, index)">{{ item.name }}</text>
-          </view> -->
-          <checkbox-group class="checkbox-content">
-            <label style="margin-right:30rpx"> <checkbox value="cb" color="#3385FF" style="transform:scale(0.6)" />深度覆盖 </label>
-            <label> <checkbox value="cb" color="#3385FF" style="transform:scale(0.6)" />推荐关注</label>
-          </checkbox-group>
+          <view class="checkbox-content">
+            <van-checkbox-group class="checkbox-ui" :value="deepCoverFocus" @change="checkboxChange">
+              <van-checkbox style="margin-right: 30rpx" name="cover" icon-size="14" shape="square">深度覆盖</van-checkbox>
+              <van-checkbox name="focus" icon-size="14" shape="square">推荐关注</van-checkbox>
+            </van-checkbox-group>
+          </view>
         </view>
         <!-- 需要循环的地方 -->
         <view class="forindustry" v-for="item in industryList" :key="item.IndustrialManagementId">
@@ -108,7 +89,7 @@
               <view class="ndustry-box-read">
                 <text>{{ item.IndustryName }}</text>
                 <image class="hot-icon" v-if="item.IsHot" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/hot_report.png" mode=""></image>
-                <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/new_report.png" mode=""></image>
+                <image v-if="item.IsNew" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/new_report.png" mode=""></image>
               </view>
               <view class="ndustry-box-arrow">
                 <text v-if="item.IsRed" class="read"></text>
@@ -181,18 +162,6 @@ export default {
         backgroundImage: "none",
       },
       tabBarsTow: [],
-      // pitchOn: [
-      //   {
-      //     name: "最新",
-      //     id: "NewTime",
-      //   },
-      //   {
-      //     name: "关注度",
-      //     id: "Recommend",
-      //   },
-      // ],
-      // pitchOnId: "NewTime",
-      //pitchOnName: '按最近更新排序',
       isNum: 1,
       strategyIndex: "",
       strategyIndexTwo: 0,
@@ -212,20 +181,7 @@ export default {
       haveData: true,
       totalPage: "",
       matchTypeName: "",
-      // overallArrangement: [
-      //   {
-      //     name: "新布局产业",
-      //     id: "1",
-      //     isShow: false,
-      //   },
-      //   {
-      //     name: "深度研究产业",
-      //     id: "2",
-      //     isShow: false,
-      //   },
-      // ],
-      // overallArrangementId: "",
-      // overallArrangementName: "全部产业",
+      deepCoverFocus: [], //深度覆盖 //推荐关注
       isScrollShow: false,
       isGuideShow: false,
       limitIsShow: false, //限免显示隐藏
@@ -289,6 +245,7 @@ export default {
     //tabs切换事件
     toggleTab(item, index) {
       this.strategyIndex = index;
+      this.deepCoverFocus = [];
       if (this.tabAct_id !== item.ChartPermissionId) {
         this.tabAct_id = item.ChartPermissionId;
         this.$store.dispatch("statistics", {
@@ -327,17 +284,6 @@ export default {
         });
       }
     },
-    //点击产业报告的筛选条件
-    // pitchClick(item) {
-    //   this.pitchOnName = item.name;
-    //   this.OrderColumn = item.id;
-    //   if (this.pitchOnId !== item.id) {
-    //     this.pitchOnId = item.id;
-    //   }
-    //   this.page_no = 1;
-    //   this.status = "loadmore";
-    //   this.getIndustryList();
-    // },
     //获取报告所有品种接口
     getTradeList() {
       Reports.getTradeList({
@@ -355,8 +301,8 @@ export default {
         OrderColumn: this.OrderColumn,
         PageSize: this.pageSize,
         CurrentIndex: this.page_no,
-        // IsNewLabel: this.overallArrangementId.includes(1) ? "1" : "0",
-        // IsDeepLabel: this.overallArrangementId.includes(2) ? "1" : "0",
+        DeepCover: this.deepCoverFocus.includes("cover") ? 1 : 0,
+        RecommendFocus: this.deepCoverFocus.includes("focus") ? 1 : 0,
       }).then((res) => {
         // this.industryList=res.Data.List
         this.status = this.page_no < res.Data.Paging.Pages ? "loadmore" : "nomore";
@@ -437,42 +383,6 @@ export default {
     hideIsred(is) {
       this.tabBarsTow[this.strategyIndexTwo].IsRed = is;
     },
-    /* 新布局产业选项*/
-    // overallBtn(index, item) {
-    //   this.overallArrangement.forEach((key) => {
-    //     if (key.id == item.id) {
-    //       key.isShow = !key.isShow;
-    //     }
-    //   });
-    // },
-    /* 新布局产业选项确定按钮 */
-    // replacementConfirm() {
-    //   const arr = [];
-    //   const arrName = [];
-    //   this.overallArrangement.forEach((key) => {
-    //     if (key.isShow) {
-    //       arr.push(key.id);
-    //       arrName.push(key.name);
-    //     }
-    //   });
-    //   this.overallArrangementId = arr.join(",");
-    //   this.overallArrangementName = arrName.join(",") || "全部产业";
-    //   this.page_no = 1;
-    //   this.status = "loadmore";
-    //   this.getIndustryList();
-    //   this.selectComponent("#menuItem").toggle();
-    // },
-    /* 新布局产业选项重置按钮 */
-    // replacementBtn() {
-    //   this.OrderColumn = "NewTime";
-    //   this.pitchOnId = "NewTime";
-    //   this.overallArrangement.forEach((key) => (key.isShow = false));
-    //   this.overallArrangementName = "全部产业";
-    // },
-    /* 判断页面滚动 */
-    // isscroll: Debounce(function () {
-    //   this.isScrollShow = true;
-    // }),
     /* 搜索 */
     async goSearch() {
       await this.$store.dispatch("checkHandle", "/reportPages/reportSearch/reportSearch?id=报告");
@@ -480,21 +390,12 @@ export default {
     /* 初始 */
     initList() {
       if (this.tabAct_id && this.strategyIndex !== 4 && this.strategyIndex !== 5) {
-        // this.OrderColumn = "NewTime";
-        // this.pitchOnId = "NewTime";
-        // this.overallArrangementName = "全部产业";
-        // this.overallArrangementId = "";
         this.page_no = 1;
         this.refresh = true;
         this.getIndustryList();
         this.getTradeList();
-        // this.overallArrangement.forEach((key) => (key.isShow = false));
       }
       this.strategyIndex == 4 ? this.getstrategyAll() : (this.tabAct_idTwo = "");
-      // if (this.isScrollShow) {
-      //   this.selectComponent("#menuItem").toggle(false);
-      //   this.isScrollShow = false;
-      // }
       this.isNum = 1;
     },
     /* 页面加载 */
@@ -528,6 +429,12 @@ export default {
         url: "/reportPages/hotList/hotList",
       });
     },
+    //点击了checkbox
+    checkboxChange(e) {
+      this.deepCoverFocus = e.detail;
+      this.page_no = 1;
+      this.getIndustryList();
+    },
   },
   /* 触底 */
   onReachBottom: Throttle(function () {
@@ -577,7 +484,7 @@ export default {
       fail: (err) => {},
     };
   },
- 
+
   onHide() {
     if (this.showTransition) {
       this.showTransition = false;

reportPages/hotList/hotList.vue

@@ -29,7 +29,7 @@
                 {{ index + 1 }}
               </text>
               <text class="title-text text_oneLine" style="display: inline"> # {{ item.IndustryName }} </text>
-              <view class="industry-color" :style="[classifyColor('医药')]">医药</view>
+              <view class="industry-color" :style="[classifyColor(item.PermissionName)]">{{ item.PermissionName }}</view>
               <image class="new-img" v-if="item.IsNew" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/new_icon.png"></image>
             </view>
             <text :class="item.IsFollow ? 'cancel-attention' : 'attention'" @click="isAttention(item, '主题')">{{ item.IsFollow ? "取消关注" : "+ 关注" }}</text>
@@ -55,9 +55,8 @@
           <view class="li-item li-bottom" style="color: #999999">
             <view class="li-user text_oneLine">
               {{ item.PublishDate }}
-               <view class="industry-color" :style="[classifyColor('医药')]">医药</view>
+              <view class="industry-color" :style="[classifyColor(item.PermissionName)]">{{ item.PermissionName }}</view>
             </view>
-           
           </view>
         </view>
       </view>
@@ -163,7 +162,6 @@ export default {
     async isAttention(item, val) {
       const res = val === "主题" ? await Reports.reportFllow({ IndustrialManagementId: item.IndustrialManagementId }) : await Reports.reportFllowDepartment({ DepartmentId: item.DepartmentId });
       if (res.Ret === 200) {
-        console.log(item);
         item.IsFollow = !item.IsFollow;
         if (res.Data.Status == 1) {
           this.goFollowShow = true;
@@ -201,7 +199,6 @@ export default {
       let color_word = item == "医药" ? "#04CE3D" : item == "科技" ? "#3385FF" : item == "消费" ? "#F1BA70" : item == "智造" ? "#8F72E1" : "#F1925C";
       let color_bg = item == "医药" ? "#EEFFF2" : item == "科技" ? "#EEF5FF" : item == "消费" ? "#FFFAF3" : item == "智造" ? "#F4F0FF" : "#FFFAF2";
       let _isColor = { color: color_word, border: ` 1px solid ${color_word}`, "background-color": color_bg };
-      console.log(_isColor);
       return _isColor;
     },
   },
@@ -294,7 +291,7 @@ export default {
       }
       .li-user {
         margin-left: 46rpx;
-        display:flex;
+        display: flex;
         align-items: center;
       }
       .li-title {

reportPages/reportSearch/reportSearch.vue

@@ -341,7 +341,6 @@ export default {
     },
     //去往主题详情
     themeDetails(item) {
-      console.log(item);
       if (item.Source === 1) {
         //非严选
         this.$store.dispatch("checkHandle", "/reportPages/IndustryReport/IndustryReport?id=" + item.IndustrialManagementId);

reportPages/reportSecretDetail/reportSecretDetail.vue

@@ -93,7 +93,7 @@
     </view>
     <freeCharge class="free-charge" :isShowFreeBtn="isShowFree" />
     <view v-if="showAudioBox">
-      <audioModule :showAudioPop="false" />
+      <audioModule ref="refAudioPop" :showAudioPop="false" />
     </view>
   </view>
 </template>
@@ -152,7 +152,8 @@ export default {
     },
     //几倍的播放数度
     isTimes() {
-      return this.$store.state.audioBg.multiple;
+      let isMultiple = this.curVoiceId === this.detali.ArticleId ? this.$store.state.audioBg.multiple : 1;
+      return isMultiple;
     },
   },
   methods: {
@@ -190,7 +191,6 @@ export default {
             });
       if (res.Ret === 200) {
         let arr = res.Data.Detail.VideoPlaySeconds.split(":");
-        console.log(arr[0] * 60 + (arr[1] - 0));
         res.Data.Detail.VideoPlaySeconds = arr[0] * 60 + (arr[1] - 0);
         this.detali = res.Data.Detail;
         this.hasPermission = res.Data.HasPermission;
@@ -243,19 +243,22 @@ export default {
     },
     //倍速播放
     isTimesHandler(i) {
+      let list = { Url: this.detali.VideoUrl, Name: this.detali.Title, PlaySeconds: this.detali.VideoPlaySeconds };
       let index = i == 3 ? 0 : i + 1;
       this.$store.commit("audioBg/setMultiple", this.timesTheSpeed[index].value);
-      this.globalBgAudioManager.pause();
-      this.play = true;
       this.globalBgAudioManager.playbackRate = this.isTimes;
       this.globalBgAudioManager.startTime = this.curTime;
-      this.globalBgAudioManager.play();
+      if (this.$store.state.audioBg.reportId != this.detali.ArticleId) {
+        this.$store.commit("audioBg/addAudio", { list, reportId: this.detali.ArticleId });
+        this.globalBgAudioManager.play();
+      } else {
+        if (this.globalBgAudioManager.paused) {
+          this.globalBgAudioManager.play();
+        }
+      }
     },
     //快进 快退
     speedReverseHandler(type) {
-      if (!this.globalBgAudioManager.src) {
-        this.init();
-      }
       let isTime = type == "reverse" ? this.curTime - 15 : this.curTime + 15;
       isTime = isTime <= 0 ? 0 : isTime;
       this.globalBgAudioManager.seek(isTime);

store/modules/audioBg.js

@@ -30,7 +30,7 @@ const audioModules = {
     },
     //删除当前音频播放
     removeAudio(state, payload) {
-      state.list = [];
+      state.list = [{ Url: "", Name: "", Title: "" }];
       state.activityId = 0;
       state.paused = true;
     },