首页添加热门专家模块、修改关注模块的相关

articalInfo.html

@@ -68,7 +68,7 @@
							</span>
						</div>
						<div class="navOperate floatR">
							<span id="attention" style="background: url(../images/favoricon.png) 0 -50px no-repeat;background-size: 100% auto;margin-top: -4px; display: inline-block;width: 26px;height: 26px;cursor:pointer"></span>
							<span id="attention" style="background: url(../images/favoricon.png) 0 -50px no-repeat;background-size: 100% auto;margin-top: 1px; display: inline-block;width: 24px;height: 24px;cursor:pointer"></span>
						</div>
						<div class="navOperate floatR">
							<span class="wrapicon wordHave"></span><span class="message" style="position:relative;top:-7px;left:2px;"></span>
@@ -133,6 +133,7 @@
</footer>
<script type="text/javascript" src="js/jquery.cookie.js"></script>
<script type="text/javascript" src="js/jquery.similar.msgbox.js"></script>
<script type="text/javascript" src="js/scrollfix.js"></script>
<script type="text/javascript" src="js/weixinshare/qrcode.min.js"></script>
<script type="text/javascript" src="js/common.js"></script>

css/index.css

@@ -49,9 +49,11 @@ input{ outline:none;}
.link-tip-tit{font-size:20px;color:#333;/*font-weight:bold;*/line-height: 46px;}
/*热门领域*/
.hot-field{ width:100%;min-width: 1120px;  background:url(../images/fieldbg.jpg) center center no-repeat; background-size:cover;padding:40px 0 50px;}
.con-tit{padding:10px 0;background: url(../images/home_line_nor.png) no-repeat center center;text-align: center;}
.hh4{font-size:22px;line-height:40px; color:#fff;}
.hh4 img{margin-right:18px;margin-left:-10px;}
.con-tit{text-align: center;}
.con-tit .hh4{padding:10px 0;background: url(../images/home_line_nor.png) no-repeat center center;font-size:22px;line-height:48px;color:#333333;}
.con-tit .hh4 .homeicon-area{background: url(../images/home_icon_remenlingyu_nor.png) no-repeat 0 center;padding-left:30px;}
.con-tit .hh4 .homeicon-pro{background: url(../images/home_icon_remenzhuanjia_nor.png) no-repeat 0 center;padding-left:30px;}
.con-tit .showtip{font-size: 18px;line-height: 40px;color:#999999;}
.field-box{ overflow:hidden; margin:20px auto;}
.field{border-radius:2px;/*margin:4px;*/ border:1px solid #d0d0d0;padding:10px 0; float:left;}
.field-name{ display:block;font-size:16px;line-height:40px; color:#fff; text-align:center;}
@@ -70,15 +72,17 @@ input{ outline:none;}
.hot-field .more{ color:#fff;}
/*热门专家*/
.hot-professor{ width:100%;  padding: 40px 0; }
.hot-professor h4{border:1px #ff9900 solid;color:#ff9900;}
.hot-professor .more{border:1px #ff9900 solid;color:#ff9900;}
.professor-box{ width:900px; height:610px; margin:20px auto;}
.professor{ width:175px; height:255px; border-radius:6px; overflow:hidden; position:relative; float:left; margin:25px;}
.professor img{width:175px; height:255px;}
.professor-data{ width:100%; height:300px; position:absolute; font-size:14px;line-height:16px; text-align:center; color:#fff;top:58%; background:url(../images/p-bg.png) no-repeat;padding:25px 0; }
.professor-data h5{font-size:20px;line-height:30px; }
.process-resear{ list-style:inside; padding:8px;font-size:12px;line-height:16px; text-align:left; }
.hot-professor .carousel .carousel-caption{position:static;height: 450px;text-shadow: none;}
.hot-professor .carousel .carousel-indicators li{background:#dadada;width: 36px;height:5px;border-radius: 0;border:0;margin:1px 10px;}
.hot-professor .carousel .carousel-indicators li.active{width: 36px;height:6px;background:#ff9900;margin:1px 10px;}
.hot-professor .homehead-pro{width: 120px;height: 120px;overflow: hidden;margin:10px auto;}
.hot-professor .homeinfo-pro{text-align: center;margin-top:10px;}
.hot-professor .homeinfo-pro .h1font{font-size: 22px;line-height: 42px;color:#333333;}
.hot-professor .homeinfo-pro .h2font{font-size: 18px;line-height: 40px;color:#666666;}
.hot-professor .carousel .carousel-control{background: none;display: none;}
.hot-professor .carousel .item{background: none;border:none;}
.hot-professor .carousel .item.active{box-shadow: none;}
.hot-professor .carousel .aitemLink{display:block;}
/*搜索页*/
.content{ width:100%; min-width: 1050px; height:auto; background:#f8f8f8; padding:60px 0 2px 0; }
.content-in{padding-bottom:20px;}

css/workspace.css

@@ -351,8 +351,8 @@ border-color:#FF9900; color:#FFFFFF}
.topTit{text-align:center;color:#FFFFFF; font-size:20px;line-height:46px;background: #ff9900;border-radius:10px 10px 0 0;height:46px;width: 100%;}
.fixbox{ background: #FFFFFF;/* position:fixed;top:46px;left:0;*/width:100%; z-index:1;}
.fixbox .fixbtn{ padding:0; margin: 0; overflow: hidden;}
.fixbox .fixbtn li{ list-style: none; float: left;height:40px;cursor:pointer;line-height:30px; padding:6px 10px; border-bottom:1px solid #F0F0F0;text-align: center;font-size: 14px;}
.fixbox .fixbtn li:first-child{ border-right:1px solid #F0F0F0;}
.fixbox .fixbtn li{ list-style: none;border-right:1px solid #F0F0F0; float: left;height:40px;cursor:pointer;line-height:30px; padding:6px 10px; border-bottom:1px solid #F0F0F0;text-align: center;font-size: 14px;}
.fixbox .fixbtn li:last-child{border-right:1px solid transparent; }
.fixbox .fixbtn li.liactive{ color: #FF9900;border-bottom-color: #FF9900;}
.childlist{ display: none;}
.alllist{ margin-top: 45px;}

index.html

@@ -14,6 +14,7 @@
<link type="text/css" href="css/index.css" rel="stylesheet">
<link type="text/css" href="css/common.css" rel="stylesheet">
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
<script type="text/javascript" src="js/bootstrap.min.js"></script>
<style type="text/css">
	#header{top:30px;}
	.searchblock{display:none;} 
@@ -105,9 +106,10 @@
		<div class="container-fulid">
	    	<div class="containerCon">
	    		<div class="con-tit">
	    			<h4 class="hh4"><img src="images/home_icon_remenlingyu_nor.png">热门领域</h4>
	    			<h4 class="hh4"><span class="homeicon-area" style=" color:#fff;">热门领域</span></h4>
	    			<p class="showtip" style="color:#F0F0F0">覆盖 1000 + 学术领域，寻找专家更精准</p>
	    		</div>
				
	    		
				<div class="field-box row">
		        	<div class="col-w-3 field">
						<a href="#"><span class="field-icon field-icon8"></span></a>
@@ -143,35 +145,89 @@
					</div>
			
				</div>
				<!--<a href="search.html" class="more">更多领域<em></em></a>-->
			</div>
	    </div>
	</div>
	<!--热门专家-->
	<!--<div class="hot-professor">
		<h4 class="hh4">热门专家</h4>
		<div class="professor-box">
			<div class="professor">
				<img src="images/pic1.jpg">
				<a href="#">
					<div class="professor-data">
						<h5>肖葵</h5>
						<p>副研究员</p>
						<p>腐蚀控制系统工程研究所</p>
						<p>北京科技大学</p>
						<ul class="process-resear">
							<li>金属材料大气腐蚀行为与机理研究</li>
							<li>多重海洋环境因素作用下材料腐蚀</li>
							<li>损伤的机理电子材料环境损伤行为与防护工艺研究材料环境腐蚀数据库设计与建设</li>
						</ul>
					</div>
				</a>
			</div>-->
	
	<div class="hot-professor">
		<div class="container-fulid">
	    	<div class="containerCon">
	    		<div class="con-tit">
	    			<h4 class="hh4"><span class="homeicon-pro">热门专家</span></h4>
	    			<p class="showtip">严选 1000 + 知名学者、高级研究员、高级工程师，为您解决研发难题</p>
	    		</div>
				<div id="carousel-example-generic" class="carousel slide" data-ride="carousel">
				    <!-- Indicators -->
				    <ol class="carousel-indicators">
					    <li data-target="#carousel-example-generic" data-slide-to="0" class="active"></li>
					    <li data-target="#carousel-example-generic" data-slide-to="1"></li>
					    <li data-target="#carousel-example-generic" data-slide-to="2"></li>
				    </ol>
				
				    <!-- Wrapper for slides -->
				    <div class="carousel-inner" role="listbox">
					    <div class="item active">
					    	<a class="aitemLink" href="information-brow.html?professorId=5955AF8E868A4FABBCB1DA1B026DC514" alt="孟国哲">
						        <div class="carousel-caption">
							      	 <div class="userRadius homehead-pro"><img src="images/professor/pro01.jpg" width="100%"></div>
							      	 <div class="homeinfo-pro">
							      	 	<p class="h1font">孟国哲</p>
							      	 	<p class="h1font">教授，哈尔滨工程大学</p>
							      	 	<p class="h2font">发明专利：铜镍合金铈盐化学转化膜处理方法</p>
							      	 	<p class="h2font">发明专利：利用电化学噪声技术测量材料局部腐蚀的方法及噪声探头和制法</p>
							      	 	<p class="h2font">发明专利：一种高强钢氢损伤的表面吸附氢快速检测方法</p>
							      	 </div>
						      	</div>
						    </a>
					    </div>
					    <div class="item">
					    	<a class="aitemLink" href="information-brow.html?professorId=4555021E1A53489C8BD42A2F67B62CAA" alt="柳伟">
						      <div class="carousel-caption">
						      	 <div class="userRadius homehead-pro"><img src="images/professor/pro02.jpg" width="100%"></div>
						      	 <div class="homeinfo-pro">
						      	 	<p class="h1font">柳伟</p>
						      	 	<p class="h1font">副教授，研究员级高级工程师，北京科技大学</p>
						      	 	<p class="h2font">国家863项目：耐海洋大气腐蚀高强度海洋工程用钢的组织、性能控制技术及其应用</p>
						      	 	<p class="h2font">国家科技重大专项：高强度耐腐蚀石油天然气集输和输送用管线钢生产技术</p>
						      	 	<p class="h2font">国家973项目二级课题：高强韧耐海洋大气腐蚀超细复合组织钢</p>
						      	 	<p class="h2font">国家自然科学基金重点项目：金属材料高温高压多相介质的腐蚀研究</p>
						      	 </div>
						      </div>
						    </a>
					    </div>
					    <div class="item">
					    	<a class="aitemLink" href="information-brow.html?professorId=F9E3DAD76E3841F7A35F23CF57430740" alt="时国庆">
						      <div class="carousel-caption">
						      	 <div class="userRadius homehead-pro"><img src="images/professor/pro03.jpg" width="100%"></div>
						      	 <div class="homeinfo-pro">
						      	 	<p class="h1font">时国庆</p>
						      	 	<p class="h1font">副教授，北京科技大学</p>
						      	 	<p class="h2font">国家863项目子课题：粮食中霉菌毒素高通量筛查技术研究与产品开发</p>
						      	 	<p class="h2font">国家科技支撑计划子课题：酞酸酯类化合物单克隆抗体及免疫</p>
						      	 	<p class="h2font">中央高校基础科研业务费青年人才基金项目：婴幼儿食品中内分泌干扰物的快速免疫检测技术研究</p>
						      	 </div>
						      </div>
						    </a>
					    </div>
				    </div>
				
				    <!-- Controls -->
				    <a class="left carousel-control" href="#carousel-example-generic" role="button" data-slide="prev">
					    <span class="glyphicon glyphicon-chevron-left" aria-hidden="true"></span>
					    <span class="sr-only">Previous</span>
				    </a>
				  	<a class="right carousel-control" href="#carousel-example-generic" role="button" data-slide="next">
					    <span class="glyphicon glyphicon-chevron-right" aria-hidden="true"></span>
					    <span class="sr-only">Next</span>
				  	</a>
				</div>
			</div>
	    </div>
	</div>
</div>
	<footer>
	    <script type="text/javascript" src="js/footer.js"></script>
	</footer>
<footer>
    <script type="text/javascript" src="js/footer.js"></script>
</footer>
<script type="text/javascript" src="/js/jquery.cookie.js"></script>
<script type="text/javascript" src="js/common.js"></script>

js/my-attention2.js

@@ -0,0 +1,123 @@
$(function(){
	
	/*设置全局变量*/
	var professorId = GetQueryString("professorId");
	var resourceId = GetQueryString("resourceId");
	var userid=$.cookie("userid");
	var returnId;
	var ifurl = window.location.href;
	
	ifCollection();
	
	$('.attentBtn').click(function(){
		if (userid && userid != "null" && userid != null) {
			if($(this).is('.attented')){
				cancelCollectionExpert();
			}else{
				collectionExpert();
			}	
		}else{
			$.MsgBox.Alert('提示',"请先登录再进行收藏");
			$("#mb_btn_ok").val("去登录");
			var aele = document.createElement('a');
			$("#mb_btnbox").append(aele);
			$("#mb_btnbox a").css({
				'display': "block",
				'width': '100%',
				'height': '40px',
				'position': 'absolute',
				'bottom': '-6px',
				'left': '0'
			});
			aele.setAttribute('href', '../login.html');
		}
	})
	
	/*判断是非收藏专家*/
	function ifCollection() {
		if(ifurl.indexOf("professorId") >= 0){
			var data = {"professorId": userid,"watchObject": professorId}
		}else{
			var data = {"professorId": userid,"watchObject": resourceId}
		}
		//alert(JSON.stringify(data))
		$.ajax({		
			url:"/ajax/watch/hasWatch",
			data:data,
			dataType: 'json', //数据格式类型
			type: 'get', //http请求类型
			timeout: 10000,
			async: false,
			success: function(data) {
				if(data.success && data.data != null) {
					$(".attentBtn").addClass('attented');
					$('.attentBtn i').text('已收藏');
					returnId = data.data.watchObject;
				} else {
					$(".attentBtn").removeClass('attented');
					$('.attentBtn i').text('收藏');
				}
			},
			error: function() {
				$.MsgBox.Alert('提示',"服务器链接超时");
			}
		});
	}
	
	/*收藏专家*/
	function collectionExpert() {
		if(ifurl.indexOf("professorId") >= 0){
			var data = {"professorId": userid,"watchObject": professorId,"watchType": 1}
		}else{
			var data = {"professorId": userid,"watchObject": resourceId,"watchType": 2}
		}
		$.ajax({		
			url:"/ajax/watch",
			data:data,
			dataType: 'json', //数据格式类型
			type: 'POST', //http请求类型
			timeout: 10000,
			async: false,
			success: function(data) {
				//console.log(data.success)
				if(data.success) {
					returnId = data.data;
					$(".attentBtn").addClass('attented');
					$('.attentBtn i').text('已收藏');
					//$.MsgBox.Alert('提示',"专家收藏成功");
				}
			},
			error: function() {
				$.MsgBox.Alert('提示',"服务器链接超时");
			}
		});
	}
	
    /*取消收藏专家*/
	function cancelCollectionExpert() {
		$.ajax({		
			url:"/ajax/watch/delete",
			data: {
				professorId: userid,
				watchObject: returnId
			},
			dataType: 'json', //数据格式类型
			type: 'post', //http请求类型
			timeout: 10000,
			async: true,
			success: function(data) {
				//console.log(data.success)
				if(data.success) {
					$(".attentBtn").removeClass('attented');
					$('.attentBtn i').text('收藏');
					//$.MsgBox.Alert('提示',"取消收藏成功");
				}
			},
			error: function(data) {
				$.MsgBox.Alert('提示',"服务器链接超时");
			}
		});
	}
	
})

resourceInfo.html

@@ -56,7 +56,7 @@
					</div>
					<div class="coulstbtn floatL" style="position: absolute;bottom: 20px;">
						<span id="consultin">咨询</span>
						<span class="attentBtn" id="attentBtn"><em></em><i>关注</i></span>
						<span class="attentBtn" id="attentBtn"><em></em><i>收藏</i></span>
						<span class="shareWeixin" style="display:inline-block;position: relative;">分享至微信
								<div class="shareCode clearfix">
									<div class="floatL" id="qrcode"></div>
@@ -114,7 +114,7 @@
<script type="text/javascript" src="js/common.js"></script>
<script type="text/javascript" src="js/popup.js"></script>
<script type="text/javascript" src="js/resourceInfo.js"></script>
<script type="text/javascript" src="js/my-attention.js"></script>
<script type="text/javascript" src="js/my-attention2.js"></script>
<script type="text/javascript">
	//分享关注按钮

workspaces.html

@@ -21,7 +21,7 @@
<!--我的关注-->
<div class="blackcover displayNone" id="attentCover">
	<div class="attentionBox">
		<div class="topTit">我的关注</div>
		<div class="topTit">关注与收藏</div>
		<div class="fixbox">
			<ul class="fixbtn" id="fixbtn">
				<li index="0" class="col-xs-4 liactive">专家</li>
@@ -98,7 +98,7 @@
					                </div> -->
								</div>
								<div class="workcountup" id="lookMyAttention">
									<p class="myAttention">我的关注</p>
									<p class="myAttention">关注与收藏</p>
								</div>
								<!--<div class="workcountup">
					                <p><span class="workcountnum">2</span>个项目正在进行</p>