Merge branch '14.3' into debug

pages/reportForm/reportForm.vue

@@ -156,7 +156,7 @@
             <view @click="isShowOpenHandler" class="content-text">
               {{ isShowOpen ? "展开" : "收起" }}
             </view>
-            <image :src="isShowOpen ?'https://hzstatic.hzinsights.com/yx_xcx/expand_icon.png':'https://hzstatic.hzinsights.com/yx_xcx/collapse_icon.png'"></image>
+            <image :src="isShowOpen ? 'https://hzstatic.hzinsights.com/yx_xcx/expand_icon.png' : 'https://hzstatic.hzinsights.com/yx_xcx/collapse_icon.png'"></image>
           </view>
           <view class="opne-content all-setup">
             您也可以
@@ -274,7 +274,7 @@ export default {
         { text: "不感兴趣", imgUrl: "https://hzstatic.hzinsights.com/new_cygx/uninterestedBtn.png", key: 3 },
       ], // 动态设置的气泡选项内容
       isShowOpen: true, // 展开收起
-      IsInterested:true, //
+      IsInterested: true, //
       page_no_open: 1,
     };
   },
@@ -363,14 +363,12 @@ export default {
     //tabs切换事件
     toggleTab(item, index) {
       this.strategyIndex = index;
-      console.log(this.strategyIndex);
       this.tabAct_idTwo = "";
       this.deepCoverFocus = [];
       this.labelListData = [];
       this.tabBarsTow = [];
       if (this.tabAct_id !== item.ChartPermissionId) {
         this.tabAct_id = item.ChartPermissionId;
-        console.log(this.tabAct_id, "this.tabAct_id");
         this.$store.dispatch("statistics", {
           PageType: "Report",
           ChartPermissionId: Number(this.tabAct_id),
@@ -417,8 +415,6 @@ export default {
     },
     //获取产业报告所有品种接口
     getIndustryList() {
-      console.log( this.isShowOpen,'-----');
-      
       Reports.getIndustryList({
         ChartPermissionId: this.tabAct_id,
         OrderColumn: this.OrderColumn,
@@ -429,8 +425,8 @@ export default {
         RecommendFocus: this.deepCoverFocus.includes("focus") ? 1 : 0,
       }).then((res) => {
         // this.industryList=res.Data.List
-        this.IsInterested = res.Data.IsInterested
-        this.isShowOpen = res.Data.IsShowOpen
+        this.IsInterested = res.Data.IsInterested;
+        this.isShowOpen = res.Data.IsShowOpen;
         this.status = res.Data.Paging.IsEnd ? "nomore" : "loadmore";
         this.totalPage = res.Data.Paging.Pages; //总页数
         if (this.page_no === 1) {
@@ -703,7 +699,7 @@ export default {
     getDisplayText(item) {
       return item.FollowType == 1
         ? "https://hzstatic.hzinsights.com/new_cygx/FocusIcon.png"
-        : item.IsFollow == 0
+        : item.FollowType == 0
         ? "https://hzstatic.hzinsights.com/new_cygx/AcceptIcon.png"
         : "https://hzstatic.hzinsights.com/new_cygx/uninterested.png";
     },
@@ -714,7 +710,8 @@ export default {
         this.page_no = 1;
         this.status = "loading";
         this.getIndustryList();
-      } else if (this.status === "nomore" || this.isShowOpen) {
+      } else if (!this.isShowOpen) {
+        this.page_no++;
         this.page_no_open = 1;
         this.status = "loading";
         this.getIndustryList();
@@ -733,8 +730,6 @@ export default {
       this.isNum++;
       return;
     }
-    console.log(this.status === "nomore",this.isShowOpen);
-    
     if (this.status === "nomore" || (!this.isShowOpen && this.IsInterested)) return;
     this.status = "loading";
     this.page_no++;