Merge pull request #78 from majie1993/master

Filter:商品->显示分类和功效
文章详情ui
Merge pull request #79 from zyuce/master

文章详情ui
调整商品详情顺序
Merge pull request #80 from zyuce/master

调整商品详情顺序
fix hot words bug
add lauch image
Merge branch 'master' of https://github.com/joy32812/beauty