|
...
|
...
|
@@ -80,7 +80,7 @@ Page({ |
|
|
|
checkedTables:{},//已选中的桌子集合
|
|
|
|
year:util.unixtoTime(new Date() / 1000,'YYYY'),
|
|
|
|
onLoad: async function (options) {
|
|
|
|
console.log('onLoad',options)
|
|
|
|
this.options=options
|
|
|
|
this.initLoad(options)
|
|
|
|
this.getCustomRemark();
|
|
|
|
},
|
|
...
|
...
|
@@ -307,13 +307,15 @@ Page({ |
|
|
|
}
|
|
|
|
}
|
|
|
|
//判断hasUseDefDtime
|
|
|
|
if ((key == 'time' || key == 'date') && !sobj.timePickerMask) {
|
|
|
|
sobj.hasUseDefDtime = true
|
|
|
|
}
|
|
|
|
if (this.data.form.date == 0) {//
|
|
|
|
let mmii = util.unixtoTime(new Date() / 1000, 'HH:II');
|
|
|
|
if (mmii > this.data.defDtime[key == 'time' ? val : this.data.form.time]) {
|
|
|
|
sobj.hasUseDefDtime = false;
|
|
|
|
if(this.options.hasQuick!=1){
|
|
|
|
if ((key == 'time' || key == 'date') && !sobj.timePickerMask) {
|
|
|
|
sobj.hasUseDefDtime = true
|
|
|
|
}
|
|
|
|
if (this.data.form.date == 0) {//
|
|
|
|
let mmii = util.unixtoTime(new Date() / 1000, 'HH:II');
|
|
|
|
if (mmii > this.data.defDtime[key == 'time' ? val : this.data.form.time]) {
|
|
|
|
sobj.hasUseDefDtime = false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
this.setData(sobj)
|
...
|
...
|
|