From 231779002863903367730e1d753d8f3554bc016a Mon Sep 17 00:00:00 2001
From: SelfRidicule <selfridicule@gmail.com>
Date: Thu, 27 Jun 2024 16:42:00 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E6=97=B6=E9=97=B4=E6=AE=B5?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../meetingBooked/meetingBooked.js            |  2 +
 .../meetingBooked/meetingBooked.json          |  3 +-
 .../meetingBooked/meetingBooked.wxml          | 18 +++++++--
 .../meetingBooked/meetingBooked.wxss          | 39 ++++++++++++++++++-
 4 files changed, 56 insertions(+), 6 deletions(-)

diff --git a/miniprogram/pages/meeting/meetingRoom/meetingBooked/meetingBooked.js b/miniprogram/pages/meeting/meetingRoom/meetingBooked/meetingBooked.js
index 0ecb4d4..174f357 100644
--- a/miniprogram/pages/meeting/meetingRoom/meetingBooked/meetingBooked.js
+++ b/miniprogram/pages/meeting/meetingRoom/meetingBooked/meetingBooked.js
@@ -175,6 +175,8 @@ Page({
                 item.reservations = item.reservations.map(record => {
                     record.startTime = record.startTime.substring(11)
                     record.endDate = record.endDate.substring(11)
+                    record.userName = record.userName.substring(0,1) + "某"
+                    record.phone = record.phone.substring(0,3) + "****" + record.phone.substring(7,record.phone.length)
                     return record;
                 })
                 return item
diff --git a/miniprogram/pages/meeting/meetingRoom/meetingBooked/meetingBooked.json b/miniprogram/pages/meeting/meetingRoom/meetingBooked/meetingBooked.json
index b97c1d1..b166c06 100644
--- a/miniprogram/pages/meeting/meetingRoom/meetingBooked/meetingBooked.json
+++ b/miniprogram/pages/meeting/meetingRoom/meetingBooked/meetingBooked.json
@@ -2,7 +2,8 @@
     "usingComponents": {
         "van-datetime-picker": "@vant/weapp/datetime-picker/index",
         "van-popup": "@vant/weapp/popup/index",
-        "van-notify": "@vant/weapp/notify/index"
+        "van-notify": "@vant/weapp/notify/index",
+        "van-icon": "@vant/weapp/icon/index"
     },
     "navigationBarTitleText": "会议室已预约"
 }
\ No newline at end of file
diff --git a/miniprogram/pages/meeting/meetingRoom/meetingBooked/meetingBooked.wxml b/miniprogram/pages/meeting/meetingRoom/meetingBooked/meetingBooked.wxml
index 2b7bf6d..b1f4257 100644
--- a/miniprogram/pages/meeting/meetingRoom/meetingBooked/meetingBooked.wxml
+++ b/miniprogram/pages/meeting/meetingRoom/meetingBooked/meetingBooked.wxml
@@ -6,9 +6,21 @@
         <!-- 预约列表 -->
         <view class="itemVIew" wx:for="{{dataList}}" wx:for-item="item" wx:key="*this">
             <view class="item">{{item.nowDate}}</view>
-            <view class="itemTimeView" wx:for="{{item.reservations}}" wx:for-item="record" wx:key="*this">
-                <view class="time">{{record.startTime}}~{{record.endDate}}</view>
-                <view class="status">已预约</view>
+            <view class="itemTimeCellView" wx:for="{{item.reservations}}" wx:for-item="record" wx:key="*this">
+                <view class="itemTimeView">
+                    <view class="time">{{record.startTime}}~{{record.endDate}}</view>
+                    <view class="status">已预约</view>
+                </view>
+                <view class="personView">
+                    <view class="name">
+                        <van-icon name="manager-o" size="30rpx" />
+                        <view class="content">预约人：{{record.userName}}</view>
+                    </view>
+                    <view class="phone">
+                        <van-icon name="phone-o" size="30rpx" />
+                        <view class="content">联系电话：{{record.phone}}</view>
+                    </view>
+                </view>
             </view>
         </view>
         <!-- 没有记录 -->
diff --git a/miniprogram/pages/meeting/meetingRoom/meetingBooked/meetingBooked.wxss b/miniprogram/pages/meeting/meetingRoom/meetingBooked/meetingBooked.wxss
index 4abbf7b..d3e3f61 100644
--- a/miniprogram/pages/meeting/meetingRoom/meetingBooked/meetingBooked.wxss
+++ b/miniprogram/pages/meeting/meetingRoom/meetingBooked/meetingBooked.wxss
@@ -7,17 +7,52 @@
 }
 
 .itemVIew {
+    border: 1px solid transparent;
     box-shadow: rgba(153, 134, 134, 0.2) 0px 0px 4px 0px;
     padding: 0 20rpx;
     margin-top: 40rpx;
 }
 
-.itemVIew .item,
+.itemVIew .item {
+    padding: 30rpx 0;
+}
+
 .itemVIew .itemTimeView {
     padding: 30rpx 0;
-    background-image: linear-gradient(to right, rgb(126, 126, 126, 0.1), rgb(126, 126, 126, 0.1), transparent 100%);
+}
+
+.itemVIew .itemTimeCellView {
+    background-image: linear-gradient(to right, rgb(126, 126, 126, 0.2), rgb(126, 126, 126, 0.2), transparent 100%);
     background-size: 20rpx 2rpx;
     background-repeat: repeat-x;
+
+    margin-bottom: 10rpx;
+}
+
+.itemVIew .personView {
+    padding: 0rpx 20rpx 20rpx;
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    /* background: #fbfbfb; */
+}
+
+.itemVIew .personView .name,
+.itemVIew .personView .phone {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-size: 24rpx;
+}
+
+.itemVIew .personView .name {}
+
+.itemVIew .personView .phone {
+    margin-left: 40rpx;
+}
+
+.itemVIew .personView .content {
+    margin-left: 10rpx;
 }
 
 .itemVIew .item {