Skip to content

S
schedule
Commit 8f6ee05e by fengzhaoyu
Options

Merge branch 'dev' into release_beta/1.0.0

parents fe43f313 b842b42d
Showing with 100 additions and 109 deletions
pages/index/index.js
......@@ -34,7 +34,7 @@ create.Page({
$data: null,
iconDay: currentDate.getDate(),
scheduleList: [],
todayStr: toLocaleDateString(currentDate),
todayStr: '',
currentData: toLocaleDateString(currentDate),
currentDataIndex: 0,
offset: "stop",
......@@ -170,7 +170,9 @@ create.Page({
loading: false
});
this.isLoaded = true;
this.backToToday('first')
setTimeout(() => {
this.backToToday('first')
}, 300)
return;
}
......@@ -181,7 +183,9 @@ create.Page({
sign: res.data.data.sign
})
if (this.isFirstLoad) {
this.backToToday('first')
setTimeout(() => {
this.backToToday('first')
}, 300)
this.isFirstLoad = false;
}
return
......
pages/meetingDetail/meetingDetail.axml
......@@ -139,25 +139,8 @@
<view class="permission" a:if="{{currentPeople != organizer}}">
</view>
</view>
<view class="meetingWayShow" a:if="{{comListData.meetingWayModelId == 0}}">
<view class="meetingWayShowTop">
<view class=" icon iconfont iconicon_camera1">
</view>
<view class="meetingWayText">
<view onTap="setCopy" data-item="https://zoom.com.cn/j/93255954558?pwd=YmNZQkY1SGxtUFNPYjZlcUpJT0xtQT09" data-type="url">
Zoom
</view>
<view class="mettingWayText" onTap="setCopy" data-item="513410069">
<text>ID：513410069</text>
<text class="icon iconfont iconicon_icon"></text>
</view>
<view class="mettingWayText passWord" onTap="setCopy" data-item="4ez3am">
<text >密码:4ez3am</text>
<text class="icon iconfont iconicon_icon"></text>
</view>
</view>
</view>
</view>
<!--<view class="meetingWayShow" a:if="{{comListData.meetingWayModelId == 0}}"><view class="meetingWayShowTop"><view class=" icon iconfont iconicon_camera1"></view><view class="meetingWayText"><view onTap="setCopy" data-item="https://zoom.com.cn/j/93255954558?pwd=YmNZQkY1SGxtUFNPYjZlcUpJT0xtQT09" data-type="url">
Zoom</view><view class="mettingWayText" onTap="setCopy" data-item="513410069"><text>ID：513410069</text><text class="icon iconfont iconicon_icon"></text></view><view class="mettingWayText passWord" onTap="setCopy" data-item="4ez3am"><text >密码:4ez3am</text><text class="icon iconfont iconicon_icon"></text></view></view></view></view> -->
<!-- 删除该会议 -->
<template is="deleteBtn" onhandleDelete="" data="{{title: '删除该会议' }}"/>
</view>
......
pages/meetingRoomList/meetingRoomList.js
......@@ -196,8 +196,8 @@ create.Page({
? "0" + modalDate.getHours()
: modalDate.getHours()
: modalDate.getHours() + 1 < 10
? "0" + (modalDate.getHours() + 1)
: modalDate.getHours() + 1;
? "0" + (modalDate.getHours() + 1)
: modalDate.getHours() + 1;
let num = "";
if (dateTime.replace(/-/g, "/") === this.data.TimeSlot.todayTime) {
num = "0";
......@@ -281,19 +281,19 @@ create.Page({
modalFooterTime.getMonth() < 9
? "0" + (modalFooterTime.getMonth() + 1)
: modalFooterTime.getMonth() + 1
}-${
}-${
modalFooterTime.getDate() < 10
? "0" + modalFooterTime.getDate()
: modalFooterTime.getDate()
} ${
} ${
modalFooterTime.getHours() < 10
? "0" + modalFooterTime.getHours()
: modalFooterTime.getHours()
}:${
}:${
modalFooterTime.getMinutes() < 10
? "0" + modalFooterTime.getMinutes()
: modalFooterTime.getMinutes()
}`,
}`,
"modalFooter.allMinutes": 30,
"modalFooter.isOneDay": true
});
......@@ -350,19 +350,19 @@ create.Page({
modalFooterTime.getMonth() < 9
? "0" + (modalFooterTime.getMonth() + 1)
: modalFooterTime.getMonth() + 1
}-${
}-${
modalFooterTime.getDate() < 10
? "0" + modalFooterTime.getDate()
: modalFooterTime.getDate()
} ${
} ${
modalFooterTime.getHours() < 10
? "0" + modalFooterTime.getHours()
: modalFooterTime.getHours()
}:${
}:${
modalFooterTime.getMinutes() < 10
? "0" + modalFooterTime.getMinutes()
: modalFooterTime.getMinutes()
}`,
}`,
"modalFooter.allMinutes": allMinutes,
"modalFooter.isOneDay": true
},
......@@ -399,19 +399,19 @@ create.Page({
modalFooterTime.getMonth() < 9
? "0" + (modalFooterTime.getMonth() + 1)
: modalFooterTime.getMonth() + 1
}-${
}-${
modalFooterTime.getDate() < 10
? "0" + modalFooterTime.getDate()
: modalFooterTime.getDate()
} ${
} ${
modalFooterTime.getHours() < 10
? "0" + modalFooterTime.getHours()
: modalFooterTime.getHours()
}:${
}:${
modalFooterTime.getMinutes() < 10
? "0" + modalFooterTime.getMinutes()
: modalFooterTime.getMinutes()
}`,
}`,
"modalFooter.allMinutes": allMinutes,
"modalFooter.isOneDay": false
},
......@@ -421,7 +421,8 @@ create.Page({
);
} else {
dd.alert({
content: "会议室已被占用"
content: "会议室已被占用",
buttonText: "确定"
});
}
});
......@@ -460,19 +461,19 @@ create.Page({
modalFooterTime.getMonth() < 9
? "0" + (modalFooterTime.getMonth() + 1)
: modalFooterTime.getMonth() + 1
}-${
}-${
modalFooterTime.getDate() < 10
? "0" + modalFooterTime.getDate()
: modalFooterTime.getDate()
} ${
} ${
modalFooterTime.getHours() < 10
? "0" + modalFooterTime.getHours()
: modalFooterTime.getHours()
}:${
}:${
modalFooterTime.getMinutes() < 10
? "0" + modalFooterTime.getMinutes()
: modalFooterTime.getMinutes()
}`,
}`,
"modalFooter.allMinutes": allMinutes,
"modalFooter.isOneDay": true
},
......@@ -508,19 +509,19 @@ create.Page({
modalFooterTime.getMonth() < 9
? "0" + (modalFooterTime.getMonth() + 1)
: modalFooterTime.getMonth() + 1
}-${
}-${
modalFooterTime.getDate() < 10
? "0" + modalFooterTime.getDate()
: modalFooterTime.getDate()
} ${
} ${
modalFooterTime.getHours() < 10
? "0" + modalFooterTime.getHours()
: modalFooterTime.getHours()
}:${
}:${
modalFooterTime.getMinutes() < 10
? "0" + modalFooterTime.getMinutes()
: modalFooterTime.getMinutes()
}`,
}`,
"modalFooter.allMinutes": allMinutes,
"modalFooter.isOneDay": false
},
......@@ -530,7 +531,8 @@ create.Page({
);
} else {
dd.alert({
content: "会议室已被占用"
content: "会议室已被占用",
buttonText: "确定"
});
}
});
......@@ -552,19 +554,19 @@ create.Page({
startTimeDate.getMonth() + 1 < 10
? "0" + (startTimeDate.getMonth() + 1)
: startTimeDate.getMonth() + 1
}-${
}-${
startTimeDate.getDate() < 10
? "0" + startTimeDate.getDate()
: startTimeDate.getDate()
} ${
} ${
startTimeDate.getHours() < 10
? "0" + startTimeDate.getHours()
: startTimeDate.getHours()
}:${
}:${
startTimeDate.getMinutes() < 10
? "0" + startTimeDate.getMinutes()
: startTimeDate.getMinutes()
}`;
}`;
if (meetingStartTime === this.data.meetingTime.endTime) {
let modalFooterTime = new Date(
that.data.meetingTime.endTime.replace(/-/g, "/")
......@@ -579,19 +581,19 @@ create.Page({
modalFooterTime.getMonth() < 9
? "0" + (modalFooterTime.getMonth() + 1)
: modalFooterTime.getMonth() + 1
}-${
}-${
modalFooterTime.getDate() < 10
? "0" + modalFooterTime.getDate()
: modalFooterTime.getDate()
} ${
} ${
modalFooterTime.getHours() < 10
? "0" + modalFooterTime.getHours()
: modalFooterTime.getHours()
}:${
}:${
modalFooterTime.getMinutes() < 10
? "0" + modalFooterTime.getMinutes()
: modalFooterTime.getMinutes()
}`,
}`,
"modalFooter.allMinutes": 30,
"modalFooter.isOneDay": true
},
......@@ -616,19 +618,19 @@ create.Page({
modalFooterTime.getMonth() < 9
? "0" + (modalFooterTime.getMonth() + 1)
: modalFooterTime.getMonth() + 1
}-${
}-${
modalFooterTime.getDate() < 10
? "0" + modalFooterTime.getDate()
: modalFooterTime.getDate()
} ${
} ${
modalFooterTime.getHours() < 10
? "0" + modalFooterTime.getHours()
: modalFooterTime.getHours()
}:${
}:${
modalFooterTime.getMinutes() < 10
? "0" + modalFooterTime.getMinutes()
: modalFooterTime.getMinutes()
}`,
}`,
"modalFooter.allMinutes": allMinutes
},
() => {
......@@ -647,19 +649,19 @@ create.Page({
endTimeDate.getMonth() + 1 < 10
? "0" + (endTimeDate.getMonth() + 1)
: endTimeDate.getMonth() + 1
}-${
}-${
endTimeDate.getDate() < 10
? "0" + endTimeDate.getDate()
: endTimeDate.getDate()
} ${
} ${
endTimeDate.getHours() < 10
? "0" + endTimeDate.getHours()
: endTimeDate.getHours()
}:${
}:${
endTimeDate.getMinutes() < 10
? "0" + endTimeDate.getMinutes()
: endTimeDate.getMinutes()
}`;
}`;
if (meetingEndTime === this.data.meetingTime.startTime) {
let modalFooterTime = new Date(
this.data.meetingTime.startTime.replace(/-/g, "/")
......@@ -673,19 +675,19 @@ create.Page({
modalFooterTime.getMonth() < 9
? "0" + (modalFooterTime.getMonth() + 1)
: modalFooterTime.getMonth() + 1
}-${
}-${
modalFooterTime.getDate() < 10
? "0" + modalFooterTime.getDate()
: modalFooterTime.getDate()
} ${
} ${
modalFooterTime.getHours() < 10
? "0" + modalFooterTime.getHours()
: modalFooterTime.getHours()
}:${
}:${
modalFooterTime.getMinutes() < 10
? "0" + modalFooterTime.getMinutes()
: modalFooterTime.getMinutes()
}`,
}`,
"modalFooter.allMinutes": 30
},
() => {
......@@ -709,19 +711,19 @@ create.Page({
modalFooterTime.getMonth() < 9
? "0" + (modalFooterTime.getMonth() + 1)
: modalFooterTime.getMonth() + 1
}-${
}-${
modalFooterTime.getDate() < 10
? "0" + modalFooterTime.getDate()
: modalFooterTime.getDate()
} ${
} ${
modalFooterTime.getHours() < 10
? "0" + modalFooterTime.getHours()
: modalFooterTime.getHours()
}:${
}:${
modalFooterTime.getMinutes() < 10
? "0" + modalFooterTime.getMinutes()
: modalFooterTime.getMinutes()
}`,
}`,
"modalFooter.allMinutes": allMinutes
},
() => {
......@@ -760,19 +762,19 @@ create.Page({
modalFooterTime.getMonth() < 9
? "0" + (modalFooterTime.getMonth() + 1)
: modalFooterTime.getMonth() + 1
}-${
}-${
modalFooterTime.getDate() < 10
? "0" + modalFooterTime.getDate()
: modalFooterTime.getDate()
} ${
} ${
modalFooterTime.getHours() < 10
? "0" + modalFooterTime.getHours()
: modalFooterTime.getHours()
}:${
}:${
modalFooterTime.getMinutes() < 10
? "0" + modalFooterTime.getMinutes()
: modalFooterTime.getMinutes()
}`,
}`,
"modalFooter.allMinutes": allMinutes,
"modalFooter.isOneDay": true
},
......@@ -806,19 +808,19 @@ create.Page({
modalFooterTime.getMonth() < 9
? "0" + (modalFooterTime.getMonth() + 1)
: modalFooterTime.getMonth() + 1
}-${
}-${
modalFooterTime.getDate() < 10
? "0" + modalFooterTime.getDate()
: modalFooterTime.getDate()
} ${
} ${
modalFooterTime.getHours() < 10
? "0" + modalFooterTime.getHours()
: modalFooterTime.getHours()
}:${
}:${
modalFooterTime.getMinutes() < 10
? "0" + modalFooterTime.getMinutes()
: modalFooterTime.getMinutes()
}`,
}`,
"modalFooter.allMinutes": allMinutes,
"modalFooter.isOneDay": false
},
......@@ -828,7 +830,8 @@ create.Page({
);
} else {
dd.alert({
content: "会议室已被占用"
content: "会议室已被占用",
buttonText: "确定"
});
}
});
......@@ -869,19 +872,19 @@ create.Page({
modalFooterTime2.getMonth() < 9
? "0" + (modalFooterTime2.getMonth() + 1)
: modalFooterTime2.getMonth() + 1
}-${
}-${
modalFooterTime2.getDate() < 10
? "0" + modalFooterTime2.getDate()
: modalFooterTime2.getDate()
} ${
} ${
modalFooterTime2.getHours() < 10
? "0" + modalFooterTime2.getHours()
: modalFooterTime2.getHours()
}:${
}:${
modalFooterTime2.getMinutes() < 10
? "0" + modalFooterTime2.getMinutes()
: modalFooterTime2.getMinutes()
}`,
}`,
"modalFooter.allMinutes": allMinutes,
"modalFooter.isOneDay": true
},
......@@ -915,19 +918,19 @@ create.Page({
modalFooterTime.getMonth() < 9
? "0" + (modalFooterTime.getMonth() + 1)
: modalFooterTime.getMonth() + 1
}-${
}-${
modalFooterTime.getDate() < 10
? "0" + modalFooterTime.getDate()
: modalFooterTime.getDate()
} ${
} ${
modalFooterTime.getHours() < 10
? "0" + modalFooterTime.getHours()
: modalFooterTime.getHours()
}:${
}:${
modalFooterTime.getMinutes() < 10
? "0" + modalFooterTime.getMinutes()
: modalFooterTime.getMinutes()
}`,
}`,
"modalFooter.allMinutes": allMinutes,
"modalFooter.isOneDay": false
},
......@@ -937,7 +940,8 @@ create.Page({
);
} else {
dd.alert({
content: "会议室已被占用"
content: "会议室已被占用",
buttonText: "确定"
});
}
});
......@@ -956,19 +960,19 @@ create.Page({
endTimeDate.getMonth() + 1 < 10
? "0" + (endTimeDate.getMonth() + 1)
: endTimeDate.getMonth() + 1
}-${
}-${
endTimeDate.getDate() < 10
? "0" + endTimeDate.getDate()
: endTimeDate.getDate()
} ${
} ${
endTimeDate.getHours() < 10
? "0" + endTimeDate.getHours()
: endTimeDate.getHours()
}:${
}:${
endTimeDate.getMinutes() < 10
? "0" + endTimeDate.getMinutes()
: endTimeDate.getMinutes()
}:00`
}:00`
};
return getAllScheduleWithMeetingRoomByTime(data).then(res => {
return res.data.data;
......@@ -1062,8 +1066,8 @@ create.Page({
e.currentTarget.dataset.num == "0"
? this.data.TimeSlot.todayTime
: e.currentTarget.dataset.num == "1"
? this.data.TimeSlot.tomorrowTime
: this.data.TimeSlot.afterTomorrowTime,
? this.data.TimeSlot.tomorrowTime
: this.data.TimeSlot.afterTomorrowTime,
dataNum: e.currentTarget.dataset.num
},
() => {
......@@ -1082,18 +1086,18 @@ create.Page({
? "0" + modalDate.getHours()
: modalDate.getHours()
: modalDate.getHours() + 1 < 10
? "0" + (modalDate.getHours() + 1)
: modalDate.getHours() + 1;
? "0" + (modalDate.getHours() + 1)
: modalDate.getHours() + 1;
let selectDate = new Date(this.data.meetingTime.date);
let meetingDate = `${selectDate.getFullYear()}-${
selectDate.getMonth() + 1 < 10
? "0" + (selectDate.getMonth() + 1)
: selectDate.getMonth() + 1
}-${
}-${
selectDate.getDate() < 10
? "0" + selectDate.getDate()
: selectDate.getDate()
}`;
}`;
let data = {
meetingRoomId: that.data.meetingTime.meetingRoomId,
startTime: meetingDate
......@@ -1200,19 +1204,19 @@ create.Page({
endTimeDate.getMonth() + 1 < 10
? "0" + (endTimeDate.getMonth() + 1)
: endTimeDate.getMonth() + 1
}/${
}/${
endTimeDate.getDate() < 10
? "0" + endTimeDate.getDate()
: endTimeDate.getDate()
} ${
} ${
endTimeDate.getHours() < 10
? "0" + endTimeDate.getHours()
: endTimeDate.getHours()
}:${
}:${
endTimeDate.getMinutes() < 10
? "0" + endTimeDate.getMinutes()
: endTimeDate.getMinutes()
}:00`;
}:00`;
this.$store.data.locationName = this.data.meetingTime.meetingRoomName;
this.$store.data.roomId = this.data.meetingTime.meetingRoomId;
this.update();
......@@ -1226,26 +1230,26 @@ create.Page({
endTimeDate.getMonth() + 1 < 10
? "0" + (endTimeDate.getMonth() + 1)
: endTimeDate.getMonth() + 1
}/${
}/${
endTimeDate.getDate() < 10
? "0" + endTimeDate.getDate()
: endTimeDate.getDate()
} ${
} ${
endTimeDate.getHours() < 10
? "0" + endTimeDate.getHours()
: endTimeDate.getHours()
}:${
}:${
endTimeDate.getMinutes() < 10
? "0" + endTimeDate.getMinutes()
: endTimeDate.getMinutes()
}:00`;
}:00`;
this.$store.data.locationName = this.data.meetingTime.meetingRoomName;
this.$store.data.roomId = this.data.meetingTime.meetingRoomId;
}
if (this.$store.data.originalData && this.$store.data.locationName) {
if (
this.$store.data.locationName !=
this.$store.data.originalData.location.locationName ||
this.$store.data.originalData.location.locationName ||
this.$store.data.roomId != this.$store.data.originalData.meetingRoomId
) {
this.$store.data.updateInfo = {
......@@ -1326,8 +1330,8 @@ create.Page({
}
);
},
onMonthChange() {},
onYearChange() {},
onMonthChange() { },
onYearChange() { },
onSelectHasDisableDate() {
my.alert({
content: "SelectHasDisableDate"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment