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