Merge pull request #2 from piercalex/master

0926tojulie合并试验
Merge pull request #3 from piercalex/master

0927活动导航页joe部分整理完毕 合并
0927资讯首页新增模块 搜索+底栏
Merge pull request #15 from chuyu123/master

Merge pull request #2 from piercalex/master