Merge branch 'dev' of http://121.42.53.174:3000/jiapeng/portal-front.git into dev

js/discover.js

@@ -150,7 +150,7 @@ $(function() {
		var d = s.substr(6, 2);
		var h = s.substr(8, 2);
		var minute = s.substr(10, 2);
		var formatTime = m.replace(/\b(0+)/gi, "") + "月" + d + "日" + h + ":" + minute;
		var formatTime = m.replace(/\b(0+)/gi, "") + "月" + d + "日 " + h + ":" + minute;
		return formatTime;
	}