Commit bb0ac971baebe647c4fc2c47205d8fbf6c09478e
Merge branch 'test' into 'qa'
Test See merge request !1182
Showing
1 changed file
with
1 additions
and
1 deletions
pages/goods/goodsInfo/goodsInfo.js
| @@ -2194,7 +2194,7 @@ Page({ | @@ -2194,7 +2194,7 @@ Page({ | ||
| 2194 | } | 2194 | } |
| 2195 | 2195 | ||
| 2196 | //如果有搭配购的时候的时候 | 2196 | //如果有搭配购的时候的时候 |
| 2197 | - if(th.data.zh_act && newd.prom_type==0){ | 2197 | + if(th.data.zh_act && (newd.prom_type==0 || newd.prom_type==3)){ |
| 2198 | newd.prom_type = 7; | 2198 | newd.prom_type = 7; |
| 2199 | newd.prom_id = th.data.zh_act.id; | 2199 | newd.prom_id = th.data.zh_act.id; |
| 2200 | } | 2200 | } |