From 7c7fd1a80ad89dd1037f2ee420fed2dcde7290a1 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期二, 20 八月 2024 16:42:53 +0800
Subject: [PATCH] 1

---
 sub_pages/customer/shopping/confirm.vue |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/sub_pages/customer/shopping/confirm.vue b/sub_pages/customer/shopping/confirm.vue
index 7d2bc7d..c9fda51 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 (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()

--
Gitblit v1.9.3