样式优化

pages/AggregateOrders/components/orders.vue

@@ -47,9 +47,6 @@
 						<!-- #endif -->
 						<view class="row">
 							<!-- #ifdef MP-DI -->
-							<view v-if="item.remainingSeconds" style="line-height: 60rpx;color: #B99846;">
-								剩余：{{ formatTime(item.remainingSeconds) }}
-							</view>
 							<template v-if="item.goodsType==9">
 								<view v-if="item.orderStatus==1||item.orderStatus==2" class="jz_Zailai"
 									style="width: 110rpx;margin-left: 10rpx;" @click.stop="cancelHotelOrder(item)">取消
@@ -62,8 +59,9 @@
 							<view v-if="item.orderStatus==1" class="jz_Zailai jz_ZailaiZF"
 								style="margin-left: 10rpx;" 
 								:style="{'width':!item.remainingSeconds?'150rpx':'auto'}"
+								:class="[item.remainingSeconds?'active':'']"
 								@click.stop="submitGetCodeByOrderNo(item)">
-								立即支付 <template v-if="item.remainingSeconds"> 剩余：{{ formatTime(item.remainingSeconds) }}</template>
+								立即支付 <text v-if="item.remainingSeconds" style="margin-left: 10rpx;"> 剩余：{{ formatTime(item.remainingSeconds) }}</text>
 							</view>
 							<view v-if="item.orderStatus!=1" style="margin-left: 10rpx;" class="jz_Zailai"
 								@click.stop="AnotherOrder(item)">再来一单</view>
@@ -76,7 +74,8 @@
 								style="width: 110rpx;margin-left: 10rpx;" @click.stop="goCancel(item)">取消</view>
 							<view v-if="item.goodsType==7&&item.orderStatus==1" class="jz_Zailai jz_ZailaiZF"
 								style="margin-left: 10rpx;" 
-								:style="{'width':!item.remainingSeconds?'150rpx':'auto','padding':!item.remainingSeconds?'0':'0 20rpx',}"
+								:style="{'width':!item.remainingSeconds?'150rpx':'auto'}"
+								:class="[item.remainingSeconds?'active':'']"
 								@click.stop="submitGetCodeByOrderNo(item)">
 								立即支付 <text v-if="item.remainingSeconds" style="margin-left: 10rpx;"> 剩余：{{ formatTime(item.remainingSeconds) }}</text>
 							</view>
@@ -129,6 +128,7 @@
 						// #ifdef MP-AG
 							goodsTypeHotel = x.goodsType==7?1:0
 						// #endif
+						if(x.orderStatus!=1) x.isExpired = true
 						if (x.orderStatus==1&&goodsTypeHotel>0) {
 							const now = Date.now();
 							// const customStr = '2025-05-12 14:43:00'
@@ -641,9 +641,10 @@
 		font-size: 24rpx;
 		position: relative;
 		border: 1rpx solid rgba(164, 164, 164, .3);
-
 	}
-
+	.jz_Zailai.active{
+		padding: 0 20rpx;
+	}
 	.jz_Zailai.jz_ZailaiZF {
 		color: #B99846;
 		border: 1rpx solid #B99846;