From 6042dcb485855d491da8b3bcba5318d6504fa2b7 Mon Sep 17 00:00:00 2001
From: SelfRidicule <selfridicule@gmail.com>
Date: Thu, 27 Jun 2024 17:41:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=8F=E8=BF=B0:=E4=BC=9A=E8=AE=AE=E9=A2=84?=
 =?UTF-8?q?=E7=BA=A6=E8=AF=A6=E6=83=85=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meetingDetail/meetingDetail.js            |  4 +-
 .../meetingDetail/meetingDetail.wxml          | 41 ++++++++-----------
 .../meetingDetail/meetingDetail.wxss          | 29 +++++++++++++
 .../meetingRecord/meetingRecord.wxml          |  2 +-
 4 files changed, 49 insertions(+), 27 deletions(-)

diff --git a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.js b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.js
index 7779d96..889c063 100644
--- a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.js
+++ b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.js
@@ -72,6 +72,8 @@ Page({
                 showDetail = true;
                 // 状态字体颜色
                 statusColor = "#3794FF";
+                // 待使用 修改为 预约成功
+                detail.statusName = '预约成功'
             }
             // 进行中 2：去邀请、查看详情
             if (statusValue == 2) {
@@ -168,7 +170,7 @@ Page({
         }
         Dialog.confirm({
             title: '提示',
-            message: '如需退款,请联系园区运营管理人员!',
+            message: '是否取消预约!',
             beforeClose,
         });
     },
diff --git a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxml b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxml
index b3e9932..fe70d0c 100644
--- a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxml
+++ b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxml
@@ -8,10 +8,10 @@
                 <view class="name">{{detail.title}}</view>
                 <view class="time">{{detail.timeSlot}}</view>
             </view>
-            <view class="priceView">
+            <!-- <view class="priceView">
                 <view class="price">￥{{detail.roomContent.money * detail.roomContent.duration}}</view>
                 <view class="unit">/ {{detail.roomContent.duration}}小时 起</view>
-            </view>
+            </view> -->
         </view>
     </view>
 
@@ -26,6 +26,10 @@
             <view class="label">会议主题</view>
             <view class="content">{{detail.title}}</view>
         </view>
+        <view class="cellView">
+            <view class="label">参会人数</view>
+            <view class="content">{{detail.personNum}}</view>
+        </view>
         <view class="cellView">
             <view class="label">会议预约人</view>
             <view class="content">{{detail.userName}}</view>
@@ -34,11 +38,6 @@
             <view class="label">联系方式</view>
             <view class="content">{{detail.phone}}</view>
         </view>
-        <view class="labelTitle leftLineTitle">订单信息</view>
-        <view class="cellView">
-            <view class="label">订单类型</view>
-            <view class="content">会议室订单</view>
-        </view>
         <view class="cellView">
             <view class="label">订单状态</view>
             <view class="content status" style="color: {{detail.statusColor}};">{{detail.statusName}}</view>
@@ -47,31 +46,23 @@
             <view class="label">取消原因</view>
             <view class="content status" style="color: {{detail.statusColor}};">{{detail.cancelResaon}}</view>
         </view>
-        <view class="cellView">
-            <view class="label">订单编号</view>
-            <view class="content">{{detail.oderNumber}}</view>
-        </view>
         <view class="cellView">
             <view class="label">创建时间</view>
             <view class="content">{{detail.createTime}}</view>
         </view>
-        <view class="cellView">
-            <view class="label">优惠卷</view>
-            <view class="content">{{detail.ticketName ? detail.ticketName : ''}}</view>
-        </view>
-        <view class="cellView">
-            <view class="label">支付金额</view>
-            <view class="content payMoney">￥{{detail.orderMoney}}</view>
-        </view>
-        <view class="cellView">
-            <view class="label">支付时间</view>
-            <view class="content">{{detail.orderTime ? detail.orderTime : ''}}</view>
+        <view class="serviceItemView">
+            <view class="label">会议服务</view>
+            <view class="serviceItem" wx:for="{{detail.reservationServes}}" wx:key="*this">
+                <view class="name">{{item.serveName}}</view>
+                <view class="name">{{item.num}}</view>
+            </view>
         </view>
+
     </view>
 
     <!-- 参与人员 -->
     <view class="basicView">
-        <view class="labelTitle leftLineTitle">参与人员</view>
+        <view class="labelTitle leftLineTitle">参与人员（{{joinPersonList.length}}/{{detail.personNum}}）</view>
         <view class="cellView borderNone">
             <view class="joinView">
                 <view class="joinPersonView" wx:for="{{joinPersonList}}" wx:key="*this">
@@ -84,11 +75,11 @@
 
     <!-- 底部区域 -->
     <view class="bottomFix" wx:if="{{detail.showPay || detail.showInvite || detail.showCancel}}">
-        <view class="btn" wx:if="{{detail.showPay}}" bind:tap="jumpPay" data-id="{{detail.id}}">去支付</view>
+        <!-- <view class="btn" wx:if="{{detail.showPay}}" bind:tap="jumpPay" data-id="{{detail.id}}">去支付</view> -->
         <view class="btn" wx:if="{{detail.showInvite}}">去邀请
             <button class="shareBtn" open-type="share" data-id="{{detail.id}}">转发</button>
         </view>
-        <view class="btn" wx:if="{{detail.showCancel}}" bind:tap="cancelOrder" data-id="{{detail.id}}">取消订单</view>
+        <view class="btn" wx:if="{{detail.showCancel}}" bind:tap="cancelOrder" data-id="{{detail.id}}">取消预约</view>
     </view>
 
     <!-- 提示框 -->
diff --git a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxss b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxss
index 383b1d5..ca90d8c 100644
--- a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxss
+++ b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingDetail/meetingDetail.wxss
@@ -96,6 +96,35 @@
     color: #4e96f8;
 }
 
+.serviceItemView {
+    border-bottom: 1px solid rgb(126, 126, 126, 0.2);
+    padding: 30rpx 20rpx;
+}
+
+.serviceItemView .label {
+    font-size: 28rpx;
+    min-width: 180rpx;
+    margin-bottom: 20rpx;
+}
+
+.serviceItemView .serviceItem {
+    border-bottom: 1px solid rgb(126, 126, 126, 0.2);
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    word-break: break-all;
+    padding: 20rpx 40rpx;
+}
+
+.serviceItemView .serviceItem:last-of-type {
+    border-bottom: none;
+    padding-bottom: 0;
+}
+
+.serviceItemView .serviceItem .name {
+    font-size: 26rpx;
+}
+
 
 .joinView {
     display: flex;
diff --git a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.wxml b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.wxml
index 4837283..24cb317 100644
--- a/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.wxml
+++ b/miniprogram/pages/meeting/reservationRecord/meetingRecord/meetingRecord.wxml
@@ -26,7 +26,7 @@
                     <view class="btn" wx:if="{{item.showInvite}}">去邀请
                         <button class="shareBtn" open-type="share" data-id="{{item.id}}">转发</button>
                     </view>
-                    <view class="btn" wx:if="{{item.showCancel}}" bind:tap="cancelOrder" data-id="{{item.id}}">取消订单</view>
+                    <view class="btn" wx:if="{{item.showCancel}}" bind:tap="cancelOrder" data-id="{{item.id}}">取消预约</view>
                     <view class="btn" wx:if="{{item.showDetail}}" bind:tap="jumpMeetingDetail" data-id="{{item.id}}">查看详情</view>
                 </view>
             </view>