From 96994a13345df47f4c138963dc0f20fc43e1e6c3 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期三, 28 八月 2024 22:28:34 +0800
Subject: [PATCH] 1

---
 pages/order/order-detail.vue |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/pages/order/order-detail.vue b/pages/order/order-detail.vue
index e559343..589f663 100644
--- a/pages/order/order-detail.vue
+++ b/pages/order/order-detail.vue
@@ -153,16 +153,16 @@
 						var tryCallWx = false
 						// #ifdef MP
 						let tmp = this
-						if (wx.openBusinessView&&false) {
+						if (wx.openBusinessView && tmp.dto && tmp.dto.paymentTrId) {
 							tryCallWx = true
 							wx.openBusinessView({
 								businessType: 'weappOrderConfirm',
 								extraData: {
-									merchant_id: '1230000109',
-									merchant_trade_no: '1234323JKHDFE1243252',
-									transaction_id: '420123123123123123123'
+									// merchant_id: '',
+									// merchant_trade_no: '',
+									transaction_id: tmp.dto && tmp.dto.paymentTrId || ''
 								},
-								success() {
+								async success() {
 									//dosomething
 									// 发送请求
 									tmp.$message.showLoading()
@@ -230,10 +230,8 @@
 								...data,
 								async success(res) {
 									console.log('pay success', res)
-									that.$message.showToast('支付成功')
-									setTimeout(() => {
-										that.getDetail()
-									}, 200)
+									await that.$message.showToast('支付成功')
+									that.getDetail()
 								},
 								fail(err) {
 									console.error('pay fail', err)

--
Gitblit v1.9.3