Merge pull request #2 from wangbo6886/master

merge
Merge pull request #3 from wangbo6886/master

update MainView
update -- GoodsInfoViewController

update -- 李潇
Merge pull request #6 from lx719679895/master

update GoodsInfoViewController