Merge branch 'dev' into 'test'

有搭配购，就不参与全场优惠 See merge request !1181

Merge branch 'dev' into 'test'
有搭配购，就不参与全场优惠 See merge request !1181
后端研发-苏明海
2 parents aca91414 b37c0514
Showing 1 changed file with 1 additions and 1 deletions
pages/goods/goodsInfo/goodsInfo.js
@@ -2194,7 +2194,7 @@ Page({
       }
  
       //如果有搭配购的时候的时候
-      if(th.data.zh_act  && newd.prom_type==0){
+      if(th.data.zh_act  && (newd.prom_type==0 || newd.prom_type==3)){
         newd.prom_type = 7;
         newd.prom_id = th.data.zh_act.id;
       }