From e5364e2e356fe1f3a89f5864f84d613de06675ae 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, 7 Aug 2025 11:34:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B1=82=E7=BA=A7=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/diy/components/diy/diy.vue        | 2 +-
 pages/diy/components/diy/tabs-magic.vue | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pages/diy/components/diy/diy.vue b/pages/diy/components/diy/diy.vue
index f603843e..dd1ed160 100644
--- a/pages/diy/components/diy/diy.vue
+++ b/pages/diy/components/diy/diy.vue
@@ -17,7 +17,7 @@
                         </view>
                         <template v-if="is_tabs_type">
                             <template v-if="diy_data.length > 0">
-                                <view v-for="(item, index) in diy_data" :key="index" :style="'margin-top:' + (['float-window'].includes(item.key) ? '0rpx;' : item.floating_up + 'z-index:' + (!isEmpty(item.com_data.style.common_style.module_z_index) ? item.com_data.style.common_style.module_z_index : 0))">
+                                <view v-for="(item, index) in diy_data" :key="index" :style="'margin-top:' + (['float-window'].includes(item.key) || isEmpty(item.floating_up) || item.floating_up == 0 ? '0rpx;' : item.floating_up + 'z-index:' + (!isEmpty(item.com_data.style.common_style.module_z_index) ? item.com_data.style.common_style.module_z_index : 0))">
                                     <!-- 基础组件 -->
                                     <template v-if="item.is_enable == '1'">
                                         <component-diy-search v-if="item.key == 'search'" :propIndex="get_prop_index(item)" :propKey="item.id + index" :propValue="item.com_data"></component-diy-search>
diff --git a/pages/diy/components/diy/tabs-magic.vue b/pages/diy/components/diy/tabs-magic.vue
index 9e753a1d..fb4abdb7 100644
--- a/pages/diy/components/diy/tabs-magic.vue
+++ b/pages/diy/components/diy/tabs-magic.vue
@@ -321,7 +321,7 @@
                         swiper_bg_img_style: this.get_swiper_bg_img_style(0),
                         sliding_fixed_style: this.get_sliding_fixed_style(0),
                     })
-                }, 100);
+                }, 0);
             },
             // tab点击
             tabs_click_event(tabs_id, is_micro_page, index) {
@@ -335,7 +335,7 @@
                         swiper_bg_img_style: this.get_swiper_bg_img_style(0),
                         sliding_fixed_style: this.get_sliding_fixed_style(0),
                     })
-                }, 100);
+                }, 0);
                 this.$emit('onTabsTap', tabs_id, is_micro_page);
             },
             // tab高度