Home Explore Help
Register Sign In
bulomakaka
/
ekexiu.com.portal
Watch 7
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Commits 148 Releases 0 Wiki
Browse Source

1、在搜索页面添加了科研资源搜索功能
2、减小了登录注册相关页面的刷新闪动幅度现象

luyanan 8 years ago
parent
096c660688
commit
fcbdb600ae
26 changed files with 175 additions and 100 deletions
Split View Show Diff Stats
  1. 2 2
      src/main/webapp/css/index.css
  2. 9 8
      src/main/webapp/css/login.css
  3. 1 1
      src/main/webapp/css/workspace.css
  4. 5 2
      src/main/webapp/js/information.brow.js
  5. 8 2
      src/main/webapp/js/information.js
  6. 5 4
      src/main/webapp/js/login-email-find01.js
  7. 3 3
      src/main/webapp/js/login-email-find02.js
  8. 3 3
      src/main/webapp/js/login-email-find03.js
  9. 3 3
      src/main/webapp/js/login-first.js
  10. 3 4
      src/main/webapp/js/login-invite-code.js
  11. 7 7
      src/main/webapp/js/login-phone-find01.js
  12. 3 3
      src/main/webapp/js/login-phone-find02.js
  13. 3 3
      src/main/webapp/js/login.js
  14. 3 3
      src/main/webapp/js/register.js
  15. 8 0
      src/main/webapp/js/sciresource.js
  16. 78 26
      src/main/webapp/js/search.js
  17. 3 3
      src/main/webapp/login-email-find01.html
  18. 3 2
      src/main/webapp/login-email-find02.html
  19. 2 1
      src/main/webapp/login-email-find03.html
  20. 3 1
      src/main/webapp/login-first.html
  21. 3 1
      src/main/webapp/login-invite-code.html
  22. 3 3
      src/main/webapp/login-phone-find01.html
  23. 3 4
      src/main/webapp/login-phone-find02.html
  24. 2 1
      src/main/webapp/login.html
  25. 2 1
      src/main/webapp/register.html
  26. 7 9
      src/main/webapp/search.html

+ 2 - 2
src/main/webapp/css/index.css
View File 

@ -290,9 +290,9 @@ label.edu-radio{ float:none;font-size:16px;line-height:26px; color:#868686; }
290 290 
.shareabout{ position:relative; margin:0 20px;}
291 291 
.sharesrcbox{overflow:hidden; position:relative; margin:auto; width:640px;  }
292 292 
.sharescrollbox{ overflow:hidden;width:30000em; position:relative; left:0;}
293 
.sharescrollbox .sharesrc{ width:192px; margin:10px; float:left;}
293 
.sharescrollbox .sharesrc{ width:200px; margin:10px 6px; float:left;}
294 294 
.sharescrollbox .briefinfor{ width:100%; max-height:100px; text-overflow:ellipsis; overflow:hidden; }
295 
.sharescrollbox .shareshow{ position:relative;}
295 
.sharescrollbox .shareshow{ position: relative; width: 200px; height: 200px;border-radius: 4px; overflow: hidden;}
296 296 
.shareopeart{ position:absolute; bottom:0px; left:0px; z-index:100; overflow:hidden; width:100%;}
297 297 
.sharebtn{ display:block; text-align:center; float:left; cursor:pointer; width:50%; height:30px;font-size:14px;line-height:30px; background:rgba(0,0,0,.2); color:#fff; border:1px solid #d6d6d6;}
298 298 
.sharebtn:hover{ color:#fff; background:#ff8400;}

+ 9 - 8
src/main/webapp/css/login.css
View File 

@ -12,7 +12,8 @@ html,body{ cursor:default; margin:0; height:100%;}
12 12 
.input_warning{ border:1px solid red; }
13 13 
.submitBtn {display: block;padding: 0; font-size:16px;width: 100%;cursor:pointer;height: 44px;text-indent:0;line-height: 44px;background: #ff8400;text-align: center;margin: 15px 0px;color: #fff;border:1px solid #ff8400;}
14 14 
/*登录邀请码*/
15 
.loginbox{ /*width:620px; height:600px;*/ background:#fff; margin:auto; padding:20px; margin-bottom:40px;  position:absolute;  z-index:999; border-radius:10px; border:1px #9f9d9d solid; box-shadow:1px 1px 8px #9f9d9d; }
15 
.loginbox{ width:710px;background:#fff; margin:auto; padding:20px; margin-bottom:40px;  position:relative;top:50%; z-index:999; border-radius:10px; border:1px #9f9d9d solid; box-shadow:1px 1px 8px #9f9d9d; }
16 
.loginbox-invite{width:520px;}
16 17
17 18 
.login-title{ color:#ff8500;font-size:16px;line-height:86px; position:absolute;right:20px; top:-10px; cursor:pointer;}
18 19 
.login-title a{ color:#ff8500; }

@ -63,7 +64,7 @@ html,body{ cursor:default; margin:0; height:100%;}
63 64 
.ecode p{ font-size:14px;}
64 65 
.downcode{ margin:10px auto; width:120px; height:120px;}
65 66 
/*首次登录*/
66 
.login-first{ /*width:466px; height:596px;*/ background:#fff; margin:auto; margin-top:35px; padding:40px 60px; position:absolute;  z-index:999; border-radius:10px; border:1px #9f9d9d solid; box-shadow:1px 1px 8px #9f9d9d;margin-bottom:40px;}
67 
.login-first{ width:554px;  background:#fff; margin:auto;padding:40px 60px; position:relative;top:30%;  z-index:999; border-radius:10px; border:1px #9f9d9d solid; box-shadow:1px 1px 8px #9f9d9d;margin-bottom:40px;}
67 68 
.logos{ clear:both;width:145px; height:100px; margin:auto; padding-top:-40px;}
68 69 
.logos img{ width:100%;}
69 70 
.welcome{font-size:16px;line-height:32px;color:#747474; text-align:center;padding:10px 0;}

@ -74,7 +75,7 @@ html,body{ cursor:default; margin:0; height:100%;}
74 75 
.psd{ width:350px; float:left;}
75 76 
.forget:hover .prompt{ display:block;}
76 77 
/*手机找回密码01*/
77 
.phone-find1{ /*width:476px; height:596px;*/ background:#fff; margin:auto; margin-top:35px; padding:0 25px;padding-bottom:60px; position:absolute; z-index:999; border-radius:10px; border:1px #9f9d9d solid; box-shadow:1px 1px 8px #9f9d9d; margin-bottom:40px; }
78 
.phone-find1{ width:510px;background:#fff; margin:auto; padding:0 40px; padding-bottom:40px; position:relative;top:30%;z-index:999; border-radius:10px; border:1px #9f9d9d solid; box-shadow:1px 1px 8px #9f9d9d; margin-bottom:40px; }
78 79 
.logo-find{width:76px; height:53px; margin:auto; padding-top:20px; float:left;}
79 80 
.logo-find img{ width:100%;}
80 81 
.steps{ clear:both;width:290px; height:90px; padding:20px 0;font-size:20px;line-height:70px; color:#f59503; text-align:center;  margin:auto; position: relative;  }

@ -87,11 +88,11 @@ html,body{ cursor:default; margin:0; height:100%;}
87 88 
.codebox{ overflow:hidden;}
88 89 
.gain{ width:160px;background:#ff8500; color:#fff;font-size:14px;line-height:44px; box-shadow:none; float:right; padding-left:0; margin:4px 0;}
89 90 
/*手机找回密码02*/
90 
.phone-find2{/* width:476px; height:525px; */background:#fff; margin:auto; margin-top:35px; padding:0 25px;padding-bottom:60px; position:absolute;  z-index:999; border-radius:10px; border:1px #9f9d9d solid; box-shadow:1px 1px 8px #9f9d9d;margin-bottom:40px;}
91 
.phone-find2{ width:510px;background:#fff; margin:auto;padding:0 40px; padding-bottom:40px; position:relative;top:30%; z-index:999; border-radius:10px; border:1px #9f9d9d solid; box-shadow:1px 1px 8px #9f9d9d;margin-bottom:40px;}
91 92 
.steps2-2{ color:#f59503; float:right;}
92 93 
.step02-2{ display:block; width:46px; height:30px; background:url(../images/02.png) no-repeat; background-position:left; overflow:hidden; margin:auto;}
93 94 
/*邮箱找回密码01*/
94 
.email-find1{/* width:476px; height:512px;*/ background:#fff; margin:auto; margin-top:35px; padding:0 25px;padding-bottom:40px; position:absolute; z-index:999; border-radius:10px; border:1px #9f9d9d solid; box-shadow:1px 1px 8px #9f9d9d; margin-bottom:40px; }
95 
.email-find1{ width:500px; background:#fff; margin:auto; padding:0 40px; padding-bottom:40px; position:relative;top:30%;z-index:999; border-radius:10px; border:1px #9f9d9d solid; box-shadow:1px 1px 8px #9f9d9d; margin-bottom:40px; }
95 96 
.email-steps{ clear:both;width:438px; height:90px; padding:20px 0;font-size:20px;line-height:70px; color:#f59503; text-align:center;  margin:auto; position: relative;  }
96 97 
.E-steps2{ color:#a3a3a3; float:left; margin-left:70px;}
97 98 
.E-step02{ display:block; width:46px; height:30px; background:url(../images/02.png) no-repeat; background-position:right; overflow:hidden; margin:auto;}

@ -100,12 +101,12 @@ html,body{ cursor:default; margin:0; height:100%;}
100 101 
.line2{ width:95px; height:2px; background:#d5d5d5; position:absolute; left:95px; top:35px}
101 102 
.line3{ width:95px; height:2px; background:#d5d5d5; position:absolute; left:265px; top:35px}
102 103 
/*邮箱找回密码02*/
103 
.email-find2{/* width:476px; height:440px; */background:#fff; margin:auto; margin-top:35px; padding:0 25px; padding-bottom:60px;position:absolute; z-index:999; border-radius:10px; border:1px #9f9d9d solid; box-shadow:1px 1px 8px #9f9d9d; margin-bottom:40px; }
104 
.email-find2{width:490px;background:#fff; margin:auto; padding:0 40px; padding-bottom:40px;position:relative;top:30%; z-index:999; border-radius:10px; border:1px #9f9d9d solid; box-shadow:1px 1px 8px #9f9d9d; margin-bottom:40px; }
104 105 
.E-steps2-2{ color:#f59503; float:left; margin-left:70px;}
105 106 
.E-step02-2{ display:block; width:46px; height:30px; background:url(../images/02.png) no-repeat; background-position:left; overflow:hidden; margin:auto;}
106 107 
.remind{font-size:14px;line-height:20px; color:#a8a8a8; text-align:center; }
107 108 
/*邮箱找回密码03*/
108 
.email-find3{ /*width:476px; height:525px;*/ background:#fff; margin:auto; margin-top:35px; padding:0 25px; padding-bottom:60px; position:absolute;z-index:999; border-radius:10px; border:1px #9f9d9d solid; box-shadow:1px 1px 8px #9f9d9d;margin-bottom:40px;}
109 
.email-find3{ width:524px; background:#fff; margin:auto; padding:0 40px; padding-bottom:40px; position:relative;top:30%;z-index:999; border-radius:10px; border:1px #9f9d9d solid; box-shadow:1px 1px 8px #9f9d9d;margin-bottom:40px;}
109 110 
.steps3-3{ color:#f59503; float:right;}
110 111 
.step03-3{ display:block; width:45px; height:30px; background:url(../images/03.png) no-repeat; background-position:left; overflow:hidden; margin:auto;}
111 112 


@ -140,7 +141,7 @@ html,body{ cursor:default; margin:0; height:100%;}
140 141
141 142 
/*注册*/
142 143
143
144 
.registerbox{ width:}
144 145 
.active { color: #ff8400;}
145 146 
.regtab { position: relative;}
146 147 
.regtabcon{ overflow:hidden;}

+ 1 - 1
src/main/webapp/css/workspace.css
View File 

@ -97,7 +97,7 @@
97 97 
.sharesrcbox11{ overflow:hidden; width:100%; padding:10px; height:240px;}
98 98 
.sharesrcbox11 .sharesrc{ width:28%; margin:10px 20px; float:left;}
99 99 
.sharesrcbox11 .briefinfor{ width:100%; max-height:100px; text-overflow:ellipsis; overflow:hidden; }
100 
.sharesrcbox11 .shareshow{ position:relative; overflow:hidden;}
100 
.sharesrcbox11 .shareshow{ position:relative; overflow:hidden;border-radius: 4px;}
101 101 
.sharesrcbox11 .shareopeart{ position:absolute;background:rgba(0,0,0,.4); line-height:30px; text-align:center; bottom:-30px; left:0px; z-index:100; overflow:hidden; width:100%; cursor:pointer;}
102 102
103 103 
.objectsrcbox{ overflow:hidden; width:100%; padding:10px; height:160px;}

+ 5 - 2
src/main/webapp/js/information.brow.js
View File 

@ -378,7 +378,7 @@ $(".subsidebar").click(function(){
378 378 
					for(var i=0;i<data.data.length;i++){
379 379 
						add='<div class="sharesrc">'
380 380 
						add+='<div class="shareshow">'
381 
	                	add+='<a href=""><img src="/images/resource/'+data.data[i].resourceId+'.jpg" width="100%" height="140" class="resourceImg"></a>'
381 
	                	add+='<a href=""><img src="/images/resource/'+data.data[i].resourceId+'.jpg" width="100%" height="100%" class="resourceImg"></a>'
382 382 
	                 	add+='<div class="shareopeart"><a class="sharebtn">咨询</a><a class="sharebtn applicant">申请</a></div>'
383 383 
	             		add+='</div>'
384 384 
	             		add+='<p>资源名称：<span class="presou">'+ data.data[i].resourceName+'</span></p>'

@ -486,7 +486,10 @@ $(".subsidebar").click(function(){
486 486 
			var m=console.log();
487 487 
			var resourceID=$(this).attr("resourceId");
488 488 
			$(".resouImage").attr("src","/images/resource/"+resourceID+".jpg");
489
489 
			$(".resouImage").load(function(){})
490 
				.error(function(){
491 
					$(this).attr("src","/images/default-resource.jpg");
492 
				});
490 493
491 494 
			//console.log(resourceID);
492 495 
			//

+ 8 - 2
src/main/webapp/js/information.js
View File 

@ -1055,7 +1055,7 @@ getProfessorData()
1055 1055 
					for(var i=0;i<data.data.length;i++){
1056 1056 
						add='<div class="sharesrc">'
1057 1057 
						add+='<div class="shareshow">'
1058 
	                	add+='<a href=""><img src="" width="100%" height="140"></a>'
1058 
	                	add+='<a href=""><img src="/images/resource/'+data.data[i].resourceId+'.jpg" width="100%" height="100%" class="resouImage"></a>'
1059 1059 
	                 	add+='<div class="shareopeart"></div>'
1060 1060 
	             		add+='</div>'
1061 1061 
	             		add+='<p>资源名称：<span class="presou">'+ data.data[i].resourceName+'</span></p>'

@ -1064,7 +1064,13 @@ getProfessorData()
1064 1064 
	             		}
1065 1065 
	             		add+='<p class="briefinfor">简介:'+data.data[i].descp+'</p>'
1066 1066 
	        			add+='</div>'
1067 
	        			$(".sharescrollbox").append(add);
1067 
	        			$(".sharescrollbox").append(add);
1068
1069 
						$(".resouImage").load(function(){})
1070 
							.error(function(){
1071 
								$(this).attr("src","/images/default-resource.jpg");
1072 
							});
1073
1068 1074 
						add="";
1069 1075 
					}
1070 1076 
					//资源轮播

+ 5 - 4
src/main/webapp/js/login-email-find01.js
View File 

@ -1,8 +1,8 @@
1 
	var _widht = document.documentElement.clientWidth;  //屏幕宽
1 
//	var _widht = document.documentElement.clientWidth;  //屏幕宽
2 2 
	var _height = document.documentElement.clientHeight; //屏幕高
3 
	var boxWidth = $(".email-find1").width();
3 
//	var boxWidth = $(".email-find1").width();
4 4 
	var boxHeight = $(".email-find1").height();
5 
	$(".email-find1").css({ top: (_height - boxHeight) / 2 +"px", left: (_widht - boxWidth) / 2 + "px" });
5 
	$(".email-find1").css({ top: (_height - boxHeight) / 2 +"px" });
6 6
7 7
8 8 
	var isPass = false;

@ -30,8 +30,9 @@
30 30 
		if(isPass){
31 31 
		$.ajax("/ajax/reqRpWithEmail",{
32 32 
				type:"GET",
33 
			    async: false,
33 
				 async: false,
34 34 
				success:function(data){
35
35 36 
					if(data.success){
36 37 
						if(data.data){
37 38 
							location.href="login-email-find02.html?email="+$("#email").val();

+ 3 - 3
src/main/webapp/js/login-email-find02.js
View File 

@ -2,11 +2,11 @@
2 2 
 * 邮箱找密码第二步
3 3 
 */
4 4 
$(function (){
5 
	var _widht = document.documentElement.clientWidth;  //屏幕宽
5 
	//var _widht = document.documentElement.clientWidth;  //屏幕宽
6 6 
	var _height = document.documentElement.clientHeight; //屏幕高
7 
	var boxWidth = $(".email-find2").width();
7 
	//var boxWidth = $(".email-find2").width();
8 8 
	var boxHeight = $(".email-find2").height();
9 
	$(".email-find2").css({ top: (_height - boxHeight) / 2 +"px", left: (_widht - boxWidth) / 2 + "px" });
9 
	$(".email-find2").css({ top: (_height - boxHeight) / 2 +"px"});
10 10
11 11 
	$("#email").text(GetQueryString("email"));
12 12 
    $("#emailGo").on("click", function(){

+ 3 - 3
src/main/webapp/js/login-email-find03.js
View File 

@ -3,11 +3,11 @@
3 3 
 */
4 4 
$(function (){
5 5
6 
	var _widht = document.documentElement.clientWidth;  //屏幕宽
6 
	//var _widht = document.documentElement.clientWidth;  //屏幕宽
7 7 
	var _height = document.documentElement.clientHeight; //屏幕高
8 
	var boxWidth = $(".email-find3").width();
8 
	//var boxWidth = $(".email-find3").width();
9 9 
	var boxHeight = $(".email-find3").height();
10 
	$(".email-find3").css({top: (_height - boxHeight) / 2 +"px", left: (_widht - boxWidth) / 2 + "px" });
10 
	$(".email-find3").css({top: (_height - boxHeight) / 2 +"px"});
11 11
12 12 
	//输入密码及确认密码获取
13 13 
	var oldPass = false;

+ 3 - 3
src/main/webapp/js/login-first.js
View File 

@ -1,9 +1,9 @@
1 1
2 
	var _widht = document.documentElement.clientWidth;  //屏幕宽
2 
	//var _widht = document.documentElement.clientWidth;  //屏幕宽
3 3 
	var _height = document.documentElement.clientHeight; //屏幕高
4 
	var boxWidth = $(".login-first").width();
4 
	//var boxWidth = $(".login-first").width();
5 5 
	var boxHeight = $(".login-first").height();
6 
	$(".login-first").css({ top: (_height - boxHeight) / 2 +"px", left: (_widht - boxWidth) / 2 + "px" });
6 
	$(".login-first").css({ top: (_height - boxHeight) / 2 +"px" });
7 7
8 8 
//检查用户是否登陆
9 9 
	$(function(){

+ 3 - 4
src/main/webapp/js/login-invite-code.js
View File 

@ -1,8 +1,7 @@
1 
	var _widht = document.documentElement.clientWidth;  //屏幕宽
1
2 2 
	var _height = document.documentElement.clientHeight; //屏幕高
3 
	var boxWidth = $(".loginbox").width();
4 
	var boxHeight = $(".loginbox").height();
5 
	$(".loginbox").css({ top: (_height - boxHeight) / 2 +"px", left: (_widht - boxWidth) / 2 + "px" });
3 
	var boxHeight = $(".loginbox-invite").height();
4 
	$(".loginbox-invite").css({ top: (_height - boxHeight) / 2 +"px" });
6 5
7 6 
	//验证手机号
8 7 
	var phonePass = false;

+ 7 - 7
src/main/webapp/js/login-phone-find01.js
View File 

@ -1,12 +1,12 @@
1 
$(function(){
2 
	var _widht = document.documentElement.clientWidth;  //屏幕宽
1 
//$(function(){
2 
//	var _widht = document.documentElement.clientWidth;  //屏幕宽
3 3 
	var _height = document.documentElement.clientHeight; //屏幕高
4 
	var boxWidth = $(".phone-find1").width();
4 
//	var boxWidth = $(".phone-find1").width();
5 5 
	var boxHeight = $(".phone-find1").height();
6 
	$(".phone-find1").css({ top: (_height - boxHeight) / 2 +"px", left: (_widht - boxWidth) / 2 + "px" });
7
8
9 
	});
6 
	$(".phone-find1").css({ top: (_height - boxHeight) / 2 +"px"});
7 
//
8 
//
9 
//	});
10 10 
	var phonePass = false;
11 11 
	function valPhone(){
12 12 
		var phoneVal = $("#phone").val();

+ 3 - 3
src/main/webapp/js/login-phone-find02.js
View File 

@ -1,9 +1,9 @@
1 1 
$(function (){
2 
	var _widht = document.documentElement.clientWidth;  //屏幕宽
2 
//	var _widht = document.documentElement.clientWidth;  //屏幕宽
3 3 
	var _height = document.documentElement.clientHeight; //屏幕高
4 
	var boxWidth = $(".phone-find2").width();
4 
//	var boxWidth = $(".phone-find2").width();
5 5 
	var boxHeight = $(".phone-find2").height();
6 
	$(".phone-find2").css({ top: (_height - boxHeight) / 2 +"px", left: (_widht - boxWidth) / 2 + "px" });
6 
	$(".phone-find2").css({ top: (_height - boxHeight) / 2 +"px"});
7 7
8 8 
		var vc = GetQueryString("vc");
9 9 
		var state = GetQueryString("state");

+ 3 - 3
src/main/webapp/js/login.js
View File 

@ -1,9 +1,9 @@
1 1 
$(function(){
2 
	var _widht = document.documentElement.clientWidth;  //屏幕宽
2 
	//var _widht = document.documentElement.clientWidth;  //屏幕宽
3 3 
	var _height = document.documentElement.clientHeight; //屏幕高
4 
	var boxWidth = $(".loginbox").width();
4 
	//var boxWidth = $(".loginbox").width();
5 5 
	var boxHeight = $(".loginbox").height();
6 
	$(".loginbox").css({ top: (_height - boxHeight) / 2 +"px", left: (_widht - boxWidth) / 2 + "px" });
6 
	$(".loginbox").css({ top: (_height - boxHeight) / 2 +"px"});
7 7 
//	console.log(_widht);
8 8 
//	console.log(_height);
9 9 
//	console.log(boxWidth);

+ 3 - 3
src/main/webapp/js/register.js
View File 

@ -1,9 +1,9 @@
1 1 
// JavaScript Document
2 
var _widht = document.documentElement.clientWidth;  //屏幕宽
2 
//var _widht = document.documentElement.clientWidth;  //屏幕宽
3 3 
var _height = document.documentElement.clientHeight; //屏幕高
4 
var boxWidth = $(".registerbox").width();
4 
//var boxWidth = $(".registerbox").width();
5 5 
var boxHeight = $(".registerbox").height();
6 
$(".registerbox").css({ top:"40px", left: (_widht - boxWidth) / 2 + "px" });
6 
$(".registerbox").css({ top:"40px"});
7 7
8 8
9 9 
/**复选框**/

+ 8 - 0
src/main/webapp/js/sciresource.js
View File 

@ -95,6 +95,10 @@ $(function(){
95 95 
								$("#descp").val(info.data.descp);
96 96 
								$("#professor").text(name);
97 97 
								$(".resouImage").attr("src","/images/resource/"+resourceID+".jpg");
98 
								$(".resouImage").load(function(){})
99 
									.error(function(){
100 
										$(this).attr("src","/images/default-resource.jpg");
101 
									});
98 102 
								}
99 103 
								else
100 104 
								{

@ -1416,6 +1420,10 @@ function ajaxGet1(operationId){
1416 1420 
					$(".namecon").text(data.data.resource.professor.name);
1417 1421 
					$(".sname").text(data.data.applysquare);
1418 1422 
					$(".resouImage").attr("src","/images/resource/"+data.data.resource.resourceId+".jpg");
1423 
					$(".resouImage").load(function(){})
1424 
						.error(function(){
1425 
							$(this).attr("src","/images/default-resource.jpg");
1426 
						});
1419 1427 
					if(data.data.payMethod){
1420 1428 
						$("#payMethod").text(data.data.payMethod);
1421 1429 
					}

+ 78 - 26
src/main/webapp/js/search.js
View File 

@ -3,21 +3,22 @@ $(function(){
3 3 
		var userid = $.cookie("userid");
4 4 
		var c=0;
5 5 
		var  subject;
6 
		var key;
6 
		var key=$("#searchContent").val();
7 7 
		var industry;
8 8 
		var pageSize;
9
9 
		var sub="PRO_SUBJECT";
10 
		var indu="PRO_INDUSTRY";
11 
		var address= $("#address .colorbg")[0].title;
10 12 
		$("#searchContent").val(GetQueryString("searchContent"));
11 13 
		$("#hsearchContent").val(GetQueryString("searchContent"));
12 14
13 
 		var getData = function (key,subject,industry,pageSize,pageNo,isbind)
14 
 		{
15 
 			console.log(c);
15 
 		var getData = function (key,subject,industry,pageSize,pageNo,isbind,add)
16 
 		{
16 17 
 			if(c==0)
17 18 
 			{
18 19 
 				$.ajax({"url" : "/ajax/professor/pq",
19 20 
					"type" : "GET",
20 
					"data" : {"key":key,"subject":subject,"industry":industry,"pageSize":pageSize,"pageNo":pageNo},
21 
					"data" : {"key":key,"subject":subject,"industry":industry,"pageSize":pageSize,"pageNo":pageNo,"address":add},
21 22 
					"contentType" : "application/x-www-form-urlencoded",
22 23 
					"success" : function($data) {
23 24 
						if ($data.success) {

@ -135,7 +136,7 @@ $(function(){
135 136 
 			                    add+='<div class="synopsis">'
136 137 
 			                    add+='<div><a class="resouname" href="">'+$da[i].resourceName+'</a></div>'
137 138 
 			                    add+='<div class="belongname">'+$da[i].professor.name+'<img class="modicon" src="images/rz.png" width="28"></div>'
138 
 			                    add+='<div class="positionbox">职称，职位，新材料技术研究院，北京科技大学 |  北京</div>'
139 
 			                    add+='<div class="positionbox">'+$da[i].professor.title+$da[i].professor.department+$da[i].professor.orgName+'</div>'
139 140 
 			                    if($da[i].subject)
140 141 
 			                    {
141 142 
 			                    	add+='<div class="sciencebox">'+$da[i].subject+'</div>'

@ -179,10 +180,24 @@ $(function(){
179 180 
 		}
180 181
181 182 
 		var subjectList = function (){
182 
 			$.get("../ajax/dataDict/PRO_SUBJECT",function(data){
183 
 			$.get("../ajax/dataDict/"+sub,function(data){
183 184 
    			if(data.success){
185 
    				$("#subject").find(".sub").remove();
184 186 
    				for(var i = 0 ; i < data.data.length; i++){
185 
    					$("#subject").append("<a href='#' title='"+data.data[i].caption+"'>"+data.data[i].caption+"</a>");
187 
    					$("#subject").append("<a href='#' class='sub'title='"+data.data[i].caption+"'>"+data.data[i].caption+"</a>");
188 
    					if(i>20)
189 
    						break;
190 
    				}
191 
    			}else{
192 
    				$.MsgBox.Alert("message",data.msg);
193 
    			}
194 
    		})
195 
 		}
196 
 		var Address = function (){
197 
 			$.get("../ajax/dataDict/PRO_ADDRESS",function(data){
198 
    			if(data.success){
199 
    				for(var i = 0 ; i < data.data.length; i++){
200 
    					$("#address").append("<a href='#' title='"+data.data[i].caption+"'>"+data.data[i].caption+"</a>");
186 201 
    					if(i>20)
187 202 
    						break;
188 203 
    				}

@ -192,10 +207,11 @@ $(function(){
192 207 
    		})
193 208 
 		}
194 209 
 		var industryList = function (){
195 
 			$.get("../ajax/dataDict/PRO_INDUSTRY",function(data){
210 
 			$.get("../ajax/dataDict/"+indu,function(data){
196 211 
    			if(data.success){
212 
    				$("#industry").find(".indu").remove();
197 213 
    				for(var i = 0 ; i < data.data.length; i++){
198 
    					$("#industry").append("<a href='#' title='"+data.data[i].caption+"'>"+data.data[i].caption+"</a>");
214 
    					$("#industry").append("<a href='#' class='indu'title='"+data.data[i].caption+"'>"+data.data[i].caption+"</a>");
199 215 
    					if(i>20)
200 216 
    						break;
201 217 
    				}

@ -204,53 +220,66 @@ $(function(){
204 220 
    			}
205 221 
    		})
206 222 
 		}
207 
		var findProfessor = function (){
208 
			key = $("#searchContent").val();
223 
		var findProfessor = function (){
209 224 
			subject = $("#subject .colorbg")[0].title;
210 225 
			industry = $("#industry .colorbg")[0].title;
211 226 
			pageSize = 4;
212 
			getData(key,subject,industry,pageSize,1,true);
227 
			getData(key,subject,industry,pageSize,1,true,address);
213 228 
		}
214 
		$("#search").on("click",function(){
215 
			$("#hsearchContent").val($("#searchContent").val());
229 
		$("#search1").on("click",function(){
230 
			$("#hsearchContent").val($("#searchContent").val());
231 
			key = $("#searchContent").val();
216 232 
			$("#professorList").remove();
217 233 
			$(".aboutpro").append('<div class="about-in" id="professorList"></div>')
218 234 
			$(".tcdPageCode").remove();
219 235 
			$(".aboutpro").append('<div class="tcdPageCode"></div>');
220 
			findProfessor();
236 
			getData(key,subject,industry,4,1,true,address);
221 237 
		})
222 
		$("#hsearch").on("click",function(){
223 
			$("#searchContent").val($("#hsearchContent").val());
238 
		$("#hsearch1").on("click",function(){
239 
			$("#searchContent").val($("#hsearchContent").val());
240 
			key = $("#hsearchContent").val();
224 241 
			$("#professorList").remove();
225 242 
			$(".aboutpro").append('<div class="about-in" id="professorList"></div>')
226 243 
			$(".tcdPageCode").remove();
227 244 
			$(".aboutpro").append('<div class="tcdPageCode"></div>');
228 
			findProfessor();
245 
			getData(key,subject,industry,4,1,true,address);
229 246 
		})
230 247
231 248 
		subjectList();
232 249 
 		industryList();
233 250 
		findProfessor();
251 
		Address();
234 252 
		$(".class1").eq(0).on("click","a",function (){
235 253 
			$(this).addClass("colorbg").siblings().removeClass("colorbg");
254 
			key=$("#searchContent").val();
236 255 
			subject = $(this).attr('title');
237 256 
			$("#professorList").remove();
238 257 
			$(".aboutpro").append('<div class="about-in" id="professorList"></div>')
239 258 
			$(".tcdPageCode").remove();
240 259 
			$(".aboutpro").append('<div class="tcdPageCode"></div>');
241 
			findProfessor();
260 
			getData(key,subject,industry,4,1,true,address);
242 261
243 262 
		});
244 263 
		$(".class1").eq(1).on("click","a",function (){
245 264 
			$(this).addClass("colorbg").siblings().removeClass("colorbg");
246 
			industry = $(this).attr('title');
265 
			industry = $(this).attr('title');
266 
			key=$("#searchContent").val();
247 267 
			$("#professorList").remove();
248 268 
			$(".aboutpro").append('<div class="about-in" id="professorList"></div>')
249 269 
			$(".tcdPageCode").remove();
250 270 
			$(".aboutpro").append('<div class="tcdPageCode"></div>');
251 
			findProfessor();
271 
			getData(key,subject,industry,4,1,true,address);
272 
    });
273 
		$(".class1").eq(2).on("click","a",function (){
274 
			$(this).addClass("colorbg").siblings().removeClass("colorbg");
275 
			address = $(this).attr('title');
276 
			key=$("#searchContent").val();
277 
			$("#professorList").remove();
278 
			$(".aboutpro").append('<div class="about-in" id="professorList"></div>')
279 
			$(".tcdPageCode").remove();
280 
			$(".aboutpro").append('<div class="tcdPageCode"></div>');
281 
			getData(key,subject,industry,4,1,true,address);
252 282 
    });
253
254 283 
	/*搜索分类展开*/
255 284 
	  var listi = 0;
256 285 
	 $(".andmore").click(function() {

@ -289,12 +318,28 @@ $(function(){
289 318 
	 //判断是搜寻专家还是资源
290 319 
	 $(".floatL").change(function(){
291 320 
			c=$(".floatL option:selected").val();
292
321 
			$("#industry").find(".no2").addClass("colorbg").siblings().removeClass("colorbg");
322 
			$("#subject").find(".nox").addClass("colorbg").siblings().removeClass("colorbg");
323 
			key=$("#searchContent").val();
324 
			industry="";
325 
			subject="";
326 
		if(c==0){
327 
			sub="PRO_SUBJECT";
328 
			indu="PRO_INDUSTRY";
329 
			$(".class1").eq(2).show();
330 
		}
331 
		else{
332 
			sub="RES_SUBJECT";
333 
			indu="RES_INDUSTRY";
334 
			$(".class1").eq(2).hide();
335 
		}
336 
		industryList();
337 
		subjectList();
293 338 
			$("#professorList").remove();
294 339 
			$(".aboutpro").append('<div class="about-in" id="professorList"></div>')
295 340 
			$(".tcdPageCode").remove();
296 341 
			$(".aboutpro").append('<div class="tcdPageCode"></div>');
297 
			getData(key,subject,industry,pageSize,1,true,c);
342 
			getData(key,subject,industry,pageSize,1,true,address);
298 343 
});
299 344 
	 //资源申请
300 345 
	 function getIdentity(professorId){		

@ -345,6 +390,13 @@ $(function(){
345 390 
			var resName=$(this).attr("resourcename");
346 391 
			var name=$(this).attr("professor");
347 392 
			var resourceID=$(this).attr("resourceId");
393
394 
			$(".resouImage").attr("src","/images/resource/"+resourceID+".jpg");
395 
			$(".resouImage").load(function(){})
396 
				.error(function(){
397 
					$(this).attr("src","/images/default-resource.jpg");
398 
				});
399
348 400 
			$(".namecon").text(name);
349 401 
			$(".applysure").hide();
350 402 
			$(".btnboxup").hide();

+ 3 - 3
src/main/webapp/login-email-find01.html
View File 

@ -17,7 +17,7 @@
17 17
18 18 
<div class="coverbox">
19 19 
		<!--邮箱找回密码01!-->
20 
		<div class="email-find1">
20 
		<div class="email-find1" id="Suspensionbox">
21 21 
			<div class="login-title">
22 22 
			 <a href="login-phone-find01.html">通过手机号找回<span class="back"></span></a>
23 23 
			</div>

@ -65,9 +65,9 @@
65 65
66 66
67 67 
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
68 
<script type="text/javascript" src="/js/jquery.cookie.js"></script>
68 69 
<script type="text/javascript" src="js/jquery.similar.msgbox.js"></script>
69 
<!--<script type="text/javascript" src="js/index.js"></script>
70 
<script type="text/javascript" src="js/form.js"></script>-->
70 
<script type="text/javascript" src="js/common.js"></script>
71 71 
<script type="text/javascript"src="js/login-email-find01.js"></script>
72 72
73 73 
</body>

+ 3 - 2
src/main/webapp/login-email-find02.html
View File 

@ -13,7 +13,7 @@
13 13
14 14 
<div class="coverbox">
15 15 
		<!--邮箱找回密码02-->
16 
		<div class="email-find2">
16 
		<div class="email-find2" id="Suspensionbox">
17 17 
			<div class="login-title">
18 18 
			  <a href="login-phone-find01.html">通过手机号找回<span class="back"></span></a>
19 19 
			</div>

@ -47,7 +47,8 @@
47 47 
</div>
48 48 
<div id="header"></div>
49 49 
<div id="footer"></div>
50 
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
50 
<script type="text/javascript" src="/js/jquery.cookie.js"></script>
51 
<script type="text/javascript" src="js/jquery.similar.msgbox.js"></script>
51 52 
<script type="text/javascript" src="js/common.js"></script>
52 53 
<script type="text/javascript" src="js/login-email-find02.js"></script>
53 54 
</body>

+ 2 - 1
src/main/webapp/login-email-find03.html
View File 

@ -18,7 +18,7 @@
18 18
19 19 
<div class="coverbox">
20 20 
		<!--邮箱找回密码03!-->
21 
		<div class="email-find3">
21 
		<div class="email-find3" id="Suspensionbox">
22 22 
			<div class="login-title">
23 23 
			  <a href="login-phone-find01.html">通过手机号找回<span class="back"></span></a>
24 24 
			</div>

@ -60,6 +60,7 @@
60 60 
<div id="header"></div>
61 61 
<div id="footer"></div>
62 62 
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
63 
<script type="text/javascript" src="/js/jquery.cookie.js"></script>
63 64 
<script type="text/javascript" src="js/jquery.similar.msgbox.js"></script>
64 65 
<script type="text/javascript" src="js/common.js"></script>
65 66 
<script type="text/javascript" src="js/login-email-find03.js"></script>

+ 3 - 1
src/main/webapp/login-first.html
View File 

@ -16,7 +16,7 @@
16 16
17 17 
<div class="coverbox">
18 18 
		<!--首次登录!-->
19 
		<div class="login-first">
19 
		<div class="login-first" id="Suspensionbox">
20 20 
				<div class="login-title">
21 21
22 22 
				</div>

@ -46,6 +46,8 @@
46 46
47 47 
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
48 48 
<script type="text/javascript" src="/js/jquery.cookie.js"></script>
49
50 
<script type="text/javascript" src="js/common.js"></script>
49 51 
<script type="text/javascript" src="js/jquery.similar.msgbox.js"></script>
50 52 
<script type="text/javascript"src="js/login-first.js"></script>
51 53

+ 3 - 1
src/main/webapp/login-invite-code.html
View File 

@ -12,7 +12,7 @@
12 12
13 13 
<div class="coverbox">
14 14 
		<!--登录邀请码!-->
15 
		<div class="loginbox">
15 
		<div class="loginbox loginbox-invite" id="Suspensionbox">
16 16 
			<div class="login-title">
17 17 
			 <a href="login.html">通过已验证手机或邮箱登录<span class="back"></span></a>
18 18 
			</div>

@ -42,7 +42,9 @@
42 42 
<div id="footer"></div>
43 43
44 44 
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
45 
<script type="text/javascript" src="/js/jquery.cookie.js"></script>
45 46 
<script type="text/javascript" src="js/jquery.similar.msgbox.js"></script>
47 
<script type="text/javascript" src="js/common.js"></script>
46 48 
<script type="text/javascript"src="js/login-invite-code.js"></script>
47 49
48 50 
</body>

+ 3 - 3
src/main/webapp/login-phone-find01.html
View File 

@ -17,7 +17,7 @@
17 17
18 18 
<div class="coverbox">
19 19 
		<!--手机找回密码01!-->
20 
		<div class="phone-find1">
20 
		<div class="phone-find1" id="Suspensionbox">
21 21 
			<div class="login-title">
22 22 
			  <a href="login-email-find01.html">通过邮箱找回<span class="back"></span></a>
23 23 
			</div>

@ -62,9 +62,9 @@
62 62 
<div id="footer"></div>
63 63
64 64 
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
65 
<script type="text/javascript" src="/js/jquery.cookie.js"></script>
65 66 
<script type="text/javascript" src="js/jquery.similar.msgbox.js"></script>
66 
<!-- <script type="text/javascript" src="js/index.js"></script> -->
67 
<!-- <script type="text/javascript" src="js/form.js"></script> -->
67 
<script type="text/javascript" src="js/common.js"></script>
68 68 
<script src='js/login-phone-find01.js'></script>
69 69
70 70 
</body>

+ 3 - 4
src/main/webapp/login-phone-find02.html
View File 

@ -17,7 +17,7 @@
17 17
18 18 
<div class="coverbox">
19 19 
		<!--手机找回密码02!-->
20 
		<div class="phone-find2">
20 
		<div class="phone-find2" id="Suspensionbox">
21 21 
			<div class="login-title">
22 22 
			   <a href="login-email-find01.html">通过邮箱找回<span class="back"></span></a>
23 23 
			</div>

@ -55,10 +55,9 @@
55 55 
<div id="footer"></div>
56 56
57 57 
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
58 
<script type="text/javascript" src="js/common.js"></script>
58 
<script type="text/javascript" src="/js/jquery.cookie.js"></script>
59 59 
<script type="text/javascript" src="js/jquery.similar.msgbox.js"></script>
60 
<!--<script type="text/javascript" src="js/index.js"></script>
61 
<script type="text/javascript" src="js/form.js"></script>-->
60 
<script type="text/javascript" src="js/common.js"></script>
62 61 
<script type="text/javascript" src="js/login-phone-find02.js"></script>
63 62
64 63 
</body>

+ 2 - 1
src/main/webapp/login.html
View File 

@ -14,7 +14,7 @@
14 14
15 15 
<div class="coverbox">
16 16 
<!--登录邀请码!-->
17 
<div class="loginbox">
17 
<div class="loginbox" id="Suspensionbox">
18 18 
	<div class="login-title">
19 19 
	 <a href="login-invite-code.html">通过手机和邀请码登录<span class="back"></span></a>
20 20 
	</div>

@ -71,6 +71,7 @@
71 71 
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
72 72 
<script type="text/javascript" src="/js/jquery.cookie.js"></script>
73 73 
<script type="text/javascript" src="js/jquery.similar.msgbox.js"></script>
74 
<script type="text/javascript" src="js/common.js"></script>
74 75 
<script type="text/javascript" src="js/login.js"></script>
75 76
76 77 
</body>

+ 2 - 1
src/main/webapp/register.html
View File 

@ -25,7 +25,7 @@
25 25
26 26 
<div class="coverbox">
27 27 
		<!--注册!-->
28 
		<div class="loginbox registerbox">
28 
		<div class="loginbox registerbox" id="Suspensionbox">
29 29 
			<div class="login-title"></div>
30 30 
			<div class="logo">
31 31 
				<a href="index.html"><img src="images/logo.png"></a>

@ -143,6 +143,7 @@
143 143 
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
144 144 
<script type="text/javascript" src="/js/jquery.cookie.js"></script>
145 145 
<script type="text/javascript" src="js/jquery.similar.msgbox.js"></script>
146 
<script type="text/javascript" src="js/common.js"></script>
146 147 
<script type="text/javascript" src="js/register.js"></script>
147 148 
</body>
148 149 
</html>

+ 7 - 9
src/main/webapp/search.html
View File 

@ -17,7 +17,7 @@
17 17 
	<a href="index.html" alt="科袖" class="logo"></a>
18 18 
	<div class="searchblock searchbox">
19 19 
		<input type="text" placeholder="搜索专家、研究方向或科研机构" class="search-txt" id="hsearchContent">
20 
		<div class="search-btn" id="hsearch"><span class="search-icon"></span></div>
20 
		<div class="search-btn" id="hsearch1"><span class="search-icon"></span></div>
21 21 
	</div>
22 22
23 23 
	<div class="header-right"> 

@ -53,14 +53,14 @@
53 53 
                <div class="sear-search">
54 54 
                	<select class="lookwho floatL"><option value="0">找专家</option><option value="1">找资源</option></select>
55 55 
                    <input type="text" placeholder="搜索专家、研究方向或科研机构" class="sear-txt" id="searchContent">
56 
                    <div class="sear-btn" id="search">搜索</div>
56 
                    <div class="sear-btn" id="search1">搜索</div>
57 57 
                </div>
58 58 
                <!--搜索分类-->
59 59 
                <div class="classify">
60 60 
                    <div class="class1">
61 61 
                        <div class="title">学术领域：</div>
62 62 
                        <div class="area-con" id="subject">
63 
                           <a href="#"  class="colorbg">不限</a>
63 
                           <a href="#"  class="colorbg nox"title="">不限</a>
64 64 
                        </div>
65 65 
                        <span class="andmore">更多<span class="updown"></span></span>
66 66 
                        

@ -68,18 +68,16 @@
68 68 
                    <div class="class1">
69 69 
                        <div class="title">应用行业：</div>
70 70 
                        <div class="area-con" id="industry">
71 
                            <a href="#"  class="colorbg">不限</a>
71 
                            <a href="#"  class="colorbg no2"title="">不限</a>
72 72 
                        </div>
73 73 
                        <span class="andmore">更多<span class="updown"></span></span>
74 74
75 75 
                    </div>
76 76 
                    <div class="class1">
77 77 
                        <div class="title">所在地点：</div>
78 
                        <a href="#"  class="colorbg">不限</a>
79 
                        <a href="#">北京</a>
80 
                        <a href="#">上海</a>
81 
                        <a href="#">深圳</a>
82 
                        <a href="#">哈尔滨</a>
78 
                        <div class="area-con" id="address">
79 
                        <a href="#"  class="colorbg"title="">不限</a>
80 
                        </div>
83 81 
                        <span class="andmore">更多<span class="updown"></span></span>
84 82
85 83 
                    </div>