diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js index bd29916..e107215 100644 --- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js +++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js @@ -2982,7 +2982,7 @@ Page({ th.setData({ all_pick_list: e.data.data.pageData }); //--获取线下库存,而且不是新的门店规则, 同时是普通购买的时候,或者同时不能是活动,秒杀,拼团,积分购-- - if (th.data.sales_rules >= 2 && !th.data.is_newsales_rules && ((th.data.prom_type != 1 && th.data.prom_type != 6 && th.data.prom_type != 4) || is_normal == 1)) { + if (th.data.sales_rules >= 2 && !th.data.is_newsales_rules && ((th.data.prom_type != 9 && th.data.prom_type != 1 && th.data.prom_type != 6 && th.data.prom_type != 4) || is_normal == 1)) { setTimeout(function () { th.deal_pickup_dline(e); }, 800) @@ -4190,7 +4190,9 @@ Page({ // } // } // }); - th.get_sto(1); + + th.data.prom_type=9; + th.get_sto(); th.setData({ is_normal: 0, openSpecModal_pt: 1 diff --git a/pages/goods/categoryList/categoryList.wxml b/pages/goods/categoryList/categoryList.wxml index 26132a3..79d6e7f 100644 --- a/pages/goods/categoryList/categoryList.wxml +++ b/pages/goods/categoryList/categoryList.wxml @@ -47,7 +47,7 @@ - + {{bitem.name}} {{bitem.enname}} diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index cb1a234..e5e8b1d 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -3108,11 +3108,11 @@ Page({ }) } - this.sele_spec_chech_activity(); + this.sele_spec_chech_activity(nor); }, //选择了不同的规格的时候要判断是不是有活动正在进行中 - async sele_spec_chech_activity() { + async sele_spec_chech_activity(nor) { //---如果是活动的时候--- var prom = null, goodsinfo = this.data.sele_g, @@ -3208,6 +3208,9 @@ Page({ return false; } } + + if(nor) return false; + //---设置普通商品--- th.setData({ prom_type: 0,