Merge branch 'dev4.0' into debug

src/views/report/Detail.vue

@@ -37,6 +37,7 @@ async function getReportDetail (){
 
     info.value=res.Data;
     chapterList.value = res.Data.ChapterList || [];
+    disclaimer.value = res.Data.Disclaimer;
 
     headImgStyle.value=info.value.HeadStyle?JSON.parse(info.value.HeadStyle):[]
     endImgStyle.value=info.value.HeadStyle?JSON.parse(info.value.HeadStyle):[]
@@ -71,6 +72,7 @@ async function getChapterDetail(id=null) {
   if(res.Ret!==200) return
 
   chapterInfo.value=res.Data;
+  disclaimer.value = res.Data.Disclaimer;
   audioData.value={
     auth_ok:chapterInfo.value.HasAuth,
     video_name:chapterInfo.value.VideoName||`${chapterInfo.value.Title}(${moment(chapterInfo.value.PublishTime).format('MMDD')})`,
@@ -140,14 +142,6 @@ function handleChangeChapter(item) {
 
 const disclaimer = ref('带我去带我去多我去大青蛙单位群')
 const showDisclaimers=ref(false)//显示免责声明
-function getConfig() {
-  apiBaseConfig().then(res => {
-    if (res.code == 200) {
-      disclaimer.value = res.data.disclaimer
-    }
-  })
-}
-// getConfig()
 
 
 // 报告标题

src/views/report/Search.vue

@@ -56,6 +56,7 @@ function onLoad() {
 }
 
 function initList() {
+  listState.list = [];
   listState.page = 1;
   getList()
 }
@@ -262,6 +263,7 @@ onUnmounted(() => {
           margin-top: 10px;
           color: #666666;
           font-size: 14px;
+          max-width: 600px;
           word-wrap: break-word;
           word-break: break-all;
           :deep(div){

src/views/user/favorite/components/MoveReport.vue

@@ -58,7 +58,7 @@ async function getChartList(){
   pagination.value.total=res.Data.Paging.Totals
   tableData.value=arr.map(_ => ({
     ..._,
-    singleId: _.ReportChapterId || _.ReportId
+    singleId: `${_.ReportChapterId}_${_.ReportId}`
   }))
   if(checkAll.value){
     tableData.value.forEach(item=>{
@@ -168,11 +168,28 @@ async function handleSave() {
     MessagePlugin.warning('请选择要移动的图表')
     return
   }
+
+  let Collects = checkAll.value
+    ? unSelectedCharts.map(_ =>{
+        let arr = _.split('_');
+        return {
+          ReportId: Number(arr[1]),
+          ReportChapterId: Number(arr[0])
+        }
+      })
+    : selectedRowKeys.value.map(_ =>{
+        let arr = _.split('_');
+        return {
+          ReportId: Number(arr[1]),
+          ReportChapterId: Number(arr[0])
+        }
+      })
+
   const params={
     SelectAll:checkAll.value,
     CollectClassifyIds:selectClassify.value?selectClassify.value:[],
     Keyword:keyword.value,
-    Collects:checkAll.value?unSelectedCharts : selectedRowKeys.value,
+    Collects,
     CollectClassifyId:newClassify.value,
   }
   const res=await apiEtaReportCollect.reportCollectBatchMove(params)

src/views/user/favorite/etaReport.vue

@@ -185,7 +185,7 @@ async function handleCancelCollect(item,index){
                     
                     <div class="c-time">{{ item.PublishTime }}</div>
                   </div>
-                  <div class="c-title text-ellipsis--l1">{{ item.Title }}</div>
+                  <div class="c-title text-ellipsis--l1" v-html="item.Title"></div>
                   <div class="desc text-ellipsis--l1" v-html="item.Abstract"></div>
                 </div>
               </div>