From 5525ed0398c496b43a09377d0c59d143e7ff3e98 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期二, 24 九月 2024 19:04:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'remote-v2/master-2.0' into master-2.0
---
pages/order/order-detail.vue | 50 +++++++++++++++++++++++++++++++-------------------
1 files changed, 31 insertions(+), 19 deletions(-)
diff --git a/pages/order/order-detail.vue b/pages/order/order-detail.vue
index 0f1af96..beca38d 100644
--- a/pages/order/order-detail.vue
+++ b/pages/order/order-detail.vue
@@ -111,7 +111,7 @@
},
methods: {
-
+
openbrand(item) {
//也要判断一下是否重复进入
//判断堆栈，如果是店铺，就直接返回
@@ -134,7 +134,7 @@
return
}
}
-
+
if (pages.length >= 10) {
//直接强制购物车
uni.reLaunch({
@@ -145,9 +145,9 @@
url: '/sub_pages/customer/shop/shop?id=' + (item.supplierId || '')
})
}
-
- },
-
+
+ },
+
toFlowerDetail(item) {
console.log(item)
uni.navigateTo({
@@ -253,25 +253,37 @@
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()
- const {
- code
- } = await tmp.$http.request('get',
- '/api/customer/order/receive/confirm', {
- params: {
- id: tmp.id,
- }
- })
- tmp.$message.hideLoading()
- if (code === 0) {
- tmp.getDetail()
- tmp.$store.dispatch('getCurrentInfo')
+ if (info.extraData && info.extraData.status === 'fail') {
+ tmp.$message.showToast('支付和确认收货需要是同一微信号，请联系实际支付人登录确认')
+
+ } else if (info.extraData && info.extraData.status === 'cancel') {
+
+ } else {
+ tmp.$message.showLoading()
+ const {
+ code
+ } = await tmp.$http.request('get',
+ '/api/customer/order/receive/confirm', {
+ params: {
+ id: tmp.id,
+ }
+ })
+ tmp.$message.hideLoading()
+ if (code === 0) {
+ tmp.getDetail()
+ tmp.$store.dispatch('getCurrentInfo')
+ }
+
}
+
},
fail(e) {
//dosomething
--
Gitblit v1.9.3