bding 2 gadi atpakaļ
vecāks
revīzija
c3da8ec603

+ 2 - 3
activityPages/playBack/playBack.vue

@@ -170,12 +170,11 @@ export default {
   },
 
   onLoad() {
-    console.log('触发了');
-    this.$store.commit("setRouterActivity", "活动回放");
-    this.$store.commit("setRouterReport", "活动回放");
     this.getActivityList();
   },
   async onShow() {
+    this.$store.commit("setRouterActivity", "活动回放");
+    this.$store.commit("setRouterReport", "活动回放");
     this.$store.commit("audioBg/parseIntAudio", true);
   },
   onHide() {

+ 1 - 1
activityPages/specialDetail/specialDetail.vue

@@ -125,7 +125,7 @@ export default {
   methods: {
     // 获取详情
     async getActivityDetail() {
-      const res = await activity.getSpecialDetailList({ ActivityId: this.id });
+      const res = await activity.getSpecialDetailList({ ActivityId: this.id, PageRouter: this.$store.state.pageRouterActivity });
       if (res.Ret == 200) {
         this.specialIsFollow = res.Data.IsFollow;
         this.haveAuth = res.Data.HasPermission;

+ 3 - 3
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 +  "&entrance=活动详情");
+          this.$store.dispatch("checkHandle", "/reportPages/IndustryReport/IndustryReport?id=" + this.contentDetail.IndustrialManagementId + "&entrance=活动详情");
         }
       }
     },
@@ -316,11 +316,11 @@ export default {
     },
   },
   onLoad(option) {
-    this.$store.commit("setRouterReport", "活动列表");
-    this.$store.commit("setRouterReport", "已结束活动主题列表");
     this.loadInit(option);
   },
   onShow() {
+    this.$store.commit("setRouterReport", "活动列表");
+    this.$store.commit("setRouterActivity", "活动列表");
     this.$store.dispatch("checkHandle");
     this.$store.commit("audioBg/parseIntAudio", true);
   },

+ 3 - 1
pageMy/applyInterview/applyInterview.vue

@@ -50,9 +50,11 @@ export default {
     };
   },
   onLoad() {
-    this.$store.commit("setRouterReport", "访谈申请");
     this.getInterList();
   },
+  onShow() {
+    this.$store.commit("setRouterReport", "访谈申请");
+  },
   components: {
     freeCharge,
   },

+ 4 - 2
pageMy/browseHistory/browseHistory.vue

@@ -59,9 +59,11 @@ export default {
     };
   },
   onLoad() {
-    this.$store.commit("setRouterReport", "足迹");
     this.gethistoryList();
   },
+  onShow() {
+    this.$store.commit("setRouterReport", "足迹");
+  },
   components: {
     freeCharge,
   },
@@ -101,7 +103,7 @@ export default {
         this.$store.dispatch("checkHandle", "/reportPages/IndustryReport/IndustryReport?id=" + val.IndustrialManagementId);
       } else {
         //严选
-        this.$store.dispatch("checkHandle", "/reportPages/researchTheme/researchTheme?id=" + val.IndustrialManagementId);
+        this.$store.dispatch("checkHandle", "/reportPages/researchTheme/researchTheme?id=" + val.IndustrialManagementId + "&pageRouter=足迹");
       }
     },
 

+ 3 - 1
pageMy/myCollection/myCollection.vue

@@ -78,10 +78,12 @@ export default {
     };
   },
   onLoad() {
-    this.$store.commit("setRouterReport", "收藏");
     uni.hideShareMenu();
     this.getCollectList();
   },
+  onShow() {
+    this.$store.commit("setRouterReport", "收藏");
+  },
   components: {
     freeCharge,
     RoadshowItem,

+ 2 - 2
pageMy/myLeavingMessage/myLeavingMessage.vue

@@ -44,6 +44,8 @@ export default {
 
     // 去往详情
     goDetail(item) {
+      this.$store.commit("setRouterActivity", "我的留言");
+      this.$store.commit("setRouterReport", "我的留言");
       if (item.RedirectType == 1) {
         uni.navigateTo({
           url: "/pageMy/reportDetail/reportDetail?id=" + item.ArticleId,
@@ -65,8 +67,6 @@ export default {
     },
   },
   onLoad() {
-    this.$store.commit("setRouterActivity", "我的留言");
-    this.$store.commit("setRouterReport", "我的留言");
     this.getList();
   },
 };

+ 1 - 1
pages/purchaser/purchaser.vue

@@ -295,7 +295,7 @@ export default {
     },
     //去往主题详情
     themeDetails(item) {
-      this.$store.dispatch("checkHandle", "/reportPages/researchTheme/researchTheme?id=" + item.IndustrialManagementId);
+      this.$store.dispatch("checkHandle", "/reportPages/researchTheme/researchTheme?id=" + item.IndustrialManagementId +'&pageRouter=月度收藏榜');
     },
     //计算遍历的颜色
     serialBackground(index) {

+ 3 - 2
reportPages/industrialReport/industrialReport.vue

@@ -58,7 +58,6 @@ export default {
     };
   },
   onLoad(option) {
-    this.$store.commit("setRouterReport", "行业综述");
     this.categoryId = Number(option.id) || "";
     this.idGenre = Number(option.idGenre) || "";
     this.articleId = Number(option.idArticle) || "";
@@ -66,7 +65,9 @@ export default {
     this.genreIs = option.isGenre || "";
     this.getCollectList();
   },
-  onShow() {},
+  onShow() {
+    this.$store.commit("setRouterReport", "行业综述");
+  },
   methods: {
     /* 获取列表 */
     async getCollectList() {

+ 4 - 3
reportPages/reportSecretDetail/reportSecretDetail.vue

@@ -137,6 +137,7 @@ export default {
       ],
       showAudioBox: false,
       curTime: 0,
+      titleTxT: "",
     };
   },
   filters: {
@@ -299,11 +300,10 @@ export default {
   async onLoad(option) {
     this.isType = option.type;
     this.id = Number(option.id) || "";
-    let titleTxT = this.isType == 1 ? "报告精选" : this.isType == 2 ? "本周研究汇总" : "上周纪要汇总";
+    this.titleTxT = this.isType == 1 ? "报告精选" : this.isType == 2 ? "本周研究汇总" : "上周纪要汇总";
     uni.setNavigationBarTitle({
-      title: titleTxT,
+      title: this.titleTxT,
     });
-    this.$store.commit("setRouterReport", titleTxT);
     await this.$store.dispatch("checkHandle");
     if (!this.$store.state.isAuth && !this.$store.state.isBind) this.getDetilaiList();
 
@@ -312,6 +312,7 @@ export default {
   },
 
   onShow() {
+    this.$store.commit("setRouterReport", this.titleTxT);
     this.showAudioBox = true;
   },
   onHide() {

+ 7 - 4
reportPages/researchTheme/researchTheme.vue

@@ -69,8 +69,8 @@ export default {
     };
   },
   methods: {
-    async researchThemeDetail(id, source) {
-      const res = await Research.researchThemeDetail({ IndustrialManagementId: id, Source: source ? 2 : 1 });
+    async researchThemeDetail(id, source, PageRouter) {
+      const res = await Research.researchThemeDetail({ IndustrialManagementId: id, Source: source ? 2 : 1, PageRouter });
       if (res.Ret === 200) {
         this.themeList = res.Data || {};
         this.isFollw = res.Data.IsFollw;
@@ -149,9 +149,12 @@ export default {
     },
   },
   onLoad(options) {
-    this.$store.commit("setRouterReport", "主题详情");
     let source = options.source || "";
-    this.researchThemeDetail(options.id, source);
+    let pageRouter = options.pageRouter || "";
+    this.researchThemeDetail(options.id, source, pageRouter);
+  },
+  onShow() {
+    this.$store.commit("setRouterReport", "主题详情");
   },
 };
 </script>

+ 1 - 1
reportPages/roadEssence/roadEssence.vue

@@ -280,7 +280,6 @@ export default {
     audioModule,
   },
   async onLoad(option) {
-    this.$store.commit("setRouterReport", "路演精华");
     this.id = Number(option.id) || "";
 
     // 免费送月卡
@@ -293,6 +292,7 @@ export default {
     }
   },
   onShow() {
+    this.$store.commit("setRouterReport", "路演精华");
     this.showAudioBox = true;
   },
   onHide() {