Showing
1 changed file
with
8 additions
and
1 deletions
| @@ -243,6 +243,11 @@ Page({ | @@ -243,6 +243,11 @@ Page({ | ||
| 243 | if(key=='time'){ | 243 | if(key=='time'){ |
| 244 | if(this.data.timeOpt[val]) return; | 244 | if(this.data.timeOpt[val]) return; |
| 245 | } | 245 | } |
| 246 | + if((key=='time' && this.data.form.time==val) || (key=='date' && this.data.form.date==val) ){ | ||
| 247 | + if(util.attr(e,'display')!='block') { | ||
| 248 | + return; | ||
| 249 | + } | ||
| 250 | + } | ||
| 246 | let form=this.data.form; | 251 | let form=this.data.form; |
| 247 | 252 | ||
| 248 | if(key=='tid'){ | 253 | if(key=='tid'){ |
| @@ -284,7 +289,9 @@ Page({ | @@ -284,7 +289,9 @@ Page({ | ||
| 284 | } | 289 | } |
| 285 | } | 290 | } |
| 286 | //判断hasUseDefDtime | 291 | //判断hasUseDefDtime |
| 287 | - sobj.hasUseDefDtime=true; | 292 | + if(key=='time' || key=='date'){ |
| 293 | + sobj.hasUseDefDtime=true | ||
| 294 | + } | ||
| 288 | if(this.data.form.date==0){// | 295 | if(this.data.form.date==0){// |
| 289 | let mmii=util.unixtoTime(new Date()/1000,'HH:II'); | 296 | let mmii=util.unixtoTime(new Date()/1000,'HH:II'); |
| 290 | if(mmii>this.data.defDtime[key=='time'?val:this.data.form.time]){ | 297 | if(mmii>this.data.defDtime[key=='time'?val:this.data.form.time]){ |
-
Please register or login to post a comment