From 213d786842e0754f8d4d8e56f0b4ef9bb0e4a43d Mon Sep 17 00:00:00 2001
From: wangxiaowei <1121133807@qq.com>
Date: Fri, 12 Dec 2025 09:29:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bundle/reserve/details.vue      | 5 +++--
 pages/order/cg-order-detail.vue | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/bundle/reserve/details.vue b/bundle/reserve/details.vue
index 5727785..51df24a 100644
--- a/bundle/reserve/details.vue
+++ b/bundle/reserve/details.vue
@@ -158,7 +158,7 @@
                                 {{ item.t }}
                             </view>
                         </view>
-                        <view class="d-f cg-info" style="width: 800rpx; overflow-x: auto;">
+                        <view class="d-f cg-info" style="width: 800rpx; overflow-x: auto;" v-if="timeList.length > 0">
                             <view style="width: 120rpx;margin-right: 10rpx;" v-for="(item2, index2) in cdList" :key="index2">
                                 <view class="" style="margin-bottom: 6rpx; text-align: center;">{{ item2.title }}</view>
                                 <view 
@@ -178,6 +178,7 @@
                                 </view>
                             </view>
                         </view>
+                        <view class="tc mt60 ww100 f30" v-else>今日预约已结束</view>
                     </view>
                 </view>
             </view>
@@ -608,7 +609,7 @@ export default {
                 total: Number(totalPrice) + Number(totalLightPrice),
                 cdf: {
                     nums: this.countSelectedTime,
-                    price: 0, // 假设单价100元/小时，实际应从后端获取
+                    price: 0, 
                     total: totalPrice
                 },
                 dgf: {
diff --git a/pages/order/cg-order-detail.vue b/pages/order/cg-order-detail.vue
index 47536c7..a11e339 100644
--- a/pages/order/cg-order-detail.vue
+++ b/pages/order/cg-order-detail.vue
@@ -7,8 +7,8 @@
 			<!-- 待付款 -->
 			<view class="state-cont icon-box" style="width: 100%;" v-if="detail.order_status == 0">
 				<image style="width: 36rpx;height: 36rpx;margin-top: 16rpx;" src="@/static/icon/time2.png" mode=""></image>
-				<view class="countdown-datetime" v-if="detail.pay_end_time">
-					<text>还剩<text style="color: #FF5951">{{ detail.pay_end_time }}</text>订单自动取消</text>
+				<view class="countdown-datetime" v-if="detail.expiration_time">
+					<text>还剩<text style="color: #FF5951">{{ detail.expiration_time }}</text>分钟订单自动取消</text>
 				</view>
 			</view>