feat:更改小程序id由7a9替换为271

pages/order/index.vue

@@ -70,13 +70,29 @@
 					<view class="price">￥{{ order.amount }}</view>
 
 					<view class="actions">
-						<view v-if="order.status=='in_used'" class="action-item primary"
+						<!-- 待支付状态显示支付和取消按钮 -->
+						<view v-if="order.status === 'waiting_for_payment' || order.orderStatus === 'waiting_for_payment'" class="action-item primary" @click="handlePayment(order)">
+							立即支付
+						</view>
+						<view v-if="order.status === 'waiting_for_payment' || order.orderStatus === 'waiting_for_payment'" class="action-item secondary" @click="handleCancelOrder(order)">
+							取消订单
+						</view>
+
+						<!-- 使用中状态显示归还设备按钮 -->
+						<view v-if="order.status=='in_used' || order.orderStatus=='in_used'" class="action-item primary"
 							@click="navigateToReturn(order.deviceId, order.orderId)">
 							归还设备
 						</view>
-						<view v-if="order.status === 'waiting_for_payment'" class="action-item secondary"
+						
+						<!-- 查看详情按钮对所有订单都显示 -->
+						<view class="action-item secondary" @click="navigateToDetails(order)">
+							查看详情
+						</view>
+						
+						<!-- 同步订单状态按钮 -->
+						<view v-if="order.status === 'waiting_for_payment' || order.orderStatus === 'waiting_for_payment'" class="action-item secondary"
 							@click="getOrderStatus(order)">
-							同步订单状态
+							同步状态
 						</view>
 					</view>
 				</view>
@@ -97,7 +113,9 @@
 	import {
 		getOrderList,
 		queryById,
-		getOrderByOrderNoScorePayStatus
+		getOrderByOrderNoScorePayStatus,
+		cancelOrder,
+		confirmPaymentAndRent
 	} from '../../config/user.js';
 
 	// 初始化状态
@@ -279,6 +297,82 @@
 			url: `/pages/return/index?deviceId=${deviceId}&orderId=${orderId}`
 		});
 	};
+	
+	// 跳转到订单详情页
+	const navigateToDetails = (order) => {
+		uni.navigateTo({
+			url: `/pages/order/details?orderId=${order.orderId || order.orderNo}`
+		});
+	};
+	
+	// 立即支付
+	const handlePayment = async (order) => {
+		try {
+			uni.showLoading({
+				title: '处理中'
+			});
+			
+			const res = await confirmPaymentAndRent(order.orderId);
+			if (res.code === 200) {
+				uni.hideLoading();
+				uni.showToast({
+					title: '支付成功',
+					icon: 'success'
+				});
+				
+				// 刷新订单列表
+				await loadOrderList(orderStatusTabs[currentTab.value].status);
+			} else {
+				throw new Error(res.msg || '支付失败');
+			}
+		} catch (error) {
+			uni.hideLoading();
+			uni.showToast({
+				title: error.message || '支付失败',
+				icon: 'none'
+			});
+		}
+	};
+	
+	// 取消订单
+	const handleCancelOrder = async (order) => {
+		try {
+			uni.showModal({
+				title: '确认取消',
+				content: '确定要取消此订单吗？',
+				success: async (res) => {
+					if (res.confirm) {
+						uni.showLoading({
+							title: '处理中'
+						});
+						
+						const result = await cancelOrder({
+							orderId: order.orderId
+						});
+						
+						if (result.code === 200) {
+							uni.hideLoading();
+							uni.showToast({
+								title: '订单已取消',
+								icon: 'success'
+							});
+							
+							// 刷新订单列表
+							await loadOrderList(orderStatusTabs[currentTab.value].status);
+						} else {
+							throw new Error(result.msg || '取消订单失败');
+						}
+					}
+				}
+			});
+		} catch (error) {
+			uni.hideLoading();
+			uni.showToast({
+				title: error.message || '取消订单失败',
+				icon: 'none'
+			});
+		}
+	};
 </script>
 
 <style lang="scss" scoped>
@@ -485,6 +579,8 @@
 
 					.actions {
 						display: flex;
+						flex-wrap: wrap;
+                        justify-content: flex-end;
 
 						.action-item {
 							font-size: 26rpx;
@@ -494,6 +590,7 @@
 							display: flex;
 							align-items: center;
 							justify-content: center;
+                            margin-bottom: 10rpx;
 
 							&.primary {
 								background: #1976D2;