From 75f5f6dbf70e57131ceecc95d5b52c0034ef62f4 Mon Sep 17 00:00:00 2001
From: cursor <yiyezhiqiutel@163.com>
Date: Tue, 9 Jun 2026 02:51:39 +0800
Subject: [PATCH] =?UTF-8?q?fix(R19):=20=E9=A1=B6=E9=83=A8=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE+=E9=AB=98=E5=BA=A6=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.vue | 12 ++++--------
 pages/staff/login.vue |  2 +-
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index d48de63..98e8e70 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,6 +1,6 @@
 <template>
   <view class="page-index">
-    <view class="nav-bar" :style="{ top: statusBarHeight + 'px' }">
+    <view class="nav-bar" :style="{ top: navBarHeight + 'px' }">
       <view class="nav-left">
         <text class="nav-logo">🍸</text>
         <text class="nav-brand">纯瘾大</text>
@@ -76,7 +76,7 @@ export default {
     const generated = ref(false)
     const inputNo = ref('')
     const cardNo = ref('')
-    const statusBarHeight = ref(0)
+    const navBarHeight = ref(44) // 默认导航栏高度
     let navTimer = null
 
     function goMenu() {
@@ -122,18 +122,14 @@ export default {
     function goMyOrders() { uni.navigateTo({ url: '/pages/orders/orders' }) }
     function goStaffLogin() { uni.navigateTo({ url: '/pages/staff/login' }) }
 
-    return { showModal, generated, inputNo, cardNo, statusBarHeight, onGenerate, onCheck, onMaskTap, goMyOrders, goStaffLogin }
-  },
-  created() {
-    const systemInfo = uni.getSystemInfoSync()
-    this.statusBarHeight = systemInfo.statusBarHeight
+    return { showModal, generated, inputNo, cardNo, navBarHeight, onGenerate, onCheck, onMaskTap, goMyOrders, goStaffLogin }
   }
 }
 </script>
 
 <style scoped>
 
-.page-index{min-height:100vh;display:flex;flex-direction:column;background:var(--bg);width:100%}
+.page-index{height:calc(100vh - 44px);display:flex;flex-direction:column;background:var(--bg);width:100%}
 .nav-bar{height:100rpx;position:fixed;top:0;z-index:100;background:var(--bg);display:flex;align-items:center;justify-content:space-between;padding:0 28rpx;border-bottom:1px solid var(--border);width:100%}
 .nav-left{display:flex;align-items:center;gap:16rpx}
 .nav-logo{font-size:44rpx}
diff --git a/pages/staff/login.vue b/pages/staff/login.vue
index a7f0c2a..8407fd6 100644
--- a/pages/staff/login.vue
+++ b/pages/staff/login.vue
@@ -61,7 +61,7 @@ export default {
 
 <style scoped>
 
-.page-staff-login{min-height:100vh;display:flex;flex-direction:column;background:var(--bg);width:100%}
+.page-staff-login{height:calc(100vh - 44px);display:flex;flex-direction:column;background:var(--bg);width:100%}
 .login-container{flex:1;display:flex;flex-direction:column;align-items:center;justify-content:center;padding:80rpx 64rpx}
 .login-logo{font-size:120rpx;animation:float 3s ease-in-out infinite}
 .login-title{font-size:44rpx;font-weight:800;color:var(--gold);margin:24rpx 0 8rpx}