From 71eed7d836e1f32d3a39a532069abf9af4653389 Mon Sep 17 00:00:00 2001
From: ZhouXu <zhou.xu@ejlchina.com>
Date: Wed, 7 Jul 2021 19:27:37 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=20Mix=20=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E5=B8=83=E5=B1=80=E6=97=B6=20=E5=BA=95=E9=83=A8?=
 =?UTF-8?q?=E6=8A=98=E5=8F=A0=E6=8C=89=E9=92=AE=20=E7=9A=84=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E4=B8=8E=E5=85=B6=E4=BB=96=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80=E4=BF=9D=E6=8C=81=E9=A3=8E=E6=A0=BC=E4=B8=80?=
 =?UTF-8?q?=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.zh_CN.md                     |  1 +
 src/layouts/default/sider/MixSider.vue | 16 +++++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md
index 0ca0b606c37..d86650252a2 100644
--- a/CHANGELOG.zh_CN.md
+++ b/CHANGELOG.zh_CN.md
@@ -1,6 +1,7 @@
 ### ✨ Features
 
 - **NoticeList** 添加分页、超长自动省略、标题点击事件、标题删除线等功能
+- **MixSider** 优化 Mix 菜单布局时 底部折叠按钮 的样式，与其它菜单布局时的风格保持一致
 
 ### 🐛 Bug Fixes
 
diff --git a/src/layouts/default/sider/MixSider.vue b/src/layouts/default/sider/MixSider.vue
index 00f700c731d..5fd37c4b704 100644
--- a/src/layouts/default/sider/MixSider.vue
+++ b/src/layouts/default/sider/MixSider.vue
@@ -15,7 +15,7 @@
   >
     <AppLogo :showTitle="false" :class="`${prefixCls}-logo`" />
 
-    <Trigger :class="`${prefixCls}-trigger`" />
+    <LayoutTrigger :class="`${prefixCls}-trigger`" />
 
     <ScrollContainer>
       <ul :class="`${prefixCls}-module`">
@@ -86,7 +86,6 @@
   import { SimpleMenu, SimpleMenuTag } from '/@/components/SimpleMenu';
   import { Icon } from '/@/components/Icon';
   import { AppLogo } from '/@/components/Application';
-  import Trigger from '../trigger/HeaderTrigger.vue';
   import { useMenuSetting } from '/@/hooks/setting/useMenuSetting';
   import { useDragLine } from './useLayoutSider';
   import { useGlobSetting } from '/@/hooks/setting';
@@ -97,6 +96,7 @@
   import clickOutside from '/@/directives/clickOutside';
   import { getChildrenMenus, getCurrentParentPath, getShallowMenus } from '/@/router/menus';
   import { listenerRouteChange } from '/@/logics/mitt/routeChange';
+  import LayoutTrigger from '../trigger/index.vue';
 
   export default defineComponent({
     name: 'LayoutMixSider',
@@ -105,7 +105,7 @@
       AppLogo,
       SimpleMenu,
       Icon,
-      Trigger,
+      LayoutTrigger,
       SimpleMenuTag,
     },
     directives: {
@@ -486,17 +486,19 @@
       bottom: 0;
       left: 0;
       width: 100%;
-      padding: 6px;
-      padding-left: 12px;
-      font-size: 18px;
+      font-size: 14px;
       color: rgba(255, 255, 255, 0.65);
+      text-align: center;
       cursor: pointer;
-      background-color: @sider-dark-bg-color;
+      background-color: @trigger-dark-bg-color;
+      height: 36px;
+      line-height: 36px;
     }
 
     &.light &-trigger {
       color: rgba(0, 0, 0, 0.65);
       background-color: #fff;
+      border-top: 1px solid #eee;
     }
 
     &-menu-list {