From be0eab546050f7f1d548de3a1f35731289a2a95d Mon Sep 17 00:00:00 2001
From: ISFP_T <68358856@qq.com>
Date: Wed, 10 Dec 2025 15:16:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/MapComponent.vue |  146 +++-
 config/url.js               |    7 +-
 locale/en-US.js             |   13 +-
 locale/zh-CN.js             |   13 +-
 manifest.json               |    6 +-
 pages/index/index.vue       |  172 +++-
 pages/legal/agreement.vue   |  175 +++-
 pages/legal/privacy.vue     |  216 +++--
 pages/my/index.vue          |   80 +-
 pages/order/detail.vue      | 1619 +++++++++++++++++------------------
 10 files changed, 1463 insertions(+), 984 deletions(-)

diff --git a/components/MapComponent.vue b/components/MapComponent.vue
index 9935b2d..dfa3a5a 100644
--- a/components/MapComponent.vue
+++ b/components/MapComponent.vue
@@ -6,10 +6,19 @@
 			<map id="map" class="native-map" :longitude="mapCenter.longitude" :latitude="mapCenter.latitude"
 				:markers="mapMarkers" :scale="mapZoom" :show-location="false" @regionchange="onMapRegionChange"
 				@markertap="onMapMarkerTap" @callouttap="onCalloutTap" @updated="onMapUpdated" @error="onMapError">
-				<!-- 覆盖在地图上的可点击控件（使用 cover-view 以兼容小程序原生组件层级） -->
-				<cover-view class="index-swiper" v-if="!props.hideControls && !props.hideMapOverlays" @tap="handleJoinTap">
-					<cover-image src="/static/index_swiper.png" class="index-swiper-img" mode="aspectFit"></cover-image>
+			<!-- 覆盖在地图上的广告轮播（使用 cover-view 以兼容小程序原生组件层级） -->
+			<cover-view class="index-swiper" v-if="!props.hideControls && !props.hideMapOverlays && currentBannerImage">
+				<cover-image :src="currentBannerImage" class="index-swiper-img" mode="aspectFill" @tap="handleBannerTap"></cover-image>
+				<!-- 轮播指示器 -->
+				<cover-view class="banner-indicators" v-if="props.bannerImages.length > 1">
+					<cover-view 
+						v-for="(img, idx) in props.bannerImages" 
+						:key="idx"
+						class="indicator-dot"
+						:class="{ active: idx === currentBannerIndex }">
+					</cover-view>
 				</cover-view>
+			</cover-view>
 				
 				<!-- 地图中心固定定位图标 -->
 				<cover-view class="center-location-marker" v-if="!props.hideMapOverlays">
@@ -98,15 +107,19 @@
 			type: Boolean,
 			default: false // 是否隐藏侧边控制按钮
 		},
-	fullWidth: {
-		type: Boolean,
-		default: false // 是否全宽显示（去掉 margin 和固定宽度）
-	},
-	hideMapOverlays: {
-		type: Boolean,
-		default: false // 是否隐藏地图上的覆盖层元素（如中心定位图标、轮播图等）
-	}
-})
+		fullWidth: {
+			type: Boolean,
+			default: false // 是否全宽显示（去掉 margin 和固定宽度）
+		},
+		hideMapOverlays: {
+			type: Boolean,
+			default: false // 是否隐藏地图上的覆盖层元素（如中心定位图标、轮播图等）
+		},
+		bannerImages: {
+			type: Array,
+			default: () => [] // 广告图片列表
+		}
+	})
 
 	// Emits
 	const emit = defineEmits([
@@ -114,7 +127,8 @@
 		'scan',
 		'showList',
 		'markerTap',
-		'mapCenterChange'
+		'mapCenterChange',
+		'bannerClick'
 	])
 
 	// 响应式数据
@@ -126,6 +140,17 @@
 	const mapZoom = ref(17)
 	const mapMarkers = ref([]) // 用于地图组件的markers
 	const mapContext = ref(null) // 地图上下文
+	const currentBannerIndex = ref(0) // 当前显示的广告索引
+	let bannerTimer = null // 广告轮播定时器
+
+	// 计算当前显示的广告图片
+	const currentBannerImage = computed(() => {
+		if (props.bannerImages && props.bannerImages.length > 0) {
+			return props.bannerImages[currentBannerIndex.value]
+		}
+		// 降级：如果没有广告，显示默认图片
+		return '/static/index_swiper.png'
+	})
 
 	// 验证坐标有效性
 	const isValidCoordinate = (lat, lng) => {
@@ -220,6 +245,26 @@
 		deep: true
 	})
 
+	// 监听广告图片变化，启动或停止轮播
+	watch(() => props.bannerImages, (newImages, oldImages) => {
+		console.log('广告图片变化:', newImages?.length, '张')
+		// 先停止旧的轮播
+		stopBannerRotation()
+		currentBannerIndex.value = 0
+		
+		// 如果有多张图片，启动新的轮播
+		if (newImages && newImages.length > 1) {
+			console.log('启动广告轮播，共', newImages.length, '张图片')
+			// 使用 nextTick 确保 DOM 已更新
+			nextTick(() => {
+				startBannerRotation()
+			})
+		}
+	}, {
+		immediate: true,
+		deep: true
+	})
+
 	// 地图加载完成事件
 	const onMapUpdated = () => {
 		isLoading.value = false
@@ -337,6 +382,44 @@ const handleSearch = () => {
 		})
 	}
 
+	// 处理广告点击
+	const handleBannerTap = () => {
+		console.log('点击地图广告:', currentBannerIndex.value, currentBannerImage.value)
+		// 触发父组件处理点击事件
+		emit('bannerClick', currentBannerIndex.value)
+		// 默认跳转到合作加盟页面
+		handleJoinTap()
+	}
+
+	// 启动广告轮播
+	const startBannerRotation = () => {
+		// 如果只有一张或没有图片，不需要轮播
+		if (!props.bannerImages || props.bannerImages.length <= 1) {
+			console.log('图片数量不足，不启动轮播')
+			return
+		}
+
+		// 清除旧的定时器
+		stopBannerRotation()
+
+		console.log('开始广告轮播定时器')
+		// 每3秒切换一次
+		bannerTimer = setInterval(() => {
+			const nextIndex = (currentBannerIndex.value + 1) % props.bannerImages.length
+			console.log('轮播切换:', currentBannerIndex.value, '->', nextIndex)
+			currentBannerIndex.value = nextIndex
+		}, 3000)
+	}
+
+	// 停止广告轮播
+	const stopBannerRotation = () => {
+		if (bannerTimer) {
+			console.log('停止广告轮播')
+			clearInterval(bannerTimer)
+			bannerTimer = null
+		}
+	}
+
 	const handleScan = () => {
 		emit('scan')
 	}
@@ -364,6 +447,12 @@ const handleSearch = () => {
 			if (collapseRef.value) {
 				collapseRef.value.init()
 			}
+			
+			// 初始化广告轮播
+			if (props.bannerImages && props.bannerImages.length > 1) {
+				console.log('onMounted: 初始化广告轮播')
+				startBannerRotation()
+			}
 		})
 	})
 
@@ -373,6 +462,8 @@ const handleSearch = () => {
 			clearTimeout(regionChangeTimer)
 			regionChangeTimer = null
 		}
+		// 停止广告轮播
+		stopBannerRotation()
 		mapContext.value = null
 	})
 
@@ -554,15 +645,42 @@ const handleSearch = () => {
 		border-radius: 20rpx;
 		z-index: 1;
 		position: absolute;
-		// top: 10rpx;
 		left: 50%;
 		transform: translateX(-50%);
 		right: 0;
+		overflow: hidden;
 
 		&-img {
 			width: 100%;
 			height: 100%;
 			border-radius: 20rpx;
 		}
+
+		.banner-indicators {
+			position: absolute;
+			bottom: 10rpx;
+			left: 50%;
+			transform: translateX(-50%);
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: center;
+			gap: 8rpx;
+			z-index: 2;
+
+			.indicator-dot {
+				width: 12rpx;
+				height: 12rpx;
+				border-radius: 50%;
+				background-color: rgba(255, 255, 255, 0.5);
+				transition: all 0.3s ease;
+
+				&.active {
+					width: 24rpx;
+					border-radius: 6rpx;
+					background-color: rgba(255, 255, 255, 0.9);
+				}
+			}
+		}
 	}
 </style>
\ No newline at end of file
diff --git a/config/url.js b/config/url.js
index be24145..e0d18e3 100644
--- a/config/url.js
+++ b/config/url.js
@@ -1,7 +1,8 @@
 // export const URL = "https://my.gxfs123.com/api" //正式服务器-弃用
-export const URL = "https://manager.fdzpower.com/api"  //正式服务器
-// export const URL = "https://fansdev.gxfs123.com/api"  //测试服务器
+// export const URL = "https://manager.fdzpower.com/api"  //正式服务器
+export const URL = "https://fansdev.gxfs123.com/api"  //测试服务器
 // export const URL = "http://192.168.5.30:8080" 		//本地调试
 // export const URL = "http://127.0.0.1:8080" 		//本地调试
 
-export const appid = "wx2165f0be356ae7a9" //小程序appid 
\ No newline at end of file
+export const appid = "wx2165f0be356ae7a9" //微信小程序appid 
+export const ZFBappid = "2021006117693332" //支付宝小程序appid
\ No newline at end of file
diff --git a/locale/en-US.js b/locale/en-US.js
index 5304925..1b7cb3f 100644
--- a/locale/en-US.js
+++ b/locale/en-US.js
@@ -233,7 +233,13 @@ export default {
     cancelFailedContactService: 'Cancel failed, please contact customer service',
     getOrderStatusFailed: 'Failed to get order status',
     syncSuccess: 'Status synced successfully',
-    syncFailed: 'Sync failed'
+    syncFailed: 'Sync failed',
+    freeRentTime: 'Free Time',
+    pricingRule: 'Pricing Rule',
+    paymentMethod: 'Payment Method',
+    perHour: 'per hour',
+    perMinute: 'per minute',
+    perHalfHour: 'per half hour'
   },
 
   user: {
@@ -556,7 +562,10 @@ export default {
     daysAgo: 'days ago',
     yesterday: 'Yesterday',
     today: 'Today',
-    tomorrow: 'Tomorrow'
+    tomorrow: 'Tomorrow',
+    hours: 'hour(s)',
+    minutes: 'minute(s)',
+    halfHours: 'half hour(s)'
   },
 
   unit: {
diff --git a/locale/zh-CN.js b/locale/zh-CN.js
index af2f276..6ad80cf 100644
--- a/locale/zh-CN.js
+++ b/locale/zh-CN.js
@@ -233,7 +233,13 @@ export default {
     cancelFailedContactService: '取消订单失败，请联系客服',
     getOrderStatusFailed: '订单状态查询失败',
     syncSuccess: '状态同步成功',
-    syncFailed: '同步状态失败'
+    syncFailed: '同步状态失败',
+    freeRentTime: '免费时长',
+    pricingRule: '计费规则',
+    paymentMethod: '支付方式',
+    perHour: '每小时',
+    perMinute: '每分钟',
+    perHalfHour: '每半小时'
   },
 
   user: {
@@ -556,7 +562,10 @@ export default {
     daysAgo: '天前',
     yesterday: '昨天',
     today: '今天',
-    tomorrow: '明天'
+    tomorrow: '明天',
+    hours: '小时',
+    minutes: '分钟',
+    halfHours: '半小时'
   },
 
   unit: {
diff --git a/manifest.json b/manifest.json
index 35f92ac..77df513 100644
--- a/manifest.json
+++ b/manifest.json
@@ -69,7 +69,11 @@
         "requiredPrivateInfos" : [ "getLocation", "chooseLocation" ]
     },
     "mp-alipay" : {
-        "usingComponents" : true
+        "usingComponents" : true,
+        "appid" : "2021006117693332",
+        "unipush" : {
+            "enable" : true
+        }
     },
     "mp-baidu" : {
         "usingComponents" : true
diff --git a/pages/index/index.vue b/pages/index/index.vue
index b99ff37..321098b 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -7,23 +7,24 @@
 			</view>
 		</view>
 
-		<!-- 顶部信息区域（通知、招商等） -->
-		<view class="top-info-section" :style="{ top: (statusBarHeight + navBarHeight) + 'px' }">
-			<!-- 通知栏 -->
-			<view class="notice-wrapper" v-if="noticeText" @click="openNoticePopup">
-				<uv-notice-bar :text="noticeText" :speed="50" :show-icon="true" color="#07c160" bg-color="#E8F8EF"
-					icon="volume"></uv-notice-bar>
-			</view>
+	<!-- 顶部信息区域（通知、招商等） -->
+	<view class="top-info-section" :style="{ top: (statusBarHeight + navBarHeight) + 'px' }">
+		<!-- 通知栏 -->
+		<view class="notice-wrapper" v-if="noticeText" @click="openNoticePopup">
+			<uv-notice-bar :text="noticeText" :speed="50" :show-icon="true" color="#07c160" bg-color="#E8F8EF"
+				icon="volume"></uv-notice-bar>
 		</view>
+	</view>
 
 		<!-- 内容区域 -->
 		<view class="main-content" :style="{ paddingTop: (statusBarHeight + navBarHeight + noticeHeight) + 'px' }">
-			<!-- 全屏地图组件 -->
-			<MapComponent v-if="!isLoading && userLocation" ref="mapRef" :userLocation="userLocation"
-				:positionList="positionList" :filteredPositions="filteredPositions" :searchKeyword="searchKeyword"
-				:enableMarkers="true" :hideMapOverlays="showGuidePopup || showNoticePopup || showActivityPopup"
-				@relocate="handleRelocate" @scan="handleScan" @showList="showLocationList" @markerTap="selectPosition"
-				@mapCenterChange="onMapCenterChange" />
+		<!-- 全屏地图组件 -->
+		<MapComponent v-if="!isLoading && userLocation" ref="mapRef" :userLocation="userLocation"
+			:positionList="positionList" :filteredPositions="filteredPositions" :searchKeyword="searchKeyword"
+			:enableMarkers="true" :bannerImages="bannerImages" 
+			:hideMapOverlays="showGuidePopup || showNoticePopup || showActivityPopup"
+			@relocate="handleRelocate" @scan="handleScan" @showList="showLocationList" @markerTap="selectPosition"
+			@mapCenterChange="onMapCenterChange" @bannerClick="handleBannerClick" />
 
 			<!-- 地图加载状态 -->
 			<view v-if="isLoading || !userLocation" class="map-loading-placeholder">
@@ -200,7 +201,6 @@
 		getPotionsDetail
 	} from '../../config/api/order.js'
 	import {
-		getNoticeTextData,
 		getActiveActivity
 	} from '../../config/api/system.js'
 	// 导入地图工具函数
@@ -291,27 +291,112 @@
 	}
 
 	const noticeText = ref('')
+	const bannerImages = ref([]) // 首页广告图片列表
+
+	// 将语言代码转换为后端接受的格式
+	const convertLanguageCode = (lang) => {
+		// zh-CN -> zh_CN (转换下划线)
+		// en-US -> en_US (转换下划线)
+		return lang.replace(/-/g, '_')
+	}
+
+	// 获取公告内容（支持多语言）
 	const getNoticeText = async () => {
-		const parasm = {
-			'title': '用户端公告'
-		}
-		const res = await getNoticeTextData(parasm);
-		noticeText.value = res.data.noticeContent;
-
-		// 设置通知栏高度
-		if (res.data.noticeContent) {
-			noticeHeight.value = 50 // 通知栏高度约50px
-		}
-
-		// 将通知内容存储到本地缓存
 		try {
-			uni.setStorageSync('noticeContent', res.data.noticeContent);
-			console.log('通知内容已缓存:', res.data.noticeContent);
-		} catch (e) {
-			console.warn('缓存通知内容失败:', e);
+			// 获取当前语言设置
+			const currentLang = uni.getStorageSync('language') || 'zh-CN'
+			const languageCode = convertLanguageCode(currentLang)
+
+			console.log('加载公告，语言:', currentLang, '转换后:', languageCode)
+
+			// 调用接口获取公告内容
+			const res = await uni.request({
+				url: `${URL}/device/announcementConfig/current`,
+				method: 'GET',
+				header: {
+					'Content-Language': languageCode
+				},
+				data: {
+					type: 'wx_user_type'  // 微信小程序用户端
+				}
+			})
+
+			console.log('公告响应:', res)
+
+			if (res.statusCode === 200 && res.data.code === 200 && res.data.data) {
+				// 使用后端自动解析的 announcement 字段
+				const announcement = res.data.data.announcement || ''
+				noticeText.value = announcement
+
+				// 设置通知栏高度
+				if (announcement) {
+					noticeHeight.value = 50 // 通知栏高度约50px
+				}
+
+				// 将通知内容存储到本地缓存
+				try {
+					uni.setStorageSync('noticeContent', announcement)
+					console.log('通知内容已缓存:', announcement)
+				} catch (e) {
+					console.warn('缓存通知内容失败:', e)
+				}
+			} else {
+				console.warn('获取公告失败:', res.data?.msg || '未知错误')
+			}
+		} catch (error) {
+			console.error('获取公告失败:', error)
 		}
 	}
 
+	// 获取首页广告图片（支持多语言）
+	const getBannerImages = async () => {
+		try {
+			// 获取当前语言设置
+			const currentLang = uni.getStorageSync('language') || 'zh-CN'
+			const languageCode = convertLanguageCode(currentLang)
+
+			console.log('加载首页广告，语言:', currentLang, '转换后:', languageCode)
+
+			// 调用接口获取广告内容
+			const res = await uni.request({
+				url: `${URL}/device/advertisementConfig/current`,
+				method: 'GET',
+				header: {
+					'Content-Language': languageCode
+				},
+				data: {
+					appPlatform: 'wechat',  // 微信平台
+					appType: 'user'  // 用户端
+				}
+			})
+
+			console.log('首页广告响应:', res)
+
+			if (res.statusCode === 200 && res.data.code === 200 && res.data.data) {
+				// 使用 files 字段（图片列表）
+				const files = res.data.data.files || []
+				if (files.length > 0) {
+					bannerImages.value = files
+					console.log('首页广告加载成功，图片数量:', files.length)
+				} else {
+					console.warn('未获取到广告图片')
+				}
+			} else {
+				console.warn('获取首页广告失败:', res.data?.msg || '未知错误')
+			}
+		} catch (error) {
+			console.error('获取首页广告失败:', error)
+		}
+	}
+
+	// 处理首页广告点击
+	const handleBannerClick = (index) => {
+		console.log('点击首页广告:', index, bannerImages.value[index])
+		// 可以根据需要添加跳转逻辑
+		// 例如跳转到合作加盟页面
+		uni.navigateTo({ url: '/pages/join/index' })
+	}
+
 	// 查询最近的活动
 	const checkActiveActivity = async () => {
 		try {
@@ -438,20 +523,25 @@
 				console.warn('清理旧缓存失败:', e);
 			}
 
-			// 开发环境测试距离计算
-			if (process.env.NODE_ENV === 'development') {
-				testDistanceCalculation()
-			}
-			await getNoticeText();
+		// 开发环境测试距离计算
+		if (process.env.NODE_ENV === 'development') {
+			testDistanceCalculation()
+		}
+		
+		// 并行加载公告和广告（不依赖定位）
+		await Promise.all([
+			getNoticeText(),
+			getBannerImages()
+		])
 
-			// 1. 先获取用户位置
-		await getUserLocationAndAddress()
+		// 1. 先获取用户位置
+	await getUserLocationAndAddress()
 
-		// 2. 加载场地列表（依赖定位）
-		await loadPositions()
+	// 2. 加载场地列表（依赖定位）
+	await loadPositions()
 
-			// 3. 查询活动并显示弹窗
-			await checkActiveActivity()
+		// 3. 查询活动并显示弹窗
+		await checkActiveActivity()
 
 		} catch (error) {
 			console.error('初始化失败:', error)
diff --git a/pages/legal/agreement.vue b/pages/legal/agreement.vue
index 9f5b849..5a3ffc5 100644
--- a/pages/legal/agreement.vue
+++ b/pages/legal/agreement.vue
@@ -1,40 +1,118 @@
 <template>
-	<view class="loading-page">
+	<!-- 加载状态 -->
+	<view v-if="loading" class="loading-page">
 		<view class="loading-content">
 			<view class="loading-spinner"></view>
 			<text>{{ $t('common.loading') }}</text>
 		</view>
 	</view>
+
+	<!-- 错误状态 -->
+	<view v-else-if="error" class="error-page">
+		<view class="error-content">
+			<text class="error-icon">⚠️</text>
+			<text class="error-message">{{ errorMessage }}</text>
+			<button class="retry-btn" @click="loadAgreement">{{ $t('common.retry') }}</button>
+		</view>
+	</view>
+
+	<!-- 内容显示 -->
+	<view v-else class="legal-page">
+		<view class="header">
+			<text class="title">{{ agreementData.title || $t('legal.agreement') }}</text>
+			<text v-if="agreementData.remark" class="subtitle">{{ agreementData.remark }}</text>
+		</view>
+
+		<scroll-view class="content" scroll-y>
+			<rich-text :nodes="agreementData.content"></rich-text>
+		</scroll-view>
+
+		<view class="footer">
+			<text>{{ $t('legal.footerNotice') }}</text>
+		</view>
+	</view>
 </template>
 
 <script setup>
-	import { onMounted } from 'vue'
+	import { ref, onMounted } from 'vue'
 	import { useI18n } from '@/utils/i18n.js'
+	import { URL } from '@/config/url.js'
 
 	const { t: $t } = useI18n()
 
-	onMounted(() => {
-		// 获取当前语言设置
-		const currentLang = uni.getStorageSync('language') || 'zh-CN'
-		
-		// 根据语言跳转到对应页面
-		const targetPage = currentLang === 'en-US' 
-			? '/pages/legal/agreement-en'
-			: '/pages/legal/agreement-zh'
-		
-		console.log('当前语言:', currentLang, '跳转到:', targetPage)
-		
-		// 使用 redirectTo 替换当前页面
-		uni.redirectTo({
-			url: targetPage,
-			fail: (err) => {
-				console.error('跳转失败:', err)
-				// 如果跳转失败，默认跳转到中文版
-				uni.redirectTo({
-					url: '/pages/legal/agreement-zh'
+	// 响应式数据
+	const loading = ref(true)
+	const error = ref(false)
+	const errorMessage = ref('')
+	const agreementData = ref({
+		title: '',
+		content: '',
+		remark: ''
+	})
+
+	// 将语言代码转换为后端接受的格式
+	const convertLanguageCode = (lang) => {
+		// zh-CN -> zh-CN (保持不变)
+		// en-US -> en_US (转换下划线)
+		return lang.replace(/-/g, '_')
+	}
+
+	// 加载协议内容
+	const loadAgreement = async () => {
+		loading.value = true
+		error.value = false
+		errorMessage.value = ''
+
+		try {
+			// 获取当前语言设置
+			const currentLang = uni.getStorageSync('language') || 'zh-CN'
+			const languageCode = convertLanguageCode(currentLang)
+
+			console.log('加载用户协议，语言:', currentLang, '转换后:', languageCode)
+
+			// 调用接口获取协议内容
+			const res = await uni.request({
+				url: `${URL}/device/agreementConfig/current`,
+				method: 'GET',
+				header: {
+					'Content-Language': languageCode,
+					'Authorization': 'Bearer ' + uni.getStorageSync('token'),
+					'Clientid': uni.getStorageSync('client_id')
+				},
+				data: {
+					agreementCode: 'USER_AGREEMENT',
+					appPlatform: 'wechat',
+					appType: 'user'
+				}
+			})
+
+			console.log('用户协议响应:', res)
+
+			if (res.statusCode === 200 && res.data.code === 200 && res.data.data) {
+				agreementData.value = {
+					title: res.data.data.title || $t('legal.agreement'),
+					content: res.data.data.content || '',
+					remark: res.data.data.remark || ''
+				}
+				
+				// 设置页面标题
+				uni.setNavigationBarTitle({
+					title: agreementData.value.title
 				})
+			} else {
+				throw new Error(res.data.msg || $t('common.loadFailed'))
 			}
-		})
+		} catch (err) {
+			console.error('加载用户协议失败:', err)
+			error.value = true
+			errorMessage.value = err.message || $t('common.loadFailed')
+		} finally {
+			loading.value = false
+		}
+	}
+
+	onMounted(() => {
+		loadAgreement()
 	})
 </script>
 
@@ -67,10 +145,41 @@
 		0% { transform: rotate(0deg); }
 		100% { transform: rotate(360deg); }
 	}
-	
-	text {
-		font-size: 28rpx;
-		color: #666;
+
+	.error-page {
+		min-height: 100vh;
+		background: #f8f8f8;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		padding: 40rpx;
+	}
+
+	.error-content {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		gap: 24rpx;
+
+		.error-icon {
+			font-size: 80rpx;
+		}
+
+		.error-message {
+			font-size: 28rpx;
+			color: #666;
+			text-align: center;
+		}
+
+		.retry-btn {
+			margin-top: 20rpx;
+			padding: 20rpx 60rpx;
+			background: #07c160;
+			color: #fff;
+			border-radius: 8rpx;
+			font-size: 28rpx;
+			border: none;
+		}
 	}
 	
 	.legal-page {
@@ -83,33 +192,31 @@
 
 		.header {
 			margin-bottom: 16rpx;
+
 			.title {
 				font-size: 40rpx;
 				font-weight: 600;
 				color: #222;
 				margin-bottom: 8rpx;
+				display: block;
 			}
+
 			.subtitle {
 				font-size: 24rpx;
 				color: #888;
+				display: block;
 			}
 		}
 
 		.content {
-			// width: 100%;
 			background: #fff;
 			border-radius: 16rpx;
-			padding: 16rpx 20rpx;
+			padding: 20rpx;
 			flex: 1;
-			min-height: 0;
 			box-sizing: border-box;
-			box-shadow: 0 4rpx 12rpx rgba(0,0,0,0.04);
+			box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.04);
 		}
 
-		.h1 { font-size: 30rpx; font-weight: 600; color: #222; margin: 18rpx 0 12rpx; }
-		.p { font-size: 26rpx; color: #444; line-height: 1.8; margin-bottom: 10rpx; }
-		.bold { font-weight: 600; color: #222; }
-
 		.footer {
 			text-align: center;
 			margin-top: 16rpx;
diff --git a/pages/legal/privacy.vue b/pages/legal/privacy.vue
index 18e4571..0f419b8 100644
--- a/pages/legal/privacy.vue
+++ b/pages/legal/privacy.vue
@@ -1,40 +1,118 @@
 <template>
-	<view class="loading-page">
+	<!-- 加载状态 -->
+	<view v-if="loading" class="loading-page">
 		<view class="loading-content">
 			<view class="loading-spinner"></view>
 			<text>{{ $t('common.loading') }}</text>
 		</view>
 	</view>
+
+	<!-- 错误状态 -->
+	<view v-else-if="error" class="error-page">
+		<view class="error-content">
+			<text class="error-icon">⚠️</text>
+			<text class="error-message">{{ errorMessage }}</text>
+			<button class="retry-btn" @click="loadAgreement">{{ $t('common.retry') }}</button>
+		</view>
+	</view>
+
+	<!-- 内容显示 -->
+	<view v-else class="legal-page">
+		<view class="header">
+			<text class="title">{{ agreementData.title || $t('legal.privacy') }}</text>
+			<text v-if="agreementData.remark" class="subtitle">{{ agreementData.remark }}</text>
+		</view>
+
+		<scroll-view class="content" scroll-y>
+			<rich-text :nodes="agreementData.content"></rich-text>
+		</scroll-view>
+
+		<view class="footer">
+			<text>{{ $t('legal.footerNoticePolicy') }}</text>
+		</view>
+	</view>
 </template>
 
 <script setup>
-	import { onMounted } from 'vue'
+	import { ref, onMounted } from 'vue'
 	import { useI18n } from '@/utils/i18n.js'
+	import { URL } from '@/config/url.js'
 
 	const { t: $t } = useI18n()
 
-	onMounted(() => {
-		// 获取当前语言设置
-		const currentLang = uni.getStorageSync('language') || 'zh-CN'
-		
-		// 根据语言跳转到对应页面
-		const targetPage = currentLang === 'en-US' 
-			? '/pages/legal/privacy-en'
-			: '/pages/legal/privacy-zh'
-		
-		console.log('当前语言:', currentLang, '跳转到:', targetPage)
-		
-		// 使用 redirectTo 替换当前页面
-		uni.redirectTo({
-			url: targetPage,
-			fail: (err) => {
-				console.error('跳转失败:', err)
-				// 如果跳转失败，默认跳转到中文版
-				uni.redirectTo({
-					url: '/pages/legal/privacy-zh'
+	// 响应式数据
+	const loading = ref(true)
+	const error = ref(false)
+	const errorMessage = ref('')
+	const agreementData = ref({
+		title: '',
+		content: '',
+		remark: ''
+	})
+
+	// 将语言代码转换为后端接受的格式
+	const convertLanguageCode = (lang) => {
+		// zh-CN -> zh-CN (保持不变)
+		// en-US -> en_US (转换下划线)
+		return lang.replace(/-/g, '_')
+	}
+
+	// 加载协议内容
+	const loadAgreement = async () => {
+		loading.value = true
+		error.value = false
+		errorMessage.value = ''
+
+		try {
+			// 获取当前语言设置
+			const currentLang = uni.getStorageSync('language') || 'zh-CN'
+			const languageCode = convertLanguageCode(currentLang)
+
+			console.log('加载隐私政策，语言:', currentLang, '转换后:', languageCode)
+
+			// 调用接口获取协议内容
+			const res = await uni.request({
+				url: `${URL}/device/agreementConfig/current`,
+				method: 'GET',
+				header: {
+					'Content-Language': languageCode,
+					'Authorization': 'Bearer ' + uni.getStorageSync('token'),
+					'Clientid': uni.getStorageSync('client_id')
+				},
+				data: {
+					agreementCode: 'PRIVACY_POLICY',
+					appPlatform: 'wechat',
+					appType: 'user'
+				}
+			})
+
+			console.log('隐私政策响应:', res)
+
+			if (res.statusCode === 200 && res.data.code === 200 && res.data.data) {
+				agreementData.value = {
+					title: res.data.data.title || $t('legal.privacy'),
+					content: res.data.data.content || '',
+					remark: res.data.data.remark || ''
+				}
+				
+				// 设置页面标题
+				uni.setNavigationBarTitle({
+					title: agreementData.value.title
 				})
+			} else {
+				throw new Error(res.data.msg || $t('common.loadFailed'))
 			}
-		})
+		} catch (err) {
+			console.error('加载隐私政策失败:', err)
+			error.value = true
+			errorMessage.value = err.message || $t('common.loadFailed')
+		} finally {
+			loading.value = false
+		}
+	}
+
+	onMounted(() => {
+		loadAgreement()
 	})
 </script>
 
@@ -67,10 +145,41 @@
 		0% { transform: rotate(0deg); }
 		100% { transform: rotate(360deg); }
 	}
-	
-	text {
-		font-size: 28rpx;
-		color: #666;
+
+	.error-page {
+		min-height: 100vh;
+		background: #f8f8f8;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		padding: 40rpx;
+	}
+
+	.error-content {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		gap: 24rpx;
+
+		.error-icon {
+			font-size: 80rpx;
+		}
+
+		.error-message {
+			font-size: 28rpx;
+			color: #666;
+			text-align: center;
+		}
+
+		.retry-btn {
+			margin-top: 20rpx;
+			padding: 20rpx 60rpx;
+			background: #07c160;
+			color: #fff;
+			border-radius: 8rpx;
+			font-size: 28rpx;
+			border: none;
+		}
 	}
 	
 	.legal-page {
@@ -83,60 +192,31 @@
 
 		.header {
 			margin-bottom: 16rpx;
-		}
 
-		.title {
-			font-size: 40rpx;
-			font-weight: 600;
-			color: #222;
-			margin-bottom: 8rpx;
-		}
+			.title {
+				font-size: 40rpx;
+				font-weight: 600;
+				color: #222;
+				margin-bottom: 8rpx;
+				display: block;
+			}
 
-		.subtitle {
-			font-size: 24rpx;
-			color: #888;
-		}
-
-		.card {
-			background: #fff;
-			border-radius: 16rpx;
-			padding: 20rpx;
-			box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.04);
-		}
-
-		.notice {
-			margin-bottom: 16rpx;
+			.subtitle {
+				font-size: 24rpx;
+				color: #888;
+				display: block;
+			}
 		}
 
 		.content {
 			background: #fff;
 			border-radius: 16rpx;
-			padding: 16rpx 20rpx;
+			padding: 20rpx;
 			flex: 1;
-			min-height: 0;
 			box-sizing: border-box;
 			box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.04);
 		}
 
-		.h1 {
-			font-size: 30rpx;
-			font-weight: 600;
-			color: #222;
-			margin: 18rpx 0 12rpx;
-		}
-
-		.p {
-			font-size: 26rpx;
-			color: #444;
-			line-height: 1.8;
-			margin-bottom: 10rpx;
-		}
-
-		.bold {
-			font-weight: 600;
-			color: #222;
-		}
-
 		.footer {
 			text-align: center;
 			margin-top: 16rpx;
diff --git a/pages/my/index.vue b/pages/my/index.vue
index 028c768..30fc32a 100644
--- a/pages/my/index.vue
+++ b/pages/my/index.vue
@@ -23,10 +23,21 @@
 			</view>
 		</view> -->
 
-		<view class="section">
-			<view class="banner-card" @click="navigateTo('/pages/join/index')">
-				<image class="banner-image" src="/static/userCenter_swiper.png" mode="aspectFill"></image>
-			</view>
+	<view class="section">
+		<!-- 广告轮播 -->
+		<view class="banner-card" v-if="bannerImages.length > 0">
+			<swiper class="banner-swiper" :indicator-dots="bannerImages.length > 1" 
+					:autoplay="bannerImages.length > 1" :circular="true" :interval="3000">
+				<swiper-item v-for="(image, index) in bannerImages" :key="index">
+					<image class="banner-image" :src="image" mode="aspectFill" 
+						   @click="handleBannerClick(index)"></image>
+				</swiper-item>
+			</swiper>
+		</view>
+		<!-- 默认图片（当没有广告时显示） -->
+		<view class="banner-card" v-else @click="navigateTo('/pages/join/index')">
+			<image class="banner-image" src="/static/userCenter_swiper.png" mode="aspectFill"></image>
+		</view>
 			<!-- <view class="section-title">常用服务</view> -->
 			<view class="list">
 				<view class="list-item" @click="handleQuickReturn">
@@ -147,6 +158,60 @@ import {
 	const appVersion = ref('1.0.0');
 	
 	const showMenuItem = ref(false)
+	const bannerImages = ref([]) // 广告图片列表
+
+	// 将语言代码转换为后端接受的格式
+	const convertLanguageCode = (lang) => {
+		// zh-CN -> zh_CN (转换下划线)
+		// en-US -> en_US (转换下划线)
+		return lang.replace(/-/g, '_')
+	}
+
+	// 获取广告图片
+	const getBannerImages = async () => {
+		try {
+			// 获取当前语言设置
+			const currentLang = uni.getStorageSync('language') || 'zh-CN'
+			const languageCode = convertLanguageCode(currentLang)
+
+			console.log('加载个人中心广告，语言:', currentLang, '转换后:', languageCode)
+
+			// 调用接口获取广告内容
+			const res = await uni.request({
+				url: `${URL}/device/advertisementConfig/current`,
+				method: 'GET',
+				header: {
+					'Content-Language': languageCode
+				},
+				data: {
+					appPlatform: 'wechat',  // 微信平台
+					appType: 'user'  // 用户端
+				}
+			})
+
+			console.log('个人中心广告响应:', res)
+
+			if (res.statusCode === 200 && res.data.code === 200 && res.data.data) {
+				// 使用 files 字段（图片列表）
+				const files = res.data.data.files || []
+				if (files.length > 0) {
+					bannerImages.value = files
+					console.log('个人中心广告加载成功，图片数量:', files.length)
+				}
+			} else {
+				console.warn('获取个人中心广告失败:', res.data?.msg || '未知错误')
+			}
+		} catch (error) {
+			console.error('获取个人中心广告失败:', error)
+		}
+	}
+
+	// 处理广告点击
+	const handleBannerClick = (index) => {
+		console.log('点击广告:', index)
+		// 可以根据需要添加跳转逻辑
+		// 例如：navigateTo('/pages/join/index')
+	}
 
 	// 页面加载时初始化
 	onMounted(() => {
@@ -155,11 +220,13 @@ import {
 		})
 		getInfo();
 		initVersion();
+		getBannerImages(); // 加载广告
 	});
 
 	// 页面显示时刷新用户信息
 	onShow(() => {
 		getInfo();
+		getBannerImages(); // 刷新广告
 	});
 
 	// 获取用户信息
@@ -571,6 +638,11 @@ import {
 		border: 1rpx solid #f0f0f0;
 	}
 
+	.banner-swiper {
+		width: 100%;
+		height: 260rpx;
+	}
+
 	.banner-image {
 		width: 100%;
 		height: 260rpx;
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index 8809860..1fdc9ce 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -24,9 +24,9 @@
 					<view class="info-label">{{ $t('order.totalAmount') }}</view>
 				</view>
 			</view>
-			<view class="fee-rule">
+			<!-- <view class="fee-rule">
 				{{ feeRuleText }}
-			</view>
+			</view> -->
 		</view>
 
 		<!-- 租借信息卡片 -->
@@ -48,8 +48,16 @@
 				<view class="rent-label">{{ $t('order.rentLocation') }}</view>
 				<view class="rent-value">{{ orderInfo.positionName || '-' }}</view>
 			</view>
+			<view class="rent-item" v-if="orderInfo.freeRentTime&&orderInfo.freeRentTime!=='0'">
+				<view class="rent-label">{{ $t('order.freeRentTime') }}</view>
+				<view class="rent-value">{{ getFreeRentTimeDisplay() }}</view>
+			</view>
+			<view class="rent-item" v-if="orderInfo.unitPrice && orderInfo.orderType">
+				<view class="rent-label">{{ $t('order.pricingRule') }}</view>
+				<view class="rent-value">{{ getPricingRuleDisplay() }}</view>
+			</view>
 			<view class="rent-item">
-				<view class="rent-label">{{ $t('order.rentMethod') }}</view>
+				<view class="rent-label">{{ $t('order.paymentMethod') }}</view>
 				<view class="rent-value">{{ getPayWayText() }}</view>
 			</view>
 			<view class="rent-item" v-if="isOrderCompleted() && orderInfo.endTime">
@@ -66,6 +74,11 @@
 				<text class="paid-unit">{{ $t('unit.yuan') }}</text>
 			</view>
 		</view>
+		<view class="">
+			<view class="" style="font-size: 24rpx;text-align: center;">
+				产品归还入仓后，订单仍未结束，请前往<text @click="contactService" style="color:#07c160 ;">客服中心</text>联系工作人员。
+			</view>
+		</view>
 
 		<!-- 底部操作栏 -->
 		<view class="bottom-bar">
@@ -122,7 +135,9 @@
 	</view>
 </template>
 
-<script>
+<script setup>
+	import { ref, computed, onMounted, onUnmounted, getCurrentInstance } from 'vue'
+	import { onLoad, onShow, onHide, onUnload } from '@dcloudio/uni-app'
 	import {
 		queryById,
 		cancelOrder
@@ -133,832 +148,806 @@
 	import {
 		URL
 	} from "@/config/url.js"
+	import { useI18n } from '@/utils/i18n.js'
 
-	export default {
-		data() {
-			return {
-				deviceId: '',
-				orderInfo: {
-					orderId: '',
-					orderNo: '',
-					startTime: '',
-					endTime: '',
-					usedTime: '0分钟',
-					currentFee: '0.00',
-					orderStatus: '',
-					payWay: '',
-					depositAmount: '',
-					packageTime: '',
-					packagePrice: '',
-					payAmount: '0.00',
-					phone: '',
-					refundAmount: '0.00',
-					withdrawStatus: 'waiting',
-					isWithdrawn: false,
-					positionName: '',
-					returnPosition: '',
-					expressReturnStart: null,
-					isSupportExpressReturn: 'yes'
-				},
-				timer: null,
-				statusCheckTimer: null,
-				maxStatusChecks: 60,
-				currentStatusChecks: 0,
-				statusCheckInterval: 3000,
-				isPageActive: false,
-				isLoadingOrder: false,
-				expressThresholdSeconds: 180,
-				countdownRemaining: 0,
-				showExpressAction: false,
-				countdownTimer: null,
-				feeRuleText: '5.0元/60分钟 前15分钟内归还免费 不足60分钟按60分钟计费 封顶99元 持续计费至99元视为买断'
-			}
-		},
-		onLoad(options) {
-			console.log('订单详情页加载，参数:', JSON.stringify(options))
+	const { t: $t } = useI18n()
+	const instance = getCurrentInstance()
+	const $orderMonitor = instance?.proxy?.$orderMonitor || null
 
-			// 设置页面标题
-			uni.setNavigationBarTitle({
-				title: this.$t('order.orderDetail')
-			})
+	// 响应式数据
+	const deviceId = ref('')
+	const orderInfo = ref({
+		orderId: '',
+		orderNo: '',
+		startTime: '',
+		endTime: '',
+		usedTime: '0分钟',
+		currentFee: '0.00',
+		orderStatus: '',
+		payWay: '',
+		depositAmount: '',
+		packageTime: '',
+		packagePrice: '',
+		payAmount: '0.00',
+		phone: '',
+		refundAmount: '0.00',
+		withdrawStatus: 'waiting',
+		isWithdrawn: false,
+		positionName: '',
+		returnPosition: '',
+		expressReturnStart: null,
+		isSupportExpressReturn: 'yes',
+		freeRentTime: '',
+		unitPrice: '',
+		orderType: ''
+	})
+	const timer = ref(null)
+	const statusCheckTimer = ref(null)
+	const maxStatusChecks = ref(60)
+	const currentStatusChecks = ref(0)
+	const statusCheckInterval = ref(3000)
+	const isPageActive = ref(false)
+	const isLoadingOrder = ref(false)
+	const expressThresholdSeconds = ref(180)
+	const countdownRemaining = ref(0)
+	const showExpressAction = ref(false)
+	const countdownTimer = ref(null)
+	const feeRuleText = ref('5.0元/60分钟 前15分钟内归还免费 不足60分钟按60分钟计费 封顶99元 持续计费至99元视为买断')
+	// 判断订单是否已完成
+	const isOrderCompleted = () => {
+		return orderInfo.value.orderStatus === 'used_done' || 
+			   orderInfo.value.orderStatus === 'used_down'
+	}
 
-			this.isPageActive = true
+	// 获取订单状态文字
+	const getOrderStatusText = () => {
+		const statusMap = {
+			'waiting_for_payment': $t('order.waitingForPayment'),
+			'payment_in_progress': $t('order.paymentInProgress'),
+			'payment_successful': $t('order.paymentSuccess'),
+			'in_used': $t('order.inUse'),
+			'payment_failed': $t('order.paymentFailed'),
+			'order_cancelled': $t('order.cancelled'),
+			'used_done': $t('order.finished'),
+			'used_down': $t('order.finished')
+		}
+		return statusMap[orderInfo.value.orderStatus] || $t('order.orderDetail')
+	}
+
+	// 获取状态描述
+	const getStatusDesc = () => {
+		const descMap = {
+			'waiting_for_payment': $t('order.pleasePaySoon'),
+			'in_used': $t('order.pleaseReturnInTime'),
+			'used_done': $t('order.returnedThankYou'),
+			'used_down': $t('order.returnedThankYou'),
+			'order_cancelled': $t('order.orderCancelled'),
+			'payment_failed': $t('order.paymentFailedRetry')
+		}
+		return descMap[orderInfo.value.orderStatus] || ''
+	}
+
+	// 获取支付方式文本
+	const getPayWayText = () => {
+		const payWayMap = {
+			'wx_score_pay': $t('order.depositFree'),
+			'wx_member_pay': $t('order.memberOrder'),
+			'wx_pay': $t('order.depositPay')
+		}
+		return payWayMap[orderInfo.value.payWay] || $t('order.depositFree')
+	}
+
+	// 获取免费时长显示
+	const getFreeRentTimeDisplay = () => {
+		if (!orderInfo.value.freeRentTime) return '-'
+		return orderInfo.value.freeRentTime
+	}
+
+	// 获取计费规则显示
+	const getPricingRuleDisplay = () => {
+		if (!orderInfo.value.unitPrice || !orderInfo.value.orderType) return '-'
+		
+		const orderTypeMap = {
+			'hours': $t('time.hours'),
+			'minutes': $t('time.minutes'),
+			'halfhours': $t('time.halfHours')
+		}
+		
+		const orderTypeText = orderTypeMap[orderInfo.value.orderType] || orderInfo.value.orderType
+		return `${orderInfo.value.unitPrice}${$t('unit.yuan')}/${orderTypeText}`
+	}
+
+	// 格式化倒计时（显示为 HH:MM:SS 格式）
+	const formatCountdown = (totalSeconds) => {
+		if (typeof totalSeconds !== 'number' || totalSeconds < 0) return '00:00:00'
+		const hours = Math.floor(totalSeconds / 3600)
+		const minutes = Math.floor((totalSeconds % 3600) / 60)
+		const seconds = totalSeconds % 60
+		const pad = (n) => n.toString().padStart(2, '0')
+		return `${pad(hours)}:${pad(minutes)}:${pad(seconds)}`
+	}
+
+	// 联系客服
+	const contactService = () => {
+		uni.navigateTo({
+			url: '/pages/help/index'
+		})
+	}
+
+	// 快速归还
+	const quickReturn = () => {
+		uni.navigateTo({
+			url: '/pages/search/index'
+		})
+	}
+
+	// 再次租借
+	const rentAgain = () => {
+		uni.reLaunch({
+			url: '/pages/index/index'
+		})
+	}
+
+	// 获取使用时长显示信息
+	const getUsedTimeDisplay = () => {
+		let usedTime = orderInfo.value.usedTime
+		
+		// 如果 usedTime 为空，通过开始时间和结束时间计算
+		if (usedTime === '0分钟' && orderInfo.value.startTime && orderInfo.value.endTime) {
+			const startMs = parseStartTimeToMs(orderInfo.value.startTime)
+			const endMs = parseStartTimeToMs(orderInfo.value.endTime)
 			
-			// 从缓存读取通知内容（计费规则）
-			try {
-				const cachedNotice = uni.getStorageSync('noticeContent')
-				if (cachedNotice) {
-					console.log('从缓存读取计费规则:', cachedNotice)
-					this.feeRuleText = cachedNotice
+			if (!isNaN(startMs) && !isNaN(endMs)) {
+				const diffMs = endMs - startMs
+				const totalMinutes = Math.floor(diffMs / (1000 * 60))
+				
+				// 格式化为 "X小时X分钟" 或 "X分钟"
+				if (totalMinutes >= 60) {
+					const hours = Math.floor(totalMinutes / 60)
+					const minutes = totalMinutes % 60
+					usedTime = minutes > 0 ? `${hours}小时${minutes}分钟` : `${hours}小时`
+				} else {
+					usedTime = `${totalMinutes}分钟`
 				}
-			} catch (e) {
-				console.warn('读取缓存通知内容失败:', e)
 			}
+		}
+		
+		// 如果还是没有值，使用默认值
+		if (!usedTime) {
+			usedTime = '0分钟'
+		}
+		
+		// 解析时长字符串，例如 "1小时5分钟" 或 "5分钟"
+		const hourMatch = usedTime.match(/(\d+)小时/)
+		const minuteMatch = usedTime.match(/(\d+)分钟/)
+		
+		let displayNumber = ''
+		let displayUnit = ''
+		
+		if (hourMatch && minuteMatch) {
+			// 有小时也有分钟，如 "1小时5分钟"
+			displayNumber = `${hourMatch[1]}`
+			displayUnit = `小时${minuteMatch[1]}分钟`
+		} else if (hourMatch) {
+			// 只有小时，如 "1小时"
+			displayNumber = hourMatch[1]
+			displayUnit = '小时'
+		} else if (minuteMatch) {
+			// 只有分钟，如 "5分钟"
+			displayNumber = minuteMatch[1]
+			displayUnit = '分钟'
+		} else {
+			// 默认情况
+			displayNumber = '0'
+			displayUnit = '分钟'
+		}
+		
+		return {
+			number: displayNumber,
+			unit: displayUnit
+		}
+	}
 
-			this.orderInfo.orderId = options.orderId || ''
-			this.deviceId = options.deviceNo || options.deviceId || ''
+	// 获取使用时长标签文本
+	const getUsedTimeLabel = () => {
+		// 使用中状态显示"已使用"，已完成状态显示"使用时长"
+		return orderInfo.value.orderStatus === 'in_used' ? $t('order.used') : $t('order.duration')
+	}
 
-			if (!this.orderInfo.orderId && this.deviceId) {
-				this.getOrderByDevice()
-			} else if (this.orderInfo.orderId) {
-				this.getOrderDetails()
+	// 获取订单费用（不含单位）
+	const getOrderFee = () => {
+		const fee = orderInfo.value.currentFee || orderInfo.value.payAmount || '0'
+		// 移除可能的"元"字符
+		return String(fee).replace(/[元¥]/g, '')
+	}
+
+	// 解析开始时间
+	const parseStartTimeToMs = (timeStr) => {
+		if (!timeStr) return NaN
+		if (typeof timeStr === 'number') {
+			return timeStr < 1e12 ? timeStr * 1000 : timeStr
+		}
+		let normalized = String(timeStr).trim()
+		normalized = normalized.replace('T', ' ').replace(/\.\d+Z?$/, '')
+		const candidates = [
+			normalized,
+			normalized.replace(/-/g, '/')
+		]
+		for (let i = 0; i < candidates.length; i++) {
+			const ts = Date.parse(candidates[i])
+			if (!isNaN(ts)) return ts
+		}
+		const m = normalized.match(/(\d{4})[\/-](\d{1,2})[\/-](\d{1,2})\s+(\d{1,2}):(\d{1,2})(?::(\d{1,2}))?/)
+		if (m) {
+			const y = parseInt(m[1])
+			const mon = parseInt(m[2]) - 1
+			const d = parseInt(m[3])
+			const h = parseInt(m[4])
+			const min = parseInt(m[5])
+			const s = m[6] ? parseInt(m[6]) : 0
+			return new Date(y, mon, d, h, min, s).getTime()
+		}
+		const num = Number(normalized)
+		if (!isNaN(num)) {
+			return num < 1e12 ? num * 1000 : num
+		}
+		return NaN
+	}
+
+	// 清除倒计时
+	const clearExpressCountdown = () => {
+		if (countdownTimer.value) {
+			clearInterval(countdownTimer.value)
+			countdownTimer.value = null
+		}
+	}
+
+	// 重新计算倒计时
+	const recomputeExpressCountdownFromStartTime = () => {
+		// 如果不支持快递归还，直接返回
+		if (orderInfo.value.isSupportExpressReturn === 'no') {
+			showExpressAction.value = false
+			countdownRemaining.value = 0
+			return
+		}
+		
+		if (orderInfo.value.orderStatus !== 'in_used') {
+			showExpressAction.value = false
+			countdownRemaining.value = 0
+			return
+		}
+		const startMs = parseStartTimeToMs(orderInfo.value.startTime)
+		if (isNaN(startMs)) {
+			showExpressAction.value = false
+			countdownRemaining.value = 0
+			return
+		}
+		const nowMs = Date.now()
+		const elapsedSeconds = Math.max(0, Math.floor((nowMs - startMs) / 1000))
+		const remaining = expressThresholdSeconds.value - elapsedSeconds
+		if (remaining <= 0) {
+			countdownRemaining.value = 0
+			showExpressAction.value = true
+		} else {
+			countdownRemaining.value = remaining
+			showExpressAction.value = false
+		}
+	}
+
+	// 启动快递归还倒计时
+	const startExpressCountdown = () => {
+		// 如果不支持快递归还，直接返回
+		if (orderInfo.value.isSupportExpressReturn === 'no') {
+			console.log('订单不支持快递归还，不启动倒计时')
+			showExpressAction.value = false
+			countdownRemaining.value = 0
+			return
+		}
+		
+		clearExpressCountdown()
+		recomputeExpressCountdownFromStartTime()
+		if (showExpressAction.value) return
+		countdownTimer.value = setInterval(() => {
+			if (!isPageActive.value) {
+				clearExpressCountdown()
+				return
+			}
+			if (orderInfo.value.orderStatus !== 'in_used') {
+				clearExpressCountdown()
+				return
+			}
+			// 再次检查是否支持快递归还
+			if (orderInfo.value.isSupportExpressReturn === 'no') {
+				clearExpressCountdown()
+				showExpressAction.value = false
+				countdownRemaining.value = 0
+				return
+			}
+			recomputeExpressCountdownFromStartTime()
+			if (showExpressAction.value) {
+				clearExpressCountdown()
+			}
+		}, 1000)
+	}
+
+	// 加载系统配置
+	const loadSystemConfig = async () => {
+		try {
+			// 优先使用订单数据中的 expressReturnStart（小时转秒）
+			if (orderInfo.value.expressReturnStart && typeof orderInfo.value.expressReturnStart === 'number' && orderInfo.value.expressReturnStart > 0) {
+				expressThresholdSeconds.value = orderInfo.value.expressReturnStart * 3600
+				console.log('使用订单配置的快递归还阈值:', orderInfo.value.expressReturnStart, '小时 =>', expressThresholdSeconds.value, '秒')
 			} else {
-				uni.showToast({
-					title: '缺少订单信息',
-					icon: 'none'
-				})
-				setTimeout(() => {
-					this.goToHome()
-				}, 1500)
+				// 如果订单数据中没有，则使用系统配置
+				const res = await getSystemConfig()
+				if (res && res.code === 200 && res.data && typeof res.data.expressReturnCountdownSeconds === 'number') {
+					const seconds = res.data.expressReturnCountdownSeconds
+					if (seconds > 0) {
+						expressThresholdSeconds.value = seconds
+						console.log('使用系统配置的快递归还阈值:', seconds, '秒')
+					}
+				}
 			}
-
-			// 注册全局订单完成事件监听器
-			uni.$on('orderCompleted', this.handleOrderCompleted)
-
-			// 获取系统配置
-			// this.loadSystemConfig().then(() => {
-			// 	if (this.orderInfo.orderStatus === 'in_used') {
-			// 		this.startExpressCountdown()
-			// 	}
-			// })
-		},
-		onShow() {
-			this.isPageActive = true
-			if (this.orderInfo.orderStatus === 'in_used' && this.orderInfo.isSupportExpressReturn !== 'no') {
-				this.startExpressCountdown()
+			
+			if (orderInfo.value.orderStatus === 'in_used' && orderInfo.value.startTime) {
+				recomputeExpressCountdownFromStartTime()
 			}
-		},
-		onHide() {
-			console.log('订单详情页隐藏，清理资源')
-			this.isPageActive = false
-			this.clearTimer()
-			this.clearStatusCheckTimer()
-			this.clearExpressCountdown()
-			this.removeFromOrderMonitor()
-		},
-		onUnload() {
-			console.log('订单详情页卸载，清理所有资源')
-			this.isPageActive = false
-			this.clearTimer()
-			this.clearStatusCheckTimer()
-			this.clearExpressCountdown()
-			this.removeFromOrderMonitor()
-			uni.$off('orderCompleted', this.handleOrderCompleted)
-		},
-		methods: {
-			// 判断订单是否已完成
-			isOrderCompleted() {
-				return this.orderInfo.orderStatus === 'used_done' || 
-					   this.orderInfo.orderStatus === 'used_down'
-			},
+		} catch (e) {
+			console.log('加载系统配置失败:', e)
+		}
+	}
 
-			// 获取订单状态文字
-			getOrderStatusText() {
-				const statusMap = {
-					'waiting_for_payment': this.$t('order.waitingForPayment'),
-					'payment_in_progress': this.$t('order.paymentInProgress'),
-					'payment_successful': this.$t('order.paymentSuccess'),
-					'in_used': this.$t('order.inUse'),
-					'payment_failed': this.$t('order.paymentFailed'),
-					'order_cancelled': this.$t('order.cancelled'),
-					'used_done': this.$t('order.finished'),
-					'used_down': this.$t('order.finished')
-				}
-				return statusMap[this.orderInfo.orderStatus] || this.$t('order.orderDetail')
-			},
-
-			// 获取状态描述
-			getStatusDesc() {
-				const descMap = {
-					'waiting_for_payment': this.$t('order.pleasePaySoon'),
-					'in_used': this.$t('order.pleaseReturnInTime'),
-					'used_done': this.$t('order.returnedThankYou'),
-					'used_down': this.$t('order.returnedThankYou'),
-					'order_cancelled': this.$t('order.orderCancelled'),
-					'payment_failed': this.$t('order.paymentFailedRetry')
-				}
-				return descMap[this.orderInfo.orderStatus] || ''
-			},
-
-			// 获取状态图标样式
-			getStatusIconClass() {
-				const classMap = {
-					'waiting_for_payment': 'waiting',
-					'in_used': 'using',
-					'used_done': 'success',
-					'used_down': 'success',
-					'order_cancelled': 'cancelled',
-					'payment_failed': 'failed'
-				}
-				return classMap[this.orderInfo.orderStatus] || 'default'
-			},
-
-			// 获取退款状态文本
-			getWithdrawStatusText() {
-				const statusMap = {
-					'waiting': '待申请',
-					'processing': '处理中',
-					'success': '已退款',
-					'failed': '退款失败'
-				}
-				return statusMap[this.orderInfo.withdrawStatus] || '待申请'
-			},
-
-			// 获取支付方式文本
-			getPayWayText() {
-				const payWayMap = {
-					'wx_score_pay': this.$t('order.depositFree'),
-					'wx_member_pay': this.$t('order.memberOrder'),
-					'wx_pay': this.$t('order.depositPay')
-				}
-				return payWayMap[this.orderInfo.payWay] || this.$t('order.depositFree')
-			},
-
-			// 格式化倒计时（显示为 HH:MM:SS 格式）
-			formatCountdown(totalSeconds) {
-				if (typeof totalSeconds !== 'number' || totalSeconds < 0) return '00:00:00'
-				const hours = Math.floor(totalSeconds / 3600)
-				const minutes = Math.floor((totalSeconds % 3600) / 60)
-				const seconds = totalSeconds % 60
-				const pad = (n) => n.toString().padStart(2, '0')
-				return `${pad(hours)}:${pad(minutes)}:${pad(seconds)}`
-			},
-
-			// 联系客服
-			contactService() {
-				uni.navigateTo({
-					url: '/pages/help/index'
+	// 从订单监控服务中移除当前订单
+	const removeFromOrderMonitor = () => {
+		if (orderInfo.value.orderId && $orderMonitor) {
+			try {
+				$orderMonitor.removeOrder({
+					orderId: orderInfo.value.orderId
 				})
-			},
-
-			// 快速归还
-			quickReturn() {
-				// 跳转到搜索页面查询周围设备
-				uni.navigateTo({
-					url: '/pages/search/index'
-				})
-			},
-
-			// 再次租借
-			rentAgain() {
-				uni.reLaunch({
-					url: '/pages/index/index'
-				})
-			},
-
-			// 获取使用时长显示信息
-			getUsedTimeDisplay() {
-				let usedTime = this.orderInfo.usedTime
-				
-				// 如果 usedTime 为空，通过开始时间和结束时间计算
-				if (usedTime === '0分钟' && this.orderInfo.startTime && this.orderInfo.endTime) {
-					const startMs = this.parseStartTimeToMs(this.orderInfo.startTime)
-					const endMs = this.parseStartTimeToMs(this.orderInfo.endTime)
-					
-					if (!isNaN(startMs) && !isNaN(endMs)) {
-						const diffMs = endMs - startMs
-						const totalMinutes = Math.floor(diffMs / (1000 * 60))
-						
-						// 格式化为 "X小时X分钟" 或 "X分钟"
-						if (totalMinutes >= 60) {
-							const hours = Math.floor(totalMinutes / 60)
-							const minutes = totalMinutes % 60
-							usedTime = minutes > 0 ? `${hours}小时${minutes}分钟` : `${hours}小时`
-						} else {
-							usedTime = `${totalMinutes}分钟`
-						}
-					}
-				}
-				
-				// 如果还是没有值，使用默认值
-				if (!usedTime) {
-					usedTime = '0分钟'
-				}
-				
-				// 解析时长字符串，例如 "1小时5分钟" 或 "5分钟"
-				const hourMatch = usedTime.match(/(\d+)小时/)
-				const minuteMatch = usedTime.match(/(\d+)分钟/)
-				
-				let displayNumber = ''
-				let displayUnit = ''
-				
-				if (hourMatch && minuteMatch) {
-					// 有小时也有分钟，如 "1小时5分钟"
-					displayNumber = `${hourMatch[1]}`
-					displayUnit = `小时${minuteMatch[1]}分钟`
-				} else if (hourMatch) {
-					// 只有小时，如 "1小时"
-					displayNumber = hourMatch[1]
-					displayUnit = '小时'
-				} else if (minuteMatch) {
-					// 只有分钟，如 "5分钟"
-					displayNumber = minuteMatch[1]
-					displayUnit = '分钟'
-				} else {
-					// 默认情况
-					displayNumber = '0'
-					displayUnit = '分钟'
-				}
-				
-				return {
-					number: displayNumber,
-					unit: displayUnit
-				}
-			},
-
-			// 获取使用时长标签文本
-			getUsedTimeLabel() {
-				// 使用中状态显示"已使用"，已完成状态显示"使用时长"
-				return this.orderInfo.orderStatus === 'in_used' ? this.$t('order.used') : this.$t('order.duration')
-			},
-
-			// 获取订单费用（不含单位）
-			getOrderFee() {
-				const fee = this.orderInfo.currentFee || this.orderInfo.payAmount || '0'
-				// 移除可能的"元"字符
-				return String(fee).replace(/[元¥]/g, '')
-			},
-
-			// 加载系统配置
-			async loadSystemConfig() {
-				try {
-					// 优先使用订单数据中的 expressReturnStart（小时转秒）
-					if (this.orderInfo.expressReturnStart && typeof this.orderInfo.expressReturnStart === 'number' && this.orderInfo.expressReturnStart > 0) {
-						this.expressThresholdSeconds = this.orderInfo.expressReturnStart * 3600
-						console.log('使用订单配置的快递归还阈值:', this.orderInfo.expressReturnStart, '小时 =>', this.expressThresholdSeconds, '秒')
-					} else {
-						// 如果订单数据中没有，则使用系统配置
-						const res = await getSystemConfig()
-						if (res && res.code === 200 && res.data && typeof res.data.expressReturnCountdownSeconds === 'number') {
-							const seconds = res.data.expressReturnCountdownSeconds
-							if (seconds > 0) {
-								this.expressThresholdSeconds = seconds
-								console.log('使用系统配置的快递归还阈值:', seconds, '秒')
-							}
-						}
-					}
-					
-					if (this.orderInfo.orderStatus === 'in_used' && this.orderInfo.startTime) {
-						this.recomputeExpressCountdownFromStartTime()
-					}
-				} catch (e) {
-					console.log('加载系统配置失败:', e)
-				}
-			},
-
-			// 启动快递归还倒计时
-			startExpressCountdown() {
-				// 如果不支持快递归还，直接返回
-				if (this.orderInfo.isSupportExpressReturn === 'no') {
-					console.log('订单不支持快递归还，不启动倒计时')
-					this.showExpressAction = false
-					this.countdownRemaining = 0
-					return
-				}
-				
-				this.clearExpressCountdown()
-				this.recomputeExpressCountdownFromStartTime()
-				if (this.showExpressAction) return
-				this.countdownTimer = setInterval(() => {
-					if (!this.isPageActive) {
-						this.clearExpressCountdown()
-						return
-					}
-					if (this.orderInfo.orderStatus !== 'in_used') {
-						this.clearExpressCountdown()
-						return
-					}
-					// 再次检查是否支持快递归还
-					if (this.orderInfo.isSupportExpressReturn === 'no') {
-						this.clearExpressCountdown()
-						this.showExpressAction = false
-						this.countdownRemaining = 0
-						return
-					}
-					this.recomputeExpressCountdownFromStartTime()
-					if (this.showExpressAction) {
-						this.clearExpressCountdown()
-					}
-				}, 1000)
-			},
-
-			// 清除倒计时
-			clearExpressCountdown() {
-				if (this.countdownTimer) {
-					clearInterval(this.countdownTimer)
-					this.countdownTimer = null
-				}
-			},
-
-			// 解析开始时间
-			parseStartTimeToMs(timeStr) {
-				if (!timeStr) return NaN
-				if (typeof timeStr === 'number') {
-					return timeStr < 1e12 ? timeStr * 1000 : timeStr
-				}
-				let normalized = String(timeStr).trim()
-				normalized = normalized.replace('T', ' ').replace(/\.\d+Z?$/, '')
-				const candidates = [
-					normalized,
-					normalized.replace(/-/g, '/')
-				]
-				for (let i = 0; i < candidates.length; i++) {
-					const ts = Date.parse(candidates[i])
-					if (!isNaN(ts)) return ts
-				}
-				const m = normalized.match(/(\d{4})[\/-](\d{1,2})[\/-](\d{1,2})\s+(\d{1,2}):(\d{1,2})(?::(\d{1,2}))?/)
-				if (m) {
-					const y = parseInt(m[1])
-					const mon = parseInt(m[2]) - 1
-					const d = parseInt(m[3])
-					const h = parseInt(m[4])
-					const min = parseInt(m[5])
-					const s = m[6] ? parseInt(m[6]) : 0
-					return new Date(y, mon, d, h, min, s).getTime()
-				}
-				const num = Number(normalized)
-				if (!isNaN(num)) {
-					return num < 1e12 ? num * 1000 : num
-				}
-				return NaN
-			},
-
-			// 重新计算倒计时
-			recomputeExpressCountdownFromStartTime() {
-				// 如果不支持快递归还，直接返回
-				if (this.orderInfo.isSupportExpressReturn === 'no') {
-					this.showExpressAction = false
-					this.countdownRemaining = 0
-					return
-				}
-				
-				if (this.orderInfo.orderStatus !== 'in_used') {
-					this.showExpressAction = false
-					this.countdownRemaining = 0
-					return
-				}
-				const startMs = this.parseStartTimeToMs(this.orderInfo.startTime)
-				if (isNaN(startMs)) {
-					this.showExpressAction = false
-					this.countdownRemaining = 0
-					return
-				}
-				const nowMs = Date.now()
-				const elapsedSeconds = Math.max(0, Math.floor((nowMs - startMs) / 1000))
-				const remaining = this.expressThresholdSeconds - elapsedSeconds
-				if (remaining <= 0) {
-					this.countdownRemaining = 0
-					this.showExpressAction = true
-				} else {
-					this.countdownRemaining = remaining
-					this.showExpressAction = false
-				}
-			},
-
-			// 从订单监控服务中移除当前订单
-			removeFromOrderMonitor() {
-				if (this.orderInfo.orderId && this.$orderMonitor) {
-					try {
-						this.$orderMonitor.removeOrder({
-							orderId: this.orderInfo.orderId
-						})
-						console.log('订单已从监控队列移除:', this.orderInfo.orderId)
-					} catch (error) {
-						console.error('从监控队列移除订单失败:', error)
-					}
-				}
-			},
-
-			// 处理订单完成事件
-			handleOrderCompleted(orderData) {
-				console.log('收到订单完成事件:', orderData)
-				if (orderData.orderId === this.orderInfo.orderId || orderData.orderNo === this.orderInfo.orderNo) {
-					// 刷新订单详情
-					this.getOrderDetails()
-				}
-			},
-
-			// 获取订单详情
-			async getOrderDetails() {
-				if (!this.isPageActive) {
-					console.log('页面已不活跃，跳过订单详情请求')
-					return
-				}
-
-				// 防止并发请求
-				if (this.isLoadingOrder) {
-					console.log('正在加载订单，跳过重复请求')
-					return
-				}
-
-				try {
-					if (!this.orderInfo.orderId) {
-						throw new Error(this.$t('order.orderIdRequired'))
-					}
-
-					this.isLoadingOrder = true
-					const result = await queryById(this.orderInfo.orderId)
-
-					if (result.code === 200 && result.data) {
-						const orderData = result.data
-						console.log('订单数据:', orderData)
-
-						// 更新订单信息
-						this.updateOrderInfo(orderData)
-
-						// 只有使用中的订单才启动定时器和监控
-						if (this.orderInfo.orderStatus === 'in_used') {
-							this.startTimer()
-							this.startStatusCheckTimer()
-							// 只有支持快递归还时才启动倒计时
-							if (this.orderInfo.isSupportExpressReturn !== 'no') {
-								this.startExpressCountdown()
-							}
-
-							uni.setStorageSync('activeOrderId', this.orderInfo.orderId)
-
-							// 添加到监控队列
-							try {
-								if (this.$orderMonitor) {
-									this.$orderMonitor.removeOrder({
-										orderId: this.orderInfo.orderId
-									})
-									this.$orderMonitor.addOrder({
-										orderId: this.orderInfo.orderId
-									}, 'detail')
-									console.log('订单已添加到监控队列:', this.orderInfo.orderId)
-								}
-							} catch (error) {
-								console.error('添加订单到监控队列失败:', error)
-							}
-						}
-					} else {
-						throw new Error(result.msg || '获取订单详情失败')
-					}
-				} catch (error) {
-					console.error('获取订单详情错误:', error)
-					uni.showToast({
-						title: error.message || '获取订单信息失败',
-						icon: 'none'
-					})
-					setTimeout(() => {
-						this.goToHome()
-					}, 1500)
-				} finally {
-					this.isLoadingOrder = false
-					uni.hideLoading()
-				}
-			},
-
-			// 更新订单信息
-			updateOrderInfo(orderData) {
-				const oldStatus = this.orderInfo.orderStatus
-				
-				this.orderInfo.usedTime = orderData.usedTime || '0分钟'
-				this.orderInfo.currentFee = orderData.currentFee || orderData.actualDeviceAmount || orderData.payAmount || '0.00'
-				this.orderInfo.orderStatus = orderData.orderStatus || ''
-				this.orderInfo.payWay = orderData.payWay || ''
-				this.orderInfo.startTime = orderData.startTime || orderData.createTime || ''
-				this.orderInfo.endTime = orderData.endTime || ''
-				this.orderInfo.depositAmount = orderData.depositAmount || ''
-				this.orderInfo.packageTime = orderData.packageTime || ''
-				this.orderInfo.packagePrice = orderData.packagePrice || ''
-				this.orderInfo.payAmount = orderData.payAmount || '0.00'
-				this.orderInfo.phone = orderData.phone || ''
-				this.orderInfo.orderNo = orderData.orderNo || ''
-				this.orderInfo.refundAmount = orderData.residueAmount || '0.00'
-				this.orderInfo.withdrawStatus = orderData.withdrawStatus || 'waiting'
-				this.orderInfo.isWithdrawn = orderData.withdrawStatus === 'success'
-				this.orderInfo.positionName = orderData.positionName || orderData.positionLocation || ''
-				this.orderInfo.returnPosition = orderData.returnPosition || orderData.positionName || orderData.positionLocation || ''
-				
-				// 保存快递归还开始时间（小时为单位）
-				this.orderInfo.expressReturnStart = orderData.expressReturnStart || null
-				
-				// 保存是否支持快递归还
-				this.orderInfo.isSupportExpressReturn = orderData.isSupportExpressReturn || 'yes'
-				
-				// 如果有有效的 expressReturnStart，立即更新倒计时阈值（小时转秒）
-				if (this.orderInfo.expressReturnStart && typeof this.orderInfo.expressReturnStart === 'number' && this.orderInfo.expressReturnStart > 0) {
-					this.expressThresholdSeconds = this.orderInfo.expressReturnStart * 3600
-					console.log('从订单数据更新快递归还阈值:', this.orderInfo.expressReturnStart, '小时 =>', this.expressThresholdSeconds, '秒')
-				}
-
-				if (orderData.deviceNo && !this.deviceId) {
-					this.deviceId = orderData.deviceNo
-				}
-				
-				// 如果订单状态从 'in_used' 变为其他状态，清理所有定时器
-				if (oldStatus === 'in_used' && this.orderInfo.orderStatus !== 'in_used') {
-					console.log('订单状态已从使用中变为:', this.orderInfo.orderStatus, '，清理所有定时器')
-					this.clearTimer()
-					this.clearStatusCheckTimer()
-					this.clearExpressCountdown()
-					this.removeFromOrderMonitor()
-					
-					// 显示订单完成提示
-					if (this.orderInfo.orderStatus === 'used_done' || this.orderInfo.orderStatus === 'used_down') {
-						uni.showToast({
-							title: '订单已完成',
-							icon: 'success'
-						})
-					}
-				}
-			},
-
-			// 更新使用时长的定时器（每30秒更新一次）
-			startTimer() {
-				this.clearTimer()
-				this.timer = setInterval(() => {
-					if (!this.isPageActive) {
-						console.log('页面已不活跃，停止计时器')
-						this.clearTimer()
-						return
-					}
-					if (this.orderInfo.orderStatus !== 'in_used') {
-						console.log('订单状态已变更，停止计时器')
-						this.clearTimer()
-						return
-					}
-					console.log('执行定时更新订单信息')
-					this.getOrderDetails()
-				}, 30000) // 改为30秒更新一次
-				console.log('已启动使用时长更新计时器（30秒间隔）')
-			},
-
-			// 清除定时器
-			clearTimer() {
-				if (this.timer) {
-					clearInterval(this.timer)
-					this.timer = null
-					console.log('已清除使用时长更新计时器')
-				}
-			},
-
-			// 清除状态检查定时器
-			clearStatusCheckTimer() {
-				if (this.statusCheckTimer) {
-					clearInterval(this.statusCheckTimer)
-					this.statusCheckTimer = null
-					console.log('已清除归还状态检查计时器')
-				}
-			},
-
-			// 开始状态检查定时器（优化版）
-			startStatusCheckTimer() {
-				this.currentStatusChecks = 0
-				this.clearStatusCheckTimer()
-
-				this.statusCheckTimer = setInterval(() => {
-					if (!this.isPageActive) {
-						console.log('页面已不活跃，停止状态检查计时器')
-						this.clearStatusCheckTimer()
-						return
-					}
-					
-					if (this.orderInfo.orderStatus !== 'in_used') {
-						console.log('订单状态已变更，停止状态检查计时器')
-						this.clearStatusCheckTimer()
-						return
-					}
-					
-					this.currentStatusChecks++
-					console.log(`执行归还状态检查 (${this.currentStatusChecks}/${this.maxStatusChecks})`)
-					this.checkReturnStatus()
-
-					if (this.currentStatusChecks >= this.maxStatusChecks) {
-						this.clearStatusCheckTimer()
-						uni.showToast({
-							title: '请手动刷新查看归还状态',
-							icon: 'none',
-							duration: 3000
-						})
-					}
-				}, this.statusCheckInterval)
-
-				console.log('已启动归还状态检查计时器（3秒间隔）')
-			},
-
-			// 通过设备号查询使用中的订单
-			async getOrderByDevice() {
-				try {
-					if (!this.deviceId) {
-						throw new Error('设备号不能为空')
-					}
-
-					const inUseRes = await uni.request({
-						url: `${URL || 'http://127.0.0.1:8080'}/app/order/inUse`,
-						method: 'GET',
-						header: {
-							'Authorization': "Bearer " + uni.getStorageSync('token'),
-							'Clientid': uni.getStorageSync('client_id')
-						}
-					})
-
-					console.log('通过设备号查询订单结果:', JSON.stringify(inUseRes))
-
-					if (inUseRes.statusCode === 200 && inUseRes.data.code === 200 && inUseRes.data.data) {
-						const inUseOrder = inUseRes.data.data
-						console.log('使用中的订单:', inUseOrder)
-
-						this.orderInfo.orderId = inUseOrder.orderId
-						this.orderInfo.orderStatus = inUseOrder.orderStatus || ''
-						this.orderInfo.payWay = inUseOrder.payWay || ''
-						this.orderInfo.startTime = inUseOrder.startTime || ''
-
-						this.getOrderDetails()
-					} else {
-						throw new Error('未找到使用中的订单')
-					}
-				} catch (error) {
-					console.error('通过设备号查询订单失败:', error)
-					uni.showToast({
-						title: error.message || '获取订单信息失败',
-						icon: 'none'
-					})
-					setTimeout(() => {
-						this.goToHome()
-					}, 1500)
-				} finally {
-					uni.hideLoading()
-				}
-			},
-
-			// 检查归还状态
-			async checkReturnStatus() {
-				try {
-					if (this.isPageActive) {
-						await this.getOrderDetails()
-					}
-				} catch (error) {
-					console.error('检查归还状态失败:', error)
-				}
-			},
-
-			// 快递归还
-			expressRetrunOrder() {
-				uni.navigateTo({
-					url: `/pages/expressReturn/addExpressReturn?orderId=${this.orderInfo.orderId}`
-				})
-			},
-
-			// 取消订单
-			handleCancelOrder() {
-				uni.showModal({
-					title: this.$t('order.confirmCancel'),
-					content: this.$t('order.confirmCancelContent'),
-					success: async (res) => {
-						if (res.confirm) {
-							try {
-								uni.showLoading({
-									title: this.$t('common.processing')
-								})
-								const result = await cancelOrder({
-									orderId: this.orderInfo.orderId
-								})
-								if (result.code === 200) {
-									uni.hideLoading()
-									uni.showToast({
-										title: this.$t('order.cancelSuccess'),
-										icon: 'success'
-									})
-									await this.getOrderDetails()
-								} else {
-									throw new Error(result.msg || this.$t('order.cancelFailed'))
-								}
-							} catch (error) {
-								uni.hideLoading()
-								uni.showToast({
-									title: error.message || this.$t('order.cancelFailed'),
-									icon: 'none'
-								})
-							}
-						}
-					}
-				})
-			},
-
-			// 立即支付
-			handlePayment() {
-				uni.navigateTo({
-					url: `/pages/order/payment?orderId=${this.orderInfo.orderId}`
-				})
-			},
-
-			// 申请退款
-			async handleWithdraw() {
-				try {
-					uni.showLoading({
-						title: this.$t('common.processing')
-					})
-
-					const res = await uni.request({
-						url: `${URL || 'http://127.0.0.1:8080'}/app/withdraw/add/${this.orderInfo.orderNo}`,
-						method: 'GET',
-						header: {
-							'Content-Type': 'application/json',
-							'Authorization': 'Bearer ' + uni.getStorageSync('token'),
-							'Clientid': uni.getStorageSync('client_id')
-						}
-					})
-
-					if (res.statusCode === 200 && res.data.code === 200) {
-						uni.showToast({
-							title: this.$t('order.refundSuccess'),
-							icon: 'success'
-						})
-
-						this.orderInfo.withdrawStatus = 'processing'
-						this.orderInfo.isWithdrawn = true
-
-						setTimeout(() => {
-							this.getOrderDetails()
-						}, 1500)
-					} else {
-						throw new Error(res.data.msg || '退款申请失败')
-					}
-				} catch (error) {
-					console.error('退款申请错误:', error)
-					uni.showToast({
-						title: error.message || this.$t('order.refundFailed'),
-						icon: 'none'
-					})
-				} finally {
-					uni.hideLoading()
-				}
-			},
-
-			// 返回首页
-			goToHome() {
-				uni.reLaunch({
-					url: '/pages/index/index'
-				})
-			},
-
-			// 格式化时间
-			formatTime(minutes) {
-				if (!minutes) return ''
-				const mins = parseInt(minutes)
-				if (mins < 60) {
-					return `${mins}分钟`
-				} else {
-					const hours = Math.floor(mins / 60)
-					const remainingMins = mins % 60
-					return remainingMins > 0 ? `${hours}小时${remainingMins}分钟` : `${hours}小时`
-				}
-			},
-
-			// 格式化倒计时
-			formatHms(totalSeconds) {
-				if (typeof totalSeconds !== 'number' || totalSeconds < 0) return '00:00:00'
-				const hours = Math.floor(totalSeconds / 3600)
-				const minutes = Math.floor((totalSeconds % 3600) / 60)
-				const seconds = totalSeconds % 60
-				const pad = (n) => n.toString().padStart(2, '0')
-				return `${pad(hours)}:${pad(minutes)}:${pad(seconds)}`
+				console.log('订单已从监控队列移除:', orderInfo.value.orderId)
+			} catch (error) {
+				console.error('从监控队列移除订单失败:', error)
 			}
 		}
 	}
+
+	// 处理订单完成事件
+	const handleOrderCompleted = (orderData) => {
+		console.log('收到订单完成事件:', orderData)
+		if (orderData.orderId === orderInfo.value.orderId || orderData.orderNo === orderInfo.value.orderNo) {
+			// 刷新订单详情
+			getOrderDetails()
+		}
+	}
+
+	// 清除定时器
+	const clearTimer = () => {
+		if (timer.value) {
+			clearInterval(timer.value)
+			timer.value = null
+			console.log('已清除使用时长更新计时器')
+		}
+	}
+
+	// 清除状态检查定时器
+	const clearStatusCheckTimer = () => {
+		if (statusCheckTimer.value) {
+			clearInterval(statusCheckTimer.value)
+			statusCheckTimer.value = null
+			console.log('已清除归还状态检查计时器')
+		}
+	}
+
+	// 更新使用时长的定时器（每30秒更新一次）
+	const startTimer = () => {
+		clearTimer()
+		timer.value = setInterval(() => {
+			if (!isPageActive.value) {
+				console.log('页面已不活跃，停止计时器')
+				clearTimer()
+				return
+			}
+			if (orderInfo.value.orderStatus !== 'in_used') {
+				console.log('订单状态已变更，停止计时器')
+				clearTimer()
+				return
+			}
+			console.log('执行定时更新订单信息')
+			getOrderDetails()
+		}, 30000) // 改为30秒更新一次
+		console.log('已启动使用时长更新计时器（30秒间隔）')
+	}
+
+	// 开始状态检查定时器（优化版）
+	const startStatusCheckTimer = () => {
+		currentStatusChecks.value = 0
+		clearStatusCheckTimer()
+
+		statusCheckTimer.value = setInterval(() => {
+			if (!isPageActive.value) {
+				console.log('页面已不活跃，停止状态检查计时器')
+				clearStatusCheckTimer()
+				return
+			}
+			
+			if (orderInfo.value.orderStatus !== 'in_used') {
+				console.log('订单状态已变更，停止状态检查计时器')
+				clearStatusCheckTimer()
+				return
+			}
+			
+			currentStatusChecks.value++
+			console.log(`执行归还状态检查 (${currentStatusChecks.value}/${maxStatusChecks.value})`)
+			checkReturnStatus()
+
+			if (currentStatusChecks.value >= maxStatusChecks.value) {
+				clearStatusCheckTimer()
+				uni.showToast({
+					title: $t('order.pleaseRefreshManually'),
+					icon: 'none',
+					duration: 3000
+				})
+			}
+		}, statusCheckInterval.value)
+
+		console.log('已启动归还状态检查计时器（3秒间隔）')
+	}
+
+	// 检查归还状态
+	const checkReturnStatus = async () => {
+		try {
+			if (isPageActive.value) {
+				await getOrderDetails()
+			}
+		} catch (error) {
+			console.error('检查归还状态失败:', error)
+		}
+	}
+
+	// 更新订单信息
+	const updateOrderInfo = (orderData) => {
+		const oldStatus = orderInfo.value.orderStatus
+		
+		orderInfo.value.usedTime = orderData.usedTime || '0分钟'
+		orderInfo.value.currentFee = orderData.currentFee || orderData.actualDeviceAmount || orderData.payAmount || '0.00'
+		orderInfo.value.orderStatus = orderData.orderStatus || ''
+		orderInfo.value.payWay = orderData.payWay || ''
+		orderInfo.value.startTime = orderData.startTime || orderData.createTime || ''
+		orderInfo.value.endTime = orderData.endTime || ''
+		orderInfo.value.depositAmount = orderData.depositAmount || ''
+		orderInfo.value.packageTime = orderData.packageTime || ''
+		orderInfo.value.packagePrice = orderData.packagePrice || ''
+		orderInfo.value.payAmount = orderData.payAmount || '0.00'
+		orderInfo.value.phone = orderData.phone || ''
+		orderInfo.value.orderNo = orderData.orderNo || ''
+		orderInfo.value.refundAmount = orderData.residueAmount || '0.00'
+		orderInfo.value.withdrawStatus = orderData.withdrawStatus || 'waiting'
+		orderInfo.value.isWithdrawn = orderData.withdrawStatus === 'success'
+		orderInfo.value.positionName = orderData.positionName || orderData.positionLocation || ''
+		orderInfo.value.returnPosition = orderData.returnPosition || orderData.positionName || orderData.positionLocation || ''
+		orderInfo.value.freeRentTime = orderData.freeRentTime || ''
+		orderInfo.value.unitPrice = orderData.unitPrice || ''
+		orderInfo.value.orderType = orderData.orderType || ''
+		
+		// 保存快递归还开始时间（小时为单位）
+		orderInfo.value.expressReturnStart = orderData.expressReturnStart || null
+		
+		// 保存是否支持快递归还
+		orderInfo.value.isSupportExpressReturn = orderData.isSupportExpressReturn || 'yes'
+		
+		// 如果有有效的 expressReturnStart，立即更新倒计时阈值（小时转秒）
+		if (orderInfo.value.expressReturnStart && typeof orderInfo.value.expressReturnStart === 'number' && orderInfo.value.expressReturnStart > 0) {
+			expressThresholdSeconds.value = orderInfo.value.expressReturnStart * 3600
+			console.log('从订单数据更新快递归还阈值:', orderInfo.value.expressReturnStart, '小时 =>', expressThresholdSeconds.value, '秒')
+		}
+
+		if (orderData.deviceNo && !deviceId.value) {
+			deviceId.value = orderData.deviceNo
+		}
+		
+		// 如果订单状态从 'in_used' 变为其他状态，清理所有定时器
+		if (oldStatus === 'in_used' && orderInfo.value.orderStatus !== 'in_used') {
+			console.log('订单状态已从使用中变为:', orderInfo.value.orderStatus, '，清理所有定时器')
+			clearTimer()
+			clearStatusCheckTimer()
+			clearExpressCountdown()
+			removeFromOrderMonitor()
+			
+			// 显示订单完成提示
+			if (orderInfo.value.orderStatus === 'used_done' || orderInfo.value.orderStatus === 'used_down') {
+				uni.showToast({
+					title: $t('order.orderCompleted'),
+					icon: 'success'
+				})
+			}
+		}
+	}
+
+	// 获取订单详情
+	const getOrderDetails = async () => {
+		if (!isPageActive.value) {
+			console.log('页面已不活跃，跳过订单详情请求')
+			return
+		}
+
+		// 防止并发请求
+		if (isLoadingOrder.value) {
+			console.log('正在加载订单，跳过重复请求')
+			return
+		}
+
+		try {
+			if (!orderInfo.value.orderId) {
+				throw new Error($t('order.orderIdRequired'))
+			}
+
+			isLoadingOrder.value = true
+			const result = await queryById(orderInfo.value.orderId)
+
+			if (result.code === 200 && result.data) {
+				const orderData = result.data
+				console.log('订单数据:', orderData)
+
+				// 更新订单信息
+				updateOrderInfo(orderData)
+
+				// 只有使用中的订单才启动定时器和监控
+				if (orderInfo.value.orderStatus === 'in_used') {
+					startTimer()
+					startStatusCheckTimer()
+					// 只有支持快递归还时才启动倒计时
+					if (orderInfo.value.isSupportExpressReturn !== 'no') {
+						startExpressCountdown()
+					}
+
+					uni.setStorageSync('activeOrderId', orderInfo.value.orderId)
+
+					// 添加到监控队列
+					try {
+						if ($orderMonitor) {
+							$orderMonitor.removeOrder({
+								orderId: orderInfo.value.orderId
+							})
+							$orderMonitor.addOrder({
+								orderId: orderInfo.value.orderId
+							}, 'detail')
+							console.log('订单已添加到监控队列:', orderInfo.value.orderId)
+						}
+					} catch (error) {
+						console.error('添加订单到监控队列失败:', error)
+					}
+				}
+			} else {
+				throw new Error(result.msg || $t('order.getOrderFailed'))
+			}
+		} catch (error) {
+			console.error('获取订单详情错误:', error)
+			uni.showToast({
+				title: error.message || $t('order.getOrderFailed'),
+				icon: 'none'
+			})
+			setTimeout(() => {
+				goToHome()
+			}, 1500)
+		} finally {
+			isLoadingOrder.value = false
+			uni.hideLoading()
+		}
+	}
+
+	// 通过设备号查询使用中的订单
+	const getOrderByDevice = async () => {
+		try {
+			if (!deviceId.value) {
+				throw new Error($t('device.deviceNoRequired'))
+			}
+
+			const inUseRes = await uni.request({
+				url: `${URL || 'http://127.0.0.1:8080'}/app/order/inUse`,
+				method: 'GET',
+				header: {
+					'Authorization': "Bearer " + uni.getStorageSync('token'),
+					'Clientid': uni.getStorageSync('client_id')
+				}
+			})
+
+			console.log('通过设备号查询订单结果:', JSON.stringify(inUseRes))
+
+			if (inUseRes.statusCode === 200 && inUseRes.data.code === 200 && inUseRes.data.data) {
+				const inUseOrder = inUseRes.data.data
+				console.log('使用中的订单:', inUseOrder)
+
+				orderInfo.value.orderId = inUseOrder.orderId
+				orderInfo.value.orderStatus = inUseOrder.orderStatus || ''
+				orderInfo.value.payWay = inUseOrder.payWay || ''
+				orderInfo.value.startTime = inUseOrder.startTime || ''
+
+				getOrderDetails()
+			} else {
+				throw new Error($t('order.noOrderInUse'))
+			}
+		} catch (error) {
+			console.error('通过设备号查询订单失败:', error)
+			uni.showToast({
+				title: error.message || $t('order.getOrderFailed'),
+				icon: 'none'
+			})
+			setTimeout(() => {
+				goToHome()
+			}, 1500)
+		} finally {
+			uni.hideLoading()
+		}
+	}
+
+	// 快递归还
+	const expressRetrunOrder = () => {
+		uni.navigateTo({
+			url: `/pages/expressReturn/addExpressReturn?orderId=${orderInfo.value.orderId}`
+		})
+	}
+
+	// 取消订单
+	const handleCancelOrder = () => {
+		uni.showModal({
+			title: $t('order.confirmCancel'),
+			content: $t('order.confirmCancelContent'),
+			success: async (res) => {
+				if (res.confirm) {
+					try {
+						uni.showLoading({
+							title: $t('common.processing')
+						})
+						const result = await cancelOrder({
+							orderId: orderInfo.value.orderId
+						})
+						if (result.code === 200) {
+							uni.hideLoading()
+							uni.showToast({
+								title: $t('order.cancelSuccess'),
+								icon: 'success'
+							})
+							await getOrderDetails()
+						} else {
+							throw new Error(result.msg || $t('order.cancelFailed'))
+						}
+					} catch (error) {
+						uni.hideLoading()
+						uni.showToast({
+							title: error.message || $t('order.cancelFailed'),
+							icon: 'none'
+						})
+					}
+				}
+			}
+		})
+	}
+
+	// 立即支付
+	const handlePayment = () => {
+		uni.navigateTo({
+			url: `/pages/order/payment?orderId=${orderInfo.value.orderId}`
+		})
+	}
+
+	// 申请退款
+	const handleWithdraw = async () => {
+		try {
+			uni.showLoading({
+				title: $t('common.processing')
+			})
+
+			const res = await uni.request({
+				url: `${URL || 'http://127.0.0.1:8080'}/app/withdraw/add/${orderInfo.value.orderNo}`,
+				method: 'GET',
+				header: {
+					'Content-Type': 'application/json',
+					'Authorization': 'Bearer ' + uni.getStorageSync('token'),
+					'Clientid': uni.getStorageSync('client_id')
+				}
+			})
+
+			if (res.statusCode === 200 && res.data.code === 200) {
+				uni.showToast({
+					title: $t('order.refundSuccess'),
+					icon: 'success'
+				})
+
+				orderInfo.value.withdrawStatus = 'processing'
+				orderInfo.value.isWithdrawn = true
+
+				setTimeout(() => {
+					getOrderDetails()
+				}, 1500)
+			} else {
+				throw new Error(res.data.msg || $t('order.refundFailed'))
+			}
+		} catch (error) {
+			console.error('退款申请错误:', error)
+			uni.showToast({
+				title: error.message || $t('order.refundFailed'),
+				icon: 'none'
+			})
+		} finally {
+			uni.hideLoading()
+		}
+	}
+
+	// 返回首页
+	const goToHome = () => {
+		uni.reLaunch({
+			url: '/pages/index/index'
+		})
+	}
+
+	// 生命周期钩子
+	onLoad((options) => {
+		console.log('订单详情页加载，参数:', JSON.stringify(options))
+
+		// 设置页面标题
+		uni.setNavigationBarTitle({
+			title: $t('order.orderDetail')
+		})
+
+		isPageActive.value = true
+		
+		// 从缓存读取通知内容（计费规则）
+		try {
+			const cachedNotice = uni.getStorageSync('noticeContent')
+			if (cachedNotice) {
+				console.log('从缓存读取计费规则:', cachedNotice)
+				feeRuleText.value = cachedNotice
+			}
+		} catch (e) {
+			console.warn('读取缓存通知内容失败:', e)
+		}
+
+		orderInfo.value.orderId = options.orderId || ''
+		deviceId.value = options.deviceNo || options.deviceId || ''
+
+		if (!orderInfo.value.orderId && deviceId.value) {
+			getOrderByDevice()
+		} else if (orderInfo.value.orderId) {
+			getOrderDetails()
+		} else {
+			uni.showToast({
+				title: $t('order.orderInfoMissing'),
+				icon: 'none'
+			})
+			setTimeout(() => {
+				goToHome()
+			}, 1500)
+		}
+
+		// 注册全局订单完成事件监听器
+		uni.$on('orderCompleted', handleOrderCompleted)
+	})
+
+	onShow(() => {
+		isPageActive.value = true
+		if (orderInfo.value.orderStatus === 'in_used' && orderInfo.value.isSupportExpressReturn !== 'no') {
+			startExpressCountdown()
+		}
+	})
+
+	onHide(() => {
+		console.log('订单详情页隐藏，清理资源')
+		isPageActive.value = false
+		clearTimer()
+		clearStatusCheckTimer()
+		clearExpressCountdown()
+		removeFromOrderMonitor()
+	})
+
+	onUnload(() => {
+		console.log('订单详情页卸载，清理所有资源')
+		isPageActive.value = false
+		clearTimer()
+		clearStatusCheckTimer()
+		clearExpressCountdown()
+		removeFromOrderMonitor()
+		uni.$off('orderCompleted', handleOrderCompleted)
+	})
 </script>
 
 <style lang="scss" scoped>
@@ -997,7 +986,7 @@
 			.info-row {
 				display: flex;
 				justify-content: space-between;
-				margin-bottom: 20rpx;
+				// margin-bottom: 20rpx;
 
 				.info-col {
 					flex: 1;