Commit cf48065ce4d0f062a3fdf2d0cd1442f6ac77d649
1 parent
6a897269
购物车测试优化
Showing
2 changed files
with
7 additions
and
3 deletions
packageE/pages/cart/cart2/cart2.js
@@ -7793,7 +7793,7 @@ Page({ | @@ -7793,7 +7793,7 @@ Page({ | ||
7793 | } | 7793 | } |
7794 | 7794 | ||
7795 | if (zh && zh['buy_limit'] > 0 && num0+buyed > zh['buy_limit']) { | 7795 | if (zh && zh['buy_limit'] > 0 && num0+buyed > zh['buy_limit']) { |
7796 | - func({'code': -1, 'msg': '超出优惠促销活动的限购'}); | 7796 | + func({'code': -1, 'msg': '超出超出组合购活动的限购'}); |
7797 | return false; | 7797 | return false; |
7798 | } | 7798 | } |
7799 | 7799 |
pages/cart/cart/cart.js
@@ -1809,11 +1809,15 @@ Page({ | @@ -1809,11 +1809,15 @@ Page({ | ||
1809 | sele_arr[i] = !sele; | 1809 | sele_arr[i] = !sele; |
1810 | } | 1810 | } |
1811 | 1811 | ||
1812 | + th.data.pitems=-1; | ||
1813 | + if (!sele) { | ||
1814 | + th.data.pitems=pitems; | ||
1815 | + } | ||
1816 | + | ||
1817 | + | ||
1812 | //-- 回调判断活动有没有冲突 -- | 1818 | //-- 回调判断活动有没有冲突 -- |
1813 | this.cx_check_ok(pitems, sele_arr, function (the_res) { | 1819 | this.cx_check_ok(pitems, sele_arr, function (the_res) { |
1814 | if (the_res.code == 0) { | 1820 | if (the_res.code == 0) { |
1815 | - | ||
1816 | - | ||
1817 | //-- 门店是所有的商品都要选择 -- | 1821 | //-- 门店是所有的商品都要选择 -- |
1818 | for (var i = 0; i < item.length; i++) { | 1822 | for (var i = 0; i < item.length; i++) { |
1819 | var txt0 = "requestData[" + pitems + "].goods[" + i + "].selected"; | 1823 | var txt0 = "requestData[" + pitems + "].goods[" + i + "].selected"; |