修复各种bug，调整布局
Merge branch 'master' of github.com:niancode/CakeWX