From 51e67a8c8f20096d868ac8dc097215a0a51d149d Mon Sep 17 00:00:00 2001
From: xiebing <xiebing@zkr.com>
Date: Thu, 27 Nov 2025 11:46:59 +0800
Subject: [PATCH] fix

---
 pages/index/components/index-two.vue | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/pages/index/components/index-two.vue b/pages/index/components/index-two.vue
index 686af83..d279260 100644
--- a/pages/index/components/index-two.vue
+++ b/pages/index/components/index-two.vue
@@ -35,7 +35,6 @@
                         ref="waterfallsFlowRef"
                         :column="columnCount"
                         :columnSpace="columnSpace"
-                        @loaded="imageloaded"
                         :value="list"
                     >
                         <template v-slot:default="job">
@@ -105,13 +104,25 @@ const { list, loading, refresh, loadMore,finished } = usePagination(
         },
     }
 );
+watch(()=>finished.value, (newVal) => {
+  if (newVal) {
+    // 确保瀑布流组件知道数据已加载完成
+    loadmoreRef.value?.change('noMore')
+  }else{
+    loadmoreRef.value?.change('more')
+  }
+})
 
-function imageloaded() {
-    if(finished.value) loadmoreRef.value?.change('noMore');
-    else loadmoreRef.value?.change('more');
-  
- 
-}
+// function imageloaded() {
+//     nextTick(() => {
+//         console.log('触发',finished.value)
+//         if (finished.value) {
+//           loadmoreRef.value?.change('noMore')
+//         } else {
+//           loadmoreRef.value?.change('more')
+//         }
+//     })
+// }
 
 const { columnCount, columnSpace } = useColumnCount(() => {
     pageSize.value = 10 * (columnCount.value - 1);