fix:修复bug

pages/waiting/index.vue

@@ -32,6 +32,8 @@
 	const leftRotateDeg = ref(0)
 	const rightRotateDeg = ref(0)
 	const orderNo = ref('')
+	const orderId = ref('')
+	const deviceId = ref('')
 	let progressTimer = null
 	let pollTimer = null
 	let timeoutTimer = null
@@ -76,7 +78,10 @@
 		progress.value = 100
 		updateRotate(progress.value)
 		setTimeout(() => {
-			uni.redirectTo({ url: '/pages/order/index' })
+			// 跳转到订单详情页面，传递 orderId 和 deviceId
+			const url = `/pages/order/detail?orderId=${orderId.value || orderNo.value}&deviceId=${deviceId.value}`
+			console.log('等待完成，跳转到订单详情:', url)
+			uni.redirectTo({ url })
 		}, 400)
 	}
 
@@ -98,6 +103,16 @@
 				if (!orderNo.value) return
 				const res = await getOrderByOrderNoScorePayStatus(orderNo.value)
 				if (res && res.data) {
+					// 如果还没有 orderId，从返回数据中获取
+					if (!orderId.value && res.data.orderId) {
+						orderId.value = res.data.orderId
+						console.log('从订单状态中获取 orderId:', orderId.value)
+					}
+					if (!deviceId.value && res.data.deviceNo) {
+						deviceId.value = res.data.deviceNo
+						console.log('从订单状态中获取 deviceId:', deviceId.value)
+					}
+					
 					if (res.data.orderStatus == 'in_used') {
 						stopAllTimers()
 						handleSuccess()
@@ -125,8 +140,17 @@
 		uni.setNavigationBarTitle({
 			title: $t('waiting.title')
 		})
-		if (query && query.orderNo) {
-			orderNo.value = query.orderNo
+		if (query) {
+			if (query.orderNo) {
+				orderNo.value = query.orderNo
+			}
+			if (query.orderId) {
+				orderId.value = query.orderId
+			}
+			if (query.deviceId) {
+				deviceId.value = query.deviceId
+			}
+			console.log('等待页面参数:', { orderNo: orderNo.value, orderId: orderId.value, deviceId: deviceId.value })
 		}
 		startProgress()
 		startPolling()