Showing
1 changed file
with
4 additions
and
0 deletions
| @@ -35,6 +35,9 @@ export default { | @@ -35,6 +35,9 @@ export default { | ||
| 35 | detail.getStatusStr=''; | 35 | detail.getStatusStr=''; |
| 36 | if(detail.status>=0){ | 36 | if(detail.status>=0){ |
| 37 | detail.getStatusStr=status[detail.status]; | 37 | detail.getStatusStr=status[detail.status]; |
| 38 | + if(!detail.hasRunning && (detail.status==1 || detail.status==5)){ | ||
| 39 | + detail.getStatusStr=status[3]; | ||
| 40 | + } | ||
| 38 | } | 41 | } |
| 39 | //mask | 42 | //mask |
| 40 | if(detail.phone){ | 43 | if(detail.phone){ |
| @@ -59,6 +62,7 @@ export default { | @@ -59,6 +62,7 @@ export default { | ||
| 59 | if(detail.status==0 || detail.status==6 || detail.status==4) return false//未进行状态 | 62 | if(detail.status==0 || detail.status==6 || detail.status==4) return false//未进行状态 |
| 60 | if(detail.status==3) return false //用餐完成(离店) | 63 | if(detail.status==3) return false //用餐完成(离店) |
| 61 | //if(ns > detail.edate) return false//超时 | 64 | //if(ns > detail.edate) return false//超时 |
| 65 | + //console.log('ns > this.getNextTime(detail)',ns , this.getNextTime(detail)) | ||
| 62 | if(ns > this.getNextTime(detail)) return false//超时 | 66 | if(ns > this.getNextTime(detail)) return false//超时 |
| 63 | return flag | 67 | return flag |
| 64 | }, | 68 | }, |
-
Please register or login to post a comment