增加弹窗
Merge branch 'master' of https://github.com/Dianjoy/zhuan-site

Conflicts:
	activity/js/js.js