Commit c972ff58ee556968084ce5bac3aca8fed8d72465
1 parent
ce08f22d
指定门店优化
Showing
1 changed file
with
3 additions
and
1 deletions
pages/goods/goodsInfo/goodsInfo.js
@@ -4350,7 +4350,7 @@ Page({ | @@ -4350,7 +4350,7 @@ Page({ | ||
4350 | 4350 | ||
4351 | 4351 | ||
4352 | //--如果找到默认门店,同时也应该判断配送方式对不对-- | 4352 | //--如果找到默认门店,同时也应该判断配送方式对不对-- |
4353 | - if (th.data.fir_def_store && !is_find_def_store && th.data.fir_def_store.pickup_id && | 4353 | + 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 && |
4354 | (g_distr_type == 0 || th.data.fir_def_store.distr_type == 0 || th.data.def_pick_store.distr_type == g_distr_type)) { | 4354 | (g_distr_type == 0 || th.data.fir_def_store.distr_type == 0 || th.data.def_pick_store.distr_type == g_distr_type)) { |
4355 | th.data.fir_def_store.CanOutQty = 0; | 4355 | th.data.fir_def_store.CanOutQty = 0; |
4356 | //--当选择的门店是客户默认的门店的时候-- | 4356 | //--当选择的门店是客户默认的门店的时候-- |
@@ -4374,6 +4374,7 @@ Page({ | @@ -4374,6 +4374,7 @@ Page({ | ||
4374 | th.deal_pickup(em); | 4374 | th.deal_pickup(em); |
4375 | 4375 | ||
4376 | } else { | 4376 | } else { |
4377 | + | ||
4377 | th.setData({ | 4378 | th.setData({ |
4378 | all_sto: null, | 4379 | all_sto: null, |
4379 | only_pk: null, | 4380 | only_pk: null, |
@@ -4382,6 +4383,7 @@ Page({ | @@ -4382,6 +4383,7 @@ Page({ | ||
4382 | } | 4383 | } |
4383 | 4384 | ||
4384 | } else { | 4385 | } else { |
4386 | + | ||
4385 | th.setData({ | 4387 | th.setData({ |
4386 | all_sto: null, | 4388 | all_sto: null, |
4387 | only_pk: null, | 4389 | only_pk: null, |