样式的修改
Merge branch 'master' of https://github.com/Joyguo0/magento1810
add image
Merge branch 'master' of https://github.com/chenlihua/magento1810