From 0abc96a1c430c8dfe685828904935a8f16707d4d Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期二, 27 八月 2024 14:23:19 +0800
Subject: [PATCH] update 确认收货
---
pages/order/order.vue | 8 ++++----
pages/order/order-detail.vue | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/pages/order/order-detail.vue b/pages/order/order-detail.vue
index e559343..7124ed8 100644
--- a/pages/order/order-detail.vue
+++ b/pages/order/order-detail.vue
@@ -153,14 +153,14 @@
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() {
//dosomething
diff --git a/pages/order/order.vue b/pages/order/order.vue
index e62584c..668e5cc 100644
--- a/pages/order/order.vue
+++ b/pages/order/order.vue
@@ -130,14 +130,14 @@
var tryCallWx = false
// #ifdef MP
let tmp = this
- if (wx.openBusinessView&&false) {
+ if (wx.openBusinessView&&item.paymentTrId) {
tryCallWx = true
wx.openBusinessView({
businessType: 'weappOrderConfirm',
extraData: {
- merchant_id: '1230000109',
- merchant_trade_no: '1234323JKHDFE1243252',
- transaction_id: '420123123123123123123'
+ // merchant_id: '1230000109',
+ // merchant_trade_no: '1234323JKHDFE1243252',
+ transaction_id: item.paymentTrId
},
success() {
//dosomething
--
Gitblit v1.9.3