Merge branch 'dev' into 'test'

佣金抵扣的判断优化 See merge request !1168

Merge branch 'dev' into 'test'
佣金抵扣的判断优化 See merge request !1168
后端研发-苏明海
2 parents d8182d24 1321daf9
Showing 1 changed file with 1 additions and 1 deletions
packageE/pages/cart/cart2/cart2.js
@@ -1346,7 +1346,7 @@ Page({
  
  
               //如果有开启佣金抵扣，同时会员是分销商的时候
-              if (!gg.collocation_goods && getApp().globalData.userInfo.is_distribut
+              if (getApp().globalData.userInfo.is_distribut
                 && th.data.dis_config && th.data.dis_config.is_yongjin_dk) {
                 var fir_num = 0;
                 var sec_num = 0;