Commit fd7eb281a4be0b0b89de20f8061564598b8ed5d9

Authored by wangfan
1 parent 99876381

smsbatch

@@ -94,7 +94,7 @@ Component({ @@ -94,7 +94,7 @@ Component({
94 } 94 }
95 }) 95 })
96 } 96 }
97 - util.rpc(uri.CGI__USER_GETCOOKBOOKSELBYSPECSID,{ 97 + App.Cookbook.GetCookbookSelBySpecsId({
98 sellerid:this.data.sellerid, 98 sellerid:this.data.sellerid,
99 orderid: this.data.orderid, 99 orderid: this.data.orderid,
100 cookbookid: this.data.item.id, 100 cookbookid: this.data.item.id,
@@ -130,7 +130,7 @@ Component({ @@ -130,7 +130,7 @@ Component({
130 var foodMenuPrice=foodMenu[0].price; 130 var foodMenuPrice=foodMenu[0].price;
131 var practice_id=foodMenu[0].id; 131 var practice_id=foodMenu[0].id;
132 } 132 }
133 - util.rpc(uri.CGI__USER_GETCOOKBOOKSELBYSPECSID,{ 133 + App.Cookbook.GetCookbookSelBySpecsId({
134 sellerid:this.data.sellerid, 134 sellerid:this.data.sellerid,
135 orderid: this.data.orderid, 135 orderid: this.data.orderid,
136 cookbookid: this.data.item.id, 136 cookbookid: this.data.item.id,
@@ -239,7 +239,7 @@ Component({ @@ -239,7 +239,7 @@ Component({
239 type:1, 239 type:1,
240 }); 240 });
241 //this.matchArray(cookbookid,1,countTotal,countPirce) 241 //this.matchArray(cookbookid,1,countTotal,countPirce)
242 - util.post(uri.CGI__USER_ADDCRAT,{ 242 + App.Orders.AddCart({
243 orderid: this.data.orderid, 243 orderid: this.data.orderid,
244 openid:util.cache('openid'), 244 openid:util.cache('openid'),
245 cookbookid:cookbookid, 245 cookbookid:cookbookid,
@@ -248,7 +248,7 @@ Component({ @@ -248,7 +248,7 @@ Component({
248 request_uri: this.data.request_uri == true ? 1 : '',//服务员通过消息通知进来 又加菜的标识 248 request_uri: this.data.request_uri == true ? 1 : '',//服务员通过消息通知进来 又加菜的标识
249 fromSoucre:this.data.fromSoucre?this.data.fromSoucre:'', 249 fromSoucre:this.data.fromSoucre?this.data.fromSoucre:'',
250 identity:util.cache('identity') 250 identity:util.cache('identity')
251 - },uri.CGI__USER_ADDCRAT__CODE,'0','0'); 251 + });
252 }); 252 });
253 }, 253 },
254 //减菜面板 254 //减菜面板
@@ -269,7 +269,7 @@ Component({ @@ -269,7 +269,7 @@ Component({
269 type:-1, 269 type:-1,
270 }); 270 });
271 271
272 - util.post(uri.CGI__USER_REDUCEORDER, { 272 + App.Orders.ReduceOrder({
273 orderid: this.data.orderid, 273 orderid: this.data.orderid,
274 openid: getApp().openid, 274 openid: getApp().openid,
275 cookbookid: cookbookid, 275 cookbookid: cookbookid,
@@ -279,7 +279,7 @@ Component({ @@ -279,7 +279,7 @@ Component({
279 request_uri: this.data.request_uri == true ? 1 : '',//服务员通过消息通知进来 又加菜的标识 279 request_uri: this.data.request_uri == true ? 1 : '',//服务员通过消息通知进来 又加菜的标识
280 status:this.data.fromSoucre!=''?2:'',//只查没有下单的 280 status:this.data.fromSoucre!=''?2:'',//只查没有下单的
281 source: 2, 281 source: 2,
282 - }, uri.CGI__USER_REDUCEORDER__CODE, '0', '0'); 282 + });
283 }); 283 });
284 }, 284 },
285 //减菜面板加菜按钮 285 //减菜面板加菜按钮
@@ -351,7 +351,7 @@ Component({ @@ -351,7 +351,7 @@ Component({
351 if(practice_id>0){ 351 if(practice_id>0){
352 params.practiceid=practice_id; 352 params.practiceid=practice_id;
353 } 353 }
354 - util.post(uri.CGI__USER_REDUCEORDER, params, uri.CGI__USER_REDUCEORDER__CODE, '0', '0'); 354 + App.Orders.ReduceOrder(params);
355 }, 355 },
356 /** 356 /**
357 * 357 *
@@ -431,7 +431,7 @@ Component({ @@ -431,7 +431,7 @@ Component({
431 if(practice_id>0){ 431 if(practice_id>0){
432 param.practiceid=practice_id; 432 param.practiceid=practice_id;
433 } 433 }
434 - util.post(uri.CGI__USER_ADDCRAT,param,uri.CGI__USER_ADDCRAT__CODE,'0','0'); 434 + App.Orders.AddCart(param);
435 }, 435 },
436 //清除订单下某菜品所有数量 436 //清除订单下某菜品所有数量
437 clean(){ 437 clean(){
@@ -440,11 +440,11 @@ Component({ @@ -440,11 +440,11 @@ Component({
440 cookbookid:cookbookid, 440 cookbookid:cookbookid,
441 type:this.data.item.num*-1 441 type:this.data.item.num*-1
442 }); 442 });
443 - util.post(uri.CGI__USER_CLEARCOOKBYID,{ 443 + App.Orders.ClearCookById({
444 orderid: this.data.orderid, 444 orderid: this.data.orderid,
445 sellerid: this.data.sellerid, 445 sellerid: this.data.sellerid,
446 cookbookid:cookbookid 446 cookbookid:cookbookid
447 - },uri.CGI__USER_CLEARCOOKBYID__CODE,'0','0'); 447 + });
448 } 448 }
449 } 449 }
450 }) 450 })
@@ -188,4 +188,68 @@ Page({ @@ -188,4 +188,68 @@ Page({
188 }); 188 });
189 189
190 }, 190 },
  191 + foodCardCallback(e){
  192 + let opt=e.detail;
  193 + console.log('foodCardCallback',opt);
  194 + if(opt.type=='specWin'){
  195 + if(opt.value=='show'){
  196 + this.setData({scrollZindex:9999});
  197 + }else{
  198 + this.setData({scrollZindex:'auto'});
  199 + }
  200 + return;
  201 + }
  202 + let books=this.data.cookbooklist;
  203 + books.forEach(menu=>{
  204 + menu.cookbooklist[0].forEach(book=>{
  205 + if(book.id==opt.cookbookid){
  206 + book.num=opt.num;
  207 + }
  208 + })
  209 + })
  210 + this.setData({
  211 + countTotal:this.data.countTotal+opt.type,
  212 + cookbooklist:books
  213 + });
  214 + this.getOrderInfo();
  215 + },
  216 + //订单详情
  217 + getOrderInfo:function(){
  218 + App.Orders.GetOrderById({orderid:this.data.orderid}).then(json=>{
  219 + let order=json.data[0].order[0];
  220 + if(order.status<2){
  221 + this.setData({aiOrderStatus:json.data[0].order[0].status});
  222 + }else{
  223 + var title=''
  224 + if(json.data[0].order[0].status==2 || json.data[0].order[0].status==3){
  225 + if(this.data.fromSoucre || util.cache('identity')==2){
  226 + return;
  227 + }
  228 + title='手慢了,小伙伴已下单'
  229 + }
  230 + if(json.data[0].order[0].status==5){
  231 + title='订单已结账'
  232 + }
  233 + if(json.data[0].order[0].status==7){
  234 + title='订单已清台'
  235 + }
  236 + wx.showToast({
  237 + icon:'none',
  238 + title:title,
  239 + duration:1500,
  240 + });
  241 + let that=this;
  242 + setTimeout(function(){
  243 + if(json.data[0].order[0].status>5){
  244 + wx.reLaunch({
  245 + url:'/pages/menu/s_nothing?sellerid='+that.data.sellerid+'&orderid='+that.data.orderid,
  246 + })
  247 + }else{
  248 + that.goToOrder(that.data.orderid)
  249 + }
  250 + },1500)
  251 + }
  252 +
  253 + })
  254 + },
191 }) 255 })
@@ -95,7 +95,18 @@ export default { @@ -95,7 +95,18 @@ export default {
95 alias:'App.Pay.WxPaySub', 95 alias:'App.Pay.WxPaySub',
96 }, 96 },
97 97
98 - //菜品列表  
99 - 'App.Cookbook.GetCookbookByClass':null,  
100 98
  99 + /**提前点餐**/
  100 + //菜品列表
  101 + 'App.Cookbook.GetCookbookByClass':null,
  102 + //菜品规格
  103 + 'App.Cookbook.GetCookbookSelBySpecsId':null,
  104 + //添加到购物车
  105 + 'App.Orders.AddCart':null,
  106 + //减菜
  107 + 'App.Orders.ReduceOrder':null,
  108 + //清空购物车
  109 + 'App.Orders.ClearCookById':null,
  110 + //购物车
  111 + 'App.Orders.GetOrderById':null,
101 } 112 }