diff --git a/jero-web/src/components/tools/UserMenu.vue b/jero-web/src/components/tools/UserMenu.vue index 35c59e6c4..21152b55b 100644 --- a/jero-web/src/components/tools/UserMenu.vue +++ b/jero-web/src/components/tools/UserMenu.vue @@ -223,7 +223,11 @@ return that.Logout({}).then(() => { // update-begin author:wangshuai date:20200601 for: 退出登录跳转登录页面 that.$router.push({ path: '/user/login' }) - // window.location.href = 'https://signin-test.nio.com/logout?client_id=100679&redirect_uri=' + encodeURIComponent('http://localhost:3000/dashboard/analysis') + '&response_type=code' + // window.location.href = 'https://signin-test.nio.com/logout?client_id=100679&redirect_uri=' + + // encodeURIComponent('http://localhost:3000/dashboard/analysis') + '&response_type=code' //本地 + + // window.location.href = 'https://signin.nio.com/logout?client_id=100679&redirect_uri=' + + // encodeURIComponent('http://grp.nioint.com/dashboard/analysis') + '&response_type=code' //线上 localStorage.removeItem('language') // update-end author:wangshuai date:20200601 for: 退出登录跳转登录页面 //window.location.reload() diff --git a/jero-web/src/permission.js b/jero-web/src/permission.js index 32a256491..24e2e97e5 100644 --- a/jero-web/src/permission.js +++ b/jero-web/src/permission.js @@ -96,8 +96,12 @@ router.beforeEach((to, from, next) => { } else { fullPath = to.path } + // http://grp.nioint.com // window.location.href = 'https://signin-test.nio.com/oauth2/authorize?client_id=100679&redirect_uri=' - // + encodeURIComponent('http://localhost:3000' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) + // + encodeURIComponent('http://localhost:3000' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //本地 + + // window.location.href = 'https://signin.nio.com/oauth2/authorize?client_id=100679&redirect_uri=' + // + encodeURIComponent('http://grp.nioint.com' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //线上 }) }) } else { @@ -118,7 +122,10 @@ router.beforeEach((to, from, next) => { } // http://grp.nioint.com // window.location.href = 'https://signin-test.nio.com/oauth2/authorize?client_id=100679&redirect_uri=' - // + encodeURIComponent('http://localhost:3000' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) + // + encodeURIComponent('http://localhost:3000' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //本地 + + // window.location.href = 'https://signin.nio.com/oauth2/authorize?client_id=100679&redirect_uri=' + // + encodeURIComponent('http://grp.nioint.com' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //线上 NProgress.done() // if current page is login will not trigger afterEach hook, so manually handle it } }