Merge pull request 'fix/updatesyspic' (#245) from fix/updatesyspic into test

Reviewed-on: #245
pull/250/head
yaoshuli 1 year ago
commit 78cd69fe7d

@ -607,7 +607,6 @@ async function refreshHandler(filtersearchId?: any) {
useInfiniteScroll( useInfiniteScroll(
el as any, el as any,
() => { () => {
console.log('加载了333333333333333333333333---------------------------')
loadMore() loadMore()
}, },
{ distance: 10, canLoadMore: () => canloadMore }, { distance: 10, canLoadMore: () => canloadMore },
@ -621,25 +620,9 @@ watch(() => show.value, async (newVal) => {
pagination.pageNo = 1 pagination.pageNo = 1
const list = await featchList() const list = await featchList()
listData.value = list listData.value = list
console.log('加载了1111111111111---------------------------', listData.value)
layout() layout()
} }
}) })
watch(() => pagination.pageNo, (newVal, oldVal) => {
console.log('加载了22222222222222222---------------------------', newVal, oldVal, canloadMore)
if (newVal == oldVal)
return
if ((newVal == 1 || newVal == 2) && canloadMore) {
setTimeout(() => {
nextTick(() => {
loading = false
loadMore()
})
}, 500)
}
})
</script> </script>
<template> <template>
@ -723,7 +706,7 @@ watch(() => pagination.pageNo, (newVal, oldVal) => {
</div> </div>
</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"> --> <!-- <n-scrollbar :on-scroll="scrollHandler"> -->
<div ref="masonryRef" class="grid"> <div ref="masonryRef" class="grid">
<div <div

Loading…
Cancel
Save