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 @@ - + @@ -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 @@ - + 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 @@ + - - @@ -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 @@ - + @@ -422,7 +422,7 @@ - +