wxd / MShopWeApp

Commit 601596a0e87012f8f75ef90e09e832e1ff9e4562

Authored by yvan.ni
1 parent f6dfc71d

~~ 秒杀的多活动，在切换的优化 ~~

Inline Side-by-side
Showing 1 changed file with 4 additions and 2 deletions
pages/goods/goodsInfo/goodsInfo.js
  View file @601596a
... ... @@ -3290,6 +3290,8 @@ Page({
3290 3290  
3291 3291  
3292 3292 //普通商品多规格的时候，商品切换
  3293 + if(this.data.base_nor_prom_type) this.data.base_nor_prom_type=parseInt(this.data.base_nor_prom_type);
  3294 +
3293 3295 if([1,2,4,8,9].indexOf(this.data.base_nor_prom_type)==-1){
3294 3296 this.setData({
3295 3297 prom_goods:null,
... ... @@ -3333,10 +3335,10 @@ Page({
3333 3335 if (nor) that.get_sto(1);
3334 3336 else that.get_sto();
3335 3337  
3336   - if (!item.whsle_id) that.check_is_youhui(gid, that.data.is_normal);
  3338 + if (!item.whsle_id && [1,2,4,6].indexOf(item.prom_type)==-1) that.check_is_youhui(gid, that.data.is_normal);
3337 3339  
3338 3340 //默认门店要拿下门店库存
3339   - if (that.data.sales_rules >= 2 && that.data.def_pick_store && !that.data.sele_g.whsle_id) {
  3341 + if (that.data.sales_rules >= 2 && that.data.def_pick_store && !that.data.sele_g.whsle_id && [1,2,4,6].indexOf(item.prom_type)==-1) {
3340 3342 var lock = 0,
3341 3343 plist = null;
3342 3344  
... ...