路径的开发完成

activityPages/generationAsk/generationAsk.vue

@@ -45,6 +45,7 @@ export default {
               Content: this.advice_content,
               SourceType: Number(this.roadshow),
               Title: this.roadshowTitle,
+              PageRouter: this.$store.state.pageRouterReport,
             })
           : this.type == "文章"
           ? await Report.articleAskAdd({

activityPages/playBack/playBack.vue

@@ -170,7 +170,8 @@ export default {
   },
 
   onLoad() {
-    this.$store.commit("pageRouterActivity", "活动回放");
+    console.log('触发了');
+    this.$store.commit("setRouterActivity", "活动回放");
     this.$store.commit("setRouterReport", "活动回放");
     this.getActivityList();
   },

activityPages/themeActivity/themeActivity.vue

@@ -273,7 +273,7 @@ export default {
           this.$store.dispatch("checkHandle", "/reportPages/researchTheme/researchTheme?id=" + this.contentDetail.IndustrialManagementId);
         } else {
           //非严选
-          this.$store.dispatch("checkHandle", "/reportPages/IndustryReport/IndustryReport?id=" + this.contentDetail.IndustrialManagementId);
+          this.$store.dispatch("checkHandle", "/reportPages/IndustryReport/IndustryReport?id=" + this.contentDetail.IndustrialManagementId +  "&entrance=活动详情");
         }
       }
     },

components/ItemComponent/activityItem.vue

@@ -437,7 +437,7 @@ export default {
       if (item.SourceType !== 1) {
         this.$store.dispatch("checkHandle", "/activityPages/specialDetail/specialDetail?id=" + item.ActivityId);
       } else {
-        this.$store.dispatch("checkHandle", "/activityPages/activityDetail/activityDetail?id=" + item.ActivityId + "&PageRouter=" + this.$store.state.pageRouterActivity);
+        this.$store.dispatch("checkHandle", "/activityPages/activityDetail/activityDetail?id=" + item.ActivityId);
       }
     },
     // 查看行程的事件

pages-search/indedxSearch/indedxSearch.vue

@@ -428,8 +428,6 @@ export default {
     },
   },
   onLoad(options) {
-    this.$store.commit("setRouterActivity", "搜索");
-    this.$store.commit("setRouterReport", "搜索");
     this.researchHotKeyWord();
     this.laodInit(options);
     if (this.$db.get("historySearchList")) {
@@ -437,6 +435,8 @@ export default {
     }
   },
   onShow() {
+    this.$store.commit("setRouterActivity", "搜索");
+    this.$store.commit("setRouterReport", "搜索");
     this.$store.dispatch("checkHandle");
   },
   /* 下拉刷新 */

pages/index/index.vue

@@ -159,12 +159,14 @@ export default {
     });
   },
   onLoad() {
-    this.$store.commit("setRouterActivity", "首页");
-    this.$store.commit("setRouterReport", "首页");
     this.getUserInfo();
     this.initNavBar();
     this.getNewList();
   },
+  onShow() {
+    this.$store.commit("setRouterActivity", "首页");
+    this.$store.commit("setRouterReport", "首页");
+  },
   // 加载数据
   onReachBottom() {
     if (this.status === "nomore" || this.newDataList.length < 8) return;

pages/material/material.vue

@@ -141,8 +141,6 @@ export default {
   },
   watch: {},
   onLoad(optios) {
-    this.$store.commit("setRouterActivity", "纪要库");
-    this.$store.commit("setRouterReport", "纪要库");
     this.getHeaderTab();
     uni.getSystemInfo({
       success: function (res) {
@@ -167,6 +165,8 @@ export default {
     this.$store.dispatch("checkHandle", "noGO");
   },
   onShow() {
+    this.$store.commit("setRouterActivity", "纪要库");
+    this.$store.commit("setRouterReport", "纪要库");
     //进入页面的记录
     this.$store.dispatch("statistics", { PageType: "Activit" });
     // #ifdef MP-WEIXIN

pages/purchaser/purchaser.vue

@@ -223,7 +223,10 @@ export default {
     },
     //关注
     async isAttention(item, val) {
-      const res = val === "主题" ? await Reports.reportFllow({ IndustrialManagementId: item.IndustrialManagementId }) : await Reports.reportFllowDepartment({ DepartmentId: item.DepartmentId });
+      const res =
+        val === "主题"
+          ? await Reports.reportFllow({ IndustrialManagementId: item.IndustrialManagementId, PageRouter: this.$store.state.pageRouterReport })
+          : await Reports.reportFllowDepartment({ DepartmentId: item.DepartmentId });
       if (res.Ret === 200) {
         item.IsFollw = !item.IsFollw;
         if (res.Data.Status == 1) {
@@ -305,10 +308,12 @@ export default {
     },
   },
   onLoad() {
-    this.$store.commit("setRouterReport", "月度收藏榜");
     this.researchNewList();
     this.initNavBar();
   },
+  onShow() {
+    this.$store.commit("setRouterReport", "买方研选");
+  },
   /* 下拉刷新 */
   onPullDownRefresh: Throttle(function () {
     wx.stopPullDownRefresh();

pages/reportForm/reportForm.vue

@@ -338,6 +338,7 @@ export default {
     },
     //跳转产业报告
     async goIndustryReport(id) {
+      this.$store.commit("setRouterReport", "产业列表");
       await this.$store.dispatch("checkHandle", "/reportPages/IndustryReport/IndustryReport?id=" + id);
     },
     //点击关注的图标
@@ -345,6 +346,7 @@ export default {
       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) {

reportPages/IndustryReport/IndustryReport.vue

@@ -136,11 +136,6 @@ export default {
     //监听tabs的变化
     tabAct_id: {
       handler(newVal) {
-        this.tabBars.forEach((item) => {
-          if (item.CategoryId == newVal) {
-            this.$store.commit("setRouterReport", item.MatchTypeName);
-          }
-        });
         if (newVal) {
           this.page_no = 1;
           this.collectList = [];
@@ -169,6 +164,7 @@ export default {
       Reports.toArticleCategoryList({
         IndustrialManagementId: this.industrialManagementId,
         ShowTimeLine: 1,
+        PageRouter: this.$store.state.pageRouterReport,
       }).then((res) => {
         if (res.Ret == 200) {
           uni.setNavigationBarTitle({
@@ -268,6 +264,7 @@ export default {
             url: "/reportPages/roadEssence/roadEssence?id=" + item.ArticleId,
           });
         } else {
+          this.setRouter();
           uni.navigateTo({
             url: "/pageMy/reportDetail/reportDetail?id=" + item.ArticleId,
           });
@@ -356,6 +353,7 @@ export default {
             url: "/reportPages/roadEssence/roadEssence?id=" + item.Id,
           });
         } else {
+          this.setRouter();
           uni.navigateTo({
             url: "/pageMy/reportDetail/reportDetail?id=" + item.Id,
           });
@@ -365,6 +363,14 @@ export default {
     getNode(content, isExpand) {
       return `<div style='-webkit-line-clamp: ${isExpand ? 9999 : 3};-webkit-box-orient: vertical;display: -webkit-box;overflow: hidden;text-overflow: ellipsis;'>${content}</div>`;
     },
+    // 去往文章详情的
+    setRouter() {
+      this.tabBars.forEach((item) => {
+        if (this.tabAct_id == item.CategoryId) {
+          this.$store.commit("setRouterReport", item.MatchTypeName);
+        }
+      });
+    },
   },
   /* 触底 */
   onReachBottom: Throttle(function () {

reportPages/hotList/hotList.vue

@@ -169,7 +169,10 @@ export default {
     },
     //关注
     async isAttention(item, val) {
-      const res = val === "主题" ? await Reports.reportFllow({ IndustrialManagementId: item.IndustrialManagementId }) : await Reports.reportFllowDepartment({ DepartmentId: item.DepartmentId });
+      const res =
+        val === "主题"
+          ? await Reports.reportFllow({ IndustrialManagementId: item.IndustrialManagementId, PageRouter: "榜单产业关注榜" })
+          : await Reports.reportFllowDepartment({ DepartmentId: item.DepartmentId });
       if (res.Ret === 200) {
         item.IsFollow = !item.IsFollow;
         if (res.Data.Status == 1) {
@@ -250,6 +253,7 @@ export default {
     },
   },
   onLoad() {
+    this.$store.commit("setRouterReport", '产业关注榜');
     this.getTabList();
   },
 };

reportPages/recentPages/recentPages.vue

@@ -49,7 +49,7 @@ export default {
       accounts: "",
       page_no: 1,
       pageSize: 20,
-      permissionId:'',
+      permissionId: "",
       status: "loadmore",
       loadText: {
         loadmore: "上拉加载更多",
@@ -83,7 +83,7 @@ export default {
     },
     //关注
     async isAttention(item) {
-      const res = await Reports.reportFllow({ IndustrialManagementId: item.IndustrialManagementId });
+      const res = await Reports.reportFllow({ IndustrialManagementId: item.IndustrialManagementId, PageRouter: "近期更新主题" });
       if (res.Ret === 200) {
         item.IsFollw = !item.IsFollw;
         if (res.Data.Status == 1) {

reportPages/researchTheme/researchTheme.vue

@@ -78,7 +78,7 @@ export default {
     },
     //关注
     async isAttention(item) {
-      const res = await Reports.reportFllow({ IndustrialManagementId: this.themeList.IndustrialManagementId });
+      const res = await Reports.reportFllow({ IndustrialManagementId: this.themeList.IndustrialManagementId, PageRouter: "主题详情" });
       if (res.Ret === 200) {
         this.isFollw = !this.isFollw;
         if (res.Data.Status == 1) {