From 45dfd5e1f9298d31f6aaf240030f701e1c896ec5 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Wed, 25 Sep 2024 15:48:17 +0800
Subject: [PATCH] 1.diy---header

---
 components/diy/diy.vue               |  8 ++++++--
 components/diy/modules/tabs-view.vue | 13 +++++++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/components/diy/diy.vue b/components/diy/diy.vue
index 9b043feb..1a584519 100644
--- a/components/diy/diy.vue
+++ b/components/diy/diy.vue
@@ -11,7 +11,7 @@
             </view>
             <view v-if="is_tabs_type" class="diy-content">
                 <template v-if="diy_data.length > 0">
-                    <view v-for="(item, index) in diy_data" :key="index" :style="{'margin-top': -(item.com_data.style.common_style.floating_up * 2 || 0) + 'rpx' }">
+                    <view v-for="(item, index) in diy_data" :key="index" :style="{ 'margin-top': -(item.com_data.style.common_style.floating_up * 2 || 0) + 'rpx' }">
                         <!-- 基础组件 -->
                         <componentDiySearch v-if="item.key == 'search'" :value="item.com_data"></componentDiySearch>
                         <componentDiyCarousel v-else-if="item.key == 'carousel'" :value="item.com_data"></componentDiyCarousel>
@@ -55,7 +55,9 @@
                 </scroll-view>
             </view>
         </view>
-        <componentDiyFooter :key="key" :value="footer_data.com_data" @footer-height="footer_height_computer" @footer-click="footer_click_event"></componentDiyFooter>
+        <block v-if="is_show_footer !== '0'">
+            <componentDiyFooter :key="key" :value="footer_data.com_data" @footer-height="footer_height_computer" @footer-click="footer_click_event"></componentDiyFooter>
+        </block>
     </view>
 </template>
 
@@ -164,6 +166,7 @@
                 // 选项卡数据
                 tabs_data: {},
                 diy_data: [],
+                is_show_footer: '0',
                 tabs_home_id: this.propHomeId,
                 // 商品列表
                 goods_list: [],
@@ -197,6 +200,7 @@
                 // tabs选项卡数据过滤
                 // const filter_tabs_list = this.value.tabs_data || [];
                 this.setData({
+                    is_show_footer: this.value.header.com_data.content.bottom_navigation_show,
                     key: get_math(),
                     header_data: this.value.header,
                     footer_data: this.value.footer,
diff --git a/components/diy/modules/tabs-view.vue b/components/diy/modules/tabs-view.vue
index 063ef499..23b1e84c 100644
--- a/components/diy/modules/tabs-view.vue
+++ b/components/diy/modules/tabs-view.vue
@@ -31,7 +31,7 @@
                         </view>
                     </view>
                 </view>
-                <view class="tc padding-top-lg" @tap="quick_close_event">
+                <view class="tc padding-top-lg flex-row jc-c align-c" @tap="quick_close_event">
                     <text class="padding-right-sm">{{ $t('nav-more.nav-more.h9g4b1') }}</text>
                     <iconfont name="icon-arrow-top" color="#ccc"></iconfont>
                 </view>
@@ -85,7 +85,16 @@
                 // 过滤弹窗
                 popup_status: false,
                 propIsBar: false,
-                propTop: bar_height + 120 + 'rpx',
+                // 5,7,0 是误差，， 12 是下边距，60是高度，bar_height是不同小程序下的导航栏距离顶部的高度
+                // #ifdef MP
+                propTop: bar_height + 34 + 5 + 12 + 'px;',
+                // #endif
+                // #ifdef H5 || MP-TOUTIAO
+                propTop: bar_height + 34 + 7 + 12 + 'px;',
+                // #endif
+                // #ifdef APP
+                propTop: bar_height + 34 + 0 + 12 + 'px;',
+                // #endif
             };
         },
         mounted() {