From 2fe7341fa77d95834863dd8e6bd48836bea03b3b Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Mon, 10 Apr 2023 18:15:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=81=BF=E5=85=8D=E9=BC=A0?=
 =?UTF-8?q?=E6=A0=87=E7=A7=BB=E5=87=BA=E6=97=B6=E6=97=A0=E6=B3=95=E9=9A=90?=
 =?UTF-8?q?=E8=97=8F=E6=BB=9A=E5=8A=A8=E6=9D=A1=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/assets/styles/sidebar.scss |  2 +-
 ruoyi-ui/src/layout/index.vue           | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ruoyi-ui/src/assets/styles/sidebar.scss b/ruoyi-ui/src/assets/styles/sidebar.scss
index 43d5f9a..9f39046 100644
--- a/ruoyi-ui/src/assets/styles/sidebar.scss
+++ b/ruoyi-ui/src/assets/styles/sidebar.scss
@@ -1,7 +1,7 @@
 #app {
 
   .main-container {
-    min-height: 100%;
+    height: 100%;
     transition: margin-left .28s;
     margin-left: $base-sidebar-width;
     position: relative;
diff --git a/ruoyi-ui/src/layout/index.vue b/ruoyi-ui/src/layout/index.vue
index c7ac8f3..cc1063c 100644
--- a/ruoyi-ui/src/layout/index.vue
+++ b/ruoyi-ui/src/layout/index.vue
@@ -1,19 +1,19 @@
 <template>
   <div :class="classObj" class="app-wrapper" :style="{'--current-color': theme}">
-    <el-scrollbar>
       <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
       <sidebar v-if="!sidebar.hide" class="sidebar-container"/>
       <div :class="{hasTagsView:needTagsView,sidebarHide:sidebar.hide}" class="main-container">
-        <div :class="{'fixed-header':fixedHeader}">
-          <navbar/>
-          <tags-view v-if="needTagsView"/>
-        </div>
-        <app-main/>
-        <right-panel>
-          <settings/>
-        </right-panel>
+        <el-scrollbar>
+          <div :class="{'fixed-header':fixedHeader}">
+            <navbar/>
+            <tags-view v-if="needTagsView"/>
+          </div>
+          <app-main/>
+          <right-panel>
+            <settings/>
+          </right-panel>
+        </el-scrollbar>
       </div>
-    </el-scrollbar>
   </div>
 </template>