Browse Source

修改了这些bug:
1.个人信息界面“地址”名字改成“所在地”2.找回密码:重置成功后要返回登录页面 3.找回密码:重置成功后登录也显示异常
4.账户不存在,登录的时候要提示“用户不存在请注册用户”5.简介录入太多,界面就乱了6.社会兼职选择“至今”后,在取消就回不去了。7. 奖项:把时间显示出来,与上面的格式一样就行:
诺贝尔奖-20160902 8.个人信息界面还没有做,把头像和名字提取出来,我的钱包功能先不要做9.修改密码:修改密码后在登录报异常错误

aaa 8 years ago
parent
commit
63862404c7

+ 6 - 4
src/main/webapp/account-set.html

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

+ 1 - 0
src/main/webapp/css/basic.css

@ -15,6 +15,7 @@
15 15
.jcrop_w{ width: 395px; height: 340px; overflow: hidden; }
16 16
.jcrop_w img{ position: absolute; }
17 17
.pre-1,.pre-2,.pre-3{ border: 1px solid #c8c8c8; margin:auto;}
18
.pre-1 img,.pre-2 img,.pre-3 img{width:100%; height:100%}
18 19
.pre-1{ width: 200px; height: 200px; border-radius:50%; overflow:hidden;  }
19 20
.pre-2{ width: 50px; height: 50px;border-radius:50%; overflow:hidden; margin-top: 13px; }
20 21
.pre-3{ width: 26px; height: 26px;border-radius:5px; overflow:hidden;margin-top: 13px; }

+ 8 - 6
src/main/webapp/css/index.css

@ -120,7 +120,8 @@ input{ outline:none;}
120 120
.content-title{height:58px;padding:0 30px;font-size:18px;line-height:64px; color:#313131; border-bottom:1px #c8c8c8 solid;}
121 121
.note{ width:438px; height:74px; margin:auto;font-size:16px;line-height:100px;color:#818181; text-align:center; border-bottom:1px #c8c8c8 dashed;}
122 122
.acountinfor{ width:60%; margin:10px auto; }
123
.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;}
123
.account-photo{ width:175px; height:175px; border-radius:50%;  margin:auto;margin-top:25px; margin-bottom:25px; overflow:hidden;}
124
.account-photo img{width:100%;}
124 125
.account-name{ height:50px; padding: 0 40px;}
125 126
.text-txt{font-size:18px;line-height:50px;color:#515151;}
126 127

@ -221,7 +222,7 @@ input[type='radio'].radio:checked + .radio {background:url(../images/redio.png)
221 222
.right-title{ position:relative; overflow:hidden; padding-right:20px;}
222 223
.right-title span{ float:left;font-size:22px;line-height:48px; /*color:#ff8400; */padding-left:15px;}
223 224
.edit-position-left{ background-position:left;}
224
.editbox{ clear:both; width:665px; max-height:210px; margin:auto;font-size:14px;line-height:20px;color:#3e3e3e;}
225
.editbox{ clear:both; width:665px; min-height:210px; margin:auto;font-size:14px;line-height:20px;color:#3e3e3e;}
225 226
.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;
226 227
}
227 228
.edit{ display:block; float:left; width:22px; height:22px; background:url(../images/edit.png) no-repeat right center;margin: 15px 6px;cursor:pointer;}
@ -260,16 +261,17 @@ input[type='radio'].radio:checked + .radio {background:url(../images/redio.png)
260 261
.edu{ font-size:16px;line-height:26px; color:#868686;}
261 262
.edu-h{ height:52px;}
262 263
.edu-txt{ float:none; width:402px;}
263
.date-box{ width:252px;}
264
.date-box{ }
264 265
.datebox{ width:540px; overflow:hidden; height:26px;}
265
hr{ width:18px; float:right; background:#ffc688; height:2px; border:none; margin:10px;}
266
.checkbox{ float:right; width:60px;margin-left:15px;margin-top: -1px;}
267
.date-btn{ float:right; width:175px; background:url(../images/select.png) no-repeat right; z-index:999;}
266
hr{ width:18px; float:left; background:#ffc688; height:2px; border:none; margin:10px;}
267
.checkbox{ float:left; width:60px;margin-left:15px;margin-top: -1px;}
268
.date-btn{ float:left; width:175px; background:url(../images/select.png) no-repeat right; z-index:999;}
268 269
.opacity{ width:150px;}
269 270
label.edu-radio{ float:none;font-size:16px;line-height:26px; color:#868686; }
270 271
.edu-select{ margin-left:10px; width:240px; }
271 272
.sf{ float:left;}
272 273
.radiobox{ width:115px; float:left;}
274
.date-title{float:left;    margin-right: 4px;}
273 275
.edu-sel{ float:right;}
274 276
.edu-about li{ list-style:inside;}
275 277
.edu-about{ list-style:inside;font-size:14px;line-height:26px;color:#868686; margin:0 35px; margin-bottom:35px; cursor:pointer;}

+ 1 - 1
src/main/webapp/information-add.html

@ -49,7 +49,7 @@
49 49
                        <td><div class="basiccon"><input type="text" class="inputtxt" id="title"></div></td>
50 50
                    </tr>
51 51
                     <tr>
52
                    	<td><div class="basictype">在地</div></td>
52
                    	<td><div class="basictype">所在在地</div></td>
53 53
                        <td><div class="basiccon"><input type="text" class="inputtxt" id="address"></div></td>
54 54
                    </tr>
55 55
                    

+ 14 - 14
src/main/webapp/information.html

@ -220,7 +220,7 @@
220 220
						<input type="text" class="input-txt edu-txt" id="school">
221 221
					</div>
222 222
					<div class="infor edu btn-marL date-box">
223
						<b class="star">&nbsp;</b> 毕业年份
223
						<div class="date-title"><b class="star">&nbsp;</b> 毕业年份</div>
224 224
                        <!--<input type="number" class="date-btn input-txt" id="year" value="2016" />-->
225 225
                        <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">
226 226

@ -279,13 +279,13 @@
279 279

280 280
					</div>
281 281
					<div class="infor edu btn-marL datebox">
282
						<b class="star">&nbsp;&nbsp;</b>时&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;间
283
						<div class="check checkbox"><input type="checkbox" class="present" />至今</div>
284
                        <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">
282
						<div class="date-title"><b class="star">&nbsp;&nbsp;</b>时&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;间</div>
283
                        <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">
285 284
						<!--<input class="date-btn input-txt" id="startMonth"/>-->
286
						<hr class="ago">
287
                        <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">
285
						  <hr class="ago">
286
                          <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">
288 287
						<!--<input class="date-btn input-txt ago" id="stopMonth" />-->
288
						<div class="check checkbox"><input type="checkbox" class="present" />至今</div>
289 289
                        
290 290
					</div>
291 291
					<div class="infor edu btn-marL">
@ -314,15 +314,15 @@
314 314
						<input type="text" class="input-txt edu-txt" id="projectName">
315 315
					</div>
316 316
					<div class="infor edu btn-marL datebox">
317
						<b class="star">&nbsp;&nbsp;</b>时&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;间
318
						<div class="check checkbox"><input type="checkbox" class="present" >至今</div>
317
						<div class="date-title"><b class="star">&nbsp;&nbsp;</b>时&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;间</div>
318
						
319 319
						<!--<input class="date-btn input-txt" id="projectStartMonth"/>-->
320 320
                        
321
                        <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">
321
                        <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">
322 322
						<hr class="ago">
323 323
						<!--<input class="date-btn input-txt ago" id="projectStopMonth"/>-->
324
                        <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">
325
                        
324
                        <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">
325
                        <div class="check checkbox"><input type="checkbox" class="present" >至今</div>
326 326
					</div>
327 327
					<div class="infor edu btn-marL">
328 328
						<b class="star">&nbsp;&nbsp;</b>描&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;述
@ -352,7 +352,7 @@
352 352
						<input type="text" class="input-txt edu-txt" id="paperName">
353 353
					</div>
354 354
					<div class="infor edu btn-marL date-box">
355
						<b class="star">&nbsp;&nbsp;</b>发表时间
355
						<div class="date-title"><b class="star">&nbsp;&nbsp;</b>发表时间</div>
356 356
						<!--<input type="text" class="date-btn input-txt" id="paperYear">-->
357 357
                        <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">
358 358
                        
@ -393,7 +393,7 @@
393 393
						<input type="text" class="input-txt edu-txt" id="patentName">
394 394
					</div>
395 395
					<div class="infor edu btn-marL date-box">
396
						<b class="star">&nbsp;&nbsp;</b>发表时间
396
						<div class="date-title"><b class="star">&nbsp;&nbsp;</b>发表时间</div>
397 397
						<!--<input type="text" class="date-btn input-txt" id="patentYear">-->
398 398
                         <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">
399 399
                        
@ -435,7 +435,7 @@
435 435
						<input type="text" class="input-txt edu-txt" id="honorName">
436 436
					</div>
437 437
					<div class="infor edu btn-marL date-box">
438
						<b class="star">&nbsp;&nbsp;</b>时&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;间
438
						<div class="date-title"><b class="star">&nbsp;&nbsp;</b>时&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;间</div>
439 439
						<!--<input type="text" class="date-btn input-txt" id="honorYear">-->
440 440
                      
441 441
                        <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">

+ 68 - 22
src/main/webapp/js/account-set.js

@ -1,19 +1,33 @@
1 1
$(function(){
2 2
	
3
	loginStatus();//读取用户头像	
3
	    loginStatus();//读取用户头像
4
	    valUser();
5
	   
4 6
		var userid = $.cookie("userid");
5

6
		valUser();
7
		$("#hsearch").on("click",function (){
7
		//个人信息头像获取
8
   		$("#headimg").attr("src", "/images/head/" + userid + "_l.jpg");
9
		$("#headimg").load(function() {
10
		}).error(function() {
11
				$("#headimg").attr("src",  "/images/default-photo.jpg");
12
		})
13
		//获取用户用户名
14
		$.ajax({	
15
			"url":"/ajax/professor/info/"+userid,
16
			"type":"get",
17
			"success":function($data){
18
				if($data.data)
19
				{	
20
					$('#username').text($data.data.name);
21
				}
22
			}
23
		})	
24
		
25
     	$("#hsearch").on("click",function (){
8 26
	   		var searchContent = $("#hsearchContent").val();
9 27
	   		location.href = "search.html?searchContent="+searchContent;
10
	   		//个人信息头像获取
11
	   		$("#headimg").attr("src", "/images/head/" + userid + "_l.jpg");
12
			$("#headimg").load(function() {})
13
				.error(function() {
14
					$("#headimg").attr("src",  "/images/default-photo.jpg");
15
				});
16
})
28
		});
29
		
30
});
17 31
		/*专家信息左导航背景点击切换*/
18 32
		$(".leftsidebar").click(function(){
19 33
			var index = $(this).index()-1;
@ -25,25 +39,25 @@ $(function(){
25 39
			$(this).addClass("edit-position-left")	
26 40
			},function(){
27 41
			$(this).removeClass("edit-position-left")			
28
				});
42
		});
29 43
		//邮箱绑定,手机绑定,点击关闭隐藏这两个部分
30 44
		$(".times").click(function(){
31 45
			$(".cover").hide();	
32 46
			$(".cover2").hide();	
33
		})
47
		});
34 48
		//邮箱绑定,手机绑定,点击返回,隐藏这两个部分
35 49
		$(".back-btn").click(function(){
36 50
			$(".cover").hide();		
37 51
			$(".cover2").hide();		
38
		})
52
		});
39 53
		//这个标签已经隐藏了,点击手机账号绑定
40 54
		$(".replace2").click(function(){
41 55
			$(".cover2").show();		
42
		})
56
		});
43 57
		//这个标签已经隐藏了,点击邮箱账号绑定
44 58
		$(".replace1").click(function(){
45 59
			$(".cover").show();		
46
		})
60
		});
47 61
		//点击邮箱账号绑定
48 62
		$(".replace5").click(function(){
49 63
			$(".cover").show();		
@ -51,7 +65,7 @@ $(function(){
51 65
		//点击手机账号绑定
52 66
		$(".replace6").click(function(){
53 67
			$(".cover2").show();		
54
		})
68
		});
55 69
		//判断是否绑定了邮箱
56 70
		var emailCookie = $.cookie("userEmail");
57 71
		var phoneCookie = $.cookie("userMobilePhone");
@ -72,7 +86,7 @@ $(function(){
72 86
			$(".replace2").show();	
73 87
			$(".replace4").hide();		
74 88
		}
75
	})
89

76 90
	var oldPass = false;
77 91
	var isPass = false;
78 92
	var isPass2 = false;
@ -157,24 +171,56 @@ $(function(){
157 171
        if(gunf.test(email.trim())){
158 172
           $(".msg11 span").text("");
159 173
           emailPass = true;
174
           emailSuccess();
160 175
        }else{
161 176
        	/*alert("请输入正确是邮箱地址");*/
162
        	$(".msg11").text("请输入正确是邮箱地址");
177
        	$(".msg11 span").text("请输入正确是邮箱地址");
163 178
        	emailPass = false;
164 179
        }
165 180
	}
181
	//获取邮箱,填写地址
182
	function emailSuccess()
183
	{
184
		var mailVal =$('#email').val();
185
		$(".act-color").each(function() {  
186
	        var url = mailVal.split('@')[1];
187
	        for (var j in hash){  
188
	            $(this).attr("href", hash[url]);  
189
	        }  
190
	     });
191
	}
192
	
193
	 var mailCode = GetQueryString('sc');
194
	//获取邮箱验证码传值注册
195
	if(mailCode!=''){
196
	    $.ajax("/ajax/bindMail/"+mailCode,{
197
				type:"post",
198
				async: true,
199
				success:function(data){ 
200
				   console.log(data);
201
				},
202
				error:function(){
203
				   $.MsgBox.Alert('消息','邮箱注册失败')
204
				},
205
				data:{},			
206
			 	dataType: 'json'}
207
		); 	 
208
	 }
209
	
166 210
	//点击邮箱激活
167 211
	function bindEmail(){
168 212
		valEmail();
169 213
		if(emailPass == true){
170 214
			$.ajax("/ajax/reqBindMail",{
171 215
					type:"GET",
172
					 async: false,
216
					async: false,
173 217
					success:function(data){ 
218
						console.log(data);
174 219
						if(data.success){
175 220
							if(data.data == true){
176
								/*alert("请检查邮件,设置成功后请重新登录!");*/
177
								location.href="login.html";
221
								alert("请检查邮件,设置成功后请重新登录!");
222
								var mailVal =$('.act-color').attr("href");  
223
								location.href=mailVal;
178 224
							}else{
179 225
								/*alert("邮箱设置失败");*/
180 226
								$.MsgBox.Alert("消息","设置错误!");

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

@ -24,7 +24,7 @@ $("#name").blur(function(){
24 24
$("#orgName").blur(function(){
25 25
	var org=$("#orgName").val();
26 26
	if(org.length==0 && org==""){
27
		$(".basicmsg2").text("请输入您的姓名");
27
		$(".basicmsg2").text("请输入您的机构");
28 28
	}else{
29 29
		$(".basicmsg2").text("");
30 30
		orgPass=true;

+ 17 - 4
src/main/webapp/js/information.js

@ -83,8 +83,8 @@ $(function(){
83 83
			var patentShow = function(data){
84 84
				if(data.length>0){
85 85
					for (var i = 0; i < data.length; i++) {
86
						$("#patentShow").append("<li>"+data[i].name+"</li>");					
87
						$("#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>");
86
						$("#patentShow").append("<li>"+data[i].name+"-"+data[i].year+"</li>");					
87
						$("#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>");
88 88
					}
89 89
				}
90 90
			}
@ -1113,11 +1113,24 @@ getProfessorData()
1113 1113
		location.href="workspaces.html?"+userid;
1114 1114
	})
1115 1115
//到至今选中复选框的操作
1116
$(".present").click(function(){
1116
/*$(".present").click(function(){
1117 1117
	var date = $(".present").index(this);
1118 1118
	$(".datebox").eq(date).find(".ago").remove();
1119 1119
	$(".datebox").eq(date).css("width","326px");
1120
	})
1120
	})*/
1121
$(".present").change(function(){
1122
	if($(".present").is(":checked"))
1123
	{
1124
		$(this).parent().parent().find('.ago').hide();
1125
		$(this).parent().parent().find('.inputno').hide();
1126
		
1127
	}else{
1128
	
1129
		$(this).parent().parent().find('.ago').show();
1130
		$(this).parent().parent().find('.inputno').show();
1131
	}
1132
})	
1133
	
1121 1134

1122 1135
/*ģ��Selectѡ���*/
1123 1136
 $(".input_select").click(function(){ 

+ 31 - 3
src/main/webapp/js/login.js

@ -11,9 +11,11 @@ $(function(){
11 11
})
12 12
	var namePass = false;
13 13
	var passwordPass = false;
14
	//校验登录账户
14 15
	function nameVal()
15 16
	{
16 17
		var loginName= $("#loginName").val();
18
		
17 19
		if(loginName.length==0)
18 20
		{
19 21
	        $(".msg1").text("请输入您的邮箱地址或者手机号码");
@ -29,7 +31,8 @@ $(function(){
29 31

30 32
	            var gunf=/^\w+@\w+\.((cn)|(com)|(com\.cn))$/;
31 33
	            if(gunf.test(loginName.trim()))
32
	            {
34
	            { 
35
	               userRegisterOk()
33 36
	               $(".msg1").text("");
34 37
	               namePass = true;
35 38
	            }
@ -38,6 +41,7 @@ $(function(){
38 41
	            	var hunPhone=/^1[3|4|5|7|8]\d{9}$/;
39 42
					if(hunPhone.test(loginName.trim()))
40 43
					{
44
						userRegisterOk()
41 45
						$(".msg1").text("");
42 46
						namePass = true;
43 47
					}
@ -49,11 +53,14 @@ $(function(){
49 53
	            }
50 54
	        }
51 55
	    }
56
		
57
		
52 58
	    
53 59
	}
54 60
	
61
	//校验登录密码
55 62
	function passwordVal(){
56
		var password = $("#loginName").val();
63
		var password = $("#password").val();
57 64
		if(password.length==0){
58 65
			$(".msg3").text("请输入密码");
59 66
			passwordPass = false;
@ -65,6 +72,25 @@ $(function(){
65 72
		}
66 73
	}	
67 74
   
75
	//判断账号是否注册
76
	function userRegisterOk(){
77
		var loginName= $("#loginName").val();
78
		//console.log(loginName);
79
		$.ajax("/ajax/isReg?key="+loginName,{
80
			type:"GET",
81
			async: true,
82
			success:function($data){ 
83
				//console.log($data);
84
			    if($data.data==true){
85
			    	 $(".msg1").text("用户不存在请注册用户");
86
			    	 return false; 
87
			    }
88
			},
89
			error:function(){
90
				$.MsgBox.Alert('消息','服务器请求失败')},
91
			}
92
		);
93
	}	
68 94
	//判断用户第一次登录,是否填写了个人信息
69 95
	function firstLogin(){
70 96
		var professorId = $.cookie('userid');
@ -87,7 +113,9 @@ $(function(){
87 113
			},
88 114
			"error":function(){$.MsgBox.Alert('message','failddd')}
89 115
		})	
90
	}	
116
	}
117
	
118
	//提交登录
91 119
	function login(){
92 120
		nameVal();
93 121
		passwordVal();

+ 3 - 0
src/main/webapp/js/register.js

@ -298,6 +298,7 @@ function valEmail()
298 298
{
299 299
	var email = $("#lp_email").val();
300 300
	var gunf=/^\w+@\w+\.((cn)|(com)|(com\.cn))$/;
301
	
301 302
	$.ajax("/ajax/isReg?key="+email,{
302 303
		type:"GET",
303 304
		async: true,
@ -319,6 +320,8 @@ function valEmail()
319 320
			$.MsgBox.Alert('消息','服务器请求失败')},
320 321
		}
321 322
	);
323
	
324
	   
322 325
}
323 326

324 327
$("#lp_email").blur(function(){

+ 1 - 2
src/main/webapp/js/search.js

@ -3,7 +3,6 @@ $(function(){
3 3
		var userid = $.cookie("userid");
4 4
		var c=0;
5 5
		var  subject;
6
		var key=$("#searchContent").val();
7 6
		var industry;
8 7
		var pageSize;
9 8
		var sub="PRO_SUBJECT";
@ -11,7 +10,7 @@ $(function(){
11 10
		var address= $("#address .colorbg")[0].title;
12 11
		$("#searchContent").val(GetQueryString("searchContent")); 
13 12
		$("#hsearchContent").val(GetQueryString("searchContent")); 
14
		
13
		var key=$("#searchContent").val();
15 14
 		var getData = function (key,subject,industry,pageSize,pageNo,isbind,add)
16 15
 		{ 			
17 16
 			if(c==0)

+ 19 - 12
src/main/webapp/photo-set.html

@ -36,12 +36,12 @@
36 36
                                             <img src="" width="602" height="400" id="headImage" />
37 37
                                         </div>
38 38
                                     </div>
39
                                     <div class="jy-up-ch">
39
                                     <!-- <div class="jy-up-ch" >
40 40
                                         <a id="idLeft" href="" class="bch bch1"></a>
41 41
                                         <a id="idSmall" href="" class="bch bch2"></a>
42 42
                                         <a id="idBig" href="" class="bch bch3"></a>
43 43
                                         <a id="idRight" href="" class="bch bch4"></a>
44
                                     </div>
44
                                     </div> -->
45 45
                                 </div>
46 46
                     </div>
47 47
                     <!---->
@ -58,11 +58,11 @@
58 58
                             <div class="pre-2">
59 59
                                 <img src="" class="jcrop-preview jcrop_preview_s" alt="" id="middleImage"/>
60 60
                             </div>
61
                             <p>50px*50px</p>
61
                             <p>66px*66px</p>
62 62
                             <div class="pre-3">
63 63
                                 <img src="" class="jcrop-preview jcrop_preview_s" alt="" id="smallImage"/>
64 64
                             </div>
65
                             <p>26px*26px</p>
65
                             <p>30px*30px</p>
66 66
                         </div>
67 67
                     </div>
68 68
                 </div>
@ -106,14 +106,15 @@ $(function (){
106 106
	var boxWidth = $(".photo-box").width();
107 107
	var boxHeight = $(".photo-box").height();
108 108
	$(".photo-box").css({ top:"40px", left: (_widht - boxWidth) / 2 + "px" });
109

110

109
    $('#largeImage').attr("style","");
110
    $('#middleImage').attr("style","");
111
    $('#smallImage').attr("style","");
111 112
	var id = $.cookie('userid');
112 113
	var cacheImageKey=null;
113 114
	if(id){
114 115
		$("#headImage").attr("src","/images/head/"+id+"_l.jpg");
115
		$("#smallImage").attr("src","/images/head/"+id+"_l.jpg");
116
		$("#middleImage").attr("src","/images/head/"+id+"_l.jpg");
116
		$("#smallImage").attr("src","/images/head/"+id+"_s.jpg");
117
		$("#middleImage").attr("src","/images/head/"+id+"_m.jpg");
117 118
		$("#largeImage").attr("src","/images/head/"+id+"_l.jpg");
118 119
		$('#uploadInput').live('change',function(){ 
119 120
			$("#jcropdiv").show();
@ -124,8 +125,10 @@ $(function (){
124 125
				fileElementId:"uploadInput",
125 126
				dataType:"json",
126 127
				success:function($data){
128
				     console.log($data);
127 129
					if($data.success){
128
						cacheImageKey =$data.data[0].cacheKey
130
						cacheImageKey =$data.data[0].cacheKey;
131
						 console.log(cacheImageKey);
129 132
						$("#headImage").attr("src","/images/tmp/"+cacheImageKey);
130 133
						$("#smallImage").attr("src","/images/tmp/"+cacheImageKey);
131 134
						$("#middleImage").attr("src","/images/tmp/"+cacheImageKey);
@ -141,6 +144,8 @@ $(function (){
141 144
		});
142 145
		
143 146
	}
147
    
148
    //保存
144 149
	$("#saveImage").on("click",function(){
145 150
		var x = parseInt($("#x").val()/395*100);
146 151
		var y = parseInt($("#y").val()/340*100);
@ -153,9 +158,11 @@ $(function (){
153 158
				data:{"id":id,"fn":cacheImageKey,"x":x,"y":y,"w":w,"h":h},
154 159
				dataType:"json",
155 160
				success:function($data){
161
				    console.log($data);
156 162
					if($data.success){
157 163
						$.MsgBox.Alert("消息","上传成功");
158 164
						location.reload(true);
165
						
159 166
					}else{
160 167
						$.MsgBox.Alert("message",$data.msg);
161 168
					}
@ -164,7 +171,7 @@ $(function (){
164 171
		}
165 172
	});
166 173

167

174
    //取消
168 175
	$(".close").on("click",function(){
169 176
		$(".load").show();
170 177
		$("#jcropdiv").hide();
@ -173,9 +180,9 @@ $(function (){
173 180
		$("#middleImage").attr("src","");
174 181
		$("#largeImage").attr("src","");
175 182
	})
176

183
    
184
    //返回
177 185
	$("#back").on("click",function(){
178

179 186
		location.href="index.html";
180 187
	})
181 188