From b6923adb7b6a5fcbe4a2eaa06e1ebe0e044ba0e2 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期四, 28 三月 2024 14:22:42 +0800
Subject: [PATCH] 代码合并

---
 pages/retrievalPage/index.js |   35 +++++++++++++++++++++++++++++------
 1 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/pages/retrievalPage/index.js b/pages/retrievalPage/index.js
index 9039b9a..663142c 100644
--- a/pages/retrievalPage/index.js
+++ b/pages/retrievalPage/index.js
@@ -41,7 +41,6 @@
     const menu = wx.getMenuButtonBoundingClientRect(); // 鑳跺泭淇℃伅
     const navBarHeight = (menu.top - systInfo.statusBarHeight) * 2 + menu.height; // 瀵艰埅鏍忛珮搴�
     this.setData({
-
       navBarHeight: navBarHeight,
       barHeight: systInfo.statusBarHeight,
       searchVal: options.searchVal
@@ -123,11 +122,17 @@
   //鏍囩鐨勫垏鎹�
   onTabsChange(event) {
     const value = event.detail.value
+    // if (this.data.bookData <= 0 || this.data.courseData <= 0 || this.data.digitalTextbooksData <= 0 || this.data.seminarData <= 0 || this.data.biblioClassificationData <= 0 || this.data.bookFairData <= 0) {
+    //   this.setData({
+    //     isMore: true
+    //   })
+    // }
     if (value === '0') {
       this.setData({
         tabValue: value,
         isMore: false
       })
+
     } else if (value === '1') {
       console.log(value, 'tab');
       this.setData({
@@ -419,7 +424,7 @@
       method: 'post',
       data: body
     }).then((resp) => {
-      // console.log(resp);
+      console.log(resp, 'resp');
 
       //鍥句功       0
       const data1 = resp[0]
@@ -492,6 +497,9 @@
 
 
     })
+    wx.stopPullDownRefresh()
+
+
 
   },
   bibliographyGet() {
@@ -533,6 +541,7 @@
       })
 
     })
+    wx.stopPullDownRefresh()
   },
   downloadData(event) {
     console.log(111);
@@ -585,10 +594,7 @@
       url: '/pages/bookExhibitionDetails/index?id=' + item.id + '&bookName=' + item.name // 鍋囪璺宠浆鍒拌鎯呴〉闈紝骞朵紶閫掍簡id鍙傛暟
     });
   },
-  //瑙﹀簳鍑芥暟
-  onReachBottom() {
-    console.log("涓婃媺鍔犺浇....");
-  },
+
   //涓婃媺鍑芥暟
   onPullDownRefresh() {
     console.log("涓嬫媺鍒锋柊...");
@@ -717,5 +723,22 @@
 
   },
 
+  // 涓嬫媺鍑芥暟
+  onPullDownRefresh() {
 
+    if (this.data.tabValue == 4) {
+      this.setData({
+        "pageCount.page": 1
+      })
+      this.bibliographyGet()
+    } else {
+      this.setData({
+        "pageCount.page": 1
+      })
+      this.retrievalPageGet()
+    }
+
+
+
+  },
 })
\ No newline at end of file

--
Gitblit v1.9.1