From b5194c496524c42508226f80d573c60cba623e3e Mon Sep 17 00:00:00 2001
From: bwstudio <fenghuo@hotmail.com>
Date: Thu, 11 Jun 2026 08:12:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20AppSidebar=20?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=9C=AA=E5=AF=BC=E5=85=A5=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=20prop=20=E5=BA=8F=E5=88=97=E5=8C=96=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=EF=BC=8C=E5=A4=A7=E5=B1=8F=E5=B9=95=E9=9A=90=E8=97=8F=E5=89=AF?=
 =?UTF-8?q?=E5=AF=BC=E8=88=AA=E9=81=BF=E5=85=8D=E5=86=85=E5=AE=B9=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 添加缺失的 AppSidebar import（修复 types prop 显示为 [object Object] 的问题）
- 大屏幕(≥1200px)隐藏 AppSubNav，避免与 AppSidebar 分类列表重复
- 移除布局调试代码（调试条、updateLayoutInfo、调试 CSS）
---
 web/src/App.vue | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/web/src/App.vue b/web/src/App.vue
index 0e23a85..a7fcd1c 100644
--- a/web/src/App.vue
+++ b/web/src/App.vue
@@ -70,6 +70,7 @@
 import { ref, provide, onMounted, computed, watch } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import AppHeader from '@/components/AppHeader.vue'
+import AppSidebar from '@/components/AppSidebar.vue'
 import AppSubNav from '@/components/AppSubNav.vue'
 import AppRightbar from '@/components/AppRightbar.vue'
 import Footer from '@/components/Footer.vue'
@@ -98,6 +99,7 @@ const filterCrowdIds = ref([])
 // 热门笑话（右侧栏）
 const hotJokes = ref([])
 
+
 // 右侧栏：仅首页显示
 const showRightBar = computed(() => route.path === '/')
 // 副导航：首页/分类/搜索显示，详情页显示推荐列表
@@ -186,7 +188,7 @@ onMounted(async () => {
     console.warn('[APP] Failed to load hot jokes:', e)
     hotJokes.value = []
   }
-})
+  })
 </script>
 
 <style>
@@ -274,17 +276,25 @@ onMounted(async () => {
   }
 }
 
-/* 超宽屏填满屏幕，逐步去掉居中限制 */
+/* 1024px+ 强制填满屏幕 */
 @media (min-width: 1024px) {
-  :root {
-    --content-max-width: 100%;
-    --content-padding: 20px;
+  .content-wrapper {
+    max-width: 100% !important;
+    margin-left: 0 !important;
+    margin-right: 0 !important;
+    padding-left: var(--content-padding) !important;
+    padding-right: 0 !important;
+  }
+  .app-header .header-inner {
+    max-width: 100% !important;
+    padding-left: var(--content-padding) !important;
+    padding-right: var(--content-padding) !important;
   }
 }
+
 /* 大屏增加内边距 */
 @media (min-width: 1400px) {
   :root {
-    --content-max-width: 100%;
     --content-padding: 32px;
   }
 }
@@ -343,7 +353,7 @@ body {
   }
 }
 
-/* 大屏幕显示所有侧边栏 */
+/* 大屏幕显示 AppSidebar + 右侧栏，隐藏副导航（避免与 AppSidebar 内容重复） */
 @media (min-width: 1200px) {
   .left-sidebar {
     display: block;
@@ -351,6 +361,9 @@ body {
     min-width: var(--sidebar-width);
     flex-shrink: 0;
   }
+  .left-subnav {
+    display: none !important;
+  }
   .rightbar {
     width: var(--rightbar-width);
     min-width: var(--rightbar-width);