显示Home画面，修改log处理函数
Merge branch 'master' of https://github.com/r2space/DiandianWeb

Conflicts:
	package.json