diff --git a/App.vue b/App.vue
index d81707b2..92ba2221 100644
--- a/App.vue
+++ b/App.vue
@@ -2889,7 +2889,7 @@
if(temp !== undefined && this.is_tabbar_pages()) {
obj.$vm.setData(
{
- bottom_fixed_style: 'bottom:'+(this.app_tabbar_height_value()*2)+'rpx'
+ bottom_fixed_style: 'bottom:'+this.app_tabbar_height_value()+'px'
});
}
}
diff --git a/components/cart/cart.vue b/components/cart/cart.vue
index 87bec2d4..bbd6f3d2 100644
--- a/components/cart/cart.vue
+++ b/components/cart/cart.vue
@@ -141,7 +141,7 @@
-
+
-
+
@@ -1429,7 +1429,7 @@
width: calc(75% - 20rpx);
}
.cart-nav-submit {
- padding: 20rpx 24rpx;
+ padding-right: 24rpx;
white-space: nowrap;
}
.cart-nav-submit .nav-btn {
diff --git a/components/realstore-cart/realstore-cart.vue b/components/realstore-cart/realstore-cart.vue
index d5b47881..3d6ab7e7 100644
--- a/components/realstore-cart/realstore-cart.vue
+++ b/components/realstore-cart/realstore-cart.vue
@@ -74,7 +74,7 @@
-
+
diff --git a/pages/goods-category/goods-category.css b/pages/goods-category/goods-category.css
index a7a12b40..d904af6a 100644
--- a/pages/goods-category/goods-category.css
+++ b/pages/goods-category/goods-category.css
@@ -272,7 +272,8 @@
bottom: 20rpx;
z-index: 2;
margin-left: 20rpx;
- background: linear-gradient(132deg, #EBEBEB 0%, #F7F7F7 100%);
+ background: linear-gradient(132deg, #EBEBEB 0%, #F7F7F7 100%);
+ box-shadow: 0rpx 4rpx 8rpx 0px rgba(0, 0, 0, 0.16);
}
.botton-nav .cart .badge-icon {
top: -20rpx;
diff --git a/pages/goods-category/goods-category.vue b/pages/goods-category/goods-category.vue
index f09304bc..4ff1b93c 100644
--- a/pages/goods-category/goods-category.vue
+++ b/pages/goods-category/goods-category.vue
@@ -329,7 +329,7 @@
-
+
diff --git a/pages/plugins/realstore/detail/detail.vue b/pages/plugins/realstore/detail/detail.vue
index 0c0ca32c..62e8f5db 100644
--- a/pages/plugins/realstore/detail/detail.vue
+++ b/pages/plugins/realstore/detail/detail.vue
@@ -690,19 +690,15 @@
value = (this.is_base_mode_show_type == 0) ? 58 : 92;
}
// 内容高度
- value += (this.client_type == 'h5') ? 386 : 374;
+ value += (this.client_type == 'h5') ? 370 : 358;
// 桌码
if(this.tablecode != null) {
value += 44;
}
- // 底部菜单高度
- if(this.footer_height_value > 0) {
- value += this.footer_height_value;
- }
- // 减去内容高度
+ // 减去内容高度、底部菜单高度
this.setData({
- content_style: 'height: calc(100vh - '+value+'rpx - '+this.status_bar_height+'px);',
+ content_style: 'height: calc(100vh - '+value+'rpx - '+(this.status_bar_height+this.footer_height_value)+'px);',
});
},
@@ -1043,7 +1039,7 @@
// 底部菜单高度
footer_height_value_event(value) {
this.setData({
- footer_height_value: parseInt(value)*2
+ footer_height_value: value
});
this.content_actual_size_handle();
}