From 5109e97cb566608e443201204d07cbfc1c734e07 Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期四, 11 四月 2024 17:56:02 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master

---
 pages/home/home.js |  115 +++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 98 insertions(+), 17 deletions(-)

diff --git a/pages/home/home.js b/pages/home/home.js
index add28de..1522c7c 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -16,7 +16,7 @@
     tabList: [], //鐩綍
     current: 1, //杞挱鍥惧弬鏁�
     autoplay: true, //杞挱鍥惧弬鏁�
-    duration: '500', //杞挱鍥惧弬鏁�
+    duration: '500', //杞挱鍥惧弬鏁� 
     interval: 5000, //杞挱鍥惧弬鏁�
     navigation: {
       type: 'dots'
@@ -36,7 +36,8 @@
     shoppingCartGetId: [],
     baseRefresh: {
       value: false
-    }
+    },
+    loading: true
   },
   onShow() {
     this.loadHomePage();
@@ -75,7 +76,9 @@
   onPullDownRefresh() {
     this.setData({
       'baseRefresh.value': true,
+      isWhite: false
     })
+    this.getBannerList();
     this.init();
   },
   init() {
@@ -109,15 +112,27 @@
         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) {
+    let {
+      info
+    } = e.currentTarget.dataset
+    console.log(info)
+    if (info.link) {
+      wx.navigateTo({
+        url: info.link,
+      });
+    }
+  },
 
   loadHomePage() {
     fetchHome().then(({
@@ -161,6 +176,10 @@
         start: 0,
         size: 4
       },
+      filterList: [{
+        value: 'Normal',
+        field: 'state'
+      }],
       fields: {
         liveTime: [],
         lecturer: [],
@@ -186,7 +205,6 @@
   getCourseTypeListList() {
     const data = {
       path: 'jsek_homepageDigitalCourses',
-      filterList: [],
       queryType: '\\',
       searchList: [],
       size: '20',
@@ -195,7 +213,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) {
@@ -221,6 +243,10 @@
         start: 0,
         size: 4
       },
+      filterList: [{
+        value: 'Normal',
+        field: 'state'
+      }],
       fields: {
         courseLeader: [],
         affiliatedUnit: [],
@@ -239,13 +265,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',
@@ -282,6 +314,10 @@
         start: 0,
         size: 6
       },
+      filterList: [{
+        value: 'Normal',
+        field: 'state'
+      }],
       fields: {
         author: []
       }
@@ -303,8 +339,8 @@
   //鏁板瓧闃呰
   getReadBookList() {
     const obj = {
-      storeInfo: app.config.digitalTextbooks,
-      path: 'jsek_homepageDigitalTextbooks',
+      storeInfo: app.config.digitalRead,
+      path: 'jsek_homepageDigitalReading',
       coverSize: {
         width: 150
       },
@@ -312,6 +348,10 @@
         start: 0,
         size: 3
       },
+      filterList: [{
+        value: 'Normal',
+        field: 'state'
+      }],
       fields: {
         author: []
       }
@@ -334,6 +374,10 @@
         start: 0,
         size: 6
       },
+      filterList: [{
+        value: 'Normal',
+        field: 'state'
+      }],
       fields: {
         author: [],
       }
@@ -412,11 +456,9 @@
     const {
       book
     } = e.currentTarget.dataset;
-    wx.showToast({
-      title: "寤鸿涓�",
-      icon: 'none',
-      duration: 1000
-    })
+    wx.navigateTo({
+      url: '/pages/home/digitalRead/index?productId=' + book.id,
+    });
   },
   goTextBookDetail(e) {
     const {
@@ -502,8 +544,37 @@
   onMoreGuide(e) {
     let type = e.currentTarget.dataset.info
     if (type == "tushufuwu") {
+      let assortCode = "";
+      if (this.data.bookTypeData.name == '楂樼瓑鏁欒偛') {
+        assortCode = "jsek_higherEducation"
+      }
+      if (this.data.bookTypeData.name == '鑱屼笟鏁欒偛') {
+        assortCode = "jsek_vocationalEducation"
+      }
+      if (this.data.bookTypeData.name == '鏁欏笀鏁欒偛') {
+        assortCode = "jsek_teacherEducation"
+      }
+      if (this.data.bookTypeData.name == '灏戝効鏁欒偛') {
+        assortCode = "jsek_childrenEducation"
+      }
+      if (this.data.bookTypeData.name == '鑰冭瘯鍩硅') {
+        assortCode = "jsek_examTraining"
+      }
+      if (this.data.bookTypeData.name == '涓婚鍑虹増') {
+        assortCode = "jsek_themePublishing"
+      }
+      if (this.data.bookTypeData.name == '瀛︽湳钁椾綔') {
+        assortCode = "jsek_academicWorks"
+      }
+      if (this.data.bookTypeData.name == '澶т紬璇荤墿') {
+        assortCode = "jsek_popularReadingMaterials"
+      }
       wx.navigateTo({
-        url: '/packageBookService/pages/bookServices/list/index?assorName=' + this.data.bookTypeData.name
+        url: '/packageBookService/pages/bookServices/list/index?assorName=' + this.data.bookTypeData.name + '&assortCode=' + assortCode
+      })
+    } else if (type == "shuziyuedu") {
+      wx.navigateTo({
+        url: '/pages/home/digitalRead/index'
       })
     } else {
       wx.showToast({
@@ -519,9 +590,19 @@
   // 鐩戝惉婊氬姩鏉�
   onScroll(e) {
     this.setData({
-      isWhite: e.detail.scrollTop > 10 ? true : false
+      isWhite: true
+    })
+    this.setData({
+      isWhite: e.detail.scrollTop > 20 ? true : false
     })
   },
+
+  onScrollToTop(e) {
+    this.setData({
+      isWhite: e.detail.scrollTop > 50 ? true : false
+    })
+  },
+
   onRetrievalPage() {
 
     // 棣栭〉娴嬭瘯鐧诲綍鍔熻兘锛屽悗缁敞閲�

--
Gitblit v1.9.1