Commit 5f773c6dbd691935480f187d87e5be108ac27224

Authored by vking
1 parent bbefba2f

拒绝原因

@@ -205,7 +205,7 @@ Page({ @@ -205,7 +205,7 @@ Page({
205 return $1 + '**' + $3; 205 return $1 + '**' + $3;
206 }) 206 })
207 } 207 }
208 - if (res.data.status == 4 && res.data.cancel) { 208 + if ((res.data.status == 4 || res.data.status == 6) && res.data.cancel) {
209 res.data.cancel.cdateStr = util.unixtoTime(res.data.cancel.cdate, "YYYY.MM.DD HH:II") 209 res.data.cancel.cdateStr = util.unixtoTime(res.data.cancel.cdate, "YYYY.MM.DD HH:II")
210 } 210 }
211 this.detailData = RS.reserve(res.data); 211 this.detailData = RS.reserve(res.data);
@@ -316,7 +316,7 @@ Page({ @@ -316,7 +316,7 @@ Page({
316 let params={ 316 let params={
317 rid:this.data.bookInfo.id, 317 rid:this.data.bookInfo.id,
318 status:6, 318 status:6,
319 - cause:await this.getCause('拒绝订单'), 319 + cause:await this.getCause('包间已订满'),
320 } 320 }
321 App.Customer.SetReserveStatus(params).then(()=>{ 321 App.Customer.SetReserveStatus(params).then(()=>{
322 this.getDetail(this.data.bookInfo.id,true); 322 this.getDetail(this.data.bookInfo.id,true);
@@ -125,6 +125,22 @@ @@ -125,6 +125,22 @@
125 <view class="black-font font34r">{{bookInfo.abolition==2?'顾客在线取消':bookInfo.cancel.uname}}</view> 125 <view class="black-font font34r">{{bookInfo.abolition==2?'顾客在线取消':bookInfo.cancel.uname}}</view>
126 </view> 126 </view>
127 </view> 127 </view>
  128 +<view class="order-info" wx:if="{{bookInfo.status==6}}">
  129 + <view class="flex-lr order-detail">
  130 + <view class="gray-deep-font font30r">拒绝原因</view>
  131 + <view class="flex-lr black-font font34r">
  132 + {{bookInfo.cancel.desc}}
  133 + </view>
  134 + </view>
  135 + <view class="flex-lr order-detail">
  136 + <view class="gray-deep-font font30r">拒绝时间</view>
  137 + <view class="black-font font34r">{{bookInfo.cancel.cdateStr}}</view>
  138 + </view>
  139 + <view class="flex-lr order-detail">
  140 + <view class="gray-deep-font font30r">操作人</view>
  141 + <view class="black-font font34r">{{bookInfo.cancel.desc=='订单长时间未处理,已过时段'?'自动拒单':bookInfo.cancel.uname}}</view>
  142 + </view>
  143 +</view>
128 <navigator url="{{bookInfo.invoice.type==0?'../checkout/invoice?rid='+bookInfo.id:''}}" wx:if="{{bookInfo.invoice}}"> 144 <navigator url="{{bookInfo.invoice.type==0?'../checkout/invoice?rid='+bookInfo.id:''}}" wx:if="{{bookInfo.invoice}}">
129 <view class="order-info"> 145 <view class="order-info">
130 <view class="flex-lr order-detail"> 146 <view class="flex-lr order-detail">