Merge branch 'master' into debug

src/views/hzyb/chart/Detail.vue

@@ -1166,6 +1166,10 @@ const setCrossVarietyChart = () => {
 
     //数据列
     let series = [];
+    const tagMap = { //标签对应文字
+        1: '最新',
+        3: 'Fix'
+    }
     DataList.forEach(item => {
         //数据列
         let series_item = {
@@ -1179,7 +1183,16 @@ const setCrossVarietyChart = () => {
             visible: true
         }
         item.CoordinatePointData.forEach(_ => {
-            series_item.data.push({x: _.X,y: _.Y,})
+            series_item.data.push({
+                x: _.X,
+                y: _.Y,
+                dataLabels: {
+                enabled: _.ShowTips===1,
+                allowOverlap: true,
+                align: 'left',
+                format: tagMap[_.DateType] || `-${_.DaysAgo}D`,
+                }
+            })
         })
         series.push(series_item);
     })

src/views/hzyb/report/ChapterDetail.vue

@@ -1,6 +1,6 @@
 <template>
 <van-pull-refresh v-model="loading" disabled style="min-height:100vh">
-  <div class="content-swipe">
+  <div class="content-swipe" v-if="bannerDataList.length > 0">
         <van-swipe class="my-swipe" :autoplay="4000" :show-indicators="false">
             <van-swipe-item v-for="item in bannerDataList" :key="item.id" @click="bannerSwiperHandler(item)">
                 <img :src="item.image_url_mobile" />
@@ -231,9 +231,7 @@ export default {
       collectIcons,
 
       isReportPublishCancel:false,//报告取消发布
-      bannerDataList:[
-        
-      ]
+      bannerDataList:[]
     };
   },
   beforeCreate(){

src/views/hzyb/report/Detail.vue

@@ -1,6 +1,6 @@
 <template>
 <van-pull-refresh v-model="loading" disabled style="min-height:100vh">
-    <div class="content-swipe">
+    <div class="content-swipe" v-if="bannerDataList.length > 0">
         <van-swipe class="my-swipe" :autoplay="4000" :show-indicators="false">
             <van-swipe-item v-for="item in bannerDataList" :key="item.id" @click="bannerSwiperHandler(item)">
                 <img :src="item.image_url_mobile" />
@@ -254,8 +254,7 @@ export default {
 
             showAttention:false,//是否显示配置播放清单提示
             isReportPublishCancel:false,//报告取消发布
-            bannerDataList:[
-            ]
+            bannerDataList:[]
         }
     },
     beforeCreate(){