From f07cc1705b0d1208561709696b3810acc52237d3 Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Tue, 27 Oct 2026 17:08:05 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=A7=BB=E5=8A=A8=E7=AB=AF):=20DIY=20?=
 =?UTF-8?q?=E5=AF=BC=E8=88=AA=E7=BB=84=E4=BB=B6=E9=97=B4=E8=B7=9D=E5=AF=B9?=
 =?UTF-8?q?=E9=BD=90=E5=90=8E=E5=8F=B0=E9=A2=84=E8=A7=88=E5=B9=B6=E5=9B=9E?=
 =?UTF-8?q?=E5=A1=AB=E6=97=A7=E6=95=B0=E6=8D=AE=E8=BE=B9=E8=B7=9D=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/subpackage/diyComponents/menus.vue    | 52 +++++++++++++++----
 1 file changed, 41 insertions(+), 11 deletions(-)

diff --git a/frontend/uni-app/src/subpackage/diyComponents/menus.vue b/frontend/uni-app/src/subpackage/diyComponents/menus.vue
index eb6e45191..213e48e06 100644
--- a/frontend/uni-app/src/subpackage/diyComponents/menus.vue
+++ b/frontend/uni-app/src/subpackage/diyComponents/menus.vue
@@ -189,8 +189,10 @@
                         </view>
                         <view
                           class="fs-24"
-                          :class="{ 'mt-10': listStyle === 0 }"
-                          :style="[textColor]"
+                          :style="[
+                            textColor,
+                            { marginTop: listStyle === 0 ? '20rpx' : '0' },
+                          ]"
                           v-if="navDisplayStyle !== 1"
                           >{{ itemn.info[0].value }}</view
                         >
@@ -236,8 +238,10 @@
                           </view>
                           <view
                             class="fs-24"
-                            :class="{ 'mt-10': listStyle === 0 }"
-                            :style="[textColor]"
+                            :style="[
+                              textColor,
+                              { marginTop: listStyle === 0 ? '20rpx' : '0' },
+                            ]"
                             v-if="navDisplayStyle !== 1"
                             >{{ itemn.info[0].value }}</view
                           >
@@ -299,8 +303,10 @@
                   </view>
                   <view
                     class="fs-24"
-                    :class="{ 'mt-10': listStyle === 0 }"
-                    :style="[textColor]"
+                    :style="[
+                      textColor,
+                      { marginTop: listStyle === 0 ? '20rpx' : '0' },
+                    ]"
                     v-if="navDisplayStyle !== 1"
                     >{{ item.info[0].value }}</view
                   >
@@ -347,8 +353,10 @@
                     </view>
                     <view
                       class="fs-24"
-                      :class="{ 'mt-10': listStyle === 0 }"
-                      :style="[textColor]"
+                      :style="[
+                        textColor,
+                        { marginTop: listStyle === 0 ? '20rpx' : '0' },
+                      ]"
                       v-if="navDisplayStyle !== 1"
                       >{{ item.info[0].value }}</view
                     >
@@ -411,8 +419,26 @@ const number = computed(() => {
   return props.dataConfig.number.tabVal;
 });
 const configData = computed(() => {
+  const data = props.dataConfig;
   return {
-    ...props.dataConfig,
+    ...data,
+    // 旧数据迁移：后台预览 setConfig 对缺失的 paddingConfig/marginConfig 直接用
+    // defaultConfig 补全（上内边距 10、外边距 0），移动端按同口径回填，
+    // 避免旧数据下移动端上下间距比后台 diy 展示小
+    paddingConfig: data.paddingConfig || {
+      isAll: true,
+      val: 0,
+      min: 0,
+      max: 100,
+      valList: [{ val: 10 }, { val: 0 }, { val: 0 }, { val: 0 }],
+    },
+    marginConfig: data.marginConfig || {
+      isAll: false,
+      val: 0,
+      min: 0,
+      max: 100,
+      valList: [{ val: 0 }, { val: 0 }, { val: 0 }, { val: 0 }],
+    },
   };
 });
 const menus = computed(() => {
@@ -585,7 +611,11 @@ const gridContainerStyle = computed(() => {
       rowGap: gridItemStyle.value.itemPaddingTop * 2 + "rpx",
     };
   } else {
-    return gridColumns.value;
+    return {
+      ...gridColumns.value,
+      // 排列/图文展示换行行距对齐后台预览条目 margin-bottom: 12px
+      rowGap: 12 * 2 + "rpx",
+    };
   }
 });
 const gridItemContentStyle = computed(() => {
@@ -729,7 +759,7 @@ function goMenuPage(url) {
   display: grid;
   grid-template-rows: auto;
   width: 100%;
-  padding: 0 0 20rpx 0;
+  padding: 0 0 24rpx 0;
 }
 .swiper {
   z-index: 20;