From 4847a54a20e36d9c528db658281c59c0f97a4829 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=95=E4=B8=96=E6=98=8A?= <40659515+202252197@users.noreply.github.com> Date: Fri, 20 Dec 2024 08:04:01 +0800 Subject: [PATCH 01/37] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/icons/home.svg | 2 +- src/layout/index.vue | 41 ++++++------------------------------- src/layout/logo/index.vue | 6 ++---- src/layout/menu/index.vue | 9 ++++---- src/layout/tabbar/index.vue | 4 ++++ src/styles/variable.scss | 2 +- 6 files changed, 19 insertions(+), 45 deletions(-) diff --git a/src/assets/icons/home.svg b/src/assets/icons/home.svg index 0b6af38..292729c 100644 --- a/src/assets/icons/home.svg +++ b/src/assets/icons/home.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/layout/index.vue b/src/layout/index.vue index a799ae3..1c1c65a 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -4,15 +4,13 @@
- - + @@ -31,7 +29,6 @@
//导入右侧抽屉 import Drawer from './tabbar/setting/drawer/index.vue' -//引入左侧菜单logo子组件 -import Logo from './logo/index.vue' //引入菜单组件 import Menu from './menu/index.vue' //引入内容组件 @@ -141,14 +136,14 @@ export default { .layout_slider { position: fixed; width: $base-menu-width; + top: 45px; // 页面折叠 &.fold { width: $base-menu-min-width; } &.hidenMenu { - z-index: 2; height: 45px; - + &.moon { background: #171717; filter: drop-shadow(-10px 3px 5px $base-theme-moon-color); @@ -190,40 +185,16 @@ export default { } } } - &.xiufu { - width: $base-menu-width !important; - z-index: 1; - - &.moon { - background: $base-moon-color; - filter: drop-shadow(6px 3px 5px $base-theme-moon-color); - } - - &.sunny { - background: #fafafb; - filter: drop-shadow(6px 3px 5px $base-theme-sunny-color); - } - } + } .layout_tabbar { z-index: 1; top: 0px; - left: $base-menu-width; position: fixed; - width: calc(100% - $base-menu-width); + width: 100%; height: $base-tabbar-height; - &.xiufu { - &.moon { - background: $base-moon-color; - filter: drop-shadow(8px 3px 5px $base-theme-moon-color) !important; - } - &.sunny { - background: $base-sunny-color; - filter: drop-shadow(8px 3px 5px $base-theme-sunny-color) !important; - } - } &.hidenMenu { &.moon { background: #171717; @@ -284,7 +255,7 @@ export default { } &.sunny { - background: $base-sunny-color; + background: #fafafb; filter: drop-shadow(0px -3px 0px $base-theme-sunny-color) !important; } } diff --git a/src/layout/logo/index.vue b/src/layout/logo/index.vue index ae66f2f..0f8d47b 100644 --- a/src/layout/logo/index.vue +++ b/src/layout/logo/index.vue @@ -2,7 +2,6 @@