rollback^2
xy 10 months ago
parent a86418f21a
commit ae697f0a18

@ -16,6 +16,7 @@ router.beforeEach(async(to, from, next) => {
// set page title // set page title
document.title = getPageTitle(to.meta.title) document.title = getPageTitle(to.meta.title)
console.log('oa-token', window.decodeURIComponent(to.query.auth_token))
if(to.query.auth_token) { if(to.query.auth_token) {
setToken(window.decodeURIComponent(to.query.auth_token)) setToken(window.decodeURIComponent(to.query.auth_token))
} }

@ -67,7 +67,7 @@ const actions = {
// get user info // get user info
getInfo({ commit, state }) { getInfo({ commit, state }) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
getInfo(state.token).then(response => { getInfo(getToken()).then(response => {
const { name, avatar, id, role, department, username, year_holiday } = response const { name, avatar, id, role, department, username, year_holiday } = response
@ -88,7 +88,7 @@ const actions = {
// user logout // user logout
logout({ commit, state }) { logout({ commit, state }) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
logout(state.token).then(() => { logout(getToken()).then(() => {
removeToken() // must remove token first removeToken() // must remove token first
resetRouter() resetRouter()
commit('RESET_STATE') commit('RESET_STATE')

Loading…
Cancel
Save