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 @@
{{item.floor}} | {{item.roomNum}} | {{item.capacityNum}}人 | {{item.typeName}}
- 预约人: {{item.bookingUserName}}
+ 预约人: {{item.userOrg}} - {{item.bookingUserName}}
会议名称:{{item.title}}
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,