弹出层策略修改
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/tip.css
	js/script.js