代码提交

hooks/usePage.js

@@ -30,11 +30,12 @@ export const usePage = getPage => {
   // 加载中
   const loading = ref(false)
 
+  // 是否有数据
+  const listEmpty = ref(false)
+
   const dataList = ref([])
 
   const handleGetDataList = async () => {
-    console.log('--> % handleGetDataList % loading:\n', loading.value)
-    console.log('--> % handleGetDataList % loadend:\n', loadend.value)
     if (loading.value || loadend.value) return
 
     loading.value = true
@@ -47,10 +48,14 @@ export const usePage = getPage => {
       news: news.value,
       isIntegral: isIntegral.value,
     })
-    console.log('--> % handleGetDataList % products:\n', products)
+    listEmpty.value = false
     if (products) {
       if (products.length <= 0) {
-        loadend.value = true
+        if(page.value === 1){
+          listEmpty.value = true
+        } else {
+          loadend.value = true
+        }
       }
       dataList.value = dataList.value.concat(products)
     }
@@ -60,18 +65,19 @@ export const usePage = getPage => {
   const handleRefresh = () => {
     loadend.value = false
     loading.value = false
+    page.value = 1
     dataList.value = []
     handleGetDataList()
   }
 
   onReady(() => {
-    console.log('onReady')
     // handleGetDataList()
   })
 
   onReachBottom(() => {
-    if (loading.value) return
+    if (loading.value || loadend.value) return
     page.value += 1
+    handleGetDataList()
   })
 
   // 通过返回值暴露所管理的状态
@@ -83,6 +89,9 @@ export const usePage = getPage => {
     keyword,
     loading,
     loadend,
+    listEmpty,
+    news,
+    sid,
     refresh: handleRefresh,
   }
 }