1、会员页面已完成签到记录、积分变动
2、购物车调试好了
Merge branch 'master' of https://github.com/o2o-qianduan/xfn.git

Conflicts:
	css/stylesheet.css