Merge branch 'dev4.0' into debug

src/layout/Index.vue

@@ -11,6 +11,10 @@ const route= useRoute()
 
 getUserInfo()
 
+const isShowAslide = computed(() => {
+	return !['/etaChart/favorite','/etaChart/favorite'].includes(route.path)
+})
+
 const dynamicStyle = computed(() => {
 	const isStylePage = route.path.includes('/etaReport')
 
@@ -35,7 +39,7 @@ async function handleLoginOut(){
     <div class="flex header">
 			<div class="flex">
       	<img class="logo" src="@/assets/imgs/logo.png" alt="" />
-				<Aslide/>
+				<Aslide v-if="isShowAslide"/>
 			</div>
 			<div class="fav-btn" @click="$router.push('/etaChart/favorite')">我的收藏</div>
       <t-popup placement="bottom-left" overlayInnerClassName="header-userInfo-pop-wrap">

src/router/index.js

@@ -13,7 +13,7 @@ const routes = [
   ...appAllRoutes,
   {
     path:'/',
-    redirect: '/etaChart/index'
+    redirect: '/etaReport/index'
   },
   {
     path:'/login',

src/views/report/Classify.vue

@@ -54,19 +54,11 @@ function onLoad() {
   getList()
 }
 function initList() {
+  listState.list = [];
   listState.page = 1;
   getList()
 }
 
-// 格式化列表日期
-const formatDate=(e)=>{
-  const isSameYear=moment(e).isSame(new Date(), 'year');
-  if(isSameYear){//今年
-    return moment(e).format('MM.DD')+' '+ moment(e).format('ddd')
-  }else{
-    return moment(e).format('YY.MM.DD')+' '+moment(e).format('ddd')
-  }
-}
 
 
 
@@ -161,7 +153,7 @@ onUnmounted(() => {
               v-for="item in firstClassifyList" 
               :key="item.PermissionName" 
               @click="handleClickFirstType(item)"
-            >{{ item.PermissionName }}</div>
+            >{{ item.PermissionName }}</div> 
           </div>
         </div>
 
@@ -214,7 +206,7 @@ onUnmounted(() => {
                 <div class="right-info">
                   <div class="c-stage flex">
                     <div>
-                      <t-tag theme="primary" v-if="item.PermissionNames">{{item.PermissionNames[0]}}</t-tag>
+                      <!-- <t-tag theme="primary" v-if="item.PermissionNames">{{item.PermissionNames[0]}}</t-tag> -->
                       {{ `第${item.Stage}期` }}
                       | {{ item.ClassifyName }}
 

src/views/report/Detail.vue

@@ -192,8 +192,47 @@ onUnmounted(() => {
           @change="handleChangeChapter"
         />
 
+         <!-- 章节详情内容区 -->
+        <div class="report-wrapper " 
+          :style="info.HasChapter?'chapter-detail':''" 
+          v-if="info.HasChapter||route.query.chapterId"
+        >
+          <!-- 无版头板尾显示标题 -->
+
+          <div class="title">{{formatChapterTitle(chapterInfo)}}</div>
+          <div class="time flex">
+              <span>{{chapterInfo.Author}}</span>
+              <span>{{moment(chapterInfo.PublishTime).format('YYYY.MM.DD HH:mm')}}</span>
+          </div>
+
+          <div class="tips">
+              <div class="abstract" v-if="chapterInfo.Abstract">摘要：{{chapterInfo.Abstract}}</div>
+              <div v-if="disclaimer">
+                  <span>*注：请务必阅读</span>
+                  <span style="color:#3D5EFF;margin-left:15px;cursor: pointer;" @click="showDisclaimers=true">免责声明</span>
+              </div>
+          </div>
+          <!-- 音频模块 -->
+          <AudioBox 
+            :data="audioData" 
+            v-if="chapterInfo.VideoUrl&&chapterInfo.VideoPlaySeconds>0">
+          </AudioBox>
+
+          <div id="report-rich-content" class="no-select-text rich-content" ref="waterMarkEl">
+
+            <ReportContent 
+              v-if="chapterInfo.Content"
+              :html="chapterInfo.Content"
+            ></ReportContent>
+              <!-- 水印 -->
+              <div class="hide-watermark-box">
+                  <div v-for="item in 20" :key="item">{{userInfo?.Mobile}}</div>
+              </div>
+          </div>
+        </div>
+
         <!-- 报告内容区域 -->
-        <div class="report-wrapper" v-if="!info.HasChapter">
+        <div class="report-wrapper" v-else>
           <!-- 无版头板尾显示标题 -->
           <template v-if="(!info.HeadImg) && (!info.EndImg)">
               <div class="title">{{formatTitle(info)}}</div>
@@ -263,41 +302,7 @@ onUnmounted(() => {
           </div>
         </div>
 
-        <!-- 章节详情内容区 -->
-        <div class="report-wrapper chapter-detail" v-else>
-          <!-- 无版头板尾显示标题 -->
-
-          <div class="title">{{formatChapterTitle(chapterInfo)}}</div>
-          <div class="time flex">
-              <span>{{chapterInfo.Author}}</span>
-              <span>{{moment(chapterInfo.PublishTime).format('YYYY.MM.DD HH:mm')}}</span>
-          </div>
-
-          <div class="tips">
-              <div class="abstract" v-if="chapterInfo.Abstract">摘要：{{chapterInfo.Abstract}}</div>
-              <div v-if="disclaimer">
-                  <span>*注：请务必阅读</span>
-                  <span style="color:#3D5EFF;margin-left:15px;cursor: pointer;" @click="showDisclaimers=true">免责声明</span>
-              </div>
-          </div>
-          <!-- 音频模块 -->
-          <AudioBox 
-            :data="audioData" 
-            v-if="chapterInfo.VideoUrl&&chapterInfo.VideoPlaySeconds>0">
-          </AudioBox>
-
-          <div id="report-rich-content" class="no-select-text rich-content" ref="waterMarkEl">
-
-            <ReportContent 
-              v-if="chapterInfo.Content"
-              :html="chapterInfo.Content"
-            ></ReportContent>
-              <!-- 水印 -->
-              <div class="hide-watermark-box">
-                  <div v-for="item in 20" :key="item">{{userInfo?.Mobile}}</div>
-              </div>
-          </div>
-        </div>
+       
         <!-- <empty-wrap v-else msg="暂无阅读权限"/> -->
     </div>
   </div>  

src/views/report/Index.vue

@@ -58,6 +58,7 @@ function onLoad() {
 }
 
 function initList() {
+  listState.list = [];
   listState.page = 1;
   getList()
 }
@@ -66,7 +67,7 @@ function initList() {
 const formatDate=(e)=>{
   const isSameYear=moment(e).isSame(new Date(), 'year');
   if(isSameYear){//今年
-    return moment(e).format('MM.DD')+' '+ moment(e).format('ddd')
+    return moment(e).format('MM.DD')+' '+ moment(e).format('dddd')
   }else{
     return moment(e).format('YY.MM.DD')+' '+moment(e).format('ddd')
   }

src/views/report/PosterDetail.vue

@@ -1,6 +1,5 @@
 <script setup>
 import { ref } from 'vue'
-import moment from 'moment'
 import { useRoute, useRouter } from 'vue-router'
 import { useReportStore } from '@/store/modules/report'
 import { useUserInfo } from '@/hooks/useUserInfo'

src/views/report/Search.vue

@@ -154,7 +154,7 @@ onUnmounted(() => {
                     
                     <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.Contentsub"></div>
                 </div>
               </div>

src/views/report/components/RightSlideWrap.vue

@@ -80,6 +80,8 @@ function handleToBanner() {
         flex-wrap: wrap;
         gap: 10px;
         justify-content: space-around;
+        max-height:30vh;
+        overflow-y: auto; 
         .recmd-item {
           width: 120px;
           height: 120px;

src/views/user/favorite/etaReport.vue

@@ -124,7 +124,6 @@ async function handleCancelCollect(item,index){
               value: 'Id',
               children: 'Children',
           }"
-          :checkStrictly="true"
           filterable
           multiple 
           clearable