|
@@ -68,7 +68,7 @@
|
|
|
data() {
|
|
data() {
|
|
|
return {
|
|
return {
|
|
|
roomTypeList: {},
|
|
roomTypeList: {},
|
|
|
- showCalendar: false,
|
|
|
|
|
|
|
+ showCalendar: true,
|
|
|
defaultDate: [],
|
|
defaultDate: [],
|
|
|
arrowPicPath: '/static/arrow.png',
|
|
arrowPicPath: '/static/arrow.png',
|
|
|
startDate: '',
|
|
startDate: '',
|
|
@@ -86,7 +86,8 @@
|
|
|
//根据起始时间到第二天的边界时间来算天数
|
|
//根据起始时间到第二天的边界时间来算天数
|
|
|
let checkinBoundaryTimeSet = this.currentHotel.checkinBoundaryTime
|
|
let checkinBoundaryTimeSet = this.currentHotel.checkinBoundaryTime
|
|
|
let end = new Date(this.endDate)
|
|
let end = new Date(this.endDate)
|
|
|
- let endTime = checkinBoundaryTimeSet ? this.currentHotel.checkinBoundaryTime.split(":") : "06:00:00".split(":")
|
|
|
|
|
|
|
+ let endTime = checkinBoundaryTimeSet ? this.currentHotel.checkinBoundaryTime.split(":") : "06:00:00".split(
|
|
|
|
|
+ ":")
|
|
|
end.setHours(endTime[0], endTime[1], endTime[2])
|
|
end.setHours(endTime[0], endTime[1], endTime[2])
|
|
|
let num = ((new Date(end)).valueOf() - (new Date(this.startDate)).valueOf()) / (24 * 60 * 60 *
|
|
let num = ((new Date(end)).valueOf() - (new Date(this.startDate)).valueOf()) / (24 * 60 * 60 *
|
|
|
1000)
|
|
1000)
|
|
@@ -140,7 +141,8 @@
|
|
|
this.startDay = getDay(new Date().getDay())
|
|
this.startDay = getDay(new Date().getDay())
|
|
|
//入住时间早于边界时间，默认当天结束
|
|
//入住时间早于边界时间，默认当天结束
|
|
|
//入住时间晚于边界时间，默认第二天结束
|
|
//入住时间晚于边界时间，默认第二天结束
|
|
|
- let checkinBoundaryTime = this.currentHotel.checkinBoundaryTime ? this.currentHotel.checkinBoundaryTime : "06:00:00"
|
|
|
|
|
|
|
+ let checkinBoundaryTime = this.currentHotel.checkinBoundaryTime ? this.currentHotel.checkinBoundaryTime :
|
|
|
|
|
+ "06:00:00"
|
|
|
let boundaryTime = new Date(
|
|
let boundaryTime = new Date(
|
|
|
now.getFullYear() + '/' + (now.getMonth() + 1) + '/' + now.getDate() +
|
|
now.getFullYear() + '/' + (now.getMonth() + 1) + '/' + now.getDate() +
|
|
|
' ' + checkinBoundaryTime)
|
|
' ' + checkinBoundaryTime)
|
LiChengjin