From d08796d02fd9645e89b1ef9b003a70693e498bdf Mon Sep 17 00:00:00 2001
From: pixel <303176530@qq.com>
Date: Mon, 30 Sep 2019 18:25:58 +0800
Subject: [PATCH] =?UTF-8?q?vue-scroll=E5=BC=95=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 QMPlusVuePage/src/view/layout/aside/index.vue | 4 ++--
 QMPlusVuePage/src/view/layout/index.vue       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/QMPlusVuePage/src/view/layout/aside/index.vue b/QMPlusVuePage/src/view/layout/aside/index.vue
index 5458b3fe..8f45f156 100644
--- a/QMPlusVuePage/src/view/layout/aside/index.vue
+++ b/QMPlusVuePage/src/view/layout/aside/index.vue
@@ -4,8 +4,8 @@
       <i class="el-icon-arrow-right" v-if="isCollapse"></i>
       <i class="el-icon-arrow-left" v-else></i>
     </div>
-    <transition name="el-zoom-in-top">
       <el-scrollbar style="height:calc(100vh - 53px)">
+    <transition name="el-zoom-in-top">
       <el-menu
         :class="['el-menu-vertical',!isCollapse&&'noCollapse']"
         :collapse="isCollapse"
@@ -19,8 +19,8 @@
           v-for="item in asyncRouters[0].children"
         />
       </el-menu>
-      </el-scrollbar>
     </transition>
+      </el-scrollbar>
   </div>
 </template>
 
diff --git a/QMPlusVuePage/src/view/layout/index.vue b/QMPlusVuePage/src/view/layout/index.vue
index 438ae2cc..4a6096f0 100644
--- a/QMPlusVuePage/src/view/layout/index.vue
+++ b/QMPlusVuePage/src/view/layout/index.vue
@@ -108,7 +108,7 @@ $mainHight: calc(100vh - 52px);
     }
     
     .el-menu-vertical {
-      height: $mainHight !important;
+      height: calc(100vh - 67px) !important;
       visibility: auto;
       &.noCollapse {
         width: 250px;