Merge pull request #5 from zjjott/feature

Merge From Feature
Merge pull request #6 from zjjott/master

Fast Forward to master
Merge pull request #9 from zjjott/feature

Feature
Merge pull request #2 from zjjott/develop

update
修改了弹出框的视图

修改了弹出框的视图，当需要登录时，直接显示“请先登录”。另外增加了一些不错的浪小花表情
Merge pull request #10 from spacewander/test

修改了弹出框的视图