|
@ -5,7 +5,7 @@ import { constantRouterMap } from './router.config.js' |
|
|
import { checkWxmpRegister, login } from '@/api/user' |
|
|
import { checkWxmpRegister, login } from '@/api/user' |
|
|
import { title } from '@/config' |
|
|
import { title } from '@/config' |
|
|
|
|
|
|
|
|
const whiteList = ['/login', '/register', '/errorPage','/selectAgency','/houseQR','/event'] |
|
|
const whiteList = ['/login', '/register', '/errorPage','/selectAgency','/houseQR','/event','/scanQrCode'] |
|
|
const originalPush = Router.prototype.push |
|
|
const originalPush = Router.prototype.push |
|
|
Router.prototype.push = function push(location, onResolve, onReject) { |
|
|
Router.prototype.push = function push(location, onResolve, onReject) { |
|
|
if (onResolve || onReject) return originalPush.call(this, location, onResolve, onReject) |
|
|
if (onResolve || onReject) return originalPush.call(this, location, onResolve, onReject) |
|
@ -57,10 +57,9 @@ router.beforeEach((to, from, next) => { |
|
|
}else{ |
|
|
}else{ |
|
|
store.commit('SET_HOUSE_ID', null) |
|
|
store.commit('SET_HOUSE_ID', null) |
|
|
} |
|
|
} |
|
|
if(urlParams.type && !localStorage.getItem('token') ){ |
|
|
if(urlParams.type && !localStorage.getItem('token')&&to.path !=='/scanQrCode' ){ |
|
|
location.href = 'https://mp.weixin.qq.com/mp/profile_ext?action=home&__biz=MzkxNzQ5MzUzNg==&scene=110#wechat_redirect' |
|
|
next('/scanQrCode') |
|
|
return |
|
|
}else{ |
|
|
} |
|
|
|
|
|
if (urlParams.appId) { |
|
|
if (urlParams.appId) { |
|
|
if (localStorage.getItem('appId') && urlParams.appId !== localStorage.getItem('appId')) { |
|
|
if (localStorage.getItem('appId') && urlParams.appId !== localStorage.getItem('appId')) { |
|
|
localStorage.removeItem('token') |
|
|
localStorage.removeItem('token') |
|
@ -71,7 +70,7 @@ router.beforeEach((to, from, next) => { |
|
|
} else { |
|
|
} else { |
|
|
store.commit('SET_APP_ID', localStorage.getItem('appId')) |
|
|
store.commit('SET_APP_ID', localStorage.getItem('appId')) |
|
|
} |
|
|
} |
|
|
if (!localStorage.getItem('appId') && to.path !== '/errorPage'&& to.path != '/houseQR') { |
|
|
if (!localStorage.getItem('appId') && to.path !== '/errorPage'&& to.path != '/houseQR' && to.path != '/scanQrCode') { |
|
|
if(to.path === '/errorPage'){ |
|
|
if(to.path === '/errorPage'){ |
|
|
next('/errorPage') |
|
|
next('/errorPage') |
|
|
}else{ |
|
|
}else{ |
|
@ -99,7 +98,7 @@ router.beforeEach((to, from, next) => { |
|
|
next({ path: '/login'}) |
|
|
next({ path: '/login'}) |
|
|
}) |
|
|
}) |
|
|
} else { |
|
|
} else { |
|
|
if (getQueryStringByName('code') && to.path != '/houseQR') { |
|
|
if (getQueryStringByName('code') && to.path != '/houseQR' && to.path != '/scanQrCode') { |
|
|
login({ wxCode: getQueryStringByName('code'),appId:'wx1078fa1e99424de9'}).then(res => { |
|
|
login({ wxCode: getQueryStringByName('code'),appId:'wx1078fa1e99424de9'}).then(res => { |
|
|
localStorage.setItem('token', res.data.token) |
|
|
localStorage.setItem('token', res.data.token) |
|
|
localStorage.setItem('userId', res.data.userH5DTO.id) |
|
|
localStorage.setItem('userId', res.data.userH5DTO.id) |
|
@ -134,6 +133,8 @@ router.beforeEach((to, from, next) => { |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
}) |
|
|
}) |
|
|
|
|
|
|
|
|
function getQueryParams() { |
|
|
function getQueryParams() { |
|
|