diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index c3267d9f..4d466224 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -121,7 +121,7 @@ aside { //main-container全局样式 .app-container { - height: calc(100vh - 84px); + // height: calc(100vh - 84px); padding: 20px; box-sizing: border-box; display: flex; diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss index abe5b631..79f05c03 100644 --- a/src/assets/styles/sidebar.scss +++ b/src/assets/styles/sidebar.scss @@ -4,7 +4,10 @@ height: 100%; transition: margin-left .28s; margin-left: $base-sidebar-width; - position: relative; + position: relative; + display: flex; + flex-direction: column; + overflow: hidden; } .sidebarHide { diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue index a25c5625..995db91f 100644 --- a/src/layout/components/AppMain.vue +++ b/src/layout/components/AppMain.vue @@ -10,7 +10,7 @@