Commit e2bc4bebd678cfe7cb1262337d516aee5aa61879

Authored by yvan.ni
1 parent 8f53b371

优化

packageE/pages/cart/cart2/cart2.js
... ... @@ -1441,6 +1441,28 @@ Page({
1441 1441 }
1442 1442 }
1443 1443  
  1444 + //如果是立即购买的时候,item_j.promgoodsbuynum
  1445 + if(carr[0].state==1 && item1.prom_type>0){
  1446 + item1.promgoodsbuynum=0;
  1447 + await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", {
  1448 + data: {
  1449 + store_id: oo.stoid,
  1450 + user_id: getApp().globalData.user_id,
  1451 + goods_id: item1.goods_id,
  1452 + prom_type: item1.prom_type,
  1453 + prom_id: item1.prom_id,
  1454 + isnew:1
  1455 + },
  1456 + }).then(res => {
  1457 + debugger
  1458 + if(res.data.code==0 && res.data.data && res.data.data.promgoodsbuynum){
  1459 + item1.promgoodsbuynum = res.data.data.promgoodsbuynum;
  1460 + }
  1461 + })
  1462 + }
  1463 +
  1464 +
  1465 +
1444 1466 //要把优惠活动加入,prom_goods_map中,赠品不要运算,代发商品不算优惠
1445 1467 if (item1.prom_type == 3 && item1.is_gift != 1 && !item1.whsle_id) {
1446 1468 // th.check_is_youhui(item1.goods_id, item1.pick_id);
... ...
packageE/pages/cart/cart2/zh_calculate.js
... ... @@ -55,7 +55,7 @@ module.exports = {
55 55 act_goos[j].num = item_j.goods_num;
56 56 act_goos[j].goods_price = item_j.goods_price;
57 57 var cart_num = item.cart_num = item_j.goods_num;
58   - var zh_b_num = item_j.promgoodsbuynum;
  58 + var zh_b_num = item_j.promgoodsbuynum || 0;
59 59 if (item.buyqty > 0) {
60 60  
61 61 var key = item.goods_id + "." + act.id;
... ...
utils/more_cx.js
... ... @@ -74,7 +74,7 @@ module.exports = {
74 74 need_ck0=th.data.in_zhact_new[aid]?th.data.in_zhact_new[aid]:0;
75 75 }
76 76 var min_can_buy0=0;
77   - if(need_ck+item_act_map.buyed>=act.buy_limit){
  77 + if(need_ck0+item_act_map.buyed>=act.buy_limit){
78 78 if(!need_ok) {
79 79 item_act_map.is_no_ok = 1;
80 80 }else{
... ...