From 9c25f60bee76271bae5231907e4e5606340827ef Mon Sep 17 00:00:00 2001
From: raofuzi <2641346316@qq.com>
Date: Sun, 21 Apr 2024 20:51:11 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E6=85=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Header/RecycleModal.vue | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/layout/components/Header/RecycleModal.vue b/src/layout/components/Header/RecycleModal.vue
index 79824c9..6e41d38 100644
--- a/src/layout/components/Header/RecycleModal.vue
+++ b/src/layout/components/Header/RecycleModal.vue
@@ -607,7 +607,6 @@ async function refreshHandler(filtersearchId?: any) {
       useInfiniteScroll(
         el as any,
         () => {
-          console.log('加载了333333333333333333333333---------------------------')
           loadMore()
         },
         { distance: 10, canLoadMore: () => canloadMore },
@@ -621,13 +620,11 @@ watch(() => show.value, async (newVal) => {
     pagination.pageNo = 1
     const list = await featchList()
     listData.value = list
-    console.log('加载了1111111111111---------------------------', listData.value)
     layout()
   }
 })
 
 watch(() => pagination.pageNo, (newVal, oldVal) => {
-  console.log('加载了22222222222222222---------------------------', newVal, oldVal, canloadMore)
   if (newVal == oldVal)
     return
 
@@ -637,7 +634,7 @@ watch(() => pagination.pageNo, (newVal, oldVal) => {
         loading = false
         loadMore()
       })
-    }, 500)
+    }, 300)
   }
 })
 </script>
-- 
2.39.3


From 42d5e1b0ab3b806f93a52a90e72440ffa2c86bc9 Mon Sep 17 00:00:00 2001
From: raofuzi <2641346316@qq.com>
Date: Sun, 21 Apr 2024 20:59:19 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E6=85=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Header/RecycleModal.vue | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/src/layout/components/Header/RecycleModal.vue b/src/layout/components/Header/RecycleModal.vue
index 00731f4..066b9c7 100644
--- a/src/layout/components/Header/RecycleModal.vue
+++ b/src/layout/components/Header/RecycleModal.vue
@@ -623,20 +623,6 @@ watch(() => show.value, async (newVal) => {
     layout()
   }
 })
-
-watch(() => pagination.pageNo, (newVal, oldVal) => {
-  if (newVal == oldVal)
-    return
-
-  if ((newVal == 1 || newVal == 2) && canloadMore) {
-    setTimeout(() => {
-      nextTick(() => {
-        loading = false
-        loadMore()
-      })
-    }, 300)
-  }
-})
 </script>
 
 <template>
@@ -720,7 +706,7 @@ watch(() => pagination.pageNo, (newVal, oldVal) => {
               </div>
             </div>
 
-            <div ref="el" class="scroll" :style="{ height: maxHeight,marginTop:'16px' }">
+            <div ref="el" class="scroll" :style="{ height: maxHeight, marginTop: '16px' }">
               <!-- <n-scrollbar :on-scroll="scrollHandler"> -->
               <div ref="masonryRef" class="grid">
                 <div
-- 
2.39.3