diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index 6de3a7e..16f9f50 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -1105,6 +1105,11 @@ Page({ //获取统一条形码,普通商品和优惠促销的商品 if (ee.data.data.prom_type == 0 || ee.data.data.prom_type == 3 || ee.data.data.prom_type == 5 || ee.data.data.prom_type == 7 || ee.data.data.prom_type == 9 || ee.data.data.prom_type == 10) { + + //-- 更新默认购买的数量 --- + var mo_num=getApp().get_limit_qty(t.data.data); + ee.setData({goodsInputNum:mo_num}) + ee.get_sto(); ee.get_sku(o.stoid, t.data.data, gid); ee.check_has_flash(); @@ -2394,11 +2399,24 @@ Page({ //----------增加购买数量----------- addCartNum: function (t) { - this.checkCartNum(this.data.goodsInputNum + 1); + + var add_num=1; + var p_type=parseInt(this.data.prom_type) + if([1,2,4,6,8,9].indexOf(p_type)==-1 || th.data.openSpecModal_inte_normal == 1 || th.data.is_normal == 1){ + add_num=getApp().get_limit_qty(this.data.sele_g,0,1); + } + + this.checkCartNum(this.data.goodsInputNum + add_num); }, //----------减少购买数量----------- subCartNum: function (t) { - this.checkCartNum(this.data.goodsInputNum - 1); + + var add_num=1; + var p_type=parseInt(this.data.prom_type) + if([1,2,4,6,8,9].indexOf(p_type)==-1 || th.data.openSpecModal_inte_normal == 1 || th.data.is_normal == 1){ + add_num=getApp().get_limit_qty(this.data.sele_g,0,1); + } + this.checkCartNum(this.data.goodsInputNum - add_num); }, //----------输入框输入购买数量----------- inputCartNum: function (t) { @@ -2487,7 +2505,7 @@ Page({ } } var e = th.data.sele_g.store_count; - var p_type = th.data.prom_type; //&& p_type!=1 && p_type!=4 + var p_type =parseInt(th.data.prom_type+'') ; //&& p_type!=1 && p_type!=4 if (!getApp().is_virtual(th.data.sele_g) && !th.data.sele_g.whsle_id && th.data.sales_rules >= 2 && ([1,2,4,6,8,9].indexOf(p_type)==-1 || th.data.openSpecModal_inte_normal == 1 || th.data.is_normal == 1)) { if (!th.data.def_pick_store) { diff --git a/pages/user/index/index.js b/pages/user/index/index.js index 5ab3214..7fae82f 100644 --- a/pages/user/index/index.js +++ b/pages/user/index/index.js @@ -991,10 +991,23 @@ Page({ //过滤掉分销关闭的 let distribut_end_time = await getApp().user_tools_endTime(2);//过滤掉分销到期的 await getApp().promiseGet("/api/weshop/storeDistribut/get/" + os.stoid, {}).then(rs => { - if (rs.data.code == 0) { - var dis = rs.data.data; + if (rs.data.code == 0 || !rs.data.data) { + var is_ok=1; + + if(!distribut_end_time){ + is_ok=0; + } + else if(!rs.data.data){ + is_ok=0; + }else{ + var dis=rs.data.data; + if(!dis || dis.switch == 0){ + is_ok=0; + } + } + for (var i in d_list) { - if (d_list[i].name == '我的分销' && (!dis || dis.switch == 0) || (d_list[i].name == '我的分销' && !distribut_end_time)) { + if (d_list[i].name == '我的分销' && !is_ok) { d_list.splice(i, 1); } }