Commit 91c1740c211f0fec246f4d93262f689fe7dff1cb
1 parent
4d8f4082
会员在开团的时候,如果未到达,也要让物流的配送方式能够切换
Showing
1 changed file
with
2 additions
and
2 deletions
pages/cart/cart2_pt/cart2_pt.js
@@ -382,7 +382,7 @@ Page({ | @@ -382,7 +382,7 @@ Page({ | ||
382 | break; | 382 | break; |
383 | } | 383 | } |
384 | 384 | ||
385 | - if(th.data.show_same_city==1 && th.data.json_d.pickupway && th.data.json_d.pickupway == 2 ){ | 385 | + if(th.data.show_same_city==1 && th.data.json_d.pickupway && th.data.json_d.pickupway == 2 && th.data.kt_type!=3 ){ |
386 | et = 2; | 386 | et = 2; |
387 | } | 387 | } |
388 | 388 | ||
@@ -862,7 +862,7 @@ Page({ | @@ -862,7 +862,7 @@ Page({ | ||
862 | } | 862 | } |
863 | }) | 863 | }) |
864 | if (!is_next){ | 864 | if (!is_next){ |
865 | - th.setData({show_submit:1, submit: 0,same_ok:0 }) | 865 | + th.setData({show_submit:1, submit: 0,same_ok:0,show_btn:1 }) |
866 | return false | 866 | return false |
867 | } | 867 | } |
868 | 868 |