From 0dabc0e7acc5491a709f20f3544eb8319e0d1fa0 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期四, 29 八月 2024 16:37:55 +0800
Subject: [PATCH] 1
---
sub_pages/customer/shopping/confirm.vue | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/sub_pages/customer/shopping/confirm.vue b/sub_pages/customer/shopping/confirm.vue
index 7d2bc7d..77686c9 100644
--- a/sub_pages/customer/shopping/confirm.vue
+++ b/sub_pages/customer/shopping/confirm.vue
@@ -179,14 +179,16 @@
console.log('pay,', data)
// /api/pub/init/callback?orderId=
// if(env.pro)
- if (data && data['_testOrderId'] && environments.httpBaseUri.startsWith(
+ if (false && data && (data['_testV2OrderId'] || data['_testOrderId']) &&
+ environments.httpBaseUri.startsWith(
'http://47.99.58.211/flower')) {
//回调
tmp.$message.showLoading()
const res2 = await tmp.$http.request('get',
'/api/pub/init/callback', {
params: {
- orderId: data['_testOrderId']
+ orderId: data['_testV2OrderId'] || data[
+ '_testOrderId'] || ''
}
})
tmp.$message.hideLoading()
@@ -199,16 +201,22 @@
...data,
async success(res) {
console.log('pay success', res)
- tmp.$message.showToast('支付成功')
+ // tmp.$message.showToast('支付成功')
//返回上一页
await tmp.$store.dispatch('sign_add', 'shopping')
+ // setTimeout(() => {
+ // uni.navigateBack()
+ // }, 500)
+ await tmp.$message.showToast('支付成功')
uni.navigateBack()
+
+
},
async fail(err) {
console.error('pay fail', err)
tmp.$message.showToast('支付失败')
- await tmp.$store.dispatch('sign_add', 'shopping')
- uni.navigateBack()
+ // await tmp.$store.dispatch('sign_add', 'shopping')
+ // uni.navigateBack()
}
})
--
Gitblit v1.9.3