Showing
6 changed files
with
13 additions
and
15 deletions
| @@ -4,7 +4,9 @@ | @@ -4,7 +4,9 @@ | ||
| 4 | bindtap="boardClick"> | 4 | bindtap="boardClick"> |
| 5 | <view class="info"> | 5 | <view class="info"> |
| 6 | <view class="name">{{board.name}}</view> | 6 | <view class="name">{{board.name}}</view> |
| 7 | - <view class="pnum">{{board.table_pnum}}人</view> | 7 | + <view class="pnum"> |
| 8 | + {{board.reserve_name?board.reserve_name:board.table_pnum+'人'}} | ||
| 9 | + </view> | ||
| 8 | </view> | 10 | </view> |
| 9 | <view class="tid" wx:if="{{board.tid==2}}">包间</view> | 11 | <view class="tid" wx:if="{{board.tid==2}}">包间</view> |
| 10 | <view class="status" wx:if="{{board.status_str}}" style="width: {{width}}rpx;">{{board.status_str}}</view> | 12 | <view class="status" wx:if="{{board.status_str}}" style="width: {{width}}rpx;">{{board.status_str}}</view> |
| @@ -33,7 +33,12 @@ Component({ | @@ -33,7 +33,12 @@ Component({ | ||
| 33 | }) | 33 | }) |
| 34 | } | 34 | } |
| 35 | this.setData({vitem:item}) | 35 | this.setData({vitem:item}) |
| 36 | - } | 36 | + }, |
| 37 | + callPhone(e){ | ||
| 38 | + wx.makePhoneCall({ | ||
| 39 | + phoneNumber: util.attr(e,'phone'), //仅为示例,并非真实的电话号码 | ||
| 40 | + }) | ||
| 41 | + }, | ||
| 37 | 42 | ||
| 38 | } | 43 | } |
| 39 | }) | 44 | }) |
| @@ -3,7 +3,7 @@ | @@ -3,7 +3,7 @@ | ||
| 3 | <view class="Medium" style="font-size: 30rpx; width: 100%;text-align: left">{{vitem.name}}</view> | 3 | <view class="Medium" style="font-size: 30rpx; width: 100%;text-align: left">{{vitem.name}}</view> |
| 4 | <view class="Medium" style="font-size: 28rpx;width: 100%;text-align: left" wx:if="{{vitem.table_ids.length>1}}">等{{vitem.table_ids.length}}桌</view> | 4 | <view class="Medium" style="font-size: 28rpx;width: 100%;text-align: left" wx:if="{{vitem.table_ids.length>1}}">等{{vitem.table_ids.length}}桌</view> |
| 5 | </view> | 5 | </view> |
| 6 | - <view class="book-list-td flex-vc"> | 6 | + <view class="book-list-td flex-vc" catchtap="callPhone" data-phone="{{vitem.phone}}"> |
| 7 | <view class="Medium">{{vitem.rname}}</view> | 7 | <view class="Medium">{{vitem.rname}}</view> |
| 8 | <view class="Medium" style="margin-top:10rpx;">{{vitem.phone_mask||''}}</view> | 8 | <view class="Medium" style="margin-top:10rpx;">{{vitem.phone_mask||''}}</view> |
| 9 | </view> | 9 | </view> |
| @@ -52,7 +52,7 @@ Page({ | @@ -52,7 +52,7 @@ Page({ | ||
| 52 | }, | 52 | }, |
| 53 | getcall:function(){ | 53 | getcall:function(){ |
| 54 | wx.makePhoneCall({ | 54 | wx.makePhoneCall({ |
| 55 | - phoneNumber: this.data.phoneNumber, //仅为示例,并非真实的电话号码 | 55 | + phoneNumber: this.data.bookInfo.phone, //仅为示例,并非真实的电话号码 |
| 56 | complete:()=>{ | 56 | complete:()=>{ |
| 57 | this.selectComponent('#notice').close(); | 57 | this.selectComponent('#notice').close(); |
| 58 | } | 58 | } |
| @@ -19,17 +19,6 @@ | @@ -19,17 +19,6 @@ | ||
| 19 | <block wx:for="{{tables}}"> | 19 | <block wx:for="{{tables}}"> |
| 20 | <board width="160" height="160" board="{{item}}" | 20 | <board width="160" height="160" board="{{item}}" |
| 21 | style="margin-left:20rpx;zoom: 0.8"></board> | 21 | style="margin-left:20rpx;zoom: 0.8"></board> |
| 22 | - <!-- | ||
| 23 | - <view class="order-desk-info"> | ||
| 24 | - <view class="flex-vc order-desk-detail" style="height:{{item.tid==2 ? '90' : '120'}}rpx;"> | ||
| 25 | - <view class="font28r black-font smooth font-more" style="width:100%;text-align:center;">{{item.name}}</view> | ||
| 26 | - <view class="font26r black-font" style="margin-top:6rpx;">{{item.table_pnum}}人</view> | ||
| 27 | - </view> | ||
| 28 | - <block wx:if="{{item.tid==2}}"> | ||
| 29 | - <view class="order-desk-type flex-cc white-font font20r">包间</view> | ||
| 30 | - </block> | ||
| 31 | - </view> | ||
| 32 | - --> | ||
| 33 | </block> | 22 | </block> |
| 34 | </view> | 23 | </view> |
| 35 | </view> | 24 | </view> |
| @@ -134,6 +134,7 @@ Page({ | @@ -134,6 +134,7 @@ Page({ | ||
| 134 | rdate:r.rdate, | 134 | rdate:r.rdate, |
| 135 | id:r.id, | 135 | id:r.id, |
| 136 | status:r.status, | 136 | status:r.status, |
| 137 | + rname:r.rname+(r.sex==1?'先生':'女士'), | ||
| 137 | } | 138 | } |
| 138 | }) | 139 | }) |
| 139 | }) | 140 | }) |
| @@ -150,6 +151,7 @@ Page({ | @@ -150,6 +151,7 @@ Page({ | ||
| 150 | tb.status_str=tids[tb.id].status==2?'用餐中':'已预订'; | 151 | tb.status_str=tids[tb.id].status==2?'用餐中':'已预订'; |
| 151 | tb.status_classname='highlight'; | 152 | tb.status_classname='highlight'; |
| 152 | tb.reserve_id=tids[tb.id].id; | 153 | tb.reserve_id=tids[tb.id].id; |
| 154 | + tb.reserve_name=tids[tb.id].rname; | ||
| 153 | } | 155 | } |
| 154 | if(tb.enable!=1){ | 156 | if(tb.enable!=1){ |
| 155 | if(tb.status_str){ | 157 | if(tb.status_str){ |
-
Please register or login to post a comment