整合页面

Signed-off-by: jingyang <jingyang.tom@qq.com>