diff --git a/components/diy/article-tabs.vue b/components/diy/article-tabs.vue
index b64d9b06..f13a9793 100644
--- a/components/diy/article-tabs.vue
+++ b/components/diy/article-tabs.vue
@@ -68,7 +68,7 @@
},
watch: {
propScrollTop(newVal) {
- if (newVal + this.propTop + this.custom_nav_height >= this.tabs_top && this.top_up == '1') {
+ 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 = '';
@@ -82,8 +82,12 @@
this.setData({
tabs_background: (new_tabs_background.length > 0 ? new_tabs_background : 'background:#fff;') + new_tabs_background_img,
});
+ console.log(1);
} else {
- this.tabs_background = 'background:transparent';
+ this.setData({
+ tabs_background: 'background:transparent',
+ });
+ console.log(2);
}
},
propkey(val) {
diff --git a/components/diy/diy.vue b/components/diy/diy.vue
index dbbdace2..1245263b 100644
--- a/components/diy/diy.vue
+++ b/components/diy/diy.vue
@@ -289,14 +289,15 @@
// 判断顶部导航是否置顶
is_header_top: parseInt(this.propValue.header.com_data.style.up_slide_display) == 1 ? true : false,
temp_sticky_top: this.sticky_top,
- // temp_header_top: `calc(${this.sticky_top}px + 66rpx + ${parseInt(this.propValue.header.com_data.style.data_alone_row_space || 5) * 2}rpx + ${this.propValue.header.com_data.content.data_alone_row_value.length > 0 ? '66rpx' : '0rpx'});`,
- temp_header_top: `calc(${this.sticky_top}px + 66rpx + 40rpx + 66rpx);`,
- header_top: `calc(${this.sticky_top}px + 66rpx + 40rpx + 66rpx);`,
+ temp_header_top: `calc(${this.sticky_top}px + 66rpx + ${parseInt(this.propValue.header.com_data.style.data_alone_row_space || 5) * 2}rpx + ${this.propValue.header.com_data.content.data_alone_row_value.length > 0 ? '66rpx' : '0rpx'});`,
+ header_top: `calc(${this.sticky_top}px + 66rpx + ${parseInt(this.propValue.header.com_data.style.data_alone_row_space || 5) * 2}rpx + ${this.propValue.header.com_data.content.data_alone_row_value.length > 0 ? '66rpx' : '0rpx'});`,
+ // temp_header_top: `calc(${this.sticky_top}px + 66rpx + 40rpx + 66rpx);`,
+ // header_top: `calc(${this.sticky_top}px + 66rpx + 40rpx + 66rpx);`,
// 顶部导航高度是否变化--------------------------------------------------
- // is_search_alone_row: this.propValue.header.com_data.content.data_alone_row_value.length > 0 ? true : false,
- // data_alone_row_space: parseInt(this.propValue.header.com_data.style.data_alone_row_space || 5),
- is_search_alone_row: true,
- data_alone_row_space: 20,
+ is_search_alone_row: this.propValue.header.com_data.content.data_alone_row_value.length > 0 ? true : false,
+ data_alone_row_space: parseInt(this.propValue.header.com_data.style.data_alone_row_space || 5),
+ // is_search_alone_row: true,
+ // data_alone_row_space: 20,
});
// 缓存数据
diff --git a/components/diy/goods-tabs.vue b/components/diy/goods-tabs.vue
index 4a08f7fe..59cec5a3 100644
--- a/components/diy/goods-tabs.vue
+++ b/components/diy/goods-tabs.vue
@@ -71,7 +71,7 @@
},
watch: {
propScrollTop(newVal) {
- if (newVal + this.propTop + this.custom_nav_height >= this.tabs_top && this.top_up == '1') {
+ 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 = '';
@@ -86,7 +86,9 @@
tabs_background: (new_tabs_background.length > 0 ? new_tabs_background : 'background:#fff;') + new_tabs_background_img,
});
} else {
- this.tabs_background = 'background:transparent';
+ this.setData({
+ tabs_background: 'background:transparent',
+ });
}
},
propkey(val) {
diff --git a/components/diy/header.vue b/components/diy/header.vue
index fc577c33..88adf007 100644
--- a/components/diy/header.vue
+++ b/components/diy/header.vue
@@ -72,13 +72,13 @@
-
+
-
+
@@ -155,6 +155,7 @@
// 判断header的查询是否独行
is_search_alone_row: false,
is_icon_alone_row: false,
+ data_alone_row_space: 0,
};
},
watch: {
@@ -219,7 +220,8 @@
header_background_type: header_background_type,
is_immersion_model: header_background_type !== 'color_image' && immersive_style == '1',
is_search_alone_row: new_content.data_alone_row_value.includes('search'),
- is_icon_alone_row: new_content.data_alone_row_value.includes('icon')
+ is_icon_alone_row: new_content.data_alone_row_value.includes('icon'),
+ data_alone_row_space: new_style.data_alone_row_space,
});
this.$emit('immersion-model-call-back', this.is_immersion_model);
},
diff --git a/components/diy/tabs.vue b/components/diy/tabs.vue
index 5c2a5d0f..6bc8f307 100644
--- a/components/diy/tabs.vue
+++ b/components/diy/tabs.vue
@@ -29,8 +29,8 @@
},
// 置顶距离顶部高度
propTop: {
- type: Number,
- default: 0,
+ type: String,
+ default: '0',
},
// 是否导航栏置顶
propNavIsTop: {