S时间线

reportPages/IndustryReport/IndustryReport.vue

@@ -27,9 +27,9 @@
           </view>
         </view>
       </view>
-      <view class="collect-ul" :style="{ 'padding-top': industryVideo.ResourceUrl ? '528rpx' : '210rpx' }">
+      <view class="collect-ul" :style="{ 'padding-top': industryVideo.ResourceUrl || industryVideo.Id ? '540rpx' : '210rpx' }">
         <!-- 其他tab -->
-        <block v-show="tabAct_id !== 99999">
+        <block v-if="tabAct_id !== 99999">
           <view class="collect-ltem" v-for="(item, index) in collectList" :key="index" @click="goDetail(item, index)">
             <view class="item-left">
               <text class="title text_twoLine"
@@ -125,7 +125,8 @@ export default {
   },
   onLoad(option) {
     this.industrialManagementId = option.id;
-    this.tabAct_id = option.tab;
+    this.tabAct_id = +option.tab || "";
+    console.log(this.tabAct_id);
     this.toArticleCategoryList();
   },
   onShow() {
@@ -549,7 +550,6 @@ export default {
       }
     }
     .time-line {
-      margin-top: 15rpx;
       padding: 30rpx 40rpx 50rpx 40rpx;
       min-height: calc(100vh - 190rpx);
       background-color: #ffffff;

reportPages/authorPages/authorPages.vue

@@ -25,10 +25,10 @@
     </view>
     <view class="content-item" v-for="item in list.List" :key="item.ArticleId">
       <view class="item-title">
-        <text style="display: inline" @click="goDetail(item)">
+        <text style="display: inline;margin-right:20rpx" @click="goDetail(item)">
           {{ item.Title }}
         </text>
-        <text class="item-industry" @click="themeDetails(item)">&nbsp;&nbsp;&nbsp;#{{ item.IndustryName }}</text>
+        <text class="item-industry" v-for="key in item.List" :key="key.IndustryName" @click="themeDetails(key)">&nbsp;&nbsp;&nbsp;#{{ key.IndustryName }}</text>
       </view>
       <view class="item-more">
         <text>{{ item.PublishDate }}</text>
@@ -216,7 +216,7 @@ export default {
     .item-title {
       font-weight: 500;
       .item-industry {
-        margin-left: 10rpx;
+        margin-right: 20rpx;
         color: #3385ff;
         display: inline-block;
       }

reportPages/keyCompany/keyCompany.vue

@@ -184,7 +184,7 @@ export default {
         .replace(/font-size:\s\w+;?/g, "")
         .replace(/font-size\s:\w+;?/g, "")
         .replace(/font-size:\w+;?/g, "");
-      return `<div style="font-size:14px">${font}</div>`;
+      return `<div style="font-size:14px;line-height: 1.6">${font}</div>`;
     },
   },
   onLoad() {