首页判断修改
Merge branch 'yaoyong' into developer