diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js index c9b3a3e..8670ff0 100644 --- a/pages/cart/cart/cart.js +++ b/pages/cart/cart/cart.js @@ -552,23 +552,42 @@ Page({ var by_map = null; - //--要获得商品，该用户买了多少件,同步应用-- - await getApp().request.promiseGet("/api/weshop/ordergoods/listUserBuyGoodsNum", { - data: { - store_id: oo.stoid, - user_id: user_id, - goods_ids: g_arr.join(','), + // //--要获得商品，该用户买了多少件,同步应用-- + // await getApp().request.promiseGet("/api/weshop/ordergoods/listUserBuyGoodsNum", { + // data: { + // store_id: oo.stoid, + // user_id: user_id, + // goods_ids: g_arr.join(','), + // + // }, + // }).then(res => { + // if (ut.ajax_ok2(res)) { + // by_map = {}; + // for (let i in res.data.data) { + // let item = res.data.data[i]; + // by_map[item.goods_id] = item; + // } + // } + // }) + + + for (let ir = 0; ir < g_arr.length; ir++) { + let gg_it=g_arr[ir]; + await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", { + data: { + store_id: oo.stoid, + user_id: user_id, + goods_ids: gg_it, + isnew:1 + }, + }).then(tt => { + if (tt.data.code == 0) { + if(!by_map) by_map={}; + by_map[gg_it] = tt.data.data; + } + }) + } - }, - }).then(res => { - if (ut.ajax_ok2(res)) { - by_map = {}; - for (let i in res.data.data) { - let item = res.data.data[i]; - by_map[item.goods_id] = item; - } - } - }) for (var i = 0; i < carr.length; i++) { var item = carr[i]; @@ -1464,6 +1483,50 @@ Page({ t_num = 0, text_arr = ""; + + if(this.data.is_edit){ + let val=!e.data.checkAllToggle; + if (dda && dda.length > 0) { + for (var i = 0; i < dda.length; i++) { + var item = dda[i].goods; + + var txt0 = "requestData[" + i + "].selected"; + this.setData({ + [txt0]: val, + }); + + for (var j = 0; j < item.length; j++) { + let txt = "requestData[" + i + "].goods[" + j + "].selected"; + e.setData({ + [txt]: val, + }); + } + } + } + if (sdda && sdda.length > 0) { + for (i = 0; i < sdda.length; i++) { + var item1 = sdda[i].goods; + + var txt00 = "service_data[" + i + "].selected"; + this.setData({ + [txt00]: val, + }); + + for (j = 0; j < item1.length; j++) { + let txt1 = "service_data[" + i + "].goods[" + j + "].selected"; + e.setData({ + [txt1]: val, + }); + } + } + } + + e.setData({ + checkAllToggle: val, + }) + return false; + } + if (e.data.requestData && e.data.requestData.length > 0 && e.data.service_data && e.data.service_data.length > 0) { wx.showModal({ @@ -1498,6 +1561,46 @@ Page({ for (var j = 0; j < item.length; j++) { if (item[j].is_gift) continue; var obj = JSON.parse(JSON.stringify(item[j])); + var gd_info=obj; + + if (!gd_info.whsle_id && [1, 2, 4, 6, 8, 9].indexOf(gd_info.prom_type) == -1 && !gd_info.selected && th.data.sales_rules >= 2) { + var ob = {}; + await th.check_down_line_next(gd_info, i, j, gd_info.erpwareid, function (res) { + ob = res; + }); + + if (ob.code == -1) { + + wx.showToast({ + title: gd_info.goods_name+'购买数量超出商品库存', + icon: 'none', + }); + + return false; + } else { + if (th.data.sales_rules == 3) { + var goods_id = gd_info.goods_id; + var num = 0; + + for (let ii = 0; ii< th.data.requestData.length; ii++) { + if (i == ii) continue; + var it = th.data.requestData[ii].goods.find((e) => { + return e.goods_id == goods_id; + }) + if (it && it.selected) num += it.goods_num + } + + if (num > ob.CanOutQty) { + wx.showToast({ + title: gd_info.goods_name+'购买数量超出商品库存', + icon: 'none', + }); + return false; + } + } + } + } + //-- 判断起购数量 -- @@ -1734,6 +1837,20 @@ Page({ }); if (!sele) { + + //编辑不管判断了 + if(this.data.is_edit){ + for (var im = 0; im < item.length; im++) { + let pro_off1 = false + var txt = "requestData[" + pitems + "].goods[" + im + "].selected"; + this.setData({[txt]:1}) + } + + var txt0 = "requestData[" + pitems + "].selected"; + this.setData({[txt0]:1}) + return false; + } + var check_is_service_selected = 0; for (var ii in garr) { for (var ij in garr[ii].goods) { @@ -1797,7 +1914,7 @@ Page({ if (ob.code == -1) { wx.showToast({ - title: '购买数量超出商品库存', + title: gd_info.goods_name+'购买数量超出商品库存', icon: 'none', }); @@ -1817,7 +1934,7 @@ Page({ if (num > ob.CanOutQty) { wx.showToast({ - title: '购买数量超出商品库存', + title: gd_info.goods_name+'购买数量超出商品库存', icon: 'none', }); return false; @@ -1963,6 +2080,15 @@ Page({ var garr = e.data.service_data; if (!a.selected) { + + //如果是标记的时候 + if(this.data.is_edit){ + var txt = "requestData[" + pitems + "].goods[" + item + "].selected"; + this.setData({[txt]:1}) + return false; + } + + var check_is_service_selected = 0; for (var ii in garr) { for (var ij in garr[ii].goods) { @@ -2127,6 +2253,17 @@ Page({ iarr = item; if (!sele) { + + //编辑不管判断了 + if(this.data.is_edit){ + for (var im = 0; im < item.length; im++) { + let pro_off1 = false + var txt = "service_data[" + pitems + "].goods[" + im + "].selected"; + this.setData({[txt]:1}) + } + return false; + } + var check_is_goods_selected = 0; for (var ii in garr) { for (var ij in garr[ii].goods) { @@ -2172,6 +2309,16 @@ Page({ var garr = e.data.requestData; if (!a.selected) { + + if(this.data.is_edit){ + var txt = "service_data[" + pitems + "].goods[" + item + "].selected"; + e.setData({ + [txt]: 1, + }); + return false; + } + + var check_is_goods_selected = 0; for (var ii in garr) { for (var ij in garr[ii].goods) { @@ -3938,6 +4085,51 @@ Page({ this.setData({ is_edit: type }); + + let dda = this.data.requestData; + let sdda = this.data.service_data; + + //清空选中的状态 + if (dda && dda.length > 0) { + for (var i = 0; i < dda.length; i++) { + var item = dda[i].goods; + var txt0 = "requestData[" + i + "].selected"; + this.setData({ + [txt0]: 0, + }); + + for (var j = 0; j < item.length; j++) { + let txt = "requestData[" + i + "].goods[" + j + "].selected"; + this.setData({ + [txt]: 0, + }); + } + } + } + + //清空选中的状态 + if (sdda && sdda.length > 0) { + for (i = 0; i < sdda.length; i++) { + var item1 = sdda[i].goods; + var txt00 = "service_data[" + i + "].selected"; + this.setData({ + [txt00]: 0, + }); + + for (j = 0; j < item1.length; j++) { + let txt1 = "service_data[" + i + "].goods[" + j + "].selected"; + this.setData({ + [txt1]: 0, + }); + } + } + } + + this.setData({ + checkAllToggle: 0, + }) + + }, //--多个删除购物车商品---