Commit 1e468dfce50006bd3475955b902cdd9c6be3a654
1 parent
fa7da737
组合促销在购物车页面也不判断了
Showing
1 changed file
with
18 additions
and
15 deletions
pages/cart/cart/cart.js
@@ -4034,11 +4034,13 @@ Page({ | @@ -4034,11 +4034,13 @@ Page({ | ||
4034 | prom_type: g_arr[i].prom_type, | 4034 | prom_type: g_arr[i].prom_type, |
4035 | prom_id: g_arr[i].prom_id, | 4035 | prom_id: g_arr[i].prom_id, |
4036 | }; | 4036 | }; |
4037 | - let gitem = checkArr7.find(item => item.goods_id == g_arr[i].goods_id) | ||
4038 | - if (gitem) { | ||
4039 | - data.prom_type = 0 | ||
4040 | - data.prom_id = 0 | ||
4041 | - } | 4037 | + |
4038 | + // let gitem = checkArr7.find(item => item.goods_id == g_arr[i].goods_id) | ||
4039 | + // if (gitem) { | ||
4040 | + // data.prom_type = 0 | ||
4041 | + // data.prom_id = 0 | ||
4042 | + // } | ||
4043 | + | ||
4042 | //-- 如果有线下取价的时候 -- | 4044 | //-- 如果有线下取价的时候 -- |
4043 | if (g_arr[i].is_offline) { | 4045 | if (g_arr[i].is_offline) { |
4044 | data.pricing_type = g_arr[i].pricing_type; | 4046 | data.pricing_type = g_arr[i].pricing_type; |
@@ -5065,6 +5067,7 @@ Page({ | @@ -5065,6 +5067,7 @@ Page({ | ||
5065 | else cx_prom_group[dx].sele = 1; | 5067 | else cx_prom_group[dx].sele = 1; |
5066 | } | 5068 | } |
5067 | 5069 | ||
5070 | + let the_rs={code:0}; | ||
5068 | // -- 判断 -- | 5071 | // -- 判断 -- |
5069 | this.cx_check_ok2(async function (the_rs) { | 5072 | this.cx_check_ok2(async function (the_rs) { |
5070 | if (the_rs.code == 0) { | 5073 | if (the_rs.code == 0) { |
@@ -5204,11 +5207,11 @@ Page({ | @@ -5204,11 +5207,11 @@ Page({ | ||
5204 | buyed = zbuy.data.data.userbuynum; | 5207 | buyed = zbuy.data.data.userbuynum; |
5205 | } | 5208 | } |
5206 | if (zh['zh_num'] > 0 && zh['zh_buy_num'] + num0 > zh['zh_num']) { | 5209 | if (zh['zh_num'] > 0 && zh['zh_buy_num'] + num0 > zh['zh_num']) { |
5207 | - func({ | ||
5208 | - 'code': -1, | ||
5209 | - 'msg': '超出组合购活动总数量' | ||
5210 | - }); | ||
5211 | - return false; | 5210 | + // func({ |
5211 | + // 'code': -1, | ||
5212 | + // 'msg': '超出组合购活动总数量' | ||
5213 | + // }); | ||
5214 | + // return false; | ||
5212 | } | 5215 | } |
5213 | } | 5216 | } |
5214 | } | 5217 | } |
@@ -5244,11 +5247,11 @@ Page({ | @@ -5244,11 +5247,11 @@ Page({ | ||
5244 | return e.goods_id == gid; | 5247 | return e.goods_id == gid; |
5245 | }) | 5248 | }) |
5246 | if (gdlist['buyqty'] > 0 && num1 + promgoodsbuynum > gdlist['buyqty']) { | 5249 | if (gdlist['buyqty'] > 0 && num1 + promgoodsbuynum > gdlist['buyqty']) { |
5247 | - func({ | ||
5248 | - 'code': -1, | ||
5249 | - 'msg': '超出组合购商品的限购' | ||
5250 | - }); | ||
5251 | - return false; | 5250 | + // func({ |
5251 | + // 'code': -1, | ||
5252 | + // 'msg': '超出组合购商品的限购' | ||
5253 | + // }); | ||
5254 | + // return false; | ||
5252 | } | 5255 | } |
5253 | } | 5256 | } |
5254 | } | 5257 | } |