Merge branch 'master' of http://121.42.53.174:3000/bulomakaka/ekexiu.com.portal.git

src/main/webapp/account-set.html

            <input type="text" placeholder="请输入您的邮箱地址" class="yz" id="email" onBlur="valEmail()" >
            <div class="msg-yz msg11"><span></span></div>
            <p>绑定邮箱验证已发送至您的邮箱<br>请您在10分钟内登录邮箱激活链接验证</p>
            <input type="button" value="登录邮箱激活" class=" activate act act-color" onClick="bindEmail()">
            <input type="button" value="登录邮箱激活" class=" activate act act-color" onClick="bindEmail()" >
            <input type="button" value="返回" class="activate back-btn" >
        </form>
	</div>
	<div class="contentbox">
		<div class="content-set" style="display:block">
			<div class="content-title">个人信息</div>
			<div class="note">此信息用于站内沟通、社区等功能</div>
			<!-- div class="note">此信息用于站内沟通、社区等功能</div> -->
			<div class="acountinfor">
				<div class="account-photo"><img id="headimg" src=""></div>
				<div class="account-photo">
				 <img id="headimg" src="">
				</div>
				<div class="account-name">
					<div class="text">
						<span class="text-txt floatL">程学群</span>
						<span class="text-txt floatL" id="username"></span>
						<a class="floatR" href="information.html"><span class="edit2 floatL"></span>修改资料</a>
					</div>
				</div>

src/main/webapp/css/basic.css

.jcrop_w{ width: 395px; height: 340px; overflow: hidden; }
.jcrop_w img{ position: absolute; }
.pre-1,.pre-2,.pre-3{ border: 1px solid #c8c8c8; margin:auto;}
.pre-1 img,.pre-2 img,.pre-3 img{width:100%; height:100%}
.pre-1{ width: 200px; height: 200px; border-radius:50%; overflow:hidden;  }
.pre-2{ width: 50px; height: 50px;border-radius:50%; overflow:hidden; margin-top: 13px; }
.pre-3{ width: 26px; height: 26px;border-radius:5px; overflow:hidden;margin-top: 13px; }

src/main/webapp/css/index.css

.content-title{height:58px;padding:0 30px;font-size:18px;line-height:64px; color:#313131; border-bottom:1px #c8c8c8 solid;}
.note{ width:438px; height:74px; margin:auto;font-size:16px;line-height:100px;color:#818181; text-align:center; border-bottom:1px #c8c8c8 dashed;}
.acountinfor{ width:60%; margin:10px auto; }
.account-photo{ width:175px; height:175px; border-radius:50%; background:url(../images/default-photo.jpg) no-repeat center center; margin:auto;margin-top:25px; margin-bottom:25px; overflow:hidden;}
.account-photo{ width:175px; height:175px; border-radius:50%;  margin:auto;margin-top:25px; margin-bottom:25px; overflow:hidden;}
.account-photo img{width:100%;}
.account-name{ height:50px; padding: 0 40px;}
.text-txt{font-size:18px;line-height:50px;color:#515151;}
.right-title{ position:relative; overflow:hidden; padding-right:20px;}
.right-title span{ float:left;font-size:22px;line-height:48px; /*color:#ff8400; */padding-left:15px;}
.edit-position-left{ background-position:left;}
.editbox{ clear:both; width:665px; max-height:210px; margin:auto;font-size:14px;line-height:20px;color:#3e3e3e;}
.editbox{ clear:both; width:665px; min-height:210px; margin:auto;font-size:14px;line-height:20px;color:#3e3e3e;}
.reedit{ clear:both; width:665px; min-height:210px; padding:10px;margin-left:35px; border:1px #f99550 solid; box-shadow:0 0 1px #f99550 inset; font-size:14px;line-height:20px; color:#3e3e3e;resize:none;
}
.edit{ display:block; float:left; width:22px; height:22px; background:url(../images/edit.png) no-repeat right center;margin: 15px 6px;cursor:pointer;}
.edu{ font-size:16px;line-height:26px; color:#868686;}
.edu-h{ height:52px;}
.edu-txt{ float:none; width:402px;}
.date-box{ width:252px;}
.date-box{ }
.datebox{ width:540px; overflow:hidden; height:26px;}
hr{ width:18px; float:right; background:#ffc688; height:2px; border:none; margin:10px;}
.checkbox{ float:right; width:60px;margin-left:15px;margin-top: -1px;}
.date-btn{ float:right; width:175px; background:url(../images/select.png) no-repeat right; z-index:999;}
hr{ width:18px; float:left; background:#ffc688; height:2px; border:none; margin:10px;}
.checkbox{ float:left; width:60px;margin-left:15px;margin-top: -1px;}
.date-btn{ float:left; width:175px; background:url(../images/select.png) no-repeat right; z-index:999;}
.opacity{ width:150px;}
label.edu-radio{ float:none;font-size:16px;line-height:26px; color:#868686; }
.edu-select{ margin-left:10px; width:240px; }
.sf{ float:left;}
.radiobox{ width:115px; float:left;}
.date-title{float:left;    margin-right: 4px;}
.edu-sel{ float:right;}
.edu-about li{ list-style:inside;}
.edu-about{ list-style:inside;font-size:14px;line-height:26px;color:#868686; margin:0 35px; margin-bottom:35px; cursor:pointer;}

src/main/webapp/information-add.html

                        <td><div class="basiccon"><input type="text" class="inputtxt" id="title"></div></td>
                    </tr>
                     <tr>
                    	<td><div class="basictype">在地址</div></td>
                    	<td><div class="basictype">所在在地</div></td>
                        <td><div class="basiccon"><input type="text" class="inputtxt" id="address"></div></td>
                    </tr>
                    

src/main/webapp/information.html

						<input type="text" class="input-txt edu-txt" id="school">
					</div>
					<div class="infor edu btn-marL date-box">
						<b class="star">&nbsp;</b> 毕业年份
						<div class="date-title"><b class="star">&nbsp;</b> 毕业年份</div>
                        <!--<input type="number" class="date-btn input-txt" id="year" value="2016" />-->
                        <input type="text"  maxLength="4" class="date-btn input-txt" id="year"  onKeypress="if (event.keyCode < 48 || event.keyCode > 57) event.returnValue = false;" value="2016">
					</div>
					<div class="infor edu btn-marL datebox">
						<b class="star">&nbsp;&nbsp;</b>时&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;间
						<div class="check checkbox"><input type="checkbox" class="present" />至今</div>
                        <input type="text"  maxLength="6" class="date-btn input-txt" id="startMonth"  onKeypress="if (event.keyCode < 48 || event.keyCode > 57) event.returnValue = false;" value="201608">
						<div class="date-title"><b class="star">&nbsp;&nbsp;</b>时&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;间</div>
                        <input type="text"  maxLength="6" class="date-btn input-txt " id="startMonth"  onKeypress="if (event.keyCode < 48 || event.keyCode > 57) event.returnValue = false;" value="201608">
						<!--<input class="date-btn input-txt" id="startMonth"/>-->
						<hr class="ago">
                        <input type="text"  maxLength="6" class="date-btn input-txt" id="stopMonth"  onKeypress="if (event.keyCode < 48 || event.keyCode > 57) event.returnValue = false;" value="201608">
						  <hr class="ago">
                          <input type="text"  maxLength="6" class="date-btn input-txt inputno" id="stopMonth"  onKeypress="if (event.keyCode < 48 || event.keyCode > 57) event.returnValue = false;" value="201608">
						<!--<input class="date-btn input-txt ago" id="stopMonth" />-->
						<div class="check checkbox"><input type="checkbox" class="present" />至今</div>
                        
					</div>
					<div class="infor edu btn-marL">
						<input type="text" class="input-txt edu-txt" id="projectName">
					</div>
					<div class="infor edu btn-marL datebox">
						<b class="star">&nbsp;&nbsp;</b>时&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;间
						<div class="check checkbox"><input type="checkbox" class="present" >至今</div>
						<div class="date-title"><b class="star">&nbsp;&nbsp;</b>时&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;间</div>
						
						<!--<input class="date-btn input-txt" id="projectStartMonth"/>-->
                        
                        <input type="text"  maxLength="6" class="date-btn input-txt" id="projectStartMonth"  onKeypress="if (event.keyCode < 48 || event.keyCode > 57) event.returnValue = false;" value="201608">
                        <input type="text"  maxLength="6" class="date-btn input-txt " id="projectStartMonth"  onKeypress="if (event.keyCode < 48 || event.keyCode > 57) event.returnValue = false;" value="201608">
						<hr class="ago">
						<!--<input class="date-btn input-txt ago" id="projectStopMonth"/>-->
                        <input type="text"  maxLength="6" class="date-btn input-txt" id="projectStopMonth"  onKeypress="if (event.keyCode < 48 || event.keyCode > 57) event.returnValue = false;" value="201608">
                        
                        <input type="text"  maxLength="6" class="date-btn input-txt inputno" id="projectStopMonth"  onKeypress="if (event.keyCode < 48 || event.keyCode > 57) event.returnValue = false;" value="201607">
                        <div class="check checkbox"><input type="checkbox" class="present" >至今</div>
					</div>
					<div class="infor edu btn-marL">
						<b class="star">&nbsp;&nbsp;</b>描&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;述
						<input type="text" class="input-txt edu-txt" id="paperName">
					</div>
					<div class="infor edu btn-marL date-box">
						<b class="star">&nbsp;&nbsp;</b>发表时间
						<div class="date-title"><b class="star">&nbsp;&nbsp;</b>发表时间</div>
						<!--<input type="text" class="date-btn input-txt" id="paperYear">-->
                        <input type="text"  maxLength="4" class="date-btn input-txt" id="paperYear"  onKeypress="if (event.keyCode < 48 || event.keyCode > 57) event.returnValue = false;" value="2016">
                        
						<input type="text" class="input-txt edu-txt" id="patentName">
					</div>
					<div class="infor edu btn-marL date-box">
						<b class="star">&nbsp;&nbsp;</b>发表时间
						<div class="date-title"><b class="star">&nbsp;&nbsp;</b>发表时间</div>
						<!--<input type="text" class="date-btn input-txt" id="patentYear">-->
                         <input type="text"  maxLength="4" class="date-btn input-txt" id="patentYear"  onKeypress="if (event.keyCode < 48 || event.keyCode > 57) event.returnValue = false;" value="2016">
                        
						<input type="text" class="input-txt edu-txt" id="honorName">
					</div>
					<div class="infor edu btn-marL date-box">
						<b class="star">&nbsp;&nbsp;</b>时&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;间
						<div class="date-title"><b class="star">&nbsp;&nbsp;</b>时&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;间</div>
						<!--<input type="text" class="date-btn input-txt" id="honorYear">-->
                      
                        <input type="text"  maxLength="4" class="date-btn input-txt" id="honorYear"  onKeypress="if (event.keyCode < 48 || event.keyCode > 57) event.returnValue = false;" value="2016">

src/main/webapp/js/account-set.js

$(function(){
	
	loginStatus();//读取用户头像	
	    loginStatus();//读取用户头像
	    valUser();
	   
		var userid = $.cookie("userid");
		valUser();
		$("#hsearch").on("click",function (){
		//个人信息头像获取
   		$("#headimg").attr("src", "/images/head/" + userid + "_l.jpg");
		$("#headimg").load(function() {
		}).error(function() {
				$("#headimg").attr("src",  "/images/default-photo.jpg");
		})
		//获取用户用户名
		$.ajax({	
			"url":"/ajax/professor/info/"+userid,
			"type":"get",
			"success":function($data){
				if($data.data)
				{	
					$('#username').text($data.data.name);
				}
			}
		})	
		
     	$("#hsearch").on("click",function (){
	   		var searchContent = $("#hsearchContent").val();
	   		location.href = "search.html?searchContent="+searchContent;
	   		//个人信息头像获取
	   		$("#headimg").attr("src", "/images/head/" + userid + "_l.jpg");
			$("#headimg").load(function() {})
				.error(function() {
					$("#headimg").attr("src",  "/images/default-photo.jpg");
				});
})
		});
		
});
		/*专家信息左导航背景点击切换*/
		$(".leftsidebar").click(function(){
			var index = $(this).index()-1;
			$(this).addClass("edit-position-left")	
			},function(){
			$(this).removeClass("edit-position-left")			
				});
		});
		//邮箱绑定，手机绑定，点击关闭隐藏这两个部分
		$(".times").click(function(){
			$(".cover").hide();	
			$(".cover2").hide();	
		})
		});
		//邮箱绑定，手机绑定，点击返回，隐藏这两个部分
		$(".back-btn").click(function(){
			$(".cover").hide();		
			$(".cover2").hide();		
		})
		});
		//这个标签已经隐藏了，点击手机账号绑定
		$(".replace2").click(function(){
			$(".cover2").show();		
		})
		});
		//这个标签已经隐藏了，点击邮箱账号绑定
		$(".replace1").click(function(){
			$(".cover").show();		
		})
		});
		//点击邮箱账号绑定
		$(".replace5").click(function(){
			$(".cover").show();		
		//点击手机账号绑定
		$(".replace6").click(function(){
			$(".cover2").show();		
		})
		});
		//判断是否绑定了邮箱
		var emailCookie = $.cookie("userEmail");
		var phoneCookie = $.cookie("userMobilePhone");
			$(".replace2").show();	
			$(".replace4").hide();		
		}
	})
	var oldPass = false;
	var isPass = false;
	var isPass2 = false;
        if(gunf.test(email.trim())){
           $(".msg11 span").text("");
           emailPass = true;
           emailSuccess();
        }else{
        	/*alert("请输入正确是邮箱地址");*/
        	$(".msg11").text("请输入正确是邮箱地址");
        	$(".msg11 span").text("请输入正确是邮箱地址");
        	emailPass = false;
        }
	}
	//获取邮箱，填写地址
	function emailSuccess()
	{
		var mailVal =$('#email').val();
		$(".act-color").each(function() {  
	        var url = mailVal.split('@')[1];
	        for (var j in hash){  
	            $(this).attr("href", hash[url]);  
	        }  
	     });
	}
	
	 var mailCode = GetQueryString('sc');
	//获取邮箱验证码传值注册
	if(mailCode!=''){
	    $.ajax("/ajax/bindMail/"+mailCode,{
				type:"post",
				async: true,
				success:function(data){ 
				   console.log(data);
				},
				error:function(){
				   $.MsgBox.Alert('消息','邮箱注册失败')
				},
				data:{},			
			 	dataType: 'json'}
		); 	 
	 }
	
	//点击邮箱激活
	function bindEmail(){
		valEmail();
		if(emailPass == true){
			$.ajax("/ajax/reqBindMail",{
					type:"GET",
					 async: false,
					async: false,
					success:function(data){ 
						console.log(data);
						if(data.success){
							if(data.data == true){
								/*alert("请检查邮件,设置成功后请重新登录!");*/
								location.href="login.html";
								alert("请检查邮件,设置成功后请重新登录!");
								var mailVal =$('.act-color').attr("href");  
								location.href=mailVal;
							}else{
								/*alert("邮箱设置失败");*/
								$.MsgBox.Alert("消息","设置错误!");

src/main/webapp/js/information-add.js

$("#orgName").blur(function(){
	var org=$("#orgName").val();
	if(org.length==0 && org==""){
		$(".basicmsg2").text("请输入您的姓名");
		$(".basicmsg2").text("请输入您的机构");
	}else{
		$(".basicmsg2").text("");
		orgPass=true;

src/main/webapp/js/information.js

			var patentShow = function(data){
				if(data.length>0){
					for (var i = 0; i < data.length; i++) {
						$("#patentShow").append("<li>"+data[i].name+"</li>");					
						$("#patentList").append("<li class='pat'>"+data[i].name+"<span class=\"modi\"  title='"+data[i].id+"'><img src=\"images/madify.png\"></span><span class=\"remove\" title='"+data[i].id+"' ><img src=\"images/move.png\" ></span></li>");
						$("#patentShow").append("<li>"+data[i].name+"－"+data[i].year+"</li>");					
						$("#patentList").append("<li class='pat'>"+data[i].name+"－"+data[i].year+"<span class=\"modi\"  title='"+data[i].id+"'><img src=\"images/madify.png\"></span><span class=\"remove\" title='"+data[i].id+"' ><img src=\"images/move.png\" ></span></li>");
					}
				}
			}
		location.href="workspaces.html?"+userid;
	})
//到至今选中复选框的操作
$(".present").click(function(){
/*$(".present").click(function(){
	var date = $(".present").index(this);
	$(".datebox").eq(date).find(".ago").remove();
	$(".datebox").eq(date).css("width","326px");
	})
	})*/
$(".present").change(function(){
	if($(".present").is(":checked"))
	{
		$(this).parent().parent().find('.ago').hide();
		$(this).parent().parent().find('.inputno').hide();
		
	}else{
	
		$(this).parent().parent().find('.ago').show();
		$(this).parent().parent().find('.inputno').show();
	}
})	
	
/*ģ��Selectѡ���*/
 $(".input_select").click(function(){ 

src/main/webapp/js/login.js

})
	var namePass = false;
	var passwordPass = false;
	//校验登录账户
	function nameVal()
	{
		var loginName= $("#loginName").val();
		
		if(loginName.length==0)
		{
	        $(".msg1").text("请输入您的邮箱地址或者手机号码");
	            var gunf=/^\w+@\w+\.((cn)|(com)|(com\.cn))$/;
	            if(gunf.test(loginName.trim()))
	            {
	            { 
	               userRegisterOk()
	               $(".msg1").text("");
	               namePass = true;
	            }
	            	var hunPhone=/^1[3|4|5|7|8]\d{9}$/;
					if(hunPhone.test(loginName.trim()))
					{
						userRegisterOk()
						$(".msg1").text("");
						namePass = true;
					}
	            }
	        }
	    }
		
		
	    
	}
	
	//校验登录密码
	function passwordVal(){
		var password = $("#loginName").val();
		var password = $("#password").val();
		if(password.length==0){
			$(".msg3").text("请输入密码");
			passwordPass = false;
		}
	}	
   
	//判断账号是否注册
	function userRegisterOk(){
		var loginName= $("#loginName").val();
		//console.log(loginName);
		$.ajax("/ajax/isReg?key="+loginName,{
			type:"GET",
			async: true,
			success:function($data){ 
				//console.log($data);
			    if($data.data==true){
			    	 $(".msg1").text("用户不存在请注册用户");
			    	 return false; 
			    }
			},
			error:function(){
				$.MsgBox.Alert('消息','服务器请求失败')},
			}
		);
	}	
	//判断用户第一次登录，是否填写了个人信息
	function firstLogin(){
		var professorId = $.cookie('userid');
			},
			"error":function(){$.MsgBox.Alert('message','failddd')}
		})	
	}	
	}
	
	//提交登录
	function login(){
		nameVal();
		passwordVal();

src/main/webapp/js/register.js

{
	var email = $("#lp_email").val();
	var gunf=/^\w+@\w+\.((cn)|(com)|(com\.cn))$/;
	
	$.ajax("/ajax/isReg?key="+email,{
		type:"GET",
		async: true,
			$.MsgBox.Alert('消息','服务器请求失败')},
		}
	);
	
	   
}
$("#lp_email").blur(function(){

src/main/webapp/js/search.js

		var userid = $.cookie("userid");
		var c=0;
		var  subject;
		var key=$("#searchContent").val();
		var industry;
		var pageSize;
		var sub="PRO_SUBJECT";
		var address= $("#address .colorbg")[0].title;
		$("#searchContent").val(GetQueryString("searchContent")); 
		$("#hsearchContent").val(GetQueryString("searchContent")); 
		
		var key=$("#searchContent").val();
 		var getData = function (key,subject,industry,pageSize,pageNo,isbind,add)
 		{ 			
 			if(c==0)

src/main/webapp/photo-set.html

                                             <img src="" width="602" height="400" id="headImage" />
                                         </div>
                                     </div>
                                     <div class="jy-up-ch">
                                     <!-- <div class="jy-up-ch" >
                                         <a id="idLeft" href="" class="bch bch1"></a>
                                         <a id="idSmall" href="" class="bch bch2"></a>
                                         <a id="idBig" href="" class="bch bch3"></a>
                                         <a id="idRight" href="" class="bch bch4"></a>
                                     </div>
                                     </div> -->
                                 </div>
                     </div>
                     <!---->
                             <div class="pre-2">
                                 <img src="" class="jcrop-preview jcrop_preview_s" alt="" id="middleImage"/>
                             </div>
                             <p>50px*50px</p>
                             <p>66px*66px</p>
                             <div class="pre-3">
                                 <img src="" class="jcrop-preview jcrop_preview_s" alt="" id="smallImage"/>
                             </div>
                             <p>26px*26px</p>
                             <p>30px*30px</p>
                         </div>
                     </div>
                 </div>
	var boxWidth = $(".photo-box").width();
	var boxHeight = $(".photo-box").height();
	$(".photo-box").css({ top:"40px", left: (_widht - boxWidth) / 2 + "px" });
    $('#largeImage').attr("style","");
    $('#middleImage').attr("style","");
    $('#smallImage').attr("style","");
	var id = $.cookie('userid');
	var cacheImageKey=null;
	if(id){
		$("#headImage").attr("src","/images/head/"+id+"_l.jpg");
		$("#smallImage").attr("src","/images/head/"+id+"_l.jpg");
		$("#middleImage").attr("src","/images/head/"+id+"_l.jpg");
		$("#smallImage").attr("src","/images/head/"+id+"_s.jpg");
		$("#middleImage").attr("src","/images/head/"+id+"_m.jpg");
		$("#largeImage").attr("src","/images/head/"+id+"_l.jpg");
		$('#uploadInput').live('change',function(){ 
			$("#jcropdiv").show();
				fileElementId:"uploadInput",
				dataType:"json",
				success:function($data){
				     console.log($data);
					if($data.success){
						cacheImageKey =$data.data[0].cacheKey
						cacheImageKey =$data.data[0].cacheKey;
						 console.log(cacheImageKey);
						$("#headImage").attr("src","/images/tmp/"+cacheImageKey);
						$("#smallImage").attr("src","/images/tmp/"+cacheImageKey);
						$("#middleImage").attr("src","/images/tmp/"+cacheImageKey);
		});
		
	}
    
    //保存
	$("#saveImage").on("click",function(){
		var x = parseInt($("#x").val()/395*100);
		var y = parseInt($("#y").val()/340*100);
				data:{"id":id,"fn":cacheImageKey,"x":x,"y":y,"w":w,"h":h},
				dataType:"json",
				success:function($data){
				    console.log($data);
					if($data.success){
						$.MsgBox.Alert("消息","上传成功");
						location.reload(true);
						
					}else{
						$.MsgBox.Alert("message",$data.msg);
					}
		}
	});
    //取消
	$(".close").on("click",function(){
		$(".load").show();
		$("#jcropdiv").hide();
		$("#middleImage").attr("src","");
		$("#largeImage").attr("src","");
	})
    
    //返回
	$("#back").on("click",function(){
		location.href="index.html";
	})