From 1d782559b682f7eb7a374c2e8017ff65cb941e52 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期二, 24 九月 2024 17:25:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'remote-v2/master-2.0' into master-2.0
---
pages/order/order.vue | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/pages/order/order.vue b/pages/order/order.vue
index 7e8fabb..606db74 100644
--- a/pages/order/order.vue
+++ b/pages/order/order.vue
@@ -234,9 +234,12 @@
extraData: {
// merchant_id: '1230000109',
// merchant_trade_no: '1234323JKHDFE1243252',
+ merchant_id: '1661512517',
+ merchant_trade_no: item.orderId || item.id || '',
transaction_id: item.paymentTrId
},
- async success() {
+ async success(info) {
+ console.log('确认收货 info success', info)
//dosomething
// 发送请求
tmp.$message.showLoading()
@@ -253,15 +256,17 @@
tmp.refreshList()
//刷新积分
tmp.$store.dispatch('getCurrentInfo')
+ tmp.$message.showToast('收货成功')
}
},
fail(e) {
- //dosomething
- console.log('error fail', e)
+ console.log('确认收货 info error', e)
+ // console.log('error fail', e)
tmp.$message.showToast('收货失败')
},
- complete() {
+ complete(info) {
//dosomething
+ console.log('确认收货 info complete', info)
}
});
}
--
Gitblit v1.9.3