From 8ebbc04a841525cdcaf08066798f33082a140137 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Thu, 26 Sep 2024 20:16:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=95=E9=83=A8=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/bottom-line/bottom-line.vue  | 11 +++++++---
 components/cart/cart.vue                |  2 +-
 components/diy/footer.vue               | 28 ++++++++++++++++++-------
 pages/goods-category/goods-category.vue |  2 +-
 4 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/components/bottom-line/bottom-line.vue b/components/bottom-line/bottom-line.vue
index ab0f40aa..b891a4dd 100644
--- a/components/bottom-line/bottom-line.vue
+++ b/components/bottom-line/bottom-line.vue
@@ -1,9 +1,11 @@
 <template>
     <view :class="theme_view">
         <view v-if="(propStatus || false)" class="data-bottom-line">
-            <view class="item left"></view>
-            <view class="item msg">{{propMsg || $t('bottom-line.bottom-line.44bct2')}}</view>
-            <view class="item right"></view>
+            <view class="bottom-exclude">
+                <view class="item left"></view>
+                <view class="item msg">{{propMsg || $t('bottom-line.bottom-line.44bct2')}}</view>
+                <view class="item right"></view>
+            </view>
         </view>
     </view>
 </template>
@@ -28,6 +30,9 @@
         padding: 40rpx;
         overflow: hidden;
     }
+    .data-bottom-line .bottom-exclude {
+        padding-bottom: env(safe-area-inset-bottom);
+    }
     .data-bottom-line .item {
         width: 33.3%;
     }
diff --git a/components/cart/cart.vue b/components/cart/cart.vue
index 05441b6d..fbcb50bf 100644
--- a/components/cart/cart.vue
+++ b/components/cart/cart.vue
@@ -1315,7 +1315,7 @@
 
             // 页面样式处理
             page_style_handle() {
-                var value = (this.propCartNavBottomValue > 0) ? (parseInt(this.propCartNavBottomValue*2)+40) : 0;
+                var value = (this.propCartNavBottomValue > 0) ? (parseInt(this.propCartNavBottomValue*2)+20) : 0;
                 this.setData({
                     cart_buy_nav_style: 'bottom:'+value+'rpx;',
                     footer_seat_style: (value > 0) ? 'height:'+value+'rpx;' : '',
diff --git a/components/diy/footer.vue b/components/diy/footer.vue
index 693ecbd8..11561137 100644
--- a/components/diy/footer.vue
+++ b/components/diy/footer.vue
@@ -1,8 +1,8 @@
 <template>
     <!-- 底部导航 -->
-    <view v-if="(propValue || null) !== null" class="footer-nav flex-row jc-c align-c">
+    <view v-if="(propValue || null) !== null" class="footer-nav flex-row jc-c align-c" :class="nav_type == 1 ? 'bottom-line-exclude' : ''">
         <view class="footer-nav-content flex-row jc-c align-c wh-auto" :style="style_container">
-            <view class="bottom-line-exclude flex-row jc-c align-c wh-auto">
+            <view class="flex-row jc-c align-c wh-auto" :class="nav_type == 0 ? 'bottom-line-exclude' : ''">
                 <view class="flex-row jc-sa align-c wh padding-0">
                     <view v-for="(item, index) in nav_content" :key="index" class="flex-1 flex-col jc-c align-c gap-5" :data-value="item.link.page || ''" @tap="url_event">
                         <view v-if="nav_style != 2" class="img-content pr">
@@ -39,6 +39,7 @@
                 style_container: '',
                 style: '',
                 nav_content: [],
+                nav_type: 0,
                 nav_style: 0,
                 default_text_color: '',
                 text_color_checked: '',
@@ -78,6 +79,7 @@
                     }
                     this.setData({
                         nav_content: nav_content,
+                        nav_type: new_content.nav_type || 0,
                         nav_style: new_content.nav_style || 0,
                         active_index: active_index,
                         default_text_color: 'color:' + new_style.default_text_color || 'rgba(0, 0, 0, 1)',
@@ -85,12 +87,22 @@
                         style_container: common_styles_computer(new_style.common_style),
                     });
 
-                    // 高度计算回调
-                    let footer_height = parseInt(new_style.common_style.padding_top) + parseInt(new_style.common_style.padding_bottom) + parseInt(new_style.common_style.margin_top) + parseInt(new_style.common_style.margin_bottom) + 40;
-                    // #ifndef APP
-                    // 底部菜单距离底部的安全距离
-                    footer_height += parseInt(uni.getSystemInfoSync().statusBarHeight);
-                    // #endif
+                    // 高度计算
+                    let nav_min_height = 70;
+                    var nav_height = parseInt(new_style.common_style.padding_top) + parseInt(new_style.common_style.padding_bottom)+44;
+                    if(nav_height < nav_min_height) {
+                        nav_height = nav_min_height;
+                    }
+                    let footer_height = nav_height + parseInt(new_style.common_style.margin_top) + parseInt(new_style.common_style.margin_bottom);
+
+                    // 底部菜单距离底部的安全距离，减去20、默认的安全距离太高了
+                    var safe_area_insets_bottom = parseInt(uni.getSystemInfoSync().safeAreaInsets.bottom);
+                    if(safe_area_insets_bottom > 0) {
+                        safe_area_insets_bottom -= 20;
+                    }
+                    footer_height += safe_area_insets_bottom;
+
+                    // 回调高度
                     this.$emit('footer-height', footer_height);
                 }
             },
diff --git a/pages/goods-category/goods-category.vue b/pages/goods-category/goods-category.vue
index 266cf58b..de86ce68 100644
--- a/pages/goods-category/goods-category.vue
+++ b/pages/goods-category/goods-category.vue
@@ -1381,7 +1381,7 @@
             // 底部菜单高度
             footer_height_value_event(value) {
                 this.setData({
-                    footer_height_value: (parseInt(value)*2)+20
+                    footer_height_value: parseInt(value)*2
                 });
                 this.content_actual_size_handle();
             }