Commit 268c1b00c161e3c1a654a386527ebfb138f97ea2
1 parent
38a53cad
支付尾款, 拼团的普通购买
Showing
2 changed files
with
12 additions
and
8 deletions
pages/cart/cart2_pt/cart2_pt.js
... | ... | @@ -386,11 +386,15 @@ Page({ |
386 | 386 | 'pickup_id': th.data.bn_pick, //门店 |
387 | 387 | 'exp_type': th.data.bn_exp_type, //配送方式 |
388 | 388 | 'is_normal':th.data.bn_goods.is_normal, //是否是普通购买 |
389 | - 'pt_prom_id':th.data.bn_goods.prom_id, //拼单ID | |
390 | - 'is_zsorder':th.data.kt_type+1, //开团类型 | |
391 | - 'is_pt_tz':th.data.is_pt_tz, //开团类型 | |
392 | - 'order_goods':new Array(), | |
389 | + 'pt_prom_id':th.data.bn_goods.prom_id, //拼单ID | |
390 | + 'is_pt_tz':th.data.is_pt_tz, //开团类型 | |
391 | + 'order_goods':new Array(), | |
393 | 392 | }; |
393 | + | |
394 | + if(!th.data.bn_goods.is_normal){ | |
395 | + item.is_zsorder=th.data.kt_type+1; //开团类型 | |
396 | + } | |
397 | + | |
394 | 398 | if(th.data.qh!='') |
395 | 399 | { |
396 | 400 | item.team_qh=th.data.qh; | ... | ... |
pages/cart/cart_wk/cart_wk.js
... | ... | @@ -34,7 +34,7 @@ Page({ |
34 | 34 | enterAddressPage: 0, //进入地址页面 |
35 | 35 | |
36 | 36 | allpice:0, |
37 | - show_pay_type:0, | |
37 | + show_pay_type:0, | |
38 | 38 | |
39 | 39 | teamgroup: null, |
40 | 40 | }, |
... | ... | @@ -290,10 +290,10 @@ Page({ |
290 | 290 | }else{ |
291 | 291 | var allpice= parseFloat(th.data.order.order_amount) |
292 | 292 | + parseFloat(th.data.order.user_money) |
293 | - +parseFloat(th.data.order.pt_tail_money); | |
293 | + +parseFloat(th.data.order.tail_money); | |
294 | 294 | allpice=allpice.toFixed(2); |
295 | 295 | this.setData({ |
296 | - allpice: allpice | |
296 | + allpice: allpice, exp_price: 0, | |
297 | 297 | }); |
298 | 298 | } |
299 | 299 | }, |
... | ... | @@ -424,7 +424,7 @@ Page({ |
424 | 424 | exp_price = parseFloat(exp_price); |
425 | 425 | th.setData({ exp_price: exp_price,allpice:allpice }) |
426 | 426 | }else { |
427 | - var allpice=th.data.order.order_amount+th.data.order.user_money+th.data.order.pt_tail_money; | |
427 | + var allpice=th.data.order.order_amount+th.data.order.user_money+th.data.order.tail_money; | |
428 | 428 | allpice=allpice.toFixed(2); |
429 | 429 | th.setData({ exp_price: 0,allpice:allpice }) |
430 | 430 | } | ... | ... |