From 20a26aa0c12c05c3f96afc163c6532c6b1b5cf8e Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期四, 21 三月 2024 09:24:01 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master

---
 packageBookService/pages/bookServices/list/index.js |   18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/packageBookService/pages/bookServices/list/index.js b/packageBookService/pages/bookServices/list/index.js
index 4fa9702..cc50289 100644
--- a/packageBookService/pages/bookServices/list/index.js
+++ b/packageBookService/pages/bookServices/list/index.js
@@ -47,6 +47,8 @@
     loadingProps: {
       size: '50rpx',
     },
+    loading: false,
+    noData: false
   },
   /**
    * 鐢熷懡鍛ㄦ湡鍑芥暟--鐩戝惉椤甸潰鍔犺浇
@@ -138,7 +140,6 @@
    * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁�
    */
   onReachBottom(e) {
-    console.log('搴曢儴');
     const flag = this.data.bookList.length < this.data.pageCount.total
     if (flag) {
       this.setData({
@@ -275,6 +276,10 @@
   },
   // 鑾峰彇鍥句功鍒楄〃
   getBookList(path) {
+    this.setData({
+      loading: true,
+      noData: false
+    })
     let sort;
     let pathObj = {};
     if (this.data.pathList.length) {
@@ -336,9 +341,15 @@
       this.setData({
         bookList: res.datas,
         enable: false,
-        "pageCount.total": res.total
+        "pageCount.total": res.total,
+        loading: false
       });
-      console.log('鍥句功鍒楄〃', res, this.data.pageCount);
+      console.log('鍥句功鍒楄〃', res.datas);
+      if (!res.datas.length) {
+        this.setData({
+          noData: true
+        })
+      }
     });
   },
   // 涓�绾у垎绫诲垏鎹�
@@ -371,7 +382,6 @@
       pathList: pathList,
       'secondList.value': e.detail.value,
     });
-
   },
   // 
   onConfirmSecond() {

--
Gitblit v1.9.1