From 0e4f61c05965411e9013dcef0281517fba7a6635 Mon Sep 17 00:00:00 2001
From: FairyEver <1711467488@qq.com>
Date: Thu, 23 Apr 2020 22:59:55 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D"=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=BE=A7=E8=BE=B9=E6=A0=8F=E8=8F=9C=E5=8D=95=E6=8A=98=E5=8F=A0?=
 =?UTF-8?q?=E5=8A=A8=E7=94=BB=E6=95=88=E6=9E=9C=E5=88=87=E6=8D=A2=E4=B8=8E?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE"=E6=8F=90=E4=BA=A4=E4=B8=AD=E9=81=97?=
 =?UTF-8?q?=E7=95=99=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/d2admin/modules/menu.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/store/modules/d2admin/modules/menu.js b/src/store/modules/d2admin/modules/menu.js
index 18338759..327a3d16 100644
--- a/src/store/modules/d2admin/modules/menu.js
+++ b/src/store/modules/d2admin/modules/menu.js
@@ -88,9 +88,8 @@ export default {
         defaultValue: setting.menu,
         user: true
       }, { root: true })
-
-      state.asideCollapse = menu.asideCollapse
-      state.asideTransition = menu.asideTransition
+      state.asideCollapse = menu.asideCollapse !== undefined ? menu.asideCollapse : setting.menu.asideCollapse
+      state.asideTransition = menu.asideTransition !== undefined ? menu.asideTransition : setting.menu.asideTransition
     }
   },
   mutations: {