From 5a2d4195b67b436b236f67544f4500b6e89c62a6 Mon Sep 17 00:00:00 2001
From: ch <cwl_ch@163.com>
Date: Thu, 26 May 2022 19:06:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=AF=E4=BB=98=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 env.config.js           | 6 +++++-
 src/common/utils/pay.js | 5 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/env.config.js b/env.config.js
index 4efb30a..e06c206 100644
--- a/env.config.js
+++ b/env.config.js
@@ -2,7 +2,7 @@
  * @Author: ch
  * @Date: 2022-05-05 14:40:00
  * @LastEditors: ch
- * @LastEditTime: 2022-05-23 21:15:35
+ * @LastEditTime: 2022-05-26 19:04:26
  * @Description: 根据git分支生成对应环境的环境变量
  * 开发时如果环境变量换了，可以不用重启服务，直接运行node env.config.js即可
  */
@@ -12,18 +12,22 @@ const path = require('path');
 const envConfig = {
 	dev : {
 		baseUrl: 'https://k8s-horse-gateway.mashibing.cn',
+		staticUrl : 'https://k8s-shop-app.mashibing.cn',
 		imUrl : 'wss://k8s-horse-gateway.mashibing.cn'
 	},
 	test : {
 		baseUrl: 'https://k8s-horse-gateway.mashibing.cn',
+		staticUrl : 'https://k8s-shop-app.mashibing.cn',
 		imUrl : 'wss://k8s-horse-gateway.mashibing.cn'
 	},
 	beta : {
 		baseUrl: 'https://you-gateway.mashibing.com',
+		staticUrl : 'https://you-app.mashibing.com',
 		imUrl : 'wss://you-gateway.mashibing.com'
 	},
 	prod : {
 		baseUrl: 'https://you-gateway.mashibing.com',
+		staticUrl : 'https://you-app.mashibing.com',
 		imUrl : 'wss://you-gateway.mashibing.com'
 	}
 }
diff --git a/src/common/utils/pay.js b/src/common/utils/pay.js
index 1bd32b7..593f342 100644
--- a/src/common/utils/pay.js
+++ b/src/common/utils/pay.js
@@ -2,10 +2,11 @@
  * @Author: ch
  * @Date: 2022-05-06 15:33:55
  * @LastEditors: ch
- * @LastEditTime: 2022-05-06 21:02:39
+ * @LastEditTime: 2022-05-26 19:04:50
  * @Description: file content
  */
 import { ApiPostWxH5Pay, ApiPostWxJsApiPay } from '@/common/api/wx';
+import ENV from '@/common/config/env';
 import { Wxpay } from './wxpay';
 export const pay = ({orderId, openId, payType})=>{
 	if(payType === 'wxpay'){
@@ -49,7 +50,7 @@ export const pay = ({orderId, openId, payType})=>{
 			uni.$u.toast(error.message);
 			return false;
 		}
-		const redirect_url = decodeURIComponent(`https://you-app.mashibing.com/payResult?orderId=${orderId}&payType=wxh5`);
+		const redirect_url = decodeURIComponent(`${ENV.staticUrl}/payResult?orderId=${orderId}&payType=wxh5`);
 		window.location.href = `${result.dataInfo.payUrl}&redirect_url=${redirect_url}`;
 	}
 	// #ednif