From b683a3d7748816d7b5aeeca0610b38435fcf242d Mon Sep 17 00:00:00 2001
From: raofuzi <2641346316@qq.com>
Date: Wed, 10 Apr 2024 20:23:51 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Header/RecycleModal.vue | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/layout/components/Header/RecycleModal.vue b/src/layout/components/Header/RecycleModal.vue
index 459189e..28e228b 100644
--- a/src/layout/components/Header/RecycleModal.vue
+++ b/src/layout/components/Header/RecycleModal.vue
@@ -126,12 +126,14 @@ async function featchList() {
   try {
     // const result = await dubiousfilelist({ ...pagination, orderbyname: timeRange.value })
     const result = await dubiousfilelist({ ...pagination, ...sortObj })
+    console.log("result-----------", result);
     // TODO：测试数据
     // result.data = Array.from({ length: 30 })
-    result.pageCount = 1
+    // result.pageCount = 1
     const { data, pageCount } = result
     pagination.pageNo += 1
-    canloadMore = pageCount >= pagination.pageNo
+    // canloadMore = pageCount >= pagination.pageNo && pageCount > 0;
+    canloadMore = data.pages >= pagination.pageNo && data.pages > 0;
     return result.data.records
     // const list = data.map((item) => {
     //   return {
@@ -141,6 +143,7 @@ async function featchList() {
     // return list
   }
   catch (error) {
+    canloadMore = false;
     return []
   }
 }
@@ -153,6 +156,7 @@ async function loadMore() {
   // loading = true
   const more = await featchList()
   listData.value.push(...more)
+  layout()
 }
 
 onUpdated(() => {
@@ -476,7 +480,7 @@ function rejectHandler() {
 function reset() {
   batch.value = false;
   // pagination.pageNo = 1;
-  pagination.pageNo = 0;
+  pagination.pageNo = 1;
   pagination.pageSize = 20;
   selectIds.value = [];
   selectedApproveItems.value.length = 0;
@@ -555,7 +559,7 @@ async function refreshHandler(filtersearchId?: any) {
   reset()
   const list = await featchList()
   listData.value = list
-  // layout()
+  layout()
 // 注释 rao end
   // reset();