From 9a07d984c0d9fd98d3d2c43ccb12c04631b7efb1 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Sat, 21 Jul 2018 16:34:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=A9=E5=B0=8F=E4=BA=86=E4=BE=A7=E8=BE=B9?=
 =?UTF-8?q?=E6=A0=8F=E8=8F=9C=E5=8D=95=E6=8A=98=E5=8F=A0=E6=97=B6=E5=BC=B9?=
 =?UTF-8?q?=E5=87=BA=E8=8F=9C=E5=8D=95=E9=A1=B9=E7=9B=AE=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 9b1ae72a1a8540dc814a756e10cc7938686649b1 [formerly 9b1ae72a1a8540dc814a756e10cc7938686649b1 [formerly 9b1ae72a1a8540dc814a756e10cc7938686649b1 [formerly 9b1ae72a1a8540dc814a756e10cc7938686649b1 [formerly da92c17bfb0125d2e45be5383cc9dc5c5b845aeb [formerly 4e3001bf82f5a67e66cffbc93ad84cf8ac41fa28]]]]]
Former-commit-id: fe5bf15af3aebd45be4f3ac37b8b1f1eb5600503
Former-commit-id: 68d168b4b0c00c6e95852a5cc1b96726a302f511
Former-commit-id: 0f42de5c85cd60a02e3fcf3a76a72c5422473088 [formerly f5dd4e0204c9915d621a8905182966417a3f0522]
Former-commit-id: 34af82d9b251d2b4683afaec6fd521f541c79794
Former-commit-id: eea554364ac932f8ce6eeceeeeb1c68adb3d6ec2
Former-commit-id: c93ede876195591d35eaaec83c0c5feceb86a482
Former-commit-id: 3de18105cee51303cd71478f43b3475cf5bfac63
Former-commit-id: fe60f4dc08a1a319b66213850c094ba7930f443a
---
 src/assets/style/theme/theme.scss.REMOVED.git-id       | 2 +-
 src/layout/header-aside/components/menu-side/index.vue | 2 +-
 src/layout/header-aside/layout.vue                     | 7 ++++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/assets/style/theme/theme.scss.REMOVED.git-id b/src/assets/style/theme/theme.scss.REMOVED.git-id
index 01ece470..e4470bc7 100644
--- a/src/assets/style/theme/theme.scss.REMOVED.git-id
+++ b/src/assets/style/theme/theme.scss.REMOVED.git-id
@@ -1 +1 @@
-98640412b9c96c762e4b89bbc3c07e64ff477c50
\ No newline at end of file
+831c6f0fbf3def30a9be4246b8f4a27e27ab7b5c
\ No newline at end of file
diff --git a/src/layout/header-aside/components/menu-side/index.vue b/src/layout/header-aside/components/menu-side/index.vue
index 456b92b4..8573eee2 100644
--- a/src/layout/header-aside/components/menu-side/index.vue
+++ b/src/layout/header-aside/components/menu-side/index.vue
@@ -13,7 +13,7 @@
     </el-menu>
     <div v-if="menusAside.length === 0 && !isMenuAsideCollapse" class="d2-layout-header-aside-menu-empty">
       <d2-icon name="hdd-o"/>
-      <span>当前目录没有菜单</span>
+      <span>没有侧栏菜单</span>
     </div>
   </div>
 </template>
diff --git a/src/layout/header-aside/layout.vue b/src/layout/header-aside/layout.vue
index 1f9078c4..6ead6f2e 100644
--- a/src/layout/header-aside/layout.vue
+++ b/src/layout/header-aside/layout.vue
@@ -28,7 +28,10 @@
       <!-- 下面 主体 -->
       <div class="d2-theme-container">
         <!-- 主体 侧边栏 -->
-        <div ref="aside" class="d2-theme-container-aside" :style="{width: isMenuAsideCollapse ? asideWidthCollapse : asideWidth}">
+        <div
+          ref="aside"
+          class="d2-theme-container-aside"
+          :style="{width: isMenuAsideCollapse ? asideWidthCollapse : asideWidth}">
           <d2-menu-side/>
         </div>
         <!-- 主体 -->
@@ -51,7 +54,6 @@
 
 <script>
 import { mapState, mapGetters, mapMutations } from 'vuex'
-
 import menuSide from './components/menu-side'
 import menuHeader from './components/menu-header'
 import tabs from './components/tabs'
@@ -59,7 +61,6 @@ import headerFullscreen from './components/header-fullscreen'
 import headerTheme from './components/header-theme'
 import headerUser from './components/header-user'
 import headerHelp from './components/header-help'
-
 export default {
   name: 'd2-layout-header-aside',
   components: {