diff --git a/components/diy/article-tabs.vue b/components/diy/article-tabs.vue index 7fc57374..a40036b5 100644 --- a/components/diy/article-tabs.vue +++ b/components/diy/article-tabs.vue @@ -3,9 +3,11 @@ - - - + + + + + @@ -75,6 +77,7 @@ custom_nav_height: 33, diy_key: '', // 选项卡背景设置 + article_margin_top: '', tabs_container: '', tabs_img_container: '', // 商品区域背景设置 @@ -193,8 +196,9 @@ top_up: new_content.tabs_top_up, article_tabs: new_data, style_container: common_styles_computer(common_style), - style_img_container: common_img_computer(common_style, this.propIndex) + 'gap:' + (new_style?.shop_content_spacing || 0) * 2 + 'rpx', + style_img_container: common_img_computer(common_style, this.propIndex), tabs_style: new_tabs_style, + article_margin_top: 'margin-top:' + (new_style?.article_content_spacing || 0) * 2 + 'rpx', tabs_container: gradient_computer(tabs_data) + radius_computer(tabs_radius) + 'overflow: hidden;', tabs_img_container: background_computer(tabs_data) + padding_computer(tabs_padding) + 'box-sizing: border-box;overflow: hidden;', article_container: gradient_computer(article_content_data) + margin_computer(article_content_margin) + radius_computer(article_content_radius) + 'overflow: hidden;', diff --git a/components/diy/goods-tabs.vue b/components/diy/goods-tabs.vue index d0d238aa..efb53d2a 100644 --- a/components/diy/goods-tabs.vue +++ b/components/diy/goods-tabs.vue @@ -2,9 +2,11 @@ - - - + + + + + @@ -77,6 +79,7 @@ tabs_container: '', tabs_img_container: '', // 商品区域背景设置 + shop_margin_top: '', shop_container: '', shop_img_container: '', // 默认数据 @@ -186,10 +189,11 @@ top_up: new_content.tabs_top_up, goods_tabs: new_data, style_container: common_styles_computer(common_style), - style_img_container: common_img_computer(common_style, this.propIndex) + 'gap:' + (new_style?.shop_content_spacing || 0) * 2 + 'rpx', + style_img_container: common_img_computer(common_style, this.propIndex), tabs_style: new_tabs_style, tabs_container: gradient_computer(tabs_data) + radius_computer(tabs_radius) + 'overflow: hidden;', tabs_img_container: background_computer(tabs_data) + padding_computer(tabs_padding) + 'box-sizing: border-box;overflow: hidden;', + shop_margin_top: 'margin-top:' + (new_style?.shop_content_spacing || 0) * 2 + 'rpx;', shop_container: gradient_computer(shop_content_data) + margin_computer(shop_content_margin) + radius_computer(shop_content_radius) + 'overflow: hidden;', shop_img_container: background_computer(shop_content_data) + padding_computer(shop_content_padding) + 'box-sizing: border-box;overflow: hidden;', }); diff --git a/components/diy/tabs-carousel.vue b/components/diy/tabs-carousel.vue index 6312eb20..8a716d04 100644 --- a/components/diy/tabs-carousel.vue +++ b/components/diy/tabs-carousel.vue @@ -1,11 +1,13 @@