Commit 5f04596ee486c9b085750e935bf522189b59800f

Authored by vking
1 parent 721b2abc

discount and activity

@@ -172,7 +172,7 @@ @@ -172,7 +172,7 @@
172 <block wx:if="{{loaded}}"> 172 <block wx:if="{{loaded}}">
173 <!--通知预订人--> 173 <!--通知预订人-->
174 <view class="notice-opt" wx:if="{{bookInfo.hasRunning}}"> 174 <view class="notice-opt" wx:if="{{bookInfo.hasRunning}}">
175 - <view class="notice-button-border font34r flex-lr"> 175 + <view class="notice-button-border font34r flex-lr bg-blue">
176 <view class="item"> 176 <view class="item">
177 <formids bindclick="noticeCall">通知客户</formids> 177 <formids bindclick="noticeCall">通知客户</formids>
178 </view> 178 </view>
@@ -181,30 +181,46 @@ @@ -181,30 +181,46 @@
181 </view> 181 </view>
182 </view> 182 </view>
183 <view class="notice-button-border font34r flex-lr" wx:if="{{hasEditorFlag || (bookInfo.type==1 && hasReceipt)}}"> 183 <view class="notice-button-border font34r flex-lr" wx:if="{{hasEditorFlag || (bookInfo.type==1 && hasReceipt)}}">
184 - <view class="item">  
185 - <formids bindclick="gotoModify">变更预订</formids> 184 + <view class="item" wx:if="{{isAdmin}}">
  185 + <PreferentialDocking sid="{{bookInfo.sid}}">
  186 + <view style="line-height: 50rpx;">优惠对接人</view>
  187 + </PreferentialDocking>
186 </view> 188 </view>
187 <view class="item"> 189 <view class="item">
188 <formids bindclick="cancelReserve">取消预订</formids> 190 <formids bindclick="cancelReserve">取消预订</formids>
189 </view> 191 </view>
190 <view class="item"> 192 <view class="item">
  193 + <formids bindclick="gotoModify">变更预订</formids>
  194 + </view>
  195 + <view class="item" wx:if="{{!isAdmin}}">
191 <formids bindclick="startDinner" data-status="2">确认到店</formids> 196 <formids bindclick="startDinner" data-status="2">确认到店</formids>
192 </view> 197 </view>
193 </view> 198 </view>
194 </view> 199 </view>
195 <view class="notice-opt" wx:if="{{bookInfo.status==2}}"> 200 <view class="notice-opt" wx:if="{{bookInfo.status==2}}">
  201 + <view class="notice-button-border font34r flex-lr bg-blue">
  202 + <view class="item">
  203 + <formids bindclick="noticeCall">通知客户</formids>
  204 + </view>
  205 + </view>
196 <view class="notice-button-border font34r flex-lr"> 206 <view class="notice-button-border font34r flex-lr">
197 - <view class="item" wx:if="{{hasEditorFlag || (bookInfo.type==1 && hasReceipt)}}">  
198 - <formids bindclick="gotoModify">变更预订</formids> 207 + <view class="item" wx:if="{{isAdmin}}">
  208 + <PreferentialDocking sid="{{bookInfo.sid}}">
  209 + <view style="line-height: 50rpx;">优惠对接人</view>
  210 + </PreferentialDocking>
199 </view> 211 </view>
200 <view class="item" wx:if="{{hasEditorFlag || (bookInfo.type==1 && hasReceipt)}}"> 212 <view class="item" wx:if="{{hasEditorFlag || (bookInfo.type==1 && hasReceipt)}}">
201 <formids bindclick="cancelReserve">取消预订</formids> 213 <formids bindclick="cancelReserve">取消预订</formids>
202 </view> 214 </view>
203 - <view class="item">  
204 - <formids bindclick="noticeCall">通知客户</formids> 215 + <view class="item" wx:if="{{hasEditorFlag || (bookInfo.type==1 && hasReceipt)}}">
  216 + <formids bindclick="gotoModify">变更预订</formids>
205 </view> 217 </view>
206 </view> 218 </view>
207 - <formids class="notice-button white-font font34r flex-cc" bindclick="startDinner" data-status="3">客户就餐完毕</formids> 219 + <formids class="notice-button white-font font34r flex-cc"
  220 + wx:if="{{!isAdmin}}"
  221 + bindclick="startDinner" data-status="3">
  222 + 客户就餐完毕
  223 + </formids>
208 </view> 224 </view>
209 <!--操作在线预订--> 225 <!--操作在线预订-->
210 <view class="notice-opt" wx:if="{{bookInfo.status==0}}"> 226 <view class="notice-opt" wx:if="{{bookInfo.status==0}}">
@@ -222,7 +238,9 @@ @@ -222,7 +238,9 @@
222 </view> 238 </view>
223 <view class="notice-button-border font34r flex-lr"> 239 <view class="notice-button-border font34r flex-lr">
224 <view class="item"> 240 <view class="item">
225 - <PreferentialDocking sid="{{bookInfo.sid}}">优惠对接人</PreferentialDocking> 241 + <PreferentialDocking sid="{{bookInfo.sid}}">
  242 + <view style="line-height: 50rpx;">优惠对接人</view>
  243 + </PreferentialDocking>
226 </view> 244 </view>
227 <view class="item"> 245 <view class="item">
228 <formids bindclick="refuseOrder">拒绝订单</formids> 246 <formids bindclick="refuseOrder">拒绝订单</formids>