From 75f043dfa6660716364e66ee0b3cf99f44255686 Mon Sep 17 00:00:00 2001
From: DYL0109 <dn18191638832@163.com>
Date: 星期三, 16 四月 2025 19:20:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop1.0' into dyl_dev

---
 zhitan-vue/src/layout/components/AppMain.vue |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/zhitan-vue/src/layout/components/AppMain.vue b/zhitan-vue/src/layout/components/AppMain.vue
index 552c76d..220b6cc 100644
--- a/zhitan-vue/src/layout/components/AppMain.vue
+++ b/zhitan-vue/src/layout/components/AppMain.vue
@@ -27,7 +27,9 @@
     position: relative;
     overflow: hidden;
     background: #110f2e;
-    padding: 14px 0 0 14px;
+    padding: 14px;
+    box-sizing: border-box;
+    padding-top: 8px;
   }
 
   .fixed-header + .app-main {
@@ -37,12 +39,11 @@
   .hasTagsView {
     .app-main {
       /* 84 = navbar + tags-view + padding = 70 + 56 + 14 */
-      min-height: calc(100vh - 125px);
-      // padding: 20px;
+      min-height: calc(100vh - 110px);
     }
 
     .fixed-header + .app-main {
-      padding-top: 130px;
+      padding-top: 108px; /* 60px(navbar) + 34px(tagsview) + 14px(鍐呰竟璺�) */
     }
   }
 }
@@ -55,7 +56,8 @@
     position: relative;
     overflow: hidden;
     background: #f7f8fa;
-    padding: 14px 0 0 14px;
+    padding: 14px;
+    box-sizing: border-box;
   }
 
   .fixed-header + .app-main {
@@ -65,15 +67,19 @@
   .hasTagsView {
     .app-main {
       /* 84 = navbar + tags-view + padding = 70 + 56 + 14 */
-      min-height: calc(100vh - 125px);
-      // padding: 20px;
+      min-height: calc(100vh - 110px);
     }
 
     .fixed-header + .app-main {
-      padding-top: 130px;
+      padding-top: 108px; /* 60px(navbar) + 34px(tagsview) + 14px(鍐呰竟璺�) */
     }
   }
 }
+
+/* 鐢ㄦ埛涓汉璧勬枡椤电壒娈婇珮搴﹀鐞� */
+.user-profile-container {
+  min-height: calc(100vh - 50px) !important;
+}
 </style>
 
 <style lang="scss">

--
Gitblit v1.9.3