From e1f5130c181d806fb47754d65aeb01a19a32bd8d Mon Sep 17 00:00:00 2001
From: jacy <18049821889@163.com>
Date: Tue, 21 Jul 2026 08:07:07 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=A1=B6=E9=83=A8=E7=A9=BA?=
 =?UTF-8?q?=E7=99=BD=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/TabMainHeader.tsx          | 21 +++++++++----------
 apps/mini-user/src/pages/home/index.config.ts |  1 -
 apps/mini-user/src/pages/home/index.tsx       |  5 +----
 apps/mini-user/src/pages/mine/index.config.ts |  1 -
 apps/mini-user/src/pages/mine/index.tsx       | 10 ++-------
 .../src/pages/stores/index.config.ts          |  1 -
 apps/mini-user/src/pages/stores/index.tsx     |  5 +----
 apps/mini-user/src/styles/nav-bar.css         |  6 +++++-
 8 files changed, 19 insertions(+), 31 deletions(-)

diff --git a/apps/mini-user/src/components/TabMainHeader.tsx b/apps/mini-user/src/components/TabMainHeader.tsx
index c3e7d18..566c883 100644
--- a/apps/mini-user/src/components/TabMainHeader.tsx
+++ b/apps/mini-user/src/components/TabMainHeader.tsx
@@ -7,25 +7,24 @@ type TabMainHeaderProps = {
   extra?: ReactNode;
 };
 
-const isH5 = process.env.TARO_ENV === 'h5';
-
-/** Tab 页顶栏：适配刘海屏 + 微信胶囊避让；H5 不展示标题（与微信系统标题重复） */
+/**
+ * Tab 页顶栏：仅在有右侧扩展内容时渲染。
+ * 小程序 / H5 标题走系统导航栏，避免自定义顶栏造成顶部留白。
+ */
 export default function TabMainHeader({ title, extra }: TabMainHeaderProps) {
   const metrics = useNavBarMetrics();
 
-  // H5：系统标题已展示；无右侧内容时整栏不渲染，避免顶部留白
-  if (isH5 && !extra) {
+  if (!extra) {
     return null;
   }
 
   return (
     <View className="tab-main-header" style={navBarStyle(metrics)} aria-label={title}>
-      {!isH5 ? <Text className="tab-main-header__title">{title}</Text> : null}
-      <View
-        className="tab-main-header__content"
-        style={tabNavContentStyle(metrics)}
-      >
-        {extra ? <View className="tab-main-header__extra">{extra}</View> : null}
+      {process.env.TARO_ENV !== 'h5' ? (
+        <Text className="tab-main-header__title">{title}</Text>
+      ) : null}
+      <View className="tab-main-header__content" style={tabNavContentStyle(metrics)}>
+        <View className="tab-main-header__extra">{extra}</View>
       </View>
     </View>
   );
diff --git a/apps/mini-user/src/pages/home/index.config.ts b/apps/mini-user/src/pages/home/index.config.ts
index cbb7097..0d044a3 100644
--- a/apps/mini-user/src/pages/home/index.config.ts
+++ b/apps/mini-user/src/pages/home/index.config.ts
@@ -1,4 +1,3 @@
 export default definePageConfig({
-  navigationStyle: 'custom',
   navigationBarTitleText: '杜康好客',
 });
diff --git a/apps/mini-user/src/pages/home/index.tsx b/apps/mini-user/src/pages/home/index.tsx
index 4ed7c74..9baca05 100644
--- a/apps/mini-user/src/pages/home/index.tsx
+++ b/apps/mini-user/src/pages/home/index.tsx
@@ -65,10 +65,7 @@ export default function HomePage() {
   const onSale = tab === 'QINGXIANG';
 
   return (
-    <PageShell
-      variant="tab"
-      className={`home-page${process.env.TARO_ENV === 'h5' ? ' h5-no-tab-header' : ''}`}
-    >
+    <PageShell variant="tab" className="home-page no-tab-header">
       <TabMainHeader title="杜康好客" />
 
       <View className="home-aroma-nav">
diff --git a/apps/mini-user/src/pages/mine/index.config.ts b/apps/mini-user/src/pages/mine/index.config.ts
index 688777d..3844ede 100644
--- a/apps/mini-user/src/pages/mine/index.config.ts
+++ b/apps/mini-user/src/pages/mine/index.config.ts
@@ -1,4 +1,3 @@
 export default definePageConfig({
-  navigationStyle: 'custom',
   navigationBarTitleText: '我的',
 });
diff --git a/apps/mini-user/src/pages/mine/index.tsx b/apps/mini-user/src/pages/mine/index.tsx
index 3325e08..6f86af0 100644
--- a/apps/mini-user/src/pages/mine/index.tsx
+++ b/apps/mini-user/src/pages/mine/index.tsx
@@ -210,10 +210,7 @@ export default function MinePage() {
 
   if (!authed) {
     return (
-      <PageShell
-        variant="tab"
-        className={`mine-page${process.env.TARO_ENV === 'h5' ? ' h5-no-tab-header' : ''}`}
-      >
+      <PageShell variant="tab" className="mine-page no-tab-header">
         <TabMainHeader title="我的" />
         <View className="mine-header">
           <View className="mine-header-texture" />
@@ -250,10 +247,7 @@ export default function MinePage() {
   const memberLabel = hasWechat ? '好客会员' : canWxBind ? '微信未授权' : '未授权微信';
 
   return (
-    <PageShell
-      variant="tab"
-      className={`mine-page${process.env.TARO_ENV === 'h5' ? ' h5-no-tab-header' : ''}`}
-    >
+    <PageShell variant="tab" className="mine-page no-tab-header">
       <TabMainHeader title="我的" />
       <View className="mine-header">
         <View className="mine-header-texture" />
diff --git a/apps/mini-user/src/pages/stores/index.config.ts b/apps/mini-user/src/pages/stores/index.config.ts
index da2edd3..860f46f 100644
--- a/apps/mini-user/src/pages/stores/index.config.ts
+++ b/apps/mini-user/src/pages/stores/index.config.ts
@@ -1,4 +1,3 @@
 export default definePageConfig({
-  navigationStyle: 'custom',
   navigationBarTitleText: '门店',
 });
diff --git a/apps/mini-user/src/pages/stores/index.tsx b/apps/mini-user/src/pages/stores/index.tsx
index d1db545..d77a9f4 100644
--- a/apps/mini-user/src/pages/stores/index.tsx
+++ b/apps/mini-user/src/pages/stores/index.tsx
@@ -73,10 +73,7 @@ export default function StoresPage() {
   }
 
   return (
-    <PageShell
-      variant="tab"
-      className={`store-page${process.env.TARO_ENV === 'h5' ? ' h5-no-tab-header' : ''}`}
-    >
+    <PageShell variant="tab" className="store-page no-tab-header">
       <TabMainHeader title="门店" />
       <View className="store-toolbar">
         <View className="store-location" onClick={() => setRegionOpen(true)}>
diff --git a/apps/mini-user/src/styles/nav-bar.css b/apps/mini-user/src/styles/nav-bar.css
index 047b6e6..0fb7248 100644
--- a/apps/mini-user/src/styles/nav-bar.css
+++ b/apps/mini-user/src/styles/nav-bar.css
@@ -20,11 +20,15 @@
   padding-bottom: calc(88px + env(safe-area-inset-bottom, 0px));
 }
 
-/* H5 无 Tab 顶栏：贴顶，去掉标题栏留白 */
+/* 无自定义 Tab 顶栏：贴顶（标题走小程序/H5 系统导航栏） */
+.page-shell.no-tab-header,
 .page-shell.h5-no-tab-header {
   --nav-bar-height: 0px;
+  --nav-status-bar-height: 0px;
+  --nav-content-height: 0px;
 }
 
+.page-shell.no-tab-header .home-aroma-nav,
 .page-shell.h5-no-tab-header .home-aroma-nav {
   top: 0;
 }