1

pages/order/order.vue

@@ -2,60 +2,33 @@
 	<view class="container">
 		<!-- 顶部筛选标签 -->
 		<view class="filter-tabs">
-			<view 
-				class="tab-item" 
-				:class="{ active: activeTab === 'all' }"
-				@click="switchTab('all')"
-			>
+			<view class="tab-item" :class="{ active: activeTab === 'all' }" @click="switchTab('all')">
 				全部
 			</view>
-			<view 
-				class="tab-item" 
-				:class="{ active: activeTab === 'recharge' }"
-				@click="switchTab('recharge')"
-			>
+			<view class="tab-item" :class="{ active: activeTab === 'recharge' }" @click="switchTab('recharge')">
 				充值
 			</view>
-			<view 
-				class="tab-item" 
-				:class="{ active: activeTab === 'monthly' }"
-				@click="switchTab('monthly')"
-			>
+			<view class="tab-item" :class="{ active: activeTab === 'monthly' }" @click="switchTab('monthly')">
 				包月
 			</view>
-			<view 
-				class="tab-item" 
-				:class="{ active: activeTab === 'season' }"
-				@click="switchTab('season')"
-			>
+			<view class="tab-item" :class="{ active: activeTab === 'season' }" @click="switchTab('season')">
 				包季
 			</view>
-			<view 
-				class="tab-item" 
-				:class="{ active: activeTab === 'yearly' }"
-				@click="switchTab('yearly')"
-			>
+			<view class="tab-item" :class="{ active: activeTab === 'yearly' }" @click="switchTab('yearly')">
 				包年
 			</view>
 		</view>
 
 		<!-- 订单列表 -->
 		<view class="order-list">
-			<view 
-				class="order-item" 
-				v-for="order in filteredOrders" 
-				:key="order.id"
-			>
+			<view class="order-item" v-for="order in filteredOrders" :key="order.id">
 				<!-- 订单头部 -->
 				<view class="order-header">
 					<view class="order-info">
 						<text class="order-number">订单编号: {{ order.orderNumber }}</text>
-						<view class="order-type-tag">{{ order.typeLabel }}</view>
+						<view class="order-type-tag">复制</view>
 					</view>
-					<view 
-						class="order-status" 
-						:class="order.status"
-					>
+					<view class="order-status" :class="order.status">
 						{{ order.statusText }}
 					</view>
 				</view>
@@ -94,52 +67,53 @@
 
 				<!-- 订单操作 -->
 				<view class="order-actions">
-					<u-button 
-						v-if="order.status === 'pending'"
-						type="default" 
-						size="small"
-						@click="cancelOrder(order)"
-					>
-						取消订单
-					</u-button>
-					<u-button 
-						type="default" 
-						size="small"
-						@click="deleteOrder(order)"
-					>
-						删除订单
-					</u-button>
-					<u-button 
-						type="primary" 
-						size="small"
-						@click="viewOrderDetail(order)"
-					>
-						查看详情
-					</u-button>
+					<div>
+						<div class="countdown-text" v-if="order.status === 'pending'">支付剩余时间: {{ order.countdown }}
+						</div>
+					</div>
+					<div class="buttonBox">
+						<template v-if="order.status === 'pending'">
+							<uv-button type="default" size="small" @click="cancelOrder(order)">
+								取消订单
+							</uv-button>
+							<uv-button type="error" size="small" @click="payOrder(order)">
+								去支付
+							</uv-button>
+						</template>
+						<template v-else>
+
+							<uv-button type="default" size="small" @click="deleteOrder(order)">
+								删除订单
+							</uv-button>
+							<uv-button type="primary" size="small" @click="viewOrderDetail(order)">
+								查看详情
+							</uv-button>
+						</template>
+					</div>
 				</view>
 
 				<!-- 待支付订单底部 -->
-				<view v-if="order.status === 'pending'" class="pending-footer">
+				<!-- 				<view v-if="order.status === 'pending'" class="pending-footer">
 					<view class="countdown">
 						<text class="countdown-text">支付剩余时间: {{ order.countdown }}</text>
 					</view>
 					<view class="pending-actions">
-						<u-button 
+						<uv-button 
 							type="default" 
 							size="large"
 							@click="cancelOrder(order)"
 						>
 							取消订单
-						</u-button>
-						<u-button 
+						</uv-button>
+						<uv-button 
 							type="error" 
 							size="large"
 							@click="payOrder(order)"
 						>
 							去支付
-						</u-button>
+						</uv-button>
 					</view>
-				</view>
+				</view> -->
 			</view>
 		</view>
 
@@ -175,8 +149,7 @@
 
 	// 响应式数据
 	const activeTab = ref('all')
-	const orders = ref([
-		{
+	const orders = ref([{
 			id: 1,
 			orderNumber: 'ORD20230515001',
 			typeLabel: '续费',
@@ -480,11 +453,24 @@
 
 			.order-actions {
 				display: flex;
-				justify-content: flex-end;
+				justify-content: space-between;
+				align-items: center;
 				gap: 8px;
 				padding: 0 16px 16px;
 				border-top: 1px solid #f0f0f0;
 				padding-top: 16px;
+
+				.countdown-text {
+					color: #ff4d4f;
+					font-size: 12px;
+				}
+
+				.buttonBox {
+					display: flex;
+					align-items: center;
+					gap: 10px;
+					justify-content: flex-end;
+				}
 			}
 
 			.pending-footer {