From d42b9339ca61313491caa2c2d576d0a810256e90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=9D=A8?= <1711467488@qq.com>
Date: Tue, 20 Mar 2018 22:34:16 +0800
Subject: [PATCH] no message

Former-commit-id: ac9e72b31c7e9c0d9450481f2e77a9b9a457afa4
Former-commit-id: 894bbe9e66c21db55ed073381e8fbdf804f6554a
Former-commit-id: 0b14f393f1fd4fd4ad42f8994a5bf8577c7252c2
---
 src/assets/style/theme/default.scss                          | 4 ++--
 src/components/core/MainLayout/components/SideMenu/index.vue | 2 +-
 src/components/core/MainLayout/index.vue                     | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/assets/style/theme/default.scss b/src/assets/style/theme/default.scss
index 0490340b..399f2f6d 100644
--- a/src/assets/style/theme/default.scss
+++ b/src/assets/style/theme/default.scss
@@ -24,7 +24,6 @@ $color: #409EFF;
         float: left;
         text-align: center;
         img {
-          transition: all .3s;
           height: 60px;
         }
       }
@@ -38,8 +37,9 @@ $color: #409EFF;
         user-select: none;
         cursor: pointer;
         i {
-          font-size: 24px;
+          font-size: 20px;
           color: $color-text-normal;
+          margin-top: 4px;
           &:hover {
             color: $color-primary;
           }
diff --git a/src/components/core/MainLayout/components/SideMenu/index.vue b/src/components/core/MainLayout/components/SideMenu/index.vue
index cd834cf2..62e94830 100644
--- a/src/components/core/MainLayout/components/SideMenu/index.vue
+++ b/src/components/core/MainLayout/components/SideMenu/index.vue
@@ -33,7 +33,7 @@
         </el-submenu>
       </template>
     </el-menu>
-    <div v-else class="dd-side-menu-empty">
+    <div v-if="sideMenu.length === 0 && !collapse" class="dd-side-menu-empty">
       没有菜单
     </div>
   </div>
diff --git a/src/components/core/MainLayout/index.vue b/src/components/core/MainLayout/index.vue
index 7405279f..819b0349 100644
--- a/src/components/core/MainLayout/index.vue
+++ b/src/components/core/MainLayout/index.vue
@@ -2,8 +2,8 @@
   <el-container class="layout-main" :class="theme">
     <el-header>
       <div class="logo-group" :style="logoGroupStyle">
-        <img :style="{opacity: collapse ? 1 : 0}" src="@/assets/image/logo/header-icon-only.png">
-        <img :style="{opacity: collapse ? 0 : 1}" src="@/assets/image/logo/header.png">
+        <img v-if="collapse" src="@/assets/image/logo/header-icon-only.png">
+        <img v-else src="@/assets/image/logo/header.png">
       </div>
       <div class="toggle-sidemenu-btn" @click="toggleAside">
         <Icon name="bars"></Icon>