From 7e738f69cf7b353492edefa1768005f19ea7e7ee Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期三, 28 八月 2024 10:25:11 +0800
Subject: [PATCH] update上线更新
---
pages/order/order.vue | 65 +++++++++++++++++++++++++++-----
1 files changed, 54 insertions(+), 11 deletions(-)
diff --git a/pages/order/order.vue b/pages/order/order.vue
index a0675d7..92e1171 100644
--- a/pages/order/order.vue
+++ b/pages/order/order.vue
@@ -127,18 +127,61 @@
break
case 'confirm': {
await this.$message.confirm('是否确定收货')
- // 发送请求
- this.$message.showLoading()
- const {
- code
- } = await this.$http.request('get', '/api/customer/order/receive/confirm', {
- params: {
- id: item.id,
+ var tryCallWx = false
+ // #ifdef MP
+ let tmp = this
+ if (wx.openBusinessView&&item.paymentTrId) {
+ tryCallWx = true
+ wx.openBusinessView({
+ businessType: 'weappOrderConfirm',
+ extraData: {
+ // merchant_id: '1230000109',
+ // merchant_trade_no: '1234323JKHDFE1243252',
+ transaction_id: item.paymentTrId
+ },
+ async success() {
+ //dosomething
+ // 发送请求
+ tmp.$message.showLoading()
+ const {
+ code
+ } = await tmp.$http.request('get', '/api/customer/order/receive/confirm', {
+ params: {
+ id: item.id,
+ }
+ })
+ tmp.$message.hideLoading()
+ if (code === 0) {
+ tmp.refreshList()
+ }
+ },
+ fail(e) {
+ //dosomething
+ console.log('error fail', e)
+ tmp.$message.showToast('收货失败')
+ },
+ complete() {
+ //dosomething
+ }
+ });
+ }
+
+ // #endif
+
+ if (!tryCallWx) {
+ // 发送请求
+ this.$message.showLoading()
+ const {
+ code
+ } = await this.$http.request('get', '/api/customer/order/receive/confirm', {
+ params: {
+ id: item.id,
+ }
+ })
+ this.$message.hideLoading()
+ if (code === 0) {
+ this.refreshList()
}
- })
- this.$message.hideLoading()
- if (code === 0) {
- this.refreshList()
}
}
--
Gitblit v1.9.3