diff --git a/composables/usePagination.js b/composables/usePagination.js index 48bb4d2..22dd800 100644 --- a/composables/usePagination.js +++ b/composables/usePagination.js @@ -81,6 +81,7 @@ export function usePagination(options = {}) { // 检查是否还有更多数据 if (mode === 'loadMore') { noMore.value = queryParams.value.pageNum * pageSize >= total + console.log(`noMore状态: ${noMore.value}, 当前页: ${queryParams.value.pageNum}, 每页: ${pageSize}, 总数: ${total}`) } console.log(`获取数据成功: 第${queryParams.value.pageNum}页,共${newData.length}条`) diff --git a/pages/announcementList/announcementList.vue b/pages/announcementList/announcementList.vue index a01ff61..d4912f5 100644 --- a/pages/announcementList/announcementList.vue +++ b/pages/announcementList/announcementList.vue @@ -23,6 +23,7 @@ import { onMounted } from 'vue' import { getArticleList } from '@/api/article/article.js' import { onReachBottom } from '@dcloudio/uni-app' import { usePagination } from '@/composables/usePagination.js' +import Pagination from '@/components/pagination/pagination.vue' // 使用分页组合式函数 const { list, loading, noMore, pagination, getList, loadMore } = usePagination({ @@ -45,6 +46,12 @@ onMounted(() => { // 上拉加载更多 onReachBottom(() => { + console.log('触发上拉加载更多,当前状态:', { + loading: loading.value, + noMore: noMore.value, + listLength: list.value.length, + total: pagination.value.total + }) loadMore() }) diff --git a/pages/myOrder/myOrder.vue b/pages/myOrder/myOrder.vue index 93b8cdc..4c51f2a 100644 --- a/pages/myOrder/myOrder.vue +++ b/pages/myOrder/myOrder.vue @@ -73,6 +73,7 @@ import { onMounted } from 'vue' import { onReachBottom } from '@dcloudio/uni-app' import { usePagination } from '@/composables/usePagination.js' import { getMyOrder } from '@/api/order/myOrder.js' +import Pagination from '@/components/pagination/pagination.vue' // 使用分页组合式函数 const { list, loading, noMore, pagination, getList, loadMore } = usePagination({