fix：修复快递归还异常bug

config/url.js

@@ -1,6 +1,6 @@
 // export const URL = "https://my.gxfs123.com/api" //正式服务器
 export const URL = "https://fansdev.gxfs123.com/api"  //测试服务器
-// export const URL = "http://192.168.5.22:8080" 		//本地调试
+// export const URL = "http://192.168.169.66:8080" 		//本地调试
 // export const URL = "http://127.0.0.1:8080" 		//本地调试
 
 export const appid = "wx2165f0be356ae7a9" //小程序appid

config/user.js

@@ -109,10 +109,10 @@ export const overOrderById = (orderId) => {
 //立即租借
 export const rentPowerBank = (deviceNo, phone) => {
 	return request({
-		url: '/app/device/rentPowerBank',
+		url: `/app/device/rentPowerBank?deviceNo=${deviceNo}`,
 		method: 'post',
 		data: {
-			deviceNo,
+			// deviceNo,
 			phone
 		}
 	})
@@ -210,7 +210,7 @@ export const getPotionsDetail = (data) => {
 export const uploadOssResource = (filePath) => {
 	return new Promise((resolve, reject) => {
 		uni.uploadFile({
-			url: URL + '/resource/oss/upload',
+			url: URL + '/manager/upload',
 			filePath,
 			name: 'file',
 			header: {

pages/expressReturn/addExpressReturn.vue

@@ -195,7 +195,7 @@ const handleSubmit = async () => {
             res = await fillExpressTrackingNumber({ id: Number(recordId.value), logisticsTrackingNumber: trackingNumber.value })
         } else {
             res = await applyExpressReturn({
-                orderId: Number(orderId.value),
+                orderId: orderId.value,
                 logisticsTrackingNumber: trackingNumber.value,
                 remark: ''
             })

pages/expressReturn/index.vue

@@ -19,15 +19,16 @@
 				<!-- 中间内容 -->
 				<view class="item-content">
 					<view class="item-header">
-						<text class="express-company">{{ item.expressCompany }}</text>
+						<text class="tracking-number">运单号：{{ item.logisticsTrackingNumber }}</text>
-						<text class="tracking-number">运单号：{{ item.trackingNumber }}</text>
+						<!-- <text class="express-company">{{ item.expressCompany }}</text> -->
 					</view>
 					<view class="item-details">
 						<text class="return-address">归还地址：{{ item.returnAddress }}</text>
-						<text class="return-time">归还时间：{{ item.returnTime }}</text>
+						<text class="return-time">填写时间：{{ item.returnTime }}</text>
 					</view>
 					<view class="item-footer">
-						<text class="package-info">包裹：{{ item.packageType }} | {{ item.weight }}</text>
+						<text class="package-info">订单号：{{ item.orderId }}</text>
+						<text class="user-phone" v-if="item.userPhone">用户电话：{{ item.userPhone }}</text>
 					</view>
 				</view>
 
@@ -65,14 +66,17 @@ const loadList = async () => {
 			const rows = (res.data && (res.data.rows || res.data)) || []
 			returnList.value = rows.map(r => ({
 				id: r.id,
-                expressCompany: r.expressCompany || r.company || '-',
+				expressCompany: r.expressCompany || r.company || '待填写',
-                trackingNumber: r.logisticsTrackingNumber || r.trackingNumber || '-',
+				trackingNumber: r.logisticsTrackingNumber || r.trackingNumber || '待填写',
-                returnAddress: r.returnAddress || r.address || '-',
+				returnAddress: r.returnAddress || r.address || '待填写',
-                returnTime: r.createTime || r.returnTime || '-',
+				returnTime: r.expressFillTime || r.createTime || r.returnTime || '待填写',
-                packageType: r.packageType || '-',
+				packageType: r.packageType || '待填写',
-                weight: r.weight || '-',
+				weight: r.weight || '待填写',
 				status: mapStatus(r.status),
-                rawStatus: r.status
+				rawStatus: r.status,
+				userPhone: r.userPhone,
+				orderId: r.orderId,
+				remark: r.remark
 			}))
 		} else {
 			throw new Error(res?.msg || '获取列表失败')
@@ -120,42 +124,42 @@ const handleItemClick = (item) => {
 	} else {
 		uni.navigateTo({ url: `/pages/expressReturn/detail?id=${item.id}` })
 	}
-	}
+}
 
 onMounted(loadList)
 </script>
 
 <style lang="scss">
-	.express-return-container {
+.express-return-container {
 	min-height: 100vh;
 	background-color: #f8f9fa;
 	padding: 20rpx;
-	}
+}
 
-	.page-header {
+.page-header {
 	margin-bottom: 40rpx;
 	padding: 20rpx 0;
-	}
+}
 
-	.page-title {
+.page-title {
 	display: block;
 	font-size: 36rpx;
 	font-weight: 600;
 	color: #2c3e50;
 	margin-bottom: 10rpx;
-	}
+}
 
-	.page-subtitle {
+.page-subtitle {
 	display: block;
 	font-size: 28rpx;
 	color: #7f8c8d;
-	}
+}
 
-	.list-container {
+.list-container {
 	background-color: transparent;
-	}
+}
 
-	.return-item {
+.return-item {
 	display: flex;
 	align-items: center;
 	padding: 30rpx 24rpx;
@@ -172,13 +176,13 @@ onMounted(loadList)
 	&:active {
 		background-color: #f8f9fa;
 	}
-	}
+}
 
-	.item-icon {
+.item-icon {
 	margin-right: 24rpx;
-	}
+}
 
-	.icon-wrapper {
+.icon-wrapper {
 	width: 80rpx;
 	height: 80rpx;
 	border-radius: 50%;
@@ -202,58 +206,67 @@ onMounted(loadList)
 		background-color: #f8f9fa;
 		color: #6c757d;
 	}
-	}
+}
 
-	.item-content {
+.item-content {
 	flex: 1;
 	margin-right: 20rpx;
-	}
+}
 
-	.item-header {
+.item-header {
 	margin-bottom: 12rpx;
-	}
+}
 
-	.express-company {
+.express-company {
 	display: block;
 	font-size: 32rpx;
 	font-weight: 600;
 	color: #2c3e50;
 	margin-bottom: 8rpx;
-	}
+}
 
-	.tracking-number {
+.tracking-number {
 	display: block;
 	font-size: 26rpx;
 	color: #7f8c8d;
-	}
+}
 
-	.item-details {
+.item-details {
 	margin-bottom: 12rpx;
-	}
+}
 
-	.return-address,
+.return-address,
-	.return-time {
+.return-time {
 	display: block;
 	font-size: 26rpx;
 	color: #34495e;
 	line-height: 1.5;
 	margin-bottom: 6rpx;
-	}
+}
 
-	.item-footer {
+.item-footer {
 	margin-top: 8rpx;
-	}
+	display: flex;
+	flex-direction: column;
+	align-items: flex-start;
+}
 
-	.package-info {
+.package-info {
 	font-size: 24rpx;
 	color: #95a5a6;
-	}
+	margin-bottom: 4rpx;
+}
 
-	.item-status {
+.user-phone {
+	font-size: 24rpx;
+	color: #95a5a6;
+}
+
+.item-status {
 	text-align: right;
-	}
+}
 
-	.status-text {
+.status-text {
 	font-size: 26rpx;
 	font-weight: 500;
 	padding: 8rpx 16rpx;
@@ -273,9 +286,9 @@ onMounted(loadList)
 		background-color: #f8f9fa;
 		color: #6c757d;
 	}
-	}
+}
 
-	.empty-state {
+.empty-state {
 	display: flex;
 	flex-direction: column;
 	align-items: center;
@@ -284,15 +297,15 @@ onMounted(loadList)
 	// background-color: #ffffff;
 	// border-radius: 16rpx;
 	// box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.08);
-	}
+}
 
-	.empty-icon {
+.empty-icon {
 	font-size: 80rpx;
 	margin-bottom: 20rpx;
-	}
+}
 
-	.empty-text {
+.empty-text {
 	font-size: 28rpx;
 	color: #7f8c8d;
-	}
+}
 </style>

pages/feedback/index.vue

@@ -21,7 +21,7 @@
 			</view>
 
 			<!-- 图片上传 -->
-			<!-- <view class="upload-section">
+			<view class="upload-section">
 				<view class="section-title">图片上传（选填）</view>
 				<view class="upload-grid">
 					<view class="upload-item" v-for="(img, index) in images" :key="index">
@@ -33,7 +33,7 @@
 						<text class="tip">上传图片</text>
 					</view>
 				</view>
-			</view> -->
+			</view>
 
 			<!-- 联系方式 -->
 			<view class="contact-section">
@@ -80,6 +80,7 @@
 		uni.chooseImage({
 			count: 3 - images.value.length,
 			success: async (res) => {
+				console.log(res);
 				const toUpload = res.tempFilePaths || []
 				for (const localPath of toUpload) {
 					// 先追加本地预览，再上传并替换为远程URL
@@ -142,7 +143,7 @@
 			type: paramsType.value,
 			content: description.value,
 			phone: contact.value,
-			// images: images.value
+			picturePath: images.value
 		}
 
 		uni.request({

pages/order/index.vue

@@ -163,6 +163,10 @@
 		'order_cancelled': {
 			text: '已取消',
 			class: 'status-cancelled'
+		},
+		'express_return': {
+			text: '快递归还',
+			class: 'status-express-return'
 		}
 	});
 
@@ -501,6 +505,10 @@
 						&.status-cancelled {
 							color: #9E9E9E;
 						}
+
+						&.status-express-return {
+							color: #FF9800;
+						}
 					}
 				}
 

pages/return/index.vue

@@ -119,7 +119,7 @@
 			<view v-if="orderInfo.orderStatus === 'in_used'" class="action-item secondary" @click="checkReturnStatus">
 				刷新状态</view>
 			<view v-if="orderInfo.orderStatus === 'in_used' && !showExpressAction" class="action-item primary">
-				{{ formatHms(countdownRemaining) }} 后可发起快递归还
+				倒计时{{ formatHms(countdownRemaining) }} 
 			</view>
 			<view v-if="orderInfo.orderStatus === 'in_used' && showExpressAction" class="action-item primary" @click="expressRetrunOrder">
 				暂停计费，快递归还
@@ -178,7 +178,8 @@
 				statusCheckInterval: 5000, // 5秒检查一次
 				isPageActive: false, // 跟踪页面是否活跃
 				// 倒计时与快递归还触发（默认4小时=14400秒，可被配置覆盖）
-				countdownRemaining: 14400,
+				// countdownRemaining: 14400,
+				countdownRemaining: 0,
 				showExpressAction: false,
 				countdownTimer: null
 			}