|
...
|
...
|
@@ -80,6 +80,7 @@ Page({ |
|
|
|
checkedTables:{},//已选中的桌子集合
|
|
|
|
year:util.unixtoTime(new Date() / 1000,'YYYY'),
|
|
|
|
onLoad: async function (options) {
|
|
|
|
console.log('onLoad',options)
|
|
|
|
this.initLoad(options)
|
|
|
|
this.getCustomRemark();
|
|
|
|
},
|
|
...
|
...
|
@@ -97,6 +98,8 @@ Page({ |
|
|
|
//判断hasUseDefDtime
|
|
|
|
let hasUseDefDtime = true;
|
|
|
|
let mmii = util.unixtoTime(new Date() / 1000, 'HH:II');
|
|
|
|
console.log('initLoad',mmii,this.data.defDtime[this.data.form.time],this.data.defDtime)
|
|
|
|
console.log('initLoad',mmii > this.data.defDtime[this.data.form.time])
|
|
|
|
if (mmii > this.data.defDtime[this.data.form.time]) {
|
|
|
|
hasUseDefDtime = false;
|
|
|
|
}
|
|
...
|
...
|
@@ -688,12 +691,12 @@ Page({ |
|
|
|
//设置日期
|
|
|
|
let obj = await this.setDateStr(options.ddate);
|
|
|
|
//设置时间
|
|
|
|
let nd = util.unixtoTime(options.ddate, 'HH:II');
|
|
|
|
let nd = util.unixtoTime(new Date()/1000, 'HH:II');
|
|
|
|
let timePickerIndex = this.data.timePickerIndex
|
|
|
|
console.log('initQuick-', this.data.timePickerArray, obj.form.time, nd)
|
|
|
|
this.data.timePickerArray[obj.form.time].forEach((dd, ii) => {
|
|
|
|
this.data.timePickerArray[obj.form.time].some((dd, ii) => {
|
|
|
|
console.log('initQuick-', nd, dd)
|
|
|
|
if (nd == dd) {
|
|
|
|
if (nd < dd) {
|
|
|
|
timePickerIndex[obj.form.time] = ii;
|
|
|
|
return true;
|
|
|
|
}
|
...
|
...
|
|