From 29cc7f3b00c9494b90535af67150fe4294431839 Mon Sep 17 00:00:00 2001
From: liyang <1711467488@qq.com>
Date: Fri, 16 Nov 2018 16:38:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=98=BE=E7=A4=BA=E4=B8=A4?=
 =?UTF-8?q?=E4=B8=AA=E5=9B=BE=E6=A0=87=E7=9A=84=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Former-commit-id: 6f84f9ce294ce6e26a27f4f07fea9b6e422e7fdc [formerly 6f84f9ce294ce6e26a27f4f07fea9b6e422e7fdc [formerly 6f84f9ce294ce6e26a27f4f07fea9b6e422e7fdc [formerly 6f84f9ce294ce6e26a27f4f07fea9b6e422e7fdc [formerly 7230e2ad2d4252e1b1043b79baadf3392f2b13a5 [formerly f404626d8b3ec5698337a28d428fce5f6ab08194]]]]]
Former-commit-id: b01ea1484ba48b0a21f7ec79b7205a661e61d396
Former-commit-id: d7e096d382cbe8ded3e10d0b29ef1f12a7438cce
Former-commit-id: d07064da9622a709f5eed3f4381552abda248c2c [formerly 1ae086520f061f996d7da052b35c7fb122e223c5]
Former-commit-id: 813086fc394a2cb8fcfbf77470c4b1bfa235bc65
Former-commit-id: 0472626b5423e9060d02cbbdfdf21427bbd935f2
Former-commit-id: c20700a96d447d8a091ca42b66a21e4d1a86f3e5
Former-commit-id: a1395ada62828578d69ba2f96aabd1167f31b1da
Former-commit-id: 50bb493c30788c203977e59414a02d396419ede1
---
 package.json                                                    | 2 +-
 .../header-aside/components/components/menu-item/index.vue      | 2 +-
 .../header-aside/components/components/menu-sub/index.vue       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 2de7b438..cd6cd12d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "d2-admin",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve --open",
diff --git a/src/layout/header-aside/components/components/menu-item/index.vue b/src/layout/header-aside/components/components/menu-item/index.vue
index 1e523b43..9c52df5e 100644
--- a/src/layout/header-aside/components/components/menu-item/index.vue
+++ b/src/layout/header-aside/components/components/menu-item/index.vue
@@ -1,7 +1,7 @@
 <template>
   <el-menu-item :index="menu.path || uniqueId">
     <i v-if="menu.icon" :class="`fa fa-${menu.icon}`"></i>
-    <i v-if="menu.icon === undefined" class="fa fa-file-o"></i>
+    <i v-if="menu.icon === undefined & !menu.iconSvg" class="fa fa-file-o"></i>
     <d2-icon-svg v-if="menu.iconSvg" :name="menu.iconSvg"/>
     <span slot="title">{{menu.title || '未命名菜单'}}</span>
   </el-menu-item>
diff --git a/src/layout/header-aside/components/components/menu-sub/index.vue b/src/layout/header-aside/components/components/menu-sub/index.vue
index 946577b4..cc730dc1 100644
--- a/src/layout/header-aside/components/components/menu-sub/index.vue
+++ b/src/layout/header-aside/components/components/menu-sub/index.vue
@@ -2,7 +2,7 @@
   <el-submenu :index="menu.path || uniqueId">
     <template slot="title">
       <i v-if="menu.icon" :class="`fa fa-${menu.icon}`"></i>
-      <i v-if="menu.icon === undefined" class="fa fa-folder-o"></i>
+      <i v-if="menu.icon === undefined & !menu.iconSvg" class="fa fa-folder-o"></i>
       <d2-icon-svg v-if="menu.iconSvg" :name="menu.iconSvg"/>
       <span slot="title">{{menu.title}}</span>
     </template>