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

js/articalShow.js

								
							}
							var str='<li>'+
								'<a href="articalShow.html?articleId='+$data[i].articleId+'"><p class="h2Font ellipsisSty-2">'+$data[i].articleTitle+'</p>'+
								'<a href="articalShow.html?articleId='+$data[i].articleId+'"><p class="h2Font ellipsisSty-2"><em class="circlePre"></em>'+$data[i].articleTitle+'</p>'+
								'<span class="smalltip">'+commenTime($data[i].publishTime)+'</span></a></li>'
							$(".recentlyList").append(str);	
						}

js/cmpInforShow.js

						itemlist += '<div class="madiaHead cmpHead" style="width:50px;height:36px;margin-top:-18px;"><div class="boxBlock" style="width: 48px;height: 34px;">';
						itemlist += '<img class="boxBlockimg" id="userimg" src="" /></div></div>';
						itemlist += '<div class="madiaInfo">';
						itemlist += '<p><span class="h1Font ellipsisSty" id="userName"></span><em class="authiconNew" title=""></em></p>';
						itemlist += '<p class="clearfix"><span class="h1Font ellipsisSty floatL" style="display:block;max-width:136px" id="userName"></span><em class="authiconNew floatL" title=""></em></p>';
						itemlist += '<p class="ellipsisSty h2Font" id="usertitle"></p>';
						itemlist += '</div></a></li>';
					$itemlist = $(itemlist);