xt / xcx-book · Commits

Go to a project

Commit f3974ba3e3dd4594df487bf0aa160d9efc6d2509

Authored by pengye
1 parent 438b0ae7
build: skipped

预订本调整2

Inline Side-by-side
Showing 6 changed files with 74 additions and 41 deletions
... ... @@ -96,7 +96,7 @@ Page({
return util.toast('请选择桌位！', 'none')
}
let tid = detail.table_photo.map((item) => item.id).join(",")
const reserveDate = new Date(this.data.date);
const reserveDate = this.getNewDate(this.data.date);
let reserveTime =
reserveDate.getFullYear() +
"-" +
... ... @@ -104,7 +104,7 @@ Page({
"-" +
reserveDate.getDate();
let ddate =
new Date(
this.getNewDate(
reserveTime + " " + detail.ddate + ":00"
).getTime() / 1000;
let obj = {
... ... @@ -182,11 +182,11 @@ Page({
let timeList = this.data.timeList;
let time1 = timeList[timeList.length - 1];
const [hour1, minute1] = time1.split(':');
let endTime = new Date(date).setHours(hour1, minute1, 0, 0);
let endTime = this.getNewDate(date).setHours(hour1, minute1, 0, 0);
let startTime = this.data.startTime;
let setOverInfo = (endTime < startTime && endTime != startTime) ? false : true;
if (!setOverInfo) {
let date1 = new Date(startTime);
let date1 = this.getNewDate(startTime);
let year1 = date1.getFullYear(); // 年
let month1 = date1.getMonth() + 1; // 月（0-11，需+1）
let day1 = date1.getDate(); // 日
... ... @@ -289,7 +289,7 @@ Page({
timeList = this.computeHour(times[0], times[1], 15)
}
//初始化全局预订rdate时间戳
const reserveDate = new Date(this.data.date);
const reserveDate = this.getNewDate(this.data.date);
let reserveTime =
reserveDate.getFullYear() +
"-" +
... ... @@ -307,17 +307,17 @@ Page({
reserveTime + " " + timeList[timeList.length - 1] + ":00"; //结束时间
//拼接时间-转时间戳
let reserveRdate =
new Date(reserveStartDate).getTime() / 1000 +
this.getNewDate(reserveStartDate).getTime() / 1000 +
"-" +
new Date(reserveEndDate).getTime() / 1000;
this.getNewDate(reserveEndDate).getTime() / 1000;
let date1 = reserveTime + " 00:00"; //开始时间
let date2 =
reserveTime + " 23:59"; //结束时间
//当天一整天的时间戳(获取预订列表)
let allDay =
new Date(date1).getTime() / 1000 +
this.getNewDate(date1).getTime() / 1000 +
"-" +
new Date(date2).getTime() / 1000;
this.getNewDate(date2).getTime() / 1000;
let startTime = this.data.startTime;
if (!startTime) { //获取当前时间所属于餐段的开始时间 （只获取一次）
const [hour, minute] = timeList[0].split(':');
... ... @@ -329,7 +329,7 @@ Page({
if (this.data.reserveOver == '0') { //是否允许变更订单到过去餐段 1 允许 0 不允许
let time = timeList[timeList.length - 1];
const [hour1, minute1] = time.split(':');
let endTime = (hour1 && minute1) ? new Date(this.data.date).setHours(hour1, minute1, 0, 0) : '';
let endTime = (hour1 && minute1) ? this.getNewDate(this.data.date).setHours(hour1, minute1, 0, 0) : '';
let setOverInfo = (endTime < startTime && endTime != startTime) ? false : true;
console.log('setOverInfo是否允许变更订单到过去餐段--------', setOverInfo);
this.setData({
... ... @@ -536,7 +536,7 @@ Page({
console.log('detail', {
...detail
});
let date1 = new Date(detail.original_ddate * 1000);
let date1 = this.getNewDate(detail.original_ddate * 1000);
let year = date1.getFullYear(); // 年
let month = date1.getMonth() + 1; // 月（0-11，需+1）
let day = date1.getDate(); // 日
... ... @@ -740,7 +740,7 @@ Page({
},
//转订单中时间戳为日期格式
ChangeReserveTime(time, type, flag) {
const temp_ddate = new Date(time * 1000);
const temp_ddate = this.getNewDate(time * 1000);
if (flag == 1) {
var hour = temp_ddate.getHours();
var minutes = temp_ddate.getMinutes();
... ... @@ -824,6 +824,17 @@ Page({
return getTimeList(time1, time2, interval);
},
// ios 部分机型不兼容new Date() 转换字符串
getNewDate(data) {
if (typeof data === 'string') {
let arr = data.split(/[- : \/]/)
if (arr[1] !== undefined || arr[1] !== null) {
arr[1] = arr[1] - 1
}
return new Date(...arr)
}
return new Date(data || new Date())
},
/**
* 生命周期函数--监听页面隐藏
*/
... ...
... ... @@ -393,7 +393,7 @@ Page({
'detail.ddate': temp_ddate
})
let detailInfo = this.data.detail;
const reserveDate = new Date(detailInfo.original_ddate * 1000);
const reserveDate = this.getNewDate(detailInfo.original_ddate * 1000);
let reserveTime =
reserveDate.getFullYear() +
"-" +
... ... @@ -782,7 +782,7 @@ Page({
},
//转订单中时间戳为日期格式
ChangeReserveTime(time, type, flag) {
const temp_ddate = new Date(time * 1000);
const temp_ddate = this.getNewDate(time * 1000);
if (flag == 1) {
var hour = temp_ddate.getHours();
var minutes = temp_ddate.getMinutes();
... ...
... ... @@ -8,7 +8,7 @@ Page({
*/
data: {
opt: {},
barHeight:'',
barHeight: '',
homeList: [],
allfloorList: [],
allfloorList: [],
... ... @@ -112,7 +112,7 @@ Page({
timeList = this.computeHour(times[0], times[1], 15)
}
//初始化全局预订rdate时间戳
const reserveDate = new Date(this.data.opt.date);
const reserveDate = this.getNewDate(this.data.opt.date);
let reserveTime =
reserveDate.getFullYear() +
"-" +
... ... @@ -124,17 +124,17 @@ Page({
reserveTime + " " + timeList[timeList.length - 1] + ":00"; //结束时间
//拼接时间-转时间戳
let reserveRdate =
new Date(reserveStartDate).getTime() / 1000 +
this.getNewDate(reserveStartDate).getTime() / 1000 +
"-" +
new Date(reserveEndDate).getTime() / 1000;
this.getNewDate(reserveEndDate).getTime() / 1000;
let date1 = reserveTime + " 00:00"; //开始时间
let date2 =
reserveTime + " 23:59"; //结束时间
//当天一整天的时间戳(获取预订列表)
let allDay =
new Date(date1).getTime() / 1000 +
this.getNewDate(date1).getTime() / 1000 +
"-" +
new Date(date2).getTime() / 1000;
this.getNewDate(date2).getTime() / 1000;
//拼接时间-转时间戳
this.setData({
reserveRdate,
... ... @@ -406,6 +406,17 @@ Page({
return getTimeList(time1, time2, interval);
},
// ios 部分机型不兼容new Date() 转换字符串
getNewDate(data) {
if (typeof data === 'string') {
let arr = data.split(/[- : \/]/)
if (arr[1] !== undefined || arr[1] !== null) {
arr[1] = arr[1] - 1
}
return new Date(...arr)
}
return new Date(data || new Date())
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
... ...
... ... @@ -79,7 +79,7 @@ Page({
'detail.ddate': temp_ddate
})
let detailInfo = this.data.detail;
const reserveDate = new Date(detailInfo.original_ddate * 1000);
const reserveDate = this.getNewDate(detailInfo.original_ddate * 1000);
let reserveTime =
reserveDate.getFullYear() +
"-" +
... ... @@ -672,7 +672,7 @@ Page({
},
//转订单中时间戳为日期格式
ChangeReserveTime(time, type, flag) {
const temp_ddate = new Date(time * 1000);
const temp_ddate = this.getNewDate(time * 1000);
if (flag == 1) {
var hour = temp_ddate.getHours();
var minutes = temp_ddate.getMinutes();
... ...
... ... @@ -11,7 +11,7 @@ Page({
*/
data: {
threeText: '今天', //今天、明天、后天
barHeight:'',
barHeight: '',
date: '',
date1: '',
week: '',
... ... @@ -100,7 +100,7 @@ Page({
const type = event.currentTarget.dataset['type'];
let objpush = this.data.objpush;
let tid = objpush.map((item) => item.id).join(",")
const reserveDate = new Date(this.data.date);
const reserveDate = this.getNewDate(this.data.date);
let reserveTime =
reserveDate.getFullYear() +
"-" +
... ... @@ -108,7 +108,7 @@ Page({
"-" +
reserveDate.getDate();
let ddate =
new Date(
this.getNewDate(
reserveTime + " " + this.data.timeList[0] + ":00"
).getTime() / 1000;
let obj = {
... ... @@ -229,7 +229,7 @@ Page({
times = lunchDis[0].mdate.split("-");
timeList = this.computeHour(times[0], times[1], 15)
}
const reserveDate = new Date(this.data.date);
const reserveDate = this.getNewDate(this.data.date);
let reserveTime =
reserveDate.getFullYear() +
"-" +
... ... @@ -240,17 +240,17 @@ Page({
let reserveEndDate =
reserveTime + " " + timeList[timeList.length - 1] + ":00"; //结束时间
let reserveRdate =
new Date(reserveStartDate).getTime() / 1000 +
this.getNewDate(reserveStartDate).getTime() / 1000 +
"-" +
new Date(reserveEndDate).getTime() / 1000;
this.getNewDate(reserveEndDate).getTime() / 1000;
let date1 = reserveTime + " 00:00"; //开始时间
let date2 =
reserveTime + " 23:59"; //结束时间
//当天一整天的时间戳(获取预订列表)
let allDay =
new Date(date1).getTime() / 1000 +
this.getNewDate(date1).getTime() / 1000 +
"-" +
new Date(date2).getTime() / 1000;
this.getNewDate(date2).getTime() / 1000;
//拼接时间-转时间戳
this.setData({
reserveRdate,
... ... @@ -403,7 +403,7 @@ Page({
}
// 宴会 || 锁定的
if (items.banquetList && items.banquetList.length > 0) {
const reserveDate = new Date(items.banquetList[0].ddate * 1000);
const reserveDate = this.getNewDate(items.banquetList[0].ddate * 1000);
let ddateStr =
reserveDate.getFullYear() +
"-" +
... ... @@ -486,7 +486,7 @@ Page({
}
// 宴会 || 锁定的
if (items.banquetList && items.banquetList.length > 0) {
const reserveDate = new Date(items.banquetList[0].ddate * 1000);
const reserveDate = this.getNewDate(items.banquetList[0].ddate * 1000);
let ddateStr =
reserveDate.getFullYear() +
"-" +
... ... @@ -555,7 +555,7 @@ Page({
url: url,
})
} else if (obj.banquetList && obj.banquetList.length > 0) {
const reserveDate = new Date(obj.banquetList[0].ddate * 1000);
const reserveDate = this.getNewDate(obj.banquetList[0].ddate * 1000);
let ddateStr =
reserveDate.getFullYear() +
"-" +
... ... @@ -791,7 +791,7 @@ Page({
})
}
//初始化全局预订rdate时间戳
const reserveDate = new Date(this.data.date);
const reserveDate = this.getNewDate(this.data.date);
let reserveTime =
reserveDate.getFullYear() +
"-" +
... ... @@ -804,12 +804,12 @@ Page({
let date1 = reserveTime + " 00:00"; //开始时间
let date2 =
reserveTime + " 23:59"; //结束时间
let reserveRdate = new Date(reserveStartDate).getTime() / 1000 +
let reserveRdate = this.getNewDate(reserveStartDate).getTime() / 1000 +
"-" +
new Date(reserveEndDate).getTime() / 1000
let allDay = new Date(date1).getTime() / 1000 +
this.getNewDate(reserveEndDate).getTime() / 1000
let allDay = this.getNewDate(date1).getTime() / 1000 +
"-" +
new Date(date2).getTime() / 1000
this.getNewDate(date2).getTime() / 1000
//拼接时间-转时间戳
this.setData({
reserveRdate,
... ... @@ -826,7 +826,7 @@ Page({
const foundItem = arr.find(item => item.sid == util.cache('sellerid'));
const today = new Date();
today.setHours(0, 0, 0, 0); // 归零时分秒毫秒
const inputDate = new Date(this.data.date);
const inputDate = this.getNewDate(this.data.date);
inputDate.setHours(0, 0, 0, 0);
if (foundItem && inputDate.getTime() != today.getTime() && inputDate.getTime() < today.getTime()) {
let str = foundItem.str.split('-')
... ... @@ -867,7 +867,7 @@ Page({
let time = timeList[timeList.length - 1];
const [hour1, minute1] = time.split(':');
let date = this.data.date;
let endTime = (hour1 && minute1) ? new Date(date).setHours(hour1, minute1, 0, 0) : '';
let endTime = (hour1 && minute1) ? this.getNewDate(date).setHours(hour1, minute1, 0, 0) : '';
// 在当前餐段之前，不能预定
addOverInfo = (endTime < startTime || endTime == startTime) ? false : true
}
... ... @@ -950,6 +950,17 @@ Page({
return getTimeList(time1, time2, interval);
},
// ios 部分机型不兼容new Date() 转换字符串
getNewDate(data) {
if (typeof data === 'string') {
let arr = data.split(/[- : \/]/)
if (arr[1] !== undefined || arr[1] !== null) {
arr[1] = arr[1] - 1
}
return new Date(...arr)
}
return new Date(data || new Date())
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
... ...
... ... @@ -19,7 +19,7 @@
</view>
</view>
</view>
<view class="mainCenter" style="padding-top: {{barHeight+40}}px;;">
<view class="mainCenter" style="padding-top: {{barHeight+60}}px;">
<view data-item="{{item}}" data-index="{{index}}" bind:tap="getTapHandler" class="itemsBox {{item.show?'checked':''}} {{(item.reserveLock == '1' || item.lockstitch) ? 'lockstitchBox':''}} {{item.reserveList?'orderInfo':''}} {{item.banquetList && item.banquetList.length>0?'banquetsInfo':''}}" wx:for="{{homeList}}" wx:key="{{item.id}}">
<view class="wordName font32r">{{ item.name }}</view>
<block wx:if="{{item.reserveList}}">
... ...