diff --git a/packageB/pages/zuhegou/index/index.js b/packageB/pages/zuhegou/index/index.js index d91cd25..5febaef 100644 --- a/packageB/pages/zuhegou/index/index.js +++ b/packageB/pages/zuhegou/index/index.js @@ -597,6 +597,16 @@ Page({ return } + if(this.data.act.zh_num>0 && this.data.act.zh_num<=this.data.act.zh_buy_num){ + wx.showToast({ + title: '组合总数不足！', + icon: 'none', + duration: 2000 + }) + return + } + + //说明是加入购物车是时候 this.data.is_zuhe_addcart = 1; if (!haveAdded) { @@ -640,14 +650,18 @@ Page({ return false; } else { //先判断一下线下库存 - th.check_pk_store_conut(function(){ - th.setData({ - is_no_pipei: 0 - }); - th.check_is_in_cart(function () { - th.add_cart_func(); + + th.chect_act_zh_num(function (){ + th.check_pk_store_conut(function(){ + th.setData({ + is_no_pipei: 0 + }); + th.check_is_in_cart(function () { + th.add_cart_func(); + }) }) }) + } } else { @@ -2023,6 +2037,13 @@ Page({ // -- 加入之前，先判断有没有在购物车中,没有商品就添加 -- check_is_in_cart: function (func) { + + var act=this.data.act; + if(act.zh_num>0 && act.zh_num<=act.zh_buy_num){ + func(); + return false; + } + var th = this; var index = th.data.sele_index; var txt = "list[" + index + "].haveAdded"; @@ -2200,105 +2221,113 @@ Page({ var delete_num = 0; var zhqty_len = 0; //几个超量倍增 var be = parseInt(no_in_arr.length / this.data.act.zhbuyqty); //看一下是几倍 - if (this.data.act.is_bzyh && zhqty_bz.length > 0) { - if (zhqty_bz.length > 1) { - let zhqty_bz_arr = []; - let zhqty_bz_flag = this.zhqty_bz_fun(zhqty_bz, be, zhqty_bz_arr); - - if (zhqty_bz_flag) { - for (let i = 0; i < zhqty_bz.length; i++) { - var vv = zhqty_bz[i]; - for (let j = 0; j < be * vv['zhqty']; j++) { - let index = no_in_arr.findIndex(i => { - return vv.goods_id === i.goods_id - }) - if (index > -1) { - delete_num++ - no_in_arr.splice(index, 1) + //如果有总数控制的时候 + if(this.data.act.zh_num){ + var be1=this.data.act.zh_num-this.data.act.zh_buy_num-1; + if(be1 0) { + if (zhqty_bz.length > 1) { + let zhqty_bz_arr = []; + let zhqty_bz_flag = this.zhqty_bz_fun(zhqty_bz, be, zhqty_bz_arr); + + if (zhqty_bz_flag) { + for (let i = 0; i < zhqty_bz.length; i++) { + var vv = zhqty_bz[i]; + for (let j = 0; j < be * vv['zhqty']; j++) { + let index = no_in_arr.findIndex(i => { + return vv.goods_id === i.goods_id + }) + if (index > -1) { + delete_num++ + no_in_arr.splice(index, 1) + } } } - } - } else { - zhqty_len = 1; - let min_bz_num = Math.min.apply(Math, zhqty_bz_arr.map(function (o) { - return o['num']; - })); - let new_arr = zhqty_bz_arr.filter(ii => { - return ii['num'] == min_bz_num; - }) - var vv = new_arr[0]; - var bz_num = be * new_arr[0].zhqty; //超量倍增 - var num = min_bz_num - new_arr[0].zhqty; //购买数量减去超量 - bz_num_ok = bz_num - num; - if (bz_num_ok <= 0) { - //超量倍增满足,超量倍增就等于倍数 - bz_num_ok = bz_num; } else { - //超量倍增不满足,倍数要减去多出得 - // be=be-bz_num_ok; - if (num % vv.zhqty == 0) { - be = num / vv.zhqty; + zhqty_len = 1; + let min_bz_num = Math.min.apply(Math, zhqty_bz_arr.map(function (o) { + return o['num']; + })); + let new_arr = zhqty_bz_arr.filter(ii => { + return ii['num'] == min_bz_num; + }) + var vv = new_arr[0]; + var bz_num = be * new_arr[0].zhqty; //超量倍增 + var num = min_bz_num - new_arr[0].zhqty; //购买数量减去超量 + bz_num_ok = bz_num - num; + if (bz_num_ok <= 0) { + //超量倍增满足,超量倍增就等于倍数 + bz_num_ok = bz_num; } else { - be = Math.floor(num / vv.zhqty) + //超量倍增不满足,倍数要减去多出得 + // be=be-bz_num_ok; + if (num % vv.zhqty == 0) { + be = num / vv.zhqty; + } else { + be = Math.floor(num / vv.zhqty) + } + bz_num_ok = be * vv.zhqty; } - bz_num_ok = be * vv.zhqty; - } - for (let i = 0; i < zhqty_bz.length; i++) { - let item1 = zhqty_bz[i]; - for (let j = 0; j < be * item1['zhqty']; j++) { + for (let i = 0; i < zhqty_bz.length; i++) { + let item1 = zhqty_bz[i]; + for (let j = 0; j < be * item1['zhqty']; j++) { + let index = no_in_arr.findIndex(i => { + return item1.goods_id === i.goods_id + }) + if (index > -1) { + // delete_num++ + no_in_arr.splice(index, 1) + } + } + } + aprice += be * aprice; + } + } else { + var vv = zhqty_bz[0]; + var bz_num = be * vv.zhqty; //超量倍增 + var num = vv['num'] - vv.zhqty; //购买数量减去超量 + if (num > 0) { + bz_num_ok = bz_num - num; + if (bz_num_ok <= 0) { + //超量倍增满足,超量倍增就等于倍数 + bz_num_ok = bz_num; + } else { + //超量倍增不满足,倍数要减去多出得 + // be=be-bz_num_ok; + if (num % vv.zhqty == 0) { + be = num / vv.zhqty; + } else { + be = Math.floor(num / vv.zhqty) + } + bz_num_ok = be * vv.zhqty; + } + for (let j = 0; j < bz_num_ok; j++) { let index = no_in_arr.findIndex(i => { - return item1.goods_id === i.goods_id + return vv.goods_id === i.goods_id }) if (index > -1) { - // delete_num++ + delete_num++ no_in_arr.splice(index, 1) } } - } - aprice += be * aprice; - } - } else { - var vv = zhqty_bz[0]; - var bz_num = be * vv.zhqty; //超量倍增 - var num = vv['num'] - vv.zhqty; //购买数量减去超量 - if (num > 0) { - bz_num_ok = bz_num - num; - if (bz_num_ok <= 0) { - //超量倍增满足,超量倍增就等于倍数 - bz_num_ok = bz_num; } else { - //超量倍增不满足,倍数要减去多出得 - // be=be-bz_num_ok; - if (num % vv.zhqty == 0) { - be = num / vv.zhqty; - } else { - be = Math.floor(num / vv.zhqty) - } - bz_num_ok = be * vv.zhqty; - } - for (let j = 0; j < bz_num_ok; j++) { - let index = no_in_arr.findIndex(i => { - return vv.goods_id === i.goods_id - }) - if (index > -1) { - delete_num++ - no_in_arr.splice(index, 1) - } + zhqty_len = 1; } - } else { - zhqty_len = 1; } } - } - if (!zhqty_len) { - //多个超量就不用pop了 - aprice += be * aprice; - let pop_num = be * this.data.act.zhbuyqty - delete_num; - for (var m = 0; m < pop_num; m++) { - no_in_arr.pop(); + if (!zhqty_len) { + //多个超量就不用pop了 + aprice += be * aprice; + let pop_num = be * this.data.act.zhbuyqty - delete_num; + for (var m = 0; m < pop_num; m++) { + no_in_arr.pop(); + } } } + } //算一下剩余的钱 @@ -2518,5 +2547,38 @@ Page({ } } return zhqty_bz_flag; + }, + + chect_act_zh_num(func){ + var userInfo = getApp().globalData.userInfo; + //获取活动信息 + var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" + this.data.id + "/" + userInfo.user_id; + getApp().request.get(url, { + success: function (e) { + if (e.data.code == 0 && e.data.data) { + var t_act=e.data.data; + if(t_act.zh_num>0 && t_act.zh_num<=t_act.zh_buy_num){ + wx.showToast({ + title: '组合活动不足！', + icon: 'none', + duration: 2000 + }) + return false; + } + func(); + + }else{ + wx.showToast({ + title: '未找到活动！', + icon: 'none', + duration: 2000 + }) + } + + } + }) } + + + }) \ No newline at end of file diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.js b/packageC/pages/presell/goodsInfo/goodsInfo.js index 561a327..7e53247 100644 --- a/packageC/pages/presell/goodsInfo/goodsInfo.js +++ b/packageC/pages/presell/goodsInfo/goodsInfo.js @@ -1731,8 +1731,9 @@ Page({ var now = ut.gettimestamp(); var rq_data = { store_id: o.stoid, - sku: gd.sku, - more_spec: gd.more_spec, + //sku: gd.sku, + //more_spec: gd.more_spec, + goods_id:g_id, isonsale: 1, is_on_sale: 1, pageSize: 500, diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js index 82ba04d..246b62e 100644 --- a/packageE/pages/cart/cart2/cart2.js +++ b/packageE/pages/cart/cart2/cart2.js @@ -147,7 +147,8 @@ Page({ appoint_pick_keyid: '', is_pre_cut:0, //是否可以使用预存 0是不可以1的可以 - coll_prom:{} //搭配活动存储 + coll_prom:{}, //搭配活动存储 + yh_is_xz_yh:{},//优惠促销优惠券使用开关 }, onLoad: function (t) { @@ -714,6 +715,10 @@ Page({ //---是不是购买等级卡成功的返回---等级卡显示的判断--- var is_card_back = getApp().globalData.is_card_back; + + //-- 判断组合购是总数量是不是存在 -- + var no_zh_num={}; + for (var i = 0; i < carr.length; i++) { var item1 = carr[i]; //把已经购买了多少见的内容填入 @@ -753,19 +758,44 @@ Page({ item1.is_post_temp=res.data.data.is_post_temp; } }) - } - + } + //要把优惠活动加入,prom_goods_map中,赠品不要运算，代发商品不算优惠 if (item1.prom_type == 3 && item1.is_gift != 1 && !item1.whsle_id) { - // th.check_is_youhui(item1.goods_id, item1.pick_id); - await th.add_prom_goods_map(item1); + // th.check_is_youhui(item1.goods_id, item1.pick_id); + //增加优惠活动次数限制 + let limit_num= await th.getprom(item1) //活动限制次数 + + if(!limit_num){ + await th.add_prom_goods_map(item1); + // item1.prom_id='' + // item1.prom_type='' + }else{ + let user_pre_buynum = await th.getUserBuyPromNum_pre(item1.prom_id) //用户已经参与次数 + if(user_pre_buynum { @@ -778,39 +808,61 @@ Page({ isok = 0; } item1.act = res.data.data; - th.data.zhhe_act_map[item1.prom_id] = res.data.data; + + //-- 在这里要判断一下活动的组合购总数量 -- + if(item1.act.zh_num>0 && item1.act.zh_buy_num>=item1.act.zh_num){ + store_count_ok = 0; + no_zh_num[item1.prom_id]=1; + //-- 清理一下活动的状态 -- + item1.prom_type = 0; + item1.prom_type1 = 0; + item1.prom_id = 0; + item1.prom_id1 = 0 + + }else{ + th.data.zhhe_act_map[item1.prom_id] = res.data.data; + } + } else { //未找到商品的活动 is_flag = 0; } }) + if (!isok) { getApp().my_warnning("组合购的活动已经过期", 0, th); return false; } - var url1 = "/api/weshop/prom/zhbuyGoods/page"; - var req_data = { - page: 1, - pageSize: 2000, - store_id: os.stoid, - zh_id: item1.prom_id, - } - await getApp().request.promiseGet(url1, { - data: req_data - }).then(res => { - if (ut.ajax_ok(res)) { - var gdlist = res.data.data.pageData; - gdlist.forEach(i => { - if (item1.goods_id == i.goods_id && !is_flag) { - item1.prom_type = 0; - item1.prom_type1 = 0; - item1.prom_id = 0; - item1.prom_id1 = 0 + + //------ 先增组合活动的总数量的时候 ------- + if(store_count_ok) { + var url1 = "/api/weshop/prom/zhbuyGoods/page"; + var req_data = { + page: 1, + pageSize: 2000, + store_id: os.stoid, + zh_id: item1.prom_id, + } + await getApp().request.promiseGet(url1, { + data: req_data + }).then(res => { + if (ut.ajax_ok(res)) { + var gdlist = res.data.data.pageData; + gdlist.forEach(i => { + if (item1.goods_id == i.goods_id && !is_flag) { + item1.prom_type = 0; + item1.prom_type1 = 0; + item1.prom_id = 0; + item1.prom_id1 = 0 + } + }) + th.data.zuhe_map_good[item1.prom_id] = gdlist; } }) - th.data.zuhe_map_good[item1.prom_id] = gdlist; - } - }) + } + + + } else { item1.act = th.data.zhhe_act_map[item1.prom_id]; @@ -3982,6 +4034,7 @@ Page({ var order_prom_list_cart = th.data.order_prom_list_cart; + //--组装推送数据-- for (var i = 0; i < order_prom_list_cart.length; i++) { var t_item = order_prom_list_cart[i]; @@ -4119,6 +4172,8 @@ Page({ var df_room_ids = ""; + //此单的组合活动汇总 + var zh_map_count={}; var check_map = {}; let groupchat_ids=[] //-------------让商品添加到商品列表-------------------- @@ -4179,6 +4234,7 @@ Page({ case 7: goods.prom_type = 7; goods.prom_id = g_item.prom_id; + zh_map_count[g_item.prom_id]= (zh_map_count[g_item.prom_id]?zh_map_count[g_item.prom_id]:0)+goods.goods_num; //汇总一下组合购的活动 break default: goods.prom_type = 0; @@ -4264,7 +4320,27 @@ Page({ } - + //-- 如果订单中有组合购,要统计到倍增的情况 --- + if(Object.keys(zh_map_count).length){ + var zhlist=[]; + + for (var kf in zh_map_count) { + + var zh_act_th=th.data.zhhe_act_map[kf]; + var ite={zhid:kf,zhnum:1}; + + if(zh_act_th.is_bz){ + if(zh_map_count[kf]>zh_act_th.zhbuyqty){ + ite.zhnum=zh_map_count[kf]/zh_act_th.zhbuyqty; + } + } + + zhlist.push(ite); + + } + + item.zhlist=zhlist; + } //如果房间号不为空的时候 if (room_ids != "") item.room_ids = ut.sub_last(room_ids); @@ -4364,6 +4440,8 @@ Page({ } var str = JSON.stringify(pdata); + console.log(str,'aaaaaaaaaaaaaaa'); + //return false; wx.showLoading({ title: "加载中" }); th.setData({ submit: 1, }) @@ -5545,50 +5623,96 @@ Page({ return !check; }, //立即购买获取优惠活动的内容 - buy_now_prom_goods: function (prom_id, arr, func) { + buy_now_prom_goods: async function (prom_id, arr, func) { var th = this; var price = arr.shop_price * arr.goods_num; var prom = null; var gg = to.get_b_now(); - getApp().request.promiseGet("/api/weshop/promgoods/get/" + os.stoid + "/" + prom_id, {}).then(res => { + getApp().request.promiseGet("/api/weshop/promgoods/get/" + os.stoid + "/" + prom_id, {}).then( async res => { if (res.data.code == 0) { prom = res.data.data; - let min_value = 0 - if (prom && prom.is_xz_yh) { - let arr = prom.promGoodsList || [] - arr.map(item => { - if (min_value) { - min_value = item.condition - } else { - if (min_value < item.condition) { - min_value = item.condition + if(prom && prom.limit_num*1){ + let user_pre_buynum=await th.getUserBuyPromNum_pre(prom.id) + if (user_pre_buynum>=prom.limit_num) { + arr.prom_price=null; + arr.prom_id=""; + arr.prom_type=""; + if(prom.is_xz_yh){ + arr.is_xz_yh=prom.is_xz_yh + } + func(arr); + }else{ + let min_value = 0 + if (prom && prom.is_xz_yh) { + let arr = prom.promGoodsList || [] + arr.map(item => { + if (min_value) { + min_value = item.condition + } else { + if (min_value < item.condition) { + min_value = item.condition + } + } + }) + if (arr.length > 0) { + if (arr[0].prom_type == 0) { + if (price < min_value) { + prom.is_xz_yh = 0 + } + } else { + if (arr.goods_num < min_value) { + prom.is_xz_yh = 0 + } + } } } - }) - if (arr.length > 0) { - if (arr[0].prom_type == 0) { - if (price < min_value) { - prom.is_xz_yh = 0 + return getApp().request.promiseGet("/api/weshop/goods/getDiscount", { + data: { + price: parseFloat(price).toFixed(2), + prom_id: prom_id, + goods_num: arr.goods_num, + user_id: getApp().globalData.user_id, + is_bz: prom.is_bz } - } else { - if (arr.goods_num < min_value) { - prom.is_xz_yh = 0 + }) + } + }else{ + let min_value = 0 + if (prom && prom.is_xz_yh) { + let arr = prom.promGoodsList || [] + arr.map(item => { + if (min_value) { + min_value = item.condition + } else { + if (min_value < item.condition) { + min_value = item.condition + } + } + }) + if (arr.length > 0) { + if (arr[0].prom_type == 0) { + if (price < min_value) { + prom.is_xz_yh = 0 + } + } else { + if (arr.goods_num < min_value) { + prom.is_xz_yh = 0 + } } } } + //------------------- + return getApp().request.promiseGet("/api/weshop/goods/getDiscount", { + data: { + price: parseFloat(price).toFixed(2), + prom_id: prom_id, + goods_num: arr.goods_num, + user_id: getApp().globalData.user_id, + is_bz: prom.is_bz + } + }) } - - //------------------- - return getApp().request.promiseGet("/api/weshop/goods/getDiscount", { - data: { - price: parseFloat(price).toFixed(2), - prom_id: prom_id, - goods_num: arr.goods_num, - user_id: getApp().globalData.user_id, - is_bz: prom.is_bz - } - }) } else { func(arr); } @@ -5660,6 +5784,38 @@ Page({ func(arr); }) }, + //优惠促销用户参与次数 + async getUserBuyPromNum_pre(prom_id){ + var userInfo = getApp().globalData.userInfo; + var url = `/api/weshop/ordergoods/getUserBuyPromNum?is_all=1&store_id=${os.stoid}&user_id=${userInfo.user_id}&prom_type=3&prom_id=${prom_id}`; + let res = await getApp().request.promiseGet(url, { + data:{} + }); + let user_pre_buynum=0 + if(res.data.code==0 && res.data.data){ + user_pre_buynum=res.data.data.userbuynum + } + return user_pre_buynum + }, + //获取优惠活动 + async getprom(item){ + + let prom_id=item.prom_id + let pickup_id=item.pick_id + let limit_num=0 + await getApp().request.promiseGet("/api/weshop/promgoods/get/" + oo.stoid + "/" + prom_id, {}).then(res => { + if (res.data.code == 0) { + let prom = res.data.data; + limit_num =prom.limit_num + let yh_is_xz_yh=this.data.yh_is_xz_yh + yh_is_xz_yh[pickup_id]=prom.is_xz_yh + this.setData({ + ['yh_is_xz_yh']:yh_is_xz_yh + }) + } + }) + return limit_num + }, //--检查订单优惠-- check_is_order_prom: function (condition, func, pick) { var th = this; @@ -5682,7 +5838,7 @@ Page({ var pickid = item.pick_id; var map = th.data.prom_goods_map; var obj = map[pickid]; - + if (map[pickid]) { if (map[pickid][item.prom_id]) { @@ -5701,6 +5857,7 @@ Page({ } else { var prom = null; + await getApp().request.promiseGet("/api/weshop/promgoods/get/" + os.stoid + "/" + item.prom_id, {}).then(res => { if (res.data.code == 0) { prom = res.data.data; @@ -5745,6 +5902,7 @@ Page({ } else { var ob = {}; var prom = null; + await getApp().request.promiseGet("/api/weshop/promgoods/get/" + os.stoid + "/" + item.prom_id, {}).then(res => { if (res.data.code == 0) { prom = res.data.data; diff --git a/packageE/pages/cart/cart2/cart2.wxml b/packageE/pages/cart/cart2/cart2.wxml index 5780298..bb88c69 100644 --- a/packageE/pages/cart/cart2/cart2.wxml +++ b/packageE/pages/cart/cart2/cart2.wxml @@ -241,7 +241,7 @@ - + 优惠券{{item.can_num}}张可用 diff --git a/packageE/pages/cart/cart2/ladder_calculate.js b/packageE/pages/cart/cart2/ladder_calculate.js index 00a8001..9c94907 100644 --- a/packageE/pages/cart/cart2/ladder_calculate.js +++ b/packageE/pages/cart/cart2/ladder_calculate.js @@ -43,6 +43,7 @@ module.exports = { for (var j = 0; j < item.cart_num; j++) { no_in_arr.push({ price: item.goods_price, + goods_market_price:item.goods_market_price, offline_price: item.offline_price, goods_id: item.goods_id, shop_price: item.shop_price, @@ -65,7 +66,7 @@ module.exports = { if (no_in_arr.length == 0) break; let item_j =ladder_list[j]; var end = no_in_arr.pop(); - var new_price = parseInt(item_j.discount_field) == 1 ? end.shop_price : end.price; + var new_price = parseInt(item_j.discount_field) == 2?end.goods_market_price:(parseInt(item_j.discount_field) == 1 ? end.shop_price : end.price); var account=new_price * parseFloat(item_j.discount) / 10; aprice +=account; @@ -240,7 +241,6 @@ module.exports = { } } - } } diff --git a/packageE/pages/cart/cart2/zh_calculate.js b/packageE/pages/cart/cart2/zh_calculate.js index 79b0db4..00136fe 100644 --- a/packageE/pages/cart/cart2/zh_calculate.js +++ b/packageE/pages/cart/cart2/zh_calculate.js @@ -148,107 +148,118 @@ module.exports = { no_in_arr.pop(); } } + //看一下剩下的数量有没有满足组合购的要求，以及要不要倍增 if (act.is_bz && no_in_arr.length >= act.zhbuyqty) { var bz_num_ok = 0; //超量倍增是否满足 var zhqty_len = 0; //几个超量倍增 var delete_num=0; - let be = parseInt(no_in_arr.length / act.zhbuyqty); //看一下是几倍 - if (act.is_bzyh && zhqty_bz.length > 0) { - if (zhqty_bz.length > 1) { - let zhqty_bz_arr = []; - let zhqty_bz_flag=this.zhqty_bz_fun(zhqty_bz,be,zhqty_bz_arr); - if (zhqty_bz_flag) { - for (let i = 0; i < zhqty_bz.length; i++) { - var vv = zhqty_bz[i]; - for (let j = 0; j < be * vv['zhqty']; j++) { - let index = no_in_arr.findIndex(i => { - return vv.goods_id === i.goods_id - }) - if (index > -1) { - delete_num++ - no_in_arr.splice(index, 1) + + //看一下是几倍 + let be = parseInt(no_in_arr.length / act.zhbuyqty); + //如果有总数控制的时候 + if(act.zh_num){ + var be1=act.zh_num-act.zh_buy_num-1; + if(be1 0) { + if (zhqty_bz.length > 1) { + let zhqty_bz_arr = []; + let zhqty_bz_flag = this.zhqty_bz_fun(zhqty_bz, be, zhqty_bz_arr); + if (zhqty_bz_flag) { + for (let i = 0; i < zhqty_bz.length; i++) { + var vv = zhqty_bz[i]; + for (let j = 0; j < be * vv['zhqty']; j++) { + let index = no_in_arr.findIndex(i => { + return vv.goods_id === i.goods_id + }) + if (index > -1) { + delete_num++ + no_in_arr.splice(index, 1) + } } } - } - } else { - zhqty_len=1; - let min_bz_num = Math.min.apply(Math, zhqty_bz_arr.map(function (o) { - return o['num']; - })); - let new_arr = zhqty_bz_arr.filter(ii => { - return ii['num'] == min_bz_num; - }) - var vv = new_arr[0]; - var bz_num = be * new_arr[0].zhqty; //超量倍增 - var num = min_bz_num - new_arr[0].zhqty; //购买数量减去超量 - bz_num_ok = bz_num - num; - if (bz_num_ok <= 0) { - //超量倍增满足,超量倍增就等于倍数 - bz_num_ok = bz_num; } else { - //超量倍增不满足,倍数要减去多出得 - // be=be-bz_num_ok; - if (num % vv.zhqty == 0) { - be = num / vv.zhqty; + zhqty_len = 1; + let min_bz_num = Math.min.apply(Math, zhqty_bz_arr.map(function (o) { + return o['num']; + })); + let new_arr = zhqty_bz_arr.filter(ii => { + return ii['num'] == min_bz_num; + }) + var vv = new_arr[0]; + var bz_num = be * new_arr[0].zhqty; //超量倍增 + var num = min_bz_num - new_arr[0].zhqty; //购买数量减去超量 + bz_num_ok = bz_num - num; + if (bz_num_ok <= 0) { + //超量倍增满足,超量倍增就等于倍数 + bz_num_ok = bz_num; } else { - be = Math.floor(num / vv.zhqty) + //超量倍增不满足,倍数要减去多出得 + // be=be-bz_num_ok; + if (num % vv.zhqty == 0) { + be = num / vv.zhqty; + } else { + be = Math.floor(num / vv.zhqty) + } + bz_num_ok = be * vv.zhqty; + } + + for (let i = 0; i < zhqty_bz.length; i++) { + let item1 = zhqty_bz[i]; + for (let j = 0; j < be * item1['zhqty']; j++) { + let index = no_in_arr.findIndex(i => { + return item1.goods_id === i.goods_id + }) + if (index > -1) { + // delete_num++ + no_in_arr.splice(index, 1) + } + } } - bz_num_ok = be * vv.zhqty; + aprice += be * aprice; } - - for(let i = 0; i < zhqty_bz.length; i++){ - let item1=zhqty_bz[i]; - for (let j = 0; j < be * item1['zhqty']; j++) { + } else { + var vv = zhqty_bz[0]; + var bz_num = be * vv.zhqty; //超量倍增 + var num = vv['num'] - vv.zhqty; //购买数量减去超量 + if (num > 0) { + bz_num_ok = bz_num - num; + if (bz_num_ok <= 0) { + //超量倍增满足,超量倍增就等于倍数 + bz_num_ok = bz_num; + } else { + //超量倍增不满足,倍数要减去多出得 + // be=be-bz_num_ok; + if (num % vv.zhqty == 0) { + be = num / vv.zhqty; + } else { + be = Math.floor(num / vv.zhqty) + } + bz_num_ok = be * vv.zhqty; + } + for (let j = 0; j < bz_num_ok; j++) { let index = no_in_arr.findIndex(i => { - return item1.goods_id === i.goods_id + return vv.goods_id === i.goods_id }) if (index > -1) { - // delete_num++ + delete_num++ no_in_arr.splice(index, 1) } } - } - aprice += be * aprice; - } - } else { - var vv = zhqty_bz[0]; - var bz_num = be * vv.zhqty; //超量倍增 - var num = vv['num'] - vv.zhqty; //购买数量减去超量 - if (num > 0) { - bz_num_ok = bz_num - num; - if (bz_num_ok <= 0) { - //超量倍增满足,超量倍增就等于倍数 - bz_num_ok = bz_num; } else { - //超量倍增不满足,倍数要减去多出得 - // be=be-bz_num_ok; - if (num % vv.zhqty == 0) { - be = num / vv.zhqty; - } else { - be = Math.floor(num / vv.zhqty) - } - bz_num_ok = be * vv.zhqty; - } - for (let j = 0; j < bz_num_ok; j++) { - let index = no_in_arr.findIndex(i => { - return vv.goods_id === i.goods_id - }) - if (index > -1) { - delete_num++ - no_in_arr.splice(index, 1) - } + zhqty_len = 1; } - } else { - zhqty_len = 1; } } - } - if (!zhqty_len) { - aprice += be * act.zhprice; - let pop_num = be * act.zhbuyqty - delete_num; - for (var m = 0; m < pop_num; m++) { - no_in_arr.pop(); + if (!zhqty_len) { + aprice += be * act.zhprice; + let pop_num = be * act.zhbuyqty - delete_num; + for (var m = 0; m < pop_num; m++) { + no_in_arr.pop(); + } } } diff --git a/packageE/pages/user/nick_avatar/nick_avatar.js b/packageE/pages/user/nick_avatar/nick_avatar.js index c2042a0..83e0d63 100644 --- a/packageE/pages/user/nick_avatar/nick_avatar.js +++ b/packageE/pages/user/nick_avatar/nick_avatar.js @@ -56,57 +56,60 @@ Page({ save_data() { var that=this; + setTimeout(()=>{ + if (!this.data.ob.head_pic) { + wx.showToast({ + title: '请选择头像', + icon: 'none', + duration: 2000 + }); + return false; + } - if (!this.data.ob.head_pic) { - wx.showToast({ - title: '请选择头像', - icon: 'none', - duration: 2000 - }); - return false; - } - - if (!this.data.ob.nickname) { - wx.showToast({ - title: '请输入昵称', - icon: 'none', - duration: 2000 + if (!this.data.ob.nickname) { + wx.showToast({ + title: '请输入昵称', + icon: 'none', + duration: 2000 + }); + return false; + } + + if (this.data.load) return false; + this.setData({load: 1}) + + wx.showLoading(); + + getApp().request.put("/api/weshop/users/update", { + data: { + store_id: os.stoid, + user_id: getApp().globalData.user_id, + nickname: this.data.ob.nickname, + head_pic: this.data.ob.head_pic + + }, + success: function (su) { + + setTimeout(()=>{ + wx.hideLoading(); + if (su.data.code == 0) { + wx.navigateBack({delta: 1}) + }else{ + that.setData({load: 0}) + wx.showToast({ + title: su.data.msg, + icon: 'none', + duration: 2000 + }); + } + },1000) + + + } }); - return false; - } - - if (this.data.load) return false; - this.setData({load: 1}) - - - wx.showLoading(); - getApp().request.put("/api/weshop/users/update", { - data: { - store_id: os.stoid, - user_id: getApp().globalData.user_id, - nickname: this.data.ob.nickname, - head_pic: this.data.ob.head_pic - - }, - success: function (su) { - - setTimeout(()=>{ - wx.hideLoading(); - if (su.data.code == 0) { - wx.navigateBack({delta: 1}) - }else{ - that.setData({load: 0}) - wx.showToast({ - title: su.data.msg, - icon: 'none', - duration: 2000 - }); - } - },1000) + },500) - } - }); } diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js index 3259a8e..728432e 100644 --- a/pages/cart/cart/cart.js +++ b/pages/cart/cart/cart.js @@ -548,7 +548,80 @@ Page({ }) item.goods_num = cbuy; } - + + //-- 如果有优惠促销，和阶梯促销，要看下有没有组合购，搭配购，看一下优惠促销和阶梯促销谁是指定商品参与的 -- + if(item.prom_type==0 || item.prom_type==3 || item.prom_type==10){ + + var c_prom_type=0; + var c_prom_id=0; + + //因为有全场优惠活动，商品参加的活动还未开始 + var url_ch_more_act = "/api/weshop/activitylist/getGoodActInfo"; + var req_data_m = { + store_id: os.stoid, goodsidlist: item.goods_id, is_detail: 1, user_id: user_id + }; + await getApp().request.promiseGet(url_ch_more_act, { data: req_data_m }).then(async function (res) { + if (res.data.code == 0 && res.data.data && res.data.data.length) { + //-- 先看一下有没有组合购 -- + var zh_fd=res.data.data.filter(function (e) { + return e.prom_type==7; + }) + if(zh_fd && zh_fd.length){ + c_prom_type=zh_fd[0].prom_type; + c_prom_id=zh_fd[0].act_id; + return; + } + + //-- 先看一下有没有搭配购 -- + var dp_fd=res.data.data.filter(function (e) { + return e.prom_type==5; + }) + if(dp_fd && dp_fd.length){ + c_prom_type=dp_fd[0].prom_type; + c_prom_id=dp_fd[0].act_id; + return; + } + + //-- 先看一下有没有指定优惠促销 -- + var yh_fd=res.data.data.filter(function (e) { + return e.prom_type==3 && e.good_object==1; + }) + if(yh_fd && yh_fd.length){ + c_prom_type=yh_fd[0].prom_type; + c_prom_id=yh_fd[0].act_id; + return; + } + + //-- 先看一下有没有指定阶梯促销 -- + var jt_fd=res.data.data.filter(function (e) { + return e.prom_type==10 && e.good_object==1; + }) + if(jt_fd && jt_fd.length){ + c_prom_type=jt_fd[0].prom_type; + c_prom_id=jt_fd[0].act_id; + } + + } + }) + + if(c_prom_type && (c_prom_type!=item.prom_type || c_prom_id!=item.prom_id )){ + item.prom_type=c_prom_type; + item.prom_id=c_prom_id; + //-- 购物车更新 -- + var updata1 = { + id: item.id, + prom_type: c_prom_type, + prom_id:c_prom_id, + store_id: os.stoid, + user_id: getApp().globalData.userInfo.user_id + }; + getApp().request.put("/api/weshop/cart/update", { + data: updata1, + }) + } + + } + //判断如果是普通商品，后面参加活动了，变成失效商品 if (item.prom_type == 0 ) { @@ -838,6 +911,10 @@ Page({ if (ut.gettimestamp() < res.data.data.start_time) { isok = 0; } + if(res.data.data.zh_num>0 && res.data.data.zh_num<=res.data.data.zh_buy_num){ + isok = 0; + } + act = res.data.data; } else { @@ -3837,12 +3914,19 @@ Page({ if (th.data.promgoods_map[p_item[0]]) { prom = th.data.promgoods_map[p_item[0]]; } else { + await getApp().request.promiseGet("/api/weshop/promgoods/get/" + os.stoid + "/" + p_item[0], {}).then(res => { if (res.data.code == 0) { prom = res.data.data; } }) } + let limit_num=0 + let user_pre_buynum=0 + if (prom && prom.limit_num) { + limit_num=prom.limit_num; + user_pre_buynum = await this.getUserBuyPromNum_pre(prom.id) + } //如果活动已经结束 if (!prom || prom.is_end || prom.end_time < ut.gettimestamp()) { for (var ii in list.goods) { @@ -3856,7 +3940,7 @@ Page({ } continue; } - + if (!th.data.promgoods_map[p_item[0]]) th.data.promgoods_map[p_item[0]] = prom; //---读取打折的详情--- var ob = p_item[1]; @@ -3880,36 +3964,37 @@ Page({ if (!promgoods_list) continue; th.data.promgoods_list[p_item[0]] = promgoods_list; } - - for (var i in promgoods_list) { - var item = promgoods_list[i]; - if (item.prom_type == 0) { - if (ob.price < item.condition) { - var elem = { - prom_id: prom.id, - diff_type: item.prom_type, - diff: (item.condition - ob.price).toFixed(2), - content: JSON.parse(item.preferential_type) + + if (!limit_num || user_pre_buynum 0) { - if (zhqty_bz.length > 1) { - let zhqty_bz_arr = []; - let zhqty_bz_flag=this.zhqty_bz_fun(zhqty_bz,be,zhqty_bz_arr); - - if (zhqty_bz_flag) { - for (let i = 0; i < zhqty_bz.length; i++) { - var vv = zhqty_bz[i]; - for (let j = 0; j < be * vv['zhqty']; j++) { - let index = no_in_arr.findIndex(i => { - return vv.goods_id === i.goods_id - }) - if (index > -1) { - delete_num++ - no_in_arr.splice(index, 1) + + //如果有总数控制的时候 + if(act.zh_num){ + var be1=act.zh_num-act.zh_buy_num-1; + if(be1 0) { + if (zhqty_bz.length > 1) { + let zhqty_bz_arr = []; + let zhqty_bz_flag=this.zhqty_bz_fun(zhqty_bz,be,zhqty_bz_arr); + + if (zhqty_bz_flag) { + for (let i = 0; i < zhqty_bz.length; i++) { + var vv = zhqty_bz[i]; + for (let j = 0; j < be * vv['zhqty']; j++) { + let index = no_in_arr.findIndex(i => { + return vv.goods_id === i.goods_id + }) + if (index > -1) { + delete_num++ + no_in_arr.splice(index, 1) + } } } - } - } else { - zhqty_len=1; - let min_bz_num = Math.min.apply(Math, zhqty_bz_arr.map(function (o) { - return o['num']; - })); - let new_arr = zhqty_bz_arr.filter(ii => { - return ii['num'] == min_bz_num; - }) - var vv = new_arr[0]; - var bz_num = be * new_arr[0].zhqty; //超量倍增 - var num = min_bz_num - new_arr[0].zhqty; //购买数量减去超量 - bz_num_ok = bz_num - num; - if (bz_num_ok <= 0) { - //超量倍增满足,超量倍增就等于倍数 - bz_num_ok = bz_num; } else { - //超量倍增不满足,倍数要减去多出得 - // be=be-bz_num_ok; - if (num % vv.zhqty == 0) { - be = num / vv.zhqty; + zhqty_len=1; + let min_bz_num = Math.min.apply(Math, zhqty_bz_arr.map(function (o) { + return o['num']; + })); + let new_arr = zhqty_bz_arr.filter(ii => { + return ii['num'] == min_bz_num; + }) + var vv = new_arr[0]; + var bz_num = be * new_arr[0].zhqty; //超量倍增 + var num = min_bz_num - new_arr[0].zhqty; //购买数量减去超量 + bz_num_ok = bz_num - num; + if (bz_num_ok <= 0) { + //超量倍增满足,超量倍增就等于倍数 + bz_num_ok = bz_num; } else { - be = Math.floor(num / vv.zhqty) + //超量倍增不满足,倍数要减去多出得 + // be=be-bz_num_ok; + if (num % vv.zhqty == 0) { + be = num / vv.zhqty; + } else { + be = Math.floor(num / vv.zhqty) + } + bz_num_ok = be * vv.zhqty; + } + + for(let i = 0; i < zhqty_bz.length; i++){ + let item1=zhqty_bz[i]; + for (let j = 0; j < be * item1['zhqty']; j++) { + let index = no_in_arr.findIndex(i => { + return item1.goods_id === i.goods_id + }) + if (index > -1) { + // delete_num++ + no_in_arr.splice(index, 1) + } + } } - bz_num_ok = be * vv.zhqty; + aprice += be * aprice; } - - for(let i = 0; i < zhqty_bz.length; i++){ - let item1=zhqty_bz[i]; - for (let j = 0; j < be * item1['zhqty']; j++) { + } else { + var vv = zhqty_bz[0]; + var bz_num = be * vv.zhqty; //超量倍增 + var num = vv['num'] - vv.zhqty; //购买数量减去超量 + if (num > 0) { + bz_num_ok = bz_num - num; + if (bz_num_ok <= 0) { + //超量倍增满足,超量倍增就等于倍数 + bz_num_ok = bz_num; + } else { + //超量倍增不满足,倍数要减去多出得 + // be=be-bz_num_ok; + if (num % vv.zhqty == 0) { + be = num / vv.zhqty; + } else { + be = Math.floor(num / vv.zhqty) + } + bz_num_ok = be * vv.zhqty; + } + for (let j = 0; j < bz_num_ok; j++) { let index = no_in_arr.findIndex(i => { - return item1.goods_id === i.goods_id + return vv.goods_id === i.goods_id }) if (index > -1) { - // delete_num++ + delete_num++ no_in_arr.splice(index, 1) } } - } - aprice += be * aprice; - } - } else { - var vv = zhqty_bz[0]; - var bz_num = be * vv.zhqty; //超量倍增 - var num = vv['num'] - vv.zhqty; //购买数量减去超量 - if (num > 0) { - bz_num_ok = bz_num - num; - if (bz_num_ok <= 0) { - //超量倍增满足,超量倍增就等于倍数 - bz_num_ok = bz_num; } else { - //超量倍增不满足,倍数要减去多出得 - // be=be-bz_num_ok; - if (num % vv.zhqty == 0) { - be = num / vv.zhqty; - } else { - be = Math.floor(num / vv.zhqty) - } - bz_num_ok = be * vv.zhqty; - } - for (let j = 0; j < bz_num_ok; j++) { - let index = no_in_arr.findIndex(i => { - return vv.goods_id === i.goods_id - }) - if (index > -1) { - delete_num++ - no_in_arr.splice(index, 1) - } + zhqty_len = 1; } - } else { - zhqty_len = 1; } } - } - if (!zhqty_len) { - aprice += be * act.zhprice; - let pop_num = be * act.zhbuyqty - delete_num; - for (var m = 0; m < pop_num; m++) { - no_in_arr.pop(); + if (!zhqty_len) { + aprice += be * act.zhprice; + let pop_num = be * act.zhbuyqty - delete_num; + for (var m = 0; m < pop_num; m++) { + no_in_arr.pop(); + } } } + } //算一下剩余的钱 if (no_in_arr.length) { diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index 2216838..bb09d54 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -267,6 +267,7 @@ Page({ base_nor_prom_type:0, base_nor_prom_id:0, base_nor_goods_id:0, + user_pre_buynum:0, //用户优惠促销参与次数 }, //------初始化加载---------- @@ -1540,7 +1541,21 @@ Page({ }) // return userbuynum }, - + //优惠促销用户参与次数 + async getUserBuyPromNum_pre(prom_id){ + var userInfo = getApp().globalData.userInfo; + var url = `/api/weshop/ordergoods/getUserBuyPromNum?is_all=1&store_id=${os.stoid}&user_id=${userInfo.user_id}&prom_type=3&prom_id=${prom_id}`; + let res = await getApp().request.promiseGet(url, { + data:{} + }); + let user_pre_buynum=0 + if(res.data.code==0 && res.data.data){ + user_pre_buynum=res.data.data.userbuynum + } + this.setData({ + user_pre_buynum + }) + }, //-- 加入购物的函数 -- add_cart_func: function (t) { var i = getApp().request; @@ -1973,7 +1988,7 @@ Page({ } //如果有搭配购的时候的时候 - if(th.data.zh_act && newd.prom_type==0){ + if(th.data.zh_act && (!th.data.zh_act.zh_num || th.data.zh_act.zh_buy_num>th.data.zh_act.zh_num ) && newd.prom_type==0){ newd.prom_type = 7; newd.prom_id = th.data.zh_act.id; } @@ -7461,7 +7476,7 @@ Page({ getApp().pre_img(this.data.sele_g.original_img); }, - is_show_more_buy: function () { + is_show_more_buy: async function () { var prom_goods = this.data.prom_goods; var per_price = this.data.sele_g.shop_price if (this.data.card_field && this.data.sele_g[this.data.card_field] > 0) { @@ -7485,7 +7500,10 @@ Page({ } } } - + //获取用户参与优惠促销的次数 + if(con && con.prom_id){ + await this.getUserBuyPromNum_pre(con.prom_id); + } this.setData({ hui_condition: con }); @@ -7724,6 +7742,11 @@ Page({ isok = 0; } + //还未开始 + if (res.data.data.zh_num>0 && res.data.data.zh_num<=res.data.data.zh_buy_num ) { + isok = 0; + } + } else { //未找到商品的活动 isok = 0; diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml index 2577055..57a46ac 100644 --- a/pages/goods/goodsInfo/goodsInfo.wxml +++ b/pages/goods/goodsInfo/goodsInfo.wxml @@ -507,7 +507,7 @@ - 消费满{{item.condition}}{{item.prom_type==1 ? '件':'元'}}享优惠 + 消费满{{item.condition}}{{item.prom_type==1 ? '件':'元'}}享优惠(每人{{item.limit_num ? '限参与'+item.limit_num+'次' : '参与不限次' }}) @@ -1346,7 +1346,7 @@ - + 再买{{hui_condition.need}} ，免{{hui_condition.money}}元 ，打{{hui_condition.sale}}折 diff --git a/pages/goods/goodsList/goodsList.js b/pages/goods/goodsList/goodsList.js index dbe1a0e..a818400 100644 --- a/pages/goods/goodsList/goodsList.js +++ b/pages/goods/goodsList/goodsList.js @@ -41,6 +41,7 @@ Page({ fil_nation_state:0, fil_brand_state:0, fil_price_state:0, + limit_num:0, }, onLoad: function(t) { @@ -125,6 +126,9 @@ Page({ th.set_prom_list(arr); } }) + if (t.prom_id) { + this.getprom(t.prom_id) + } } //--- 阶梯优惠活动的凑单 --- @@ -236,7 +240,18 @@ Page({ onShow:function () { getApp().check_can_share(); }, - + //获取优惠活动 + async getprom(prom_id){ + await getApp().request.promiseGet("/api/weshop/promgoods/get/" + oo.stoid + "/" + prom_id, {}).then(res => { + if (res.data.code == 0) { + let prom = res.data.data; + let limit_num =prom.limit_num + this.setData({ + limit_num + }) + } + }) + }, //设置优惠券的 set_prom_list:async function(arr){ var th=this; diff --git a/pages/goods/goodsList/goodsList.wxml b/pages/goods/goodsList/goodsList.wxml index 5f41d31..a43abc3 100644 --- a/pages/goods/goodsList/goodsList.wxml +++ b/pages/goods/goodsList/goodsList.wxml @@ -1,8 +1,10 @@ + + 每人限参与{{limit_num}}次; 满{{item.condition}}元 件 减{{item.content.money}}元 打{{item.content.sale}}折 diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js index a67ded7..cf6b0ba 100644 --- a/pages/user/order_detail/order_detail.js +++ b/pages/user/order_detail/order_detail.js @@ -1222,26 +1222,31 @@ Page({ b_item.price = prom.price; } break; - case 6: - b_item.is_pd_normal = 1; - break; - case 7: - //如果有组合购 - var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" + good.prom_id + "/" + getApp().globalData.userInfo.user_id; - await getApp().request.promiseGet(url, {}).then(res => { - if (res.data.code == 0 && res.data.data) { - if (res.data.data.is_show == 1 && res.data.data.is_end == 0 - && ut.gettimestamp() < res.data.data.end_time - && ut.gettimestamp() > res.data.data.start_time - ) { - b_item.prom_type = 7; - b_item.prom_id = res.data.data.id; - good.prom_type = 7; - good.prom_id = res.data.data.id; - } - } - }) - break; + case 6: + b_item.is_pd_normal = 1; + break; + case 7: + //如果有组合购 + var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" + good.prom_id + "/" + getApp().globalData.userInfo.user_id; + await getApp().request.promiseGet(url, {}).then(res => { + if (res.data.code == 0 && res.data.data) { + + var t_act=res.data.data; + if(!t_act.zh_num || t_act.zh_num>t_act.zh_buy_num) { + + if (res.data.data.is_show == 1 && res.data.data.is_end == 0 + && ut.gettimestamp() < res.data.data.end_time + && ut.gettimestamp() > res.data.data.start_time + ) { + b_item.prom_type = 7; + b_item.prom_id = res.data.data.id; + good.prom_type = 7; + good.prom_id = res.data.data.id; + } + } + } + }) + break; case 10: var url = `/api/weshop/prom/ladderForm/getNew/${os.stoid}/${user_id}/${good.prom_id}`; @@ -1252,7 +1257,7 @@ Page({ } }) break; - } + } //如果有优惠促销的时候,要看下商品的优惠活动有没有过期 diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js index 5a8780c..097163c 100644 --- a/pages/user/order_list/order_list.js +++ b/pages/user/order_list/order_list.js @@ -1583,13 +1583,16 @@ Page({ var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" + good.prom_id + "/" + getApp().globalData.userInfo.user_id; await getApp().request.promiseGet(url, {}).then(res => { if (res.data.code == 0 && res.data.data) { - if (res.data.data.is_show == 1 && res.data.data.is_end == 0 - && ut.gettimestamp() < res.data.data.end_time - && ut.gettimestamp() > res.data.data.start_time - ) { - b_item.prom_type = 7; - b_item.prom_id = res.data.data.id; + var t_act=res.data.data; + if(!t_act.zh_num || t_act.zh_num>t_act.zh_buy_num) { + if (res.data.data.is_show == 1 && res.data.data.is_end == 0 + && ut.gettimestamp() < res.data.data.end_time + && ut.gettimestamp() > res.data.data.start_time + ) { + b_item.prom_type = 7; + b_item.prom_id = res.data.data.id; + } } } })