From 5e649be819c7297c79c21c6dc120b4b6b362db9e Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期三, 03 四月 2024 17:23:39 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master

---
 pages/home/home.js |   54 +++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/pages/home/home.js b/pages/home/home.js
index 5122f72..b7e213f 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -117,7 +117,17 @@
       })
     })
   },
-
+  navToActivityDetail(e) {
+    let {
+      info
+    } = e.currentTarget.dataset
+    console.log(info)
+    if (info.link) {
+      wx.navigateTo({
+        url: info.link,
+      });
+    }
+  },
 
   loadHomePage() {
     fetchHome().then(({
@@ -239,6 +249,9 @@
   },
   tabChangeHandle(item) {
     let info = this.data.courseTypeList[item.detail.value]
+    this.setData({
+      courseList: []
+    })
     this.getCourseList(info)
   },
   //鍥句功鏈嶅姟鍒嗙被
@@ -500,8 +513,33 @@
   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({
@@ -520,18 +558,12 @@
 
   // 鐩戝惉婊氬姩鏉�
   onScroll(e) {
-    console.log(e)
     this.setData({
       isWhite: true
     })
-    if (e.detail.scrollTop == 0) {
-      this.setData({
-        isWhite: false
-      })
-    }
-    // this.setData({
-    //   isWhite: e.detail.scrollTop > 20 ? true : false
-    // })
+    this.setData({
+      isWhite: e.detail.scrollTop > 20 ? true : false
+    })
   },
 
   onScrollToTop(e) {

--
Gitblit v1.9.1