From f81ee3a8fd3b8707cd6d99ec1a850377e5c2d723 Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Sat, 19 Oct 2024 19:48:55 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/cart/cart.vue            | 8 ++++----
 components/common/common.vue        | 2 +-
 components/diy/diy.vue              | 9 +++------
 pages/goods-detail/goods-detail.vue | 4 ++--
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/components/cart/cart.vue b/components/cart/cart.vue
index 56012f80..6563560b 100644
--- a/components/cart/cart.vue
+++ b/components/cart/cart.vue
@@ -152,7 +152,7 @@
                                 </view>
                                 <!-- 销售,自提,虚拟销售 -->
                                 <view v-else class="bottom-fixed-content item round bg-white flex-row jc-sb align-c">
-                                    <view class="cart-nav-base single-text padding-left flex-row jc-sb align-c">
+                                    <view class="cart-nav-base single-text padding-left-sm flex-row jc-sb align-c">
                                         <view class="cart-selected flex-row align-c">
                                             <view @tap="selected_event" data-type="all">
                                                 <iconfont :name="'icon-zhifu-' + (is_selected_all ? 'yixuan' : 'weixuan')" size="34rpx" :color="is_selected_all ? theme_color : '#999'"></iconfont>
@@ -1417,13 +1417,13 @@
     * 操作导航
     */
     .bottom-fixed-content {
-        height: 120rpx;
+        height: 106rpx;
     }
     .cart-nav-base {
         width: calc(75% - 20rpx);
     }
-    .cart-nav-submit {
-        padding-right: 24rpx;
+    .cart-nav-submit {
+        padding-right: 16rpx;
         white-space: nowrap;
     }
     .cart-nav-submit .nav-btn {
diff --git a/components/common/common.vue b/components/common/common.vue
index 67942a63..47730576 100644
--- a/components/common/common.vue
+++ b/components/common/common.vue
@@ -2,7 +2,7 @@
     <view :class="theme_view">
         <!-- 底部菜单 -->
         <block v-if="is_tabbar">
-            <component-diy-footer :propKey="key" :propValue="app_tabber" @footer-height="footer_height_value_event"></component-diy-footer>
+            <component-diy-footer :propKey="key" :propValue="app_tabber" @onFooterHeight="footer_height_value_event"></component-diy-footer>
             <view v-if="propIsFooterSeat && footer_height_value > 0" :style="'height:'+footer_height_value+'rpx;'"></view>
         </block>
 
diff --git a/components/diy/diy.vue b/components/diy/diy.vue
index 34e3a311..a7babdaa 100644
--- a/components/diy/diy.vue
+++ b/components/diy/diy.vue
@@ -78,9 +78,8 @@
                 <!-- 当前diy页面底部菜单（非公共底部菜单） -->
                 <block v-if="is_show_footer == 1">
                     <componentDiyFooter :propKey="footer_data.id" :propValue="footer_data.com_data" @onFooterHeight="footer_height_value_event"></componentDiyFooter>
+                    <view v-if="footer_height_value > 0" :style="'height:' + footer_height_value + 'rpx;'"></view>
                 </block>
-                <view v-if="is_show_footer_height && footer_height_value > 0" :style="'height:' + footer_height_value + 'rpx;'"></view>
-                
 
                 <!-- 底部卡槽 -->
                 <slot name="bottom"></slot>
@@ -215,8 +214,7 @@
                 diy_data: [],
                 page_style: '',
                 page_img_style: '',
-                is_show_footer: false,
-                is_tabbar: false,
+                is_show_footer: 0,
                 tabs_home_id: this.propDataId,
                 // 商品列表
                 goods_list: [],
@@ -268,11 +266,10 @@
             init_config(status) {
                 if ((status || false) == true) {
                     // 是否显示底部菜单，如果当前地址已经存在系统底部菜单中则不显示当前diy页面自定义的底部菜单
-                    var is_show_footer = parseInt(app.globalData.get_key_data(this.propValue, 'header.com_data.content.bottom_navigation_show', 0)) == 1;
+                    var is_show_footer = parseInt(this.propValue.header.com_data.content.bottom_navigation_show || 0) == 1;
                     var is_tabbar = app.globalData.is_tabbar_pages();
                     this.setData({
                         is_show_footer: is_show_footer && !is_tabbar,
-                        is_show_footer_height: is_tabbar || is_show_footer
                     });
                 } else {
                     app.globalData.is_config(this, 'init_config');
diff --git a/pages/goods-detail/goods-detail.vue b/pages/goods-detail/goods-detail.vue
index 20bd1fb5..a405d7a3 100644
--- a/pages/goods-detail/goods-detail.vue
+++ b/pages/goods-detail/goods-detail.vue
@@ -413,7 +413,7 @@
             <block v-if="goods_bottom_nav_status">
                 <view v-if="plugins_realstore_cart_nav_status || data_loading_status == 0" class="bottom-fixed" :style="bottom_fixed_style">
                     <view class="bottom-line-exclude">
-                        <view class="item goods-buy-nav oh round bg-white flex-row jc-sb align-c padding-sm">
+                        <view class="item goods-buy-nav oh round bg-white flex-row jc-sb align-c padding-vertical-sm padding-horizontal-xs">
                             <button class="bg-white br-white round tc text-size-md wh-auto margin-horizontal-main cr-grey" type="default" :loading="true">{{ $t('realstore-cart.realstore-cart.50lf68') }}</button>
                         </view>
                     </view>
@@ -422,7 +422,7 @@
                     <!-- 底部操作 -->
                     <view v-if="goods_bottom_opt_nav_status" class="bottom-fixed" :style="bottom_fixed_style">
                         <view class="bottom-line-exclude">
-                            <view class="item goods-buy-nav oh round bg-white flex-row jc-sb align-c padding-sm">
+                            <view class="item goods-buy-nav oh round bg-white flex-row jc-sb align-c padding-vertical-sm padding-horizontal-xs">
                                 <!-- 左侧集合操作 -->
                                 <view class="tc flex-row jc-sa align-c flex-width-half padding-right-sm">
                                     <!-- 是否指定返回操作 -->