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

js/articalInfo.js

@@ -439,6 +439,8 @@ $(document).ready(function() {
			success: function(data) {				
				if(data.success) {
					$this.parents('li').remove();
					var oNum=$(".message").eq(0).text();
					$(".message").text(oNum-1);
				}
			},
			error: function(XMLHttpRequest) {
@@ -446,4 +448,13 @@ $(document).ready(function() {
			}
		});
	})
	/*跳转详情页面专家或者企业*/
	$("#details").click(function(){
		if(oFlag==1){
			location.href="companybrowinfor.html?orgId="+professorId;
		}else{
			location.href="information-brow.html?professorId="+professorId;
		}
		
	})
})

js/information.brow.js

@@ -412,7 +412,7 @@ $(function() {
							} else if($info[i].professor.title && !$info[i].professor.office && !$info[i].professor.orgName && !$info[i].professor.address) {
								title = $info[i].professor.title;
							}
							var addw = '<li>'
							var addw = '<li data-id="'+$info[i].professor.id+'" style="cursor:pointer">'
							addw += '<a class="proinfor clearfix">'
							addw += '<div class="headblock floatL"><img id="proHead" class="headimg headRadius" src="' + img + '"></div>'
							addw += '<div class="mediaBody">'
@@ -429,7 +429,11 @@ $(function() {
				error: function() {}
			});
		});
/*研究方向点赞点击每一个点赞的用户进入点赞用户的浏览页面*/
$(".attentList").on("click","li",function(){
	var opid=$(this).attr("data-id");
	location.href="information-brow.html?professorId="+opid;
})
		$.get("/ajax/professor/info/" + professorId, function($data) {
			if($data.success) {
				var $info = $data.data;
@@ -825,8 +829,8 @@ $(function() {
						add += '</div></a>'
						add += '<div class="shareopeart"><a class="sharebtn resourceConsult" professorId=' + data.data[i]["professorId"] + '>咨询</a><a class="sharebtn applicant" style="display:none">申请</a></div>'
						add += '</div>'
						add += '<p class="restit">资源名称：<span class="presou consultTitleVal" resourceConsultTitle = "">' + data.data[i].resourceName + '</span></p>'
						add += '<p class="briefinfor">应用用途:' + data.data[i].supportedServices + '</p>'
						add += '<p class="restit ellipsisSty">资源名称：<span class="presou consultTitleVal" resourceConsultTitle = "">' + data.data[i].resourceName + '</span></p>'
						add += '<p class="briefinfor ellipsisSty-2">应用用途：' + data.data[i].supportedServices + '</p>'
						add += '</div>'
						$("#sharescrollbox").append(add);
						$('.applicant').eq(i).attr("resourceId", data.data[i].resourceId);