Merge branch 'requirements_200' into custom

src/views/report_manage/reportdtl.vue

@@ -6,7 +6,7 @@
 		  <span style="float:right;">{{reportInfo.PublishTime}}</span>
 		</div>
 		
-		<!-- 英文版摘要+overview -->
+		<!-- 英文版摘要+overview 必填-->
 		<div id="abstract-en" v-if="$route.query.fromPage=='en'||isEn">
 			<div 
 				class="abstract" 
@@ -26,13 +26,15 @@
 		</div>
 		<div id="abstract" v-else-if="$route.query.fromPage=='strategyReport'">
 			<div>
-				<div>Abstract：<span v-html="reportInfo.Abstract"></span></div>
+				<div v-if="reportInfo.Abstract">Abstract：<span v-html="reportInfo.Abstract"></span></div>
 				<div>Key Takeaways：<span v-html="reportInfo.KeyTakeaways"></span></div>
 			</div>
 		</div>
-		<div id="abstract" v-else>
-		  <div>{{($route.query.fromPage=='en'||isEn)?'Abstract':'摘要'}}：{{reportInfo.Abstract}}</div>
-		</div>
+		<template v-else>
+			<div id="abstract" v-if="reportInfo.Abstract">
+		  	<div>{{($route.query.fromPage=='en'||isEn)?'Abstract':'摘要'}}：{{reportInfo.Abstract}}</div>
+			</div>
+		</template>
 		<div id="resetsty" style="padding:30px; box-sizing:border-box; overflow:hidden;">
 			<block v-if="reportInfo.ChapterType=='day'||reportInfo.ChapterType=='week'">
 				<div class="chapter-item" v-for="item in reportInfo.ChapterList" :key="item.ReportChapterId">

src/views/smartReport/reportDetail.vue

@@ -25,7 +25,7 @@
                     <span style="float:right;">{{reportInfo.CreateTime}}</span>
                 </div>
             </div>
-            <div class="abstract" v-if="reportInfo && !!reportInfo.NeedSplice">
+            <div class="abstract" v-if="reportInfo && !!reportInfo.NeedSplice && reportInfo.Abstract">
                 <div>摘要： <span v-html="reportInfo.Abstract"></span></div> 
             </div>
             <div class="html-wrap" v-html="content"></div>