Commit c646aed3e0bf923baa7d6e5929e783d8b2c3dc4b
Merge branch 'test' into 'qa'
Test See merge request !1169
Showing
1 changed file
with
1 additions
and
1 deletions
packageE/pages/cart/cart2/cart2.js
| @@ -1346,7 +1346,7 @@ Page({ | @@ -1346,7 +1346,7 @@ Page({ | ||
| 1346 | 1346 | ||
| 1347 | 1347 | ||
| 1348 | //如果有开启佣金抵扣，同时会员是分销商的时候 | 1348 | //如果有开启佣金抵扣，同时会员是分销商的时候 |
| 1349 | - if (!gg.collocation_goods && getApp().globalData.userInfo.is_distribut | 1349 | + if (getApp().globalData.userInfo.is_distribut |
| 1350 | && th.data.dis_config && th.data.dis_config.is_yongjin_dk) { | 1350 | && th.data.dis_config && th.data.dis_config.is_yongjin_dk) { |
| 1351 | var fir_num = 0; | 1351 | var fir_num = 0; |
| 1352 | var sec_num = 0; | 1352 | var sec_num = 0; |