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

调整商品详情ui