From 95bd27ce4b587fa6e25d3e14c0efc16a9daaa595 Mon Sep 17 00:00:00 2001
From: xjs <xjs@ycymedu.com>
Date: Thu, 11 Dec 2025 17:31:55 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages-sub/about/onlineCustom.vue             |  4 ++--
 src/pages-sub/about/userInfo.vue                 | 12 ++++++------
 src/pages-sub/components/upload/index.vue        | 10 +++-------
 src/pages-sub/countdown/index.vue                |  8 ++++----
 src/pages-sub/information/highSchool.vue         |  4 ++--
 src/pages-sub/information/highSchoolDetail.vue   |  4 ++--
 src/pages-sub/information/middleSchool.vue       |  4 ++--
 src/pages-sub/information/overTheYear.vue        |  4 ++--
 src/pages-sub/information/quota.vue              |  4 ++--
 src/pages-sub/information/quotaDetail.vue        |  4 ++--
 src/pages-sub/talented/create/artFirst.vue       |  4 ++--
 src/pages-sub/talented/create/artSecond.vue      |  4 ++--
 src/pages-sub/talented/create/editAdvantages.vue |  4 ++--
 src/pages-sub/talented/create/sportsFirst.vue    |  4 ++--
 src/pages-sub/talented/create/sportsSecond.vue   |  4 ++--
 src/pages-sub/wishlist/create/first.vue          |  4 ++--
 src/pages-sub/wishlist/create/firstBatch.vue     |  4 ++--
 src/pages-sub/wishlist/create/second.vue         |  4 ++--
 src/pages-sub/wishlist/create/secondBatch.vue    |  4 ++--
 src/pages-sub/wishlist/create/third.vue          |  4 ++--
 src/pages-sub/wishlist/create/thirdBatch.vue     |  4 ++--
 src/pages-sub/wishlist/school.vue                |  4 ++--
 src/pages/evaluation/index.vue                   |  6 +++---
 src/pages/index/index.vue                        |  9 +++++----
 src/pages/me/me.vue                              |  6 +++---
 src/pages/talented/index.vue                     |  6 +++---
 src/utils/systemInfo.ts                          |  4 +++-
 27 files changed, 68 insertions(+), 69 deletions(-)

diff --git a/src/pages-sub/about/onlineCustom.vue b/src/pages-sub/about/onlineCustom.vue
index 7e83d9f..08718cf 100644
--- a/src/pages-sub/about/onlineCustom.vue
+++ b/src/pages-sub/about/onlineCustom.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { safeAreaInsets } from '@/utils/systemInfo'
+import { systemInfo } from '@/utils/systemInfo'
 
 // #ifdef MP-WEIXIN
 definePage({
@@ -39,7 +39,7 @@ const handleBack = () => {
 <template>
     <view class="flex flex-col custom-background h-screen">
         <sar-navbar show-back @back="handleBack" :fixed="true" fixation-style="top:unset;"
-            :root-style="{ '--sar-navbar-bg': `transparent`, '--sar-navbar-item-color': 'white','margin-top': `${safeAreaInsets?.top}px` }">
+            :root-style="{ '--sar-navbar-bg': `transparent`, '--sar-navbar-item-color': 'white','margin-top': `${systemInfo?.statusBarHeight}px` }">
             <template #title>
                 <view class="flex justify-center text-white">在线客服</view>
             </template>
diff --git a/src/pages-sub/about/userInfo.vue b/src/pages-sub/about/userInfo.vue
index 1aef7d7..30877a3 100644
--- a/src/pages-sub/about/userInfo.vue
+++ b/src/pages-sub/about/userInfo.vue
@@ -21,7 +21,7 @@ const gradeClassification = ref([])
 const areaList = ref([])
 
 const handleChange = (value: any[]) => {
-  userInfo.value.avatar = value[0].url
+  userInfo.value.avatar = value[value.length-1].url
 }
 
 const handleSave = () => {
@@ -89,16 +89,16 @@ onShow(() => {
 <template>
   <view class="flex flex-col bg-[#f8f8f8] h-screen">
     <view class="mx-[32rpx] bg-[#fff] rounded-[20rpx] mt-[32rpx] text-[28rpx] text-[#303030] font-bold">
-      <view class="flex items-center justify-between mr-[16rpx] ml-[32rpx] py-[28rpx] not-last-child">
+      <view class="flex items-center justify-between mx-[32rpx] py-[28rpx] not-last-child">
         <text class="text-[30rpx] text-[#404142] font-400">头像</text>
-        <MxUpload :custom-upload="true" root-class="w-[98rpx] h-[98rpx]" :hiddenPreview="true" @change="handleChange"
-          :signal="true" :outer-file-list="[{ url: `${userInfo.avatar}` }]">
+        <MxUpload :custom-upload="true" root-class="" :hiddenPreview="true" @change="handleChange"
+          :multiple="false" :outer-file-list="[{ url: `${userInfo.avatar}` }]">
           <template #default="{ fileList }">
             <view class="flex items-center gap-[16rpx]">
               <view class="w-[96rpx] h-[96rpx] rounded-full">
-                <image :src="fileList[0].url" mode="scaleToFill" class="w-[96rpx] h-[96rpx] rounded-full" />
+                <image :src="fileList[fileList.length-1].url" mode="scaleToFill" class="w-[96rpx] h-[96rpx] rounded-full" />
               </view>
-              <view class="w-[18rpx] h-[36rpx] flex items-center ml-[20rpx]">
+              <view class="w-[18rpx] h-[36rpx] flex items-center ml-[4rpx]">
                 <image src="https://lwzk.ycymedu.com/img/qt/tb_jiantou.png" mode="scaleToFill"
                   class="w-[18rpx] h-[36rpx]" />
               </view>
diff --git a/src/pages-sub/components/upload/index.vue b/src/pages-sub/components/upload/index.vue
index cf76234..8596225 100644
--- a/src/pages-sub/components/upload/index.vue
+++ b/src/pages-sub/components/upload/index.vue
@@ -1,9 +1,9 @@
 <template>
     <sar-upload v-model="fileList" :root-class="rootClass" :after-read="afterRead" :multiple="multiple"
-        :max-count="multiple ? 99 : 1"
-        :root-style="`--sar-upload-select-bg:#f7f7f7;--sar-upload-close-size:32rpx;${customUpload ? '--sar-upload-select-width: min-content;--sar-upload-select-height: min-content;--sar-upload-select-color: transparent;--sar-upload-select-bg: transparent;--sar-upload-select-border-radius:  0;' : ''} ${hiddenPreview ? '--sar-upload-preview-width:  0;--sar-upload-preview-height:  0;' : ''}`">
+        :max-count="99"
+        :root-style="`--sar-upload-select-bg:#f7f7f7;${customUpload ? '--sar-upload-select-width: max-content;--sar-upload-select-height: max-content;--sar-upload-select-color: transparent;--sar-upload-select-bg: transparent;--sar-upload-select-border-radius:  0;' : ''} ${hiddenPreview ? '--sar-upload-preview-width:  0;--sar-upload-preview-height:  0;' : ''}`">
         <template #select>
-            <view style="display: flex; flex-direction: column; align-items: center" v-if="!customUpload">
+            <view class="flex flex-col items-center" v-if="!customUpload">
                 <view class="w-[60rpx] h-[60rpx]">
                     <image src="https://lwzk.ycymedu.com/img/cpgx/cp_shangchuan.png" mode="scaleToFill" />
                 </view>
@@ -37,10 +37,6 @@ const props = defineProps({
         type: Boolean,
         default: false
     },
-    signal: {
-        type: Boolean,
-        default: false
-    },
     rootClass: {
         type: String,
         default: ''
diff --git a/src/pages-sub/countdown/index.vue b/src/pages-sub/countdown/index.vue
index 35726f3..fe6fb4b 100644
--- a/src/pages-sub/countdown/index.vue
+++ b/src/pages-sub/countdown/index.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { getCountdown, getTimeList } from '@/service'
-import { safeAreaInsets } from '@/utils/systemInfo'
+import { systemInfo } from '@/utils/systemInfo'
 // #ifdef MP-WEIXIN
 definePage({
     style: {
@@ -59,14 +59,14 @@ onShow(() => {
 <template>
     <view class="relative">
         <sar-navbar root-class="bg-transparent" :fixed="true" fixation-style="top:unset;"
-            :root-style="{ '--sar-navbar-bg': `rgba(255, 255, 255, ${opacity})`, '--sar-navbar-height': `${safeAreaInsets?.top + 44}px` }">
+            :root-style="{ '--sar-navbar-bg': `rgba(255, 255, 255, ${opacity})`, '--sar-navbar-height': `${systemInfo?.statusBarHeight + 44}px` }">
             <template #title>
-                <view class="flex justify-center text-white mix-blend-difference" :style="{ 'padding-top': `${safeAreaInsets?.top}px` }">
+                <view class="flex justify-center text-white mix-blend-difference" :style="{ 'padding-top': `${systemInfo?.statusBarHeight}px` }">
                     中考倒计时</view>
             </template>
             <template #left>
                 <view class="flex items-center justify-center text-[32rpx] ml-[32rpx]"
-                    :style="{ 'padding-top': `${safeAreaInsets?.top}px` }" @click="nativeBack">
+                    :style="{ 'padding-top': `${systemInfo?.statusBarHeight}px` }" @click="nativeBack">
                     <sar-icon name="left" size="48rpx" :color="computeColor"/>
                 </view>
             </template>
diff --git a/src/pages-sub/information/highSchool.vue b/src/pages-sub/information/highSchool.vue
index c13753f..ca9f1f7 100644
--- a/src/pages-sub/information/highSchool.vue
+++ b/src/pages-sub/information/highSchool.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { safeAreaInsets } from '@/utils/systemInfo'
+import { systemInfo } from '@/utils/systemInfo'
 import MxSearch from "@/pages-sub/components/search/index.vue"
 import MxRadioGroup from "@/pages-sub/components/radio/index.vue"
 import {  getAreaList, getSchoolNature, getSchoolTypeList, getBusHightSchoolList } from "@/service"
@@ -104,7 +104,7 @@ const handleComplete = () => {
     @virtualListChange="virtualListChange" @query="queryList" :auto-show-system-loading="false"
     :safe-area-inset-bottom="true" :pagingStyle="{ backgroundColor: 'white' }">
     <template #top>
-      <view class="gradient-custom" :style="{ 'padding-top': `${safeAreaInsets?.top}px` }">
+      <view class="gradient-custom" :style="{ 'padding-top': `${systemInfo?.statusBarHeight}px` }">
         <sar-navbar :show-back="true" @back="handleBack"
           :root-style="{ '--sar-navbar-bg': `rgba(255, 255, 255, 0)`, '--sar-navbar-item-color': 'black', '--sar-navbar-title-max-width': '100%' }">
           <template #title>
diff --git a/src/pages-sub/information/highSchoolDetail.vue b/src/pages-sub/information/highSchoolDetail.vue
index 90930c5..f3b2843 100644
--- a/src/pages-sub/information/highSchoolDetail.vue
+++ b/src/pages-sub/information/highSchoolDetail.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import HighSchoolDetailHeader from './components/HighSchoolDetailHeader.vue'
 import MxTabs from "@/pages-sub/components/tabs/index.vue"
-import { safeAreaInsets } from '@/utils/systemInfo'
+import { systemInfo } from '@/utils/systemInfo'
 import SchoolIntroduce from './components/SchoolIntroduce.vue'
 import EnrollmentIntroDetail from './components/EnrollmentIntroDetail.vue'
 import QuotaAndScore from './components/QuotaAndScore.vue'
@@ -56,7 +56,7 @@ onLoad((options) => {
 <template>
   <view class="gradient-custom pb-safe">
     <sar-navbar title="学校详情" :show-back="true" @back="handleBack"
-      :root-style="{ '--sar-navbar-bg': `rgba(255, 255, 255, 0)`, 'padding-top': `${safeAreaInsets?.top}px`, '--sar-navbar-item-color': 'black' }">
+      :root-style="{ '--sar-navbar-bg': `rgba(255, 255, 255, 0)`, 'padding-top': `${systemInfo?.statusBarHeight}px`, '--sar-navbar-item-color': 'black' }">
     </sar-navbar>
     <HighSchoolDetailHeader :schoolDetail="schoolDetail"/>
     <mx-tabs :tabsList="tabs" @tab-change="handleChange" />
diff --git a/src/pages-sub/information/middleSchool.vue b/src/pages-sub/information/middleSchool.vue
index 2800c26..5453b41 100644
--- a/src/pages-sub/information/middleSchool.vue
+++ b/src/pages-sub/information/middleSchool.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { safeAreaInsets } from '@/utils/systemInfo'
+import { systemInfo } from '@/utils/systemInfo'
 import MxSearch from "@/pages-sub/components/search/index.vue"
 import MxTabs from "@/pages-sub/components/tabs/index.vue"
 import { getNewsCategory, getNewsPage } from "@/service"
@@ -85,7 +85,7 @@ const handleComplete = () => {
         <template #top>
             <view class="gradient-custom">
                 <sar-navbar title="中考资讯" :show-back="true" @back="handleBack"
-                    :root-style="{ '--sar-navbar-bg': `rgba(255, 255, 255, 0)`, 'padding-top': `${safeAreaInsets?.top}px`, '--sar-navbar-item-color': 'black' }">
+                    :root-style="{ '--sar-navbar-bg': `rgba(255, 255, 255, 0)`, 'padding-top': `${systemInfo?.statusBarHeight}px`, '--sar-navbar-item-color': 'black' }">
                 </sar-navbar>
                 <mx-search v-model:searchText="searchParams.keyword" rootStyle="margin: 16rpx 30rpx 0;" @complete="handleComplete"/>
                 <mx-tabs :tabsList="tabs" rootClass="shadow-md mb-[20rpx]" @tab-change="handleChange" />
diff --git a/src/pages-sub/information/overTheYear.vue b/src/pages-sub/information/overTheYear.vue
index bf56d72..f7949a6 100644
--- a/src/pages-sub/information/overTheYear.vue
+++ b/src/pages-sub/information/overTheYear.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { safeAreaInsets } from '@/utils/systemInfo'
+import { systemInfo } from '@/utils/systemInfo'
 import MxSearch from "@/pages-sub/components/search/index.vue?async"
 import MxRadioGroup from "@/pages-sub/components/radio/index.vue?async"
 import { getAreaList, getHistoryYearList, getSchoolHistoricalScores, getSchoolNature } from "@/service"
@@ -124,7 +124,7 @@ onShow(() => {
 <template>
   <view class="gradient-custom flex flex-col h-screen">
     <sar-navbar title="历年分数" :show-back="true" @back="handleBack"
-      :root-style="{ '--sar-navbar-bg': `rgba(255, 255, 255, 0)`, 'padding-top': `${safeAreaInsets?.top}px`, '--sar-navbar-item-color': 'black' }">
+      :root-style="{ '--sar-navbar-bg': `rgba(255, 255, 255, 0)`, 'padding-top': `${systemInfo?.statusBarHeight}px`, '--sar-navbar-item-color': 'black' }">
     </sar-navbar>
     <mx-search v-model:searchText="searchParams.keyword" rootStyle="margin: 16rpx 30rpx 0;" @complete="handleChange" />
     <sar-dropdown
diff --git a/src/pages-sub/information/quota.vue b/src/pages-sub/information/quota.vue
index 7cd7713..6c72f48 100644
--- a/src/pages-sub/information/quota.vue
+++ b/src/pages-sub/information/quota.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { safeAreaInsets } from '@/utils/systemInfo'
+import { systemInfo } from '@/utils/systemInfo'
 import MxSearch from "@/pages-sub/components/search/index.vue?async"
 import MxRadioGroup from "@/pages-sub/components/radio/index.vue?async"
 import { getAreaList, getSchoolQuotaScores } from "@/service"
@@ -64,7 +64,7 @@ onLoad(() => {
 <template>
   <view class="gradient-custom h-screen flex flex-col">
     <sar-navbar title="指标生分配" :show-back="true" @back="handleBack"
-      :root-style="{ '--sar-navbar-bg': `rgba(255, 255, 255, 0)`, 'padding-top': `${safeAreaInsets?.top}px`, '--sar-navbar-item-color': 'black' }">
+      :root-style="{ '--sar-navbar-bg': `rgba(255, 255, 255, 0)`, 'padding-top': `${systemInfo?.statusBarHeight}px`, '--sar-navbar-item-color': 'black' }">
     </sar-navbar>
     <view class="flex">
       <view class="flex items-center ml-[30rpx]" @click="regionVisible = true">
diff --git a/src/pages-sub/information/quotaDetail.vue b/src/pages-sub/information/quotaDetail.vue
index a9e8c8e..0d358a6 100644
--- a/src/pages-sub/information/quotaDetail.vue
+++ b/src/pages-sub/information/quotaDetail.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import MxRadio from "@/pages-sub/components/radio/index.vue"
-import { safeAreaInsets } from '@/utils/systemInfo'
+import { systemInfo } from '@/utils/systemInfo'
 import {getSchoolQuotaScores} from "@/service"
 
 // #ifdef MP-WEIXIN
@@ -82,7 +82,7 @@ onLoad((options)=>{
 <template>
   <view class="gradient-custom">
     <sar-navbar :title="searchParams.schoolName" :show-back="true" @back="handleBack"
-      :root-style="{ '--sar-navbar-bg': `rgba(255, 255, 255, 0)`, 'padding-top': `${safeAreaInsets?.top}px`, '--sar-navbar-item-color': 'black' }">
+      :root-style="{ '--sar-navbar-bg': `rgba(255, 255, 255, 0)`, 'padding-top': `${systemInfo?.statusBarHeight}px`, '--sar-navbar-item-color': 'black' }">
     </sar-navbar>
     <MxRadio v-model:value="searchParams.year" :options="years" label-key="label" value-key="value"
       custom-root-cols-class="flex items-center gap-[16rpx]" custom-root-class="px-[30rpx] pt-[22rpx] pb-[20rpx]"
diff --git a/src/pages-sub/talented/create/artFirst.vue b/src/pages-sub/talented/create/artFirst.vue
index c5f1290..9437995 100644
--- a/src/pages-sub/talented/create/artFirst.vue
+++ b/src/pages-sub/talented/create/artFirst.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { safeAreaInsets } from '@/utils/systemInfo'
+import { systemInfo } from '@/utils/systemInfo'
 import MxRadio from "@/pages-sub/components/radio/index.vue"
 import MxInput from "@/pages-sub/components/input/index.vue"
 import { getAreaList, getGradeList, getStudentTalentedDetail, getTalentAreaList, saveUserInfo } from '@/service'
@@ -125,7 +125,7 @@ onLoad(() => {
 <template>
   <view class="flex flex-col custom-background h-screen">
     <sar-navbar show-back @back="handleBack" :fixed="true" fixation-style="top:unset;"
-      :root-style="{ '--sar-navbar-bg': `transparent`, '--sar-navbar-item-color': 'black', 'padding-top': `${safeAreaInsets?.top}px` }">
+      :root-style="{ '--sar-navbar-bg': `transparent`, '--sar-navbar-item-color': 'black', 'padding-top': `${systemInfo?.statusBarHeight}px` }">
       <template #title>
         <view class="flex justify-center">艺术特长生</view>
       </template>
diff --git a/src/pages-sub/talented/create/artSecond.vue b/src/pages-sub/talented/create/artSecond.vue
index 19e708f..b3225b9 100644
--- a/src/pages-sub/talented/create/artSecond.vue
+++ b/src/pages-sub/talented/create/artSecond.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { safeAreaInsets } from '@/utils/systemInfo'
+import { systemInfo } from '@/utils/systemInfo'
 import MxRadio from "@/pages-sub/components/radio/index.vue"
 import MxUpload from "@/pages-sub/components/upload/index.vue"
 import MxInput from "@/pages-sub/components/input/index.vue"
@@ -103,7 +103,7 @@ onLoad(() => {
 <template>
     <view class="flex flex-col custom-background h-screen">
         <sar-navbar show-back @back="handleBack" :fixed="true" fixation-style="top:unset;"
-            :root-style="{ '--sar-navbar-bg': `transparent`, '--sar-navbar-item-color': 'black', 'padding-top': `${safeAreaInsets?.top}px` }">
+            :root-style="{ '--sar-navbar-bg': `transparent`, '--sar-navbar-item-color': 'black', 'padding-top': `${systemInfo?.statusBarHeight}px` }">
             <template #title>
                 <view class="flex justify-center">艺术特长生</view>
             </template>
diff --git a/src/pages-sub/talented/create/editAdvantages.vue b/src/pages-sub/talented/create/editAdvantages.vue
index 0d853e1..534335f 100644
--- a/src/pages-sub/talented/create/editAdvantages.vue
+++ b/src/pages-sub/talented/create/editAdvantages.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { safeAreaInsets } from '@/utils/systemInfo'
+import { systemInfo } from '@/utils/systemInfo'
 import { useUserStore } from '@/store'
 import { storeToRefs } from 'pinia'
 // #ifdef MP-WEIXIN
@@ -40,7 +40,7 @@ const handleSave = () => {
 <template>
   <view class="flex flex-col custom-background h-screen">
     <sar-navbar show-back @back="handleBack" :fixed="true" fixation-style="top:unset;"
-      :root-style="{ '--sar-navbar-bg': `transparent`, '--sar-navbar-item-color': 'black', 'padding-top': `${safeAreaInsets?.top}px` }">
+      :root-style="{ '--sar-navbar-bg': `transparent`, '--sar-navbar-item-color': 'black', 'padding-top': `${systemInfo?.statusBarHeight}px` }">
       <template #title>
         <view class="flex justify-center">我的优势</view>
       </template>
diff --git a/src/pages-sub/talented/create/sportsFirst.vue b/src/pages-sub/talented/create/sportsFirst.vue
index 569b0bc..421370a 100644
--- a/src/pages-sub/talented/create/sportsFirst.vue
+++ b/src/pages-sub/talented/create/sportsFirst.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { safeAreaInsets } from '@/utils/systemInfo'
+import { systemInfo } from '@/utils/systemInfo'
 import MxRadio from "@/pages-sub/components/radio/index.vue"
 import MxInput from "@/pages-sub/components/input/index.vue"
 import { getAreaList, getGradeList, getStudentTalentedDetail, saveUserInfo } from '@/service'
@@ -121,7 +121,7 @@ onShow(() => {
 <template>
     <view class="flex flex-col custom-background h-screen">
         <sar-navbar show-back @back="handleBack" :fixed="true" fixation-style="top:unset;"
-            :root-style="{ '--sar-navbar-bg': `transparent`, '--sar-navbar-item-color': 'black', 'padding-top': `${safeAreaInsets?.top}px` }">
+            :root-style="{ '--sar-navbar-bg': `transparent`, '--sar-navbar-item-color': 'black', 'padding-top': `${systemInfo?.statusBarHeight}px` }">
             <template #title>
                 <view class="flex justify-center">体育特长生</view>
             </template>
diff --git a/src/pages-sub/talented/create/sportsSecond.vue b/src/pages-sub/talented/create/sportsSecond.vue
index ad38350..cccd9b9 100644
--- a/src/pages-sub/talented/create/sportsSecond.vue
+++ b/src/pages-sub/talented/create/sportsSecond.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { safeAreaInsets } from '@/utils/systemInfo'
+import { systemInfo } from '@/utils/systemInfo'
 import MxRadio from "@/pages-sub/components/radio/index.vue"
 import MxUpload from "@/pages-sub/components/upload/index.vue"
 import MxInput from "@/pages-sub/components/input/index.vue"
@@ -112,7 +112,7 @@ onLoad(() => {
 <template>
     <view class="flex flex-col custom-background h-screen">
         <sar-navbar show-back @back="handleBack" :fixed="true" fixation-style="top:unset;"
-            :root-style="{ '--sar-navbar-bg': `transparent`, '--sar-navbar-item-color': 'black', 'padding-top': `${safeAreaInsets?.top}px` }">
+            :root-style="{ '--sar-navbar-bg': `transparent`, '--sar-navbar-item-color': 'black', 'padding-top': `${systemInfo?.statusBarHeight}px` }">
             <template #title>
                 <view class="flex justify-center">体育特长生</view>
             </template>
diff --git a/src/pages-sub/wishlist/create/first.vue b/src/pages-sub/wishlist/create/first.vue
index 73b971a..3f6b3ae 100644
--- a/src/pages-sub/wishlist/create/first.vue
+++ b/src/pages-sub/wishlist/create/first.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { safeAreaInsets } from '@/utils/systemInfo'
+import { systemInfo } from '@/utils/systemInfo'
 import MxRadio from "@/pages-sub/components/radio/index.vue"
 import MxInput from "@/pages-sub/components/input/index.vue"
 import { getGradeList, getAreaList, saveUserInfo } from "@/service"
@@ -110,7 +110,7 @@ onShow(() => {
 <template>
     <view class="flex flex-col custom-background h-screen">
         <sar-navbar show-back @back="handleBack" :fixed="true" fixation-style="top:unset;"
-            :root-style="{ '--sar-navbar-bg': `transparent`, '--sar-navbar-item-color': 'black', 'padding-top': `${safeAreaInsets?.top}px` }">
+            :root-style="{ '--sar-navbar-bg': `transparent`, '--sar-navbar-item-color': 'black', 'padding-top': `${systemInfo?.statusBarHeight}px` }">
             <template #title>
                 <view class="flex justify-center">志愿填报</view>
             </template>
diff --git a/src/pages-sub/wishlist/create/firstBatch.vue b/src/pages-sub/wishlist/create/firstBatch.vue
index b0b2369..4fda9ca 100644
--- a/src/pages-sub/wishlist/create/firstBatch.vue
+++ b/src/pages-sub/wishlist/create/firstBatch.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { safeAreaInsets } from '@/utils/systemInfo'
+import { systemInfo } from '@/utils/systemInfo'
 import ScheduleQuota from './components/ScheduleQuota.vue'
 import FirstBatchSchool from './components/FirstBatchSchool.vue'
 import MxDialog from "@/pages-sub/components/dialog/index.vue"
@@ -45,7 +45,7 @@ const show = ref(false)
 <template>
     <view class="flex flex-col custom-background h-screen">
         <sar-navbar show-back @back="handleBack" :fixed="true" fixation-style="top:unset;"
-            :root-style="{ '--sar-navbar-bg': `transparent`, '--sar-navbar-item-color': 'black', 'padding-top': `${safeAreaInsets?.top}px` }">
+            :root-style="{ '--sar-navbar-bg': `transparent`, '--sar-navbar-item-color': 'black', 'padding-top': `${systemInfo?.statusBarHeight}px` }">
             <template #title>
                 <view class="flex justify-center">第一批次</view>
             </template>
diff --git a/src/pages-sub/wishlist/create/second.vue b/src/pages-sub/wishlist/create/second.vue
index 33fd19a..23481ea 100644
--- a/src/pages-sub/wishlist/create/second.vue
+++ b/src/pages-sub/wishlist/create/second.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { safeAreaInsets } from '@/utils/systemInfo'
+import { systemInfo } from '@/utils/systemInfo'
 import MxRadio from "@/pages-sub/components/radio/index.vue"
 import MxInput from "@/pages-sub/components/input/index.vue"
 import { getMyScore, getTalentAreaList, saveMyScore } from '@/service'
@@ -126,7 +126,7 @@ onLoad(() => {
 <template>
     <view class="flex flex-col custom-background h-screen">
         <sar-navbar show-back @back="handleBack" :fixed="true" fixation-style="top:unset;"
-            :root-style="{ '--sar-navbar-bg': `transparent`, '--sar-navbar-item-color': 'black', 'padding-top': `${safeAreaInsets?.top}px` }">
+            :root-style="{ '--sar-navbar-bg': `transparent`, '--sar-navbar-item-color': 'black', 'padding-top': `${systemInfo?.statusBarHeight}px` }">
             <template #title>
                 <view class="flex justify-center">志愿填报</view>
             </template>
diff --git a/src/pages-sub/wishlist/create/secondBatch.vue b/src/pages-sub/wishlist/create/secondBatch.vue
index ac077f7..551e582 100644
--- a/src/pages-sub/wishlist/create/secondBatch.vue
+++ b/src/pages-sub/wishlist/create/secondBatch.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { safeAreaInsets } from '@/utils/systemInfo'
+import { systemInfo } from '@/utils/systemInfo'
 import SecondBatchSchool from './components/SecondBatchSchool.vue'
 import MxDialog from "@/pages-sub/components/dialog/index.vue"
 import { useWishlistStore } from '@/store'
@@ -49,7 +49,7 @@ const disableSubmit = computed(() => {
 <template>
   <view class="flex flex-col custom-background h-screen">
     <sar-navbar show-back @back="handleBack" :fixed="true" fixation-style="top:unset;"
-      :root-style="{ '--sar-navbar-bg': `transparent`, '--sar-navbar-item-color': 'black', 'padding-top': `${safeAreaInsets?.top}px` }">
+      :root-style="{ '--sar-navbar-bg': `transparent`, '--sar-navbar-item-color': 'black', 'padding-top': `${systemInfo?.statusBarHeight}px` }">
       <template #title>
         <view class="flex justify-center">第二批次</view>
       </template>
diff --git a/src/pages-sub/wishlist/create/third.vue b/src/pages-sub/wishlist/create/third.vue
index 3e07edf..851b1dd 100644
--- a/src/pages-sub/wishlist/create/third.vue
+++ b/src/pages-sub/wishlist/create/third.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { safeAreaInsets } from '@/utils/systemInfo'
+import { systemInfo } from '@/utils/systemInfo'
 import MxDialog from "@/pages-sub/components/dialog/index.vue"
 import { useUserStore, useWishlistStore } from '@/store'
 import { storeToRefs } from 'pinia'
@@ -72,7 +72,7 @@ onLoad(()=>{
 <template>
     <view class="flex flex-col custom-background-bg h-screen" style="--status-bar-height:556rpx;--start-color:#D7E4FF">
         <sar-navbar show-back @back="handleBack" :fixed="true" fixation-style="top:unset;"
-            :root-style="{ '--sar-navbar-bg': `transparent`, '--sar-navbar-item-color': 'black', 'padding-top': `${safeAreaInsets?.top}px` }">
+            :root-style="{ '--sar-navbar-bg': `transparent`, '--sar-navbar-item-color': 'black', 'padding-top': `${systemInfo?.statusBarHeight}px` }">
             <template #title>
                 <view class="flex justify-center">志愿填报</view>
             </template>
diff --git a/src/pages-sub/wishlist/create/thirdBatch.vue b/src/pages-sub/wishlist/create/thirdBatch.vue
index 5bd2bad..7406a33 100644
--- a/src/pages-sub/wishlist/create/thirdBatch.vue
+++ b/src/pages-sub/wishlist/create/thirdBatch.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { safeAreaInsets } from '@/utils/systemInfo'
+import { systemInfo } from '@/utils/systemInfo'
 import ThirdBatchSchool from './components/ThirdBatchSchool.vue'
 import MxDialog from "@/pages-sub/components/dialog/index.vue"
 import { useWishlistStore } from '@/store'
@@ -55,7 +55,7 @@ const disableSubmit = computed(() => {
 <template>
   <view class="flex flex-col custom-background h-screen">
     <sar-navbar show-back @back="handleBack" :fixed="true" fixation-style="top:unset;"
-      :root-style="{ '--sar-navbar-bg': `transparent`, '--sar-navbar-item-color': 'black', 'padding-top': `${safeAreaInsets?.top}px` }">
+      :root-style="{ '--sar-navbar-bg': `transparent`, '--sar-navbar-item-color': 'black', 'padding-top': `${systemInfo?.statusBarHeight}px` }">
       <template #title>
         <view class="flex justify-center">第三批次</view>
       </template>
diff --git a/src/pages-sub/wishlist/school.vue b/src/pages-sub/wishlist/school.vue
index 9d16953..d413062 100644
--- a/src/pages-sub/wishlist/school.vue
+++ b/src/pages-sub/wishlist/school.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { safeAreaInsets } from '@/utils/systemInfo'
+import { systemInfo } from '@/utils/systemInfo'
 import MxSearch from "@/pages-sub/components/search/index.vue"
 import { getHightSchool } from '@/service'
 import { useUserStore } from '@/store'
@@ -59,7 +59,7 @@ onLoad((options) => {
 <template>
     <view class="flex flex-col custom-background h-screen">
         <sar-navbar show-back @back="handleBack" :fixed="true" fixation-style="top:unset;"
-            :root-style="{ '--sar-navbar-bg': `transparent`, '--sar-navbar-item-color': 'black', 'padding-top': `${safeAreaInsets?.top}px` }">
+            :root-style="{ '--sar-navbar-bg': `transparent`, '--sar-navbar-item-color': 'black', 'padding-top': `${systemInfo?.statusBarHeight}px` }">
             <template #title>
                 <view class="flex justify-center">选择就读中学</view>
             </template>
diff --git a/src/pages/evaluation/index.vue b/src/pages/evaluation/index.vue
index 8ef44bc..25acc30 100644
--- a/src/pages/evaluation/index.vue
+++ b/src/pages/evaluation/index.vue
@@ -2,9 +2,9 @@
   <view class="custom-background flex flex-col pb-safe">
     <view>
       <sar-navbar :fixed="true" fixation-style="top:unset;"
-        :root-style="{ '--sar-navbar-bg': `rgba(255, 255, 255, ${opacity})`, '--sar-navbar-height': `${safeAreaInsets?.top + 44}px` }">
+        :root-style="{ '--sar-navbar-bg': `rgba(255, 255, 255, ${opacity})`, '--sar-navbar-height': `${systemInfo?.statusBarHeight + 44}px` }">
         <template #title>
-          <view class="text-[32rpx] font-500" :style="{ 'padding-top': `${safeAreaInsets?.top}px` }">
+          <view class="text-[32rpx] font-500" :style="{ 'padding-top': `${systemInfo?.statusBarHeight}px` }">
             志愿填报
           </view>
         </template>
@@ -18,7 +18,7 @@
 </template>
 
 <script lang="ts" setup>
-import { safeAreaInsets } from '@/utils/systemInfo'
+import { systemInfo } from '@/utils/systemInfo'
 import EvaluationItem from './components/EvaluationItem.vue'
 import {getEvaluationList} from "@/service/requestApi"
 
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index e1b0c91..972c654 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { safeAreaInsets } from '@/utils/systemInfo'
+import { systemInfo } from '@/utils/systemInfo'
 import { getMyScore, getTopNew, getCountdown, getFirstPageInfo } from "@/service"
 import { useTokenStore } from '@/store'
 
@@ -29,6 +29,7 @@ definePage({
 // #endif
 
 const tokenStore = useTokenStore()
+console.log(systemInfo);
 
 onShareAppMessage(() => {
   return {
@@ -153,13 +154,13 @@ onShow(() => {
 <template>
   <view class="custom-background flex flex-col">
     <sar-navbar :fixed="true" fixation-style="top:unset;"
-      :root-style="{ '--sar-navbar-bg': `rgba(255, 255, 255, ${opacity})`, '--sar-navbar-height': `${safeAreaInsets?.top + 44}px` }">
+      :root-style="{ '--sar-navbar-bg': `rgba(255, 255, 255, ${opacity})`, '--sar-navbar-height': `${systemInfo?.statusBarHeight + 44}px` }">
       <template #left>
         <view class="flex items-center justify-center text-[#333] text-[32rpx] ml-[32rpx]"
-          :style="{ 'padding-top': `${safeAreaInsets?.top}px` }">济南</view>
+          :style="{ 'padding-top': `${systemInfo?.statusBarHeight}px` }">济南</view>
       </template>
       <template #title>
-        <view :style="{ 'padding-top': `${safeAreaInsets?.top}px` }" class="flex justify-center">
+        <view :style="{ 'padding-top': `${systemInfo?.statusBarHeight}px` }" class="flex justify-center">
           <view class="h-[32rpx] w-[226rpx] flex justify-center">
             <image class="h-[32rpx] w-[226rpx]" src="https://lwzk.ycymedu.com/img/home/sy_logo.png"
               mode="aspectFit" />
diff --git a/src/pages/me/me.vue b/src/pages/me/me.vue
index e38dc0d..ff8690f 100644
--- a/src/pages/me/me.vue
+++ b/src/pages/me/me.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { safeAreaInsets } from '@/utils/systemInfo'
+import { safeAreaInsets,systemInfo } from '@/utils/systemInfo'
 
 import { storeToRefs } from 'pinia'
 import { useUserStore } from '@/store'
@@ -47,9 +47,9 @@ const navigateToUserInfo = () => {
 <template>
   <view :class="`custom-background`" :style="{height:`calc(100vh - 50px - ${safeAreaInsets.bottom}px)`}">
     <sar-navbar :fixed="true" fixation-style="top:unset;"
-      :root-style="{ '--sar-navbar-bg': `transparent`, '--sar-navbar-height': `${safeAreaInsets?.top + 44}px` }">
+      :root-style="{ '--sar-navbar-bg': `transparent`, '--sar-navbar-height': `${systemInfo?.statusBarHeight + 44}px` }">
       <template #title>
-        <view :style="{ 'padding-top': `${safeAreaInsets?.top}px` }" class="flex justify-center">
+        <view :style="{ 'padding-top': `${systemInfo?.statusBarHeight}px` }" class="flex justify-center">
           我的
         </view>
       </template>
diff --git a/src/pages/talented/index.vue b/src/pages/talented/index.vue
index f496a4c..b30c714 100644
--- a/src/pages/talented/index.vue
+++ b/src/pages/talented/index.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { safeAreaInsets } from '@/utils/systemInfo'
+import { systemInfo } from '@/utils/systemInfo'
 
 // #ifdef MP-WEIXIN
 definePage({
@@ -41,9 +41,9 @@ const navigateToPage = (type: string) => {
 <template>
   <view class="custom-background flex flex-col">
     <sar-navbar :fixed="true" fixation-style="top:unset;"
-      :root-style="{ '--sar-navbar-bg': `rgba(255, 255, 255, ${opacity})`, '--sar-navbar-height': `${safeAreaInsets?.top + 44}px` }">
+      :root-style="{ '--sar-navbar-bg': `rgba(255, 255, 255, ${opacity})`, '--sar-navbar-height': `${systemInfo?.statusBarHeight + 44}px` }">
       <template #title>
-        <view :style="{ 'padding-top': `${safeAreaInsets?.top}px` }" class="flex justify-center text-[32rpx] font-500">
+        <view :style="{ 'padding-top': `${systemInfo?.statusBarHeight}px` }" class="flex justify-center text-[32rpx] font-500">
           <text>艺体生测评</text>
         </view>
       </template>
diff --git a/src/utils/systemInfo.ts b/src/utils/systemInfo.ts
index 2492fef..216184d 100644
--- a/src/utils/systemInfo.ts
+++ b/src/utils/systemInfo.ts
@@ -2,6 +2,7 @@
 // 获取屏幕边界到安全区域距离
 let systemInfo
 let safeAreaInsets
+let headerBarHeight = 0
 
 // #ifdef MP-WEIXIN
 // 微信小程序使用新的API
@@ -34,5 +35,6 @@ safeAreaInsets = systemInfo.safeAreaInsets
 // windowHeight: 753
 // windowTop: 0
 // windowWidth: 390
-export { safeAreaInsets, systemInfo }
+headerBarHeight = 88 / systemInfo.pixelRatio 
+export { safeAreaInsets, systemInfo, headerBarHeight }