fix:修复bug；新增订单列表页面订单监控

App.vue

@@ -15,6 +15,55 @@
 			console.log('=== App onShow 被调用 ===')
 			console.log('时间戳:', new Date().toLocaleTimeString())
 			
+			// 检查启动路径，如果设置了启动路径则跳转
+			try {
+				const launchPath = uni.getStorageSync('launchPath')
+				if (launchPath) {
+					console.log('检测到启动路径:', launchPath)
+					// 获取当前页面栈
+					const pages = getCurrentPages()
+					const currentPage = pages[pages.length - 1]
+					const currentRoute = currentPage ? ('/' + currentPage.route) : ''
+					
+					// 规范化路径格式进行比较
+					const normalizedLaunchPath = launchPath.replace(/\.html$/, '')
+					
+					// 只在「单页面栈」时生效，避免影响正常多页面跳转（如下单后跳详情）
+					if (pages.length === 1 && currentRoute !== normalizedLaunchPath) {
+						console.log('当前页面:', currentRoute, '目标页面:', normalizedLaunchPath)
+						// 清除启动路径标记（在跳转前清除，避免重复触发）
+						uni.removeStorageSync('launchPath')
+						// 跳转到启动路径（首页）
+						// 先尝试 switchTab（如果首页是 tabBar 页面）
+						uni.reLaunch({
+							url: normalizedLaunchPath,
+							success: () => {
+								console.log('成功跳转到启动路径（switchTab）')
+							},
+							fail: (err) => {
+								console.log('switchTab 失败，使用 reLaunch:', err)
+								// 如果 switchTab 失败，使用 reLaunch（适用于非 tabBar 页面）
+								uni.reLaunch({
+									url: normalizedLaunchPath,
+									success: () => {
+										console.log('成功跳转到启动路径（reLaunch）')
+									},
+									fail: (reLaunchErr) => {
+										console.error('跳转到启动路径失败:', reLaunchErr)
+									}
+								})
+							}
+						})
+					} else if (currentRoute === normalizedLaunchPath) {
+						// 如果已经在目标页面，清除启动路径标记
+						console.log('当前已在目标页面，清除启动路径标记')
+						uni.removeStorageSync('launchPath')
+					}
+				}
+			} catch (e) {
+				console.error('App onShow - 启动路径检查失败:', e)
+			}
+			
 			// 检查并更新语言（uni.reLaunch 会触发 onShow）
 			try {
 				const savedLang = uni.getStorageSync('language')

config/api/order.js

@@ -76,6 +76,25 @@ export const getOrderByOrderNo = (orderNo) => {
 	})
 }
 
+// 充电宝未弹出反馈（快捷反馈）
+export const reportDeviceNoEject = (data) => {
+	console.log('充电宝未弹出反馈：', data)
+	return request({
+		url: '/app/order/report-no-eject',
+		method: 'post',
+		data
+	})
+}
+
+// 充电宝转为自用
+export const convertToOwned = (orderId) => {
+	console.log('充电宝转为自用，订单ID：', orderId)
+	return request({
+		url: `/app/order/convert-to-owned/${orderId}`,
+		method: 'post'
+	})
+}
+
 // 通过订单号获取支付分订单信息
 export const getOrderByOrderNoScore = (orderNo) => {
 	console.log('通过订单号获取支付分订单信息', orderNo);

config/url.js

@@ -1,6 +1,6 @@
 // export const URL = "https://my.gxfs123.com/api" //正式服务器-弃用
-export const URL = "https://manager.fdzpower.com/api"  //正式服务器
+// export const URL = "https://manager.fdzpower.com/api"  //正式服务器
-// export const URL = "https://fansdev.gxfs123.com/api"  //测试服务器
+export const URL = "https://fansdev.gxfs123.com/api"  //测试服务器
 // export const URL = "http://192.168.5.30:8080" 		//本地调试
 // export const URL = "http://127.0.0.1:8080" 		//本地调试
 

locale/en-US.js

@@ -240,7 +240,17 @@ export default {
     paymentMethod: 'Payment Method',
     perHour: 'per hour',
     perMinute: 'per minute',
-    perHalfHour: 'per half hour'
+    perHalfHour: 'per half hour',
+    deviceNoEject: 'Not Ejected',
+    convertToOwn: 'Don\'t want to return? Convert to own',
+    convertToOwnTitle: 'Convert to Own',
+    convertToOwnConfirm: 'Converting to own costs ¥99. The power bank will be yours. Confirm?',
+    convertToOwnSuccess: 'Successfully converted to own',
+    convertToOwnFailed: 'Operation failed, please try again',
+    deviceNoEjectTitle: 'Device Not Ejected',
+    deviceNoEjectConfirm: 'Your power bank didn\'t eject? We will handle it immediately, expected to resolve within 5 minutes.',
+    deviceNoEjectSuccess: 'Feedback received, will be handled within 5 minutes',
+    deviceNoEjectFailed: 'Feedback submission failed, please try again'
   },
 
   user: {

locale/zh-CN.js

@@ -240,7 +240,17 @@ export default {
     paymentMethod: '支付方式',
     perHour: '每小时',
     perMinute: '每分钟',
-    perHalfHour: '每半小时'
+    perHalfHour: '每半小时',
+    deviceNoEject: '宝未弹出',
+    convertToOwn: '不想还了？点击转为自用',
+    convertToOwnTitle: '转为自用',
+    convertToOwnConfirm: '转为自用需扣除99元，充电宝将归您所有，确认操作吗？',
+    convertToOwnSuccess: '已成功转为自用',
+    convertToOwnFailed: '操作失败，请稍后重试',
+    deviceNoEjectTitle: '充电宝未弹出',
+    deviceNoEjectConfirm: '您的充电宝未弹出吗？我们将立即为您处理，预计5分钟内解决问题。',
+    deviceNoEjectSuccess: '反馈已受理，将在5分钟内处理',
+    deviceNoEjectFailed: '反馈提交失败，请稍后重试'
   },
 
   user: {

pages/device/detail.vue

@@ -111,7 +111,8 @@
 		onMounted
 	} from 'vue'
 	import {
-		onLoad
+		onLoad,
+		onUnload
 	} from '@dcloudio/uni-app'
 	import {
 		getDeviceInfo,
@@ -170,6 +171,21 @@
 		await fetchDeviceInfo()
 	})
 
+	// 页面卸载时设置默认启动路径为首页（仅在非下单流程时生效）
+	onUnload(() => {
+		// 如果是下单流程跳转（在提交订单时设置了标记），则本次不设置启动路径
+		const skipSetLaunchPathOnce = uni.getStorageSync('skipSetLaunchPathOnce')
+		if (skipSetLaunchPathOnce) {
+			console.log('下单流程离开设备详情页，本次不设置启动路径')
+			uni.removeStorageSync('skipSetLaunchPathOnce')
+			return
+		}
+
+		// 正常离开设备详情页（比如返回、关闭小程序）时，记录启动路径为首页
+		uni.setStorageSync('launchPath', '/pages/index/index')
+		console.log('设备详情页卸载，已设置启动路径为首页')
+	})
+
 	const checkUserPhone = async () => {
 		try {
 			const userInfoRes = await getUserInfo()
@@ -278,6 +294,7 @@
 
 	// 检查登录状态和订单
 	const fetchDeviceInfo = async () => {
+		console.log(deviceId.value);
 		const res = await getDeviceInfo(deviceId.value)
 		if (res.code == 200) {
 			deviceInfo.value = res.data.device || {}
@@ -504,6 +521,13 @@
 		const order = rentResult.data
 		console.log('订单信息', order);
 
+		// 标记：本次是从设备详情页发起的下单流程，离开页面时不设置启动路径
+		try {
+			uni.setStorageSync('skipSetLaunchPathOnce', true)
+		} catch (e) {
+			console.warn('设置 skipSetLaunchPathOnce 失败:', e)
+		}
+
 		if (payWay == 'wx-pay') {
 				// 当支付方式为押金支付时
 				uni.hideLoading()

pages/feedback/list.vue

@@ -152,7 +152,7 @@
 			const status = statusTabs[currentTab.value].status;
 			const params = {
 				pageNum: currentPage.value,
-				pageSize: pageSize.value
+				pageSize: pageSize.value,
 			};
 			if (status) {
 				params.status = status;

pages/index/index.vue

@@ -22,8 +22,8 @@
 			<MapComponent v-if="!isLoading && userLocation" ref="mapRef" :userLocation="userLocation"
 				:positionList="positionList" :filteredPositions="filteredPositions" :searchKeyword="searchKeyword"
 				:enableMarkers="true" :bannerImages="bannerImages"
-			:hideMapOverlays="showGuidePopup || showNoticePopup || showActivityPopup"
+				:hideMapOverlays="showGuidePopup || showNoticePopup || showActivityPopup" @relocate="handleRelocate"
-			@relocate="handleRelocate" @scan="handleScan" @showList="showLocationList" @markerTap="selectPosition"
+				@scan="handleScan" @showList="showLocationList" @markerTap="selectPosition"
 				@mapCenterChange="onMapCenterChange" @bannerClick="handleBannerClick" />
 
 			<!-- 地图加载状态 -->
@@ -367,7 +367,8 @@
 				},
 				data: {
 					appPlatform: 'wechat', // 微信平台
-					appType: 'user'  // 用户端
+					appType: 'user' ,// 用户端
+					pictureLocation:'home_banner'
 				}
 			})
 
@@ -934,7 +935,16 @@
 				})
 			})
 
-			let deviceNo = getQueryString(scanResult.path, 'deviceNo')
+			console.log(scanResult);
+			let deviceNo;
+			if (scanResult.scanType=='"QR_CODE"') {
+
+				deviceNo = getQueryString(scanResult.result, 'deviceNo')
+			} else {
+				deviceNo = getQueryString(scanResult.path, 'deviceNo')
+			}
+
+
 
 			if (!deviceNo) {
 				uni.showToast({

pages/my/index.vue

@@ -186,7 +186,8 @@ import {
 				},
 				data: {
 					appPlatform: 'wechat',  // 微信平台
-					appType: 'user'  // 用户端
+					appType: 'user'  ,// 用户端
+					pictureLocation:'userProfile_banner'
 				}
 			})
 

pages/order/detail.vue

@@ -80,8 +80,25 @@
 			</view>
 		</view>
 
+		<!-- 转为自用提示 - 在使用中状态时显示 -->
+		<view v-if="orderInfo.orderStatus === 'in_used'" class="convert-tip" @click="handleConvertToOwned">
+			{{ $t('order.convertToOwn') }}
+		</view>
+
 		<!-- 底部操作栏 -->
 		<view class="bottom-bar">
+			<!-- 支付成功状态 -->
+			<template v-if="orderInfo.orderStatus === 'payment_successful'">
+				<view class="bottom-icon-btn" @click="contactService">
+					<image src="/static/customer-service.png" class="icon" mode="aspectFit"></image>
+					<text>{{ $t('user.customerService') }}</text>
+				</view>
+				<view class="bottom-icon-btn" @click="handleDeviceNoEject">
+					<image src="/static/complaint.png" class="icon" mode="aspectFit"></image>
+					<text>{{ $t('order.deviceNoEject') }}</text>
+				</view>
+			</template>
+
 			<!-- 使用中状态 -->
 			<template v-if="orderInfo.orderStatus === 'in_used'">
 				<view class="bottom-icon-btn" @click="contactService">
@@ -104,6 +121,11 @@
 				<view v-else class="action-btn primary" @click="quickReturn">
 					{{ $t('order.quickReturn') }}
 				</view>
+				<!-- 宝未弹出按钮 - 放在最后 -->
+				<view class="bottom-icon-btn" @click="handleDeviceNoEject">
+					<image src="/static/complaint.png" class="icon" mode="aspectFit"></image>
+					<text>{{ $t('order.deviceNoEject') }}</text>
+				</view>
 			</template>
 
 			<!-- 已完成状态 -->
@@ -140,8 +162,13 @@
 	import { onLoad, onShow, onHide, onUnload } from '@dcloudio/uni-app'
 	import {
 		queryById,
-		cancelOrder
+		cancelOrder,
+		reportDeviceNoEject,
+		convertToOwned
 	} from '@/config/api/order.js'
+	import {
+		addUserFeedback
+	} from '@/config/api/feedback.js'
 	import {
 		getSystemConfig
 	} from '@/config/api/system.js'
@@ -497,18 +524,11 @@
 		}
 	}
 
-	// 从订单监控服务中移除当前订单
+	// 从订单详情页角度不再主动移除订单监控
+	// 订单监控的生命周期完全交给全局 orderMonitor，在订单真正完成时自动移除
 	const removeFromOrderMonitor = () => {
-		if (orderInfo.value.orderId && $orderMonitor) {
+		// 保留函数以兼容已有调用，但不再从全局监控中删除订单
-			try {
+		console.log('removeFromOrderMonitor 调用：已不再从全局监控中移除订单，交由 orderMonitor 在订单完成时处理')
-				$orderMonitor.removeOrder({
-					orderId: orderInfo.value.orderId
-				})
-				console.log('订单已从监控队列移除:', orderInfo.value.orderId)
-			} catch (error) {
-				console.error('从监控队列移除订单失败:', error)
-			}
-		}
 	}
 
 	// 处理订单完成事件
@@ -691,7 +711,7 @@
 				// 更新订单信息
 				updateOrderInfo(orderData)
 
-				// 只有使用中的订单才启动定时器和监控
+				// 只有使用中的订单才启动本页的计时器逻辑
 				if (orderInfo.value.orderStatus === 'in_used') {
 					startTimer()
 					startStatusCheckTimer()
@@ -699,10 +719,13 @@
 					if (orderInfo.value.isSupportExpressReturn !== 'no') {
 						startExpressCountdown()
 					}
+				}
 
+				// 无论当前订单状态如何，只要进入订单详情页，就把当前订单交给全局订单监控
+				if (orderInfo.value.orderId) {
 					uni.setStorageSync('activeOrderId', orderInfo.value.orderId)
 
-					// 添加到监控队列
+					// 添加/更新到监控队列
 					try {
 						if ($orderMonitor) {
 							$orderMonitor.removeOrder({
@@ -711,7 +734,9 @@
 							$orderMonitor.addOrder({
 								orderId: orderInfo.value.orderId
 							}, 'detail')
-							console.log('订单已添加到监控队列:', orderInfo.value.orderId)
+							console.log('订单已添加到监控队列(无论当前状态):', orderInfo.value.orderId, '当前状态:', orderInfo.value.orderStatus)
+						} else {
+							console.warn('$orderMonitor 未定义，无法添加订单到监控队列')
 						}
 					} catch (error) {
 						console.error('添加订单到监控队列失败:', error)
@@ -880,6 +905,98 @@
 		})
 	}
 
+	// 处理"宝未弹出"反馈
+	const handleDeviceNoEject = () => {
+		uni.showModal({
+			title: $t('order.deviceNoEjectTitle'),
+			content: $t('order.deviceNoEjectConfirm'),
+			confirmText: $t('common.confirm'),
+			cancelText: $t('common.cancel'),
+			success: async (res) => {
+				if (res.confirm) {
+					try {
+						uni.showLoading({
+							title: $t('common.submitting')
+						})
+						
+						// 调用反馈API提交工单
+						const feedbackData = {
+							type: 'device_issue',
+							content: `订单号：${orderInfo.value.orderNo}\n设备号：${deviceId.value}\n问题：充电宝未弹出`,
+							phone: orderInfo.value.phone || '',
+							orderId: orderInfo.value.orderId,
+							orderNo: orderInfo.value.orderNo
+						}
+						
+						const result = await addUserFeedback(feedbackData)
+						
+						if (result.code === 200) {
+							uni.hideLoading()
+							uni.showToast({
+								title: $t('order.deviceNoEjectSuccess'),
+								icon: 'success',
+								duration: 3000
+							})
+						} else {
+							throw new Error(result.msg || $t('order.deviceNoEjectFailed'))
+						}
+					} catch (error) {
+						uni.hideLoading()
+						uni.showToast({
+							title: error.message || $t('order.deviceNoEjectFailed'),
+							icon: 'none',
+							duration: 2000
+						})
+					}
+				}
+			}
+		})
+	}
+
+	// 处理"转为自用"
+	const handleConvertToOwned = () => {
+		uni.showModal({
+			title: $t('order.convertToOwnTitle'),
+			content: $t('order.convertToOwnConfirm'),
+			confirmText: $t('common.confirm'),
+			cancelText: $t('common.cancel'),
+			success: async (res) => {
+				if (res.confirm) {
+					try {
+						uni.showLoading({
+							title: $t('common.processing')
+						})
+						
+						const result = await convertToOwned(orderInfo.value.orderId)
+						
+						if (result.code === 200) {
+							uni.hideLoading()
+							uni.showToast({
+								title: $t('order.convertToOwnSuccess'),
+								icon: 'success',
+								duration: 2000
+							})
+							
+							// 刷新订单详情
+							setTimeout(() => {
+								getOrderDetails()
+							}, 2000)
+						} else {
+							throw new Error(result.msg || $t('order.convertToOwnFailed'))
+						}
+					} catch (error) {
+						uni.hideLoading()
+						uni.showToast({
+							title: error.message || $t('order.convertToOwnFailed'),
+							icon: 'none',
+							duration: 2000
+						})
+					}
+				}
+			}
+		})
+	}
+
 	// 生命周期钩子
 	onLoad((options) => {
 		console.log('订单详情页加载，参数:', JSON.stringify(options))
@@ -1029,6 +1146,24 @@
 			}
 		}
 
+		// 转为自用提示
+		.convert-tip {
+			position: fixed;
+			left: 30rpx;
+			right: 30rpx;
+			bottom: calc(120rpx + env(safe-area-inset-bottom));
+			color: #000;
+			text-align: center;
+			padding: 20rpx 30rpx;
+			border-radius: 12rpx;
+			font-size: 26rpx;
+			z-index: 9;
+			
+			&:active {
+				opacity: 0.85;
+			}
+		}
+
 		// 租借信息卡片
 		.rent-card {
 			background: #fff;

pages/order/index.vue

@@ -35,7 +35,8 @@
 	import {
 		ref,
 		reactive,
-		onMounted
+		onMounted,
+		onUnmounted
 	} from 'vue';
     import OrderItemCard from '../../components/OrderItemCard.vue';
 	import {
@@ -60,13 +61,6 @@
 	
 	const { t: $t } = useI18n()
 
-	// 设置页面标题
-	onMounted(() => {
-		uni.setNavigationBarTitle({
-			title: $t('order.myOrders')
-		})
-	})
-
 	// 初始化状态
 	const currentTab = ref(0);
 	const orderList = ref([]);
@@ -228,6 +222,29 @@
 		}
 	};
 
+	// 处理订单完成事件
+	const handleOrderCompleted = (orderData) => {
+		console.log('订单列表页收到订单完成事件:', orderData)
+		// 刷新订单列表，根据当前选中的标签刷新对应状态的订单
+		const statusList = orderStatusTabs[currentTab.value].status[0]
+		loadOrderList(statusList)
+	}
+
+	// 设置页面标题并监听订单完成事件
+	onMounted(() => {
+		uni.setNavigationBarTitle({
+			title: $t('order.myOrders')
+		})
+		
+		// 监听订单完成事件
+		uni.$on('orderCompleted', handleOrderCompleted)
+	})
+	
+	// 页面卸载时移除事件监听
+	onUnmounted(() => {
+		uni.$off('orderCompleted', handleOrderCompleted)
+	})
+
 	// 同步订单状态
 	const getOrderStatus = async (order) => {
 		try {

pages/waiting/index.vue

@@ -93,7 +93,7 @@
 		} catch (e) {}
 		uni.showToast({ title: $t('waiting.rentFailed'), icon: 'none' })
 		setTimeout(() => {
-			uni.switchTab({ url: '/pages/index/index' })
+			uni.reLaunch({ url: '/pages/index/index' })
 		}, 800)
 	}
 
@@ -131,7 +131,7 @@
 			stopAllTimers()
 			uni.showToast({ title: $t('waiting.timeout'), icon: 'none' })
 			setTimeout(() => {
-				uni.switchTab({ url: '/pages/index/index' })
+				uni.reLaunch({ url: '/pages/index/index' })
 			}, 800)
 		}, 60000)
 	}

utils/orderMonitor.js

@@ -173,15 +173,15 @@ class OrderMonitor {
             
             // 如果时间差超过1分钟，不进行提醒
             if (timeDiff > 3) {
-              console.log(`订单 ${orderId} 完成时间与当前时间相差${timeDiff.toFixed(2)}分钟，超过3分钟，不进行提醒`);
+              console.log(`订单 ${orderId} 完成时间与当前时间相差${timeDiff.toFixed(2)}分钟，超过3分钟，不进行弹窗提醒`);
               shouldNotify = false;
             }
           }
           
-          if (shouldNotify) {
+          // 无论是否需要弹窗提醒，都要触发全局订单完成事件（用于订单列表、详情等页面刷新）
-            // 触发全局事件（订单详情页会监听此事件自动刷新）
           uni.$emit('orderCompleted', orderData)
           
+          if (shouldNotify) {
             // 显示全局通知
             uni.showToast({
               title: '风扇归还成功',