修改活动页面
Merge branch 'master' of https://github.com/GavinLai/zhufuyu
改版发现页面
Merge branch 'master' of https://github.com/GavinLai/zhufuyu