diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index 825641b..cc4c618 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -7157,88 +7157,136 @@ Page({ }, //---检查有没有优惠活动--- - check_is_youhui: function (gid, is_nor) { + check_is_youhui:async function (gid, is_nor) { var th = this; var user_id = getApp().globalData.user_id; if (!user_id) user_id = 0; - //调用接口判断订单优惠， - getApp().request.get("/api/weshop/goods/getGoodsPromListNew1/" + os.stoid + "/" + gid + "/0" + "/" + user_id, { - success: async function (res) { - if (res.data.code == 0 && res.data.data) { - var r_data = res.data.data; - var max = 0, min = 0; + //普通购买的时候，重新算一下组合购有没有 + if(is_nor){ + var arr3=null; + var url = '/api/weshop/activitylist/listGoodActInfo2New'; + var req_d = { + "store_id": os.stoid, + "goods_id": this.data.gid, + "user_id": user_id, + } + await getApp().request.promiseGet(url, { + data: req_d, + }).then(e=>{ + if (e.data.code == 0 && e.data.data && e.data.data.length > 0) { + var arr = e.data.data; + if(arr.length){ + arr3 = arr.filter(function (e) { + return e.s_time < ut.gettimestamp() && e.prom_type==7; + }) + } + } + }) + if(arr3 && arr3.length>0){ + //获取活动信息 + var url = "/api/weshop/prom/zhbuy/get/" + os.stoid + "/" +arr3[0].act_id + "/" + getApp().globalData.user_id; + await getApp().request.promiseGet(url, { - //暂时积分够 不和 优惠，阶梯重叠 - if(th.data.zh_act){ - r_data.collocationList=null; - r_data.ladderLists=null; - r_data.promGoodsLists=null; + }).then(e=>{ + if (e.data.code == 0 && e.data.data) { + if (ut.gettimestamp() < e.data.data.start_time) { + return false; + } + if (e.data.data.is_end == 0 && ut.gettimestamp() < e.data.data.end_time) { + //-- 获取商品列表 -- + th.data.zh_act=e.data.data; + th.getUserBuyPromNum(e.data.data.id) } + } + }) + } + } - if (r_data.collocationList) { - for (var i in r_data.collocationList) { - if (max == 0) max = r_data.collocationList[i].price; - if (min == 0) min = r_data.collocationList[i].price; - if (max < parseFloat(r_data.collocationList[i].price)) max = r_data.collocationList[i].price; - if (min > parseFloat(r_data.collocationList[i].price)) min = r_data.collocationList[i].price; - } - r_data.collocationPromList.max = (max + th.data.data.shop_price).toFixed(2); - r_data.collocationPromList.min = (min + th.data.data.shop_price).toFixed(2); + //调用接口判断订单优惠， + await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromListNew1/" + os.stoid + "/" + gid + "/0" + "/" + user_id, { + }).then(async res=>{ + if (res.data.code == 0 && res.data.data) { + var r_data = res.data.data; + var max = 0, min = 0; + //暂时积分够 不和 优惠，阶梯重叠 + if(th.data.zh_act){ + r_data.collocationList=null; + r_data.ladderLists=null; + r_data.promGoodsLists=null; + } - //如果有搭配促销先不和 阶梯促销和优惠测序重合,做到后台可以重合 - r_data.ladderLists=null; - r_data.promGoodsLists=null; - } + if (r_data.collocationList) { + for (var i in r_data.collocationList) { + if (max == 0) max = r_data.collocationList[i].price; + if (min == 0) min = r_data.collocationList[i].price; + if (max < parseFloat(r_data.collocationList[i].price)) max = r_data.collocationList[i].price; + if (min > parseFloat(r_data.collocationList[i].price)) min = r_data.collocationList[i].price; + } + r_data.collocationPromList.max = (max + th.data.data.shop_price).toFixed(2); + r_data.collocationPromList.min = (min + th.data.data.shop_price).toFixed(2); - if (r_data.ladderLists) { - var act_id = r_data.ladderLists[0].form_id; - //-- 判断会员能不能参与阶梯促销 -- - await getApp().request.promiseGet("/api/weshop/prom/ladderForm/getNew/" + os.stoid + "/" + user_id + "/" + act_id, {}).then(res => { - if (res.data.code == 0 && res.data.data) { - var prom_content = ""; + //如果有搭配促销先不和 阶梯促销和优惠测序重合,做到后台可以重合 + r_data.ladderLists=null; + r_data.promGoodsLists=null; + } - //暂定优惠促销还不能重叠 - if(res.data.data.good_object==0 && (r_data.promGoodsLists || th.data.zh_act)){ - return false; - } - if(res.data.data.good_object==1){ - r_data.promGoodsLists=null; - } + if (r_data.ladderLists) { + var act_id = r_data.ladderLists[0].form_id; + //-- 判断会员能不能参与阶梯促销 -- + await getApp().request.promiseGet("/api/weshop/prom/ladderForm/getNew/" + os.stoid + "/" + user_id + "/" + act_id, {}).then(res => { + if (res.data.code == 0 && res.data.data) { + var prom_content = ""; - for (let jj in r_data.ladderLists) { - if (r_data.ladderLists[jj].discount == 10) { - prom_content += "第" + (parseInt(jj) + 1) + "件原价，"; - } else { - prom_content += "第" + (parseInt(jj) + 1) + "件" + r_data.ladderLists[jj].discount + "折，"; - } - } - prom_content = ut.sub_last(prom_content); - th.data.prom_type = 10; - th.data.prom_id = act_id; - th.setData({ - jieti_prom: prom_content, - ladder_act_id: act_id - }) + //暂定优惠促销还不能重叠 + if(res.data.data.good_object==0 && (r_data.promGoodsLists || th.data.zh_act)){ + return false; + } + + if(res.data.data.good_object==1){ + r_data.promGoodsLists=null; + } + + for (let jj in r_data.ladderLists) { + if (r_data.ladderLists[jj].discount == 10) { + prom_content += "第" + (parseInt(jj) + 1) + "件原价，"; + } else { + prom_content += "第" + (parseInt(jj) + 1) + "件" + r_data.ladderLists[jj].discount + "折，"; } + } + prom_content = ut.sub_last(prom_content); + th.data.prom_type = 10; + th.data.prom_id = act_id; + th.setData({ + jieti_prom: prom_content, + ladder_act_id: act_id }) } + }) + } - - th.setData({ - order_prom: r_data.promOrder, - collocationGoods: r_data.collocationPromList, - prom_goods: r_data.promGoodsLists, - }) - th.is_show_more_buy(); - } + //普通购买不在界面显示 + if(is_nor){ + th.data.collocationGoods=r_data.collocationPromList; + th.data.prom_goods=r_data.prom_goods; + }else{ + th.setData({ + order_prom: r_data.promOrder, + collocationGoods: r_data.collocationPromList, + prom_goods: r_data.promGoodsLists, + }) } - }) + th.is_show_more_buy(); + } + }) + + + }, @@ -7461,7 +7509,7 @@ Page({ } }) } - + if(!is_ok) return false; if(r_data.promGoodsLists){ obj = {