9.7 init

activityPages/activityDetail/activityDetail.vue

@@ -206,9 +206,7 @@
           </view>
           <view class="network" v-if="detailData.ArticleList.length">
             <view class="network-left">相关报告：</view>
-            <view class="network-right" style="color: #2c83ff">
-              <view style="margin-left: -20rpx" class="text_oneLine" @click="goDetail(item.ArticleId)" v-for="item in detailData.ArticleList" :key="item.ArticleId"> {{ item.ReportLink }}</view>
-            </view>
+            <view class="network-right look-link" style="color: #2c83ff" @click="articleLinkHandler"> 点击查看 </view>
           </view>
           <view v-if="detailData.Theme" class="network">
             <view class="network-left">主&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;题： </view>
@@ -261,6 +259,12 @@
           <view style="color: #a9afb8" @click="selectShow = false">取消</view>
         </u-popup>
       </view>
+      <view class="select-box">
+        <u-popup v-model="selectShowLink" mode="bottom">
+          <view style="color: #2c83ff" class="text_oneLine" @click="goDetail(item.ArticleId)" v-for="item in detailData.ArticleList" :key="item.ArticleId"> {{ item.ReportLink }}</view>
+          <view style="color: #a9afb8" @click="selectShowLink = false">取消</view>
+        </u-popup>
+      </view>
       <!-- 各种弹框部分 -->
       <modalDialog
         :isShow="isShow"
@@ -337,6 +341,7 @@ export default {
       curTime: 0,
       videoContext: null,
       isVideoPlay: false,
+      selectShowLink: false,
     };
   },
   mixins: [manageMixin],
@@ -618,6 +623,16 @@ export default {
         this.detailData.IsCollect = !this.detailData.IsCollect;
       }
     },
+    articleLinkHandler() {
+      console.log(this.detailData.ArticleList);
+      if (!this.detailData.ArticleList.length === 1) {
+        uni.navigateTo({
+          url: "/pageMy/reportDetail/reportDetail?id=" + this.detailData.ArticleList[0].ArticleId,
+        });
+      } else {
+        this.selectShowLink = true;
+      }
+    },
   },
   async onLoad(option) {
     this.id = option.id || "";
@@ -1024,5 +1039,16 @@ export default {
       }
     }
   }
+  .look-link {
+    background: #3385ff;
+    border-radius: 4rpx;
+    color: #fff !important;
+    width: 160rpx !important;
+    height: 40rpx;
+    text-align: center;
+    line-height: 40rpx;
+    margin-left: 20rpx;
+    padding-left: 0 !important;
+  }
 }
 </style>

components/isTrackFollow.vue

@@ -0,0 +1,104 @@
+<template>
+  <view class="track-follow-page">
+    <view class="container-track-follow">
+      <view>若对该赛道不感兴趣，可点击 </view>
+      <view class="cancel-follow">取消关注 </view>
+      <icon @click="followInfoHandler" type="info" size="16" color="#fff" />
+      <image @click="cancelFollowClick" class="close-follow" src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/close_follow.png" alt=""></image>
+    </view>
+    <van-dialog use-slot :show="show" close-on-click-overlay show-cancel-button :showConfirmButton="false" :showCancelButton="false" @close="onClickHide">
+      <view class="content-dialog">
+        <view class="close"><van-icon name="cross" color="#333" @click="onClickHide" /></view>
+        <text class="tips">提示</text>
+        <text>取消关注后，该赛道下的更新内容都不会对您做消息推送，您也可以在【查研观向小助手】公众号菜单栏【推送规则】下修改您关注的赛道</text>
+        <image show-menu-by-longpress src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/follow_dialog.png"></image>
+      </view>
+    </van-dialog>
+  </view>
+</template>
+
+<script>
+export default {
+  name: "",
+  components: {},
+  props: {},
+  data() {
+    return {
+      show: false,
+    };
+  },
+  computed: {},
+  watch: {},
+  created() {},
+  mounted() {},
+  methods: {
+    followInfoHandler() {
+      this.show = true;
+    },
+    onClickHide() {
+      this.show = false;
+    },
+    cancelFollowClick(){}
+  },
+};
+</script>
+<style scoped lang="scss">
+.track-follow-page {
+  position: relative;
+  width: calc(100% + 60rpx);
+  margin-left: -30rpx;
+  .container-track-follow {
+    position: relative;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 100%;
+    height: 60rpx;
+    padding-right: 30rpx;
+    background-color: #3385ff;
+    color: #fff;
+    .cancel-follow {
+      width: 136rpx;
+      height: 44rpx;
+      background-color: #fff;
+      color: #3385ff;
+      text-align: center;
+      line-height: 46rpx;
+      margin: 0 20rpx 0 15rpx;
+    }
+    .close-follow {
+      position: absolute;
+      top: 50%;
+      right: 20rpx;
+      transform: translateY(-50%);
+      width: 30rpx;
+      height: 30rpx;
+    }
+  }
+  .content-dialog {
+    text-align: center;
+    font-size: 32rpx;
+    color: #666;
+    line-height: 40rpx;
+    padding: 0 20rpx;
+    .close {
+      display: flex;
+      justify-content: flex-end;
+      align-items: center;
+      height: 60rpx;
+      padding-right: 10rpx;
+    }
+    .tips {
+      color: #333;
+      font-size: 34rpx;
+      font-weight: 500;
+      margin-bottom: 12rpx;
+    }
+    image {
+      margin-top: 35rpx;
+      width: 545rpx;
+      height: 579rpx;
+    }
+  }
+}
+</style>

config/config.js

@@ -12,7 +12,7 @@ if (env.envVersion === "develop") {
   //开发
   baseUrl = "http://8.136.199.33:8500/api";
   pcUrl = "https://cygxpctest.hzinsights.com/cygx_pc";
-  reportLinkUrl = "http://xcxh5test.hzinsights.com/xcx_h5/raiReportDtl";
+  reportLinkUrl = "http://192.168.77.25:3000/xcx_h5/raiReportDtl";
   reportStrategyUrl = "http://xcxh5test.hzinsights.com/xcx_h5/strategyReport";
 } else if (env.envVersion === "trial") {
   //体验版

pages.json

@@ -48,7 +48,7 @@
         "enablePullDownRefresh": false
       }
     }
-    ],
+  ],
   "subPackages": [
     {
       "root": "activityPages",
@@ -372,7 +372,8 @@
       "van-radio-group": "/wxcomponents/vant/dist/radio-group/index",
       "van-overlay": "/wxcomponents/vant/dist/overlay/index",
       "van-checkbox": "/wxcomponents/vant/dist/checkbox/index",
-      "van-checkbox-group": "/wxcomponents/vant/dist/checkbox-group/index"
+      "van-checkbox-group": "/wxcomponents/vant/dist/checkbox-group/index",
+      "van-dialog": "/wxcomponents/vant/dist/dialog/index"
     }
   },
   "tabBar": {

reportPages/hotList/hotList.vue

@@ -1,5 +1,6 @@
 <template>
   <view class="container container-hot-list">
+     <is-track-follow />
     <view class="top-content">
       <view class="tab-content">
         <view v-for="item in tabList" :key="item.Source" :class="['item', tabsActive == item.Source && 'tab-active']" @click="tabsHandler(item)">
@@ -22,11 +23,6 @@
             </view>
             <text :class="item.IsFollow ? 'cancel-attention' : 'attention'" @click="isAttention(item, '主题')">{{ item.IsFollow ? "取消关注" : "+ 关注" }}</text>
           </view>
-          <!-- <view class="li-item read-more">
-            <text class="text-box text_oneLine" v-for="val in item.IndustrialSubjectList" :key="val.IndustrialSubjectId">
-              {{ val.SubjectName }}
-            </text>
-          </view> -->
           <view class="li-item read-more">
             <view class="industry-video-item" @click.stop="handelVideoPlay(item)" :style="{ 'background-image': 'url(' + item.IndustryVideo.BackgroundImg + ')' }" v-if="item.IndustryVideo">
               5min
@@ -88,6 +84,7 @@
     </u-modal>
     <videoModule :showVideoPop="showVideoPop" :videoPopList="videoPopList" />
     <modalDialog :isShowhasPermission="isShowhasPermission" :applyForIsShow="applyForIsShow" :jurisdictionList="jurisdictionList" :hasPermission="hasPermission" />
+   
   </view>
 </template>
 
@@ -96,6 +93,7 @@ import { Reports } from "@/config/api.js";
 import { color_word_bg } from "@/utils/styleClassify";
 import videoModule from "@/components/videoModule/index";
 import modalDialog from "@/components/modalDialog.vue";
+import IsTrackFollow from '@/components/isTrackFollow.vue';
 export default {
   data() {
     return {
@@ -116,7 +114,7 @@ export default {
       labelListData: [],
     };
   },
-  components: { modalDialog, videoModule },
+  components: { modalDialog, videoModule,IsTrackFollow },
   methods: {
     /* 获取tab*/
     async getTabList() {