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

css/index.css

.coulstblock .coulstbox .coulstbtn{padding:24px 10px; margin-right: 20px;}
.coulstbtn span,#conbtn span{display:inline-block;width:120px;text-align:center;padding:8px;margin-right:6px; border-radius:4px; text-align:center; color:#fff; background:#ff9900;cursor:pointer}
.coulstbtn .shareWeixin{background: #52DA4D;}
.shareCode{background:#FFFFFF;border:6px solid rgba(0,0,0,.2);padding:8px;position: absolute;bottom:40px;left:0;display: none;width: 260px;}
.shareCode img{width:80px;height:80px;}
.shareCode .shareWord{width: 126px;margin:10px;color:#666666;text-align: left;font-size: 14px; line-height: 20px;}
.coulstbtn .attentBtn{position:relative;padding-left:20px;border:1px solid #ff9900;color:#ff9900;background: transparent;}
.shareCode{background:#FFFFFF;border:6px solid rgba(0,0,0,.2);padding:8px;position: absolute;bottom:40px;left:0;display: none;width:340px;}
.shareCode img{width:120px;height:120px;}
.shareCode .shareWord{width: 160px;margin:16px 10px;color:#666666;text-align: left;font-size: 16px; line-height: 28px;}.coulstbtn .attentBtn{position:relative;padding-left:20px;border:1px solid #ff9900;color:#ff9900;background: transparent;}
.coulstbtn .attentBtn em{position:absolute;top:50%;margin-top:-8px;left:34px;display:inline-block; width:16px;height:18px;background:url(../images/favoricon.png) 0 -32px no-repeat;background-size:100% auto;}
.coulstbtn .attentBtn i{font-style: normal;}
.coulstbtn .attentBtn.attented{color:#ffffff;padding-left:24px;background: #f4c600;border:1px solid #f4c600;}

e/a.html

							}
						},
						"error":function(){
							$.MsgBox.Alert('提示','链接服务器超时')
							//$.MsgBox.Alert('提示','链接服务器超时')
						}
					});
				var oArticleModule = {
					articleId: GetQueryString("articleId"),
					articleId: GetQueryString("id"),
					oAjaxGet: function(url, obj, oType, oFun) {
						$.ajax({
							url: url,

e/p.html

				var nameli = document.getElementById("nameli");
				var personSummary = document.getElementsByClassName("breifinfo")[0];
				var professorId = GetQueryString("id");
			$.ajax({
			"url": "/ajax/resource/qaProPublish",
			"type": "get",
			"data": {
				"professorId": professorId,
			},
			"success": function(data) {
				if(data.success) {
					console.log(data)
					var $data=data.data
					if($data.length) {
								professorResource($data);
							} else {
								document.getElementById("professorresourceList").style.display = "none";
							}
						}
			},
			"error": function() {
				$.MsgBox.Alert('提示', '链接服务器超时')
			}
		});
				
							
				function GetQueryString(name) {
					var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
					var r = window.location.search.substr(1).match(reg);
							string += '<div class="proinfor clearfix">'
							string += '<div class="media-object pull-left ResImgBox">'
							if($data[i].images.length) {
								string += '<img class="resImg headRadius" src="../images/resource/' + $data[i].resourceId + '.jpg">'
								string += '<img class="resImg headRadius" src="../data/resource/' + $data[i].images[0].imageSrc+ '">'
							} else {
								document.getElementById("professorinfoapply").style.display = "none";
							}
							//专家资源
							if($data.resources.length) {
							/*if($data.resources.length) {
								professorResource($data.resources);
							} else {
								document.getElementById("professorresourceList").style.display = "none";
							}
							}*/
							/*//如无详细内容数据，隐藏详细点击的按钮
							if(!$data.edus.length && !$data.jobs.length && !$data.projects.length && !$data.papers.length && !$data.patents.length && !$data.honors.length) {
								document.getElementById("detailProfessor").style.display = "none";

e/r.html

				if(data.success) {}
			},
			"error": function() {
				$.MsgBox.Alert('提示', '链接服务器超时')
				//$.MsgBox.Alert('提示', '链接服务器超时')
			}
		});
	function getRecourceMe() {

index.html

					</ul>
				</div>-->
			    <!-- <select class="lookwho floatL" id="lookFor"><option value="0">找专家</option><option value="1">找资源</option></select>  -->
				<input type="text" placeholder="搜索专家、机构、研究方向" class="sear-txt" id="searchContent" >
				<input type="text" placeholder="搜索专家、资源、文章" class="sear-txt" id="searchContent" >
				<div class="sear-btn" id="search" >搜索</div>
			</div>
		</div>

js/header.js

						'</ul>' +
					'</div>' +
					'<div class="searchblock">'+
				    '<input type="text" placeholder="搜索专家、研发资源" class="search-txt" id="hsearchContent">'+
				    '<input type="text" placeholder="搜索专家、资源、文章" class="search-txt" id="hsearchContent">'+
						'<div class="search-btn" id="hsearch"><span class="search-icon"></span></div>'+
					'</div>'+
					//未登录状态

js/information.brow.js

						add += '</div>'
						$("#sharescrollbox").append(add);
						$('.applicant').eq(i).attr("resourceId", data.data[i].resourceId);
						$(".resourceImg").eq(i).attr("src","/data/resource/" + data.data[i].images[0].imageSrc);
						$(".resourceImg").load(function() {})
							.error(function() {
								$(this).attr("src", "/images/default-resource.jpg");
							});
						if(data.data[i].images.length) {
							$(".resourceImg").eq(i).attr("src","/data/resource/" + data.data[i].images[0].imageSrc);
						}else{
							$(".resourceImg").eq(i).attr("src","/images/default-resource.jpg");
						}
						add = "";
					}
					//资源轮播