我删除了有些页面多余的代码
Merge remote-tracking branch 'refs/remotes/origin/master'