From 20a26aa0c12c05c3f96afc163c6532c6b1b5cf8e Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期四, 21 三月 2024 09:24:01 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
packageBookService/pages/bookServices/detail/index.js | 36 ++++++++++++++++++++----------------
1 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js
index 77bf47c..faa412f 100644
--- a/packageBookService/pages/bookServices/detail/index.js
+++ b/packageBookService/pages/bookServices/detail/index.js
@@ -428,11 +428,11 @@
})
this.findChildIds(this.data.teach, this.data.openTeachids = [])
} else if (type.refCode == 'jsek_cloudLearning') {
- // res.datas.cmsDatas[0].datas.forEach(item => {
- // item.checked = false
- // })
- // const list = await this.getAllResource(res.datas.cmsDatas[0].datas)
- console.log(list, 'currentlist');
+ res.datas.cmsDatas[0].datas.forEach(item => {
+ item.checked = false
+ })
+ const list = await this.getAllResource(res.datas.cmsDatas[0].datas)
+ console.log(list, 'list');
this.setData({
learn: list,
loading: false
@@ -994,14 +994,14 @@
async allAddShoppiingCar() {
const child = this.selectComponent('#learn-resource')
const token = wx.getStorageSync('jsek-token')
- if (!token) {
- return wx.getUserProfile({
- desc: '鐢ㄦ埛鐧诲綍',
- success: (res) => {
- console.log(res);
- }
- })
- }
+ // if (!token) {
+ // return wx.getUserProfile({
+ // desc: '鐢ㄦ埛鐧诲綍',
+ // success: (res) => {
+ // console.log(res);
+ // }
+ // })
+ // }
let shopList = this.handleTreeData(this.data.learn).filter((item) => this.resourceIsBuy(item))
this.getShoppingCartProductGet()
if (!shopList.length) return wx.showToast({
@@ -1146,7 +1146,6 @@
})
res = await app.MG.store.initOrder(query)
}
-
if (res.orderNumber && this.data.mockData.price) {
wx.navigateTo({
url: `/pages/cart/paymentPage/index?orderNumber=${res.orderNumber}`,
@@ -1197,11 +1196,16 @@
this.buyBook()
}
else if (this.data.tabValue == 'jsek_cloudLearning') {
- console.log('浜戝涔�');
+ const tree = this.selectComponent('#tree')
+
+ tree.onCloudShoppingCart()
+
+
} else if (this.data.tabValue == 'questionBank') {
this.buyMock()
} else {
console.log(this.data.tabValue);
}
- }
+ },
+
})
--
Gitblit v1.9.1