diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index f478405..e364466 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -144,10 +144,11 @@ const actions = {
   },
   loginByToken({ commit }, Token) {
     return new Promise((resolve, reject) => {
-      TJUserLoginInfo({ Token }).then(async response => {
+      TJUserLoginInfo(Token).then(async response => {
         if (response.IsSuccess) {
           zzSessionStorage.removeItem('lastWorkbench')
           const data = response.Result
+          commit('SET_TOKEN', response.OtherInfo)
           setToken(response.OtherInfo)
           commit('SET_ROLES', data)
           resolve(data)
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 770e4b6..7dc2a27 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -294,6 +294,7 @@ export default {
           this.loginLoading = false
           this.toggleRoleVisible = true
         }).catch(err => {
+          this.loginLoading = false
           console.log(err)
         })
     },