完善登录，提交订单
Merge branch 'xiaowei'