From 837bed87a6b601d53f79d52d5f1bec8ba1b1bf4b Mon Sep 17 00:00:00 2001
From: bb_pan <max_163email@163.com>
Date: Thu, 7 Aug 2025 08:05:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/materialsStation/index/index.vue |  4 +++-
 src/pages/my/index.vue                     | 17 +++++++++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/pages/materialsStation/index/index.vue b/src/pages/materialsStation/index/index.vue
index 3eb7481..5c942ce 100644
--- a/src/pages/materialsStation/index/index.vue
+++ b/src/pages/materialsStation/index/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div v-if="isIOS" :style="{ height: statusBarHeight }"></div>
-  <view class="page-bg">
+  <view class="page-bg" :style="{ height: `calc(100vh - ${statusBarHeight} - 50px)` }">
     <div class="top-content">
       <view class="upper-user">
         <view class="user-rig">
@@ -86,9 +86,11 @@ const isIOS = ref(/iphone/.test(userAgent))
 let statusBarHeight = ref('50px')
 // #ifdef MP-WEIXIN
 statusBarHeight.value = uni.getWindowInfo().statusBarHeight + 'px'
+console.log('🚀 ~ statusBarHeight.value:', statusBarHeight.value)
 // #endif
 // #ifndef MP-WEIXIN
 statusBarHeight.value = uni.getSystemInfoSync().statusBarHeight + 'px'
+console.log('🚀 ~ statusBarHeight.value:', statusBarHeight.value)
 // #endif
 
 function jumpUrl(path) {
diff --git a/src/pages/my/index.vue b/src/pages/my/index.vue
index d1ec1be..f323b27 100644
--- a/src/pages/my/index.vue
+++ b/src/pages/my/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <view class="content">
+    <view class="content" :style="{ height: `calc(100vh - ${statusBarHeight} - 50px)` }">
         <view class="user-info"> 用户： {{ userInfo.nickName }} </view>
         <view class="user-info"> 用户： {{ userInfo.userName }} </view>
         <view class="user-info"> 手机号：{{ userInfo.phonenumber || '13655555' }} </view>
@@ -16,6 +16,19 @@ const memberStore = useMemberStore()
 // const userInfo = memberStore.userInfo || reactive({})
 const userInfo = ref(memberStore.userInfo || {})
 
+const userAgent = navigator.userAgent.toLowerCase()
+const isIOS = ref(/iphone/.test(userAgent))
+
+let statusBarHeight = ref('50px')
+// #ifdef MP-WEIXIN
+statusBarHeight.value = uni.getWindowInfo().statusBarHeight + 'px'
+console.log('🚀 ~ statusBarHeight.value:', statusBarHeight.value)
+// #endif
+// #ifndef MP-WEIXIN
+statusBarHeight.value = uni.getSystemInfoSync().statusBarHeight + 'px'
+console.log('🚀 ~ statusBarHeight.value:', statusBarHeight.value)
+// #endif
+
 
 // 监听 memberStore.userInfo 的变化
 watch(() => memberStore.userInfo, (newUserInfo) => {
@@ -37,7 +50,7 @@ const onSignature = () => {
 
 <style scoped>
 .content {
-    height: calc(100vh - 110px);
+    /* height: calc(100vh - 110px); */
 }
 .user-info {
     width: 95%;