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

---
 pages/bibliographyList/index.js |   39 +++++++++++++++++++++++++++++++--------
 1 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/pages/bibliographyList/index.js b/pages/bibliographyList/index.js
index 0a4cd71..c02f54b 100644
--- a/pages/bibliographyList/index.js
+++ b/pages/bibliographyList/index.js
@@ -7,6 +7,7 @@
      * 椤甸潰鐨勫垵濮嬫暟鎹�
      */
     data: {
+      downloadLoadin: false,
       isMore: null,
       higherList: [],
       vocationalList: [],
@@ -18,7 +19,8 @@
       BarHeight: '',
       navBarHeight: '',
       start: 1,
-      tabValue: ''
+      tabValue: '',
+      keyword: ''
     },
 
     /**
@@ -105,17 +107,20 @@
       if (value === '0') {
         console.log(value);
         this.setData({
-          tabValue: value
+          tabValue: value,
+          isMore: false
         })
       } else if (value === '1') {
         console.log(value);
         this.setData({
-          tabValue: value
+          tabValue: value,
+          isMore: false
         })
       } else if (value === '2') {
         console.log(value);
         this.setData({
-          tabValue: value
+          tabValue: value,
+          isMore: false
         })
       }
     },
@@ -123,6 +128,7 @@
 
     //楂樼瓑鏁欒偛
     higherGet(keyword) {
+      console.log(keyword, 'keyword');
       let searchObj = {
         'Name*': keyword,
         '||author*': keyword,
@@ -248,6 +254,9 @@
 
     },
     downloadData(event) {
+      this.setData({
+        downloadLoadin: true
+      })
       console.log(111);
       const item = event.currentTarget.dataset.item;
       // console.log(item.datas.freeFile.Value);
@@ -277,6 +286,13 @@
           console.log('涓嬭浇鏂囦欢澶辫触', res);
         }
       });
+
+      setTimeout(() => {
+        this.setData({
+          downloadLoadin: false
+        });
+      }, 2000);
+
     },
     onSearchSubmit: function (e) {
       const keyword = e.detail.value;
@@ -285,6 +301,7 @@
       this.higherGet(keyword)
       this.vocationalGet(keyword)
       this.teacherGet(keyword)
+
     },
 
 
@@ -357,15 +374,21 @@
 
 
     },
+
     onPullDownRefresh() {
 
 
+      let keyword = this.data.value
+
       this.setData({
-        start: 1
+        start: 1,
+
       })
-      this.vocationalGet()
-      this.higherGet()
-      this.teacherGet()
+
+      this.higherGet(keyword)
+      this.vocationalGet(keyword)
+      this.teacherGet(keyword)
+
 
     },
 

--
Gitblit v1.9.1