3/18 logo更新1.0

src/layout/components/Navbar.vue

@@ -539,9 +539,9 @@ export default {
 
         .user-avatar {
           cursor: pointer;
-          width: 40px;
+          width: 20px;
-          height: 40px;
+          height: 20px;
-          border-radius: 10px;
+          border-radius: 3px;
         }
 
         .el-icon-caret-bottom {

src/layout/components/Sidebar/Logo.vue

@@ -72,12 +72,13 @@ export default {
 
     & .sidebar-logo {
       width: 100px;
-      height: 100px;
+      height: 60px;
-      margin-top: 12px;
+      margin-top: 23px;
       vertical-align: middle;
       margin-right: 12px;
     }
 
+
     & .sidebar-title {
       width: 100%;
       display: inline-block;

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)

src/views/myLogin.vue

@@ -16,9 +16,9 @@
     >
       <el-card class="box-card">
         <div style="text-align: center; margin-top: 10px">
-          <img alt="element-logo" src="@/assets/logo/logo.png"/>
+          <img alt="element-logo" src="@/assets/logo/logo.png" width="120" height="60"/>
         </div>
-        <h3 class="title">用户登录</h3>
+        <h3 class="title" style="margin-top: 15px">用户登录</h3>
         <el-form-item prop="username" class="item" style="margin-top: -20px">
           <el-input
             placeholder="账号"