Commit 5eab125c7c434cde4ea2c6fa0cd49fcc9241e8fe
1 parent
3388c6f2
会员默认物流的由优化
Showing
2 changed files
with
8 additions
and
5 deletions
packageE/pages/cart/cart2/cart2.js
| @@ -4833,7 +4833,8 @@ Page({ | @@ -4833,7 +4833,8 @@ Page({ | ||
| 4833 | 4833 | ||
| 4834 | } | 4834 | } |
| 4835 | //判断有没有默认的物流地址值 | 4835 | //判断有没有默认的物流地址值 |
| 4836 | - if (def_exp_code != "" && def_exp_code != null && def_exp_code != undefined && !th.data.is_default_logistics) { | 4836 | + if (def_exp_code != "" && def_exp_code != null && def_exp_code != undefined && !th.data.is_default_logistics && !th.data.get_exp_ing) { |
| 4837 | + th.data.get_exp_ing=1; | ||
| 4837 | var wu_arr = this.data.wu_arr; | 4838 | var wu_arr = this.data.wu_arr; |
| 4838 | if (wu_arr != null && wu_arr != "") { | 4839 | if (wu_arr != null && wu_arr != "") { |
| 4839 | for (var i = 0; i < wu_arr.length; i++) { | 4840 | for (var i = 0; i < wu_arr.length; i++) { |
| @@ -4872,7 +4873,8 @@ Page({ | @@ -4872,7 +4873,8 @@ Page({ | ||
| 4872 | } | 4873 | } |
| 4873 | 4874 | ||
| 4874 | //判断有没有默认的物流地址值 | 4875 | //判断有没有默认的物流地址值 |
| 4875 | - if (def_exp_code != "" && def_exp_code != null && def_exp_code != undefined && !th.data.is_default_logistics) { | 4876 | + if (def_exp_code != "" && def_exp_code != null && def_exp_code != undefined && !th.data.is_default_logistics && !th.data.get_exp_ing) { |
| 4877 | + th.data.get_exp_ing=1; | ||
| 4876 | var wu_arr = this.data.wu_arr; | 4878 | var wu_arr = this.data.wu_arr; |
| 4877 | if (wu_arr != null && wu_arr != "") { | 4879 | if (wu_arr != null && wu_arr != "") { |
| 4878 | for (var i = 0; i < wu_arr.length; i++) { | 4880 | for (var i = 0; i < wu_arr.length; i++) { |
packageE/pages/cart/cart2_inte/cart2_inte.js
| @@ -199,11 +199,11 @@ Page({ | @@ -199,11 +199,11 @@ Page({ | ||
| 199 | if (th.data.is_b_now == 1) { | 199 | if (th.data.is_b_now == 1) { |
| 200 | if (th.data.bn_goods) { | 200 | if (th.data.bn_goods) { |
| 201 | th.setData({ add_back: 1,same_ok:1 }); | 201 | th.setData({ add_back: 1,same_ok:1 }); |
| 202 | - th.calculatePrice2(); | ||
| 203 | } | 202 | } |
| 204 | } | 203 | } |
| 204 | + th.calculatePrice2(); | ||
| 205 | } else { | 205 | } else { |
| 206 | - th.setData({ user_addr: ie,show_submit:0 }); | 206 | + th.setData({ user_addr: ie }); |
| 207 | } | 207 | } |
| 208 | var going = 0; | 208 | var going = 0; |
| 209 | 209 | ||
| @@ -1466,7 +1466,8 @@ Page({ | @@ -1466,7 +1466,8 @@ Page({ | ||
| 1466 | } | 1466 | } |
| 1467 | 1467 | ||
| 1468 | //判断有没有默认的物流地址值 | 1468 | //判断有没有默认的物流地址值 |
| 1469 | - if (def_exp_code != "" && def_exp_code != null && def_exp_code != undefined && !th.data.is_default_logistics) { | 1469 | + if (def_exp_code != "" && def_exp_code != null && def_exp_code != undefined && !th.data.is_default_logistics && !th.data.get_exp_ing) { |
| 1470 | + th.data.get_exp_ing=1; | ||
| 1470 | var wu_arr = this.data.wu_arr; | 1471 | var wu_arr = this.data.wu_arr; |
| 1471 | if (wu_arr != null && wu_arr != "") { | 1472 | if (wu_arr != null && wu_arr != "") { |
| 1472 | for (var i = 0; i < wu_arr.length; i++) { | 1473 | for (var i = 0; i < wu_arr.length; i++) { |