ETA1.1.7 bug修复

src/views/report/Index.vue

@@ -174,8 +174,8 @@ async function getReportList(){
             }
         }else{
             listState.list=arr
-            listState.total = res.data.page.total
         }
+        listState.total = res.data.page.total
         if(arr.length<listState.pageSize){
             listState.finished=true
         }
@@ -231,7 +231,7 @@ function listenScroll(){
         const windowHeight = document.documentElement.clientHeight || document.body.clientHeight;
         const scrollHeight = document.documentElement.scrollHeight||document.body.scrollHeight;
         if(scrollTop+windowHeight>=scrollHeight){   //考虑到滚动的位置一般可能会大于一点可滚动的高度，所以这里不能用等于
-            console.log("距顶部"+scrollTop+"可视区高度"+windowHeight+"滚动条总高度"+scrollHeight);
+            // console.log("距顶部"+scrollTop+"可视区高度"+windowHeight+"滚动条总高度"+scrollHeight);
             listState.page++
             getReportList()
         }
@@ -364,7 +364,7 @@ const contentTypeChange=(index)=>{
                     @click="handleChangeFirstClassify(item)"
                 >{{item.classify_name}}</span>
             </div>
-            <h2 class="label" v-show="listState.rootClassifyId===0">ABOUT US</h2>
+            <!-- <h2 class="label" v-show="listState.rootClassifyId===0">ABOUT US</h2> -->
             <div class="sub-nav-list">
                 <span 
                     :class="['item',item.id===listState.secClassifyId?'active':'']" 
@@ -421,8 +421,8 @@ const contentTypeChange=(index)=>{
                         <!-- <span class="label">【NO.{{item.stage}}|FICC】</span> -->
                         <img src="@/assets/icons/report.png"  >
                         <span class="title-span">
-                            {{item.title}}
-                            <span v-if="item.create_time">({{item.create_time.substring(5,7)}}{{item.create_time.substring(8,10)}})</span>
+                            {{item.abstract}}
+                            <!-- <span v-if="item.create_time">({{item.create_time.substring(5,7)}}{{item.create_time.substring(8,10)}})</span> -->
                         </span>     
                     </div>
                     <div class="time-classify-name" v-show="width<768">
@@ -431,7 +431,7 @@ const contentTypeChange=(index)=>{
                         <span v-show="item.classify_name_first!==item.classify_name_second && 
                             item.classify_name_root!==item.classify_name_second">{{item.classify_name_second}}</span>
                     </div>
-                    <div class="intro">{{item.abstract}}</div>
+                    <div class="intro" v-html="item.overview"></div>
                     <div class="time">
                         <span class="time-time">
                             {{item.publish_time}}
@@ -571,6 +571,12 @@ const contentTypeChange=(index)=>{
         }
     }
 }
+.intro{
+    p{
+        margin: 0!important;
+        padding: 0!important;
+    }
+}
 
 </style>
 <style lang="scss" scoped>
@@ -1077,13 +1083,10 @@ const contentTypeChange=(index)=>{
                 cursor: pointer;
                 display: flex;
                 align-items: center;
-                line-height: 18px;
-                display: flex;
-                align-items: flex-start;
                 img{
                     height: 16px;
                     width: 16px;
-                    margin: 2px 4px 0 0;
+                    margin: 0 4px 0 0;
                 }
                 // .label{
                 //     display: inline-block;
@@ -1112,7 +1115,7 @@ const contentTypeChange=(index)=>{
                 }
             }
             .intro{
-                font-size: 14px;
+                // font-size: 14px;
                 color: #666;
                 margin-top: 10px;
                 margin-bottom: 20px;

src/views/report/Search.vue

@@ -42,8 +42,8 @@ async function getReportList(){
             }
         }else{
             listState.list=arr
-            listState.total = res.data.page.total
         }
+        listState.total = res.data.page.total
         if(arr.length<listState.pageSize){
             listState.finished=true
         }
@@ -132,8 +132,8 @@ listenScroll()
                         <!-- <span class="label">【NO.{{item.stage}}|FICC】</span> -->
                         <img src="@/assets/icons/report.png"  >
                         <span class="title-span">
-                            <span v-html="item.title"></span>
-                            <span v-if="item.create_time">({{item.create_time.substring(5,7)}}{{item.create_time.substring(8,10)}})</span>
+                            <span v-html="item.abstract"></span>
+                            <!-- <span v-if="item.create_time">({{item.create_time.substring(5,7)}}{{item.create_time.substring(8,10)}})</span> -->
                         </span>
                     </div>
                     <div class="time-classify-name" v-show="width<768">
@@ -236,13 +236,10 @@ listenScroll()
             cursor: pointer;
             display: flex;
             align-items: center;
-            line-height: 18px;
-            display: flex;
-            align-items: flex-start;
             img{
                 height: 16px;
                 width: 16px;
-                margin: 2px 4px 0 0;
+                margin: 0 4px 0 0;
             }
             // .label{
             //     display: inline-block;

vite.config.js

@@ -14,4 +14,9 @@ export default ({mode})=> defineConfig({
   build:{
     outDir:loadEnv(mode, process.cwd()).VITE_APP_OUTDIR
   },
+  server:{
+    host:true,
+    // 原本的5173端口和移动ETA的服务端口冲突了
+    port:5174
+  }
 })