From 000d7d8a7fdfdda09badc105634163960a847250 Mon Sep 17 00:00:00 2001
From: R524809 <R524809@hyundai-hmatc.com>
Date: Mon, 25 May 2026 15:03:43 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E4=B8=AA=E4=BA=BA?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E9=A1=B5=E3=80=81=E5=AF=BC=E8=88=AA=E6=A0=8F?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components3.0/nav-bar/nav-bar.less        |  2 +-
 miniprogram/components3.0/nav-bar/nav-bar.ts  |  7 ++--
 .../components3.0/nav-bar/nav-bar.wxml        |  2 +-
 miniprogram/pages/profile/profile.less        |  2 +-
 miniprogram/pages/profile/profile.ts          |  2 +-
 miniprogram/utils/navMetrics.ts               | 34 +++++++++++++++++--
 6 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/miniprogram/components3.0/nav-bar/nav-bar.less b/miniprogram/components3.0/nav-bar/nav-bar.less
index 4adce12..f10849b 100644
--- a/miniprogram/components3.0/nav-bar/nav-bar.less
+++ b/miniprogram/components3.0/nav-bar/nav-bar.less
@@ -14,7 +14,6 @@
 }
 
 .nav-bar__inner {
-    height: @nav-inner-height;
     display: flex;
     flex-direction: row;
     align-items: center;
@@ -71,6 +70,7 @@
     font-weight: @fw-nav-title;
     color: @color-nav-title;
     letter-spacing: @ls-nav-title;
+    line-height: 1;
     flex: 1;
     min-width: 0;
 }
diff --git a/miniprogram/components3.0/nav-bar/nav-bar.ts b/miniprogram/components3.0/nav-bar/nav-bar.ts
index e5736be..c135c27 100644
--- a/miniprogram/components3.0/nav-bar/nav-bar.ts
+++ b/miniprogram/components3.0/nav-bar/nav-bar.ts
@@ -1,4 +1,4 @@
-import { NAV_INNER_PX } from '../../utils/navMetrics';
+import { getNavInnerPx } from '../../utils/navMetrics';
 
 const HOME_TAB_URL = '/pages/home/home';
 const HOME_ROUTE = 'pages/home/home';
@@ -19,6 +19,7 @@ Component({
     },
     data: {
         statusBarHeight: 0,
+        navInnerHeight: 44,
         navBlockHeight: 0,
         leftActionType: 'none' as 'none' | 'back' | 'home' | 'brand',
         /** 仅首页（Tab 根页）在 logo 旁展示「涂鸦丫」；其余主 Tab 只展示 logo */
@@ -27,9 +28,11 @@ Component({
     lifetimes: {
         attached() {
             const { statusBarHeight } = wx.getWindowInfo();
+            const navInnerHeight = getNavInnerPx();
             this.setData({
                 statusBarHeight,
-                navBlockHeight: statusBarHeight + NAV_INNER_PX,
+                navInnerHeight,
+                navBlockHeight: statusBarHeight + navInnerHeight,
             });
             this.syncLeftAction();
         },
diff --git a/miniprogram/components3.0/nav-bar/nav-bar.wxml b/miniprogram/components3.0/nav-bar/nav-bar.wxml
index f33fe86..cd296b2 100644
--- a/miniprogram/components3.0/nav-bar/nav-bar.wxml
+++ b/miniprogram/components3.0/nav-bar/nav-bar.wxml
@@ -1,7 +1,7 @@
 <view
     class="nav-bar"
     style="padding-top: {{statusBarHeight}}px; {{background ? 'background:' + background + ';' : ''}}">
-    <view class="nav-bar__inner">
+    <view class="nav-bar__inner" style="height: {{navInnerHeight}}px;">
         <view wx:if="{{leftActionType === 'brand'}}" class="nav-bar__brand">
             <image
                 class="nav-bar__logo"
diff --git a/miniprogram/pages/profile/profile.less b/miniprogram/pages/profile/profile.less
index 375d58a..30b6ee1 100644
--- a/miniprogram/pages/profile/profile.less
+++ b/miniprogram/pages/profile/profile.less
@@ -331,7 +331,7 @@ page {
 .profile-editor {
     overflow-y: auto;
     padding: 32rpx 40rpx;
-    padding-bottom: env(safe-area-inset-bottom);
+    padding-bottom: calc(32rpx + env(safe-area-inset-bottom) + 120rpx);
     background: @bg-white;
     box-sizing: border-box;
 }
diff --git a/miniprogram/pages/profile/profile.ts b/miniprogram/pages/profile/profile.ts
index d419177..4f785fc 100644
--- a/miniprogram/pages/profile/profile.ts
+++ b/miniprogram/pages/profile/profile.ts
@@ -25,7 +25,7 @@ Page({
     onLoad() {
         this.syncUserInfoFromApp();
         const isDevEnv =
-            wx.getAccountInfoSync().miniProgram.envVersion !== 'release';
+            wx.getAccountInfoSync().miniProgram.envVersion === 'develop';
         this.setData({
             isDevEnv,
         });
diff --git a/miniprogram/utils/navMetrics.ts b/miniprogram/utils/navMetrics.ts
index 521e2a5..0b3bbcb 100644
--- a/miniprogram/utils/navMetrics.ts
+++ b/miniprogram/utils/navMetrics.ts
@@ -1,2 +1,32 @@
-/** 与 style/theme.less 中 @nav-inner-height 对齐（px） */
-export const NAV_INNER_PX = 44;
+/**
+ * 导航栏内容区高度（px）。
+ * 基于胶囊按钮位置计算：让 inner 的垂直中心与胶囊中心对齐，
+ * inner_height = (capsule.top - statusBarHeight) * 2 + capsule.height。
+ * 默认值 44 仅作兜底。
+ */
+
+let cachedInnerPx: number | null = null;
+
+function computeInnerPx(): number {
+    try {
+        const { statusBarHeight } = wx.getWindowInfo();
+        const rect = wx.getMenuButtonBoundingClientRect();
+        const inner = (rect.top - statusBarHeight) * 2 + rect.height;
+        if (inner > 0 && Number.isFinite(inner)) {
+            return Math.round(inner);
+        }
+    } catch (e) {
+        // ignore, fallback below
+    }
+    return 44;
+}
+
+export function getNavInnerPx(): number {
+    if (cachedInnerPx === null) {
+        cachedInnerPx = computeInnerPx();
+    }
+    return cachedInnerPx;
+}
+
+/** 兼容旧调用：保留常量导出，启动时取一次胶囊几何。 */
+export const NAV_INNER_PX = getNavInnerPx();