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

into dev

js/articalShow.js

@@ -486,7 +486,7 @@ function addAgree() {
		success: function(data) {
			if(data.success){
				var articleAgreeval = $(".thumbBtn span").text();
				$(".thumbBtn").html("已赞 <span>"+parseInt(articleAgreeval+1)+"</span>");
				$(".thumbBtn").html("已赞 <span>"+(parseInt(articleAgreeval)+1)+"</span>");
				$(".thumbBtn").addClass("thumbedBtn");
				$(".thumbBtn").removeClass("thunbgo");
			}