xt / xcx-book · Commits

Go to a project

Commit a50784f6aec263bb43cf0f4581b6a274bcf64173

Authored by vking
1 parent 103bc852
build: skipped

add loading

Inline Side-by-side
Showing 2 changed files with 88 additions and 81 deletions
@@ -12,6 +12,7 @@ Page({ @@ -12,6 +12,7 @@ Page({
12 actionSheetItems: ['客户取消', '客户行程改变'], 12 actionSheetItems: ['客户取消', '客户行程改变'],
13 hasEditorFlag: false,//是否开启编辑 13 hasEditorFlag: false,//是否开启编辑
14 hasReceipt:false,//接单人身份 14 hasReceipt:false,//接单人身份
  15 + loaded:false,//是否加载完预订数据
15 }, 16 },
16 sc: {}, 17 sc: {},
17 tpls: TP.tpls(), 18 tpls: TP.tpls(),
@@ -239,7 +240,8 @@ Page({ @@ -239,7 +240,8 @@ Page({
239 tables: res.data.tables, 240 tables: res.data.tables,
240 bookInfo: this.detailData, 241 bookInfo: this.detailData,
241 isAdmin:getApp().isAdmin, 242 isAdmin:getApp().isAdmin,
242 - hasCallPhone:this.hasCallPhone 243 + hasCallPhone:this.hasCallPhone,
  244 + loaded:true,
243 }) 245 })
244 }, 246 },
245 gotoModify() { 247 gotoModify() {
@@ -348,6 +350,9 @@ Page({ @@ -348,6 +350,9 @@ Page({
348 cause:await this.getCause('安排包间'), 350 cause:await this.getCause('安排包间'),
349 tid:res.tableid.toString() 351 tid:res.tableid.toString()
350 } 352 }
  353 + this.setData({
  354 + loaded:false,
  355 + })
351 App.Customer.SetReserveStatus(params).then(()=>{ 356 App.Customer.SetReserveStatus(params).then(()=>{
352 this.getDetail(this.data.bookInfo.id,true); 357 this.getDetail(this.data.bookInfo.id,true);
353 PubSub.emit('fulshReseveList') 358 PubSub.emit('fulshReseveList')
@@ -169,102 +169,104 @@ @@ -169,102 +169,104 @@
169 </view> 169 </view>
170 </navigator> 170 </navigator>
171 <view style="height: 250rpx;"></view> 171 <view style="height: 250rpx;"></view>
172 -  
173 -<!--通知预订人-->  
174 -<view class="notice-opt" wx:if="{{bookInfo.hasRunning}}">  
175 - <view class="notice-button-border font34r flex-lr">  
176 - <view>  
177 - <formids bindclick="noticeCall">通知客户</formids>  
178 - </view>  
179 - <view wx:if="{{bookInfo.order && bookInfo.order.cookbooklist.length>0}}">  
180 - <formids bindclick="showOrder">查看菜品</formids>  
181 - </view>  
182 - </view>  
183 - <view class="notice-button-border font34r flex-lr" wx:if="{{hasEditorFlag || (bookInfo.type==1 && hasReceipt)}}">  
184 - <view>  
185 - <formids bindclick="gotoModify">变更预订</formids>  
186 - </view>  
187 - <view >  
188 - <formids bindclick="cancelReserve">取消预订</formids>  
189 - </view>  
190 - <view>  
191 - <formids bindclick="startDinner" data-status="2">确认到店</formids>  
192 - </view>  
193 - </view>  
194 -</view>  
195 -<view class="notice-opt" wx:if="{{bookInfo.status==2}}">  
196 - <view class="notice-button-border font34r flex-lr">  
197 - <view wx:if="{{hasEditorFlag || (bookInfo.type==1 && hasReceipt)}}">  
198 - <formids bindclick="gotoModify">变更预订</formids>  
199 - </view>  
200 - <view wx:if="{{hasEditorFlag || (bookInfo.type==1 && hasReceipt)}}">  
201 - <formids bindclick="cancelReserve">取消预订</formids>  
202 - </view>  
203 - <view>  
204 - <formids bindclick="noticeCall">通知客户</formids>  
205 - </view>  
206 - </view>  
207 - <formids class="notice-button white-font font34r flex-cc" bindclick="startDinner" data-status="3">客户就餐完毕</formids>  
208 -</view>  
209 -<!--操作在线预订-->  
210 -<view class="notice-opt" wx:if="{{bookInfo.status==0}}">  
211 - <block wx:if="{{isAdmin}}"> 172 +<block wx:if="{{loaded}}">
  173 + <!--通知预订人-->
  174 + <view class="notice-opt" wx:if="{{bookInfo.hasRunning}}">
212 <view class="notice-button-border font34r flex-lr"> 175 <view class="notice-button-border font34r flex-lr">
213 <view> 176 <view>
214 - <formids bindclick="easyCall" data-key="jdmans">联系接单人</formids>  
215 - </view>  
216 - <view>  
217 - <formids bindclick="easyCall" data-key="seller">联系商家</formids> 177 + <formids bindclick="noticeCall">通知客户</formids>
218 </view> 178 </view>
219 - <view>  
220 - <formids bindclick="easyCall" data-key="customer">联系顾客</formids> 179 + <view wx:if="{{bookInfo.order && bookInfo.order.cookbooklist.length>0}}">
  180 + <formids bindclick="showOrder">查看菜品</formids>
221 </view> 181 </view>
222 </view> 182 </view>
223 - <view class="notice-button-border font34r flex-lr"> 183 + <view class="notice-button-border font34r flex-lr" wx:if="{{hasEditorFlag || (bookInfo.type==1 && hasReceipt)}}">
224 <view> 184 <view>
225 - <formids bindclick="refuseOrder">拒绝订单</formids> 185 + <formids bindclick="gotoModify">变更预订</formids>
226 </view> 186 </view>
227 - <view>  
228 - <formids bindclick="arrangeOrder">安排包间</formids> 187 + <view >
  188 + <formids bindclick="cancelReserve">取消预订</formids>
229 </view> 189 </view>
230 - </view>  
231 - </block>  
232 - <block wx:elif="{{hasCallPhone}}">  
233 - <view class="notice-button-border font34r flex-lr">  
234 <view> 190 <view>
235 - <formids bindclick="arrangeOrder">安排包间</formids> 191 + <formids bindclick="startDinner" data-status="2">确认到店</formids>
236 </view> 192 </view>
237 </view> 193 </view>
  194 + </view>
  195 + <view class="notice-opt" wx:if="{{bookInfo.status==2}}">
238 <view class="notice-button-border font34r flex-lr"> 196 <view class="notice-button-border font34r flex-lr">
239 - <view>  
240 - <formids bindclick="refuseOrder">拒绝订单</formids> 197 + <view wx:if="{{hasEditorFlag || (bookInfo.type==1 && hasReceipt)}}">
  198 + <formids bindclick="gotoModify">变更预订</formids>
  199 + </view>
  200 + <view wx:if="{{hasEditorFlag || (bookInfo.type==1 && hasReceipt)}}">
  201 + <formids bindclick="cancelReserve">取消预订</formids>
241 </view> 202 </view>
242 <view> 203 <view>
243 - <formids bindclick="easyCall" data-key="customer">联系顾客</formids> 204 + <formids bindclick="noticeCall">通知客户</formids>
244 </view> 205 </view>
245 </view> 206 </view>
246 - </block>  
247 - <block wx:else="">  
248 - <view class="notice-button-border font34r flex-lr">  
249 - <view>  
250 - <formids bindclick="refuseOrder">拒绝订单</formids> 207 + <formids class="notice-button white-font font34r flex-cc" bindclick="startDinner" data-status="3">客户就餐完毕</formids>
  208 + </view>
  209 + <!--操作在线预订-->
  210 + <view class="notice-opt" wx:if="{{bookInfo.status==0}}">
  211 + <block wx:if="{{isAdmin}}">
  212 + <view class="notice-button-border font34r flex-lr">
  213 + <view>
  214 + <formids bindclick="easyCall" data-key="jdmans">联系接单人</formids>
  215 + </view>
  216 + <view>
  217 + <formids bindclick="easyCall" data-key="seller">联系商家</formids>
  218 + </view>
  219 + <view>
  220 + <formids bindclick="easyCall" data-key="customer">联系顾客</formids>
  221 + </view>
251 </view> 222 </view>
252 - <view>  
253 - <formids bindclick="arrangeOrder">安排包间</formids> 223 + <view class="notice-button-border font34r flex-lr">
  224 + <view>
  225 + <formids bindclick="refuseOrder">拒绝订单</formids>
  226 + </view>
  227 + <view>
  228 + <formids bindclick="arrangeOrder">安排包间</formids>
  229 + </view>
254 </view> 230 </view>
255 - </view>  
256 - </block>  
257 -</view>  
258 -<noticeCall id="notice" bookInfo="{{bookInfo}}"></noticeCall>  
259 -<action-sheet hidden="{{actionSheetHidden}}" bindchange="actionSheetChange" class="flex-ll">  
260 - <block wx:for-items="{{actionSheetItems}}" wx:key="actionSheetItems.key">  
261 - <action-sheet-item>{{item}}</action-sheet-item>  
262 - </block>  
263 - <action-sheet-item>  
264 - <input placeholder="请输入" style="width:100%"/>  
265 - </action-sheet-item>  
266 - <action-sheet-cancel >取消</action-sheet-cancel> 231 + </block>
  232 + <block wx:elif="{{hasCallPhone}}">
  233 + <view class="notice-button-border font34r flex-lr">
  234 + <view>
  235 + <formids bindclick="arrangeOrder">安排包间</formids>
  236 + </view>
  237 + </view>
  238 + <view class="notice-button-border font34r flex-lr">
  239 + <view>
  240 + <formids bindclick="refuseOrder">拒绝订单</formids>
  241 + </view>
  242 + <view>
  243 + <formids bindclick="easyCall" data-key="customer">联系顾客</formids>
  244 + </view>
  245 + </view>
  246 + </block>
  247 + <block wx:else="">
  248 + <view class="notice-button-border font34r flex-lr">
  249 + <view>
  250 + <formids bindclick="refuseOrder">拒绝订单</formids>
  251 + </view>
  252 + <view>
  253 + <formids bindclick="arrangeOrder">安排包间</formids>
  254 + </view>
  255 + </view>
  256 + </block>
  257 + </view>
  258 + <noticeCall id="notice" bookInfo="{{bookInfo}}"></noticeCall>
  259 + <action-sheet hidden="{{actionSheetHidden}}" bindchange="actionSheetChange" class="flex-ll">
  260 + <block wx:for-items="{{actionSheetItems}}" wx:key="actionSheetItems.key">
  261 + <action-sheet-item>{{item}}</action-sheet-item>
  262 + </block>
  263 + <action-sheet-item>
  264 + <input placeholder="请输入" style="width:100%"/>
  265 + </action-sheet-item>
  266 + <action-sheet-cancel >取消</action-sheet-cancel>
267 267
268 -</action-sheet>  
269 -<cancel id="cancel" bindreserveCancel="reserveCancel" bookInfo="{{bookInfo}}"></cancel>  
270 -<showModal id="showModal" bindshowModal="showModalEvent"></showModal>  
  268 + </action-sheet>
  269 + <cancel id="cancel" bindreserveCancel="reserveCancel" bookInfo="{{bookInfo}}"></cancel>
  270 + <showModal id="showModal" bindshowModal="showModalEvent"></showModal>
  271 +</block>
  272 +<loading wx:else="">加载中</loading>