Showing
5 changed files
with
15 additions
and
9 deletions
| @@ -61,19 +61,23 @@ Component({ | @@ -61,19 +61,23 @@ Component({ | ||
| 61 | +'）'; | 61 | +'）'; |
| 62 | } | 62 | } |
| 63 | let tableSubInfo='' | 63 | let tableSubInfo='' |
| 64 | + let tableFirst=''; | ||
| 64 | if(this.data.detail.tableFirst){ | 65 | if(this.data.detail.tableFirst){ |
| 65 | tableSubInfo=(this.data.detail.tableFirst||'')+' '+(this.data.detail.tableSubInfo||''); | 66 | tableSubInfo=(this.data.detail.tableFirst||'')+' '+(this.data.detail.tableSubInfo||''); |
| 66 | - | 67 | + tableFirst=this.data.detail.tableFirst |
| 67 | }else{ | 68 | }else{ |
| 69 | + tableFirst=this.data.detail.tables[0].name | ||
| 68 | tableSubInfo=this.data.detail.tables[0].name; | 70 | tableSubInfo=this.data.detail.tables[0].name; |
| 69 | if(this.data.detail.tables.length>1){ | 71 | if(this.data.detail.tables.length>1){ |
| 70 | tableSubInfo+=' 等'+(this.data.detail.tables.length)+'个' | 72 | tableSubInfo+=' 等'+(this.data.detail.tables.length)+'个' |
| 71 | +(this.data.detail.tables[0].tid==2?'包间':''); | 73 | +(this.data.detail.tables[0].tid==2?'包间':''); |
| 74 | + tableFirst+='等'; | ||
| 72 | } | 75 | } |
| 73 | } | 76 | } |
| 74 | let obj={ | 77 | let obj={ |
| 75 | rdateStr:util.unixtoTime(this.data.detail.ddate,'MM月DD日 HH:II'), | 78 | rdateStr:util.unixtoTime(this.data.detail.ddate,'MM月DD日 HH:II'), |
| 76 | tableSubInfo:tableSubInfo, | 79 | tableSubInfo:tableSubInfo, |
| 80 | + tableFirst:tableFirst, | ||
| 77 | masterMan:masterMan, | 81 | masterMan:masterMan, |
| 78 | } | 82 | } |
| 79 | if(this.data.hasShowStatus){ | 83 | if(this.data.hasShowStatus){ |
| @@ -21,8 +21,8 @@ | @@ -21,8 +21,8 @@ | ||
| 21 | </view> | 21 | </view> |
| 22 | <view class="line"></view> | 22 | <view class="line"></view> |
| 23 | <view class="right info Medium"> | 23 | <view class="right info Medium"> |
| 24 | - <view class="label">包间</view> | ||
| 25 | - <view class="value">{{tableSubInfo}}</view> | 24 | + <view class="label">包间{{detail.tables.length>1?("("+detail.tables.length+")个"):""}}</view> |
| 25 | + <view class="value">{{tableFirst}}</view> | ||
| 26 | </view> | 26 | </view> |
| 27 | </view> | 27 | </view> |
| 28 | <view class="seller address flex-ll" catchtap="lookLocation"> | 28 | <view class="seller address flex-ll" catchtap="lookLocation"> |
| 1 | /* pages/customer/detail_customer.wxss */ | 1 | /* pages/customer/detail_customer.wxss */ |
| 2 | -page{ | 2 | +.page{ |
| 3 | color:#FFFFFF; | 3 | color:#FFFFFF; |
| 4 | background: url("http://qn.colorcun.com/custom/lite-yd/image/invit-bg.png") #353334; | 4 | background: url("http://qn.colorcun.com/custom/lite-yd/image/invit-bg.png") #353334; |
| 5 | background-size: 100%; | 5 | background-size: 100%; |
| 6 | -} | ||
| 7 | -.page{ | ||
| 8 | overflow-y: auto; | 6 | overflow-y: auto; |
| 9 | position: fixed; | 7 | position: fixed; |
| 10 | - top:40rpx; | 8 | + top:0; |
| 11 | bottom: 0; | 9 | bottom: 0; |
| 12 | left:0; | 10 | left:0; |
| 13 | right:0; | 11 | right:0; |
| @@ -85,7 +85,7 @@ Page({ | @@ -85,7 +85,7 @@ Page({ | ||
| 85 | url = '/pages/customer/detail_invitation'; | 85 | url = '/pages/customer/detail_invitation'; |
| 86 | } | 86 | } |
| 87 | if (res.data.openid == opt.openid) { | 87 | if (res.data.openid == opt.openid) { |
| 88 | - url = '/pages/customer/detail_owner'; | 88 | + //url = '/pages/customer/detail_owner'; |
| 89 | } | 89 | } |
| 90 | } | 90 | } |
| 91 | } | 91 | } |
| @@ -133,7 +133,11 @@ Page({ | @@ -133,7 +133,11 @@ Page({ | ||
| 133 | openid:getApp().openid, | 133 | openid:getApp().openid, |
| 134 | is_agree:1, | 134 | is_agree:1, |
| 135 | }).then(res=>{ | 135 | }).then(res=>{ |
| 136 | - this.getListData(true); | 136 | + App.Reserve.Detail({ |
| 137 | + openid: getApp().openid, | ||
| 138 | + rid: id | ||
| 139 | + },'clear') | ||
| 140 | + this.getListData(true); | ||
| 137 | }) | 141 | }) |
| 138 | } | 142 | } |
| 139 | }) | 143 | }) |
-
Please register or login to post a comment