Merge branch 'master' into new_883

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,6 +139,7 @@ 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];