Merge branch 'xqc_list_bot_text'

src/components/SelfList.vue

@@ -3,6 +3,7 @@
  * 公共列表组件
  */
 const props=defineProps({
+    count:0,//当前加载的列表数据数量
     loading:false,
     finished:false,//是否加载完
     isEmpty:false,//是否为空数据
@@ -31,7 +32,7 @@ const handleClickLoadMore=()=>{
         <div class="bot-load" v-if="!props.finished&&props.loading">
             <div class="loading-text">加载中...</div>
         </div>
-        <p class="nomore-text" v-if="!props.isEmpty&&props.finished">没有更多了~</p>
+        <p class="nomore-text" v-if="!props.isEmpty&&props.finished&&props.count>20">没有更多了~</p>
     </div>
 </template>
 
@@ -68,7 +69,7 @@ const handleClickLoadMore=()=>{
     }
     .nomore-text{
         text-align: center;
-        color: #F3A52F;
+        color: #999;
     }
 }
 </style>

src/views/activity/List.vue

@@ -296,6 +296,7 @@ const posterParams=computed(()=>{
             :finished="listData.finished" 
             :isEmpty="listData.list.length===0&&listData.finished"
             :loading="listData.loading"
+            :count="listData.list.length"
             @listOnload="onLoad"
         >
             <li class="flex item" v-for="item in listData.list" :key="item.activityId" @click="goDetail(item.activityId)">

src/views/chart/List.vue

@@ -141,6 +141,7 @@ onMounted(()=>{
             :finished="chartList.finished" 
             :isEmpty="chartList.list.length===0&&chartList.finished"
             :loading="chartList.loading"
+            :count="chartList.list.length"
             @listOnload="onLoad"
         >
             <draggable 

src/views/question/List.vue

@@ -357,6 +357,7 @@ const setCancelNickHandle = async() => {
             :finished="question.isTotalData" 
             :isEmpty="question.list.length===0&&question.isTotalData"
             :loading="question.isLoading"
+            :count="question.list.length"
             @listOnload="onLoad"
         >
         <div class="question-list">

src/views/question/MyList.vue

@@ -249,7 +249,7 @@ const getQuestionList=()=>{
   })
 }
 
-const loadingMore = ()=>{
+const onLoad = ()=>{
   question.page_index++
   getQuestionList()
 }
@@ -339,6 +339,7 @@ getBarList()
         :finished="question.isTotalData" 
         :isEmpty="question.list.length===0&&question.isTotalData"
         :loading="question.isLoading"
+        :count="question.list.length"
         @listOnload="onLoad"
       >
         <div class="question-list">

src/views/report/Index.vue

@@ -320,6 +320,7 @@ onActivated(()=>{
         :finished="reportState.finished" 
         :isEmpty="reportState.list.length === 0 && reportState.finished" 
         :loading="reportState.loading" 
+        :count="reportState.list.length"
         @listOnload="onLoad"
       >
         <div class="report-list-wrap">

src/views/report/List.vue

@@ -232,6 +232,7 @@ const posterParams=computed(()=>{
             :finished="reportState.finished" 
             :isEmpty="reportState.list.length === 0 && reportState.finished" 
             :loading="reportState.loading" 
+            :count="reportState.list.length"
             @listOnload="onLoad"
             :emptyMsg="reportState.searchVal?'找不到对应报告，试试别的搜索词吧':'暂无报告'"
         >

src/views/report/Search.vue

@@ -100,6 +100,7 @@ onBeforeRouteLeave((to,from)=>{
             :finished="listState.finished" 
             :isEmpty="listState.list.length === 0 && listState.finished" 
             :loading="listState.loading" 
+            :count="listState.list.length"
             @listOnload="onLoad"
             emptyMsg="找不到对应报告，试试别的搜索词吧"
         >

src/views/report/specialColumn/Detail.vue

@@ -180,6 +180,7 @@ const posterParams=computed(()=>{
                     :finished="listState.finished" 
                     :isEmpty="listState.list.length === 0 && listState.finished" 
                     :loading="listState.loading"
+                    :count="listState.list.length"
                     @listOnload="onLoad"
                 >
                     <div class="report-list">

src/views/report/specialColumn/List.vue

@@ -144,6 +144,7 @@ const posterParams=computed(()=>{
         <SelfList 
             :finished="listState.finished" 
             :isEmpty="listState.list.length === 0 && listState.finished" 
+            :count="listState.list.length"
             :loading="listState.loading"
         >
             <div class="flex list-wrap">

src/views/sandBox/List.vue

@@ -437,6 +437,7 @@ onActivated(()=>{
         :finished="sandBox.isTotalData" 
         :isEmpty="sandBox.list.length===0&&sandBox.isTotalData"
         :loading="sandBox.isLoading"
+        :count="sandBox.list.length"
         @listOnload="onLoad">
             <div class="sandBox-content">
                 <div class="sandBox-item" v-for="(item,index) in sandBox.list" :key="item.sandbox_id">
@@ -648,7 +649,7 @@ onActivated(()=>{
                 height: 30px;
                 font-size: 16px;
                 font-family: 'PingFang SC';
-                color: #666666;
+                color: #999;
             }
         }
     }

src/views/video/List.vue

@@ -212,6 +212,7 @@ onActivated(()=>{
             :finished="listState.finished" 
             :isEmpty="listState.list.length===0&&listState.finished"
             :loading="listState.loading"
+            :count="listState.list.length"
             @listOnload="onLoad"
         >
             <div class="flex list-wrap">

src/views/voice/List.vue

@@ -316,6 +316,7 @@ onActivated(()=>{
             :finished="listState.finished" 
             :isEmpty="listState.list.length===0&&listState.finished"
             :loading="listState.loading"
+            :count="listState.list.length"
             @listOnload="onLoad"
         >
             <div class="list-wrap">