完善层放大缩小时的碰撞检测
删除层和组件
Merge branch 'sx_func' of https://github.com/lln7777/zhuyun into dev
Merge branch 'jack' of https://github.com/lln7777/zhuyun into dev

Conflicts:
	views/index.ejs