Showing
6 changed files
with
24 additions
and
5 deletions
| @@ -34,7 +34,11 @@ Component({ | @@ -34,7 +34,11 @@ Component({ | ||
| 34 | }) | 34 | }) |
| 35 | 35 | ||
| 36 | } | 36 | } |
| 37 | - item.rname_mask=item.rname.substr(0,3)+(item.sex==1?'先生':'女士') | 37 | + if(item.sex==3){ |
| 38 | + item.rname_mask=item.rname.substr(0,10) | ||
| 39 | + }else{ | ||
| 40 | + item.rname_mask=item.rname.substr(0,3)+(item.sex==1?'先生':'女士') | ||
| 41 | + } | ||
| 38 | item.order_time=util.unixtoTime(item.ddate,'HH:II') | 42 | item.order_time=util.unixtoTime(item.ddate,'HH:II') |
| 39 | item.status_str=reserveStatus[item.status]||''; | 43 | item.status_str=reserveStatus[item.status]||''; |
| 40 | this.setData({vitem:item}) | 44 | this.setData({vitem:item}) |
| @@ -167,7 +167,8 @@ | @@ -167,7 +167,8 @@ | ||
| 167 | </block> | 167 | </block> |
| 168 | </view> | 168 | </view> |
| 169 | <view class="book-info-single flex-lr" style="align-items:flex-start;"> | 169 | <view class="book-info-single flex-lr" style="align-items:flex-start;"> |
| 170 | - <input placeholder="预订人姓名(必填)" placeholder-class="gray-font font34r" class="black-font font34r" maxlength="5" style="width:450rpx;" value="{{form.rname}}" | 170 | + <input placeholder="预订人姓名(必填)" placeholder-class="gray-font font34r" class="black-font font34r" |
| 171 | + maxlength="12" style="width:450rpx;" value="{{form.rname}}" | ||
| 171 | bindinput="selectedValue" | 172 | bindinput="selectedValue" |
| 172 | bindconfirm="selectedValue" | 173 | bindconfirm="selectedValue" |
| 173 | bindfocus="inputFocus" | 174 | bindfocus="inputFocus" |
| @@ -175,7 +176,7 @@ | @@ -175,7 +176,7 @@ | ||
| 175 | data-key="rname"/> | 176 | data-key="rname"/> |
| 176 | <view class="book-info-grand flex-rr font28r gray-deep-font"> | 177 | <view class="book-info-grand flex-rr font28r gray-deep-font"> |
| 177 | <block wx:for="{{grand}}" wx:key="grand.key"> | 178 | <block wx:for="{{grand}}" wx:key="grand.key"> |
| 178 | - <view class="book-grand flex-cc {{index==0 ? 'book-grand-border' : ''}} {{form.sex==item.sex ? 'book-grand-active white-font' : ''}}" | 179 | + <view class="book-grand flex-cc book-grand-border {{form.sex==item.sex ? 'book-grand-active white-font' : ''}}" |
| 179 | bindtap="selectedValue" | 180 | bindtap="selectedValue" |
| 180 | data-value="{{item.sex}}" | 181 | data-value="{{item.sex}}" |
| 181 | data-key="sex">{{item.grand_title}}</view> | 182 | data-key="sex">{{item.grand_title}}</view> |
| @@ -198,6 +198,9 @@ | @@ -198,6 +198,9 @@ | ||
| 198 | .book-grand-border{ | 198 | .book-grand-border{ |
| 199 | border-right:1px solid #199095; | 199 | border-right:1px solid #199095; |
| 200 | } | 200 | } |
| 201 | +.book-grand-border:last-child{ | ||
| 202 | + border-width: 0; | ||
| 203 | +} | ||
| 201 | .phone-reminder{ | 204 | .phone-reminder{ |
| 202 | width:32rpx; | 205 | width:32rpx; |
| 203 | height:32rpx; | 206 | height:32rpx; |
| @@ -24,7 +24,7 @@ | @@ -24,7 +24,7 @@ | ||
| 24 | </view> | 24 | </view> |
| 25 | <view class="flex-lr order-detail"> | 25 | <view class="flex-lr order-detail"> |
| 26 | <text class="gray-deep-font font30r" space="true" decode="true">预 订 人</text> | 26 | <text class="gray-deep-font font30r" space="true" decode="true">预 订 人</text> |
| 27 | - <view class="black-font font34r">{{bookInfo.rname}} {{bookInfo.sex==1?'先生':'女士'}}</view> | 27 | + <view class="black-font font34r">{{bookInfo.rname}} {{bookInfo.sex==1?'先生':(bookInfo.sex==2?'女士':'')}}</view> |
| 28 | </view> | 28 | </view> |
| 29 | <view class="flex-lr order-detail"> | 29 | <view class="flex-lr order-detail"> |
| 30 | <view class="gray-deep-font font30r">手机号码</view> | 30 | <view class="gray-deep-font font30r">手机号码</view> |
| @@ -85,8 +85,14 @@ Page({ | @@ -85,8 +85,14 @@ Page({ | ||
| 85 | }, | 85 | }, |
| 86 | smsData:{}, | 86 | smsData:{}, |
| 87 | getTplMsg(){ | 87 | getTplMsg(){ |
| 88 | + let guest=''; | ||
| 89 | + if(this.bookInfo.sex==3){ | ||
| 90 | + guest='贵宾' | ||
| 91 | + }else{ | ||
| 92 | + guest=this.bookInfo.rname.substr(0,1)+(this.bookInfo.sex==1?'先生':'女士') | ||
| 93 | + } | ||
| 88 | let smsData={ | 94 | let smsData={ |
| 89 | - guest:this.bookInfo.rname.substr(0,1)+(this.bookInfo.sex==1?'先生':'女士'), | 95 | + guest:guest, |
| 90 | seller_name:this.bookInfo.seller.sellername.substr(0,20), | 96 | seller_name:this.bookInfo.seller.sellername.substr(0,20), |
| 91 | date:this.bookInfo.rdateStr, | 97 | date:this.bookInfo.rdateStr, |
| 92 | region_room_name:this.getTableName(this.bookInfo.tables), | 98 | region_room_name:this.getTableName(this.bookInfo.tables), |
-
Please register or login to post a comment