Commit 0d4003427e44eb713ab35afa14fd37e7091712a8
1 parent
7be6eb40
小程序再啦一下
Showing
1 changed file
with
30 additions
and
4 deletions
pages/cart/cart/cart.js
... | ... | @@ -1848,7 +1848,7 @@ Page({ |
1848 | 1848 | //-- 判断起购数量 -- |
1849 | 1849 | if(!e.data.checkAllToggle){ |
1850 | 1850 | //判断是不是有促销活动 |
1851 | - var act=await getApp().get_has_cx_act(gd_info.goods_id); | |
1851 | + var act=await getApp().get_has_cx_act(obj.goods_id); | |
1852 | 1852 | th.click_set_limit(obj,i,j,act); |
1853 | 1853 | } |
1854 | 1854 | |
... | ... | @@ -2599,6 +2599,30 @@ Page({ |
2599 | 2599 | }); |
2600 | 2600 | }, |
2601 | 2601 | |
2602 | + //-- 循环汇总其他门店,其他活动有此商品的购买数量的汇总,不包含赠品 -- | |
2603 | + get_goods_other(item, pitem){ | |
2604 | + var goods_id = this.data.requestData[pitem].goods[item].goods_id; | |
2605 | + var num=0; | |
2606 | + for (let i = 0; i < this.data.requestData[pitem].goods.length; i++) { | |
2607 | + var t_item=this.data.requestData[pitem].goods[i] | |
2608 | + if(i!=item && t_item.goods_id==goods_id && t_item.is_gift==0){ | |
2609 | + num+=t_item.goods_num | |
2610 | + } | |
2611 | + } | |
2612 | + for (let j = 0; j < this.data.requestData.length;j++){ | |
2613 | + if(j!=pitem){ | |
2614 | + var goods=this.data.requestData[j]; | |
2615 | + for (let k = 0; k <goods.length ; k++) { | |
2616 | + var m_item=goods[k]; | |
2617 | + if(m_item.goods_id==goods_id && m_item.is_gift==0){ | |
2618 | + num+=m_item.goods_num | |
2619 | + } | |
2620 | + } | |
2621 | + } | |
2622 | + } | |
2623 | + return num; | |
2624 | + }, | |
2625 | + | |
2602 | 2626 | //----------------------更新购物数量,加减,调用接口--------------------- |
2603 | 2627 | postCardList: function (t, item, pitem) { |
2604 | 2628 | var e = this,th = e,user_id = getApp().globalData.user_id; |
... | ... | @@ -2617,9 +2641,9 @@ Page({ |
2617 | 2641 | var goodsinfo = e.data.requestData[pitem].goods[item]; |
2618 | 2642 | var promgoodsbuynum = 0; |
2619 | 2643 | var goodsbuynum = 0; |
2644 | + var other_gd_num=th.get_goods_other(item, pitem); | |
2620 | 2645 | |
2621 | 2646 | var is_showing=0; |
2622 | - | |
2623 | 2647 | //--要获得商品,该用户买了多少件,同步应用,用于限购的计算-- |
2624 | 2648 | await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", { |
2625 | 2649 | data: { |
... | ... | @@ -2642,6 +2666,9 @@ Page({ |
2642 | 2666 | |
2643 | 2667 | }) |
2644 | 2668 | |
2669 | + //-- 已经购买数量要汇总其他活动,其他门店的商品数量 -- | |
2670 | + goodsbuynum+=other_gd_num; | |
2671 | + | |
2645 | 2672 | //--> by ty |
2646 | 2673 | // var buyed_mum2 = t.goods_num + goodsbuynum; |
2647 | 2674 | var buyed_mum2 = t.goods_num; |
... | ... | @@ -2651,7 +2678,6 @@ Page({ |
2651 | 2678 | |
2652 | 2679 | //getApp().my_warnning('购买数量超出商品限购', 0, th); |
2653 | 2680 | var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num"; |
2654 | - | |
2655 | 2681 | limit = limit - goodsbuynum; |
2656 | 2682 | if(limit<0) limit=0; |
2657 | 2683 | |
... | ... | @@ -2744,7 +2770,6 @@ Page({ |
2744 | 2770 | |
2745 | 2771 | //--活动的限购是不是要判断-- |
2746 | 2772 | if(false_data.buy_limit > 0) { |
2747 | - | |
2748 | 2773 | if(t.goods_num + promgoodsbuynum > false_data.buy_limit && !is_showing){ |
2749 | 2774 | wx.showToast({ |
2750 | 2775 | title: '购买数量超出秒杀限购', |
... | ... | @@ -2768,6 +2793,7 @@ Page({ |
2768 | 2793 | } |
2769 | 2794 | break; |
2770 | 2795 | case 2: |
2796 | + | |
2771 | 2797 | //-- 读取团购 -- |
2772 | 2798 | var res= await getApp().promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/" + goodsinfo.goods_id + "/" + goodsinfo.prom_id, {}); |
2773 | 2799 | if (res.data.code == 0 && res.data.data) { | ... | ... |