Merge pull request #1 from JohnCny/master

merge
[mod]页面布局bug
Merge pull request #17 from wangxu2013/master

[mod]页面布局bug