diff --git a/public/favicon.ico b/public/favicon.ico index b47a73c..5def48f 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/src/assets/logo/logo.png b/src/assets/logo/logo.png index 385e999..1ee6477 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 add427d..53b2aa0 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -532,9 +532,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 f396f4b..4e7b3e2 100644 --- a/src/layout/components/Sidebar/Logo.vue +++ b/src/layout/components/Sidebar/Logo.vue @@ -72,8 +72,8 @@ export default { & .sidebar-logo { width: 100px; - height: 100px; - margin-top: 12px; + height: 60px; + margin-top: 23px; vertical-align: middle; margin-right: 12px; } diff --git a/src/store/modules/user.js b/src/store/modules/user.js index c76511b..a31211a 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -103,7 +103,7 @@ const user = { const user = res.data; const avatar = user.avatar == "" || user.avatar == null - ? require("@/assets/images/glxplogo.png") + ? require("@/assets/logo/logo.png") : user.avatar; if (res.data.roles && res.data.roles.length > 0) { // 验证返回的roles是否是一个非空数组 diff --git a/src/views/myLogin.vue b/src/views/myLogin.vue index d2c1647..9dbb162 100644 --- a/src/views/myLogin.vue +++ b/src/views/myLogin.vue @@ -21,7 +21,7 @@ >
- element-logo + element-logo

用户登录