From 5222ec82b0c2c7aeac3469706e0f02ac8bade89b Mon Sep 17 00:00:00 2001
From: jacy <18049821889@163.com>
Date: Tue, 14 Jul 2026 17:35:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=95=86=E5=93=81=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=9D=A2=E7=9A=84=E5=88=86=E4=BA=AB=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/mini-user/config/index.ts                | 14 ++++++---
 apps/mini-user/src/app.css                    | 31 +++++++++++++++++++
 apps/mini-user/src/components/PageNavBar.tsx  |  4 ++-
 .../mini-user/src/components/RegionPicker.tsx |  2 +-
 apps/mini-user/src/lib/nav-bar.ts             | 11 +++++--
 apps/mini-user/src/styles/nav-bar.css         | 22 ++++++++++++-
 6 files changed, 75 insertions(+), 9 deletions(-)

diff --git a/apps/mini-user/config/index.ts b/apps/mini-user/config/index.ts
index 51b5602..dfbeb86 100644
--- a/apps/mini-user/config/index.ts
+++ b/apps/mini-user/config/index.ts
@@ -63,11 +63,17 @@ export default defineConfig(async () => ({
     },
   },
   h5: {
+    // 生产发版由 remote-release 注入 TARO_H5_PUBLIC_PATH=/user/、TARO_H5_ROUTER_BASENAME=/user
+    // 本地预览勿强制 basename，否则静态托管下易白屏
     publicPath: process.env.TARO_H5_PUBLIC_PATH || '/',
-    router: {
-      mode: 'browser',
-      basename: process.env.TARO_H5_ROUTER_BASENAME || '/',
-    },
+    ...(process.env.TARO_H5_ROUTER_BASENAME
+      ? {
+          router: {
+            mode: 'browser' as const,
+            basename: process.env.TARO_H5_ROUTER_BASENAME,
+          },
+        }
+      : {}),
     staticDirectory: 'static',
     devServer: {
       port: 5177,
diff --git a/apps/mini-user/src/app.css b/apps/mini-user/src/app.css
index eab96a0..ce40b8e 100644
--- a/apps/mini-user/src/app.css
+++ b/apps/mini-user/src/app.css
@@ -19,3 +19,34 @@ body {
   font-family: var(--font-body);
   margin: 0;
 }
+
+/* 全局隐藏滚动条（H5 + 小程序均可滚动，仅隐藏轨道） */
+html,
+page,
+body,
+#app,
+.taro_page,
+.taro_router,
+.taro-tabbar__panel {
+  scrollbar-width: none; /* Firefox */
+  -ms-overflow-style: none; /* legacy Edge */
+}
+
+html::-webkit-scrollbar,
+page::-webkit-scrollbar,
+body::-webkit-scrollbar,
+#app::-webkit-scrollbar,
+.taro_page::-webkit-scrollbar,
+.taro_router::-webkit-scrollbar,
+.taro-tabbar__panel::-webkit-scrollbar,
+*::-webkit-scrollbar {
+  width: 0 !important;
+  height: 0 !important;
+  display: none !important;
+  background: transparent;
+}
+
+* {
+  scrollbar-width: none;
+  -ms-overflow-style: none;
+}
diff --git a/apps/mini-user/src/components/PageNavBar.tsx b/apps/mini-user/src/components/PageNavBar.tsx
index 8203bb6..40397ff 100644
--- a/apps/mini-user/src/components/PageNavBar.tsx
+++ b/apps/mini-user/src/components/PageNavBar.tsx
@@ -41,7 +41,9 @@ export default function PageNavBar({
         ) : (
           <View className="page-nav-bar__btn page-nav-bar__btn--back page-nav-bar__btn--placeholder" />
         )}
-        {right ?? (
+        {right ? (
+          <View className="page-nav-bar__right-slot">{right}</View>
+        ) : (
           <View className="page-nav-bar__btn page-nav-bar__btn--right page-nav-bar__btn--placeholder" />
         )}
       </View>
diff --git a/apps/mini-user/src/components/RegionPicker.tsx b/apps/mini-user/src/components/RegionPicker.tsx
index 1fa3aba..af2c71d 100644
--- a/apps/mini-user/src/components/RegionPicker.tsx
+++ b/apps/mini-user/src/components/RegionPicker.tsx
@@ -167,7 +167,7 @@ export default function RegionPicker({
           </Text>
         </View>
 
-        <ScrollView className="region-picker-list" scrollY>
+        <ScrollView className="region-picker-list" scrollY showScrollbar={false}>
           {listItems.map((item) => (
             <View
               key={item}
diff --git a/apps/mini-user/src/lib/nav-bar.ts b/apps/mini-user/src/lib/nav-bar.ts
index cdbc4c8..710f146 100644
--- a/apps/mini-user/src/lib/nav-bar.ts
+++ b/apps/mini-user/src/lib/nav-bar.ts
@@ -18,7 +18,8 @@ const H5_FALLBACK: NavBarMetrics = {
   statusBarHeight: 0,
   navBarHeight: 56,
   navContentHeight: 56,
-  navBarPaddingRight: 16,
+  /** 避开微信内置浏览器右上角 ··· / 设置入口（约一颗胶囊宽） */
+  navBarPaddingRight: 96,
   navBarPaddingLeft: 16,
 };
 
@@ -33,7 +34,13 @@ const WEAPP_FALLBACK: NavBarMetrics = {
 /** 计算小程序自定义导航栏尺寸（对齐微信胶囊按钮） */
 export function getNavBarMetrics(): NavBarMetrics {
   if (process.env.TARO_ENV === 'h5') {
-    return H5_FALLBACK;
+    // H5：在微信浏览器内额外避让右上角菜单；非微信保持较小右侧留白
+    const inWechat =
+      typeof navigator !== 'undefined' && /MicroMessenger/i.test(navigator.userAgent || '');
+    return {
+      ...H5_FALLBACK,
+      navBarPaddingRight: inWechat ? 96 : 16,
+    };
   }
 
   try {
diff --git a/apps/mini-user/src/styles/nav-bar.css b/apps/mini-user/src/styles/nav-bar.css
index fb92f73..10a0d3a 100644
--- a/apps/mini-user/src/styles/nav-bar.css
+++ b/apps/mini-user/src/styles/nav-bar.css
@@ -127,6 +127,26 @@
   right: 0;
 }
 
+/* 右侧操作槽：固定贴着内容区右缘（内容区已用 navBarPaddingRight 避让微信菜单） */
+.page-nav-bar__right-slot {
+  position: absolute;
+  top: 50%;
+  right: 0;
+  transform: translateY(-50%);
+  z-index: 2;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.page-nav-bar__right-slot .page-nav-bar__btn {
+  position: relative;
+  top: auto;
+  left: auto;
+  right: auto;
+  transform: none;
+}
+
 .page-nav-bar--solid .page-nav-bar__btn {
   background: transparent;
 }
@@ -157,7 +177,7 @@
   height: var(--nav-content-height);
   line-height: var(--nav-content-height);
   text-align: center;
-  padding: 0 48px;
+  padding: 0 88px 0 56px;
   box-sizing: border-box;
   opacity: 0;
   font-family: var(--font-headline);