diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js index 53cd08d..4d85d5a 100644 --- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js +++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js @@ -2158,7 +2158,11 @@ Page({ //----------增加购买数量----------- addCartNum: function (t) { - var add_num=1; + //如果是幸运购的话,每次只能购买一个中 + if(!this.data.is_normal && this.data.prom_type==9) { + return; + } + var add_num=1; if(this.data.is_normal == 1){ add_num=getApp().get_limit_qty(this.data.sele_g,this.data.is_act,1); } diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js index 006304b..4269c3e 100644 --- a/pages/cart/cart/cart.js +++ b/pages/cart/cart/cart.js @@ -3222,9 +3222,26 @@ Page({ // let checkOff=false for (var i = 0; i < this.data.requestData.length; i++) { + + var pid=this.data.requestData[i].pid; + var _pick=null; + //获取商品信息,包含线下商品ID,指定门店销售的信息 + var rh=await getApp().request.promiseGet("/api/weshop/pickup/get/"+os.stoid+"/"+pid, {}); + if(rh && rh.data.code==0){ + _pick=rh.data.data; + } + var i_arr = this.data.requestData[i].goods; for (var j = 0; j < i_arr.length; j++) { if (i_arr[j].selected && i_arr[j].is_gift != 1) { + + //-- 判断门店配送是不是匹配 -- + if(_pick && _pick.distr_type!=0 && i_arr[j].distr_type!=0 && _pick.distr_type!= i_arr[j].distr_type){ + getApp().confirmBox(i_arr[j].goods_name + "配送方式和门店不一致"); + wx.hideLoading(); + return false; + } + if (i_arr[j].is_pd_normal || i_arr[j].prom_type == 0 || i_arr[j].prom_type == 3) { normal_arr[i_arr[j].goods_id] = 1; } @@ -3255,8 +3272,6 @@ Page({ } } - - if (i_arr[j].prom_type == 7 && (!this.data.requestData[i].need_list || (this.data.requestData[i].need_list && this.data.requestData[i].need_list.length == 0)) && i_arr[j].act && i_arr[j].act.buy_limit != 0) { let userbuynum = await this.getUserBuyPromNum(i_arr[j].goods_prom_id); @@ -3394,9 +3409,6 @@ Page({ if ((i_arr[j].prom_type == 0 || i_arr[j].prom_type == 3 || i_arr[j].prom_type == 5 || i_arr[j].prom_type == 7 || i_arr[j].prom_type == 10 || i_arr[j].need_downlow_num) && th.data.sales_rules >= 2 && i_arr[j].is_gift != 1 && !i_arr[j].whsle_id) { - - - //--判断商品是线下库存-- var ob = {} await th.check_down_line_next(i_arr[j], i, j, gd.erpwareid, function (rs) { diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js index 61a235a..ea0302f 100644 --- a/pages/user/order_detail/order_detail.js +++ b/pages/user/order_detail/order_detail.js @@ -426,6 +426,14 @@ Page({ var wlist = ""; var the_yh_map={}; //判断那种商品的prom_type为0,正在做的活动是优惠促销 + + + var _pick=null; + //获取商品信息,包含线下商品ID,指定门店销售的信息 + var rh=await getApp().request.promiseGet("/api/weshop/pickup/get/"+os.stoid+"/"+order.pickup_id, {}); + if(rh && rh.data.code==0){ + _pick=rh.data.data; + } for (var i in order_goods) { var good = order_goods[i]; @@ -449,6 +457,13 @@ Page({ gg = res.data.data; }) + //-- 判断门店配送是不是匹配 -- + if(_pick && _pick.distr_type!=0 && gg.distr_type!=0 && _pick.distr_type!= gg.distr_type){ + getApp().confirmBox(gg.goods_name + "配送方式和门店不一致"); + th.setData({ paying: 0 }); + return false; + } + //-- 要进行判断指定门店的判断优化,先做普通商品 -- if([0,3,5,7,10].indexOf(parseInt(good.prom_type))>-1 && gg.pick_group_ids){ var idx0=gg.pick_up_lists.findIndex(function (e){ diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js index 1437fd0..4a9c977 100644 --- a/pages/user/order_list/order_list.js +++ b/pages/user/order_list/order_list.js @@ -742,6 +742,13 @@ Page({ var wlist = ""; var the_yh_map={}; //判断那种商品的prom_type为0,正在做的活动是优惠促销 + var _pick=null; + //获取商品信息,包含线下商品ID,指定门店销售的信息 + var rh=await getApp().request.promiseGet("/api/weshop/pickup/get/"+os.stoid+"/"+order.pickup_id, {}); + if(rh && rh.data.code==0){ + _pick=rh.data.data; + } + for (var i in order_goods) { var good = order_goods[i]; @@ -763,6 +770,15 @@ Page({ gg = res.data.data; }) + //-- 判断门店配送是不是匹配 -- + if(_pick && _pick.distr_type!=0 && gg.distr_type!=0 && _pick.distr_type!= gg.distr_type){ + getApp().confirmBox(gg.goods_name + "配送方式和门店不一致"); + th.setData({ paying: 0 }); + wx.hideLoading(); + return false; + } + + //-- 要进行判断指定门店的判断优化,先做普通商品 -- if([0,3,5,7,10].indexOf(parseInt(good.prom_type))>-1 && gg.pick_group_ids){ var idx0=gg.pick_up_lists.findIndex(function (e){