Browse Source

修改完善了一些界面网页界面上的相关样式

luyanan 8 years ago
parent
commit
557fb8320c
39 changed files with 589 additions and 425 deletions
  1. 17 16
      src/main/webapp/account-set.html
  2. 2 1
      src/main/webapp/bind-mail.html
  3. 1 1
      src/main/webapp/css/common.css
  4. 31 30
      src/main/webapp/css/index.css
  5. 15 12
      src/main/webapp/css/login.css
  6. 17 16
      src/main/webapp/css/popup.css
  7. 10 9
      src/main/webapp/css/workspace.css
  8. BIN
      src/main/webapp/images/back.png
  9. BIN
      src/main/webapp/images/ep.png
  10. BIN
      src/main/webapp/images/evastar.png
  11. BIN
      src/main/webapp/images/rz.png
  12. 7 4
      src/main/webapp/index.html
  13. 2 1
      src/main/webapp/information-add.html
  14. 7 7
      src/main/webapp/information-brow.html
  15. 8 8
      src/main/webapp/information.html
  16. 1 0
      src/main/webapp/js/account-set.js
  17. 51 44
      src/main/webapp/js/information.brow.js
  18. 8 1
      src/main/webapp/js/login-email-find01.js
  19. 7 0
      src/main/webapp/js/login-first.js
  20. 5 0
      src/main/webapp/js/login-invite-code.js
  21. 6 0
      src/main/webapp/js/login-phone-find01.js
  22. 6 0
      src/main/webapp/js/login-phone-find02.js
  23. 10 2
      src/main/webapp/js/login.js
  24. 24 23
      src/main/webapp/js/popup.js
  25. 7 0
      src/main/webapp/js/register.js
  26. 70 29
      src/main/webapp/js/workspace.js
  27. 11 7
      src/main/webapp/login-email-find01.html
  28. 20 13
      src/main/webapp/login-email-find02.html
  29. 19 4
      src/main/webapp/login-email-find03.html
  30. 9 7
      src/main/webapp/login-first.html
  31. 8 6
      src/main/webapp/login-invite-code.html
  32. 12 8
      src/main/webapp/login-phone-find01.html
  33. 11 8
      src/main/webapp/login-phone-find02.html
  34. 59 56
      src/main/webapp/login.html
  35. 7 6
      src/main/webapp/organization-brow.html
  36. 85 73
      src/main/webapp/photo-set.html
  37. 9 7
      src/main/webapp/register.html
  38. 8 7
      src/main/webapp/search.html
  39. 19 19
      src/main/webapp/workspaces.html

+ 17 - 16
src/main/webapp/account-set.html

@ -8,22 +8,15 @@
8 8
<link rel="stylesheet" href="css/reset.css" />
9 9
<link type="text/css" href="css/index.css" rel="stylesheet">
10 10
<link type="text/css" href="css/common.css" rel="stylesheet">
11
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
12
<!-- <script type="text/javascript" src="js/form.js"></script> -->
13
<script type="text/javascript" src="js/index.js"></script>
14
<script type="text/javascript" src="js/jquery.cookie.js"></script>
15
<script type="text/javascript" src="js/common.js"></script>
16
 <script type="text/javascript" src="js/account-set.js"></script> 
17
<script type="text/javascript" src="js/jquery.similar.msgbox.js"></script>
18 11
</head>
19 12

20 13
<body>
21 14
<!--浮动窗口-->
22
<div class="cover">
23
	<div class="floatbox">
15
<div class="coverblock cover">
16
	<div class="floatbox" id="bindmail">
24 17
		<div class="float-title">
25 18
			邮箱绑定
26
			<span class="times">&times;</span>
19
			<span class="times"></span>
27 20
		</div>
28 21
        <form class="bdfrm" action="" name="bdemail">
29 22
        	<p>验证您的邮箱地址,完成邮箱账号绑定</p>
@ -35,11 +28,11 @@
35 28
        </form>
36 29
	</div>
37 30
</div>
38
<div class="cover2">
39
	<div class="floatbox">
31
<div class="coverblock cover2">
32
	<div class="floatbox" id="bindphone">
40 33
		<div class="float-title">
41 34
			手机绑定
42
			<span class="times" >&times;</span>
35
			<span class="times" ></span>
43 36
		</div>
44 37
		
45 38
        <form class="bdfrm" action="" name="bdphone">
@ -121,10 +114,10 @@
121 114
                <div class="msg msg2" ></div>
122 115
                <div class="password"><span class="lable">确认密码</span><input type="password" class="psd" id="newPassword2" onBlur="valNew2()" /></div>
123 116
                <div class="msg msg3" ></div>
124
			
117
				<input type="button" value="保存" class="save" onClick="restPassword()"/>
118
            	<!--<div class="msg msg4" ></div> -->
125 119
            </form>
126
            <input type="button" value="保存" class="save" onClick="restPassword()"/>
127
            <!--<div class="msg msg4" ></div> -->
120
            
128 121
		</div>
129 122
		
130 123
		<div class="content-set">
@ -174,5 +167,13 @@
174 167
	<div class="footer-btm">本站由 阿里云 提供计算与安全服务 Copyright © 2016~2017 科袖 | 京ICP备12345678号 | 京ICP证123456号 | 京公网安备11010800011111号 | 网站联盟安全认证</div>
175 168
</div>
176 169

170
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
171
<!-- <script type="text/javascript" src="js/form.js"></script> -->
172
<script type="text/javascript" src="js/index.js"></script>
173
<script type="text/javascript" src="js/jquery.cookie.js"></script>
174
<script type="text/javascript" src="js/common.js"></script>
175
 <script type="text/javascript" src="js/account-set.js"></script> 
176
<script type="text/javascript" src="js/jquery.similar.msgbox.js"></script>
177

177 178
</body>
178 179
</html>

+ 2 - 1
src/main/webapp/bind-mail.html

@ -12,7 +12,7 @@
12 12
<link rel="stylesheet" href="css/reset.css" />
13 13
<link type="text/css" href="css/login.css" rel="stylesheet">
14 14
<link type="text/css" href="css/common.css" rel="stylesheet">
15
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
15

16 16
</head>
17 17

18 18
<body>
@ -84,5 +84,6 @@
84 84
	<div class="footer-btm">本站由 阿里云 提供计算与安全服务 Copyright © 2016~2017 科袖 | 京ICP备12345678号 | 京ICP证123456号 | 京公网安备11010800011111号 | 网站联盟安全认证</div>
85 85
</div>
86 86

87
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
87 88
</body>
88 89
</html>

+ 1 - 1
src/main/webapp/css/common.css

@ -10,7 +10,7 @@ input{ outline:none;}
10 10
#header{width:100%;min-width:1170px; height:60px; background:rgba(255,132,0,1); position:fixed; top:0; z-index:999; }
11 11
.logo{ display:block; width:80px; height:50px; background:url(../images/logo2.png) no-repeat; margin-left:80px; margin-top:5px; float:left;}
12 12
.searchblock{ width:280px; height:35px; position:absolute; left:50%; top:50%; margin-left:-132px; margin-top:-17.5px; display:none;}
13
.search-txt{ width:220px; height:33px; background:#fff; border:none;-moz-border-radius:10px 0 0 10px;-webkit-border-radius:10px 0 0 10px; border-radius:10px 0 0 10px; behavior:url(../js/ie-css3.htc); float:left;font-size:14px;line-height35px; padding-left:10px; color:#a3a3a3;}
13
.search-txt{ width:220px; line-height: 33px; background:#fff; border:none;-moz-border-radius:10px 0 0 10px;-webkit-border-radius:10px 0 0 10px; border-radius:10px 0 0 10px; behavior:url(../js/ie-css3.htc); float:left;font-size:14px;line-height35px; padding-left:10px; color:#a3a3a3;}
14 14
.search-btn{ width:35px; height:35px; background:#fff; border-radius:0 10px 10px 0;-moz-border-radius:0 10px 10px 0;-webkit-border-radius:0 10px 10px 0; float:left; cursor:pointer; behavior:url(../js/ie-css3.htc);cursor:pointer;}
15 15
.search-icon{ display:block; width:20px; height:20px; background:
16 16
url(../images/index-icon.png) no-repeat; background-position:left; margin:8px;}

+ 31 - 30
src/main/webapp/css/index.css

@ -87,7 +87,7 @@ input{ outline:none;}
87 87
.item{ width:99%;overflow: hidden; background:#f8f8f8; border:1px #f0f0f0 solid;/*box-shadow:1px 1px 1px #ff8400 inset;*/ border-radius:10px; margin:10px auto; position:relative;min-height:120px; }
88 88
.operbox{float: left;position: absolute;padding: 10px 20px;margin: 20px;right: 10px; top:50%; margin-top:-20px;}
89 89
.operbtn{ padding:6px 20px; margin:0 2px; border: 1px solid #efefef;border-radius: 6px; background:#ff8400; color:#fff; cursor:pointer;}
90
.photo1{width:132px;height:132px;border-radius:50%;border:1px #f0f0f0 solid;margin:20px;float:left;/*background:url(../images/default-photo.jpg)  no-repeat center center;*/background-size:100% 100%;-moz-background-size:100% 100%; overflow:hidden;}
90
.photo1{width:132px;height:132px;border-radius:50%;margin:20px;float:left;/*border:1px #f0f0f0 solid; background:url(../images/default-photo.jpg)  no-repeat center center;background-size:100% 100%;-moz-background-size:100% 100%;*/ overflow:hidden;}
91 91
/*专家简介*/
92 92
.synopsis{ float:left; padding:20px 0;color:#000; width:800px;line-height:30px;}
93 93
.named{display:block;font-size:24px; color:#000; float:left;}
@ -106,20 +106,21 @@ input{ outline:none;}
106 106
.industrybox{font-size:16px; }
107 107
/*------------------------------------------------------------------------------------*/
108 108
/*账号设置*/
109
.account{ width:875px; min-height:100px; margin:auto; padding: 40px 0;}
110
.account-set{ width:280px; height:438px; float:left; background:#f8f8f8; border-radius:10px; margin-top:50px; overflow:hidden;}
111
.account-title{ height:58px; padding:0 30px;font-size:20px;line-height:68px;color:#a3a3a3;}
112
.leftsidebar{ display:block; width:100%; height:40px; padding-left:50px;font-size:18px;line-height:40px; color:#313131;}
109
.account{ width:1050px; min-height:100px; margin:auto; padding: 40px 0;}
110
.account-set{ width:18%; min-height: 260px; float:left; background:#f8f8f8; border-radius:10px; margin-top:50px; overflow:hidden;}
111
.account-title{ height:58px; padding:0 30px;font-size:18px;line-height:68px;color:#a3a3a3;}
112
.leftsidebar{ display:block; width:100%; height:40px; padding-left:50px;font-size:16px;line-height:40px; color:#313131;}
113 113
.bgcolor{ background:#ff8400; color:#fff;}
114 114
.leftsidebar:hover{ background:#ff8400; color:#fff;}
115 115

116
.contentbox{ overflow:hidden;}
117
.content-set{ width:578px; height:552px; float:right; background:#f8f8f8; border-radius:10px;margin-top:50px; overflow:hidden; display:none;}
118
.content-title{height:58px;padding:0 30px;font-size:20px;line-height:28px; color:#313131; border-bottom:2px #c8c8c8 solid;}
116
.contentbox{  width:80%; float: right;overflow:hidden;margin:40px 0;}
117
.content-set{ width:100%;  min-height: 460px; background:#f8f8f8; border-radius:10px;margin:10px 0; overflow:hidden; display:none;}
118
.content-set form{ width: 600px;margin: auto;padding: 10px;}
119
.content-title{height:58px;padding:0 30px;font-size:18px;line-height:64px; color:#313131; border-bottom:1px #c8c8c8 solid;}
119 120
.note{ width:438px; height:74px; margin:auto;font-size:16px;line-height:100px;color:#818181; text-align:center; border-bottom:1px #c8c8c8 dashed;}
120 121
.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;}
121 122
.account-name{ height:50px; padding: 0 40px;}
122
.text-txt{font-size:18px;line-height:50px;color:#515151; float:left; margin-left:20px; }
123
.text-txt{font-size:16px;line-height:50px;color:#515151; float:left; margin-left:20px; }
123 124
.edit{ display:block;width:22px; height:22px; background:url(../images/edit.png) no-repeat; background-position:right; float:left; margin-top:14px; margin-left:15px;cursor:pointer;}
124 125
.text a{font-size:14px;line-height:57px; color:#f5980b; padding-left:5px;}
125 126
.account-sax{ clear:both; height:50px; width:100%; padding: 0 40px;}
@ -127,31 +128,31 @@ input{ outline:none;}
127 128
input[type='radio'].radio {opacity:0; display:inline-block; height:20px; float:left; }
128 129
label.radio {background:url(../images/unredio.png) no-repeat; height:20px; padding-left:25px; float:left; margin-top:14px; margin-left:10px;font-size:18px;line-height:22px; color:#818181;}
129 130
input[type='radio'].radio:checked + .radio {background:url(../images/redio.png) no-repeat;}
130
.save{ clear:both; width:140px; height:44px;margin-left:219px; margin-top:20px;border-radius:10px; border:none; background:#ff8400;font-size:18px;line-height:44px; color:#fff;}
131
.save{ clear:both; width:140px; height:36px;margin-left:219px; margin-top:20px;border-radius:10px; border:none; background:#ff8400;font-size:16px;line-height:36px; color:#fff;}
131 132
/*修改密码*/
132 133

133 134
/*input:focus{ border:1px solid #ff8500;}*/
134
.msgs{font-size:14px;line-height:44px; color:#ff8500;padding-left:8px;  float:left;cursor:pointer;}
135
.msgs{font-size:14px;line-height:40px; color:#ff8500;padding-left:8px;  float:left;cursor:pointer;}
135 136
.msg{ clear:both;font-size:14px;line-height:26px;color:red; padding-left:140px; background:url(../images/info_warn.png) 116px center no-repeat; }
136 137
.msg-yz{font-size:14px;line-height:26px; color:red; padding:0 30px;background:url(../images/info_warn.png) 10px center no-repeat; margin-bottom:10px;  clear: both;  }
137 138
.marginT{ height:60px; width:100%;}
138
.password{ width:100%; height:44px; clear:both; margin-top:24px; }
139
.lable{ float:left; display:block; width:100px;font-size:18px;line-height:44px; color:#747474; padding-right:15px; text-align:right;}
140
.psd{ width:350px; height:44px; float:left; border-radius:10px; border:1px #bdbdbd solid; box-shadow:0px 0px 2px #bdbdbd inset; padding-left:20px;}
141
.forget{ display:block; height:44px;font-size:14px;line-height:44px; color:#ff8500; float:right;cursor:pointer; position:relative;}
139
.password{ width:100%; height:40px; clear:both; margin-top:24px; }
140
.lable{ float:left; display:block; width:100px;font-size:16px;line-height:40px; color:#747474; padding-right:15px; text-align:right;}
141
.psd{ width:350px; height:40px; float:left; border-radius:10px; border:1px #bdbdbd solid; box-shadow:0px 0px 2px #bdbdbd inset; padding-left:20px;}
142
.forget{ display:block; height:40px;font-size:14px;line-height:40px; color:#ff8500; float:right;cursor:pointer; position:relative;}
142 143
.forget:hover{ color:#ff8500;}
143 144
/*账号绑定*/
144
.binding{ width:100%; height:44px;font-size:18px;line-height:66px;color:#818181;margin-left:70px;; margin-top:40px; display:none; }
145
.unbinding{width:100%; height:44px;font-size:18px;line-height:66px; color:#ff8400;margin-left:70px;; margin-top:40px; cursor:pointer; }
146
.email-icon{display:block; width:44px; height:44px; background:url(../images/ep.png) no-repeat; background-position:left; float:left; margin-right:25px; margin-top:10px;}
147
.phone-icon{display:block; width:44px; height:44px; background:url(../images/ep.png) no-repeat; background-position:right; float:left; margin-right:25px; margin-top:10px;}
148
.replace{ width:88px; height:35px; background:#ff8400; border-radius:5px; border:none;font-size:18px;line-height:35px; color:#fff; margin-left:10px; cursor:pointer;}
145
.binding{ width:100%; height:44px;font-size:16px;line-height:66px;color:#818181;margin-left:70px;; margin-top:40px; display:none; }
146
.unbinding{width:580px; height:44px;font-size:16px;line-height:66px; color:#ff8400;margin:auto; margin-top:40px; cursor:pointer; }
147
.email-icon{display:block; width:30px; height:30px; background:url(../images/ep.png) 0 center no-repeat; float:left; margin-right:20px; margin-top:20px;}
148
.phone-icon{display:block; width:30px; height:30px; background:url(../images/ep.png) -30px center no-repeat;float:left; margin-right:20px; margin-top:20px;}
149
.replace{ width:88px; height:30px; background:#ff8400; border-radius:5px; border:none;font-size:16px;line-height:30px; color:#fff; margin-left:10px; cursor:pointer;}
149 150
.replace3,.replace4{ display:none;}
150
.cover{ width:100%; height:100%; background:rgba(0,0,0,0.2); position:fixed; z-index:999; display:none;}
151
.cover2{ width:100%; height:100%; background:rgba(0,0,0,0.2); position:fixed; z-index:999; display:none;}
152
.floatbox{ /*width:400px;*/ box-shadow:2px 5px 5px #999; border-radius:10px;background:#fff; position:absolute; left:50%;top:50%; margin-left:-210px; margin-top:-193px; overflow:hidden;}
153
.float-title{  height:70px; background:#eee;font-size:20px;line-height:70px; color:#818181; padding:0 20px;}
154
.times{ display:block; width:30px; height:30px; background:#ff8400; border-radius:3px;font-size:28px;line-height:28px; color:#fff; text-align:center; font-weight:bold; float:right; margin-top:20px; cursor:pointer; }
151

152
.coverblock{ width:100%; height:100%; background:rgba(0,0,0,0.6); position:fixed; z-index:1004; display:none;}
153
.floatbox{ /*width:400px;*/ padding: 20px; box-shadow:2px 5px 5px #999; border-radius:16px;background:#fff; position:absolute; top:80px; left:50%; margin-left:-240px;  margin-bottom:40px;}
154
.float-title{  height:60px;border-bottom: 1px #ff8400 solid;font-size:18px;line-height:60px; color:#818181; padding:0 20px;}
155
.times{ background:url(../images/workclose.png) center center no-repeat; position:absolute; top:10px; right:-30px;width: 24px;height: 24px; z-index: 1005; cursor:pointer; }
155 156

156 157
.bdfrm{ padding:10px 30px 60px 30px; }
157 158
.yz{ width:350px; height:44px; border-radius:10px; border:1px #bdbdbd solid; box-shadow:0px 0px 2px #bdbdbd inset; padding-left:20px; margin:10px;}
@ -174,7 +175,7 @@ input[type='radio'].radio:checked + .radio {background:url(../images/redio.png)
174 175
.coulstblock .coulstbox .coulstbtn{padding:24px 10px; margin-left:10px;}
175 176
.coulstblock .coulstbox .coulstbtn span{padding:4px 10px; display:block; width:60px; border-radius:2px; text-align:center; color:#fff; background:#ff8400;}
176 177
/*专家信息头部*/
177
.information-head{ width:1050px; margin:auto;background:#fff; border:1px #c9c9c9 solid; margin-top:30px; overflow:hidden; padding:20px 50px;}
178
.information-head{ width:1050px; margin:auto;background:#fff; border:1px  solid #eaeaea; margin-top:30px; overflow:hidden; padding:20px 50px;}
178 179
.head-left{ float:left;width:200px; height:200px; border-radius:50%;position:relative;overflow:hidden;}
179 180
.replace-photo{ display:block; width:100%; height:50px; position:absolute; bottom:-50px;background:url(../images/take-photo.png) no-repeat center center; background-color:rgba(0,0,0,0.4);font-size:16px;line-height:44px; color:#fff; text-align:center;}
180 181
/*.take-photo{ display:block; width:20px; height:20px; position:absolute; top:50%; margin-top:-10px; left:50%; margin-left:-10px;background:url(../images/take-photo.png) no-repeat center center; }*/
@ -192,14 +193,14 @@ input[type='radio'].radio:checked + .radio {background:url(../images/redio.png)
192 193
/*专家信息内容*/
193 194
.information-content{  width:1050px;height:auto; margin:auto;margin-top:20px; position:relative;overflow: hidden;}
194 195
.content-left{min-height:394px; float:left;overflow:hidden; }
195
.menublock{ margin-bottom:10px;width:298px; background:#fff; border:1px #c9c9c9 solid; padding-bottom:10px;}
196
.menublock{ margin-bottom:10px;width:298px; background:#fff; border:1px #eaeaea solid; padding-bottom:10px;}
196 197
.left-title{ width:165px; height:44px;font-size:22px;line-height:44px; border-bottom:1px #ffad55 solid; padding-left:10px; }
197 198
.subsidebar{ display:block; width:100%; height:26px; padding-left:18px;font-size:14px;line-height:26px;color:#313131; margin-top:5px;}
198 199
.subcolor{ background:#f99550; color:#fff;}
199 200
.subsidebar:hover{ background:#f99550; color:#fff;}
200 201

201 202
.content-right{ width:735px;min-height:100px; float:right; }
202
.right-box{ width:100%; background:#fff; border:1px #c9c9c9 solid; margin-bottom:20px; }
203
.right-box{ width:100%; background:#fff; border:1px #eaeaea solid; margin-bottom:20px; }
203 204
/*.introduction{min-height:200px;}*/
204 205
.right-title{ position:relative; overflow:hidden; padding-right:20px;}
205 206
.right-title span{ float:left;font-size:22px;line-height:48px; /*color:#ff8400; */padding-left:15px;}
@ -293,8 +294,8 @@ label.edu-radio{ float:none;font-size:16px;line-height:26px; color:#868686; }
293 294
.evaluate .evastarbox{ overflow:hidden;}
294 295
.evaluate .evastar{ display:block; width:24px; height:24px; cursor:pointer; float:left; background:url(../images/evastar.png) 0 -22px no-repeat;}
295 296
.evaluate .evabrief{ display:block; max-height:80px; overflow:hidden; text-overflow:ellipsis; }
296
.evaluate .morebtn{ text-align:right; overflow:hidden;}
297
.evaluate .morelink{ color:#333;font-size:14px;line-height:60px;float:right; margin-right:20px;}
297
.shareabout .morebtn{ text-align:right; overflow:hidden; margin:10px;}
298
.shareabout .morebtn .morelink{ color:#333;font-size:14px;line-height:60px;float:right; margin-right:20px;}
298 299

299 300
/*个人修改页面科研资源*/
300 301
.enterwork{ color:#333;position:absolute; bottom:10px; left:110px;}

+ 15 - 12
src/main/webapp/css/login.css

@ -4,6 +4,7 @@
4 4
html,body{ cursor:default; margin:0; height:100%;}
5 5
#header{ width:100%; height:50%; background:#db7200; }
6 6
#footer{ width:100%; height:50%; background:#dbdbdb;}
7
.coverbox{position:fixed; overflow-y: auto; width:100%; height: 100%;}
7 8

8 9
.inputtxt{ width:100%; height:44px;border:1px #e4e4e4 solid; border-radius:10px;background:url(../images/input-bg.jpg); box-shadow:0px 1px 1px #d6d6d6; margin:4px 0; text-indent:1.4em;box-sizing: content-box;}
9 10
.inputtxtbtn{text-indent:0em;}
@ -11,11 +12,11 @@ html,body{ cursor:default; margin:0; height:100%;}
11 12
.input_warning{ border:1px solid red; }
12 13
.submitBtn {display: block; 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;}
13 14
/*登录邀请码*/
14
.loginbox{ /*width:620px; height:600px;*/ background:#fff; margin:auto; padding:20px;  position:absolute; left:50%; top:50%; margin-left:-300px; margin-top:-280px; z-index:999; border-radius:10px; border:1px #9f9d9d solid; box-shadow:1px 1px 8px #9f9d9d; }
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 16

16 17
.login-title{ color:#ff8500;font-size:16px;line-height:86px; position:absolute;right:20px; top:-10px; cursor:pointer;}
17 18
.login-title a{ color:#ff8500; }
18
.back{ display:block; width:24px; height:24px; margin-top:33px; margin-left:8px; background:url(../images/back.png) no-repeat; float:right; cursor:pointer;}
19
.back{ display:block; width:24px; height:24px; margin-top:30px; margin-left:8px; background:url(../images/back.png) no-repeat; float:right; cursor:pointer;}
19 20
.logo{ clear:both;width:145px; height:100px;margin:auto; margin-top:30px;}
20 21
.logo img{ width:100%;}
21 22

@ -59,9 +60,10 @@ html,body{ cursor:default; margin:0; height:100%;}
59 60
.way-icon3{ width:21px; background:url(../images/share2.png) no-repeat; background-position:-54px 0;}
60 61
.way-icon4{ width:23px; background:url(../images/share2.png) no-repeat; background-position:right;}
61 62
.ecode{ text-align:center;}
63
.ecode p{ font-size:14px;}
62 64
.downcode{ margin:10px auto; width:120px; height:120px;}
63 65
/*首次登录*/
64
.login-first{ /*width:466px; height:596px;*/ background:#fff; margin:auto; margin-top:35px; padding:0 30px; padding-bottom:40px; position:absolute; left:50%; top:50%; margin-left:-263px; margin-top:-268px; z-index:999; border-radius:10px; border:1px #9f9d9d solid; box-shadow:1px 1px 8px #9f9d9d;}
66
.login-first{ /*width:466px; height:596px;*/ background:#fff; margin:auto; margin-top:35px; padding:0 30px; padding-bottom:40px; position:absolute;  z-index:999; border-radius:10px; border:1px #9f9d9d solid; box-shadow:1px 1px 8px #9f9d9d;margin-bottom:40px;}
65 67
.logos{ clear:both;width:145px; height:100px; margin:auto; padding-top:-40px;}
66 68
.logos img{ width:100%;}
67 69
.welcome{font-size:16px;line-height:32px;color:#747474; text-align:center;padding:10px 0;}
@ -72,7 +74,7 @@ html,body{ cursor:default; margin:0; height:100%;}
72 74
.psd{ width:350px; float:left;}
73 75
.forget:hover .prompt{ display:block;}
74 76
/*手机找回密码01*/
75
.phone-find1{ /*width:476px; height:596px;*/ background:#fff; margin:auto; margin-top:35px; padding:0 25px;padding-bottom:60px; position:absolute; left:50%; top:50%; margin-left:-263px; margin-top:-268px; z-index:999; border-radius:10px; border:1px #9f9d9d solid; box-shadow:1px 1px 8px #9f9d9d; }
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; }
76 78
.logo-find{width:76px; height:53px; margin:auto; padding-top:20px; float:left;}
77 79
.logo-find img{ width:100%;}
78 80
.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;  }
@ -82,13 +84,14 @@ html,body{ cursor:default; margin:0; height:100%;}
82 84
.step02{ display:block; width:46px; height:30px; background:url(../images/02.png) no-repeat; background-position:right; overflow:hidden; margin:auto;}
83 85
.line{ width:133px; height:2px; background:#d5d5d5; position:absolute; left:80px; top:35px}
84 86
.sms{ width:254px;}
85
.gain{ width:175px;background:#ff8500; color:#fff;font-size:14px;line-height:44px; box-shadow:none; float:right; padding-left:0;}
87
.codebox{ overflow:hidden;}
88
.gain{ width:160px;background:#ff8500; color:#fff;font-size:14px;line-height:44px; box-shadow:none; float:right; padding-left:0; margin:4px 0;}
86 89
/*手机找回密码02*/
87
.phone-find2{/* width:476px; height:525px; */background:#fff; margin:auto; margin-top:35px; padding:0 25px;padding-bottom:60px; position:absolute; left:50%; top:50%; margin-left:-263px; margin-top:-268px; z-index:999; border-radius:10px; border:1px #9f9d9d solid; box-shadow:1px 1px 8px #9f9d9d;}
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;}
88 91
.steps2-2{ color:#f59503; float:right;}
89 92
.step02-2{ display:block; width:46px; height:30px; background:url(../images/02.png) no-repeat; background-position:left; overflow:hidden; margin:auto;}
90 93
/*邮箱找回密码01*/
91
.email-find1{/* width:476px; height:512px;*/ background:#fff; margin:auto; margin-top:35px; padding:0 25px;padding-bottom:40px; position:absolute; left:50%; top:50%; margin-left:-263px; margin-top:-260px; z-index:999; border-radius:10px; border:1px #9f9d9d solid; box-shadow:1px 1px 8px #9f9d9d; }
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; }
92 95
.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;  }
93 96
.E-steps2{ color:#a3a3a3; float:left; margin-left:70px;}
94 97
.E-step02{ display:block; width:46px; height:30px; background:url(../images/02.png) no-repeat; background-position:right; overflow:hidden; margin:auto;}
@ -97,19 +100,19 @@ html,body{ cursor:default; margin:0; height:100%;}
97 100
.line2{ width:95px; height:2px; background:#d5d5d5; position:absolute; left:95px; top:35px}
98 101
.line3{ width:95px; height:2px; background:#d5d5d5; position:absolute; left:265px; top:35px}
99 102
/*邮箱找回密码02*/
100
.email-find2{/* width:476px; height:440px; */background:#fff; margin:auto; margin-top:35px; padding:0 25px; padding-bottom:60px;position:absolute; left:50%; top:50%; margin-left:-263px; margin-top:-268px; z-index:999; border-radius:10px; border:1px #9f9d9d solid; box-shadow:1px 1px 8px #9f9d9d; }
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; }
101 104
.E-steps2-2{ color:#f59503; float:left; margin-left:70px;}
102 105
.E-step02-2{ display:block; width:46px; height:30px; background:url(../images/02.png) no-repeat; background-position:left; overflow:hidden; margin:auto;}
103 106
.remind{font-size:14px;line-height:20px; color:#a8a8a8; text-align:center; }
104 107
/*邮箱找回密码03*/
105
.email-find3{ /*width:476px; height:525px;*/ background:#fff; margin:auto; margin-top:35px; padding:0 25px; padding-bottom:60px; position:absolute; left:50%; top:50%; margin-left:-263px; margin-top:-268px; z-index:999; border-radius:10px; border:1px #9f9d9d solid; box-shadow:1px 1px 8px #9f9d9d;}
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;}
106 109
.steps3-3{ color:#f59503; float:right;}
107 110
.step03-3{ display:block; width:45px; height:30px; background:url(../images/03.png) no-repeat; background-position:left; overflow:hidden; margin:auto;}
108 111

109 112

110 113
/*默认头像*/
111
.default-photo{ display:block; width:171px; height:171px; border-radius:50%; position:absolute; left:50%; top:50%; margin-left:-100px; margin-top:-100px; background:url(../images/default-photo.jpg) center center; border:4px #c9c9c9 solid;}
112
.photo-box{/* width:788px; height:726px; */border-radius:10px; background:#fff; position:absolute; left:50%; top:50%; margin-left:-394px; margin-top:-320px; padding:0 40px; padding-bottom:40px;}
114
.default-photo{ display:block; width:171px; height:171px; border-radius:50%; position:absolute; left:50%; top:50%; margin-left:-100px; margin-top:-100px; background:url(../images/default-photo.jpg) center center; border:4px #c9c9c9 solid;margin-bottom:40px;}
115
.photo-box{/* width:788px; height:726px; */border-radius:10px; background:#fff; position:absolute;  padding:0 40px; padding-bottom:40px; margin-bottom:40px;}
113 116

114 117
.photo-title{color:#ef7c00;font-size:26px;line-height:80px; padding-left:10px; }
115 118
.photo-set{ height:450px; width:735px; margin:auto; color:#828282; text-align:center;}
@ -117,7 +120,7 @@ html,body{ cursor:default; margin:0; height:100%;}
117 120
.photo-upload{ width:490px; height:450px; border-radius:10px; background:#f8f8f8; float:left; overflow:hidden;}
118 121

119 122
.load{font-size:16px;line-height:30px; text-align:center;/* border:1px solid red;*/ margin-top:200px;margin-bottom:200px;}
120
.load p{font-size:14px;line-height:14px;}
123
.load p{font-size:14px;line-height:14px; margin: 10px;}
121 124
.upbtn{width: 140px;height: 34px; border-radius:10px; border:1px #dfdfdf solid; background:#fff; position:relative; margin-top:10px; cursor:pointer;}
122 125
.filebtn{ width: 200px; height: 80px; box-shadow:none;opacity:0; position:absolute; left:-20px; top:-25px; cursor:pointer;}
123 126
#uploadBtn{ float:left; box-shadow:none; border:1px #dfdfdf solid; width:140px; height:32px; border-radius:10px; background:#fff;margin-top:10px; margin-left:100px; cursor:pointer; }

+ 17 - 16
src/main/webapp/css/popup.css

@ -9,12 +9,12 @@
9 9
.blackcover{ width:100%; height:100%;overflow-x: hidden;overflow-y: auto; position:fixed; background:rgba(0,0,0,.6); z-index:1000; }
10 10
.resoufrm p{ font-size:14px;}
11 11
/*弹窗资源信息、申请信息*/
12
.resouinfo{position:absolute;background:#fff;border-radius:10px;padding:30px 20px;font-size:14px;z-index:1001; margin-bottom:40px; }
12
.resouinfo{position:absolute;background:#fff;border-radius:10px;padding:30px 20px;font-size:14px;z-index:1001; margin-bottom:40px; box-shadow: 2px 4px 10px 4px #555; -webkit-box-shadow: 2px 4px 10px 4px #555; -moz-box-shadow: 2px 4px 10px 4px #555; }
13 13

14 14
.resoutit{padding: 0 20px;font-size:16px;line-height:40px;color: #606060; border-bottom:1px solid #ff8400; position:relative; font-weight:bold;}
15 15

16 16
.resoutit .showinfor{ position:absolute; left:60px; top:2px; font-size:13px; font-weight:normal;}
17
.resouinfotype{ font-weight:600; text-align:right;  min-width: 80px;}
17
.resouinfotype{ font-weight:600; text-align:right;color: #555; min-width: 80px;}
18 18
.resouinforcon{ padding:0 10px; width:100%; position:relative; max-width:560px;}
19 19

20 20
.resoubox{ padding:20px; }
@ -48,24 +48,25 @@
48 48
.teamworktit{padding: 0 10px;font-size:16px;line-height:40px;color: #606060; border-bottom:1px solid #ff8400;}
49 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
.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:480px;}
51
.teamwork .lefteva .evaimg{ display:block; width:50px; height:50px; overflow:hidden; border:1px solid transparent; border-radius:50%; margin:auto;}
52
.teamwork .righteva{padding:10px; float:left; margin-left:20px; font-size:14px; width:78%; max-width:476px;}
53 53
.teamwork .righteva  .teamname{ position:relative;}
54 54
.teamwork .righteva .teamname .teamtime{ position:absolute; right:0;}
55 55
.teamwork .righteva .evastarbox{ overflow:hidden;}
56 56
.teamwork .righteva .evastar{ display:block; width:24px; height:24px; cursor:pointer; float:left; background:url(../images/evastar.png) 0 -22px no-repeat;}
57 57
.teamwork .righteva .evabrief{ display:block; margin-top:10px; max-height:80px; overflow:hidden; }
58 58

59
.resoutit .stateinfor{ position:absolute; bottom:-20px; right: -26px;background: #ff8400; color: #fff; padding: 0 40px;border-radius: 10px 0 0 10px;z-index: 2; cursor:pointer;}
60
.resoutit .stateinfor em{position: absolute;width: 0px; height: 0px;border-top: 0px solid  rgb(180, 90, 0);border-bottom: 4px solid transparent;border-left: 6px solid  rgb(180, 90, 0); border-right: 0px solid transparent;right: 0px; bottom: -4px;}
61
.workclose{ position:absolute; top:0; right:-60px; display:block; width:20px; height:20px; background:url(../images/workclose.png) center center no-repeat; padding:20px;cursor:pointer; z-index:999;}
59
.resoutit .stateinfor{ position:absolute; bottom:-20px; right: -28px;background: #ff8400; color: #fff; padding: 0 40px;border-radius: 20px 0 0 20px;z-index: 2; cursor:pointer;}
60
.resoutit .stateinfor em{position: absolute;width: 0px; height: 0px;border-top: 0px solid  rgb(180, 60, 6);border-bottom: 6px solid transparent;border-left: 8px solid  rgb(180, 60, 6); border-right: 0px solid transparent;right: 0px; bottom: -6px;}
61
.workclose{ position:absolute; top:0; right:-50px; display:block; width:20px; height:20px; background:url(../images/workclose.png) center center no-repeat; padding:20px;cursor:pointer; z-index:999;}
62 62

63 63
.resoutab .workmsgbox td{padding:0; margin:0;}
64 64
.workmsg{ clear:both;font-size:14px;line-height:26px; color:red; padding-left:20px; background:url(../images/info_warn.png) 0 center no-repeat; }
65 65

66 66
/*//资源申请*/
67
.resouapply{position:absolute; background:#fff;border-radius:10px;padding:20px;font-size:14px;z-index:1001; margin-bottom:40px;}
67
.resouapply{position:absolute; background:#fff;border-radius:10px;padding:20px;font-size:14px;z-index:1001; margin-bottom:40px;box-shadow: 2px 4px 10px 4px #555; -webkit-box-shadow: 2px 4px 10px 4px #555; -moz-box-shadow: 2px 4px 10px 4px #555;}
68 68
.resouapply .resoushowimg{width:100%; border:1px solid #d6d6d6; height:200px; position:relative; overflow:hidden; }
69
.resouapply .resouimg2{ height:200px;}
69 70
.resoufrm .worktit{ position:relative; width:100%;border-bottom:1px solid #d6d6d6; padding:10px; font-size:16px; }
70 71
.resoufrm .worktit .uploadbtn{ position:absolute; bottom:11px; left:80px; font-size:13px; color:#ff8400;}
71 72
.filebox{ padding:10px; margin:10px 0;}
@ -77,7 +78,7 @@
77 78
.fibepople{ margin-right:60px;}
78 79

79 80
/*评价*/
80
.commentinfo{position:absolute;background:#fff;border-radius:10px;padding:20px;font-size:14px; z-index:1001; margin-bottom:40px; }
81
.commentinfo{position:absolute;background:#fff;border-radius:10px;padding:20px;font-size:14px; z-index:1001; margin-bottom:40px;box-shadow: 2px 4px 10px 4px #555; -webkit-box-shadow: 2px 4px 10px 4px #555; -moz-box-shadow: 2px 4px 10px 4px #555; }
81 82
.commentinfo .wordlimit{ font-size:12px; color:#999; text-align:right;}
82 83
.commentbox{ padding:20px; }
83 84
.commentbox table{width:640px;}
@ -89,7 +90,7 @@
89 90
.evastar2{ display:block; width:24px; height:24px; cursor:pointer; float:left; background:url(../images/evastar.png) 0 -22px no-repeat;}
90 91

91 92
/*留言*/
92
.guestbookinfo{position:absolute;background:#fff;border-radius:10px;padding:20px;font-size:14px; z-index:1001;  margin-bottom:40px;}
93
.guestbookinfo{position:absolute;background:#fff;border-radius:10px;padding:20px;font-size:14px; z-index:1001;  margin-bottom:40px;box-shadow: 2px 4px 10px 4px #555; -webkit-box-shadow: 2px 4px 10px 4px #555; -moz-box-shadow: 2px 4px 10px 4px #555;}
93 94
.guestbookinfo .wordlimit{ font-size:12px; color:#999;}
94 95
.guestbookcon{padding:20px; width:600px; margin:auto;}
95 96
.guestcon{ padding:20px 0;max-height:240px;overflow-x:hidden; overflow-y:visible ;  }
@ -104,7 +105,7 @@
104 105

105 106
/*款项记录*/
106 107

107
.paymentinfo{position:absolute; background:#fff;border-radius:10px;padding:20px;font-size:14px;z-index:1001;  margin-bottom:40px; }
108
.paymentinfo{position:absolute; background:#fff;border-radius:10px;padding:20px;font-size:14px;z-index:1001;  margin-bottom:40px; box-shadow: 2px 4px 10px 4px #555; -webkit-box-shadow: 2px 4px 10px 4px #555; -moz-box-shadow: 2px 4px 10px 4px #555;}
108 109
.paymentbox{ padding:20px;}
109 110
.payaddbox{  width:640px; margin:auto; margin-top:20px;padding:20px 40px; background:#f8f8f8;}
110 111
.payaddbox table{ width:100%;}
@ -119,7 +120,7 @@
119 120
.paybtn{ position:absolute; left:100px; top:0px; font-size:14px; cursor:pointer; color:#ff8400; }
120 121

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

@ -139,7 +140,7 @@
139 140
.combtn{color:#ff8400; cursor:pointer;}
140 141

141 142
/*//咨询申请*/
142
.consultapply{position:absolute;border-radius:10px; min-width: 700px;margin-top:40px; font-size:14px; background:#fff;padding:20px;z-index:1001; }
143
.consultapply{position:absolute;border-radius:10px; min-width: 700px;margin-top:40px;margin-bottom:40px; font-size:14px; background:#fff;padding:20px;z-index:1001; box-shadow: 2px 4px 10px 4px #555; -webkit-box-shadow: 2px 4px 10px 4px #555; -moz-box-shadow: 2px 4px 10px 4px #555;}
143 144
.consultinfo{ padding:10px 20px; max-width:680px; overflow:hidden;}
144 145
.consultleft{ width:33%; margin-right:20px;}
145 146
.consultleft .prohead{ width:140px; height:140px; border-radius:50%; overflow:hidden; margin:auto; margin-bottom:10px;}
@ -154,9 +155,9 @@
154 155

155 156
.consultright{ width:60%; margin-left:20px; padding:10px;}
156 157
.probrief .proname .name{  text-align:left;font-size:26px;line-height:46px; font-weight:400; color:#333;}
157
.probrief .proname .modifyicon{ margin-left:10px;}
158
.probrief .hh2{font-size:20px;line-height:36px;  }
159
.probrief .hh4{font-size:16px;line-height:24px; }
158
.probrief .proname .modifyicon{ margin-left:10px; margin-top:-10px;}
159
.probrief .phh2{font-size:20px;line-height:36px; color:#333;  }
160
.probrief .phh4{font-size:16px;line-height:24px; color:#333; }
160 161
.sendmsg {}
161 162
.sendmsg .sendmsgtit{font-size:18px;line-height:40px;  font-weight:600; border-bottom: 1px solid #ff8400; margin:10px 0;}
162 163
.sendmsg .sendmsgcon{}

+ 10 - 9
src/main/webapp/css/workspace.css

@ -34,27 +34,28 @@
34 34
.maintab{ border-bottom:1px dashed #d7d7d7; margin-top:20px; overflow:hidden;}
35 35
.maintab:last-child{border-bottom:none;}
36 36
.worktab *{ text-align:center; color:#000;}
37
.lefttab{ width:16%; overflow:hidden;}
38
.resoubrief{height:300px; overflow:hidden;}
37
.lefttab{ width:16%;min-width: 162px; overflow:hidden;}
38
.resoubrief{width:100%;height:300px; overflow:hidden;}
39 39
.resoubrief tr td{ /*border-bottom:1px solid #d6d6d6;*/ min-height:200px; padding:16px 0;}
40 40
.resoubrief tr td ul li{ width:100%; max-width:150px; text-overflow:ellipsis; overflow:hidden; white-space:nowrap;}
41 41
.resoumag{ display:block; background:#ff8400;font-size:14px;line-height:30px;color:#fff; border-radius:4px; text-align:center; cursor:pointer;}
42 42
.righttab{ width:82%;}
43 43
.worktab a{ color:#333;}
44 44
.worktab a:hover{color:#ff8400;}
45
.worktab tr td{ padding:0 4px;max-width:60px;text-overflow:ellipsis; overflow:hidden; white-space:nowrap;}
45
.worktab tr td{ padding:0 4px;max-width:60px;/*text-overflow:ellipsis; overflow:hidden; white-space:nowrap;*/}
46 46
.worktab .worktabtit{ height:40px;background:#fff9ef;border-bottom:1px #D8D8D8 solid;}
47
.worktab .workitem{ border-bottom:1px #D8D8D8 solid;height:80px; padding:10px 0;}
47
.worktab .workitem{ border-bottom:1px #D8D8D8 solid;height:110px; padding:10px 0;}
48 48
.worktab .workitem:nth-child(odd){background:#fff;}
49 49
.workitemsrc{ cursor:pointer; color:#702C40;}
50
.operatebtn{ display:block; cursor:pointer;}
51

50
.operatebtn,.opbtn{ display:block;margin-top:10px;}
51
.operatebtn span,.opbtn span{ color:#ff8400; cursor:pointer; }
52
.modification{padding:10px 0;}
52 53

53 54
/*////////////我的工作台/////////////////*/
54 55
.workblock{ padding:10px; overflow:hidden;  background:#fff; margin:10px 0; margin-bottom:20px;}
55 56
.workhs{ width:34%; overflow:hidden;}
56 57
.workconleft{ width:82%;}
57
.workhead{ display:block; margin:10px; height:84%; height:84%; border:1px #ccc solid; border-radius:50%; overflow:hidden;}
58
.workhead{ display:block; margin:10px; height:84%; height:84%;/* border:1px #ccc solid; */border-radius:50%; overflow:hidden;}
58 59
.workstat{ float:left; width:50%; text-align:center;}
59 60
.workstat span{font-size:18px;line-height:30px; font-weight:bold;}
60 61

@ -63,8 +64,8 @@
63 64
.workinfor .named{display:block;font-size:18px;line-height:34px; font-weight:bold; color:#000; float:left;}
64 65
.workinfor .named:hover,.workinfor .named:focus,.workinfor .named:active{color:#000; text-decoration:none;}
65 66

66
.workinfor h5{font-size:16px;line-height:30px; font-weight:bold;}
67
.workinfor h6{ font-size:13px;line-height:24px; font-weight:bold;}
67
.workinfor h5{font-size:16px;line-height:30px; font-weight:600;}
68
.workinfor h6{ font-size:13px;line-height:24px; font-weight:400;}
68 69
.worklinkbtn{ color:#ff8400;font-size:12px;line-height:24px;cursor:pointer;}
69 70

70 71
.workcountup{ width:100%; overflow:hidden; padding:6px 0; text-align:center; margin:10px;}

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


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


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


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


+ 7 - 4
src/main/webapp/index.html

@ -1,6 +1,7 @@
1 1
<!DOCTYPE html>
2 2
<html>
3 3
<head>
4
<meta name="keywords" content="科袖 科袖专家网"/>
4 5
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
5 6
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
6 7
<meta http-equiv="X-UA-Compatible" content="IE=edge">
@ -8,10 +9,7 @@
8 9
<link rel="stylesheet" href="css/reset.css" />
9 10
<link type="text/css" href="css/index.css" rel="stylesheet">
10 11
<link type="text/css" href="css/common.css" rel="stylesheet">
11
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
12
<script type="text/javascript" src="/js/jquery.cookie.js"></script>
13
<script type="text/javascript" src="js/common.js"></script>
14
<script type="text/javascript" src="js/index.js"></script>
12

15 13
</head>
16 14
<body>
17 15
<div id="container">
@ -297,5 +295,10 @@
297 295
	</div>
298 296
	<div class="footer-btm">本站由 阿里云 提供计算与安全服务 Copyright © 2016~2017 科袖 | 京ICP备12345678号 | 京ICP证123456号 | 京公网安备11010800011111号 | 网站联盟安全认证</div>
299 297
</div>
298

299
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
300
<script type="text/javascript" src="/js/jquery.cookie.js"></script>
301
<script type="text/javascript" src="js/common.js"></script>
302
<script type="text/javascript" src="js/index.js"></script>
300 303
</body>
301 304
</html>

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

@ -12,7 +12,6 @@
12 12
<link rel="stylesheet" href="css/reset.css" />
13 13
<link type="text/css" href="css/login.css" rel="stylesheet">
14 14
<link type="text/css" href="css/common.css" rel="stylesheet">
15
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
16 15

17 16
</head>
18 17

@ -95,6 +94,8 @@
95 94
	</div>
96 95
	<div class="footer-btm">本站由 阿里云 提供计算与安全服务 Copyright © 2016~2017 科袖 | 京ICP备12345678号 | 京ICP证123456号 | 京公网安备11010800011111号 | 网站联盟安全认证</div>
97 96
</div>
97

98
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
98 99
<script type="text/javascript" src="js/information-add.js"></script>
99 100
</body>
100 101
</html>

+ 7 - 7
src/main/webapp/information-brow.html

@ -12,13 +12,6 @@
12 12
<link type="text/css" href="css/common.css" rel="stylesheet">
13 13
<link type="text/css" href="css/workspace.css" rel="stylesheet">
14 14
<link type="text/css" href="css/popup.css" rel="stylesheet">
15
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
16
<script type="text/javascript" src="js/index.js"></script>
17
<script type="text/javascript" src="js/popup.js"></script>
18
<script type="text/javascript" src="js/information.brow.js"></script>
19
<script type="text/javascript" src="js/common.js"></script>
20
<script type="text/javascript" src="/js/jquery.cookie.js"></script>
21
<script type="text/javascript" src="js/jquery.similar.msgbox.js"></script>
22 15
</head>
23 16

24 17
<body>
@ -289,6 +282,13 @@
289 282
	</div>
290 283
	<div class="footer-btm">本站由 阿里云 提供计算与安全服务 Copyright © 2016~2017 科袖 | 京ICP备12345678号 | 京ICP证123456号 | 京公网安备11010800011111号 | 网站联盟安全认证</div>
291 284
</div>
285
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
286
<script type="text/javascript" src="js/index.js"></script>
287
<script type="text/javascript" src="js/popup.js"></script>
288
<script type="text/javascript" src="js/information.brow.js"></script>
289
<script type="text/javascript" src="js/common.js"></script>
290
<script type="text/javascript" src="/js/jquery.cookie.js"></script>
291
<script type="text/javascript" src="js/jquery.similar.msgbox.js"></script>
292 292
 <script>
293 293
//合作历史及评价------等级星
294 294


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

@ -10,13 +10,6 @@
10 10
<link rel="stylesheet" type="text/css" href="css/style.css" />
11 11
<link type="text/css" href="css/index.css" rel="stylesheet">
12 12
<link type="text/css" href="css/common.css" rel="stylesheet">
13
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
14
<script type="text/javascript" src="js/index.js"></script>
15
<script type="text/javascript" src="js/jquery.cookie.js"></script>
16
<script type="text/javascript" src="js/common.js"></script>
17
<script type="text/javascript" src="js/jquery.similar.msgbox.js"></script>
18
<script type="text/javascript" src="js/information.js"></script>
19

20 13

21 14
</head>
22 15

@ -467,7 +460,7 @@
467 460
				</div>
468 461
				
469 462
                <div class="right-box introduction">
470
					<div class="right-title"><span>科研资源</span> <a href="workspace.html" class="enterwork">进入我的工作台</a>   </div>
463
					<div class="right-title"><span>科研资源</span> <a href="workspaces.html" class="enterwork">进入我的工作台</a>   </div>
471 464
					<div class="infor-browse">
472 465
                    	<div class="shareabout">
473 466
                            <div class="sharesrcbox">
@ -560,5 +553,12 @@
560 553
	<div class="footer-btm">本站由 阿里云 提供计算与安全服务 Copyright © 2016~2017 科袖 | 京ICP备12345678号 | 京ICP证123456号 | 京公网安备11010800011111号 | 网站联盟安全认证</div>
561 554
</div>
562 555

556
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
557
<script type="text/javascript" src="js/index.js"></script>
558
<script type="text/javascript" src="js/jquery.cookie.js"></script>
559
<script type="text/javascript" src="js/common.js"></script>
560
<script type="text/javascript" src="js/jquery.similar.msgbox.js"></script>
561
<script type="text/javascript" src="js/information.js"></script>
562

563 563
</body>
564 564
</html>

+ 1 - 0
src/main/webapp/js/account-set.js

@ -1,4 +1,5 @@
1 1
$(function(){
2
	
2 3
			//loginStatus();
3 4
		var userid = $.cookie("userid");
4 5
	 	if(userid){

+ 51 - 44
src/main/webapp/js/information.brow.js

@ -372,27 +372,60 @@ $(".subsidebar").click(function(){
372 372
			//console.log(data);
373 373
			if(data.data.length==0){
374 374
				$("#infor-browse").css("display","none");
375
				$(".resoubtn").css("display","none");
376
			}
377
			if(data.data.length > 0 && data.data.length <= 3){
378
				$("#infor-browse").css("display","block");
379
				$(".resoubtn").css("display","none");
375 380
			}
376 381
			var add="";
377 382
			if(data.success)
378 383
				{
379
				for(var i=0;i<data.data.length;i++){
380
					add='<div class="sharesrc">'
381
					add+='<div class="shareshow">'
382
                	add+='<a href=""><img src="" width="100%" height="140"></a>'
383
                 	add+='<div class="shareopeart"><a class="sharebtn">咨询</a><a class="sharebtn applicant">申请</a></div>'
384
             		add+='</div>'
385
             		add+='<p>资源名称:<span class="presou">'+ data.data[i].resourceName+'</span></p>'
386
             		add+='<p class="briefinfor">简介:'+data.data[i].descp+'</p>'
387
        			add+='</div>'
388
        			$("#sharescrollbox").append(add);
389
					$('.applicant').eq(i).attr("resourceId",data.data[i].resourceId);
390
					add="";
391
				}
384
					for(var i=0;i<data.data.length;i++){
385
						add='<div class="sharesrc">'
386
						add+='<div class="shareshow">'
387
	                	add+='<a href=""><img src="" width="100%" height="140"></a>'
388
	                 	add+='<div class="shareopeart"><a class="sharebtn">咨询</a><a class="sharebtn applicant">申请</a></div>'
389
	             		add+='</div>'
390
	             		add+='<p>资源名称:<span class="presou">'+ data.data[i].resourceName+'</span></p>'
391
	             		add+='<p class="briefinfor">简介:'+data.data[i].descp+'</p>'
392
	        			add+='</div>'
393
	        			$("#sharescrollbox").append(add);
394
						$('.applicant').eq(i).attr("resourceId",data.data[i].resourceId);
395
						add="";
396
					}
397
					//资源轮播
398
					var $content = $(".sharescrollbox");
399
					var childcount = $content.find(".sharesrc").length; 
400
					Carousel(3,3, childcount, $content, $(".resounext"), $(".resouprev"));
401
					
402
					function Carousel(inde, num, childcount, obj, next, prev) {
403
						next.click(function() {	
404
							if (!obj.is(":animated")) { 
405
								if (num < childcount) { 
406
								
407
									num++;
408
									obj.animate({
409
										left: "-=212px"
410
									}, 600);
411
								}
412
							}
413
						});
414
						prev.click(function() {
415
							if (!obj.is(":animated")) {
416
								if (num > inde) { 
417
									num--;
418
									obj.animate({
419
										left: "+=212px"
420
									}, 600);
421
								}
422
							}
423
						});
424
					}
392 425
				}
393 426
				else
394 427
				{
395
					console.log("系统异常!");
428
					$.MsgBox.Alert("消息","系统异常!");
396 429
				}
397 430
		},
398 431
		"error":function(){$.MsgBox.Alert('message','failddd')}
@ -412,7 +445,7 @@ $(".subsidebar").click(function(){
412 445
			}
413 446
			else
414 447
			{
415
				console.log("系统异常!");
448
				$.MsgBox.Alert("消息","系统异常!");
416 449
			}
417 450
		},
418 451
		"error":function(){$.MsgBox.Alert('message','failddd')}
@ -421,16 +454,16 @@ $(".subsidebar").click(function(){
421 454

422 455
	$('.introduction').on("click",'.applicant',function(){
423 456
		ResourceApply();//调用资源申请HTML创建函数
424
		console.log(name);
457
		//console.log(name);
425 458
		$(".timelo").css("display","none");
426 459
		$(".namecon").text(name);
427 460
		$(".applysure").hide();
428 461
		$(".btnboxup").hide();
429 462
		var index1=$(this).parent().parent().parent().index();
430
		console.log(index1);
463
		//console.log(index1);
431 464
		var m=console.log();
432 465
		var resourceID=$(this).attr("resourceId");
433
		console.log(resourceID);
466
		//console.log(resourceID);
434 467
		$(".log").text($('.presou').eq(index1).text());
435 468
		
436 469
		getIdentity(professorId);
@ -463,32 +496,6 @@ $(".subsidebar").click(function(){
463 496
			});
464 497
	});
465 498
	
466
	var $content = $(".sharescrollbox");
467
	var childcount = $content.find(".sharesrc").length; 
468
	Carousel(3,3, childcount, $content, $(".resounext"), $(".resouprev"));
469 499
	
470
	function Carousel(inde, num, childcount, obj, next, prev) {
471
		next.click(function() {	
472
			if (!obj.is(":animated")) { 
473
				if (num < childcount) { 
474
				
475
					num++;
476
					obj.animate({
477
						left: "-=212px"
478
					}, 600);
479
				}
480
			}
481
		});
482
		prev.click(function() {
483
			if (!obj.is(":animated")) {
484
				if (num > inde) { 
485
					num--;
486
					obj.animate({
487
						left: "+=212px"
488
					}, 600);
489
				}
490
			}
491
		});
492
	}
493 500
})
494 501


+ 8 - 1
src/main/webapp/js/login-email-find01.js

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

7

8
	var isPass = false;
2 9
	function valEmail() {
3 10
		var email=$("#email").val();
4 11
		if(email.length==0){

+ 7 - 0
src/main/webapp/js/login-first.js

@ -1,3 +1,10 @@
1

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

1 8
//检查用户是否登陆
2 9
	$(function(){  
3 10
	    if($.cookie("userAuth") == true){

+ 5 - 0
src/main/webapp/js/login-invite-code.js

@ -1,3 +1,8 @@
1
	var _widht = document.documentElement.clientWidth;  //屏幕宽
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" });
1 6

2 7
	//验证手机号
3 8
	var phonePass = false;

+ 6 - 0
src/main/webapp/js/login-phone-find01.js

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

2 8
		 
3 9
	});
4 10
	var phonePass = false;

+ 6 - 0
src/main/webapp/js/login-phone-find02.js

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

2 8
		var vc = GetQueryString("vc");
3 9
		var state = GetQueryString("state");
4 10
		var mobilePhone = GetQueryString("mobilePhone");

+ 10 - 2
src/main/webapp/js/login.js

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

8
	var namePass = false;
2 9
	var passwordPass = false;
3 10
	function nameVal()
4 11
	{
@ -86,4 +93,5 @@ var namePass = false;
86 93
	}
87 94
	function restSub(data) {  
88 95
         $(".msg5").text("");
89
     } 
96
     } 
97
})

+ 24 - 23
src/main/webapp/js/popup.js

@ -5,7 +5,7 @@ function ResourceInfo() {
5 5

6 6
		PopHtml += '<div class="blackcover">';
7 7
		PopHtml += '<div class="resouinfo"><form class="resoufrm">';
8
		PopHtml += '<div class="resoutit">资源信息<div class="stateinfor"><em></em>申请</div></div>';
8
		PopHtml += '<div class="resoutit">资源信息<div class="stateinfor"><em></em><span>申请</span></div></div>';
9 9
		PopHtml += '<div class="resoubox">';
10 10
		//资源信息
11 11
		PopHtml += '<table class="resoutab"><tr>';
@ -46,16 +46,16 @@ function ResourceInfo() {
46 46
		PopHtml += '<div class="addrebtn" style="text-align:center;"><input type="button" value="保存" class="frmtype frmbtn" id="inputb"><input type="button" value="删除资源" class="frmtype frmbtn frmrbtn" id="deletedResource"></div>';
47 47
		PopHtml += '</td></tr></table>';
48 48
		//合作历史及评价
49
		PopHtml += '<table class="teamworkbox">';
50
		PopHtml += '<tr><td><div class="teamworktit">合作历史及评价</div></td></tr>';
51
		PopHtml += '<tr><td><div class="teamwork">';
52
		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>';
53
		PopHtml += '<div class="righteva">';
54
        PopHtml += '<ul class="evasort"><li class="teamname"><span>XXXXXX资源的合作</span><span class="teamtime">2016-09-06</span></li></ul>';
55
        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>';
56
        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>';
57
        PopHtml += '</div></div>';
58
		PopHtml += '</td></tr></table>';
49
//		PopHtml += '<table class="teamworkbox">';
50
//		PopHtml += '<tr><td><div class="teamworktit">合作历史及评价</div></td></tr>';
51
//		PopHtml += '<tr><td><div class="teamwork">';
52
//		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>';
53
//		PopHtml += '<div class="righteva">';
54
//        PopHtml += '<ul class="evasort"><li class="teamname"><span>XXXXXX资源的合作</span><span class="teamtime">2016-09-06</span></li></ul>';
55
//        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>';
56
//        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>';
57
//        PopHtml += '</div></div>';
58
//		PopHtml += '</td></tr></table>';
59 59
		PopHtml += '</div></form>';
60 60
		//关闭按钮
61 61
		PopHtml += '<span class="workclose"></span>';
@ -161,22 +161,23 @@ function ResourceApply(){
161 161
		PopHtml += '<div class="resouapply"><form class="resoufrm">';
162 162
		
163 163
		/*//资源申请模块*/
164
		PopHtml += '<div class="applyblock"><div class="resoutit">资源申请<div class="stateinfor"><em></em>申请中</div></div>';
164
		PopHtml += '<div class="applyblock"><div class="resoutit">资源申请<div class="stateinfor"><em></em><span>申请中</span></div></div>';
165 165
		PopHtml += '<div class="resoubox"><table class="resoutab">';
166 166
		//合作编号在申请的时候还未生成,不显示;申请完成之后产生,在申请确认是显示
167 167
		PopHtml += '<tr class="timelo"><th class="resouinfotype" scope="row">合作编号</th>';
168
		PopHtml += '<td><div class="resouinforcon contration">00001109</div></td>';
168
		PopHtml += '<td><div class="resouinforcon contration"></div></td>';
169 169
		//资源申请信息
170
		PopHtml += '<td rowspan="5"><div class="resouinforcon"><div class="resouimg" ><img src="" width="100%" height="100%"></div></div></td>';
170
		PopHtml += '<td rowspan="6"><div class="resouinforcon"><div class="resouimg2" ><img src="" width="100%" height="100%"></div></div></td>';
171 171
		PopHtml += '</tr>';
172 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>';
173
		PopHtml += '<tr><th class="resouinfotype "  scope="row">需求资源</th><td><div class="resouinforcon log"></div></td> </tr>';
174
		PopHtml += '<tr><th class="resouinfotype"  scope="row">资源发布者</th><td><div class="resouinforcon namecon" id="professor3"><!--<a href="" class="worktel">联系ta</a>--></div></td></tr>';
175 175
		PopHtml += '<tr><th class="resouinfotype"  scope="row">需求方</th><td>';
176
                PopHtml += '<div class="resouinforcon"><select class="frmtype"style="background:url(../images/downselect.png) no-repeat 500px center"><option>本人</option><option>所属机构</option></select></div>';
176
        PopHtml += '<div class="resouinforcon"><select class="frmtype" style="background:url(../images/downselect.png) no-repeat 96% center"><option>本人</option><option>所属机构</option></select></div>';
177 177
		PopHtml += '</td></tr>';
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="3"><div class="resouinforcon"><input type="text" class="dealTime"></div></td></tr></table>';
178
		PopHtml += '<tr><th class="resouinfotype " scope="row">交付时间</th><td><div class="resouinforcon"><input type="text" class="frmtype dealTime"></div></td></tr>';
179
		PopHtml += '<tr><th class="resouinfotype"  scope="row">具体需求</th><td colspan="2"><div class="resouinforcon"><textarea class="frmtype detail"></textarea></div></td></tr></table>';
180
		
180 181
		//相关文件上传
181 182
		PopHtml += '<div class="filebox"style="display:none;"> ';
182 183
		PopHtml += '<div class="worktit">相关文件<div class="uploadbtn">上传文件</div></div>';
@ -431,7 +432,7 @@ function DetailInfo(){
431 432
		PopHtml += '<div class="resoudetailinfo"><form class="resoufrm">';
432 433
		//****************************************************
433 434
		/*//资源申请模块*/
434
		PopHtml += '<div class="resoutit">详细信息<div class="stateinfor"><em></em>合作进行中</div></div>';
435
		PopHtml += '<div class="resoutit">详细信息<div class="stateinfor"><em></em><span>合作进行中</sapn></div></div>';
435 436
		PopHtml += '<div class="resoubox">';
436 437
		PopHtml += '<div class="resoupricebox">';
437 438
		PopHtml += '<table class="resoutab1">';
@ -607,9 +608,9 @@ function ConsultApply() {
607 608
		//专家信息
608 609
		PopHtml += '<div class="probrief">';
609 610
		PopHtml += '<div class="proname"><a href="" class="name">程学群</a><img class="modifyicon" src="images/rz.png" width="30"></div>';
610
		PopHtml += '<div class="hh2"><span>副教授</span>,<span>主任</span></div>';
611
		PopHtml += '<div class="hh4"><span>新材料技术研究院</span>,<span>北京科技大学</span></div>';
612
		PopHtml += '<div class="hh4">所在地:<span>北京</span></div>';
611
		PopHtml += '<div class="phh2"><span>副教授</span>,<span>主任</span></div>';
612
		PopHtml += '<div class="phh4"><span>新材料技术研究院</span>,<span>北京科技大学</span></div>';
613
		PopHtml += '<div class="phh4">所在地:<span>北京</span></div>';
613 614
		PopHtml += '</div>';
614 615
		//发送咨询主题与内容
615 616
		PopHtml += '<div class="sendmsg">';

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

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

8

2 9
/**复选框**/
3 10
  $('.agreeNotice').click(function(){
4 11
    var formbox = $(this).closest("form");

+ 70 - 29
src/main/webapp/js/workspace.js

@ -167,21 +167,25 @@ $(function(){
167 167
	$("#workmysrc").on("click",".resoumag",function()
168 168
			{ 
169 169
				ResourceInfo(); 
170
				$(".stateinfor span").text("资源发布中");
170 171
				var resourceID=$(this).attr("resourceId");
171 172
				//console.log(resourceID);
172 173
				if(resourceID){
173 174
					$("#deletedResource").on("click",function(){
174
						$.ajax({
175
							"url" : "/ajax/resource/"+resourceID,
176
							"type" : "DELETE",
177
							"success" : function($data) {
178
								if ($data.success) {
179
									location.reload(true);
180
								} else {
181
									$.MsgBox.Alert('message',$data.msg);
175
						//$.MsgBox.Confirm("消息", "执行删除后资源信息将无法恢复,确定继续吗?",
176
							$.ajax({
177
								"url" : "/ajax/resource/"+resourceID,
178
								"type" : "DELETE",
179
								"success" : function($data) {
180
									if ($data.success) {
181
										
182
										location.reload(true);
183
									} else {
184
										$.MsgBox.Alert('message',$data.msg);
185
									}
182 186
								}
183
							}
184
						});
187
							})
188
						//);
185 189
					})
186 190
					$.ajax({		
187 191
						"url":"/ajax/resource/"+resourceID,
@ -198,7 +202,7 @@ $(function(){
198 202
								$("#subject").val(info.data.subject);
199 203
								$("#industry").val(info.data.industry);
200 204
								$("#descp").val(info.data.descp);
201
								$("#professor").val(name);
205
								$("#professor").text(name);
202 206
								}
203 207
								else
204 208
								{
@ -218,6 +222,7 @@ $(function(){
218 222
								$data.subject=$("#subject").val();
219 223
								$data.industry=$("#industry").val();
220 224
								$data.descp=$("#descp").val();
225
								
221 226
								if (resourceID) {
222 227
									$data.resourceId = resourceID;
223 228
								}
@ -232,14 +237,17 @@ $(function(){
232 237
									"success" : function(rdata) {
233 238
										if (rdata.success) {
234 239
											if (resourceID) {
240
												
241
												//$.MsgBox.Alert("消息","资源信息修改成功!");
235 242
												location.reload(true);
236 243
												$(".workconitem").eq(1).addClass("subcolor");	
237 244
										 		$(".workconitem").eq(1).show();
238 245
											} else {
239 246
												location.reload(true);
247
												//$.MsgBox.Alert("消息","资源发布成功!");
240 248
											}
241 249
										} else {
242
											$.MsgBox.Alert('message',"发布失败");
250
											$.MsgBox.Alert("消息","资源发布失败");
243 251
										}
244 252
									},
245 253
									"data" : resourceID ? JSON.stringify($data) : $data,
@ -268,9 +276,9 @@ $.ajax({
268 276
					add+='<li class="li4">详细描述:'+data.data[i].descp+'</li><li class="li5">备注:'+data.data[i].cooperationNotes+'</li></ul></td></tr><tr>'                
269 277
					add+='<td><span class="resoumag"">资源管理</span></td></tr></table></div>'                 
270 278
					add+='<div class="righttab fr"><table width="100%" class="worktab tablecon">'
271
					add+='<tr class="worktabtit"><th width="10%" height="40">申请时间</th><th width="10%">需求方</th>'    
272
					add+='<th width="10%">联系人</th><th width="10%">交付时间</th><th width="10%">成交金额</th><th width="20%">付款方式</th>'        
273
					add+='<th width="20%">付款进程</th><th width="30%">操作</th></tr></table></div></div>';
279
					add+='<tr class="worktabtit"><th width="12%" height="40">申请时间</th><th width="12%">需求方</th>'    
280
					add+='<th width="12%">联系人</th><th width="12%">交付时间</th><th width="12%">成交金额</th><th width="12%">付款方式</th>'        
281
					add+='<th width="14%">付款进程</th><th width="14%">状态/操作</th></tr></table></div></div>';
274 282
					$("#consd").append(add);
275 283
					if(data.data[i].subject==undefined){
276 284
						$(".li1").eq(i).css({"display":"none"});
@ -318,58 +326,74 @@ $.ajax({
318 326
							                       addString+='<td>'+data.data[j].dealPrice+'</td>'
319 327
							                        addString+='<td>'+data.data[j].payMethod+'</td>'
320 328
							                       addString+='<td><span>'+inquiry+'</span>/<span>'+data.data[j].dealPrice+'</span><br></td>'
321
							                        addString+='<td><a class="operatebtn modification">修改申请</a></td> </tr>'						                      		
329
							                        addString+='<td><div class="modification"></div></td> </tr>'						                      		
322 330
							                        	$(".tablecon").eq(i).append(addString);	
323 331
													
324 332
														switch(data.data[j].operationStatus)
325 333
														{
326 334
														case 1:
327 335
															var string='<span>新的申请</span><br/>'
336
															string+='<a class="operatebtn">'
328 337
															string+='<span class="detailmess"resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>回复申请</span><br />'
338
															string+='</a>'
329 339
															$(".modification").eq(k).html(string)
330 340
														  break;
331 341
														case 2:
332 342
															var string='<span>发送报价待对方确认</span><br/>'
333
																string+='<span class="detailmess"resourId='+data.data[j].resource.resourceId+' operationStatus="1" operationId='+data.data[j].operationId+'>修改报价</span><br />'
343
															string+='<a class="operatebtn">'
344
															string+='<span class="detailmess"resourId='+data.data[j].resource.resourceId+' operationStatus="1" operationId='+data.data[j].operationId+'>修改报价</span><br />'
345
															string+='</a>'
334 346
															$(".modification").eq(k).html(string);
335 347
														  break;
336 348
														case 3:
337 349
															var string='<span>对方发来报价合作进行中</span><br/>'
338
																string+='<span class="detailm"resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>查看详情</span><br />'
350
															string+='<a class="operatebtn">'
351
															string+='<span class="detailm"resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>查看详情</span><br />'
339 352
															string+='<span class="drawback"resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+' dealPrice='+data.data[j].dealPrice+'>退款</span><br />'
340 353
															string+='<span resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>投诉</span>'
354
															string+='</a>'
341 355
															$(".modification").eq(k).html(string);
342 356
														  break;
343 357
														case 4:
344 358
															var string='<span>对方拒绝报价,合作结束</span><br/>'
345
																string+='<span class="detailmess"resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>查看详情</span><br />'
359
															string+='<a class="operatebtn">'
360
															string+='<span class="detailmess"resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>查看详情</span><br />'
361
															string+='</a>'
346 362
															$(".modification").eq(k).html(string);
347 363
														  break;
348 364
														case 5:
349 365
															var string='<span>本人拒绝合作</span><br/>'
350
																string+='<span class="detailmess"resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>查看详情</span><br />'
366
															string+='<a class="operatebtn">'
367
															string+='<span class="detailmess"resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>查看详情</span><br />'
368
															string+='</a>'
351 369
															$(".modification").eq(k).html(string);
352 370
														  break;
353 371
														case 6:
354 372
																var string='<span>对方中止合作合作结束</span><br/>'
373
																string+='<a class="operatebtn">'
355 374
																string+='<span class="detailm"resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>查看详情</span><br />'
356 375
																string+='<span class="discuss"dataStatus="1"resourceId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>评价</span><br />'
357 376
																string+='<span class="drawback"resourceId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>退款</span><br />'
358 377
																string+='<span class="complain"resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>投诉</span>'
378
																string+='</a>'
359 379
																$(".modification").eq(k).html(string);	
360 380
														  break;
361 381
														case 7:
362 382
															var string='<span>合作进行中</span><br/>'
383
															string+='<a class="operatebtn">'
363 384
															string+='<span class="detailm"resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>查看详情</span><br />'
364 385
															string+='<span class="acknowledgement"resourceId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>确认完成</span><br />'
365 386
															string+='<span class="complain"resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>投诉</span>'
387
															string+='</a>'
366 388
															$(".modification").eq(k).html(string);
367 389
														  break;
368 390
														case 8:
369 391
															var string='<span>完成</span><br/>'
392
															string+='<a class="operatebtn">'
370 393
															string+='<span class="detailm"resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>查看详情</span><br />'
371 394
															string+='<span class="discuss"dataStatus="1"resourceId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>评价</span><br />'
372 395
															string+='<span class="complain"resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>投诉</span>'
396
															string+='</a>'
373 397
															$(".modification").eq(k).html(string);
374 398
														  break;
375 399
														default:
@ -382,7 +406,7 @@ $.ajax({
382 406
									}
383 407
									else
384 408
									{
385
										$.MsgBox.Alert('message',"系统异常!");
409
										$.MsgBox.Alert("消息","系统异常!");
386 410
									}
387 411
							},
388 412
							"error":function(){$.MsgBox.Alert('message','failed')}
@ -403,6 +427,7 @@ $.ajax({
403 427
//我的资源状态的回复
404 428
$("#consd").on("click",".detailmess",function(){
405 429
	ResourceApply();
430
	$(".stateinfor span").text("回复申请");
406 431
	var operationId=$(this).attr("operationId");
407 432
	//console.log(operationId);
408 433
	var operationStatus=$(this).attr("operationStatus");
@ -503,56 +528,72 @@ $.ajax({
503 528
	                    stringContent +='<td>'+data.data[i].dealPrice+'</td>'     
504 529
	                    stringContent +='<td>'+data.data[i].payMethod+'</td>'       
505 530
	                    stringContent +='<td><span>'+inq+'</span>/<span>'+data.data[i].dealPrice+'</span><br></td>'     
506
	                    stringContent +='<td class="loginStatus">修改申请</td></tr>'
531
	                    stringContent +='<td><div class="loginStatus"></div></td></tr>'
507 532
	                   $(".worktabb").append( stringContent);											
508 533
							switch(data.data[i].operationStatus)
509 534
							{
510 535
							case 1:
511 536
								var string='<span>申请已发送待对方确认</span><br/>'
512
									string+='<span class="detailm"resourId='+data.data[i].resource.resourceId+' operationStatus='+data.data[i].operationStatus+' operationId='+data.data[i].operationId+'>修改申请</span><br />'
513
								$(".loginStatus").eq(i).html(string);
537
								string+='<a class="opbtn">'
538
								string+='<span class="detailm"resourId='+data.data[i].resource.resourceId+' operationStatus='+data.data[i].operationStatus+' operationId='+data.data[i].operationId+'>修改申请</span><br />'
539
								string+='</a>'
540
									$(".loginStatus").eq(i).html(string);
514 541
							  break;
515 542
							case 2:
516 543
								var string='<span>对方发来报价</span><br/>'
517
									string+='<span class="detailm"resourId='+data.data[i].resource.resourceId+' operationStatus='+data.data[i].operationStatus+' operationId='+data.data[i].operationId+'>回复报价</span><br />'
544
								string+='<a class="opbtn">'
545
								string+='<span class="detailm"resourId='+data.data[i].resource.resourceId+' operationStatus='+data.data[i].operationStatus+' operationId='+data.data[i].operationId+'>回复报价</span><br />'
546
								string+='</a>'
518 547
								$(".loginStatus").eq(i).html(string);
519 548
							  break;
520 549
							case 3:
521 550
								var string='<span>合作进行中</span><br/>'
522
									string+='<span class="detailm"resourId='+data.data[i].resource.resourceId+' operationStatus='+data.data[i].operationStatus+' operationId='+data.data[i].operationId+'>查看详情</span><br />'
551
								string+='<a class="opbtn">'
552
								string+='<span class="detailm"resourId='+data.data[i].resource.resourceId+' operationStatus='+data.data[i].operationStatus+' operationId='+data.data[i].operationId+'>查看详情</span><br />'
523 553
								string+='<span class="payMonety"resourId='+data.data[i].resource.resourceId+' operationStatus='+data.data[i].operationStatus+' operationId='+data.data[i].operationId+' dealPrice='+data.data[i].dealPrice+'>付款</span><br />'
524 554
								string+='<span class="stopcoo"resourId='+data.data[i].resource.resourceId+' operationStatus='+data.data[i].operationStatus+' operationId='+data.data[i].operationId+'>中止合作</span>'
555
								string+='</a>'
525 556
								$(".loginStatus").eq(i).html(string);								
526 557
							  break;
527 558
							case 4:
528 559
								var string='<span>本人拒绝合作</span><br/>'
529
									string+='<span class="detailm"resourId='+data.data[i].resource.resourceId+' operationStatus='+data.data[i].operationStatus+' operationId='+data.data[i].operationId+'>查看详情</span><br />'
560
								string+='<a class="opbtn">'
561
								string+='<span class="detailm"resourId='+data.data[i].resource.resourceId+' operationStatus='+data.data[i].operationStatus+' operationId='+data.data[i].operationId+'>查看详情</span><br />'
562
								string+='</a>'
530 563
								$(".loginStatus").eq(i).html(string);
531 564
							  break;
532 565
							case 5:
533 566
								var string='<span>对方拒绝合作,合作结束</span><br/>'
534
									string+='<span class="detailm"resourId='+data.data[i].resource.resourceId+' operationStatus='+data.data[i].operationStatus+' operationId='+data.data[i].operationId+'>查看详情</span><br />'
567
								string+='<a class="opbtn">'
568
								string+='<span class="detailm"resourId='+data.data[i].resource.resourceId+' operationStatus='+data.data[i].operationStatus+' operationId='+data.data[i].operationId+'>查看详情</span><br />'
569
								string+='</a>'
535 570
								$(".loginStatus").eq(i).html(string);
536 571
							  break;
537 572
							case 6:
538 573
								var string='<span>本人中止合作</span><br/>'
574
								string+='<a class="opbtn">'
539 575
								string+='<span class="detailm"resourId='+data.data[i].resource.resourceId+' operationStatus='+data.data[i].operationStatus+' operationId='+data.data[i].operationId+'>查看详情</span><br />'
540 576
								string+='<span class=" discuss"dataStatus="0"resourceId='+data.data[i].resource.resourceId+' operationStatus='+data.data[i].operationStatus+' operationId='+data.data[i].operationId+'>评价</span><br />'
541 577
								string+='<span class="complain"resourId='+data.data[i].resource.resourceId+' operationStatus='+data.data[i].operationStatus+' operationId='+data.data[i].operationId+'>投诉</span>'
578
								string+='</a>'
542 579
								$(".loginStatus").eq(i).html(string);
543 580
							  break;
544 581
							case 7:
545 582
								var string='<span>合作进行中</span><br/>'
583
								string+='<a class="opbtn">'
546 584
								string+='<span class="detailm"resourId='+data.data[i].resource.resourceId+' operationStatus='+data.data[i].operationStatus+' operationId='+data.data[i].operationId+'>查看详情</span><br />'
547 585
								string+='<span class="acknowledgement"resourceId='+data.data[i].resource.resourceId+' operationStatus='+data.data[i].operationStatus+' operationId='+data.data[i].operationId+'>确认完成</span><br />'
548 586
								string+='<span class="complain"resourId='+data.data[i].resource.resourceId+' operationStatus='+data.data[i].operationStatus+' operationId='+data.data[i].operationId+'>投诉</span>'
587
								string+='</a>'
549 588
								$(".loginStatus").eq(i).html(string);
550 589
							  break;
551 590
							case 8:
552 591
								var string='<span>完成</span><br/>'
592
								string+='<a class="opbtn">'
553 593
								string+='<span class="detailm"resourId='+data.data[i].resource.resourceId+' operationStatus='+data.data[i].operationStatus+' operationId='+data.data[i].operationId+'>查看详情</span><br />'
554 594
								string+='<span class="discuss"dataStatus="0"resourceId='+data.data[i].resource.resourceId+' operationStatus='+data.data[i].operationStatus+' operationId='+data.data[i].operationId+'>评价</span><br />'
555 595
								string+='<span class="complain"resourId='+data.data[i].resource.resourceId+' operationStatus='+data.data[i].operationStatus+' operationId='+data.data[i].operationId+'>投诉</span>'
596
								string+='</a>'
556 597
								$(".loginStatus").eq(i).html(string);
557 598
							  break;
558 599
							default:							  
@ -987,7 +1028,7 @@ $(".workmysrc").on("click",".detailm",function(){
987 1028
	flag=1;
988 1029
	if(flag==1&&operationStatus==1)
989 1030
	{ 
990
		$(".stateinfor").text("修改申请中");
1031
		$(".stateinfor span").text("修改申请中");
991 1032
		$(".btnboxup").css({"display":"none"});
992 1033
		$(".applysure").css({"display":"none"});
993 1034
//		$(".dealTime").replaceWith("<input type='text'colspan='2'class='dealTime'>");

+ 11 - 7
src/main/webapp/login-email-find01.html

@ -11,17 +11,11 @@
11 11

12 12
<link rel="stylesheet" href="css/reset.css" />
13 13
<link type="text/css" href="css/login.css" rel="stylesheet">
14
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
15
<script type="text/javascript" src="js/jquery.similar.msgbox.js"></script>
16
<!--<script type="text/javascript" src="js/index.js"></script>
17
<script type="text/javascript" src="js/form.js"></script>-->
18
<script type="text/javascript"src="js/login-email-find01.js"></script>
19 14
</head>
20 15

21 16
<body>
22
<div id="header"></div>
23 17

24
		
18
<div class="coverbox">		
25 19
		<!--邮箱找回密码01!-->
26 20
		<div class="email-find1">
27 21
			<div class="login-title">
@ -64,7 +58,17 @@
64 58
            		
65 59
			</div>
66 60
		</div>
61
</div>
67 62

63
<div id="header"></div>
68 64
<div id="footer"></div>
65

66

67
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
68
<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>-->
71
<script type="text/javascript"src="js/login-email-find01.js"></script>
72

69 73
</body>
70 74
</html>

+ 20 - 13
src/main/webapp/login-email-find02.html

@ -11,21 +11,12 @@
11 11

12 12
<link rel="stylesheet" href="css/reset.css" />
13 13
<link type="text/css" href="css/login.css" rel="stylesheet">
14
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
15
<script type="text/javascript" src="js/common.js"></script>
16
<!--<script type="text/javascript" src="js/form.js"></script>-->
17
<script type="text/javascript">
18
$(function (){
19
	
20
	 $("#email").text(GetQueryString("email")); 
21
});
22
     
23
</script>
14

24 15
</head>
25 16

26 17
<body>
27
<div id="header"></div>
28 18

19
<div class="coverbox">
29 20
		<!--邮箱找回密码02-->
30 21
		<div class="email-find2">
31 22
			<div class="login-title">
@ -60,8 +51,24 @@ $(function (){
60 51
				</div>	
61 52
				    
62 53
		</div>
63
		
64

54
</div>		
55
<div id="header"></div>
65 56
<div id="footer"></div>
57

58
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
59
<script type="text/javascript" src="js/common.js"></script>
60
<!--<script type="text/javascript" src="js/form.js"></script>-->
61
<script type="text/javascript">
62
$(function (){
63
	var _widht = document.documentElement.clientWidth;  //屏幕宽
64
	var _height = document.documentElement.clientHeight; //屏幕高
65
	var boxWidth = $(".email-find2").width();
66
	var boxHeight = $(".email-find2").height();
67
	$(".email-find2").css({ top: (_height - boxHeight) / 2 +"px", left: (_widht - boxWidth) / 2 + "px" });
68
	
69
	 $("#email").text(GetQueryString("email")); 
70
});
71
     
72
</script>
66 73
</body>
67 74
</html>

+ 19 - 4
src/main/webapp/login-email-find03.html

@ -11,14 +11,12 @@
11 11

12 12
<link rel="stylesheet" href="css/reset.css" />
13 13
<link type="text/css" href="css/login.css" rel="stylesheet">
14
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
15
<script type="text/javascript" src="js/index.js"></script>
16
<script type="text/javascript" src="js/form.js"></script>
14

17 15
</head>
18 16

19 17
<body>
20
<div id="header"></div>
21 18

19
<div class="coverbox">
22 20
		<!--邮箱找回密码03!-->
23 21
		<div class="email-find3">
24 22
			<div class="login-title">
@ -56,7 +54,24 @@
56 54
			</form>	
57 55
			</div>
58 56
		</div>	
57
</div>
59 58

59
<div id="header"></div>
60 60
<div id="footer"></div>
61

62
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
63
<script type="text/javascript" src="js/index.js"></script>
64
<script type="text/javascript" src="js/form.js"></script>
65
<script type="text/javascript">
66
$(function (){
67
	var _widht = document.documentElement.clientWidth;  //屏幕宽
68
	var _height = document.documentElement.clientHeight; //屏幕高
69
	var boxWidth = $(".email-find3").width();
70
	var boxHeight = $(".email-find3").height();
71
	$(".email-find3").css({top: (_height - boxHeight) / 2 +"px", left: (_widht - boxWidth) / 2 + "px" });
72
	
73
});
74
     
75
</script>
61 76
</body>
62 77
</html>

+ 9 - 7
src/main/webapp/login-first.html

@ -11,14 +11,10 @@
11 11

12 12
<link rel="stylesheet" href="css/reset.css" />
13 13
<link type="text/css" href="css/login.css" rel="stylesheet">
14
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
15
<script type="text/javascript" src="/js/jquery.cookie.js"></script>
16
<script type="text/javascript" src="js/jquery.similar.msgbox.js"></script>
17
<script type="text/javascript"src="js/login-first.js"></script>
18 14
</head>
19 15
<body>
20
<div id="header"></div>
21 16

17
<div class="coverbox">
22 18
		<!--首次登录!-->
23 19
		<div class="login-first">
24 20
				<div class="login-title">
@ -43,9 +39,15 @@
43 39
				</form>
44 40
				</div>    
45 41
		</div>
46
			
42
</div>			
47 43
	
48

44
<div id="header"></div>
49 45
<div id="footer"></div>
46

47
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
48
<script type="text/javascript" src="/js/jquery.cookie.js"></script>
49
<script type="text/javascript" src="js/jquery.similar.msgbox.js"></script>
50
<script type="text/javascript"src="js/login-first.js"></script>
51

50 52
</body>
51 53
</html>

+ 8 - 6
src/main/webapp/login-invite-code.html

@ -7,13 +7,10 @@
7 7
<title>科袖-登录-通过手机和邀请码登录</title>
8 8
<link rel="stylesheet" href="css/reset.css" />
9 9
<link type="text/css" href="css/login.css" rel="stylesheet">
10
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
11
<script type="text/javascript" src="js/jquery.similar.msgbox.js"></script>
12
<script type="text/javascript"src="js/login-invite-code.js"></script>
13 10
</head>
14 11
<body>
15
<div id="header"></div>
16 12

13
<div class="coverbox">
17 14
		<!--登录邀请码!-->
18 15
		<div class="loginbox">
19 16
			<div class="login-title">
@ -40,8 +37,13 @@
40 37
                </form>	
41 38
			</div>
42 39
		</div>
43
		
44

40
</div>		
41
<div id="header"></div>
45 42
<div id="footer"></div>
43

44
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
45
<script type="text/javascript" src="js/jquery.similar.msgbox.js"></script>
46
<script type="text/javascript"src="js/login-invite-code.js"></script>
47

46 48
</body>
47 49
</html>

+ 12 - 8
src/main/webapp/login-phone-find01.html

@ -11,16 +11,11 @@
11 11

12 12
<link rel="stylesheet" href="css/reset.css" />
13 13
<link type="text/css" href="css/login.css" rel="stylesheet">
14
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
15
<script type="text/javascript" src="js/jquery.similar.msgbox.js"></script>
16
<!-- <script type="text/javascript" src="js/index.js"></script> -->
17
<!-- <script type="text/javascript" src="js/form.js"></script> -->
18
<script src='js/login-phone-find01.js'></script>
19 14
</head>
20 15

21 16
<body>
22
<div id="header"></div>
23
	
17

18
<div class="coverbox">	
24 19
		<!--手机找回密码01!-->
25 20
		<div class="phone-find1">
26 21
			<div class="login-title">
@ -61,7 +56,16 @@
61 56
			</form>	
62 57
		</div>
63 58
	</div>
64
		
59
</div>
60

61
<div id="header"></div>		
65 62
<div id="footer"></div>
63

64
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
65
<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> -->
68
<script src='js/login-phone-find01.js'></script>
69

66 70
</body>
67 71
</html>

+ 11 - 8
src/main/webapp/login-phone-find02.html

@ -11,17 +11,11 @@
11 11

12 12
<link rel="stylesheet" href="css/reset.css" />
13 13
<link type="text/css" href="css/login.css" rel="stylesheet">
14
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
15
<script type="text/javascript" src="js/common.js"></script>
16
<script type="text/javascript" src="js/jquery.similar.msgbox.js"></script>
17
<!--<script type="text/javascript" src="js/index.js"></script>
18
<script type="text/javascript" src="js/form.js"></script>-->
19
<script type="text/javascript" src="js/login-phone-find02.js"></script>
20 14
</head>
21 15

22 16
<body>
23
<div id="header"></div>
24 17

18
<div class="coverbox">	
25 19
		<!--手机找回密码02!-->
26 20
		<div class="phone-find2">
27 21
			<div class="login-title">
@ -54,8 +48,17 @@
54 48
                 <input type="button" value="重置密码" class="inputtxt submitBtn" id="resetPw" />
55 49
			</div>
56 50
		</div>
51
</div>
57 52

58

53
<div id="header"></div>
59 54
<div id="footer"></div>
55

56
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
57
<script type="text/javascript" src="js/common.js"></script>
58
<script type="text/javascript" src="js/jquery.similar.msgbox.js"></script>
59
<!--<script type="text/javascript" src="js/index.js"></script>
60
<script type="text/javascript" src="js/form.js"></script>-->
61
<script type="text/javascript" src="js/login-phone-find02.js"></script>
62

60 63
</body>
61 64
</html>

+ 59 - 56
src/main/webapp/login.html

@ -8,67 +8,70 @@
8 8

9 9
<link rel="stylesheet" href="css/reset.css" />
10 10
<link type="text/css" href="css/login.css" rel="stylesheet">
11
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
12
<script type="text/javascript" src="/js/jquery.cookie.js"></script>
13
<script type="text/javascript" src="js/jquery.similar.msgbox.js"></script>
14
<script type="text/javascript" src="js/login.js"></script>
15 11
</head>
16 12

17 13
<body>
18
<div id="header"></div>
19

20
		<!--登录邀请码!-->
21
		<div class="loginbox">
22
			<div class="login-title">
23
			 <a href="login-invite-code.html">通过手机和邀请码登录<span class="back"></span></a>
24
			</div>
25
			<div class="logo">
26
				<a href="index.html"><img src="images/logo.png"></a>
27
			</div>
28
            <div class="logindown">
29
                <table>
30
                        <tr>
31
                            <td>
32
                                <div class="login-input loginleft">
33
                                    <form  name="loginForm" id="loginForm" action="index.html" method="post">	
34
                                        <div class="frmbox">
35
                                            <input class="inputtxt" type="text" placeholder="请输入已验证手机/邮箱" id="loginName" name="loginName" onKeyDown="restSub()"  onBlur="nameVal()">
36
                                            <div class="msg msg1" ><span></span></div>
37
                                            <input class="inputtxt" type="password" placeholder="请输入密码" id="password" name="password"  onkeydown="restSub()" onBlur="passwordVal()">
38
                                            <div class="msg msg3" ><span></span></div>
39
                                            <input type="button" value="登录" class="inputtxt submitBtn" onClick="login()">
40
                                            <div class="msg msg5" ><span></span></div>
41
                                            <div class="reglinkbox">还没有科袖账号?<a class="reglink" href="register.html">立即注册</a><a href="login-email-find01.html" class="forget">忘记密码?</a></div>
42
                                        </div>
43
                                    </form>
44
                                </div>
45
                             </td>
46
                             <td>
47
                                <div class="login-line">
48
                                    <div class="lineb"></div>
49
                                    <div class="wordor"> or </div>
50
                                </div>
51
                             </td>
52
                             <td>
53
                                <div class="login-other">
54
                                    <span>使用以下帐号直接登录:</span>
55
                                    <div class="login-way">
56
                                        <a href="#" class="way-icon way-icon1"></a>
57
                                        <a href="#" class="way-icon way-icon2"></a>
58
                                        <a href="#" class="way-icon way-icon3"></a>
59
                                    </div>
60
                                    <div class="ecode">
61
                                        <div class="downcode"><img src="images/code.jpg" width="100%" height="100%"></div>
62
                                        <p>扫描二维码下载科袖APP</p>
63
                                    </div>
64
                                </div>
65
                             </td>
66
                          </tr>
67
                       </table>
68
                    </div>
69
                </div>
70 14

15
<div class="coverbox">
16
<!--登录邀请码!-->
17
<div class="loginbox">
18
	<div class="login-title">
19
	 <a href="login-invite-code.html">通过手机和邀请码登录<span class="back"></span></a>
20
	</div>
21
	<div class="logo">
22
		<a href="index.html"><img src="images/logo.png"></a>
23
	</div>
24
          <div class="logindown">
25
              <table>
26
                      <tr>
27
                          <td>
28
                              <div class="login-input loginleft">
29
                                  <form  name="loginForm" id="loginForm" action="index.html" method="post">	
30
                                      <div class="frmbox">
31
                                          <input class="inputtxt" type="text" placeholder="请输入已验证手机/邮箱" id="loginName" name="loginName" onKeyDown="restSub()"  onBlur="nameVal()">
32
                                          <div class="msg msg1" ><span></span></div>
33
                                          <input class="inputtxt" type="password" placeholder="请输入密码" id="password" name="password"  onkeydown="restSub()" onBlur="passwordVal()">
34
                                          <div class="msg msg3" ><span></span></div>
35
                                          <input type="button" value="登录" class="inputtxt submitBtn" onClick="login()">
36
                                          <div class="msg msg5" ><span></span></div>
37
                                          <div class="reglinkbox">还没有科袖账号?<a class="reglink" href="register.html">立即注册</a><a href="login-email-find01.html" class="forget">忘记密码?</a></div>
38
                                      </div>
39
                                  </form>
40
                              </div>
41
                           </td>
42
                           <td>
43
                              <div class="login-line">
44
                                  <div class="lineb"></div>
45
                                  <div class="wordor"> or </div>
46
                              </div>
47
                           </td>
48
                           <td>
49
                              <div class="login-other">
50
                                  <span>使用以下帐号直接登录:</span>
51
                                  <div class="login-way">
52
                                      <a href="#" class="way-icon way-icon1"></a>
53
                                      <a href="#" class="way-icon way-icon2"></a>
54
                                      <a href="#" class="way-icon way-icon3"></a>
55
                                  </div>
56
                                  <div class="ecode">
57
                                      <div class="downcode"><img src="images/code.jpg" width="100%" height="100%"></div>
58
                                      <p>扫描二维码下载科袖APP</p>
59
                                  </div>
60
                              </div>
61
                           </td>
62
                        </tr>
63
                     </table>
64
                  </div>
65
              </div>
66
</div>
71 67

68
<div id="header"></div>
72 69
<div id="footer"></div>
70

71
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
72
<script type="text/javascript" src="/js/jquery.cookie.js"></script>
73
<script type="text/javascript" src="js/jquery.similar.msgbox.js"></script>
74
<script type="text/javascript" src="js/login.js"></script>
75

73 76
</body>
74 77
</html>

+ 7 - 6
src/main/webapp/organization-brow.html

@ -9,12 +9,6 @@
9 9
<link rel="stylesheet" href="css/reset.css" />
10 10
<link type="text/css" href="css/index.css" rel="stylesheet">
11 11
<link type="text/css" href="css/common.css" rel="stylesheet">
12
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
13
<script type="text/javascript" src="js/index.js"></script>
14
<script type="text/javascript" src="js/common.js"></script>
15
<script type="text/javascript" src="/js/jquery.cookie.js"></script>
16
<script type="text/javascript" src="js/jquery.similar.msgbox.js"></script>
17
<script type="text/javascript" src="js/organization-brow.js"></script>
18 12
</head>
19 13

20 14
<body>
@ -247,5 +241,12 @@
247 241
	</div>
248 242
	<div class="footer-btm">本站由 阿里云 提供计算与安全服务 Copyright © 2016~2017 科袖 | 京ICP备12345678号 | 京ICP证123456号 | 京公网安备11010800011111号 | 网站联盟安全认证</div>
249 243
</div>
244
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
245
<script type="text/javascript" src="js/index.js"></script>
246
<script type="text/javascript" src="js/common.js"></script>
247
<script type="text/javascript" src="/js/jquery.cookie.js"></script>
248
<script type="text/javascript" src="js/jquery.similar.msgbox.js"></script>
249
<script type="text/javascript" src="js/organization-brow.js"></script>
250

250 251
</body>
251 252
</html>

+ 85 - 73
src/main/webapp/photo-set.html

@ -7,6 +7,7 @@
7 7
<meta http-equiv="X-UA-Compatible" content="IE=edge">
8 8

9 9
<title>头像上传</title>
10
<link href="css/reset.css" rel="stylesheet" type="text/css" />
10 11
<link href="css/basic.css" rel="stylesheet" type="text/css" />
11 12
<link href="css/jquery.Jcrop.css" rel="stylesheet" type="text/css" />
12 13
<link type="text/css" href="css/login.css" rel="stylesheet">
@ -14,79 +15,83 @@
14 15

15 16
</head>
16 17
<body>
17
  <div id="header"></div>
18 18

19
          <div class="photo-box">
20
				<div class="photo-title">头像设置</div>
21
                <div class="photo-set">
22
                    <div class="photo-upload">
23
                        <!--点击上传按钮-->
24
                        <div class="load">
25
                             <div class="upbtn" style="Margin:auto" ><span class="plus">+</span>本地上传<input type="file" class="filebtn"  name="file" id="uploadInput" ></div>
26
                            <p>只支持JPG、PNG、GIF,大小不超过5M</p>
27
                            
28
                        </div>
29
                        <!---->
30
                        <!--选择图片尺寸-->
31
                        <div class="wrap" id="jcropdiv">
32
                                    <div class="wl">
33
                                        <div class="jc-demo-box" data="0">
34
                                            <div id="target" class="jcrop_w" >
35
                                                <img src="" width="602" height="400" id="headImage" />
36
                                            </div>
37
                                        </div>
38
                                        <div class="jy-up-ch">
39
                                            <a id="idLeft" href="" class="bch bch1"></a>
40
                                            <a id="idSmall" href="" class="bch bch2"></a>
41
                                            <a id="idBig" href="" class="bch bch3"></a>
42
                                            <a id="idRight" href="" class="bch bch4"></a>
43
                                        </div>
44
                                    </div>
45
                        </div>
46
                        <!---->
47
                    </div>
48
        
49
                    <div class="photo-size">
50
                        <div class="wr" id="preview-pane">
51
                            <div class="preview-container">
52
                                <p>头像预览</p>
53
                                <div class="pre-1">
54
                                    <img  src="" class="jcrop-preview jcrop_preview_s" alt="" id="largeImage"/>
55
                                </div>
56
                                <p>200px*200px</p>
57
                                <div class="pre-2">
58
                                    <img src="" class="jcrop-preview jcrop_preview_s" alt="" id="middleImage"/>
59
                                </div>
60
                                <p>50px*50px</p>
61
                                <div class="pre-3">
62
                                    <img src="" class="jcrop-preview jcrop_preview_s" alt="" id="smallImage"/>
63
                                </div>
64
                                <p>26px*26px</p>
65
                            </div>
66
                        </div>
67
                    </div>
68
                </div>	
69
				<input id="x" type="hidden"/>
70
				<input id="y" type="hidden"/>
71
				<input id="w" type="hidden"/>
72
				<input id="h" type="hidden"/>
73
                <div class="upload-file">
74
                	  <!--<div class="fl">
75
                       <div class="upbtn"><span class="plus">+</span>本地上传<input type="file" class="filebtn"  name="file" id="uploadInput" ></div>
76
                        <p>只支持JPG、PNG、GIF,大小不超过5M</p> 
77
                    </div>
78
                    <div class="fl">
79
                    	<button type="button" id="uploadBtn">UPLOAD</button>
80
                    </div>
81
                    -->
82
                    <div class="clear"></div>
83
                </div>
84
				<input type="button" value="保存" class="inputtxt inputtxtbtn save" id="saveImage">
85
				<input type="button" value="取消" class="inputtxt inputtxtbtn  close" >
86
				<input type="button" value="返回" class="inputtxt inputtxtbtn " id="back" >
87
				
88
			 </div>
89
             
19
<div class="coverbox">
20
  <div class="photo-box">
21
	<div class="photo-title">头像设置</div>
22
             <div class="photo-set">
23
                 <div class="photo-upload">
24
                     <!--点击上传按钮-->
25
                     <div class="load">
26
                          <div class="upbtn" style="Margin:auto" ><span class="plus">+</span>本地上传<input type="file" class="filebtn"  name="file" id="uploadInput" ></div>
27
                         <p>只支持JPG、PNG、GIF,大小不超过5M</p>
28
                         
29
                     </div>
30
                     <!---->
31
                     <!--选择图片尺寸-->
32
                     <div class="wrap" id="jcropdiv">
33
                                 <div class="wl">
34
                                     <div class="jc-demo-box" data="0">
35
                                         <div id="target" class="jcrop_w" >
36
                                             <img src="" width="602" height="400" id="headImage" />
37
                                         </div>
38
                                     </div>
39
                                     <div class="jy-up-ch">
40
                                         <a id="idLeft" href="" class="bch bch1"></a>
41
                                         <a id="idSmall" href="" class="bch bch2"></a>
42
                                         <a id="idBig" href="" class="bch bch3"></a>
43
                                         <a id="idRight" href="" class="bch bch4"></a>
44
                                     </div>
45
                                 </div>
46
                     </div>
47
                     <!---->
48
                 </div>
49
     
50
                 <div class="photo-size">
51
                     <div class="wr" id="preview-pane">
52
                         <div class="preview-container">
53
                             <p>头像预览</p>
54
                             <div class="pre-1">
55
                                 <img  src="" class="jcrop-preview jcrop_preview_s" alt="" id="largeImage"/>
56
                             </div>
57
                             <p>200px*200px</p>
58
                             <div class="pre-2">
59
                                 <img src="" class="jcrop-preview jcrop_preview_s" alt="" id="middleImage"/>
60
                             </div>
61
                             <p>50px*50px</p>
62
                             <div class="pre-3">
63
                                 <img src="" class="jcrop-preview jcrop_preview_s" alt="" id="smallImage"/>
64
                             </div>
65
                             <p>26px*26px</p>
66
                         </div>
67
                     </div>
68
                 </div>
69
             </div>	
70
	<input id="x" type="hidden"/>
71
	<input id="y" type="hidden"/>
72
	<input id="w" type="hidden"/>
73
	<input id="h" type="hidden"/>
74
             <div class="upload-file">
75
             	  <!--<div class="fl">
76
                    <div class="upbtn"><span class="plus">+</span>本地上传<input type="file" class="filebtn"  name="file" id="uploadInput" ></div>
77
                     <p>只支持JPG、PNG、GIF,大小不超过5M</p> 
78
                 </div>
79
                 <div class="fl">
80
                 	<button type="button" id="uploadBtn">UPLOAD</button>
81
                 </div>
82
                 -->
83
                 <div class="clear"></div>
84
             </div>
85
	<input type="button" value="保存" class="inputtxt inputtxtbtn save" id="saveImage">
86
	<input type="button" value="取消" class="inputtxt inputtxtbtn  close" >
87
	<input type="button" value="返回" class="inputtxt inputtxtbtn " id="back" >
88
	
89
  </div>
90
</div>
91
 
92
<div id="header"></div>
93
<div id="footer"></div>    
94
         
90 95
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
91 96
<script type="text/javascript" src="js/jquery.HeadP.js"> </script>
92 97
<script type="text/javascript" src="js/jquery.Jcrop.js"> </script>
@ -96,6 +101,13 @@
96 101
<script type="text/javascript"src="js/jquery.cookie.js"></script>
97 102
<script type="text/javascript">
98 103
$(function (){
104
	var _widht = document.documentElement.clientWidth;  //屏幕宽
105
	var _height = document.documentElement.clientHeight; //屏幕高
106
	var boxWidth = $(".photo-box").width();
107
	var boxHeight = $(".photo-box").height();
108
	$(".photo-box").css({ top:"40px", left: (_widht - boxWidth) / 2 + "px" });
109

110

99 111
	var id = $.cookie('userid');
100 112
	var cacheImageKey=null;
101 113
	if(id){
@ -170,6 +182,6 @@ $(function (){
170 182
})
171 183

172 184
</script>
173
<div id="footer"></div>
185

174 186
</body>
175 187
</html>

+ 9 - 7
src/main/webapp/register.html

@ -8,9 +8,6 @@
8 8

9 9
<link rel="stylesheet" href="css/reset.css" />
10 10
<link type="text/css" href="css/login.css" rel="stylesheet">
11
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
12
<script type="text/javascript" src="/js/jquery.cookie.js"></script>
13
<script type="text/javascript" src="js/jquery.similar.msgbox.js"></script>
14 11

15 12
</head>
16 13

@ -25,10 +22,10 @@
25 22
        </div>
26 23
    </div>
27 24
</div>
28
<div id="header"></div>
29 25

30
		<!--登录邀请码!-->
31
		<div class="loginbox">
26
<div class="coverbox">
27
		<!--注册!-->
28
		<div class="loginbox registerbox">
32 29
			<div class="login-title"></div>
33 30
			<div class="logo">
34 31
				<a href="index.html"><img src="images/logo.png"></a>
@ -137,9 +134,14 @@
137 134
                
138 135
            </div>
139 136
		</div>
137
</div>
140 138
		
141

139
<div id="header"></div>
142 140
<div id="footer"></div>
141

142
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
143
<script type="text/javascript" src="/js/jquery.cookie.js"></script>
144
<script type="text/javascript" src="js/jquery.similar.msgbox.js"></script>
143 145
<script type="text/javascript" src="js/register.js"></script>
144 146
</body>
145 147
</html>

+ 8 - 7
src/main/webapp/search.html

@ -8,13 +8,6 @@
8 8
<link rel="stylesheet" href="css/reset.css" />
9 9
<link type="text/css" href="css/index.css" rel="stylesheet">
10 10
<link type="text/css" href="css/common.css" rel="stylesheet">
11
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
12
<script type="text/javascript" src="js/index.js"></script>
13
<script type="text/javascript" src="js/common.js"></script>
14
<script type="text/javascript" src="js/jquery.cookie.js"></script>
15
<script src="js/jquery.page.js"></script>
16
<script type="text/javascript" src="js/jquery.similar.msgbox.js"></script>
17
<script type="text/javascript" src="js/search.js"></script>
18 11
</head>
19 12
<body>
20 13
<div id="header">
@ -180,5 +173,13 @@
180 173
	</div>
181 174
	<div class="footer-btm">本站由 阿里云 提供计算与安全服务 Copyright © 2016~2017 科袖 | 京ICP备12345678号 | 京ICP证123456号 | 京公网安备11010800011111号 | 网站联盟安全认证</div>
182 175
</div>
176
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
177
<script type="text/javascript" src="js/index.js"></script>
178
<script type="text/javascript" src="js/common.js"></script>
179
<script type="text/javascript" src="js/jquery.cookie.js"></script>
180
<script src="js/jquery.page.js"></script>
181
<script type="text/javascript" src="js/jquery.similar.msgbox.js"></script>
182
<script type="text/javascript" src="js/search.js"></script>
183

183 184
</body>
184 185
</html>

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

@ -16,18 +16,6 @@
16 16
<link type="text/css" href="css/common.css" rel="stylesheet">
17 17
<link type="text/css" href="css/workspace.css" rel="stylesheet">
18 18
<link type="text/css" href="css/popup.css" rel="stylesheet">
19
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
20
<script type="text/javascript" src="js/common.js"></script>
21
<script type="text/javascript" src="js/jquery.HeadP.js"> </script>
22
<script type="text/javascript" src="js/jquery.Jcrop.js"> </script>
23
<script type="text/javascript" src="js/basic.js"> </script>
24
<script type="text/javascript" src="/js/ajaxfileupload.js"></script>
25

26
<script type="text/javascript"src="js/jquery.cookie.js"></script>
27
<script type="text/javascript"src="js/jquery.similar.msgbox.js"></script>
28
<script type="text/javascript" src="js/index.js"></script>
29
<script type="text/javascript" src="js/popup.js"></script>
30
<script type="text/javascript" src="js/workspace.js"></script>
31 19
</head>
32 20

33 21
<body>
@ -341,14 +329,14 @@
341 329
                        <div class="workmysrctit"></div>
342 330
                        <table width="100%" height="60" class="worktab worktabb">
343 331
                            <tr class="worktabtit">
344
                                <th width="10%" height="40">申请时间</th>
345
                                <th width="10%">需求资源</th>
332
                                <th width="12%" height="40">申请时间</th>
333
                                <th width="12%">需求资源</th>
346 334
                                <th width="12%">资源发布者</th>                                
347
                                <th width="10%">交付时间</th>
348
                                <th width="10%">成交金额</th>
349
                                <th width="14%">付款方式</th>
350
                                <th width="10%">付款进程</th>
351
                                <th width="20%">操作</th>
335
                                <th width="12%">交付时间</th>
336
                                <th width="12%">成交金额</th>
337
                                <th width="12%">付款方式</th>
338
                                <th width="12%">付款进程</th>
339
                                <th width="14%">状态/操作</th>
352 340
                            </tr>
353 341
                            
354 342
                            <tr>
@ -482,6 +470,18 @@
482 470
	</div>
483 471
	<div class="footer-btm">本站由 阿里云 提供计算与安全服务 Copyright © 2016~2017 科袖 | 京ICP备12345678号 | 京ICP证123456号 | 京公网安备11010800011111号 | 网站联盟安全认证</div>
484 472
</div>
473
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
474
<script type="text/javascript" src="js/common.js"></script>
475
<script type="text/javascript" src="js/jquery.HeadP.js"> </script>
476
<script type="text/javascript" src="js/jquery.Jcrop.js"> </script>
477
<script type="text/javascript" src="js/basic.js"> </script>
478
<script type="text/javascript" src="/js/ajaxfileupload.js"></script>
479

480
<script type="text/javascript"src="js/jquery.cookie.js"></script>
481
<script type="text/javascript"src="js/jquery.similar.msgbox.js"></script>
482
<script type="text/javascript" src="js/index.js"></script>
483
<script type="text/javascript" src="js/popup.js"></script>
484
<script type="text/javascript" src="js/workspace.js"></script>
485 485

486 486
</body>
487 487
</html>