From e16da1d6f3ae5dc06fd5840e0bc76edb15a2f1c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=82=96=E7=A3=8A?= <18851179580@163.com>
Date: Thu, 29 Aug 2024 09:51:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E4=B8=AD?=
 =?UTF-8?q?=E9=97=B4=E5=8C=BA=E5=9F=9F=E7=9A=84=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/page-settings/page-content.vue |  2 +-
 src/layout/components/main/index.vue          | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/components/page-settings/page-content.vue b/src/components/page-settings/page-content.vue
index c129aca4..be167dc3 100644
--- a/src/components/page-settings/page-content.vue
+++ b/src/components/page-settings/page-content.vue
@@ -7,7 +7,7 @@
                 </el-form-item>
                 <template v-if="form.theme == '1' || form.theme == '2'">
                     <el-form-item label="页面标题">
-                    <el-input v-model="form.title" placeholder="请输入标题名称"></el-input>
+                        <el-input v-model="form.title" placeholder="请输入标题名称"></el-input>
                     </el-form-item>
                 </template>
             </card-container>
diff --git a/src/layout/components/main/index.vue b/src/layout/components/main/index.vue
index 232247b7..f8f2acc0 100644
--- a/src/layout/components/main/index.vue
+++ b/src/layout/components/main/index.vue
@@ -190,6 +190,8 @@ const top_margin = ref(0);
 const content_style = ref('');
 const main_content_style = ref('');
 const bottom_navigation_show = ref(true);
+const container_min_height = ref(681);
+const height = computed(() => container_min_height.value + 'px');
 watchEffect(() => {
     const data = page_data.value.com_data;
     if (data) {
@@ -205,8 +207,10 @@ watchEffect(() => {
         // 不开启沉浸式 和 上滑显示
         if (immersive_style || !up_slide_display) {
             top_padding.value = 2;
+            container_min_height.value = 681 + 88;
         } else {
             top_padding.value = 90;
+            container_min_height.value = 681;
         }
         // 开启沉浸式并且没有开通上滑显示
         if (immersive_style && !up_slide_display) {
@@ -214,6 +218,12 @@ watchEffect(() => {
         } else {
             top_margin.value = 0;
         }
+        // 开启沉浸式时要加上顶部的高度，关闭底部导航的时候要加上底部的高度
+        if (bottom_navigation_show.value) {
+            container_min_height.value = container_min_height.value - footer_nav_counter_store.padding_footer;
+        } else {
+            container_min_height.value = container_min_height.value + footer_nav_counter_store.padding_footer;
+        }
     }
 });
 
@@ -656,7 +666,7 @@ const float_bottom_change = (val: { bottom: string; location: string }, id: stri
                     background: #f5f5f5;
                     margin: 0 auto;
                     .drag-area {
-                        min-height: 68.1rem;
+                        min-height: v-bind(height);
                     }
                     .drag-area .float-window {
                         position: fixed;