diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index de520c8..17f9a51 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -4350,7 +4350,7 @@ Page({ //--如果找到默认门店,同时也应该判断配送方式对不对-- - if (th.data.fir_def_store && !is_find_def_store && th.data.fir_def_store.pickup_id && + if (th.data.fir_def_store && !is_find_def_store && th.data.fir_def_store.pickup_id && !th.data.def_pick_store.is_no_dis_nor && !th.data.def_pick_store.is_no_dis_act && (g_distr_type == 0 || th.data.fir_def_store.distr_type == 0 || th.data.def_pick_store.distr_type == g_distr_type)) { th.data.fir_def_store.CanOutQty = 0; //--当选择的门店是客户默认的门店的时候-- @@ -4374,6 +4374,7 @@ Page({ th.deal_pickup(em); } else { + th.setData({ all_sto: null, only_pk: null, @@ -4382,6 +4383,7 @@ Page({ } } else { + th.setData({ all_sto: null, only_pk: null,