|
@@ -27,6 +27,7 @@
|
|
|
@tap.stop="openNoticeDetail"
|
|
@tap.stop="openNoticeDetail"
|
|
|
>
|
|
>
|
|
|
<view class="notice-left">
|
|
<view class="notice-left">
|
|
|
|
|
+ <sprite-icon name="notice" :size="30" custom-class="item-cate-header-icon" />
|
|
|
<text class="notice-tag">通知公告</text>
|
|
<text class="notice-tag">通知公告</text>
|
|
|
<swiper
|
|
<swiper
|
|
|
class="notice-swiper"
|
|
class="notice-swiper"
|
|
@@ -1006,7 +1007,7 @@ export default {
|
|
|
flex-direction: column;
|
|
flex-direction: column;
|
|
|
min-height: 0;
|
|
min-height: 0;
|
|
|
overflow: hidden;
|
|
overflow: hidden;
|
|
|
- padding-bottom: calc(180upx + env(safe-area-inset-bottom));
|
|
|
|
|
|
|
+ padding-bottom: $shopTabBarTotalHeight;
|
|
|
box-sizing: border-box;
|
|
box-sizing: border-box;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -1079,7 +1080,7 @@ export default {
|
|
|
font-size: 26upx;
|
|
font-size: 26upx;
|
|
|
font-weight: 600;
|
|
font-weight: 600;
|
|
|
color: #ff4757;
|
|
color: #ff4757;
|
|
|
- margin-right: 12upx;
|
|
|
|
|
|
|
+ margin: 0 12upx;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
.notice-swiper {
|
|
.notice-swiper {
|
|
@@ -1304,12 +1305,12 @@ export default {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
.side-nav-placeholder {
|
|
.side-nav-placeholder {
|
|
|
- height: calc(180upx + env(safe-area-inset-bottom));
|
|
|
|
|
|
|
+ height: $shopTabBarTotalHeight;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/* 底部 FooterCart 出现时,左侧分类可继续上滑,避免被全宽栏挡住 */
|
|
/* 底部 FooterCart 出现时,左侧分类可继续上滑,避免被全宽栏挡住 */
|
|
|
.side-nav-placeholder--cart {
|
|
.side-nav-placeholder--cart {
|
|
|
- height: calc(268upx + env(safe-area-inset-bottom));
|
|
|
|
|
|
|
+ height: $shopFooterCartStackHeight;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
.content-panel {
|
|
.content-panel {
|
|
@@ -1453,7 +1454,7 @@ export default {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
.content-bottom-placeholder--cart {
|
|
.content-bottom-placeholder--cart {
|
|
|
- height: 140upx;
|
|
|
|
|
|
|
+ height: calc(#{$shopFooterCartHeight} + #{$shopFooterCartGap});
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
.item-product-list {
|
|
.item-product-list {
|
|
@@ -1464,10 +1465,11 @@ export default {
|
|
|
position: relative;
|
|
position: relative;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-/* 整页全宽 FooterCart:只改 bottom,保留组件默认 702upx 居中样式 */
|
|
|
|
|
|
|
+/* 整页全宽 FooterCart:bottom 须高于 Tab 栏(115upx + 安全区),避免真机重叠 */
|
|
|
.shop-category-footer-cart {
|
|
.shop-category-footer-cart {
|
|
|
::v-deep .cart-ft_bx {
|
|
::v-deep .cart-ft_bx {
|
|
|
- bottom: calc(130upx + env(safe-area-inset-bottom));
|
|
|
|
|
|
|
+ bottom: $shopFooterCartBottom;
|
|
|
|
|
+ z-index: 199;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -1483,14 +1485,14 @@ export default {
|
|
|
|
|
|
|
|
.item-cart-panel {
|
|
.item-cart-panel {
|
|
|
position: fixed;
|
|
position: fixed;
|
|
|
- bottom: calc(180upx + env(safe-area-inset-bottom));
|
|
|
|
|
|
|
+ bottom: $shopTabBarTotalHeight;
|
|
|
width: 100vw;
|
|
width: 100vw;
|
|
|
background-color: #fff;
|
|
background-color: #fff;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/* FooterCart 显示时,弹层上移到购物车栏上方 */
|
|
/* FooterCart 显示时,弹层上移到购物车栏上方 */
|
|
|
.item-cart-panel--above-footer {
|
|
.item-cart-panel--above-footer {
|
|
|
- bottom: calc(276upx + env(safe-area-inset-bottom));
|
|
|
|
|
|
|
+ bottom: $shopFooterCartStackHeight;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
.commodity-view {
|
|
.commodity-view {
|