From d05111bcb4bf77754ba44f9a4f71f4f1b55f1547 Mon Sep 17 00:00:00 2001
From: wangxiaowei <1121133807@qq.com>
Date: Tue, 30 Dec 2025 18:19:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A2=84=E7=BA=A6=E6=96=87?=
 =?UTF-8?q?=E6=9C=AC=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bundle/reserve/details.vue | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/bundle/reserve/details.vue b/bundle/reserve/details.vue
index 3d54921..55cfd62 100644
--- a/bundle/reserve/details.vue
+++ b/bundle/reserve/details.vue
@@ -177,7 +177,7 @@
                                                 : 'cg-info-time-normal'
                                         ]" >
                                             <template v-if="item3.price > 0 && item3.status == 0">￥{{ item3.price }}</template>
-                                            <template v-if="item3.status == 1">已约</template>
+                                            <template v-else-if="item3.status == 1">已约</template>
                                             <template v-else>免费</template>
                                     </view>
                                 </view>
@@ -226,7 +226,7 @@
                         <image style="width: 14rpx;height: 8rpx;margin-left: 10rpx;" src="@/static/icon/down.png" mode=""></image>
                     </view>
                 </view>
-                <view class="price-btn" @tap="toReserve">立即预约</view>
+                <view class="price-btn" @tap="toReserve">{{ typeId == 1 ? '立即预约' : '立即支付' }}</view>
             </view>
         </view>
     </view>
@@ -533,7 +533,8 @@ export default {
             // 保留2位小数，不四舍五入
             totalPrice = Number(totalPrice.toFixed(2));
             totalLightPrice = Number(totalLightPrice.toFixed(2));
-            const total = Number((totalPrice + totalLightPrice).toFixed(2));
+            // const total = Number((totalPrice + totalLightPrice).toFixed(2)); 2025-12-30要求显示灯光费用，但是不显示在总价中
+            const total = Number((totalPrice - 0).toFixed(2));
 
             this.selectedReserveTime = room_list;
             
@@ -543,7 +544,7 @@ export default {
                 cdf: {
                     nums: this.countSelectedTime,
                     price: 0, 
-                    total: totalPrice
+                    total: Number((totalPrice - totalLightPrice).toFixed(2))
                 },
                 dgf: {
                     nums: this.countSelectedTime,