From 3066154e5eb8df87f6dbf18fc8bc7568030e6077 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Thu, 17 Oct 2024 18:01:19 +0800
Subject: [PATCH] =?UTF-8?q?1.=E9=A1=B6=E9=83=A8=E5=AF=BC=E8=88=AA=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/diy/article-tabs.vue | 11 ++++++++++-
 components/diy/goods-tabs.vue   | 11 ++++++++++-
 components/diy/header.vue       |  3 +++
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/components/diy/article-tabs.vue b/components/diy/article-tabs.vue
index f13a9793..2c5ba72f 100644
--- a/components/diy/article-tabs.vue
+++ b/components/diy/article-tabs.vue
@@ -64,11 +64,20 @@
                 tabs_background: 'background:transparent',
                 custom_nav_height: 33,
                 diy_key: '',
+                // #ifdef MP
+                nav_safe_space: bar_height + 5,
+                // #endif
+                // #ifdef H5 || MP-TOUTIAO
+                nav_safe_space: bar_height + 7,
+                // #endif
+                // #ifdef APP
+                nav_safe_space: bar_height + 0,
+                // #endif
             };
         },
         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.nav_safe_space && 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 59cec5a3..05e7687a 100644
--- a/components/diy/goods-tabs.vue
+++ b/components/diy/goods-tabs.vue
@@ -67,11 +67,20 @@
                 tabs_background: 'background:transparent',
                 custom_nav_height: 33,
                 diy_key: '',
+                // #ifdef MP
+                nav_safe_space: bar_height + 5,
+                // #endif
+                // #ifdef H5 || MP-TOUTIAO
+                nav_safe_space: bar_height + 7,
+                // #endif
+                // #ifdef APP
+                nav_safe_space: bar_height + 0,
+                // #endif
             };
         },
         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.nav_safe_space && 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 1964fe1b..a048e79b 100644
--- a/components/diy/header.vue
+++ b/components/diy/header.vue
@@ -125,6 +125,7 @@
                 text_style: '',
                 header_style: 'max-width:100%',
                 common_app_is_header_nav_fixed: 0,
+                // 5,7,0 是误差，， 12 是下边距，66是高度，bar_height是不同小程序下的导航栏距离顶部的高度
                 // #ifdef MP
                 top_content_style: 'padding-top:' + (bar_height + 5) + 'px;padding-bottom:12px;',
                 // #endif
@@ -138,9 +139,11 @@
                 // 顶部背景样式类别
                 header_background_type: 'color_image',
                 // #ifdef MP
+                sticky_top: bar_height + 5,
                 header_top: bar_height + 5 + 12 + 33,
                 // #endif
                 // #ifdef H5 || MP-TOUTIAO
+                sticky_top: bar_height + 7 + 12,
                 header_top: bar_height + 7 + 12 + 33,
                 // #endif
                 // #ifdef APP