diff --git a/Web/src/components/ContributionHeatmap.vue b/Web/src/components/ContributionHeatmap.vue
index 25bccbb..7d15ff9 100644
--- a/Web/src/components/ContributionHeatmap.vue
+++ b/Web/src/components/ContributionHeatmap.vue
@@ -261,7 +261,7 @@ onMounted(() => {
   padding: 12px;
   color: var(--van-text-color);
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif;
-  margin: 10px;
+  margin: 0 10px;
   box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
   border: 1px solid var(--van-border-color);
 }
diff --git a/Web/src/views/CalendarView.vue b/Web/src/views/CalendarView.vue
index a2aac00..0951646 100644
--- a/Web/src/views/CalendarView.vue
+++ b/Web/src/views/CalendarView.vue
@@ -13,6 +13,8 @@
     
     <ContributionHeatmap ref="heatmapRef" />
 
+    <!-- 底部安全距离 -->
+    <div style="height: calc(60px + env(safe-area-inset-bottom, 0px))"></div>
 
     <!-- 日期交易列表弹出层 -->
     <PopupContainer
@@ -304,8 +306,6 @@ onBeforeUnmount(() => {
 
 .calendar-container {
   /* 使用准确的视口高度减去 TabBar 高度（50px）和安全区域 */
-  height: calc(var(--vh, 100vh) - 50px - env(safe-area-inset-bottom, 0px));
-  max-height: calc(var(--vh, 100vh) - 50px - env(safe-area-inset-bottom, 0px));
   display: flex;
   flex-direction: column;
   overflow: hidden;
@@ -338,7 +338,6 @@ onBeforeUnmount(() => {
 
 /* Add margin to bottom of heatmap to separate from tabbar */
 :deep(.heatmap-card) {
-  margin-bottom: 20px;
   flex-shrink: 0; /* Prevent heatmap from shrinking */
 }
 
diff --git a/Web/src/views/ClassificationEdit.vue b/Web/src/views/ClassificationEdit.vue
index 4908a97..83f7d44 100644
--- a/Web/src/views/ClassificationEdit.vue
+++ b/Web/src/views/ClassificationEdit.vue
@@ -59,7 +59,7 @@
     </div>
 
     <!-- 底部安全距离 -->
-    <div style="height: calc(80px + env(safe-area-inset-bottom, 0px))"></div>
+    <div style="height: calc(55px + env(safe-area-inset-bottom, 0px))"></div>
 
     <div class="bottom-button">
       <!-- 新增分类按钮 -->