From 6608a6839d771d38640988e3ee496ecdd91765a4 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期二, 09 四月 2024 15:12:59 +0800
Subject: [PATCH] 代码合并

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

diff --git a/pages/home/home.js b/pages/home/home.js
index fcd8dad..cac6afc 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'
@@ -75,7 +75,9 @@
   onPullDownRefresh() {
     this.setData({
       'baseRefresh.value': true,
+      isWhite: false
     })
+    this.getBannerList();
     this.init();
   },
   init() {
@@ -117,7 +119,17 @@
       })
     })
   },
-
+  navToActivityDetail(e) {
+    let {
+      info
+    } = e.currentTarget.dataset
+    console.log(info)
+    if (info.link) {
+      wx.navigateTo({
+        url: info.link,
+      });
+    }
+  },
 
   loadHomePage() {
     fetchHome().then(({
@@ -239,6 +251,9 @@
   },
   tabChangeHandle(item) {
     let info = this.data.courseTypeList[item.detail.value]
+    this.setData({
+      courseList: []
+    })
     this.getCourseList(info)
   },
   //鍥句功鏈嶅姟鍒嗙被
@@ -303,8 +318,8 @@
   //鏁板瓧闃呰
   getReadBookList() {
     const obj = {
-      storeInfo: app.config.digitalTextbooks,
-      path: 'jsek_homepageDigitalTextbooks',
+      storeInfo: app.config.digitalRead,
+      path: 'jsek_homepageDigitalReading',
       coverSize: {
         width: 150
       },
@@ -412,11 +427,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 +515,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,12 +561,41 @@
   // 鐩戝惉婊氬姩鏉�
   onScroll(e) {
     this.setData({
-      isWhite: e.detail.scrollTop > 10 ? true : false
+      isWhite: true
+    })
+    this.setData({
+      isWhite: e.detail.scrollTop > 20 ? true : false
     })
   },
-  onRetrievalPage() {
-    wx.navigateTo({
-      url: '/pages/retrievalPage/index?searchVal=' + this.data.searchVal
+
+  onScrollToTop(e) {
+    this.setData({
+      isWhite: e.detail.scrollTop > 50 ? true : false
     })
   },
+
+  onRetrievalPage() {
+
+    // 棣栭〉娴嬭瘯鐧诲綍鍔熻兘锛屽悗缁敞閲�
+    // 妫�鏌ョ櫥褰曠姸鎬�
+    const token = wx.getStorageSync(app.config.tokenKey)
+    if (!token) {
+      loginInfo(app, (data) => {
+        // 濡傛灉涓嶆槸绗竴娆＄櫥褰曪紝浼氭墽琛屽洖璋�
+        if (data) {
+          wx.navigateTo({
+            url: '/pages/retrievalPage/index?searchVal=' + this.data.searchVal
+          })
+        } else {
+          // 鍑虹幇閿欒锛岃繑鍥瀎alse
+        }
+      })
+    } else {
+      wx.navigateTo({
+        url: '/pages/retrievalPage/index?searchVal=' + this.data.searchVal
+      })
+    }
+
+
+  },
 });
\ No newline at end of file

--
Gitblit v1.9.1