Browse Source

1、添加详细信息模块
2、解决找回密码界面跳转问题bug

luyanan 8 years ago
parent
commit
497b9d512a

+ 2 - 2
src/main/webapp/account-set.html

@ -107,7 +107,7 @@
107 107
    			<input type="radio" name="sex" id="b" value="M" class="radio"><label for="b" class="radio" >女</label>
108 108
				
109 109
			</div>
110
			<input type="submit" value="保存" class="save">
110
			<input type="button" value="保存" class="save">
111 111
		</div>-->
112 112
		
113 113
		<div class="content-set" style="display:block">
@ -123,7 +123,7 @@
123 123
                <div class="msg msg3" ></div>
124 124
			
125 125
            </form>
126
            <input type="submit" value="保存" class="save" onClick="restPassword()"/>
126
            <input type="button" value="保存" class="save" onClick="restPassword()"/>
127 127
            <!--<div class="msg msg4" ></div> -->
128 128
		</div>
129 129
		

+ 37 - 10
src/main/webapp/css/popup.css

@ -14,8 +14,8 @@
14 14
.resoutit{padding: 0 20px;font: 16px/40px \5FAE\8F6F\96C5\9ED1,"Microsoft YaHei";color: #606060; border-bottom:1px solid #ff8400; position:relative; font-weight:bold;}
15 15
.resoutit .stateinfor{ position:absolute; bottom: -46px;right: -20px;background: #ff8400; color: #fff; padding: 0 40px;border-radius: 10px 0 0 10px;z-index: 2; cursor:pointer;}
16 16
.resoutit .showinfor{ position:absolute; left:60px; top:2px; font-size:13px; font-weight:normal;}
17
.resouinfotype{ font-weight:normal; text-align:right;}
18
.resouinforcon{ padding:0 10px; width:100%; position:relative; max-width:540px;}
17
.resouinfotype{ font-weight:600; text-align:right;  min-width: 80px;}
18
.resouinforcon{ padding:0 10px; width:100%; position:relative; max-width:560px;}
19 19

20 20
.resoubox{ padding:20px; }
21 21
.resoubox table{width:620px;}
@ -46,10 +46,10 @@
46 46
/*合作项目及评价*/
47 47
.teamworkbox{ margin-top:20px;}
48 48
.teamworktit{padding: 0 10px;font: 16px/40px \5FAE\8F6F\96C5\9ED1,"Microsoft YaHei";color: #606060; border-bottom:1px solid #ff8400;}
49
.teamwork{ overflow:hidden; padding:10px 0; border-bottom:1px dashed #d6d6d6; margin-top:10px;}
49
.teamwork{ overflow:hidden;  padding-bottom: 10px; border-bottom:1px dashed #d6d6d6; }
50 50
.teamwork .lefteva{ float:left; max-height:200px; width:20%; max-width:200px; text-align:center; margin-top:10px;}
51 51
.teamwork .lefteva .evaimg{ display:block; width:50px; height:50px; overflow:hidden; border:1px solid #d6d6d6; border-radius:50%; margin:auto;}
52
.teamwork .righteva{padding:0 10px; float:left; margin-left:20px; font-size:14px; width:78%; max-width:458px;}
52
.teamwork .righteva{padding:0 10px; float:left; margin-left:20px; font-size:14px; width:78%; max-width:480px;}
53 53
.teamwork .righteva  .teamname{ position:relative;}
54 54
.teamwork .righteva .teamname .teamtime{ position:absolute; right:0;}
55 55
.teamwork .righteva .evastarbox{ overflow:hidden;}
@ -63,13 +63,22 @@
63 63

64 64
/*//资源申请*/
65 65
.resouapply{position:absolute; background:#fff;border-radius:10px;padding:20px;font-size:14px;z-index:1001; margin-bottom:40px;}
66

66
.resouapply .resoushowimg{width:100%; border:1px solid #d6d6d6; height:200px; position:relative; overflow:hidden; }
67
.resoufrm .worktit{ position:relative; width:100%;border-bottom:1px solid #d6d6d6; padding:10px; font-size:16px; }
68
.resoufrm .worktit .uploadbtn{ position:absolute; bottom:11px; left:80px; font-size:13px; color:#ff8400;}
69
.filebox{ padding:10px; margin:10px 0;}
70
.fileitem{ margin:10px;}
71
.filename{ margin-left:10px;}
72
.fileicon{ background:url(../images/filetype.png) center center no-repeat; width:20px; height:20px; }
73
.filebtn{ padding:0 10px; cursor:pointer; }
74
.filedownbtn{ color:#ff8400; text-decoration:underline;}
75
.fibepople{ margin-right:60px;}
67 76

68 77
/*评价*/
69 78
.commentinfo{position:absolute;background:#fff;border-radius:10px;padding:20px;font-size:14px; z-index:1001; margin-bottom:40px; }
70 79
.commentinfo .wordlimit{ font-size:12px; color:#999; text-align:right;}
71 80
.commentbox{ padding:20px; }
72
.commentbox table{width:600px;}
81
.commentbox table{width:640px;}
73 82
.commentcon tr td{ width:90%;max-width:400px; padding:4px 0;}
74 83
.commentcon tr th{ width:10%;}
75 84
.noconmment{ line-height:120px;}
@ -80,13 +89,13 @@
80 89
/*留言*/
81 90
.guestbookinfo{position:absolute;background:#fff;border-radius:10px;padding:20px;font-size:14px; z-index:1001;  margin-bottom:40px;}
82 91
.guestbookinfo .wordlimit{ font-size:12px; color:#999;}
83
.guestbookcon{padding:20px; width:560px;}
84
.guestcon{ border-top:1px #d6d6d6 solid;  padding:20px 0;}
92
.guestbookcon{padding:20px; width:600px; margin:auto;}
93
.guestcon{ padding:20px 0;max-height:240px;overflow-x:hidden; overflow-y:visible ;  }
85 94
.guestconitem{ padding:10px 0; overflow:hidden; margin-bottom:10px;border-bottom:1px dashed #d6d6d6;}
86 95
.guestconitem:nth-child(odd){ background:#f8f8f8;}
87 96
.guestcon .lefteva{ float:left; max-height:200px; width:20%; max-width:200px; text-align:center; margin-top:10px;}
88 97
.guestcon .lefteva .evaimg{ display:block; width:80px; height:80px; overflow:hidden; border:1px solid #d6d6d6; border-radius:50%; margin:auto;}
89
.guestcon .righteva{padding:0 10px; float:left; margin-left:20px; font-size:14px;  width:79%; max-width:400px;}
98
.guestcon .righteva{padding:0 10px; float:left; margin-left:20px; width:79%; max-width:480px;}
90 99
.guestcon .righteva .guestname{ position:relative;}
91 100
.guestcon .righteva .guestname .guesttime{ position:absolute; right:0;}
92 101
.guestcon .righteva .evabrief{ display:block; margin-top:10px; max-height:80px; overflow:hidden; }
@ -107,4 +116,22 @@
107 116
.paymentbox table .paytit th{ background:#ff8400; color:#fff;}
108 117
.paybtn{ position:absolute; left:100px; top:0px; font-size:14px; cursor:pointer; color:#ff8400; }
109 118

110

119
/*详细信息*/
120
.resoudetailinfo{position:absolute;margin-top:40px; background:#fff; font-size:14px;border-radius:10px;padding:20px;z-index:1900;}
121
.resoudetailinfo .resoushowimg1{width:100%; border:1px solid #d6d6d6; height:200px; position:relative; overflow:hidden; left:-40px;top:40px; }
122
.resoudetailinfo .resoutab1 tr td{ min-width:200px; padding:4px; }
123

124
.paymentbox1{ padding:20px;}
125
.payaddbox1{  width:580px; margin:auto; margin-top:20px;padding:10px; background:#f8f8f8;}
126
.payaddbox1 table{ width:100%;}
127
.payaddbox1 table tr th{ text-align:right;}
128
.payaddbox1 table tr td{ padding:4px 0; }
129

130
.paymentbox1 table{width:640px; margin-bottom:20px; text-align:center;}
131
.paymentbox1 table tr{border-bottom:1px dotted #ccc; }
132
.paymentbox1 table tr:nth-child(1){border-bottom:none;}
133
.paymentbox1 table tr th{ background:#f2f2f2;}
134
.paymentbox1 table tr th,.paymentbox table tr td{ padding:10px 4px; text-align:center; }
135
.paymentbox1 table .paytit th{ background:#ff8400; color:#fff;}
136

137
.combtn{color:#ff8400; cursor:pointer;}

+ 2 - 2
src/main/webapp/css/reset.css

@ -16,8 +16,8 @@ sub{vertical-align:text-bottom;}
16 16
fieldset,img{border:0;}
17 17
button,input,select,textarea{font-size:100%;}
18 18
table{border-collapse:collapse;border-spacing:0;}
19
a{text-decoration:none; color:#fff;}
20
a:focus{outline:thin dotted; color:#fff;}
19
a{text-decoration:none;}
20
a:focus{outline:thin dotted;}
21 21
a:active,a:hover{outline:0;text-decoration:none;}
22 22
.clear{clear:both;}
23 23


BIN
src/main/webapp/images/filetype.png


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

@ -78,8 +78,8 @@
78 78
					<input type="text" class="input-txt" id="orgName">
79 79
				</div>
80 80
				<div class="infor">
81
				<input id="saveProfessor" type="submit" value="保存" class="infor-save">
82
				<input type="submit" value="取消" class="close">
81
				<input id="saveProfessor" type="button" value="保存" class="infor-save">
82
				<input type="button" value="取消" class="close">
83 83
				</div>
84 84
				</div>
85 85
			</div>
@ -119,8 +119,8 @@
119 119
					<div class="modifybox">
120 120
						<textarea class="reedit" id="descp"></textarea>
121 121
                        
122
                        <input id="saveDescp" type="submit" value="保存" class="infor-save btn btn-marL">
123
                        <input type="submit" value="取消" class="close btn btn-marB">
122
                        <input id="saveDescp" type="button" value="保存" class="infor-save btn btn-marL">
123
                        <input type="button" value="取消" class="close btn btn-marB">
124 124
                        <div class="clearfix"></div>
125 125
                    </div>
126 126
				</div>
@ -151,8 +151,8 @@
151 151
					</div>
152 152
					
153 153
					<p class="ann">*可拖动标签更换顺序</p>
154
					<input type="submit" value="保存" class="infor-save btn btn-marL" id="subjectSave">
155
					<input type="submit" value="取消" class="close btn btn-marB">
154
					<input type="button" value="保存" class="infor-save btn btn-marL" id="subjectSave">
155
					<input type="button" value="取消" class="close btn btn-marB">
156 156
                    <div class="clearfix"></div>
157 157
					</div>
158 158
				</div>
@ -174,8 +174,8 @@
174 174
                            </div>
175 175
						</div>
176 176
						<p class="ann">*可拖动标签更换顺序</p>
177
						<input type="submit" value="保存" class="infor-save btn btn-marL" id="researchAreaSave">
178
						<input type="submit" value="取消" class="close btn btn-marB">
177
						<input type="button" value="保存" class="infor-save btn btn-marL" id="researchAreaSave">
178
						<input type="button" value="取消" class="close btn btn-marB">
179 179
                        <div class="clearfix"></div>
180 180
				    </div>  	
181 181
				</div>
@ -199,8 +199,8 @@
199 199
                            </div>
200 200
						</div>
201 201
						<p class="ann">*可拖动标签更换顺序</p>
202
						<input type="submit" value="保存" class="infor-save btn btn-marL"  id="industrySave">
203
						<input type="submit" value="取消" class="close btn btn-marB">
202
						<input type="button" value="保存" class="infor-save btn btn-marL"  id="industrySave">
203
						<input type="button" value="取消" class="close btn btn-marB">
204 204
                        <div class="clearfix"></div>
205 205
				    </div>  
206 206
					</div>	
@ -259,7 +259,7 @@
259 259
					</div>
260 260
                    <div class="clear"></div>
261 261
					<input type="button" value="保存" class="infor-save btn btn-marL" id="saveEduBg">
262
					<input type="submit" value="取消" class="close btn btn-marB" >
262
					<input type="button" value="取消" class="close btn btn-marB" >
263 263
                    <div class="clearfix"></div>
264 264
					<ul class="edu-about" id="eduBgList">
265 265
						
@ -296,7 +296,7 @@
296 296
						<input type="text" class="input-txt edu-txt" id="jobTitle" />
297 297
					</div>
298 298
					<input type="button" value="保存" class="infor-save btn btn-marL" id="timeJobSave">
299
					<input type="submit" value="取消" class="close btn btn-marB">
299
					<input type="button" value="取消" class="close btn btn-marB">
300 300
                    <div class="clearfix"></div>
301 301
					<ul class="edu-about" id="timeJobList">
302 302
					</ul>
@ -333,7 +333,7 @@
333 333
						<input type="text" class="input-txt edu-txt" id="projectDescp">
334 334
					</div>
335 335
					<input type="button" value="添加" class="infor-save btn btn-marL" id="projectSave">
336
					<input type="submit" value="取消" class="close btn btn-marB">
336
					<input type="button" value="取消" class="close btn btn-marB">
337 337
                    <div class="clearfix"></div>
338 338
					<ul class="edu-about" id="projectList">
339 339
						
@ -374,7 +374,7 @@
374 374
						<input type="text" class="input-txt edu-txt" id="paperUrl">
375 375
					</div>
376 376
					<input type="button" value="保存" class="infor-save btn btn-marL" id="paperSave">
377
					<input type="submit" value="取消" class="close btn btn-marB">
377
					<input type="button" value="取消" class="close btn btn-marB">
378 378
                    <div class="clearfix"></div>
379 379
					<ul class="edu-about" id="paperList">
380 380
						
@ -416,7 +416,7 @@
416 416
						<input type="text" class="input-txt edu-txt" id="patentDescp">
417 417
					</div>
418 418
					<input type="button" value="保存" class="infor-save btn btn-marL" id="patentSave">
419
					<input type="submit" value="取消" class="close btn btn-marB">
419
					<input type="button" value="取消" class="close btn btn-marB">
420 420
                    <div class="clearfix"></div>
421 421
					<ul class="edu-about" id="patentList">
422 422
						
@ -454,7 +454,7 @@
454 454
						<input type="text" class="input-txt edu-txt" id="honorDescp">
455 455
					</div>-->
456 456
					<input type="button" value="保存" class="infor-save btn btn-marL" id="honorSave">
457
					<input type="submit" value="取消" class="close btn btn-marB">
457
					<input type="button" value="取消" class="close btn btn-marB">
458 458
                    <div class="clearfix"></div>
459 459
					<ul class="edu-about" id="honorList">
460 460
						

+ 215 - 20
src/main/webapp/js/popup.js

@ -159,30 +159,59 @@ function ResourceApply(){
159 159
		var PopHtml="";
160 160
		PopHtml += '<div class="blackcover">';
161 161
		PopHtml += '<div class="resouapply"><form class="resoufrm">';
162
		PopHtml += '<div class="resoutit">资源信息</div>';
163
		PopHtml += '<table class="resoutab"><tr class="timelo">';
164
		PopHtml += '<th class="resouinfotype" scope="row">合作编号</th>';
165
		PopHtml += '<td class="contration">00001109</td>';
166
		PopHtml += '<td rowspan="5"><div class="resouimg" ><img src="" width="100%" height="100%"></div></td>';
162
		
163
		/*//资源申请模块*/
164
		PopHtml += '<div class="applyblock"><div class="resoutit">资源申请<div class="stateinfor">申请中</div></div>';
165
		PopHtml += '<div class="resoubox"><table class="resoutab">';
166
		//合作编号在申请的时候还未生成,不显示;申请完成之后产生,在申请确认是显示
167
		PopHtml += '<tr class="timelo"><th class="resouinfotype" scope="row">合作编号</th>';
168
		PopHtml += '<td><div class="resouinforcon contration">00001109</div></td>';
169
		//资源申请信息
170
		PopHtml += '<td rowspan="5"><div class="resouinforcon"><div class="resouimg" ><img src="" width="100%" height="100%"></div></div></td>';
167 171
		PopHtml += '</tr>';
168
		PopHtml += '<tr class="timelo"><th class="resouinfotype "  scope="row">申请时间</th><td class="timelog">2016-08-01</td></tr>';
169
		PopHtml += '<tr><th class="resouinfotype "  scope="row">需求资源</th><td class="log">xxx检测仪</td> </tr>';
170
		PopHtml += '<tr><th class="resouinfotype"  scope="row">资源发布者</th><td class="namecon">张三 <a href="" class="worktel">联系ta</a></td></tr>';
172
		PopHtml += '<tr class="timelo"><th class="resouinfotype "  scope="row">申请时间</th><td><div class="resouinforcon timelog">2016-08-01</div></td></tr>';
173
		PopHtml += '<tr><th class="resouinfotype "  scope="row">需求资源</th><td><div class="resouinforcon log">xxx检测仪</div></td> </tr>';
174
		PopHtml += '<tr><th class="resouinfotype"  scope="row">资源发布者</th><td><div class="resouinforcon namecon">张三 <a href="" class="worktel">联系ta</a></div></td></tr>';
171 175
		PopHtml += '<tr><th class="resouinfotype"  scope="row">需求方</th><td>';
172
        PopHtml += '<select class="frmtype"><option>本人</option><option>所属机构</option></select>';
176
        PopHtml += '<div class="resouinforcon"><select class="frmtype"><option>本人</option><option>所属机构</option></select></div>';
173 177
		PopHtml += '</td></tr>';
174
		PopHtml += '<tr><th class="resouinfotype"  scope="row">具体需求</th><td colspan="2"><textarea class="frmtype detail"></textarea></td></tr>';
175
		PopHtml += ' <tr><th class="resouinfotype"  scope="row">相关文件</th><td colspan="2" ><a href="" class="updownbtn" >点击下载</a></td></tr>';
176
		PopHtml += '<tr><th class="resouinfotype " scope="row">交付时间:</th><td colspan="2"class="dealTime">2016-09-01</td></tr></table>';
177
		PopHtml += '<table class="resoutab btnboxup"><tr><td colspan="3"><div class="addrebtn" style="text-align:center;">';
178
        PopHtml += '<input type="button" value="确认,下一步" class="frmtype frmbtn"id="nextStep"><input type="button" value="联系ta" class="frmtype frmbtn"><input type="button" value="直接拒绝" class="frmtype frmbtn frmrbtn"id="refuses"></div></td></tr></table>';
178
		PopHtml += '<tr><th class="resouinfotype"  scope="row">具体需求</th><td colspan="2"><div class="resouinforcon"><textarea class="frmtype detail"></textarea></div></td></tr>';
179
		PopHtml += '<tr><th class="resouinfotype " scope="row">交付时间</th><td colspan="2"><div class="resouinforcon dealTime"><input type="text" class="dealTime"></div></td></tr></table>';
180
		//相关文件上传
181
		PopHtml += '<div class="filebox"> ';
182
		PopHtml += '<div class="worktit">相关文件<div class="uploadbtn">上传文件</div></div>';
183
		PopHtml += '<div class="fileitem clearfix"> ';
184
		PopHtml += '<em class="fileicon floatL"></em><div class="filename floatL">323333333333333</div> ';
185
		PopHtml += '<div class="filebtnbox floatR"><a class="filebtn filedownbtn">下载</a><a class="filebtn">删除</a></div> ';
186
		PopHtml += '</div></div> ';
187
		//发送申请按钮
188
		PopHtml += '<div class="btntab applybtn btnboxdown"><div class="addrebtn" style="text-align:center;">';
189
		PopHtml += '<input type="button" value="发送" class="frmtype frmbtn"></div></div>';
190
		//确认申请按钮
191
		PopHtml += '<div class="btntab btnboxup"><div class="addrebtn" style="text-align:center;">';
192
		PopHtml += '<input type="button" value="确认,下一步" class="frmtype frmbtn"id="nextStep"><input type="button" value="直接拒绝" class="frmtype frmbtn frmrbtn"id="refuses"></div></div>';
193
		PopHtml += '</div></div>';
194
		
195

196
		/*//发送报价模块*/
197
		PopHtml += '<div class="applyblock applysure"><div class="resoutit">发送报价<div class="stateinfor">报价中</div></div>';
198
		PopHtml += '<div class="resoubox"><table class="resoutab applysure">';
199
		PopHtml += '<tr><th class="resouinfotype"  scope="row">付款方式</th><td><div class="resouinforcon"><input type="text" class="frmtype" id="payMethod"></div></td><td ><div class="resouinforcon"></div></td></tr>';
200
		PopHtml += '<tr><th class="resouinfotype" scope="row">费用</th><td><div class="resouinforcon"><input type="text" class="frmtype" id="dealPrice"></div></td><td ><div class="resouinforcon"></div></td></tr>';
201
		PopHtml += '<tr><th class="resouinfotype" scope="row">备注</th><td colspan="2"><div class="resouinforcon"><textarea class="frmtype" id="consultContent"></textarea></div></td></tr></table>';
202
		PopHtml += '</table>';
203
		//文件	
204
		PopHtml += '<div class="filebox"> ';
205
		PopHtml += '<div class="worktit">相关文件<div class="uploadbtn">上传文件</div></div>';
206
		PopHtml += '<div class="fileitem clearfix"> ';
207
		PopHtml += '<em class="fileicon floatL"></em><div class="filename floatL">323333333333333</div> ';
208
		PopHtml += '<div class="filebtnbox floatR"><a class="filebtn filedownbtn">下载</a><a class="filebtn">删除</a></div> ';
209
		PopHtml += '</div></div> ';
210
		//发送报价按钮
211
		PopHtml += '<div class="btntab btnboxdown"><div class="addrebtn" style="text-align:center;"><input type="button" value="发送" id="del" class="frmtype frmbtn"><input type="button" value="返回" class="frmtype frmbtn frmrbtn "id="cooperation"></div></div>';
179 212
		
180
		PopHtml += '<table class="resoutab applysure"><tr><th class="resouinfotype"  scope="row">付款方式</th><td colspan="2" ><input type="text" class="frmtype" id="payMethod"></td></tr>';
181
		PopHtml += '<tr><th class="resouinfotype" scope="row">费用</th><td colspan="2"><input type="text" class="frmtype" id="dealPrice"  ></td></tr>';
182
		PopHtml += '<tr><th class="resouinfotype" scope="row">合作协议</th><td colspan="2"><a class="updownbtn" href="">点击上传</a></td></tr>';
183
		PopHtml += '<tr><th class="resouinfotype" scope="row">备注</th><td colspan="2"><textarea class="frmtype" id="consultContent"></textarea></td></tr></table>';
184
		PopHtml += '<table class="resoutab btnboxdown"> <tr><td colspan="3"><div class="addrebtn" style="text-align:center;"><input type="button" value="发送" id="del" class="frmtype frmbtn"><input type="button" value="返回" class="frmtype frmbtn frmrbtn "id="cooperation"></div></td></tr>';
185
		PopHtml += '</table></form><span class="workclose">关闭</span></div>';
213
		PopHtml += '</div></div>';
214
		PopHtml += '</form><span class="workclose">关闭</span></div>';
186 215
		PopHtml += '</div>';
187 216
		
188 217
		//必须先将html添加到body,再设置Css样式
@ -392,3 +421,169 @@ function PaymentInfo() {
392 421
		});           
393 422
}       
394 423
 // 款项记录//
424

425

426
//详细信息
427
function DetailInfo(){
428
		var PopHtml="";
429
		PopHtml += '<div class="blackcover">';
430
		PopHtml += '<div class="resoudetailinfo"><form class="resoufrm">';
431
		//****************************************************
432
		/*//资源申请模块*/
433
		PopHtml += '<div class="resoutit">详细信息<div class="stateinfor">合作进行中</div></div>';
434
		PopHtml += '<div class="resoubox">';
435
		PopHtml += '<div class="resoupricebox">';
436
		PopHtml += '<table class="resoutab1">';
437

438
		//合作编号在申请的时候还未生成,不显示;申请完成之后产生,在申请确认是显示
439
		PopHtml += '<tr><th class="resouinfotype" scope="row">合作编号</th>';
440
		PopHtml += '<td><div class="resouinforcon contration">00001109</div></td>';
441
		//资源申请信息
442
		PopHtml += '<td rowspan="5"><div class="resouinforcon"><div class="resoushowimg1" ><img src="" width="100%" height="100%"></div></div></td>';
443
		PopHtml += '</tr>';
444
		PopHtml += '<tr class="timelo"><th class="resouinfotype "  scope="row">申请时间</th><td><div class="resouinforcon timelog">2016-08-01</div></td></tr>';
445
		PopHtml += '<tr><th class="resouinfotype "  scope="row">需求资源</th><td><div class="resouinforcon log">xxx检测仪</div></td> </tr>';
446
		PopHtml += '<tr><th class="resouinfotype"  scope="row">资源发布者</th><td><div class="resouinforcon namecon">张三 <a href="" class="worktel">联系ta</a></div></td></tr>';
447
		PopHtml += '<tr><th class="resouinfotype"  scope="row">需求方</th><td>';
448
        PopHtml += '<div class="resouinforcon">李四</div>';
449
		PopHtml += '</td></tr>';
450
		PopHtml += '<tr><th class="resouinfotype"  scope="row">具体需求</th><td colspan="2"><div class="resouinforcon"> 89fufhyury8fruijkfhjhdf </div></td></tr>';
451
		PopHtml += '<tr><th class="resouinfotype " scope="row">交付时间</th><td colspan="2"><div class="resouinforcon dealTime">2016-10-30</div></td></tr>';
452
		
453
		/*//报价模块*/
454
		//PopHtml += '<table class="resoutab1 applysure">';
455
		PopHtml += '<tr><th class="resouinfotype"  scope="row">付款方式</th><td><div class="resouinforcon">一次性付清</div></td><td ><div class="resouinforcon"></div></td></tr>';
456
		PopHtml += '<tr><th class="resouinfotype" scope="row">费用</th><td><div class="resouinforcon">¥10000</div></td><td ><div class="resouinforcon"></div></td></tr>';
457
		PopHtml += '<tr><th class="resouinfotype" scope="row">备注</th><td colspan="2"><div class="resouinforcon">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvin</div></td></tr></table>';
458
		PopHtml += '</table>';
459
		//文件	
460
		PopHtml += '<div class="filebox"> ';
461
		PopHtml += '<div class="worktit">相关文件<div class="uploadbtn">上传文件</div></div>';
462
		PopHtml += '<div class="fileitem clearfix"> ';
463
		PopHtml += '<em class="fileicon floatL"></em><div class="filename floatL">323333333333333</div> ';
464
		PopHtml += '<div class="filebtnbox floatR"><a class="filebtn filedownbtn">下载</a><a class="filebtn">删除</a></div> ';
465
		PopHtml += '</div></div></div></div> ';
466

467
		//****************************************************
468
		//款项记录
469
		PopHtml += '<div class="resoupayinfo">';
470
		PopHtml += '<div class="worktit">款项记录</div>';
471
		/*添加款项记录*/
472
		PopHtml += '<div class="payaddbox1">';
473
		PopHtml += '<table><tr>';
474
		PopHtml += '<th><div class="resouinforcon">付款方</div></th>';
475
		PopHtml += '<td><div class="resouinforcon"><input type="text" class="frmtype"></div></td>';
476
		PopHtml += '<th><div class="resouinforcon">支付方式</div></th>';
477
		PopHtml += '<td><div class="resouinforcon"><input type="text" class="frmtype"></div></td>';
478
		PopHtml += '</tr>';
479

480
		PopHtml += '<tr>';
481
		PopHtml += '<th><div class="resouinforcon">金额</div></th>';
482
		PopHtml += '<td><div class="resouinforcon"><input type="number" class="frmtype"></div></td>';
483
		PopHtml += '<th><div class="resouinforcon">状态</div></th>';
484
		PopHtml += '<td><div class="resouinforcon"><input type="text" class="frmtype"></div></td>';
485
		PopHtml += '</tr>';
486

487
		PopHtml += '<tr>';
488
		PopHtml += '<th><div class="resouinforcon">备注</div></th>';
489
		PopHtml += '<td colspan="2"><div class="resouinforcon"><textarea class="frmtype"></textarea></div></td>';
490
		PopHtml += '<td><div class="resouinforcon"><div class="addrebtn" style="text-align:center;"><input type="button" value="添加" class="frmtype frmbtn"> </div></div></td>';
491
		PopHtml += ' </tr></table></div>';
492
		/*款项记录*/
493
		PopHtml += '<div class="paymentbox1"> ';
494
		PopHtml += '<table><tr>';
495
		PopHtml += '<th><div class="resouinforcon">总费用</div></th>';
496
		PopHtml += '<td><div class="resouinforcon">¥10000</div></td>';
497
		PopHtml += '<th><div class="resouinforcon">实收费用</div></th>';
498
		PopHtml += '<td><div class="resouinforcon">¥2000</div></td>';
499
		PopHtml += '<th><div class="resouinforcon">剩余费用</div></th>';
500
		PopHtml += '<td><div class="resouinforcon">¥8000</div></td>';
501
		PopHtml += '</tr></table>';
502

503
		PopHtml += '<table>';
504
		PopHtml += '<tr class="paytit">';
505
		PopHtml += '<th width="140"><div class="resouinforcon">时间</div></th>';
506
		PopHtml += '<th width="100"><div class="resouinforcon">付款方</div></th>';
507
		PopHtml += '<th width="120"><div class="resouinforcon">支付方式</div></th>';
508
		PopHtml += '<th width="120"><div class="resouinforcon">金额</div></th>';
509
		PopHtml += '<th width="120"><div class="resouinforcon">状态</div></th>';
510
		PopHtml += '<th width="200"><div class="resouinforcon">备注</div></th>';
511
		PopHtml += '</tr>';
512

513
		PopHtml += '<tr class="payitem">';
514
		PopHtml += '<td><div class="resouinforcon">2016-08-10 08:00</div></td>';
515
		PopHtml += '<td><div class="resouinforcon">张三</div></td>';
516
		PopHtml += '<td><div class="resouinforcon">线下</div></td>';
517
		PopHtml += '<td><div class="resouinforcon">¥1000</div></td>';
518
		PopHtml += '<td><div class="resouinforcon">确认收款</div></td>';
519
		PopHtml += '<td><div class="resouinforcon">之后尾款另行支付</div></td>';
520
		PopHtml += '</tr>';
521
		PopHtml += '</table></div></div>';
522
		
523
		//****************************************************
524
		//合作动态
525
		PopHtml += '<div class="liuyaninfo">';
526
		PopHtml += '<div class="worktit">留言板</div>';
527
		PopHtml += '<div class="guestbookcon"><div class="resouinforcon"><textarea class="frmtype"></textarea></div>';
528
		PopHtml += '<div class="resouinforcon"><div class="wordlimit">字数限制为5~200个</div></div>';
529
		PopHtml += '<div class="addrebtn" style="text-align:right;"> <input type="button" value="留言" class="frmtype frmbtn"></div></div>';
530
		PopHtml += '<div class="guestcon"><div class="guestconitem">';
531
		PopHtml += '<div class="lefteva"> <a href="" class="evaimg"><img src="images/default-photo.jpg" width="100%" height="100%"></a> </div>';
532
		PopHtml += ' <div class="righteva">';
533
		PopHtml += '<ul class="evasort"> <li class="guestname"><span>李四</span><span class="guesttime">2016-09-06 08:00</span></li></ul>';
534
		PopHtml += '<p class="evabrief">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo co Proin gravida dolor sit amet lacus accumsan etiverra justo co Proin gravida dolor sit amet lacus accumsan et iverra justo co Proin gravida dolor sit amet lacus accumsan et iverra justo co Proin gravida dolor sit amet lacus accumsan et  </p>';
535
		PopHtml += '</div></div> </div></div>';
536
		
537
		//****************************************************
538
		//评价
539
		PopHtml += '<div class="pingjiainfo">';
540

541
		/*查看评价信息*/
542
		PopHtml += '<div class="worktit">评价信息</div>';
543
		PopHtml += '<div class="commentbox"><table class="commentcon">';
544
		//双方都评价
545
		PopHtml += '<tr><td> <div class="teamwork">';
546
		PopHtml += '<div class="lefteva"> <a href="" class="evaimg"><img src="images/default-photo.jpg" width="100%" height="100%"></a><p>专家姓名</p><p>职称,职位</p><p>XXX学校,XXX机222222222222222构</p></div>';
547
		PopHtml += '<div class="righteva">';
548
        PopHtml += '<ul class="evasort"><li class="teamname"><span>XXXXXX资源的合作</span><span class="teamtime">2016-09-06</span></li></ul>';
549
        PopHtml += '<div class="evastarbox"><span class="evastar"></span><span class="evastar"></span><span class="evastar"></span><span class="evastar"></span><span class="evastar"></span></div>';
550
        PopHtml += '<p class="evabrief">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo co Proin gravida dolor sit amet lacus accumsan etiverra justo co Proin gravida dolor sit amet lacus accumsan et iverra justo co Proin gravida dolor sit amet lacus accumsan et iverra justo co Proin gravida dolor sit amet lacus accumsan et  </p>';
551
        PopHtml += '</div></div>';
552
        //对方未评价
553
        PopHtml += '<tr><td> <div class="teamwork">';
554
		PopHtml += '<div class="lefteva"> <a href="" class="evaimg"><img src="images/default-photo.jpg" width="100%" height="100%"></a><p>专家姓名</p><p>职称,职位</p><p>XXX学校,XXX机222222222222222构</p></div>';
555
		PopHtml += '<div class="righteva"><div class="noconmment">对方还未评价</div></div>';
556
		//您本人未评价
557
        PopHtml += '<tr><td> <div class="teamwork">';
558
		PopHtml += '<div class="lefteva"> <a href="" class="evaimg"><img src="images/default-photo.jpg" width="100%" height="100%"></a><p>专家姓名</p><p>职称,职位</p><p>XXX学校,XXX机222222222222222构</p></div>';
559
		PopHtml += '<div class="righteva"><div class="noconmment">您还未进行评价,<a class="combtn">现在去评价!</a></div>';
560

561
		PopHtml += '</td></tr> </table></div> </div> ';
562
		
563
		//****************************************************
564
		//关闭按钮
565
		PopHtml += '</div></div>';
566
		PopHtml += '</form><span class="workclose">关闭</span></div>';
567
		PopHtml += '</div>';
568

569

570
		//必须先将html添加到body,再设置Css样式
571
        $("body").before(PopHtml);
572
		$("body").css("overflow-y","hidden");
573
      
574
        var _widht = $(".blackcover").width();
575
        var _height = $(".blackcover").height();
576
		var boxWidth = $(".resoudetailinfo").width();
577
		var boxHeight = $(".resoudetailinfo").height();
578
		
579
		//让提示框居中
580
		$(".resoudetailinfo").css({ top:"40px", left: (_widht - boxWidth) / 2 + "px"  });
581

582

583
		//关闭按钮
584
		$(".workclose").click(function(){
585
			$(".blackcover").remove();
586
			$("body").css("overflow","auto");
587
		});           
588
}
589


+ 20 - 20
src/main/webapp/js/register.js

@ -55,24 +55,24 @@ $("#lp_phone").blur(function(){
55 55
	phoneVal();
56 56
});
57 57
//验证随机验证码
58
//var phoneCode=false;
59
//$("#lp_yzm").blur(function(){
60
//	var authCode=$("#lp_yzm").val();
61
//	if(authCode.length==0){
62
//		$(".msgphone2").text("请输入您的验证码");
63
//		phoneCode=false;
64
//	}else{
65
//		var d=/^[0-9a-zA-Z]{4}$/;
66
//		if(d.test(authCode.trim())){
67
//			$(".msgphone2").text("");
68
//			phoneCode=true;
69
//		}
70
//		else{
71
//			$(".msgphone2").text("请输入您的验证码不正确");
72
//			phoneCode=false;
73
//		}
74
//	}
75
//});
58
var phoneCode=false;
59
$("#lp_yzm").blur(function(){
60
	var authCode=$("#lp_yzm").val();
61
	if(authCode.length==0){
62
		$(".msgphone2").text("请输入您的验证码");
63
		phoneCode=false;
64
	}else{
65
		var d=/^[0-9a-zA-Z]{4}$/;
66
		if(d.test(authCode.trim())){
67
			$(".msgphone2").text("");
68
			phoneCode=true;
69
		}
70
		else{
71
			$(".msgphone2").text("请输入您的验证码不正确");
72
			phoneCode=false;
73
		}
74
	}
75
});
76 76
//获取手机验证码
77 77
var setTime;
78 78
$(".getcode1").click(function(){
@ -180,7 +180,7 @@ $("#btnn").click(function(){
180 180
			 async: false,
181 181
			success:function(data){  
182 182
			if(data.success){
183
				loginagain();
183
				loginagain();//调用登录的接口
184 184
				$(".completedcover").css("display","block");
185 185
				$("#afterSay").click(function(){
186 186
					location.href="index.html";
@ -299,7 +299,7 @@ $("#btnn1").click(function(){
299 299
			type:"POST",
300 300
			 async: false,
301 301
			success:function(data){  
302
				location.href="professor.html?id="+data.data;
302
				location.href="information-add.html?id="+data.data;
303 303
			},
304 304
			error:function(){$.MsgBox.Alert('message','fail')},
305 305
			data:{"email":$("#lp_email").val(),"password":$("#mail_password1").val()},		

+ 1 - 1
src/main/webapp/js/workspace.js

@ -505,7 +505,7 @@ $(".workmysrc").on("click",".loginStatus",function(){
505 505
	{
506 506
		$(".btnboxup").css({"display":"none"});
507 507
		$(".applysure").css({"display":"none"});
508
		$(".dealTime").replaceWith("<input type='text'colspan='2'class='dealTime'>");
508
		$(".dealTime").replaceWith("<input type='text' class='dealTime'>");
509 509
		ajaxGet(operationId);
510 510
		//if($(".dealTime").val()!=""&&$(".detail").val()!="")
511 511
		//{

+ 1 - 1
src/main/webapp/login-email-find01.html

@ -57,7 +57,7 @@
57 57
                    <div class="code-pic"></div><span class="note">看不清?换一换</span>
58 58
                    </div>
59 59
                    <div class="msg" ><span></span></div>-->
60
                    <input type="submit" value="找回密码" class="inputtxt submitBtn" onClick="findBack()" >
60
                    <input type="button" value="找回密码" class="inputtxt submitBtn" onClick="findBack()" >
61 61
					<div class="msg msg2" ><span></span></div>		
62 62
				</div>
63 63
			</form>	

+ 1 - 1
src/main/webapp/login-email-find02.html

@ -55,7 +55,7 @@ $(function (){
55 55
				<div class="remind">请在10分钟内登录您的邮箱接收邮件,<br>点击链接后即可重置密码</div>
56 56
				<div class="password-input">
57 57
                	
58
						<input type="submit" value="登录邮箱并查看" class="inputtxt submitBtn">
58
						<input type="button" value="登录邮箱并查看" class="inputtxt submitBtn">
59 59
                   
60 60
				</div>	
61 61
				    

+ 2 - 2
src/main/webapp/login-phone-find01.html

@ -52,10 +52,10 @@
52 52
                    <div class="msg" ><span></span></div>-->
53 53
                    <div class="codebox">
54 54
                        <input type="text" placeholder="请输入短信验证码" class="inputtxt sms" id="phoneCode" onBlur="valCode()">	
55
                        <input type="submit" value="获取短信验证码" class="inputtxt gain" onClick="sendPhoneCode()">
55
                        <input type="button" value="获取短信验证码" class="inputtxt submitBtn gain" onClick="sendPhoneCode()">
56 56
                    </div>
57 57
                    <div class="msg msg2" ><span></span></div>	
58
                    <input type="submit" value="找回密码" class="inputtxt submitBtn" onClick="submitCodeVal()"/>
58
                    <input type="button" value="找回密码" class="inputtxt submitBtn" onClick="submitCodeVal()"/>
59 59
                    <div class="msg msg3" ><span></span></div>				
60 60
                </div>	
61 61
			</form>	

+ 4 - 4
src/main/webapp/workspaces.html

@ -11,7 +11,7 @@
11 11
<link type="text/css" href="css/workspace.css" rel="stylesheet">
12 12
<link type="text/css" href="css/popup.css" rel="stylesheet">
13 13
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
14

14
<script type="text/javascript" src="js/common.js"></script>
15 15
<script type="text/javascript" src="js/jquery.HeadP.js"> </script>
16 16
<script type="text/javascript" src="js/jquery.Jcrop.js"> </script>
17 17
<script type="text/javascript" src="js/basic.js"> </script>
@ -24,7 +24,7 @@
24 24
<script type="text/javascript" src="js/workspace.js"></script>
25 25
</head>
26 26

27
<body onload="PaymentInfo();">
27
<body onload="DetailInfo();">
28 28

29 29
<div id="header">
30 30
	<a href="index.html" alt="科袖" class="logo"></a>
@ -122,7 +122,7 @@
122 122
                                        <div class="writespan floatL">快速回复:</div>
123 123
                                        <form class="writebackbox">
124 124
                                            <textarea class="frmtype"></textarea>
125
                                            <input type="submit" name="enterback" value="发送" class="writeback floatR">
125
                                            <input type="button" name="enterback" value="发送" class="writeback floatR">
126 126
                                        </form>
127 127
                                    </div>
128 128
                                </div>
@ -146,7 +146,7 @@
146 146
                                        <div class="writespan floatL">快速回复:</div>
147 147
                                        <form class="writebackbox">
148 148
                                            <textarea class="frmtype"></textarea>
149
                                            <input type="submit" name="enterback" value="发送" class="writeback floatR">
149
                                            <input type="button" name="enterback" value="发送" class="writeback floatR">
150 150
                                        </form>
151 151
                                    </div>
152 152
                                </div>