From 45385258171aa74d06ceb4c5092b4f4725c666ab 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 21:32:30 +0800
Subject: [PATCH] no message
Former-commit-id: b3ef513a0e5ecf84c438e4363a1dff4e190b7d8b
Former-commit-id: 78962f5f37c74c581015466966fc8beeb366ddfc
Former-commit-id: 09b11468354468cb6e5f76c0030d66588fa80b54
---
src/assets/style/theme/default.scss | 17 +++++++++++++++++
.../MainLayout/components/SideMenu/index.vue | 10 ++++++++--
src/components/core/MainLayout/index.vue | 3 +++
3 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/src/assets/style/theme/default.scss b/src/assets/style/theme/default.scss
index 513a6e2f..cd28d2ed 100644
--- a/src/assets/style/theme/default.scss
+++ b/src/assets/style/theme/default.scss
@@ -27,6 +27,23 @@ $color: #409EFF;
height: 60px;
}
}
+ .toggle-sidemenu-btn {
+ float: left;
+ height: 60px;
+ width: 60px;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ user-select: none;
+ cursor: pointer;
+ i {
+ font-size: 24px;
+ color: $color-text-normal;
+ &:hover {
+ color: $color-primary;
+ }
+ }
+ }
// 顶栏菜单
.el-menu {
float: left;
diff --git a/src/components/core/MainLayout/components/SideMenu/index.vue b/src/components/core/MainLayout/components/SideMenu/index.vue
index 88a57ef1..cd834cf2 100644
--- a/src/components/core/MainLayout/components/SideMenu/index.vue
+++ b/src/components/core/MainLayout/components/SideMenu/index.vue
@@ -43,11 +43,17 @@
import { mapState } from 'vuex'
import { menu, router } from '@/router/menu/index.js'
export default {
+ props: {
+ collapse: {
+ type: Boolean,
+ required: false,
+ default: false
+ }
+ },
data () {
return {
menu,
- router,
- collapse: false
+ router
}
},
computed: {
diff --git a/src/components/core/MainLayout/index.vue b/src/components/core/MainLayout/index.vue
index a964938d..3edc73fc 100644
--- a/src/components/core/MainLayout/index.vue
+++ b/src/components/core/MainLayout/index.vue
@@ -4,6 +4,9 @@
+
