diff --git a/src/layout/components/Header/RecycleModal.vue b/src/layout/components/Header/RecycleModal.vue index 9d15895..5dc2c95 100644 --- a/src/layout/components/Header/RecycleModal.vue +++ b/src/layout/components/Header/RecycleModal.vue @@ -170,15 +170,16 @@ async function featchList() { loading = true try { // const result = await dubiousfilelist({ ...pagination, orderbyname: timeRange.value }) - pagination.pageNo += 1 + // console.log('pagination.pageNo------------', pagination.pageNo) const result = await dubiousfilelist({ ...pagination, ...sortObj }) // TODO:测试数据 // result.data = Array.from({ length: 30 }) const { data, pageCount, current } = result - pagination.pageNo = data.current + // pagination.pageNo = data.current // canloadMore = pageCount >= pagination.pageNo && pageCount > 0; canloadMore = data.pages >= pagination.pageNo && data.pages > 0 + pagination.pageNo += 1 // console.log('canloadMore------------', canloadMore) loading = false return result.data.records @@ -207,16 +208,16 @@ async function loadMore() { more.forEach((item) => { item.calHeight = 182 * item.high / item.wide }) - if (pagination.pageNo <= 2) { + if (pagination.pageNo <= 1) { listData.value = [] listData.value = listData.value.concat(more) console.log('listData.value出来了11111111111111', listData.value, pagination.pageNo) - if (pagination.pageNo <= 2) + if (pagination.pageNo <= 1) waterfallRef.value?.resize() } else { listData.value = listData.value.concat(more) - console.log('listData.value出来了2222222222', listData.value) + console.log('listData.value出来了2222222222', listData.value, pagination.pageNo) waterfallRef.value?.mix() } // layout() @@ -546,7 +547,7 @@ function reset() { batch.value = false // pagination.pageNo = 1; pagination.pageNo = 1 - pagination.pageSize = 20 + pagination.pageSize = 30 selectIds.value = [] selectedApproveItems.value.length = 0 loading = false