调整商品详情ui
fix conflict&bug
Merge pull request #77 from zyuce/master

调整商品详情ui
Merge branch 'master' of https://github.com/joy32812/beauty
Filter:分类->品牌+功效（功效尚未完成）