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){