diff --git a/pages/goods/goodsInfo/buy_pt.wxml b/pages/goods/goodsInfo/buy_pt.wxml index eaf853f..424fc88 100644 --- a/pages/goods/goodsInfo/buy_pt.wxml +++ b/pages/goods/goodsInfo/buy_pt.wxml @@ -73,6 +73,7 @@ (配送不匹配) (该店不可售) + (该店不可售) (库存不足) @@ -220,7 +221,10 @@ 配送不匹配 - + + + 该店不可售 + 确定 diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index dd3abd7..21c7fe3 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -3572,7 +3572,7 @@ Page({ var pickup_ids=th.data.sele_g.pickup_ids; //指定门店判断, 不是普通购买的时候,秒杀的时候,秒杀有指定门店 - if(!is_normal && th.data.prom_type==1 && th.data.prom_act.pick_up_lists){ + if(!is_normal && (th.data.prom_type==1 || th.data.prom_type==6) && th.data.prom_act.pick_up_lists){ pickup_ids=th.data.prom_act.pick_up_lists } @@ -3602,7 +3602,7 @@ Page({ if(idx1<0){ th.data.def_pick_store.is_no_dis_nor=1; //如果是秒杀的指定门店,就要设置秒杀的 - if(!is_normal && th.data.prom_type==1){ + if(!is_normal && (th.data.prom_type==1 || th.data.prom_type==6) ){ th.data.def_pick_store.is_no_dis_act=1; }else{ th.data.def_pick_store.is_no_dis_nor=1;