Merge branch 'master' into 9.8

components/ItemComponent/reportItem.vue

@@ -1,6 +1,6 @@
 <template>
   <view class="container-report-item" @click="goDetail(list)">
-    <view class="item-title">
+    <view class="item-title" v-if="list.Title">
       <mp-html :content="richTextClamp(3) + list.Title + '</div>'" />
     </view>
     <view class="item-image" v-if="list.BodyHtml">

pageMy/browseHistory/browseHistory.vue

@@ -2,10 +2,12 @@
   <view class="container browseHistory-container">
     <view class="history-ul" v-if="haveData">
       <view class="content-item" v-for="item in historyList" :key="item.ArticleId">
-        <view class="item-user" v-if="item.Source == 2">
-          <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/user_report.png"></image>
-          <text> {{ item.NickName }}</text>
-        </view>
+        <blok v-if="item.NickName">
+          <view class="item-user" v-if="item.Source == 2">
+            <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/user_report.png"></image>
+            <text> {{ item.NickName }}</text>
+          </view>
+        </blok>
         <view class="item-title">
           <text style="display: inline" @click="goDetailReport(item)">
             {{ item.Title }}

pageMy/myCollection/myCollection.vue

@@ -12,20 +12,21 @@
           <RoadshowItem :list="item" @isCollectionHandeler="isCollectionHandeler" />
         </view>
       </view>
-      <blok v-if="tabsActive == 3">
+      <blok v-else-if="tabsActive == 3">
         <viwe class="chart-ul">
           <view style="width: 49%" v-for="item in collectList" :key="item.Id">
             <ChartItem class="chart-item" :isMyChartCollection="true" :list="item" @myChartIsTop="myChartIsTop" @myChartCollect="myChartCollect" />
           </view>
         </viwe>
       </blok>
-
       <block v-else>
         <view class="content-item" v-for="item in collectList" :key="item.ArticleId">
-          <view class="item-user" v-if="item.Source == 2">
-            <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/user_report.png"></image>
-            <text> {{ item.NickName }}</text>
-          </view>
+          <blok v-if="item.NickName">
+            <view class="item-user" v-if="item.Source == 2">
+              <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/czbk/user_report.png"></image>
+              <text> {{ item.NickName }}</text>
+            </view>
+          </blok>
           <view class="item-title">
             <text style="display: inline" @click="goDetailReport(item)">
               {{ item.Title }}
@@ -84,7 +85,7 @@ export default {
         { name: "微路演", id: 2 },
         { name: "图表", id: 3 },
       ],
-      tabsActive: 3,
+      tabsActive: 1,
     };
   },
   onLoad() {

pages/reportForm/components/strategy.vue

@@ -82,12 +82,17 @@ export default {
         if (this.status === "nomore") return;
         this.status = "loading";
         this.page_no++;
-        this.getCollectList();
+        this.tabAct_idTwo && this.getCollectList();
       },
     },
     tabAct_idTwo: {
-      handler() {
-        (this.page_no = 1), (this.pageSize = 10), this.getCollectList();
+      handler(newValue) {
+        this.collectList = [];
+        if (newValue) {
+          this.page_no = 1;
+          this.pageSize = 10;
+          this.getCollectList();
+        }
       },
       // immediate:true
     },
@@ -95,7 +100,7 @@ export default {
       handler() {
         if (this.pageNumFather) {
           this.page_no = 1;
-          this.getCollectList();
+          this.tabAct_idTwo && this.getCollectList();
           this.$parent.pageNumFather = "";
         }
       },

pages/reportForm/index.scss

@@ -115,7 +115,7 @@
 
     .tab-cont-two {
       position: sticky;
-      top: 252rpx;
+      top: 236rpx;
       left: 0;
       width: 100%;
       z-index: 99;

pages/reportForm/reportForm.vue

@@ -19,7 +19,7 @@
       </view>
     </view>
     <!-- 内容 -->
-    <view class="strategy" v-if="strategyIndex == 4">
+    <view class="strategy" v-if="strategyIndex >= 4">
       <view class="tab-cont-two">
         <block v-for="(item, index) in tabBarsTow" :key="item.CategoryId">
           <view :id="'__' + index" class="scroll-tab-item" :class="{ active: tabAct_idTwo == item.CategoryId }" @click.stop="toggleTabTwo(item, index)">
@@ -244,7 +244,9 @@ export default {
     },
     //获取二级事件
     getstrategyAll() {
-      Reports.getstrategyAll().then((res) => {
+      Reports.getstrategyAll({
+        ChartPermissionId: this.tabAct_id,
+      }).then((res) => {
         this.tabBarsTow = res.Data.List;
         if (!this.tabAct_idTwo) {
           this.tabAct_idTwo = res.Data.List[0].CategoryId;
@@ -255,8 +257,10 @@ export default {
     //tabs切换事件
     toggleTab(item, index) {
       this.strategyIndex = index;
+      this.tabAct_idTwo = "";
       this.deepCoverFocus = [];
       this.labelListData = [];
+      this.tabBarsTow = [];
       if (this.tabAct_id !== item.ChartPermissionId) {
         this.tabAct_id = item.ChartPermissionId;
         this.$store.dispatch("statistics", {
@@ -400,7 +404,7 @@ export default {
         this.getIndustryList();
         this.getTradeList();
       }
-      this.strategyIndex == 4 ? this.getstrategyAll() : (this.tabAct_idTwo = "");
+      this.strategyIndex >= 4 && this.getstrategyAll();
       this.isNum = 1;
     },
     /* 页面加载 */
@@ -574,7 +578,7 @@ export default {
     }
     .second-tabs {
       width: 100%;
-       padding-left: 30rpx;
+      padding-left: 30rpx;
       display: flex;
       overflow-x: auto;
       background-color: #fff;

reportPages/keyCompany/keyCompany.vue

@@ -15,7 +15,7 @@
     </view>
     <view class="macro-strategy">
       <image src="https://hzchart.oss-cn-shanghai.aliyuncs.com/cygx/macro-strategy.png"></image>
-      宏观策略：
+      宏观策略
     </view>
     <view class="description">
       <mp-html :content="strFontSize(reportDetail.MarketStrategy)" />
@@ -264,6 +264,7 @@ export default {
         width: 42rpx;
         display: flex;
         justify-content: center;
+        align-items: center;
         background: #3385ff;
         color: #fff;
         writing-mode: tb-rl;
@@ -375,10 +376,10 @@ export default {
   .macro-strategy {
     display: flex;
     align-items: center;
-    width: 238rpx;
+    width: 230rpx;
     height: 50rpx;
     padding-left: 35rpx;
-    background-color: #3385FF;
+    background-color: #3385ff;
     color: #fff;
     border-radius: 0rpx 50rpx 50rpx 0rpx;
     margin: 30rpx 0;