From 41b409c327a1bf29f6f963ba279afda50a083002 Mon Sep 17 00:00:00 2001
From: 8vd8 <1936002261@qq.com>
Date: Fri, 18 Apr 2025 18:04:21 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8F=96=E6=B6=88=E4=BA=86=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E8=BD=AE=E8=AF=A2=20=20=E6=9B=B4=E6=96=B0=E6=8A=BC?=
 =?UTF-8?q?=E9=87=91=E6=8F=90=E7=8E=B0=E5=8F=8A=E8=AE=A2=E5=8D=95=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=8A=9F=E8=83=BD=20=20=E5=BD=92=E8=BF=98=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F=E4=B9=8B=E5=90=8E=E4=B8=8D=E4=BC=9A=E6=9C=89=E5=BD=92?=
 =?UTF-8?q?=E8=BF=98=E6=88=90=E5=8A=9F=E7=9A=84=E5=BC=B9=E7=AA=97=E5=87=BA?=
 =?UTF-8?q?=E7=8E=B0=20=20=E6=8F=90=E7=8E=B0=E7=9A=84=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E7=9B=AE=E5=89=8D=E5=88=A4=E6=96=AD=E6=8A=BC=E9=87=91=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=92=8C=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修改了提现API的参数名称，从订单ID更改为订单号，并新增了根据设备号和状态查询订单列表的功能。同时，优化了用户在提现过程中的错误提示，确保用户能够获得更清晰的反馈。更新了多个页面的逻辑，提升了整体用户体验。
---
 config/user.js                                |  46 ++++++++-
 pages/deposit/index.vue                       |  82 +++++++--------
 pages/device/detail.vue                       |  58 ++++++++++-
 pages/order/payment.vue                       | Bin 13896 -> 27896 bytes
 pages/serve/bagCheck/index.vue                |  91 +++++++++++-----
 .../.sourcemap/mp-weixin/config/user.js.map   |   2 +-
 .../mp-weixin/pages/deposit/index.js.map      |   2 +-
 .../mp-weixin/pages/device/detail.js.map      |   2 +-
 .../mp-weixin/pages/order/payment.js.map      |   2 +-
 .../pages/serve/bagCheck/index.js.map         |   2 +-
 unpackage/dist/dev/mp-weixin/common/vendor.js |   2 +-
 unpackage/dist/dev/mp-weixin/config/user.js   |  29 ++++--
 .../dist/dev/mp-weixin/pages/deposit/index.js |  68 ++++++------
 .../dist/dev/mp-weixin/pages/device/detail.js |  43 +++++++-
 .../dist/dev/mp-weixin/pages/order/payment.js |  97 ++++++++----------
 .../mp-weixin/pages/serve/bagCheck/index.js   |  70 ++++++++-----
 16 files changed, 389 insertions(+), 207 deletions(-)

diff --git a/config/user.js b/config/user.js
index f3d7b7a..efe40c7 100644
--- a/config/user.js
+++ b/config/user.js
@@ -19,10 +19,10 @@ export const getMyIndexInfo = (data) => {
 }
 
 // 添加押金提现API
-export const withdrawDeposit = (orderId) => {
-    console.log('调用提现API，订单ID：', orderId)
+export const withdrawDeposit = (orderNo) => {
+    console.log('调用提现API，订单号：', orderNo)
     return request({
-        url: `/app/withdraw/add/${orderId}`,
+        url: `/app/withdraw/add/${orderNo}`,
         method: 'get',
         hideLoading: true
     })
@@ -46,6 +46,17 @@ export const queryHasOrder = (deviceNo) => {
     })
 }
 
+// 查询指定设备号下，特定状态的订单列表
+export const checkOrdersByStatus = (deviceNo, statuses) => {
+    // statuses 是一个包含状态字符串的数组，例如 ['in_used', 'waiting_for_payment']
+    const statusQuery = statuses.join(','); // 后端需要支持逗号分隔的状态查询
+    return request({
+        url: `/app/order/list?deviceNo=${deviceNo}&orderStatus=${statusQuery}`,
+        method: 'get',
+		hideLoading: true // 隐藏加载提示，避免干扰用户
+    })
+}
+
 //设备查询
 export const getDeviceInfo = (deviceNo) => {
     return request({
@@ -131,3 +142,32 @@ export const forcefOpenEmptyGrid = (deviceNo) => {
         method: 'post'
     })
 }
+
+// 通过订单号获取订单信息
+export const getOrderByOrderNo = (orderNo) => {
+    console.log('通过订单号获取订单信息：', orderNo)
+    return request({
+        url: `/app/order/byOrderNo/${orderNo}`,
+        method: 'get',
+        hideLoading: true
+    })
+}
+
+// 更新订单套餐信息
+export const updateOrderPackage = (data) => {
+    console.log('更新订单套餐信息：', data)
+    return request({
+        url: '/app/device/updateOrderPackage',
+        method: 'post',
+        data
+    })
+}
+
+// 更新用户余额
+export const updateUserBalance = (orderId) => {
+    return request({
+        url: `/app/user/updateBalance/${orderId}`,
+        method: 'post',
+        hideLoading: true
+    })
+}
diff --git a/pages/deposit/index.vue b/pages/deposit/index.vue
index 89de25b..84c6aad 100644
--- a/pages/deposit/index.vue
+++ b/pages/deposit/index.vue
@@ -40,7 +40,7 @@
 
 <script>
 import { getUserInfo } from '../../util/index.js'
-import { withdrawDeposit, queryById, getOrderList } from '../../config/user.js'
+import { withdrawDeposit,queryById } from '../../config/user.js'
 
 export default {
   data() {
@@ -48,8 +48,7 @@ export default {
       depositAmount: '0.00',
       orderNo: '',
       records: [],
-      orderId: '',
-      isLoading: false
+	  orderId:''
     }
   },
   onLoad() {
@@ -61,34 +60,15 @@ export default {
   methods: {
     async loadUserInfo() {
       try {
-        this.isLoading = true
         const res = await getUserInfo()
-        console.log('loadUserInfo', res);
+		console.log('loadUserInfo',res);
         if (res.code === 200) {
           this.depositAmount = res.data.balanceAmount || '0.00'
           this.orderNo = res.data.latestOrderNo || ''
-          this.orderId = res.data.latestOrderId || ''
-          
-          // 如果有余额但没有orderId，尝试查询用户订单列表获取
-          if (parseFloat(this.depositAmount) > 0 && !this.orderId) {
-            console.log('没有latestOrderId但有余额，尝试查询订单列表')
-            const orderRes = await getOrderList({ pageNum: 1, pageSize: 10 })
-            if (orderRes.code === 200 && orderRes.data && orderRes.data.records && orderRes.data.records.length > 0) {
-              // 查找最近的包含押金的订单
-              const depositOrder = orderRes.data.records.find(order => 
-                order.depositAmount && parseFloat(order.depositAmount) > 0
-              )
-              
-              if (depositOrder) {
-                console.log('找到押金订单:', depositOrder)
-                this.orderId = depositOrder.orderId
-                this.orderNo = depositOrder.orderNo
-              }
-            }
-          }
+		  this.orderId = res.data.latestOrderId||''
           
           // 如果存在余额，获取押金记录
-          if (parseFloat(this.depositAmount) > 0) {
+          if (parseFloat(this.depositAmount) > 0 && this.orderNo) {
             this.records = [
               { 
                 type: '支付', 
@@ -106,8 +86,6 @@ export default {
           title: '获取用户信息失败',
           icon: 'none'
         })
-      } finally {
-        this.isLoading = false
       }
     },
     async handleWithdraw() {
@@ -118,14 +96,15 @@ export default {
         })
         return
       }
-      
-      if (!this.orderId) {
-        uni.showToast({
-          title: '无法找到押金订单',
-          icon: 'none'
-        })
-        return
-      }
+	  const res  = await queryById(Number(this.orderNo))
+	  console.log(res);
+	  // if(this.orderNo.length!=0){
+		 //  uni.showToast({
+		 //  	title:'当前存在进行中的订单',
+			// icon:'none'
+		 //  })
+		 //  return
+	  // }
       
       uni.showModal({
         title: '确认提现',
@@ -137,8 +116,8 @@ export default {
             })
             
             try {
-              console.log('发起提现请求，订单ID：', this.orderId)
-              const result = await withdrawDeposit(this.orderId)
+              console.log('发起提现请求，订单号：', this.orderNo)
+              const result = await withdrawDeposit(this.orderNo)
               console.log('提现响应：', result)
               
               if (result.code === 200) {
@@ -166,9 +145,32 @@ export default {
             } catch (error) {
               console.error('提现失败：', error)
               uni.hideLoading()
-              uni.showToast({
-                title: error.message || '提现失败，请稍后再试',
-                icon: 'none'
+              
+              // 更详细的错误处理
+              let errorMessage = '提现失败，请稍后再试';
+              
+              // 如果有具体错误信息，使用它
+              if (error.message) {
+                // 常见错误消息处理
+                if (error.message.includes('尚未归还')) {
+                  errorMessage = '当前订单尚未归还，请归还后再提现';
+                } else if (error.message.includes('已退还')) {
+                  errorMessage = '押金已退还，无需重复提现';
+                } else if (error.message.includes('处理中')) {
+                  errorMessage = '押金退还处理中，请耐心等待';
+                } else if (error.message.includes('余额为0')) {
+                  errorMessage = '账户余额为0，无法提现';
+                } else {
+                  // 使用后端返回的具体错误消息
+                  errorMessage = error.message;
+                }
+              }
+              
+              // 显示错误提示
+              uni.showModal({
+                title: '提现失败',
+                content: errorMessage,
+                showCancel: false
               })
             }
           }
diff --git a/pages/device/detail.vue b/pages/device/detail.vue
index 5e3a204..7b3d1a6 100644
--- a/pages/device/detail.vue
+++ b/pages/device/detail.vue
@@ -85,7 +85,8 @@
 <script>
 	import {
 		getDeviceInfo,
-		rentPowerBank
+		rentPowerBank,
+		updateOrderPackage
 	} from '@/config/user.js'
 	export default {
 		data() {
@@ -123,6 +124,7 @@
 		onLoad(options) {
 			// console.log(options);
 			this.deviceId = options.deviceNo
+			this.checkOrderStatus() // 新增状态检查
 			console.log(options.deviceNo);
 			this.getDeviceInfo()
 		},
@@ -162,10 +164,22 @@
 					const result = await this.$api.checkActiveOrder()
 
 					if (result.hasOrder) {
-						// 如果有正在进行的订单，跳转到归还页面，带上设备ID
-						uni.redirectTo({
+						const order = result.order; // 假设后端返回 order 对象
+
+						// 检查订单状态
+						if (order.status === 'waiting_for_payment') {
+							// 跳转支付页面，带上订单ID
+    uni.redirectTo({
+        url: `/pages/order/payment?orderId=${order.orderId}&deviceId=${this.deviceId}`
+    })
+						}else if(order.status === 'in_used'){
+							// 如果有正在进行的订单，跳转到归还页面，带上设备ID
+							uni.redirectTo({
 							url: `/pages/device/return?deviceId=${this.deviceId}`
 						})
+						}
+						
+						
 					}
 				} catch (error) {
 					uni.showToast({
@@ -230,12 +244,46 @@
 
 					// 获取后端返回的订单信息
 					const order = rentResult.data
+					
+					// --- 新增：立即更新订单套餐信息 ---
+					try {
+					    let packageTimeMinutes = 0;
+					    if (selectedPkg.time.includes('小时')) {
+					        packageTimeMinutes = parseInt(selectedPkg.time) * 60;
+					    } else if (selectedPkg.time.includes('分钟')) {
+					        packageTimeMinutes = parseInt(selectedPkg.time);
+					    } else {
+							packageTimeMinutes = parseInt(selectedPkg.time) * 60; // 默认按小时处理
+						}
+						
+					    const updateRes = await updateOrderPackage({
+					        orderId: order.orderId,
+					        packageTime: packageTimeMinutes,
+					        packagePrice: parseFloat(selectedPkg.price)
+					    });
+					    if (updateRes.code !== 200) {
+					        console.warn("更新订单套餐信息失败:", updateRes.msg);
+					        // 这里可以选择是否提示用户或阻止流程，当前不阻止
+					    } else {
+							console.log("订单套餐信息已提前更新");
+						}
+					} catch (updateError) {
+					    console.error("更新订单套餐信息时出错:", updateError);
+					    // 即使更新失败，也继续尝试跳转支付，让用户完成支付
+					}
+					// --- 更新结束 ---
+					
+					// --- 新增：计算总金额 ---
+					const deposit = 99.00; // 固定押金
+					const packagePrice = parseFloat(selectedPkg.price);
+					const totalAmount = (deposit + packagePrice).toFixed(2);
+					// --- 计算结束 ---
 
 					uni.hideLoading()
 
-					// 跳转到订单支付页面，传递订单ID和套餐信息
+					// 跳转到订单支付页面，传递订单ID、套餐信息和总金额
 					uni.redirectTo({
-						url: `/pages/order/payment?orderId=${order.orderId}&packageTime=${selectedPkg.time}&packagePrice=${selectedPkg.price}`
+						url: `/pages/order/payment?orderId=${order.orderId}&packageTime=${selectedPkg.time}&packagePrice=${selectedPkg.price}&totalAmount=${totalAmount}`
 					})
 				} catch (error) {
 					uni.hideLoading()
diff --git a/pages/order/payment.vue b/pages/order/payment.vue
index 1aae314665b57bfe545d22db9e159ea9ba3ddbb9..5ac4a89d3624b4ac0a3391444c224200ac8ff702 100644
GIT binary patch
literal 27896
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
ZJg1&kXX`THB|^{iudd44>g&VRZvd#YWv2iD

literal 13896
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

diff --git a/pages/serve/bagCheck/index.vue b/pages/serve/bagCheck/index.vue
index c56d8e5..b500946 100644
--- a/pages/serve/bagCheck/index.vue
+++ b/pages/serve/bagCheck/index.vue
@@ -9,9 +9,15 @@
 		wxLogin,
 	} from '../../../util/index'
 
+	import {
+		getMyIndexInfo
+	} from "../../../config/user.js";
 	import {
 		queryHasOrder
-	} from '@/config/user.js'
+	} from "../../../config/user.js";
+	import {
+		checkOrdersByStatus
+	} from "../../../config/user.js";
 
 	export default {
 		data() {
@@ -20,46 +26,79 @@
 			}
 		},
 		async onLoad(option) {
+			console.log('bagCheck onLoad option:', option);
 			try {
 				uni.showLoading({
-					title: '加载中...'
+					title: '处理中...',
+					mask: true
 				});
 
-				if (!uni.getStorageSync('token')) {
-					await wxLogin();
+				// 检查是否传入设备编号
+				if (!option || !option.deviceNo) {
+					throw new Error('未识别到设备编号');
 				}
 
-				if (!option.deviceNo) {
-					uni.hideLoading();
-					uni.showToast({
-						title: '设备编号不能为空',
-						icon: 'none'
-					});
-					return;
-				}
+				const deviceNo = option.deviceNo;
 				
-				// 查询用户是否有使用中(in_used)的订单
-				const result = await queryHasOrder(option.deviceNo);
-				uni.hideLoading();
+				// 检查用户是否有进行中(in_used)或待支付(waiting_for_payment)的订单
+				const statusesToCheck = ['in_used', 'waiting_for_payment'];
+				const res = await checkOrdersByStatus(deviceNo, statusesToCheck);
 
-				if (result.data && result.data.data && result.data.data.length > 0) {
-					// 如果有使用中的订单，直接跳转到归还页面
-					uni.redirectTo({
-						url: `/pages/device/return?deviceNo=${option.deviceNo}`
-					});
+				if (res.code === 200 && res.data && res.data.length > 0) {
+					// 找到相关订单，取最新的一条
+					const latestOrder = res.data[0]; // 假设返回结果按时间倒序
+
+					if (latestOrder.orderStatus === 'in_used') {
+						// 如果是使用中的订单，跳转到归还页面
+						console.log('检测到使用中订单，跳转归还页:', latestOrder.orderId);
+						uni.redirectTo({
+							url: `/pages/device/return?orderId=${latestOrder.orderId}`
+						});
+					} else if (latestOrder.orderStatus === 'waiting_for_payment') {
+						// 如果是待支付订单，跳转到支付页面，并传递必要信息
+						console.log('检测到待支付订单，跳转支付页:', latestOrder.orderId);
+						const packageTime = latestOrder.packageTime ? `${latestOrder.packageTime / 60}小时` : '默认套餐'; // 示例转换
+						const packagePrice = latestOrder.packagePrice || '0.00';
+						const depositAmount = latestOrder.depositAmount || '99.00';
+						const totalAmount = (parseFloat(depositAmount) + parseFloat(packagePrice)).toFixed(2);
+						
+						uni.redirectTo({
+							url: `/pages/order/payment?orderId=${latestOrder.orderId}&packageTime=${packageTime}&packagePrice=${packagePrice}&totalAmount=${totalAmount}&depositAmount=${depositAmount}`
+						});
+					} else {
+						// 其他状态（理论上不应该到这里，除非statusesToCheck配置错误），默认到详情页
+						console.log('检测到其他状态订单，跳转详情页:', latestOrder.orderId);
+						uni.redirectTo({
+							url: `/pages/device/detail?deviceNo=${deviceNo}`
+						});
+					}
 				} else {
-					// 如果没有使用中的订单，跳转到设备详情页面进行租借
+					// 没有找到相关状态的订单，跳转到设备详情页进行租借
+					console.log('未检测到相关订单，跳转详情页');
 					uni.redirectTo({
-						url: `/pages/device/detail?deviceNo=${option.deviceNo}`
+						url: `/pages/device/detail?deviceNo=${deviceNo}`
 					});
 				}
 			} catch (error) {
-				uni.hideLoading();
+				console.error('扫码检查订单失败:', error);
 				uni.showToast({
-					title: '页面加载失败，请重试',
-					icon: 'none'
+					title: error.message || '处理失败，请稍后重试',
+					icon: 'none',
+					duration: 2000
 				});
-				console.error('bagCheck onLoad error:', error);
+				// 错误时也尝试跳转到详情页，给用户一个操作入口
+				setTimeout(() => {
+				    if (option && option.deviceNo) {
+					    uni.redirectTo({
+					        url: `/pages/device/detail?deviceNo=${option.deviceNo}`
+					    });
+				    } else {
+                        // 如果连deviceNo都没有，则返回首页
+                        uni.switchTab({ url: '/pages/index/index' });
+                    }
+				}, 2000);
+			} finally {
+				uni.hideLoading();
 			}
 		},
 		methods: {
diff --git a/unpackage/dist/dev/.sourcemap/mp-weixin/config/user.js.map b/unpackage/dist/dev/.sourcemap/mp-weixin/config/user.js.map
index d6f3549..e019854 100644
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/config/user.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/config/user.js.map
@@ -1 +1 @@
-{"version":3,"file":"user.js","sources":["config/user.js"],"sourcesContent":["import request from './http'\n\n\nexport const login = (data) => {\n    return request({\n        url: '/app/user/login',\n        method: 'get',\n        data\n    })\n}\n\n\nexport const getMyIndexInfo = (data) => {\n    return request({\n        url: '/app/user/userInfo',\n        method: 'get',\n        data,\n    })\n}\n\n// 添加押金提现API\nexport const withdrawDeposit = (orderId) => {\n    console.log('调用提现API，订单ID：', orderId)\n    return request({\n        url: `/app/withdraw/add/${orderId}`,\n        method: 'get',\n        hideLoading: true\n    })\n}\n\n//获取所有全部订单\nexport const getOrderList = (data) => {\n    return request({\n        url: '/app/order/list',\n        method: 'get',\n        data,\n        hideLoading:true\n    })\n}\n\n//查询是否有订单\nexport const queryHasOrder = (deviceNo) => {\n    return request({\n        url: `/app/order/list?deviceNo=${deviceNo}&orderStatus=in_used`,\n        method: 'get',\n    })\n}\n\n//设备查询\nexport const getDeviceInfo = (deviceNo) => {\n    return request({\n        url: `/app/device/${deviceNo}`,\n        method: 'get',\n    })\n}\n\n\n//创建订单\nexport const createOrder = (data) => {\n    return request({\n        url: '/app/order/add',\n        method: 'post',\n        data,\n    })\n}\n\n//查询订单\nexport const queryById = (id) => {\n    console.log(`查询订单详情, orderId: ${id}`)\n    return request({\n        url: `/app/order/${id}`,\n        method: 'get',\n        hideLoading: true\n    })\n}\n\n\n//取消订单\nexport const cancelOrder = (data) => {\n    return request({\n        url: '/orderInfo/cancelOrder',\n        method: 'get',\n        data,\n    })\n}\n\n\n//结束订单\nexport const overOrderById = (orderId) => {\n    console.log(`调用结束订单API, orderId: ${orderId}`)\n    return request({\n        url: `/app/order/close/${orderId}`,\n        method: 'get',\n    })\n}\n\n//立即租借\nexport const rentPowerBank = (deviceNo, phone) => {\n    return request({\n        url: '/app/device/rentPowerBank',\n        method: 'post',\n        data: { deviceNo, phone }\n    })\n}\n\n//确认支付并弹出充电宝\nexport const confirmPaymentAndRent = (orderId) => {\n    console.log(`确认支付并弹出充电宝, orderId: ${orderId}`)\n    return request({\n        url: `/app/device/confirmPaymentAndRent?orderId=${orderId}`,\n        method: 'post'\n    })\n}\n\n\n\n//投诉反馈\nexport const addUserFeedback = (data) => {\n    return request({\n        url: '/app/feedback/add',\n        method: 'post',\n        data,\n    })\n}\n\n//强制打开空格子\nexport const forcefOpenEmptyGrid = (deviceNo) => {\n    console.log(`强制打开空格子, deviceNo: ${deviceNo}`)\n    return request({\n        url: `/app/device/forcef/${deviceNo}`,\n        method: 'post'\n    })\n}\n"],"names":["request","uni"],"mappings":";;;AAGY,MAAC,QAAQ,CAAC,SAAS;AAC3B,SAAOA,oBAAQ;AAAA,IACX,KAAK;AAAA,IACL,QAAQ;AAAA,IACR;AAAA,EACR,CAAK;AACL;AAGY,MAAC,iBAAiB,CAAC,SAAS;AACpC,SAAOA,oBAAQ;AAAA,IACX,KAAK;AAAA,IACL,QAAQ;AAAA,IACR;AAAA,EACR,CAAK;AACL;AAGY,MAAC,kBAAkB,CAAC,YAAY;AACxCC,gBAAAA,MAAA,MAAA,OAAA,wBAAY,iBAAiB,OAAO;AACpC,SAAOD,oBAAQ;AAAA,IACX,KAAK,qBAAqB,OAAO;AAAA,IACjC,QAAQ;AAAA,IACR,aAAa;AAAA,EACrB,CAAK;AACL;AAGY,MAAC,eAAe,CAAC,SAAS;AAClC,SAAOA,oBAAQ;AAAA,IACX,KAAK;AAAA,IACL,QAAQ;AAAA,IACR;AAAA,IACA,aAAY;AAAA,EACpB,CAAK;AACL;AAGY,MAAC,gBAAgB,CAAC,aAAa;AACvC,SAAOA,oBAAQ;AAAA,IACX,KAAK,4BAA4B,QAAQ;AAAA,IACzC,QAAQ;AAAA,EAChB,CAAK;AACL;AAGY,MAAC,gBAAgB,CAAC,aAAa;AACvC,SAAOA,oBAAQ;AAAA,IACX,KAAK,eAAe,QAAQ;AAAA,IAC5B,QAAQ;AAAA,EAChB,CAAK;AACL;AAaY,MAAC,YAAY,CAAC,OAAO;AAC7BC,gBAAA,MAAA,MAAA,OAAA,wBAAY,oBAAoB,EAAE,EAAE;AACpC,SAAOD,oBAAQ;AAAA,IACX,KAAK,cAAc,EAAE;AAAA,IACrB,QAAQ;AAAA,IACR,aAAa;AAAA,EACrB,CAAK;AACL;AAuBY,MAAC,gBAAgB,CAAC,UAAU,UAAU;AAC9C,SAAOA,oBAAQ;AAAA,IACX,KAAK;AAAA,IACL,QAAQ;AAAA,IACR,MAAM,EAAE,UAAU,MAAO;AAAA,EACjC,CAAK;AACL;AAGY,MAAC,wBAAwB,CAAC,YAAY;AAC9CC,gBAAY,MAAA,MAAA,OAAA,yBAAA,wBAAwB,OAAO,EAAE;AAC7C,SAAOD,oBAAQ;AAAA,IACX,KAAK,6CAA6C,OAAO;AAAA,IACzD,QAAQ;AAAA,EAChB,CAAK;AACL;;;;;;;;;;"}
\ No newline at end of file
+{"version":3,"file":"user.js","sources":["config/user.js"],"sourcesContent":["import request from './http'\n\n\nexport const login = (data) => {\n    return request({\n        url: '/app/user/login',\n        method: 'get',\n        data\n    })\n}\n\n\nexport const getMyIndexInfo = (data) => {\n    return request({\n        url: '/app/user/userInfo',\n        method: 'get',\n        data,\n    })\n}\n\n// 添加押金提现API\nexport const withdrawDeposit = (orderNo) => {\n    console.log('调用提现API，订单号：', orderNo)\n    return request({\n        url: `/app/withdraw/add/${orderNo}`,\n        method: 'get',\n        hideLoading: true\n    })\n}\n\n//获取所有全部订单\nexport const getOrderList = (data) => {\n    return request({\n        url: '/app/order/list',\n        method: 'get',\n        data,\n        hideLoading:true\n    })\n}\n\n//查询是否有订单\nexport const queryHasOrder = (deviceNo) => {\n    return request({\n        url: `/app/order/list?deviceNo=${deviceNo}&orderStatus=in_used`,\n        method: 'get',\n    })\n}\n\n// 查询指定设备号下，特定状态的订单列表\nexport const checkOrdersByStatus = (deviceNo, statuses) => {\n    // statuses 是一个包含状态字符串的数组，例如 ['in_used', 'waiting_for_payment']\n    const statusQuery = statuses.join(','); // 后端需要支持逗号分隔的状态查询\n    return request({\n        url: `/app/order/list?deviceNo=${deviceNo}&orderStatus=${statusQuery}`,\n        method: 'get',\n\t\thideLoading: true // 隐藏加载提示，避免干扰用户\n    })\n}\n\n//设备查询\nexport const getDeviceInfo = (deviceNo) => {\n    return request({\n        url: `/app/device/${deviceNo}`,\n        method: 'get',\n    })\n}\n\n\n//创建订单\nexport const createOrder = (data) => {\n    return request({\n        url: '/app/order/add',\n        method: 'post',\n        data,\n    })\n}\n\n//查询订单\nexport const queryById = (id) => {\n    return request({\n        url: `/app/order/${id}`,\n        method: 'get',\n        hideLoading: true\n    })\n}\n\n\n//取消订单\nexport const cancelOrder = (data) => {\n    return request({\n        url: '/orderInfo/cancelOrder',\n        method: 'get',\n        data,\n    })\n}\n\n\n//结束订单\nexport const overOrderById = (orderId) => {\n    console.log(`调用结束订单API, orderId: ${orderId}`)\n    return request({\n        url: `/app/order/close/${orderId}`,\n        method: 'get',\n    })\n}\n\n//立即租借\nexport const rentPowerBank = (deviceNo, phone) => {\n    return request({\n        url: '/app/device/rentPowerBank',\n        method: 'post',\n        data: { deviceNo, phone }\n    })\n}\n\n//确认支付并弹出充电宝\nexport const confirmPaymentAndRent = (orderId) => {\n    console.log(`确认支付并弹出充电宝, orderId: ${orderId}`)\n    return request({\n        url: `/app/device/confirmPaymentAndRent?orderId=${orderId}`,\n        method: 'post'\n    })\n}\n\n\n\n//投诉反馈\nexport const addUserFeedback = (data) => {\n    return request({\n        url: '/app/feedback/add',\n        method: 'post',\n        data,\n    })\n}\n\n//强制打开空格子\nexport const forcefOpenEmptyGrid = (deviceNo) => {\n    console.log(`强制打开空格子, deviceNo: ${deviceNo}`)\n    return request({\n        url: `/app/device/forcef/${deviceNo}`,\n        method: 'post'\n    })\n}\n\n// 通过订单号获取订单信息\nexport const getOrderByOrderNo = (orderNo) => {\n    console.log('通过订单号获取订单信息：', orderNo)\n    return request({\n        url: `/app/order/byOrderNo/${orderNo}`,\n        method: 'get',\n        hideLoading: true\n    })\n}\n\n// 更新订单套餐信息\nexport const updateOrderPackage = (data) => {\n    console.log('更新订单套餐信息：', data)\n    return request({\n        url: '/app/device/updateOrderPackage',\n        method: 'post',\n        data\n    })\n}\n\n// 更新用户余额\nexport const updateUserBalance = (orderId) => {\n    return request({\n        url: `/app/user/updateBalance/${orderId}`,\n        method: 'get',\n        hideLoading: true\n    })\n}\n"],"names":["request","uni"],"mappings":";;;AAGY,MAAC,QAAQ,CAAC,SAAS;AAC3B,SAAOA,oBAAQ;AAAA,IACX,KAAK;AAAA,IACL,QAAQ;AAAA,IACR;AAAA,EACR,CAAK;AACL;AAGY,MAAC,iBAAiB,CAAC,SAAS;AACpC,SAAOA,oBAAQ;AAAA,IACX,KAAK;AAAA,IACL,QAAQ;AAAA,IACR;AAAA,EACR,CAAK;AACL;AAGY,MAAC,kBAAkB,CAAC,YAAY;AACxCC,gBAAAA,MAAY,MAAA,OAAA,wBAAA,gBAAgB,OAAO;AACnC,SAAOD,oBAAQ;AAAA,IACX,KAAK,qBAAqB,OAAO;AAAA,IACjC,QAAQ;AAAA,IACR,aAAa;AAAA,EACrB,CAAK;AACL;AAGY,MAAC,eAAe,CAAC,SAAS;AAClC,SAAOA,oBAAQ;AAAA,IACX,KAAK;AAAA,IACL,QAAQ;AAAA,IACR;AAAA,IACA,aAAY;AAAA,EACpB,CAAK;AACL;AAWY,MAAC,sBAAsB,CAAC,UAAU,aAAa;AAEvD,QAAM,cAAc,SAAS,KAAK,GAAG;AACrC,SAAOA,oBAAQ;AAAA,IACX,KAAK,4BAA4B,QAAQ,gBAAgB,WAAW;AAAA,IACpE,QAAQ;AAAA,IACd,aAAa;AAAA;AAAA,EACf,CAAK;AACL;AAGY,MAAC,gBAAgB,CAAC,aAAa;AACvC,SAAOA,oBAAQ;AAAA,IACX,KAAK,eAAe,QAAQ;AAAA,IAC5B,QAAQ;AAAA,EAChB,CAAK;AACL;AAaY,MAAC,YAAY,CAAC,OAAO;AAC7B,SAAOA,oBAAQ;AAAA,IACX,KAAK,cAAc,EAAE;AAAA,IACrB,QAAQ;AAAA,IACR,aAAa;AAAA,EACrB,CAAK;AACL;AAuBY,MAAC,gBAAgB,CAAC,UAAU,UAAU;AAC9C,SAAOA,oBAAQ;AAAA,IACX,KAAK;AAAA,IACL,QAAQ;AAAA,IACR,MAAM,EAAE,UAAU,MAAO;AAAA,EACjC,CAAK;AACL;AAGY,MAAC,wBAAwB,CAAC,YAAY;AAC9CC,gBAAY,MAAA,MAAA,OAAA,yBAAA,wBAAwB,OAAO,EAAE;AAC7C,SAAOD,oBAAQ;AAAA,IACX,KAAK,6CAA6C,OAAO;AAAA,IACzD,QAAQ;AAAA,EAChB,CAAK;AACL;AAiCY,MAAC,qBAAqB,CAAC,SAAS;AACxCC,gBAAAA,MAAA,MAAA,OAAA,yBAAY,aAAa,IAAI;AAC7B,SAAOD,oBAAQ;AAAA,IACX,KAAK;AAAA,IACL,QAAQ;AAAA,IACR;AAAA,EACR,CAAK;AACL;;;;;;;;;;;"}
\ No newline at end of file
diff --git a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/deposit/index.js.map b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/deposit/index.js.map
index f580960..c51445c 100644
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/deposit/index.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/deposit/index.js.map
@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["E:/迅雷下载/HBuilderX.4.57.2025032507/HBuilderX/plugins/uniapp-cli-vite/uniPage:/cGFnZXMvZGVwb3NpdC9pbmRleC52dWU"],"sourcesContent":["import MiniProgramPage from 'C:/Users/Administrator.DESKTOP-IRCM9I0/Desktop/locker-fans/locker-fans/uni-fans/pages/deposit/index.vue'\nwx.createPage(MiniProgramPage)"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,GAAG,WAAW,eAAe;"}
\ No newline at end of file
+{"version":3,"file":"index.js","sources":["E:/迅雷下载/HBuilderX.4.57.2025032507/HBuilderX/plugins/uniapp-cli-vite/uniPage:/cGFnZXMvZGVwb3NpdC9pbmRleC52dWU"],"sourcesContent":["import MiniProgramPage from 'C:/Users/Administrator.DESKTOP-IRCM9I0/Desktop/locker-fans/locker-fans/uni-fans/pages/deposit/index.vue'\nwx.createPage(MiniProgramPage)"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,GAAG,WAAW,eAAe;"}
\ 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 d70f6d5..ac927d1 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":["E:/迅雷下载/HBuilderX.4.57.2025032507/HBuilderX/plugins/uniapp-cli-vite/uniPage:/cGFnZXMvZGV2aWNlL2RldGFpbC52dWU"],"sourcesContent":["import MiniProgramPage from 'C:/Users/Administrator.DESKTOP-IRCM9I0/Desktop/locker-fans/locker-fans/uni-fans/pages/device/detail.vue'\nwx.createPage(MiniProgramPage)"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,GAAG,WAAW,eAAe;"}
\ No newline at end of file
+{"version":3,"file":"detail.js","sources":["E:/迅雷下载/HBuilderX.4.57.2025032507/HBuilderX/plugins/uniapp-cli-vite/uniPage:/cGFnZXMvZGV2aWNlL2RldGFpbC52dWU"],"sourcesContent":["import MiniProgramPage from 'C:/Users/Administrator.DESKTOP-IRCM9I0/Desktop/locker-fans/locker-fans/uni-fans/pages/device/detail.vue'\nwx.createPage(MiniProgramPage)"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,GAAG,WAAW,eAAe;"}
\ No newline at end of file
diff --git a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/payment.js.map b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/payment.js.map
index 2f2fad0..cf5cdd2 100644
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/payment.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/payment.js.map
@@ -1 +1 @@
-{"version":3,"file":"payment.js","sources":["E:/迅雷下载/HBuilderX.4.57.2025032507/HBuilderX/plugins/uniapp-cli-vite/uniPage:/cGFnZXMvb3JkZXIvcGF5bWVudC52dWU"],"sourcesContent":["import MiniProgramPage from 'C:/Users/Administrator.DESKTOP-IRCM9I0/Desktop/locker-fans/locker-fans/uni-fans/pages/order/payment.vue'\nwx.createPage(MiniProgramPage)"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,GAAG,WAAW,eAAe;"}
\ No newline at end of file
+{"version":3,"file":"payment.js","sources":["E:/迅雷下载/HBuilderX.4.57.2025032507/HBuilderX/plugins/uniapp-cli-vite/uniPage:/cGFnZXMvb3JkZXIvcGF5bWVudC52dWU"],"sourcesContent":["import MiniProgramPage from 'C:/Users/Administrator.DESKTOP-IRCM9I0/Desktop/locker-fans/locker-fans/uni-fans/pages/order/payment.vue'\nwx.createPage(MiniProgramPage)"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,GAAG,WAAW,eAAe;"}
\ No newline at end of file
diff --git a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/serve/bagCheck/index.js.map b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/serve/bagCheck/index.js.map
index 882805e..ba1449a 100644
--- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/serve/bagCheck/index.js.map
+++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/serve/bagCheck/index.js.map
@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["E:/迅雷下载/HBuilderX.4.57.2025032507/HBuilderX/plugins/uniapp-cli-vite/uniPage:/cGFnZXMvc2VydmUvYmFnQ2hlY2svaW5kZXgudnVl"],"sourcesContent":["import MiniProgramPage from 'C:/Users/Administrator.DESKTOP-IRCM9I0/Desktop/locker-fans/locker-fans/uni-fans/pages/serve/bagCheck/index.vue'\nwx.createPage(MiniProgramPage)"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,GAAG,WAAW,eAAe;"}
\ No newline at end of file
+{"version":3,"file":"index.js","sources":["E:/迅雷下载/HBuilderX.4.57.2025032507/HBuilderX/plugins/uniapp-cli-vite/uniPage:/cGFnZXMvc2VydmUvYmFnQ2hlY2svaW5kZXgudnVl"],"sourcesContent":["import MiniProgramPage from 'C:/Users/Administrator.DESKTOP-IRCM9I0/Desktop/locker-fans/locker-fans/uni-fans/pages/serve/bagCheck/index.vue'\nwx.createPage(MiniProgramPage)"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,GAAG,WAAW,eAAe;"}
\ 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 22844b9..38b0145 100644
--- a/unpackage/dist/dev/mp-weixin/common/vendor.js
+++ b/unpackage/dist/dev/mp-weixin/common/vendor.js
@@ -6876,7 +6876,7 @@ function initOnError() {
 function initRuntimeSocketService() {
   const hosts = "10.8.0.5,192.168.1.15,127.0.0.1";
   const port = "8090";
-  const id = "mp-weixin_hczUPf";
+  const id = "mp-weixin_V-Usyu";
   const lazy = typeof swan !== "undefined";
   let restoreError = lazy ? () => {
   } : initOnError();
diff --git a/unpackage/dist/dev/mp-weixin/config/user.js b/unpackage/dist/dev/mp-weixin/config/user.js
index a35132b..83c2015 100644
--- a/unpackage/dist/dev/mp-weixin/config/user.js
+++ b/unpackage/dist/dev/mp-weixin/config/user.js
@@ -15,10 +15,10 @@ const getMyIndexInfo = (data) => {
     data
   });
 };
-const withdrawDeposit = (orderId) => {
-  common_vendor.index.__f__("log", "at config/user.js:23", "调用提现API，订单ID：", orderId);
+const withdrawDeposit = (orderNo) => {
+  common_vendor.index.__f__("log", "at config/user.js:23", "调用提现API，订单号：", orderNo);
   return config_http.request({
-    url: `/app/withdraw/add/${orderId}`,
+    url: `/app/withdraw/add/${orderNo}`,
     method: "get",
     hideLoading: true
   });
@@ -31,10 +31,13 @@ const getOrderList = (data) => {
     hideLoading: true
   });
 };
-const queryHasOrder = (deviceNo) => {
+const checkOrdersByStatus = (deviceNo, statuses) => {
+  const statusQuery = statuses.join(",");
   return config_http.request({
-    url: `/app/order/list?deviceNo=${deviceNo}&orderStatus=in_used`,
-    method: "get"
+    url: `/app/order/list?deviceNo=${deviceNo}&orderStatus=${statusQuery}`,
+    method: "get",
+    hideLoading: true
+    // 隐藏加载提示，避免干扰用户
   });
 };
 const getDeviceInfo = (deviceNo) => {
@@ -44,7 +47,6 @@ const getDeviceInfo = (deviceNo) => {
   });
 };
 const queryById = (id) => {
-  common_vendor.index.__f__("log", "at config/user.js:69", `查询订单详情, orderId: ${id}`);
   return config_http.request({
     url: `/app/order/${id}`,
     method: "get",
@@ -59,19 +61,28 @@ const rentPowerBank = (deviceNo, phone) => {
   });
 };
 const confirmPaymentAndRent = (orderId) => {
-  common_vendor.index.__f__("log", "at config/user.js:108", `确认支付并弹出充电宝, orderId: ${orderId}`);
+  common_vendor.index.__f__("log", "at config/user.js:118", `确认支付并弹出充电宝, orderId: ${orderId}`);
   return config_http.request({
     url: `/app/device/confirmPaymentAndRent?orderId=${orderId}`,
     method: "post"
   });
 };
+const updateOrderPackage = (data) => {
+  common_vendor.index.__f__("log", "at config/user.js:157", "更新订单套餐信息：", data);
+  return config_http.request({
+    url: "/app/device/updateOrderPackage",
+    method: "post",
+    data
+  });
+};
+exports.checkOrdersByStatus = checkOrdersByStatus;
 exports.confirmPaymentAndRent = confirmPaymentAndRent;
 exports.getDeviceInfo = getDeviceInfo;
 exports.getMyIndexInfo = getMyIndexInfo;
 exports.getOrderList = getOrderList;
 exports.login = login;
 exports.queryById = queryById;
-exports.queryHasOrder = queryHasOrder;
 exports.rentPowerBank = rentPowerBank;
+exports.updateOrderPackage = updateOrderPackage;
 exports.withdrawDeposit = withdrawDeposit;
 //# sourceMappingURL=../../.sourcemap/mp-weixin/config/user.js.map
diff --git a/unpackage/dist/dev/mp-weixin/pages/deposit/index.js b/unpackage/dist/dev/mp-weixin/pages/deposit/index.js
index a0fb0a0..03e7a8e 100644
--- a/unpackage/dist/dev/mp-weixin/pages/deposit/index.js
+++ b/unpackage/dist/dev/mp-weixin/pages/deposit/index.js
@@ -8,8 +8,7 @@ const _sfc_main = {
       depositAmount: "0.00",
       orderNo: "",
       records: [],
-      orderId: "",
-      isLoading: false
+      orderId: ""
     };
   },
   onLoad() {
@@ -20,28 +19,13 @@ const _sfc_main = {
   methods: {
     async loadUserInfo() {
       try {
-        this.isLoading = true;
         const res = await util_index.getUserInfo();
-        common_vendor.index.__f__("log", "at pages/deposit/index.vue:66", "loadUserInfo", res);
+        common_vendor.index.__f__("log", "at pages/deposit/index.vue:64", "loadUserInfo", res);
         if (res.code === 200) {
           this.depositAmount = res.data.balanceAmount || "0.00";
           this.orderNo = res.data.latestOrderNo || "";
           this.orderId = res.data.latestOrderId || "";
-          if (parseFloat(this.depositAmount) > 0 && !this.orderId) {
-            common_vendor.index.__f__("log", "at pages/deposit/index.vue:74", "没有latestOrderId但有余额，尝试查询订单列表");
-            const orderRes = await config_user.getOrderList({ pageNum: 1, pageSize: 10 });
-            if (orderRes.code === 200 && orderRes.data && orderRes.data.records && orderRes.data.records.length > 0) {
-              const depositOrder = orderRes.data.records.find(
-                (order) => order.depositAmount && parseFloat(order.depositAmount) > 0
-              );
-              if (depositOrder) {
-                common_vendor.index.__f__("log", "at pages/deposit/index.vue:83", "找到押金订单:", depositOrder);
-                this.orderId = depositOrder.orderId;
-                this.orderNo = depositOrder.orderNo;
-              }
-            }
-          }
-          if (parseFloat(this.depositAmount) > 0) {
+          if (parseFloat(this.depositAmount) > 0 && this.orderNo) {
             this.records = [
               {
                 type: "支付",
@@ -54,13 +38,11 @@ const _sfc_main = {
           }
         }
       } catch (error) {
-        common_vendor.index.__f__("error", "at pages/deposit/index.vue:104", "获取用户信息失败：", error);
+        common_vendor.index.__f__("error", "at pages/deposit/index.vue:84", "获取用户信息失败：", error);
         common_vendor.index.showToast({
           title: "获取用户信息失败",
           icon: "none"
         });
-      } finally {
-        this.isLoading = false;
       }
     },
     async handleWithdraw() {
@@ -71,25 +53,20 @@ const _sfc_main = {
         });
         return;
       }
-      if (!this.orderId) {
-        common_vendor.index.showToast({
-          title: "无法找到押金订单",
-          icon: "none"
-        });
-        return;
-      }
+      const res = await config_user.queryById(Number(this.orderNo));
+      common_vendor.index.__f__("log", "at pages/deposit/index.vue:100", res);
       common_vendor.index.showModal({
         title: "确认提现",
         content: "押金将原路退回，预计0-7个工作日到账",
-        success: async (res) => {
-          if (res.confirm) {
+        success: async (res2) => {
+          if (res2.confirm) {
             common_vendor.index.showLoading({
               title: "提现中..."
             });
             try {
-              common_vendor.index.__f__("log", "at pages/deposit/index.vue:140", "发起提现请求，订单ID：", this.orderId);
-              const result = await config_user.withdrawDeposit(this.orderId);
-              common_vendor.index.__f__("log", "at pages/deposit/index.vue:142", "提现响应：", result);
+              common_vendor.index.__f__("log", "at pages/deposit/index.vue:119", "发起提现请求，订单号：", this.orderNo);
+              const result = await config_user.withdrawDeposit(this.orderNo);
+              common_vendor.index.__f__("log", "at pages/deposit/index.vue:121", "提现响应：", result);
               if (result.code === 200) {
                 common_vendor.index.hideLoading();
                 common_vendor.index.showToast({
@@ -109,11 +86,26 @@ const _sfc_main = {
                 throw new Error(result.msg || "提现失败");
               }
             } catch (error) {
-              common_vendor.index.__f__("error", "at pages/deposit/index.vue:167", "提现失败：", error);
+              common_vendor.index.__f__("error", "at pages/deposit/index.vue:146", "提现失败：", error);
               common_vendor.index.hideLoading();
-              common_vendor.index.showToast({
-                title: error.message || "提现失败，请稍后再试",
-                icon: "none"
+              let errorMessage = "提现失败，请稍后再试";
+              if (error.message) {
+                if (error.message.includes("尚未归还")) {
+                  errorMessage = "当前订单尚未归还，请归还后再提现";
+                } else if (error.message.includes("已退还")) {
+                  errorMessage = "押金已退还，无需重复提现";
+                } else if (error.message.includes("处理中")) {
+                  errorMessage = "押金退还处理中，请耐心等待";
+                } else if (error.message.includes("余额为0")) {
+                  errorMessage = "账户余额为0，无法提现";
+                } else {
+                  errorMessage = error.message;
+                }
+              }
+              common_vendor.index.showModal({
+                title: "提现失败",
+                content: errorMessage,
+                showCancel: false
               });
             }
           }
diff --git a/unpackage/dist/dev/mp-weixin/pages/device/detail.js b/unpackage/dist/dev/mp-weixin/pages/device/detail.js
index 7145dac..5b37986 100644
--- a/unpackage/dist/dev/mp-weixin/pages/device/detail.js
+++ b/unpackage/dist/dev/mp-weixin/pages/device/detail.js
@@ -37,7 +37,8 @@ const _sfc_main = {
   },
   onLoad(options) {
     this.deviceId = options.deviceNo;
-    common_vendor.index.__f__("log", "at pages/device/detail.vue:126", options.deviceNo);
+    this.checkOrderStatus();
+    common_vendor.index.__f__("log", "at pages/device/detail.vue:128", options.deviceNo);
     this.getDeviceInfo();
   },
   methods: {
@@ -71,9 +72,16 @@ const _sfc_main = {
       try {
         const result = await this.$api.checkActiveOrder();
         if (result.hasOrder) {
-          common_vendor.index.redirectTo({
-            url: `/pages/device/return?deviceId=${this.deviceId}`
-          });
+          const order = result.order;
+          if (order.status === "waiting_for_payment") {
+            common_vendor.index.redirectTo({
+              url: `/pages/order/payment?orderId=${order.orderId}&deviceId=${this.deviceId}`
+            });
+          } else if (order.status === "in_used") {
+            common_vendor.index.redirectTo({
+              url: `/pages/device/return?deviceId=${this.deviceId}`
+            });
+          }
         }
       } catch (error) {
         common_vendor.index.showToast({
@@ -125,9 +133,34 @@ const _sfc_main = {
           throw new Error(rentResult.msg || "设备租借失败");
         }
         const order = rentResult.data;
+        try {
+          let packageTimeMinutes = 0;
+          if (selectedPkg.time.includes("小时")) {
+            packageTimeMinutes = parseInt(selectedPkg.time) * 60;
+          } else if (selectedPkg.time.includes("分钟")) {
+            packageTimeMinutes = parseInt(selectedPkg.time);
+          } else {
+            packageTimeMinutes = parseInt(selectedPkg.time) * 60;
+          }
+          const updateRes = await config_user.updateOrderPackage({
+            orderId: order.orderId,
+            packageTime: packageTimeMinutes,
+            packagePrice: parseFloat(selectedPkg.price)
+          });
+          if (updateRes.code !== 200) {
+            common_vendor.index.__f__("warn", "at pages/device/detail.vue:265", "更新订单套餐信息失败:", updateRes.msg);
+          } else {
+            common_vendor.index.__f__("log", "at pages/device/detail.vue:268", "订单套餐信息已提前更新");
+          }
+        } catch (updateError) {
+          common_vendor.index.__f__("error", "at pages/device/detail.vue:271", "更新订单套餐信息时出错:", updateError);
+        }
+        const deposit = 99;
+        const packagePrice = parseFloat(selectedPkg.price);
+        const totalAmount = (deposit + packagePrice).toFixed(2);
         common_vendor.index.hideLoading();
         common_vendor.index.redirectTo({
-          url: `/pages/order/payment?orderId=${order.orderId}&packageTime=${selectedPkg.time}&packagePrice=${selectedPkg.price}`
+          url: `/pages/order/payment?orderId=${order.orderId}&packageTime=${selectedPkg.time}&packagePrice=${selectedPkg.price}&totalAmount=${totalAmount}`
         });
       } catch (error) {
         common_vendor.index.hideLoading();
diff --git a/unpackage/dist/dev/mp-weixin/pages/order/payment.js b/unpackage/dist/dev/mp-weixin/pages/order/payment.js
index b0f92cb..2264c96 100644
--- a/unpackage/dist/dev/mp-weixin/pages/order/payment.js
+++ b/unpackage/dist/dev/mp-weixin/pages/order/payment.js
@@ -11,6 +11,8 @@ const _sfc_main = {
         time: "",
         price: "0.00"
       },
+      passedTotalAmount: null,
+      passedDepositAmount: null,
       orderStatus: {
         text: "等待支付",
         desc: "请在15分钟内完成支付",
@@ -20,6 +22,9 @@ const _sfc_main = {
   },
   computed: {
     totalAmount() {
+      if (this.passedTotalAmount !== null) {
+        return parseFloat(this.passedTotalAmount).toFixed(2);
+      }
       const deposit = parseFloat(this.orderInfo.deposit || 99);
       const amount = parseFloat(this.orderInfo.amount || this.packageInfo.price || 0);
       return (deposit + amount).toFixed(2);
@@ -34,6 +39,12 @@ const _sfc_main = {
           price: options.packagePrice
         };
       }
+      if (options.totalAmount) {
+        this.passedTotalAmount = options.totalAmount;
+      }
+      if (options.depositAmount) {
+        this.passedDepositAmount = options.depositAmount;
+      }
       this.loadOrderInfo();
     } else {
       common_vendor.index.showToast({
@@ -65,7 +76,6 @@ const _sfc_main = {
               formattedTime = this.formatTime(/* @__PURE__ */ new Date());
             }
           } catch (e) {
-            common_vendor.index.__f__("error", "at pages/order/payment.vue:143", "时间格式化错误:", e);
             formattedTime = this.formatTime(/* @__PURE__ */ new Date());
           }
           this.orderInfo = {
@@ -73,13 +83,13 @@ const _sfc_main = {
             deviceNo: orderData.deviceNo,
             createTime: formattedTime,
             phone: orderData.phone,
-            deposit: "99.00",
-            // 假设押金固定为99元
-            amount: orderData.amount || this.packageInfo.price || "0.00"
+            deposit: this.passedDepositAmount || orderData.depositAmount || "99.00",
+            amount: orderData.packagePrice || this.packageInfo.price || "0.00"
           };
-          if (!orderData.packageTime && this.packageInfo.time) {
-            this.orderInfo.packageTime = this.packageInfo.time;
-            this.orderInfo.packagePrice = this.packageInfo.price;
+          if (orderData.packageTime) {
+            this.packageInfo.time = `${orderData.packageTime / 60}小时`;
+            this.packageInfo.price = orderData.packagePrice || "0.00";
+          } else if (this.packageInfo.time) {
           }
         } else {
           throw new Error("获取订单信息失败");
@@ -111,11 +121,18 @@ const _sfc_main = {
           const payParams = res.data.data;
           await common_vendor.index.requestPayment({
             ...payParams,
-            success: () => {
-              this.pollOrderStatus();
+            success: async () => {
+              common_vendor.index.showToast({
+                title: "支付成功",
+                icon: "success"
+              });
+              setTimeout(() => {
+                common_vendor.index.redirectTo({
+                  url: `/pages/order/index?orderId=${this.orderId}`
+                });
+              }, 1500);
             },
             fail: (err) => {
-              common_vendor.index.__f__("error", "at pages/order/payment.vue:203", "支付失败:", err);
               throw new Error("支付失败，请重试");
             }
           });
@@ -195,50 +212,26 @@ const _sfc_main = {
       const minute = date.getMinutes().toString().padStart(2, "0");
       return `${year}-${month}-${day} ${hour}:${minute}`;
     },
-    // 轮询订单状态
-    async pollOrderStatus() {
-      let retryCount = 0;
-      const maxRetries = 10;
-      const interval = 1e3;
-      const checkStatus = async () => {
-        try {
-          const res = await common_vendor.index.request({
-            url: `${config_url.URL || "http://127.0.0.1:8080"}/app/wx-payment/status/${this.orderInfo.orderNo}`,
-            method: "GET",
-            header: {
-              "Authorization": "Bearer " + common_vendor.index.getStorageSync("token"),
-              "Clientid": common_vendor.index.getStorageSync("client_id")
-            }
-          });
-          if (res.statusCode === 200 && res.data.code === 200) {
-            const orderData = res.data.data;
-            if (orderData.orderStatus === "in_used") {
-              common_vendor.index.showToast({
-                title: "支付成功",
-                icon: "success"
-              });
-              setTimeout(() => {
-                common_vendor.index.redirectTo({
-                  url: `/pages/order/index?orderId=${this.orderId}`
-                });
-              }, 1500);
-              return;
-            }
+    // 检查订单状态（单次查询，不轮询）
+    async checkOrderStatus() {
+      try {
+        const res = await common_vendor.index.request({
+          url: `${config_url.URL || "http://127.0.0.1:8080"}/app/wx-payment/status/${this.orderInfo.orderNo}`,
+          method: "GET",
+          header: {
+            "Authorization": "Bearer " + common_vendor.index.getStorageSync("token"),
+            "Clientid": common_vendor.index.getStorageSync("client_id")
           }
-          if (retryCount < maxRetries) {
-            retryCount++;
-            setTimeout(checkStatus, interval);
-          } else {
-            throw new Error("订单状态查询超时");
-          }
-        } catch (error) {
-          common_vendor.index.showToast({
-            title: error.message || "查询订单状态失败",
-            icon: "none"
-          });
+        });
+        if (res.statusCode === 200 && res.data.code === 200) {
+          return res.data.data;
+        } else {
+          throw new Error("查询订单状态失败");
         }
-      };
-      checkStatus();
+      } catch (error) {
+        common_vendor.index.__f__("error", "at pages/order/payment.vue:332", "查询订单状态错误:", error);
+        return null;
+      }
     }
   }
 };
diff --git a/unpackage/dist/dev/mp-weixin/pages/serve/bagCheck/index.js b/unpackage/dist/dev/mp-weixin/pages/serve/bagCheck/index.js
index ce1ac3c..83b8d3e 100644
--- a/unpackage/dist/dev/mp-weixin/pages/serve/bagCheck/index.js
+++ b/unpackage/dist/dev/mp-weixin/pages/serve/bagCheck/index.js
@@ -1,45 +1,69 @@
 "use strict";
 const common_vendor = require("../../../common/vendor.js");
-const util_index = require("../../../util/index.js");
 const config_user = require("../../../config/user.js");
 const _sfc_main = {
   data() {
     return {};
   },
   async onLoad(option) {
+    common_vendor.index.__f__("log", "at pages/serve/bagCheck/index.vue:29", "bagCheck onLoad option:", option);
     try {
       common_vendor.index.showLoading({
-        title: "加载中..."
+        title: "处理中...",
+        mask: true
       });
-      if (!common_vendor.index.getStorageSync("token")) {
-        await util_index.wxLogin();
+      if (!option || !option.deviceNo) {
+        throw new Error("未识别到设备编号");
       }
-      if (!option.deviceNo) {
-        common_vendor.index.hideLoading();
-        common_vendor.index.showToast({
-          title: "设备编号不能为空",
-          icon: "none"
-        });
-        return;
-      }
-      const result = await config_user.queryHasOrder(option.deviceNo);
-      common_vendor.index.hideLoading();
-      if (result.data && result.data.data && result.data.data.length > 0) {
-        common_vendor.index.redirectTo({
-          url: `/pages/device/return?deviceNo=${option.deviceNo}`
-        });
+      const deviceNo = option.deviceNo;
+      const statusesToCheck = ["in_used", "waiting_for_payment"];
+      const res = await config_user.checkOrdersByStatus(deviceNo, statusesToCheck);
+      if (res.code === 200 && res.data && res.data.length > 0) {
+        const latestOrder = res.data[0];
+        if (latestOrder.orderStatus === "in_used") {
+          common_vendor.index.__f__("log", "at pages/serve/bagCheck/index.vue:53", "检测到使用中订单，跳转归还页:", latestOrder.orderId);
+          common_vendor.index.redirectTo({
+            url: `/pages/device/return?orderId=${latestOrder.orderId}`
+          });
+        } else if (latestOrder.orderStatus === "waiting_for_payment") {
+          common_vendor.index.__f__("log", "at pages/serve/bagCheck/index.vue:59", "检测到待支付订单，跳转支付页:", latestOrder.orderId);
+          const packageTime = latestOrder.packageTime ? `${latestOrder.packageTime / 60}小时` : "默认套餐";
+          const packagePrice = latestOrder.packagePrice || "0.00";
+          const depositAmount = latestOrder.depositAmount || "99.00";
+          const totalAmount = (parseFloat(depositAmount) + parseFloat(packagePrice)).toFixed(2);
+          common_vendor.index.redirectTo({
+            url: `/pages/order/payment?orderId=${latestOrder.orderId}&packageTime=${packageTime}&packagePrice=${packagePrice}&totalAmount=${totalAmount}&depositAmount=${depositAmount}`
+          });
+        } else {
+          common_vendor.index.__f__("log", "at pages/serve/bagCheck/index.vue:70", "检测到其他状态订单，跳转详情页:", latestOrder.orderId);
+          common_vendor.index.redirectTo({
+            url: `/pages/device/detail?deviceNo=${deviceNo}`
+          });
+        }
       } else {
+        common_vendor.index.__f__("log", "at pages/serve/bagCheck/index.vue:77", "未检测到相关订单，跳转详情页");
         common_vendor.index.redirectTo({
-          url: `/pages/device/detail?deviceNo=${option.deviceNo}`
+          url: `/pages/device/detail?deviceNo=${deviceNo}`
         });
       }
     } catch (error) {
-      common_vendor.index.hideLoading();
+      common_vendor.index.__f__("error", "at pages/serve/bagCheck/index.vue:83", "扫码检查订单失败:", error);
       common_vendor.index.showToast({
-        title: "页面加载失败，请重试",
-        icon: "none"
+        title: error.message || "处理失败，请稍后重试",
+        icon: "none",
+        duration: 2e3
       });
-      common_vendor.index.__f__("error", "at pages/serve/bagCheck/index.vue:62", "bagCheck onLoad error:", error);
+      setTimeout(() => {
+        if (option && option.deviceNo) {
+          common_vendor.index.redirectTo({
+            url: `/pages/device/detail?deviceNo=${option.deviceNo}`
+          });
+        } else {
+          common_vendor.index.switchTab({ url: "/pages/index/index" });
+        }
+      }, 2e3);
+    } finally {
+      common_vendor.index.hideLoading();
     }
   },
   methods: {}