diff --git a/vue-admin-wonderful-next/src/store/index.ts b/vue-admin-wonderful-next/src/store/index.ts index be2f2c4b..8f623167 100644 --- a/vue-admin-wonderful-next/src/store/index.ts +++ b/vue-admin-wonderful-next/src/store/index.ts @@ -23,7 +23,10 @@ export interface RootStateTypes { isCollapse1: boolean, menuWidth1: number, isShowLogo: boolean, - isShowLogoChange: boolean + isShowLogoChange: boolean, + isBreadcrumb: boolean, + isTagsview: boolean, + isFooter: boolean } } diff --git a/vue-admin-wonderful-next/src/theme/app.scss b/vue-admin-wonderful-next/src/theme/app.scss index 676724a0..930a463f 100644 --- a/vue-admin-wonderful-next/src/theme/app.scss +++ b/vue-admin-wonderful-next/src/theme/app.scss @@ -39,18 +39,12 @@ body, overflow-x: hidden !important; } .el-header { - box-shadow: 0 1px 4px rgb(0 21 41 / 8%); + box-shadow: 0 1px 4px rgb(0 21 41 / 4%); padding: 0 !important; } .el-main { padding: 0 !important; } - .el-main-overflow-unset { - overflow: unset !important; - } - .el-main-overflow-auto { - overflow: auto !important; - } .el-scrollbar { width: 100%; } @@ -66,10 +60,6 @@ body, @extend .el-scrollbar; padding: 15px; } - .layout-container-header-main { - display: flex; - flex-direction: column; - } } /* element plus 全局样式 @@ -96,6 +86,11 @@ body, .flex-auto { flex: 1; } +.flex-center { + @extend .flex; + flex-direction: column; + width: 100%; +} /* 宽高 100% ------------------------------- */ diff --git a/vue-admin-wonderful-next/src/utils/themeConfig.ts b/vue-admin-wonderful-next/src/utils/themeConfig.ts index ade84df5..2d11dcff 100644 --- a/vue-admin-wonderful-next/src/utils/themeConfig.ts +++ b/vue-admin-wonderful-next/src/utils/themeConfig.ts @@ -20,5 +20,8 @@ export default { isCollapse1: false, menuWidth1: 200, isShowLogo: false, - isShowLogoChange: false + isShowLogoChange: false, + isBreadcrumb: true, + isTagsview: true, + isFooter: false } \ No newline at end of file diff --git a/vue-admin-wonderful-next/src/views/layout/component/aside.vue b/vue-admin-wonderful-next/src/views/layout/component/aside.vue index 1e131095..9418fbbf 100644 --- a/vue-admin-wonderful-next/src/views/layout/component/aside.vue +++ b/vue-admin-wonderful-next/src/views/layout/component/aside.vue @@ -8,10 +8,10 @@ \ No newline at end of file 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 87dc4a43..a9160ea1 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,7 @@ @@ -25,14 +27,17 @@ import { } from "vue"; import { useRoute, onBeforeRouteUpdate } from "vue-router"; import { useStore } from "/@/store/index.ts"; +import Footer from "/@/views/layout/footer/index.vue"; export default defineComponent({ name: "layoutMain", + components: { Footer }, setup() { const { proxy } = getCurrentInstance(); const store = useStore(); const route = useRoute(); const state = reactive({ transitionName: "slide-right", + headerHeight: "84px", }); const getThemeConfig = computed(() => { return store.state.themeConfig; @@ -43,6 +48,7 @@ export default defineComponent({ to.meta.index > from.meta.index ? "slide-right" : "slide-left"; }); watch(store.state.themeConfig, (val) => { + state.headerHeight = val.isTagsview ? "84px" : "50px"; if (val.isFixedHeaderChange !== val.isFixedHeader) { proxy.$refs.layoutScrollbarRef.update(); } diff --git a/vue-admin-wonderful-next/src/views/layout/defaults.vue b/vue-admin-wonderful-next/src/views/layout/defaults.vue index eef17859..3c9e89fb 100644 --- a/vue-admin-wonderful-next/src/views/layout/defaults.vue +++ b/vue-admin-wonderful-next/src/views/layout/defaults.vue @@ -1,33 +1,48 @@ + + \ No newline at end of file diff --git a/vue-admin-wonderful-next/src/views/layout/logo/index.vue b/vue-admin-wonderful-next/src/views/layout/logo/index.vue index e1a97893..ade35621 100644 --- a/vue-admin-wonderful-next/src/views/layout/logo/index.vue +++ b/vue-admin-wonderful-next/src/views/layout/logo/index.vue @@ -28,7 +28,7 @@ export default { display: flex; align-items: center; justify-content: center; - box-shadow: rgb(0 21 41 / 2%) 0px 1px 4px; + box-shadow: rgb(0 21 41 / 3%) 0px 1px 4px; color: var(--color-primary); font-size: 16px; animation: logoAnimation 0.3s ease-in-out; diff --git a/vue-admin-wonderful-next/src/views/layout/navBars/breadcrumb/breadcrumb.vue b/vue-admin-wonderful-next/src/views/layout/navBars/breadcrumb/breadcrumb.vue index cf2923c1..d3328550 100644 --- a/vue-admin-wonderful-next/src/views/layout/navBars/breadcrumb/breadcrumb.vue +++ b/vue-admin-wonderful-next/src/views/layout/navBars/breadcrumb/breadcrumb.vue @@ -1,8 +1,8 @@ -