浏览代码

Merge branch '10.5.2'

bding 1 年之前
父节点
当前提交
bb180da332
共有 3 个文件被更改,包括 7 次插入4 次删除
  1. 5 2
      components/ItemComponent/reportItem.vue
  2. 1 1
      components/isTrackFollow.vue
  3. 1 1
      pageMy/reportPage/reportPage.vue

+ 5 - 2
components/ItemComponent/reportItem.vue

@@ -6,7 +6,10 @@
     <view class="item-image" v-if="list.BodyHtml">
       <image :src="list.BodyHtml"></image>
     </view>
-    <block v-if="list.Annotation || list.Body[0]">
+    <view class="item-image" v-if="list.Cover">
+      <image :src="list.Cover"></image>
+    </view>
+    <block v-if="(list.Annotation || list.Body[0]) && !list.Cover">
       <text class="item-content" v-if="!list.Body[0]">{{ list.ArticleResponse == 4 ? "核心观点" : "核心结论" }}:</text>
       <view class="item-rich-text">
         <mp-html :content="richTextClamp(7) + (list.Annotation || list.Body[0]) + '</div>'" />
@@ -46,7 +49,7 @@ export default {
     goDetail(item) {
       if (item.HomeType !== 1) {
         /* 无需授权且已绑定 检验是或否有权限 */
-        uni.navigateTo({ url: "/pageMy/reportDetail/reportDetail?id=" + item.ArticleId});
+        uni.navigateTo({ url: "/pageMy/reportDetail/reportDetail?id=" + item.ArticleId });
       }
     },
     richTextClamp(val) {

+ 1 - 1
components/isTrackFollow.vue

@@ -1,7 +1,7 @@
 <template>
   <view class="track-follow-page" v-if="isShowFollowButton">
     <view class="container-track-follow">
-      <view>若对该赛道不感兴趣,可点击 </view>
+      <view>若无需此赛道更新推送,请点击 </view>
       <view class="cancel-follow" @click="isFollowHandler">{{ isFollowData ? "取消关注" : "已取消" }} </view>
       <icon @click="followInfoHandler" type="info" size="16" color="#fff" />
       <van-icon @click="cancelFollowClick" class="close-follow" name="cross" size="16" color="#fff" />

+ 1 - 1
pageMy/reportPage/reportPage.vue

@@ -5,7 +5,7 @@
         <web-view :src="strategyUrl + '?url=' + linkurl" v-if="linkurl">
           <cover-view class="search-view">
             <cover-view class="search-view-box" v-if="reportInfo.IsShowFollowButton">
-              <cover-view>若对该赛道不感兴趣,可点击</cover-view>
+              <cover-view>若无需此赛道更新推送,请点击</cover-view>
               <cover-image
                 class="search-icon"
                 @click="isFollowHandler"