From 3140e214a91c7effe8a5faa008e44791ee166c6c 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, 17 Oct 2024 16:59:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=86=85=E5=AE=B9=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/page-settings/index.vue     |  9 +++++++--
 src/views/layout/components/main/index.vue | 10 ++++++++--
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/components/page-settings/index.vue b/src/components/page-settings/index.vue
index 7148bca4..b19972ee 100644
--- a/src/components/page-settings/index.vue
+++ b/src/components/page-settings/index.vue
@@ -27,7 +27,7 @@
                                 </div>
                             </div>
                             <div v-else-if="['4', '5'].includes(form.theme)" class="flex-1 flex-row align-c h gap-10">
-                                <div class="flex-1 flex-row gap-2" :style="'color:' + new_style.position_color">
+                                <div class="flex-row gap-2 align-c" :style="'color:' + new_style.position_color">
                                     <template v-if="form.is_location_left_icon_show == '1'">
                                         <image-empty v-if="form.location_left_img.length > 0" v-model="form.location_left_img[0]" fit="contain" :error-img-style="'width: 12px; height:12px'"></image-empty>
                                         <icon v-else :name="form.location_left_icon" size="12"></icon>
@@ -170,10 +170,15 @@ const position_class = computed(() => (form.value?.indicator_location == 'center
         .location-name {
             line-height: 3.2rem;
             max-width: 15rem;
+            width: 100%;
+            flex-basis: content;
+            flex-shrink: 1;
         }
         :deep(.el-image) {
             width: 100%;
-            max-height: 3.2rem;
+            height: 2.8rem;
+            flex-basis: content;
+            flex-shrink: 1;
         }
     }
 }
diff --git a/src/views/layout/components/main/index.vue b/src/views/layout/components/main/index.vue
index 0b1d6f20..83f984f6 100644
--- a/src/views/layout/components/main/index.vue
+++ b/src/views/layout/components/main/index.vue
@@ -167,16 +167,22 @@ watchEffect(() => {
 
         main_content_style.value = padding_computer(new_style.common_style);
 
-        const { immersive_style, up_slide_display } = new_style;
+        const { immersive_style, up_slide_display, data_alone_row_space } = new_style;
         // 不开启沉浸式 和 上滑显示
         if (immersive_style == '1' || up_slide_display != '1') {
             top_padding.value = 0;
+        } else if (content.data_alone_row_value.length > 0) {
+            top_padding.value = 90 + 32 + data_alone_row_space;
         } else {
             top_padding.value = 90;
         }
         // 开启沉浸式并且没有开通上滑显示
         if (immersive_style == '1' && up_slide_display != '1') {
-            top_margin.value = -90;
+            if (content.data_alone_row_value.length > 0) {
+                top_margin.value = -90 - 32 - data_alone_row_space;
+            } else {
+                top_margin.value = -90;
+            }
         } else {
             top_margin.value = 0;
         }