Commit b17f44b88555e7d89f876da7e8db3944c8e2f0aa
Merge branch 'qa' into 'master'
Qa See merge request !749
Showing
1 changed file
with
1 additions
and
1 deletions
pages/index/index/index.js
| @@ -1009,7 +1009,7 @@ Page({ | @@ -1009,7 +1009,7 @@ Page({ | ||
| 1009 | //弹出节日有礼 | 1009 | //弹出节日有礼 |
| 1010 | check_holiday_pop:function(){ | 1010 | check_holiday_pop:function(){ |
| 1011 | var th=this; | 1011 | var th=this; |
| 1012 | - getApp().waitfor(th,'w_holiday_pop',th.data.holiday_image,function(){ | 1012 | + getApp().waitfor2(th,'w_holiday_pop','holiday_image',function(){ |
| 1013 | console.log(th.data.holiday_image); | 1013 | console.log(th.data.holiday_image); |
| 1014 | th.setData({ | 1014 | th.setData({ |
| 1015 | new_image: th.data.holiday_image, | 1015 | new_image: th.data.holiday_image, |