Merge pull request #19 from wayne0332/master

修改过都写在每次的记录里了
11.17.1

活动详情页
Merge pull request #21 from InsCake/master

merge