支付倒计时

pages/AggregateOrders/components/orders.vue

@@ -60,24 +60,25 @@
 									style="width: 110rpx;margin-left: 10rpx;" @click.stop="goCancelZK(item)">取消</view>
 							</template>
 							<view v-if="item.orderStatus==1" class="jz_Zailai jz_ZailaiZF"
-								style="width: 150rpx;margin-left: 10rpx;" @click.stop="submitGetCodeByOrderNo(item)">
-								立即支付
+								style="margin-left: 10rpx;" 
+								:style="{'width':!item.remainingSeconds?'150rpx':'auto'}"
+								@click.stop="submitGetCodeByOrderNo(item)">
+								立即支付 <template v-if="item.remainingSeconds"> 剩余：{{ formatTime(item.remainingSeconds) }}</template>
 							</view>
 							<view v-if="item.orderStatus!=1" style="margin-left: 10rpx;" class="jz_Zailai"
 								@click.stop="AnotherOrder(item)">再来一单</view>
 							<!-- #endif -->
 							<!-- #ifdef MP-AG -->
-							<view v-if="item.remainingSeconds" style="line-height: 60rpx;color: #B99846;">
-								剩余：{{ formatTime(item.remainingSeconds) }}
-							</view>
+						
 							<view v-if="item.goodsType==7&&(item.orderStatus==1||item.orderStatus==2)" class="jz_Zailai"
 								style="width: 110rpx;margin-left: 10rpx;" @click.stop="cancelHotelOrder(item)">取消</view>
 							<view v-if="item.goodsType!=7&&item.income == 0&&item.orderStatus==1" class="jz_Zailai"
 								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="width: 150rpx;margin-left: 10rpx;" @click.stop="submitGetCodeByOrderNo(item)">
-								立即支付 
-								
+								style="margin-left: 10rpx;" 
+								:style="{'width':!item.remainingSeconds?'150rpx':'auto','padding':!item.remainingSeconds?'0':'0 20rpx',}"
+								@click.stop="submitGetCodeByOrderNo(item)">
+								立即支付 <text v-if="item.remainingSeconds" style="margin-left: 10rpx;"> 剩余：{{ formatTime(item.remainingSeconds) }}</text>
 							</view>
 							<view v-else class="jz_Zailai" style="margin-left: 10rpx;" @click.stop="AnotherOrder(item)">
 								再来一单</view>
@@ -154,7 +155,6 @@
 			clearInterval(this.checkInterval)
   		},
 		mounted() {
-			// clearInterval(null)
 			this.b2b_user = uni.getStorageSync("b2b_user")
 			// 全局定时检查（防止极端情况下定时器失效）
 			this.checkInterval = setInterval(() => {
@@ -174,6 +174,8 @@
 					if(order.remainingSeconds>0){
 						order.remainingSeconds--
 					}else {
+						if(order.isExpired) return clearInterval(null)
+						order.isExpired = true
 						this.submitCancel = true
 						let cancelMsg = {
 							OrderNo: order.OrderNo,

pages/hotel/orderdetails.vue

@@ -30,7 +30,7 @@
 						</text>
 					</view>
 					<view class="RemainderBox" v-if="remainingSeconds">
-						<text>剩余：</text>
+						<text>剩余支付时间：</text>
 						<text>{{formattedTime}}</text>
 					</view>
 				</view>
@@ -582,6 +582,7 @@
 			},
 
 			handleTimeout() {
+				if(this.isExpired) return this.clearInterval()
 				this.isExpired = true
 				if (this.submitCancel) return
 				let cancelMsg = {