From 3f1ea0a8e4bb02bf7544df8660b15cfa69d6b84a Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期五, 15 三月 2024 18:54:04 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
pages/cart/paymentPage/index.js | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/pages/cart/paymentPage/index.js b/pages/cart/paymentPage/index.js
index 7a4e351..fcad534 100644
--- a/pages/cart/paymentPage/index.js
+++ b/pages/cart/paymentPage/index.js
@@ -143,6 +143,7 @@
}
}
app.MG.store.getOrderByOrderNum(query).then(res => {
+ console.log(res, 'res');
this.setData({
orderGoods: res.orderNumber
})
@@ -155,10 +156,11 @@
res.saleMethodLinks.forEach(item => {
item.paymentIcon = getPublicImage(item.orderSaleMethod.product.icon)
-
+ console.log(item.orderSaleMethod.type);
this.setData({
- productList: res.saleMethodLinks
+ productList: res.saleMethodLinks,
+ type: item.orderSaleMethod.type == 'createProductItemSaleMethod' ? 'item' : 'product'
})
})
--
Gitblit v1.9.1