跳到登录界面
Merge branch 'master' of https://github.com/shanghaishule/weixinshop.git
解决冲突