Merge pull request #77 from zyuce/master

调整商品详情ui
Filter:商品->显示分类和功效
Merge branch 'master' of https://github.com/joy32812/beauty
Filter:分类->品牌+功效（功效尚未完成）
Merge pull request #78 from majie1993/master

Filter:商品->显示分类和功效
调整商品详情顺序