From 201afece0a66d27145507478bdf553d414cc3bbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sun, 1 May 2022 17:21:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/layout/components/Navbar.vue | 3 ++-
 src/views/login/components/login.vue   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue
index 63b4b100..ad9ff825 100644
--- a/src/views/layout/components/Navbar.vue
+++ b/src/views/layout/components/Navbar.vue
@@ -224,7 +224,8 @@ export default {
     logout() {
       this.$store.dispatch('LogOut').then(() => {
         //location.reload()// In order to re-instantiate the vue-router object to avoid bugs
-        this.$router.push({path:'/login'})
+        //this.$router.replace({path:'/login'})
+        location.replace('/');
       })
     },
 			showSelectShopMethod() {
diff --git a/src/views/login/components/login.vue b/src/views/login/components/login.vue
index 38054d5f..79c3cd50 100644
--- a/src/views/login/components/login.vue
+++ b/src/views/login/components/login.vue
@@ -328,7 +328,8 @@ export default {
             this.handleLogin();
         },
         weixinLogin(){
-            var mdpRedirectUri="https://www.qingqinkj.com/xm/m1/"
+            var curlDomain=window.location.protocol+"//"+window.location.host; //  
+            var mdpRedirectUri=curlDomain+"/"+process.env.CONTEXT+"/"+process.env.VERSION+"/"
             getTpaState().then(res=>{
                 var tips = res.data.tips;
                 if(tips.isOk){