baimingxuan
diff --git a/‎index.html
Lines changed: 1 addition & 0 deletions b/‎index.html
Lines changed: 1 addition & 0 deletions
diff --git a/‎logo.png
-6.69 KB b/‎logo.png
-6.69 KB
diff --git a/‎src/assets/less/side-menu.less
Lines changed: 11 additions & 2 deletions b/‎src/assets/less/side-menu.less
Lines changed: 11 additions & 2 deletions
diff --git a/‎src/layout/index.vue
Lines changed: 27 additions & 1 deletion b/‎src/layout/index.vue
Lines changed: 27 additions & 1 deletion
diff --git a/‎static/logo/favicon.ico
1.12 KB b/‎static/logo/favicon.ico
1.12 KB
diff --git a/‎static/logo/logo-icon.png
14.6 KB b/‎static/logo/logo-icon.png
14.6 KB
diff --git a/‎static/logo/logo.png
10.2 KB b/‎static/logo/logo.png
10.2 KB
@@ -4,6 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <title>vue-admin-system</title>
+    <link rel="icon" type="image/x-icon" href="./static/logo/favicon.ico">
   </head>
   <body>
     <div id="app"></div>
 
@@ -15,8 +15,17 @@
       .el-menu {
         border-right: none;
         .side-menu-item {
-          .el-submenu__title * {
-            vertical-align: top;
+          .el-submenu__title {
+            height: 52px;
+            line-height: 52px;
+            * {
+              vertical-align: top;
+            }
+          }
+          /* 菜单项高度重置 */
+          .el-menu-item {
+            height: 52px;
+            line-height: 52px;
           }
           /* 图标样式 */
           i {
 
@@ -1,6 +1,11 @@
 <template>
   <div class="app-wrapper">
     <div class="side-container" :class="collapsed ? 'folded' : 'unfolded'">
+      <div class="logo">
+        <a href="/">
+          <img :src="imgSrc" alt="logo">
+        </a>
+      </div>
       <SideMenu/>
     </div>
     <div class="main-container" :class="collapsed ? 'wider' : 'normal'">
@@ -28,7 +33,13 @@ export default {
   name: 'Layout',
   components: { HeaderBar, SideMenu, TagsNav, MainView },
   computed: {
-    ...mapGetters('app', ['collapsed'])
+    ...mapGetters('app', ['collapsed']),
+    imgSrc () {
+      if (this.collapsed) {
+        return  './static/logo/logo-icon.png'
+      }
+      return  './static/logo/logo.png'
+    }
   }
 }
 </script>
@@ -46,9 +57,24 @@ export default {
     background-color: #263238;
     &.unfolded {
       width: 260px;
+      .logo {
+        width: 260px;
+        height: 84px;
+      }
     }
     &.folded {
       width: 64px;
+      .logo {
+        width: 64px;
+        height: 64px;
+        padding: 10px;
+        box-sizing: border-box;
+      }
+    }
+    img {
+      display: block;
+      width: 100%;
+      height: 100%;
     }
   }
   .main-container{