From 482a7e174e699177f7407a308ebf1cb607498ff8 Mon Sep 17 00:00:00 2001
From: WindowBird <13870814+windows-bird@user.noreply.gitee.com>
Date: Tue, 26 Aug 2025 09:38:47 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=94=A8=E5=88=86=E7=B1=BB=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E5=8A=A0=E8=BD=BD=E5=99=A8=E7=9A=84=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 composables/usePagination.js                | 1 +
 pages/announcementList/announcementList.vue | 7 +++++++
 pages/myOrder/myOrder.vue                   | 1 +
 3 files changed, 9 insertions(+)

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({