xiugai logo
Merge branch 'master' of https://github.com/bigv220/jsis
Modify Text
Modify Logo
Modify Text
修改商品模板.
修改样式.
desc
Modify style.
Modify style
modify style
Update.
footer style
1. 修改后台"产品管理"，增加id列
2。修改"联系我们"页，增加QQ在线显示
3。修改底部内容，增加在线QQ显示
4。修改产品详细页
Merge branch 'master' of https://github.com/bigv220/jsis

Conflicts:
	catalog/view/theme/elegantcart/template/common/footer.tpl
1。修改注册，登录页
2。使用手机号或卡号登录
Merge branch 'sophia' of https://github.com/bigv220/jsis into sophia

Conflicts:
	catalog/view/theme/elegantcart/stylesheet/stylesheet.css