Merge pull request #50 from pengqin/dev

Dev
提交新界面
Merge pull request #62 from hopesfish/dev

Dev