From db53b4e4f71240957ee5d721197a1921b4a11c46 Mon Sep 17 00:00:00 2001
From: "471615499@qq.com" <sy996996@>
Date: Wed, 21 May 2025 12:50:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/meeting/reservationRecord/approve/approve.js    | 5 +++--
 .../pages/meeting/reservationRecord/approve/approve.wxml  | 2 +-
 miniprogram/utils/util.js                                 | 8 ++++++++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/miniprogram/pages/meeting/reservationRecord/approve/approve.js b/miniprogram/pages/meeting/reservationRecord/approve/approve.js
index 8e727e3..38f2c8e 100644
--- a/miniprogram/pages/meeting/reservationRecord/approve/approve.js
+++ b/miniprogram/pages/meeting/reservationRecord/approve/approve.js
@@ -5,7 +5,8 @@ import Notify from '@vant/weapp/notify/notify';
 
 import {
   selfFormatTimeYMD,
-  selfFormatTimeHM
+  selfFormatTimeHM,
+  getWeekday
 } from "../../../../utils/util.js"
 
 import {
@@ -313,7 +314,7 @@ Page({
   formartData(queryDataList) {
     // 格式化数据
     return queryDataList.map(item => {
-      item.timeSlot = selfFormatTimeYMD(item.start) + ' ' + selfFormatTimeHM(item.start) + '~' + selfFormatTimeHM(item.end);
+      item.timeSlot = selfFormatTimeYMD(item.start) + ' '+ getWeekday(item.start) +' ' + selfFormatTimeHM(item.start) + '~' + selfFormatTimeHM(item.end);
       // 状态字体颜色
       let statusColor = "#FFB119";
       // 按钮是否显示
diff --git a/miniprogram/pages/meeting/reservationRecord/approve/approve.wxml b/miniprogram/pages/meeting/reservationRecord/approve/approve.wxml
index 719e8de..8ab5ede 100644
--- a/miniprogram/pages/meeting/reservationRecord/approve/approve.wxml
+++ b/miniprogram/pages/meeting/reservationRecord/approve/approve.wxml
@@ -22,7 +22,7 @@
       <image class="img" src="{{IMG_NAME + item.indoorPicUrlFirst}}" mode="aspectFill"></image>
       <view class="msgView">
         <view class="title">{{item.floor}} | {{item.roomNum}} | {{item.capacityNum}}人 | {{item.typeName}}</view>
-        <view class="name">预约人: {{item.bookingUserName}}</view>
+        <view class="name">预约人: {{item.userOrg}} - {{item.bookingUserName}}</view>
         <view class="time">会议名称：{{item.title}}</view>
       </view>
     </view>
diff --git a/miniprogram/utils/util.js b/miniprogram/utils/util.js
index 170d893..180739b 100644
--- a/miniprogram/utils/util.js
+++ b/miniprogram/utils/util.js
@@ -353,6 +353,13 @@ function uploadVoice(url) {
   })
 }
 
+function getWeekday(dateStr) {
+  const weekDays = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'];
+  const date = new Date(dateStr);
+  const weekday = date.getDay();
+  return weekDays[weekday];
+}
+
 module.exports = {
   formatTime: formatTime,
   formatDate: formatDate,
@@ -367,6 +374,7 @@ module.exports = {
   selfFormatTimeHM,
   selfFormatTimeYMDH,
   twoTimeInterval,
+  getWeekday,
   twoTimeIntervalReturnHours,
   selfArrSum,
   getUrlParamsObj,