From 09ee2450832f6bc729ccdd3fab71c988c4ffbb9f Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Sat, 30 Jul 2022 22:16:24 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=E5=A4=B4=E6=9D=A1=E5=AF=BC?=
 =?UTF-8?q?=E8=88=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods-category/goods-category.css   |  7 ++-----
 pages/goods-category/goods-category.vue   |  6 +++---
 pages/index/index.css                     | 12 ++++++------
 pages/index/index.vue                     | 14 ++++++--------
 pages/plugins/realstore/detail/detail.css |  2 +-
 5 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/pages/goods-category/goods-category.css b/pages/goods-category/goods-category.css
index 7a5b5e4d..56cbafa9 100644
--- a/pages/goods-category/goods-category.css
+++ b/pages/goods-category/goods-category.css
@@ -6,17 +6,14 @@
     /* #ifdef MP-ALIPAY */
     padding-right: 255rpx;
     /* #endif */
-    /* #ifdef H5 || APP */
-    padding-right: 20rpx;
-    /* #endif */
-    /* #ifdef MP-TOUTIAO */
+    /* #ifdef H5 || MP-TOUTIAO || APP */
     padding-right: 20rpx;
     /* #endif */
     padding-bottom: 10px;
 }
 .category-content {
     height: calc(100vh - 68px);
-    /* #ifdef H5 || APP */
+    /* #ifdef H5 || MP-TOUTIAO || APP */
     height: calc(100vh - 98px) !important;
     /* #endif */
 }
diff --git a/pages/goods-category/goods-category.vue b/pages/goods-category/goods-category.vue
index 0d9a0547..7fc64709 100644
--- a/pages/goods-category/goods-category.vue
+++ b/pages/goods-category/goods-category.vue
@@ -193,9 +193,9 @@
     
     var common_static_url = app.globalData.get_static_url('common');
     // 状态栏高度
-    var bar_height = 0;
-    // #ifndef MP-TOUTIAO
-    bar_height = parseInt(app.globalData.get_system_info('statusBarHeight', 0));
+    var bar_height = parseInt(app.globalData.get_system_info('statusBarHeight', 0));
+    // #ifdef MP-TOUTIAO
+    bar_height = 0;
     // #endif
 
     export default {
diff --git a/pages/index/index.css b/pages/index/index.css
index 7ec3b19e..cdc5359e 100644
--- a/pages/index/index.css
+++ b/pages/index/index.css
@@ -5,9 +5,9 @@
     background-repeat: no-repeat;
     background-size: 100% auto;
     min-height: 410rpx;
-    padding-top: 8px;
-    /* #ifndef MP-TOUTIAO */
     padding-top: calc(var(--status-bar-height) + 8px);
+    /* #ifndef MP-TOUTIAO */
+    padding-top: 0;
     /* #endif */
 }
 .home-top-nav-title {
@@ -16,7 +16,7 @@
     padding: 2px 250rpx 0 20rpx;
     height: 37px;
     font-size: 42rpx;
-    /* #ifdef H5 || APP */
+    /* #ifdef H5 || MP-TOUTIAO || APP */
     font-size: 24px;
     padding-top: 0;
     /* #endif */
@@ -37,12 +37,12 @@
     background-repeat: no-repeat;
     background-size: 100% auto;
     padding-top: 25px;
-    /* #ifdef H5 || APP */
+    /* #ifdef H5 || MP-TOUTIAO || APP */
     padding-top: 15rpx !important;
     padding-bottom: 15rpx !important;
     /* #endif */
 }
-/* #ifdef H5 || APP */
+/* #ifdef H5 || MP-TOUTIAO || APP */
 .search-content-fixed .nav-top-right-icon {
     top: 9px !important;
 }
@@ -51,7 +51,7 @@
 /**
  * 消息
  */
-/* #ifdef H5 || APP */
+/* #ifdef H5 || MP-TOUTIAO || APP */
 .nav-top-right-icon {
     top: -34px;
     right: 28rpx;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index f9b8b883..6c906982 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -15,7 +15,7 @@
                         </view>
                     </view>
 
-                    <!-- #ifdef H5 || APP -->
+                    <!-- #ifdef H5 || MP-TOUTIAO || APP -->
                     <!-- 右上角icon列表 -->
                     <view v-if="(right_icon_list || null) != null && right_icon_list.length > 0" class="nav-top-right-icon pa">
                         <block v-for="(item,index) in right_icon_list">
@@ -298,9 +298,9 @@
     var common_static_url = app.globalData.get_static_url('common');
     var static_url = app.globalData.get_static_url('home');
     // 状态栏高度
-    var bar_height = 0;
-    // #ifndef MP-TOUTIAO
-    bar_height = parseInt(app.globalData.get_system_info('statusBarHeight', 0));
+    var bar_height = parseInt(app.globalData.get_system_info('statusBarHeight', 0));
+    // #ifdef MP-TOUTIAO
+    bar_height = 0;
     // #endif
 
     export default {
@@ -500,7 +500,6 @@
             
             // 页面滚动监听
             onPageScroll(e) {
-                // #ifndef MP-TOUTIAO
                 if(this.common_app_is_header_nav_fixed == 1 && this.common_app_is_enable_search == 1) {
                     var top = e.scrollTop > 35 ? 35 : e.scrollTop;
                     var num = top*7;
@@ -508,7 +507,7 @@
                     // #ifdef MP-ALIPAY
                         base = 235
                     // #endif
-                    // #ifdef H5 || APP
+                    // #ifdef H5 || MP-TOUTIAO || APP
                         var len = (this.right_icon_list || []).length;
                         base = (len <= 0) ? 0 : 66*len;
                     // #endif
@@ -520,8 +519,7 @@
                             search_is_fixed: (top >= 35) ? 1 : 0,
                         });
                     }
-                }
-                // #endif
+                }
             },
             
             // url事件
diff --git a/pages/plugins/realstore/detail/detail.css b/pages/plugins/realstore/detail/detail.css
index 289d3891..d04c6b2b 100644
--- a/pages/plugins/realstore/detail/detail.css
+++ b/pages/plugins/realstore/detail/detail.css
@@ -34,7 +34,7 @@
 }
 .nav-search {
     width: calc(100% - 90rpx);
-    /* #ifdef MP-ALIPAY || MP-TOUTIAO */
+    /* #ifdef MP-ALIPAY || MP-TOUTIAO || H5 || APP */
     width: 100%;
     /* #endif */
 }