mirror of
https://gitee.com/elegant_wings/dbd-meeting-wx-small.git
synced 2025-06-21 21:19:37 +08:00
修改部分内容
This commit is contained in:
parent
6121695f54
commit
db53b4e4f7
@ -5,7 +5,8 @@ import Notify from '@vant/weapp/notify/notify';
|
|||||||
|
|
||||||
import {
|
import {
|
||||||
selfFormatTimeYMD,
|
selfFormatTimeYMD,
|
||||||
selfFormatTimeHM
|
selfFormatTimeHM,
|
||||||
|
getWeekday
|
||||||
} from "../../../../utils/util.js"
|
} from "../../../../utils/util.js"
|
||||||
|
|
||||||
import {
|
import {
|
||||||
@ -313,7 +314,7 @@ Page({
|
|||||||
formartData(queryDataList) {
|
formartData(queryDataList) {
|
||||||
// 格式化数据
|
// 格式化数据
|
||||||
return queryDataList.map(item => {
|
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";
|
let statusColor = "#FFB119";
|
||||||
// 按钮是否显示
|
// 按钮是否显示
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
<image class="img" src="{{IMG_NAME + item.indoorPicUrlFirst}}" mode="aspectFill"></image>
|
<image class="img" src="{{IMG_NAME + item.indoorPicUrlFirst}}" mode="aspectFill"></image>
|
||||||
<view class="msgView">
|
<view class="msgView">
|
||||||
<view class="title">{{item.floor}} | {{item.roomNum}} | {{item.capacityNum}}人 | {{item.typeName}}</view>
|
<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 class="time">会议名称:{{item.title}}</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
@ -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 = {
|
module.exports = {
|
||||||
formatTime: formatTime,
|
formatTime: formatTime,
|
||||||
formatDate: formatDate,
|
formatDate: formatDate,
|
||||||
@ -367,6 +374,7 @@ module.exports = {
|
|||||||
selfFormatTimeHM,
|
selfFormatTimeHM,
|
||||||
selfFormatTimeYMDH,
|
selfFormatTimeYMDH,
|
||||||
twoTimeInterval,
|
twoTimeInterval,
|
||||||
|
getWeekday,
|
||||||
twoTimeIntervalReturnHours,
|
twoTimeIntervalReturnHours,
|
||||||
selfArrSum,
|
selfArrSum,
|
||||||
getUrlParamsObj,
|
getUrlParamsObj,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user