src/layout/components/Header/RecycleModal.vue

@@ -128,10 +128,10 @@ async function featchList() {
     const result = await dubiousfilelist({ ...pagination, ...sortObj })
     // TODO：测试数据
     // result.data = Array.from({ length: 30 })
-    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 +141,7 @@ async function featchList() {
     // return list
   }
   catch (error) {
+    canloadMore = false;
     return []
   }
 }
@@ -153,6 +154,7 @@ async function loadMore() {
   // loading = true
   const more = await featchList()
   listData.value.push(...more)
+  layout()
 }
 
 onUpdated(() => {
@@ -476,7 +478,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 +557,7 @@ async function refreshHandler(filtersearchId?: any) {
   reset()
   const list = await featchList()
   listData.value = list
-  // layout()
+  layout()
 // 注释 rao end
   // reset();