From 676269db6c30cde8088318f6f165f1f4155aebab Mon Sep 17 00:00:00 2001
From: xieyonghong <18010623010@163.com>
Date: Wed, 1 Feb 2023 10:10:19 +0800
Subject: [PATCH] =?UTF-8?q?update:=201.=E4=BC=98=E5=8C=96=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E6=97=A0=E6=B3=95=E6=9F=A5=E7=9C=8B=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=9B2.=E4=BC=98=E5=8C=96PageContainer=E3=80=81Search?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Layout/components/PageContainer/index.less         | 10 +++++-----
 src/components/Search/Search.vue                       |  1 +
 src/utils/menu.ts                                      |  3 ++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/components/Layout/components/PageContainer/index.less b/src/components/Layout/components/PageContainer/index.less
index fd4e709a..2e617c9f 100644
--- a/src/components/Layout/components/PageContainer/index.less
+++ b/src/components/Layout/components/PageContainer/index.less
@@ -14,10 +14,10 @@
       flex-direction: column;
     }
 
-    .children-full-height {
-      > :nth-child(1) {
-        min-height: 100%;
-      }
-    }
+    //.children-full-height {
+    //  > :nth-child(1) {
+    //    min-height: 100%;
+    //  }
+    //}
   }
 }
\ No newline at end of file
diff --git a/src/components/Search/Search.vue b/src/components/Search/Search.vue
index fcad9502..4abeb789 100644
--- a/src/components/Search/Search.vue
+++ b/src/components/Search/Search.vue
@@ -286,6 +286,7 @@ handleItems()
 .JSearch-warp {
   padding: 24px;
   background-color: #fff;
+  margin-bottom: 24px;
   
   .JSearch-content {
     display: flex;
diff --git a/src/utils/menu.ts b/src/utils/menu.ts
index 2907f1c2..228ce8be 100644
--- a/src/utils/menu.ts
+++ b/src/utils/menu.ts
@@ -220,7 +220,8 @@ export function filterAsnycRouter(asyncRouterMap: any, parentCode = '', level =
         route.component = resolveComponent(route.code) || BlankLayoutPage;
       }
     } else {
-      route.component = resolveComponent(route.code) || BlankLayoutPage;
+      console.log(route.code)
+      route.component = route.component || resolveComponent(route.code) || BlankLayoutPage;
     }
     delete route.name
     return route