diff --git a/src/views/theme/components/leftBar/panel.vue b/src/views/theme/components/leftBar/panel.vue index 3939cba..1542448 100644 --- a/src/views/theme/components/leftBar/panel.vue +++ b/src/views/theme/components/leftBar/panel.vue @@ -114,7 +114,7 @@ export default { .panelBox { width: 0px; - min-height: 100%; + height: 100%; display: flex; overflow: hidden; transition: 0.2s width ease; @@ -166,6 +166,9 @@ export default { border-left: 1px solid #f0f3f4; width: 186px; padding: 20px 0; + height: auto; + overflow-y: auto; + padding-bottom:40px; .itemBox { h3 { diff --git a/src/views/theme/container/index.vue b/src/views/theme/container/index.vue index b1bdb4c..91afb0f 100644 --- a/src/views/theme/container/index.vue +++ b/src/views/theme/container/index.vue @@ -146,7 +146,8 @@ export default { position: relative; display: flex; flex-direction: column; - height: 100%; + height:calc(100vh - 84px); + overflow: hidden; .topBox { height: 52px; @@ -188,7 +189,7 @@ export default { .bottomWarp { flex: 1; display: flex; - height: 0; + overflow:hidden } .leftBox { height: 100%; @@ -212,4 +213,4 @@ export default { overflow: auto; } } - \ No newline at end of file +