Commit 5cf6508bc3de6fa994b09d9f3cfbd3a70174d931
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into test
Showing
1 changed file
with
3 additions
and
1 deletions
packageE/pages/cart/cart2/cart2.js
@@ -3631,7 +3631,7 @@ Page({ | @@ -3631,7 +3631,7 @@ Page({ | ||
3631 | function is_ok_wu_arr(index, name) { | 3631 | function is_ok_wu_arr(index, name) { |
3632 | if (!th.data.wu_arr) return ''; | 3632 | if (!th.data.wu_arr) return ''; |
3633 | if (!th.data.wu_arr[index]) return ''; | 3633 | if (!th.data.wu_arr[index]) return ''; |
3634 | - return th.data.wu_arr[name]; | 3634 | + return th.data.wu_arr[index][name]; |
3635 | } | 3635 | } |
3636 | 3636 | ||
3637 | var th = this, pdata = new Array(); | 3637 | var th = this, pdata = new Array(); |
@@ -3652,6 +3652,7 @@ Page({ | @@ -3652,6 +3652,7 @@ Page({ | ||
3652 | th.data.is_summit_ing = 0; | 3652 | th.data.is_summit_ing = 0; |
3653 | return false; | 3653 | return false; |
3654 | } | 3654 | } |
3655 | + | ||
3655 | 3656 | ||
3656 | var item = { | 3657 | var item = { |
3657 | 'user_id': to.globalData.user_id, | 3658 | 'user_id': to.globalData.user_id, |
@@ -3679,6 +3680,7 @@ Page({ | @@ -3679,6 +3680,7 @@ Page({ | ||
3679 | 'exp_type': th.data.bn_exp_type, //配送方式 | 3680 | 'exp_type': th.data.bn_exp_type, //配送方式 |
3680 | 'order_goods': new Array(), | 3681 | 'order_goods': new Array(), |
3681 | }; | 3682 | }; |
3683 | + | ||
3682 | //是不是重新提交 | 3684 | //是不是重新提交 |
3683 | if (th.data.is_continue == 1) item.is_continue = 1; | 3685 | if (th.data.is_continue == 1) item.is_continue = 1; |
3684 | 3686 |