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 | 58 ++++++++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 46 insertions(+), 12 deletions(-) diff --git a/pages/home/home.js b/pages/home/home.js index 5122f72..cac6afc 100644 --- a/pages/home/home.js +++ b/pages/home/home.js @@ -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) }, //鍥句功鏈嶅姟鍒嗙被 @@ -500,8 +515,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,26 +560,20 @@ // 鐩戝惉婊氬姩鏉� 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) { - this.setData({ isWhite: e.detail.scrollTop > 50 ? true : false }) }, + onRetrievalPage() { // 棣栭〉娴嬭瘯鐧诲綍鍔熻兘锛屽悗缁敞閲� -- Gitblit v1.9.1