Showing
1 changed file
with
4 additions
and
3 deletions
| @@ -92,7 +92,7 @@ Page({ | @@ -92,7 +92,7 @@ Page({ | ||
| 92 | const month = date.getMonth() + 1; | 92 | const month = date.getMonth() + 1; |
| 93 | const day = date.getDate(); | 93 | const day = date.getDate(); |
| 94 | let isOrder = this.isCurrentTimeGreaterThan(year, month, day, timeHour * 1, timeMinute * 1) | 94 | let isOrder = this.isCurrentTimeGreaterThan(year, month, day, timeHour * 1, timeMinute * 1) |
| 95 | - this.getSellerTemplateConfFun(RS.reserve(res.data).sid, isOrder); | 95 | + this.getSellerTemplateConfFun(RS.reserve(res.data).sid, isOrder, reserev.status); |
| 96 | }).catch(res => { | 96 | }).catch(res => { |
| 97 | console.log(res, '详情请求失败'); | 97 | console.log(res, '详情请求失败'); |
| 98 | }) | 98 | }) |
| @@ -105,7 +105,7 @@ Page({ | @@ -105,7 +105,7 @@ Page({ | ||
| 105 | return isorder; | 105 | return isorder; |
| 106 | }, | 106 | }, |
| 107 | // 获取商家设置营销信息 | 107 | // 获取商家设置营销信息 |
| 108 | - getSellerTemplateConfFun(sid, isOrder) { | 108 | + getSellerTemplateConfFun(sid, isOrder, status) { |
| 109 | App.Seller.GetSellerTemplateConf({ | 109 | App.Seller.GetSellerTemplateConf({ |
| 110 | sid | 110 | sid |
| 111 | }).then(res => { | 111 | }).then(res => { |
| @@ -119,7 +119,8 @@ Page({ | @@ -119,7 +119,8 @@ Page({ | ||
| 119 | url = '/pages/customer/detail_owner_invitation9'; | 119 | url = '/pages/customer/detail_owner_invitation9'; |
| 120 | } | 120 | } |
| 121 | url += '?id=' + this.data.options.id + '&tplid=' + this.data.options.tplid; | 121 | url += '?id=' + this.data.options.id + '&tplid=' + this.data.options.tplid; |
| 122 | - url += isOrder == '1' ? '&isOrder=1' : ''; | 122 | + // (过了当前餐段结束时间 || 预订是用餐完成状态) 邀请函显示已结束 |
| 123 | + url += (isOrder == '1' || status == '3') ? '&isOrder=1' : ''; | ||
| 123 | url+= this.data.options.paymentId?'&paymentId='+this.data.options.paymentId:'&paymentId=' ; | 124 | url+= this.data.options.paymentId?'&paymentId='+this.data.options.paymentId:'&paymentId=' ; |
| 124 | console.log('跳转路径url', url); | 125 | console.log('跳转路径url', url); |
| 125 | wx.redirectTo({ | 126 | wx.redirectTo({ |
-
Please register or login to post a comment