From f0d64379a75eb72ad8dd05028beab1d3c03d4442 Mon Sep 17 00:00:00 2001
From: wuzilong <704541015@qq.com>
Date: Sat, 12 Sep 2026 18:54:21 +0800
Subject: [PATCH] fix(miniprogram): adapt bx topbar for WeChat capsule safe
 area

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../components/bx-ui/bx-wf-config-page.vue        |  7 ++++---
 miniprogram/pages/bx/admin/expense-item.vue       |  9 ++++++---
 miniprogram/pages/bx/advance/apply.vue            |  4 +++-
 miniprogram/pages/bx/advance/detail.vue           |  4 +++-
 miniprogram/pages/bx/advance/list.vue             |  7 ++++---
 miniprogram/pages/bx/all/list.vue                 |  7 ++++---
 miniprogram/pages/bx/invoice/admin.vue            |  7 ++++---
 miniprogram/pages/bx/invoice/mine.vue             |  6 ++++--
 miniprogram/pages/bx/mine/list.vue                |  7 ++++---
 miniprogram/pages/bx/reimburse/apply.vue          |  4 +++-
 miniprogram/pages/bx/reimburse/detail.vue         |  4 +++-
 miniprogram/pages/bx/reimburse/list.vue           |  7 ++++---
 miniprogram/styles/bx-theme.scss                  | 15 +++++----------
 13 files changed, 51 insertions(+), 37 deletions(-)

diff --git a/miniprogram/components/bx-ui/bx-wf-config-page.vue b/miniprogram/components/bx-ui/bx-wf-config-page.vue
index 717e93753..18a26fd9e 100644
--- a/miniprogram/components/bx-ui/bx-wf-config-page.vue
+++ b/miniprogram/components/bx-ui/bx-wf-config-page.vue
@@ -1,6 +1,6 @@
 <template>
   <view class="bx-page">
-    <view class="topbar">
+    <view class="topbar" :style="safeAreaStyle">
       <view class="topbar-left">
         <view class="topbar-back" @click="onBack">
           <text class="topbar-back-icon">‹</text>
@@ -160,7 +160,6 @@
         <view class="bx-sheet__title">选择审批人</view>
         <view class="search-wrap" style="padding: 8px 16px 0">
           <view class="search-box">
-            <text class="search-box__icon">⌕</text>
             <input
               v-model="approverKeyword"
               class="search-input"
@@ -197,6 +196,8 @@ import { ref, reactive, computed, onMounted } from 'vue'
 import { workflowApi, fetchPortalUserOptions } from '@/api/bx'
 import { statusLabel, adminStatusTagClass } from '@/utils/bxFormat'
 import { PAGE_PATHS } from '@/config/api'
+import { getSafeAreaStyle } from '@/utils/safeArea'
+const safeAreaStyle = getSafeAreaStyle()
 
 const props = defineProps({
   bizType: { type: String, required: true },
@@ -452,7 +453,7 @@ async function moveDown(node) {
 }
 
 function onBack() {
-  uni.navigateBack({ fail: () => uni.switchTab({ url: PAGE_PATHS.workbench }) })
+  uni.navigateBack({ fail: () => uni.reLaunch({ url: PAGE_PATHS.workbench }) })
 }
 
 onMounted(() => {
diff --git a/miniprogram/pages/bx/admin/expense-item.vue b/miniprogram/pages/bx/admin/expense-item.vue
index c5487b72e..c84a546af 100644
--- a/miniprogram/pages/bx/admin/expense-item.vue
+++ b/miniprogram/pages/bx/admin/expense-item.vue
@@ -1,6 +1,6 @@
 <template>
   <view class="bx-page">
-    <view class="topbar">
+    <view class="topbar" :style="safeAreaStyle">
       <view class="topbar-left">
         <view class="topbar-back" @click="onBack">
           <text class="topbar-back-icon">‹</text>
@@ -216,6 +216,9 @@ import { ref, reactive, computed, onMounted } from 'vue'
 import { expenseItemApi } from '@/api/bx'
 import { statusLabel, adminStatusTagClass } from '@/utils/bxFormat'
 import { PAGE_PATHS } from '@/config/api'
+import { getSafeAreaStyle, getGlobalSafeArea } from '@/utils/safeArea'
+
+const safeAreaStyle = getSafeAreaStyle()
 
 const expenseTree = ref([])
 const loading = ref(false)
@@ -258,7 +261,7 @@ const dialogTitle = computed(() => {
 function measureListHeight() {
   try {
     const sys = uni.getSystemInfoSync()
-    const topbar = 44 + (sys.statusBarHeight || 0)
+    const topbar = getGlobalSafeArea().headerHeight
     listHeight.value = `${Math.max(320, (sys.windowHeight || 600) - topbar)}px`
   } catch (e) {
     listHeight.value = '70vh'
@@ -417,7 +420,7 @@ function handleDelete(item) {
 }
 
 function onBack() {
-  uni.navigateBack({ fail: () => uni.switchTab({ url: PAGE_PATHS.workbench }) })
+  uni.navigateBack({ fail: () => uni.reLaunch({ url: PAGE_PATHS.workbench }) })
 }
 
 onMounted(() => {
diff --git a/miniprogram/pages/bx/advance/apply.vue b/miniprogram/pages/bx/advance/apply.vue
index 7abc4a1b0..e6110fb64 100644
--- a/miniprogram/pages/bx/advance/apply.vue
+++ b/miniprogram/pages/bx/advance/apply.vue
@@ -1,6 +1,6 @@
 <template>
   <view class="bx-page bx-page--form">
-    <view class="topbar">
+    <view class="topbar" :style="safeAreaStyle">
       <view class="topbar-left">
         <view class="topbar-back" @click="goBack">
           <text class="topbar-back-icon">‹</text>
@@ -89,6 +89,8 @@ import { ref, reactive, computed } from 'vue'
 import { onLoad } from '@dcloudio/uni-app'
 import { PAGE_PATHS } from '@/config/api'
 import { advanceApi, attachmentApi } from '@/api/bx'
+import { getSafeAreaStyle } from '@/utils/safeArea'
+const safeAreaStyle = getSafeAreaStyle()
 
 const MAX_ATTACHMENTS = 10
 const editId = ref('')
diff --git a/miniprogram/pages/bx/advance/detail.vue b/miniprogram/pages/bx/advance/detail.vue
index ff5bcd7fb..bdfe7dcb0 100644
--- a/miniprogram/pages/bx/advance/detail.vue
+++ b/miniprogram/pages/bx/advance/detail.vue
@@ -1,6 +1,6 @@
 <template>
   <view class="bx-page bx-page--form">
-    <view class="topbar">
+    <view class="topbar" :style="safeAreaStyle">
       <view class="topbar-left">
         <view class="topbar-back" @click="goBack">
           <text class="topbar-back-icon">‹</text>
@@ -197,6 +197,8 @@ import { onLoad } from '@dcloudio/uni-app'
 import { PAGE_PATHS } from '@/config/api'
 import { advanceApi, attachmentApi } from '@/api/bx'
 import {
+import { getSafeAreaStyle } from '@/utils/safeArea'
+const safeAreaStyle = getSafeAreaStyle()
   statusLabel,
   ticketHeaderStatusToneClass,
   formatAmount,
diff --git a/miniprogram/pages/bx/advance/list.vue b/miniprogram/pages/bx/advance/list.vue
index 884794847..2ef584d11 100644
--- a/miniprogram/pages/bx/advance/list.vue
+++ b/miniprogram/pages/bx/advance/list.vue
@@ -1,6 +1,6 @@
 <template>
   <view class="bx-page">
-    <view class="topbar">
+    <view class="topbar" :style="safeAreaStyle">
       <view class="topbar-left">
         <view class="topbar-back" @click="goBack">
           <text class="topbar-back-icon">‹</text>
@@ -14,7 +14,6 @@
 
     <view class="search-wrap">
       <view class="search-box">
-        <text class="search-box__icon">⌕</text>
         <input
           class="search-input"
           v-model="keyword"
@@ -132,6 +131,8 @@ import { onShow } from '@dcloudio/uni-app'
 import { PAGE_PATHS } from '@/config/api'
 import { advanceApi } from '@/api/bx'
 import {
+import { getSafeAreaStyle } from '@/utils/safeArea'
+const safeAreaStyle = getSafeAreaStyle()
   statusLabel,
   workflowListStatusTagClass,
   formatAmount,
@@ -240,7 +241,7 @@ function clearKeyword() {
 }
 
 function goBack() {
-  uni.navigateBack({ fail: () => uni.switchTab({ url: PAGE_PATHS.workbench }) })
+  uni.navigateBack({ fail: () => uni.reLaunch({ url: PAGE_PATHS.workbench }) })
 }
 
 function goApply(id) {
diff --git a/miniprogram/pages/bx/all/list.vue b/miniprogram/pages/bx/all/list.vue
index ff6326ecc..81c8272df 100644
--- a/miniprogram/pages/bx/all/list.vue
+++ b/miniprogram/pages/bx/all/list.vue
@@ -1,6 +1,6 @@
 <template>
   <view class="bx-page">
-    <view class="topbar">
+    <view class="topbar" :style="safeAreaStyle">
       <view class="topbar-left">
         <view class="topbar-back" @click="goBack">
           <text class="topbar-back-icon">‹</text>
@@ -36,7 +36,6 @@
 
     <view class="search-wrap">
       <view class="search-box">
-        <text class="search-box__icon">⌕</text>
         <input
           class="search-input"
           v-model="keyword"
@@ -207,6 +206,8 @@ import { onShow } from '@dcloudio/uni-app'
 import { PAGE_PATHS } from '@/config/api'
 import { advanceApi, reimburseApi, expenseItemApi } from '@/api/bx'
 import {
+import { getSafeAreaStyle } from '@/utils/safeArea'
+const safeAreaStyle = getSafeAreaStyle()
   statusLabel,
   ticketHeaderStatusToneClass,
   workflowListStatusTagClass,
@@ -406,7 +407,7 @@ function clearKeyword() {
 }
 
 function goBack() {
-  uni.navigateBack({ fail: () => uni.switchTab({ url: PAGE_PATHS.workbench }) })
+  uni.navigateBack({ fail: () => uni.reLaunch({ url: PAGE_PATHS.workbench }) })
 }
 
 function goDetail(item) {
diff --git a/miniprogram/pages/bx/invoice/admin.vue b/miniprogram/pages/bx/invoice/admin.vue
index 22411551c..eed4dbe65 100644
--- a/miniprogram/pages/bx/invoice/admin.vue
+++ b/miniprogram/pages/bx/invoice/admin.vue
@@ -1,6 +1,6 @@
 <template>
   <view class="bx-page">
-    <view class="topbar">
+    <view class="topbar" :style="safeAreaStyle">
       <view class="topbar-left">
         <view class="topbar-back" @click="onBack">
           <text class="topbar-back-icon">‹</text>
@@ -16,7 +16,6 @@
     <template v-if="!detailUser">
       <view class="search-wrap">
         <view class="search-box">
-          <text class="search-box__icon">⌕</text>
           <input
             class="search-input"
             v-model="keyword"
@@ -221,6 +220,8 @@
 <script setup>
 import { reactive, ref, onMounted } from 'vue'
 import { attachmentApi, invoiceApi, invoiceWalletApi } from '@/api/bx'
+import { getSafeAreaStyle } from '@/utils/safeArea'
+const safeAreaStyle = getSafeAreaStyle()
 
 const PAGE_SIZE = 5
 
@@ -509,7 +510,7 @@ function onBack() {
     resetWalletList()
     return
   }
-  uni.navigateBack({ fail: () => uni.switchTab({ url: '/pages/index/index' }) })
+  uni.navigateBack({ fail: () => uni.reLaunch({ url: '/pages/workbench/workbench' }) })
 }
 
 function onDelete(inv) {
diff --git a/miniprogram/pages/bx/invoice/mine.vue b/miniprogram/pages/bx/invoice/mine.vue
index 855e71828..850087ea5 100644
--- a/miniprogram/pages/bx/invoice/mine.vue
+++ b/miniprogram/pages/bx/invoice/mine.vue
@@ -1,6 +1,6 @@
 <template>
   <view class="bx-page">
-    <view class="topbar">
+    <view class="topbar" :style="safeAreaStyle">
       <view class="topbar-left">
         <view class="topbar-back" @click="goBack">
           <text class="topbar-back-icon">‹</text>
@@ -217,6 +217,8 @@
 <script setup>
 import { reactive, ref, onMounted } from 'vue'
 import { attachmentApi, invoiceApi, invoiceWalletApi } from '@/api/bx'
+import { getSafeAreaStyle } from '@/utils/safeArea'
+const safeAreaStyle = getSafeAreaStyle()
 
 const PAGE_SIZE = 5
 
@@ -251,7 +253,7 @@ const uploadPaths = ref([])
 const uploading = ref(false)
 
 function goBack() {
-  uni.navigateBack({ fail: () => uni.switchTab({ url: '/pages/index/index' }) })
+  uni.navigateBack({ fail: () => uni.reLaunch({ url: '/pages/workbench/workbench' }) })
 }
 
 function money(v) {
diff --git a/miniprogram/pages/bx/mine/list.vue b/miniprogram/pages/bx/mine/list.vue
index f7258d7b5..9489c98d2 100644
--- a/miniprogram/pages/bx/mine/list.vue
+++ b/miniprogram/pages/bx/mine/list.vue
@@ -1,6 +1,6 @@
 <template>
   <view class="bx-page">
-    <view class="topbar">
+    <view class="topbar" :style="safeAreaStyle">
       <view class="topbar-left">
         <view class="topbar-back" @click="goBack">
           <text class="topbar-back-icon">‹</text>
@@ -31,7 +31,6 @@
 
     <view class="search-wrap">
       <view class="search-box">
-        <text class="search-box__icon">⌕</text>
         <input
           class="search-input"
           v-model="keyword"
@@ -248,6 +247,8 @@ import { onShow } from '@dcloudio/uni-app'
 import { PAGE_PATHS } from '@/config/api'
 import { advanceApi, reimburseApi, expenseItemApi } from '@/api/bx'
 import {
+import { getSafeAreaStyle } from '@/utils/safeArea'
+const safeAreaStyle = getSafeAreaStyle()
   statusLabel,
   workflowListStatusTagClass,
   formatAmount,
@@ -402,7 +403,7 @@ function clearKeyword() {
 }
 
 function goBack() {
-  uni.navigateBack({ fail: () => uni.switchTab({ url: PAGE_PATHS.workbench }) })
+  uni.navigateBack({ fail: () => uni.reLaunch({ url: PAGE_PATHS.workbench }) })
 }
 
 function onFabAdd() {
diff --git a/miniprogram/pages/bx/reimburse/apply.vue b/miniprogram/pages/bx/reimburse/apply.vue
index ca6e6cb66..9cb3bc2e8 100644
--- a/miniprogram/pages/bx/reimburse/apply.vue
+++ b/miniprogram/pages/bx/reimburse/apply.vue
@@ -1,6 +1,6 @@
 <template>
   <view class="bx-page bx-page--form">
-    <view class="topbar">
+    <view class="topbar" :style="safeAreaStyle">
       <view class="topbar-left">
         <view class="topbar-back" @click="goBack">
           <text class="topbar-back-icon">‹</text>
@@ -261,6 +261,8 @@ import {
   invoiceApi
 } from '@/api/bx'
 import {
+import { getSafeAreaStyle } from '@/utils/safeArea'
+const safeAreaStyle = getSafeAreaStyle()
   normalizeExpenseItem,
   flattenExpenseTree,
   formatExpenseName
diff --git a/miniprogram/pages/bx/reimburse/detail.vue b/miniprogram/pages/bx/reimburse/detail.vue
index 51841b583..dab708d8b 100644
--- a/miniprogram/pages/bx/reimburse/detail.vue
+++ b/miniprogram/pages/bx/reimburse/detail.vue
@@ -1,6 +1,6 @@
 <template>
   <view class="bx-page bx-page--form">
-    <view class="topbar">
+    <view class="topbar" :style="safeAreaStyle">
       <view class="topbar-left">
         <view class="topbar-back" @click="goBack">
           <text class="topbar-back-icon">‹</text>
@@ -220,6 +220,8 @@ import { onLoad } from '@dcloudio/uni-app'
 import { PAGE_PATHS } from '@/config/api'
 import { reimburseApi, attachmentApi, expenseItemApi } from '@/api/bx'
 import {
+import { getSafeAreaStyle } from '@/utils/safeArea'
+const safeAreaStyle = getSafeAreaStyle()
   statusLabel,
   ticketHeaderStatusToneClass,
   formatAmount,
diff --git a/miniprogram/pages/bx/reimburse/list.vue b/miniprogram/pages/bx/reimburse/list.vue
index ea2814a5d..87f49195d 100644
--- a/miniprogram/pages/bx/reimburse/list.vue
+++ b/miniprogram/pages/bx/reimburse/list.vue
@@ -1,6 +1,6 @@
 <template>
   <view class="bx-page">
-    <view class="topbar">
+    <view class="topbar" :style="safeAreaStyle">
       <view class="topbar-left">
         <view class="topbar-back" @click="goBack">
           <text class="topbar-back-icon">‹</text>
@@ -14,7 +14,6 @@
 
     <view class="search-wrap">
       <view class="search-box">
-        <text class="search-box__icon">⌕</text>
         <input
           class="search-input"
           v-model="keyword"
@@ -147,6 +146,8 @@ import { onShow } from '@dcloudio/uni-app'
 import { PAGE_PATHS } from '@/config/api'
 import { reimburseApi, expenseItemApi } from '@/api/bx'
 import {
+import { getSafeAreaStyle } from '@/utils/safeArea'
+const safeAreaStyle = getSafeAreaStyle()
   statusLabel,
   workflowListStatusTagClass,
   formatAmount,
@@ -269,7 +270,7 @@ function clearKeyword() {
 }
 
 function goBack() {
-  uni.navigateBack({ fail: () => uni.switchTab({ url: PAGE_PATHS.workbench }) })
+  uni.navigateBack({ fail: () => uni.reLaunch({ url: PAGE_PATHS.workbench }) })
 }
 
 function goApply(id) {
diff --git a/miniprogram/styles/bx-theme.scss b/miniprogram/styles/bx-theme.scss
index 3f7813bc7..c1bd55d50 100644
--- a/miniprogram/styles/bx-theme.scss
+++ b/miniprogram/styles/bx-theme.scss
@@ -76,10 +76,11 @@
   top: 0;
   z-index: 50;
   display: grid;
-  grid-template-columns: 1fr auto 1fr;
+  grid-template-columns: minmax(0, 1fr) auto var(--sq-capsule-right-safe, 96px);
   align-items: center;
-  height: calc(58px + env(safe-area-inset-top, 0px));
-  padding: env(safe-area-inset-top, 0px) 12px 0;
+  height: var(--sq-header-height, calc(44px + 44px));
+  padding: var(--sq-safe-top, 44px) 12px 0;
+  box-sizing: border-box;
   background: rgba(255, 255, 255, 0.92);
   box-shadow: 0 1px 0 rgba(217, 232, 226, 0.85), 0 8px 20px rgba(15, 23, 42, 0.06);
 }
@@ -90,7 +91,7 @@
   left: 0;
   right: 0;
   top: 0;
-  height: calc(58px + env(safe-area-inset-top, 0px));
+  height: var(--sq-header-height, calc(44px + 44px));
   background: linear-gradient(
     135deg,
     rgba(16, 185, 129, 0.1),
@@ -164,12 +165,6 @@
   height: 40px;
 }
 
-.bx-page .search-box__icon {
-  color: var(--text-muted);
-  font-size: 14px;
-  flex-shrink: 0;
-}
-
 .bx-page .search-box input,
 .bx-page .search-box .search-input {
   flex: 1;