From 2a42d55fb60c7d8abdde1a0fafec5b48498cb248 Mon Sep 17 00:00:00 2001 From: ch Date: Wed, 13 Jul 2022 18:46:04 +0800 Subject: [PATCH] =?UTF-8?q?fix:static=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.bate | 2 +- .env.prod | 2 +- src/pages/order/payResult.vue | 10 ++++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.env.bate b/.env.bate index b223a6f..a7a1073 100644 --- a/.env.bate +++ b/.env.bate @@ -1,3 +1,3 @@ VUE_APP_BASE_URL = https://you-gateway.mashibing.com -VUE_APP_STATIC_URL = https://you-gateway.mashibing.com +VUE_APP_STATIC_URL = https://you-app.mashibing.com VUE_APP_IM_URL = wss://you-gateway.mashibing.com \ No newline at end of file diff --git a/.env.prod b/.env.prod index b223a6f..df8e146 100644 --- a/.env.prod +++ b/.env.prod @@ -1,3 +1,3 @@ VUE_APP_BASE_URL = https://you-gateway.mashibing.com -VUE_APP_STATIC_URL = https://you-gateway.mashibing.com +VUE_APP_STATIC_URL = https://you-app.mashibing.com VUE_APP_IM_URL = wss://you-gateway.mashibing.com \ No newline at end of file diff --git a/src/pages/order/payResult.vue b/src/pages/order/payResult.vue index 8c1d38b..7fdd0b5 100644 --- a/src/pages/order/payResult.vue +++ b/src/pages/order/payResult.vue @@ -2,7 +2,7 @@ * @Author: ch * @Date: 2022-04-28 15:01:41 * @LastEditors: ch - * @LastEditTime: 2022-06-30 17:31:15 + * @LastEditTime: 2022-07-13 18:41:57 * @Description: file content --> @@ -69,9 +69,11 @@ export default { }, back(){ const payType = this.$Route.query.payType; - if(payType !== 'wxjsapi'){ - this.$Router.back(2); - }else{ + if(payType === 'wxjsapi'){ + this.$Router.back(); + }else if(payType === 'h5'){ + history.back(2); + }else if(payType === 'appWx'){ this.$Router.back(); } }