From 4a13279fe13ad1cf6736670f6d1c5c61c8cba59b Mon Sep 17 00:00:00 2001 From: VVT789 <sdxt_0802@163.com> Date: 星期五, 18 四月 2025 12:41:11 +0800 Subject: [PATCH] Merge branch 'develop1.0' into wt_from_develop1.0 --- zhitan-vue/src/layout/index.vue | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/zhitan-vue/src/layout/index.vue b/zhitan-vue/src/layout/index.vue index 00a46f1..90aaa04 100644 --- a/zhitan-vue/src/layout/index.vue +++ b/zhitan-vue/src/layout/index.vue @@ -134,10 +134,11 @@ // 缁勪欢鎸傝浇鏃讹紝纭繚棣栭〉渚ц竟鏍忕姸鎬佹纭� onMounted(() => { - // 濡傛灉褰撳墠鏄椤碉紝纭繚渚ц竟鏍忓彲瑙� + // 濡傛灉褰撳墠鏄椤靛瓙椤甸潰锛屽彧纭繚渚ц竟鏍忎笉琚殣钘忥紝浣嗕繚鎸佹姌鍙�/灞曞紑鐘舵�佷笉鍙� if (route.path === '/index/index') { + // 鍙缃笉闅愯棌渚ц竟鏍忥紝浣嗕笉鏀瑰彉鍏跺睍寮�/鎶樺彔鐘舵�� appStore.toggleSideBarHide(false) - appStore.sidebar.opened = true + // 涓嶅啀寮哄埗璁剧疆opened涓簍rue锛屼繚鎸佺敤鎴蜂箣鍓嶇殑璁剧疆 } }) @@ -310,13 +311,19 @@ top: 60px; right: 0; z-index: 9; - width: 100%; + width: calc(100% - #{$base-sidebar-width}); transition: width 0.28s; display: flex; flex-direction: column; + box-sizing: border-box; + padding: 0; } .hideSidebar .fixed-header { + width: calc(100% - 54px); +} + +.sidebarHide .fixed-header { width: 100%; } -- Gitblit v1.9.3