后端要测试

activityPages/activityDetail/activityDetail.vue

@@ -407,6 +407,7 @@ export default {
         })
         .then((res) => {
           if (res.Ret == 200) {
+            this.$store.commit("setRouterActivity", "活动详情");
             this.haveAuth = res.Data.HasPermission;
             this.jurisdictionList = res.Data;
             if (res.Data.HasPermission == 1) {
@@ -458,7 +459,8 @@ export default {
       });
     },
     // 提问
-    askingGo(type = "") {
+    async askingGo(type = "") {
+      await activity.checkAskActivity({ ActivityId: this.id, PageRouter: this.$store.state.pageRouterActivity });
       uni.navigateTo({
         url: "/activityPages/generationAsk/generationAsk?id=" + this.id + "&type=" + type,
       });
@@ -604,6 +606,7 @@ export default {
       const res = await Home.microRoadshowCollect({
         Id: this.detailData.FileType == 1 ? this.detailData.VoiceList.ActivityVoiceId : this.detailData.VideoDetail.Id,
         SourceType: this.detailData.FileType,
+        PageRouter: this.$store.state.pageRouterReport,
       });
       if (res.Ret === 200) {
         uni.showToast({
@@ -616,7 +619,6 @@ export default {
   },
   async onLoad(option) {
     this.id = option.id || "";
-    this.$store.commit("setRouterReport", "活动详情");
     // 详情页面不写路径
     await this.$store.dispatch("checkHandle");
     // this.listenAudio()
@@ -625,6 +627,9 @@ export default {
       this.getActivityDetail();
     }
   },
+  onShow() {
+    this.$store.commit("setRouterReport", "活动详情");
+  },
   /**
    * 用户点击分享
    */

activityPages/activityDetail/manageMixin.js

@@ -24,7 +24,7 @@ export default {
           cancelColor: "#606266",
           success: async (res) => {
             if (res.confirm) {
-              const res = await activity.signupCancel({ ActivityId: this.detailData.ActivityId, SignupType: type });
+              const res = await activity.signupCancel({ ActivityId: this.detailData.ActivityId, SignupType: type, PageRouter: this.$store.state.pageRouterActivity });
               if (res.Ret === 200) {
                 type == 1
                   ? uni.showToast({
@@ -50,6 +50,7 @@ export default {
           .signupAdd({
             ActivityId: this.detailData.ActivityId,
             SignupType: type,
+            PageRouter: this.$store.state.pageRouterActivity,
           })
           .then((res) => {
             if (res.Ret == 200) {
@@ -84,7 +85,7 @@ export default {
     // 预约/取消
     async summaryIsHandel() {
       if (this.detailData.IsAppointment == 0) {
-        const res = await activity.postAppointmentAdd({ ActivityId: Number(this.id) });
+        const res = await activity.postAppointmentAdd({ ActivityId: Number(this.id), PageRouter: this.$store.state.pageRouterActivity });
         if (res.Ret == 200) {
           this.hasPermission = res.Data.HasPermission;
           this.jurisdictionList = res.Data;
@@ -105,7 +106,7 @@ export default {
           cancelColor: "#606266",
           success: async (res) => {
             if (res.confirm) {
-              const res = await activity.postAppointmentCancel({ ActivityId: Number(this.id) });
+              const res = await activity.postAppointmentCancel({ ActivityId: Number(this.id), PageRouter: this.$store.state.pageRouterActivity });
               if (res.Ret === 200) {
                 this.getActivityDetail();
               }
@@ -120,6 +121,7 @@ export default {
         activity
           .meetingReminderCancel({
             ActivityId: Number(this.id),
+            PageRouter: this.$store.state.pageRouterActivity,
           })
           .then((res) => {
             if (res.Ret == 200) {
@@ -145,6 +147,7 @@ export default {
       activity
         .meetingReminderAdd({
           ActivityId: Number(this.id),
+          PageRouter: this.$store.state.pageRouterActivity,
         })
         .then((res) => {
           if (res.Ret == 200) {

activityPages/components/specialMixins.js

@@ -38,6 +38,7 @@ export default {
             if (res.confirm) {
               const res = await activity.activityApecialCancel({
                 ActivityId: item.ActivityId,
+                PageRouter: this.$store.state.pageRouterActivity,
               });
               if (res.Ret === 200) {
                 uni.showToast({
@@ -52,7 +53,7 @@ export default {
         });
       } else {
         // 报名
-        const res = await activity.activityApecialAdd({ ActivityId: item.ActivityId });
+        const res = await activity.activityApecialAdd({ ActivityId: item.ActivityId, PageRouter: this.$store.state.pageRouterActivity });
         if (res.Ret == 200) {
           this.modalShow(res);
           if (res.Data.SignupStatus == 1) {

activityPages/generationAsk/generationAsk.vue

@@ -51,10 +51,12 @@ export default {
           ? await Report.articleAskAdd({
               ArticleId: Number(this.id),
               Content: this.advice_content,
+              PageRouter: this.$store.state.pageRouterReport,
             })
           : await activity.activityAskAdd({
               ActivityId: Number(this.id),
               Content: this.advice_content,
+              PageRouter: this.$store.state.pageRouterReport,
             });
       if (res.Ret === 200) {
         this.$util.toast("提交成功");

activityPages/specialDetail/specialDetail.vue

@@ -141,6 +141,7 @@ export default {
     async interest() {
       const res = await activity.postSpecialSignupAdd({
         ActivityId: this.detailData.ActivityId,
+        PageRouter: this.$store.state.pageRouterActivity,
       });
       if (res.Ret === 200) {
         this.currentPages();
@@ -161,6 +162,7 @@ export default {
           if (res.confirm) {
             const res = await activity.postSpecialSignupAdd({
               ActivityId: this.detailData.ActivityId,
+              PageRouter: this.$store.state.pageRouterActivity,
             });
             if (res.Ret === 200) {
               this.detailData.IsSignup = 0;
@@ -184,7 +186,7 @@ export default {
 
     // 查看行程的事件
     lookImg() {
-      this.getRecordTracking("查看行程");
+      this.getRecordTracking(this.$store.state.pageRouterActivity, { ActivityId: this.detailData.ActivityId, Source: "查看行程" });
       uni.previewImage({
         urls: [this.detailData.TripImgLink], //查看图片的数组
       });

activityPages/specialResearchPage/specialResearchPage.vue

@@ -130,7 +130,7 @@ export default {
 
     // 查看行程的事件
     lookImg(item) {
-      this.getRecordTracking("查看行程");
+      this.getRecordTracking(this.$store.state.pageRouterActivity, { ActivityId: item.ActivityId, Source: "查看行程" });
       uni.previewImage({
         urls: [item.TripImgLink], //查看图片的数组
       });
@@ -145,6 +145,7 @@ export default {
     async interest(item) {
       const res = await activity.postSpecialSignupAdd({
         ActivityId: item.ActivityId,
+        PageRouter: this.$store.state.pageRouterActivity,
       });
       if (res.Ret === 200) {
         this.modalShow(res);
@@ -164,6 +165,7 @@ export default {
           if (res.confirm) {
             const res = await activity.postSpecialSignupAdd({
               ActivityId: item.ActivityId,
+              PageRouter: this.$store.state.pageRouterActivity,
             });
             if (res.Ret === 200) {
               item.IsSignup = 0;

activityPages/themeActivity/themeActivity.vue

@@ -289,7 +289,7 @@ export default {
 
     //查看行程的事件
     lookImg(item) {
-      this.getRecordTracking("查看行程");
+      this.getRecordTracking(this.$store.state.pageRouterActivity, { ActivityId: item.ActivityId, Source: "查看行程" });
       uni.previewImage({
         urls: [item.TripImgLink], //查看图片的数组
       });

components/ItemComponent/activityItem.vue

@@ -442,7 +442,7 @@ export default {
     },
     // 查看行程的事件
     lookImg(item) {
-      this.getRecordTracking("查看行程");
+      this.getRecordTracking(this.$store.state.pageRouterActivity, { ActivityId: item.ActivityId, Source: "查看行程" });
       uni.previewImage({
         urls: [item.TripImgLink], //查看图片的数组
       });
@@ -451,6 +451,7 @@ export default {
     async interest(item) {
       const res = await activity.postSpecialSignupAdd({
         ActivityId: item.ActivityId,
+        PageRouter: this.$store.state.pageRouterActivity,
       });
       if (res.Ret === 200) {
         this.modalShow(res);
@@ -477,6 +478,7 @@ export default {
             if (res.confirm) {
               const res = await activity.activityApecialCancel({
                 ActivityId: item.ActivityId,
+                PageRouter: this.$store.state.pageRouterActivity,
               });
               if (res.Ret === 200) {
                 uni.showToast({
@@ -491,7 +493,7 @@ export default {
         });
       } else {
         // 报名
-        const res = await activity.activityApecialAdd({ ActivityId: item.ActivityId });
+        const res = await activity.activityApecialAdd({ ActivityId: item.ActivityId, PageRouter: this.$store.state.pageRouterActivity });
         if (res.Ret == 200) {
           this.modalShow(res);
           if (res.Data.SignupStatus == 1) {
@@ -527,6 +529,7 @@ export default {
           if (res.confirm) {
             const res = await activity.postSpecialSignupAdd({
               ActivityId: item.ActivityId,
+              PageRouter: this.$store.state.pageRouterActivity,
             });
             if (res.Ret === 200) {
               this.parentDataEmit(item, "IsSignup", 0);

components/audioModule/index.vue

@@ -51,7 +51,7 @@
 </template>
 
 <script>
-import { activity } from "@/config/api";
+import { activity, Reports } from "@/config/api";
 export default {
   name: "",
   filters: {
@@ -270,7 +270,13 @@ 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,
+          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,
         });

config/modules/Reports.js

@@ -1,120 +1,122 @@
 import { getHttp, postHttp } from "../request.js";
 
-
 /* 报告  */
 export const Reports = {
-    /* 获取报告一级分类 */
-    getClassify: (params) => {
-      return getHttp("/permission/reportallV7", params, 0);
-    },
-    /* 获取策略的分类 */
-    getstrategyAll: (params) => {
-      return getHttp("/permission/strategyAll", params);
-    },
-    /* 获取策略的文章 */
-    getTacticsList: (params) => {
-      return getHttp("/tactics/list", params);
-    },
-    /* 获取产业报告分类列表接口*/
-    getTradeList: (params) => {
-      return getHttp("/report/home/tradeList", params, 0);
-    },
-    /* 报告搜索接口*/
-    getReportSearchReport: (params) => {
-      return getHttp("/report/searchReport", params, 0);
-    },
-  
-    /* 获取产业报告分类列表接口*/
-    getIndustryList: (params) => {
-      return getHttp("/report/home/industryList", params, 0);
-    },
-    /* 获取产业文章列表接口*/
-    getIndustryAndArticle: (params) => {
-      return getHttp("/report/searchResource", params, 0);
-    },
-    /* 是否置顶*/
-    postToptt: (params) => {
-      return postHttp("/report/top", params, 0);
-    },
-    /* 是否置顶*/
-    reportFllow: (params) => {
-      return postHttp("/report/fllow", params, 0);
-    },
-    /* 是否置顶*/
-    industryListByDepartment: (params) => {
-      return getHttp("/report/industryListByDepartment", params, 0);
-    },
-    /* 获取产业文章列表接口*/
-    industryReportList: (params) => {
-      return getHttp("/report/industry/reportList", params);
-    },
-    /* 关注作者/取消关注作者 接口*/
-    reportFllowDepartment: (params) => {
-      return postHttp("/report/fllowDepartment", params, 0);
-    },
-    /* 获取策略列表接口*/
-    getTactics: (params) => {
-      return getHttp("/tactics/list", params);
-    },
-    /* 产业下所关联的文章分类列表接口*/
-    toArticleCategoryList: (params) => {
-      return getHttp("/report/toArticleCategoryList", params);
-    }, //
-    /* 产业下所关联的文章分类列表接口*/
-    getArticleList: (params) => {
-      return getHttp("/report/industry/ArticleList", params);
-    },
-    /*上传文章阅读时间接口*/
-    addStopTime: (params) => {
-      return postHttp("/article/addStopTime", params, 0);
-    },
-    /* 获取研选最新主题关键词文章列表接口*/
-    reportListNew: (params) => {
-      return getHttp("/report/industry/reportListNew", params);
-    },
-    /* 获取是否展示绝密内参接口*/
-    reportIsShow: (params) => {
-      return getHttp("/report/isShow", params);
-    },
-    /* 获取报告精选、本周研究汇总、上周纪要汇总列表接口*/
-    reportListByType: (params) => {
-      return getHttp("/report/reportList/byType", params);
-    },
-    /* 获取报告精选详情接口*/
-    reportSelectionDetail: (params) => {
-      return getHttp("/report/reportSelection/detail", params);
-    },
-    /* 获取本周研究汇总详情接口*/
-    researchSummaryDetail: (params) => {
-      return getHttp("/report/researchSummary/detail", params);
-    },
-    /* 获取上周研究汇总详情接口*/
-    minutesSummaryDetail: (params) => {
-      return getHttp("/report/minutesSummary/detailv4", params);
-    },
-    /* 获取报告详情接口 /  路演精华*/
-    roadshowEssence: (params) => {
-      return getHttp("/report/roadshowEssence/detail", params);
-    },
-    /* 报告榜单table栏*/
-    getHotTableList: (params) => {
-      return getHttp("/report_billboard/table/list", params);
-    },
-    /* 获取产业关注榜接口*/
-    getIndustryFllowList: (params) => {
-      return getHttp("/report_billboard/industry/fllowList", params);
-    },
-    /* 获取阅读飙升榜/报告收藏榜接口 */
-    getIndustryReadList: (params) => {
-      return getHttp("/report_billboard/industry/readList", params);
-    },
-    /* 产业报告公司列表 */
-    getHomeStockName: (params) => {
-      return getHttp("/report/home/stockName", params);
-    },
-    /* 季度关注 */
-    getChartQuarter: (params) => {
-      return getHttp("/chart/jidu", params);
-    },
-    
-  };
+  /* 获取报告一级分类 */
+  getClassify: (params) => {
+    return getHttp("/permission/reportallV7", params, 0);
+  },
+  /* 获取策略的分类 */
+  getstrategyAll: (params) => {
+    return getHttp("/permission/strategyAll", params);
+  },
+  /* 获取策略的文章 */
+  getTacticsList: (params) => {
+    return getHttp("/tactics/list", params);
+  },
+  /* 获取产业报告分类列表接口*/
+  getTradeList: (params) => {
+    return getHttp("/report/home/tradeList", params, 0);
+  },
+  /* 报告搜索接口*/
+  getReportSearchReport: (params) => {
+    return getHttp("/report/searchReport", params, 0);
+  },
+
+  /* 获取产业报告分类列表接口*/
+  getIndustryList: (params) => {
+    return getHttp("/report/home/industryList", params, 0);
+  },
+  /* 获取产业文章列表接口*/
+  getIndustryAndArticle: (params) => {
+    return getHttp("/report/searchResource", params, 0);
+  },
+  /* 是否置顶*/
+  postToptt: (params) => {
+    return postHttp("/report/top", params, 0);
+  },
+  /* 是否置顶*/
+  reportFllow: (params) => {
+    return postHttp("/report/fllow", params, 0);
+  },
+  /* 是否置顶*/
+  industryListByDepartment: (params) => {
+    return getHttp("/report/industryListByDepartment", params, 0);
+  },
+  /* 获取产业文章列表接口*/
+  industryReportList: (params) => {
+    return getHttp("/report/industry/reportList", params);
+  },
+  /* 关注作者/取消关注作者 接口*/
+  reportFllowDepartment: (params) => {
+    return postHttp("/report/fllowDepartment", params, 0);
+  },
+  /* 获取策略列表接口*/
+  getTactics: (params) => {
+    return getHttp("/tactics/list", params);
+  },
+  /* 产业下所关联的文章分类列表接口*/
+  toArticleCategoryList: (params) => {
+    return getHttp("/report/toArticleCategoryList", params);
+  }, //
+  /* 产业下所关联的文章分类列表接口*/
+  getArticleList: (params) => {
+    return getHttp("/report/industry/ArticleList", params);
+  },
+  /*上传文章阅读时间接口*/
+  addStopTime: (params) => {
+    return postHttp("/article/addStopTime", params, 0);
+  },
+  /* 获取研选最新主题关键词文章列表接口*/
+  reportListNew: (params) => {
+    return getHttp("/report/industry/reportListNew", params);
+  },
+  /* 获取是否展示绝密内参接口*/
+  reportIsShow: (params) => {
+    return getHttp("/report/isShow", params);
+  },
+  /* 获取报告精选、本周研究汇总、上周纪要汇总列表接口*/
+  reportListByType: (params) => {
+    return getHttp("/report/reportList/byType", params);
+  },
+  /* 获取报告精选详情接口*/
+  reportSelectionDetail: (params) => {
+    return getHttp("/report/reportSelection/detail", params);
+  },
+  /* 获取本周研究汇总详情接口*/
+  researchSummaryDetail: (params) => {
+    return getHttp("/report/researchSummary/detail", params);
+  },
+  /* 获取上周研究汇总详情接口*/
+  minutesSummaryDetail: (params) => {
+    return getHttp("/report/minutesSummary/detailv4", params);
+  },
+  /* 获取报告详情接口 /  路演精华*/
+  roadshowEssence: (params) => {
+    return getHttp("/report/roadshowEssence/detail", params);
+  },
+  /* 报告榜单table栏*/
+  getHotTableList: (params) => {
+    return getHttp("/report_billboard/table/list", params);
+  },
+  /* 获取产业关注榜接口*/
+  getIndustryFllowList: (params) => {
+    return getHttp("/report_billboard/industry/fllowList", params);
+  },
+  /* 获取阅读飙升榜/报告收藏榜接口 */
+  getIndustryReadList: (params) => {
+    return getHttp("/report_billboard/industry/readList", params);
+  },
+  /* 产业报告公司列表 */
+  getHomeStockName: (params) => {
+    return getHttp("/report/home/stockName", params);
+  },
+  /* 季度关注 */
+  getChartQuarter: (params) => {
+    return getHttp("/chart/jidu", params);
+  },
+  /* 新增音频放记录 报告 */
+  reportVoiceHistoryAdd: (params) => {
+    return postHttp("/report/voiceHistory/add", params);
+  },
+};

pageMy/browseHistory/browseHistory.vue

@@ -109,7 +109,7 @@ export default {
 
     // 收藏
     async collectClick(item) {
-      const res = await Report.collectRpt({ ArticleId: item.ArticleId });
+      const res = await Report.collectRpt({ ArticleId: item.ArticleId, PageRouter: this.$store.state.pageRouterReport });
       if (res.Ret === 200) {
         item.IsCollect = !item.IsCollect;
         item.IsCollect

pageMy/myCollection/myCollection.vue

@@ -81,9 +81,6 @@ export default {
     uni.hideShareMenu();
     this.getCollectList();
   },
-  onShow() {
-    this.$store.commit("setRouterReport", "收藏");
-  },
   components: {
     freeCharge,
     RoadshowItem,
@@ -181,6 +178,7 @@ export default {
       const res = await Home.microRoadshowCollect({
         Id: item.Id,
         SourceType: item.Type,
+        PageRouter: this.$store.state.pageRouterReport,
       });
       if (res.Ret === 200) {
         let index = this.collectList.findIndex((key) => key.Id == item.Id);
@@ -207,6 +205,7 @@ export default {
   },
   onShow() {
     this.$store.commit("audioBg/parseIntAudio", true);
+    this.$store.commit("setRouterReport", "收藏");
   },
   onHide() {
     this.$store.commit("audioBg/parseIntAudio", false);
@@ -234,7 +233,7 @@ export default {
       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("我的收藏转发", { ActivityId: item.ActivityId, Id: item.Id, Type: item.Type });
       return {
         title: this.isHorzMobile ? "好友向您推荐此内容，上传名片享查研观向免费月卡！" : title_share,
         path: "/pages/material/material?topTabsActive=4" + "&audioShareId=" + audio_id + "&videoShareId=" + video_id + "&activityId=" + activity_id,

pageMy/mySchedulepage/mySchedulepage.vue

@@ -206,7 +206,7 @@ export default {
 
     //查看行程的事件
     lookImg(item) {
-      this.getRecordTracking("查看行程");
+      this.getRecordTracking(this.$store.state.pageRouterActivity, { ActivityId: item.ActivityId, Source: "查看行程" });
       uni.previewImage({
         urls: [item.TripImgLink], //查看图片的数组
       });
@@ -227,6 +227,7 @@ export default {
           if (res.confirm) {
             const res = await activity.activityApecialCancel({
               ActivityId: item.ActivityId,
+              PageRouter: this.$store.state.pageRouterActivity,
             });
             if (res.Ret === 200) {
               uni.showToast({

pageMy/reportDetail/reportDetail.vue

@@ -77,6 +77,7 @@ export default {
         PageRouter: this.$store.state.pageRouterReport,
       }).then((res) => {
         if (res.Ret === 200) {
+          this.$store.commit("setRouterReport", "报告详情");
           uni.setNavigationBarTitle({
             title: res.Data.Detail.IsSummary == 1 ? "纪要详情" : "报告详情",
           });
@@ -210,6 +211,7 @@ export default {
     collectHandle() {
       Report.collectRpt({
         ArticleId: Number(this.id),
+        PageRouter: this.$store.state.pageRouterReport,
       }).then((res) => {
         this.reportInfo.IsCollect = !this.reportInfo.IsCollect;
         this.$util.toast(res.Msg);

pageMy/reportPage/reportPage.vue

@@ -222,6 +222,7 @@ export default {
     collectHandle() {
       Report.collectRpt({
         ArticleId: Number(this.id),
+        PageRouter: this.$store.state.pageRouterReport,
       }).then((res) => {
         this.isCollection = !this.isCollection;
         this.$util.toast(res.Msg);

pages-search/components/activityBack.vue

@@ -214,7 +214,7 @@ export default {
   methods: {
     //查看行程的事件
     lookImg(item) {
-      this.getRecordTracking("查看行程");
+      this.getRecordTracking(this.$store.state.pageRouterActivity, { ActivityId: item.ActivityId, Source: "查看行程" });
       uni.previewImage({
         urls: [item.TripImgLink], //查看图片的数组
       });

pages-search/components/report.vue

@@ -9,9 +9,15 @@
         <text style="height: 1rpx; background: #ececec"></text>
         <view class="list-ui" v-for="item in reportPageData.ListHzResource" :key="item.IndustrialManagementId" @click="themeDetails(item)">
           <view class="item-title">
-            <text>
+            <view style="display: flex; align-items: center">
+              <view class="industry-box-left" @click.stop="reportFllow(item.IndustrialManagementId, '弘则')">
+                <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/attention_act.png" v-if="item.IsFollw"></image>
+                <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/attention_icon.png" v-else></image>
+              </view>
               {{ 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 v-if="item.IsNew" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/new_report.png" mode=""></image>
+            </view>
             <view class="publish">
               <text class="reg-hint" v-if="item.IsRed"></text>
               {{ item.PublishDate }}
@@ -58,9 +64,15 @@
         <text style="height: 1rpx; background: #ececec"></text>
         <view class="list-ui" v-for="item in reportPageData.ListYxResource" :key="item.IndustrialManagementId" @click="themeDetails(item)">
           <view class="item-title">
-            <text>
+            <view style="display: flex; align-items: center">
+              <view class="industry-box-left" @click.stop="reportFllow(item.IndustrialManagementId, '研选')">
+                <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/attention_act.png" v-if="item.IsFollw"></image>
+                <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/attention_icon.png" v-else></image>
+              </view>
               {{ 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 v-if="item.IsNew" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/new_report.png" mode=""></image>
+            </view>
             <view class="publish">
               {{ item.PublishDate }}更新
               <u-icon name="arrow-right" color="#BDBDBD" size="34"></u-icon>
@@ -174,7 +186,7 @@
 </template>
 
 <script>
-import { Report } from "@/config/api";
+import { Report, Reports } from "@/config/api";
 import videoModule from "@/components/videoModule/index";
 import modalDialog from "@/components/modalDialog.vue";
 export default {
@@ -202,7 +214,7 @@ export default {
   methods: {
     //去往文章详情页面
     goDetailReport(item) {
-      this.$store.dispatch("checkHandle", "/pageMy/reportDetail/reportDetail?id=" + item.ArticleId );
+      this.$store.dispatch("checkHandle", "/pageMy/reportDetail/reportDetail?id=" + item.ArticleId);
     },
     /* 进入详情 校验是否有该品种权限 */
     goDetail(item) {
@@ -222,7 +234,7 @@ export default {
     },
     //收藏
     async collectClick(item) {
-      const res = await Report.collectRpt({ ArticleId: item.ArticleId });
+      const res = await Report.collectRpt({ ArticleId: item.ArticleId, PageRouter: this.$store.state.pageRouterReport });
       if (res.Ret === 200) {
         item.IsCollect = !item.IsCollect;
         item.IsCollect
@@ -241,6 +253,39 @@ export default {
           });
       }
     },
+    //点击关注的图标
+    reportFllow(id, type) {
+      if (!this.$store.state.isAuth && !this.$store.state.isBind) {
+        Reports.reportFllow({
+          IndustrialManagementId: id,
+          PageRouter: "搜索关注",
+        }).then((res) => {
+          if (res.Ret === 200) {
+            if (res.Data.Status == 1) {
+              this.goFollowShow = true;
+              this.confirmText = res.Data.GoFollow ? "去关注" : "知道了";
+              if (res.Data.GoFollow) {
+                this.accounts = `产业关注成功 <br> 想要及时获取该产业内容的更新推送，请关注【查研观向小助手】公众号`;
+                this.isCancelBtn = true;
+              } else {
+                this.accounts = "产业关注成功<br>请关注【查研观向小助手】公众号，及时获取产业报告更新提醒";
+              }
+            }
+            this.$emit("updateFllow", id, type);
+          }
+        });
+      } else if (this.$store.state.isAuth) {
+        //未授权
+        uni.navigateTo({
+          url: "/pageMy/authGuide/authGuide",
+        });
+      } else if (!this.$store.state.isAuth && this.$store.state.isBind) {
+        //已授权未绑定
+        uni.navigateTo({
+          url: "/pageMy/login/login",
+        });
+      }
+    },
     //点击了去关注
     goFollowShowBtn() {
       if (this.confirmText == "去关注") {
@@ -326,6 +371,25 @@ export default {
           border-radius: 50%;
         }
       }
+      image {
+        margin-left: 10rpx;
+        width: 60rpx;
+        height: 30rpx;
+      }
+
+      .hot-icon {
+        width: 30rpx;
+      }
+      .industry-box-left {
+        width: 50rpx;
+        display: flex;
+        align-items: center;
+        margin-right: 10rpx;
+        image {
+          width: 38rpx;
+          height: 34rpx;
+        }
+      }
     }
     .read-more {
       margin-top: 20rpx;

pages-search/components/roadshow.vue

@@ -35,6 +35,7 @@ export default {
       const res = await Home.microRoadshowCollect({
         Id: item.Id,
         SourceType: item.Type,
+        PageRouter: this.$store.state.pageRouterReport
       });
       if (res.Ret === 200) {
         let index = this.roadshowPageList.findIndex((key) => key.Id == item.Id);

pages-search/indedxSearch/indedxSearch.vue

@@ -79,7 +79,7 @@
               <view class="more-rivet" @click="tabsActiveMore(3)"> 更多 <u-icon name="arrow-right" color="#3385FF" size="28"></u-icon> </view>
             </view>
           </view>
-          <reportPage :reportPageData="reportPageData" id="container-report-page" v-if="Object.keys(reportPageData).length && (tabsActive == 3 || tabsActive == 1)" />
+          <reportPage @updateFllow="updateFllow" :reportPageData="reportPageData" id="container-report-page" v-if="Object.keys(reportPageData).length && (tabsActive == 3 || tabsActive == 1)" />
           <view class="more-activity more-box" v-if="tabsActive === 1 && haveResultActivity">
             <text class="more-text"> 活动 </text>
             <view>
@@ -401,6 +401,7 @@ export default {
       this.historySearchList = [];
       this.$db.del("historySearchList");
     },
+    // 数据 初始化
     getListInit() {
       uni.pageScrollTo({
         scrollTop: 0,
@@ -418,6 +419,7 @@ export default {
       this.reportPageData = {};
       this.roadshowPageList = [];
     },
+    // 进入页面 load的事件
     laodInit(options) {
       if (Object.keys(options).length && options.searchTxt) {
         this.searchTxt = options.searchTxt;
@@ -427,6 +429,23 @@ export default {
         this.searchTxt && this.getDataList();
       }
     },
+    // 报告、资源包的关注 改变状态
+    updateFllow(id, type) {
+      let typeName = type == "弘则" ? "ListHzResource" : "ListYxResource";
+
+      this.reportPageData[typeName].forEach((key) => {
+        if (key.IndustrialManagementId == id) {
+          if (key.IsFollw) {
+            uni.showToast({
+              title: "已取消关注",
+              icon: "none",
+              duration: 2000,
+            });
+          }
+          key.IsFollw = !key.IsFollw;
+        }
+      });
+    },
   },
   onLoad(options) {
     this.getRecordTracking("搜索入口:" + options.source);
@@ -449,7 +468,7 @@ export default {
   }),
   // 上拉加载this.resultList
   onReachBottom: Throttle(function () {
-    if (this.tabsActive == 1) return;
+    if (this.tabsActive == 1 || this.tabsActive == 3) return;
     if (this.status === "nomore") return;
     this.status = "loading";
     this.pageNum++;
@@ -464,7 +483,7 @@ export default {
       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("搜索转发", { ActivityId: item.ActivityId, Id: item.Id, Type: item.Type });
       return {
         title: this.isHorzMobile ? "好友向您推荐此内容，上传名片享查研观向免费月卡！" : title_share,
         path: "/pages/material/material?topTabsActive=4" + "&audioShareId=" + audio_id + "&videoShareId=" + video_id + "&activityId=" + activity_id,

pages/index/index.vue

@@ -120,6 +120,7 @@ export default {
       const res = await Home.microRoadshowCollect({
         Id: item.Id,
         SourceType: item.Type,
+        PageRouter: this.$store.state.pageRouterReport
       });
       if (res.Ret === 200) {
         let index = this.newDataList.findIndex((key) => key.Roadshow && key.Roadshow.Id == item.Id);
@@ -190,7 +191,7 @@ export default {
       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("首页转发", { ActivityId: item.ActivityId, Id: item.Id, Type: item.Type });
       return {
         title: this.isHorzMobile ? "好友向您推荐此内容，上传名片享查研观向免费月卡！" : title_share,
         path: "/pages/material/material?topTabsActive=4" + "&audioShareId=" + audio_id + "&videoShareId=" + video_id + "&activityId=" + activity_id,

pages/material/material.vue

@@ -457,6 +457,7 @@ export default {
       const res = await Home.microRoadshowCollect({
         Id: item.Id,
         SourceType: item.Type,
+        PageRouter: this.$store.state.pageRouterReport
       });
       if (res.Ret === 200) {
         let index = this.roadshowPageList.findIndex((key) => key.Id == item.Id);

pages/purchaser/purchaser.vue

@@ -226,7 +226,7 @@ export default {
       const res =
         val === "主题"
           ? await Reports.reportFllow({ IndustrialManagementId: item.IndustrialManagementId, PageRouter: this.$store.state.pageRouterReport })
-          : await Reports.reportFllowDepartment({ DepartmentId: item.DepartmentId });
+          : await Reports.reportFllowDepartment({ DepartmentId: item.DepartmentId, PageRouter: this.$store.state.pageRouterReport });
       if (res.Ret === 200) {
         item.IsFollw = !item.IsFollw;
         if (res.Data.Status == 1) {
@@ -264,7 +264,7 @@ export default {
     },
     //收藏
     async collectClick(item) {
-      const res = await Report.collectRpt({ ArticleId: item.ArticleId });
+      const res = await Report.collectRpt({ ArticleId: item.ArticleId, PageRouter: '月度收藏榜' });
       if (res.Ret === 200) {
         item.IsCollect = !item.IsCollect;
         item.IsCollect
@@ -291,6 +291,7 @@ export default {
     },
     //去往文章详情页面
     goDetail(item) {
+       this.$store.commit("setRouterReport", "月度收藏榜");
       this.$store.dispatch("checkHandle", "/pageMy/reportDetail/reportDetail?id=" + item.ArticleId);
     },
     //去往主题详情

reportPages/authorPages/authorPages.vue

@@ -113,7 +113,7 @@ export default {
     },
     //收藏
     async collectClick(item) {
-      const res = await Report.collectRpt({ ArticleId: item.ArticleId });
+      const res = await Report.collectRpt({ ArticleId: item.ArticleId, PageRouter: this.$store.state.pageRouterReport });
       if (res.Ret === 200) {
         item.IsCollect = !item.IsCollect;
         item.IsCollect

reportPages/keyCompany/keyCompany.vue

@@ -113,6 +113,9 @@ export default {
   onLoad() {
     this.getList();
   },
+  onShow() {
+    this.$store.commit("setRouterReport", "重点公司");
+  },
   onReachBottom() {
     if (this.status === "nomore") return;
     this.status = "loading";

reportPages/reportSecretDetail/reportSecretDetail.vue

@@ -181,13 +181,16 @@ export default {
         this.isType == 1
           ? await Reports.reportSelectionDetail({
               ArticleId: this.id,
+              PageRouter: this.$store.state.pageRouterReport,
             })
           : this.isType == 3
           ? await Reports.minutesSummaryDetail({
               ArticleId: this.id,
+              PageRouter: this.$store.state.pageRouterReport,
             })
           : await Reports.researchSummaryDetail({
               ArticleId: this.id,
+              PageRouter: this.$store.state.pageRouterReport,
             });
       if (res.Ret === 200) {
         this.hasPermission = res.Data.HasPermission;

reportPages/researchTheme/researchTheme.vue

@@ -111,7 +111,7 @@ export default {
     },
     //收藏
     async collectClick(item) {
-      const res = await Report.collectRpt({ ArticleId: item.ArticleId });
+      const res = await Report.collectRpt({ ArticleId: item.ArticleId, PageRouter: this.$store.state.pageRouterReport });
       if (res.Ret === 200) {
         item.IsCollect = !item.IsCollect;
         item.IsCollect