搜索功能完善
Merge remote-tracking branch 'origin/master'
修改了登录的bug
修正了登录和注册的bug
Merge remote-tracking branch 'origin/master'