Commit 7e896018e35a05b52b1e4c501f2eb14066c7d2da
Merge branch 'test' into 'qa'
Test See merge request !1146
Showing
1 changed file
with
1 additions
and
1 deletions
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
| @@ -5831,7 +5831,7 @@ Page({ | @@ -5831,7 +5831,7 @@ Page({ | ||
| 5831 | var lock = 0; | 5831 | var lock = 0; |
| 5832 | 5832 | ||
| 5833 | //---如果是活动的时候,同时不是普通购买--- | 5833 | //---如果是活动的时候,同时不是普通购买--- |
| 5834 | - if ((th.data.prom_type == 1 || th.data.prom_type == 6 || th.data.prom_type == 4) && !th.data.is_normal) { | 5834 | + if ((th.data.prom_type == 9 || th.data.prom_type == 1 || th.data.prom_type == 6 || th.data.prom_type == 4) && !th.data.is_normal) { |
| 5835 | func(); return false; | 5835 | func(); return false; |
| 5836 | } | 5836 | } |
| 5837 | 5837 |