From e59abb4509a0b598cfc56e2169c02a36946d09e6 Mon Sep 17 00:00:00 2001
From: lyt-Top <1105290566@qq.com>
Date: Thu, 31 Dec 2020 21:10:11 +0800
Subject: [PATCH] =?UTF-8?q?'admin-20.12.31:=E5=A4=84=E7=90=86=E4=B8=BB?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80=E5=88=87=E6=8D=A2=E9=A1=B5=E9=9D=A2elementPl?=
 =?UTF-8?q?us=E6=BB=9A=E5=8A=A8=E6=9D=A1=E9=AB=98=E5=BA=A6=E4=B8=8D?=
 =?UTF-8?q?=E5=8F=98=E7=9A=84bug'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue-admin-wonderful-next/src/theme/app.scss   | 12 +++++++--
 .../src/theme/common/transition.scss          |  2 +-
 .../src/theme/media/index.scss                | 25 ++++++++++++++++++
 .../src/theme/media/template.scss             | 26 -------------------
 .../src/views/layout/component/main.vue       |  2 +-
 .../src/views/layout/fashion.vue              |  6 +++--
 .../layout/navBars/tagsView/tagsView.vue      |  2 +-
 7 files changed, 42 insertions(+), 33 deletions(-)
 delete mode 100644 vue-admin-wonderful-next/src/theme/media/template.scss

diff --git a/vue-admin-wonderful-next/src/theme/app.scss b/vue-admin-wonderful-next/src/theme/app.scss
index 35d44d9..7cc7c12 100644
--- a/vue-admin-wonderful-next/src/theme/app.scss
+++ b/vue-admin-wonderful-next/src/theme/app.scss
@@ -47,8 +47,7 @@ body,
     @extend .el-scrollbar;
     padding: 15px;
   }
-  .el-scrollbar__view {
-    height: 100%;
+  .layout-container-header-main {
     display: flex;
     flex-direction: column;
   }
@@ -62,6 +61,15 @@ body,
 .h100 {
   height: 100% !important;
 }
+.vh100 {
+  height: 100vh !important;
+}
+.max100vh {
+  max-height: 100vh !important;
+}
+.min100vh {
+  min-height: 100vh !important;
+}
 
 /* 字体大小全局样式
 ------------------------------- */
diff --git a/vue-admin-wonderful-next/src/theme/common/transition.scss b/vue-admin-wonderful-next/src/theme/common/transition.scss
index c62dba7..891d5a7 100644
--- a/vue-admin-wonderful-next/src/theme/common/transition.scss
+++ b/vue-admin-wonderful-next/src/theme/common/transition.scss
@@ -27,7 +27,7 @@
 ------------------------------- */
 .breadcrumb-enter-active,
 .breadcrumb-leave-active {
-  transition: all 0.3s ease;
+  transition: all 0.2s ease;
   position: absolute;
 }
 .breadcrumb-enter-from,
diff --git a/vue-admin-wonderful-next/src/theme/media/index.scss b/vue-admin-wonderful-next/src/theme/media/index.scss
index 320affb..0f2758d 100644
--- a/vue-admin-wonderful-next/src/theme/media/index.scss
+++ b/vue-admin-wonderful-next/src/theme/media/index.scss
@@ -10,3 +10,28 @@ $sm: 768px;
 $md: 992px;
 $lg: 1200px;
 $xl: 1920px;
+
+/* 页面宽度小于576px
+------------------------------- */
+@media screen and (max-width: $xs) {
+}
+
+/* 页面宽度小于768px
+------------------------------- */
+@media screen and (max-width: $sm) {
+}
+
+/* 页面宽度大于768px小于992px
+------------------------------- */
+@media screen and (min-width: $sm) and (max-width: $md) {
+}
+
+/* 页面宽度大于992px小于1200px
+------------------------------- */
+@media screen and (min-width: $md) and (max-width: $lg) {
+}
+
+/* 页面宽度大于1920px
+------------------------------- */
+@media screen and (min-width: $xl) {
+}
diff --git a/vue-admin-wonderful-next/src/theme/media/template.scss b/vue-admin-wonderful-next/src/theme/media/template.scss
deleted file mode 100644
index 492737b..0000000
--- a/vue-admin-wonderful-next/src/theme/media/template.scss
+++ /dev/null
@@ -1,26 +0,0 @@
-@import './index.scss';
-
-/* 页面宽度小于576px
-------------------------------- */
-@media screen and (max-width: $xs) {
-}
-
-/* 页面宽度小于768px
-------------------------------- */
-@media screen and (max-width: $sm) {
-}
-
-/* 页面宽度大于768px小于992px
-------------------------------- */
-@media screen and (min-width: $sm) and (max-width: $md) {
-}
-
-/* 页面宽度大于992px小于1200px
-------------------------------- */
-@media screen and (min-width: $md) and (max-width: $lg) {
-}
-
-/* 页面宽度大于1920px
-------------------------------- */
-@media screen and (min-width: $xl) {
-}
diff --git a/vue-admin-wonderful-next/src/views/layout/component/main.vue b/vue-admin-wonderful-next/src/views/layout/component/main.vue
index 9993bb3..4298ec8 100644
--- a/vue-admin-wonderful-next/src/views/layout/component/main.vue
+++ b/vue-admin-wonderful-next/src/views/layout/component/main.vue
@@ -1,6 +1,6 @@
 <template>
   <el-main>
-    <el-scrollbar class="layout-scrollbar">
+    <el-scrollbar class="layout-scrollbar" style="min-height: calc(100vh - 84px);">
       <router-view v-slot="{ Component }">
         <transition appear :name="transitionName" mode="out-in">
           <div :key="key">
diff --git a/vue-admin-wonderful-next/src/views/layout/fashion.vue b/vue-admin-wonderful-next/src/views/layout/fashion.vue
index 3881216..94bdcf3 100644
--- a/vue-admin-wonderful-next/src/views/layout/fashion.vue
+++ b/vue-admin-wonderful-next/src/views/layout/fashion.vue
@@ -3,8 +3,10 @@
     <Aside />
     <el-container>
       <el-scrollbar>
-        <Header />
-        <Main />
+        <div class="layout-container-header-main">
+          <Header />
+          <Main />
+        </div>
       </el-scrollbar>
     </el-container>
   </el-container>
diff --git a/vue-admin-wonderful-next/src/views/layout/navBars/tagsView/tagsView.vue b/vue-admin-wonderful-next/src/views/layout/navBars/tagsView/tagsView.vue
index a83ad64..9f03fe8 100644
--- a/vue-admin-wonderful-next/src/views/layout/navBars/tagsView/tagsView.vue
+++ b/vue-admin-wonderful-next/src/views/layout/navBars/tagsView/tagsView.vue
@@ -130,7 +130,7 @@ export default {
     list-style: none;
     margin: 0;
     padding: 0;
-    height: 100%;
+    height: 34px;
     display: flex;
     align-items: center;
     color: #606266;