cygx 7.4

activityPages/playBack/playBack.vue

@@ -136,9 +136,9 @@ export default {
         this.isShowJurisdiction = !this.isShowJurisdiction;
         this.isGetJurisdiction = this.isShowJurisdiction ? 1 : 2;
         await this.getUserSearchContent();
-
         if (this.isShowJurisdiction) {
           this.getActivityList();
+          this.replacementConfirm()
         } else {
           this.replacementBtn();
         }

pageMy/browseHistory/browseHistory.vue

@@ -10,7 +10,7 @@
           <text style="display: inline" @click="goDetailReport(item)">
             {{ item.Title }}
           </text>
-          <text @click="themeDetails(item,val)" class="item-industry" v-for="val in item.List" :key="val.IndustrialManagementId"> # {{ val.IndustryName }} </text>
+          <text @click="themeDetails(item, val)" class="item-industry" v-for="val in item.List" :key="val.IndustrialManagementId"> # {{ val.IndustryName }} </text>
         </view>
         <view class="item-more">
           <text>{{ item.PublishDate }}</text>
@@ -38,7 +38,7 @@
 </template>
 
 <script>
-import { Mine } from "@/config/api.js";
+import { Mine, Report } from "@/config/api.js";
 import { Throttle } from "@/config/util.js";
 import freeCharge from "@/components/freeCharge";
 export default {
@@ -92,7 +92,7 @@ export default {
       this.$store.dispatch("checkHandle", "/pageMy/reportDetail/reportDetail?id=" + item.ArticleId);
     },
     //去往主题详情
-    themeDetails(item,val) {
+    themeDetails(item, val) {
       if (item.Source === 1) {
         //非严选
         this.$store.dispatch("checkHandle", "/reportPages/IndustryReport/IndustryReport?id=" + val.IndustrialManagementId);
@@ -101,6 +101,27 @@ export default {
         this.$store.dispatch("checkHandle", "/reportPages/researchTheme/researchTheme?id=" + val.IndustrialManagementId);
       }
     },
+    //收藏
+    async collectClick(item) {
+      const res = await Report.collectRpt({ ArticleId: item.ArticleId });
+      if (res.Ret === 200) {
+        item.IsCollect = !item.IsCollect;
+        item.IsCollect
+          ? (item.CollectNum += 1) &&
+            uni.showToast({
+              title: "收藏成功",
+              icon: "none",
+              duration: 2000,
+            })
+          : (item.CollectNum -= 1);
+        !item.IsCollect &&
+          uni.showToast({
+            title: "已取消收藏",
+            icon: "none",
+            duration: 2000,
+          });
+      }
+    },
   },
   /* 触底 */
   onReachBottom: Throttle(function () {

pageMy/myCollection/myCollection.vue

@@ -10,7 +10,7 @@
           <text style="display: inline" @click="goDetailReport(item)">
             {{ item.Title }}
           </text>
-          <text @click="themeDetails(item,val)" class="item-industry" v-for="val in item.List" :key="val.IndustrialManagementId"> # {{ val.IndustryName }} </text>
+          <text @click="themeDetails(item, val)" class="item-industry" v-for="val in item.List" :key="val.IndustrialManagementId"> # {{ val.IndustryName }} </text>
         </view>
         <view class="item-more">
           <text>{{ item.PublishDate }}</text>
@@ -38,7 +38,7 @@
 </template>
 
 <script>
-import { Mine } from "@/config/api.js";
+import { Mine, Report } from "@/config/api.js";
 import { Throttle } from "@/config/util.js";
 import freeCharge from "@/components/freeCharge";
 export default {
@@ -101,6 +101,27 @@ export default {
         this.$store.dispatch("checkHandle", "/reportPages/researchTheme/researchTheme?id=" + val.IndustrialManagementId);
       }
     },
+    //收藏
+    async collectClick(item) {
+      const res = await Report.collectRpt({ ArticleId: item.ArticleId });
+      if (res.Ret === 200) {
+        item.IsCollect = !item.IsCollect;
+        item.IsCollect
+          ? (item.CollectNum += 1) &&
+            uni.showToast({
+              title: "收藏成功",
+              icon: "none",
+              duration: 2000,
+            })
+          : (item.CollectNum -= 1);
+        !item.IsCollect &&
+          uni.showToast({
+            title: "已取消收藏",
+            icon: "none",
+            duration: 2000,
+          });
+      }
+    },
   },
   /* 触底 */
   onReachBottom: Throttle(function () {

pageMy/search/search.vue

@@ -35,7 +35,7 @@
       </view>
       <view class="search-cont-top">
         <view class="cont-tit">
-          <text>弘则推荐：</text>
+          <text>推荐关键词：</text>
         </view>
         <view class="targetList">
           <view class="target-item" v-for="(item, index) in keywordList" :key="index" @click="chooseTarget(item)"># {{ item }}</view>

pages/activity/activity.vue

@@ -46,11 +46,8 @@
         <view class="half">
           <view class="activity-ltem" v-for="(item, index) in collectTypeList" :key="index" v-if="item.Position == 1">
             <image class="zindex-one" :src="item.ImgUrl"></image>
-            <!-- <image class="zindex-two" :src="item.ImgUrlBg"></image> -->
             <view class="content">
-              <view class="item-img" @click="goDetails(item)">
-                {{ item.ActivityTypeName }}
-              </view>
+              <view class="item-img" @click="goDetails(item)"> </view>
               <view :style="{ 'background-image': 'url(' + item.ImgUrlBg + ')' }" class="activity-ui">
                 <view class="activity-li" v-for="val in item.List" :key="val.KeyWord" @click="goDetails(val, item.Resource)">
                   <image class="item-image" lazy-load :src="val.ImgUrlBg"></image>
@@ -63,11 +60,8 @@
         <view class="half">
           <view class="activity-ltem" v-for="(item, index) in collectTypeList" :key="index" v-if="item.Position == 2">
             <image class="zindex-one" :src="item.ImgUrl"></image>
-            <!-- <image class="zindex-two" :src="item.ImgUrlBg"></image> -->
             <view class="content">
-              <view class="item-img" @click="goDetails(item)">
-                {{ item.ActivityTypeName }}
-              </view>
+              <view class="item-img" @click="goDetails(item)"> </view>
               <view :style="{ 'background-image': 'url(' + item.ImgUrlBg + ')' }" class="activity-ui">
                 <view class="activity-li" v-for="val in item.List" :key="val.KeyWord" @click="goDetails(val, item.Resource)">
                   <image class="item-image" lazy-load :src="val.ImgUrlBg"></image>
@@ -491,7 +485,6 @@ export default {
       top: 0;
       left: 0;
       width: 100%;
-      // padding-bottom: 30rpx;
       border-radius: 15rpx;
       overflow: hidden;
       z-index: 3;
@@ -502,7 +495,6 @@ export default {
       margin-bottom: 30rpx;
       font-size: 34rpx;
       color: #fff;
-      padding: 30rpx 0 0 20rpx;
     }
     .activity-li {
       width: 100%;

reportPages/reportSearch/reportSearch.vue

@@ -36,7 +36,7 @@
         </view>
         <view class="search-cont-top">
           <view class="cont-tit">
-            <text>高关注度：</text>
+            <text>推荐关键词：</text>
           </view>
           <view class="targetList">
             <view class="target-item" v-for="(item, index) in keywordList" :key="index" @click="chooseTarget(item)"># {{ item }}</view>