Merge branch 'master' into 12.8.1

pages-purchaser/columnAuthor/columnAuthor.vue

@@ -63,7 +63,7 @@ export default {
       uni.navigateTo({ url: "/pages-purchaser/columnDetail/columnDetail?id=" + item.UserId });
     },
   },
-  onShow() {
+  onLoad() {
     this.getColumnList();
   },
   /** 用户点击分享 */

pages-purchaser/noteAndViewpoint/noteAndViewpoint.vue

@@ -127,10 +127,12 @@ export default {
     //页面退出
     if (this.detailId && this.detailId > 0) {
       clearInterval(this.setIntervalTiem);
-      Reports.addStopTime({
-        SpecialId: this.detailId,
-        StopTime: this.readTiem,
-      }).then((res) => {});
+      purchaserApi
+        .YanxuanSpecialRecord({
+          SpecialId: this.detailId,
+          StopTime: this.readTiem,
+        })
+        .then((res) => {});
     }
   },
   onUnload() {

pages-purchaser/specialColumn/specialColumn.vue

@@ -78,7 +78,7 @@ export default {
       });
     },
   },
-  onShow() {
+  onLoad() {
     this.getYanxuanSpecialList();
   },
   /** 用户点击分享 */

pages-search/components/synthetical.vue

@@ -4,7 +4,7 @@
       <view class="item-ul">
         <block v-for="(item, index) in newDataList" :key="index">
           <view v-if="index % 2 == 0 && item.IsShowData">
-            <block v-if="item.Source === 'article' || item.Source === 'yanxuanspecial'"> <ReportItem :list="item.Article" /></block>
+            <block v-if="item.Source === 'article' || item.Source === 'yanxuanspecial' || item.Source === 'reportselection'"> <ReportItem :list="item.Article" /></block>
             <block v-if="item.Source === 'newchart'">
               <ChartItem :list="item.Newchart" :isMyChartCollection="isMyChartCollection" @myChartIsTop="myChartIsTop" @myChartCollect="myChartCollect" />
             </block>
@@ -26,7 +26,7 @@
       <view class="item-ul">
         <block v-for="(item, index) in newDataList" :key="index">
           <view v-if="index % 2 !== 0 && item.IsShowData">
-            <block v-if="item.Source === 'article' || item.Source === 'yanxuanspecial'"> <ReportItem :list="item.Article" /></block>
+            <block v-if="item.Source === 'article' || item.Source === 'yanxuanspecial' || item.Source === 'reportselection'"> <ReportItem :list="item.Article" /></block>
             <block v-if="item.Source === 'newchart'">
               <ChartItem :list="item.Newchart" :isMyChartCollection="isMyChartCollection" @myChartIsTop="myChartIsTop" @myChartCollect="myChartCollect" />
             </block>
@@ -121,9 +121,12 @@ export default {
         let listArr = [];
         res.Data.List &&
           res.Data.List.forEach((item) => {
+             if (item.ReportSelection && item.ReportSelection.MarketStrategy) {
+              item.ReportSelection.Body = [item.ReportSelection.MarketStrategy];
+            }
             let obj = {
               Source: item.Source,
-              Article: item.Article || item.YanxuanSpecial,
+              Article: item.Article || item.YanxuanSpecial || item.ReportSelection,
               Newchart: item.Newchart,
               Activity: item.Activity || item.Activityspecial,
               Roadshow: item.Roadshow || item.Activityvideo || item.Activityvoice || item.AskserieVideo,
@@ -136,10 +139,13 @@ export default {
             if (obj.YanxuanSpecial && obj.YanxuanSpecial.BodyHighlight) {
               obj.YanxuanSpecial.Body = obj.YanxuanSpecial.BodyHighlight;
             }
+            
             listArr.push({ ...obj, IsShowData: obj.Article || obj.Newchart || obj.Roadshow || obj.Activity || obj.ThreeSummary || obj.IndustrialResource });
           });
         this.newDataList = this.pageNumSynthetical === 1 ? listArr : [...this.newDataList, ...listArr];
         this.haveData = this.newDataList && this.newDataList.length ? true : false;
+        clearInterval(this.$parent.timerOut);
+        this.$store.commit("requestHideLoading");
       }
     },
     // 晨会弹框显示

pages-search/indedxSearch/indedxSearch.vue

@@ -3,16 +3,7 @@
     <view class="container search-container">
       <view class="sticky-content">
         <view class="searchTarget-header">
-          <input
-            type="text"
-            :placeholder="searchPlaceholderList.TabSearch"
-            placeholder-class="sea_ipt_placeholder"
-            class="sea_ipt"
-            v-model="searchTxt"
-            focus="true"
-            confirm-type="search"
-            @confirm="searchHandle"
-          />
+          <input type="text" :placeholder="searchPlaceholderList.TabSearch" placeholder-class="sea_ipt_placeholder" class="sea_ipt" v-model="searchTxt" confirm-type="search" @confirm="searchHandle" />
           <icon type="search" size="15" class="sea_ico" />
           <view class="ipt-right">
             <icon type="clear" size="16" color="#E0E0E0" v-show="searchTxt" @click="clearIpt" />
@@ -61,7 +52,7 @@
       </view>
       <view v-else class="content">
         <block v-if="haveResult">
-          <block v-if="tabsActive === 1">
+          <block v-if="tabsActive == 1">
             <synthetical :searchTxt="searchTxt" :isSyntheticalShow="isSyntheticalShow" :pageNumSynthetical="pageNumSynthetical" />
           </block>
           <view v-else>
@@ -127,6 +118,7 @@ export default {
       },
       isSearchKeyWord: [],
       isSyntheticalShow: false,
+      timerOut: null,
     };
   },
   computed: {
@@ -214,6 +206,9 @@ export default {
         this.isSearchKeyWord.push(this.searchTxt);
         await User.userSearchKeyWordLog({ KeyWord: this.searchTxt });
       }
+      this.timerOut = setInterval(() => {
+        this.$store.commit("requestShowLoading");
+      }, 300);
       if (this.tabsActive == 1) {
         this.isSyntheticalShow = true;
         this.pageNumSynthetical = 1;
@@ -273,6 +268,8 @@ export default {
           res.Data.List.length && this.resultDataList.push(...res.Data.List);
         }
         this.resultList = this.resultDataList;
+        clearInterval(this.timerOut);
+        this.$store.commit("requestHideLoading");
       }
     },
     //活动回放的接口获取列表
@@ -306,6 +303,8 @@ export default {
       } else {
         this.collectList.push(...res.Data.List);
       }
+      clearInterval(this.timerOut);
+      this.$store.commit("requestHideLoading");
     },
     //获取报告的
     async getReportList() {
@@ -324,6 +323,8 @@ export default {
         } else {
           this.haveResultReport = false;
         }
+        clearInterval(this.timerOut);
+        this.$store.commit("requestHideLoading");
       }
     },
     //获取微路演
@@ -347,6 +348,8 @@ export default {
         } else {
           this.roadshowPageList = this.roadshowPageList.concat(res.Data.List);
         }
+        clearInterval(this.timerOut);
+        this.$store.commit("requestHideLoading");
       }
     },
     //点击了更多

pages/index/index.vue

@@ -49,6 +49,7 @@
           <view class="lable-row" v-for="(item, index) in lableIsRows" :key="index">
             <view :class="['lable-item', lable.isAct && 'item-active']" v-for="lable in item" :key="lable.TagId" @click="lableKeysHandler(lable)">
               {{ lable.TagName }}
+              <image v-if="lable.TagName == '问答'" class="item-image" lazy-load src="https://hzstatic.hzinsights.com/cygx/icon/new_report.png"></image>
             </view>
           </view>
         </view>
@@ -176,20 +177,20 @@ export default {
     },
     lableIsRows() {
       //处理标签的样式
-      const numTags = this.dataListLable.length;
-      const rows = [];
+      // const numTags =.length;
+      const rows = [this.dataListLable];
 
-      if (numTags <= 4) {
-        rows.push(this.dataListLable);
-      } else if (numTags > 4 && numTags <= 8) {
-        const firstRow = this.dataListLable.slice(0, 4);
-        const secondRow = this.dataListLable.slice(4);
-        rows.push(firstRow, secondRow);
-      } else if (numTags >= 9) {
-        const firstRow = this.dataListLable.filter((_, index) => index % 2 === 0);
-        const secondRow = this.dataListLable.filter((_, index) => index % 2 !== 0);
-        rows.push(firstRow, secondRow);
-      }
+      // if (numTags <= 4) {
+      //   rows.push(this.dataListLable);
+      // } else if (numTags > 4 && numTags <= 8) {
+      //   const firstRow = this.dataListLable.slice(0, 4);
+      //   const secondRow = this.dataListLable.slice(4);
+      //   rows.push(firstRow, secondRow);
+      // } else if (numTags >= 9) {
+      //   const firstRow = this.dataListLable.filter((_, index) => index % 2 === 0);
+      //   const secondRow = this.dataListLable.filter((_, index) => index % 2 !== 0);
+      //   rows.push(firstRow, secondRow);
+      // }
 
       return rows;
     },
@@ -276,7 +277,7 @@ export default {
             uni.navigateTo({
               url: "/pageMy/login/login",
             });
-          } 
+          }
         },
       });
     },
@@ -409,6 +410,15 @@ export default {
       const res = await Home.homeTagListCustom();
       if (res.Ret === 200) {
         this.dataListLable = res.Data.List || [];
+        let arr = [];
+        if (this.actIdLable) {
+          arr = this.actIdLable.split(",").map((_) => Number(_));
+        }
+        this.dataListLable.forEach((item) => {
+          if (arr.includes(item.TagId)) {
+            item.isAct = true;
+          }
+        });
         this.industryTablList = res.Data.ListPermission || [];
       }
     },
@@ -429,7 +439,11 @@ export default {
       this.getNewList();
     });
   },
-  onLoad() {
+  onLoad(options) {
+    console.log(options);
+    this.industrytabActId = options.industrytabActId ? Number(options.industrytabActId) : 0;
+    this.actIdLable = options.findIndexId;
+    console.log(this.actIdLable, "======");
     this.getBannerList();
     this.getNewList();
     this.homeTagListCustom();
@@ -454,6 +468,7 @@ export default {
     this.page_no = 1;
     this.refresh = true;
     this.getNewList();
+    this.homeTagListCustom();
   },
   onPageScroll(val) {
     this.isScrollNumber = val.scrollTop;
@@ -474,9 +489,10 @@ export default {
         imageUrl: item.AudioShareImg || item.ShareImg,
       };
     } else {
+      console.log(this.actIdLable);
       return {
         title: this.isHorzMobile ? "好友向您推荐此内容，上传名片享查研观向免费月卡！" : "弘则研究—聚焦·前瞻·客观·深度",
-        path: "/pages/index/index",
+        path: "/pages/index/index?industrytabActId=" + this.industrytabActId + "&findIndexId=" + this.actIdLable,
         success: (res) => {},
         fail: (err) => {},
       };
@@ -574,7 +590,7 @@ export default {
   }
 
   .content-ul {
-    padding: 20rpx 10rpx;
+    padding: 0rpx 10rpx 20rpx;
     display: flex;
     justify-content: space-between;
     .item-ul {
@@ -608,21 +624,30 @@ export default {
     overflow-x: auto;
     width: 100%;
     background-color: #fff;
-    padding: 10rpx 0 20rpx 20rpx;
+    padding: 18rpx 0 18rpx 20rpx;
     .lable-row {
       display: flex;
       font-size: 24rpx;
     }
     .lable-item {
+      position: relative;
       flex-shrink: 0;
-      padding: 8rpx 40rpx;
+      padding: 6rpx 30rpx;
       background: #ffffff;
       border: 1rpx solid #dcdfe6;
       border-radius: 39rpx;
       margin-right: 20rpx;
       white-space: nowrap;
-      margin-top: 20rpx;
+      // padding-top: 20rpx;
       color: #999999;
+      .item-image {
+        position: absolute;
+        top: -16rpx;
+        right: -18rpx;
+        width: 60rpx;
+        height: 30rpx;
+        border-radius: 4rpx;
+      }
     }
     .item-active {
       border: none;