WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

切换线上登录

Browse Source
This commit is contained in:
qq787203167
2022-06-21 09:35:25 +08:00
parent c06f4004d0
commit d2019ca19d
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-web/src/components/tools/UserMenu.vue
+3 -3
View File
@@ -223,13 +223,13 @@
return that.Logout({}).then(() => {
// update-begin author:wangshuai date:20200601 for: 退出登录跳转登录页面
// TODO 在部署线上时注掉以下代码
that.$router.push({ path: '/user/login' })
// 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' //本地
// TODO 在部署线上时解开以下代码
// window.location.href = 'https://signin.nio.com/logout?client_id=100679&redirect_uri=' +
// encodeURIComponent('http://grp.nioint.com/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: 退出登录跳转登录页面
jero-web/src/permission.js
+8 -8
View File
@@ -14,10 +14,10 @@ NProgress.configure({ showSpinner: false }) // NProgress Configuration
// TODO 线上部署在conmponetns/tools/UserMenu.vue的退出登录时需解开代码以及注释代码
// TODO 在部署线上时注掉以下代码
const whiteList = ['/user/login', '/user/register', '/user/register-result', '/user/alteration']
// const whiteList = ['/user/login', '/user/register', '/user/register-result', '/user/alteration']
// TODO 在部署线上时解开一下代码
// const whiteList = []
const whiteList = []
// no redirect whitelist
@@ -96,7 +96,7 @@ router.beforeEach((to, from, next) => {
// query: { redirect: to.fullPath }
store.dispatch('Logout').then(() => {
// TODO 在部署线上时注掉此代码
next({ path: '/user/login', query: { redirect: to.fullPath } })
// next({ path: '/user/login', query: { redirect: to.fullPath } })
let fullPath = ''
if (to.fullPath == '/') {
@@ -109,8 +109,8 @@ router.beforeEach((to, from, next) => {
// + encodeURIComponent('http://localhost:3000' + fullPath) + '&response_type=code&state=' + JSON.stringify(to.query) //本地
// TODO 在部署线上时解开此代码
// 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) //线上
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 {
@@ -123,7 +123,7 @@ router.beforeEach((to, from, next) => {
next()
} else {
// TODO 在部署线上时注掉此代码
next({ path: '/user/login', query: { redirect: to.fullPath } })
// next({ path: '/user/login', query: { redirect: to.fullPath } })
let fullPath = ''
if (to.fullPath == '/') {
@@ -135,8 +135,8 @@ router.beforeEach((to, from, next) => {
// 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) //本地
// TODO 在部署线上时解开此代码
// 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) //线上
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
}