diff --git a/config/url.js b/config/url.js
index 8c390cd..7a65808 100644
--- a/config/url.js
+++ b/config/url.js
@@ -1,5 +1,5 @@
 export const URL = "https://my.gxfs123.com/api" //正式服务器
 // export const URL = "https://unifans.gxfs123.com/api"  //测试服务器
-// export const URL = "http://192.168.10.16:8080" 		//本地调试
+// export const URL = "http://192.168.10.31:8080" 		//本地调试
 
 export const appid = "wx2165f0be356ae7a9" //小程序appid
\ No newline at end of file
diff --git a/pages/device/detail.vue b/pages/device/detail.vue
index 62fdca0..11e810f 100644
--- a/pages/device/detail.vue
+++ b/pages/device/detail.vue
@@ -50,10 +50,10 @@
 
 			<view class="pricing-banner">
 				<view class="pricing-main">
-					<text class="price">¥5.00</text>
+					<text class="price">¥{{deviceFeeConfig.maxHourPrice}}</text>
 					<text class="unit">/小时</text>
 				</view>
-				<text class="cap-price">封顶 ¥99</text>
+				<text class="cap-price">封顶 ¥{{deviceInfo.depositAmount}}</text>
 			</view>
 
 			<view class="pricing-rules">
@@ -109,7 +109,7 @@
 
 		<!-- 底部操作区 -->
 		<view class="footer">
-			
+
 
 			<button class="rent-button" :class="{ 'return-button': hasActiveOrder }"
 				@click="handleRent('wx-score-pay')">
@@ -123,11 +123,11 @@
 					<text class="credit-score">550分及以上优享</text>
 				</view>
 			</view>
-			<view class="" style="align-items: center;align-content: center;text-align: center;line-height: 50rpx;"
+			<!-- <view class="" style="align-items: center;align-content: center;text-align: center;line-height: 50rpx;"
 				@click="handleRent('wx-pay')">
-				无法免押点这里></view>
+				无法免押点这里></view> -->
 		</view>
-		
+
 		<!-- 手机号授权弹窗 -->
 		<view class="phone-auth-popup" v-if="showPhoneAuthPopup">
 			<view class="popup-mask" @click.stop></view>
@@ -181,6 +181,7 @@
 	// 响应式状态
 	const deviceInfo = ref({})
 	const deviceId = ref('')
+	const deviceFeeConfig = ref({})
 	const deviceLocation = ref('一号教学楼大厅')
 	const batteryLevel = ref(95)
 	const hasActiveOrder = ref(false)
@@ -191,7 +192,7 @@
 	const isLoggedIn = ref(true)
 	const phoneNumber = ref('')
 	const showPhoneAuthPopup = ref(false)
-	
+
 	// 生命周期 onLoad 钩子
 	onLoad((options) => {
 		deviceId.value = options.deviceNo
@@ -199,16 +200,16 @@
 		console.log(options.deviceNo)
 		fetchDeviceInfo()
 	})
-	
-	onMounted(()=>{
+
+	onMounted(() => {
 		checkUserPhone()
 	})
-	
+
 	const checkUserPhone = async () => {
 		try {
 			const userInfoRes = await getUserInfo()
 			console.log(userInfoRes.data.phone, 'getUserInfoPhone')
-			
+
 			if (userInfoRes.code == 200 && userInfoRes.data && userInfoRes.data.phone) {
 				phoneNumber.value = userInfoRes.data.phone
 			} else {
@@ -219,11 +220,11 @@
 			console.error('获取用户信息失败:', error)
 		}
 	}
-	
+
 	// 处理获取手机号
 	const onGetPhoneNumber = (e) => {
 		console.log('getPhoneNumber event:', e.detail)
-		
+
 		// 用户拒绝授权的情况
 		if (e.detail.errMsg && e.detail.errMsg.includes('deny')) {
 			uni.showToast({
@@ -232,22 +233,22 @@
 			})
 			return
 		}
-		
+
 		// 获取到授权code
 		if (e.detail.code) {
 			uni.showLoading({
 				title: '获取中...'
 			})
-			
+
 			console.log('获取到的授权code:', e.detail.code)
-			
+
 			// 添加 try-catch 以捕获任何 Promise 外部的错误
 			try {
 				getUserPhoneNumber(e.detail.code)
 					.then(res => {
 						console.log('获取手机号API响应原始数据:', JSON.stringify(res))
 						uni.hideLoading()
-						
+
 						// 不立即抛出错误，而是记录问题并继续处理
 						if (!res) {
 							console.error('API返回数据为空')
@@ -258,15 +259,15 @@
 							})
 							return
 						}
-						
+
 						// 检查响应格式
 						console.log('响应code:', res.code, '响应类型:', typeof res.code)
 						console.log('是否有data:', !!res.data, '是否有phone:', res.data && !!res.data.phone)
-						
+
 						if (res.code == 200 && res.data && res.data.phoneNumber) {
 							phoneNumber.value = res.data.phoneNumber
 							showPhoneAuthPopup.value = false
-							
+
 							uni.showToast({
 								title: '手机号获取成功',
 								icon: 'success'
@@ -284,7 +285,7 @@
 					.catch(err => {
 						uni.hideLoading()
 						console.error('获取手机号码失败(catch):', err)
-						
+
 						// 显示更详细的错误信息
 						let errMsg = err.message || err.toString()
 						uni.showModal({
@@ -333,6 +334,9 @@
 					deviceStatus.class = 'offline'
 				}
 			}
+			console.log('feeconfig',deviceInfo.value.feeConfig);
+			
+			deviceFeeConfig.value = JSON.parse(deviceInfo.value.feeConfig)[0] || {}
 		}
 	}
 
@@ -388,7 +392,7 @@
 			showLoginTip()
 			return
 		}
-		
+
 		// 检查是否有手机号，如果没有则提示授权
 		if (!phoneNumber.value) {
 			showPhoneAuthPopup.value = true
diff --git a/unpackage/dist/build/mp-weixin/pages/device/detail.js b/unpackage/dist/build/mp-weixin/pages/device/detail.js
index 48d2c92..c3ad00c 100644
--- a/unpackage/dist/build/mp-weixin/pages/device/detail.js
+++ b/unpackage/dist/build/mp-weixin/pages/device/detail.js
@@ -1 +1 @@
-"use strict";const e=require("../../common/vendor.js"),o=require("../../common/assets.js"),t=require("../../config/user.js"),a=require("../../util/index.js"),n={__name:"detail",setup(n){const i=e.ref({}),r=e.ref(""),d=e.ref("一号教学楼大厅"),s=e.ref(95),c=e.ref(!1),l=e.reactive({text:"可使用",class:"available"}),u=e.ref(!0),g=e.ref(""),v=e.ref(!1);e.onLoad((e=>{r.value=e.deviceNo,m(),console.log(e.deviceNo),x()})),e.onMounted((()=>{h()}));const h=async()=>{try{const e=await a.getUserInfo();console.log(e.data.phone,"getUserInfoPhone"),200==e.code&&e.data&&e.data.phone?g.value=e.data.phone:v.value=!0}catch(e){console.error("获取用户信息失败:",e)}},p=o=>{if(console.log("getPhoneNumber event:",o.detail),o.detail.errMsg&&o.detail.errMsg.includes("deny"))e.index.showToast({title:"需要授权手机号才能使用设备",icon:"none"});else if(o.detail.code){e.index.showLoading({title:"获取中..."}),console.log("获取到的授权code:",o.detail.code);try{a.getUserPhoneNumber(o.detail.code).then((o=>{if(console.log("获取手机号API响应原始数据:",JSON.stringify(o)),e.index.hideLoading(),!o)return console.error("API返回数据为空"),void e.index.showModal({title:"数据异常",content:"API返回为空",showCancel:!1});console.log("响应code:",o.code,"响应类型:",typeof o.code),console.log("是否有data:",!!o.data,"是否有phone:",o.data&&!!o.data.phone),200==o.code&&o.data&&o.data.phoneNumber?(g.value=o.data.phoneNumber,v.value=!1,e.index.showToast({title:"手机号获取成功",icon:"success"})):(console.warn("获取手机号响应异常:",o.msg||"未知错误"),e.index.showModal({title:"获取手机号异常",content:`状态码: ${o.code}, 消息: ${o.msg||"无"}`,showCancel:!1}))})).catch((o=>{e.index.hideLoading(),console.error("获取手机号码失败(catch):",o);let t=o.message||o.toString();e.index.showModal({title:"获取手机号失败",content:"错误信息: "+t,showCancel:!1})}))}catch(t){e.index.hideLoading(),console.error("获取手机号外部错误:",t),e.index.showModal({title:"意外错误",content:"处理过程发生异常: "+(t.message||t),showCancel:!1})}}else e.index.showToast({title:"获取授权码失败",icon:"none"})},x=async()=>{const e=await t.getDeviceInfo(r.value);200==e.code&&(i.value=e.data.device||{},i.value.deviceLocation?d.value=i.value.deviceLocation:e.data.position&&e.data.position.name&&(d.value=e.data.position.name),i.value.status&&("online"===i.value.status?(l.text="可使用",l.class="available"):"offline"===i.value.status&&(l.text="离线",l.class="offline")))},m=async()=>{try{const o=await e.index.$api.checkActiveOrder();if(o.hasOrder){const t=o.order;"waiting_for_payment"===t.status?e.index.redirectTo({url:`/pages/order/payment?orderId=${t.orderId}&deviceId=${r.value}`}):"in_used"===t.status&&e.index.redirectTo({url:`/pages/device/return?deviceId=${r.value}`})}}catch(o){e.index.showToast({title:"订单状态查询失败",icon:"none"})}},w=o=>{u.value?g.value?I(o):v.value=!0:e.index.showModal({title:"提示",content:"请先登录后再操作",confirmText:"去登录",success:o=>{o.confirm&&e.index.navigateTo({url:"/pages/login/index"})}})},f=e.reactive({time:"1小时",price:"5.00"}),y=e.ref("99.00"),I=async o=>{try{e.index.showLoading({title:"处理中"});const s=await t.rentPowerBank(r.value,g.value);if(200!==s.code)throw new Error(s.msg||"设备租借失败");const c=s.data;try{let e=0;e=f.time.includes("小时")?60*parseInt(f.time):f.time.includes("分钟")?parseInt(f.time):60*parseInt(f.time);const o=await t.updateOrderPackage({orderId:c.orderId,packageTime:e,packagePrice:parseFloat(f.price)});200!==o.code?console.warn("更新订单套餐信息失败:",o.msg):console.log("订单套餐信息已提前更新")}catch(n){console.error("更新订单套餐信息时出错:",n)}if("wx-pay"==o){e.index.hideLoading();const o=await t.getOrderByOrderNo(c.orderNo);console.log(o);const a=parseFloat(i.value.depositAmount),n=(a+parseFloat(f.price)).toFixed(2);e.index.hideLoading(),e.index.redirectTo({url:`/pages/order/payment?orderId=${c.orderId}&packageTimeHours=${f.time.replace("小时","")}&packagePrice=${f.price}&totalAmount=${n}&depositAmount=${y.value}${i.value&&i.value.feeConfig?"&feeConfig="+encodeURIComponent(i.value.feeConfig):""}`})}else if("wx-score-pay"==o){e.index.hideLoading();const o=await t.getOrderByOrderNoScore(c.orderNo);if(e.index.hideLoading(),o&&200===o.code)try{if("0"==(await a.initiateWeChatScorePayment(o)).errCode){const o=await t.getOrderByOrderNoScorePayStatus(c.orderNo);console.log(o.data.orderStatus),"in_used"==o.data.orderStatus?(e.index.showToast({title:"设备租借成功",icon:"success"}),setTimeout((()=>{e.index.redirectTo({url:"/pages/order/index"})}),1500)):"waiting_for_payment"==o.data.orderStatus&&(e.index.showToast({title:"设备租借失败，订单已取消",icon:"error"}),await t.cancelOrder({orderId:c.orderNo}),setTimeout((()=>{e.index.switchTab({url:"/pages/index/index"})}),1500))}}catch(d){e.index.showToast({title:"支付分调用失败，请重试",icon:"none"})}else e.index.showToast({title:(null==o?void 0:o.msg)||"获取支付参数失败",icon:"none"})}}catch(s){e.index.hideLoading(),e.index.showToast({title:s.message||"租借失败，请重试",icon:"none"})}};return(t,a)=>e.e({a:e.t(l.text),b:e.n(l.class),c:e.t(r.value),d:o._imports_0$3,e:e.t(d.value),f:o._imports_1$2,g:s.value<20?1:"",h:e.t(s.value),i:e.t(c.value?"归还设备":"免押租借"),j:c.value?1:"",k:e.o((e=>w("wx-score-pay"))),l:o._imports_0$2,m:v.value},v.value?{n:e.o((()=>{})),o:e.o(p),p:e.o((e=>v.value=!1))}:{})}},i=e._export_sfc(n,[["__scopeId","data-v-716cc21d"]]);wx.createPage(i);
+"use strict";const e=require("../../common/vendor.js"),o=require("../../common/assets.js"),t=require("../../config/user.js"),a=require("../../util/index.js"),n={__name:"detail",setup(n){const i=e.ref({}),r=e.ref(""),d=e.ref({}),s=e.ref("一号教学楼大厅"),c=e.ref(95),l=e.ref(!1),u=e.reactive({text:"可使用",class:"available"}),g=e.ref(!0),v=e.ref(""),h=e.ref(!1);e.onLoad((e=>{r.value=e.deviceNo,m(),console.log(e.deviceNo),x()})),e.onMounted((()=>{p()}));const p=async()=>{try{const e=await a.getUserInfo();console.log(e.data.phone,"getUserInfoPhone"),200==e.code&&e.data&&e.data.phone?v.value=e.data.phone:h.value=!0}catch(e){console.error("获取用户信息失败:",e)}},f=o=>{if(console.log("getPhoneNumber event:",o.detail),o.detail.errMsg&&o.detail.errMsg.includes("deny"))e.index.showToast({title:"需要授权手机号才能使用设备",icon:"none"});else if(o.detail.code){e.index.showLoading({title:"获取中..."}),console.log("获取到的授权code:",o.detail.code);try{a.getUserPhoneNumber(o.detail.code).then((o=>{if(console.log("获取手机号API响应原始数据:",JSON.stringify(o)),e.index.hideLoading(),!o)return console.error("API返回数据为空"),void e.index.showModal({title:"数据异常",content:"API返回为空",showCancel:!1});console.log("响应code:",o.code,"响应类型:",typeof o.code),console.log("是否有data:",!!o.data,"是否有phone:",o.data&&!!o.data.phone),200==o.code&&o.data&&o.data.phoneNumber?(v.value=o.data.phoneNumber,h.value=!1,e.index.showToast({title:"手机号获取成功",icon:"success"})):(console.warn("获取手机号响应异常:",o.msg||"未知错误"),e.index.showModal({title:"获取手机号异常",content:`状态码: ${o.code}, 消息: ${o.msg||"无"}`,showCancel:!1}))})).catch((o=>{e.index.hideLoading(),console.error("获取手机号码失败(catch):",o);let t=o.message||o.toString();e.index.showModal({title:"获取手机号失败",content:"错误信息: "+t,showCancel:!1})}))}catch(t){e.index.hideLoading(),console.error("获取手机号外部错误:",t),e.index.showModal({title:"意外错误",content:"处理过程发生异常: "+(t.message||t),showCancel:!1})}}else e.index.showToast({title:"获取授权码失败",icon:"none"})},x=async()=>{const e=await t.getDeviceInfo(r.value);200==e.code&&(i.value=e.data.device||{},i.value.deviceLocation?s.value=i.value.deviceLocation:e.data.position&&e.data.position.name&&(s.value=e.data.position.name),i.value.status&&("online"===i.value.status?(u.text="可使用",u.class="available"):"offline"===i.value.status&&(u.text="离线",u.class="offline")),console.log("feeconfig",i.value.feeConfig),d.value=JSON.parse(i.value.feeConfig)[0]||{})},m=async()=>{try{const o=await e.index.$api.checkActiveOrder();if(o.hasOrder){const t=o.order;"waiting_for_payment"===t.status?e.index.redirectTo({url:`/pages/order/payment?orderId=${t.orderId}&deviceId=${r.value}`}):"in_used"===t.status&&e.index.redirectTo({url:`/pages/device/return?deviceId=${r.value}`})}}catch(o){e.index.showToast({title:"订单状态查询失败",icon:"none"})}},w=o=>{g.value?v.value?T(o):h.value=!0:e.index.showModal({title:"提示",content:"请先登录后再操作",confirmText:"去登录",success:o=>{o.confirm&&e.index.navigateTo({url:"/pages/login/index"})}})},y=e.reactive({time:"1小时",price:"5.00"}),I=e.ref("99.00"),T=async o=>{try{e.index.showLoading({title:"处理中"});const s=await t.rentPowerBank(r.value,v.value);if(200!==s.code)throw new Error(s.msg||"设备租借失败");const c=s.data;try{let e=0;e=y.time.includes("小时")?60*parseInt(y.time):y.time.includes("分钟")?parseInt(y.time):60*parseInt(y.time);const o=await t.updateOrderPackage({orderId:c.orderId,packageTime:e,packagePrice:parseFloat(y.price)});200!==o.code?console.warn("更新订单套餐信息失败:",o.msg):console.log("订单套餐信息已提前更新")}catch(n){console.error("更新订单套餐信息时出错:",n)}if("wx-pay"==o){e.index.hideLoading();const o=await t.getOrderByOrderNo(c.orderNo);console.log(o);const a=parseFloat(i.value.depositAmount),n=(a+parseFloat(y.price)).toFixed(2);e.index.hideLoading(),e.index.redirectTo({url:`/pages/order/payment?orderId=${c.orderId}&packageTimeHours=${y.time.replace("小时","")}&packagePrice=${y.price}&totalAmount=${n}&depositAmount=${I.value}${i.value&&i.value.feeConfig?"&feeConfig="+encodeURIComponent(i.value.feeConfig):""}`})}else if("wx-score-pay"==o){e.index.hideLoading();const o=await t.getOrderByOrderNoScore(c.orderNo);if(e.index.hideLoading(),o&&200===o.code)try{if("0"==(await a.initiateWeChatScorePayment(o)).errCode){const o=await t.getOrderByOrderNoScorePayStatus(c.orderNo);console.log(o.data.orderStatus),"in_used"==o.data.orderStatus?(e.index.showToast({title:"设备租借成功",icon:"success"}),setTimeout((()=>{e.index.redirectTo({url:"/pages/order/index"})}),1500)):"waiting_for_payment"==o.data.orderStatus&&(e.index.showToast({title:"设备租借失败，订单已取消",icon:"error"}),await t.cancelOrder({orderId:c.orderNo}),setTimeout((()=>{e.index.switchTab({url:"/pages/index/index"})}),1500))}}catch(d){e.index.showToast({title:"支付分调用失败，请重试",icon:"none"})}else e.index.showToast({title:(null==o?void 0:o.msg)||"获取支付参数失败",icon:"none"})}}catch(s){e.index.hideLoading(),e.index.showToast({title:s.message||"租借失败，请重试",icon:"none"})}};return(t,a)=>e.e({a:e.t(u.text),b:e.n(u.class),c:e.t(r.value),d:o._imports_0$3,e:e.t(s.value),f:o._imports_1$2,g:c.value<20?1:"",h:e.t(c.value),i:e.t(d.value.maxHourPrice),j:e.t(i.value.depositAmount),k:e.t(l.value?"归还设备":"免押租借"),l:l.value?1:"",m:e.o((e=>w("wx-score-pay"))),n:o._imports_0$2,o:h.value},h.value?{p:e.o((()=>{})),q:e.o(f),r:e.o((e=>h.value=!1))}:{})}},i=e._export_sfc(n,[["__scopeId","data-v-45fad95c"]]);wx.createPage(i);
diff --git a/unpackage/dist/build/mp-weixin/pages/device/detail.wxml b/unpackage/dist/build/mp-weixin/pages/device/detail.wxml
index 797c761..3339408 100644
--- a/unpackage/dist/build/mp-weixin/pages/device/detail.wxml
+++ b/unpackage/dist/build/mp-weixin/pages/device/detail.wxml
@@ -1 +1 @@
-<view class="container data-v-716cc21d"><view class="device-header data-v-716cc21d"><view class="{{['device-status-card', 'data-v-716cc21d', b]}}"><view class="status-indicator data-v-716cc21d"></view><text class="status-text data-v-716cc21d">{{a}}</text></view><view class="device-title data-v-716cc21d"><text class="name data-v-716cc21d">共享风扇</text><view class="device-meta data-v-716cc21d"><text class="id-label data-v-716cc21d">设备号：</text><text class="id-value data-v-716cc21d">{{c}}</text></view></view></view><view class="card device-info-card data-v-716cc21d"><view class="card-row data-v-716cc21d"><view class="card-item data-v-716cc21d"><view class="item-icon location-icon data-v-716cc21d"><image class="data-v-716cc21d" src="{{d}}" mode="aspectFill" style="width:45rpx;height:45rpx"></image></view><view class="item-content data-v-716cc21d"><text class="item-label data-v-716cc21d">当前位置</text><text class="item-value data-v-716cc21d">{{e}}</text></view></view><view class="card-item data-v-716cc21d"><view class="{{['item-icon', 'battery-icon', 'data-v-716cc21d', g && 'battery-low']}}"><image class="data-v-716cc21d" src="{{f}}" mode="aspectFill" style="width:45rpx;height:45rpx"></image></view><view class="item-content data-v-716cc21d"><text class="item-label data-v-716cc21d">电池电量</text><text class="item-value data-v-716cc21d">{{h}}%</text></view></view></view></view><view class="card pricing-card data-v-716cc21d"><view class="card-header data-v-716cc21d"><text class="card-title data-v-716cc21d">计费规则</text></view><view class="pricing-banner data-v-716cc21d"><view class="pricing-main data-v-716cc21d"><text class="price data-v-716cc21d">¥5.00</text><text class="unit data-v-716cc21d">/小时</text></view><text class="cap-price data-v-716cc21d">封顶 ¥99</text></view><view class="pricing-rules data-v-716cc21d"><view class="rule-item data-v-716cc21d"><view class="rule-dot data-v-716cc21d"></view><text class="rule-text data-v-716cc21d">不足60分钟按60分钟计费</text></view><view class="rule-item data-v-716cc21d"><view class="rule-dot data-v-716cc21d"></view><text class="rule-text data-v-716cc21d">持续计费至99元视为买断</text></view></view></view><view class="card notice-card data-v-716cc21d"><view class="card-header data-v-716cc21d"><text class="card-title data-v-716cc21d">使用须知</text></view><view class="notice-items data-v-716cc21d"><view class="notice-item data-v-716cc21d"><view class="notice-dot data-v-716cc21d"></view><text class="notice-text data-v-716cc21d">请在使用前检查设备是否完好</text></view><view class="notice-item data-v-716cc21d"><view class="notice-dot data-v-716cc21d"></view><text class="notice-text data-v-716cc21d">请在指定区域内使用设备</text></view><view class="notice-item data-v-716cc21d"><view class="notice-dot data-v-716cc21d"></view><text class="notice-text data-v-716cc21d">归还时请确保设备完好，避免损坏</text></view></view></view><view class="footer data-v-716cc21d"><button class="{{['rent-button', 'data-v-716cc21d', j && 'return-button']}}" bindtap="{{k}}"><text class="data-v-716cc21d">{{i}}</text></button><view class="wechat-credit data-v-716cc21d"><image src="{{l}}" mode="aspectFit" class="wx-icon data-v-716cc21d"></image><view class="credit-text data-v-716cc21d"><text class="data-v-716cc21d">微信支付分</text><text class="credit-divider data-v-716cc21d">|</text><text class="credit-score data-v-716cc21d">550分及以上优享</text></view></view></view><view wx:if="{{m}}" class="phone-auth-popup data-v-716cc21d"><view class="popup-mask data-v-716cc21d" catchtap="{{n}}"></view><view class="popup-content data-v-716cc21d"><view class="popup-header data-v-716cc21d"><text class="popup-title data-v-716cc21d">授权获取手机号</text></view><view class="popup-body data-v-716cc21d"><view class="auth-desc data-v-716cc21d"><text class="data-v-716cc21d">为了提供更好的服务，需要授权获取您的手机号</text></view><button class="auth-btn data-v-716cc21d" open-type="getPhoneNumber" bindgetphonenumber="{{o}}"> 一键获取手机号 </button><view class="auth-cancel data-v-716cc21d" bindtap="{{p}}"><text class="data-v-716cc21d">暂不授权</text></view></view></view></view></view>
\ No newline at end of file
+<view class="container data-v-45fad95c"><view class="device-header data-v-45fad95c"><view class="{{['device-status-card', 'data-v-45fad95c', b]}}"><view class="status-indicator data-v-45fad95c"></view><text class="status-text data-v-45fad95c">{{a}}</text></view><view class="device-title data-v-45fad95c"><text class="name data-v-45fad95c">共享风扇</text><view class="device-meta data-v-45fad95c"><text class="id-label data-v-45fad95c">设备号：</text><text class="id-value data-v-45fad95c">{{c}}</text></view></view></view><view class="card device-info-card data-v-45fad95c"><view class="card-row data-v-45fad95c"><view class="card-item data-v-45fad95c"><view class="item-icon location-icon data-v-45fad95c"><image class="data-v-45fad95c" src="{{d}}" mode="aspectFill" style="width:45rpx;height:45rpx"></image></view><view class="item-content data-v-45fad95c"><text class="item-label data-v-45fad95c">当前位置</text><text class="item-value data-v-45fad95c">{{e}}</text></view></view><view class="card-item data-v-45fad95c"><view class="{{['item-icon', 'battery-icon', 'data-v-45fad95c', g && 'battery-low']}}"><image class="data-v-45fad95c" src="{{f}}" mode="aspectFill" style="width:45rpx;height:45rpx"></image></view><view class="item-content data-v-45fad95c"><text class="item-label data-v-45fad95c">电池电量</text><text class="item-value data-v-45fad95c">{{h}}%</text></view></view></view></view><view class="card pricing-card data-v-45fad95c"><view class="card-header data-v-45fad95c"><text class="card-title data-v-45fad95c">计费规则</text></view><view class="pricing-banner data-v-45fad95c"><view class="pricing-main data-v-45fad95c"><text class="price data-v-45fad95c">¥{{i}}</text><text class="unit data-v-45fad95c">/小时</text></view><text class="cap-price data-v-45fad95c">封顶 ¥{{j}}</text></view><view class="pricing-rules data-v-45fad95c"><view class="rule-item data-v-45fad95c"><view class="rule-dot data-v-45fad95c"></view><text class="rule-text data-v-45fad95c">不足60分钟按60分钟计费</text></view><view class="rule-item data-v-45fad95c"><view class="rule-dot data-v-45fad95c"></view><text class="rule-text data-v-45fad95c">持续计费至99元视为买断</text></view></view></view><view class="card notice-card data-v-45fad95c"><view class="card-header data-v-45fad95c"><text class="card-title data-v-45fad95c">使用须知</text></view><view class="notice-items data-v-45fad95c"><view class="notice-item data-v-45fad95c"><view class="notice-dot data-v-45fad95c"></view><text class="notice-text data-v-45fad95c">请在使用前检查设备是否完好</text></view><view class="notice-item data-v-45fad95c"><view class="notice-dot data-v-45fad95c"></view><text class="notice-text data-v-45fad95c">请在指定区域内使用设备</text></view><view class="notice-item data-v-45fad95c"><view class="notice-dot data-v-45fad95c"></view><text class="notice-text data-v-45fad95c">归还时请确保设备完好，避免损坏</text></view></view></view><view class="footer data-v-45fad95c"><button class="{{['rent-button', 'data-v-45fad95c', l && 'return-button']}}" bindtap="{{m}}"><text class="data-v-45fad95c">{{k}}</text></button><view class="wechat-credit data-v-45fad95c"><image src="{{n}}" mode="aspectFit" class="wx-icon data-v-45fad95c"></image><view class="credit-text data-v-45fad95c"><text class="data-v-45fad95c">微信支付分</text><text class="credit-divider data-v-45fad95c">|</text><text class="credit-score data-v-45fad95c">550分及以上优享</text></view></view></view><view wx:if="{{o}}" class="phone-auth-popup data-v-45fad95c"><view class="popup-mask data-v-45fad95c" catchtap="{{p}}"></view><view class="popup-content data-v-45fad95c"><view class="popup-header data-v-45fad95c"><text class="popup-title data-v-45fad95c">授权获取手机号</text></view><view class="popup-body data-v-45fad95c"><view class="auth-desc data-v-45fad95c"><text class="data-v-45fad95c">为了提供更好的服务，需要授权获取您的手机号</text></view><button class="auth-btn data-v-45fad95c" open-type="getPhoneNumber" bindgetphonenumber="{{q}}"> 一键获取手机号 </button><view class="auth-cancel data-v-45fad95c" bindtap="{{r}}"><text class="data-v-45fad95c">暂不授权</text></view></view></view></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/build/mp-weixin/pages/device/detail.wxss b/unpackage/dist/build/mp-weixin/pages/device/detail.wxss
index af04e4a..f24b3fd 100644
--- a/unpackage/dist/build/mp-weixin/pages/device/detail.wxss
+++ b/unpackage/dist/build/mp-weixin/pages/device/detail.wxss
@@ -1 +1 @@
-.container.data-v-716cc21d{min-height:100vh;background-color:#f5f7fa;padding:30rpx 30rpx 300rpx;box-sizing:border-box}.device-header.data-v-716cc21d{display:flex;flex-direction:column;margin-bottom:30rpx}.device-header .device-status-card.data-v-716cc21d{display:flex;align-items:center;margin-bottom:20rpx}.device-header .device-status-card .status-indicator.data-v-716cc21d{width:20rpx;height:20rpx;border-radius:50%;margin-right:10rpx}.device-header .device-status-card.available .status-indicator.data-v-716cc21d{background-color:#10c469;box-shadow:0 0 10rpx rgba(16,196,105,.5)}.device-header .device-status-card.available .status-text.data-v-716cc21d{color:#10c469}.device-header .device-status-card.offline .status-indicator.data-v-716cc21d{background-color:#9a9a9a}.device-header .device-status-card.offline .status-text.data-v-716cc21d{color:#9a9a9a}.device-header .device-status-card .status-text.data-v-716cc21d{font-size:28rpx;font-weight:500}.device-header .device-title .name.data-v-716cc21d{font-size:48rpx;font-weight:700;color:#333}.device-header .device-title .device-meta.data-v-716cc21d{margin-top:10rpx;display:flex;align-items:center}.device-header .device-title .device-meta .id-label.data-v-716cc21d{font-size:26rpx;color:#999}.device-header .device-title .device-meta .id-value.data-v-716cc21d{font-size:26rpx;color:#666}.card.data-v-716cc21d{background-color:#fff;border-radius:24rpx;box-shadow:0 4rpx 24rpx rgba(0,0,0,.03);padding:30rpx;margin-bottom:30rpx}.card .card-header.data-v-716cc21d{display:flex;align-items:center;justify-content:space-between;margin-bottom:24rpx}.card .card-header .card-title.data-v-716cc21d{font-size:32rpx;font-weight:600;color:#333}.device-info-card .card-row.data-v-716cc21d{display:flex;justify-content:space-between}.device-info-card .card-item.data-v-716cc21d{display:flex;align-items:center;flex:1}.device-info-card .card-item .item-icon.data-v-716cc21d{width:60rpx;height:60rpx;border-radius:12rpx;margin-right:20rpx;display:flex;align-items:center;justify-content:center;font-size:30rpx;color:#fff}.device-info-card .card-item .item-icon.location-icon.data-v-716cc21d{background:linear-gradient(135deg,#40c9ff,#32a5ff)}.device-info-card .card-item .item-icon.battery-icon.data-v-716cc21d{background:linear-gradient(135deg,#33db92,#10c469)}.device-info-card .card-item .item-icon.battery-icon.battery-low.data-v-716cc21d{background:linear-gradient(135deg,#ff7676,#f54f4f)}.device-info-card .card-item .item-content.data-v-716cc21d{display:flex;flex-direction:column}.device-info-card .card-item .item-content .item-label.data-v-716cc21d{font-size:26rpx;color:#999;margin-bottom:4rpx}.device-info-card .card-item .item-content .item-value.data-v-716cc21d{font-size:30rpx;color:#333;font-weight:500}.pricing-card .pricing-banner.data-v-716cc21d{background:linear-gradient(to right,#f8f9ff,#e8f0ff);border-radius:16rpx;padding:30rpx;margin-bottom:30rpx;display:flex;flex-direction:column;align-items:center}.pricing-card .pricing-banner .pricing-main.data-v-716cc21d{display:flex;align-items:flex-end}.pricing-card .pricing-banner .pricing-main .price.data-v-716cc21d{font-size:60rpx;font-weight:700;color:#ff6b6b}.pricing-card .pricing-banner .pricing-main .unit.data-v-716cc21d{font-size:28rpx;color:#999;margin-left:4rpx;margin-bottom:10rpx}.pricing-card .pricing-banner .cap-price.data-v-716cc21d{margin-top:10rpx;font-size:26rpx;color:#666;background-color:rgba(255,107,107,.1);padding:6rpx 20rpx;border-radius:20rpx}.pricing-card .pricing-rules .rule-item.data-v-716cc21d{display:flex;align-items:center;margin-bottom:16rpx}.pricing-card .pricing-rules .rule-item.data-v-716cc21d:last-child{margin-bottom:0}.pricing-card .pricing-rules .rule-item .rule-dot.data-v-716cc21d{width:10rpx;height:10rpx;border-radius:50%;background-color:#ff6b6b;margin-right:16rpx}.pricing-card .pricing-rules .rule-item .rule-text.data-v-716cc21d{font-size:28rpx;color:#666}.pricing-card .pricing-rules .rule-item .rule-text .highlight.data-v-716cc21d{color:#ff6b6b;font-weight:700}.phone-card .phone-input-container .input-wrapper.data-v-716cc21d{display:flex;align-items:center;height:88rpx;background-color:#f5f7fa;border-radius:16rpx;padding:0 24rpx}.phone-card .phone-input-container .input-wrapper .prefix.data-v-716cc21d{font-size:28rpx;color:#666;margin-right:16rpx;padding-right:16rpx;border-right:1px solid #e0e0e0}.phone-card .phone-input-container .input-wrapper .phone-input.data-v-716cc21d{flex:1;height:88rpx;font-size:28rpx;color:#333;padding-left:10rpx}.phone-card .phone-input-container .phone-tip.data-v-716cc21d{font-size:24rpx;color:#999;margin-top:16rpx;display:block}.notice-card .notice-items .notice-item.data-v-716cc21d{display:flex;align-items:flex-start;margin-bottom:20rpx}.notice-card .notice-items .notice-item.data-v-716cc21d:last-child{margin-bottom:0}.notice-card .notice-items .notice-item .notice-dot.data-v-716cc21d{width:10rpx;height:10rpx;border-radius:50%;background-color:#32a5ff;margin-right:16rpx;margin-top:12rpx}.notice-card .notice-items .notice-item .notice-text.data-v-716cc21d{font-size:28rpx;color:#666;line-height:1.6}.footer.data-v-716cc21d{position:fixed;bottom:0;left:0;right:0;background-color:#fff;padding:20rpx 30rpx;padding-bottom:calc(20rpx + env(safe-area-inset-bottom));box-shadow:0 -2rpx 20rpx rgba(0,0,0,.05);z-index:100;display:flex;flex-direction:column;--footer-height: 180rpx}.footer .wechat-credit.data-v-716cc21d{display:flex;align-items:center;justify-content:center;margin-top:10rpx}.footer .wechat-credit .wx-icon.data-v-716cc21d{width:50rpx;height:40rpx;margin-right:10rpx}.footer .wechat-credit .credit-text.data-v-716cc21d{font-size:24rpx;color:#07c160;display:flex;align-items:center}.footer .wechat-credit .credit-text .credit-divider.data-v-716cc21d{margin:0 10rpx}.footer .wechat-credit .credit-text .credit-score.data-v-716cc21d{font-weight:500}.footer .rent-button.data-v-716cc21d{height:92rpx;border-radius:46rpx;background:linear-gradient(135deg,#07c160,#10d673);color:#fff;font-size:32rpx;font-weight:600;display:flex;align-items:center;justify-content:center;border:none;width:90%}.footer .rent-button.return-button.data-v-716cc21d{background:linear-gradient(135deg,#ff9800,#ffb74d)}.footer .rent-button.data-v-716cc21d:active{transform:scale(.98);opacity:.9}.phone-auth-popup.data-v-716cc21d{position:fixed;top:0;left:0;right:0;bottom:0;z-index:1000;display:flex;align-items:center;justify-content:center;background-color:rgba(0,0,0,.5)}.popup-mask.data-v-716cc21d{position:absolute;top:0;left:0;right:0;bottom:0}.popup-content.data-v-716cc21d{background-color:#fff;border-radius:24rpx;box-shadow:0 8rpx 32rpx rgba(0,0,0,.15);width:90%;max-width:500rpx;padding:40rpx 30rpx;position:relative;z-index:1001;display:flex;flex-direction:column;align-items:center}.popup-header.data-v-716cc21d{margin-bottom:30rpx;text-align:center}.popup-title.data-v-716cc21d{font-size:36rpx;font-weight:700;color:#333}.popup-body.data-v-716cc21d{width:100%;display:flex;flex-direction:column;align-items:center;margin-bottom:30rpx}.auth-desc.data-v-716cc21d{font-size:28rpx;color:#666;text-align:center;margin-bottom:30rpx;line-height:1.6}.auth-btn.data-v-716cc21d{width:100%;height:92rpx;border-radius:46rpx;background:linear-gradient(135deg,#07c160,#10d673);color:#fff;font-size:32rpx;font-weight:600;display:flex;align-items:center;justify-content:center;border:none;margin-bottom:20rpx}.auth-btn.data-v-716cc21d:active{transform:scale(.98);opacity:.9}.auth-cancel.data-v-716cc21d{width:100%;height:92rpx;border-radius:46rpx;background-color:#f5f7fa;color:#333;font-size:32rpx;font-weight:600;display:flex;align-items:center;justify-content:center;border:none}.auth-cancel.data-v-716cc21d:active{transform:scale(.98);opacity:.9}
+.container.data-v-45fad95c{min-height:100vh;background-color:#f5f7fa;padding:30rpx 30rpx 300rpx;box-sizing:border-box}.device-header.data-v-45fad95c{display:flex;flex-direction:column;margin-bottom:30rpx}.device-header .device-status-card.data-v-45fad95c{display:flex;align-items:center;margin-bottom:20rpx}.device-header .device-status-card .status-indicator.data-v-45fad95c{width:20rpx;height:20rpx;border-radius:50%;margin-right:10rpx}.device-header .device-status-card.available .status-indicator.data-v-45fad95c{background-color:#10c469;box-shadow:0 0 10rpx rgba(16,196,105,.5)}.device-header .device-status-card.available .status-text.data-v-45fad95c{color:#10c469}.device-header .device-status-card.offline .status-indicator.data-v-45fad95c{background-color:#9a9a9a}.device-header .device-status-card.offline .status-text.data-v-45fad95c{color:#9a9a9a}.device-header .device-status-card .status-text.data-v-45fad95c{font-size:28rpx;font-weight:500}.device-header .device-title .name.data-v-45fad95c{font-size:48rpx;font-weight:700;color:#333}.device-header .device-title .device-meta.data-v-45fad95c{margin-top:10rpx;display:flex;align-items:center}.device-header .device-title .device-meta .id-label.data-v-45fad95c{font-size:26rpx;color:#999}.device-header .device-title .device-meta .id-value.data-v-45fad95c{font-size:26rpx;color:#666}.card.data-v-45fad95c{background-color:#fff;border-radius:24rpx;box-shadow:0 4rpx 24rpx rgba(0,0,0,.03);padding:30rpx;margin-bottom:30rpx}.card .card-header.data-v-45fad95c{display:flex;align-items:center;justify-content:space-between;margin-bottom:24rpx}.card .card-header .card-title.data-v-45fad95c{font-size:32rpx;font-weight:600;color:#333}.device-info-card .card-row.data-v-45fad95c{display:flex;justify-content:space-between}.device-info-card .card-item.data-v-45fad95c{display:flex;align-items:center;flex:1}.device-info-card .card-item .item-icon.data-v-45fad95c{width:60rpx;height:60rpx;border-radius:12rpx;margin-right:20rpx;display:flex;align-items:center;justify-content:center;font-size:30rpx;color:#fff}.device-info-card .card-item .item-icon.location-icon.data-v-45fad95c{background:linear-gradient(135deg,#40c9ff,#32a5ff)}.device-info-card .card-item .item-icon.battery-icon.data-v-45fad95c{background:linear-gradient(135deg,#33db92,#10c469)}.device-info-card .card-item .item-icon.battery-icon.battery-low.data-v-45fad95c{background:linear-gradient(135deg,#ff7676,#f54f4f)}.device-info-card .card-item .item-content.data-v-45fad95c{display:flex;flex-direction:column}.device-info-card .card-item .item-content .item-label.data-v-45fad95c{font-size:26rpx;color:#999;margin-bottom:4rpx}.device-info-card .card-item .item-content .item-value.data-v-45fad95c{font-size:30rpx;color:#333;font-weight:500}.pricing-card .pricing-banner.data-v-45fad95c{background:linear-gradient(to right,#f8f9ff,#e8f0ff);border-radius:16rpx;padding:30rpx;margin-bottom:30rpx;display:flex;flex-direction:column;align-items:center}.pricing-card .pricing-banner .pricing-main.data-v-45fad95c{display:flex;align-items:flex-end}.pricing-card .pricing-banner .pricing-main .price.data-v-45fad95c{font-size:60rpx;font-weight:700;color:#ff6b6b}.pricing-card .pricing-banner .pricing-main .unit.data-v-45fad95c{font-size:28rpx;color:#999;margin-left:4rpx;margin-bottom:10rpx}.pricing-card .pricing-banner .cap-price.data-v-45fad95c{margin-top:10rpx;font-size:26rpx;color:#666;background-color:rgba(255,107,107,.1);padding:6rpx 20rpx;border-radius:20rpx}.pricing-card .pricing-rules .rule-item.data-v-45fad95c{display:flex;align-items:center;margin-bottom:16rpx}.pricing-card .pricing-rules .rule-item.data-v-45fad95c:last-child{margin-bottom:0}.pricing-card .pricing-rules .rule-item .rule-dot.data-v-45fad95c{width:10rpx;height:10rpx;border-radius:50%;background-color:#ff6b6b;margin-right:16rpx}.pricing-card .pricing-rules .rule-item .rule-text.data-v-45fad95c{font-size:28rpx;color:#666}.pricing-card .pricing-rules .rule-item .rule-text .highlight.data-v-45fad95c{color:#ff6b6b;font-weight:700}.phone-card .phone-input-container .input-wrapper.data-v-45fad95c{display:flex;align-items:center;height:88rpx;background-color:#f5f7fa;border-radius:16rpx;padding:0 24rpx}.phone-card .phone-input-container .input-wrapper .prefix.data-v-45fad95c{font-size:28rpx;color:#666;margin-right:16rpx;padding-right:16rpx;border-right:1px solid #e0e0e0}.phone-card .phone-input-container .input-wrapper .phone-input.data-v-45fad95c{flex:1;height:88rpx;font-size:28rpx;color:#333;padding-left:10rpx}.phone-card .phone-input-container .phone-tip.data-v-45fad95c{font-size:24rpx;color:#999;margin-top:16rpx;display:block}.notice-card .notice-items .notice-item.data-v-45fad95c{display:flex;align-items:flex-start;margin-bottom:20rpx}.notice-card .notice-items .notice-item.data-v-45fad95c:last-child{margin-bottom:0}.notice-card .notice-items .notice-item .notice-dot.data-v-45fad95c{width:10rpx;height:10rpx;border-radius:50%;background-color:#32a5ff;margin-right:16rpx;margin-top:12rpx}.notice-card .notice-items .notice-item .notice-text.data-v-45fad95c{font-size:28rpx;color:#666;line-height:1.6}.footer.data-v-45fad95c{position:fixed;bottom:0;left:0;right:0;background-color:#fff;padding:20rpx 30rpx;padding-bottom:calc(20rpx + env(safe-area-inset-bottom));box-shadow:0 -2rpx 20rpx rgba(0,0,0,.05);z-index:100;display:flex;flex-direction:column;--footer-height: 180rpx}.footer .wechat-credit.data-v-45fad95c{display:flex;align-items:center;justify-content:center;margin-top:10rpx}.footer .wechat-credit .wx-icon.data-v-45fad95c{width:50rpx;height:40rpx;margin-right:10rpx}.footer .wechat-credit .credit-text.data-v-45fad95c{font-size:24rpx;color:#07c160;display:flex;align-items:center}.footer .wechat-credit .credit-text .credit-divider.data-v-45fad95c{margin:0 10rpx}.footer .wechat-credit .credit-text .credit-score.data-v-45fad95c{font-weight:500}.footer .rent-button.data-v-45fad95c{height:92rpx;border-radius:46rpx;background:linear-gradient(135deg,#07c160,#10d673);color:#fff;font-size:32rpx;font-weight:600;display:flex;align-items:center;justify-content:center;border:none;width:90%}.footer .rent-button.return-button.data-v-45fad95c{background:linear-gradient(135deg,#ff9800,#ffb74d)}.footer .rent-button.data-v-45fad95c:active{transform:scale(.98);opacity:.9}.phone-auth-popup.data-v-45fad95c{position:fixed;top:0;left:0;right:0;bottom:0;z-index:1000;display:flex;align-items:center;justify-content:center;background-color:rgba(0,0,0,.5)}.popup-mask.data-v-45fad95c{position:absolute;top:0;left:0;right:0;bottom:0}.popup-content.data-v-45fad95c{background-color:#fff;border-radius:24rpx;box-shadow:0 8rpx 32rpx rgba(0,0,0,.15);width:90%;max-width:500rpx;padding:40rpx 30rpx;position:relative;z-index:1001;display:flex;flex-direction:column;align-items:center}.popup-header.data-v-45fad95c{margin-bottom:30rpx;text-align:center}.popup-title.data-v-45fad95c{font-size:36rpx;font-weight:700;color:#333}.popup-body.data-v-45fad95c{width:100%;display:flex;flex-direction:column;align-items:center;margin-bottom:30rpx}.auth-desc.data-v-45fad95c{font-size:28rpx;color:#666;text-align:center;margin-bottom:30rpx;line-height:1.6}.auth-btn.data-v-45fad95c{width:100%;height:92rpx;border-radius:46rpx;background:linear-gradient(135deg,#07c160,#10d673);color:#fff;font-size:32rpx;font-weight:600;display:flex;align-items:center;justify-content:center;border:none;margin-bottom:20rpx}.auth-btn.data-v-45fad95c:active{transform:scale(.98);opacity:.9}.auth-cancel.data-v-45fad95c{width:100%;height:92rpx;border-radius:46rpx;background-color:#f5f7fa;color:#333;font-size:32rpx;font-weight:600;display:flex;align-items:center;justify-content:center;border:none}.auth-cancel.data-v-45fad95c:active{transform:scale(.98);opacity:.9}
diff --git a/unpackage/dist/build/mp-weixin/pages/my/index.js b/unpackage/dist/build/mp-weixin/pages/my/index.js
index 1182a89..3388a11 100644
--- a/unpackage/dist/build/mp-weixin/pages/my/index.js
+++ b/unpackage/dist/build/mp-weixin/pages/my/index.js
@@ -1 +1 @@
-"use strict";const e=require("../../common/vendor.js"),a=require("../../common/assets.js"),o=require("../../util/index.js");if(!Array){e.resolveComponent("uni-icons")()}const n={__name:"index",setup(n){const t=e.ref({}),i=e.ref("0.00"),r=e.ref(""),s=e.ref(null),d=e.ref(!1);e.onMounted((()=>{c()}));const c=async()=>{try{if(!e.index.getStorageSync("token"))return void(await o.wxLogin());const a=await o.getUserInfo();console.log("User info response:",a),200==a.code&&(a.data.openId&&(r.value=a.data.openId,e.index.setStorageSync("openId",a.data.openId)),t.value={nickName:a.data.nickname,phone:a.data.phone,avatar:a.data.iconUrl,isAdmin:a.data.isAdmin},e.index.setStorageSync("userInfo",t.value),i.value=a.data.balanceAmount||"0.00")}catch(a){console.error("获取用户信息失败:",a),e.index.showToast({title:"获取用户信息失败",icon:"none"})}},l=a=>{e.index.navigateTo({url:a})},p=()=>{l("/pages/deposit/index")},u=()=>{t.value||v()},v=()=>{s.value&&(s.value.open(),d.value=!0)};return(o,n)=>e.e({a:t.value.avatar},t.value.avatar?{b:t.value.avatar}:{c:a._imports_0$1},{d:t.value.isAdmin},(t.value.isAdmin,{}),{e:t.value},t.value?{f:e.t(t.value.nickName),g:e.t(t.value.phone||"未绑定手机号")}:{},{h:e.p({type:"right",size:"16",color:"#999"}),i:e.o(u),j:e.t(i.value),k:e.o(p),l:a._imports_1$1,m:e.p({type:"right",size:"16",color:"#999"}),n:e.o((e=>l("/pages/order/index"))),o:a._imports_2,p:e.p({type:"right",size:"16",color:"#999"}),q:e.o((e=>l("/pages/feedback/index"))),r:a._imports_3,s:e.p({type:"right",size:"16",color:"#999"}),t:e.o((e=>l("/pages/help/index")))})}},t=e._export_sfc(n,[["__scopeId","data-v-ac1cfc8d"]]);wx.createPage(t);
+"use strict";const e=require("../../common/vendor.js"),a=require("../../common/assets.js"),o=require("../../util/index.js");if(!Array){e.resolveComponent("uni-icons")()}const n={__name:"index",setup(n){const t=e.ref({}),r=e.ref("0.00"),i=e.ref(""),s=e.ref(null),d=e.ref(!1);e.onMounted((()=>{l()}));const l=async()=>{try{if(!e.index.getStorageSync("token"))return void(await o.wxLogin());const a=await o.getUserInfo();console.log("User info response:",a),200==a.code&&(a.data.openId&&(i.value=a.data.openId,e.index.setStorageSync("openId",a.data.openId)),t.value={nickName:a.data.nickname,phone:a.data.phone,avatar:a.data.iconUrl,isAdmin:a.data.isAdmin},e.index.setStorageSync("userInfo",t.value),r.value=a.data.balanceAmount||"0.00")}catch(a){console.error("获取用户信息失败:",a),e.index.showToast({title:"获取用户信息失败",icon:"none"})}},c=a=>{e.index.navigateTo({url:a})},p=()=>{c("/pages/deposit/index")},u=()=>{t.value||v()},v=()=>{s.value&&(s.value.open(),d.value=!0)};return(o,n)=>{return e.e({a:t.value.avatar},t.value.avatar?{b:t.value.avatar}:{c:a._imports_0$1},{d:t.value.isAdmin},(t.value.isAdmin,{}),{e:t.value},t.value?{f:e.t(t.value.nickName),g:e.t(t.value.phone?(i=t.value.phone,i?i.replace(/(\d{3})\d{4}(\d{4})/,"$1****$2"):""):"未绑定手机号")}:{},{h:e.p({type:"right",size:"16",color:"#999"}),i:e.o(u),j:e.t(r.value),k:e.o(p),l:a._imports_1$1,m:e.p({type:"right",size:"16",color:"#999"}),n:e.o((e=>c("/pages/order/index"))),o:a._imports_2,p:e.p({type:"right",size:"16",color:"#999"}),q:e.o((e=>c("/pages/feedback/index"))),r:a._imports_3,s:e.p({type:"right",size:"16",color:"#999"}),t:e.o((e=>c("/pages/help/index")))});var i}}},t=e._export_sfc(n,[["__scopeId","data-v-6fbc3933"]]);wx.createPage(t);
diff --git a/unpackage/dist/build/mp-weixin/pages/my/index.wxml b/unpackage/dist/build/mp-weixin/pages/my/index.wxml
index 7c26e0a..6b2d487 100644
--- a/unpackage/dist/build/mp-weixin/pages/my/index.wxml
+++ b/unpackage/dist/build/mp-weixin/pages/my/index.wxml
@@ -1 +1 @@
-<view class="profile-container data-v-ac1cfc8d"><view class="header-section data-v-ac1cfc8d"><view class="user-profile data-v-ac1cfc8d" bindtap="{{i}}"><view class="avatar-container data-v-ac1cfc8d"><image wx:if="{{a}}" class="avatar data-v-ac1cfc8d" src="{{b}}" mode="aspectFill"></image><image wx:else class="avatar data-v-ac1cfc8d" src="{{c}}" mode="aspectFill"></image><view wx:if="{{d}}" class="avatar-badge data-v-ac1cfc8d"></view></view><view wx:if="{{e}}" class="user-details data-v-ac1cfc8d"><view class="username data-v-ac1cfc8d">{{f}}</view><view class="user-id data-v-ac1cfc8d">{{g}}</view></view><view wx:else class="user-details data-v-ac1cfc8d"><view class="username data-v-ac1cfc8d">点击登录</view><view class="user-id data-v-ac1cfc8d">授权登录后享受更多服务</view></view><view class="edit-profile data-v-ac1cfc8d"><uni-icons wx:if="{{h}}" class="data-v-ac1cfc8d" u-i="ac1cfc8d-0" bind:__l="__l" u-p="{{h}}"></uni-icons></view></view></view><view class="balance-card data-v-ac1cfc8d"><view class="balance-info data-v-ac1cfc8d"><view class="balance-label data-v-ac1cfc8d">押金余额</view><view class="balance-amount data-v-ac1cfc8d">¥{{j}}</view></view><view class="action-button data-v-ac1cfc8d" bindtap="{{k}}"><text class="data-v-ac1cfc8d">提现</text></view></view><view class="function-list data-v-ac1cfc8d"><view class="function-item data-v-ac1cfc8d" bindtap="{{n}}"><view class="item-left data-v-ac1cfc8d"><view class="item-icon data-v-ac1cfc8d"><image class="data-v-ac1cfc8d" src="{{l}}" mode="aspectFit"></image></view><text class="item-title data-v-ac1cfc8d">订单中心</text></view><view class="item-right data-v-ac1cfc8d"><uni-icons wx:if="{{m}}" class="data-v-ac1cfc8d" u-i="ac1cfc8d-1" bind:__l="__l" u-p="{{m}}"></uni-icons></view></view><view class="function-item data-v-ac1cfc8d" bindtap="{{q}}"><view class="item-left data-v-ac1cfc8d"><view class="item-icon data-v-ac1cfc8d"><image class="data-v-ac1cfc8d" src="{{o}}" mode="aspectFit"></image></view><text class="item-title data-v-ac1cfc8d">投诉建议</text></view><view class="item-right data-v-ac1cfc8d"><uni-icons wx:if="{{p}}" class="data-v-ac1cfc8d" u-i="ac1cfc8d-2" bind:__l="__l" u-p="{{p}}"></uni-icons></view></view><view class="function-item data-v-ac1cfc8d" bindtap="{{t}}"><view class="item-left data-v-ac1cfc8d"><view class="item-icon data-v-ac1cfc8d"><image class="data-v-ac1cfc8d" src="{{r}}" mode="aspectFit"></image></view><text class="item-title data-v-ac1cfc8d">帮助中心</text></view><view class="item-right data-v-ac1cfc8d"><uni-icons wx:if="{{s}}" class="data-v-ac1cfc8d" u-i="ac1cfc8d-3" bind:__l="__l" u-p="{{s}}"></uni-icons></view></view></view></view>
\ No newline at end of file
+<view class="profile-container data-v-6fbc3933"><view class="header-section data-v-6fbc3933"><view class="user-profile data-v-6fbc3933" bindtap="{{i}}"><view class="avatar-container data-v-6fbc3933"><image wx:if="{{a}}" class="avatar data-v-6fbc3933" src="{{b}}" mode="aspectFill"></image><image wx:else class="avatar data-v-6fbc3933" src="{{c}}" mode="aspectFill"></image><view wx:if="{{d}}" class="avatar-badge data-v-6fbc3933"></view></view><view wx:if="{{e}}" class="user-details data-v-6fbc3933"><view class="username data-v-6fbc3933">{{f}}</view><view class="user-id data-v-6fbc3933">{{g}}</view></view><view wx:else class="user-details data-v-6fbc3933"><view class="username data-v-6fbc3933">点击登录</view><view class="user-id data-v-6fbc3933">授权登录后享受更多服务</view></view><view class="edit-profile data-v-6fbc3933"><uni-icons wx:if="{{h}}" class="data-v-6fbc3933" u-i="6fbc3933-0" bind:__l="__l" u-p="{{h}}"></uni-icons></view></view></view><view class="balance-card data-v-6fbc3933"><view class="balance-info data-v-6fbc3933"><view class="balance-label data-v-6fbc3933">押金余额</view><view class="balance-amount data-v-6fbc3933">¥{{j}}</view></view><view class="action-button data-v-6fbc3933" bindtap="{{k}}"><text class="data-v-6fbc3933">提现</text></view></view><view class="function-list data-v-6fbc3933"><view class="function-item data-v-6fbc3933" bindtap="{{n}}"><view class="item-left data-v-6fbc3933"><view class="item-icon data-v-6fbc3933"><image class="data-v-6fbc3933" src="{{l}}" mode="aspectFit"></image></view><text class="item-title data-v-6fbc3933">订单中心</text></view><view class="item-right data-v-6fbc3933"><uni-icons wx:if="{{m}}" class="data-v-6fbc3933" u-i="6fbc3933-1" bind:__l="__l" u-p="{{m}}"></uni-icons></view></view><view class="function-item data-v-6fbc3933" bindtap="{{q}}"><view class="item-left data-v-6fbc3933"><view class="item-icon data-v-6fbc3933"><image class="data-v-6fbc3933" src="{{o}}" mode="aspectFit"></image></view><text class="item-title data-v-6fbc3933">投诉建议</text></view><view class="item-right data-v-6fbc3933"><uni-icons wx:if="{{p}}" class="data-v-6fbc3933" u-i="6fbc3933-2" bind:__l="__l" u-p="{{p}}"></uni-icons></view></view><view class="function-item data-v-6fbc3933" bindtap="{{t}}"><view class="item-left data-v-6fbc3933"><view class="item-icon data-v-6fbc3933"><image class="data-v-6fbc3933" src="{{r}}" mode="aspectFit"></image></view><text class="item-title data-v-6fbc3933">帮助中心</text></view><view class="item-right data-v-6fbc3933"><uni-icons wx:if="{{s}}" class="data-v-6fbc3933" u-i="6fbc3933-3" bind:__l="__l" u-p="{{s}}"></uni-icons></view></view></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/build/mp-weixin/pages/my/index.wxss b/unpackage/dist/build/mp-weixin/pages/my/index.wxss
index ba59a5d..54d470b 100644
--- a/unpackage/dist/build/mp-weixin/pages/my/index.wxss
+++ b/unpackage/dist/build/mp-weixin/pages/my/index.wxss
@@ -1 +1 @@
-.profile-container.data-v-ac1cfc8d{min-height:100vh;background-color:#f5f7fa;padding-bottom:env(safe-area-inset-bottom)}.header-section.data-v-ac1cfc8d{padding:40rpx;background:linear-gradient(135deg,#4facfe,#00f2fe);position:relative;border-radius:0 0 30rpx 30rpx;margin-bottom:20rpx;box-shadow:0 10rpx 30rpx rgba(79,172,254,.2)}.user-profile.data-v-ac1cfc8d{display:flex;align-items:center;padding:20rpx 0}.avatar-container.data-v-ac1cfc8d{position:relative;margin-right:30rpx}.avatar.data-v-ac1cfc8d{width:120rpx;height:120rpx;border-radius:60rpx;border:4rpx solid rgba(255,255,255,.6);box-shadow:0 8rpx 20rpx rgba(0,0,0,.1)}.avatar-badge.data-v-ac1cfc8d{position:absolute;bottom:0;right:0;width:36rpx;height:36rpx;border-radius:18rpx;background-color:#ff9500;border:4rpx solid white}.user-details.data-v-ac1cfc8d{flex:1}.username.data-v-ac1cfc8d{font-size:36rpx;font-weight:600;color:#fff;margin-bottom:8rpx}.user-id.data-v-ac1cfc8d{font-size:26rpx;color:rgba(255,255,255,.8)}.edit-profile.data-v-ac1cfc8d{background-color:rgba(255,255,255,.2);padding:10rpx;border-radius:50%}.balance-card.data-v-ac1cfc8d{margin:30rpx;background:#fff;border-radius:20rpx;padding:30rpx;display:flex;justify-content:space-between;align-items:center;box-shadow:0 10rpx 30rpx rgba(0,0,0,.05)}.balance-label.data-v-ac1cfc8d{font-size:28rpx;color:#666;margin-bottom:10rpx}.balance-amount.data-v-ac1cfc8d{font-size:48rpx;font-weight:600;color:#4facfe}.action-button.data-v-ac1cfc8d{background:linear-gradient(135deg,#4facfe,#00f2fe);border-radius:40rpx;height:80rpx;display:flex;align-items:center;justify-content:center;padding:0 40rpx;color:#fff;font-weight:500;font-size:30rpx;box-shadow:0 8rpx 16rpx rgba(79,172,254,.2)}.action-button.data-v-ac1cfc8d:active{opacity:.9;transform:scale(.98)}.action-button text.data-v-ac1cfc8d{margin-right:10rpx}.function-list.data-v-ac1cfc8d{margin:30rpx;background:#fff;border-radius:20rpx;overflow:hidden;box-shadow:0 6rpx 16rpx rgba(0,0,0,.04)}.function-item.data-v-ac1cfc8d{display:flex;justify-content:space-between;align-items:center;padding:32rpx 30rpx;border-bottom:1rpx solid #f0f0f0}.function-item.data-v-ac1cfc8d:last-child{border-bottom:none}.function-item.data-v-ac1cfc8d:active{background-color:#f9f9f9}.item-left.data-v-ac1cfc8d{display:flex;align-items:center}.item-icon.data-v-ac1cfc8d{width:48rpx;height:48rpx;margin-right:24rpx;display:flex;align-items:center;justify-content:center}.item-icon image.data-v-ac1cfc8d{width:40rpx;height:40rpx}.item-title.data-v-ac1cfc8d{font-size:30rpx;color:#333;font-weight:500}.item-right.data-v-ac1cfc8d{display:flex;align-items:center}.auth-popup.data-v-ac1cfc8d{background-color:#fff;width:100%;padding:40rpx;border-radius:15rpx}.auth-title.data-v-ac1cfc8d{font-size:34rpx;font-weight:600;color:#333;text-align:center;margin-bottom:20rpx}.auth-desc.data-v-ac1cfc8d{font-size:28rpx;color:#666;text-align:center;margin-bottom:40rpx}.auth-buttons.data-v-ac1cfc8d{display:flex;justify-content:space-between}.cancel-btn.data-v-ac1cfc8d,.confirm-btn.data-v-ac1cfc8d{width:240rpx;height:80rpx;line-height:80rpx;text-align:center;border-radius:40rpx;font-size:28rpx}.cancel-btn.data-v-ac1cfc8d:after,.confirm-btn.data-v-ac1cfc8d:after{border:none}.cancel-btn.data-v-ac1cfc8d{background-color:#f0f0f0;color:#666}.confirm-btn.data-v-ac1cfc8d{background:linear-gradient(135deg,#4facfe,#00f2fe);color:#fff}
+.profile-container.data-v-6fbc3933{min-height:100vh;background-color:#f5f7fa;padding-bottom:env(safe-area-inset-bottom)}.header-section.data-v-6fbc3933{padding:40rpx;background:linear-gradient(135deg,#4facfe,#00f2fe);position:relative;border-radius:0 0 30rpx 30rpx;margin-bottom:20rpx;box-shadow:0 10rpx 30rpx rgba(79,172,254,.2)}.user-profile.data-v-6fbc3933{display:flex;align-items:center;padding:20rpx 0}.avatar-container.data-v-6fbc3933{position:relative;margin-right:30rpx}.avatar.data-v-6fbc3933{width:120rpx;height:120rpx;border-radius:60rpx;border:4rpx solid rgba(255,255,255,.6);box-shadow:0 8rpx 20rpx rgba(0,0,0,.1)}.avatar-badge.data-v-6fbc3933{position:absolute;bottom:0;right:0;width:36rpx;height:36rpx;border-radius:18rpx;background-color:#ff9500;border:4rpx solid white}.user-details.data-v-6fbc3933{flex:1}.username.data-v-6fbc3933{font-size:36rpx;font-weight:600;color:#fff;margin-bottom:8rpx}.user-id.data-v-6fbc3933{font-size:26rpx;color:rgba(255,255,255,.8)}.edit-profile.data-v-6fbc3933{background-color:rgba(255,255,255,.2);padding:10rpx;border-radius:50%}.balance-card.data-v-6fbc3933{margin:30rpx;background:#fff;border-radius:20rpx;padding:30rpx;display:flex;justify-content:space-between;align-items:center;box-shadow:0 10rpx 30rpx rgba(0,0,0,.05)}.balance-label.data-v-6fbc3933{font-size:28rpx;color:#666;margin-bottom:10rpx}.balance-amount.data-v-6fbc3933{font-size:48rpx;font-weight:600;color:#4facfe}.action-button.data-v-6fbc3933{background:linear-gradient(135deg,#4facfe,#00f2fe);border-radius:40rpx;height:80rpx;display:flex;align-items:center;justify-content:center;padding:0 40rpx;color:#fff;font-weight:500;font-size:30rpx;box-shadow:0 8rpx 16rpx rgba(79,172,254,.2)}.action-button.data-v-6fbc3933:active{opacity:.9;transform:scale(.98)}.action-button text.data-v-6fbc3933{margin-right:10rpx}.function-list.data-v-6fbc3933{margin:30rpx;background:#fff;border-radius:20rpx;overflow:hidden;box-shadow:0 6rpx 16rpx rgba(0,0,0,.04)}.function-item.data-v-6fbc3933{display:flex;justify-content:space-between;align-items:center;padding:32rpx 30rpx;border-bottom:1rpx solid #f0f0f0}.function-item.data-v-6fbc3933:last-child{border-bottom:none}.function-item.data-v-6fbc3933:active{background-color:#f9f9f9}.item-left.data-v-6fbc3933{display:flex;align-items:center}.item-icon.data-v-6fbc3933{width:48rpx;height:48rpx;margin-right:24rpx;display:flex;align-items:center;justify-content:center}.item-icon image.data-v-6fbc3933{width:40rpx;height:40rpx}.item-title.data-v-6fbc3933{font-size:30rpx;color:#333;font-weight:500}.item-right.data-v-6fbc3933{display:flex;align-items:center}.auth-popup.data-v-6fbc3933{background-color:#fff;width:100%;padding:40rpx;border-radius:15rpx}.auth-title.data-v-6fbc3933{font-size:34rpx;font-weight:600;color:#333;text-align:center;margin-bottom:20rpx}.auth-desc.data-v-6fbc3933{font-size:28rpx;color:#666;text-align:center;margin-bottom:40rpx}.auth-buttons.data-v-6fbc3933{display:flex;justify-content:space-between}.cancel-btn.data-v-6fbc3933,.confirm-btn.data-v-6fbc3933{width:240rpx;height:80rpx;line-height:80rpx;text-align:center;border-radius:40rpx;font-size:28rpx}.cancel-btn.data-v-6fbc3933:after,.confirm-btn.data-v-6fbc3933:after{border:none}.cancel-btn.data-v-6fbc3933{background-color:#f0f0f0;color:#666}.confirm-btn.data-v-6fbc3933{background:linear-gradient(135deg,#4facfe,#00f2fe);color:#fff}
diff --git a/unpackage/dist/build/mp-weixin/pages/order/details.js b/unpackage/dist/build/mp-weixin/pages/order/details.js
index cddcf78..d1cdfeb 100644
--- a/unpackage/dist/build/mp-weixin/pages/order/details.js
+++ b/unpackage/dist/build/mp-weixin/pages/order/details.js
@@ -1 +1 @@
-"use strict";const e=require("../../common/vendor.js"),a=require("../../common/assets.js"),t=require("../../config/user.js"),n={__name:"details",setup(n){const r=e.ref(""),i=e.ref({}),o=e.computed((()=>{switch(i.value.orderStatus){case"waiting_for_payment":return"等待支付";case"in_used":return"使用中";case"used_done":return"已完成";case"order_cancelled":return"已取消";default:return"未知状态"}})),s=e.computed((()=>{switch(i.value.orderStatus){case"waiting_for_payment":return"status-waiting";case"in_used":return"status-using";case"used_done":return"status-finished";case"order_cancelled":return"status-cancelled";default:return""}})),u=e.computed((()=>{switch(i.value.orderStatus){case"waiting_for_payment":return"请在15分钟内完成支付";case"in_used":return"设备正在使用中";case"used_done":return"感谢您的使用";case"order_cancelled":return"该订单已取消";default:return""}}));e.computed((()=>{const e=i.value.payWay;return"wx_score_pay"===e?"微信支付分 (免押金)":"wx_pay"===e?"微信支付":"押金支付"})),e.onLoad((async a=>{a&&a.orderId?(r.value=a.orderId,await d()):(e.index.showToast({title:"订单信息不存在",icon:"none"}),setTimeout((()=>{e.index.navigateBack()}),1500))}));const d=async()=>{try{e.index.showLoading({title:"加载中"});const a=await t.queryById(r.value);if(200!==a.code||!a.data)throw new Error("获取订单详情失败");i.value=a.data,i.value.createTime&&(i.value.createTime=c(new Date(i.value.createTime))),i.value.startTime&&(i.value.startTime=c(new Date(i.value.startTime))),i.value.endTime&&(i.value.endTime=c(new Date(i.value.endTime))),e.index.hideLoading()}catch(a){e.index.hideLoading(),e.index.showToast({title:a.message||"获取订单详情失败",icon:"none"})}},c=e=>`${e.getFullYear()}-${(e.getMonth()+1).toString().padStart(2,"0")}-${e.getDate().toString().padStart(2,"0")} ${e.getHours().toString().padStart(2,"0")}:${e.getMinutes().toString().padStart(2,"0")}`,l=e=>{if(!e)return"";const a=parseInt(e);if(a<60)return`${a}分钟`;{const e=Math.floor(a/60),t=a%60;return t>0?`${e}小时${t}分钟`:`${e}小时`}},v=()=>{e.index.showModal({title:"确认取消",content:"确定要取消此订单吗？",success:async a=>{if(a.confirm)try{e.index.showLoading({title:"处理中"});const a=await t.cancelOrder({orderId:r.value});if(200!==a.code)throw new Error(a.msg||"取消订单失败");e.index.hideLoading(),e.index.showToast({title:"订单已取消",icon:"success"}),await d()}catch(n){e.index.hideLoading(),e.index.showToast({title:n.message||"取消订单失败",icon:"none"})}}})},m=async()=>{try{e.index.showLoading({title:"处理中"});const a=await t.confirmPaymentAndRent(r.value);if(200!==a.code)throw new Error(a.msg||"支付失败");e.index.hideLoading(),e.index.showToast({title:"支付成功",icon:"success"}),await d()}catch(a){e.index.hideLoading(),e.index.showToast({title:a.message||"支付失败",icon:"none"})}},g=()=>{e.index.navigateTo({url:`/pages/return/index?deviceId=${i.value.deviceNo}&orderId=${r.value}`})};return(t,n)=>e.e({a:e.n(s.value),b:e.t(o.value),c:e.t(u.value),d:e.t(i.value.orderNo||"-"),e:e.t(i.value.deviceNo||"-"),f:"wx_score_pay"===i.value.payWay},"wx_score_pay"===i.value.payWay?{g:a._imports_0$2}:{},{h:e.t(i.value.createTime||"-"),i:e.t(i.value.startTime||"-"),j:i.value.endTime},i.value.endTime?{k:e.t(i.value.endTime)}:{},{l:i.value.phone},i.value.phone?{m:e.t(i.value.phone)}:{},{n:i.value.depositAmount},i.value.depositAmount?{o:e.t(i.value.depositAmount)}:{},{p:i.value.packageTime&&i.value.packagePrice},i.value.packageTime&&i.value.packagePrice?{q:e.t(i.value.packagePrice),r:e.t(l(i.value.packageTime))}:{},{s:e.t(i.value.payAmount||0),t:"waiting_for_payment"===i.value.orderStatus},"waiting_for_payment"===i.value.orderStatus?{v:e.o(v),w:e.o(m)}:"in_used"===i.value.orderStatus?{y:e.o(g)}:{},{x:"in_used"===i.value.orderStatus})}},r=e._export_sfc(n,[["__scopeId","data-v-e8875514"]]);wx.createPage(r);
+"use strict";const e=require("../../common/vendor.js"),a=require("../../common/assets.js"),t=require("../../config/user.js"),r={__name:"details",setup(r){const n=e.ref(""),o=e.ref({}),i=e.computed((()=>{switch(o.value.orderStatus){case"waiting_for_payment":return"待支付";case"in_used":default:return"使用中";case"used_done":return"已完成";case"order_cancelled":return"已取消"}}));e.onLoad((async a=>{a&&a.orderId?(n.value=a.orderId,await u()):(e.index.showToast({title:"订单信息不存在",icon:"none"}),setTimeout((()=>{e.index.navigateBack()}),1500))}));const u=async()=>{try{e.index.showLoading({title:"加载中"});const a=await t.queryById(n.value);if(200!==a.code||!a.data)throw new Error("获取订单详情失败");o.value=a.data,o.value.createTime&&(o.value.createTime=s(new Date(o.value.createTime))),o.value.startTime&&(o.value.startTime=s(new Date(o.value.startTime))),o.value.endTime&&(o.value.endTime=s(new Date(o.value.endTime))),e.index.hideLoading()}catch(a){e.index.hideLoading(),e.index.showToast({title:a.message||"获取订单详情失败",icon:"none"})}},s=e=>`${e.getFullYear()}-${(e.getMonth()+1).toString().padStart(2,"0")}-${e.getDate().toString().padStart(2,"0")} ${e.getHours().toString().padStart(2,"0")}:${e.getMinutes().toString().padStart(2,"0")}`,d=e=>{if(!e)return"";const a=parseInt(e);if(a<60)return`${a}分钟`;{const e=Math.floor(a/60),t=a%60;return t>0?`${e}小时${t}分钟`:`${e}小时`}};return(t,r)=>e.e({a:e.t(i.value),b:e.t(o.value.orderNo||"-"),c:e.t(o.value.deviceNo||"-"),d:"wx_score_pay"===o.value.payWay},"wx_score_pay"===o.value.payWay?{e:a._imports_0$2}:{},{f:e.t(o.value.startTime||"-"),g:o.value.endTime},o.value.endTime?{h:e.t(o.value.endTime)}:{},{i:o.value.phone},o.value.phone?{j:e.t(o.value.phone)}:{},{k:o.value.depositAmount},o.value.depositAmount?{l:e.t(o.value.depositAmount)}:{},{m:o.value.packageTime&&o.value.packagePrice},o.value.packageTime&&o.value.packagePrice?{n:e.t(o.value.packagePrice),o:e.t(d(o.value.packageTime))}:{},{p:e.t(o.value.payAmount||0)})}},n=e._export_sfc(r,[["__scopeId","data-v-f9b4f795"]]);wx.createPage(n);
diff --git a/unpackage/dist/build/mp-weixin/pages/order/details.wxml b/unpackage/dist/build/mp-weixin/pages/order/details.wxml
index 8494170..5ff12a7 100644
--- a/unpackage/dist/build/mp-weixin/pages/order/details.wxml
+++ b/unpackage/dist/build/mp-weixin/pages/order/details.wxml
@@ -1 +1 @@
-<view class="details-container data-v-e8875514"><view class="status-card data-v-e8875514"><view class="{{['status-icon', 'data-v-e8875514', a]}}"></view><view class="status-text data-v-e8875514">{{b}}</view><view class="status-desc data-v-e8875514">{{c}}</view></view><view class="info-card data-v-e8875514"><view class="card-title data-v-e8875514">订单信息</view><view class="info-item data-v-e8875514"><text class="label data-v-e8875514">订单号</text><text class="value data-v-e8875514">{{d}}</text></view><view class="info-item data-v-e8875514"><text class="label data-v-e8875514">设备号</text><text class="value data-v-e8875514">{{e}}</text></view><view class="info-item data-v-e8875514"><text class="label data-v-e8875514">租借方式</text><view class="value payment-method data-v-e8875514"><view wx:if="{{f}}" class="payment-badge wx-score data-v-e8875514"><image src="{{g}}" mode="aspectFit" class="badge-icon data-v-e8875514"></image><view class="badge-text data-v-e8875514"><text class="data-v-e8875514">微信支付分</text><text class="divider data-v-e8875514">|</text><text class="highlight data-v-e8875514">免押租借</text></view></view><view wx:else class="payment-badge deposit data-v-e8875514"><text class="badge-text data-v-e8875514">押金租借</text></view></view></view><view class="info-item data-v-e8875514"><text class="label data-v-e8875514">创建时间</text><text class="value data-v-e8875514">{{h}}</text></view><view class="info-item data-v-e8875514"><text class="label data-v-e8875514">开始时间</text><text class="value data-v-e8875514">{{i}}</text></view><view wx:if="{{j}}" class="info-item data-v-e8875514"><text class="label data-v-e8875514">结束时间</text><text class="value data-v-e8875514">{{k}}</text></view><view wx:if="{{l}}" class="info-item data-v-e8875514"><text class="label data-v-e8875514">联系电话</text><text class="value data-v-e8875514">{{m}}</text></view></view><view class="info-card data-v-e8875514"><view class="card-title data-v-e8875514">费用信息</view><view wx:if="{{n}}" class="info-item data-v-e8875514"><text class="label data-v-e8875514">押金</text><text class="value data-v-e8875514">￥{{o}}</text></view><view wx:if="{{p}}" class="info-item data-v-e8875514"><text class="label data-v-e8875514">套餐</text><text class="value data-v-e8875514">￥{{q}}元 / {{r}}</text></view><view class="info-item total data-v-e8875514"><text class="label data-v-e8875514">合计</text><text class="value data-v-e8875514">￥{{s}}</text></view></view><view wx:if="{{t}}" class="action-buttons data-v-e8875514"><view class="btn cancel data-v-e8875514" bindtap="{{v}}">取消订单</view><view class="btn primary data-v-e8875514" bindtap="{{w}}">立即支付</view></view><view wx:elif="{{x}}" class="action-buttons data-v-e8875514"><view class="btn primary data-v-e8875514" bindtap="{{y}}">归还设备</view></view></view>
\ No newline at end of file
+<view class="return-container data-v-f9b4f795"><view class="order-card data-v-f9b4f795"><view class="order-header data-v-f9b4f795"><text class="title data-v-f9b4f795">{{a}}</text><text class="order-no data-v-f9b4f795">订单号：{{b}}</text></view><view class="device-info data-v-f9b4f795"><view class="device-left data-v-f9b4f795"><view class="device-name data-v-f9b4f795">共享风扇</view><view class="device-id data-v-f9b4f795">设备号：{{c}}</view></view><view class="device-right data-v-f9b4f795"><view wx:if="{{d}}" class="payment-badge wx-score data-v-f9b4f795"><image src="{{e}}" mode="aspectFit" class="badge-icon data-v-f9b4f795"></image><view class="badge-text data-v-f9b4f795"><text class="data-v-f9b4f795">微信支付分</text><text class="divider data-v-f9b4f795">|</text><text class="highlight data-v-f9b4f795">免押租借</text></view></view><view wx:else class="payment-badge deposit data-v-f9b4f795"><text class="badge-text data-v-f9b4f795">押金租借</text></view></view></view><view class="time-info data-v-f9b4f795"><view class="time-item data-v-f9b4f795"><text class="label data-v-f9b4f795">开始时间</text><text class="value data-v-f9b4f795">{{f}}</text></view><view wx:if="{{g}}" class="time-item data-v-f9b4f795"><text class="label data-v-f9b4f795">结束时间</text><text class="value data-v-f9b4f795">{{h}}</text></view><view wx:if="{{i}}" class="time-item data-v-f9b4f795"><text class="label data-v-f9b4f795">联系电话</text><text class="value data-v-f9b4f795">{{j}}</text></view></view></view><view class="notice-card data-v-f9b4f795"><view class="notice-title data-v-f9b4f795">费用信息</view><view class="notice-list data-v-f9b4f795"><view wx:if="{{k}}" class="notice-item data-v-f9b4f795"><view class="dot data-v-f9b4f795"></view><text class="data-v-f9b4f795">押金：￥{{l}}</text></view><view wx:if="{{m}}" class="notice-item data-v-f9b4f795"><view class="dot data-v-f9b4f795"></view><text class="data-v-f9b4f795">套餐：￥{{n}}元 / {{o}}</text></view><view class="notice-item data-v-f9b4f795"><view class="dot data-v-f9b4f795"></view><text class="data-v-f9b4f795">合计：￥{{p}}</text></view></view></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/build/mp-weixin/pages/order/details.wxss b/unpackage/dist/build/mp-weixin/pages/order/details.wxss
index 1b7a31c..5005000 100644
--- a/unpackage/dist/build/mp-weixin/pages/order/details.wxss
+++ b/unpackage/dist/build/mp-weixin/pages/order/details.wxss
@@ -1 +1 @@
-.details-container.data-v-e8875514{min-height:100vh;background:#f7f8fa;padding:30rpx 30rpx 100rpx;box-sizing:border-box}.details-container .status-card.data-v-e8875514{background:#fff;border-radius:20rpx;padding:40rpx;display:flex;flex-direction:column;align-items:center;margin-bottom:30rpx;box-shadow:0 4rpx 16rpx rgba(0,0,0,.04)}.details-container .status-card .status-icon.data-v-e8875514{width:120rpx;height:120rpx;border-radius:50%;margin-bottom:20rpx}.details-container .status-card .status-icon.status-waiting.data-v-e8875514{background:#fff9c4}.details-container .status-card .status-icon.status-using.data-v-e8875514{background:#e8f5e9}.details-container .status-card .status-icon.status-finished.data-v-e8875514{background:#e3f2fd}.details-container .status-card .status-icon.status-cancelled.data-v-e8875514{background:#ffebee}.details-container .status-card .status-text.data-v-e8875514{font-size:36rpx;font-weight:600;color:#333;margin-bottom:10rpx}.details-container .status-card .status-desc.data-v-e8875514{font-size:28rpx;color:#999}.details-container .info-card.data-v-e8875514{background:#fff;border-radius:20rpx;padding:30rpx;margin-bottom:30rpx;box-shadow:0 4rpx 16rpx rgba(0,0,0,.04)}.details-container .info-card .card-title.data-v-e8875514{font-size:32rpx;font-weight:600;color:#333;margin-bottom:20rpx;position:relative;padding-left:20rpx}.details-container .info-card .card-title.data-v-e8875514:before{content:"";position:absolute;left:0;top:50%;transform:translateY(-50%);width:8rpx;height:32rpx;background:#1976d2;border-radius:4rpx}.details-container .info-card .info-item.data-v-e8875514{display:flex;justify-content:space-between;align-items:center;padding:20rpx 0;border-bottom:1px solid #f5f5f5}.details-container .info-card .info-item.data-v-e8875514:last-child{border-bottom:none}.details-container .info-card .info-item .label.data-v-e8875514{font-size:28rpx;color:#666}.details-container .info-card .info-item .value.data-v-e8875514{font-size:28rpx;color:#333;word-break:break-all;text-align:right;max-width:70%}.details-container .info-card .info-item .value.payment-method.data-v-e8875514{display:flex;flex-direction:column;align-items:flex-end}.details-container .info-card .info-item .value.payment-method .payment-badge.data-v-e8875514{margin-top:8rpx;display:flex;align-items:center;padding:4rpx 10rpx;border-radius:8rpx}.details-container .info-card .info-item .value.payment-method .payment-badge.wx-score.data-v-e8875514{background:rgba(7,193,96,.08)}.details-container .info-card .info-item .value.payment-method .payment-badge.wx-score .badge-icon.data-v-e8875514{width:32rpx;height:26rpx;margin-right:8rpx}.details-container .info-card .info-item .value.payment-method .payment-badge.wx-score .badge-text.data-v-e8875514{font-size:22rpx;color:#07c160;display:flex;align-items:center}.details-container .info-card .info-item .value.payment-method .payment-badge.wx-score .badge-text .divider.data-v-e8875514{margin:0 6rpx}.details-container .info-card .info-item .value.payment-method .payment-badge.wx-score .badge-text .highlight.data-v-e8875514{font-weight:500}.details-container .info-card .info-item .value.payment-method .payment-badge.deposit.data-v-e8875514{background:#f5f5f5}.details-container .info-card .info-item .value.payment-method .payment-badge.deposit .badge-text.data-v-e8875514{font-size:22rpx;color:#666;font-weight:500}.details-container .info-card .info-item.total.data-v-e8875514{margin-top:10rpx;padding-top:30rpx;border-top:1px solid #f5f5f5}.details-container .info-card .info-item.total .label.data-v-e8875514,.details-container .info-card .info-item.total .value.data-v-e8875514{font-size:32rpx;font-weight:600;color:#333}.details-container .info-card .info-item.total .value.data-v-e8875514{color:#ff5722}.details-container .action-buttons.data-v-e8875514{display:flex;justify-content:space-between;padding:30rpx 0}.details-container .action-buttons .btn.data-v-e8875514{flex:1;height:88rpx;display:flex;align-items:center;justify-content:center;font-size:32rpx;font-weight:500;border-radius:44rpx}.details-container .action-buttons .btn.cancel.data-v-e8875514{background:#f5f5f5;color:#666;margin-right:20rpx}.details-container .action-buttons .btn.primary.data-v-e8875514{background:#1976d2;color:#fff}.details-container .action-buttons .btn.data-v-e8875514:active{opacity:.9}
+.return-container.data-v-f9b4f795{min-height:100vh;background:#f7f8fa;padding:30rpx 30rpx 180rpx;box-sizing:border-box}.return-container .order-card.data-v-f9b4f795{background:#fff;border-radius:20rpx;padding:30rpx;margin-bottom:30rpx;box-shadow:0 4rpx 16rpx rgba(0,0,0,.04)}.return-container .order-card .order-header.data-v-f9b4f795{display:flex;justify-content:space-between;align-items:center;margin-bottom:20rpx;padding-bottom:16rpx;border-bottom:1rpx solid #f0f0f0}.return-container .order-card .order-header .title.data-v-f9b4f795{font-size:30rpx;font-weight:700;color:#333}.return-container .order-card .order-header .order-no.data-v-f9b4f795{font-size:24rpx;color:#999}.return-container .order-card .device-info.data-v-f9b4f795{margin-bottom:24rpx;display:flex;justify-content:space-between;align-items:flex-start}.return-container .order-card .device-info .device-left.data-v-f9b4f795{flex:1;margin-right:20rpx}.return-container .order-card .device-info .device-left .device-name.data-v-f9b4f795{font-size:32rpx;font-weight:500;color:#333;margin-bottom:8rpx}.return-container .order-card .device-info .device-left .device-id.data-v-f9b4f795{font-size:26rpx;color:#999;margin-bottom:0}.return-container .order-card .device-info .device-right .payment-badge.data-v-f9b4f795{display:inline-flex;align-items:center;padding:6rpx 12rpx;border-radius:8rpx;white-space:nowrap}.return-container .order-card .device-info .device-right .payment-badge.wx-score.data-v-f9b4f795{background:rgba(7,193,96,.08)}.return-container .order-card .device-info .device-right .payment-badge.wx-score .badge-icon.data-v-f9b4f795{width:32rpx;height:26rpx;margin-right:8rpx}.return-container .order-card .device-info .device-right .payment-badge.wx-score .badge-text.data-v-f9b4f795{font-size:22rpx;color:#07c160;display:flex;align-items:center}.return-container .order-card .device-info .device-right .payment-badge.wx-score .badge-text .divider.data-v-f9b4f795{margin:0 6rpx}.return-container .order-card .device-info .device-right .payment-badge.wx-score .badge-text .highlight.data-v-f9b4f795{font-weight:500}.return-container .order-card .device-info .device-right .payment-badge.deposit.data-v-f9b4f795{background:#f5f5f5}.return-container .order-card .device-info .device-right .payment-badge.deposit .badge-text.data-v-f9b4f795{font-size:22rpx;color:#666;font-weight:500}.return-container .order-card .time-info.data-v-f9b4f795{background:#f9f9f9;border-radius:16rpx;padding:20rpx}.return-container .order-card .time-info .time-item.data-v-f9b4f795{display:flex;justify-content:space-between;align-items:center;margin-bottom:16rpx}.return-container .order-card .time-info .time-item.data-v-f9b4f795:last-child{margin-bottom:0}.return-container .order-card .time-info .time-item .label.data-v-f9b4f795{font-size:26rpx;color:#666}.return-container .order-card .time-info .time-item .value.data-v-f9b4f795{font-size:26rpx;color:#333}.return-container .order-card .time-info .time-item .value.highlight.data-v-f9b4f795{color:#ff6b6b;font-weight:700}.return-container .notice-card.data-v-f9b4f795{background:#fff;border-radius:20rpx;padding:30rpx;margin-bottom:30rpx;box-shadow:0 4rpx 16rpx rgba(0,0,0,.04)}.return-container .notice-card .notice-title.data-v-f9b4f795{font-size:30rpx;font-weight:700;color:#333;margin-bottom:20rpx}.return-container .notice-card .notice-list .notice-item.data-v-f9b4f795{display:flex;align-items:flex-start;margin-bottom:16rpx}.return-container .notice-card .notice-list .notice-item.data-v-f9b4f795:last-child{margin-bottom:0}.return-container .notice-card .notice-list .notice-item .dot.data-v-f9b4f795{width:12rpx;height:12rpx;background:#07c160;border-radius:50%;margin-top:10rpx;margin-right:16rpx;flex-shrink:0}.return-container .notice-card .notice-list .notice-item text.data-v-f9b4f795{font-size:26rpx;color:#666;line-height:1.5}.return-container .bottom-bar.data-v-f9b4f795{position:fixed;left:0;right:0;bottom:0;padding:20rpx 30rpx;padding-bottom:calc(20rpx + env(safe-area-inset-bottom));background:#fff;box-shadow:0 -4rpx 16rpx rgba(0,0,0,.04);z-index:10;display:flex;justify-content:space-between;gap:20rpx}.return-container .bottom-bar .action-item.data-v-f9b4f795{height:88rpx;display:flex;align-items:center;justify-content:center;font-size:30rpx;border-radius:44rpx;flex:1}.return-container .bottom-bar .action-item.primary.data-v-f9b4f795{background:#07c160;color:#fff}.return-container .bottom-bar .action-item.primary.data-v-f9b4f795:active{opacity:.8}.return-container .bottom-bar .action-item.secondary.data-v-f9b4f795{background:#f5f5f5;color:#333;border:1rpx solid #e0e0e0}.return-container .bottom-bar .action-item.secondary.data-v-f9b4f795:active{opacity:.8}
diff --git a/unpackage/dist/build/mp-weixin/pages/order/payment.js b/unpackage/dist/build/mp-weixin/pages/order/payment.js
index 9c6704d..33c021b 100644
--- a/unpackage/dist/build/mp-weixin/pages/order/payment.js
+++ b/unpackage/dist/build/mp-weixin/pages/order/payment.js
@@ -1 +1 @@
-"use strict";const e=require("../../common/vendor.js"),t=require("../../config/user.js"),o=require("../../config/url.js"),i={data:()=>({orderId:null,deviceNo:null,orderInfo:{},packageInfo:{time:"",price:"0.00"},deviceInfo:null,passedTotalAmount:null,passedDepositAmount:null,orderStatus:{text:"等待支付",desc:"请在15分钟内完成支付",class:"waiting"}}),computed:{totalAmount(){if(null!==this.passedTotalAmount)return parseFloat(this.passedTotalAmount).toFixed(2);return(parseFloat(this.orderInfo.deposit||this.passedDepositAmount||99)+parseFloat(this.packageInfo.price||0)).toFixed(2)},hourlyRate(){const e=parseFloat(this.packageInfo.price||0);let t=parseFloat(this.packageInfo.time||1);if(this.packageInfo.time&&this.packageInfo.time.includes("分钟"))t/=60;else if(this.packageInfo.time&&this.packageInfo.time.includes("次"))return e.toFixed(2);return t<=0&&(t=1),(e/t).toFixed(2)}},onLoad(t){if(t&&t.orderId){if(this.orderId=t.orderId,t.totalAmount&&(this.passedTotalAmount=t.totalAmount),t.depositAmount&&(this.passedDepositAmount=t.depositAmount),t.feeConfig)try{console.log("从URL获取到feeConfig:",t.feeConfig);const e=decodeURIComponent(t.feeConfig);this.deviceInfo={feeConfig:e}}catch(o){console.error("解析URL中的feeConfig失败:",o)}this.loadOrderInfo()}else e.index.showToast({title:"订单信息不存在",icon:"none"}),setTimeout((()=>{e.index.redirectTo({url:"/pages/index/index"})}),1500)},methods:{async loadOrderInfo(){try{e.index.showLoading({title:"加载中"});const i=await t.queryById(this.orderId);if(200!==i.code||!i.data)throw new Error("获取订单信息失败");{const e=i.data;let t;try{t=e.createTime?this.formatTime(new Date(e.createTime)):this.formatTime(new Date)}catch(o){console.error("时间格式化错误:",o),t=this.formatTime(new Date)}if(this.orderInfo={orderNo:e.orderNo||e.orderId,deviceNo:e.deviceNo,createTime:t,phone:e.phone,deposit:this.passedDepositAmount||e.depositAmount||"99.00"},e.packageTime&&e.packagePrice){const t=(parseFloat(e.packageTime)/60).toFixed(1);this.packageInfo={time:t.toString(),price:e.packagePrice.toString()}}this.deviceNo=e.deviceNo,await this.loadDeviceInfo()}e.index.hideLoading()}catch(i){e.index.hideLoading(),e.index.showToast({title:i.message||"获取订单信息失败",icon:"none"})}},async loadDeviceInfo(){if(this.deviceNo)try{const e=await t.getDeviceInfo(this.deviceNo);200===e.code&&e.data&&(this.deviceInfo=e.data.device,this.deviceInfo&&this.deviceInfo.depositAmount&&(this.orderInfo.deposit=this.deviceInfo.depositAmount))}catch(e){console.error("获取设备信息失败:",e)}},async handlePayment(){try{e.index.showLoading({title:"处理中"});const i=await e.index.request({url:`${o.URL||"http://127.0.0.1:8080"}/app/wx-payment/create/${this.orderInfo.orderNo}`,method:"GET",header:{Authorization:"Bearer "+e.index.getStorageSync("token"),Clientid:e.index.getStorageSync("client_id")}});if(200!==i.statusCode||200!==i.data.code)throw new Error(i.data.msg||"创建支付订单失败");{const o=i.data.data;await e.index.requestPayment({...o,success:async()=>{e.index.showToast({title:"支付成功",icon:"success"});try{await t.updateUserBalance(this.orderId)}catch(o){console.warn("更新用户余额失败:",o)}setTimeout((()=>{e.index.redirectTo({url:`/pages/order/index?orderId=${this.orderId}`})}),1500)},fail:e=>{throw console.error("支付失败:",e),new Error("支付失败，请重试")}})}}catch(i){e.index.hideLoading(),e.index.showToast({title:i.message||"支付失败",icon:"none"})}},async sendRentCommand(){try{e.index.showLoading({title:"处理中"});const t=await this.sendRentRequest();if(200!==t.code)throw new Error(t.msg||"租借失败");e.index.hideLoading(),e.index.showToast({title:"租借成功",icon:"success"}),setTimeout((()=>{e.index.redirectTo({url:`/pages/order/index?orderId=${this.orderId}`})}),1500)}catch(t){e.index.hideLoading(),e.index.showToast({title:t.message||"租借失败",icon:"none"})}},sendRentRequest(){return new Promise(((t,i)=>{e.index.request({url:`${o.URL}/app/device/sendRentCommand`,method:"POST",data:{orderId:this.orderId},header:{"Content-Type":"application/x-www-form-urlencoded",Authorization:"Bearer "+e.index.getStorageSync("token"),Clientid:e.index.getStorageSync("client_id")},success(e){200===e.statusCode?t(e.data):i(new Error("请求失败"))},fail(e){i(e)}})}))},formatTime:e=>`${e.getFullYear()}-${(e.getMonth()+1).toString().padStart(2,"0")}-${e.getDate().toString().padStart(2,"0")} ${e.getHours().toString().padStart(2,"0")}:${e.getMinutes().toString().padStart(2,"0")}`,async checkOrderStatus(){try{const t=await e.index.request({url:`${o.URL||"http://127.0.0.1:8080"}/app/wx-payment/status/${this.orderInfo.orderNo}`,method:"GET",header:{Authorization:"Bearer "+e.index.getStorageSync("token"),Clientid:e.index.getStorageSync("client_id")}});if(200===t.statusCode&&200===t.data.code)return t.data.data;throw new Error("查询订单状态失败")}catch(t){return console.error("查询订单状态错误:",t),null}}}};const n=e._export_sfc(i,[["render",function(t,o,i,n,r,a){return{a:e.n(r.orderStatus.class),b:e.t(r.orderStatus.text),c:e.t(r.orderStatus.desc),d:e.t(r.orderInfo.orderNo||"-"),e:e.t(r.orderInfo.deviceNo||"-"),f:e.t(r.orderInfo.createTime||"-"),g:e.t(r.orderInfo.phone||"-"),h:e.t(r.orderInfo.deposit||"99.00"),i:e.t(r.packageInfo.price),j:e.t(r.packageInfo.time),k:e.t(a.totalAmount),l:e.t(a.totalAmount),m:e.o(((...e)=>a.handlePayment&&a.handlePayment(...e)))}}],["__scopeId","data-v-9930ec32"]]);wx.createPage(n);
+"use strict";const e=require("../../common/vendor.js"),t=require("../../config/user.js"),o=require("../../config/url.js"),i={data:()=>({orderId:null,deviceNo:null,orderInfo:{},packageInfo:{time:"",price:"0.00"},deviceInfo:null,passedTotalAmount:null,passedDepositAmount:null,orderStatus:{text:"等待支付",desc:"请在15分钟内完成支付",class:"waiting"}}),computed:{totalAmount(){if(null!==this.passedTotalAmount)return parseFloat(this.passedTotalAmount).toFixed(2);return(parseFloat(this.orderInfo.deposit||this.passedDepositAmount||99)+parseFloat(this.packageInfo.price||0)).toFixed(2)},hourlyRate(){const e=parseFloat(this.packageInfo.price||0);let t=parseFloat(this.packageInfo.time||1);if(this.packageInfo.time&&this.packageInfo.time.includes("分钟"))t/=60;else if(this.packageInfo.time&&this.packageInfo.time.includes("次"))return e.toFixed(2);return t<=0&&(t=1),(e/t).toFixed(2)}},onLoad(t){if(t&&t.orderId){if(this.orderId=t.orderId,t.totalAmount&&(this.passedTotalAmount=t.depositAmount),t.depositAmount&&(this.passedDepositAmount=t.depositAmount),t.feeConfig)try{console.log("从URL获取到feeConfig:",t.feeConfig);const e=decodeURIComponent(t.feeConfig);this.deviceInfo={feeConfig:e}}catch(o){console.error("解析URL中的feeConfig失败:",o)}this.loadOrderInfo()}else e.index.showToast({title:"订单信息不存在",icon:"none"}),setTimeout((()=>{e.index.redirectTo({url:"/pages/index/index"})}),1500)},methods:{async loadOrderInfo(){try{e.index.showLoading({title:"加载中"});const i=await t.queryById(this.orderId);if(200!==i.code||!i.data)throw new Error("获取订单信息失败");{const e=i.data;let t;try{t=e.createTime?this.formatTime(new Date(e.createTime)):this.formatTime(new Date)}catch(o){console.error("时间格式化错误:",o),t=this.formatTime(new Date)}if(this.orderInfo={orderNo:e.orderNo||e.orderId,deviceNo:e.deviceNo,createTime:t,phone:e.phone,deposit:this.passedDepositAmount||e.depositAmount||"99.00"},e.packageTime&&e.packagePrice){const t=(parseFloat(e.packageTime)/60).toFixed(1);this.packageInfo={time:t.toString(),price:e.packagePrice.toString()}}this.deviceNo=e.deviceNo,await this.loadDeviceInfo()}e.index.hideLoading()}catch(i){e.index.hideLoading(),e.index.showToast({title:i.message||"获取订单信息失败",icon:"none"})}},async loadDeviceInfo(){if(this.deviceNo)try{const e=await t.getDeviceInfo(this.deviceNo);200===e.code&&e.data&&(this.deviceInfo=e.data.device,this.deviceInfo&&this.deviceInfo.depositAmount&&(this.orderInfo.deposit=this.deviceInfo.depositAmount))}catch(e){console.error("获取设备信息失败:",e)}},async handlePayment(){try{e.index.showLoading({title:"处理中"});const i=await e.index.request({url:`${o.URL||"http://127.0.0.1:8080"}/app/wx-payment/create/${this.orderInfo.orderNo}`,method:"GET",header:{Authorization:"Bearer "+e.index.getStorageSync("token"),Clientid:e.index.getStorageSync("client_id")}});if(200!==i.statusCode||200!==i.data.code)throw new Error(i.data.msg||"创建支付订单失败");{const o=i.data.data;await e.index.requestPayment({...o,success:async()=>{e.index.showToast({title:"支付成功",icon:"success"});try{await t.updateUserBalance(this.orderId)}catch(o){console.warn("更新用户余额失败:",o)}setTimeout((()=>{e.index.redirectTo({url:`/pages/order/index?orderId=${this.orderId}`})}),1500)},fail:e=>{throw console.error("支付失败:",e),new Error("支付失败，请重试")}})}}catch(i){e.index.hideLoading(),e.index.showToast({title:i.message||"支付失败",icon:"none"})}},async sendRentCommand(){try{e.index.showLoading({title:"处理中"});const t=await this.sendRentRequest();if(200!==t.code)throw new Error(t.msg||"租借失败");e.index.hideLoading(),e.index.showToast({title:"租借成功",icon:"success"}),setTimeout((()=>{e.index.redirectTo({url:`/pages/order/index?orderId=${this.orderId}`})}),1500)}catch(t){e.index.hideLoading(),e.index.showToast({title:t.message||"租借失败",icon:"none"})}},sendRentRequest(){return new Promise(((t,i)=>{e.index.request({url:`${o.URL}/app/device/sendRentCommand`,method:"POST",data:{orderId:this.orderId},header:{"Content-Type":"application/x-www-form-urlencoded",Authorization:"Bearer "+e.index.getStorageSync("token"),Clientid:e.index.getStorageSync("client_id")},success(e){200===e.statusCode?t(e.data):i(new Error("请求失败"))},fail(e){i(e)}})}))},formatTime:e=>`${e.getFullYear()}-${(e.getMonth()+1).toString().padStart(2,"0")}-${e.getDate().toString().padStart(2,"0")} ${e.getHours().toString().padStart(2,"0")}:${e.getMinutes().toString().padStart(2,"0")}`,async checkOrderStatus(){try{const t=await e.index.request({url:`${o.URL||"http://127.0.0.1:8080"}/app/wx-payment/status/${this.orderInfo.orderNo}`,method:"GET",header:{Authorization:"Bearer "+e.index.getStorageSync("token"),Clientid:e.index.getStorageSync("client_id")}});if(200===t.statusCode&&200===t.data.code)return t.data.data;throw new Error("查询订单状态失败")}catch(t){return console.error("查询订单状态错误:",t),null}}}};const n=e._export_sfc(i,[["render",function(t,o,i,n,r,a){return{a:e.n(r.orderStatus.class),b:e.t(r.orderStatus.text),c:e.t(r.orderStatus.desc),d:e.t(r.orderInfo.orderNo||"-"),e:e.t(r.orderInfo.deviceNo||"-"),f:e.t(r.orderInfo.createTime||"-"),g:e.t(r.orderInfo.phone||"-"),h:e.t(r.orderInfo.deposit||"99.00"),i:e.t(r.packageInfo.price),j:e.t(r.packageInfo.time),k:e.t(a.totalAmount),l:e.t(a.totalAmount),m:e.o(((...e)=>a.handlePayment&&a.handlePayment(...e)))}}],["__scopeId","data-v-6af544c6"]]);wx.createPage(n);
diff --git a/unpackage/dist/build/mp-weixin/pages/order/payment.wxml b/unpackage/dist/build/mp-weixin/pages/order/payment.wxml
index 6bd6a42..e8ed910 100644
--- a/unpackage/dist/build/mp-weixin/pages/order/payment.wxml
+++ b/unpackage/dist/build/mp-weixin/pages/order/payment.wxml
@@ -1 +1 @@
-<view class="payment-container data-v-9930ec32"><view class="status-card data-v-9930ec32"><view class="{{['status-icon', 'data-v-9930ec32', a]}}"></view><view class="status-text data-v-9930ec32">{{b}}</view><view class="status-desc data-v-9930ec32">{{c}}</view></view><view class="order-card data-v-9930ec32"><view class="card-title data-v-9930ec32">订单信息</view><view class="info-item data-v-9930ec32"><text class="label data-v-9930ec32">订单号</text><text class="value data-v-9930ec32">{{d}}</text></view><view class="info-item data-v-9930ec32"><text class="label data-v-9930ec32">设备号</text><text class="value data-v-9930ec32">{{e}}</text></view><view class="info-item data-v-9930ec32"><text class="label data-v-9930ec32">创建时间</text><text class="value data-v-9930ec32">{{f}}</text></view><view class="info-item data-v-9930ec32"><text class="label data-v-9930ec32">联系电话</text><text class="value data-v-9930ec32">{{g}}</text></view></view><view class="price-card data-v-9930ec32"><view class="card-title data-v-9930ec32">费用信息</view><view class="price-item data-v-9930ec32"><text class="label data-v-9930ec32">押金</text><text class="value data-v-9930ec32">￥{{h}}</text></view><view class="price-item data-v-9930ec32"><text class="label data-v-9930ec32">套餐</text><text class="value data-v-9930ec32">{{i}}元/{{j}}小时</text></view><view class="price-item total data-v-9930ec32"><text class="label data-v-9930ec32">合计</text><text class="value data-v-9930ec32">￥{{k}}</text></view></view><view class="bottom-bar data-v-9930ec32"><view class="total-amount data-v-9930ec32"><text class="data-v-9930ec32">合计：</text><text class="amount data-v-9930ec32">￥{{l}}</text></view><view class="pay-btn data-v-9930ec32" bindtap="{{m}}">立即支付</view></view></view>
\ No newline at end of file
+<view class="payment-container data-v-6af544c6"><view class="status-card data-v-6af544c6"><view class="{{['status-icon', 'data-v-6af544c6', a]}}"></view><view class="status-text data-v-6af544c6">{{b}}</view><view class="status-desc data-v-6af544c6">{{c}}</view></view><view class="order-card data-v-6af544c6"><view class="card-title data-v-6af544c6">订单信息</view><view class="info-item data-v-6af544c6"><text class="label data-v-6af544c6">订单号</text><text class="value data-v-6af544c6">{{d}}</text></view><view class="info-item data-v-6af544c6"><text class="label data-v-6af544c6">设备号</text><text class="value data-v-6af544c6">{{e}}</text></view><view class="info-item data-v-6af544c6"><text class="label data-v-6af544c6">创建时间</text><text class="value data-v-6af544c6">{{f}}</text></view><view class="info-item data-v-6af544c6"><text class="label data-v-6af544c6">联系电话</text><text class="value data-v-6af544c6">{{g}}</text></view></view><view class="price-card data-v-6af544c6"><view class="card-title data-v-6af544c6">费用信息</view><view class="price-item data-v-6af544c6"><text class="label data-v-6af544c6">押金</text><text class="value data-v-6af544c6">￥{{h}}</text></view><view class="price-item data-v-6af544c6"><text class="label data-v-6af544c6">套餐</text><text class="value data-v-6af544c6">{{i}}元/{{j}}小时</text></view><view class="price-item total data-v-6af544c6"><text class="label data-v-6af544c6">合计</text><text class="value data-v-6af544c6">￥{{k}}</text></view></view><view class="bottom-bar data-v-6af544c6"><view class="total-amount data-v-6af544c6"><text class="data-v-6af544c6">合计：</text><text class="amount data-v-6af544c6">￥{{l}}</text></view><view class="pay-btn data-v-6af544c6" bindtap="{{m}}">立即支付</view></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/build/mp-weixin/pages/order/payment.wxss b/unpackage/dist/build/mp-weixin/pages/order/payment.wxss
index f615f06..5362368 100644
--- a/unpackage/dist/build/mp-weixin/pages/order/payment.wxss
+++ b/unpackage/dist/build/mp-weixin/pages/order/payment.wxss
@@ -1 +1 @@
-.payment-container.data-v-9930ec32{min-height:100vh;background:#f8f8f8;padding:30rpx 30rpx 180rpx;box-sizing:border-box}.payment-container .status-card.data-v-9930ec32{background:#fff;border-radius:24rpx;padding:40rpx 30rpx;margin-bottom:30rpx;display:flex;flex-direction:column;align-items:center;box-shadow:0 4rpx 16rpx rgba(0,0,0,.04)}.payment-container .status-card .status-icon.data-v-9930ec32{width:120rpx;height:120rpx;border-radius:50%;background:#f5f5f5;margin-bottom:20rpx}.payment-container .status-card .status-icon.waiting.data-v-9930ec32{background:#fff9c4}.payment-container .status-card .status-icon.success.data-v-9930ec32{background:#e8f5e9}.payment-container .status-card .status-icon.failed.data-v-9930ec32{background:#ffebee}.payment-container .status-card .status-text.data-v-9930ec32{font-size:36rpx;font-weight:600;color:#333;margin-bottom:10rpx}.payment-container .status-card .status-desc.data-v-9930ec32{font-size:28rpx;color:#999}.payment-container .order-card.data-v-9930ec32,.payment-container .price-card.data-v-9930ec32{background:#fff;border-radius:24rpx;padding:30rpx;margin-bottom:30rpx;box-shadow:0 4rpx 16rpx rgba(0,0,0,.04)}.payment-container .order-card .card-title.data-v-9930ec32,.payment-container .price-card .card-title.data-v-9930ec32{font-size:32rpx;font-weight:600;color:#333;margin-bottom:20rpx;position:relative;padding-left:20rpx}.payment-container .order-card .card-title.data-v-9930ec32:before,.payment-container .price-card .card-title.data-v-9930ec32:before{content:"";position:absolute;left:0;top:50%;transform:translateY(-50%);width:8rpx;height:32rpx;background:#1976d2;border-radius:4rpx}.payment-container .order-card .info-item.data-v-9930ec32,.payment-container .order-card .price-item.data-v-9930ec32,.payment-container .price-card .info-item.data-v-9930ec32,.payment-container .price-card .price-item.data-v-9930ec32{display:flex;justify-content:space-between;align-items:center;padding:20rpx 0;border-bottom:1px solid #f5f5f5}.payment-container .order-card .info-item.data-v-9930ec32:last-child,.payment-container .order-card .price-item.data-v-9930ec32:last-child,.payment-container .price-card .info-item.data-v-9930ec32:last-child,.payment-container .price-card .price-item.data-v-9930ec32:last-child{border-bottom:none}.payment-container .order-card .info-item .label.data-v-9930ec32,.payment-container .order-card .price-item .label.data-v-9930ec32,.payment-container .price-card .info-item .label.data-v-9930ec32,.payment-container .price-card .price-item .label.data-v-9930ec32{font-size:28rpx;color:#666}.payment-container .order-card .info-item .value.data-v-9930ec32,.payment-container .order-card .price-item .value.data-v-9930ec32,.payment-container .price-card .info-item .value.data-v-9930ec32,.payment-container .price-card .price-item .value.data-v-9930ec32{font-size:28rpx;color:#333}.payment-container .order-card .info-item.total.data-v-9930ec32,.payment-container .order-card .price-item.total.data-v-9930ec32,.payment-container .price-card .info-item.total.data-v-9930ec32,.payment-container .price-card .price-item.total.data-v-9930ec32{margin-top:10rpx;padding-top:30rpx;border-top:1px solid #f5f5f5}.payment-container .order-card .info-item.total .label.data-v-9930ec32,.payment-container .order-card .info-item.total .value.data-v-9930ec32,.payment-container .order-card .price-item.total .label.data-v-9930ec32,.payment-container .order-card .price-item.total .value.data-v-9930ec32,.payment-container .price-card .info-item.total .label.data-v-9930ec32,.payment-container .price-card .info-item.total .value.data-v-9930ec32,.payment-container .price-card .price-item.total .label.data-v-9930ec32,.payment-container .price-card .price-item.total .value.data-v-9930ec32{font-size:32rpx;font-weight:600;color:#333}.payment-container .order-card .info-item.total .value.data-v-9930ec32,.payment-container .order-card .price-item.total .value.data-v-9930ec32,.payment-container .price-card .info-item.total .value.data-v-9930ec32,.payment-container .price-card .price-item.total .value.data-v-9930ec32{color:#ff5722}.payment-container .wechat-tip.data-v-9930ec32{background:#fff;border-radius:24rpx;padding:30rpx;margin-bottom:30rpx;box-shadow:0 4rpx 16rpx rgba(0,0,0,.04);display:flex;align-items:center}.payment-container .wechat-tip .method-icon.data-v-9930ec32{width:48rpx;height:48rpx;margin-right:20rpx}.payment-container .wechat-tip .method-icon.wechat.data-v-9930ec32{background:url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNCAyNCI+PHBhdGggZmlsbD0iIzA3QzE2MCIgZD0iTTkuODI3MjcyNzMsMjQgQzkuODI3MjcyNzMsMjQgOS44MjcyNzI3MywyNCA5LjgyNzI3MjczLDI0IEw5LjgyNzI3MjczLDI0IEM3LjQxNzczMTYzLDI0IDQuOTUzMTgxODIsMjMuNTMxODE4MiA0Ljk1MzE4MTgyLDIzLjUzMTgxODIgQzQuOTUzMTgxODIsMjMuNTMxODE4MiAzLDIzLjExMzYzNjQgMS41LDIyLjIyNzI3MjcgQzEuNSwyMi4yMjcyNzI3IDAuOTU0NTQ1NDU1LDIyLjA4NjM2MzYgMS4wNDMxODE4MiwyMS41NDU0NTQ1IEMxLjEzMTgxODE4LDIxLjAwNDU0NTUgMS4zNjM2MzYzNiwyMC4yNSAxLjM2MzYzNjM2LDIwLjI1IEwyLjI1LDE3LjcyNzI3MjcgQzAuNDA5MDkwOTA5LDE2LjAyMjcyNzMgMCwxNC4wNDU0NTQ1IDAsMTIuODE4MTgxOCBDMCw4LjQ1NDU0NTQ1IDQuOTA5MDkwOTEsNC45MDkwOTA5MSA5LjgyNzI3MjczLDQuOTA5MDkwOTEgQzEzLjc0NTQ1NDUsNC45MDkwOTA5MSAxNy4xODE4MTgyLDcuMTA0NTQ1NDUgMTguNTQ1NDU0NSwxMC4yMjcyNzI3IEMxOS4wOTA5MDkxLDEwLjEzMTgxODIgMTkuNjM2MzYzNiwxMC4wOTA5MDkxIDIwLjE4MTgxODIsMTAuMDkwOTA5MSBDMjQuNTQ1NDU0NSwxMC4wOTA5MDkxIDI4LjA5MDkwOTEsMTMuMTgxODE4MiAyOC4wOTA5MDkxLDE2LjkwOTA5MDkgQzI4LjA5MDkwOTEsMTguODE4MTgxOCAyNi43MjcyNzI3LDIwLjU5MDkwOTEgMjQuNzI3MjcyNywyMS43MjcyNzI3IEwyNS4zNjM2MzY0LDIzLjU5MDkwOTEgQzI1LjM2MzYzNjQsMjMuNTkwOTA5MSAyNS41LDI0LjA0NTQ1NDUgMjUuNTkwOTA5MSwyNC40MDkwOTA5IEMyNS42ODE4MTgyLDI0Ljc3MjcyNzMgMjUuMzYzNjM2NCwyNC45NTQ1NDU1IDI1LjM2MzYzNjQsMjQuOTU0NTQ1NSBDMjQuMjcyNzI3MywyNS42MzYzNjM2IDIyLjcyNzI3MjcsMjYuMDQ1NDU0NSAyMi43MjcyNzI3LDI2LjA0NTQ1NDUgQzIyLjcyNzI3MjcsMjYuMDQ1NDU0NSAyMC43MjcyNzI3LDI2LjQ1NDU0NTUgMTguNzI3MjcyNywyNi40NTQ1NDU1IEMxNi43MjcyNzI3LDI2LjQ1NDU0NTUgMTQuNzI3MjcyNywyNi4wNDU0NTQ1IDE0LjcyNzI3MjcsMjYuMDQ1NDU0NSBDMTMuNjM2MzYzNiwyNS43NzI3MjczIDEyLjU0NTQ1NDUsMjUuNDA5MDkwOSAxMS41NDU0NTQ1LDI0Ljk1NDU0NTUgQzEwLjkwOTA5MDksMjQuNjgxODE4MiAxMC4zNjM2MzY0LDI0LjM2MzYzNjQgOS44MjcyNzI3MywyNCBaIE02LjEzNjM2MzY0LDExLjMxODE4MTggQzUuMDQ1NDU0NTUsMTEuMzE4MTgxOCA0LjE4MTgxODE4LDEyLjE4MTgxODIgNC4xODE4MTgxOCwxMy4yNzI3MjczIEM0LjE4MTgxODE4LDE0LjM2MzYzNjQgNS4wNDU0NTQ1NSwxNS4yMjcyNzI3IDYuMTM2MzYzNjQsMTUuMjI3MjcyNyBDNy4yMjcyNzI3MywxNS4yMjcyNzI3IDguMDkwOTA5MDksMTQuMzYzNjM2NCA4LjA5MDkwOTA5LDEzLjI3MjcyNzMgQzguMDkwOTA5MDksMTIuMTgxODE4MiA3LjIyNzI3MjczLDExLjMxODE4MTggNi4xMzYzNjM2NCwxMS4zMTgxODE4IFogTTEzLjUsMTEuMzE4MTgxOCBDMTIuNDA5MDkwOSwxMS4zMTgxODE4IDExLjU0NTQ1NDUsMTIuMTgxODE4MiAxMS41NDU0NTQ1LDEzLjI3MjcyNzMgQzExLjU0NTQ1NDUsMTQuMzYzNjM2NCAxMi40MDkwOTA5LDE1LjIyNzI3MjcgMTMuNSwxNS4yMjcyNzI3IEMxNC41OTA5MDkxLDE1LjIyNzI3MjcgMTUuNDU0NTQ1NSwxNC4zNjM2MzY0IDE1LjQ1NDU0NTUsMTMuMjcyNzI3MyBDMTUuNDU0NTQ1NSwxMi4xODE4MTgyIDE0LjU5MDkwOTEsMTEuMzE4MTgxOCAxMy41LDExLjMxODE4MTggWiBNMjAuMTgxODE4MiwxNi41IEMxOS4wOTA5MDkxLDE2LjUgMTguMjI3MjcyNywxNy4zNjM2MzY0IDE4LjIyNzI3MjcsMTguNDU0NTQ1NSBDMTguMjI3MjcyNywxOS41NDU0NTQ1IDE5LjA5MDkwOTEsMjAuNDA5MDkwOSAyMC4xODE4MTgyLDIwLjQwOTA5MDkgQzIxLjI3MjcyNzMsMjAuNDA5MDkwOSAyMi4xMzYzNjM2LDE5LjU0NTQ1NDUgMjIuMTM2MzYzNiwxOC40NTQ1NDU1IEMyMi4xMzYzNjM2LDE3LjM2MzYzNjQgMjEuMjcyNzI3MywxNi41IDIwLjE4MTgxODIsMTYuNSBaIE0yNS41LDE2LjUgQzI0LjQwOTA5MDksMTYuNSAyMy41NDU0NTQ1LDE3LjM2MzYzNjQgMjMuNTQ1NDU0NSwxOC40NTQ1NDU1IEMyMy41NDU0NTQ1LDE5LjU0NTQ1NDUgMjQuNDA5MDkwOSwyMC40MDkwOTA5IDI1LjUsMjAuNDA5MDkwOSBDMjYuNTkwOTA5MSwyMC40MDkwOTA5IDI3LjQ1NDU0NTUsMTkuNTQ1NDU0NSAyNy40NTQ1NDU1LDE4LjQ1NDU0NTUgQzI3LjQ1NDU0NTUsMTcuMzYzNjM2NCAyNi41OTA5MDkxLDE2LjUgMjUuNSwxNi41IFoiLz48L3N2Zz4=) no-repeat center/contain}.payment-container .wechat-tip .method-text.data-v-9930ec32{font-size:28rpx;color:#333;font-weight:500}.payment-container .bottom-bar.data-v-9930ec32{position:fixed;left:0;right:0;bottom:0;background:#fff;padding:20rpx 30rpx;padding-bottom:calc(20rpx + env(safe-area-inset-bottom));display:flex;align-items:center;justify-content:space-between;box-shadow:0 -4rpx 16rpx rgba(0,0,0,.04)}.payment-container .bottom-bar .total-amount.data-v-9930ec32{font-size:28rpx;color:#666}.payment-container .bottom-bar .total-amount .amount.data-v-9930ec32{font-size:36rpx;font-weight:600;color:#ff5722;margin-left:10rpx}.payment-container .bottom-bar .pay-btn.data-v-9930ec32{background:#1976d2;color:#fff;font-size:32rpx;font-weight:600;padding:20rpx 60rpx;border-radius:100rpx;border:none}.payment-container .bottom-bar .pay-btn.data-v-9930ec32:active{opacity:.9}
+.payment-container.data-v-6af544c6{min-height:100vh;background:#f8f8f8;padding:30rpx 30rpx 180rpx;box-sizing:border-box}.payment-container .status-card.data-v-6af544c6{background:#fff;border-radius:24rpx;padding:40rpx 30rpx;margin-bottom:30rpx;display:flex;flex-direction:column;align-items:center;box-shadow:0 4rpx 16rpx rgba(0,0,0,.04)}.payment-container .status-card .status-icon.data-v-6af544c6{width:120rpx;height:120rpx;border-radius:50%;background:#f5f5f5;margin-bottom:20rpx}.payment-container .status-card .status-icon.waiting.data-v-6af544c6{background:#fff9c4}.payment-container .status-card .status-icon.success.data-v-6af544c6{background:#e8f5e9}.payment-container .status-card .status-icon.failed.data-v-6af544c6{background:#ffebee}.payment-container .status-card .status-text.data-v-6af544c6{font-size:36rpx;font-weight:600;color:#333;margin-bottom:10rpx}.payment-container .status-card .status-desc.data-v-6af544c6{font-size:28rpx;color:#999}.payment-container .order-card.data-v-6af544c6,.payment-container .price-card.data-v-6af544c6{background:#fff;border-radius:24rpx;padding:30rpx;margin-bottom:30rpx;box-shadow:0 4rpx 16rpx rgba(0,0,0,.04)}.payment-container .order-card .card-title.data-v-6af544c6,.payment-container .price-card .card-title.data-v-6af544c6{font-size:32rpx;font-weight:600;color:#333;margin-bottom:20rpx;position:relative;padding-left:20rpx}.payment-container .order-card .card-title.data-v-6af544c6:before,.payment-container .price-card .card-title.data-v-6af544c6:before{content:"";position:absolute;left:0;top:50%;transform:translateY(-50%);width:8rpx;height:32rpx;background:#1976d2;border-radius:4rpx}.payment-container .order-card .info-item.data-v-6af544c6,.payment-container .order-card .price-item.data-v-6af544c6,.payment-container .price-card .info-item.data-v-6af544c6,.payment-container .price-card .price-item.data-v-6af544c6{display:flex;justify-content:space-between;align-items:center;padding:20rpx 0;border-bottom:1px solid #f5f5f5}.payment-container .order-card .info-item.data-v-6af544c6:last-child,.payment-container .order-card .price-item.data-v-6af544c6:last-child,.payment-container .price-card .info-item.data-v-6af544c6:last-child,.payment-container .price-card .price-item.data-v-6af544c6:last-child{border-bottom:none}.payment-container .order-card .info-item .label.data-v-6af544c6,.payment-container .order-card .price-item .label.data-v-6af544c6,.payment-container .price-card .info-item .label.data-v-6af544c6,.payment-container .price-card .price-item .label.data-v-6af544c6{font-size:28rpx;color:#666}.payment-container .order-card .info-item .value.data-v-6af544c6,.payment-container .order-card .price-item .value.data-v-6af544c6,.payment-container .price-card .info-item .value.data-v-6af544c6,.payment-container .price-card .price-item .value.data-v-6af544c6{font-size:28rpx;color:#333}.payment-container .order-card .info-item.total.data-v-6af544c6,.payment-container .order-card .price-item.total.data-v-6af544c6,.payment-container .price-card .info-item.total.data-v-6af544c6,.payment-container .price-card .price-item.total.data-v-6af544c6{margin-top:10rpx;padding-top:30rpx;border-top:1px solid #f5f5f5}.payment-container .order-card .info-item.total .label.data-v-6af544c6,.payment-container .order-card .info-item.total .value.data-v-6af544c6,.payment-container .order-card .price-item.total .label.data-v-6af544c6,.payment-container .order-card .price-item.total .value.data-v-6af544c6,.payment-container .price-card .info-item.total .label.data-v-6af544c6,.payment-container .price-card .info-item.total .value.data-v-6af544c6,.payment-container .price-card .price-item.total .label.data-v-6af544c6,.payment-container .price-card .price-item.total .value.data-v-6af544c6{font-size:32rpx;font-weight:600;color:#333}.payment-container .order-card .info-item.total .value.data-v-6af544c6,.payment-container .order-card .price-item.total .value.data-v-6af544c6,.payment-container .price-card .info-item.total .value.data-v-6af544c6,.payment-container .price-card .price-item.total .value.data-v-6af544c6{color:#ff5722}.payment-container .wechat-tip.data-v-6af544c6{background:#fff;border-radius:24rpx;padding:30rpx;margin-bottom:30rpx;box-shadow:0 4rpx 16rpx rgba(0,0,0,.04);display:flex;align-items:center}.payment-container .wechat-tip .method-icon.data-v-6af544c6{width:48rpx;height:48rpx;margin-right:20rpx}.payment-container .wechat-tip .method-icon.wechat.data-v-6af544c6{background:url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNCAyNCI+PHBhdGggZmlsbD0iIzA3QzE2MCIgZD0iTTkuODI3MjcyNzMsMjQgQzkuODI3MjcyNzMsMjQgOS44MjcyNzI3MywyNCA5LjgyNzI3MjczLDI0IEw5LjgyNzI3MjczLDI0IEM3LjQxNzczMTYzLDI0IDQuOTUzMTgxODIsMjMuNTMxODE4MiA0Ljk1MzE4MTgyLDIzLjUzMTgxODIgQzQuOTUzMTgxODIsMjMuNTMxODE4MiAzLDIzLjExMzYzNjQgMS41LDIyLjIyNzI3MjcgQzEuNSwyMi4yMjcyNzI3IDAuOTU0NTQ1NDU1LDIyLjA4NjM2MzYgMS4wNDMxODE4MiwyMS41NDU0NTQ1IEMxLjEzMTgxODE4LDIxLjAwNDU0NTUgMS4zNjM2MzYzNiwyMC4yNSAxLjM2MzYzNjM2LDIwLjI1IEwyLjI1LDE3LjcyNzI3MjcgQzAuNDA5MDkwOTA5LDE2LjAyMjcyNzMgMCwxNC4wNDU0NTQ1IDAsMTIuODE4MTgxOCBDMCw4LjQ1NDU0NTQ1IDQuOTA5MDkwOTEsNC45MDkwOTA5MSA5LjgyNzI3MjczLDQuOTA5MDkwOTEgQzEzLjc0NTQ1NDUsNC45MDkwOTA5MSAxNy4xODE4MTgyLDcuMTA0NTQ1NDUgMTguNTQ1NDU0NSwxMC4yMjcyNzI3IEMxOS4wOTA5MDkxLDEwLjEzMTgxODIgMTkuNjM2MzYzNiwxMC4wOTA5MDkxIDIwLjE4MTgxODIsMTAuMDkwOTA5MSBDMjQuNTQ1NDU0NSwxMC4wOTA5MDkxIDI4LjA5MDkwOTEsMTMuMTgxODE4MiAyOC4wOTA5MDkxLDE2LjkwOTA5MDkgQzI4LjA5MDkwOTEsMTguODE4MTgxOCAyNi43MjcyNzI3LDIwLjU5MDkwOTEgMjQuNzI3MjcyNywyMS43MjcyNzI3IEwyNS4zNjM2MzY0LDIzLjU5MDkwOTEgQzI1LjM2MzYzNjQsMjMuNTkwOTA5MSAyNS41LDI0LjA0NTQ1NDUgMjUuNTkwOTA5MSwyNC40MDkwOTA5IEMyNS42ODE4MTgyLDI0Ljc3MjcyNzMgMjUuMzYzNjM2NCwyNC45NTQ1NDU1IDI1LjM2MzYzNjQsMjQuOTU0NTQ1NSBDMjQuMjcyNzI3MywyNS42MzYzNjM2IDIyLjcyNzI3MjcsMjYuMDQ1NDU0NSAyMi43MjcyNzI3LDI2LjA0NTQ1NDUgQzIyLjcyNzI3MjcsMjYuMDQ1NDU0NSAyMC43MjcyNzI3LDI2LjQ1NDU0NTUgMTguNzI3MjcyNywyNi40NTQ1NDU1IEMxNi43MjcyNzI3LDI2LjQ1NDU0NTUgMTQuNzI3MjcyNywyNi4wNDU0NTQ1IDE0LjcyNzI3MjcsMjYuMDQ1NDU0NSBDMTMuNjM2MzYzNiwyNS43NzI3MjczIDEyLjU0NTQ1NDUsMjUuNDA5MDkwOSAxMS41NDU0NTQ1LDI0Ljk1NDU0NTUgQzEwLjkwOTA5MDksMjQuNjgxODE4MiAxMC4zNjM2MzY0LDI0LjM2MzYzNjQgOS44MjcyNzI3MywyNCBaIE02LjEzNjM2MzY0LDExLjMxODE4MTggQzUuMDQ1NDU0NTUsMTEuMzE4MTgxOCA0LjE4MTgxODE4LDEyLjE4MTgxODIgNC4xODE4MTgxOCwxMy4yNzI3MjczIEM0LjE4MTgxODE4LDE0LjM2MzYzNjQgNS4wNDU0NTQ1NSwxNS4yMjcyNzI3IDYuMTM2MzYzNjQsMTUuMjI3MjcyNyBDNy4yMjcyNzI3MywxNS4yMjcyNzI3IDguMDkwOTA5MDksMTQuMzYzNjM2NCA4LjA5MDkwOTA5LDEzLjI3MjcyNzMgQzguMDkwOTA5MDksMTIuMTgxODE4MiA3LjIyNzI3MjczLDExLjMxODE4MTggNi4xMzYzNjM2NCwxMS4zMTgxODE4IFogTTEzLjUsMTEuMzE4MTgxOCBDMTIuNDA5MDkwOSwxMS4zMTgxODE4IDExLjU0NTQ1NDUsMTIuMTgxODE4MiAxMS41NDU0NTQ1LDEzLjI3MjcyNzMgQzExLjU0NTQ1NDUsMTQuMzYzNjM2NCAxMi40MDkwOTA5LDE1LjIyNzI3MjcgMTMuNSwxNS4yMjcyNzI3IEMxNC41OTA5MDkxLDE1LjIyNzI3MjcgMTUuNDU0NTQ1NSwxNC4zNjM2MzY0IDE1LjQ1NDU0NTUsMTMuMjcyNzI3MyBDMTUuNDU0NTQ1NSwxMi4xODE4MTgyIDE0LjU5MDkwOTEsMTEuMzE4MTgxOCAxMy41LDExLjMxODE4MTggWiBNMjAuMTgxODE4MiwxNi41IEMxOS4wOTA5MDkxLDE2LjUgMTguMjI3MjcyNywxNy4zNjM2MzY0IDE4LjIyNzI3MjcsMTguNDU0NTQ1NSBDMTguMjI3MjcyNywxOS41NDU0NTQ1IDE5LjA5MDkwOTEsMjAuNDA5MDkwOSAyMC4xODE4MTgyLDIwLjQwOTA5MDkgQzIxLjI3MjcyNzMsMjAuNDA5MDkwOSAyMi4xMzYzNjM2LDE5LjU0NTQ1NDUgMjIuMTM2MzYzNiwxOC40NTQ1NDU1IEMyMi4xMzYzNjM2LDE3LjM2MzYzNjQgMjEuMjcyNzI3MywxNi41IDIwLjE4MTgxODIsMTYuNSBaIE0yNS41LDE2LjUgQzI0LjQwOTA5MDksMTYuNSAyMy41NDU0NTQ1LDE3LjM2MzYzNjQgMjMuNTQ1NDU0NSwxOC40NTQ1NDU1IEMyMy41NDU0NTQ1LDE5LjU0NTQ1NDUgMjQuNDA5MDkwOSwyMC40MDkwOTA5IDI1LjUsMjAuNDA5MDkwOSBDMjYuNTkwOTA5MSwyMC40MDkwOTA5IDI3LjQ1NDU0NTUsMTkuNTQ1NDU0NSAyNy40NTQ1NDU1LDE4LjQ1NDU0NTUgQzI3LjQ1NDU0NTUsMTcuMzYzNjM2NCAyNi41OTA5MDkxLDE2LjUgMjUuNSwxNi41IFoiLz48L3N2Zz4=) no-repeat center/contain}.payment-container .wechat-tip .method-text.data-v-6af544c6{font-size:28rpx;color:#333;font-weight:500}.payment-container .bottom-bar.data-v-6af544c6{position:fixed;left:0;right:0;bottom:0;background:#fff;padding:20rpx 30rpx;padding-bottom:calc(20rpx + env(safe-area-inset-bottom));display:flex;align-items:center;justify-content:space-between;box-shadow:0 -4rpx 16rpx rgba(0,0,0,.04)}.payment-container .bottom-bar .total-amount.data-v-6af544c6{font-size:28rpx;color:#666}.payment-container .bottom-bar .total-amount .amount.data-v-6af544c6{font-size:36rpx;font-weight:600;color:#ff5722;margin-left:10rpx}.payment-container .bottom-bar .pay-btn.data-v-6af544c6{background:#1976d2;color:#fff;font-size:32rpx;font-weight:600;padding:20rpx 60rpx;border-radius:100rpx;border:none}.payment-container .bottom-bar .pay-btn.data-v-6af544c6:active{opacity:.9}
diff --git a/unpackage/dist/build/mp-weixin/pages/return/index.js b/unpackage/dist/build/mp-weixin/pages/return/index.js
index fc2b1db..b3e74ff 100644
--- a/unpackage/dist/build/mp-weixin/pages/return/index.js
+++ b/unpackage/dist/build/mp-weixin/pages/return/index.js
@@ -1 +1 @@
-"use strict";const e=require("../../common/vendor.js"),r=require("../../config/user.js"),t=require("../../config/url.js"),o=require("../../common/assets.js"),s={data:()=>({deviceId:"",orderInfo:{orderId:"",startTime:"",_rawStartTime:"",usedTime:"0分钟",currentFee:"0.00",orderStatus:"in_used",payWay:""},timer:null,statusCheckTimer:null,maxStatusChecks:30,currentStatusChecks:0,statusCheckInterval:5e3,isPageActive:!1}),onLoad(r){if(console.log("Return page loaded with options:",JSON.stringify(r)),this.isPageActive=!0,this.orderInfo.orderId=r.orderId||"",this.deviceId=r.deviceNo||r.deviceId||"",console.log(`初始化参数: orderId=${this.orderInfo.orderId}, deviceId=${this.deviceId}`),!this.orderInfo.orderId&&this.deviceId)this.getOrderByDevice();else if(this.orderInfo.orderId){this.getOrderDetails(),this.startTimer(),this.startStatusCheckTimer(),e.index.setStorageSync("activeOrderId",this.orderInfo.orderId);try{this.$orderMonitor?(this.$orderMonitor.removeOrder({orderId:this.orderInfo.orderId}),this.$orderMonitor.addOrder({orderId:this.orderInfo.orderId},"return"),console.log("订单已添加到监控队列:",this.orderInfo.orderId)):console.warn("$orderMonitor 未定义，无法添加订单到监控队列")}catch(t){console.error("添加订单到监控队列失败:",t)}}else e.index.showToast({title:"缺少订单信息",icon:"none"}),setTimeout((()=>{this.goToHome()}),1500);e.index.$on("orderCompleted",this.handleOrderCompleted)},onHide(){console.log("归还页面隐藏，清理计时器资源和监控服务"),this.isPageActive=!1,this.clearTimer(),this.clearStatusCheckTimer(),this.removeFromOrderMonitor()},onUnload(){console.log("归还页面卸载，清理所有资源"),this.isPageActive=!1,this.clearTimer(),this.clearStatusCheckTimer(),this.removeFromOrderMonitor(),e.index.$off("orderCompleted",this.handleOrderCompleted)},methods:{removeFromOrderMonitor(){if(this.orderInfo.orderId&&this.$orderMonitor)try{this.$orderMonitor.removeOrder({orderId:this.orderInfo.orderId}),console.log("订单已从监控队列移除:",this.orderInfo.orderId)}catch(e){console.error("从监控队列移除订单失败:",e)}},handleOrderCompleted(e){console.log("收到订单完成事件:",e),e.orderId!==this.orderInfo.orderId&&e.orderNo!==this.orderInfo.orderNo||this.showReturnSuccessModal(e)},showReturnSuccessModal(r){this.clearTimer(),this.clearStatusCheckTimer(),e.index.showModal({title:"归还成功",content:"风扇已归还成功，剩余押金将退还到您的账户",confirmText:"查看详情",success:t=>{t.confirm?e.index.redirectTo({url:`/pages/order/return-success?orderId=${r.orderId||this.orderInfo.orderId}`}):e.index.reLaunch({url:"/pages/index/index"})}})},getOrderStatusText(){return{waiting_for_payment:"待支付",payment_in_progress:"支付中",payment_successful:"支付成功",in_used:"使用中",payment_failed:"支付失败",order_cancelled:"订单取消",used_done:"订单完成",used_down:"订单完成"}[this.orderInfo.orderStatus]||"使用中"},async getOrderDetails(){if(this.isPageActive)try{if(!this.orderInfo.orderId)throw new Error("订单ID不能为空");console.log("请求订单详情, orderId:",this.orderInfo.orderId);const t=await r.queryById(this.orderInfo.orderId);if(console.log("订单详情结果:",JSON.stringify(t)),200!==t.code||!t.data)throw new Error(t.msg||"获取订单详情失败");{const r=t.data;if(console.log("订单原始数据:",r),console.log("开始时间字段:",r.startTime,typeof r.startTime),r.orderStatus&&(this.orderInfo.orderStatus=r.orderStatus),r.payWay&&(this.orderInfo.payWay=r.payWay),r.orderStatus&&("used_done"===r.orderStatus||"used_down"===r.orderStatus))return e.index.$emit("orderCompleted",r),void this.showReturnSuccessModal(r);this.updateOrderInfo(r),console.log("更新后的开始时间:",this.orderInfo.startTime)}}catch(t){console.error("获取订单详情错误:",t),e.index.showToast({title:t.message||"获取订单信息失败",icon:"none"}),setTimeout((()=>{this.goToHome()}),1500)}finally{e.index.hideLoading()}else console.log("页面已不活跃，跳过订单详情请求")},formatTime:e=>`${e.getFullYear()}-${(e.getMonth()+1).toString().padStart(2,"0")}-${e.getDate().toString().padStart(2,"0")} ${e.getHours().toString().padStart(2,"0")}:${e.getMinutes().toString().padStart(2,"0")}`,updateOrderInfo(e){if(console.log("更新订单信息:",JSON.stringify(e)),this.orderInfo.usedTime=e.usedTime||"0分钟",this.orderInfo.currentFee=e.currentFee||e.actualDeviceAmount||e.payAmount||"0.00",e.orderStatus&&(this.orderInfo.orderStatus=e.orderStatus),e.payWay&&(this.orderInfo.payWay=e.payWay),this.orderInfo._rawStartTime=e.startTime,e.startTime)try{console.log("API返回的开始时间:",e.startTime),this.orderInfo.startTime=e.startTime}catch(r){console.error("更新开始时间错误:",r),this.orderInfo.startTime="未知"}else console.warn("API返回的订单数据中没有startTime字段"),e.createTime?(console.log("使用createTime作为备选:",e.createTime),this.orderInfo.startTime=e.createTime):this.orderInfo.startTime="未知";e.deviceNo&&!this.deviceId&&(this.deviceId=e.deviceNo)},startTimer(){this.clearTimer(),this.timer=setInterval((()=>{this.isPageActive?(console.log("执行定时更新订单信息"),this.getOrderDetails()):(console.log("页面已不活跃，停止计时器"),this.clearTimer())}),6e4),console.log("已启动使用时长更新计时器")},clearTimer(){this.timer&&(clearInterval(this.timer),this.timer=null,console.log("已清除使用时长更新计时器"))},clearStatusCheckTimer(){this.statusCheckTimer&&(clearInterval(this.statusCheckTimer),this.statusCheckTimer=null,console.log("已清除归还状态检查计时器"))},startStatusCheckTimer(){this.currentStatusChecks=0,this.clearStatusCheckTimer(),this.statusCheckTimer=setInterval((()=>{this.isPageActive?(this.currentStatusChecks++,console.log(`执行归还状态检查 (${this.currentStatusChecks}/${this.maxStatusChecks})`),this.checkReturnStatus(),this.currentStatusChecks>=this.maxStatusChecks&&(this.clearStatusCheckTimer(),e.index.showToast({title:"请手动刷新查看归还状态",icon:"none",duration:3e3}))):(console.log("页面已不活跃，停止状态检查计时器"),this.clearStatusCheckTimer())}),this.statusCheckInterval),console.log("已启动归还状态检查计时器")},async getOrderByDevice(){try{if(!this.deviceId)throw new Error("设备号不能为空");const r=await e.index.request({url:`${t.URL||"http://127.0.0.1:8080"}/app/order/inUse`,method:"GET",header:{Authorization:"Bearer "+e.index.getStorageSync("token"),Clientid:e.index.getStorageSync("client_id")}});if(console.log("通过设备号查询订单结果:",JSON.stringify(r)),200!==r.statusCode||200!==r.data.code||!r.data.data)throw new Error("未找到使用中的订单");{const e=r.data.data;console.log("使用中的订单:",e),this.orderInfo.orderId=e.orderId,e.orderStatus&&(this.orderInfo.orderStatus=e.orderStatus),e.payWay&&(this.orderInfo.payWay=e.payWay),e.startTime&&(console.log("inUse API返回的开始时间:",e.startTime),this.orderInfo.startTime=e.startTime),this.getOrderDetails(),this.startTimer(),this.startStatusCheckTimer()}}catch(r){console.error("通过设备号查询订单失败:",r),e.index.showToast({title:r.message||"获取订单信息失败",icon:"none"}),setTimeout((()=>{this.goToHome()}),1500)}finally{e.index.hideLoading()}},async checkReturnStatus(){try{this.isPageActive&&await this.getOrderDetails()}catch(e){console.error("检查归还状态失败:",e)}},goToHome(){e.index.reLaunch({url:"/pages/index/index"})}}};const i=e._export_sfc(s,[["render",function(r,t,s,i,d,a){return e.e({a:e.t(a.getOrderStatusText()),b:e.t(d.orderInfo.orderId),c:e.t(d.deviceId),d:"wx_score_pay"==d.orderInfo.payWay},"wx_score_pay"==d.orderInfo.payWay?{e:o._imports_0$2}:{},{f:e.t(d.orderInfo.startTime),g:e.t(d.orderInfo.usedTime),h:e.t(d.orderInfo.currentFee)},{},{l:e.o(((...e)=>a.checkReturnStatus&&a.checkReturnStatus(...e))),m:e.o(((...e)=>a.goToHome&&a.goToHome(...e)))})}],["__scopeId","data-v-571550e1"]]);wx.createPage(i);
+"use strict";const e=require("../../common/vendor.js"),r=require("../../config/user.js"),t=require("../../config/url.js"),o=require("../../common/assets.js"),s={data:()=>({deviceId:"",orderInfo:{orderId:"",startTime:"",_rawStartTime:"",usedTime:"0分钟",currentFee:"0.00",orderStatus:"in_used",payWay:"",orderNo:""},timer:null,statusCheckTimer:null,maxStatusChecks:30,currentStatusChecks:0,statusCheckInterval:5e3,isPageActive:!1}),onLoad(r){if(console.log("Return page loaded with options:",JSON.stringify(r)),this.isPageActive=!0,this.orderInfo.orderId=r.orderId||"",this.deviceId=r.deviceNo||r.deviceId||"",console.log(`初始化参数: orderId=${this.orderInfo.orderId}, deviceId=${this.deviceId}`),!this.orderInfo.orderId&&this.deviceId)this.getOrderByDevice();else if(this.orderInfo.orderId){this.getOrderDetails(),this.startTimer(),this.startStatusCheckTimer(),e.index.setStorageSync("activeOrderId",this.orderInfo.orderId);try{this.$orderMonitor?(this.$orderMonitor.removeOrder({orderId:this.orderInfo.orderId}),this.$orderMonitor.addOrder({orderId:this.orderInfo.orderId},"return"),console.log("订单已添加到监控队列:",this.orderInfo.orderId)):console.warn("$orderMonitor 未定义，无法添加订单到监控队列")}catch(t){console.error("添加订单到监控队列失败:",t)}}else e.index.showToast({title:"缺少订单信息",icon:"none"}),setTimeout((()=>{this.goToHome()}),1500);e.index.$on("orderCompleted",this.handleOrderCompleted)},onHide(){console.log("归还页面隐藏，清理计时器资源和监控服务"),this.isPageActive=!1,this.clearTimer(),this.clearStatusCheckTimer(),this.removeFromOrderMonitor()},onUnload(){console.log("归还页面卸载，清理所有资源"),this.isPageActive=!1,this.clearTimer(),this.clearStatusCheckTimer(),this.removeFromOrderMonitor(),e.index.$off("orderCompleted",this.handleOrderCompleted)},methods:{removeFromOrderMonitor(){if(this.orderInfo.orderId&&this.$orderMonitor)try{this.$orderMonitor.removeOrder({orderId:this.orderInfo.orderId}),console.log("订单已从监控队列移除:",this.orderInfo.orderId)}catch(e){console.error("从监控队列移除订单失败:",e)}},handleOrderCompleted(e){console.log("收到订单完成事件:",e),e.orderId!==this.orderInfo.orderId&&e.orderNo!==this.orderInfo.orderNo||this.showReturnSuccessModal(e)},showReturnSuccessModal(r){this.clearTimer(),this.clearStatusCheckTimer(),e.index.showModal({title:"归还成功",content:"风扇已归还成功，剩余押金将退还到您的账户",confirmText:"查看详情",success:t=>{t.confirm?e.index.redirectTo({url:`/pages/order/return-success?orderId=${r.orderId||this.orderInfo.orderId}`}):e.index.reLaunch({url:"/pages/index/index"})}})},getOrderStatusText(){return{waiting_for_payment:"待支付",payment_in_progress:"支付中",payment_successful:"支付成功",in_used:"使用中",payment_failed:"支付失败",order_cancelled:"订单取消",used_done:"订单完成",used_down:"订单完成"}[this.orderInfo.orderStatus]||"使用中"},async getOrderDetails(){if(this.isPageActive)try{if(!this.orderInfo.orderId)throw new Error("订单ID不能为空");const t=await r.queryById(this.orderInfo.orderId);if(200!==t.code||!t.data)throw new Error(t.msg||"获取订单详情失败");{const r=t.data;if(console.log("订单原始数据:",r),console.log("开始时间字段:",r.startTime,typeof r.startTime),r.orderStatus&&(this.orderInfo.orderStatus=r.orderStatus),r.payWay&&(this.orderInfo.payWay=r.payWay),r.orderStatus&&("used_done"===r.orderStatus||"used_down"===r.orderStatus))return e.index.$emit("orderCompleted",r),void this.showReturnSuccessModal(r);this.updateOrderInfo(r),console.log("更新后的开始时间:",this.orderInfo.startTime)}}catch(t){console.error("获取订单详情错误:",t),e.index.showToast({title:t.message||"获取订单信息失败",icon:"none"}),setTimeout((()=>{this.goToHome()}),1500)}finally{e.index.hideLoading()}else console.log("页面已不活跃，跳过订单详情请求")},formatTime:e=>`${e.getFullYear()}-${(e.getMonth()+1).toString().padStart(2,"0")}-${e.getDate().toString().padStart(2,"0")} ${e.getHours().toString().padStart(2,"0")}:${e.getMinutes().toString().padStart(2,"0")}`,updateOrderInfo(e){if(this.orderInfo.usedTime=e.usedTime||"0分钟",this.orderInfo.currentFee=e.currentFee||e.actualDeviceAmount||e.payAmount||"0.00",e.orderStatus&&(this.orderInfo.orderStatus=e.orderStatus),e.payWay&&(this.orderInfo.payWay=e.payWay),this.orderInfo._rawStartTime=e.startTime,e.startTime)try{console.log("API返回的开始时间:",e.startTime),this.orderInfo.startTime=e.startTime}catch(r){console.error("更新开始时间错误:",r),this.orderInfo.startTime="未知"}else console.warn("API返回的订单数据中没有startTime字段"),e.createTime?(console.log("使用createTime作为备选:",e.createTime),this.orderInfo.startTime=e.createTime):this.orderInfo.startTime="未知";e.orderNo&&(this.orderInfo.orderNo=e.orderNo),e.deviceNo&&!this.deviceId&&(this.deviceId=e.deviceNo)},startTimer(){this.clearTimer(),this.timer=setInterval((()=>{this.isPageActive?(console.log("执行定时更新订单信息"),this.getOrderDetails()):(console.log("页面已不活跃，停止计时器"),this.clearTimer())}),6e4),console.log("已启动使用时长更新计时器")},clearTimer(){this.timer&&(clearInterval(this.timer),this.timer=null,console.log("已清除使用时长更新计时器"))},clearStatusCheckTimer(){this.statusCheckTimer&&(clearInterval(this.statusCheckTimer),this.statusCheckTimer=null,console.log("已清除归还状态检查计时器"))},startStatusCheckTimer(){this.currentStatusChecks=0,this.clearStatusCheckTimer(),this.statusCheckTimer=setInterval((()=>{this.isPageActive?(this.currentStatusChecks++,console.log(`执行归还状态检查 (${this.currentStatusChecks}/${this.maxStatusChecks})`),this.checkReturnStatus(),this.currentStatusChecks>=this.maxStatusChecks&&(this.clearStatusCheckTimer(),e.index.showToast({title:"请手动刷新查看归还状态",icon:"none",duration:3e3}))):(console.log("页面已不活跃，停止状态检查计时器"),this.clearStatusCheckTimer())}),this.statusCheckInterval),console.log("已启动归还状态检查计时器")},async getOrderByDevice(){try{if(!this.deviceId)throw new Error("设备号不能为空");const r=await e.index.request({url:`${t.URL||"http://127.0.0.1:8080"}/app/order/inUse`,method:"GET",header:{Authorization:"Bearer "+e.index.getStorageSync("token"),Clientid:e.index.getStorageSync("client_id")}});if(console.log("通过设备号查询订单结果:",JSON.stringify(r)),200!==r.statusCode||200!==r.data.code||!r.data.data)throw new Error("未找到使用中的订单");{const e=r.data.data;console.log("使用中的订单:",e),this.orderInfo.orderId=e.orderId,e.orderStatus&&(this.orderInfo.orderStatus=e.orderStatus),e.payWay&&(this.orderInfo.payWay=e.payWay),e.startTime&&(console.log("inUse API返回的开始时间:",e.startTime),this.orderInfo.startTime=e.startTime),this.getOrderDetails(),this.startTimer(),this.startStatusCheckTimer()}}catch(r){console.error("通过设备号查询订单失败:",r),e.index.showToast({title:r.message||"获取订单信息失败",icon:"none"}),setTimeout((()=>{this.goToHome()}),1500)}finally{e.index.hideLoading()}},async checkReturnStatus(){try{this.isPageActive&&await this.getOrderDetails()}catch(e){console.error("检查归还状态失败:",e)}},goToHome(){e.index.reLaunch({url:"/pages/index/index"})}}};const i=e._export_sfc(s,[["render",function(r,t,s,i,d,a){return e.e({a:e.t(a.getOrderStatusText()),b:e.t(d.orderInfo.orderNo),c:e.t(d.deviceId),d:"wx_score_pay"==d.orderInfo.payWay},"wx_score_pay"==d.orderInfo.payWay?{e:o._imports_0$2}:{},{f:e.t(d.orderInfo.startTime),g:e.t(d.orderInfo.usedTime),h:e.t(d.orderInfo.currentFee)},{},{l:e.o(((...e)=>a.checkReturnStatus&&a.checkReturnStatus(...e))),m:e.o(((...e)=>a.goToHome&&a.goToHome(...e)))})}],["__scopeId","data-v-30d62b50"]]);wx.createPage(i);
diff --git a/unpackage/dist/build/mp-weixin/pages/return/index.wxml b/unpackage/dist/build/mp-weixin/pages/return/index.wxml
index 0b9d8c3..69f9cde 100644
--- a/unpackage/dist/build/mp-weixin/pages/return/index.wxml
+++ b/unpackage/dist/build/mp-weixin/pages/return/index.wxml
@@ -1 +1 @@
-<view class="return-container data-v-571550e1"><view class="order-card data-v-571550e1"><view class="order-header data-v-571550e1"><text class="title data-v-571550e1">{{a}}</text><text class="order-no data-v-571550e1">订单号：{{b}}</text></view><view class="device-info data-v-571550e1"><view class="device-left data-v-571550e1"><view class="device-name data-v-571550e1">共享风扇</view><view class="device-id data-v-571550e1">设备号：{{c}}</view></view><view class="device-right data-v-571550e1"><view wx:if="{{d}}" class="payment-badge wx-score data-v-571550e1"><image src="{{e}}" mode="aspectFit" class="badge-icon data-v-571550e1"></image><view class="badge-text data-v-571550e1"><text class="data-v-571550e1">微信支付分</text><text class="divider data-v-571550e1">|</text><text class="highlight data-v-571550e1">免押租借</text></view></view><view wx:else class="payment-badge deposit data-v-571550e1"><text class="badge-text data-v-571550e1">押金租借</text></view></view></view><view class="time-info data-v-571550e1"><view class="time-item data-v-571550e1"><text class="label data-v-571550e1">开始时间</text><text class="value data-v-571550e1">{{f}}</text></view><view class="time-item data-v-571550e1"><text class="label data-v-571550e1">已使用时长</text><text class="value highlight data-v-571550e1">{{g}}</text></view><view class="time-item data-v-571550e1"><text class="label data-v-571550e1">当前费用</text><text class="value data-v-571550e1">￥{{h}}</text></view></view><view wx:if="{{false}}" class="debug-info data-v-571550e1"><view class="debug-title data-v-571550e1">调试信息</view><view class="debug-item data-v-571550e1">原始开始时间: {{i}}</view><view class="debug-item data-v-571550e1">处理后开始时间: {{j}}</view><view class="debug-item data-v-571550e1">订单状态: {{k}}</view></view></view><view class="notice-card data-v-571550e1"><view class="notice-title data-v-571550e1">归还说明</view><view class="notice-list data-v-571550e1"><view class="notice-item data-v-571550e1"><view class="dot data-v-571550e1"></view><text class="data-v-571550e1">请确保设备完好无损</text></view><view class="notice-item data-v-571550e1"><view class="dot data-v-571550e1"></view><text class="data-v-571550e1">将风扇插入原位置或空闲插口</text></view><view class="notice-item data-v-571550e1"><view class="dot data-v-571550e1"></view><text class="data-v-571550e1">系统将自动检测归还并处理退款</text></view><view class="notice-item data-v-571550e1"><view class="dot data-v-571550e1"></view><text class="data-v-571550e1">归还成功后将自动跳转到成功页面</text></view></view></view><view class="bottom-bar data-v-571550e1"><view class="action-item secondary data-v-571550e1" bindtap="{{l}}">刷新状态</view><view class="action-item primary data-v-571550e1" bindtap="{{m}}">返回首页</view></view></view>
\ No newline at end of file
+<view class="return-container data-v-30d62b50"><view class="order-card data-v-30d62b50"><view class="order-header data-v-30d62b50"><text class="title data-v-30d62b50">{{a}}</text><text class="order-no data-v-30d62b50">订单号：{{b}}</text></view><view class="device-info data-v-30d62b50"><view class="device-left data-v-30d62b50"><view class="device-name data-v-30d62b50">共享风扇</view><view class="device-id data-v-30d62b50">设备号：{{c}}</view></view><view class="device-right data-v-30d62b50"><view wx:if="{{d}}" class="payment-badge wx-score data-v-30d62b50"><image src="{{e}}" mode="aspectFit" class="badge-icon data-v-30d62b50"></image><view class="badge-text data-v-30d62b50"><text class="data-v-30d62b50">微信支付分</text><text class="divider data-v-30d62b50">|</text><text class="highlight data-v-30d62b50">免押租借</text></view></view><view wx:else class="payment-badge deposit data-v-30d62b50"><text class="badge-text data-v-30d62b50">押金租借</text></view></view></view><view class="time-info data-v-30d62b50"><view class="time-item data-v-30d62b50"><text class="label data-v-30d62b50">开始时间</text><text class="value data-v-30d62b50">{{f}}</text></view><view class="time-item data-v-30d62b50"><text class="label data-v-30d62b50">已使用时长</text><text class="value highlight data-v-30d62b50">{{g}}</text></view><view class="time-item data-v-30d62b50"><text class="label data-v-30d62b50">当前费用</text><text class="value data-v-30d62b50">￥{{h}}</text></view></view><view wx:if="{{false}}" class="debug-info data-v-30d62b50"><view class="debug-title data-v-30d62b50">调试信息</view><view class="debug-item data-v-30d62b50">原始开始时间: {{i}}</view><view class="debug-item data-v-30d62b50">处理后开始时间: {{j}}</view><view class="debug-item data-v-30d62b50">订单状态: {{k}}</view></view></view><view class="notice-card data-v-30d62b50"><view class="notice-title data-v-30d62b50">归还说明</view><view class="notice-list data-v-30d62b50"><view class="notice-item data-v-30d62b50"><view class="dot data-v-30d62b50"></view><text class="data-v-30d62b50">请确保设备完好无损</text></view><view class="notice-item data-v-30d62b50"><view class="dot data-v-30d62b50"></view><text class="data-v-30d62b50">将风扇插入原位置或空闲插口</text></view><view class="notice-item data-v-30d62b50"><view class="dot data-v-30d62b50"></view><text class="data-v-30d62b50">系统将自动检测归还并处理退款</text></view><view class="notice-item data-v-30d62b50"><view class="dot data-v-30d62b50"></view><text class="data-v-30d62b50">归还成功后将自动跳转到成功页面</text></view></view></view><view class="bottom-bar data-v-30d62b50"><view class="action-item secondary data-v-30d62b50" bindtap="{{l}}">刷新状态</view><view class="action-item primary data-v-30d62b50" bindtap="{{m}}">返回首页</view></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/build/mp-weixin/pages/return/index.wxss b/unpackage/dist/build/mp-weixin/pages/return/index.wxss
index cb5216a..4c6fd9e 100644
--- a/unpackage/dist/build/mp-weixin/pages/return/index.wxss
+++ b/unpackage/dist/build/mp-weixin/pages/return/index.wxss
@@ -1 +1 @@
-.return-container.data-v-571550e1{min-height:100vh;background:#f7f8fa;padding:30rpx 30rpx 180rpx;box-sizing:border-box}.return-container .order-card.data-v-571550e1{background:#fff;border-radius:20rpx;padding:30rpx;margin-bottom:30rpx;box-shadow:0 4rpx 16rpx rgba(0,0,0,.04)}.return-container .order-card .order-header.data-v-571550e1{display:flex;justify-content:space-between;align-items:center;margin-bottom:20rpx;padding-bottom:16rpx;border-bottom:1rpx solid #f0f0f0}.return-container .order-card .order-header .title.data-v-571550e1{font-size:30rpx;font-weight:700;color:#333}.return-container .order-card .order-header .order-no.data-v-571550e1{font-size:24rpx;color:#999}.return-container .order-card .device-info.data-v-571550e1{margin-bottom:24rpx;display:flex;justify-content:space-between;align-items:flex-start}.return-container .order-card .device-info .device-left.data-v-571550e1{flex:1;margin-right:20rpx}.return-container .order-card .device-info .device-left .device-name.data-v-571550e1{font-size:32rpx;font-weight:500;color:#333;margin-bottom:8rpx}.return-container .order-card .device-info .device-left .device-id.data-v-571550e1{font-size:26rpx;color:#999;margin-bottom:0}.return-container .order-card .device-info .device-right .payment-badge.data-v-571550e1{display:inline-flex;align-items:center;padding:6rpx 12rpx;border-radius:8rpx;white-space:nowrap}.return-container .order-card .device-info .device-right .payment-badge.wx-score.data-v-571550e1{background:rgba(7,193,96,.08)}.return-container .order-card .device-info .device-right .payment-badge.wx-score .badge-icon.data-v-571550e1{width:32rpx;height:26rpx;margin-right:8rpx}.return-container .order-card .device-info .device-right .payment-badge.wx-score .badge-text.data-v-571550e1{font-size:22rpx;color:#07c160;display:flex;align-items:center}.return-container .order-card .device-info .device-right .payment-badge.wx-score .badge-text .divider.data-v-571550e1{margin:0 6rpx}.return-container .order-card .device-info .device-right .payment-badge.wx-score .badge-text .highlight.data-v-571550e1{font-weight:500}.return-container .order-card .device-info .device-right .payment-badge.deposit.data-v-571550e1{background:#f5f5f5}.return-container .order-card .device-info .device-right .payment-badge.deposit .badge-text.data-v-571550e1{font-size:22rpx;color:#666;font-weight:500}.return-container .order-card .time-info.data-v-571550e1{background:#f9f9f9;border-radius:16rpx;padding:20rpx}.return-container .order-card .time-info .time-item.data-v-571550e1{display:flex;justify-content:space-between;align-items:center;margin-bottom:16rpx}.return-container .order-card .time-info .time-item.data-v-571550e1:last-child{margin-bottom:0}.return-container .order-card .time-info .time-item .label.data-v-571550e1{font-size:26rpx;color:#666}.return-container .order-card .time-info .time-item .value.data-v-571550e1{font-size:26rpx;color:#333}.return-container .order-card .time-info .time-item .value.highlight.data-v-571550e1{color:#ff6b6b;font-weight:700}.return-container .notice-card.data-v-571550e1{background:#fff;border-radius:20rpx;padding:30rpx;margin-bottom:30rpx;box-shadow:0 4rpx 16rpx rgba(0,0,0,.04)}.return-container .notice-card .notice-title.data-v-571550e1{font-size:30rpx;font-weight:700;color:#333;margin-bottom:20rpx}.return-container .notice-card .notice-list .notice-item.data-v-571550e1{display:flex;align-items:flex-start;margin-bottom:16rpx}.return-container .notice-card .notice-list .notice-item.data-v-571550e1:last-child{margin-bottom:0}.return-container .notice-card .notice-list .notice-item .dot.data-v-571550e1{width:12rpx;height:12rpx;background:#07c160;border-radius:50%;margin-top:10rpx;margin-right:16rpx;flex-shrink:0}.return-container .notice-card .notice-list .notice-item text.data-v-571550e1{font-size:26rpx;color:#666;line-height:1.5}.return-container .bottom-bar.data-v-571550e1{position:fixed;left:0;right:0;bottom:0;padding:20rpx 30rpx;padding-bottom:calc(20rpx + env(safe-area-inset-bottom));background:#fff;box-shadow:0 -4rpx 16rpx rgba(0,0,0,.04);z-index:10;display:flex;justify-content:space-between;gap:20rpx}.return-container .bottom-bar .action-item.data-v-571550e1{height:88rpx;display:flex;align-items:center;justify-content:center;font-size:30rpx;border-radius:44rpx;flex:1}.return-container .bottom-bar .action-item.primary.data-v-571550e1{background:#07c160;color:#fff}.return-container .bottom-bar .action-item.primary.data-v-571550e1:active{opacity:.8}.return-container .bottom-bar .action-item.secondary.data-v-571550e1{background:#f5f5f5;color:#333;border:1rpx solid #e0e0e0}.return-container .bottom-bar .action-item.secondary.data-v-571550e1:active{opacity:.8}
+.return-container.data-v-30d62b50{min-height:100vh;background:#f7f8fa;padding:30rpx 30rpx 180rpx;box-sizing:border-box}.return-container .order-card.data-v-30d62b50{background:#fff;border-radius:20rpx;padding:30rpx;margin-bottom:30rpx;box-shadow:0 4rpx 16rpx rgba(0,0,0,.04)}.return-container .order-card .order-header.data-v-30d62b50{display:flex;justify-content:space-between;align-items:center;margin-bottom:20rpx;padding-bottom:16rpx;border-bottom:1rpx solid #f0f0f0}.return-container .order-card .order-header .title.data-v-30d62b50{font-size:30rpx;font-weight:700;color:#333}.return-container .order-card .order-header .order-no.data-v-30d62b50{font-size:24rpx;color:#999}.return-container .order-card .device-info.data-v-30d62b50{margin-bottom:24rpx;display:flex;justify-content:space-between;align-items:flex-start}.return-container .order-card .device-info .device-left.data-v-30d62b50{flex:1;margin-right:20rpx}.return-container .order-card .device-info .device-left .device-name.data-v-30d62b50{font-size:32rpx;font-weight:500;color:#333;margin-bottom:8rpx}.return-container .order-card .device-info .device-left .device-id.data-v-30d62b50{font-size:26rpx;color:#999;margin-bottom:0}.return-container .order-card .device-info .device-right .payment-badge.data-v-30d62b50{display:inline-flex;align-items:center;padding:6rpx 12rpx;border-radius:8rpx;white-space:nowrap}.return-container .order-card .device-info .device-right .payment-badge.wx-score.data-v-30d62b50{background:rgba(7,193,96,.08)}.return-container .order-card .device-info .device-right .payment-badge.wx-score .badge-icon.data-v-30d62b50{width:32rpx;height:26rpx;margin-right:8rpx}.return-container .order-card .device-info .device-right .payment-badge.wx-score .badge-text.data-v-30d62b50{font-size:22rpx;color:#07c160;display:flex;align-items:center}.return-container .order-card .device-info .device-right .payment-badge.wx-score .badge-text .divider.data-v-30d62b50{margin:0 6rpx}.return-container .order-card .device-info .device-right .payment-badge.wx-score .badge-text .highlight.data-v-30d62b50{font-weight:500}.return-container .order-card .device-info .device-right .payment-badge.deposit.data-v-30d62b50{background:#f5f5f5}.return-container .order-card .device-info .device-right .payment-badge.deposit .badge-text.data-v-30d62b50{font-size:22rpx;color:#666;font-weight:500}.return-container .order-card .time-info.data-v-30d62b50{background:#f9f9f9;border-radius:16rpx;padding:20rpx}.return-container .order-card .time-info .time-item.data-v-30d62b50{display:flex;justify-content:space-between;align-items:center;margin-bottom:16rpx}.return-container .order-card .time-info .time-item.data-v-30d62b50:last-child{margin-bottom:0}.return-container .order-card .time-info .time-item .label.data-v-30d62b50{font-size:26rpx;color:#666}.return-container .order-card .time-info .time-item .value.data-v-30d62b50{font-size:26rpx;color:#333}.return-container .order-card .time-info .time-item .value.highlight.data-v-30d62b50{color:#ff6b6b;font-weight:700}.return-container .notice-card.data-v-30d62b50{background:#fff;border-radius:20rpx;padding:30rpx;margin-bottom:30rpx;box-shadow:0 4rpx 16rpx rgba(0,0,0,.04)}.return-container .notice-card .notice-title.data-v-30d62b50{font-size:30rpx;font-weight:700;color:#333;margin-bottom:20rpx}.return-container .notice-card .notice-list .notice-item.data-v-30d62b50{display:flex;align-items:flex-start;margin-bottom:16rpx}.return-container .notice-card .notice-list .notice-item.data-v-30d62b50:last-child{margin-bottom:0}.return-container .notice-card .notice-list .notice-item .dot.data-v-30d62b50{width:12rpx;height:12rpx;background:#07c160;border-radius:50%;margin-top:10rpx;margin-right:16rpx;flex-shrink:0}.return-container .notice-card .notice-list .notice-item text.data-v-30d62b50{font-size:26rpx;color:#666;line-height:1.5}.return-container .bottom-bar.data-v-30d62b50{position:fixed;left:0;right:0;bottom:0;padding:20rpx 30rpx;padding-bottom:calc(20rpx + env(safe-area-inset-bottom));background:#fff;box-shadow:0 -4rpx 16rpx rgba(0,0,0,.04);z-index:10;display:flex;justify-content:space-between;gap:20rpx}.return-container .bottom-bar .action-item.data-v-30d62b50{height:88rpx;display:flex;align-items:center;justify-content:center;font-size:30rpx;border-radius:44rpx;flex:1}.return-container .bottom-bar .action-item.primary.data-v-30d62b50{background:#07c160;color:#fff}.return-container .bottom-bar .action-item.primary.data-v-30d62b50:active{opacity:.8}.return-container .bottom-bar .action-item.secondary.data-v-30d62b50{background:#f5f5f5;color:#333;border:1rpx solid #e0e0e0}.return-container .bottom-bar .action-item.secondary.data-v-30d62b50:active{opacity:.8}
diff --git a/unpackage/dist/dev/.sourcemap/mp-weixin/config/url.js.map b/unpackage/dist/dev/.sourcemap/mp-weixin/config/url.js.map
index c0ab343..4681748 100644
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/config/url.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/config/url.js.map
@@ -1 +1 @@
-{"version":3,"file":"url.js","sources":["config/url.js"],"sourcesContent":["export const URL = \"https://my.gxfs123.com/api\" //正式服务器\r\n// export const URL = \"https://unifans.gxfs123.com/api\"  //测试服务器\r\n// export const URL = \"http://192.168.10.16:8080\" \t\t//本地调试\r\n\r\nexport const appid = \"wx2165f0be356ae7a9\" //小程序appid"],"names":[],"mappings":";AAAY,MAAC,MAAM;AAIP,MAAC,QAAQ;;;"}
\ No newline at end of file
+{"version":3,"file":"url.js","sources":["config/url.js"],"sourcesContent":["export const URL = \"https://my.gxfs123.com/api\" //正式服务器\r\n// export const URL = \"https://unifans.gxfs123.com/api\"  //测试服务器\r\n// export const URL = \"http://192.168.10.31:8080\" \t\t//本地调试\r\n\r\nexport const appid = \"wx2165f0be356ae7a9\" //小程序appid"],"names":[],"mappings":";AAAY,MAAC,MAAM;AAIP,MAAC,QAAQ;;;"}
\ No newline at end of file
diff --git a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/device/detail.js.map b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/device/detail.js.map
index 5628163..e475721 100644
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/device/detail.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/device/detail.js.map
@@ -1 +1 @@
-{"version":3,"file":"detail.js","sources":["pages/device/detail.vue","E:/HBuilderX.4.24.2024072208/plugins/uniapp-cli-vite/uniPage:/cGFnZXMvZGV2aWNlL2RldGFpbC52dWU"],"sourcesContent":["<template>\r\n\t<view class=\"container\">\r\n\t\t<!-- 顶部设备信息 -->\r\n\t\t<view class=\"device-header\">\r\n\t\t\t<view class=\"device-status-card\" :class=\"deviceStatus.class\">\r\n\t\t\t\t<view class=\"status-indicator\"></view>\r\n\t\t\t\t<text class=\"status-text\">{{ deviceStatus.text }}</text>\r\n\t\t\t</view>\r\n\t\t\t<view class=\"device-title\">\r\n\t\t\t\t<text class=\"name\">共享风扇</text>\r\n\t\t\t\t<view class=\"device-meta\">\r\n\t\t\t\t\t<text class=\"id-label\">设备号：</text>\r\n\t\t\t\t\t<text class=\"id-value\">{{ deviceId }}</text>\r\n\t\t\t\t</view>\r\n\t\t\t</view>\r\n\t\t</view>\r\n\r\n\t\t<!-- 设备信息卡片 -->\r\n\t\t<view class=\"card device-info-card\">\r\n\t\t\t<view class=\"card-row\">\r\n\t\t\t\t<view class=\"card-item\">\r\n\t\t\t\t\t<view class=\"item-icon location-icon\">\r\n\t\t\t\t\t\t<!-- <uni-icons type=\"location\" size=\"24\" color=\"#fff\"></uni-icons> -->\r\n\t\t\t\t\t\t<image src=\"/static/images/location-map.svg\" mode=\"aspectFill\"\r\n\t\t\t\t\t\t\tstyle=\"width: 45rpx;height: 45rpx;\"></image>\r\n\t\t\t\t\t</view>\r\n\t\t\t\t\t<view class=\"item-content\">\r\n\t\t\t\t\t\t<text class=\"item-label\">当前位置</text>\r\n\t\t\t\t\t\t<text class=\"item-value\">{{ deviceLocation }}</text>\r\n\t\t\t\t\t</view>\r\n\t\t\t\t</view>\r\n\t\t\t\t<view class=\"card-item\">\r\n\t\t\t\t\t<view class=\"item-icon battery-icon\" :class=\"{ 'battery-low': batteryLevel < 20 }\">\r\n\t\t\t\t\t\t<image src=\"/static/images/Electricity.svg\" mode=\"aspectFill\"\r\n\t\t\t\t\t\t\tstyle=\"width: 45rpx;height: 45rpx;\"></image>\r\n\t\t\t\t\t</view>\r\n\t\t\t\t\t<view class=\"item-content\">\r\n\t\t\t\t\t\t<text class=\"item-label\">电池电量</text>\r\n\t\t\t\t\t\t<text class=\"item-value\">{{ batteryLevel }}%</text>\r\n\t\t\t\t\t</view>\r\n\t\t\t\t</view>\r\n\t\t\t</view>\r\n\t\t</view>\r\n\r\n\t\t<!-- 计费规则 -->\r\n\t\t<view class=\"card pricing-card\">\r\n\t\t\t<view class=\"card-header\">\r\n\t\t\t\t<text class=\"card-title\">计费规则</text>\r\n\t\t\t</view>\r\n\r\n\t\t\t<view class=\"pricing-banner\">\r\n\t\t\t\t<view class=\"pricing-main\">\r\n\t\t\t\t\t<text class=\"price\">¥5.00</text>\r\n\t\t\t\t\t<text class=\"unit\">/小时</text>\r\n\t\t\t\t</view>\r\n\t\t\t\t<text class=\"cap-price\">封顶 ¥99</text>\r\n\t\t\t</view>\r\n\r\n\t\t\t<view class=\"pricing-rules\">\r\n\t\t\t\t<!-- <view class=\"rule-item\">\r\n\t\t\t\t\t<view class=\"rule-dot\"></view>\r\n\t\t\t\t\t<text class=\"rule-text\">前15分钟内归还<text class=\"highlight\">免费</text></text>\r\n\t\t\t\t</view> -->\r\n\t\t\t\t<view class=\"rule-item\">\r\n\t\t\t\t\t<view class=\"rule-dot\"></view>\r\n\t\t\t\t\t<text class=\"rule-text\">不足60分钟按60分钟计费</text>\r\n\t\t\t\t</view>\r\n\t\t\t\t<view class=\"rule-item\">\r\n\t\t\t\t\t<view class=\"rule-dot\"></view>\r\n\t\t\t\t\t<text class=\"rule-text\">持续计费至99元视为买断</text>\r\n\t\t\t\t</view>\r\n\t\t\t</view>\r\n\t\t</view>\r\n\r\n\t\t<!-- 手机号输入 -->\r\n\t\t<!-- \t\t<view class=\"card phone-card\" v-if=\"!hasActiveOrder\">\r\n\t\t\t<view class=\"card-header\">\r\n\t\t\t\t<text class=\"card-title\">联系方式</text>\r\n\t\t\t</view>\r\n\t\t\t<view class=\"phone-input-container\">\r\n\t\t\t\t<view class=\"input-wrapper\">\r\n\t\t\t\t\t<text class=\"prefix\">+86</text>\r\n\t\t\t\t\t<input type=\"number\" class=\"phone-input\" maxlength=\"11\" placeholder=\"请输入手机号码\"\r\n\t\t\t\t\t\tv-model=\"phoneNumber\" />\r\n\t\t\t\t</view>\r\n\t\t\t</view>\r\n\t\t</view> -->\r\n\r\n\t\t<!-- 使用须知 -->\r\n\t\t<view class=\"card notice-card\">\r\n\t\t\t<view class=\"card-header\">\r\n\t\t\t\t<text class=\"card-title\">使用须知</text>\r\n\t\t\t</view>\r\n\t\t\t<view class=\"notice-items\">\r\n\t\t\t\t<view class=\"notice-item\">\r\n\t\t\t\t\t<view class=\"notice-dot\"></view>\r\n\t\t\t\t\t<text class=\"notice-text\">请在使用前检查设备是否完好</text>\r\n\t\t\t\t</view>\r\n\t\t\t\t<view class=\"notice-item\">\r\n\t\t\t\t\t<view class=\"notice-dot\"></view>\r\n\t\t\t\t\t<text class=\"notice-text\">请在指定区域内使用设备</text>\r\n\t\t\t\t</view>\r\n\t\t\t\t<view class=\"notice-item\">\r\n\t\t\t\t\t<view class=\"notice-dot\"></view>\r\n\t\t\t\t\t<text class=\"notice-text\">归还时请确保设备完好，避免损坏</text>\r\n\t\t\t\t</view>\r\n\t\t\t</view>\r\n\t\t</view>\r\n\r\n\t\t<!-- 底部操作区 -->\r\n\t\t<view class=\"footer\">\r\n\t\t\t\r\n\r\n\t\t\t<button class=\"rent-button\" :class=\"{ 'return-button': hasActiveOrder }\"\r\n\t\t\t\t@click=\"handleRent('wx-score-pay')\">\r\n\t\t\t\t<text>{{ hasActiveOrder ? '归还设备' : '免押租借' }}</text>\r\n\t\t\t</button>\r\n\t\t\t<view class=\"wechat-credit\">\r\n\t\t\t\t<image src=\"/static/images/wxpayflag.png\" mode=\"aspectFit\" class=\"wx-icon\"></image>\r\n\t\t\t\t<view class=\"credit-text\">\r\n\t\t\t\t\t<text>微信支付分</text>\r\n\t\t\t\t\t<text class=\"credit-divider\">|</text>\r\n\t\t\t\t\t<text class=\"credit-score\">550分及以上优享</text>\r\n\t\t\t\t</view>\r\n\t\t\t</view>\r\n\t\t\t<view class=\"\" style=\"align-items: center;align-content: center;text-align: center;line-height: 50rpx;\"\r\n\t\t\t\t@click=\"handleRent('wx-pay')\">\r\n\t\t\t\t无法免押点这里></view>\r\n\t\t</view>\r\n\t\t\r\n\t\t<!-- 手机号授权弹窗 -->\r\n\t\t<view class=\"phone-auth-popup\" v-if=\"showPhoneAuthPopup\">\r\n\t\t\t<view class=\"popup-mask\" @click.stop></view>\r\n\t\t\t<view class=\"popup-content\">\r\n\t\t\t\t<view class=\"popup-header\">\r\n\t\t\t\t\t<text class=\"popup-title\">授权获取手机号</text>\r\n\t\t\t\t</view>\r\n\t\t\t\t<view class=\"popup-body\">\r\n\t\t\t\t\t<view class=\"auth-desc\">\r\n\t\t\t\t\t\t<text>为了提供更好的服务，需要授权获取您的手机号</text>\r\n\t\t\t\t\t</view>\r\n\t\t\t\t\t<button class=\"auth-btn\" open-type=\"getPhoneNumber\" @getphonenumber=\"onGetPhoneNumber\">\r\n\t\t\t\t\t\t一键获取手机号\r\n\t\t\t\t\t</button>\r\n\t\t\t\t\t<view class=\"auth-cancel\" @click=\"showPhoneAuthPopup = false\">\r\n\t\t\t\t\t\t<text>暂不授权</text>\r\n\t\t\t\t\t</view>\r\n\t\t\t\t</view>\r\n\t\t\t</view>\r\n\t\t</view>\r\n\t</view>\r\n</template>\r\n\r\n<script setup>\r\n\timport {\r\n\t\tref,\r\n\t\treactive,\r\n\t\tonMounted\r\n\t} from 'vue'\r\n\timport {\r\n\t\tonLoad\r\n\t} from '@dcloudio/uni-app'\r\n\timport {\r\n\t\tgetDeviceInfo,\r\n\t\trentPowerBank,\r\n\t\tgetOrderByOrderNoScore,\r\n\t\tgetOrderByOrderNoScorePayStatus,\r\n\t\tgetOrderByOrderNo,\r\n\t\tupdateOrderPackage,\r\n\t\tcancelOrder\r\n\t} from '@/config/user.js'\r\n\timport {\r\n\t\tURL\r\n\t} from \"@/config/url.js\"\r\n\timport {\r\n\t\tinitiateWeChatScorePayment,\r\n\t\tgetUserInfo,\r\n\t\tgetUserPhoneNumber\r\n\t} from '@/util/index.js'\r\n\r\n\t// 响应式状态\r\n\tconst deviceInfo = ref({})\r\n\tconst deviceId = ref('')\r\n\tconst deviceLocation = ref('一号教学楼大厅')\r\n\tconst batteryLevel = ref(95)\r\n\tconst hasActiveOrder = ref(false)\r\n\tconst deviceStatus = reactive({\r\n\t\ttext: '可使用',\r\n\t\tclass: 'available'\r\n\t})\r\n\tconst isLoggedIn = ref(true)\r\n\tconst phoneNumber = ref('')\r\n\tconst showPhoneAuthPopup = ref(false)\r\n\t\r\n\t// 生命周期 onLoad 钩子\r\n\tonLoad((options) => {\r\n\t\tdeviceId.value = options.deviceNo\r\n\t\tcheckOrderStatus()\r\n\t\tconsole.log(options.deviceNo)\r\n\t\tfetchDeviceInfo()\r\n\t})\r\n\t\r\n\tonMounted(()=>{\r\n\t\tcheckUserPhone()\r\n\t})\r\n\t\r\n\tconst checkUserPhone = async () => {\r\n\t\ttry {\r\n\t\t\tconst userInfoRes = await getUserInfo()\r\n\t\t\tconsole.log(userInfoRes.data.phone, 'getUserInfoPhone')\r\n\t\t\t\r\n\t\t\tif (userInfoRes.code == 200 && userInfoRes.data && userInfoRes.data.phone) {\r\n\t\t\t\tphoneNumber.value = userInfoRes.data.phone\r\n\t\t\t} else {\r\n\t\t\t\t// 如果没有手机号，显示授权弹窗\r\n\t\t\t\tshowPhoneAuthPopup.value = true\r\n\t\t\t}\r\n\t\t} catch (error) {\r\n\t\t\tconsole.error('获取用户信息失败:', error)\r\n\t\t}\r\n\t}\r\n\t\r\n\t// 处理获取手机号\r\n\tconst onGetPhoneNumber = (e) => {\r\n\t\tconsole.log('getPhoneNumber event:', e.detail)\r\n\t\t\r\n\t\t// 用户拒绝授权的情况\r\n\t\tif (e.detail.errMsg && e.detail.errMsg.includes('deny')) {\r\n\t\t\tuni.showToast({\r\n\t\t\t\ttitle: '需要授权手机号才能使用设备',\r\n\t\t\t\ticon: 'none'\r\n\t\t\t})\r\n\t\t\treturn\r\n\t\t}\r\n\t\t\r\n\t\t// 获取到授权code\r\n\t\tif (e.detail.code) {\r\n\t\t\tuni.showLoading({\r\n\t\t\t\ttitle: '获取中...'\r\n\t\t\t})\r\n\t\t\t\r\n\t\t\tconsole.log('获取到的授权code:', e.detail.code)\r\n\t\t\t\r\n\t\t\t// 添加 try-catch 以捕获任何 Promise 外部的错误\r\n\t\t\ttry {\r\n\t\t\t\tgetUserPhoneNumber(e.detail.code)\r\n\t\t\t\t\t.then(res => {\r\n\t\t\t\t\t\tconsole.log('获取手机号API响应原始数据:', JSON.stringify(res))\r\n\t\t\t\t\t\tuni.hideLoading()\r\n\t\t\t\t\t\t\r\n\t\t\t\t\t\t// 不立即抛出错误，而是记录问题并继续处理\r\n\t\t\t\t\t\tif (!res) {\r\n\t\t\t\t\t\t\tconsole.error('API返回数据为空')\r\n\t\t\t\t\t\t\tuni.showModal({\r\n\t\t\t\t\t\t\t\ttitle: '数据异常',\r\n\t\t\t\t\t\t\t\tcontent: 'API返回为空',\r\n\t\t\t\t\t\t\t\tshowCancel: false\r\n\t\t\t\t\t\t\t})\r\n\t\t\t\t\t\t\treturn\r\n\t\t\t\t\t\t}\r\n\t\t\t\t\t\t\r\n\t\t\t\t\t\t// 检查响应格式\r\n\t\t\t\t\t\tconsole.log('响应code:', res.code, '响应类型:', typeof res.code)\r\n\t\t\t\t\t\tconsole.log('是否有data:', !!res.data, '是否有phone:', res.data && !!res.data.phone)\r\n\t\t\t\t\t\t\r\n\t\t\t\t\t\tif (res.code == 200 && res.data && res.data.phoneNumber) {\r\n\t\t\t\t\t\t\tphoneNumber.value = res.data.phoneNumber\r\n\t\t\t\t\t\t\tshowPhoneAuthPopup.value = false\r\n\t\t\t\t\t\t\t\r\n\t\t\t\t\t\t\tuni.showToast({\r\n\t\t\t\t\t\t\t\ttitle: '手机号获取成功',\r\n\t\t\t\t\t\t\t\ticon: 'success'\r\n\t\t\t\t\t\t\t})\r\n\t\t\t\t\t\t} else {\r\n\t\t\t\t\t\t\t// 记录详细信息，不抛出错误\r\n\t\t\t\t\t\t\tconsole.warn('获取手机号响应异常:', res.msg || '未知错误')\r\n\t\t\t\t\t\t\tuni.showModal({\r\n\t\t\t\t\t\t\t\ttitle: '获取手机号异常',\r\n\t\t\t\t\t\t\t\tcontent: `状态码: ${res.code}, 消息: ${res.msg || '无'}`,\r\n\t\t\t\t\t\t\t\tshowCancel: false\r\n\t\t\t\t\t\t\t})\r\n\t\t\t\t\t\t}\r\n\t\t\t\t\t})\r\n\t\t\t\t\t.catch(err => {\r\n\t\t\t\t\t\tuni.hideLoading()\r\n\t\t\t\t\t\tconsole.error('获取手机号码失败(catch):', err)\r\n\t\t\t\t\t\t\r\n\t\t\t\t\t\t// 显示更详细的错误信息\r\n\t\t\t\t\t\tlet errMsg = err.message || err.toString()\r\n\t\t\t\t\t\tuni.showModal({\r\n\t\t\t\t\t\t\ttitle: '获取手机号失败',\r\n\t\t\t\t\t\t\tcontent: '错误信息: ' + errMsg,\r\n\t\t\t\t\t\t\tshowCancel: false\r\n\t\t\t\t\t\t})\r\n\t\t\t\t\t})\r\n\t\t\t} catch (outerError) {\r\n\t\t\t\tuni.hideLoading()\r\n\t\t\t\tconsole.error('获取手机号外部错误:', outerError)\r\n\t\t\t\tuni.showModal({\r\n\t\t\t\t\ttitle: '意外错误',\r\n\t\t\t\t\tcontent: '处理过程发生异常: ' + (outerError.message || outerError),\r\n\t\t\t\t\tshowCancel: false\r\n\t\t\t\t})\r\n\t\t\t}\r\n\t\t} else {\r\n\t\t\tuni.showToast({\r\n\t\t\t\ttitle: '获取授权码失败',\r\n\t\t\t\ticon: 'none'\r\n\t\t\t})\r\n\t\t}\r\n\t}\r\n\r\n\t// 检查登录状态和订单\r\n\tconst fetchDeviceInfo = async () => {\r\n\t\tconst res = await getDeviceInfo(deviceId.value)\r\n\t\tif (res.code == 200) {\r\n\t\t\tdeviceInfo.value = res.data.device || {}\r\n\r\n\t\t\t// 更新设备位置信息\r\n\t\t\tif (deviceInfo.value.deviceLocation) {\r\n\t\t\t\tdeviceLocation.value = deviceInfo.value.deviceLocation\r\n\t\t\t} else if (res.data.position && res.data.position.name) {\r\n\t\t\t\tdeviceLocation.value = res.data.position.name\r\n\t\t\t}\r\n\r\n\t\t\t// 更新设备状态\r\n\t\t\tif (deviceInfo.value.status) {\r\n\t\t\t\tif (deviceInfo.value.status === 'online') {\r\n\t\t\t\t\tdeviceStatus.text = '可使用'\r\n\t\t\t\t\tdeviceStatus.class = 'available'\r\n\t\t\t\t} else if (deviceInfo.value.status === 'offline') {\r\n\t\t\t\t\tdeviceStatus.text = '离线'\r\n\t\t\t\t\tdeviceStatus.class = 'offline'\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n\r\n\t// 显示登录提示\r\n\tconst showLoginTip = () => {\r\n\t\tuni.showModal({\r\n\t\t\ttitle: '提示',\r\n\t\t\tcontent: '请先登录后再操作',\r\n\t\t\tconfirmText: '去登录',\r\n\t\t\tsuccess: (res) => {\r\n\t\t\t\tif (res.confirm) {\r\n\t\t\t\t\tuni.navigateTo({\r\n\t\t\t\t\t\turl: '/pages/login/index'\r\n\t\t\t\t\t})\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t})\r\n\t}\r\n\r\n\t// 检查订单状态\r\n\tconst checkOrderStatus = async () => {\r\n\t\ttry {\r\n\t\t\t// 调用接口检查是否有进行中的订单\r\n\t\t\tconst result = await uni.$api.checkActiveOrder()\r\n\r\n\t\t\tif (result.hasOrder) {\r\n\t\t\t\tconst order = result.order // 假设后端返回 order 对象\r\n\r\n\t\t\t\t// 检查订单状态\r\n\t\t\t\tif (order.status === 'waiting_for_payment') {\r\n\t\t\t\t\t// 跳转支付页面，带上订单ID\r\n\t\t\t\t\tuni.redirectTo({\r\n\t\t\t\t\t\turl: `/pages/order/payment?orderId=${order.orderId}&deviceId=${deviceId.value}`\r\n\t\t\t\t\t})\r\n\t\t\t\t} else if (order.status === 'in_used') {\r\n\t\t\t\t\t// 如果有正在进行的订单，跳转到归还页面，带上设备ID\r\n\t\t\t\t\tuni.redirectTo({\r\n\t\t\t\t\t\turl: `/pages/device/return?deviceId=${deviceId.value}`\r\n\t\t\t\t\t})\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t} catch (error) {\r\n\t\t\tuni.showToast({\r\n\t\t\t\ttitle: '订单状态查询失败',\r\n\t\t\t\ticon: 'none'\r\n\t\t\t})\r\n\t\t}\r\n\t}\r\n\r\n\t// 处理租借操作\r\n\tconst handleRent = (payWay) => {\r\n\t\tif (!isLoggedIn.value) {\r\n\t\t\tshowLoginTip()\r\n\t\t\treturn\r\n\t\t}\r\n\t\t\r\n\t\t// 检查是否有手机号，如果没有则提示授权\r\n\t\tif (!phoneNumber.value) {\r\n\t\t\tshowPhoneAuthPopup.value = true\r\n\t\t\treturn\r\n\t\t}\r\n\r\n\t\t// 提交订单\r\n\t\tsubmitRentOrder(payWay)\r\n\t}\r\n\r\n\tconst selectedPkg = reactive({\r\n\t\ttime: '1小时',\r\n\t\tprice: '5.00'\r\n\t})\r\n\tconst depositAmount = ref('99.00')\r\n\r\n\t// 提交租借订单\r\n\tconst submitRentOrder = async (payWay) => {\r\n\t\ttry {\r\n\t\t\tuni.showLoading({\r\n\t\t\t\ttitle: '处理中'\r\n\t\t\t})\r\n\r\n\t\t\t// 调用设备租借接口\r\n\t\t\tconst rentResult = await rentPowerBank(deviceId.value, phoneNumber.value)\r\n\t\t\tif (rentResult.code !== 200) {\r\n\t\t\t\tthrow new Error(rentResult.msg || '设备租借失败')\r\n\t\t\t}\r\n\r\n\t\t\t// 获取后端返回的订单信息\r\n\t\t\tconst order = rentResult.data\r\n\r\n\t\t\t// --- 统一：先更新订单套餐信息 ---\r\n\t\t\ttry {\r\n\t\t\t\tlet packageTimeMinutes = 0;\r\n\t\t\t\tif (selectedPkg.time.includes('小时')) {\r\n\t\t\t\t\tpackageTimeMinutes = parseInt(selectedPkg.time) * 60;\r\n\t\t\t\t} else if (selectedPkg.time.includes('分钟')) {\r\n\t\t\t\t\tpackageTimeMinutes = parseInt(selectedPkg.time);\r\n\t\t\t\t} else {\r\n\t\t\t\t\tpackageTimeMinutes = parseInt(selectedPkg.time) * 60; // 默认按小时处理\r\n\t\t\t\t}\r\n\r\n\t\t\t\tconst updateRes = await updateOrderPackage({\r\n\t\t\t\t\torderId: order.orderId,\r\n\t\t\t\t\tpackageTime: packageTimeMinutes,\r\n\t\t\t\t\tpackagePrice: parseFloat(selectedPkg.price)\r\n\t\t\t\t});\r\n\t\t\t\tif (updateRes.code !== 200) {\r\n\t\t\t\t\tconsole.warn(\"更新订单套餐信息失败:\", updateRes.msg);\r\n\t\t\t\t\t// 这里可以选择是否提示用户或阻止流程，当前不阻止\r\n\t\t\t\t} else {\r\n\t\t\t\t\tconsole.log(\"订单套餐信息已提前更新\");\r\n\t\t\t\t}\r\n\t\t\t} catch (updateError) {\r\n\t\t\t\tconsole.error(\"更新订单套餐信息时出错:\", updateError);\r\n\t\t\t\t// 即使更新失败，也继续流程\r\n\t\t\t}\r\n\t\t\t// --- 套餐信息更新结束 ---\r\n\r\n\t\t\tif (payWay == 'wx-pay') {\r\n\t\t\t\t//当支付方式为押金支付时\r\n\t\t\t\tuni.hideLoading()\r\n\t\t\t\tconst res = await getOrderByOrderNo(order.orderNo);\r\n\t\t\t\tconsole.log(res);\r\n\t\t\t\t// --- 新增：计算总金额 ---\r\n\t\t\t\tconst deposit = parseFloat(deviceInfo.value.depositAmount);\r\n\t\t\t\tconst packagePrice = parseFloat(selectedPkg.price);\r\n\t\t\t\tconst totalAmount = (deposit + packagePrice).toFixed(2);\r\n\t\t\t\t// --- 计算结束 ---\r\n\r\n\t\t\t\tuni.hideLoading()\r\n\r\n\t\t\t\t// 跳转到订单支付页面，传递订单ID、套餐信息和总金额\r\n\t\t\t\tuni.redirectTo({\r\n\t\t\t\t\turl: `/pages/order/payment?orderId=${order.orderId}&packageTimeHours=${selectedPkg.time.replace('小时', '')}&packagePrice=${selectedPkg.price}&totalAmount=${totalAmount}&depositAmount=${depositAmount.value}${deviceInfo.value && deviceInfo.value.feeConfig ? '&feeConfig=' + encodeURIComponent(deviceInfo.value.feeConfig) : ''}`\r\n\t\t\t\t})\r\n\r\n\t\t\t} else if (payWay == 'wx-score-pay') {\r\n\t\t\t\t// 当支付方式为支付分支付时\r\n\t\t\t\tuni.hideLoading()\r\n\t\t\t\t// 获取支付分所需参数\r\n\t\t\t\tconst res = await getOrderByOrderNoScore(order.orderNo);\r\n\t\t\t\tuni.hideLoading()\r\n\r\n\t\t\t\tif (res && res.code === 200) {\r\n\t\t\t\t\ttry {\r\n\t\t\t\t\t\t// 调用微信支付分小程序\r\n\t\t\t\t\t\tconst payResult = await initiateWeChatScorePayment(res);\r\n\t\t\t\t\t\t// 支付成功后的逻辑处理 - 可以根据业务需求决定是否跳转或刷新页面\r\n\t\t\t\t\t\tif (payResult.errCode == '0') {\r\n\t\t\t\t\t\t\tconst res = await getOrderByOrderNoScorePayStatus(order.orderNo);\r\n\t\t\t\t\t\t\tconsole.log(res.data.orderStatus);\r\n\t\t\t\t\t\t\tif (res.data.orderStatus == 'in_used') {\r\n\t\t\t\t\t\t\t\t// 用户完成了支付流程，可以查询订单状态或跳转到订单页\r\n\t\t\t\t\t\t\t\tuni.showToast({\r\n\t\t\t\t\t\t\t\t\ttitle: '设备租借成功',\r\n\t\t\t\t\t\t\t\t\ticon: 'success'\r\n\t\t\t\t\t\t\t\t});\r\n\r\n\t\t\t\t\t\t\t\tsetTimeout(() => {\r\n\t\t\t\t\t\t\t\t\t// 延迟跳转到租用中页面或订单页\r\n\t\t\t\t\t\t\t\t\tuni.redirectTo({\r\n\t\t\t\t\t\t\t\t\t\turl: '/pages/order/index'\r\n\t\t\t\t\t\t\t\t\t});\r\n\t\t\t\t\t\t\t\t}, 1500);\r\n\t\t\t\t\t\t\t} else if (res.data.orderStatus == 'waiting_for_payment') {\r\n\t\t\t\t\t\t\t\tuni.showToast({\r\n\t\t\t\t\t\t\t\t\ttitle: '设备租借失败，订单已取消',\r\n\t\t\t\t\t\t\t\t\ticon: 'error'\r\n\t\t\t\t\t\t\t\t});\r\n\r\n\t\t\t\t\t\t\t\tawait cancelOrder({\r\n\t\t\t\t\t\t\t\t\torderId: order.orderNo\r\n\t\t\t\t\t\t\t\t});\r\n\t\t\t\t\t\t\t\t// 延迟跳转到租用中页面或订单页\r\n\t\t\t\t\t\t\t\tsetTimeout(() => {\r\n\t\t\t\t\t\t\t\t\tuni.switchTab({\r\n\t\t\t\t\t\t\t\t\t\turl: '/pages/index/index'\r\n\t\t\t\t\t\t\t\t\t});\r\n\t\t\t\t\t\t\t\t}, 1500)\r\n\r\n\t\t\t\t\t\t\t}\r\n\t\t\t\t\t\t\t// 用户取消等其他情况，不做特殊处理\r\n\t\t\t\t\t\t}\r\n\t\t\t\t\t\t// 用户取消等其他情况，不做特殊处理\r\n\t\t\t\t\t} catch (payError) {\r\n\t\t\t\t\t\tuni.showToast({\r\n\t\t\t\t\t\t\ttitle: '支付分调用失败，请重试',\r\n\t\t\t\t\t\t\ticon: 'none'\r\n\t\t\t\t\t\t});\r\n\t\t\t\t\t}\r\n\t\t\t\t} else {\r\n\t\t\t\t\tuni.showToast({\r\n\t\t\t\t\t\ttitle: res?.msg || '获取支付参数失败',\r\n\t\t\t\t\t\ticon: 'none'\r\n\t\t\t\t\t});\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t} catch (error) {\r\n\t\t\tuni.hideLoading()\r\n\t\t\tuni.showToast({\r\n\t\t\t\ttitle: error.message || '租借失败，请重试',\r\n\t\t\t\ticon: 'none'\r\n\t\t\t})\r\n\t\t}\r\n\t}\r\n</script>\r\n\r\n<style lang=\"scss\" scoped>\r\n\t.container {\r\n\t\tmin-height: 100vh;\r\n\t\tbackground-color: #f5f7fa;\r\n\t\tpadding: 30rpx 30rpx 300rpx;\r\n\t\tbox-sizing: border-box;\r\n\t}\r\n\r\n\t// 顶部设备信息\r\n\t.device-header {\r\n\t\tdisplay: flex;\r\n\t\tflex-direction: column;\r\n\t\tmargin-bottom: 30rpx;\r\n\r\n\t\t.device-status-card {\r\n\t\t\tdisplay: flex;\r\n\t\t\talign-items: center;\r\n\t\t\tmargin-bottom: 20rpx;\r\n\r\n\t\t\t.status-indicator {\r\n\t\t\t\twidth: 20rpx;\r\n\t\t\t\theight: 20rpx;\r\n\t\t\t\tborder-radius: 50%;\r\n\t\t\t\tmargin-right: 10rpx;\r\n\t\t\t}\r\n\r\n\t\t\t&.available {\r\n\t\t\t\t.status-indicator {\r\n\t\t\t\t\tbackground-color: #10c469;\r\n\t\t\t\t\tbox-shadow: 0 0 10rpx rgba(16, 196, 105, 0.5);\r\n\t\t\t\t}\r\n\r\n\t\t\t\t.status-text {\r\n\t\t\t\t\tcolor: #10c469;\r\n\t\t\t\t}\r\n\t\t\t}\r\n\r\n\t\t\t&.offline {\r\n\t\t\t\t.status-indicator {\r\n\t\t\t\t\tbackground-color: #9a9a9a;\r\n\t\t\t\t}\r\n\r\n\t\t\t\t.status-text {\r\n\t\t\t\t\tcolor: #9a9a9a;\r\n\t\t\t\t}\r\n\t\t\t}\r\n\r\n\t\t\t.status-text {\r\n\t\t\t\tfont-size: 28rpx;\r\n\t\t\t\tfont-weight: 500;\r\n\t\t\t}\r\n\t\t}\r\n\r\n\t\t.device-title {\r\n\t\t\t.name {\r\n\t\t\t\tfont-size: 48rpx;\r\n\t\t\t\tfont-weight: bold;\r\n\t\t\t\tcolor: #333;\r\n\t\t\t}\r\n\r\n\t\t\t.device-meta {\r\n\t\t\t\tmargin-top: 10rpx;\r\n\t\t\t\tdisplay: flex;\r\n\t\t\t\talign-items: center;\r\n\r\n\t\t\t\t.id-label {\r\n\t\t\t\t\tfont-size: 26rpx;\r\n\t\t\t\t\tcolor: #999;\r\n\t\t\t\t}\r\n\r\n\t\t\t\t.id-value {\r\n\t\t\t\t\tfont-size: 26rpx;\r\n\t\t\t\t\tcolor: #666;\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n\r\n\t// 卡片通用样式\r\n\t.card {\r\n\t\tbackground-color: #fff;\r\n\t\tborder-radius: 24rpx;\r\n\t\tbox-shadow: 0 4rpx 24rpx rgba(0, 0, 0, 0.03);\r\n\t\tpadding: 30rpx;\r\n\t\tmargin-bottom: 30rpx;\r\n\r\n\t\t.card-header {\r\n\t\t\tdisplay: flex;\r\n\t\t\talign-items: center;\r\n\t\t\tjustify-content: space-between;\r\n\t\t\tmargin-bottom: 24rpx;\r\n\r\n\t\t\t.card-title {\r\n\t\t\t\tfont-size: 32rpx;\r\n\t\t\t\tfont-weight: 600;\r\n\t\t\t\tcolor: #333;\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n\r\n\t// 设备信息卡\r\n\t.device-info-card {\r\n\t\t.card-row {\r\n\t\t\tdisplay: flex;\r\n\t\t\tjustify-content: space-between;\r\n\t\t}\r\n\r\n\t\t.card-item {\r\n\t\t\tdisplay: flex;\r\n\t\t\talign-items: center;\r\n\t\t\tflex: 1;\r\n\r\n\t\t\t.item-icon {\r\n\t\t\t\twidth: 60rpx;\r\n\t\t\t\theight: 60rpx;\r\n\t\t\t\tborder-radius: 12rpx;\r\n\t\t\t\tmargin-right: 20rpx;\r\n\t\t\t\tdisplay: flex;\r\n\t\t\t\talign-items: center;\r\n\t\t\t\tjustify-content: center;\r\n\t\t\t\tfont-size: 30rpx;\r\n\t\t\t\tcolor: #fff;\r\n\r\n\t\t\t\t&.location-icon {\r\n\t\t\t\t\tbackground: linear-gradient(135deg, #40c9ff, #32a5ff);\r\n\r\n\t\t\t\t\t// &::before {\r\n\t\t\t\t\t// \tcontent: \"\\e900\"; // 使用字体图标，需要自行替换\r\n\t\t\t\t\t// }\r\n\t\t\t\t}\r\n\r\n\t\t\t\t&.battery-icon {\r\n\t\t\t\t\tbackground: linear-gradient(135deg, #33db92, #10c469);\r\n\r\n\t\t\t\t\t// &::before {\r\n\t\t\t\t\t// \tcontent: \"\\e901\"; // 使用字体图标，需要自行替换\r\n\t\t\t\t\t// }\r\n\r\n\t\t\t\t\t&.battery-low {\r\n\t\t\t\t\t\tbackground: linear-gradient(135deg, #ff7676, #f54f4f);\r\n\t\t\t\t\t}\r\n\t\t\t\t}\r\n\t\t\t}\r\n\r\n\t\t\t.item-content {\r\n\t\t\t\tdisplay: flex;\r\n\t\t\t\tflex-direction: column;\r\n\r\n\t\t\t\t.item-label {\r\n\t\t\t\t\tfont-size: 26rpx;\r\n\t\t\t\t\tcolor: #999;\r\n\t\t\t\t\tmargin-bottom: 4rpx;\r\n\t\t\t\t}\r\n\r\n\t\t\t\t.item-value {\r\n\t\t\t\t\tfont-size: 30rpx;\r\n\t\t\t\t\tcolor: #333;\r\n\t\t\t\t\tfont-weight: 500;\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n\r\n\t// 计费规则\r\n\t.pricing-card {\r\n\t\t.pricing-banner {\r\n\t\t\tbackground: linear-gradient(to right, #f8f9ff, #e8f0ff);\r\n\t\t\tborder-radius: 16rpx;\r\n\t\t\tpadding: 30rpx;\r\n\t\t\tmargin-bottom: 30rpx;\r\n\t\t\tdisplay: flex;\r\n\t\t\tflex-direction: column;\r\n\t\t\talign-items: center;\r\n\r\n\t\t\t.pricing-main {\r\n\t\t\t\tdisplay: flex;\r\n\t\t\t\talign-items: flex-end;\r\n\r\n\t\t\t\t.price {\r\n\t\t\t\t\tfont-size: 60rpx;\r\n\t\t\t\t\tfont-weight: bold;\r\n\t\t\t\t\tcolor: #ff6b6b;\r\n\t\t\t\t}\r\n\r\n\t\t\t\t.unit {\r\n\t\t\t\t\tfont-size: 28rpx;\r\n\t\t\t\t\tcolor: #999;\r\n\t\t\t\t\tmargin-left: 4rpx;\r\n\t\t\t\t\tmargin-bottom: 10rpx;\r\n\t\t\t\t}\r\n\t\t\t}\r\n\r\n\t\t\t.cap-price {\r\n\t\t\t\tmargin-top: 10rpx;\r\n\t\t\t\tfont-size: 26rpx;\r\n\t\t\t\tcolor: #666;\r\n\t\t\t\tbackground-color: rgba(255, 107, 107, 0.1);\r\n\t\t\t\tpadding: 6rpx 20rpx;\r\n\t\t\t\tborder-radius: 20rpx;\r\n\t\t\t}\r\n\t\t}\r\n\r\n\t\t.pricing-rules {\r\n\t\t\t.rule-item {\r\n\t\t\t\tdisplay: flex;\r\n\t\t\t\talign-items: center;\r\n\t\t\t\tmargin-bottom: 16rpx;\r\n\r\n\t\t\t\t&:last-child {\r\n\t\t\t\t\tmargin-bottom: 0;\r\n\t\t\t\t}\r\n\r\n\t\t\t\t.rule-dot {\r\n\t\t\t\t\twidth: 10rpx;\r\n\t\t\t\t\theight: 10rpx;\r\n\t\t\t\t\tborder-radius: 50%;\r\n\t\t\t\t\tbackground-color: #ff6b6b;\r\n\t\t\t\t\tmargin-right: 16rpx;\r\n\t\t\t\t}\r\n\r\n\t\t\t\t.rule-text {\r\n\t\t\t\t\tfont-size: 28rpx;\r\n\t\t\t\t\tcolor: #666;\r\n\r\n\t\t\t\t\t.highlight {\r\n\t\t\t\t\t\tcolor: #ff6b6b;\r\n\t\t\t\t\t\tfont-weight: bold;\r\n\t\t\t\t\t}\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n\r\n\t// 手机号输入\r\n\t.phone-card {\r\n\t\t.phone-input-container {\r\n\t\t\t.input-wrapper {\r\n\t\t\t\tdisplay: flex;\r\n\t\t\t\talign-items: center;\r\n\t\t\t\theight: 88rpx;\r\n\t\t\t\tbackground-color: #f5f7fa;\r\n\t\t\t\tborder-radius: 16rpx;\r\n\t\t\t\tpadding: 0 24rpx;\r\n\r\n\t\t\t\t.prefix {\r\n\t\t\t\t\tfont-size: 28rpx;\r\n\t\t\t\t\tcolor: #666;\r\n\t\t\t\t\tmargin-right: 16rpx;\r\n\t\t\t\t\tpadding-right: 16rpx;\r\n\t\t\t\t\tborder-right: 1px solid #e0e0e0;\r\n\t\t\t\t}\r\n\r\n\t\t\t\t.phone-input {\r\n\t\t\t\t\tflex: 1;\r\n\t\t\t\t\theight: 88rpx;\r\n\t\t\t\t\tfont-size: 28rpx;\r\n\t\t\t\t\tcolor: #333;\r\n\t\t\t\t\tpadding-left: 10rpx;\r\n\t\t\t\t}\r\n\t\t\t}\r\n\r\n\t\t\t.phone-tip {\r\n\t\t\t\tfont-size: 24rpx;\r\n\t\t\t\tcolor: #999;\r\n\t\t\t\tmargin-top: 16rpx;\r\n\t\t\t\tdisplay: block;\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n\r\n\t// 使用须知\r\n\t.notice-card {\r\n\t\t.notice-items {\r\n\t\t\t.notice-item {\r\n\t\t\t\tdisplay: flex;\r\n\t\t\t\talign-items: flex-start;\r\n\t\t\t\tmargin-bottom: 20rpx;\r\n\r\n\t\t\t\t&:last-child {\r\n\t\t\t\t\tmargin-bottom: 0;\r\n\t\t\t\t}\r\n\r\n\t\t\t\t.notice-dot {\r\n\t\t\t\t\twidth: 10rpx;\r\n\t\t\t\t\theight: 10rpx;\r\n\t\t\t\t\tborder-radius: 50%;\r\n\t\t\t\t\tbackground-color: #32a5ff;\r\n\t\t\t\t\tmargin-right: 16rpx;\r\n\t\t\t\t\tmargin-top: 12rpx;\r\n\t\t\t\t}\r\n\r\n\t\t\t\t.notice-text {\r\n\t\t\t\t\tfont-size: 28rpx;\r\n\t\t\t\t\tcolor: #666;\r\n\t\t\t\t\tline-height: 1.6;\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n\r\n\t// 底部操作区\r\n\t.footer {\r\n\t\tposition: fixed;\r\n\t\tbottom: 0;\r\n\t\tleft: 0;\r\n\t\tright: 0;\r\n\t\tbackground-color: #fff;\r\n\t\tpadding: 20rpx 30rpx;\r\n\t\tpadding-bottom: calc(20rpx + env(safe-area-inset-bottom));\r\n\t\tbox-shadow: 0 -2rpx 20rpx rgba(0, 0, 0, 0.05);\r\n\t\tz-index: 100;\r\n\t\tdisplay: flex;\r\n\t\tflex-direction: column;\r\n\t\t// 添加一个变量来保存footer高度，方便管理和确保一致性\r\n\t\t--footer-height: 180rpx;\r\n\r\n\t\t.wechat-credit {\r\n\t\t\tdisplay: flex;\r\n\t\t\talign-items: center;\r\n\t\t\tjustify-content: center;\r\n\t\t\tmargin-top: 10rpx;\r\n\r\n\t\t\t.wx-icon {\r\n\t\t\t\twidth: 50rpx;\r\n\t\t\t\theight: 40rpx;\r\n\t\t\t\tmargin-right: 10rpx;\r\n\t\t\t}\r\n\r\n\t\t\t.credit-text {\r\n\t\t\t\tfont-size: 24rpx;\r\n\t\t\t\tcolor: #07c160;\r\n\t\t\t\tdisplay: flex;\r\n\t\t\t\talign-items: center;\r\n\r\n\t\t\t\t.credit-divider {\r\n\t\t\t\t\tmargin: 0 10rpx;\r\n\t\t\t\t}\r\n\r\n\t\t\t\t.credit-score {\r\n\t\t\t\t\tfont-weight: 500;\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t}\r\n\r\n\t\t.rent-button {\r\n\t\t\theight: 92rpx;\r\n\t\t\tborder-radius: 46rpx;\r\n\t\t\tbackground: linear-gradient(135deg, #07c160, #10d673);\r\n\t\t\tcolor: #fff;\r\n\t\t\tfont-size: 32rpx;\r\n\t\t\tfont-weight: 600;\r\n\t\t\tdisplay: flex;\r\n\t\t\talign-items: center;\r\n\t\t\tjustify-content: center;\r\n\t\t\tborder: none;\r\n\t\t\twidth: 90%;\r\n\r\n\t\t\t&.return-button {\r\n\t\t\t\tbackground: linear-gradient(135deg, #FF9800, #FFB74D);\r\n\t\t\t}\r\n\r\n\t\t\t&:active {\r\n\t\t\t\ttransform: scale(0.98);\r\n\t\t\t\topacity: 0.9;\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n\r\n\t/* 手机号授权弹窗样式 */\r\n\t.phone-auth-popup {\r\n\t\tposition: fixed;\r\n\t\ttop: 0;\r\n\t\tleft: 0;\r\n\t\tright: 0;\r\n\t\tbottom: 0;\r\n\t\tz-index: 1000;\r\n\t\tdisplay: flex;\r\n\t\talign-items: center;\r\n\t\tjustify-content: center;\r\n\t\tbackground-color: rgba(0, 0, 0, 0.5);\r\n\t}\r\n\r\n\t.popup-mask {\r\n\t\tposition: absolute;\r\n\t\ttop: 0;\r\n\t\tleft: 0;\r\n\t\tright: 0;\r\n\t\tbottom: 0;\r\n\t}\r\n\r\n\t.popup-content {\r\n\t\tbackground-color: #fff;\r\n\t\tborder-radius: 24rpx;\r\n\t\tbox-shadow: 0 8rpx 32rpx rgba(0, 0, 0, 0.15);\r\n\t\twidth: 90%;\r\n\t\tmax-width: 500rpx;\r\n\t\tpadding: 40rpx 30rpx;\r\n\t\tposition: relative;\r\n\t\tz-index: 1001;\r\n\t\tdisplay: flex;\r\n\t\tflex-direction: column;\r\n\t\talign-items: center;\r\n\t}\r\n\r\n\t.popup-header {\r\n\t\tmargin-bottom: 30rpx;\r\n\t\ttext-align: center;\r\n\t}\r\n\r\n\t.popup-title {\r\n\t\tfont-size: 36rpx;\r\n\t\tfont-weight: bold;\r\n\t\tcolor: #333;\r\n\t}\r\n\r\n\t.popup-body {\r\n\t\twidth: 100%;\r\n\t\tdisplay: flex;\r\n\t\tflex-direction: column;\r\n\t\talign-items: center;\r\n\t\tmargin-bottom: 30rpx;\r\n\t}\r\n\r\n\t.auth-desc {\r\n\t\tfont-size: 28rpx;\r\n\t\tcolor: #666;\r\n\t\ttext-align: center;\r\n\t\tmargin-bottom: 30rpx;\r\n\t\tline-height: 1.6;\r\n\t}\r\n\r\n\t.auth-btn {\r\n\t\twidth: 100%;\r\n\t\theight: 92rpx;\r\n\t\tborder-radius: 46rpx;\r\n\t\tbackground: linear-gradient(135deg, #07c160, #10d673);\r\n\t\tcolor: #fff;\r\n\t\tfont-size: 32rpx;\r\n\t\tfont-weight: 600;\r\n\t\tdisplay: flex;\r\n\t\talign-items: center;\r\n\t\tjustify-content: center;\r\n\t\tborder: none;\r\n\t\tmargin-bottom: 20rpx;\r\n\r\n\t\t&:active {\r\n\t\t\ttransform: scale(0.98);\r\n\t\t\topacity: 0.9;\r\n\t\t}\r\n\t}\r\n\r\n\t.auth-cancel {\r\n\t\twidth: 100%;\r\n\t\theight: 92rpx;\r\n\t\tborder-radius: 46rpx;\r\n\t\tbackground-color: #f5f7fa;\r\n\t\tcolor: #333;\r\n\t\tfont-size: 32rpx;\r\n\t\tfont-weight: 600;\r\n\t\tdisplay: flex;\r\n\t\talign-items: center;\r\n\t\tjustify-content: center;\r\n\t\tborder: none;\r\n\r\n\t\t&:active {\r\n\t\t\ttransform: scale(0.98);\r\n\t\t\topacity: 0.9;\r\n\t\t}\r\n\t}\r\n</style>","import MiniProgramPage from 'D:/uni-fans-score/pages/device/detail.vue'\nwx.createPage(MiniProgramPage)"],"names":["ref","reactive","onLoad","uni","onMounted","getUserInfo","getUserPhoneNumber","getDeviceInfo","rentPowerBank","updateOrderPackage","getOrderByOrderNo","getOrderByOrderNoScore","initiateWeChatScorePayment","res","getOrderByOrderNoScorePayStatus","cancelOrder"],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"detail.js","sources":["pages/device/detail.vue","E:/HBuilderX.4.24.2024072208/plugins/uniapp-cli-vite/uniPage:/cGFnZXMvZGV2aWNlL2RldGFpbC52dWU"],"sourcesContent":["<template>\r\n\t<view class=\"container\">\r\n\t\t<!-- 顶部设备信息 -->\r\n\t\t<view class=\"device-header\">\r\n\t\t\t<view class=\"device-status-card\" :class=\"deviceStatus.class\">\r\n\t\t\t\t<view class=\"status-indicator\"></view>\r\n\t\t\t\t<text class=\"status-text\">{{ deviceStatus.text }}</text>\r\n\t\t\t</view>\r\n\t\t\t<view class=\"device-title\">\r\n\t\t\t\t<text class=\"name\">共享风扇</text>\r\n\t\t\t\t<view class=\"device-meta\">\r\n\t\t\t\t\t<text class=\"id-label\">设备号：</text>\r\n\t\t\t\t\t<text class=\"id-value\">{{ deviceId }}</text>\r\n\t\t\t\t</view>\r\n\t\t\t</view>\r\n\t\t</view>\r\n\r\n\t\t<!-- 设备信息卡片 -->\r\n\t\t<view class=\"card device-info-card\">\r\n\t\t\t<view class=\"card-row\">\r\n\t\t\t\t<view class=\"card-item\">\r\n\t\t\t\t\t<view class=\"item-icon location-icon\">\r\n\t\t\t\t\t\t<!-- <uni-icons type=\"location\" size=\"24\" color=\"#fff\"></uni-icons> -->\r\n\t\t\t\t\t\t<image src=\"/static/images/location-map.svg\" mode=\"aspectFill\"\r\n\t\t\t\t\t\t\tstyle=\"width: 45rpx;height: 45rpx;\"></image>\r\n\t\t\t\t\t</view>\r\n\t\t\t\t\t<view class=\"item-content\">\r\n\t\t\t\t\t\t<text class=\"item-label\">当前位置</text>\r\n\t\t\t\t\t\t<text class=\"item-value\">{{ deviceLocation }}</text>\r\n\t\t\t\t\t</view>\r\n\t\t\t\t</view>\r\n\t\t\t\t<view class=\"card-item\">\r\n\t\t\t\t\t<view class=\"item-icon battery-icon\" :class=\"{ 'battery-low': batteryLevel < 20 }\">\r\n\t\t\t\t\t\t<image src=\"/static/images/Electricity.svg\" mode=\"aspectFill\"\r\n\t\t\t\t\t\t\tstyle=\"width: 45rpx;height: 45rpx;\"></image>\r\n\t\t\t\t\t</view>\r\n\t\t\t\t\t<view class=\"item-content\">\r\n\t\t\t\t\t\t<text class=\"item-label\">电池电量</text>\r\n\t\t\t\t\t\t<text class=\"item-value\">{{ batteryLevel }}%</text>\r\n\t\t\t\t\t</view>\r\n\t\t\t\t</view>\r\n\t\t\t</view>\r\n\t\t</view>\r\n\r\n\t\t<!-- 计费规则 -->\r\n\t\t<view class=\"card pricing-card\">\r\n\t\t\t<view class=\"card-header\">\r\n\t\t\t\t<text class=\"card-title\">计费规则</text>\r\n\t\t\t</view>\r\n\r\n\t\t\t<view class=\"pricing-banner\">\r\n\t\t\t\t<view class=\"pricing-main\">\r\n\t\t\t\t\t<text class=\"price\">¥{{deviceFeeConfig.maxHourPrice}}</text>\r\n\t\t\t\t\t<text class=\"unit\">/小时</text>\r\n\t\t\t\t</view>\r\n\t\t\t\t<text class=\"cap-price\">封顶 ¥{{deviceInfo.depositAmount}}</text>\r\n\t\t\t</view>\r\n\r\n\t\t\t<view class=\"pricing-rules\">\r\n\t\t\t\t<!-- <view class=\"rule-item\">\r\n\t\t\t\t\t<view class=\"rule-dot\"></view>\r\n\t\t\t\t\t<text class=\"rule-text\">前15分钟内归还<text class=\"highlight\">免费</text></text>\r\n\t\t\t\t</view> -->\r\n\t\t\t\t<view class=\"rule-item\">\r\n\t\t\t\t\t<view class=\"rule-dot\"></view>\r\n\t\t\t\t\t<text class=\"rule-text\">不足60分钟按60分钟计费</text>\r\n\t\t\t\t</view>\r\n\t\t\t\t<view class=\"rule-item\">\r\n\t\t\t\t\t<view class=\"rule-dot\"></view>\r\n\t\t\t\t\t<text class=\"rule-text\">持续计费至99元视为买断</text>\r\n\t\t\t\t</view>\r\n\t\t\t</view>\r\n\t\t</view>\r\n\r\n\t\t<!-- 手机号输入 -->\r\n\t\t<!-- \t\t<view class=\"card phone-card\" v-if=\"!hasActiveOrder\">\r\n\t\t\t<view class=\"card-header\">\r\n\t\t\t\t<text class=\"card-title\">联系方式</text>\r\n\t\t\t</view>\r\n\t\t\t<view class=\"phone-input-container\">\r\n\t\t\t\t<view class=\"input-wrapper\">\r\n\t\t\t\t\t<text class=\"prefix\">+86</text>\r\n\t\t\t\t\t<input type=\"number\" class=\"phone-input\" maxlength=\"11\" placeholder=\"请输入手机号码\"\r\n\t\t\t\t\t\tv-model=\"phoneNumber\" />\r\n\t\t\t\t</view>\r\n\t\t\t</view>\r\n\t\t</view> -->\r\n\r\n\t\t<!-- 使用须知 -->\r\n\t\t<view class=\"card notice-card\">\r\n\t\t\t<view class=\"card-header\">\r\n\t\t\t\t<text class=\"card-title\">使用须知</text>\r\n\t\t\t</view>\r\n\t\t\t<view class=\"notice-items\">\r\n\t\t\t\t<view class=\"notice-item\">\r\n\t\t\t\t\t<view class=\"notice-dot\"></view>\r\n\t\t\t\t\t<text class=\"notice-text\">请在使用前检查设备是否完好</text>\r\n\t\t\t\t</view>\r\n\t\t\t\t<view class=\"notice-item\">\r\n\t\t\t\t\t<view class=\"notice-dot\"></view>\r\n\t\t\t\t\t<text class=\"notice-text\">请在指定区域内使用设备</text>\r\n\t\t\t\t</view>\r\n\t\t\t\t<view class=\"notice-item\">\r\n\t\t\t\t\t<view class=\"notice-dot\"></view>\r\n\t\t\t\t\t<text class=\"notice-text\">归还时请确保设备完好，避免损坏</text>\r\n\t\t\t\t</view>\r\n\t\t\t</view>\r\n\t\t</view>\r\n\r\n\t\t<!-- 底部操作区 -->\r\n\t\t<view class=\"footer\">\r\n\r\n\r\n\t\t\t<button class=\"rent-button\" :class=\"{ 'return-button': hasActiveOrder }\"\r\n\t\t\t\t@click=\"handleRent('wx-score-pay')\">\r\n\t\t\t\t<text>{{ hasActiveOrder ? '归还设备' : '免押租借' }}</text>\r\n\t\t\t</button>\r\n\t\t\t<view class=\"wechat-credit\">\r\n\t\t\t\t<image src=\"/static/images/wxpayflag.png\" mode=\"aspectFit\" class=\"wx-icon\"></image>\r\n\t\t\t\t<view class=\"credit-text\">\r\n\t\t\t\t\t<text>微信支付分</text>\r\n\t\t\t\t\t<text class=\"credit-divider\">|</text>\r\n\t\t\t\t\t<text class=\"credit-score\">550分及以上优享</text>\r\n\t\t\t\t</view>\r\n\t\t\t</view>\r\n\t\t\t<!-- <view class=\"\" style=\"align-items: center;align-content: center;text-align: center;line-height: 50rpx;\"\r\n\t\t\t\t@click=\"handleRent('wx-pay')\">\r\n\t\t\t\t无法免押点这里></view> -->\r\n\t\t</view>\r\n\r\n\t\t<!-- 手机号授权弹窗 -->\r\n\t\t<view class=\"phone-auth-popup\" v-if=\"showPhoneAuthPopup\">\r\n\t\t\t<view class=\"popup-mask\" @click.stop></view>\r\n\t\t\t<view class=\"popup-content\">\r\n\t\t\t\t<view class=\"popup-header\">\r\n\t\t\t\t\t<text class=\"popup-title\">授权获取手机号</text>\r\n\t\t\t\t</view>\r\n\t\t\t\t<view class=\"popup-body\">\r\n\t\t\t\t\t<view class=\"auth-desc\">\r\n\t\t\t\t\t\t<text>为了提供更好的服务，需要授权获取您的手机号</text>\r\n\t\t\t\t\t</view>\r\n\t\t\t\t\t<button class=\"auth-btn\" open-type=\"getPhoneNumber\" @getphonenumber=\"onGetPhoneNumber\">\r\n\t\t\t\t\t\t一键获取手机号\r\n\t\t\t\t\t</button>\r\n\t\t\t\t\t<view class=\"auth-cancel\" @click=\"showPhoneAuthPopup = false\">\r\n\t\t\t\t\t\t<text>暂不授权</text>\r\n\t\t\t\t\t</view>\r\n\t\t\t\t</view>\r\n\t\t\t</view>\r\n\t\t</view>\r\n\t</view>\r\n</template>\r\n\r\n<script setup>\r\n\timport {\r\n\t\tref,\r\n\t\treactive,\r\n\t\tonMounted\r\n\t} from 'vue'\r\n\timport {\r\n\t\tonLoad\r\n\t} from '@dcloudio/uni-app'\r\n\timport {\r\n\t\tgetDeviceInfo,\r\n\t\trentPowerBank,\r\n\t\tgetOrderByOrderNoScore,\r\n\t\tgetOrderByOrderNoScorePayStatus,\r\n\t\tgetOrderByOrderNo,\r\n\t\tupdateOrderPackage,\r\n\t\tcancelOrder\r\n\t} from '@/config/user.js'\r\n\timport {\r\n\t\tURL\r\n\t} from \"@/config/url.js\"\r\n\timport {\r\n\t\tinitiateWeChatScorePayment,\r\n\t\tgetUserInfo,\r\n\t\tgetUserPhoneNumber\r\n\t} from '@/util/index.js'\r\n\r\n\t// 响应式状态\r\n\tconst deviceInfo = ref({})\r\n\tconst deviceId = ref('')\r\n\tconst deviceFeeConfig = ref({})\r\n\tconst deviceLocation = ref('一号教学楼大厅')\r\n\tconst batteryLevel = ref(95)\r\n\tconst hasActiveOrder = ref(false)\r\n\tconst deviceStatus = reactive({\r\n\t\ttext: '可使用',\r\n\t\tclass: 'available'\r\n\t})\r\n\tconst isLoggedIn = ref(true)\r\n\tconst phoneNumber = ref('')\r\n\tconst showPhoneAuthPopup = ref(false)\r\n\r\n\t// 生命周期 onLoad 钩子\r\n\tonLoad((options) => {\r\n\t\tdeviceId.value = options.deviceNo\r\n\t\tcheckOrderStatus()\r\n\t\tconsole.log(options.deviceNo)\r\n\t\tfetchDeviceInfo()\r\n\t})\r\n\r\n\tonMounted(() => {\r\n\t\tcheckUserPhone()\r\n\t})\r\n\r\n\tconst checkUserPhone = async () => {\r\n\t\ttry {\r\n\t\t\tconst userInfoRes = await getUserInfo()\r\n\t\t\tconsole.log(userInfoRes.data.phone, 'getUserInfoPhone')\r\n\r\n\t\t\tif (userInfoRes.code == 200 && userInfoRes.data && userInfoRes.data.phone) {\r\n\t\t\t\tphoneNumber.value = userInfoRes.data.phone\r\n\t\t\t} else {\r\n\t\t\t\t// 如果没有手机号，显示授权弹窗\r\n\t\t\t\tshowPhoneAuthPopup.value = true\r\n\t\t\t}\r\n\t\t} catch (error) {\r\n\t\t\tconsole.error('获取用户信息失败:', error)\r\n\t\t}\r\n\t}\r\n\r\n\t// 处理获取手机号\r\n\tconst onGetPhoneNumber = (e) => {\r\n\t\tconsole.log('getPhoneNumber event:', e.detail)\r\n\r\n\t\t// 用户拒绝授权的情况\r\n\t\tif (e.detail.errMsg && e.detail.errMsg.includes('deny')) {\r\n\t\t\tuni.showToast({\r\n\t\t\t\ttitle: '需要授权手机号才能使用设备',\r\n\t\t\t\ticon: 'none'\r\n\t\t\t})\r\n\t\t\treturn\r\n\t\t}\r\n\r\n\t\t// 获取到授权code\r\n\t\tif (e.detail.code) {\r\n\t\t\tuni.showLoading({\r\n\t\t\t\ttitle: '获取中...'\r\n\t\t\t})\r\n\r\n\t\t\tconsole.log('获取到的授权code:', e.detail.code)\r\n\r\n\t\t\t// 添加 try-catch 以捕获任何 Promise 外部的错误\r\n\t\t\ttry {\r\n\t\t\t\tgetUserPhoneNumber(e.detail.code)\r\n\t\t\t\t\t.then(res => {\r\n\t\t\t\t\t\tconsole.log('获取手机号API响应原始数据:', JSON.stringify(res))\r\n\t\t\t\t\t\tuni.hideLoading()\r\n\r\n\t\t\t\t\t\t// 不立即抛出错误，而是记录问题并继续处理\r\n\t\t\t\t\t\tif (!res) {\r\n\t\t\t\t\t\t\tconsole.error('API返回数据为空')\r\n\t\t\t\t\t\t\tuni.showModal({\r\n\t\t\t\t\t\t\t\ttitle: '数据异常',\r\n\t\t\t\t\t\t\t\tcontent: 'API返回为空',\r\n\t\t\t\t\t\t\t\tshowCancel: false\r\n\t\t\t\t\t\t\t})\r\n\t\t\t\t\t\t\treturn\r\n\t\t\t\t\t\t}\r\n\r\n\t\t\t\t\t\t// 检查响应格式\r\n\t\t\t\t\t\tconsole.log('响应code:', res.code, '响应类型:', typeof res.code)\r\n\t\t\t\t\t\tconsole.log('是否有data:', !!res.data, '是否有phone:', res.data && !!res.data.phone)\r\n\r\n\t\t\t\t\t\tif (res.code == 200 && res.data && res.data.phoneNumber) {\r\n\t\t\t\t\t\t\tphoneNumber.value = res.data.phoneNumber\r\n\t\t\t\t\t\t\tshowPhoneAuthPopup.value = false\r\n\r\n\t\t\t\t\t\t\tuni.showToast({\r\n\t\t\t\t\t\t\t\ttitle: '手机号获取成功',\r\n\t\t\t\t\t\t\t\ticon: 'success'\r\n\t\t\t\t\t\t\t})\r\n\t\t\t\t\t\t} else {\r\n\t\t\t\t\t\t\t// 记录详细信息，不抛出错误\r\n\t\t\t\t\t\t\tconsole.warn('获取手机号响应异常:', res.msg || '未知错误')\r\n\t\t\t\t\t\t\tuni.showModal({\r\n\t\t\t\t\t\t\t\ttitle: '获取手机号异常',\r\n\t\t\t\t\t\t\t\tcontent: `状态码: ${res.code}, 消息: ${res.msg || '无'}`,\r\n\t\t\t\t\t\t\t\tshowCancel: false\r\n\t\t\t\t\t\t\t})\r\n\t\t\t\t\t\t}\r\n\t\t\t\t\t})\r\n\t\t\t\t\t.catch(err => {\r\n\t\t\t\t\t\tuni.hideLoading()\r\n\t\t\t\t\t\tconsole.error('获取手机号码失败(catch):', err)\r\n\r\n\t\t\t\t\t\t// 显示更详细的错误信息\r\n\t\t\t\t\t\tlet errMsg = err.message || err.toString()\r\n\t\t\t\t\t\tuni.showModal({\r\n\t\t\t\t\t\t\ttitle: '获取手机号失败',\r\n\t\t\t\t\t\t\tcontent: '错误信息: ' + errMsg,\r\n\t\t\t\t\t\t\tshowCancel: false\r\n\t\t\t\t\t\t})\r\n\t\t\t\t\t})\r\n\t\t\t} catch (outerError) {\r\n\t\t\t\tuni.hideLoading()\r\n\t\t\t\tconsole.error('获取手机号外部错误:', outerError)\r\n\t\t\t\tuni.showModal({\r\n\t\t\t\t\ttitle: '意外错误',\r\n\t\t\t\t\tcontent: '处理过程发生异常: ' + (outerError.message || outerError),\r\n\t\t\t\t\tshowCancel: false\r\n\t\t\t\t})\r\n\t\t\t}\r\n\t\t} else {\r\n\t\t\tuni.showToast({\r\n\t\t\t\ttitle: '获取授权码失败',\r\n\t\t\t\ticon: 'none'\r\n\t\t\t})\r\n\t\t}\r\n\t}\r\n\r\n\t// 检查登录状态和订单\r\n\tconst fetchDeviceInfo = async () => {\r\n\t\tconst res = await getDeviceInfo(deviceId.value)\r\n\t\tif (res.code == 200) {\r\n\t\t\tdeviceInfo.value = res.data.device || {}\r\n\r\n\t\t\t// 更新设备位置信息\r\n\t\t\tif (deviceInfo.value.deviceLocation) {\r\n\t\t\t\tdeviceLocation.value = deviceInfo.value.deviceLocation\r\n\t\t\t} else if (res.data.position && res.data.position.name) {\r\n\t\t\t\tdeviceLocation.value = res.data.position.name\r\n\t\t\t}\r\n\r\n\t\t\t// 更新设备状态\r\n\t\t\tif (deviceInfo.value.status) {\r\n\t\t\t\tif (deviceInfo.value.status === 'online') {\r\n\t\t\t\t\tdeviceStatus.text = '可使用'\r\n\t\t\t\t\tdeviceStatus.class = 'available'\r\n\t\t\t\t} else if (deviceInfo.value.status === 'offline') {\r\n\t\t\t\t\tdeviceStatus.text = '离线'\r\n\t\t\t\t\tdeviceStatus.class = 'offline'\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t\tconsole.log('feeconfig',deviceInfo.value.feeConfig);\r\n\t\t\t\r\n\t\t\tdeviceFeeConfig.value = JSON.parse(deviceInfo.value.feeConfig)[0] || {}\r\n\t\t}\r\n\t}\r\n\r\n\t// 显示登录提示\r\n\tconst showLoginTip = () => {\r\n\t\tuni.showModal({\r\n\t\t\ttitle: '提示',\r\n\t\t\tcontent: '请先登录后再操作',\r\n\t\t\tconfirmText: '去登录',\r\n\t\t\tsuccess: (res) => {\r\n\t\t\t\tif (res.confirm) {\r\n\t\t\t\t\tuni.navigateTo({\r\n\t\t\t\t\t\turl: '/pages/login/index'\r\n\t\t\t\t\t})\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t})\r\n\t}\r\n\r\n\t// 检查订单状态\r\n\tconst checkOrderStatus = async () => {\r\n\t\ttry {\r\n\t\t\t// 调用接口检查是否有进行中的订单\r\n\t\t\tconst result = await uni.$api.checkActiveOrder()\r\n\r\n\t\t\tif (result.hasOrder) {\r\n\t\t\t\tconst order = result.order // 假设后端返回 order 对象\r\n\r\n\t\t\t\t// 检查订单状态\r\n\t\t\t\tif (order.status === 'waiting_for_payment') {\r\n\t\t\t\t\t// 跳转支付页面，带上订单ID\r\n\t\t\t\t\tuni.redirectTo({\r\n\t\t\t\t\t\turl: `/pages/order/payment?orderId=${order.orderId}&deviceId=${deviceId.value}`\r\n\t\t\t\t\t})\r\n\t\t\t\t} else if (order.status === 'in_used') {\r\n\t\t\t\t\t// 如果有正在进行的订单，跳转到归还页面，带上设备ID\r\n\t\t\t\t\tuni.redirectTo({\r\n\t\t\t\t\t\turl: `/pages/device/return?deviceId=${deviceId.value}`\r\n\t\t\t\t\t})\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t} catch (error) {\r\n\t\t\tuni.showToast({\r\n\t\t\t\ttitle: '订单状态查询失败',\r\n\t\t\t\ticon: 'none'\r\n\t\t\t})\r\n\t\t}\r\n\t}\r\n\r\n\t// 处理租借操作\r\n\tconst handleRent = (payWay) => {\r\n\t\tif (!isLoggedIn.value) {\r\n\t\t\tshowLoginTip()\r\n\t\t\treturn\r\n\t\t}\r\n\r\n\t\t// 检查是否有手机号，如果没有则提示授权\r\n\t\tif (!phoneNumber.value) {\r\n\t\t\tshowPhoneAuthPopup.value = true\r\n\t\t\treturn\r\n\t\t}\r\n\r\n\t\t// 提交订单\r\n\t\tsubmitRentOrder(payWay)\r\n\t}\r\n\r\n\tconst selectedPkg = reactive({\r\n\t\ttime: '1小时',\r\n\t\tprice: '5.00'\r\n\t})\r\n\tconst depositAmount = ref('99.00')\r\n\r\n\t// 提交租借订单\r\n\tconst submitRentOrder = async (payWay) => {\r\n\t\ttry {\r\n\t\t\tuni.showLoading({\r\n\t\t\t\ttitle: '处理中'\r\n\t\t\t})\r\n\r\n\t\t\t// 调用设备租借接口\r\n\t\t\tconst rentResult = await rentPowerBank(deviceId.value, phoneNumber.value)\r\n\t\t\tif (rentResult.code !== 200) {\r\n\t\t\t\tthrow new Error(rentResult.msg || '设备租借失败')\r\n\t\t\t}\r\n\r\n\t\t\t// 获取后端返回的订单信息\r\n\t\t\tconst order = rentResult.data\r\n\r\n\t\t\t// --- 统一：先更新订单套餐信息 ---\r\n\t\t\ttry {\r\n\t\t\t\tlet packageTimeMinutes = 0;\r\n\t\t\t\tif (selectedPkg.time.includes('小时')) {\r\n\t\t\t\t\tpackageTimeMinutes = parseInt(selectedPkg.time) * 60;\r\n\t\t\t\t} else if (selectedPkg.time.includes('分钟')) {\r\n\t\t\t\t\tpackageTimeMinutes = parseInt(selectedPkg.time);\r\n\t\t\t\t} else {\r\n\t\t\t\t\tpackageTimeMinutes = parseInt(selectedPkg.time) * 60; // 默认按小时处理\r\n\t\t\t\t}\r\n\r\n\t\t\t\tconst updateRes = await updateOrderPackage({\r\n\t\t\t\t\torderId: order.orderId,\r\n\t\t\t\t\tpackageTime: packageTimeMinutes,\r\n\t\t\t\t\tpackagePrice: parseFloat(selectedPkg.price)\r\n\t\t\t\t});\r\n\t\t\t\tif (updateRes.code !== 200) {\r\n\t\t\t\t\tconsole.warn(\"更新订单套餐信息失败:\", updateRes.msg);\r\n\t\t\t\t\t// 这里可以选择是否提示用户或阻止流程，当前不阻止\r\n\t\t\t\t} else {\r\n\t\t\t\t\tconsole.log(\"订单套餐信息已提前更新\");\r\n\t\t\t\t}\r\n\t\t\t} catch (updateError) {\r\n\t\t\t\tconsole.error(\"更新订单套餐信息时出错:\", updateError);\r\n\t\t\t\t// 即使更新失败，也继续流程\r\n\t\t\t}\r\n\t\t\t// --- 套餐信息更新结束 ---\r\n\r\n\t\t\tif (payWay == 'wx-pay') {\r\n\t\t\t\t//当支付方式为押金支付时\r\n\t\t\t\tuni.hideLoading()\r\n\t\t\t\tconst res = await getOrderByOrderNo(order.orderNo);\r\n\t\t\t\tconsole.log(res);\r\n\t\t\t\t// --- 新增：计算总金额 ---\r\n\t\t\t\tconst deposit = parseFloat(deviceInfo.value.depositAmount);\r\n\t\t\t\tconst packagePrice = parseFloat(selectedPkg.price);\r\n\t\t\t\tconst totalAmount = (deposit + packagePrice).toFixed(2);\r\n\t\t\t\t// --- 计算结束 ---\r\n\r\n\t\t\t\tuni.hideLoading()\r\n\r\n\t\t\t\t// 跳转到订单支付页面，传递订单ID、套餐信息和总金额\r\n\t\t\t\tuni.redirectTo({\r\n\t\t\t\t\turl: `/pages/order/payment?orderId=${order.orderId}&packageTimeHours=${selectedPkg.time.replace('小时', '')}&packagePrice=${selectedPkg.price}&totalAmount=${totalAmount}&depositAmount=${depositAmount.value}${deviceInfo.value && deviceInfo.value.feeConfig ? '&feeConfig=' + encodeURIComponent(deviceInfo.value.feeConfig) : ''}`\r\n\t\t\t\t})\r\n\r\n\t\t\t} else if (payWay == 'wx-score-pay') {\r\n\t\t\t\t// 当支付方式为支付分支付时\r\n\t\t\t\tuni.hideLoading()\r\n\t\t\t\t// 获取支付分所需参数\r\n\t\t\t\tconst res = await getOrderByOrderNoScore(order.orderNo);\r\n\t\t\t\tuni.hideLoading()\r\n\r\n\t\t\t\tif (res && res.code === 200) {\r\n\t\t\t\t\ttry {\r\n\t\t\t\t\t\t// 调用微信支付分小程序\r\n\t\t\t\t\t\tconst payResult = await initiateWeChatScorePayment(res);\r\n\t\t\t\t\t\t// 支付成功后的逻辑处理 - 可以根据业务需求决定是否跳转或刷新页面\r\n\t\t\t\t\t\tif (payResult.errCode == '0') {\r\n\t\t\t\t\t\t\tconst res = await getOrderByOrderNoScorePayStatus(order.orderNo);\r\n\t\t\t\t\t\t\tconsole.log(res.data.orderStatus);\r\n\t\t\t\t\t\t\tif (res.data.orderStatus == 'in_used') {\r\n\t\t\t\t\t\t\t\t// 用户完成了支付流程，可以查询订单状态或跳转到订单页\r\n\t\t\t\t\t\t\t\tuni.showToast({\r\n\t\t\t\t\t\t\t\t\ttitle: '设备租借成功',\r\n\t\t\t\t\t\t\t\t\ticon: 'success'\r\n\t\t\t\t\t\t\t\t});\r\n\r\n\t\t\t\t\t\t\t\tsetTimeout(() => {\r\n\t\t\t\t\t\t\t\t\t// 延迟跳转到租用中页面或订单页\r\n\t\t\t\t\t\t\t\t\tuni.redirectTo({\r\n\t\t\t\t\t\t\t\t\t\turl: '/pages/order/index'\r\n\t\t\t\t\t\t\t\t\t});\r\n\t\t\t\t\t\t\t\t}, 1500);\r\n\t\t\t\t\t\t\t} else if (res.data.orderStatus == 'waiting_for_payment') {\r\n\t\t\t\t\t\t\t\tuni.showToast({\r\n\t\t\t\t\t\t\t\t\ttitle: '设备租借失败，订单已取消',\r\n\t\t\t\t\t\t\t\t\ticon: 'error'\r\n\t\t\t\t\t\t\t\t});\r\n\r\n\t\t\t\t\t\t\t\tawait cancelOrder({\r\n\t\t\t\t\t\t\t\t\torderId: order.orderNo\r\n\t\t\t\t\t\t\t\t});\r\n\t\t\t\t\t\t\t\t// 延迟跳转到租用中页面或订单页\r\n\t\t\t\t\t\t\t\tsetTimeout(() => {\r\n\t\t\t\t\t\t\t\t\tuni.switchTab({\r\n\t\t\t\t\t\t\t\t\t\turl: '/pages/index/index'\r\n\t\t\t\t\t\t\t\t\t});\r\n\t\t\t\t\t\t\t\t}, 1500)\r\n\r\n\t\t\t\t\t\t\t}\r\n\t\t\t\t\t\t\t// 用户取消等其他情况，不做特殊处理\r\n\t\t\t\t\t\t}\r\n\t\t\t\t\t\t// 用户取消等其他情况，不做特殊处理\r\n\t\t\t\t\t} catch (payError) {\r\n\t\t\t\t\t\tuni.showToast({\r\n\t\t\t\t\t\t\ttitle: '支付分调用失败，请重试',\r\n\t\t\t\t\t\t\ticon: 'none'\r\n\t\t\t\t\t\t});\r\n\t\t\t\t\t}\r\n\t\t\t\t} else {\r\n\t\t\t\t\tuni.showToast({\r\n\t\t\t\t\t\ttitle: res?.msg || '获取支付参数失败',\r\n\t\t\t\t\t\ticon: 'none'\r\n\t\t\t\t\t});\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t} catch (error) {\r\n\t\t\tuni.hideLoading()\r\n\t\t\tuni.showToast({\r\n\t\t\t\ttitle: error.message || '租借失败，请重试',\r\n\t\t\t\ticon: 'none'\r\n\t\t\t})\r\n\t\t}\r\n\t}\r\n</script>\r\n\r\n<style lang=\"scss\" scoped>\r\n\t.container {\r\n\t\tmin-height: 100vh;\r\n\t\tbackground-color: #f5f7fa;\r\n\t\tpadding: 30rpx 30rpx 300rpx;\r\n\t\tbox-sizing: border-box;\r\n\t}\r\n\r\n\t// 顶部设备信息\r\n\t.device-header {\r\n\t\tdisplay: flex;\r\n\t\tflex-direction: column;\r\n\t\tmargin-bottom: 30rpx;\r\n\r\n\t\t.device-status-card {\r\n\t\t\tdisplay: flex;\r\n\t\t\talign-items: center;\r\n\t\t\tmargin-bottom: 20rpx;\r\n\r\n\t\t\t.status-indicator {\r\n\t\t\t\twidth: 20rpx;\r\n\t\t\t\theight: 20rpx;\r\n\t\t\t\tborder-radius: 50%;\r\n\t\t\t\tmargin-right: 10rpx;\r\n\t\t\t}\r\n\r\n\t\t\t&.available {\r\n\t\t\t\t.status-indicator {\r\n\t\t\t\t\tbackground-color: #10c469;\r\n\t\t\t\t\tbox-shadow: 0 0 10rpx rgba(16, 196, 105, 0.5);\r\n\t\t\t\t}\r\n\r\n\t\t\t\t.status-text {\r\n\t\t\t\t\tcolor: #10c469;\r\n\t\t\t\t}\r\n\t\t\t}\r\n\r\n\t\t\t&.offline {\r\n\t\t\t\t.status-indicator {\r\n\t\t\t\t\tbackground-color: #9a9a9a;\r\n\t\t\t\t}\r\n\r\n\t\t\t\t.status-text {\r\n\t\t\t\t\tcolor: #9a9a9a;\r\n\t\t\t\t}\r\n\t\t\t}\r\n\r\n\t\t\t.status-text {\r\n\t\t\t\tfont-size: 28rpx;\r\n\t\t\t\tfont-weight: 500;\r\n\t\t\t}\r\n\t\t}\r\n\r\n\t\t.device-title {\r\n\t\t\t.name {\r\n\t\t\t\tfont-size: 48rpx;\r\n\t\t\t\tfont-weight: bold;\r\n\t\t\t\tcolor: #333;\r\n\t\t\t}\r\n\r\n\t\t\t.device-meta {\r\n\t\t\t\tmargin-top: 10rpx;\r\n\t\t\t\tdisplay: flex;\r\n\t\t\t\talign-items: center;\r\n\r\n\t\t\t\t.id-label {\r\n\t\t\t\t\tfont-size: 26rpx;\r\n\t\t\t\t\tcolor: #999;\r\n\t\t\t\t}\r\n\r\n\t\t\t\t.id-value {\r\n\t\t\t\t\tfont-size: 26rpx;\r\n\t\t\t\t\tcolor: #666;\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n\r\n\t// 卡片通用样式\r\n\t.card {\r\n\t\tbackground-color: #fff;\r\n\t\tborder-radius: 24rpx;\r\n\t\tbox-shadow: 0 4rpx 24rpx rgba(0, 0, 0, 0.03);\r\n\t\tpadding: 30rpx;\r\n\t\tmargin-bottom: 30rpx;\r\n\r\n\t\t.card-header {\r\n\t\t\tdisplay: flex;\r\n\t\t\talign-items: center;\r\n\t\t\tjustify-content: space-between;\r\n\t\t\tmargin-bottom: 24rpx;\r\n\r\n\t\t\t.card-title {\r\n\t\t\t\tfont-size: 32rpx;\r\n\t\t\t\tfont-weight: 600;\r\n\t\t\t\tcolor: #333;\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n\r\n\t// 设备信息卡\r\n\t.device-info-card {\r\n\t\t.card-row {\r\n\t\t\tdisplay: flex;\r\n\t\t\tjustify-content: space-between;\r\n\t\t}\r\n\r\n\t\t.card-item {\r\n\t\t\tdisplay: flex;\r\n\t\t\talign-items: center;\r\n\t\t\tflex: 1;\r\n\r\n\t\t\t.item-icon {\r\n\t\t\t\twidth: 60rpx;\r\n\t\t\t\theight: 60rpx;\r\n\t\t\t\tborder-radius: 12rpx;\r\n\t\t\t\tmargin-right: 20rpx;\r\n\t\t\t\tdisplay: flex;\r\n\t\t\t\talign-items: center;\r\n\t\t\t\tjustify-content: center;\r\n\t\t\t\tfont-size: 30rpx;\r\n\t\t\t\tcolor: #fff;\r\n\r\n\t\t\t\t&.location-icon {\r\n\t\t\t\t\tbackground: linear-gradient(135deg, #40c9ff, #32a5ff);\r\n\r\n\t\t\t\t\t// &::before {\r\n\t\t\t\t\t// \tcontent: \"\\e900\"; // 使用字体图标，需要自行替换\r\n\t\t\t\t\t// }\r\n\t\t\t\t}\r\n\r\n\t\t\t\t&.battery-icon {\r\n\t\t\t\t\tbackground: linear-gradient(135deg, #33db92, #10c469);\r\n\r\n\t\t\t\t\t// &::before {\r\n\t\t\t\t\t// \tcontent: \"\\e901\"; // 使用字体图标，需要自行替换\r\n\t\t\t\t\t// }\r\n\r\n\t\t\t\t\t&.battery-low {\r\n\t\t\t\t\t\tbackground: linear-gradient(135deg, #ff7676, #f54f4f);\r\n\t\t\t\t\t}\r\n\t\t\t\t}\r\n\t\t\t}\r\n\r\n\t\t\t.item-content {\r\n\t\t\t\tdisplay: flex;\r\n\t\t\t\tflex-direction: column;\r\n\r\n\t\t\t\t.item-label {\r\n\t\t\t\t\tfont-size: 26rpx;\r\n\t\t\t\t\tcolor: #999;\r\n\t\t\t\t\tmargin-bottom: 4rpx;\r\n\t\t\t\t}\r\n\r\n\t\t\t\t.item-value {\r\n\t\t\t\t\tfont-size: 30rpx;\r\n\t\t\t\t\tcolor: #333;\r\n\t\t\t\t\tfont-weight: 500;\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n\r\n\t// 计费规则\r\n\t.pricing-card {\r\n\t\t.pricing-banner {\r\n\t\t\tbackground: linear-gradient(to right, #f8f9ff, #e8f0ff);\r\n\t\t\tborder-radius: 16rpx;\r\n\t\t\tpadding: 30rpx;\r\n\t\t\tmargin-bottom: 30rpx;\r\n\t\t\tdisplay: flex;\r\n\t\t\tflex-direction: column;\r\n\t\t\talign-items: center;\r\n\r\n\t\t\t.pricing-main {\r\n\t\t\t\tdisplay: flex;\r\n\t\t\t\talign-items: flex-end;\r\n\r\n\t\t\t\t.price {\r\n\t\t\t\t\tfont-size: 60rpx;\r\n\t\t\t\t\tfont-weight: bold;\r\n\t\t\t\t\tcolor: #ff6b6b;\r\n\t\t\t\t}\r\n\r\n\t\t\t\t.unit {\r\n\t\t\t\t\tfont-size: 28rpx;\r\n\t\t\t\t\tcolor: #999;\r\n\t\t\t\t\tmargin-left: 4rpx;\r\n\t\t\t\t\tmargin-bottom: 10rpx;\r\n\t\t\t\t}\r\n\t\t\t}\r\n\r\n\t\t\t.cap-price {\r\n\t\t\t\tmargin-top: 10rpx;\r\n\t\t\t\tfont-size: 26rpx;\r\n\t\t\t\tcolor: #666;\r\n\t\t\t\tbackground-color: rgba(255, 107, 107, 0.1);\r\n\t\t\t\tpadding: 6rpx 20rpx;\r\n\t\t\t\tborder-radius: 20rpx;\r\n\t\t\t}\r\n\t\t}\r\n\r\n\t\t.pricing-rules {\r\n\t\t\t.rule-item {\r\n\t\t\t\tdisplay: flex;\r\n\t\t\t\talign-items: center;\r\n\t\t\t\tmargin-bottom: 16rpx;\r\n\r\n\t\t\t\t&:last-child {\r\n\t\t\t\t\tmargin-bottom: 0;\r\n\t\t\t\t}\r\n\r\n\t\t\t\t.rule-dot {\r\n\t\t\t\t\twidth: 10rpx;\r\n\t\t\t\t\theight: 10rpx;\r\n\t\t\t\t\tborder-radius: 50%;\r\n\t\t\t\t\tbackground-color: #ff6b6b;\r\n\t\t\t\t\tmargin-right: 16rpx;\r\n\t\t\t\t}\r\n\r\n\t\t\t\t.rule-text {\r\n\t\t\t\t\tfont-size: 28rpx;\r\n\t\t\t\t\tcolor: #666;\r\n\r\n\t\t\t\t\t.highlight {\r\n\t\t\t\t\t\tcolor: #ff6b6b;\r\n\t\t\t\t\t\tfont-weight: bold;\r\n\t\t\t\t\t}\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n\r\n\t// 手机号输入\r\n\t.phone-card {\r\n\t\t.phone-input-container {\r\n\t\t\t.input-wrapper {\r\n\t\t\t\tdisplay: flex;\r\n\t\t\t\talign-items: center;\r\n\t\t\t\theight: 88rpx;\r\n\t\t\t\tbackground-color: #f5f7fa;\r\n\t\t\t\tborder-radius: 16rpx;\r\n\t\t\t\tpadding: 0 24rpx;\r\n\r\n\t\t\t\t.prefix {\r\n\t\t\t\t\tfont-size: 28rpx;\r\n\t\t\t\t\tcolor: #666;\r\n\t\t\t\t\tmargin-right: 16rpx;\r\n\t\t\t\t\tpadding-right: 16rpx;\r\n\t\t\t\t\tborder-right: 1px solid #e0e0e0;\r\n\t\t\t\t}\r\n\r\n\t\t\t\t.phone-input {\r\n\t\t\t\t\tflex: 1;\r\n\t\t\t\t\theight: 88rpx;\r\n\t\t\t\t\tfont-size: 28rpx;\r\n\t\t\t\t\tcolor: #333;\r\n\t\t\t\t\tpadding-left: 10rpx;\r\n\t\t\t\t}\r\n\t\t\t}\r\n\r\n\t\t\t.phone-tip {\r\n\t\t\t\tfont-size: 24rpx;\r\n\t\t\t\tcolor: #999;\r\n\t\t\t\tmargin-top: 16rpx;\r\n\t\t\t\tdisplay: block;\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n\r\n\t// 使用须知\r\n\t.notice-card {\r\n\t\t.notice-items {\r\n\t\t\t.notice-item {\r\n\t\t\t\tdisplay: flex;\r\n\t\t\t\talign-items: flex-start;\r\n\t\t\t\tmargin-bottom: 20rpx;\r\n\r\n\t\t\t\t&:last-child {\r\n\t\t\t\t\tmargin-bottom: 0;\r\n\t\t\t\t}\r\n\r\n\t\t\t\t.notice-dot {\r\n\t\t\t\t\twidth: 10rpx;\r\n\t\t\t\t\theight: 10rpx;\r\n\t\t\t\t\tborder-radius: 50%;\r\n\t\t\t\t\tbackground-color: #32a5ff;\r\n\t\t\t\t\tmargin-right: 16rpx;\r\n\t\t\t\t\tmargin-top: 12rpx;\r\n\t\t\t\t}\r\n\r\n\t\t\t\t.notice-text {\r\n\t\t\t\t\tfont-size: 28rpx;\r\n\t\t\t\t\tcolor: #666;\r\n\t\t\t\t\tline-height: 1.6;\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n\r\n\t// 底部操作区\r\n\t.footer {\r\n\t\tposition: fixed;\r\n\t\tbottom: 0;\r\n\t\tleft: 0;\r\n\t\tright: 0;\r\n\t\tbackground-color: #fff;\r\n\t\tpadding: 20rpx 30rpx;\r\n\t\tpadding-bottom: calc(20rpx + env(safe-area-inset-bottom));\r\n\t\tbox-shadow: 0 -2rpx 20rpx rgba(0, 0, 0, 0.05);\r\n\t\tz-index: 100;\r\n\t\tdisplay: flex;\r\n\t\tflex-direction: column;\r\n\t\t// 添加一个变量来保存footer高度，方便管理和确保一致性\r\n\t\t--footer-height: 180rpx;\r\n\r\n\t\t.wechat-credit {\r\n\t\t\tdisplay: flex;\r\n\t\t\talign-items: center;\r\n\t\t\tjustify-content: center;\r\n\t\t\tmargin-top: 10rpx;\r\n\r\n\t\t\t.wx-icon {\r\n\t\t\t\twidth: 50rpx;\r\n\t\t\t\theight: 40rpx;\r\n\t\t\t\tmargin-right: 10rpx;\r\n\t\t\t}\r\n\r\n\t\t\t.credit-text {\r\n\t\t\t\tfont-size: 24rpx;\r\n\t\t\t\tcolor: #07c160;\r\n\t\t\t\tdisplay: flex;\r\n\t\t\t\talign-items: center;\r\n\r\n\t\t\t\t.credit-divider {\r\n\t\t\t\t\tmargin: 0 10rpx;\r\n\t\t\t\t}\r\n\r\n\t\t\t\t.credit-score {\r\n\t\t\t\t\tfont-weight: 500;\r\n\t\t\t\t}\r\n\t\t\t}\r\n\t\t}\r\n\r\n\t\t.rent-button {\r\n\t\t\theight: 92rpx;\r\n\t\t\tborder-radius: 46rpx;\r\n\t\t\tbackground: linear-gradient(135deg, #07c160, #10d673);\r\n\t\t\tcolor: #fff;\r\n\t\t\tfont-size: 32rpx;\r\n\t\t\tfont-weight: 600;\r\n\t\t\tdisplay: flex;\r\n\t\t\talign-items: center;\r\n\t\t\tjustify-content: center;\r\n\t\t\tborder: none;\r\n\t\t\twidth: 90%;\r\n\r\n\t\t\t&.return-button {\r\n\t\t\t\tbackground: linear-gradient(135deg, #FF9800, #FFB74D);\r\n\t\t\t}\r\n\r\n\t\t\t&:active {\r\n\t\t\t\ttransform: scale(0.98);\r\n\t\t\t\topacity: 0.9;\r\n\t\t\t}\r\n\t\t}\r\n\t}\r\n\r\n\t/* 手机号授权弹窗样式 */\r\n\t.phone-auth-popup {\r\n\t\tposition: fixed;\r\n\t\ttop: 0;\r\n\t\tleft: 0;\r\n\t\tright: 0;\r\n\t\tbottom: 0;\r\n\t\tz-index: 1000;\r\n\t\tdisplay: flex;\r\n\t\talign-items: center;\r\n\t\tjustify-content: center;\r\n\t\tbackground-color: rgba(0, 0, 0, 0.5);\r\n\t}\r\n\r\n\t.popup-mask {\r\n\t\tposition: absolute;\r\n\t\ttop: 0;\r\n\t\tleft: 0;\r\n\t\tright: 0;\r\n\t\tbottom: 0;\r\n\t}\r\n\r\n\t.popup-content {\r\n\t\tbackground-color: #fff;\r\n\t\tborder-radius: 24rpx;\r\n\t\tbox-shadow: 0 8rpx 32rpx rgba(0, 0, 0, 0.15);\r\n\t\twidth: 90%;\r\n\t\tmax-width: 500rpx;\r\n\t\tpadding: 40rpx 30rpx;\r\n\t\tposition: relative;\r\n\t\tz-index: 1001;\r\n\t\tdisplay: flex;\r\n\t\tflex-direction: column;\r\n\t\talign-items: center;\r\n\t}\r\n\r\n\t.popup-header {\r\n\t\tmargin-bottom: 30rpx;\r\n\t\ttext-align: center;\r\n\t}\r\n\r\n\t.popup-title {\r\n\t\tfont-size: 36rpx;\r\n\t\tfont-weight: bold;\r\n\t\tcolor: #333;\r\n\t}\r\n\r\n\t.popup-body {\r\n\t\twidth: 100%;\r\n\t\tdisplay: flex;\r\n\t\tflex-direction: column;\r\n\t\talign-items: center;\r\n\t\tmargin-bottom: 30rpx;\r\n\t}\r\n\r\n\t.auth-desc {\r\n\t\tfont-size: 28rpx;\r\n\t\tcolor: #666;\r\n\t\ttext-align: center;\r\n\t\tmargin-bottom: 30rpx;\r\n\t\tline-height: 1.6;\r\n\t}\r\n\r\n\t.auth-btn {\r\n\t\twidth: 100%;\r\n\t\theight: 92rpx;\r\n\t\tborder-radius: 46rpx;\r\n\t\tbackground: linear-gradient(135deg, #07c160, #10d673);\r\n\t\tcolor: #fff;\r\n\t\tfont-size: 32rpx;\r\n\t\tfont-weight: 600;\r\n\t\tdisplay: flex;\r\n\t\talign-items: center;\r\n\t\tjustify-content: center;\r\n\t\tborder: none;\r\n\t\tmargin-bottom: 20rpx;\r\n\r\n\t\t&:active {\r\n\t\t\ttransform: scale(0.98);\r\n\t\t\topacity: 0.9;\r\n\t\t}\r\n\t}\r\n\r\n\t.auth-cancel {\r\n\t\twidth: 100%;\r\n\t\theight: 92rpx;\r\n\t\tborder-radius: 46rpx;\r\n\t\tbackground-color: #f5f7fa;\r\n\t\tcolor: #333;\r\n\t\tfont-size: 32rpx;\r\n\t\tfont-weight: 600;\r\n\t\tdisplay: flex;\r\n\t\talign-items: center;\r\n\t\tjustify-content: center;\r\n\t\tborder: none;\r\n\r\n\t\t&:active {\r\n\t\t\ttransform: scale(0.98);\r\n\t\t\topacity: 0.9;\r\n\t\t}\r\n\t}\r\n</style>","import MiniProgramPage from 'D:/uni-fans-score/pages/device/detail.vue'\nwx.createPage(MiniProgramPage)"],"names":["ref","reactive","onLoad","uni","onMounted","getUserInfo","getUserPhoneNumber","getDeviceInfo","rentPowerBank","updateOrderPackage","getOrderByOrderNo","getOrderByOrderNoScore","initiateWeChatScorePayment","res","getOrderByOrderNoScorePayStatus","cancelOrder"],"mappings":"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"}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/common/vendor.js b/unpackage/dist/dev/mp-weixin/common/vendor.js
index 45bfbb1..ddc87bc 100644
--- a/unpackage/dist/dev/mp-weixin/common/vendor.js
+++ b/unpackage/dist/dev/mp-weixin/common/vendor.js
@@ -6988,9 +6988,9 @@ function isConsoleWritable() {
   return isWritable;
 }
 function initRuntimeSocketService() {
-  const hosts = "192.168.10.13,127.0.0.1";
+  const hosts = "192.168.10.30,127.0.0.1";
   const port = "8090";
-  const id = "mp-weixin_4_oLdt";
+  const id = "mp-weixin_wcZ9WZ";
   const lazy = typeof swan !== "undefined";
   let restoreError = lazy ? () => {
   } : initOnError();
diff --git a/unpackage/dist/dev/mp-weixin/pages/device/detail.js b/unpackage/dist/dev/mp-weixin/pages/device/detail.js
index f5d6806..8edd8da 100644
--- a/unpackage/dist/dev/mp-weixin/pages/device/detail.js
+++ b/unpackage/dist/dev/mp-weixin/pages/device/detail.js
@@ -8,6 +8,7 @@ const _sfc_main = {
   setup(__props) {
     const deviceInfo = common_vendor.ref({});
     const deviceId = common_vendor.ref("");
+    const deviceFeeConfig = common_vendor.ref({});
     const deviceLocation = common_vendor.ref("一号教学楼大厅");
     const batteryLevel = common_vendor.ref(95);
     const hasActiveOrder = common_vendor.ref(false);
@@ -21,7 +22,7 @@ const _sfc_main = {
     common_vendor.onLoad((options) => {
       deviceId.value = options.deviceNo;
       checkOrderStatus();
-      common_vendor.index.__f__("log", "at pages/device/detail.vue:199", options.deviceNo);
+      common_vendor.index.__f__("log", "at pages/device/detail.vue:200", options.deviceNo);
       fetchDeviceInfo();
     });
     common_vendor.onMounted(() => {
@@ -30,18 +31,18 @@ const _sfc_main = {
     const checkUserPhone = async () => {
       try {
         const userInfoRes = await util_index.getUserInfo();
-        common_vendor.index.__f__("log", "at pages/device/detail.vue:210", userInfoRes.data.phone, "getUserInfoPhone");
+        common_vendor.index.__f__("log", "at pages/device/detail.vue:211", userInfoRes.data.phone, "getUserInfoPhone");
         if (userInfoRes.code == 200 && userInfoRes.data && userInfoRes.data.phone) {
           phoneNumber.value = userInfoRes.data.phone;
         } else {
           showPhoneAuthPopup.value = true;
         }
       } catch (error) {
-        common_vendor.index.__f__("error", "at pages/device/detail.vue:219", "获取用户信息失败:", error);
+        common_vendor.index.__f__("error", "at pages/device/detail.vue:220", "获取用户信息失败:", error);
       }
     };
     const onGetPhoneNumber = (e) => {
-      common_vendor.index.__f__("log", "at pages/device/detail.vue:225", "getPhoneNumber event:", e.detail);
+      common_vendor.index.__f__("log", "at pages/device/detail.vue:226", "getPhoneNumber event:", e.detail);
       if (e.detail.errMsg && e.detail.errMsg.includes("deny")) {
         common_vendor.index.showToast({
           title: "需要授权手机号才能使用设备",
@@ -53,13 +54,13 @@ const _sfc_main = {
         common_vendor.index.showLoading({
           title: "获取中..."
         });
-        common_vendor.index.__f__("log", "at pages/device/detail.vue:242", "获取到的授权code:", e.detail.code);
+        common_vendor.index.__f__("log", "at pages/device/detail.vue:243", "获取到的授权code:", e.detail.code);
         try {
           util_index.getUserPhoneNumber(e.detail.code).then((res) => {
-            common_vendor.index.__f__("log", "at pages/device/detail.vue:248", "获取手机号API响应原始数据:", JSON.stringify(res));
+            common_vendor.index.__f__("log", "at pages/device/detail.vue:249", "获取手机号API响应原始数据:", JSON.stringify(res));
             common_vendor.index.hideLoading();
             if (!res) {
-              common_vendor.index.__f__("error", "at pages/device/detail.vue:253", "API返回数据为空");
+              common_vendor.index.__f__("error", "at pages/device/detail.vue:254", "API返回数据为空");
               common_vendor.index.showModal({
                 title: "数据异常",
                 content: "API返回为空",
@@ -67,8 +68,8 @@ const _sfc_main = {
               });
               return;
             }
-            common_vendor.index.__f__("log", "at pages/device/detail.vue:263", "响应code:", res.code, "响应类型:", typeof res.code);
-            common_vendor.index.__f__("log", "at pages/device/detail.vue:264", "是否有data:", !!res.data, "是否有phone:", res.data && !!res.data.phone);
+            common_vendor.index.__f__("log", "at pages/device/detail.vue:264", "响应code:", res.code, "响应类型:", typeof res.code);
+            common_vendor.index.__f__("log", "at pages/device/detail.vue:265", "是否有data:", !!res.data, "是否有phone:", res.data && !!res.data.phone);
             if (res.code == 200 && res.data && res.data.phoneNumber) {
               phoneNumber.value = res.data.phoneNumber;
               showPhoneAuthPopup.value = false;
@@ -77,7 +78,7 @@ const _sfc_main = {
                 icon: "success"
               });
             } else {
-              common_vendor.index.__f__("warn", "at pages/device/detail.vue:276", "获取手机号响应异常:", res.msg || "未知错误");
+              common_vendor.index.__f__("warn", "at pages/device/detail.vue:277", "获取手机号响应异常:", res.msg || "未知错误");
               common_vendor.index.showModal({
                 title: "获取手机号异常",
                 content: `状态码: ${res.code}, 消息: ${res.msg || "无"}`,
@@ -86,7 +87,7 @@ const _sfc_main = {
             }
           }).catch((err) => {
             common_vendor.index.hideLoading();
-            common_vendor.index.__f__("error", "at pages/device/detail.vue:286", "获取手机号码失败(catch):", err);
+            common_vendor.index.__f__("error", "at pages/device/detail.vue:287", "获取手机号码失败(catch):", err);
             let errMsg = err.message || err.toString();
             common_vendor.index.showModal({
               title: "获取手机号失败",
@@ -96,7 +97,7 @@ const _sfc_main = {
           });
         } catch (outerError) {
           common_vendor.index.hideLoading();
-          common_vendor.index.__f__("error", "at pages/device/detail.vue:298", "获取手机号外部错误:", outerError);
+          common_vendor.index.__f__("error", "at pages/device/detail.vue:299", "获取手机号外部错误:", outerError);
           common_vendor.index.showModal({
             title: "意外错误",
             content: "处理过程发生异常: " + (outerError.message || outerError),
@@ -128,6 +129,8 @@ const _sfc_main = {
             deviceStatus.class = "offline";
           }
         }
+        common_vendor.index.__f__("log", "at pages/device/detail.vue:337", "feeconfig", deviceInfo.value.feeConfig);
+        deviceFeeConfig.value = JSON.parse(deviceInfo.value.feeConfig)[0] || {};
       }
     };
     const showLoginTip = () => {
@@ -207,17 +210,17 @@ const _sfc_main = {
             packagePrice: parseFloat(selectedPkg.price)
           });
           if (updateRes.code !== 200) {
-            common_vendor.index.__f__("warn", "at pages/device/detail.vue:441", "更新订单套餐信息失败:", updateRes.msg);
+            common_vendor.index.__f__("warn", "at pages/device/detail.vue:445", "更新订单套餐信息失败:", updateRes.msg);
           } else {
-            common_vendor.index.__f__("log", "at pages/device/detail.vue:444", "订单套餐信息已提前更新");
+            common_vendor.index.__f__("log", "at pages/device/detail.vue:448", "订单套餐信息已提前更新");
           }
         } catch (updateError) {
-          common_vendor.index.__f__("error", "at pages/device/detail.vue:447", "更新订单套餐信息时出错:", updateError);
+          common_vendor.index.__f__("error", "at pages/device/detail.vue:451", "更新订单套餐信息时出错:", updateError);
         }
         if (payWay == "wx-pay") {
           common_vendor.index.hideLoading();
           const res = await config_user.getOrderByOrderNo(order.orderNo);
-          common_vendor.index.__f__("log", "at pages/device/detail.vue:456", res);
+          common_vendor.index.__f__("log", "at pages/device/detail.vue:460", res);
           const deposit = parseFloat(deviceInfo.value.depositAmount);
           const packagePrice = parseFloat(selectedPkg.price);
           const totalAmount = (deposit + packagePrice).toFixed(2);
@@ -234,7 +237,7 @@ const _sfc_main = {
               const payResult = await util_index.initiateWeChatScorePayment(res);
               if (payResult.errCode == "0") {
                 const res2 = await config_user.getOrderByOrderNoScorePayStatus(order.orderNo);
-                common_vendor.index.__f__("log", "at pages/device/detail.vue:484", res2.data.orderStatus);
+                common_vendor.index.__f__("log", "at pages/device/detail.vue:488", res2.data.orderStatus);
                 if (res2.data.orderStatus == "in_used") {
                   common_vendor.index.showToast({
                     title: "设备租借成功",
@@ -291,17 +294,18 @@ const _sfc_main = {
         f: common_assets._imports_1$2,
         g: batteryLevel.value < 20 ? 1 : "",
         h: common_vendor.t(batteryLevel.value),
-        i: common_vendor.t(hasActiveOrder.value ? "归还设备" : "免押租借"),
-        j: hasActiveOrder.value ? 1 : "",
-        k: common_vendor.o(($event) => handleRent("wx-score-pay")),
-        l: common_assets._imports_0$2,
-        m: common_vendor.o(($event) => handleRent("wx-pay")),
-        n: showPhoneAuthPopup.value
+        i: common_vendor.t(deviceFeeConfig.value.maxHourPrice),
+        j: common_vendor.t(deviceInfo.value.depositAmount),
+        k: common_vendor.t(hasActiveOrder.value ? "归还设备" : "免押租借"),
+        l: hasActiveOrder.value ? 1 : "",
+        m: common_vendor.o(($event) => handleRent("wx-score-pay")),
+        n: common_assets._imports_0$2,
+        o: showPhoneAuthPopup.value
       }, showPhoneAuthPopup.value ? {
-        o: common_vendor.o(() => {
+        p: common_vendor.o(() => {
         }),
-        p: common_vendor.o(onGetPhoneNumber),
-        q: common_vendor.o(($event) => showPhoneAuthPopup.value = false)
+        q: common_vendor.o(onGetPhoneNumber),
+        r: common_vendor.o(($event) => showPhoneAuthPopup.value = false)
       } : {});
     };
   }
diff --git a/unpackage/dist/dev/mp-weixin/pages/device/detail.wxml b/unpackage/dist/dev/mp-weixin/pages/device/detail.wxml
index bdae10f..83f1305 100644
--- a/unpackage/dist/dev/mp-weixin/pages/device/detail.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/device/detail.wxml
@@ -1 +1 @@
-<view class="container data-v-d65de3a7"><view class="device-header data-v-d65de3a7"><view class="{{['device-status-card', 'data-v-d65de3a7', b]}}"><view class="status-indicator data-v-d65de3a7"></view><text class="status-text data-v-d65de3a7">{{a}}</text></view><view class="device-title data-v-d65de3a7"><text class="name data-v-d65de3a7">共享风扇</text><view class="device-meta data-v-d65de3a7"><text class="id-label data-v-d65de3a7">设备号：</text><text class="id-value data-v-d65de3a7">{{c}}</text></view></view></view><view class="card device-info-card data-v-d65de3a7"><view class="card-row data-v-d65de3a7"><view class="card-item data-v-d65de3a7"><view class="item-icon location-icon data-v-d65de3a7"><image class="data-v-d65de3a7" src="{{d}}" mode="aspectFill" style="width:45rpx;height:45rpx"></image></view><view class="item-content data-v-d65de3a7"><text class="item-label data-v-d65de3a7">当前位置</text><text class="item-value data-v-d65de3a7">{{e}}</text></view></view><view class="card-item data-v-d65de3a7"><view class="{{['item-icon', 'battery-icon', 'data-v-d65de3a7', g && 'battery-low']}}"><image class="data-v-d65de3a7" src="{{f}}" mode="aspectFill" style="width:45rpx;height:45rpx"></image></view><view class="item-content data-v-d65de3a7"><text class="item-label data-v-d65de3a7">电池电量</text><text class="item-value data-v-d65de3a7">{{h}}%</text></view></view></view></view><view class="card pricing-card data-v-d65de3a7"><view class="card-header data-v-d65de3a7"><text class="card-title data-v-d65de3a7">计费规则</text></view><view class="pricing-banner data-v-d65de3a7"><view class="pricing-main data-v-d65de3a7"><text class="price data-v-d65de3a7">¥5.00</text><text class="unit data-v-d65de3a7">/小时</text></view><text class="cap-price data-v-d65de3a7">封顶 ¥99</text></view><view class="pricing-rules data-v-d65de3a7"><view class="rule-item data-v-d65de3a7"><view class="rule-dot data-v-d65de3a7"></view><text class="rule-text data-v-d65de3a7">不足60分钟按60分钟计费</text></view><view class="rule-item data-v-d65de3a7"><view class="rule-dot data-v-d65de3a7"></view><text class="rule-text data-v-d65de3a7">持续计费至99元视为买断</text></view></view></view><view class="card notice-card data-v-d65de3a7"><view class="card-header data-v-d65de3a7"><text class="card-title data-v-d65de3a7">使用须知</text></view><view class="notice-items data-v-d65de3a7"><view class="notice-item data-v-d65de3a7"><view class="notice-dot data-v-d65de3a7"></view><text class="notice-text data-v-d65de3a7">请在使用前检查设备是否完好</text></view><view class="notice-item data-v-d65de3a7"><view class="notice-dot data-v-d65de3a7"></view><text class="notice-text data-v-d65de3a7">请在指定区域内使用设备</text></view><view class="notice-item data-v-d65de3a7"><view class="notice-dot data-v-d65de3a7"></view><text class="notice-text data-v-d65de3a7">归还时请确保设备完好，避免损坏</text></view></view></view><view class="footer data-v-d65de3a7"><button class="{{['rent-button', 'data-v-d65de3a7', j && 'return-button']}}" bindtap="{{k}}"><text class="data-v-d65de3a7">{{i}}</text></button><view class="wechat-credit data-v-d65de3a7"><image src="{{l}}" mode="aspectFit" class="wx-icon data-v-d65de3a7"></image><view class="credit-text data-v-d65de3a7"><text class="data-v-d65de3a7">微信支付分</text><text class="credit-divider data-v-d65de3a7">|</text><text class="credit-score data-v-d65de3a7">550分及以上优享</text></view></view><view class=" data-v-d65de3a7" style="align-items:center;align-content:center;text-align:center;line-height:50rpx" bindtap="{{m}}"> 无法免押点这里></view></view><view wx:if="{{n}}" class="phone-auth-popup data-v-d65de3a7"><view class="popup-mask data-v-d65de3a7" catchtap="{{o}}"></view><view class="popup-content data-v-d65de3a7"><view class="popup-header data-v-d65de3a7"><text class="popup-title data-v-d65de3a7">授权获取手机号</text></view><view class="popup-body data-v-d65de3a7"><view class="auth-desc data-v-d65de3a7"><text class="data-v-d65de3a7">为了提供更好的服务，需要授权获取您的手机号</text></view><button class="auth-btn data-v-d65de3a7" open-type="getPhoneNumber" bindgetphonenumber="{{p}}"> 一键获取手机号 </button><view class="auth-cancel data-v-d65de3a7" bindtap="{{q}}"><text class="data-v-d65de3a7">暂不授权</text></view></view></view></view></view>
\ No newline at end of file
+<view class="container data-v-d65de3a7"><view class="device-header data-v-d65de3a7"><view class="{{['device-status-card', 'data-v-d65de3a7', b]}}"><view class="status-indicator data-v-d65de3a7"></view><text class="status-text data-v-d65de3a7">{{a}}</text></view><view class="device-title data-v-d65de3a7"><text class="name data-v-d65de3a7">共享风扇</text><view class="device-meta data-v-d65de3a7"><text class="id-label data-v-d65de3a7">设备号：</text><text class="id-value data-v-d65de3a7">{{c}}</text></view></view></view><view class="card device-info-card data-v-d65de3a7"><view class="card-row data-v-d65de3a7"><view class="card-item data-v-d65de3a7"><view class="item-icon location-icon data-v-d65de3a7"><image class="data-v-d65de3a7" src="{{d}}" mode="aspectFill" style="width:45rpx;height:45rpx"></image></view><view class="item-content data-v-d65de3a7"><text class="item-label data-v-d65de3a7">当前位置</text><text class="item-value data-v-d65de3a7">{{e}}</text></view></view><view class="card-item data-v-d65de3a7"><view class="{{['item-icon', 'battery-icon', 'data-v-d65de3a7', g && 'battery-low']}}"><image class="data-v-d65de3a7" src="{{f}}" mode="aspectFill" style="width:45rpx;height:45rpx"></image></view><view class="item-content data-v-d65de3a7"><text class="item-label data-v-d65de3a7">电池电量</text><text class="item-value data-v-d65de3a7">{{h}}%</text></view></view></view></view><view class="card pricing-card data-v-d65de3a7"><view class="card-header data-v-d65de3a7"><text class="card-title data-v-d65de3a7">计费规则</text></view><view class="pricing-banner data-v-d65de3a7"><view class="pricing-main data-v-d65de3a7"><text class="price data-v-d65de3a7">¥{{i}}</text><text class="unit data-v-d65de3a7">/小时</text></view><text class="cap-price data-v-d65de3a7">封顶 ¥{{j}}</text></view><view class="pricing-rules data-v-d65de3a7"><view class="rule-item data-v-d65de3a7"><view class="rule-dot data-v-d65de3a7"></view><text class="rule-text data-v-d65de3a7">不足60分钟按60分钟计费</text></view><view class="rule-item data-v-d65de3a7"><view class="rule-dot data-v-d65de3a7"></view><text class="rule-text data-v-d65de3a7">持续计费至99元视为买断</text></view></view></view><view class="card notice-card data-v-d65de3a7"><view class="card-header data-v-d65de3a7"><text class="card-title data-v-d65de3a7">使用须知</text></view><view class="notice-items data-v-d65de3a7"><view class="notice-item data-v-d65de3a7"><view class="notice-dot data-v-d65de3a7"></view><text class="notice-text data-v-d65de3a7">请在使用前检查设备是否完好</text></view><view class="notice-item data-v-d65de3a7"><view class="notice-dot data-v-d65de3a7"></view><text class="notice-text data-v-d65de3a7">请在指定区域内使用设备</text></view><view class="notice-item data-v-d65de3a7"><view class="notice-dot data-v-d65de3a7"></view><text class="notice-text data-v-d65de3a7">归还时请确保设备完好，避免损坏</text></view></view></view><view class="footer data-v-d65de3a7"><button class="{{['rent-button', 'data-v-d65de3a7', l && 'return-button']}}" bindtap="{{m}}"><text class="data-v-d65de3a7">{{k}}</text></button><view class="wechat-credit data-v-d65de3a7"><image src="{{n}}" mode="aspectFit" class="wx-icon data-v-d65de3a7"></image><view class="credit-text data-v-d65de3a7"><text class="data-v-d65de3a7">微信支付分</text><text class="credit-divider data-v-d65de3a7">|</text><text class="credit-score data-v-d65de3a7">550分及以上优享</text></view></view></view><view wx:if="{{o}}" class="phone-auth-popup data-v-d65de3a7"><view class="popup-mask data-v-d65de3a7" catchtap="{{p}}"></view><view class="popup-content data-v-d65de3a7"><view class="popup-header data-v-d65de3a7"><text class="popup-title data-v-d65de3a7">授权获取手机号</text></view><view class="popup-body data-v-d65de3a7"><view class="auth-desc data-v-d65de3a7"><text class="data-v-d65de3a7">为了提供更好的服务，需要授权获取您的手机号</text></view><button class="auth-btn data-v-d65de3a7" open-type="getPhoneNumber" bindgetphonenumber="{{q}}"> 一键获取手机号 </button><view class="auth-cancel data-v-d65de3a7" bindtap="{{r}}"><text class="data-v-d65de3a7">暂不授权</text></view></view></view></view></view>
\ No newline at end of file