From 80232d691dd9c4989985b570ce4d745e5d2bc3f7 Mon Sep 17 00:00:00 2001
From: yiming <m13691596795@163.com>
Date: 星期三, 20 三月 2024 18:34:19 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
pages/cart/index.js | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/pages/cart/index.js b/pages/cart/index.js
index c2194e7..16c1922 100644
--- a/pages/cart/index.js
+++ b/pages/cart/index.js
@@ -20,7 +20,9 @@
});
this.shoppingCartGet();
},
-
+ onShow() {
+ this.shoppingCartGet();
+ },
onDelete(e) {
const item = e.currentTarget.dataset.item;
app.MG.store.delShoppingCart({
@@ -39,6 +41,7 @@
searchList: []
};
app.MG.store.getShoppingCartProductList(query).then(res => {
+ console.log(res, 'res');
res.datas.forEach(item => {
item.imgUrl = getPublicImage(item.productMonWithLinkDto.product.icon, '', '160');
console.log(item);
@@ -76,12 +79,9 @@
if (eitem.id == item.id) {
eitem.checked = e.detail.checked
}
-
-
})
const data = items.filter(item => item.checked)
const checkAll = data.length == this.data.shoppingCartData.length
-
this.setData({
shoppingCartData: items,
checkAll
@@ -106,24 +106,19 @@
});
},
goPaymentPage() {
-
-
const selectedItems = this.data.shoppingCartData.filter(item => item.checked);
// console.log(selectedItems, 789);
const selectedIds = selectedItems.map(item => item.id);
console.log('閫変腑鐨勫晢鍝� id:', selectedIds);
if (selectedIds.length) {
app.MG.store.shoppingCartCreateOrder({ linkIds: selectedIds }).then(res => {
- console.log(res.orderNumber, 456);
+ console.log(res, 456);
const url = '/pages/cart/paymentPage/index?orderNumber=' + res.orderNumber
wx.navigateTo({
url
});
-
-
})
} else {
-
Toast({
context: this,
selector: '#t-toast',
@@ -132,8 +127,10 @@
direction: 'column',
});
}
-
-
-
+ },
+ onLogin() {
+ wx.navigateTo({
+ url: '/pages/testLogin/index'
+ });
}
});
--
Gitblit v1.9.1