Showing
1 changed file
with
15 additions
and
10 deletions
| @@ -49,16 +49,16 @@ Component({ | @@ -49,16 +49,16 @@ Component({ | ||
| 49 | if(json.ret==200){ | 49 | if(json.ret==200){ |
| 50 | this.houseFullDate=json.data; | 50 | this.houseFullDate=json.data; |
| 51 | if(this.houseFullDate.indexOf(this.data.date)==-1){ | 51 | if(this.houseFullDate.indexOf(this.data.date)==-1){ |
| 52 | - this.triggerEvent('selectdate',{date:this.data.date,action:'defalut',houseFullStatus:0}) | 52 | + this.triggerEvent('selectdate',{date:this.data.date,action:'defalut',houseFullStatus:0,overdate:0}) |
| 53 | }else{ //满房 | 53 | }else{ //满房 |
| 54 | - this.triggerEvent('selectdate',{date:this.data.date,action:'defalut',houseFullStatus:1}) | 54 | + this.triggerEvent('selectdate',{date:this.data.date,action:'defalut',houseFullStatus:1,overdate:0}) |
| 55 | } | 55 | } |
| 56 | if(json.data.length>0){ | 56 | if(json.data.length>0){ |
| 57 | this.changespeciallist(json.data) | 57 | this.changespeciallist(json.data) |
| 58 | } | 58 | } |
| 59 | }else{ | 59 | }else{ |
| 60 | this.houseFullDate=null | 60 | this.houseFullDate=null |
| 61 | - this.triggerEvent('selectdate',{date:this.data.date,action:'defalut',houseFullStatus:1}) | 61 | + this.triggerEvent('selectdate',{date:this.data.date,action:'defalut',houseFullStatus:1,overdate:0}) |
| 62 | } | 62 | } |
| 63 | }) | 63 | }) |
| 64 | }, | 64 | }, |
| @@ -99,16 +99,21 @@ Component({ | @@ -99,16 +99,21 @@ Component({ | ||
| 99 | this.setData({ | 99 | this.setData({ |
| 100 | date:e.detail.date | 100 | date:e.detail.date |
| 101 | }) | 101 | }) |
| 102 | - if(this.houseFullDate){ | ||
| 103 | - if(this.houseFullDate.indexOf(this.data.date)==-1){ | ||
| 104 | - this.triggerEvent('selectdate',{date:this.data.date,action:'click',houseFullStatus:0}) | ||
| 105 | - }else{ //满房 | ||
| 106 | - this.triggerEvent('selectdate',{date:this.data.date,action:'click',houseFullStatus:1}) | 102 | + if(date/1000<=Number(util.timetouUnix(this.data.date,'-'))){ |
| 103 | + if(this.houseFullDate){ | ||
| 104 | + if(this.houseFullDate.indexOf(this.data.date)==-1){ | ||
| 105 | + this.triggerEvent('selectdate',{date:this.data.date,action:'click',houseFullStatus:0,overdate:0}) | ||
| 106 | + }else{ //满房 | ||
| 107 | + this.triggerEvent('selectdate',{date:this.data.date,action:'click',houseFullStatus:1,overdate:0}) | ||
| 108 | + } | ||
| 109 | + }else{ | ||
| 110 | + this.triggerEvent('selectdate',{date:this.data.date,action:'click',houseFullStatus:1,overdate:0}) | ||
| 107 | } | 111 | } |
| 108 | - }else{ | ||
| 109 | - this.triggerEvent('selectdate',{date:this.data.date,action:'click',houseFullStatus:1}) | 112 | + }else{ //overdate为1过期日期 |
| 113 | + this.triggerEvent('selectdate',{date:this.data.date,action:'click',houseFullStatus:1,overdate:1}) | ||
| 110 | } | 114 | } |
| 111 | 115 | ||
| 116 | + | ||
| 112 | } | 117 | } |
| 113 | } | 118 | } |
| 114 | 119 |
-
Please register or login to post a comment