diff --git a/public/favicon.ico b/public/favicon.ico index b47a73ce..cac45c56 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/src/assets/images/glxplogo.png b/src/assets/images/glxplogo.png deleted file mode 100644 index 385e9991..00000000 Binary files a/src/assets/images/glxplogo.png and /dev/null differ diff --git a/src/assets/logo/logo.png b/src/assets/logo/logo.png index 385e9991..1ee6477e 100644 Binary files a/src/assets/logo/logo.png and b/src/assets/logo/logo.png differ diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index b76aa588..0e73af7d 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -539,9 +539,9 @@ export default { .user-avatar { cursor: pointer; - width: 40px; - height: 40px; - border-radius: 10px; + width: 20px; + height: 20px; + border-radius: 3px; } .el-icon-caret-bottom { diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue index f396f4b9..c3dc3824 100644 --- a/src/layout/components/Sidebar/Logo.vue +++ b/src/layout/components/Sidebar/Logo.vue @@ -72,12 +72,13 @@ export default { & .sidebar-logo { width: 100px; - height: 100px; - margin-top: 12px; + height: 60px; + margin-top: 23px; vertical-align: middle; margin-right: 12px; } + & .sidebar-title { width: 100%; display: inline-block; diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 38d090e6..2b7d6336 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -98,7 +98,7 @@ const user = { return new Promise((resolve, reject) => { getInfo().then(res => { const user = res.data - const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/glxplogo.png") : user.avatar; + const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/logo/logo.png") : user.avatar; if (res.data.roles && res.data.roles.length > 0) { // 验证返回的roles是否是一个非空数组 commit('SET_ROLES', res.data.roles) commit('SET_PERMISSIONS', res.data.permissions) diff --git a/src/views/myLogin.vue b/src/views/myLogin.vue index 0f67e157..586a32f3 100644 --- a/src/views/myLogin.vue +++ b/src/views/myLogin.vue @@ -16,9 +16,9 @@ >
- element-logo + element-logo
-

用户登录

+

用户登录