Commit 872d2dbde9f9a5605563c787e3f37a0b3e8ce0ed

Authored by wangfan
1 parent 46d2b78c

rdate=>ddate

@@ -74,13 +74,17 @@ Component({ @@ -74,13 +74,17 @@ Component({
74 74
75 let enter_params=util.cache('enter_params'); 75 let enter_params=util.cache('enter_params');
76 let sc=(await App.Reserve.SellerInfo(enter_params)).data 76 let sc=(await App.Reserve.SellerInfo(enter_params)).data
  77 + cause={desc:cause}
  78 + if(enter_params){
  79 + cause.uid=enter_params.manager_id;
  80 + }
77 if(sc.seller_user){ 81 if(sc.seller_user){
78 - cause=cause+'|'+(sc.seller_user.nick_name||sc.seller_user.nickname) 82 + cause.uname=(sc.seller_user.nick_name||sc.seller_user.nickname)
79 } 83 }
80 App.Reserve.SetReserveStatus({ 84 App.Reserve.SetReserveStatus({
81 rid:this.data.bookInfo.id, 85 rid:this.data.bookInfo.id,
82 status:4, 86 status:4,
83 - cause:cause, 87 + cause:JSON.stringify(cause),
84 }).then(()=>{ 88 }).then(()=>{
85 this.hide() 89 this.hide()
86 this.triggerEvent('reserveCancel',{hasCancel:true}); 90 this.triggerEvent('reserveCancel',{hasCancel:true});
@@ -55,7 +55,13 @@ @@ -55,7 +55,13 @@
55 <view class="gray-deep-font font30r">记录人</view> 55 <view class="gray-deep-font font30r">记录人</view>
56 <view class="black-font font34r">{{bookInfo.note_name}}</view> 56 <view class="black-font font34r">{{bookInfo.note_name}}</view>
57 </view> 57 </view>
58 - 58 + <view class="flex-lr order-detail" wx:if="{{bookInfo.status==4 && bookInfo.cancel}}">
  59 + <view class="gray-deep-font font30r">取消原因</view>
  60 + <view class="black-font font34r" style="width: 80%;">
  61 + <view class="flex-rr">{{bookInfo.cancel.desc}}</view>
  62 + <view class="flex-rr" wx:if="{{bookInfo.cancel.uname}}">{{bookInfo.cancel.uname}}</view>
  63 + </view>
  64 + </view>
59 </view> 65 </view>
60 66
61 67
@@ -155,7 +155,7 @@ @@ -155,7 +155,7 @@
155 "id": 15, 155 "id": 15,
156 "name": "预定本详情", 156 "name": "预定本详情",
157 "pathName": "pages/book/b_detail", 157 "pathName": "pages/book/b_detail",
158 - "query": "id=1466", 158 + "query": "id=1465",
159 "scene": "1001" 159 "scene": "1001"
160 }, 160 },
161 { 161 {