|
...
|
...
|
@@ -232,7 +232,7 @@ Page({ |
|
|
|
onShareAppMessage: function () {
|
|
|
|
|
|
|
|
},
|
|
|
|
selectedValue(e){
|
|
|
|
async selectedValue(e){
|
|
|
|
console.log(e);
|
|
|
|
let key = util.attr(e, 'key');
|
|
|
|
let val;
|
|
...
|
...
|
@@ -317,10 +317,18 @@ Page({ |
|
|
|
//判断hasUseDefDtime
|
|
|
|
if ((key == 'time' || key == 'date') && !sobj.timePickerMask) {
|
|
|
|
sobj.hasUseDefDtime = true
|
|
|
|
let xtime =new Date() / 1000
|
|
|
|
let ntime = parseInt(new Date() / 1000)
|
|
|
|
let xtime =ntime
|
|
|
|
if(key == 'time'){
|
|
|
|
xtime=util.unixtoTime(new Date() / 1000, this.year+'-' + (this.data.dateStr[this.data.form.date].substr(0, 5)) + ' HH:II:SS');
|
|
|
|
xtime=util.timetouUnix(xtime)
|
|
|
|
//if 当前时间在区间内 hasUseDefDtime 为 false
|
|
|
|
let d_rdate = await comm.getTimeSpace(this.data.dateStr[this.data.form.date],
|
|
|
|
this.data.form.time, null,null,this.year);
|
|
|
|
d_rdate=d_rdate.split('-');
|
|
|
|
if(d_rdate[0] <= ntime && ntime<=d_rdate[1]){
|
|
|
|
sobj.hasUseDefDtime=false
|
|
|
|
}
|
|
|
|
}
|
|
|
|
this.setDateStr(xtime,sobj.hasUseDefDtime);
|
|
|
|
}
|
...
|
...
|
|