Merge branch 'test' of

http://121.42.53.174:3000/jiapeng/portal-front.git into test

js/articalIssue.js

@@ -6,7 +6,7 @@ $(function() {
	var $data = {};
	var articleId;
	var fa = false;
  	var userid = $.cookie("userid");
  	var userid = $.cookie("userid"); 
  	var hbur,hburEnd;
  	var pr,prEnd;
  	var re,reEnd;