From b056244badc7963ece8724c6a5172173a8a5c65c Mon Sep 17 00:00:00 2001
From: guoapeng <GuoAnPeng@163.com>
Date: Sun, 8 Jun 2025 21:48:24 +0800
Subject: [PATCH] =?UTF-8?q?fix:loading=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CustomNavBar.tsx | 2 +-
 src/pages/Measure.tsx           | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/components/CustomNavBar.tsx b/src/components/CustomNavBar.tsx
index da25498..8af3f02 100644
--- a/src/components/CustomNavBar.tsx
+++ b/src/components/CustomNavBar.tsx
@@ -54,7 +54,7 @@ export default function CustomNavBar({ title }: { title: string }) {
                         transition: 'transform 300ms',
                     }}
                 />
-                <div className="bluetooth-battery">
+                <div className="bluetooth-battery ml-2">
                     <div className="bg-color" style={{ width: `${device.power || 0}%`, backgroundColor: device.flag ? '#1dbb1d' : device.power > 20 ? '#3e63cb' : 'red' }}></div>
                     <div className={'power-head'} style={{ backgroundColor: device.flag && device.power === 100? '#1dbb1d' : device.power === 100 ? '#3e63cb' : 'rgba(0,0,0,0.3)' }}></div>
                     <span className="power-num">{device.power || 0}</span>
diff --git a/src/pages/Measure.tsx b/src/pages/Measure.tsx
index d032afd..0035cde 100644
--- a/src/pages/Measure.tsx
+++ b/src/pages/Measure.tsx
@@ -437,11 +437,12 @@ export default function Measure() {
         <main className="home-page-content overflow-x-hidden overflow-y-auto">
           <div className="relative h-0 p-0 pb-[70%]">
             {/**正在校准时的loading */}
-            {caloading && (
-              <Mask opacity="thin" className="h-[100vh] flex justify-center items-center">
-                <div style={{ margin: '45%' }}>
+            {/*caloading*/}
+            {(
+              <Mask opacity='thick' className="h-[100vh] flex justify-center items-center">
+                <div style={{ margin: '45%',  display: 'flex', flexDirection: 'column',  alignItems: 'center', justifyContent: 'center' }}>
                   <SpinLoading color="#5c92b4" />
-                  <div className="w-[100px] mt-[20px] text-[#5c92b4]">正在转换...</div>
+                  <span className="whitespace-nowrap mt-5 text-[#5c92b4]" style={{fontSize: '16px'}}>请稍候...</span>
                 </div>
               </Mask>
             )}