Showing
1 changed file
with
10 additions
and
2 deletions
| @@ -232,7 +232,7 @@ Page({ | @@ -232,7 +232,7 @@ Page({ | ||
| 232 | onShareAppMessage: function () { | 232 | onShareAppMessage: function () { |
| 233 | 233 | ||
| 234 | }, | 234 | }, |
| 235 | - selectedValue(e){ | 235 | + async selectedValue(e){ |
| 236 | console.log(e); | 236 | console.log(e); |
| 237 | let key = util.attr(e, 'key'); | 237 | let key = util.attr(e, 'key'); |
| 238 | let val; | 238 | let val; |
| @@ -317,10 +317,18 @@ Page({ | @@ -317,10 +317,18 @@ Page({ | ||
| 317 | //判断hasUseDefDtime | 317 | //判断hasUseDefDtime |
| 318 | if ((key == 'time' || key == 'date') && !sobj.timePickerMask) { | 318 | if ((key == 'time' || key == 'date') && !sobj.timePickerMask) { |
| 319 | sobj.hasUseDefDtime = true | 319 | sobj.hasUseDefDtime = true |
| 320 | - let xtime =new Date() / 1000 | 320 | + let ntime = parseInt(new Date() / 1000) |
| 321 | + let xtime =ntime | ||
| 321 | if(key == 'time'){ | 322 | if(key == 'time'){ |
| 322 | xtime=util.unixtoTime(new Date() / 1000, this.year+'-' + (this.data.dateStr[this.data.form.date].substr(0, 5)) + ' HH:II:SS'); | 323 | xtime=util.unixtoTime(new Date() / 1000, this.year+'-' + (this.data.dateStr[this.data.form.date].substr(0, 5)) + ' HH:II:SS'); |
| 323 | xtime=util.timetouUnix(xtime) | 324 | xtime=util.timetouUnix(xtime) |
| 325 | + //if 当前时间在区间内 hasUseDefDtime 为 false | ||
| 326 | + let d_rdate = await comm.getTimeSpace(this.data.dateStr[this.data.form.date], | ||
| 327 | + this.data.form.time, null,null,this.year); | ||
| 328 | + d_rdate=d_rdate.split('-'); | ||
| 329 | + if(d_rdate[0] <= ntime && ntime<=d_rdate[1]){ | ||
| 330 | + sobj.hasUseDefDtime=false | ||
| 331 | + } | ||
| 324 | } | 332 | } |
| 325 | this.setDateStr(xtime,sobj.hasUseDefDtime); | 333 | this.setDateStr(xtime,sobj.hasUseDefDtime); |
| 326 | } | 334 | } |
-
Please register or login to post a comment