From 558845242a07b68f42fa1802c45ab2769395d8b8 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期一, 29 四月 2024 14:31:30 +0800
Subject: [PATCH] 合并代码

---
 pages/home/home.js |   85 ++++++++++++++++++++++++++++++++----------
 1 files changed, 65 insertions(+), 20 deletions(-)

diff --git a/pages/home/home.js b/pages/home/home.js
index f037922..54de09d 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -11,6 +11,7 @@
     barHeight: '',
     navBarHeight: '',
     searchVal: '',
+    scoll: false,
     isWhite: false,
     userInfo: {},
     tabList: [], //鐩綍
@@ -36,9 +37,14 @@
     shoppingCartGetId: [],
     baseRefresh: {
       value: false
-    }
+    },
+    loading: true
   },
   onShow() {
+    this.setData({
+      searchVal: "",
+    });
+    console.log(this.data.searchVal)
     this.loadHomePage();
     this.getBannerList()
 
@@ -75,7 +81,9 @@
   onPullDownRefresh() {
     this.setData({
       'baseRefresh.value': true,
+      isWhite: false
     })
+    this.getBannerList();
     this.init();
   },
   init() {
@@ -109,22 +117,26 @@
         const item = res.datas[i]
         list.push({
           value: item.icon,
-          link: item.jsek_link
+          link: item.jsek_link,
+
         })
       }
       this.setData({
-        bannerList: list
+        bannerList: list,
+        loading: false
       })
     })
   },
   navToActivityDetail(e) {
-    console.log(item)
     let {
       info
     } = e.currentTarget.dataset
-    wx.navigateTo({
-      url: info.link,
-    });
+    console.log(info)
+    if (info.link) {
+      wx.navigateTo({
+        url: info.link,
+      });
+    }
   },
 
   loadHomePage() {
@@ -169,6 +181,10 @@
         start: 0,
         size: 4
       },
+      filterList: [{
+        value: 'Normal',
+        field: 'state'
+      }],
       fields: {
         liveTime: [],
         lecturer: [],
@@ -194,7 +210,6 @@
   getCourseTypeListList() {
     const data = {
       path: 'jsek_homepageDigitalCourses',
-      filterList: [],
       queryType: '\\',
       searchList: [],
       size: '20',
@@ -203,7 +218,11 @@
       sort: {
         type: 'Asc',
         field: 'LinkOrder'
-      }
+      },
+      filterList: [{
+        value: 'Normal',
+        field: 'state'
+      }]
     }
     app.MG.store.getStoreChannelList(data).then((res) => {
       if (res.datas && res.datas.length > 0) {
@@ -229,6 +248,10 @@
         start: 0,
         size: 4
       },
+      filterList: [{
+        value: 'Normal',
+        field: 'state'
+      }],
       fields: {
         courseLeader: [],
         affiliatedUnit: [],
@@ -247,13 +270,19 @@
   },
   tabChangeHandle(item) {
     let info = this.data.courseTypeList[item.detail.value]
+    this.setData({
+      courseList: []
+    })
     this.getCourseList(info)
   },
   //鍥句功鏈嶅姟鍒嗙被
   getBookTypeList() {
     const data = {
       path: 'jsek_homepageBookService',
-      filterList: [],
+      filterList: [{
+        value: 'Normal',
+        field: 'state'
+      }],
       queryType: '\\',
       searchList: [],
       size: '20',
@@ -290,6 +319,10 @@
         start: 0,
         size: 6
       },
+      filterList: [{
+        value: 'Normal',
+        field: 'state'
+      }],
       fields: {
         author: []
       }
@@ -320,6 +353,10 @@
         start: 0,
         size: 3
       },
+      filterList: [{
+        value: 'Normal',
+        field: 'state'
+      }],
       fields: {
         author: []
       }
@@ -342,6 +379,10 @@
         start: 0,
         size: 6
       },
+      filterList: [{
+        value: 'Normal',
+        field: 'state'
+      }],
       fields: {
         author: [],
       }
@@ -553,20 +594,24 @@
 
   // 鐩戝惉婊氬姩鏉�
   onScroll(e) {
+    if (this.data.scoll) {
+      if (e.detail.scrollTop < 20) {
+        this.data.scoll = false
+        this.isChange(false);
+      }
+    } else {
+      if (e.detail.scrollTop > 20) {
+        this.data.scoll = true
+        this.isChange(true);
+      }
+    }
+  },
+  isChange(data) {
     this.setData({
-      isWhite: true
-    })
-    this.setData({
-      isWhite: e.detail.scrollTop > 20 ? true : false
+      isWhite: data
     })
   },
 
-  onScrollToTop(e) {
-
-    this.setData({
-      isWhite: e.detail.scrollTop > 50 ? true : false
-    })
-  },
   onRetrievalPage() {
 
     // 棣栭〉娴嬭瘯鐧诲綍鍔熻兘锛屽悗缁敞閲�

--
Gitblit v1.9.1