Skip to content

S
schedule
Commit 3dc43fb1 by fengzhaoyu
Options

fix：解决部分机型页面下拉回刷新 会议室名字全拼问题 时间组件点击范围

parent 70c47b22
Showing with 92 additions and 85 deletions
app.json
{
"pages": [
"pages/index/index",
"pages/aa/aa",
"pages/meetingRoomList/meetingRoomList",
"pages/bindingApp/bindingApp",
"pages/meetingDetail/meetingDetail",
......@@ -16,5 +17,6 @@
],
"window": {
"allowsBounceVertical": "YES"
}
},
"pullRefresh": false
}
\ No newline at end of file
pages/meetingRoomList/meetingRoomList.axml
<view class="searchHeader">
<view class="searchTime">
<view onTap="selectSearchTime">{{search.time.split('-')[0]}}年{{search.time.split('-')[1]}}月{{search.time.split('-')[2]}}日</view>
<view class="iconfont iconicon_open"></view>
<view class="iconfont iconicon_open" onTap="selectSearchTime"></view>
</view>
</view>
<view class="roomScrollView" style="{{canScroll ? '': 'overflow:hidden'}}"">
......
pages/meetingRoomList/meetingRoomList.js
......@@ -199,8 +199,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";
......@@ -284,19 +284,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
});
......@@ -353,19 +353,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
},
......@@ -402,19 +402,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
},
......@@ -463,19 +463,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
},
......@@ -511,19 +511,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
},
......@@ -555,19 +555,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, "/")
......@@ -582,19 +582,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
},
......@@ -619,19 +619,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
},
() => {
......@@ -650,19 +650,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, "/")
......@@ -676,19 +676,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
},
() => {
......@@ -712,19 +712,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
},
() => {
......@@ -763,19 +763,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
},
......@@ -809,19 +809,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
},
......@@ -872,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
},
......@@ -918,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
},
......@@ -959,19 +959,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;
......@@ -1065,8 +1065,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
},
() => {
......@@ -1085,18 +1085,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
......@@ -1199,19 +1199,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();
......@@ -1225,26 +1225,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 = {
......@@ -1266,6 +1266,10 @@ create.Page({
};
getReserveRoomList(data).then(res => {
if (res.data.data) {
for (let value of res.data.data) {
value.name = `${this.getParentStr(value.locationId)}${value.name}`;
this.parentStr = "";
}
let reserveRoomList = res.data.data.map(item => {
let startTime = parseInt(
item.timeSlotWithMeetingVOS[0].reserveStartTime.substring(0, 2)
......@@ -1321,8 +1325,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