From 7e738f69cf7b353492edefa1768005f19ea7e7ee Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期三, 28 八月 2024 10:25:11 +0800
Subject: [PATCH] update上线更新
---
environments/index.js | 4 ++--
manifest.json | 2 +-
sub_pages/customer/shopping/confirm.vue | 2 +-
pages/order/order.vue | 2 +-
pages/order/order-detail.vue | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/environments/index.js b/environments/index.js
index a6f20e1..c8a5cf9 100644
--- a/environments/index.js
+++ b/environments/index.js
@@ -1,7 +1,7 @@
export default {
- // httpBaseUri: 'https://www.hmyxianhua.com/flower',
- httpBaseUri: 'http://47.99.58.211/flower',
+ httpBaseUri: 'https://www.hmyxianhua.com/flower',
+ // httpBaseUri: 'http://47.99.58.211/flower',
// httpBaseUri: 'http://localhost:8080/flower',
clientId: '',
secret: '',
diff --git a/manifest.json b/manifest.json
index 2848179..f2448bf 100644
--- a/manifest.json
+++ b/manifest.json
@@ -49,7 +49,7 @@
"quickapp" : {},
/* 快应用特有相关 */
"mp-weixin" : {
- "appid" : "wx1441324401626290",
+ "appid" : "wx3203fd935a6ffe09",
"setting" : {
"urlCheck" : false,
"es6" : true,
diff --git a/pages/order/order-detail.vue b/pages/order/order-detail.vue
index 7124ed8..67167b9 100644
--- a/pages/order/order-detail.vue
+++ b/pages/order/order-detail.vue
@@ -162,7 +162,7 @@
// merchant_trade_no: '',
transaction_id: tmp.dto && tmp.dto.paymentTrId || ''
},
- success() {
+ async success() {
//dosomething
// 发送请求
tmp.$message.showLoading()
diff --git a/pages/order/order.vue b/pages/order/order.vue
index 668e5cc..92e1171 100644
--- a/pages/order/order.vue
+++ b/pages/order/order.vue
@@ -139,7 +139,7 @@
// merchant_trade_no: '1234323JKHDFE1243252',
transaction_id: item.paymentTrId
},
- success() {
+ async success() {
//dosomething
// 发送请求
tmp.$message.showLoading()
diff --git a/sub_pages/customer/shopping/confirm.vue b/sub_pages/customer/shopping/confirm.vue
index c9fda51..4ea2671 100644
--- a/sub_pages/customer/shopping/confirm.vue
+++ b/sub_pages/customer/shopping/confirm.vue
@@ -179,7 +179,7 @@
console.log('pay,', data)
// /api/pub/init/callback?orderId=
// if(env.pro)
- if (data && (data['_testV2OrderId'] || data['_testOrderId']) &&
+ if (false && data && (data['_testV2OrderId'] || data['_testOrderId']) &&
environments.httpBaseUri.startsWith(
'http://47.99.58.211/flower')) {
//回调
--
Gitblit v1.9.3