From 08aaf067ed7a19cc43c313c6191299ab14abe368 Mon Sep 17 00:00:00 2001
From: QYF-GitLab1 <1940665526@qq.com>
Date: 星期一, 16 十二月 2024 11:29:55 +0800
Subject: [PATCH] 1
---
pages/home/home.js | 131 ++++++++++++++++++++++++++-----------------
1 files changed, 79 insertions(+), 52 deletions(-)
diff --git a/pages/home/home.js b/pages/home/home.js
index 9bfbbab..a70fd1b 100644
--- a/pages/home/home.js
+++ b/pages/home/home.js
@@ -1,7 +1,6 @@
import {
fetchHome
} from '../../services/home/home';
-import moment from 'moment'
import {
loginInfo
} from '../../assets/js/login';
@@ -39,14 +38,18 @@
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()
+ }
+ this.init();
},
onLoad() {
@@ -66,16 +69,14 @@
loginInfo(app, (data) => {
// 濡傛灉涓嶆槸绗竴娆＄櫥褰曪紝浼氭墽琛屽洖璋�
if (data) {
- // 鐧诲綍鎴愬姛锛岃嚜鍔ㄨ褰晅oken鍜岀敤鎴蜂俊鎭紝骞惰繑鍥瀟rue
+ this.init();
+ this.registe()
} else {
- // 鍑虹幇閿欒锛岃繑鍥瀎alse
+ this.init();
}
})
- } else {
- // 濡傛灉鏄涓�娆＄櫥褰曪紝浼氳烦杞嚦缁戝畾鐢ㄦ埛淇℃伅椤甸潰锛屽～鍐欏畬鐢ㄦ埛淇℃伅鍚庤繘琛岀櫥褰曞苟鍌ㄥ瓨token鍜岀敤鎴蜂俊鎭紝缁撴潫鍚庤烦杞洖褰撳墠椤甸潰锛堟惡甯﹂〉闈㈠弬鏁帮級
}
- this.registe()
- this.init();
+
},
onReachBottom() {},
onPullDownRefresh() {
@@ -113,6 +114,9 @@
path: 'jsek_banner\\jsek_homeBannerApplet',
fields: {
jsek_link: []
+ },
+ coverSize: {
+ width: 400
},
paging: {
start: 0,
@@ -202,8 +206,8 @@
}
app.MG.store.getProductList(obj).then((res) => {
res.datas.forEach((item) => {
- item.liveTime = item.liveTime ? moment(item.liveTime).format("MM-DD HH:mm:ss") : '';
- item.startTime = item.startTime ? moment(item.startTime).format("MM-DD HH:mm:ss") : '';
+ item.liveTime = item.liveTime ? item.liveTime.substring(5) : '';
+ item.startTime = item.startTime ? item.startTime.substring(5) : '';
item.price = item.price ? item.price.toFixed(2) : item.price;
});
this.setData({
@@ -269,6 +273,7 @@
app.MG.store.getProductList(obj).then((res) => {
res.datas.forEach((item) => {
item.price = item.price ? item.price.toFixed(2) : item.price;
+ item.isbuy = item.purchasedSaleMethodIdList.indexOf(item.defaultSaleMethodId) > -1
});
this.setData({
courseList: res.datas
@@ -398,6 +403,7 @@
app.MG.store.getProductList(obj).then((res) => {
res.datas.forEach((item) => {
item.price = item.price ? item.price.toFixed(2) : item.price;
+ item.isbuy = item.purchasedSaleMethodIdList.indexOf(item.defaultSaleMethodId) > -1
});
this.setData({
textbookList: res.datas
@@ -452,10 +458,17 @@
// 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}`
+ })
+
},
goCourseDetail(e) {
// return wx.showToast({
@@ -507,51 +520,59 @@
})
})
},
- addCart(e) {
+ async addCart(e) {
const {
info
} = e.currentTarget.dataset;
if (wx.getStorageSync(app.config.tokenKey)) {
- let query = {
- start: 0,
- size: 999,
- filterList: [],
- searchList: []
- }
- try {
- if (
- this.data.shoppingCartGetId.includes(
- info.defaultSaleMethodId
- )
- ) {
- wx.showToast({
- title: "璇ヤ功宸插湪璐墿杞︼紝璇峰嬁閲嶅娣诲姞绌�",
- icon: 'none',
- duration: 1000
- })
- } else {
- let query = {
- requests: [{
- saleMethodId: info.defaultSaleMethodId,
- storeEventId: null,
- agentCode: '鐢靛瓙涔�'
- }]
- }
- const addRes = app.MG.store.addShoppingCart(query)
- if (addRes) {
+ if (info.isbuy) {
+ wx.showToast({
+ title: "璇ュ晢鍝佸凡璐拱",
+ icon: 'none',
+ duration: 1000
+ })
+ } else {
+ let query = {
+ start: 0,
+ size: 999,
+ filterList: [],
+ searchList: []
+ }
+ try {
+ if (
+ this.data.shoppingCartGetId.includes(
+ info.defaultSaleMethodId
+ )
+ ) {
wx.showToast({
- title: "娣诲姞鎴愬姛",
- icon: 'success',
+ title: "璇ュ晢鍝佸凡鍦ㄨ喘鐗╄溅锛岃鍕块噸澶嶆坊鍔�",
+ icon: 'none',
duration: 1000
})
+ } else {
+ let query = {
+ requests: [{
+ saleMethodId: info.defaultSaleMethodId,
+ storeEventId: null,
+ agentCode: '鐢靛瓙涔�'
+ }]
+ }
+ const addRes = await app.MG.store.addShoppingCart(query)
+ if (addRes) {
+ wx.showToast({
+ title: "娣诲姞鎴愬姛",
+ icon: 'success',
+ duration: 1000
+ })
+ }
+ this.getShoppingCartList()
}
- this.getShoppingCartList()
+
+ } catch (error) {
+ console.error('鍑洪敊浜嗭細', error)
}
- } catch (error) {
- console.error('鍑洪敊浜嗭細', error)
}
}
-
},
onMoreGuide(e) {
let type = e.currentTarget.dataset.info
@@ -627,10 +648,16 @@
success(res) {
console.log(res);
if (res.errMsg == "scanCode:ok" && res.path || res.result) {
- let path = res.path || res.result
- wx.redirectTo({
- url: '/' + path,
- })
+ if (res.path) {
+ let path = res.path || res.result
+ wx.redirectTo({
+ url: '/' + path,
+ })
+ } else {
+ wx.redirectTo({
+ url: '/pages/scanResult/index?result=' + res.result,
+ })
+ }
}
}
})
--
Gitblit v1.9.1