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-detail.vue |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/pages/order/order-detail.vue b/pages/order/order-detail.vue
index 0f1af96..d868488 100644
--- a/pages/order/order-detail.vue
+++ b/pages/order/order-detail.vue
@@ -253,9 +253,12 @@
 								extraData: {
 									// merchant_id: '',
 									// merchant_trade_no: '',
+									merchant_id: '1661512517',
+									merchant_trade_no: tmp.id || '',
 									transaction_id: tmp.dto && tmp.dto.paymentTrId || ''
 								},
-								async success() {
+								async success(info) {
+									console.log('info', info)
 									//dosomething
 									// 发送请求
 									tmp.$message.showLoading()

--
Gitblit v1.9.3