init

activityPages/activityDetail/activityDetail.vue

@@ -554,14 +554,10 @@ export default {
     // 跳转新的小程序
     networkBtn() {
       if (this.detailData.OnlineParticipation.includes("http")) {
-        console.log(1);
-
         uni.navigateTo({
           url: "/activityPages/networkAttend/networkAttend?url=" + this.detailData.OnlineParticipation,
         });
       } else {
-        console.log(2);
-
         uni.navigateToMiniProgram({
           appId: "wxade30ff0c4ee757d",
           path: this.detailData.OnlineParticipation,
@@ -678,6 +674,7 @@ export default {
           list: this.detailData.VoiceList,
           activityId: this.detailData.ActivityId,
           activityTitle: this.detailData.ActivityName,
+          recordList: this.detailData
         });
       }
       this.$refs.childrenAudio.isRecord = false;
@@ -715,7 +712,7 @@ export default {
     //视频的播放事件
     handelVideoPlay() {
       if (!this.isVideoPlay) {
-        Home.microAideoHistoryAdd({ VideoId: this.detailData.ActivityId, SourceType: 2 });
+        Home.microAideoHistoryAdd({ SourceId: this.detailData.ActivityId, SourceType: 2 });
       }
       this.isVideoPlay = true;
     },
@@ -732,7 +729,7 @@ export default {
     async isCollectionHandeler() {
       await this.$store.dispatch("showLoginModal");
       const res = await Home.microRoadshowCollect({
-        Id: this.detailData.FileType == 1 ? this.detailData.VoiceList.ActivityVoiceId : this.detailData.VideoDetail.Id,
+        SourceId: this.detailData.FileType == 1 ? this.detailData.VoiceList.ActivityVoiceId : this.detailData.VideoDetail.Id,
         SourceType: this.detailData.FileType,
         PageRouter: this.$store.state.pageRouterReport,
       });

activityPages/generationAsk/generationAsk.vue

@@ -44,7 +44,7 @@ export default {
       const res =
         this.roadshow && this.type == "文章"
           ? await Home.microRoadshowAdd({
-              Id: Number(this.id),
+              SourceId: Number(this.id),
               Content: this.advice_content,
               SourceType: Number(this.roadshow),
               Title: this.roadshowTitle,

activityPages/themeActivity/themeActivity.vue

@@ -315,7 +315,6 @@ export default {
 
     // 进入页面的初始化
     loadInit(option) {
-      console.log(option);
       this.label = option.title;
       this.type = option.type;
       this.chartPermissionIds = option.permissionIds || "";

components/ItemComponent/roadshowItem.vue

@@ -20,10 +20,14 @@
         ></image>
       </block>
       <text class="time">{{ list.PublishTime }}</text>
-      <view :class="['identification', list.Type != 1 && 'identification-video']"> </view>
+      <view :class="['identification', list.Type != 1 && list.Type != 4 && 'identification-video']"> </view>
       <image
         class="identification-img"
-        :src="list.Type == 1 ? 'https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/multimedia/video-iocn.png' : 'https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/multimedia/audio-icon.png'"
+        :src="
+          list.Type == 1 || list.Type == 4
+            ? 'https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/multimedia/video-iocn.png'
+            : 'https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/multimedia/audio-icon.png'
+        "
       ></image>
     </view>
     <view class="title-share">
@@ -92,17 +96,17 @@ export default {
     async handelPlay(item) {
       await this.$store.dispatch("showLoginModal");
       let content_item = null;
-      if (item.AudioActivityId) {
+      if (item.SourceId) {
         content_item = {
-          ActivityId: item.AudioActivityId,
-          PlaySeconds: +item.AudioPlaySeconds,
-          ResourceUrl: item.AudioResourceUrl,
-          Title: item.AudioTitle,
-          Type: item.AudioType,
+          ActivityId: item.SourceId,
+          PlaySeconds: item.PlaySeconds,
+          ResourceUrl: item.ResourceUrl,
+          Title: item.Title,
+          Type: item.Type,
         };
       }
       if (item.AuthInfo.HasPermission == 1) {
-        item.Type == 1 || item.AudioType == 1 ? this.audioPlayBack(content_item ? content_item : item) : this.handelVideoPlay(item);
+        item.Type == 1 || item.AudioType == 1 || item.Type == 4 ? this.audioPlayBack(content_item ? content_item : item) : this.handelVideoPlay(item);
       } else {
         this.hasPermission = item.AuthInfo.HasPermission;
         this.jurisdictionList.ActivityId = item.Id;
@@ -145,21 +149,21 @@ export default {
           Name: item.Title,
           PlaySeconds: +item.PlaySeconds,
         };
-        this.$store.commit("audioBg/addAudio", { list: VoiceList, indexId: item.ActivityId, activityTitle: item.Title });
+        this.$store.commit("audioBg/addAudio", { list: VoiceList, indexId: item.ActivityId, activityTitle: item.Title, recordList: item });
       }
       this.$parent.showAudioPop = true;
     },
     //音视频的图标
     classifyIcon(item) {
       let srcItem = MultimediaIcon.find((key) => key.name == (item.AudioChartPermissionName || item.ChartPermissionName));
-      let imgSrc = item.Type == 1 || item.AudioType == 1 ? srcItem.audio : srcItem.video;
+      let imgSrc = item.Type == 1 || item.AudioType == 1 || item.Type == 4 ? srcItem.audio : srcItem.video;
       return imgSrc;
     },
     // 微路演留言
     async myLeavingMessageHandler(item) {
       await this.$store.dispatch("showLoginModal");
       uni.navigateTo({
-        url: "/activityPages/generationAsk/generationAsk?id=" + (item.Type == 3 ? item.Id : item.ActivityId) + "&type=文章&roadshow=" + item.Type + "&roadshowTitle=" + item.Title,
+        url: "/activityPages/generationAsk/generationAsk?id=" + item.SourceId + "&type=文章&roadshow=" + item.Type + "&roadshowTitle=" + item.Title,
       });
     },
 
@@ -169,7 +173,7 @@ export default {
     },
     // 跳转
     goDetails() {
-      console.log(this.list);
+      if (this.list.Type == 4) return;
       if (this.list.Type == 3) {
         // 跳转产业资源包
         uni.navigateTo({ url: "/reportPages/IndustryReport/IndustryReport?id=" + this.list.IndustryId });
@@ -188,8 +192,9 @@ export default {
         Url: item.ResourceUrl,
         Name: item.Title,
         PlaySeconds: +item.PlaySeconds,
-        indexId: item.ActivityId,
+        indexId: item.SourceId || item.ActivityId,
         activityTitle: item.Title,
+        recordList: item,
       };
       const playlist = this.$store.state.audioJoinPlaylist.playlist.some((key) => key.indexId === dataList.indexId);
       if (!playlist) {

components/activity/indexActivity.js

@@ -69,7 +69,6 @@ export default {
     signupIsAddOfCancel(item, type, valName = "") {
       let id = this.activityIdAdd || item.ActivityId;
       this.itemData = item;
-      console.log(this.itemData, item.IsSignup);
       if (item && item.IsSignup == 1) {
         if (item.IsResearchPoints) {
           if (isTimeGreaterThanCurrent(item.CancelDeadline)) {

components/activity/mediaMixins.js

@@ -66,7 +66,7 @@ export default {
           this.globalBgAudioManager.pause();
         }
       } else {
-        this.$store.commit("audioBg/addAudio", { list: item.VoiceList, activityId: item.ActivityId, activityTitle: item.ActivityName });
+        this.$store.commit("audioBg/addAudio", { list: item.VoiceList, activityId: item.ActivityId, activityTitle: item.ActivityName,recordList: item });
       }
       this.showAudioPop = true;
     },

components/audioModule/index.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- v-if="showAudioPop" -->
-  <view class="container global-audio-box">
+  <view class="container global-audio-box" v-if="showAudioPop">
     <view class="bg-overlay" @click="isShowMaskHandler"></view>
 
     <view class="audio-box">
@@ -40,6 +40,7 @@
           </view>
         </view>
         <view class="fast-reverse">
+          <view :style="{ color: PreviousNextSong == 0 ? '#f00' : '#333' }" @click="isPreviousNextSongHandler(PreviousNextSong == 0, '上')">上一首</view>
           <image @click="speedReverseHandler('reverse')" class="speed-img" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/fastReverse_icon.png"></image>
           <block v-for="(item, index) in timesTheSpeed" :key="item.value">
             <view class="speed-button" v-if="isTimes == item.value" @click="isTimesHandler(index)">
@@ -47,6 +48,7 @@
             </view>
           </block>
           <image @click="speedReverseHandler('speed')" class="speed-img" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/speed_icon.png"></image>
+          <view :style="{ color: PreviousNextSong == playlistData.length - 1 ? '#f00' : '#333' }" @click="isPreviousNextSongHandler(PreviousNextSong == playlistData.length - 1, '下')">下一首</view>
         </view>
       </view>
     </view>
@@ -120,9 +122,17 @@ export default {
     isEnded() {
       return this.$store.state.audioBg.isAudioEnded;
     },
+    // 播放列表数据
     playlistData() {
       return this.$store.state.audioJoinPlaylist.playlist;
     },
+    // 上、下一首歌曲禁用
+    PreviousNextSong() {
+      const curAudio = this.$store.state.audioBg.list;
+      let indexId = this.$store.state.audioBg.indexId;
+      let indexPlay = this.playlistData.findIndex((_) => _.Name === curAudio.Name && _.indexId === indexId);
+      return indexPlay;
+    },
   },
   watch: {
     audioInit: {
@@ -210,13 +220,12 @@ export default {
       });
       // 音频onEnded
       this.globalBgAudioManager.onEnded(() => {
+        const curAudio = this.$store.state.audioBg.list;
+        let indexId = this.$store.state.audioBg.indexId;
+        this.onEndedpalyHandler(curAudio, indexId);
         console.log("音频onEnded");
         this.backAudioPlay();
         clearInterval(this.palyTimeout);
-        this.$emit("update:showAudioPop", false);
-        this.$store.commit("audioBg/setAudioEnd", true);
-        this.$store.commit("audioBg/parseIntAudio", false);
-        this.$store.commit("audioBg/removeAudio");
       });
       // 音频onError
       this.globalBgAudioManager.onError((e) => {
@@ -284,19 +293,21 @@ export default {
 
     // 播放了记录
     backAudioPlay() {
-      if ((this.$store.state.audioBg.activityId || this.$store.state.audioBg.indexId) && this.palyTime >= 0) {
-        activity.backAudioPlay({
-          ActivityId: this.$store.state.audioBg.activityId || this.$store.state.audioBg.indexId || "",
-          PlaySeconds: this.palyTime,
-          PageRouter: this.$store.state.pageRouterReport,
-        });
-      } else if (this.$store.state.audioBg.reportId && this.palyTime >= 0) {
-        Reports.reportVoiceHistoryAdd({
-          ArticleId: this.$store.state.audioBg.reportId,
-          PlaySeconds: this.palyTime,
-          PageRouter: this.$store.state.pageRouterReport,
-        });
-      }
+      // let recordList = this.$store.state.audioBg.recordList;
+      // if ((this.$store.state.audioBg.activityId || this.$store.state.audioBg.indexId) && this.palyTime >= 0) {
+      //   activity.backAudioPlay({
+      //     SourceId: recordList.SourceId || recordList.ActivityId,
+      //     SourceType: recordList.Type ? recordList.Type : 1,
+      //     PlaySeconds: this.palyTime,
+      //     PageRouter: this.$store.state.pageRouterReport,
+      //   });
+      // } else if (this.$store.state.audioBg.reportId && this.palyTime >= 0) {
+      //   Reports.reportVoiceHistoryAdd({
+      //     ArticleId: this.$store.state.audioBg.reportId,
+      //     PlaySeconds: this.palyTime,
+      //     PageRouter: this.$store.state.pageRouterReport,
+      //   });
+      // }
     },
     // 手指离开了拖动进度条
     touchstartHandler() {
@@ -306,8 +317,8 @@ export default {
     onCloseHandler() {
       this.showTabulation = false;
     },
+    // 点击了播放列表
     palyHandler(item) {
-      console.log(item,this.$store.state.audioBg.indexId);
       if (this.$store.state.audioBg.indexId == item.indexId) {
         if (this.globalBgAudioManager.paused) {
           this.globalBgAudioManager.play();
@@ -315,14 +326,37 @@ export default {
           this.globalBgAudioManager.pause();
         }
       } else {
-        console.log(112233);
+        this.playlistDataInit(item);
+      }
+    },
+    // 播放结束后 播放下一首
+    onEndedpalyHandler(curAudio, indexId) {
+      let item = this.playlistData[this.PreviousNextSong + 1];
+      if (item) {
+        this.playlistDataInit(item);
+      } else {
+        this.$emit("update:showAudioPop", false);
+        this.$store.commit("audioBg/setAudioEnd", true);
+        this.$store.commit("audioBg/parseIntAudio", false);
+        this.$store.commit("audioBg/removeAudio");
+      }
+    },
+    // 上一首 下一首
+    isPreviousNextSongHandler(isPlay, type) {
+      if (isPlay) return;
+      let item = this.playlistData[type == "上" ? this.PreviousNextSong - 1 : this.PreviousNextSong + 1];
+      this.playlistDataInit(item);
+    },
+    // 处理播放列表的数据
+    playlistDataInit(item) {
+      if (item) {
         let VoiceList = {
           Url: item.Url,
           Name: item.Name,
           PlaySeconds: item.PlaySeconds,
         };
-        this.$store.commit("audioBg/addAudio", { list: VoiceList, indexId: item.indexId, activityTitle: item.activityTitle });
-        this.init()
+        this.$store.commit("audioBg/addAudio", { list: VoiceList, indexId: item.indexId, activityTitle: item.activityTitle, recordList: item.recordList });
+        this.init();
       }
     },
   },

components/report/timeLine.vue

@@ -57,7 +57,6 @@ export default {
   mounted() {},
   methods: {
     async goDetailFromTimeLine(item, index) {
-      // console.log(item);
       item.TimeLineId &&
         (await Reports.postTacticsHistory({
           TimeLineId: item.TimeLineId,
@@ -91,7 +90,7 @@ export default {
             Name: item.Title,
             PlaySeconds: item.VoicePlaySeconds,
           };
-          this.$store.commit("audioBg/addAudio", { list: VoiceList, indexId: item.Id, activityTitle: item.Title });
+          this.$store.commit("audioBg/addAudio", { list: VoiceList, indexId: item.Id, activityTitle: item.Title, recordList: item });
         }
         this.showAudioPop = true;
       } else {
@@ -121,7 +120,7 @@ export default {
           TimeLineId: item.TimeLineId,
         });
       } else {
-      await  Reports.morning_meeting_history({ Id: item.Id, SourcePage: "展开" });
+        await Reports.morning_meeting_history({ Id: item.Id, SourcePage: "展开" });
         this.getRecordTracking("展开收起", { Id: item.Id });
       }
 

components/videoModule/index.vue

@@ -70,7 +70,7 @@ export default {
     //视频的播放事件
     handelVideoPlayChild() {
       this.videoContext = wx.createVideoContext(this.videoPopList.Id.toString(), this);
-      Home.microAideoHistoryAdd({ VideoId: this.videoPopList.ActivityId || this.videoPopList.Id, SourceType: this.videoPopList.ActivityId ? 2 : 1, PageRouter: this.$store.state.pageRouterReport });
+      Home.microAideoHistoryAdd({ SourceId: this.videoPopList.ActivityId || this.videoPopList.Id, SourceType: this.videoPopList.ActivityId ? 2 : 1, PageRouter: this.$store.state.pageRouterReport });
       this.curVideoTime = 0;
       if (this.curVideoId == this.videoPopList.Id || this.activityVideoId == this.videoPopList.ActivityId) {
         this.curVideoTime = this.$store.state.videoPlay.palyCurrentTime;

config/modules/Reports.js

@@ -175,4 +175,8 @@ export const Reports = {
   morning_meeting_history: (params) => {
     return postHttp("/morning_meeting/history/add", params, 0);
   },
+  // 获取行业
+  permissionNoyx: (params) => {
+    return getHttp("/permission/noyx", params, 0);
+  },
 };

config/modules/activity.js

@@ -92,7 +92,7 @@ export const activity = {
     },
     //背景音频开始播放
     backAudioPlay: (params) => {
-      return postHttp("/activity/voiceHistory/add", params, 0);
+      return postHttp("/micro_roadshow/videoHistory/add", params, 0);
     },
     //专项产业报名取消报名接口
     activityApecialAdd: (params) => {

pageMy/myCollection/myCollection.vue

@@ -223,7 +223,7 @@ export default {
     async isCollectionHandeler(item) {
       await this.$store.dispatch("showLoginModal");
       const res = await Home.microRoadshowCollect({
-        Id: item.Id,
+        SourceId: item.SourceId,
         SourceType: item.Type,
         PageRouter: this.$store.state.pageRouterReport,
       });

pageMy/reportPage/reportPage.vue

@@ -268,7 +268,6 @@ export default {
           this.haveAuth = res.Data.HasPermission;
           this.isShowWriter = res.Data.IsShow;
           this.reportInfo = res.Data.Detail;
-          console.log(this.reportInfo);
           if (!this.isUserBindingPhoneNumber) {
             this.lableListForm = {
               CategoryName: this.reportInfo.CategoryName,

pages-purchaser/columnDetail/columnDetail.vue

@@ -131,7 +131,6 @@ export default {
     upDateCollectHandler(item) {
       this.specialList.forEach((key) => {
         if (key.Id === item.Id) {
-          console.log(key);
           key.CollectNum = item.IsCollect == 1 ? item.CollectNum - 1 : item.CollectNum + 1;
           key.IsCollect = item.IsCollect == 1 ? 0 : 1;
         }
@@ -149,7 +148,7 @@ export default {
   /** 用户点击分享 */
   onShareAppMessage: function (res) {
     return {
-      title: "研选专栏",
+      title: this.authorDetail.SpecialName,
       path: "/pages-purchaser/columnDetail/columnDetail?id=" + this.detailUserId,
     };
   },

pages-purchaser/components/imageUpload.vue

@@ -154,7 +154,6 @@ export default {
       } else {
         height = (Math.ceil(this.imageList.length / this.colsValue) * this.viewWidth).toFixed() + "px";
       }
-      console.log("areaHeight", height);
       return height;
     },
     childWidth() {
@@ -165,7 +164,6 @@ export default {
     value: {
       handler(n) {
         if (!this.first && this.changeStatus) {
-          console.log("watch", n);
           let flag = false;
           for (let i = 0; i < n.length; i++) {
             if (flag) {
@@ -185,7 +183,6 @@ export default {
     modelValue: {
       handler(n) {
         if (!this.first && this.changeStatus) {
-          console.log("watch", n);
           let flag = false;
           for (let i = 0; i < n.length; i++) {
             if (flag) {
@@ -275,7 +272,6 @@ export default {
               });
             }, 0);
           }
-          // console.log('bbb', JSON.parse(JSON.stringify(item)));
           this.sortList();
         }
       }
@@ -323,9 +319,7 @@ export default {
           this.tempItem = null;
           this.changeStatus = true;
         });
-        // console.log('ccc', JSON.parse(JSON.stringify(item)));
       }, 0);
-      // console.log('ddd', JSON.parse(JSON.stringify(item)));
     },
     previewImage(item) {
       if (this.timer && this.preStatus && this.changeStatus && item.offset < 28.28) {
@@ -333,7 +327,6 @@ export default {
         this.timer = null;
         const list = this.value || this.modelValue;
         let srcList = list.map((v) => this.getSrc(v));
-        console.log(list, srcList);
         uni.previewImage({
           urls: srcList,
           current: item.src,
@@ -344,7 +337,6 @@ export default {
             }, 600);
           },
           fail: (e) => {
-            console.log(e);
           },
         });
       } else if (this.timer) {
@@ -439,7 +431,6 @@ export default {
       //#endif
     },
     sortList() {
-      console.log("sortList");
       const result = [];
       let source = this.value;
       // #ifdef VUE3
@@ -469,7 +460,6 @@ export default {
       this.$emit("update:modelValue", result);
     },
     addProperties(item) {
-      console.log(item);
       let absX = this.imageList.length % this.colsValue;
       let absY = Math.floor(this.imageList.length / this.colsValue);
       let x = absX * this.viewWidth;

pages-purchaser/noteAndViewpoint/noteAndViewpoint.vue

@@ -121,7 +121,7 @@ export default {
   /** 用户点击分享 */
   onShareAppMessage: function (res) {
     return {
-      title: (this.detailDataForm.Type == 1 ? "笔记" : "观点") + "详情",
+      title: this.detailDataForm.Title,
       path: "/pages-purchaser/noteAndViewpoint/noteAndViewpoint?id=" + this.detailId,
     };
   },

pages-purchaser/purchaserActivity/purchaserActivity.vue

@@ -93,7 +93,6 @@ export default {
       if (res.Ret === 200) {
         this.activityTypeList = res.Data.List || [];
       }
-      console.log(res);
     },
   },
   /** 用户点击分享 */

pages-purchaser/survey/surveyDetail.vue

@@ -22,7 +22,6 @@
 			}
 		},
 		onLoad(option) {
-			// console.log(option,'option');
 			this.getDetail(option.surveyId || 0)
 		}
 	}

pages-purchaser/survey/surveySubmit.vue

@@ -32,7 +32,6 @@ export default {
       this.surveyText = e.detail;
     },
     submit() {
-      // console.log(this.surveyText);
       if (!this.surveyText) {
         uni.showToast({
           title: "调研需求不能为空",
@@ -57,7 +56,6 @@ export default {
   onLoad(option) {
     let id = option.Id || 0;
     this.url = `${leafletUrl}?Id=${id}#wechat_redirect`;
-    console.log(this.url);
   },
 };
 </script>

pages-search/components/roadshow.vue

@@ -44,7 +44,7 @@ export default {
     async isCollectionHandeler(item) {
       await this.$store.dispatch("showLoginModal");
       const res = await Home.microRoadshowCollect({
-        Id: item.Id,
+        SourceId: item.SourceId,
         SourceType: item.Type,
         PageRouter: this.$store.state.pageRouterReport,
       });

pages-search/components/synthetical.vue

@@ -8,7 +8,7 @@
             <block v-if="item.Source === 'newchart'">
               <ChartItem :list="item.Newchart" :isMyChartCollection="isMyChartCollection" @myChartIsTop="myChartIsTop" @myChartCollect="myChartCollect" />
             </block>
-            <block v-if="item.Source === 'roadshow' || item.Source === 'activityvideo' || item.Source === 'activityvoice'">
+            <block v-if="item.Source === 'roadshow' || item.Source === 'activityvideo' || item.Source === 'activityvoice' || item.Source === 'askserievideo'">
               <RoadshowItem :list="item.Roadshow" @isCollectionHandeler="isCollectionHandeler" />
             </block>
             <block v-if="item.Source === 'activity' || item.Source === 'activityspecial'">
@@ -33,7 +33,7 @@
             <block v-if="item.Source === 'industrialsource'">
               <Industrialsource :list="item.IndustrialResource" />
             </block>
-            <block v-if="item.Source === 'roadshow' || item.Source === 'activityvideo' || item.Source === 'activityvoice'">
+            <block v-if="item.Source === 'roadshow' || item.Source === 'activityvideo' || item.Source === 'activityvoice' || item.Source === 'askserievideo'">
               <RoadshowItem :list="item.Roadshow" @isCollectionHandeler="isCollectionHandeler" />
             </block>
             <block v-if="item.Source === 'activity' || item.Source === 'activityspecial'">
@@ -126,7 +126,7 @@ export default {
               Article: item.Article || item.YanxuanSpecial,
               Newchart: item.Newchart,
               Activity: item.Activity || item.Activityspecial,
-              Roadshow: item.Roadshow || item.Activityvideo || item.Activityvoice,
+              Roadshow: item.Roadshow || item.Activityvideo || item.Activityvoice || item.AskserieVideo,
               ThreeSummary: item.Researchsummary || item.Minutessummary || item.Meetingreviewchapt || item.ProductInterior,
               IndustrialResource: item.IndustrialResource,
             };

pages-signIn/isSignIn/components/uploadContact.vue

@@ -93,7 +93,6 @@ export default {
     "itemDetail.Mobile": {
       handler(newVal) {
         this.phoneNumber = newVal;
-        console.log(this.phoneNumber);
       },
       deep: true,
       immediate: true,
@@ -101,7 +100,6 @@ export default {
   },
   methods: {
     radioChange(e) {
-      console.log(e);
       this.radioValue = e.detail.value;
     },
     // 选择区号的取消

pages/index/index.vue

@@ -50,7 +50,7 @@
                 <block v-if="item.Source === 'newchart'">
                   <ChartItem :list="item.Newchart" :isMyChartCollection="isMyChartCollection" @myChartIsTop="myChartIsTop" @myChartCollect="myChartCollect" />
                 </block>
-                <block v-if="item.Source === 'roadshow' || item.Source === 'activityvideo' || item.Source === 'activityvoice'">
+                <block v-if="item.Source === 'roadshow' || item.Source === 'activityvideo' || item.Source === 'activityvoice' || item.Source === 'askserievideo'">
                   <RoadshowItem :list="item.Roadshow" @isCollectionHandeler="isCollectionHandeler" />
                 </block>
                 <block v-if="item.Source === 'activity' || item.Source === 'activityspecial'">
@@ -69,7 +69,7 @@
                 <block v-if="item.Source === 'newchart'">
                   <ChartItem :list="item.Newchart" :isMyChartCollection="isMyChartCollection" @myChartIsTop="myChartIsTop" @myChartCollect="myChartCollect" />
                 </block>
-                <block v-if="item.Source === 'roadshow' || item.Source === 'activityvideo' || item.Source === 'activityvoice'">
+                <block v-if="item.Source === 'roadshow' || item.Source === 'activityvideo' || item.Source === 'activityvoice' || item.Source === 'askserievideo'">
                   <RoadshowItem :list="item.Roadshow" @isCollectionHandeler="isCollectionHandeler" />
                 </block>
                 <block v-if="item.Source === 'activity' || item.Source === 'activityspecial'">
@@ -213,7 +213,7 @@ export default {
               Article: item.Article || item.YanxuanSpecial,
               Newchart: item.Newchart,
               Activity: item.Activity || item.Activityspecial,
-              Roadshow: item.Roadshow || item.Activityvideo || item.Activityvoice,
+              Roadshow: item.Roadshow || item.Activityvideo || item.Activityvoice || item.AskserieVideo,
               ThreeSummary: item.Researchsummary || item.Minutessummary || item.Meetingreviewchapt || item.ProductInterior || item.ReportSelection,
             };
             listArr.push({ ...obj, IsShowData: obj.Article || obj.Newchart || obj.Roadshow || obj.Activity || obj.ThreeSummary || item.YanxuanSpecial });
@@ -229,7 +229,7 @@ export default {
     async isCollectionHandeler(item) {
       await this.$store.dispatch("showLoginModal");
       const res = await Home.microRoadshowCollect({
-        Id: item.Id,
+        SourceId: item.SourceId,
         SourceType: item.Type,
         PageRouter: this.$store.state.pageRouterReport,
       });
@@ -395,7 +395,7 @@ export default {
     async homeTagListCustom() {
       const res = await Home.homeTagListCustom();
       if (res.Ret === 200) {
-        const arr = res.Data || [];
+        const arr = res.Data.List || [];
         this.dataListLable = arr.map((item) => {
           return {
             ...item,

pages/material/material.vue

@@ -5,7 +5,7 @@
       <view class="top-tabs">
         <block v-for="item in topTabBars" :key="item.Id">
           <view v-if="item.IsShow" :class="['item', item.Id == topTabsActive && 'tabs-active']" @click="topTabsChange(item)">
-            {{ showTabBarsText(item.Name) }}
+            {{ item.Name}}
             <block v-if="(item.Id === 3 || item.Name == '图表') && wholeShowListData.IsShowChart">
               <image class="limit-img tabs-img" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/limit_icon.png" mode=""></image>
             </block>
@@ -30,13 +30,32 @@
             }}</view>
           </view>
         </block>
-        <!-- <view v-if="topTabsActive == '4'" class="medium-ul">
-          <view class="item-content">
-            <view @click="mediumClickHandler(item)" :class="['item', item.isSelect && 'item-act']" v-for="item in mediumSelect" :key="item.value">
+        <view v-if="topTabsActive == '4'" class="medium-ul">
+          <view class="global_two_tabs">
+            <view @click="mediumClickHandler(item)" :class="['item', item.isSelect && 'tabs-active']" v-for="item in mediumSelect" :key="item.value">
               {{ item.name }}
             </view>
+            <!-- 各种状态选择 -->
+            <view class="select-conyent" ref="select-conyent" style="margin-left: 20rpx">
+              <van-dropdown-menu active-color="#333333">
+                <van-dropdown-item id="industry" :title="chartPermissionName">
+                  <view class="menu-items">
+                    <view class="menu-items-box" v-for="item in listChartPermission" :key="item.ChartPermissionId" @click="overallClick(item)">
+                      <view class="items-box">
+                        <u-icon v-if="item.IsChoose" name="checkbox-mark" :color="'#376cbb'" size="24"></u-icon>
+                      </view>
+                      <text>{{ item.PermissionName }}</text>
+                    </view>
+                  </view>
+                  <view class="replacement">
+                    <text @click="replacementBtn" class="replacement-box">重置</text>
+                    <text @click="replacementConfirm">确定</text>
+                  </view>
+                </van-dropdown-item>
+              </van-dropdown-menu>
+            </view>
           </view>
-        </view> -->
+        </view>
       </view>
     </view>
     <block v-if="haveData">
@@ -120,12 +139,19 @@ export default {
       showTransition: false, //点击绝密后的隐现
       isBindingMobile: true, //图表我的收藏是否绑定手机号
       videoContext: null,
-      audioShareId: "", //通过分享单个音频点进页面时使用
-      videoShareId: "", //通过分享单个视频点进页面时使用
-      activityShareId: "",
+      shareSourceType: "", //通过分享单个音频点进页面时使用
+      shareSourceId: "", //通过分享单个视频点进页面时使用
       roadshowPageList: [], //音频  视频 list
       showAudioPop: false,
       mediumActive: "",
+      mediumSelect: [
+        { name: "路演回放", value: 1, IsChoose: false },
+        { name: "问答系列", value: 2, IsChoose: false },
+        { name: "调研反馈", value: 3, IsChoose: false },
+      ],
+      listChartPermission: [], // 行业
+      chartPermissionName: "全行业",
+      chartPermissionIds: "",
     };
   },
   components: {
@@ -138,14 +164,14 @@ export default {
   },
   watch: {},
   onLoad(optios) {
+    this.getUserSearchContent();
     this.getHeaderTab();
     if (optios.topTabsActive) {
       this.topTabsActive = optios.topTabsActive;
       this.secondActive = optios.secondActive;
       this.chartChildrenActive = optios.childrenActive;
-      this.videoShareId = optios.videoShareId;
-      this.audioShareId = optios.audioShareId;
-      this.activityShareId = optios.activityId;
+      this.shareSourceType = optios.SourceType;
+      this.shareSourceId = optios.SourceId;
     }
     this.getTabs();
     this.getReportList();
@@ -186,8 +212,8 @@ export default {
       this.secondActive = "";
       this.pageNum = 1;
       this.dataList = [];
-      this.audioShareId = "";
-      this.videoShareId = "";
+      this.shareSourceId = "";
+      this.shareSourceType = "";
       uni.pageScrollTo({
         scrollTop: 0,
         duration: 0,
@@ -233,6 +259,8 @@ export default {
     },
     // 点击为路演的筛选
     mediumClickHandler(item) {
+      this.shareSourceType = "";
+      this.shareSourceId = "";
       item.isSelect = !item.isSelect;
       let arr = [];
       this.mediumSelect.forEach((key) => {
@@ -301,10 +329,10 @@ export default {
         const res = await Home.microRoadshowList({
           PageSize: this.pageSize,
           CurrentIndex: this.pageNum,
-          AudioId: this.audioShareId,
-          VideoId: this.activityShareId ? "" : this.videoShareId,
-          ActivityVideoId: this.activityShareId && this.videoShareId,
-          Filter: this.mediumActive,
+          SourceId: this.shareSourceId,
+          SourceType: this.shareSourceType,
+          ChartPermissionIds: this.chartPermissionIds,
+          SearchType: this.mediumActive,
         });
         if (res.Ret === 200) {
           this.status = this.pageNum < res.Data.Paging.Pages ? "loadmore" : "nomore";
@@ -453,7 +481,7 @@ export default {
     async isCollectionHandeler(item) {
       await this.$store.dispatch("showLoginModal");
       const res = await Home.microRoadshowCollect({
-        Id: item.Id,
+        SourceId: item.SourceId,
         SourceType: item.Type,
         PageRouter: this.$store.state.pageRouterReport,
       });
@@ -466,11 +494,50 @@ export default {
         });
       }
     },
-    showTabBarsText(key) {
-      if (key == "微路演") {
-        return "路演回放";
+    // 选择的选中事件
+    overallClick(item) {
+      item.IsChoose = !item.IsChoose;
+    },
+    // 下拉的选择的重置事件
+    replacementBtn() {
+      this.page_no = 1;
+      this.chartPermissionIds = "";
+      this.listChartPermission.map((item) => (item.IsChoose = false));
+      this.chartPermissionName = "全行业";
+      this.initData();
+    },
+    // 下拉选择的确定事件
+    replacementConfirm() {
+      this.page_no = 1;
+      const arr = [];
+      const str = [];
+      this.listChartPermission.forEach((key) => {
+        if (key.IsChoose) {
+          arr.push(key.ChartPermissionId);
+          str.push(key.PermissionName);
+        }
+      });
+      if (str.length == this.listChartPermission.length || str.length <= 0) {
+        this.chartPermissionName = "全行业";
+      } else {
+        this.chartPermissionName = str.join(",");
+      }
+      this.chartPermissionIds = arr.join(",");
+      this.initData();
+      this.selectComponent("#industry").toggle(false);
+    },
+    // 获取权限、所有的行业
+    async getUserSearchContent() {
+      const res = await Reports.permissionNoyx({});
+      if (res.Ret === 200) {
+        this.listChartPermission =
+          res.Data.List.map((item) => {
+            return {
+              ...item,
+              IsChoose: false,
+            };
+          }) || [];
       }
-      return key;
     },
   },
   onHide() {
@@ -484,9 +551,8 @@ export default {
   },
   /* 下拉刷新 */
   onPullDownRefresh: Throttle(function () {
-    this.audioShareId = "";
-    this.videoShareId = "";
-    this.activityShareId = "";
+    this.shareSourceId = "";
+    this.shareSourceType = "";
     this.status = "loadmore";
     this.refresh = true;
     this.dataList = [];
@@ -504,15 +570,11 @@ export default {
   onShareAppMessage: function ({ from, target }) {
     if (from === "button") {
       let item = target.dataset.item;
-      let audio_id = item.Type == 1 || item.AudioType == 1 ? item.Id : "";
-      // type=2 -- 活动视频 type=3 -- 产业视频
-      let video_id = item.Type == 2 || item.Type == 3 ? item.Id : "";
-      let activity_id = item.Type == 2 && item.ActivityId > 0 ? item.ActivityId : "";
       let title_share = item.AudioTitle || item.Title;
-      this.getRecordTracking("微路演转发", { ActivityId: item.ActivityId, Id: item.Id, Type: item.Type });
+      this.getRecordTracking("微路演转发", { SourceId: item.SourceId, SourceType: item.SourceType });
       return {
-        title: this.isHorzMobile ? "好友向您推荐此内容，上传名片享查研观向免费月卡！" : title_share,
-        path: "/pages/material/material?topTabsActive=4" + "&audioShareId=" + audio_id + "&videoShareId=" + video_id + "&activityId=" + activity_id,
+        title: title_share,
+        path: "/pages/material/material?topTabsActive=4" + "&SourceId=" + item.SourceId + "&SourceType=" + item.Type,
         imageUrl: item.AudioShareImg || item.ShareImg,
       };
     } else {
@@ -633,5 +695,81 @@ export default {
       margin: 50rpx auto;
     }
   }
+  .select-conyent {
+    .items-box {
+      width: 40rpx;
+    }
+
+    .menu-items {
+      background-color: #f8f8fa;
+      width: 100%;
+      display: flex;
+      flex-wrap: wrap;
+      padding: 30rpx 30rpx 0;
+
+      .menu-items-box {
+        display: flex;
+        width: 50%;
+        font-size: 28rpx;
+        font-weight: 400;
+        margin-bottom: 40rpx;
+      }
+    }
+
+    .replacement {
+      margin: 0rpx 30rpx 20rpx;
+      display: flex;
+      background-color: $uni-color-new;
+      height: 60rpx;
+      line-height: 58rpx;
+      font-size: 28rpx;
+      font-weight: 400;
+      color: #ffffff;
+      border-radius: 30rpx;
+
+      text {
+        flex: 1;
+        text-align: center;
+        line-height: 60rpx;
+      }
+
+      .replacement-box {
+        border: 1rpx solid $uni-color-new;
+        line-height: 58rpx;
+        color: $uni-color-new;
+        background: #ffffff;
+        border-radius: 28rpx 0rpx 28rpx 28rpx;
+      }
+    }
+  }
+
+  /deep/.van-dropdown-menu {
+    background-color: #fff;
+    box-shadow: none !important;
+    display: flex;
+    align-items: center;
+  }
+
+  /deep/.van-dropdown-menu__item {
+    box-sizing: border-box;
+    width: 160rpx;
+    // margin-right: 20rpx;
+    padding-right: 20rpx;
+    height: 51rpx;
+    border-radius: 26rpx;
+    background: #f8f8fa;
+  }
+
+  /deep/.van-dropdown-item {
+    margin-top: -10rpx;
+  }
+
+  /deep/[data-index="2"] {
+    margin-right: 0rpx;
+  }
+
+  /deep/ .van-ellipsis {
+    font-size: 24rpx;
+  }
 }
 </style>

pages/reportForm/reportForm.vue

@@ -590,9 +590,7 @@ export default {
     async getBannerList() {
       const res = await Reports.collectionBannerList();
       if (res.Ret === 200) {
-        console.log(res);
         this.bannerDataList = res.Data.ListA || [];
-        console.log(this.bannerDataList);
         this.bulletinData = res.Data.ListB || {};
       }
     },

reportPages/IndustryReport/IndustryReport.vue

@@ -312,7 +312,7 @@ export default {
     },
     //
     async handelVideoBindplay() {
-      const res = await Home.microAideoHistoryAdd({ VideoId: this.industryVideo.Id, SourceType: 1, PageRouter: this.$store.state.pageRouterReport });
+      const res = await Home.microAideoHistoryAdd({ SourceId: this.industryVideo.Id, SourceType: this.industryVideo.Type, PageRouter: this.$store.state.pageRouterReport });
     },
     //展开收起晨会内容
     handleExpand(item, index) {

store/modules/audioBg.js

@@ -14,11 +14,13 @@ const audioModules = {
     parseIntShow: false, //
     isDragSlide: false, //是否在拖动进度条
     isAudioEnded: false, //
+    recordList: {}, //记录音频播放的数据
   },
   mutations: {
     addAudio(state, payload) {
       state.show = true;
       state.list = payload.list;
+      state.recordList = payload.recordList;
       state.activityTitle = payload.activityTitle;
       state.activityId = payload.activityId || 0;
       state.reportId = payload.reportId || 0;
@@ -39,9 +41,10 @@ const audioModules = {
     removeAudio(state, payload) {
       state.show = false;
       state.list = [];
+      state.recordList = {};
       state.activityId = 0;
       state.reportId = 0;
-      state.indexId = 0
+      state.indexId = 0;
       state.curTime = 0;
       state.paused = true;
     },

store/modules/audioPlaylist.js

@@ -8,28 +8,28 @@ const audioJoinPlaylist = {
         PlaySeconds: 190,
         Url: "https://hongze.oss-accelerate.aliyuncs.com/static/audio/202311/20231101/Hz6rdgtHCwQtDoDUR9p4ImNJ12ZZ.mp3",
         activityTitle: "血液灌流器械.mp3",
-        indexId: 0,
+        indexId: 7,
       },
       {
         Name: "昊轩京剧-吴昊 - 走卒 (戏腔女版).mp3",
         PlaySeconds: 213,
         Url: "https://hongze.oss-accelerate.aliyuncs.com/static/audio/202311/20231101/EkvvFI7CGn8cLjCB62scauahvDkw.mp3",
         activityTitle: "昊轩京剧-吴昊 - 走卒 (戏腔女版).mp3",
-        indexId: 0,
+        indexId: 6,
       },
       {
         Name: "林俊杰 .mp3",
         PlaySeconds: 237,
         Url: "https://hongze.oss-accelerate.aliyuncs.com/static/audio/202310/20231031/h229ufVmjpOXSKJQeKr2B6RcCpOS.mp3",
         activityTitle: "林俊杰 .mp3",
-        indexId: 0,
+        indexId: 3,
       },
       {
         Name: "郁可唯 - 水中花 (Live).mp3",
         PlaySeconds: 210,
         Url: "https://hongze.oss-accelerate.aliyuncs.com/static/audio/202310/20231030/SiI1jCNPGg0xJgY0Cn9tH9DCkUOL.mp3",
         activityTitle: "郁可唯 - 水中花 (Live).mp3",
-        indexId: 0,
+        indexId: 2,
       },
     ],
   },