Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into test

WXD-SEASON\season
2 parents 5c70b1f0 e802e590
Showing 1 changed file with 0 additions and 2 deletions
pages/cart/cart/cart.js
@@ -2900,8 +2900,6 @@ Page({
            ob = res;
         });
         cQty=ob.CanOutQty;
-        //-- 只获取相同门店,2的时候，因为是线下不同的门店，所以库存再不同门店是不一样的 --
-        if(th.data.sales_rules== 2)  other_gd_num=th.get_goods_other(item, pitem,1);
     }
  
     var is_showing=0;