lilei 4 rokov pred
rodič
commit
8ecef1062a
2 zmenil súbory, kde vykonal 2 pridanie a 2 odobranie
  1. 1 1
      src/permission.js
  2. 1 1
      src/store/modules/user.js

+ 1 - 1
src/permission.js

@@ -18,7 +18,7 @@ router.beforeEach((to, from, next) => {
   to.meta && (typeof to.meta.title !== 'undefined' && setDocumentTitle(`${to.meta.title} - ${domTitle}`))
   let token = store.state.user.token || sessionStorage.getItem(ACCESS_TOKEN)
   token = token != 'undefined' ? token : ''
-  // console.log(token)
+
   // 已登录
   if (token) {
     /* has token */

+ 1 - 1
src/store/modules/user.js

@@ -47,7 +47,7 @@ const user = {
               const users = res.auth_user
               Vue.ls.set('hasError', 0)
               commit('SET_TOKEN', res.access_token)
-              commit('SET_NAME', { name: users.userNameCN, welcome: welcome() })
+              commit('SET_NAME', { name: users.userNameCN || users.username, welcome: welcome() })
               Vue.ls.set('rolesAccess', { permissionList: users.permCodes }, 7 * 24 * 60 * 60 * 1000)
               commit('SET_AVATAR', res.avatar ? res.avatar : '')
               // 记住密码