与后端对接 接口

activityPages/activityDetail/activityDetail.vue

@@ -403,6 +403,7 @@ export default {
       activity
         .getActivityDetail({
           ActivityId: this.id,
+          PageRouter: this.$store.state.pageRouterActivity,
         })
         .then((res) => {
           if (res.Ret == 200) {
@@ -615,6 +616,8 @@ export default {
   },
   async onLoad(option) {
     this.id = option.id || "";
+    this.$store.commit("setRouterReport", "活动详情");
+    // 详情页面不写路径
     await this.$store.dispatch("checkHandle");
     // this.listenAudio()
     if (!this.$store.state.isAuth && !this.$store.state.isBind) {

activityPages/activityDetail/manageMixin.js

@@ -70,13 +70,9 @@ export default {
               if (res.Data.SignupStatus !== "Success") {
                 this.isShow = true;
               } else {
-                if (res.Data.GoOutboundMobile) {
-                  this.editIsShow = true;
-                } else if (res.Data.GoFollow) {
-                  this.goFollow = res.Data.GoFollow;
-                } else if (res.Data.SignupStatus == "Success") {
-                  this.isShow = true;
-                }
+                if (res.Data.GoOutboundMobile) this.editIsShow = true;
+                else if (res.Data.GoFollow) this.goFollow = res.Data.GoFollow;
+                else if (res.Data.SignupStatus == "Success") this.isShow = true;
               }
             }
           });
@@ -98,11 +94,8 @@ export default {
           if (res.Data.SignupStatus !== "Success") {
             this.isShow = true;
           } else {
-            if (res.Data.GoFollow) {
-              this.goFollow = res.Data.GoFollow;
-            } else if (res.Data.SignupStatus == "Success") {
-              this.isShow = true;
-            }
+            if (res.Data.GoFollow) this.goFollow = res.Data.GoFollow;
+            else if (res.Data.SignupStatus == "Success") this.isShow = true;
           }
           this.selectShow = false;
         }

activityPages/playBack/playBack.vue

@@ -151,7 +151,7 @@ export default {
     },
     // 去往详情页面
     goDetail(item) {
-      this.$store.dispatch("checkHandle", "/activityPages/activityDetail/activityDetail?id=" + item.ActivityId);
+      this.$store.dispatch("checkHandle", "/activityPages/activityDetail/activityDetail?id=" + item.ActivityId + "&PageRouter=活动回放");
     },
 
     // 点击视频 、音频 的筛选
@@ -170,6 +170,8 @@ export default {
   },
 
   onLoad() {
+    this.$store.commit("pageRouterActivity", "活动回放");
+    this.$store.commit("setRouterReport", "活动回放");
     this.getActivityList();
   },
   async onShow() {

activityPages/themeActivity/themeActivity.vue

@@ -316,6 +316,8 @@ export default {
     },
   },
   onLoad(option) {
+    this.$store.commit("setRouterReport", "活动列表");
+    this.$store.commit("setRouterReport", "已结束活动主题列表");
     this.loadInit(option);
   },
   onShow() {

components/ItemComponent/activityItem.vue

@@ -136,6 +136,10 @@ export default {
       default: {},
       required: true,
     },
+    componentsPage: {
+      type: String,
+      default: "",
+    },
   },
   data() {
     return {
@@ -226,7 +230,7 @@ export default {
           cancelColor: "#606266",
           success: async (res) => {
             if (res.confirm) {
-              const res = await activity.signupCancel({ ActivityId: item.ActivityId, SignupType: type });
+              const res = await activity.signupCancel({ ActivityId: item.ActivityId, SignupType: type, PageRouter: this.$store.state.pageRouterActivity });
               if (res.Ret === 200) {
                 this.parentDataEmit(item, "IsSignup", 0);
                 this.init();
@@ -256,6 +260,7 @@ export default {
           .signupAdd({
             ActivityId: id,
             SignupType: type,
+            PageRouter: this.$store.state.pageRouterActivity,
           })
           .then((res) => {
             if (res.Ret == 200) {
@@ -278,13 +283,9 @@ export default {
                 if (res.Data.SignupStatus !== "Success") {
                   this.isShow = true;
                 } else {
-                  if (res.Data.GoOutboundMobile) {
-                    this.editIsShow = true;
-                  } else if (res.Data.GoFollow) {
-                    this.goFollow = res.Data.GoFollow;
-                  } else if (res.Data.SignupStatus == "Success") {
-                    this.isShow = true;
-                  }
+                  if (res.Data.GoOutboundMobile) this.editIsShow = true;
+                  else if (res.Data.GoFollow) this.goFollow = res.Data.GoFollow;
+                  else if (res.Data.SignupStatus == "Success") this.isShow = true;
                   this.parentDataEmit(item, "IsSignup", 1);
                 }
               } else if (this.hasPermission == 2) {
@@ -315,17 +316,15 @@ export default {
       activity
         .meetingReminderAdd({
           ActivityId: item.ActivityId,
+          PageRouter: this.$store.state.pageRouterActivity,
         })
         .then((res) => {
           if (res.Ret == 200) {
             this.hasPermission = res.Data.HasPermission;
             this.jurisdictionList = res.Data;
             if (this.hasPermission == 1) {
-              if ((res.Data.GoFollow && res.Data.SignupStatus !== "Success") || !res.Data.GoFollow) {
-                this.isShow = true;
-              } else {
-                this.goFollow = res.Data.GoFollow;
-              }
+              if ((res.Data.GoFollow && res.Data.SignupStatus !== "Success") || !res.Data.GoFollow) this.isShow = true;
+              else this.goFollow = res.Data.GoFollow;
               this.signupType = 999;
               this.idTypeCancel = {
                 cutId: res.Data.ActivityId,
@@ -346,6 +345,7 @@ export default {
       activity
         .meetingReminderCancel({
           ActivityId: item.ActivityId,
+          PageRouter: this.$store.state.pageRouterActivity,
         })
         .then((res) => {
           if (res.Ret == 200) {
@@ -367,7 +367,7 @@ export default {
 
     //帮我带问
     async askingGo(item, type = "") {
-      const res = await activity.checkAskActivity({ ActivityId: item.ActivityId });
+      const res = await activity.checkAskActivity({ ActivityId: item.ActivityId, PageRouter: this.$store.state.pageRouterActivity });
       if (res.Ret == 200) {
         this.hasPermission = res.Data.HasPermission;
         this.jurisdictionList = res.Data;
@@ -392,7 +392,7 @@ export default {
     //预约纪要、取消预约纪要
     async summaryIsHandel(item, type = "") {
       if (item.IsAppointment == 0) {
-        const res = await activity.postAppointmentAdd({ ActivityId: item.ActivityId });
+        const res = await activity.postAppointmentAdd({ ActivityId: item.ActivityId, PageRouter: this.$store.state.pageRouterActivity });
         if (res.Ret == 200) {
           this.hasPermission = res.Data.HasPermission;
           this.jurisdictionList = res.Data;
@@ -402,11 +402,8 @@ export default {
             if (res.Data.SignupStatus !== "Success") {
               this.isShow = true;
             } else {
-              if (res.Data.GoFollow) {
-                this.goFollow = res.Data.GoFollow;
-              } else if (res.Data.SignupStatus == "Success") {
-                this.isShow = true;
-              }
+              if (res.Data.GoFollow) this.goFollow = res.Data.GoFollow;
+              else if (res.Data.SignupStatus == "Success") this.isShow = true;
               this.parentDataEmit(item, "IsAppointment", 1);
             }
           } else if (this.hasPermission == 2) {
@@ -422,7 +419,7 @@ export default {
           cancelColor: "#606266",
           success: async (res) => {
             if (res.confirm) {
-              const res = await activity.postAppointmentCancel({ ActivityId: item.ActivityId });
+              const res = await activity.postAppointmentCancel({ ActivityId: item.ActivityId, PageRouter: this.$store.state.pageRouterActivity });
               if (res.Ret === 200) {
                 this.parentDataEmit(item, "IsAppointment", 0);
                 this.init();
@@ -440,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);
+        this.$store.dispatch("checkHandle", "/activityPages/activityDetail/activityDetail?id=" + item.ActivityId + "&PageRouter=" + this.$store.state.pageRouterActivity);
       }
     },
     // 查看行程的事件

components/activity/indexActivity.js

@@ -78,7 +78,7 @@ export default {
           cancelColor: "#606266",
           success: async (res) => {
             if (res.confirm) {
-              const res = await activity.signupCancel({ ActivityId: item.ActivityId, SignupType: type });
+              const res = await activity.signupCancel({ ActivityId: item.ActivityId, SignupType: type, PageRouter: this.$store.state.pageRouterActivity });
               if (res.Ret === 200) {
                 this.collectList.forEach((valueAct) => {
                   if (valueAct.ActivityId === id) {
@@ -112,6 +112,7 @@ export default {
           .signupAdd({
             ActivityId: id,
             SignupType: type,
+            PageRouter: this.$store.state.pageRouterActivity,
           })
           .then((res) => {
             if (res.Ret == 200) {
@@ -135,13 +136,9 @@ export default {
                 if (res.Data.SignupStatus !== "Success") {
                   this.isShow = true;
                 } else {
-                  if (res.Data.GoOutboundMobile) {
-                    this.editIsShow = true;
-                  } else if (res.Data.GoFollow) {
-                    this.goFollow = res.Data.GoFollow;
-                  } else if (res.Data.SignupStatus == "Success") {
-                    this.isShow = true;
-                  }
+                  if (res.Data.GoOutboundMobile) this.editIsShow = true;
+                  else if (res.Data.GoFollow) this.goFollow = res.Data.GoFollow;
+                  else if (res.Data.SignupStatus == "Success") this.isShow = true;
                   this.collectList.forEach((valueAct) => {
                     if (valueAct.ActivityId === id) {
                       valueAct.IsSignup = 1;
@@ -176,17 +173,15 @@ export default {
       activity
         .meetingReminderAdd({
           ActivityId: id,
+          PageRouter: this.$store.state.pageRouterActivity,
         })
         .then((res) => {
           if (res.Ret == 200) {
             this.hasPermission = res.Data.HasPermission;
             this.jurisdictionList = res.Data;
             if (this.hasPermission == 1) {
-              if ((res.Data.GoFollow && res.Data.SignupStatus !== "Success") || !res.Data.GoFollow) {
-                this.isShow = true;
-              } else {
-                this.goFollow = res.Data.GoFollow;
-              }
+              if ((res.Data.GoFollow && res.Data.SignupStatus !== "Success") || !res.Data.GoFollow) this.isShow = true;
+              else this.goFollow = res.Data.GoFollow;
               this.signupType = 999;
               this.idTypeCancel = {
                 cutId: res.Data.ActivityId,
@@ -211,6 +206,7 @@ export default {
       activity
         .meetingReminderCancel({
           ActivityId: id,
+          PageRouter: this.$store.state.pageRouterActivity,
         })
         .then((res) => {
           if (res.Ret == 200) {
@@ -236,7 +232,7 @@ export default {
 
     //帮我带问
     async askingGo(item, type = "") {
-      const res = await activity.checkAskActivity({ ActivityId: item.ActivityId });
+      const res = await activity.checkAskActivity({ ActivityId: item.ActivityId, PageRouter: this.$store.state.pageRouterActivity });
       if (res.Ret == 200) {
         this.hasPermission = res.Data.HasPermission;
         this.jurisdictionList = res.Data;
@@ -261,7 +257,7 @@ export default {
     //预约纪要、取消预约纪要
     async summaryIsHandel(item, type = "") {
       if (item.IsAppointment == 0) {
-        const res = await activity.postAppointmentAdd({ ActivityId: item.ActivityId });
+        const res = await activity.postAppointmentAdd({ ActivityId: item.ActivityId, PageRouter: this.$store.state.pageRouterActivity });
         if (res.Ret == 200) {
           this.hasPermission = res.Data.HasPermission;
           this.jurisdictionList = res.Data;
@@ -271,9 +267,8 @@ export default {
             if (res.Data.SignupStatus !== "Success") {
               this.isShow = true;
             } else {
-              if (res.Data.GoFollow) {
-                this.goFollow = res.Data.GoFollow;
-              } else if (res.Data.SignupStatus == "Success") {
+              if (res.Data.GoFollow) this.goFollow = res.Data.GoFollow;
+              else if (res.Data.SignupStatus == "Success") {
                 this.isShow = true;
                 item.IsAppointment = 1;
               }
@@ -292,7 +287,7 @@ export default {
           cancelColor: "#606266",
           success: async (res) => {
             if (res.confirm) {
-              const res = await activity.postAppointmentCancel({ ActivityId: item.ActivityId });
+              const res = await activity.postAppointmentCancel({ ActivityId: item.ActivityId ,PageRouter: this.$store.state.pageRouterActivity});
               if (res.Ret === 200) {
                 item.IsAppointment = 0;
                 this.init();

components/audioModule/index.vue

@@ -110,7 +110,8 @@ export default {
     },
   },
   watch: {
-    audioInit: { // 切换了音频播放 重置下数据
+    audioInit: {
+      // 切换了音频播放 重置下数据
       handler(nval) {
         this.init();
       },
@@ -120,7 +121,8 @@ export default {
 
   created() {},
   mounted() {
-    uni.getSystemInfo({ //判断机型
+    uni.getSystemInfo({
+      //判断机型
       success: (res) => {
         this.isosName = res.osName;
       },
@@ -270,10 +272,11 @@ export default {
         activity.backAudioPlay({
           ActivityId: this.$store.state.audioBg.activityId || this.$store.state.audioBg.indexId,
           PlaySeconds: this.palyTime,
+          PageRouter: this.$store.state.pageRouterReport,
         });
       }
     },
-    // 手指离开了拖动进度条 
+    // 手指离开了拖动进度条
     touchstartHandler() {
       this.$store.commit("audioBg/setSlide", true);
     },

components/modalDialog.vue

@@ -125,9 +125,9 @@ export default {
     mailboxBinding() {
       this.mailboxBindingDlg = this.mailboxBinding;
     },
-    editIsShow() {
-      this.editIsShowDlg = this.editIsShow;
-      if (this.editIsShow) {
+    editIsShow(newVal) {
+      this.editIsShowDlg = newVal;
+      if (newVal) {
         this.editIsShowAccounts = `
 						默认外呼号码是您当前绑定的手机号：<br />
 						${this.countryCode}-${this.mobileEdit}<br/><br/>
@@ -156,7 +156,7 @@ export default {
   computed: {
     isModalShow: {
       get() {
-        let isShow = this.show || this.cancelShow || this.goFollowShow || this.applyIsShow || this.mailboxBindingDlg;
+        let isShow = this.show || this.cancelShow || this.goFollowShow || this.applyIsShow || this.mailboxBindingDlg || this.editIsShowDlg;
         return isShow;
       },
       set() {},
@@ -168,18 +168,24 @@ export default {
         ? "立即上传"
         : this.applyIsShow && !this.isShowAlert
         ? "立即申请"
+        : this.editIsShowDlg
+        ? "无需修改"
         : this.goFollowShow
         ? "去关注"
         : this.show
         ? "知道了"
-        : this.editIsShowDlg
-        ? "无需修改"
         : "";
       return text;
     },
     content: {
       get() {
-        let str = this.mailboxBindingDlg ? "您当前绑定的联系方式为邮箱，请先设置您的外呼号码" : this.applyIsShow || this.goFollowShow || this.show ? this.jurisdictionList.PopupMsg : "";
+        let str = this.mailboxBindingDlg
+          ? "您当前绑定的联系方式为邮箱，请先设置您的外呼号码"
+          : this.editIsShowDlg
+          ? this.editIsShowAccounts
+          : this.applyIsShow || this.goFollowShow || this.show
+          ? this.jurisdictionList.PopupMsg
+          : "";
         return str;
       },
       set() {},
@@ -220,7 +226,7 @@ export default {
      */
     cancelModal() {
       if (this.editIsShowDlg) {
-        this.GoOutboundMobileIsGo;
+        this.GoOutboundMobileIsGo();
       } else {
         this.initData();
         this.$emit("cancelShowBtn");
@@ -246,6 +252,7 @@ export default {
       this.$parent.signupType = "";
       this.$parent.isCancelShow = false;
       this.cancelShow = false;
+      this.editIsShowDlg = false;
     },
 
     showhasPermissionBtn() {

components/videoModule/index.vue

@@ -69,7 +69,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 });
+      Home.microAideoHistoryAdd({ VideoId: 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;

mixin/index.js

@@ -12,6 +12,10 @@ export default {
       },
       searchPlaceholderList: {},
       wholeShowListData: {}, //
+      PageRouter: {
+        report: "",
+        activity:'',
+      }, //页面进来的路径
     };
   },
   onShow() {
@@ -32,7 +36,6 @@ export default {
 
     // 判断手机号是不是弘则研究
     // this.userIsShowShare();
-    
   },
   methods: {
     //免费标签的隐现

pageMy/applyInterview/applyInterview.vue

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

pageMy/browseHistory/browseHistory.vue

@@ -59,6 +59,7 @@ export default {
     };
   },
   onLoad() {
+    this.$store.commit("setRouterReport", "足迹");
     this.gethistoryList();
   },
   components: {

pageMy/chartPage/chartPage.vue

@@ -43,6 +43,7 @@ export default {
     async myChartDetail() {
       const res = await Chart.myChartDetail({
         ChartId: Number(this.id),
+        PageRouter: this.$store.state.pageRouterReport,
       });
       if (res.Ret === 200) {
         this.chartData = res.Data;

pageMy/myCollection/myCollection.vue

@@ -78,6 +78,7 @@ export default {
     };
   },
   onLoad() {
+    this.$store.commit("setRouterReport", "收藏");
     uni.hideShareMenu();
     this.getCollectList();
   },
@@ -173,7 +174,6 @@ export default {
       this.getCollectList();
     },
 
-
     // 微路演收藏
     async isCollectionHandeler(item) {
       const res = await Home.microRoadshowCollect({

pageMy/myLeavingMessage/myLeavingMessage.vue

@@ -65,6 +65,8 @@ export default {
     },
   },
   onLoad() {
+    this.$store.commit("setRouterActivity", "我的留言");
+    this.$store.commit("setRouterReport", "我的留言");
     this.getList();
   },
 };

pageMy/mySchedulepage/mySchedulepage.vue

@@ -241,6 +241,7 @@ export default {
   },
   //load
   onLoad(option) {
+    this.$store.commit("setRouterActivity", "我的日程");
     this.getActivityList();
   },
   async onShow() {

pageMy/reportDetail/reportDetail.vue

@@ -74,6 +74,7 @@ export default {
     getDetail() {
       Report.reportDtl({
         ArticleId: Number(this.id),
+        PageRouter: this.$store.state.pageRouterReport,
       }).then((res) => {
         if (res.Ret === 200) {
           uni.setNavigationBarTitle({

pageMy/reportPage/reportPage.vue

@@ -97,6 +97,7 @@ export default {
     getDetail() {
       Report.reportDtl({
         ArticleId: Number(this.id),
+        PageRouter: this.$store.state.pageRouterReport,
       }).then((res) => {
         if (res.Ret === 200) {
           uni.setNavigationBarTitle({

pages-search/components/report.vue

@@ -13,40 +13,40 @@
               {{ item.IndustryName }}
             </text>
             <view class="publish">
-              {{ item.PublishDate }}更新
+              <text class="reg-hint" v-if="item.IsRed"></text>
+              {{ item.PublishDate }}
               <u-icon name="arrow-right" color="#BDBDBD" size="34"></u-icon>
             </view>
           </view>
           <view class="read-more">
-<!--            <text class="text-box text_oneLine" v-for="val in item.IndustrialSubjectList" :key="val.IndustrialSubjectId">
+            <!--            <text class="text-box text_oneLine" v-for="val in item.IndustrialSubjectList" :key="val.IndustrialSubjectId">
               {{ val.SubjectName }}
             </text> -->
-			<view class="industry-video-item" @click.stop="handelVideoPlay(item)"
-			:style="{'background-image':'url('+item.IndustryVideo.BackgroundImg+ ')'}" v-if="item.IndustryVideo">
-				5min
-				<br />
-				逻辑解析
-				<view class="industry-video-icon">
-					<image src="https://hzstatic.hzinsights.com/cygx/video-right-top-icon.svg"></image>
-				</view>
-			</view>
-			<block v-if="item.IndustrialSubjectList">
-				<view v-if="item.IndustryVideo" style="display: flex;flex-wrap: wrap;width: 420rpx;">
-					<view v-for="val in item.IndustrialSubjectList.slice(0,4)" :key="val.IndustrialSubjectId" class="text-box text_oneLine">
-						{{ val.SubjectName }}
-					</view>
-				</view>
-				<block v-if="item.IndustryVideo && item.IndustrialSubjectList.length>4">
-					<view v-for="val in item.IndustrialSubjectList.slice(4)" :key="val.IndustrialSubjectId" class="text-box text_oneLine">
-						{{ val.SubjectName }}
-					</view>
-				</block>
-				<block v-if="!item.IndustryVideo">
-					<view v-for="val in item.IndustrialSubjectList" :key="val.IndustrialSubjectId" class="text-box text_oneLine">
-						{{ val.SubjectName }}
-					</view>
-				</block>
-			</block>
+            <view class="industry-video-item" @click.stop="handelVideoPlay(item)" :style="{ 'background-image': 'url(' + item.IndustryVideo.BackgroundImg + ')' }" v-if="item.IndustryVideo">
+              5min
+              <br />
+              逻辑解析
+              <view class="industry-video-icon">
+                <image src="https://hzstatic.hzinsights.com/cygx/video-right-top-icon.svg"></image>
+              </view>
+            </view>
+            <block v-if="item.IndustrialSubjectList">
+              <view v-if="item.IndustryVideo" style="display: flex; flex-wrap: wrap; width: 420rpx">
+                <view v-for="val in item.IndustrialSubjectList.slice(0, 4)" :key="val.IndustrialSubjectId" class="text-box text_oneLine">
+                  {{ val.SubjectName }}
+                </view>
+              </view>
+              <block v-if="item.IndustryVideo && item.IndustrialSubjectList.length > 4">
+                <view v-for="val in item.IndustrialSubjectList.slice(4)" :key="val.IndustrialSubjectId" class="text-box text_oneLine">
+                  {{ val.SubjectName }}
+                </view>
+              </block>
+              <block v-if="!item.IndustryVideo">
+                <view v-for="val in item.IndustrialSubjectList" :key="val.IndustrialSubjectId" class="text-box text_oneLine">
+                  {{ val.SubjectName }}
+                </view>
+              </block>
+            </block>
           </view>
         </view>
       </block>
@@ -67,10 +67,10 @@
             </view>
           </view>
           <view class="read-more" v-if="item.IndustrialSubjectList">
-           <text class="text-box text_oneLine" v-for="val in item.IndustrialSubjectList" :key="val.IndustrialSubjectId">
+            <text class="text-box text_oneLine" v-for="val in item.IndustrialSubjectList" :key="val.IndustrialSubjectId">
               {{ val.SubjectName }}
             </text>
-<!-- 			<view class="industry-video-item" @click.stop="handelVideoPlay(item)"
+            <!-- 			<view class="industry-video-item" @click.stop="handelVideoPlay(item)"
 			:style="{'background-image':'url('+item.IndustryVideo.BackgroundImg+ ')'}" v-if="item.IndustryVideo">
 				5min
 				<br />
@@ -166,19 +166,19 @@
         <rich-text :nodes="accounts"></rich-text>
       </view>
     </u-modal>
-	<!-- 视频模块 -->
-	<videoModule :showVideoPop="showVideoPop" :videoPopList="videoPopList" class="industry-video-module"/>
-	<!-- 权限弹窗 -->
-	<modalDialog :isShowhasPermission="isShowhasPermission" :applyForIsShow="applyForIsShow" :jurisdictionList="jurisdictionList" :hasPermission="hasPermission" />
+    <!-- 视频模块 -->
+    <videoModule :showVideoPop="showVideoPop" :videoPopList="videoPopList" class="industry-video-module" />
+    <!-- 权限弹窗 -->
+    <modalDialog :isShowhasPermission="isShowhasPermission" :applyForIsShow="applyForIsShow" :jurisdictionList="jurisdictionList" :hasPermission="hasPermission" />
   </view>
 </template>
 
 <script>
-import {Report } from "@/config/api"
+import { Report } from "@/config/api";
 import videoModule from "@/components/videoModule/index";
 import modalDialog from "@/components/modalDialog.vue";
 export default {
-  components: {videoModule,modalDialog},
+  components: { videoModule, modalDialog },
   props: {
     reportPageData: {
       type: Object,
@@ -190,19 +190,19 @@ export default {
       confirmText: "知道了",
       isCancelBtn: false,
       accounts: "",
-	  showVideoPop:false, //视频弹窗显示控制
-	  videoPopList:{},// 视频信息
-	  isShowhasPermission: false, //  联系销售的提交申请
-	  applyForIsShow: false, // 提交申请
-	  jurisdictionList: {},
-	  hasPermission: "", //权限
+      showVideoPop: false, //视频弹窗显示控制
+      videoPopList: {}, // 视频信息
+      isShowhasPermission: false, //  联系销售的提交申请
+      applyForIsShow: false, // 提交申请
+      jurisdictionList: {},
+      hasPermission: "", //权限
     };
   },
   watch: {},
   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) {
@@ -250,45 +250,45 @@ export default {
       }
       this.goFollowShow = false;
     },
-	// 播放权限判断
-	handelVideoPlay(item){
-		if (!this.$store.state.isAuth && !this.$store.state.isBind) {
-		  if (item.AuthInfo.HasPermission == 1) {
-		    this.playVideo(item)
-		  } else {
-		    this.hasPermission = item.AuthInfo.HasPermission;
-		    this.jurisdictionList.ActivityId = item.IndustryVideo.Id;
-			// 产业视频
-		    this.jurisdictionList.isAudioVideo = 3;
-		    if (this.hasPermission == 2) {
-		      this.jurisdictionList.SellerMobile = item.AuthInfo.SellerMobile;
-		      this.jurisdictionList.SellerName = item.AuthInfo.SellerName;
-		      this.jurisdictionList.PopupMsg = item.AuthInfo.PopupMsg;
-		      this.isShowhasPermission = true;
-		    } else if (this.hasPermission == 3 || this.hasPermission == 4 || this.hasPermission == 5) {
-		      this.jurisdictionList.PopupMsg = item.AuthInfo.PopupMsg;
-		      this.applyForIsShow = true;
-		    }
-		  }
-		} else {
-		  this.$store.dispatch("checkHandle");
-		}
-	},
-	playVideo(item){
-		let params={
-			Id:item.IndustryVideo.Id,
-			ResourceUrl:item.IndustryVideo.ResourceUrl,
-			BackgroundImg:item.IndustryVideo.BackgroundImg,
-			Title:`5min【${item.IndustryName}】逻辑解析`
-		}
-		if (this.$store.state.videoPlay.playVideoId != item.Id) {
-		  this.$store.commit("videoPlay/palyTimeUpdate", 0);
-		  this.$store.commit("videoPlay/playVideo", item.Id);
-		}
-		this.globalBgAudioManager.stop();
-		this.videoPopList = params;
-		this.showVideoPop = true;
-	}
+    // 播放权限判断
+    handelVideoPlay(item) {
+      if (!this.$store.state.isAuth && !this.$store.state.isBind) {
+        if (item.AuthInfo.HasPermission == 1) {
+          this.playVideo(item);
+        } else {
+          this.hasPermission = item.AuthInfo.HasPermission;
+          this.jurisdictionList.ActivityId = item.IndustryVideo.Id;
+          // 产业视频
+          this.jurisdictionList.isAudioVideo = 3;
+          if (this.hasPermission == 2) {
+            this.jurisdictionList.SellerMobile = item.AuthInfo.SellerMobile;
+            this.jurisdictionList.SellerName = item.AuthInfo.SellerName;
+            this.jurisdictionList.PopupMsg = item.AuthInfo.PopupMsg;
+            this.isShowhasPermission = true;
+          } else if (this.hasPermission == 3 || this.hasPermission == 4 || this.hasPermission == 5) {
+            this.jurisdictionList.PopupMsg = item.AuthInfo.PopupMsg;
+            this.applyForIsShow = true;
+          }
+        }
+      } else {
+        this.$store.dispatch("checkHandle");
+      }
+    },
+    playVideo(item) {
+      let params = {
+        Id: item.IndustryVideo.Id,
+        ResourceUrl: item.IndustryVideo.ResourceUrl,
+        BackgroundImg: item.IndustryVideo.BackgroundImg,
+        Title: `5min【${item.IndustryName}】逻辑解析`,
+      };
+      if (this.$store.state.videoPlay.playVideoId != item.Id) {
+        this.$store.commit("videoPlay/palyTimeUpdate", 0);
+        this.$store.commit("videoPlay/playVideo", item.Id);
+      }
+      this.globalBgAudioManager.stop();
+      this.videoPopList = params;
+      this.showVideoPop = true;
+    },
   },
 };
 </script>
@@ -309,10 +309,22 @@ export default {
       padding: 0 30rpx;
       background-color: #fff;
       .publish {
+        position: relative;
         display: flex;
         align-items: center;
         color: #999999;
         font-style: 26rpx;
+        padding-left: 30rpx;
+        .reg-hint {
+          position: absolute;
+          top: 50%;
+          left: 0rpx;
+          width: 14rpx;
+          height: 14rpx;
+          transform: translateY(-50%);
+          background-color: #ff0000;
+          border-radius: 50%;
+        }
       }
     }
     .read-more {
@@ -320,41 +332,41 @@ export default {
       display: flex;
       flex-wrap: wrap;
       margin-left: 80rpx;
-	  .industry-video-item{
-	  	height: 126rpx;
-	  	width: 170rpx;
-		// width: 216rpx;
-	  	margin: 0 40rpx 30rpx 0;
-		// margin: 0 15rpx 30rpx 0;
-	  	border-radius: 8rpx;
-	  	background-size: cover;
-	  	background-position: center;
-	  	background-repeat: no-repeat;
-	  	font-weight: 500;
-	  	font-size: 32rpx;
-	  	color: white;
-	  	line-height: 45rpx;
-	  	padding: 20rpx;
-	  	position: relative;
-	  	overflow: hidden;
-	  	.industry-video-icon{
-	  		height: 0rpx;
-	  		width: 0rpx;
-	  		border-style: solid;
-	  		border-color: #3385FF #3385FF transparent transparent;
-	  		border-width: 28rpx;
-	  		position: absolute;
-	  		right: 0;
-	  		top: 0;
-	  		image{
-	  			position: absolute;
-	  			right: -24rpx;
-	  			bottom: 0;
-	  			height: 20rpx;
-	  			width: 20rpx;
-	  		}
-	  	}
-	  }
+      .industry-video-item {
+        height: 126rpx;
+        width: 170rpx;
+        // width: 216rpx;
+        margin: 0 40rpx 30rpx 0;
+        // margin: 0 15rpx 30rpx 0;
+        border-radius: 8rpx;
+        background-size: cover;
+        background-position: center;
+        background-repeat: no-repeat;
+        font-weight: 500;
+        font-size: 32rpx;
+        color: white;
+        line-height: 45rpx;
+        padding: 20rpx;
+        position: relative;
+        overflow: hidden;
+        .industry-video-icon {
+          height: 0rpx;
+          width: 0rpx;
+          border-style: solid;
+          border-color: #3385ff #3385ff transparent transparent;
+          border-width: 28rpx;
+          position: absolute;
+          right: 0;
+          top: 0;
+          image {
+            position: absolute;
+            right: -24rpx;
+            bottom: 0;
+            height: 20rpx;
+            width: 20rpx;
+          }
+        }
+      }
       .text-box {
         margin-bottom: 30rpx;
         margin-right: 40rpx;
@@ -438,4 +450,4 @@ export default {
     }
   }
 }
-</style>
+</style>

pages-search/indedxSearch/indedxSearch.vue

@@ -428,6 +428,8 @@ export default {
     },
   },
   onLoad(options) {
+    this.$store.commit("setRouterActivity", "搜索");
+    this.$store.commit("setRouterReport", "搜索");
     this.researchHotKeyWord();
     this.laodInit(options);
     if (this.$db.get("historySearchList")) {

pages/index/index.vue

@@ -159,6 +159,8 @@ export default {
     });
   },
   onLoad() {
+    this.$store.commit("setRouterActivity", "首页");
+    this.$store.commit("setRouterReport", "首页");
     this.getUserInfo();
     this.initNavBar();
     this.getNewList();

pages/material/material.vue

@@ -141,6 +141,8 @@ export default {
   },
   watch: {},
   onLoad(optios) {
+    this.$store.commit("setRouterActivity", "纪要库");
+    this.$store.commit("setRouterReport", "纪要库");
     this.getHeaderTab();
     uni.getSystemInfo({
       success: function (res) {
@@ -217,9 +219,11 @@ export default {
       } else {
         this.initData();
       }
+      this.$store.commit("setRouterReport", item.Id === 3 ? "我的收藏" : "纪要库");
     },
     //点击顶部二级分类
     handleClickTopSub(item) {
+      this.$store.commit("setRouterReport", item.PermissionName === "我的收藏" ? "我的收藏" : "纪要库");
       this.secondActive = item.ChartPermissionId;
       this.chartChildren = [];
       this.chartChildrenActive = 0;

pages/purchaser/purchaser.vue

@@ -305,6 +305,7 @@ export default {
     },
   },
   onLoad() {
+    this.$store.commit("setRouterReport", "月度收藏榜");
     this.researchNewList();
     this.initNavBar();
   },

pages/reportForm/components/strategy.vue

@@ -136,6 +136,7 @@ export default {
         this.$emit("hideIsred", this.isShow);
       }
       this.collectList[index].IsRed = false;
+      this.$store.commit("setRouterReport", "深度研究策略");
       this.$store.dispatch("checkHandle", "/pageMy/reportDetail/reportDetail?id=" + item.ArticleId);
     },
   },

pages/reportForm/reportForm.vue

@@ -443,6 +443,7 @@ export default {
     },
     // 视频播放权限判断
     handelVideoPlay(item) {
+      this.$store.commit("setRouterReport", "产业列表");
       if (!this.$store.state.isAuth && !this.$store.state.isBind) {
         if (item.AuthInfo.HasPermission == 1) {
           this.playVideo(item);
@@ -491,6 +492,7 @@ export default {
 
     // 策略平台的 标签 点击事件
     strategyLabelHadel(item) {
+      this.$store.commit("setRouterReport", "综述链接");
       //去往文章详情页面
       this.$store.dispatch("checkHandle", "/pageMy/reportDetail/reportDetail?id=" + item.ArticleId);
     },

reportPages/IndustryReport/IndustryReport.vue

@@ -48,6 +48,7 @@
             <view class="line-item" v-for="(item, index) in timeLine" :key="index" @click="goDetailFromTimeLine(item, index)">
               <view class="time">{{ item.date }}</view>
               <view class="content" v-if="item.Content.length">
+                <text class="content-reg" v-if="item.IsRed"></text>
                 <rich-text class="rich-text" :style="{ height: item.isExpand ? 'auto' : richTextHeight + 'px' }" :data-index="index" :class="{ expand: item.isExpand }" :nodes="item.Content">
                 </rich-text>
                 <view class="expan-btn" :class="{ pos: !item.isExpand }" @click="handleExpand(item, index)" v-if="item.isShowBtn">{{ item.isExpand ? "收起" : "展开" }}</view>
@@ -134,9 +135,15 @@ export default {
   watch: {
     //监听tabs的变化
     tabAct_id: {
-      handler() {
-        if (this.tabAct_id) {
-          (this.page_no = 1), (this.collectList = []);
+      handler(newVal) {
+        this.tabBars.forEach((item) => {
+          if (item.CategoryId == newVal) {
+            this.$store.commit("setRouterReport", item.MatchTypeName);
+          }
+        });
+        if (newVal) {
+          this.page_no = 1;
+          this.collectList = [];
           this.getCollectList();
         }
       },
@@ -252,10 +259,6 @@ export default {
     },
     async goDetail(item, index) {
       /* 无需授权且已绑定 检验是或否有权限 */
-      if (index == 0) {
-        this.tabBars[this.toggleTabIndex].IsRed = false;
-      }
-      this.collectList[index].IsRed = false;
       await this.$store.dispatch("checkHandle");
       if (!this.$store.state.isAuth && !this.$store.state.isBind) {
         // 已授权已绑定
@@ -273,6 +276,7 @@ export default {
     },
     // 视频播放权限判断
     handelVideoPlay() {
+      this.$store.commit("setRouterReport", "资源包详情页");
       if (!this.$store.state.isAuth && !this.$store.state.isBind) {
         if (this.authInfo.HasPermission == 1) {
           this.playVideo();
@@ -310,7 +314,7 @@ export default {
     },
     //
     async handelVideoBindplay() {
-      const res = await Home.microAideoHistoryAdd({ VideoId: this.industryVideo.Id, SourceType: 1 });
+      const res = await Home.microAideoHistoryAdd({ VideoId: this.industryVideo.Id, SourceType: 1, PageRouter: this.$store.state.pageRouterReport });
     },
     //展开收起晨会内容
     handleExpand(item, index) {
@@ -650,6 +654,15 @@ export default {
               bottom: 0;
             }
           }
+          .content-reg {
+            position: absolute;
+            top: 10rpx;
+            left: -20rpx;
+            width: 14rpx;
+            height: 14rpx;
+            background-color: #ff0000;
+            border-radius: 50%;
+          }
         }
         .title {
           color: #3385ff;

reportPages/authorPages/authorPages.vue

@@ -108,7 +108,7 @@ export default {
             duration: 2000,
           });
         }
-        uni.$emit('updateFllowAuthor',{isFollw:this.isFollw,id:this.list.DepartmentId})
+        uni.$emit("updateFllowAuthor", { isFollw: this.isFollw, id: this.list.DepartmentId });
       }
     },
     //收藏
@@ -143,6 +143,7 @@ export default {
     },
     //去往文章详情页面
     goDetail(item) {
+      this.$store.commit("setRouterReport", "作者详情");
       this.$store.dispatch("checkHandle", "/pageMy/reportDetail/reportDetail?id=" + item.ArticleId);
     },
     //去往主题详情

reportPages/hotList/hotList.vue

@@ -116,7 +116,7 @@ export default {
       labelListData: [],
     };
   },
-  components: {modalDialog,videoModule},
+  components: { modalDialog, videoModule },
   methods: {
     /* 获取tab*/
     async getTabList() {
@@ -130,6 +130,7 @@ export default {
     /* 点击一级的tabs*/
     tabsHandler(item) {
       this.tabsActive = item.Source;
+      this.$store.commit("setRouterReport", item.Name);
       this.listInit();
       this.researchHotList();
     },

reportPages/industrialReport/industrialReport.vue

@@ -4,7 +4,8 @@
     <view class="collect-ul" v-if="haveData">
       <view class="collect-ltem" v-for="(item, index) in collectList" :key="index" @click="goDetail(item, index)">
         <view class="item-left">
-          <text class="title text_twoLine">{{ item.Title }}
+          <text class="title text_twoLine"
+            >{{ item.Title }}
             <text class="reg-text" v-if="item.IsRed"></text>
           </text>
           <view class="desc">
@@ -24,15 +25,15 @@
       <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/act_search.png" mode="" class="nodata_ico"></image>
       <text>暂时没有报告的内容</text>
     </view>
-   <freeCharge class="free-charge" :isShowFreeBtn="isShowFree"/>
+    <freeCharge class="free-charge" :isShowFreeBtn="isShowFree" />
   </view>
 </template>
 
 <script>
 import { Reports } from "@/config/api.js";
 import { Throttle } from "@/config/util.js";
-import freeCharge  from '@/components/freeCharge'
-let app = getApp({allowDefault: true});
+import freeCharge from "@/components/freeCharge";
+let app = getApp({ allowDefault: true });
 export default {
   data() {
     return {
@@ -57,12 +58,13 @@ export default {
     };
   },
   onLoad(option) {
-        this.categoryId = Number(option.id) || "";
-        this.idGenre = Number(option.idGenre) || "";
-        this.articleId = Number(option.idArticle) || "";
-        this.typeIsPost = option.type || "";
-        this.genreIs = option.isGenre || "";
-        this.getCollectList();
+    this.$store.commit("setRouterReport", "行业综述");
+    this.categoryId = Number(option.id) || "";
+    this.idGenre = Number(option.idGenre) || "";
+    this.articleId = Number(option.idArticle) || "";
+    this.typeIsPost = option.type || "";
+    this.genreIs = option.isGenre || "";
+    this.getCollectList();
   },
   onShow() {},
   methods: {
@@ -124,11 +126,11 @@ export default {
     goDetail(item, index) {
       /* 无需授权且已绑定 检验是或否有权限 */
       this.collectList[index].IsRed = false;
-      this.$store.dispatch("checkHandle","/pageMy/reportDetail/reportDetail?id=" + item.ArticleId)
+      this.$store.dispatch("checkHandle", "/pageMy/reportDetail/reportDetail?id=" + item.ArticleId);
     },
   },
   components: {
-    freeCharge
+    freeCharge,
   },
   /* 触底 */
   onReachBottom: Throttle(function () {
@@ -149,7 +151,7 @@ export default {
    */
   onShareAppMessage: function (res) {
     return {
-      title: this.isHorzMobile ? "好友向您推荐此内容，上传名片享查研观向免费月卡！" :  this.titleReport,
+      title: this.isHorzMobile ? "好友向您推荐此内容，上传名片享查研观向免费月卡！" : this.titleReport,
       path:
         "/reportPages/industrialReport/industrialReport?id=" + this.categoryId + "&type=" + this.typeIsPost + "&isGenre=" + this.genreIs + "&idGenre=" + this.idGenre + "&idArticle=" + this.articleId,
       success: (res) => {},

reportPages/myAskPage/myAskPage.vue

@@ -55,6 +55,8 @@ export default {
     },
   },
   onLoad() {
+    this.$store.commit("setRouterActivity", "活动提问");
+    this.$store.commit("setRouterReport", "活动提问");
     this.getAsk();
   },
 };

reportPages/reportSecretDetail/reportSecretDetail.vue

@@ -299,9 +299,11 @@ export default {
   async onLoad(option) {
     this.isType = option.type;
     this.id = Number(option.id) || "";
+    let titleTxT = this.isType == 1 ? "报告精选" : this.isType == 2 ? "本周研究汇总" : "上周纪要汇总";
     uni.setNavigationBarTitle({
-      title: this.isType == 1 ? "报告精选" : this.isType == 2 ? "本周研究汇总" : "上周纪要汇总",
+      title: titleTxT,
     });
+    this.$store.commit("setRouterReport", titleTxT);
     await this.$store.dispatch("checkHandle");
     if (!this.$store.state.isAuth && !this.$store.state.isBind) this.getDetilaiList();
 

reportPages/researchTheme/researchTheme.vue

@@ -149,6 +149,7 @@ export default {
     },
   },
   onLoad(options) {
+    this.$store.commit("setRouterReport", "主题详情");
     let source = options.source || "";
     this.researchThemeDetail(options.id, source);
   },

reportPages/roadEssence/roadEssence.vue

@@ -160,7 +160,7 @@ export default {
       if (res.Ret === 200) {
         this.haveAuth = res.Data.HasPermission;
         if (res.Data.Detail) {
-         let arr = res.Data.Detail.VideoPlaySeconds.split(":");
+          let arr = res.Data.Detail.VideoPlaySeconds.split(":");
           res.Data.Detail.VideoPlaySeconds = arr[0] * 60 + (arr[1] - 0);
           this.detali = res.Data.Detail;
           this.videoUrl = res.Data.Detail.VideoUrl;
@@ -280,6 +280,7 @@ export default {
     audioModule,
   },
   async onLoad(option) {
+    this.$store.commit("setRouterReport", "路演精华");
     this.id = Number(option.id) || "";
 
     // 免费送月卡

store/index.js

@@ -10,12 +10,20 @@ const store = new Vuex.Store({
   state: {
     isAuth: "", // 默认为
     isBind: "",
+    pageRouterReport: "", //报告详情的路径
+    pageRouterActivity: "", //活动详情的路径
   },
   mutations: {
     globalData(state, payload) {
       state.isAuth = payload.IsAuth;
       state.isBind = payload.IsBind;
     },
+    setRouterReport(state, payload) {
+      state.pageRouterReport = payload;
+    },
+    setRouterActivity(state, payload) {
+      state.pageRouterActivity = payload;
+    },
   },
   actions: {
     checkHandle(context, navigateUrl = "") {
@@ -68,7 +76,7 @@ const store = new Vuex.Store({
     },
   },
   getters: {},
-  modules: { audioBg,videoPlay },
+  modules: { audioBg, videoPlay },
 });
 
 export default store;