From fa93e847216dfe1da8920aecfa37c37b887c0f29 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期一, 23 九月 2024 17:52:12 +0800
Subject: [PATCH] rwd
---
pages/home/home.js | 97 ++++++++++++++++++++++++++++++------------------
1 files changed, 61 insertions(+), 36 deletions(-)
diff --git a/pages/home/home.js b/pages/home/home.js
index cfeb887..953b47e 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -39,14 +39,17 @@
baseRefresh: {
value: false
},
- loading: true
+ loading: true,
},
onShow() {
this.setData({
searchVal: "",
});
- console.log(this.data.searchVal)
this.loadHomePage();
+ const token = wx.getStorageSync(app.config.tokenKey)
+ if (token) {
+ this.getShoppingCartList()
+ }
},
onLoad() {
@@ -66,15 +69,13 @@
loginInfo(app, (data) => {
// 濡傛灉涓嶆槸绗竴娆＄櫥褰曪紝浼氭墽琛屽洖璋�
if (data) {
- // 鐧诲綍鎴愬姛锛岃嚜鍔ㄨ褰晅oken鍜岀敤鎴蜂俊鎭紝骞惰繑鍥瀟rue
+ this.init();
+ this.registe()
} else {
- // 鍑虹幇閿欒锛岃繑鍥瀎alse
+ this.init();
}
})
- } else {
- // 濡傛灉鏄涓�娆＄櫥褰曪紝浼氳烦杞嚦缁戝畾鐢ㄦ埛淇℃伅椤甸潰锛屽～鍐欏畬鐢ㄦ埛淇℃伅鍚庤繘琛岀櫥褰曞苟鍌ㄥ瓨token鍜岀敤鎴蜂俊鎭紝缁撴潫鍚庤烦杞洖褰撳墠椤甸潰锛堟惡甯﹂〉闈㈠弬鏁帮級
}
- this.registe()
this.init();
},
onReachBottom() {},
@@ -446,28 +447,42 @@
});
},
goSubjectDetail(e) {
- return wx.showToast({
- title: "寤鸿涓�",
- icon: 'none',
- duration: 1000
- })
+ // return wx.showToast({
+ // title: "寤鸿涓�",
+ // icon: 'none',
+ // duration: 1000
+ // })
const item = e.currentTarget.dataset.book
- console.log(item);
+ // 缃戦〉绫诲瀷璺宠浆鍒扮綉鍧�澶嶅埗椤碉紝鍥犱负url浼犲弬涓嶈兘浼� 甯﹀弬鏁扮殑缃戠粶鍦板潃锛屾墍浠ユ澶勮鎶婄綉缁滃湴鍧�閲岀殑浼犲弬鎽樺嚭鏉ワ紝鏀惧埌url閲�
+ let urlData = ''
+ const flags = item.jsek_link.indexOf("?")
+ if (flags > -1) {
+ urlData = item.jsek_link.slice(flags + 1, item.jsek_link.length)
+ }
+ let url = '/packageBookService/pages/bookServices/linkPage/index'
wx.navigateTo({
- url: '/pages/specialDiscussion/webView/index?link=' + item.jsek_link
- });
+ url: urlData ? url + `?path=${item.jsek_link.slice(0,flags)}` + '&' + urlData : url + `?path=${item.jsek_link}`
+ })
+ // wx.navigateTo({
+ // url: '/pages/specialDiscussion/webView/index?link=' + item.jsek_link
+ // });
+
+
+
},
goCourseDetail(e) {
- return wx.showToast({
- title: "寤鸿涓�",
- icon: 'none',
- duration: 1000
- })
+ // return wx.showToast({
+ // title: "寤鸿涓�",
+ // icon: 'none',
+ // duration: 1000
+ // })
+
const {
book
} = e.currentTarget.dataset;
+ console.log(book);
wx.navigateTo({
- url: '/pages/digitalCourses/digitalCoursesDetails/index?id=' + book.id,
+ url: '/pages/digitalCourses/digitalCoursesDetails/index?id=' + book.id + '&path=' + book.idPath,
});
},
goReadBookDetail(e) {
@@ -505,7 +520,7 @@
})
})
},
- addCart(e) {
+ async addCart(e) {
const {
info
} = e.currentTarget.dataset;
@@ -523,7 +538,7 @@
)
) {
wx.showToast({
- title: "璇ヤ功宸插湪璐墿杞︼紝璇峰嬁閲嶅娣诲姞绌�",
+ title: "璇ュ晢鍝佸凡鍦ㄨ喘鐗╄溅锛岃鍕块噸澶嶆坊鍔�",
icon: 'none',
duration: 1000
})
@@ -535,7 +550,7 @@
agentCode: '鐢靛瓙涔�'
}]
}
- const addRes = app.MG.store.addShoppingCart(query)
+ const addRes = await app.MG.store.addShoppingCart(query)
if (addRes) {
wx.showToast({
title: "娣诲姞鎴愬姛",
@@ -587,21 +602,21 @@
url: '/pages/home/digitalRead/index'
})
} else if (type == "zhuantitaolun") {
- return wx.showToast({
- title: "寤鸿涓�",
- icon: 'none',
- duration: 1000
- })
+ // return wx.showToast({
+ // title: "寤鸿涓�",
+ // icon: 'none',
+ // duration: 1000
+ // })
wx.navigateTo({
url: '/pages/specialDiscussion/index'
})
} else if (type == "jingxuankecheng") {
- return wx.showToast({
- title: "寤鸿涓�",
- icon: 'none',
- duration: 1000
- })
+ // return wx.showToast({
+ // title: "寤鸿涓�",
+ // icon: 'none',
+ // duration: 1000
+ // })
wx.navigateTo({
url: '/pages/digitalCourses/index?courseTypeActive=' + this.data.courseTypeActive
})
@@ -641,12 +656,16 @@
if (this.data.scoll) {
if (e.detail.scrollTop < 20) {
this.data.scoll = false
- this.isChange(false);
+ // 閬垮厤棰戠箒璋冪敤 setData
+ if (this.data.isWhite)
+ this.isChange(false);
}
} else {
if (e.detail.scrollTop > 20) {
this.data.scoll = true
- this.isChange(true);
+ // 閬垮厤棰戠箒璋冪敤 setData
+ if (!this.data.isWhite)
+ this.isChange(true);
}
}
},
@@ -680,4 +699,10 @@
},
+
+ /**
+ * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜�
+ */
+ onShareAppMessage() {},
+ onShareTimeline() {}
});
\ No newline at end of file
--
Gitblit v1.9.1