diff --git a/components/diy/article-tabs.vue b/components/diy/article-tabs.vue index 89fe2551..cbaa7fdf 100644 --- a/components/diy/article-tabs.vue +++ b/components/diy/article-tabs.vue @@ -65,7 +65,7 @@ }, watch: { propScrollTop(newVal) { - if (newVal + this.propTop + this.custom_nav_height >= this.tabs_top) { + if (newVal + this.propTop + this.custom_nav_height >= this.tabs_top && this.top_up == '1') { let new_style = this.propValue.style || {}; let tabs_bg = new_style.common_style.color_list; let new_tabs_background = ''; diff --git a/components/diy/goods-tabs.vue b/components/diy/goods-tabs.vue index 465d2b2a..fccffb67 100644 --- a/components/diy/goods-tabs.vue +++ b/components/diy/goods-tabs.vue @@ -64,7 +64,7 @@ }, watch: { propScrollTop(newVal) { - if (newVal + this.propTop + this.custom_nav_height >= this.tabs_top) { + if (newVal + this.propTop + this.custom_nav_height >= this.tabs_top && this.top_up == '1') { let new_style = this.propValue.style || {}; let tabs_bg = new_style.common_style.color_list; let new_tabs_background = ''; diff --git a/components/diy/header.vue b/components/diy/header.vue index 8fd7026f..f82bc103 100644 --- a/components/diy/header.vue +++ b/components/diy/header.vue @@ -173,17 +173,18 @@ } // 小程序下,获取小程序胶囊的宽度 let menuButtonInfo = 'max-width:100%'; - + let new_text_style = `font-weight:${new_style.header_background_title_typeface}; font-size: ${new_style.header_background_title_size * 2}rpx; color: ${new_style.header_background_title_color};`; // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU const custom = uni.getMenuButtonBoundingClientRect(); menuButtonInfo = `max-width:calc(100% - ${custom.width + 10}px);`; + new_text_style += `right:-${custom.width + 10}px;`; // #endif this.setData({ form: this.propValue, position: new_style.up_slide_display == '1' ? 'position:fixed;' : 'position:relative;', is_positon_realative: new_style.up_slide_display == '1' ? false : true, roll_style: new_roll_style, - text_style: `font-weight:${new_style.header_background_title_typeface}; font-size: ${new_style.header_background_title_size * 2}rpx; color: ${new_style.header_background_title_color};right:-${custom.width + 10}px;`, + text_style: new_text_style, position_class: new_content.indicator_location == 'center' ? `indicator-center` : '', header_style: menuButtonInfo, header_background_type: header_background_type, diff --git a/components/diy/modules/tabs-view.vue b/components/diy/modules/tabs-view.vue index 49b3c6f7..9f778492 100644 --- a/components/diy/modules/tabs-view.vue +++ b/components/diy/modules/tabs-view.vue @@ -116,13 +116,13 @@ propIsBar: false, // 5,7,0 是误差,, 12 是下边距,60是高度,bar_height是不同小程序下的导航栏距离顶部的高度 // #ifdef MP - tabs_top: 'calc(' + bar_height + 5 + 12 + 'px + 66rpx);', + tabs_top: 'calc(' + (bar_height + 5 + 12) + 'px + 66rpx);', // #endif // #ifdef H5 || MP-TOUTIAO - tabs_top: 'calc(' + bar_height + 7 + 12 + 'px+ 66rpx);', + tabs_top: 'calc(' + (bar_height + 7 + 12) + 'px+ 66rpx);', // #endif // #ifdef APP - tabs_top: 'calc(' + bar_height + 0 + 12 + 'px+ 66rpx);', + tabs_top: 'calc(' + (bar_height + 0 + 12) + 'px+ 66rpx);', // #endif custom_nav_height: '66rpx', }; diff --git a/components/diy/tabs.vue b/components/diy/tabs.vue index 67e563b4..57989c42 100644 --- a/components/diy/tabs.vue +++ b/components/diy/tabs.vue @@ -6,14 +6,13 @@ -