diff --git a/dist.rar b/dist.rar new file mode 100644 index 00000000..6a387eed Binary files /dev/null and b/dist.rar differ diff --git a/src/store/modules/user.js b/src/store/modules/user.js index c32a9566..be241622 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -128,8 +128,10 @@ const user = { commit('SET_USER_INFO', userInfo) commit('SET_ROLES', roles) commit('SET_QXS', data.qxs) - commit('SET_TOKEN', data.data.accessToken.tokenValue) + commit('SET_TOKEN', data.data.accessToken.tokenValue) + commit('SET_IS_LOAD_OK', false) setToken( data.data.accessToken.tokenValue) + removeCacheUserInfo(); } resolve(res) }).catch(error => { @@ -254,7 +256,8 @@ const user = { commit('SET_MYBRANCHS', []) commit('SET_MYSHOPS', []) commit('SET_MYPOSTS', []) - commit('SET_USER_INFO', {}) + commit('SET_USER_INFO', {}) + commit('SET_IS_LOAD_OK', false) removeToken() removeCacheUserInfo(); resolve() diff --git a/src/views/layout/components/Sidebar/Logo.vue b/src/views/layout/components/Sidebar/Logo.vue index f2217c2e..68caea7c 100644 --- a/src/views/layout/components/Sidebar/Logo.vue +++ b/src/views/layout/components/Sidebar/Logo.vue @@ -57,14 +57,15 @@ export default { width: 50px; height: 50px; vertical-align: middle; - margin-left:-2px; + margin-left:-4px; } & .sidebar-title { display: inline-block; margin: 0; color: #fff; line-height: 50px; - font-size: 14px; + font-weight: 400; + font-size: 16px; font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif; vertical-align: middle; } @@ -74,7 +75,7 @@ export default { .sidebar-logo { width: 40px; height: 40px; - margin-left: -2px; + margin-left: -4px; } } }