From 77861fcc5ee1c4f8e7c6412b373cb438c7313930 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 03 九月 2025 10:06:26 +0800
Subject: [PATCH] 头部样式修改、适配不同机型

---
 src/pages/index.vue                                    |   22 ++
 src/pages/sales/salesAccount/detail.vue                |    2 
 src/components/PageHeader.vue                          |  147 ++++++++----------
 src/pages/equipmentManagement/ledger/index.vue         |    5 
 src/pages/equipmentManagement/repair/add.vue           |   36 +++-
 src/pages/mine.vue                                     |   21 ++
 src/pages/procurementManagement/invoiceEntry/index.vue |   20 --
 src/pages/sales/invoicingRegistration/index.vue        |   20 --
 src/pages/cooperativeOffice/clientVisit/detail.vue     |    2 
 src/pages/equipmentManagement/ledger/detail.vue        |  200 ++++++++++++++++--------
 10 files changed, 269 insertions(+), 206 deletions(-)

diff --git a/src/components/PageHeader.vue b/src/components/PageHeader.vue
index 58acaca..fd8be07 100644
--- a/src/components/PageHeader.vue
+++ b/src/components/PageHeader.vue
@@ -1,20 +1,17 @@
 <template>
-	<view class="page-header">
-		<view class="header-left">
-			<up-icon 
-				name="arrow-left" 
-				size="20" 
-				color="#333" 
-				@click="handleBack"
-			></up-icon>
-		</view>
-		<view class="header-center">
-			<text class="page-title">{{ title }}</text>
-		</view>
-		<view class="header-right" v-if="$slots.right">
-			<slot name="right"></slot>
-		</view>
-	</view>
+  <up-navbar
+    :title="title"
+    :show-back="showBack"
+    @leftClick="handleBack"
+    :color="color"
+    :border="true"
+    :fixed="true"
+    :placeholder="true"
+  >
+    <template v-if="$slots.right" #right>
+      <slot name="right"></slot>
+    </template>
+  </up-navbar>
 </template>
 
 <script setup>
@@ -22,21 +19,41 @@
 
 // 瀹氫箟缁勪欢灞炴��
 const props = defineProps({
-	// 椤甸潰鏍囬
-	title: {
-		type: String,
-		default: ''
-	},
-	// 鏄惁鏄剧ず杩斿洖鎸夐挳
-	showBack: {
-		type: Boolean,
-		default: true
-	},
-	// 鑷畾涔夎繑鍥炰簨浠�
-	customBack: {
-		type: Function,
-		default: null
-	}
+  // 椤甸潰鏍囬
+  title: {
+    type: String,
+    default: ''
+  },
+  // 鏄惁鏄剧ず杩斿洖鎸夐挳
+  showBack: {
+    type: Boolean,
+    default: true
+  },
+  // 鑷畾涔夎繑鍥炰簨浠�
+  customBack: {
+    type: Function,
+    default: null
+  },
+  // 鑳屾櫙鑹�
+  background: {
+    type: String,
+    default: '#ffffff'
+  },
+  // 鏂囧瓧棰滆壊
+  color: {
+    type: String,
+    default: '#333333'
+  },
+  // 鏄惁鏄剧ず搴曢儴鍒嗗壊绾�
+  borderBottom: {
+    type: Boolean,
+    default: true
+  },
+  // 鏄惁鍥哄畾鍦ㄩ《閮�
+  isFixed: {
+    type: Boolean,
+    default: true
+  }
 });
 
 // 瀹氫箟浜嬩欢
@@ -44,60 +61,28 @@
 
 // 澶勭悊杩斿洖浜嬩欢
 const handleBack = () => {
-	if (props.customBack) {
-		props.customBack();
-	} else {
-		emit('back');
-		// uni.navigateBack();
-	}
+  if (props.customBack) {
+    props.customBack();
+  } else {
+    emit('back');
+    // uni.navigateBack();
+  }
 };
 </script>
 
 <style scoped lang="scss">
-.page-header {
-	background: #ffffff;
-	padding: 16px 20px;
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	border-bottom: 1px solid #f0f0f0;
-	position: sticky;
-	/* 鍏煎 iOS 鍒樻捣/鐏靛姩宀涘畨鍏ㄥ尯 */
-	padding-top: calc(env(safe-area-inset-top));
-	top: 0;
-	z-index: 100;
-	position: relative;
-}
+/* up-navbar 缁勪欢宸茬粡鍐呯疆浜嗗畨鍏ㄥ尯鍩熼�傞厤锛屼笉闇�瑕侀澶栫殑鏍峰紡璋冩暣 */
 
-.header-left {
-	display: flex;
-	align-items: center;
-	gap: 8px;
-	min-width: 30px; /* 纭繚鐐瑰嚮鍖哄煙瓒冲澶� */
-}
-
-.header-center {
-	flex: 1;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	position: absolute;
-	left: 0;
-	right: 0;
-	pointer-events: none;
-}
-
-.page-title {
-	font-size: 18px;
-	font-weight: 600;
-	color: #333;
-	pointer-events: auto;
-}
-
-.header-right {
-	display: flex;
-	align-items: center;
-	min-width: 44px; /* 纭繚鍙充晶鍖哄煙鏈夎冻澶熺┖闂� */
-	justify-content: flex-end;
+/* 鏆楄壊妯″紡閫傞厤 */
+@media (prefers-color-scheme: dark) {
+  :deep(.up-navbar) {
+    background: #1e1f24 !important;
+    .up-navbar__title {
+      color: #e9edf3 !important;
+    }
+    .up-navbar__back {
+      color: #e9edf3 !important;
+    }
+  }
 }
 </style>
diff --git a/src/pages/cooperativeOffice/clientVisit/detail.vue b/src/pages/cooperativeOffice/clientVisit/detail.vue
index c2f8521..3dbee0c 100644
--- a/src/pages/cooperativeOffice/clientVisit/detail.vue
+++ b/src/pages/cooperativeOffice/clientVisit/detail.vue
@@ -53,7 +53,7 @@
             placeholder="璇疯緭鍏ユ嫓璁垮湴鐐�"
           >
             <template #suffix>
-              <u-icon name="map" @click.stop="getCurrentLocation" class="location-icon" />
+              <u-icon name="map" @click="getCurrentLocation" class="location-icon" />
             </template>
           </u-input>
         </u-form-item>
diff --git a/src/pages/equipmentManagement/ledger/detail.vue b/src/pages/equipmentManagement/ledger/detail.vue
index 70db8b2..2c798e6 100644
--- a/src/pages/equipmentManagement/ledger/detail.vue
+++ b/src/pages/equipmentManagement/ledger/detail.vue
@@ -1,10 +1,10 @@
 <template>
-	<view class="equipment-detail">
+	<view class="account-detail">
 		<!-- 浣跨敤閫氱敤椤甸潰澶撮儴缁勪欢 -->
 		<PageHeader title="璁惧鍙拌处璇︽儏" @back="goBack" />
 		
 		<!-- 琛ㄥ崟鍐呭 -->
-		<u-form @submit="sendForm" ref="formRef" :rules="formRules" label-width="110">
+		<u-form @submit="sendForm" ref="formRef" :model="form" :rules="formRules" label-width="110">
 			<!-- 鍩烘湰淇℃伅 -->
 			<u-cell-group title="鍩烘湰淇℃伅">
 				<u-form-item label="璁惧鍚嶇О" prop="deviceName" required border-bottom>
@@ -22,13 +22,13 @@
 						clearable
 					/>
 				</u-form-item>
-				<u-form-item label="璁惧鍝佺墝" prop="deviceBrand" required border-bottom>
+				<!-- <u-form-item label="璁惧鍝佺墝" prop="deviceBrand" required border-bottom>
 					<u-input
 						v-model="form.deviceBrand"
 						placeholder="璇疯緭鍏ヨ澶囧搧鐗�"
 						clearable
 					/>
-				</u-form-item>
+				</u-form-item> -->
 				<u-form-item label="渚涘簲鍟�" prop="supplierName" required border-bottom>
 					<u-input
 						v-model="form.supplierName"
@@ -36,13 +36,13 @@
 						clearable
 					/>
 				</u-form-item>
-				<u-form-item label="瀛樻斁浣嶇疆" prop="storageLocation" required border-bottom>
+				<!-- <u-form-item label="瀛樻斁浣嶇疆" prop="storageLocation" required border-bottom>
 					<u-input
 						v-model="form.storageLocation"
 						placeholder="璇疯緭鍏ュ瓨鏀句綅缃�"
 						clearable
 					/>
-				</u-form-item>
+				</u-form-item> -->
 				<u-form-item label="鍗曚綅" prop="unit" required border-bottom>
 					<u-input
 						v-model="form.unit"
@@ -50,13 +50,13 @@
 						clearable
 					/>
 				</u-form-item>
-				<u-form-item label="鍚敤鎶樻棫" prop="enableDepreciation" required border-bottom>
+				<!-- <u-form-item label="鍚敤鎶樻棫" prop="enableDepreciation" required border-bottom>
 					<u-switch
 						v-model="form.enableDepreciation"
 						:active-value="true"
 						:inactive-value="false"
 					/>
-				</u-form-item>
+				</u-form-item> -->
 				<u-form-item label="鏁伴噺" prop="number" required border-bottom>
 					<u-input
 						v-model="form.number"
@@ -186,9 +186,46 @@
 	supplierName: [{ required: true, trigger: "blur", message: "璇疯緭鍏�" }],
 	storageLocation: [{ required: true, trigger: "blur", message: "璇疯緭鍏�" }],
 	unit: [{ required: true, trigger: "blur", message: "璇疯緭鍏�" }],
-	number: [{ required: true, trigger: "blur", message: "璇疯緭鍏�" }],
-	taxIncludingPriceUnit: [{ required: true, trigger: "blur", message: "璇疯緭鍏�" }],
-	taxRate: [{ required: true, trigger: "change", message: "璇疯緭鍏�" }],
+	// 鏁板瓧绫诲瀷瀛楁闇�瑕佺壒娈婂鐞嗭紝纭繚鏈夋暟鍊兼椂涓嶄細瑙﹀彂蹇呭～鏍￠獙
+	number: [{
+		required: true,
+		trigger: "blur",
+		message: "璇疯緭鍏�",
+		validator: (rule, value, callback) => {
+			// 瀵逛簬鏁板瓧绫诲瀷锛屾鏌ユ槸鍚︿负鏈夋晥鏁板瓧锛堝寘鎷�0锛�
+			if (value !== undefined && value !== null && value !== '' && !isNaN(value)) {
+				callback();
+			} else {
+				callback(new Error('璇疯緭鍏ユ暟閲�'));
+			}
+		}
+	}],
+	taxIncludingPriceUnit: [{
+		required: true,
+		trigger: "blur",
+		message: "璇疯緭鍏�",
+		validator: (rule, value, callback) => {
+			// 瀵逛簬鏁板瓧绫诲瀷锛屾鏌ユ槸鍚︿负鏈夋晥鏁板瓧锛堝寘鎷�0锛�
+			if (value !== undefined && value !== null && value !== '' && !isNaN(value)) {
+				callback();
+			} else {
+				callback(new Error('璇疯緭鍏ュ惈绋庡崟浠�'));
+			}
+		}
+	}],
+	taxRate: [{
+		required: true,
+		trigger: "change",
+		message: "璇烽�夋嫨",
+		validator: (rule, value, callback) => {
+			// 妫�鏌ョ◣鐜囨槸鍚︿负鏈夋晥鏁板瓧
+			if (value !== undefined && value !== null && value !== '' && !isNaN(value)) {
+				callback();
+			} else {
+				callback(new Error('璇烽�夋嫨绋庣巼'));
+			}
+		}
+	}],
 	createTime: [{ required: true, trigger: "change", message: "璇烽�夋嫨" }],
 };
 
@@ -218,6 +255,8 @@
 	}
 	try {
 		const { code, data } = await getLedgerById(id);
+		console.log(data);
+		
 		if (code == 200) {
 			form.value.deviceName = data.deviceName;
 			form.value.deviceModel = data.deviceModel;
@@ -232,6 +271,11 @@
 			form.value.taxRate = data.taxRate;
 			form.value.unTaxIncludingPriceTotal = data.unTaxIncludingPriceTotal;
 			form.value.createTime = data.createTime;
+			
+			// 鏁版嵁鍔犺浇瀹屾垚鍚庯紝閲嶇疆琛ㄥ崟楠岃瘉鐘舵��
+			setTimeout(() => {
+				clearValidate();
+			}, 100);
 		}
 	} catch (e) {
 		showToast('鑾峰彇璇︽儏澶辫触');
@@ -240,11 +284,12 @@
 
 // 鏁板璁＄畻
 const mathNum = () => {
-	if (!form.value.taxIncludingPriceUnit) {
+	// 鍙湁鍦ㄦ柊澧炴ā寮忔垨鑰呭瓧娈电‘瀹炰负绌烘椂鎵嶆樉绀烘彁绀�
+	if (operationType.value !== 'edit' || (form.value.taxIncludingPriceUnit === undefined || form.value.taxIncludingPriceUnit === '')) {
 		showToast("璇疯緭鍏ュ崟浠�");
 		return;
 	}
-	if (!form.value.number) {
+	if (operationType.value !== 'edit' || (form.value.number === undefined || form.value.number === '')) {
 		showToast("璇疯緭鍏ユ暟閲�");
 		return;
 	}
@@ -265,47 +310,65 @@
 	formRef.value?.clearValidate();
 };
 
-// 閲嶇疆琛ㄥ崟鏁版嵁鍜屾牎楠岀姸鎬�
-const resetForm = () => {
-	form.value = {
-		deviceName: undefined,
-		deviceModel: undefined,
-		deviceBrand: undefined,
-		supplierName: undefined,
-		storageLocation: undefined,
-		unit: undefined,
-		enableDepreciation: false,
-		number: undefined,
-		taxIncludingPriceUnit: undefined,
-		taxIncludingPriceTotal: undefined,
-		taxRate: undefined,
-		unTaxIncludingPriceTotal: undefined,
-		createTime: dayjs().format("YYYY-MM-DD"),
-	};
-};
-
-const resetFormAndValidate = () => {
-	resetForm();
-	clearValidate();
-};
-
 // 鎻愪氦琛ㄥ崟
 const sendForm = async () => {
 	try {
-		// 鎵嬪姩楠岃瘉琛ㄥ崟
-		await formRef.value?.validate();
+		// 妫�鏌ュ繀濉瓧娈�
+		let isValid = true;
+		let errorMessage = '';
+		
+		// 妫�鏌ユ枃鏈被鍨嬪繀濉瓧娈�
+		if (!form.value.deviceName || form.value.deviceName.trim() === '') {
+			isValid = false;
+			errorMessage = '璇疯緭鍏ヨ澶囧悕绉�';
+		} else if (!form.value.deviceModel || form.value.deviceModel.trim() === '') {
+			isValid = false;
+			errorMessage = '璇疯緭鍏ヨ鏍煎瀷鍙�';
+		} else if (!form.value.deviceBrand || form.value.deviceBrand.trim() === '') {
+			isValid = false;
+			errorMessage = '璇疯緭鍏ヨ澶囧搧鐗�';
+		} else if (!form.value.supplierName || form.value.supplierName.trim() === '') {
+			isValid = false;
+			errorMessage = '璇疯緭鍏ヤ緵搴斿晢';
+		} else if (!form.value.storageLocation || form.value.storageLocation.trim() === '') {
+			isValid = false;
+			errorMessage = '璇疯緭鍏ュ瓨鏀句綅缃�';
+		} else if (!form.value.unit || form.value.unit.trim() === '') {
+			isValid = false;
+			errorMessage = '璇疯緭鍏ュ崟浣�';
+		}
+		
+		// 妫�鏌ユ暟瀛楃被鍨嬪繀濉瓧娈�
+		else if (form.value.number === undefined || form.value.number === null || form.value.number === '' || isNaN(form.value.number)) {
+			isValid = false;
+			errorMessage = '璇疯緭鍏ユ暟閲�';
+		} else if (form.value.taxIncludingPriceUnit === undefined || form.value.taxIncludingPriceUnit === null || form.value.taxIncludingPriceUnit === '' || isNaN(form.value.taxIncludingPriceUnit)) {
+			isValid = false;
+			errorMessage = '璇疯緭鍏ュ惈绋庡崟浠�';
+		} else if (form.value.taxRate === undefined || form.value.taxRate === null || form.value.taxRate === '' || isNaN(form.value.taxRate)) {
+			isValid = false;
+			errorMessage = '璇烽�夋嫨绋庣巼';
+		} else if (!form.value.createTime || form.value.createTime.trim() === '') {
+			isValid = false;
+			errorMessage = '璇烽�夋嫨褰曞叆鏃ユ湡';
+		}
+		
+		// 濡傛灉楠岃瘉澶辫触锛屾樉绀洪敊璇彁绀�
+		if (!isValid) {
+			showToast(errorMessage);
+			return;
+		}
+		
+		// 楠岃瘉閫氳繃锛屾樉绀烘彁浜や腑鎻愮ず
+		showToast('姝ｅ湪鎻愪氦琛ㄥ崟...');
 		
 		loading.value = true;
 		const id = getPageId();
 		
 		// 鍑嗗鎻愪氦鏁版嵁锛宑reateTime 鍔犱笂褰撳墠鏃跺垎绉�
 		const submitData = { ...form.value };
-		if (submitData.createTime && !submitData.createTime.includes(':')) {
-			// 濡傛灉 createTime 鍙寘鍚棩鏈燂紝娣诲姞褰撳墠鏃跺垎绉�
-			submitData.createTime = submitData.createTime + ' ' + dayjs().format('HH:mm:ss');
-		}
 		
-		const { code } = id
+		const { code, res } = id
 			? await editLedger({ id: id, ...submitData })
 			: await addLedger(submitData);
 		
@@ -316,47 +379,52 @@
 			}, 1500);
 		} else {
 			loading.value = false;
+			console.log(res);
 		}
 	} catch (e) {
 		loading.value = false;
-		showToast('琛ㄥ崟楠岃瘉澶辫触');
+		showToast('鎻愪氦澶辫触');
 	}
 };
 
 // 杩斿洖涓婁竴椤�
 const goBack = () => {
+	// 浣跨敤鍚庢竻闄torage涓殑ID锛岄伩鍏嶆暟鎹畫鐣�
+			uni.removeStorageSync('ledgerId');
 	uni.navigateBack();
 };
 
 // 鑾峰彇椤甸潰鍙傛暟
 const getPageParams = () => {
-	const pages = getCurrentPages();
-	const currentPage = pages[pages.length - 1];
-	const options = currentPage.options;
-	
-	if (options.id) {
-		// 缂栬緫妯″紡锛岃幏鍙栬鎯�
-		loadForm(options.id);
-	} else {
-		// 鏂板妯″紡
+	try {
+		// 浼樺厛浠巗torage涓幏鍙朓D
+		const ledgerId = uni.getStorageSync('ledgerId');
+		
+		if (ledgerId) {
+			// 缂栬緫妯″紡锛岃幏鍙栬鎯�
+			loadForm(ledgerId);
+		} else {
+			// 鏂板妯″紡
+			operationType.value = 'add';
+		}
+	} catch (e) {
 		operationType.value = 'add';
 	}
 };
 
 // 鑾峰彇椤甸潰ID
 const getPageId = () => {
-	const pages = getCurrentPages();
-	const currentPage = pages[pages.length - 1];
-	const options = currentPage.options;
-	return options.id;
-};
-
-
-
-// 纭绋庣巼閫夋嫨
-const onTaxRateConfirm = (e) => {
-	form.value.taxRate = e.value;
-	mathNum(); // 閲嶆柊璁＄畻
+	try {
+		// 浼樺厛浠巗torage涓幏鍙朓D
+		const ledgerId = uni.getStorageSync('ledgerId');
+		
+		if (ledgerId) {
+			return ledgerId;
+		}
+	} catch (e) {
+		console.error('鑾峰彇椤甸潰ID鍑洪敊:', e);
+	}
+	return null;
 };
 
 // 閫夋嫨绋庣巼
diff --git a/src/pages/equipmentManagement/ledger/index.vue b/src/pages/equipmentManagement/ledger/index.vue
index e1fac27..0feb86f 100644
--- a/src/pages/equipmentManagement/ledger/index.vue
+++ b/src/pages/equipmentManagement/ledger/index.vue
@@ -150,7 +150,7 @@
   }
   getLedgerPage(params)
     .then((res) => {
-      ledgerList.value = res.records || res.data?.records || []
+      ledgerList.value = res.data.records
     })
     .catch(() => {
       showToast('鑾峰彇鏁版嵁澶辫触')
@@ -167,8 +167,9 @@
 // 缂栬緫 - 璺宠浆鍒拌鎯呴〉闈�
 const edit = (id) => {
   if (!id) return
+  uni.setStorageSync('ledgerId', id)
   uni.navigateTo({
-    url: `/pages/equipmentManagement/ledger/detail?id=${id}`
+    url: '/pages/equipmentManagement/ledger/detail'
   })
 }
 
diff --git a/src/pages/equipmentManagement/repair/add.vue b/src/pages/equipmentManagement/repair/add.vue
index b4252d3..ec0147f 100644
--- a/src/pages/equipmentManagement/repair/add.vue
+++ b/src/pages/equipmentManagement/repair/add.vue
@@ -4,7 +4,7 @@
 		<PageHeader :title="operationType === 'edit' ? '缂栬緫鎶ヤ慨' : '鏂板鎶ヤ慨'" @back="goBack" />
 		
 		<!-- 琛ㄥ崟鍐呭 -->
-		<u-form @submit="sendForm" ref="formRef" :rules="formRules" label-width="110" input-align="right" error-message-align="right">
+		<u-form @submit="sendForm" ref="formRef" :rules="formRules" :model="form" label-width="110">
 			<!-- 鍩烘湰淇℃伅 -->
 			<u-cell-group title="鍩烘湰淇℃伅">
 				<u-form-item label="璁惧鍚嶇О" prop="deviceLedgerId" required border-bottom>
@@ -204,11 +204,6 @@
 	deviceNameText.value = '';
 };
 
-const resetFormAndValidate = () => {
-	resetForm();
-	clearValidate();
-};
-
 // 鎵弿浜岀淮鐮佸姛鑳�
 const startScan = () => {
 	if (isScanning.value) {
@@ -313,18 +308,37 @@
 const sendForm = async () => {
 	try {
 		// 鎵嬪姩楠岃瘉琛ㄥ崟
-		await formRef.value?.validate();
-		
+		let isValid = true;
+		let errorMessage = '';
+		if (!form.value.deviceLedgerId) {
+			isValid = false;
+			errorMessage = '璇烽�夋嫨璁惧鍚嶇О';
+		} else if (!form.value.repairTime || form.value.repairTime.trim() === '') {
+			isValid = false;
+			errorMessage = '璇烽�夋嫨鎶ヤ慨鏃ユ湡';
+		} else if (!form.value.repairName || form.value.repairName.trim() === '') {
+			isValid = false;
+			errorMessage = '璇疯緭鍏ユ姤淇汉';
+		} else if (!form.value.remark || form.value.remark.trim() === '') {
+			isValid = false;
+			errorMessage = '璇疯緭鍏ユ晠闅滅幇璞�';
+		}
+
+		if (!isValid) {
+			showToast(errorMessage);
+			return;
+		}
+
 		loading.value = true;
 		const id = getPageId();
-		
+
 		// 鍑嗗鎻愪氦鏁版嵁
 		const submitData = { ...form.value };
-		
+
 		const { code } = id
 			? await editRepair({ id: id, ...submitData })
 			: await addRepair(submitData);
-		
+
 		if (code == 200) {
 			showToast(`${id ? "缂栬緫" : "鏂板"}鎶ヤ慨鎴愬姛`);
 			setTimeout(() => {
diff --git a/src/pages/index.vue b/src/pages/index.vue
index 6e54b27..53fb2bc 100644
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -433,8 +433,22 @@
 	background: linear-gradient(135deg, #f8f9fa 0%, #e3f2fd 100%);
 	min-height: 100vh;
 	padding: 1.25rem;
-	padding-top: env(safe-area-inset-top);
+	/* 涓烘墍鏈夎澶囪缃熀纭�padding-top */
+	padding-top: 40px;
 	position: relative;
+	
+	/* iOS璁惧浣跨敤env()鍑芥暟澶勭悊瀹夊叏鍖哄煙 */
+	padding-top: env(safe-area-inset-top);
+	
+	/* 涓哄畨鍗撹澶囪缃洿澶х殑椤堕儴鍐呰竟璺� */
+	/* #ifdef APP-PLUS && !MP && !H5 */
+	padding-top: 45px;
+	/* #endif */
+	
+	/* H5鍜屽皬绋嬪簭骞冲彴鐨勯�氱敤鏍峰紡 */
+	/* #ifdef H5 || MP */
+	padding-top: 30px;
+	/* #endif */
 	
 	&::before {
 		content: '';
@@ -462,11 +476,13 @@
 	}
 }
 
-/* 鏈〉涓嶅啀瀹氫箟 .safe-area-top锛屽凡绉昏嚦鍏ㄥ眬鏍峰紡 */
-
 .header-section {
 	margin-bottom: 1rem;
 	animation: fadeInDown 0.6s ease-out;
+	/* 涓哄畨鍗撹澶囬澶栬皟鏁村ご閮ㄤ綅缃� */
+	/* #ifdef APP-PLUS && !MP && !H5 */
+	margin-top: 10px;
+	/* #endif */
 }
 
 .currentFactory {
diff --git a/src/pages/mine.vue b/src/pages/mine.vue
index 40a2645..0961130 100644
--- a/src/pages/mine.vue
+++ b/src/pages/mine.vue
@@ -150,9 +150,23 @@
 .mine-page {
   min-height: 100vh;
 	padding: 1.25rem;
-	padding-top: env(safe-area-inset-top);
+	/* 涓烘墍鏈夎澶囪缃熀纭�padding-top */
+	padding-top: 40px;
 	position: relative;
   background: linear-gradient( 225deg, #E7F1FF 0%, rgba(255,255,255,0) 74%, rgba(255,255,255,0) 100%);
+  
+	/* iOS璁惧浣跨敤env()鍑芥暟澶勭悊瀹夊叏鍖哄煙 */
+	padding-top: env(safe-area-inset-top);
+	
+	/* 涓哄畨鍗撹澶囪缃洿澶х殑椤堕儴鍐呰竟璺� */
+	/* #ifdef APP-PLUS && !MP && !H5 */
+	padding-top: 45px;
+	/* #endif */
+	
+	/* H5鍜屽皬绋嬪簭骞冲彴鐨勯�氱敤鏍峰紡 */
+	/* #ifdef H5 || MP */
+	padding-top: 30px;
+	/* #endif */
 }
 
 /* 椤堕儴涓汉淇℃伅鍗� */
@@ -162,6 +176,11 @@
   align-items: center;
   color: #333;
   margin: 1.25rem 0;
+  
+  /* 涓哄畨鍗撹澶囬澶栬皟鏁村崱鐗囦綅缃� */
+	/* #ifdef APP-PLUS && !MP && !H5 */
+	margin-top: 15px;
+	/* #endif */
 
   .left {
     display: flex;
diff --git a/src/pages/procurementManagement/invoiceEntry/index.vue b/src/pages/procurementManagement/invoiceEntry/index.vue
index 71602db..05940b0 100644
--- a/src/pages/procurementManagement/invoiceEntry/index.vue
+++ b/src/pages/procurementManagement/invoiceEntry/index.vue
@@ -171,26 +171,6 @@
 	position: relative;
 }
 
-.page-header {
-	background: #ffffff;
-	padding: 16px 20px;
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	border-bottom: 1px solid #f0f0f0;
-	position: sticky;
-	/* 鍏煎 iOS 鍒樻捣/鐏靛姩宀涘畨鍏ㄥ尯 */
-	padding-top: env(safe-area-inset-top);
-	top: 0;
-	z-index: 100;
-}
-
-.header-left {
-	display: flex;
-	align-items: center;
-	gap: 8px;
-}
-
 .nav-icon {
 	width: 24px;
 	height: 24px;
diff --git a/src/pages/sales/invoicingRegistration/index.vue b/src/pages/sales/invoicingRegistration/index.vue
index 43f21dc..e7af8a9 100644
--- a/src/pages/sales/invoicingRegistration/index.vue
+++ b/src/pages/sales/invoicingRegistration/index.vue
@@ -178,26 +178,6 @@
 	position: relative;
 }
 
-.page-header {
-	background: #ffffff;
-	padding: 16px 20px;
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	border-bottom: 1px solid #f0f0f0;
-	position: sticky;
-	/* 鍏煎 iOS 鍒樻捣/鐏靛姩宀涘畨鍏ㄥ尯 */
-	padding-top: env(safe-area-inset-top);
-	top: 0;
-	z-index: 100;
-}
-
-.header-left {
-	display: flex;
-	align-items: center;
-	gap: 8px;
-}
-
 .nav-icon {
 	width: 24px;
 	height: 24px;
diff --git a/src/pages/sales/salesAccount/detail.vue b/src/pages/sales/salesAccount/detail.vue
index 60efb0e..e082ecb 100644
--- a/src/pages/sales/salesAccount/detail.vue
+++ b/src/pages/sales/salesAccount/detail.vue
@@ -17,7 +17,7 @@
 			>
 				<up-input
 					v-model="form.salesman"
-					readonly=""
+					readonly
 					@click="showPicker = true"
 					placeholder="鐐瑰嚮閫夋嫨涓氬姟鍛�"
 				/>

--
Gitblit v1.9.3