|
...
|
...
|
@@ -314,19 +314,13 @@ Page({ |
|
|
|
}
|
|
|
|
}
|
|
|
|
//判断hasUseDefDtime
|
|
|
|
let hasQuick=this.options.hasQuick==1
|
|
|
|
if(hasQuick && (key == 'time' || key == 'date') && !sobj.timePickerMask){
|
|
|
|
hasQuick=false
|
|
|
|
if ((key == 'time' || key == 'date') && !sobj.timePickerMask) {
|
|
|
|
sobj.hasUseDefDtime = true
|
|
|
|
}
|
|
|
|
if(!hasQuick){
|
|
|
|
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.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)
|
...
|
...
|
|