Browse Source

修改专家头像,页面显示的一些问题

luyanan 8 years ago
parent
commit
0f614c2f2c

+ 14 - 13
src/main/webapp/account-set.html

@ -67,11 +67,12 @@
67 67
        </div>
68 68
        <!--已登录-->
69 69
        <div class="onlogin">
70
	        <div class="head-portrait">
70
       		<a class="myWorkspace" href="workspaces.html">我的工作台</a>
71
	        <div class="head-portrait headRadius">
71 72
	        	<img class="portrait-p" />
72 73
	            <div class="personal-infor">
73 74
	                <div class="triangleB"></div>
74
	                <div class="personal-box">
75
	                <div class="personal-box bgRadius">
75 76
	                    <!-- <a href="#"><span class="icon icon1"></span>我的主页</a> -->
76 77
	                    <a href="information.html"><span class="icon icon2"></span>修改资料</a>
77 78
	                    <a href="account-set.html"><span class="icon icon3"></span>账户设置</a>
@ -79,7 +80,7 @@
79 80
	                </div>
80 81
	            </div>
81 82
	        </div>
82
	        <a class="myWorkspace" href="workspaces.html">我的工作台</a>
83
	        
83 84
        </div>
84 85
    </div>
85 86
</div>
@ -87,17 +88,17 @@
87 88
	<div class="account">
88 89
		<div class="account-set">
89 90
			<div class="account-title">账号设置</div>
90
			<a href="#"  class="leftsidebar bgcolor">个人信息</a>
91
			<a href="#" class="leftsidebar">修改密码</a>
91
			<!-- <a href="#"  class="leftsidebar">个人信息</a> -->
92
			<a href="#" class="leftsidebar bgcolor">修改密码</a>
92 93
			<a href="#" class="leftsidebar">账号绑定</a>
93 94
		</div>
94 95
	<div class="contentbox">
95
		<div class="content-set" style="display:block">
96
		<!-- <div class="content-set">
96 97
			<div class="content-title">个人信息</div>
97
			<!-- div class="note">此信息用于站内沟通、社区等功能</div> -->
98
			div class="note">此信息用于站内沟通、社区等功能</div>
98 99
			<div class="acountinfor">
99
				<div class="account-photo">
100
				 <img id="headimg" src="">
100
				<div class="account-photo headRadius">
101
				 	<img id="headimg" src="">
101 102
				</div>
102 103
				<div class="account-name">
103 104
					<div class="text">
@ -115,9 +116,9 @@
115 116
					</div>
116 117
				</div>
117 118
			</div>
118
		</div>
119
		</div> -->
119 120
		
120
		<div class="content-set">
121
		<div class="content-set" style="display:block">
121 122
			<div class="content-title">修改密码</div>
122 123
			<div class="marginT"></div>
123 124
            <form  name="f1" >	
@ -139,8 +140,8 @@
139 140
			<div class="content-title">账号绑定</div>
140 141
			<div class="note">绑定后,您可以同时使用以下方式登录科袖网</div>
141 142
			<div class="unbinding">
142
				<div class="replace1"><span class="email-icon "></span>绑定邮箱账号</div>
143
				<div class="replace2"><span class="phone-icon "></span>绑定手机账号</div>
143
				<div class="replace1"><span class="email-icon "></span>绑定邮箱账号<input type="button" value="绑定" class="replace"></div>
144
				<div class="replace2"><span class="phone-icon "></span>绑定手机账号<input type="button" value="绑定" class="replace"></div>
144 145
                <div class="replace3"><span class="email-icon"></span>您已绑定邮箱  <span id="emailShow"></span><input type="button" value="更换" class="replace replace5"><br>
145 146
				</div>
146 147
				<div class="replace4"><span class="phone-icon "></span>您已绑定手机  <span id="phoneShow"></span><input type="button" value="更换" class="replace replace6" >

+ 3 - 3
src/main/webapp/css/basic.css

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


+ 45 - 21
src/main/webapp/css/common.css

@ -4,13 +4,36 @@
4 4
.floatR{float:right;}
5 5
.clearfix{ clear:both;}
6 6

7
/*默认/主题颜色*/
8
.mainColor{color:#ff9900;}
9
.defaultColor{ color:#333;}
10
/*文字*/
11
.h1Font{font-size:20px;} /*标题*/
12
.h2Font{font-size:18px;} 
13
.h3Font{font-size:16px;} 
14
.h4Font{font-size:14px;} 
15
.h5Font{font-size:13px;} 
16
.h6Font{font-size:12px;} 
17

18
/*圆角*/
19
/*头像、资源圆角*/
20
.headRadius{border-radius: 4px;}
21
/*底板背景圆角*/
22
.bgRadius{border-radius: 6px; overflow:hidden;}
23
/* 表单样式 */
24
.frmtype{ width:100%; border-radius:5px; border:1px #dadada solid; padding:0 10px; min-height:30px;font-size:14px;line-height:30px;}
25
.frmtype:focus{ border:1px solid #ff8500;}
26
.frmbtn{ width:100px; margin:10px; background:#ff9900; color:#fff; border:none; }
27
.frmrbtn{ background:none; color:#303030; border:none; }
28
.updownbtn{text-decoration:underline; color:#333;}
29

7 30
html, body{}
8 31
input{ outline:none;}
9 32
/*header部分*/
10
#header{width:100%;min-width:1170px; height:60px; background:rgba(255,153,0,1); position:fixed; top:0; z-index:999; }
33
#header{width:100%;min-width:1050px; height:60px; background:rgba(255,153,0,1); position:fixed; top:0; z-index:999; }
11 34
.logo{ display:block; width:80px; height:50px; background:url(../images/logo2.png) no-repeat; margin-left:80px; margin-top:5px; float:left;}
12 35
.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;/*line-height兼容*/line-height:35px; height:35px; background:#fff; border:none;-moz-border-radius:6px 0 0 6px;-webkit-border-radius:6px 0 0 6px; border-radius:6px 0 0 6px; behavior:url(../js/ie-css3.htc); float:left;font-size:14px;padding-left:10px; color:#a3a3a3;}
36
.search-txt{ width:220px;line-height:35px; height:35px; background:#fff; border:none;-moz-border-radius:6px 0 0 6px;-webkit-border-radius:6px 0 0 6px; border-radius:6px 0 0 6px; behavior:url(../js/ie-css3.htc); float:left;font-size:14px;padding-left:10px; color:#a3a3a3;}
14 37
.search-btn{ width:35px; height:35px; background:#fff; border-radius:0 6px 6px 0;-moz-border-radius:0 6px 6px 0;-webkit-border-radius:0 6px 6px 0; float:left; cursor:pointer; behavior:url(../js/ie-css3.htc);cursor:pointer;}
15 38
.search-icon{ display:block; width:20px; height:20px; background:
16 39
url(../images/index-icon.png) no-repeat; background-position:left; margin:8px;}
@ -24,11 +47,11 @@ url(../images/index-icon.png) no-repeat; background-position:left; margin:8px;}
24 47
/* .loginbtn:hover{border:2px #fff solid;} */
25 48
/*已登录*/
26 49
.onlogin{ display:none; position:relative;}
27
.head-portrait{width:50px; height:50px; border-radius:50%;background-size:100% 100%;-moz-background-size:100% 100%; float:left; margin-right:10px; margin-top:5px; cursor:pointer;/* border:1px solid #f8f8f8; */overflow:hidden; }
50
.head-portrait{width:40px; height:40px;background-size:100% 100%;-moz-background-size:100% 100%; float:left;margin: 10px 16px; cursor:pointer;overflow:hidden; }
28 51
.portrait-p{ width:100%;}
29
.personal-infor{width:202px; height:179px; position:absolute; top:40px; right:80px; display:none;}
52
.personal-infor{width:202px; height:179px; position:absolute; top:40px; right:8px; display:none;}
30 53
.triangleB{ display:block; width:0; height:0; border:8px solid transparent; border-bottom-color:#f3a36c; float:right; margin-right:20px; margin-top:15px;}
31
.personal-box{ width:202px; /*height:160px;*/ border-radius:10px; background:#f3a36c; clear:both; overflow:hidden;}
54
.personal-box{ width:202px;background:#f3a36c; clear:both; overflow:hidden;}
32 55
.personal-box a{ display:block; width:202px; height:40px;line-height:40px; font-size: 13px; color:#fff;}
33 56
.personal-box a:hover{ background:#ff9900;}
34 57
.icon{ display:block; width:20px; height:20px; margin-left:15px; margin-right:12px; margin-top:10px; float:left;}
@ -39,23 +62,11 @@ url(../images/index-icon.png) no-repeat; background-position:left; margin:8px;}
39 62

40 63
.myWorkspace{font-size: 14px;line-height:40px; text-align: center;float: left; margin-top: 10px;color: #fff;}
41 64
/*主体部分*/
42
#container{ min-width:1170px; background:#fff;overflow: hidden;}
43

44
/*分页*/
45
.tcdPageCode{ padding: 20px; margin: 10px 0;text-align: left;color: #000;text-align:center;font-size:14px;line-height:24px; }
46
.tcdPageCode a{display: inline-block;color: #428bca;display: inline-block;height: 30px;	line-height: 30px;	padding: 0 10px;border: 1px solid #e5e5e5;	margin: 0 8px;border-radius:5px; color:#000;}
47
.tcdPageCode a:hover{text-decoration: none;}
48
.tcdPageCode span.current{display: inline-block;height:30px;line-height: 30px;padding: 0 10px;margin: 0 8px;color: #fff;background-color: #ff9900;border-radius:5px;}
49
.tcdPageCode span.disabled{	display: inline-block;height: 30px;line-height:30px;padding: 0 10px;margin: 0 8px;	color: #000;background: #fff;border: 1px solid #e5e5e5;border-radius:5px;}
50
.tcdPageCode li { display: inline;}
51

52
.tcdPageCode a.current{
53
	display: inline-block;height:30px;line-height: 30px;padding: 0 10px;margin: 0 8px;color: #fff;background-color: #ff9900;border-radius:5px;
54
}
65
#container{ min-width:1050px; background:#fff;overflow: hidden;}
55 66

56 67
/*footer部分*/
57
#footer{ min-width:1170px;clear:both; height:250px; background:#ff9900;}
58
.footer-top{ width:1170px; padding: 20px 10px; overflow: hidden; margin:auto;}
68
#footer{ min-width:1050px;clear:both; height:250px; background:#ff9900;}
69
.footer-top{ width:1050px; padding: 20px 10px; overflow: hidden; margin:auto;}
59 70
.footerL{ float:left; }
60 71
.footer-logo{ width:80px; height:50px; background:url(../images/logo2.png) no-repeat; background-size:100% 100%; margin:24px 0;}
61 72
.link{ color:#fff;padding-bottom:15px;display:none;  }
@ -70,4 +81,17 @@ url(../images/index-icon.png) no-repeat; background-position:left; margin:8px;}
70 81
.foot-icon3{ width:21px; background:url(../images/share.png) no-repeat; background-position:-54px 0;}
71 82
.foot-icon4{ width:23px; background:url(../images/share.png) no-repeat; background-position:right;}
72 83
.footer-btm{ width:100%; height:40px; background:#FFB76A;font-size:12px;line-height:40px; color:#fff; text-align:center; }
73
/*------------------------------------------------------------------------------------*/
84
/*------------------------------------------------------------------------------------*/
85

86
/*分页*/
87
.tcdPageCode{ padding: 20px; margin: 10px 0;text-align: left;color: #000;text-align:center;font-size:14px;line-height:24px; }
88
.tcdPageCode a{display: inline-block;color: #428bca;display: inline-block;height: 30px;	line-height: 30px;	padding: 0 10px;border: 1px solid #e5e5e5;	margin: 0 8px;border-radius:5px; color:#000;}
89
.tcdPageCode a:hover{text-decoration: none;}
90
.tcdPageCode span.current{display: inline-block;height:30px;line-height: 30px;padding: 0 10px;margin: 0 8px;color: #fff;background-color: #ff9900;border-radius:5px;}
91
.tcdPageCode span.disabled{	display: inline-block;height: 30px;line-height:30px;padding: 0 10px;margin: 0 8px;	color: #000;background: #fff;border: 1px solid #e5e5e5;border-radius:5px;}
92
.tcdPageCode li { display: inline;}
93

94
.tcdPageCode a.current{
95
	display: inline-block;height:30px;line-height: 30px;padding: 0 10px;margin: 0 8px;color: #fff;background-color: #ff9900;border-radius:5px;
96
}
97


+ 50 - 45
src/main/webapp/css/index.css

@ -3,7 +3,7 @@
3 3

4 4
html, body{}
5 5
input{ outline:none;}
6

6
.emspace{letter-spacing: 2em; }
7 7

8 8
/*banner部分*/
9 9
#banner{ height:auto; position:relative;}
@ -49,7 +49,7 @@ input{ outline:none;}
49 49
.field-icon7{ background:url(../images/field02.png) no-repeat center center;}
50 50
.field-icon8{ background:url(../images/field05.png) no-repeat center center;}
51 51
.more{position: relative; display:block; width:132px; height:35px; margin:auto;font-size:14px;line-height:32px;padding:0 30px; color:#fff;}
52
.more em{ position: absolute; top: 50%;margin-top: -11px; margin-left: 4px;width: 20px; height: 20px; background:url(../images/more-white.png) center center no-repeat;background-size:100% 100%;}
52
.more em{ position: absolute; top: 50%;margin-top: -9px; margin-left: 4px;width: 16px; height: 16px; background:url(../images/more-white.png) center center no-repeat;background-size:100% 100%;}
53 53
.hot-field .more{ color:#fff;}
54 54
/*热门专家*/
55 55
.hot-professor{ width:100%;  padding: 40px 0; }
@ -64,7 +64,7 @@ input{ outline:none;}
64 64

65 65
/*搜索页*/
66 66
.content{ width:100%; height:auto; background:#f8f8f8; padding:60px 0 2px 0; }
67
.content-in{ width:1170px;/*min-height:300px;*/ margin:auto;padding-bottom:20px;}
67
.content-in{ width:1050px;/*min-height:300px;*/ margin:auto;padding-bottom:20px;}
68 68
.sear-search{ width: 774px;height: 38px;border: 2px solid #ff9900;border-radius: 6px; margin: 20px 0;}
69 69
.sear-search .lookwho{border-right: 2px #ff9900 solid;font-size:15px;color:#ff9900;line-height:34px; height:34px; width:100px; border:none; border-right: 2px #ff9900 solid;border-radius:4px 0 0 4px; background:url(../images/downselect.png) no-repeat 70px center #fff; padding-left:16px; }
70 70
.sear-search .lishow{background: #fff; overflow: hidden;border-radius: 0 0 6px 6px; position: absolute;top: 32px;left: -2px;width: 102px;border: 2px solid #ff9900; border-top: none;z-index: 20; display: none;}
@ -73,20 +73,21 @@ input{ outline:none;}
73 73
.sear-search .sear-btn{ width:140px; height:34px; background:#ff9900; border-radius:0; float:left; cursor:pointer;font-size:15px;line-height:34px; color:#fff; text-align:center; }
74 74

75 75
/*搜索分类*/
76
.classify{ width:100%; /*min-height:200px; */border:1px #f0f0f0 solid; margin-top:10px;border-radius: 6px;background: #fff; padding:10px 0; }
76
.classify{ width:100%;border:1px #f0f0f0 solid; margin-top:10px;border-radius: 6px;background: #fff; }
77 77
.class1{ width:100%; height:52px; overflow:hidden; position:relative; border-bottom:1px #efefef solid;}
78 78
.class1:nth-child(even){background:#f8f8f8;}
79 79
.class1:last-child{border-bottom:none;}
80
.title{ padding:0 15px; float:left;font-size:15px;line-height:48px; color:#000;}
81
.area-con{ float:left; width:970px;/* border:1px solid red; */overflow:hidden; padding-bottom: 16px;}
82
.class1 a{ padding:0px 10px; float:left;font-size:14px;line-height:30px; color:#000; margin-top:9px;/*  margin-right:15px; */}
80
.title{ padding:0 15px; float:left;font-size:15px;line-height:48px; color:#333;}
81
.area-con{ float:left; width:83%;/* border:1px solid red; */overflow:hidden; padding-bottom: 10px;}
82
.class1 a{ padding:0px 10px; float:left;font-size:14px;line-height:30px; color:#333; margin-top:9px;/*  margin-right:15px; */}
83
.class1 a:hover{color:#fff; background:#ff9900;}
83 84
.class1 .colorbg{ color:#fff; background:#ff9900;}
84
.andmore{ display:block; width:100px;font-size:14px;line-height:50px; color:#000; padding:0 28px; position:absolute;right:0; cursor:pointer;}
85
.andmore{ display:block; width:100px;font-size:14px;line-height:50px; color:#333; padding:0 28px; position:absolute;right:0; cursor:pointer;}
85 86
.updown{ display:block; width:12px; height:12px; background:url(../images/UpDown.png) 0 center no-repeat;  float:right; margin-top:19px;}
86 87
/*搜索内容*/
87 88
.about{ width:100%; border-top:1px #e2e2e2 solid; padding:5px 0;}
88
.aboutcenter{ width:1170px;height:auto; margin:auto; }
89
.abouttab{ width:100%; margin:10px 0; border-bottom:1px solid #ccc; border-radius:4px; }
89
.aboutcenter{ width:1050px;height:auto; margin:auto; }
90
.abouttab{ width:100%; margin:10px 0; border-bottom:1px solid #ccc; border-radius:6px; }
90 91
.tabbtn{ font-weight:bold; position:relative;z-index:20;font-size:16px; letter-spacing:0.2em; float:left; padding:16px; width:100px; text-align:center; border-radius:6px 6px 0 0; top: 1px;color:#ff9900; cursor:pointer; margin-left:6px; }
91 92
.tabcurrent{ border:1px solid #ccc; border-bottom-color:#fff;background:#f8f8f8;}
92 93
.abouttablist{ margin-bottom:40px;}
@ -96,19 +97,21 @@ input{ outline:none;}
96 97
.item{ width:99%;overflow: hidden; background:#f8f8f8; border:1px #f0f0f0 solid;/*box-shadow:1px 1px 1px #ff9900 inset;*/ border-radius:6px; margin:10px auto; position:relative;min-height:120px; }
97 98
.operbox{float: left;position: absolute;padding: 10px 20px;margin: 20px;right: 10px; top:50%; margin-top:-20px;}
98 99
.operbtn{ padding:4px 20px; font-size:13px; margin:0 2px; border: 1px solid #efefef;border-radius: 6px; background:#ff9900; color:#fff; cursor:pointer;}
99
.photo1{width:100px;height:100px;border-radius:50%;margin:10px 20px;float:left; overflow:hidden;}
100
.photo1{width:100px;height:100px;margin:10px 20px;float:left; overflow:hidden;}
101
.item:hover{/* border:1px solid #ff9900; */ box-shadow: 0 1px 6px 2px #e0e0e0;}
102

100 103
/*专家简介*/
101
.synopsis{ float:left; padding:10px 0; width:770px;line-height:24px;}
104
.synopsis{ float:left; padding:10px 0; width:74%;line-height:24px;cursor: pointer;}
102 105
.named{display:block;font-size:18px; color:#333; float:left;}
103 106
.named:hover,.named:focus,.named:active{color:#333; text-decoration:none;}
104 107
.modify{ display:block; width:16px; height:16px; background:url(../images/onauth.png) center center no-repeat; background-size:100% 100%; float:left; margin:4px;}
105 108
.position{ clear:both;font-size:16px;  color:#666; }
106 109
.science{font-size:14px; color:#999;  }
107
.industry{font-size:15px; color:#888;  }
110
.industry,.address{font-size:15px; color:#888;  }
108 111
/*资源简介*/
109 112
.remess{ cursor:pointer;}
110
.resourcephoto{width:100px;height:100px; border-radius:4px;border:1px #f0f0f0 solid;margin:10px 20px;float:left;overflow:hidden; }
111
.resouname{font-size:18px; color:#000;}
113
.resourcephoto{width:100px;height:100px;margin:10px 20px;float:left;overflow:hidden; }
114
.resouname{font-size:18px; color:#333;}
112 115
.belongname{ font-size:17px; color:#333; }
113 116
.modicon{ margin:0 6px;}
114 117
.positionbox{ font-size:16px;  color:#666; }
@ -130,7 +133,7 @@ input{ outline:none;}
130 133
.content-title{height:58px;padding:0 30px;font-size:18px;line-height:64px; color:#313131; border-bottom:1px #c8c8c8 solid;}
131 134
.note{ width:438px; height:74px; margin:auto;font-size:16px;line-height:100px;color:#818181; text-align:center; border-bottom:1px #c8c8c8 dashed;}
132 135
.acountinfor{ width:60%; margin:10px auto; }
133
.account-photo{ width:175px; height:175px; border-radius:50%;  margin:auto;margin-top:25px; margin-bottom:25px; overflow:hidden;}
136
.account-photo{ width:175px; height:175px; margin:auto;margin-top:25px; margin-bottom:25px; overflow:hidden;}
134 137
.account-photo img{width:100%;}
135 138
.account-name{ height:50px; padding: 0 40px;}
136 139
.text-txt{font-size:18px;line-height:50px;color:#515151;}
@ -139,7 +142,7 @@ input{ outline:none;}
139 142
.text{ overflow: hidden;width:180px;margin: auto;}
140 143
.text a{ overflow: hidden;font-size:14px;line-height:57px; color:#f5980b; padding-left:5px;}
141 144
 
142
.account-wallet{margin:20px auto;  padding: 20px; background: #E8E8E8; border-radius: 4px;}   
145
.account-wallet{margin:20px auto;  padding: 20px; background: #E8E8E8; border-radius: 6px;}   
143 146
.mywallet{ font-size:16px; line-height:20px; color:grey; font-weight: 500;}
144 147
.walletbox{overflow: hidden; padding:6px 14px;}
145 148
.walletbrig{font-size: 14px; color: #666; margin-left:20px;  }
@ -155,26 +158,26 @@ input{ outline:none;}
155 158
input[type='radio'].radio {opacity:0; display:inline-block; height:20px; float:left; }
156 159
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;}
157 160
input[type='radio'].radio:checked + .radio {background:url(../images/redio.png) no-repeat;}
158
.save{ clear:both; width:140px; height:36px;margin-left:219px; margin-top:20px;border-radius:6px; border:none; background:#ff9900;font-size:16px;line-height:36px; color:#fff;}
161
.save{ clear:both; width:100px; height:30px;margin-left:220px; margin-top:20px;border-radius:6px; border:none; background:#ff9900;font-size:14px;line-height:30px; color:#fff;}
159 162
/*修改密码*/
160 163

161 164
/*input:focus{ border:1px solid #ff8500;}*/
162 165
.msgs{font-size:14px;line-height:40px; color:#ff8500;padding-left:8px;  float:left;cursor:pointer;}
163
.msg{ clear:both;font-size:14px;line-height:26px;color:red; padding-left:140px; background:url(../images/info_warn.png) 116px center no-repeat; }
166
.msg{ clear:both;font-size:14px;line-height:26px;color:red; padding-left:120px; background:url(../images/info_warn.png) 100px center no-repeat; }
164 167
.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;  }
165 168
.marginT{ height:60px; width:100%;}
166
.password{ width:100%; height:40px; clear:both; margin-top:24px; }
169
.password{ width:100%; height:40px; clear:both; margin:6px 0; }
167 170
.lable{ float:left; display:block; width:100px;font-size:16px;line-height:40px; color:#747474; padding-right:15px; text-align:right;}
168
.psd{ width:350px; height:40px; float:left; border-radius:6px; border:1px #bdbdbd solid; box-shadow:0px 0px 2px #bdbdbd inset; padding-left:20px;}
171
.psd{ width:350px; height:40px; float:left; border-radius:6px; border:1px #bdbdbd solid; box-shadow:0px 0px 2px #bdbdbd inset; padding-left:10px;}
169 172
.forget{ display:block; height:40px;font-size:14px;line-height:40px; color:#ff8500; float:right;cursor:pointer; position:relative;}
170 173
.forget:hover{ color:#ff8500;}
171 174
/*账号绑定*/
172 175
.binding{ width:100%; height:44px;font-size:16px;line-height:66px;color:#818181;margin-left:70px;; margin-top:40px; display:none; }
173 176
.unbinding{width:580px; height:44px;font-size:16px;line-height:66px; color:#ff9900;margin:auto; margin-top:40px; cursor:pointer; }
174
.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;}
175
.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;}
176
.replace{ width:88px; height:30px; background:#ff9900; border-radius:5px; border:none;font-size:16px;line-height:30px; color:#fff; margin-left:10px; cursor:pointer;}
177
.replace3,.replace4{ display:none;}
177
.email-icon{display:block; width:30px; height:30px; background:url(../images/ep.png) 0 center no-repeat; float:left; margin-right:6px; margin-top:18px;}
178
.phone-icon{display:block; width:30px; height:30px; background:url(../images/ep.png) -30px center no-repeat;float:left; margin-right:6px; margin-top:18px;}
179
.replace{ width:60px; height:25px; background:#ff9900; border-radius:6px; border:none;font-size:13px;line-height:24px; color:#fff; margin-left:10px; cursor:pointer;}
180
.replace3,.replace4{ display:none;color:#666;}
178 181

179 182
.coverblock{ width:100%; height:100%; background:rgba(0,0,0,0.6); position:fixed; z-index:1004; display:none;}
180 183
.floatbox{ /*width:400px;*/ padding: 0 20px 10px 20px;box-shadow:1px 1px 8px #9f9d9d; border-radius:6px;background:#fff; position:absolute; top:80px; left:50%; margin-left:-240px;  margin-bottom:40px;}
@ -186,53 +189,54 @@ input[type='radio'].radio:checked + .radio {background:url(../images/redio.png)
186 189

187 190
.cover p{ clear:both;font-size:16px;line-height:26px; color:#818181; text-align:center; margin:20px 0;}
188 191
.cover2 p{ clear:both;font-size:16px;line-height:26px; color:#818181; text-align:center; margin:20px 0;}
189
.activate{ width:140px; height:38px; background:#fff;font-size:16px;line-height:35px; color:#000; cursor:pointer; border:none; border-radius:5px; margin:auto; margin-top:30px;  }
192
.activate{ width:140px; height:38px; background:#fff;font-size:16px;line-height:35px; color:#333; cursor:pointer; border:none; border-radius:6px; margin:auto; margin-top:30px;  }
190 193
.act{margin-left:40px;}
191 194
.act-color{background:#ff9900;color:#fff;}
192 195
.back-btn:hover{background:#ff9900;color:#fff;cursor:pointer;}
193 196
.input-code{ width: 210px;margin-left: 10px;}
194
.infor-code{ width:130px; height:40px; background:#ff9900; border:none; border-radius:5px;font-size:14px;line-height:35px; color:#fff; cursor:pointer; margin-left:5px;}
197
.infor-code{ width:130px; height:40px; background:#ff9900; border:none; border-radius:6px;font-size:14px;line-height:35px; color:#fff; cursor:pointer; margin-left:5px;}
195 198

196 199
/*------------------------------------------------------------------------------------*/
197 200
/*专家信息页*/
198 201
/*咨询模块按钮入口*/
199 202
.coulstblock{position:fixed; bottom:0;right:0;z-index:999; display:none;}
200 203
.coulstblock .coulstbox{display:block; width:200px; height:100px; padding:10px; background:rgba(256,256,256,.9); border:1px solid #ccc; border-radius:4px 4px 0 0; box-shadow: -3px -2px 8px -1px rgba(0,0,0,0.2); cursor: pointer;}
201
.coulstblock .coulstbox .prohead{ width:80px; height:80px; border-radius:50%; overflow:hidden;}
204
.coulstblock .coulstbox .prohead{ width:80px; height:80px; overflow:hidden;}
202 205
.coulstblock .coulstbox .coulstbtn{padding:24px 10px; margin-left:10px;}
203 206
.coulstblock .coulstbox .coulstbtn span,#conbtn span{padding:4px 10px; display:block; width:60px; border-radius:2px; text-align:center; color:#fff; background:#ff9900;cursor:pointer}
204 207
/*专家信息头部*/
205 208
.information-head{ width:1050px; margin:auto;background:#fff; border:1px  solid #eaeaea; margin-top:30px; overflow:hidden; padding:20px 50px;}
206
.head-left{ float:left;width:200px; height:200px; border-radius:50%;position:relative;overflow:hidden;}
209
.head-left{ float:left;width:200px; height:200px; position:relative;overflow:hidden;}
207 210
.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;}
208 211
/*.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; }*/
209 212
.head-center{ float:left; width:500px; min-height:150px; margin-top:20px; margin-left:64px;}
210
.input-txt{ width:175px; height:26px; border-radius:5px; border:1px #f99550 solid; box-shadow:0 0 1px #f99550 inset; float:left; padding-left:10px;}
213
.input-txt{ width:175px; height:26px; color:#666; border-radius:5px; border:1px #f99550 solid; box-shadow:0 0 1px #f99550 inset; float:left; padding-left:10px;}
211 214
.infor{clear:both; width:100%; height:26px; margin-bottom:10px; }
212
.infor span{ display:block; width:60px; height:26px; float:left;font-size:14px;line-height:26px; color:#000; margin-left:10px;}
215
.infor span{ display:block; width:60px; height:26px; float:left;font-size:14px;line-height:26px; color:#333; margin-left:10px;}
213 216
.select{  width:173px; height:24px; border-radius:5px; border:1px #f99550 solid; box-shadow:0 0 1px #f99550 inset; background:url(../images/downselect.png) no-repeat 150px center; float:left; overflow:hidden;}
214 217
.selectbtn{ width:200px; height:24px; border:none; background:url(../images/downselect.png) no-repeat 150px center; font-size:14px;line-height:26px; color:#999;}
215 218
.infor-save{ float:left; clear:both; width:130px; height:26px; background:#ff9900;box-shadow:none; border:none;cursor:pointer; color:#fff; border-radius:5px;font-size:14px;line-height:26px; margin-top:15px; margin-left:10px;  }
216
.close{float: left;  width:130px; height:26px; border-radius:5px; background:none; box-shadow:none; border:none;cursor:pointer; padding:0;font-size:14px;line-height:26px; margin-top:15px; margin-left:5px;opacity: 1;  text-shadow:none; }
219
.close{float: left;  width:130px; height:26px; border-radius:5px; font-weight:normal;background:none; box-shadow:none; border:none;cursor:pointer; padding:0;font-size:14px;line-height:26px; margin-top:15px; margin-left:5px;opacity: 1;color: #666; text-shadow:none; }
217 220
.close:hover{ background:#ff9900; color:#fff; opacity: 1; }
218
.head-right{ float:right; margin-top:30px; /*margin-right:50px;*/position: relative;width:140px; height:140px; overflow:hidden;}
221
.head-right{ float:right; margin-top:30px; position: relative;width:140px; height:140px; overflow:hidden;}
219 222
#headImage,#orgImage{ width:100%; height:100%;border:0;}
223
#orgImage{display:none;}
220 224
/*专家信息内容*/
221 225
.information-content{  width:1050px;height:auto; margin:auto;margin-top:20px; position:relative;overflow: hidden;}
222 226
.content-left{min-height:394px; float:left;overflow:hidden; }
223 227
.menublock{ margin-bottom:10px;width:298px; background:#fff; border:1px #eaeaea solid; padding-bottom:10px;}
224
.left-title{ width:165px; height:44px;font-size:22px;line-height:44px; border-bottom:1px #ffad55 solid; padding-left:10px; }
228
.left-title{ width:165px; height:44px;font-size:20px;line-height:44px; border-bottom:1px #ffad55 solid; padding-left:10px; }
225 229
.subsidebar{ display:block; width:100%; height:26px; padding-left:18px;font-size:14px;line-height:26px;color:#313131; margin-top:5px;}
226
.subcolor{ background:#f99550; color:#fff;}
230
.subcolor{ background:#ff9900; color:#fff;}
227 231
.subsidebar:hover{ background:#f99550; color:#fff;}
228 232

229 233
.content-right{ width:735px;min-height:100px; float:right; }
230 234
.right-box{ width:100%; background:#fff; border:1px #eaeaea solid; margin-bottom:20px; }
231 235
/*.introduction{min-height:200px;}*/
232 236
.right-title{ position:relative; overflow:hidden; padding-right:20px;}
233
.right-title span{ float:left;font-size:22px;line-height:48px; /*color:#ff9900; */padding-left:15px;}
237
.right-title span{ float:left;font-size:20px;line-height:48px; /*color:#ff9900; */padding-left:15px;}
234 238
.edit-position-left{ background-position:left;}
235
.editbox{ clear:both; width:665px; min-height:210px; margin:auto;font-size:14px;line-height:20px;color:#3e3e3e;}
239
.editbox{ clear:both; width:665px; margin:auto;font-size:14px;line-height:20px;color:#666;}
236 240
.reedit{ clear:both; width:665px; min-height:210px; padding:10px;margin-left:35px; border:1px #f99550 solid; box-shadow:0 0 1px #f99550 inset; font-size:14px;line-height:20px; color:#3e3e3e;resize:none;
237 241
}
238 242
.edit{ display:block; float:left; width:22px; height:22px; background:url(../images/edit.png) no-repeat right center;margin: 15px 6px;cursor:pointer;}
@ -249,7 +253,7 @@ input[type='radio'].radio:checked + .radio {background:url(../images/redio.png)
249 253
.listbox{ margin:5px 0;max-width:100%; margin-left:15px; overflow:hidden; /*border:1px solid red;*/}
250 254
.list-area{ overflow:hidden; padding:10px 0 20px 0; width:670px; margin:10px auto; background:#f8f8f8;}
251 255
.listbox-browse{ min-height:26px; position:relative;}
252
.list-browse{ height:24px;box-shadow:2px 2px 1px #c9c9c9 ; text-align:center;font-size:14px;line-height:26px; color:#3e3e3e; margin-left:15px; float:left;cursor:pointer;padding-right: 8px; overflow:hidden;}
256
.list-browse{ height:24px;box-shadow:2px 2px 1px #c9c9c9 ; text-align:center;font-size:14px;line-height:26px; color:#666; margin-left:15px; float:left;cursor:pointer;padding-right: 8px; overflow:hidden;}
253 257
.plus{ float:left;display:block; width:26px; height:26px; cursor:pointer; background:url(../images/zan.png) no-repeat center center; margin-left:10px;  }
254 258
.line{ width:110px; height:1px; background:#ccc; float:left; margin-left:30px; margin-top:12px;}
255 259
.like-num{ float:right;max-width:380px;height:26px; padding:0 20px; overflow:hidden; }
@ -286,7 +290,7 @@ label.edu-radio{ float:none;font-size:16px;line-height:26px; color:#868686; }
286 290
.edu-about li{ list-style:inside;}
287 291
.edu-about{ list-style:inside;font-size:14px;line-height:26px;color:#868686; margin:0 35px; margin-bottom:35px; cursor:pointer;}
288 292
.edu-about span{ display:none;}
289
.infor-browse .edu-about{ color:#000;}
293
.infor-browse .edu-about{ color:#666;}
290 294
.add-icon{ cursor:pointer;}
291 295
.button{ float:left; width:40px; height:17px; margin-left:10px; margin-top:4px;}
292 296
.modi{ cursor:pointer;padding-left:10px;}
@ -303,7 +307,8 @@ label.edu-radio{ float:none;font-size:16px;line-height:26px; color:#868686; }
303 307
.sharesrcbox{overflow:hidden; position:relative; margin:auto; width:640px;  }
304 308
.sharescrollbox{ overflow:hidden;width:30000em; position:relative; left:0;}
305 309
.sharescrollbox .sharesrc{ width:200px; margin:10px 6px; float:left;}
306
.sharescrollbox .briefinfor{ width:100%; max-height:100px; text-overflow:ellipsis; overflow:hidden; }
310
.sharescrollbox .restit{ color:#666; margin-top: 6px;}
311
.sharescrollbox .briefinfor{ width:100%; max-height:100px; text-overflow:ellipsis; overflow:hidden; color:#777; }
307 312
.sharescrollbox .shareshow{ position: relative; width: 200px; height: 200px;border-radius: 4px; overflow: hidden;}
308 313
.shareopeart{ position:absolute; bottom:0px; left:0px; z-index:100; overflow:hidden; width:100%;}
309 314
.sharebtn{ display:block; text-align:center; float:left; cursor:pointer; width:50%; height:30px;font-size:14px;line-height:30px; background:rgba(0,0,0,.2); color:#fff; border:1px solid #d6d6d6;}
@ -317,7 +322,7 @@ label.edu-radio{ float:none;font-size:16px;line-height:26px; color:#868686; }
317 322
/*合作历史及评价*/
318 323
.evaluate{ overflow:hidden; border-bottom:1px dashed #d6d6d6; padding:10px 0;}
319 324
.evaluate .lefteva{ float:left; max-height:200px; width:20%; max-width:200px; text-align:center; margin-top:10px;}
320
.evaluate .evaimg{ display:block; width:60px; height:60px; overflow:hidden; border:1px solid #999; border-radius:50%; margin:auto;}
325
.evaluate .evaimg{ display:block; width:60px; height:60px; overflow:hidden;margin:auto;}
321 326
.evaluate .righteva{ padding:0 10px; float:right; width:80%;}
322 327
.evaluate .evasort{ }
323 328
.evaluate .evasort li{ text-overflow:ellipsis; overflow:hidden; white-space:nowrap;}
@ -328,19 +333,19 @@ label.edu-radio{ float:none;font-size:16px;line-height:26px; color:#868686; }
328 333
.shareabout .morebtn .morelink{ color:#333;font-size:14px;line-height:60px;float:right; margin-right:20px;}
329 334

330 335
/*个人修改页面科研资源*/
331
.enterwork{ color:#333;position:absolute; bottom:10px; left:110px; cursor: pointer;}
332

336
.enterwork{ color:#333;position:absolute; bottom:10px; left:102px; cursor: pointer;}
337
.enterwork:hover{color:#ff9900;}
333 338
/*机构信息页面*/
334 339
.head-org{ float:left;  position: relative;width:180px; height:180px; overflow:hidden;}
335 340

336 341
.similarblock{ overflow:hidden; margin:0 10px; padding:10px; border-bottom:1px dashed #d6d6d6;}
337
.similarblock .evaimg{ display:block; width:60px; height:60px; overflow:hidden; border:1px solid #999; border-radius:50%; float:left; margin-right:20px;}
342
.similarblock .evaimg{ display:block; width:60px; height:60px; overflow:hidden; border:1px solid #999; border-radius:4px; float:left; margin-right:20px;}
338 343
.rightsim{ max-width:160px; overflow:hidden; float:left;}
339 344
.rightsim p{text-overflow:ellipsis;  white-space:nowrap;overflow:hidden;font-size:12px; line-height:16px;}
340 345

341 346
.subuser{ overflow:hidden;}
342 347
.subuser li{ overflow:hidden; float:left; text-align:center; padding:10px; width:24%; list-style:none;}
343
.subuser li .evaimg{ display:block; width:60px; height:60px; overflow:hidden; border:1px solid #999; border-radius:50%; margin:auto;}
348
.subuser li .evaimg{ display:block; width:60px; height:60px; overflow:hidden; border:1px solid #999; border-radius:4px; margin:auto;}
344 349
#evastarboxx .staspan{background: url(../images/evastar.png) 0 1px no-repeat;}
345 350

346 351


+ 7 - 8
src/main/webapp/css/login.css

@ -123,8 +123,9 @@ html,body{ cursor:default; margin:0; height:100%;}
123 123

124 124
.photo-upload{ width:490px; height:450px; border-radius:10px; background:#f8f8f8; float:left; overflow:hidden;}
125 125

126
.load{font-size:16px;line-height:30px; text-align:center;/* border:1px solid red;*/ margin-top:200px;margin-bottom:200px;}
126
.load{font-size:14px;line-height:28px; text-align:center;/* border:1px solid red;*/ margin-top:200px;margin-bottom:200px;}
127 127
.load p{font-size:14px;line-height:14px; margin: 10px;}
128
.resouimgmsg{ font-size:12px;line-height:20px; color:#999;}
128 129
.upbtn{width: 140px;height: 34px; border-radius:10px; border:1px #dfdfdf solid; background:#fff; position:relative; margin-top:10px; cursor:pointer;}
129 130
.filebtn{ width: 200px; height: 80px; box-shadow:none;opacity:0; position:absolute; left:-20px; top:-25px; cursor:pointer;}
130 131
#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; }
@ -133,13 +134,11 @@ html,body{ cursor:default; margin:0; height:100%;}
133 134
.clear{ clear:both;}
134 135
.plus{font-size:24px;line-height:30px; color:#ff9900; font-weight:bold; margin-right:10px;}
135 136
.photo-size{ /*width:200px; */height:410px; border-radius:10px; background:#f8f8f8; float:right; padding:20px 0;}
136
.size-big{ width:175px; height:175px; background:red; border-radius:50%; margin:auto;}
137
.size-small{ width:58px; height:58px; background:red; border-radius:50%; margin:auto;}
138
.size-square{ width:26px; height:26px; background:red; border-radius:5px; margin:auto;}
139
.save{ clear:both; width:130px; height:35px; background:#ff9900;box-shadow:none; border:none;cursor:pointer; color:#fff;margin-left:200px; padding:0;}
140
.close{ width:130px; height:35px; background:none; box-shadow:none; border:none;cursor:pointer; padding:0;}
141
#back{width: 130px;height: 35px; background:none; box-shadow:none; border:none;cursor: pointer;padding: 0;}
142
#back:hover,.close:hover{ background:#ff9900; color:#fff; }
137

138
.save{ clear:both; width:130px; height:30px; background:#ff9900;box-shadow:none; border:none;cursor:pointer; color:#fff;margin-left:200px; padding:0;}
139
.close{ width:130px; height:30px; background:none; box-shadow:none; border:none;cursor:pointer; padding:0;}
140
#back{width: 130px;height: 30px; background:none; box-shadow:none; border:none;cursor: pointer;padding: 0;}
141
.save:hover,#back:hover,.close:hover{ background:#ff9900; color:#fff; }
143 142

144 143

145 144
/*注册*/

+ 28 - 25
src/main/webapp/css/popup.css

@ -2,11 +2,11 @@
2 2
/* CSS Document */
3 3
.frmtype{ width:100%; border-radius:5px; border:1px #dadada solid; padding:0 10px; min-height:30px;font-size:14px;line-height:30px;}
4 4
#resouinforcon .frmtype,.subCla{width:80%;}
5
.addIndusry,.addSubject{ width:16%; height:30px; background:#ff8400;box-shadow:none; border:none;cursor:pointer; color:#fff; border-radius:5px;font-size:14px;line-height:26px;  margin-left:10px;cursor:pointer; }
5
.addIndusry,.addSubject{ width:16%; height:30px; background:#ff9900;box-shadow:none; border:none;cursor:pointer; color:#fff; border-radius:5px;font-size:14px;line-height:26px;  margin-left:10px;cursor:pointer; }
6 6
.deleteIndustry,.deleteSubject{  height:30px;border:1px #c9c9c9 solid; border-radius:5px; text-align:center;font-size:14px;line-height:30px;color:#3e3e3e; margin:6px 0; margin-left:15px; float:left;cursor:pointer;padding:0 8px;}
7 7
.removeNu{margin-left:5px;}
8 8
.frmtype:focus{ border:1px solid #ff8500;}
9
.frmbtn{ width:100px; margin:10px; background:#ff8400; color:#fff;  border:1px solid transparent; }
9
.frmbtn{ width:100px; margin:10px; background:#ff9900; color:#fff;  border:1px solid transparent; }
10 10
.frmrbtn{ background:none; color:#303030; border:1px solid transparent; }
11 11
.frmarea{ min-height:80px;}
12 12
.updownbtn{text-decoration:underline; color:#333;}
@ -16,7 +16,7 @@
16 16
/*弹窗资源信息、申请信息*/
17 17
.resouinfo{position:absolute;background:#fff;min-width:750px;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; }
18 18

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

21 21
.resoutit .showinfor{ position:absolute; left:60px; top:2px; font-size:13px; font-weight:normal;}
22 22
.resouinfotype{ font-weight:600; text-align:right;color: #555; min-width: 80px;}
@ -42,18 +42,18 @@
42 42

43 43
/*合作项目及评价*/
44 44
.teamworkbox{ margin-top:20px;}
45
.teamworktit{padding: 0 10px;font-size:16px;line-height:40px;color: #606060; border-bottom:1px solid #ff8400;}
45
.teamworktit{padding: 0 10px;font-size:16px;line-height:40px;color: #606060; border-bottom:1px solid #ff9900;}
46 46
.teamwork{ overflow:hidden;  padding-bottom: 10px; border-bottom:1px dashed #d6d6d6; }
47 47
.teamwork .lefteva{ float:left; max-height:200px; width:20%; max-width:200px; text-align:center; margin-top:10px;}
48
.teamwork .lefteva .evaimg{ display:block; width:50px; height:50px; overflow:hidden; border:1px solid transparent; border-radius:50%; margin:auto;}
48
.teamwork .lefteva .evaimg{ display:block; width:50px; height:50px; overflow:hidden; border:1px solid transparent; margin:auto;}
49 49
.teamwork .righteva{padding:10px; float:left; margin-left:20px; font-size:14px; width:78%; max-width:476px;}
50 50
.teamwork .righteva  .teamname{ position:relative;}
51 51
.teamwork .righteva .teamname .teamtime{ position:absolute; right:0;}
52 52
.teamwork .righteva .evastarbox{ overflow:hidden;}
53
.teamwork .righteva .evastar{ display:block; width:24px; height:24px; cursor:pointer; float:left; background:url(../images/evastar.png) 0 -22px no-repeat;}
53
.teamwork .righteva .evastar{ display:block; width:20px; height:20px; cursor:pointer; float:left; background:url(../images/evastar.png) 0 -22px no-repeat;}
54 54
.teamwork .righteva .evabrief{ display:block; margin-top:10px; max-height:80px; overflow:hidden; }
55 55

56
.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;}
56
.resoutit .stateinfor{ position:absolute; bottom:-20px; right: -28px;background: #ff9900; color: #fff; padding: 0 40px;border-radius: 20px 0 0 20px;z-index: 2; cursor:pointer;}
57 57
.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;}
58 58
.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;}
59 59

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

77 77
/*评价*/
@ -84,7 +84,7 @@
84 84
.noconmment{ line-height:120px;}
85 85

86 86
.evastarbox2{ overflow:hidden;}
87
.evastar2{ display:block; width:24px; height:24px; cursor:pointer; float:left; background:url(../images/evastar.png) 0 -21px no-repeat;}
87
.evastar2{ display:block; width:20px; height:20px; cursor:pointer; float:left; background:url(../images/evastar.png) 0 -21px no-repeat;}
88 88

89 89
/*留言*/
90 90
.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;}
@ -94,7 +94,7 @@
94 94
.guestconitem{ padding:10px 0; overflow:hidden; margin-bottom:10px;border-bottom:1px dashed #d6d6d6;}
95 95
.guestconitem:nth-child(odd){ background:#f8f8f8;}
96 96
.guestcon .lefteva{ float:left; max-height:200px; width:20%; max-width:200px; text-align:center; margin-top:10px;}
97
.guestcon .lefteva .evaimg{ display:block; width:80px; height:80px; overflow:hidden; border:1px solid #d6d6d6; border-radius:50%; margin:auto;}
97
.guestcon .lefteva .evaimg{ display:block; width:80px; height:80px; overflow:hidden; border:1px solid #d6d6d6; margin:auto;}
98 98
.guestcon .righteva{padding:0 10px; float:left; margin-left:20px; width:79%; max-width:480px;}
99 99
.guestcon .righteva .guestname{ position:relative;}
100 100
.guestcon .righteva .guestname .guesttime{ position:absolute; right:0;}
@ -111,10 +111,10 @@
111 111
.paymentbox table{width:760px; margin-bottom:20px;}
112 112
.paymentbox table tr{border-bottom:1px dotted #ccc; }
113 113
.paymentbox table tr:nth-child(1){border-bottom:none;}
114
.paymentbox table tr th{ background:#ff8400;color:#fff;}
114
.paymentbox table tr th{ background:#ff9900;color:#fff;}
115 115
.paymentbox table tr th,.paymentbox table tr td{ padding:10px 4px; text-align:center; }
116
.paymentbox table .paytit th{ background:#ff8400; color:#fff;}
117
.paybtn{ position:absolute; left:100px; top:0px; font-size:14px; cursor:pointer; color:#ff8400; }
116
.paymentbox table .paytit th{ background:#ff9900; color:#fff;}
117
.paybtn{ position:absolute; left:100px; top:0px; font-size:14px; cursor:pointer; color:#ff9900; }
118 118

119 119
/*详细信息*/
120 120
.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;}
@ -136,32 +136,35 @@
136 136
.paymentbox1 table tr th{ background:#f2f2f2;}
137 137
.paymentbox1 table tr th,.paymentbox1 table tr td{ padding:10px 4px; text-align:center; }
138 138
.paymentbox1 #paytit tr td:nth-child(even){background:#f6f6f6;}
139
.paymentbox1 table .paytit th{ background:#ff8400; color:#fff;}
139
.paymentbox1 table .paytit th{ background:#ff9900; color:#fff;}
140 140

141
.combtn{color:#ff8400; cursor:pointer;}
141
.combtn{color:#ff9900; cursor:pointer;}
142 142

143 143
/*//咨询申请*/
144 144
.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;}
145 145
.consultinfo{ padding:10px 20px; max-width:680px; overflow:hidden;}
146 146
.consultleft{ width:33%; margin-right:20px;}
147
.consultleft .prohead{ width:140px; height:140px; border-radius:50%; overflow:hidden; margin:auto; margin-bottom:10px;}
147
.consultleft .proheadbox{ width:140px; height:140px; margin:auto; margin-bottom:10px; }
148
.consultleft .prohead{ width:100px; height:100px; overflow:hidden; margin:auto;}
149
.consultleft .phh5{font-size: 13px;line-height: 24px;color: #999;width: 110px;text-align: center;margin: auto;overflow: hidden; }
148 150
.consultmenu{ margin:10px 0;}
149
.consultmenu .menutit{ font-size:16px;line-height:40px; font-weight:600;border-bottom:1px solid #ff8400;}
151
.consultmenu .menutit{ font-size:16px;line-height:40px; border-bottom:1px solid #ff9900;}
150 152
.consultmenu .menucon{ padding:10px;}
151 153
.consultmenu .menucon li{ padding:8px 20px;cursor:pointer; font-size:14px;line-height:20px;  border-bottom:1px solid #d6d6d6;}
152
.consultmenu .menucon .clicknow{ background:#ff8400; color:#fff;} 
154
.consultmenu .menucon .clicknow{ background:#ff9900; color:#fff;} 
153 155
.consultmenu .pripolicy{ padding:10px; background:#eee; border-radius: 6px;text-align:center;}
154 156
.consultmenu .pripolicy h3{ font-size:14px; line-height:30px;}
155 157
.consultmenu .pripolicy p{ font-size:13px; text-align:justify; text-indent:1.5em;}
156 158

157 159
.consultright{ width:60%; margin-left:20px; padding:10px;}
158
.consultright .probrief {height:130px;}
159
.probrief .proname .name{  text-align:left;font-size:26px;line-height:46px; font-weight:400; color:#333;}
160
.probrief .proname .modifyicon{ margin-left:10px; margin-top:-10px;}
161
.probrief .phh2{font-size:20px;line-height:36px; color:#333;  }
162
.probrief .phh4{font-size:16px;line-height:24px; color:#333; }
160
.consultright .probrief {height:130px;overflow:hidden;}
161
.probrief .proname .name{  text-align:left;font-size:20px;line-height:40px;color:#333;}
162
.probrief .proname .modifyicon{ margin-left:6px; margin-top:-10px;}
163
.probrief .phh2{font-size:16px;line-height:30px; color:#333;  }
164
.probrief .phh4{font-size:14px;line-height:20px; color:#666; }
165

163 166
.sendmsg {}
164
.sendmsg .sendmsgtit{font-size:18px;line-height:40px;  font-weight:600; border-bottom: 1px solid #ff8400; margin:10px 0;}
167
.sendmsg .sendmsgtit{font-size:18px;line-height:40px; border-bottom: 1px solid #ff9900; margin:10px 0;}
165 168
.sendmsg .sendmsgcon{}
166 169
.sendmsg .sendmsgcon li{ padding:4px 0; font-size:14px;line-height:20px; }
167 170
.sendmsg .sendmsgcon li span{ color:red; margin-right:6px;}

+ 4 - 4
src/main/webapp/css/webuploader/webuploader.css

@ -11,8 +11,8 @@
11 11
	position: relative;
12 12
	display: inline-block;
13 13
	cursor: pointer;
14
	background: #ff8400;
15
	padding: 7px 15px;
14
	background: #ff9900;
15
	padding: 4px 20px;
16 16
	color: #fff;
17 17
	text-align: center;
18 18
	border-radius: 3px;
@ -21,7 +21,7 @@
21 21
	
22 22
}
23 23
.webuploader-pick-hover {
24
	background: #ff8400;
24
	background: #ff9900;
25 25
}
26 26

27 27
.webuploader-pick-disable {
@ -117,7 +117,7 @@
117 117
    overflow: hidden;
118 118
    width: 0;
119 119
    height: 100%;
120
    background: #ff8400  url(../images/progress.png) repeat-x;
120
    background: #ff9900  url(../images/progress.png) repeat-x;
121 121
    -webit-transition: width 200ms linear;
122 122
    -moz-transition: width 200ms linear;
123 123
    -o-transition: width 200ms linear;

+ 56 - 47
src/main/webapp/css/workspace.css

@ -1,17 +1,17 @@
1 1
@charset "utf-8";
2 2
/* CSS Document */
3
.con-center{ width:1170px;position:relative; margin:auto; overflow:hidden;padding:20px 10px; margin-top:60px;}
3
.con-center{ width:1050px;position:relative; margin:auto; overflow:hidden;padding:20px 10px; margin-top:60px;}
4 4
.frmtype{ width:100%; border-radius:5px; border:1px #dadada solid; padding:0 10px; min-height:30px;font-size:14px;line-height:30px;}
5 5
.frmtype:focus{ border:1px solid #ff8500;}
6
.frmbtn{ width:100px; margin:10px; background:#ff8400; color:#fff; border:none; }
6
.frmbtn{ width:100px; margin:10px; background:#ff9900; color:#fff; border:none; }
7 7
.frmrbtn{ background:none; color:#303030; border:none; }
8 8
.updownbtn{text-decoration:underline; color:#333;}
9 9

10 10
/*左侧菜单*/
11 11
.workmenu{ float:left; width:12%; height:300px; background: #fafafa;border-radius: 6px;overflow: hidden;}
12
.workmenutit{height: 60px;padding: 0 20px;font-size:16px;line-height:60px; border-bottom:1px #ff8400 solid;cursor:pointer;}
12
.workmenutit{height: 60px;padding: 0 20px;font-size:16px;line-height:60px; border-bottom:1px #ff9900 solid;cursor:pointer;}
13 13
.worksubmenu{width:100%; height:40px; margin:10px 0; padding-left:30px;font-size:15px;line-height:40px; color:#313131; cursor:pointer;}
14
.subcolor{ background:#f99550; color:#fff;}
14
.worksubmenu .subcolor{ background:#ff9900; color:#fff;}
15 15

16 16
/*右侧内容*/
17 17
.workcon{float:right; margin-left:10px; width:87%; min-height:800px; background: #fafafa;border-radius:6px;overflow: hidden;}
@ -26,52 +26,53 @@
26 26
.workmysrc{ margin-bottom:30px;}
27 27
.workmysrctit{font-size:16px;line-height:30px;position:relative;}
28 28
.worksamlltit{ font-size:13px;line-height:30px; margin:0 10px; padding:10px;cursor:pointer;}
29
.worksamlltitnow{ border-bottom:1px solid #ff8400; color:#ff8400;text-decoration: none;}
29
.worksamlltitnow{ border-bottom:1px solid #ff9900; color:#ff9900;text-decoration: none;}
30 30
.workcontit a:link,.workcontit a:active,.workcontit a:visited  {color:#313131;}
31 31

32 32
.workmysrc{display:none;}
33 33
.workmysrc:first-child{display:block;}
34
.workmysrc .workbtn{ display:block;background:#ff8400;text-align: center;font-size:14px;line-height:30px;color:#fff; width:140px; padding:0 20px; border-radius:4px; cursor:pointer; margin-bottom:10px;}
34
.workmysrc .workbtn{ display:block;background:#ff9900;text-align: center;font-size:14px;line-height:30px;color:#fff; width:140px; padding:0 20px; border-radius:4px; cursor:pointer; margin-bottom:10px;}
35 35
.maintab{ border-bottom:1px dashed #d7d7d7; margin-top:20px; overflow:hidden;}
36 36
.maintab:last-child{border-bottom:none;}
37
.worktab *{ text-align:center; color:#000;}
37
.worktab *{ text-align:center; color:#333;}
38 38
.lefttab{ width:16%;min-width: 162px; max-height:400px; overflow:hidden;}
39 39
.resoubrief{width:100%;height:300px; overflow:hidden;}
40 40
.resoubrief tr td{ /*border-bottom:1px solid #d6d6d6;*/ max-height:180px; padding:6px 0;}
41 41
.resoubrief tr td ul{max-height: 260px;overflow: hidden;}
42
.resoubrief tr td ul li{ width:100%; max-width:160px; text-indent:1.5em; word-break: break-all;text-align: justify; /*text-overflow:ellipsis; overflow:hidden; white-space:nowrap;*/}
43
.resoubrief tr td ul li:first-child{text-indent:0;font-size: 15px;color: #ff8400;}
42
.resoubrief tr td ul li{ width:100%; max-width:160px; text-indent:0.5em; word-break: break-all;text-align: justify; /*text-overflow:ellipsis; overflow:hidden; white-space:nowrap;*/}
43
.resoubrief tr td ul li:first-child{text-indent:0;font-size: 15px;color: #ff9900;}
44 44
.resoubrief tr td .resoimgbox{width: 160px; height: 160px;border-radius: 4px; overflow:hidden;}
45
.managebtn{ display:block; background:#ff8400;margin:auto;width:120px;font-size:14px;line-height:30px;color:#fff; border-radius:4px; text-align:center; cursor:pointer;}
45
.managebtn{ display:block; background:#ff9900;margin:auto;width:120px;font-size:14px;line-height:30px;color:#fff; border-radius:4px; text-align:center; cursor:pointer;}
46 46

47
.righttab{ width:82%;}
47
.righttab{ width:80%;}
48 48
.worktab a{ color:#333;}
49
.worktab a:hover{color:#ff8400;}
49
.worktab a:hover{color:#ff9900;}
50 50
.worktab tr td{ padding:0 4px;max-width:60px;word-break:break-all;/*text-overflow:ellipsis; overflow:hidden; white-space:nowrap;*/}
51 51
.worktab .worktabtit{ height:40px;background:#fff9ef;border-bottom:1px #D8D8D8 solid;}
52 52
.worktab .workitem{ border-bottom:1px #D8D8D8 solid;height:110px; padding:10px 0;}
53 53
.worktab .workitem:nth-child(odd){background:#fff;}
54 54
.workitemsrc{/* cursor:pointer;*/ color:#702C40;}
55 55
.operatebtn,.opbtn{ display:block;margin-top:10px;}
56
.operatebtn span,.opbtn span{ color:#ff8400; cursor:pointer; }
56
.operatebtn span,.opbtn span{ color:#ff9900; cursor:pointer; }
57 57
.modification{padding:10px 0;}
58 58

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

67 67
.workinfor{width:64%; margin-top:20px; padding:10px 16px;min-height:140px;}
68 68
.workinfor h4{ overflow:hidden;}
69
.workinfor .named{display:block;font-size:18px;line-height:34px; font-weight:bold; color:#000; float:left;}
70
.workinfor .named:hover,.workinfor .named:focus,.workinfor .named:active{color:#000; text-decoration:none;}
69
.workinfor .named{display:block;font-size:18px;line-height:34px;color:#333; float:left;}
70
.workinfor .named:hover,.workinfor .named:focus,.workinfor .named:active{color:#333; text-decoration:none;}
71 71

72
.workinfor h5{font-size:16px;line-height:30px; font-weight:600;}
73
.workinfor h6{ font-size:13px;line-height:24px; font-weight:400;}
74
.worklinkbtn{ color:#ff8400;font-size:12px;line-height:24px;cursor:pointer;}
72
.workinfor h5{font-size:16px;line-height:26px;color:#666;}
73
.workinfor h6{ font-size:13px;line-height:24px;color:#888;}
74
.workinfor p{ color:#444; font-size:12px;}
75
.worklinkbtn{ color:#ff9900;font-size:12px;line-height:24px;cursor:pointer;}
75 76

76 77
.workcountup{ width:100%; overflow:hidden; padding:6px 0; text-align:center; margin:10px;}
77 78
.workcountup:nth-child(2){ border-top:1px solid #d6d6d6;}
@ -84,21 +85,22 @@
84 85
.worktit{ width:100%;border-bottom:1px solid #d6d6d6; padding:4px 0; font-size:16px; }
85 86
.leftwb{ width:30%; margin:auto; text-align:center;}
86 87
.wbcon{ padding:20px 0; overflow:hidden;}
87
.wbimg{ display:block; margin:auto; width:60px; height:60px; overflow:hidden; border-radius:50%;}
88
.wbimg{ display:block; margin:auto; width:60px; height:60px; overflow:hidden;}
88 89
.rightwb{ width:66%; margin-left:10px; }
89
.worktopic{ font-weight:bold; text-overflow:ellipsis; white-space:nowrap; overflow:hidden;}
90
.worktopic{text-overflow:ellipsis; white-space:nowrap; overflow:hidden;}
90 91
.workrecord{ list-style:inside disc;max-height:94px; overflow:hidden;font-size:13px; color:#666;}
91
.writeback{ margin:10px 0; border-radius:4px; font-size:12px; text-align:center; cursor:pointer; border:1px solid #888; padding:0 14px;}
92
.writeback:hover,.writeback:active{border:1px solid #ff8400; color:#ff8400;}
92
.writeback{ margin:10px 0;padding:4px 16px; border-radius:4px; font-size:12px; text-align:center; cursor:pointer; background: #ff9900;border: 1px solid #ff9900;color:#fff; }
93
/* .writeback:hover,.writeback:active{border:1px solid #ff9900; color:#ff9900;} */
93 94
.writebackbox{/*display:none;*/}
94 95
.writespan{ margin-top:10px; font-weight:bold;}
95 96

96 97
/*资源、项目*/
97
.sharesrcbox11{ overflow:hidden; width:100%; padding:10px; height:320px;}
98
.sharesrcbox11 .sharesrc{ width:200px; margin:10px 20px; float:left;cursor:pointer;}
98
.sharesrcbox11{ overflow:hidden; width:100%; padding:1%; height:320px;}
99
.sharesrcbox11 .sharesrc{ width:186px; margin:10px 1%; float:left;cursor:pointer;}
99 100
.sharesrcbox11 .briefinfor{ width:100%; max-height:100px; text-overflow:ellipsis; overflow:hidden; }
100
.sharesrcbox11 .shareshow{ position:relative; overflow:hidden;border-radius: 4px;margin: 8px;}
101
.sharesrcbox11 .shareshow{ position:relative; overflow:hidden;border-radius: 4px;margin: 8px 0;font-size: 13px; color:#666;}
101 102
.sharesrcbox11 .shareopeart{ position:absolute;background:rgba(0,0,0,.4); line-height:30px; text-align:center; bottom:-30px; left:0px; z-index:100; overflow:hidden; width:100%; cursor:pointer;}
103
.sharesrcbox11 .shareshow .statuswork{font-size: 12px;color:#ff9900/* #006DBD */;}
102 104

103 105
.objectsrcbox{ overflow:hidden; width:100%; padding:10px; height:160px;}
104 106
.objectsrc{float:left;  width:28%; margin:10px 20px;  height:120px; border-radius:4px; background:#fbeed5; /*border:1px dashed #e5e5e5;*/ padding:30px 10px; cursor:pointer; }
@ -122,31 +124,38 @@
122 124
.workcurrent{ background:url(../images/selected.png) no-repeat 90% center #f7f7f7; }
123 125

124 126
.orderedbtn{ padding:1px 6px;  cursor:pointer; }
125
.orderedbtn div{width:20px; height:20px; background:url(../images/order.png) no-repeat 0 1px #ff8400 ; border-radius:4px;}
127
.orderedbtn div{width:20px; height:20px; background:url(../images/order.png) no-repeat 0 1px #ff9900 ; border-radius:4px;}
126 128

127 129
.workselectcon{ padding:10px;}
128
.workselectitem{/*  overflow:hidden; */ margin:6px 0;}
130
.workselectitem{/*  overflow:hidden; */ margin:6px 0;padding: 0 10px; padding-left: 20px;}
129 131
.workselectitem:nth-child(odd){background:#fff;}
130 132
.workselectitem table tr .workcheck{ text-align:center;}
131 133
.worksitcon{ width:100%;margin-top:0; overflow:hidden; }
132 134
.worksitcon .lasttime{ font-size:13px; color:#666;}
133 135
.worksitcon span{ padding-right:4px;}
134 136
.rebackcon{ height:60px; overflow:hidden;}
135
.modifyicon{width:20px; margin-left:6px;margin-top: 6px;}
137
.modifyicon{width:16px; margin-left:6px;margin-top: 6px;}
136 138
.workitimg{ width:120px; height:120px; }
137 139
.messagebox{position:relative;}
138 140
.msgprompt{position:absolute; top:26px; left:16px; padding:0 10px;text-align:center;  border-radius:14px; background:#ff6432; color:#fff;}
139 141
.workhandle{ position:absolute;  top:20px; right:20px;}
140
.workhandle span{ padding:2px 20px;border:1px #d7d7d7 solid;}
141
.workhandle .coultstate{background: #ff8400; position: relative;top:-10px;right: 20px; padding: 10px 30px; border-radius: 0 0 6px 6px;    border: solid 1px transparent;  box-shadow: 1px 1px 2px 1px #ccc; color: #fff; z-index: 20;}
142
.workhandle span{ padding:2px 20px;border:1px #d7d7d7 solid;margin: 2px;}
143
.workhandle .complain{display:none;}/* 更多操作按钮... */
144
.workhandle .coultstate{/* background: #ff9900; position: relative;top:-10px;right: 20px; padding: 10px 30px; border-radius: 0 0 6px 6px; box-shadow: 1px 1px 2px 1px #ccc; z-index: 20; */color: #fff;border-radius: 6px 0 0 6px;}
145
.workhandle .status-1{background:#FF9900;border: solid 1px #FF9900;}/*进行中*//*咨询状态*/
146
.workhandle .status-2{background:#dd524d;border: solid 1px #dd524d;}/*待评价*/
147
.workhandle .status-3{background:#4cd964;border: solid 1px #4cd964;}/*已完成*/
148

149

142 150
.workhandle .coultstate em{ position: absolute; width: 0px; height: 0px;border-top: 6px solid transparent; border-bottom: 0px solid rgb(204, 106, 6); border-left: 0px solid transparent; border-right: 5px solid rgb(204, 106, 6);left: -6px; top: -1px;z-index: 10;}
151
#evastarbox { overflow: hidden; border: 1px solid transparent; width: 110px; margin: auto;}
143 152
#evastarbox .startStyle{background: url(../images/evastar.png) 0 1px no-repeat;}
144
.workhandle .replybtn:hover{ background:#ff8400;cursor:pointer;color:#fff;border:1px #ff8400 solid;}
153
.workhandle .replybtn:hover{ background:#ff9900;cursor:pointer;color:#fff;border:1px #ff9900 solid;}
145 154

146
.workhandle .moreopert:hover{ background:#ff8400;cursor:pointer;color:#fff;border:1px #ff8400 solid;}
155
.workhandle .moreopert:hover{ background:#ff9900;cursor:pointer;color:#fff;border:1px #ff9900 solid;}
147 156
.workhandle .moreopertbtn{box-shadow:0px 2px 2px 1px #CECEB8;-moz-box-shadow:0px 2px 2px 1px #CECEB8;-webkit-box-shadow:0px 2px 2px 1px #CECEB8;width: 80px;right: 0;position: absolute;background: #fff; display:none;}
148 157
.workhandle .moreopertbtn li{ cursor:pointer;padding:2px 20px;border:1px #d7d7d7 solid;}
149
.workhandle .moreopertbtn li:hover{background:#ff8400;cursor:pointer;color:#fff;border:1px #ff8400 solid;}
158
.workhandle .moreopertbtn li:hover{background:#ff9900;cursor:pointer;color:#fff;border:1px #ff9900 solid;}
150 159
/*////////////科研项目/////////////////*/
151 160

152 161
.workobjcon{ overflow:hidden; background:#fff; min-height:600px; margin-top:10px; padding:20px;}
@ -182,9 +191,9 @@
182 191
.dialogcontain .dialoginfo .thankbox{ width:190px;}
183 192
.dialogcontain .dialoginfo .thankbox span{ padding:0 12px; font-weight:600;}
184 193
.dialogcontain .dialoginfo .dialogsurebtn{margin: 10px auto;}
185
.dialogcontain .dialoginfo .dialogsurebtn span {padding:6px 20px; border-radius:6px; background:#ff8400;color:#fff; cursor:pointer; }
194
.dialogcontain .dialoginfo .dialogsurebtn span {padding:6px 20px; border-radius:6px; background:#ff9900;color:#fff; cursor:pointer; }
186 195

187
.dialogcontain .dialogstatus{ position:absolute; top:-20px; right: -8px;background: #ff8400; color: #fff; padding: 0 60px;border-radius: 20px 0 0 20px;z-index: 2; line-height: 40px; }
196
.dialogcontain .dialogstatus{ position:absolute; top:-20px; right: -8px;background: #ff9900; color: #fff; padding: 0 60px;border-radius: 20px 0 0 20px;z-index: 2; line-height: 40px; }
188 197
.dialogcontain .dialogstatus 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: -5px;}
189 198

190 199
.dialogbody{ padding:20px; background:#FFF1DD; border-bottom:1px #d6d6d6 solid; min-height: 320px; overflow-y:auto;}
@ -194,19 +203,19 @@
194 203
.dialogbody .dialoghistory{display: block; padding: 0 0 0 20px;border-style: solid;border-width: 1px 0 0 0;position: relative; margin: 25px 82px 14px; border-style: dashed; border-color: #d9d9d9;}
195 204
.dialogbody .dialoghistory .dialogword{ font-size: 14px; text-decoration:none; position: absolute; top: -9px;left: 50%;width: 108px; margin-left: -54px;text-align: center;font-weight: normal;}
196 205

197
.dialogleftitem,.dialogrightitem{ padding:10px; margin:10px;}
206
.dialogleftitem,.dialogrightitem{ padding:4px; }
198 207
.dilmod{ overflow:hidden;}
199 208
.dilmod .diluser{ width:60px; height:60px;}
200
.dilmod .diluser .userface{ display:block; width:100%; height:100%; border-radius:50%;overflow:hidden;}
209
.dilmod .diluser .userface{ display:block; width:100%; height:100%;/*  border-radius:50%; */overflow:hidden;}
201 210

202
.dilmod .dilinfobox{ max-width: 700px; padding:20px; margin:0 16px; border-radius:10px; position:relative;}
211
.dilmod .dilinfobox{ max-width: 700px; padding:10px 20px; margin:8px 16px; border-radius:6px; position:relative;}
203 212
.dilmod .dilinfobox_l{ background:#fff ; border: 1px  rgba(0,0,0,.1) solid;}
204 213
.dilmod .dilinfobox_r{ background:#ADE0F9; border: 1px #C8ECFD solid;}
205
.dilmod .dilinfobox .dilarrow{ display: block; width: 0px;height: 0px; margin:20px;border-width:14px;border-style:solid; position: absolute; top:-5px; }
206
.dilmod .dilinfobox .dilarrow_l{border-color:transparent rgba(0,0,0,.1) transparent transparent;left:-48px; }
207
.dilmod .dilinfobox .dilarrow_l_bor{border-color:transparent #fff transparent transparent;  left:-47px; }
208
.dilmod .dilinfobox .dilarrow_r{ border-color:transparent transparent transparent #C8ECFD;  right:-48px;}
209
.dilmod .dilinfobox .dilarrow_r_bor{ border-color:transparent transparent transparent #ADE0F9;  right:-47px;}
214
.dilmod .dilinfobox .dilarrow{ display: block; width: 0px;height: 0px; margin:20px;border-width:10px;border-style:solid; position: absolute; top:-10px; }
215
.dilmod .dilinfobox .dilarrow_l{border-color:transparent rgba(0,0,0,.1) transparent transparent;left:-40px; }
216
.dilmod .dilinfobox .dilarrow_l_bor{border-color:transparent #fff transparent transparent;  left:-39px; }
217
.dilmod .dilinfobox .dilarrow_r{ border-color:transparent transparent transparent #C8ECFD;  right:-40px;}
218
.dilmod .dilinfobox .dilarrow_r_bor{ border-color:transparent transparent transparent #ADE0F9;  right:-39px;}
210 219

211 220

212 221
.dialogfoot{ padding:20px; background:#fff; border-radius:0 0 10px 10px;}
@ -224,7 +233,7 @@
224 233
.dialogfoot .sendbox_bar .sendtype .mlink3:hover{ background-position: -60px -30px;}
225 234

226 235
.dialogfoot .sendbox_bar .sendbtn {}
227
.dialogfoot .sendbox_bar .sendbtn .W_btn { display: inline-block;text-align: center;border-radius: 4px;line-height: 30px; padding: 0px 20px; font-size: 14px; background: #ff8400; border: 1px solid #ff8400; color: #fff; box-shadow: 0px 1px 2px rgba(0,0,0,0.25);}
236
.dialogfoot .sendbox_bar .sendbtn .W_btn { display: inline-block;text-align: center;border-radius: 4px;line-height: 30px; padding: 0px 20px; font-size: 14px; background: #ff9900; border: 1px solid #ff9900; color: #fff; box-shadow: 0px 1px 2px rgba(0,0,0,0.25);}
228 237

229 238
/* 对话页面,按钮显示和隐藏样式 */
230 239
.displayNone{

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


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


BIN
src/main/webapp/images/default-photo.jpg


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


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


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


BIN
src/main/webapp/images/more-white.png


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


+ 5 - 5
src/main/webapp/index.html

@ -30,11 +30,12 @@
30 30
	        
31 31
	        <!--已登录-->
32 32
	        <div class="onlogin">
33
		        <div class="head-portrait">
33
	        	<a class="myWorkspace" href="workspaces.html">我的工作台</a>
34
		        <div class="head-portrait headRadius">
34 35
		        	<img class="portrait-p" />
35 36
		            <div class="personal-infor">
36 37
		                <div class="triangleB"></div>
37
		                <div class="personal-box">
38
		                <div class="personal-box bgRadius">
38 39
		                    <!-- <a href="#"><span class="icon icon1"></span>我的主页</a> -->
39 40
		                    <a href="information.html"><span class="icon icon2"></span>修改资料</a>
40 41
		                    <a href="account-set.html"><span class="icon icon3"></span>账户设置</a>
@ -42,8 +43,7 @@
42 43
		                </div>
43 44
		                
44 45
		            </div>
45
		        </div>
46
		        <a class="myWorkspace" href="workspaces.html">我的工作台</a>
46
		        </div> 
47 47
	        </div>
48 48
        </div>
49 49
    </div>
@ -55,7 +55,7 @@
55 55
		<div class="theme">
56 56
			<h1>科袖</h1>
57 57
			<h2>搭建专家与企业之间的桥梁</h2>
58
			<div class="main-search">
58
			<div class="main-search bgRadius">
59 59
				 <div class="simuselect floatL" id="lookFor">
60 60
                	<div class="ulbox lookwho" onclick="showmenu()" id="div_select">找专家</div> 
61 61
					<ul id="li_show" class="lishow"> 

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

@ -41,11 +41,12 @@
41 41
        </div>
42 42
        <!--已登录-->
43 43
        <div class="onlogin">
44
	        <div class="head-portrait">
44
        	<a class="myWorkspace" href="workspaces.html">我的工作台</a>
45
	        <div class="head-portrait headRadius">
45 46
	        	<img class="portrait-p" />
46 47
	            <div class="personal-infor">
47 48
	                <div class="triangleB"></div>
48
	                <div class="personal-box">
49
	                <div class="personal-box bgRadius">
49 50
	                    <!-- <a href="#"><span class="icon icon1"></span>我的主页</a> -->
50 51
	                    <a href="information.html"><span class="icon icon2"></span>修改资料</a>
51 52
	                    <a href="account-set.html"><span class="icon icon3"></span>账户设置</a>
@ -54,24 +55,24 @@
54 55
	                
55 56
	            </div>
56 57
	        </div>
57
	        <a class="myWorkspace" href="workspaces.html">我的工作台</a>
58
	        
58 59
        </div>
59 60
	</div>
60 61
</div>
61 62
<div id="container">
62 63
	<div class="content">
63 64
		<div class="information-head">
64
			<div class="head-left"><a href="#"><img id="headImage"></a></div>	
65
			<div class="head-left headRadius"><a href="#"><img id="headImage"></a></div>	
65 66
			<div class="head-center">
66 67
				<div class="infor-browse">
67
					<a href="#" class="named" id="nameS"></a><a href="#" class="modify"></a>
68
					<a href="#" class="named" id="nameS" style="font-size:20px;"></a><a href="#" class="modify"></a>
68 69
					<div class="position" ><span id="office"></span ><span id="titleS"></span ></div>				
69 70
					<div class="science"><span id="industryS"></span ><span id="orgNameS"></span ></div>			
70 71
					<div class="address" id="address"></div>					
71 72
				</div>
72 73
				<div class="coulstbtn floatL" id="conbtn"><span>咨询</span></div>
73 74
			</div>
74
			<div class="head-right"><a  id="organ"><img id="orgImage"></a></div>
75
			<div class="head-right headRadius"><a  id="organ"><img id="orgImage"></a></div>
75 76
		</div>
76 77
		<div class="information-content">
77 78
			<div class="content-left" >
@ -82,12 +83,11 @@
82 83
                    <a href="#infor3"  class="subsidebar">研究方向</a>
83 84
                    <a href="#infor4"  class="subsidebar">应用行业</a>
84 85
                    <a href="#infor5"  class="subsidebar">教育背景</a>
85
                    <a href="#infor6"  class="subsidebar">社会兼职</a>
86
                    <a href="#infor6"  class="subsidebar">工作经历</a>
86 87
                    <a href="#infor7"  class="subsidebar">项目经历</a>
87
                    
88 88
                    <a href="#infor8"  class="subsidebar">著作、论文、文章</a>
89 89
                    <a href="#infor9"  class="subsidebar">专利</a>
90
                    <a href="#infor10"  class="subsidebar">获奖</a>
90
                    <a href="#infor10"  class="subsidebar">荣誉及奖项</a>
91 91
                </div>
92 92
                <div class="menublock">
93 93
                    <div class="left-title" >合作机会</div>
@ -143,7 +143,7 @@
143 143
				</div>
144 144
				
145 145
				<div class="right-box introduction">
146
					<div class="right-title"><span>社会兼职</span>    </div>
146
					<div class="right-title"><span>工作经历</span>    </div>
147 147
					<div class="infor-browse">
148 148
						<ul class="edu-about" id="timeJobShow">
149 149
							
@ -189,7 +189,7 @@
189 189
				<div class="right-box introduction">
190 190
					<div class="right-title"><span>科研资源</span>    </div>
191 191
					<div class="infor-browse">
192
                    	<div class="shareabout">
192
                    	<div class="shareabout shareabout1">
193 193
                            <div class="sharesrcbox">
194 194
                                <div class="sharescrollbox" id="sharescrollbox">
195 195
                                    
@ -204,7 +204,7 @@
204 204
                <div class="right-box introduction">
205 205
					<div class="right-title"><span>合作历史及评价</span>    </div>
206 206
					<div class="infor-browse">
207
						<div class="shareabout">
207
						<div class="shareabout shareabout2">
208 208
                        	
209 209
                        
210 210
                        </div>

+ 39 - 56
src/main/webapp/information.html

@ -29,11 +29,12 @@
29 29
        </div>
30 30
        <!--已登录-->
31 31
        <div class="onlogin">
32
	        <div class="head-portrait">
32
        	<a class="myWorkspace" href="workspaces.html">我的工作台</a>
33
	        <div class="head-portrait headRadius">
33 34
	        	<img class="portrait-p" />
34 35
	            <div class="personal-infor">
35 36
	                <div class="triangleB"></div>
36
	                <div class="personal-box">
37
	                <div class="personal-box bgRadius">
37 38
	                    <!-- <a href="#"><span class="icon icon1"></span>我的主页</a> -->
38 39
	                    <a href="information.html"><span class="icon icon2"></span>修改资料</a>
39 40
	                    <a href="account-set.html"><span class="icon icon3"></span>账户设置</a>
@ -42,41 +43,41 @@
42 43
	                
43 44
	            </div>
44 45
	        </div>
45
	        <a class="myWorkspace" href="workspaces.html">我的工作台</a>
46 46
        </div>
47 47
	</div>
48 48
</div>
49 49
<div id="container">
50 50
	<div class="content">
51 51
		<div class="information-head">
52
			<div class="head-left"><a href="#"><img id="headImage"><a href="photo-set.html" class="replace-photo"></a></a></div>		
52
			<div class="head-left headRadius"><a href="#"><img id="headImage"><a href="photo-set.html" class="replace-photo"></a></a></div>		
53 53
			<div class="head-center">
54 54
				<div class="infor-browse">
55
					<a href="#" class="named" id="nameS"></a><a href="#" class="modify"></a><a class="edit" ></a>
55
					<a href="#" class="named" id="nameS" style="font-size:20px;"></a><a href="#" class="modify"></a><a class="edit" style=" margin:4px 6px;"></a>
56 56
					<div class="position" ><span id="office"></span ><span id="titleS"></span ></div>				
57 57
					<div class="science"><span id="industryS"></span ><span id="orgNameS"></span ></div>			
58 58
					<div class="address" id="address"></div>
59 59
				</div>
60 60
				<div class="modifybox">
61 61
				<div class="infor">
62
					<span>姓&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;名</span>
62
					<span><em class="emspace">姓</em>名</span>
63 63
					<input type="text" class="input-txt name" id="name">
64
                    <span>职&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;称</span>
65
					<div class="divselect"> 
66
						<input class="input-txt" type="text" value=""  id="title"/> 
67
					</div>
64
					<span>所在城市</span>
65
					<input type="text" class="input-txt" id="addressRevise">
66
                    
68 67

69 68
				</div>
70 69
				<div class="infor">
71
					<span>职&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;位</span>
70
					<span><em class="emspace">职</em>称</span>
71
					<div class="divselect"> 
72
						<input class="input-txt" type="text" value=""  id="title"/> 
73
					</div>
74
					<span><em class="emspace">职</em>位</span>
72 75
					<input type="text" class="input-txt" id="officeRevise">
73
					<span>地&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;址</span>
74
					<input type="text" class="input-txt" id="addressRevise">
75 76
				</div>
76 77
				<div class="infor">
77
					<span>部&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;门</span>
78
					<span>所属部门</span>
78 79
					<input type="text" class="input-txt" id="department">
79
					<span>所机构</span>
80
					<span>所机构</span>
80 81
					<input type="text" class="input-txt" id="orgName">
81 82
				</div>
82 83
				<div class="infor">
@ -86,7 +87,7 @@
86 87
				</div>
87 88
			</div>
88 89
			<!-- href="organization-brow.html" -->
89
		<div class="head-right"><a ><img id="orgImage"></a></div>
90
		<div class="head-right headRadius"><a ><img id="orgImage"></a></div>
90 91
		</div>
91 92
		<div class="information-content">
92 93
			<div class="content-left" >
@ -97,12 +98,12 @@
97 98
                    <a href="#infor3"  class="subsidebar">研究方向</a>
98 99
                    <a href="#infor4"  class="subsidebar">应用行业</a>
99 100
                    <a href="#infor5"  class="subsidebar">教育背景</a>
100
                    <a href="#infor6"  class="subsidebar">社会兼职</a>
101
                    <a href="#infor6"  class="subsidebar">工作经历</a>
101 102
                    <a href="#infor7"  class="subsidebar">项目经历</a>
102 103
                    
103 104
                    <a href="#infor8"  class="subsidebar">著作、论文、文章</a>
104 105
                    <a href="#infor9"  class="subsidebar">专利</a>
105
                    <a href="#infor10"  class="subsidebar">获奖</a>
106
                    <a href="#infor10"  class="subsidebar">荣誉及奖项</a>
106 107
                </div>
107 108
                <div class="menublock">
108 109
                    <div class="left-title" >合作机会</div>
@ -220,7 +221,7 @@
220 221
					</div>
221 222
					<div class="modifybox">
222 223
					<div class="infor edu btn-marL">
223
						<b class="star">*</b>学&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
224
						<b class="star">*</b><em class="emspace">学</em>
224 225
						<input type="hidden" id="eduId" />
225 226
						
226 227
						<input type="text" class="input-txt edu-txt" id="school">
@ -233,17 +234,17 @@
233 234
						<!--<input type="text" class="date-btn input-txt" id="year" />-->
234 235
					</div>
235 236
					<div class="infor edu btn-marL">
236
						<b class="star">&nbsp;&nbsp;</b>院&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
237
						<b class="star">&nbsp;&nbsp;</b><em class="emspace">院</em>
237 238
						<input type="text" class="input-txt edu-txt" id="college">
238 239
					</div>
239 240
					<div class="infor edu btn-marL">
240
						<b class="star">&nbsp;&nbsp;</b>专&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
241
						<b class="star">&nbsp;&nbsp;</b><em class="emspace">专</em>
241 242
						<input type="text" class="input-txt edu-txt" id="major">
242 243
					</div>
243 244
					<div class="infor edu btn-marL edu-h">
244
					<!--	<div class="sf"><b class="star">*</b>身&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;份</div>
245
					<!--	<div class="sf"><b class="star">*</b><em class="emspace">身</em>份</div>
245 246
						<div class="radiobox">
246
							<input type="radio" name="student" id="a" value="0" class="radio edu-radio"><label for="a" class="radio edu-radio">学&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;生</label>
247
							<input type="radio" name="student" id="a" value="0" class="radio edu-radio"><label for="a" class="radio edu-radio"><em class="emspace">学</em>生</label>
247 248
							<input type="radio" name="student" id="b" value="1" class="radio edu-radio"><label for="b" class="radio edu-radio" >访问学者</label>
248 249
						</div>-->
249 250
						<div class="edu-select" style=" float:none;">
@ -271,7 +272,7 @@
271 272
				</div>
272 273
				
273 274
				<div class="right-box introduction">
274
					<div class="right-title"><span>社会兼职</span><a class="edit"></a></div>
275
					<div class="right-title"><span>工作经历</span><a class="edit"></a></div>
275 276
					<div class="infor-browse">
276 277
						<ul class="edu-about" id="timeJobShow">
277 278
							
@ -285,7 +286,7 @@
285 286

286 287
					</div>
287 288
					<div class="infor edu btn-marL datebox">
288
						<div class="date-title"><b class="star">&nbsp;&nbsp;</b>时&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;间</div>
289
						<div class="date-title"><b class="star">&nbsp;&nbsp;</b><em class="emspace">时</em>间</div>
289 290
                        <input type="text"  maxLength="6" class="date-btn input-txt " id="startMonth"  onKeypress="if (event.keyCode < 48 || event.keyCode > 57) event.returnValue = false;" value="201608">
290 291
						<!--<input class="date-btn input-txt" id="startMonth"/>-->
291 292
						  <hr class="ago">
@ -295,7 +296,7 @@
295 296
                        
296 297
					</div>
297 298
					<div class="infor edu btn-marL">
298
						<b class="star">*</b>头&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
299
						<b class="star">*</b><em class="emspace">头</em>
299 300
						<input type="text" class="input-txt edu-txt" id="jobTitle" />
300 301
					</div>
301 302
					<input type="button" value="保存" class="infor-save btn btn-marL" id="timeJobSave">
@ -320,7 +321,7 @@
320 321
						<input type="text" class="input-txt edu-txt" id="projectName">
321 322
					</div>
322 323
					<div class="infor edu btn-marL datebox">
323
						<div class="date-title"><b class="star">&nbsp;&nbsp;</b>时&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;间</div>
324
						<div class="date-title"><b class="star">&nbsp;&nbsp;</b><em class="emspace">时</em>间</div>
324 325
						
325 326
						<!--<input class="date-btn input-txt" id="projectStartMonth"/>-->
326 327
                        
@ -331,7 +332,7 @@
331 332
                        <div class="check checkbox"><input type="checkbox" class="present" >至今</div>
332 333
					</div>
333 334
					<div class="infor edu btn-marL">
334
						<b class="star">&nbsp;&nbsp;</b>描&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
335
						<b class="star">&nbsp;&nbsp;</b><em class="emspace">描</em>
335 336
						<!-- <textarea class="reedit" id="projectDescp"></textarea> -->
336 337
						<input type="text" class="input-txt edu-txt" id="projectDescp">
337 338
					</div>
@ -353,7 +354,7 @@
353 354
					</div>
354 355
					<div class="modifybox">
355 356
					<div class="infor edu btn-marL">
356
						<b class="star">*</b>标&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
357
						<b class="star">*</b><em class="emspace">标</em>
357 358
						<input type="hidden" id="paperId"/>
358 359
						<input type="text" class="input-txt edu-txt" id="paperName">
359 360
					</div>
@ -363,17 +364,12 @@
363 364
                        <input type="text"  maxLength="4" class="date-btn input-txt" id="paperYear"  onKeypress="if (event.keyCode < 48 || event.keyCode > 57) event.returnValue = false;" value="2016">
364 365
                        
365 366
					</div>
366
					<!--<div class="infor edu btn-marL datebox">
367
						<b class="star">&nbsp;&nbsp;</b>年&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;份
368
						<input type="text" class="input-txt edu-txt" id="paperYear">
369
						
370
					</div>-->
371 367
					<div class="infor edu btn-marL">
372
						<b class="star">&nbsp;&nbsp;</b>描&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
368
						<b class="star">&nbsp;&nbsp;</b><em class="emspace">描</em>述
373 369
						<input type="text" class="input-txt edu-txt" id="paperDescp">
374 370
					</div>
375 371
					<div class="infor edu btn-marL">
376
						<b class="star">&nbsp;&nbsp;</b>链&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
372
						<b class="star">&nbsp;&nbsp;</b><em class="emspace">链</em>
377 373
						<input type="text" class="input-txt edu-txt" id="paperUrl">
378 374
					</div>
379 375
					<input type="button" value="保存" class="infor-save btn btn-marL" id="paperSave">
@ -394,7 +390,7 @@
394 390
					</div>
395 391
					<div class="modifybox">
396 392
					<div class="infor edu btn-marL">
397
						<b class="star">*</b>标&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
393
						<b class="star">*</b><em class="emspace">标</em>
398 394
						<input type="hidden" id="patentId" />
399 395
						<input type="text" class="input-txt edu-txt" id="patentName">
400 396
					</div>
@ -404,18 +400,12 @@
404 400
                         <input type="text"  maxLength="4" class="date-btn input-txt" id="patentYear"  onKeypress="if (event.keyCode < 48 || event.keyCode > 57) event.returnValue = false;" value="2016">
405 401
                        
406 402
					</div>
407
					<!--
408
					<div class="infor edu btn-marL datebox">
409
						<b class="star">&nbsp;&nbsp;</b>年&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;份
410
						<input type="text" class="input-txt edu-txt" id="patentYear">
411
						
412
					</div>-->
413 403
					<div class="infor edu btn-marL">
414
						<b class="star">&nbsp;&nbsp;</b>链&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
404
						<b class="star">&nbsp;&nbsp;</b><em class="emspace">链</em>接
415 405
						<input type="text" class="input-txt edu-txt" id="patentUrl">
416 406
					</div>
417 407
					<div class="infor edu btn-marL">
418
						<b class="star">&nbsp;&nbsp;</b>描&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
408
						<b class="star">&nbsp;&nbsp;</b><em class="emspace">描</em>述
419 409
						<input type="text" class="input-txt edu-txt" id="patentDescp">
420 410
					</div>
421 411
					<input type="button" value="保存" class="infor-save btn btn-marL" id="patentSave">
@ -436,26 +426,18 @@
436 426
					</div>
437 427
					<div class="modifybox">
438 428
					<div class="infor edu btn-marL">
439
						<b class="star">*</b>标&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
429
						<b class="star">*</b><em class="emspace">标</em>
440 430
						<input type="hidden" id="honorId"/>
441 431
						<input type="text" class="input-txt edu-txt" id="honorName">
442 432
					</div>
443 433
					<div class="infor edu btn-marL date-box">
444
						<div class="date-title"><b class="star">&nbsp;&nbsp;</b>时&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;间</div>
434
						<div class="date-title"><b class="star">&nbsp;&nbsp;</b><em class="emspace">时</em>间</div>
445 435
						<!--<input type="text" class="date-btn input-txt" id="honorYear">-->
446 436
                      
447 437
                        <input type="text"  maxLength="4" class="date-btn input-txt" id="honorYear"  onKeypress="if (event.keyCode < 48 || event.keyCode > 57) event.returnValue = false;" value="2016">
448 438
                        
449 439
					</div>
450
				<!--	<div class="infor edu btn-marL datebox">
451
						<b class="star">&nbsp;&nbsp;</b>年&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;份
452
						<input type="text" class="input-txt edu-txt" id="honorYear">
453
						
454
					</div>
455
					<div class="infor edu btn-marL">
456
						<b class="star">*</b>描&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;述
457
						<input type="text" class="input-txt edu-txt" id="honorDescp">
458
					</div>-->
440
			
459 441
					<input type="button" value="保存" class="infor-save btn btn-marL" id="honorSave">
460 442
					<input type="button" value="取消" class="close btn btn-marB">
461 443
                    <div class="clearfix"></div>
@ -520,3 +502,4 @@
520 502

521 503
</body>
522 504
</html>
505


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

@ -257,7 +257,7 @@ $(function(){
257 257
			}else{
258 258
				phonePass = false;
259 259
				/*alert("手机格式正确,请输入正确的手机号码");*/
260
				$(".msg12").text("手机格式正确,请输入正确的手机号码");
260
				$(".msg12").text("手机格式正确,请输入正确的手机号码");
261 261
			}
262 262
	    }
263 263
	}

+ 9 - 3
src/main/webapp/js/consult.js

@ -15,13 +15,19 @@ function handleData(data,attrParams,btnCls){
15 15
		
16 16
		if(data[i]["consultStatus"] == 0){
17 17
			state = "进行中";
18
			/*$(".coultstate").eq(i).removeClass("status-2,status-3");
19
			$(".coultstate").eq(i).addClass("status-1");*/
18 20
			text = '回复';
19 21
		} else if (data[i]["consultStatus"] == 1) {
20 22
			text = "查看";
23
			/*$(".coultstate").eq(i).removeClass("status-2,status-1");
24
			$(".coultstate").eq(i).addClass("status-3");*/
21 25
			state = "已完成";
22 26
			if(attrParams == 'consultId'){
23 27
				if(data[i]["assessStatus"] == 0){
24
					state = "未评价";
28
					/*$(".coultstate").eq(i).removeClass("status-1,status-3");
29
					$(".coultstate").eq(i).addClass("status-2");*/
30
					state = "待评价";
25 31
				}
26 32
			} 
27 33
		}else if(data[i]["consultStatus"] == undefined){
@ -67,7 +73,7 @@ function handleData(data,attrParams,btnCls){
67 73
				"<table width='100%'>" +
68 74
					"<tbody><tr>" +
69 75
						"<td width='14%' class='messagebox'>" +
70
							"<a class='workhead workitimg'>" +
76
							"<a class='workhead workitimg headRadius'>" +
71 77
								"<img class='headPhoto' src='"+photoUrl+"'  width='100%' height='100%'>" +
72 78
							"</a>" +
73 79
							"<span class='msgprompt showUnreadMsg' style='"+unread.style+"' id='" +data[i]["consultId"] +"'>"+unread.unreadCount+"</span>" +
@ -214,7 +220,7 @@ function dialogContentStrFn(data){
214 220
			"<div class='"+dialogitem+"'>" +
215 221
			"<div class='dilmod'>" +
216 222
				"<div class='diluser "+float+"'>" +
217
					"<a  target='_blank' class='userface'>" +
223
					"<a  target='_blank' class='userface headRadius'>" +
218 224
						"<img src='images/default-photo.jpg' width='100%' height='100%'>" +
219 225
					"</a>" +
220 226
				"</div>" +

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

@ -78,7 +78,7 @@ $("#searchContent").blur(function() {
78 78
});
79 79

80 80

81
var lookFor = $("#lookFor ul li").index();
81
var lookFor = 0;
82 82
$("#lookFor ul li").on("click",function(){
83 83
	lookFor=$(this).index();
84 84
});

+ 8 - 8
src/main/webapp/js/information.brow.js

@ -174,7 +174,7 @@ loginStatus();//读取用户头像
174 174
						
175 175
						if($photos.length>0){
176 176
							for(var j =0 ; j< $photos.length;++j){
177
								showDiv += "<span class='like-people'><img class='like-h' src='/images/head/"+$photos[j]+"_s.jpg'></span>";
177
								showDiv += "<span class='like-people headRadius'><img class='like-h' src='/images/head/"+$photos[j]+"_s.jpg'></span>";
178 178
								
179 179
							} 
180 180
						}
@ -304,7 +304,7 @@ loginStatus();//读取用户头像
304 304
							
305 305
							//研究方向						
306 306
							if ($info.researchAreas.length) {
307
								researchAreaShow($info.researchAreas,$info.researchAreaLogs);
307
								researchAreaShow($info.researchAreas,$info.editResearchAreaLogs);
308 308
							}else{							
309 309
								$("span:contains('研究方向')").parents(".introduction").hide();
310 310
								$("a:contains('研究方向')").hide();
@ -329,8 +329,8 @@ loginStatus();//读取用户头像
329 329
							if ($info.jobs.length) {
330 330
								timeJobShow($info.jobs);
331 331
							}else{
332
								$("span:contains('社会兼职')").parents(".introduction").hide();
333
								$("a:contains('社会兼职')").hide();
332
								$("span:contains('工作经历')").parents(".introduction").hide();
333
								$("a:contains('工作经历')").hide();
334 334
							}
335 335
							//项目
336 336
							if ($info.projects.length) {
@ -359,7 +359,7 @@ loginStatus();//读取用户头像
359 359
								honorShow($info.honors);
360 360
							}else{
361 361
								$("span:contains('荣誉及奖项')").parents(".introduction").hide();
362
								$("a:contains('获奖')").hide();	
362
								$("a:contains('荣誉及奖项')").hide();	
363 363
							}
364 364
							 
365 365
					//下滑滚动不覆盖底部 
@ -458,7 +458,7 @@ var resou;
458 458
	                	add+='<a class="remess" resourceId='+data.data[i].resourceId+'><img src="/images/resource/'+data.data[i].resourceId+'.jpg" width="100%" height="100%" class="resourceImg"></a>'
459 459
	                 	add+='<div class="shareopeart"><a class="sharebtn resourceConsult" professorId='+data.data[i]["professorId"]+'>咨询</a><a class="sharebtn applicant">申请</a></div>'
460 460
	             		add+='</div>'
461
	             		add+='<p>资源名称:<span class="presou consultTitleVal" resourceConsultTitle = "">'+ data.data[i].resourceName+'</span></p>'
461
	             		add+='<p class="restit">资源名称:<span class="presou consultTitleVal" resourceConsultTitle = "">'+ data.data[i].resourceName+'</span></p>'
462 462
	             		add+='<p class="briefinfor">简介:'+data.data[i].supportedServices+'</p>'
463 463
	        			add+='</div>'
464 464
	        			$("#sharescrollbox").append(add);
@ -716,7 +716,7 @@ var resou;
716 716
				+  $data[i].assessTime.substr(8,2)+ ":" + $data[i].assessTime.substr(10,2);
717 717
				add+='<div class="evaluate">'
718 718
                	add+='<div class="lefteva">'
719
                      add+='<a  class="evaimg">'
719
                      add+='<a  class="evaimg headRadius">'
720 720
                    if($data[i].professor.hasHeadImage) {
721 721
                    	add+='<img src="/images/head/'+$data[i].professor.id+'_m.jpg" width="100%" height="100%">'
722 722
                    }else{
@ -758,7 +758,7 @@ var resou;
758 758
                      add+='</div>'
759 759
                add+='</div>'
760 760
                	var $add=$(add);
761
                $(".shareabout").append($add);
761
                $(".shareabout2").append($add);
762 762
                 $add.find(".evastar:lt("+$data[i].assessStar+")").addClass('staspan');     
763 763
               }
764 764
			}

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

@ -1119,7 +1119,7 @@ getProfessorData()
1119 1119
	                	add+='<a href=""><img src="/images/resource/'+data.data[i].resourceId+'.jpg" width="100%" height="100%" class="resouImage"></a>'
1120 1120
	                 	add+='<div class="shareopeart"></div>'
1121 1121
	             		add+='</div>'	             
1122
	             		add+='<p>资源名称:<span class="presou">'+ data.data[i].resourceName+'</span></p>'
1122
	             		add+='<p class="restit">资源名称:<span class="presou">'+ data.data[i].resourceName+'</span></p>'
1123 1123
	             		if(data.data[i].descp==undefined){
1124 1124
	             			data.data[i].descp="";
1125 1125
	             		}

+ 1 - 1
src/main/webapp/js/login-phone-find01.js

@ -62,7 +62,7 @@
62 62
	    var clickTime = new Date().getTime();
63 63
	    var Timer = setInterval(function(){
64 64
	        var nowTime = new Date().getTime();
65
	        var second  = Math.ceil(120-(nowTime-clickTime)/1000);
65
	        var second  = Math.ceil(60-(nowTime-clickTime)/1000);
66 66
	        if(second>0){
67 67
	        	$('.gainon').val(second+"s后重新获取");
68 68
	        }else{

+ 34 - 36
src/main/webapp/js/popup.js

@ -18,7 +18,7 @@ function ResourceInfo() {
18 18
		
19 19
		PopHtml += '<tr class="workmsgbox"><th></th><td><div class="resouinforcon"><div class="workmsg workmsg1"></div></div></td></tr>  ';
20 20
		PopHtml += '<tr class="respublisher"><th class="resouinfotype"  scope="row">资源发布者</th><td><div class="resouinforcon" id="professor" ></div></td></tr>';
21
		PopHtml += '<tr><th class="resouinfotype"  scope="row">可提供服务</th><td><div class="resouinforcon"><input type="text" class="frmtype"  id="supportedServices"><span class="requiredcon">*</span></div></td></tr>';
21
		PopHtml += '<tr><th class="resouinfotype"  scope="row">应用用途</th><td><div class="resouinforcon"><input type="text" class="frmtype"  id="supportedServices"><span class="requiredcon">*</span></div></td></tr>';
22 22
		PopHtml += '<tr class="workmsgbox"><th></th><td><div class="resouinforcon"><div class="workmsg workmsg3"></div></div></td></tr>  ';
23 23
		PopHtml += '<tr><th class="resouinfotype"  scope="row">学术领域</th><td><div class="resouinforcon"><input type="text" class="frmtype subCla" id="subject"><input type="button" value="添加" class="addIndusry" id="subjectAdd"></div></td></tr>';
24 24
		PopHtml += '<tr><th></th><td><div class="addlist" id="SubjectList"></div></td></tr>'
@ -36,7 +36,7 @@ function ResourceInfo() {
36 36
		//PopHtml += '<div class="resouimg" >';
37 37
		//PopHtml += '<span class="resouup"><input type="file" name="file" id="resouup" >上传资源图片</span>';
38 38
		//PopHtml += '<div class="resouimgshow"><img width="100%" height="100%" src="" class="resouImage" /></div></div>';
39
		PopHtml += '<div id="uploader">';
39
		PopHtml += '<div id="uploader" style="border-radius: 6px;">';
40 40
		PopHtml += '<div id="fileList" class="uploader-list"></div>';
41 41
		PopHtml += '<div id="filePicker">选择图片</div></div>';
42 42
		PopHtml += '<span class="resouimgmsg">尺寸240*240,大小在5M以内,<br/>JPG、PNG格式</span>';
@ -51,7 +51,7 @@ function ResourceInfo() {
51 51
//		PopHtml += '<table class="teamworkbox">';
52 52
//		PopHtml += '<tr><td><div class="teamworktit">合作历史及评价</div></td></tr>';
53 53
//		PopHtml += '<tr><td><div class="teamwork">';
54
//		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>';
54
//		PopHtml += '<div class="lefteva"><a href="" class="evaimg headRadius"><img src="images/default-photo.jpg" width="100%" height="100%"></a><p>专家姓名</p><p>职称,职位</p><p>XXX学校,XXX机222222222222222构</p></div>';
55 55
//		PopHtml += '<div class="righteva">';
56 56
//        PopHtml += '<ul class="evasort"><li class="teamname"><span>XXXXXX资源的合作</span><span class="teamtime">2016-09-06</span></li></ul>';
57 57
//        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>';
@ -115,13 +115,13 @@ function ResourceInfo() {
115 115
			 resourceName();
116 116
		});
117 117

118
	//验证可提供服务	
118
	//验证应用用途	
119 119
		function supportedServices()
120 120
		{
121 121
			var code = $("#supportedServices").val();
122 122
			if(code.length==0||code==" ")
123 123
			{
124
				$(".workmsg3").text("可提供服务不能为空");
124
				$(".workmsg3").text("应用用途不能为空");
125 125
				supportedServicesPass= false;
126 126
			}
127 127
			else
@ -269,7 +269,7 @@ function ResourceMessage() {
269 269
	PopHtml += '</tr>';		
270 270
	PopHtml += '<tr class="workmsgbox"><th></th><td><div class="resouinforcon"><div class="workmsg workmsg1"></div></div></td></tr>  ';
271 271
	PopHtml += '<tr class="respublisher"><th class="resouinfotype"  scope="row">资源发布者</th><td><div class="resouinforcon" id="professor" ></div></td></tr>';
272
	PopHtml += '<tr><th class="resouinfotype"  scope="row">可提供服务</th><td><div class="resouinforcon"><span  id="supportedServices"></span></div></td></tr>';
272
	PopHtml += '<tr><th class="resouinfotype"  scope="row">应用用途</th><td><div class="resouinforcon"><span  id="supportedServices"></span></div></td></tr>';
273 273
	PopHtml += '<tr class="workmsgbox"><th></th><td><div class="resouinforcon"><div class="workmsg workmsg3"></div></div></td></tr>  ';
274 274
	PopHtml += '<tr><th class="resouinfotype"  scope="row">学术领域</th><td><div class="resouinforcon"><span   id="subject"></span></div></td></tr>';
275 275
	PopHtml += '<tr><th class="resouinfotype"  scope="row">应用行业</th><td><div class="resouinforcon"><span id="industry"></span></div></td></tr>'; 
@ -280,10 +280,10 @@ function ResourceMessage() {
280 280
	
281 281
	/////////////资源图片上传////////////////////
282 282
	//图像
283
	PopHtml +='<div class="resouimgbox floatL">';
283
	PopHtml +='<div class="resouimgbox floatL" style="width:240px;">';
284 284
	PopHtml += '<div class="resouinforcon">';
285 285
	PopHtml += '<div class="resouimg" >';
286
	PopHtml += '<div class="resouimgshow"><img width="100%" height="100%" src="" class="resouImage" /></div></div>';
286
	PopHtml += '<div class="resouimgshow" style="height:220px;width:220px;"><img width="100%" height="100%" src="" class="resouImage" /></div></div>';
287 287
	PopHtml += '</div></div>';
288 288
	PopHtml += '</div></form>';
289 289
	//关闭按钮
@ -413,7 +413,7 @@ function CommentInfo() {
413 413
		PopHtml += '<div class="commentbox"><table class="commentcon"id="commbox">';
414 414
		//双方都评价
415 415
//		PopHtml += '<tr><td> <div class="teamwork">';
416
//		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>';
416
//		PopHtml += '<div class="lefteva"> <a href="" class="evaimg headRadius"><img src="images/default-photo.jpg" width="100%" height="100%"></a><p>专家姓名</p><p>职称,职位</p><p>XXX学校,XXX机222222222222222构</p></div>';
417 417
//		PopHtml += '<div class="righteva">';
418 418
//        PopHtml += '<ul class="evasort"><li class="teamname"><span>XXXXXX资源的合作</span><span class="teamtime">2016-09-06</span></li></ul>';
419 419
//        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>';
@ -421,7 +421,7 @@ function CommentInfo() {
421 421
//        PopHtml += '</div></div>';
422 422
//        //对方未评价
423 423
//        PopHtml += '<tr><td> <div class="teamwork">';
424
//		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>';
424
//		PopHtml += '<div class="lefteva"> <a href="" class="evaimg headRadius"><img src="images/default-photo.jpg" width="100%" height="100%"></a><p>专家姓名</p><p>职称,职位</p><p>XXX学校,XXX机222222222222222构</p></div>';
425 425
//		PopHtml += '<div class="righteva"><div class="noconmment">对方还未评价</div></div>';
426 426
//		PopHtml += '</td></tr>  ';
427 427
		PopHtml += '</table></div> </div>'
@ -462,7 +462,7 @@ function GuestbookInfo() {
462 462
		PopHtml += '<div class="resouinforcon"><div class="wordlimit">字数限制为5~200个</div></div>';
463 463
		PopHtml += '<div class="addrebtn" style="text-align:right;"> <input type="button" value="留言" class="frmtype frmbtn"></div></div>';
464 464
		PopHtml += '<div class="guestcon"><div class="guestconitem">';
465
		PopHtml += '<div class="lefteva"> <a href="" class="evaimg"><img src="images/default-photo.jpg" width="100%" height="100%"></a> </div>';
465
		PopHtml += '<div class="lefteva"> <a href="" class="evaimg headRadius"><img src="images/default-photo.jpg" width="100%" height="100%"></a> </div>';
466 466
		PopHtml += ' <div class="righteva">';
467 467
		PopHtml += '<ul class="evasort"> <li class="guestname"><span>李四</span><span class="guesttime">2016-09-06 08:00</span></li></ul>';
468 468
		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>';
@ -680,7 +680,7 @@ function DetailInfo(){
680 680
		PopHtml += '<div class="resouinforcon"><div class="wordlimit">字数限制为5~200个</div></div>';
681 681
		PopHtml += '<div class="addrebtn" style="text-align:right;"> <input type="button" value="留言" class="frmtype frmbtn"></div></div>';
682 682
		PopHtml += '<div class="guestcon"><div class="guestconitem">';
683
		PopHtml += '<div class="lefteva"> <a href="" class="evaimg"><img src="images/default-photo.jpg" width="100%" height="100%"></a> </div>';
683
		PopHtml += '<div class="lefteva"> <a href="" class="evaimg headRadius"><img src="images/default-photo.jpg" width="100%" height="100%"></a> </div>';
684 684
		PopHtml += ' <div class="righteva">';
685 685
		PopHtml += '<ul class="evasort"> <li class="guestname"><span>李四</span><span class="guesttime">2016-09-06 08:00</span></li></ul>';
686 686
		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>';
@ -695,7 +695,7 @@ function DetailInfo(){
695 695
		PopHtml += '<div class="commentbox"><table class="commentcon">';
696 696
		//双方都评价
697 697
		PopHtml += '<tr><td> <div class="teamwork">';
698
		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>';
698
		PopHtml += '<div class="lefteva"> <a href="" class="evaimg headRadius"><img src="images/default-photo.jpg" width="100%" height="100%"></a><p>专家姓名</p><p>职称,职位</p><p>XXX学校,XXX机222222222222222构</p></div>';
699 699
		PopHtml += '<div class="righteva">';
700 700
        PopHtml += '<ul class="evasort"><li class="teamname"><span>XXXXXX资源的合作</span><span class="teamtime">2016-09-06</span></li></ul>';
701 701
        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>';
@ -703,11 +703,11 @@ function DetailInfo(){
703 703
        PopHtml += '</div></div>';
704 704
        //对方未评价
705 705
        PopHtml += '<tr><td> <div class="teamwork">';
706
		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>';
706
		PopHtml += '<div class="lefteva"> <a href="" class="evaimg headRadius"><img src="images/default-photo.jpg" width="100%" height="100%"></a><p>专家姓名</p><p>职称,职位</p><p>XXX学校,XXX机222222222222222构</p></div>';
707 707
		PopHtml += '<div class="righteva"><div class="noconmment">对方还未评价</div></div>';
708 708
		//您本人未评价
709 709
        PopHtml += '<tr><td> <div class="teamwork">';
710
		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>';
710
		PopHtml += '<div class="lefteva"> <a href="" class="evaimg headRadius"><img src="images/default-photo.jpg" width="100%" height="100%"></a><p>专家姓名</p><p>职称,职位</p><p>XXX学校,XXX机222222222222222构</p></div>';
711 711
		PopHtml += '<div class="righteva"><div class="noconmment">您还未进行评价,<a class="combtn">现在去评价!</a></div>';
712 712

713 713
		PopHtml += '</td></tr> </table></div> </div> ';
@ -748,32 +748,35 @@ function ConsultApply() {
748 748

749 749
		PopHtml += '<div class="consultleft floatL">';
750 750
		//专家头像
751
		PopHtml += '<div class="prohead"><img id="prohead"  width="100%" height="100%"></div>';
751
		PopHtml += '<div class="proheadbox">';
752
		PopHtml += '<div class="prohead headRadius"><img id="prohead"  width="100%" height="100%"></div>';
753
		PopHtml += '<div class="phh5" id="starLevel"><div class="evadegree floatL" style="margin-right:10px;">';
754
		PopHtml += '<div class="evastarbox2">';
755
   			PopHtml += '<span class="evastar2"></span>';
756
			PopHtml += '<span class="evastar2"></span>';
757
			PopHtml += '<span class="evastar2"></span>';
758
			PopHtml += '<span class="evastar2"></span>';
759
			PopHtml += '<span class="evastar2"></span>';
760
		PopHtml += '</div>';
761

762
		PopHtml += '已完成咨询<span id="byConsultConut" ></span>次</div>';
763
		PopHtml += '</div>';
764
			
765
		PopHtml += '</div>';
752 766
		//咨询类型菜单选择
753 767
		PopHtml += '<div class="consultmenu">';
754
		PopHtml += '<div class="menutit">请选择联系目的</div>';
768
		PopHtml += '<div class="menutit">请选择您的咨询类型</div>';
755 769
		PopHtml += '<ul class="menucon"><li>技术咨询</li><li>资源咨询</li><li>其他事务</li> </ul>';
756
		PopHtml += '<div class="pripolicy"><h3>隐私条款</h3><p>为使您的请求得到快速响应,您填写的信息可能被ta的助手或科袖工作人员查阅,所以请不要填写机密信息。</p></div>';
770
		PopHtml += '<div class="pripolicy"><h3>隐私条款</h3><p>为使您的请求得到快速响应,您填写的信息可能被的助手或科袖工作人员查阅,所以请不要填写机密信息。</p></div>';
757 771
        PopHtml += '</div></div>';
758 772

759 773
		PopHtml += ' <div class="consultright floatL">';
760 774
		//专家信息
761 775
		PopHtml += '<div class="probrief">';
762
		PopHtml += '<div class="proname"><a href="" class="name" id="professorName"></a><img class="modifyicon displayNone" id="proModify" src="images/rz.png" width="30"></div>';
776
		PopHtml += '<div class="proname"><a href="" class="name" id="professorName"></a><img class="modifyicon displayNone" id="proModify" src="images/onauth.png" width="18"></div>';
763 777
		PopHtml += '<div class="phh2" id="professorTitle"></div>';
764 778
		PopHtml += '<div class="phh4"><span id="profDepartment"> </span><span id="profOrganization" style="margin-left:5px;"></span></div>';
765 779
		PopHtml += '<div class="phh4" id="adress"><span id="profAdress"></span></div>';
766
		PopHtml += '<div class="phh4" id="starLevel"><div class="evadegree floatL" style="margin-right:10px;">';
767
		PopHtml += '<div class="evastarbox2">';
768
   			PopHtml += '<span class="evastar2"></span>';
769
			PopHtml += '<span class="evastar2"></span>';
770
			PopHtml += '<span class="evastar2"></span>';
771
			PopHtml += '<span class="evastar2"></span>';
772
			PopHtml += '<span class="evastar2"></span>';
773
			PopHtml += '</div>';
774
		PopHtml += '</div>';
775
PopHtml += '已完成咨询<span id="byConsultConut" ></span>次</div>';
776
		
777 780
		PopHtml += '</div>';
778 781
		//发送咨询主题与内容
779 782
		PopHtml += '<div class="sendmsg">';
@ -793,12 +796,7 @@ PopHtml += '已完成咨询<span id="byConsultConut" ></span>次</div>';
793 796
		//必须先将html添加到body,再设置Css样式
794 797
        $("body").prepend(PopHtml);
795 798
        $("body").css("position","fixed");
796
		//$("body").css({"overflow-y":"hidden","-ms-overflow-y":"hidden","-webkit-overflow-y":"hidden","-moz-overflow-y":"hidden"});
797
		/*$("#sendConsultBtn").on("click",function(){
798
			alert("444");
799
			//sendConsult();
800
			
801
		})*/;
799

802 800
        var _widht = $(".blackcover").width();
803 801
        var _height = $(".blackcover").height();
804 802
		var boxWidth = $(".consultapply").width();

+ 5 - 4
src/main/webapp/js/register.js

@ -64,7 +64,7 @@ function phoneVal(){
64 64
	   		        }
65 65
	    		}else{
66 66
	    			phonePass = false;
67
	    			$(".msgphone1").text("手机格式正确,请输入正确的手机号码");
67
	    			$(".msgphone1").text("手机格式有误,请输入正确的手机号码");
68 68
	    		}
69 69
	        }    
70 70
		},
@ -140,11 +140,11 @@ function removeEvent(obj,type,handler){
140 140
function doClick(){
141 141
    removeClass(btn,'getcodeon');
142 142
    addClass(btn,'getcodeoff');
143
    btn.innerHTML="120s后重新获取";
143
    btn.innerHTML="60s后重新获取";
144 144
    var clickTime = new Date().getTime();
145 145
    var Timer = setInterval(function(){
146 146
        var nowTime = new Date().getTime();
147
        var second  = Math.ceil(120-(nowTime-clickTime)/1000);
147
        var second  = Math.ceil(60-(nowTime-clickTime)/1000);
148 148
        if(second>0){
149 149
            btn.innerHTML = second+"s后重新获取";
150 150
        }else{
@ -228,7 +228,8 @@ function setPassword(){
228 228
			$(".msgphone4").text("");
229 229
			setpass = true;
230 230
		}else{
231
			$(".msgphone4").text("密码6到16位");
231
			//$(".msgphone4").text("密码6到16位");
232
			$(".msgphone4").text("密码由6-24 个字符组成,区分大小写");
232 233
		}
233 234
    }  
234 235
}

+ 29 - 8
src/main/webapp/js/search.js

@ -7,6 +7,24 @@ $(function(){
7 7
//	       $(".lookwho option[value='1']").attr("selected","selected");
8 8
	       $("#div_select").text("找资源");
9 9
	    }
10
	   
11
//	    var lookFor2 = 0;
12
//	    $("#lookFor2 ul li").on("click",function(){
13
//	    	lookFor2=$(this).index();
14
//	    	 console.log(lookFor2);
15
//	    });
16
//	  //enter绑定时间
17
//	    $("#lookFor2 #searchContent").keydown(function(e){
18
//	    	if(e.which==13) {
19
//	    		synContent(2);
20
//	    		synContent(1);		
21
//	    	 var searchContent = $("#searchContent").val();
22
//	    	   console.log(lookFor2);
23
//	    		location.href = "search.html?searchContent=" + encodeURI(searchContent)+"&lookFor=" + lookFor2;
24
//	    	}
25
//	    	
26
//	    })
27
	    
10 28
		var userid = $.cookie("userid");
11 29
		var  subject;
12 30
		var subb=$.trim(GetQueryString("subject"));
@ -33,7 +51,7 @@ $(function(){
33 51
							for(var i = 0 ; i < $data.data.data.length ; i++){
34 52
								//创建HTML标签  
35 53
								var dataHtml = "<div class='item'>";									
36
								dataHtml += "<a  class='infoi'  href='information-brow.html?professorId="+$data.data.data[i].id+"' ><div class='photo1'>"
54
								dataHtml += "<a  class='infoi'  href='information-brow.html?professorId="+$data.data.data[i].id+"' ><div class='photo1 headRadius'>"
37 55
								if($data.data.data[i].hasHeadImage) {
38 56
									dataHtml += "<img class='images' style='width:100%;'  src='/images/head/"+$data.data.data[i].id+"_l.jpg'/></div></a>";
39 57
								}
@ -41,7 +59,7 @@ $(function(){
41 59
									dataHtml += "<img class='images' style='width:100%;'  src='/images/default-photo.jpg'/></div></a>";
42 60
								}
43 61
								dataHtml += "<div class='synopsis'>";
44
								dataHtml += "<a href='information-brow.html?professorId="+$data.data.data[i].id+"' class='named'>";
62
								dataHtml += "<a href='javascript:void();' class='named'>";
45 63
								if(typeof($data.data.data[i].name) !== "undefined"){
46 64
									dataHtml += $data.data.data[i].name;
47 65
								}
@ -102,12 +120,15 @@ $(function(){
102 120
								)(i);
103 121
								//点击查看当前信息
104 122
								(function(i){
105
									$('.named').click(function()
123
									$('.synopsis').click(function()
106 124
								{
107 125
									if(userid==$data.data.data[i].id)
108
									{
109
										$(".named").attr("href","information.html");	
110
									}										
126
									{	
127
										location.href='information.html';
128
									}else{
129
										location.href='information-brow.html?professorId='+$data.data.data[i].id;
130
									}	
131
									
111 132
								})
112 133
								}
113 134
									
@ -150,9 +171,9 @@ $(function(){
150 171
 							for(var i=0;i<$da.length;i++)
151 172
 							{
152 173
 								var add='<div class="item">'
153
 			                    add+='<a class="resourcephoto" ><img src="" class="resourceImg remess" width="100%" height="100%" resourceId='+$da[i].resourceId+'></a>'
174
 			                    add+='<a class="resourcephoto bgRadius" ><img src="" class="resourceImg remess" width="100%" height="100%" resourceId='+$da[i].resourceId+'></a>'
154 175
 			                    add+='<div class="synopsis">' 			                  
155
 			                     add+='<div class="cousultName"><a class="resouname" href="">'+$da[i].resourceName+'</a></div>'
176
 			                     add+='<div class="cousultName"><a class="resouname" href="javascript:void();">'+$da[i].resourceName+'</a></div>'
156 177
 			                     if($da[i].professor.name){
157 178
 			                    	 add+='<div class="belongname">'+$da[i].professor.name+'<img class="modicon" src="images/onauth.png" width="14" ></div>'  
158 179
 			                    		  } 			                   

+ 7 - 7
src/main/webapp/js/workindex.js

@ -75,7 +75,7 @@ $(function(){
75 75
	$.ajax({		
76 76
		"url":"/ajax/operation/pqpro",
77 77
		"type":"get",
78
		"data":{"id":userid},
78
		"data":{"id":userid,"pageSize":4},
79 79
		"async": false,
80 80
		"success":function(data)
81 81
		{
@ -95,8 +95,8 @@ $(function(){
95 95
						{
96 96
							stringContent +='<div class="sharesrc replySide" resourId='+data.data.data[i].resource.resourceId+' operationStatus='+data.data.data[i].operationStatus+' operationId='+data.data.data[i].operationId+' dealPrice='+data.data.data[i].dealPrice+' flag=0>'
97 97
						}						
98
	                    stringContent +='<div class="shareshow"><img src="" width="100%" height="184"class="resourceImage"></div>'
99
	                    stringContent +='<p>资源名称:'+data.data.data[i].resource.resourceName+'</p>'
98
	                    stringContent +='<div class="shareshow"><img src="" width="186" height="186"class="resourceImage"></div>'
99
	                    stringContent +='<div class="shareshow"><p>资源名称:'+data.data.data[i].resource.resourceName+'</p>'
100 100
	                    if(userid==data.data.data[i].professor.id)
101 101
	                    	{
102 102
	                    	 stringContent +='<p>合作对象:'+data.data.data[i].resource.professor.name+'</p>'
@ -105,7 +105,7 @@ $(function(){
105 105
	                    	 stringContent +='<p>合作对象:'+data.data.data[i].professor.name+'</p>'
106 106
	                    }
107 107
		                stringContent +='<p>最新动态:</p>'
108
		                stringContent +='<p class="statuswork"></p>'
108
		                stringContent +='<p class="statuswork"></p></div>'
109 109
		                stringContent +='</div>'
110 110
		                var $stringContent=$(stringContent)
111 111
		                $(".sharesrcbox11").append($stringContent);
@ -749,7 +749,7 @@ $(function(){
749 749
	//最新回复中的发送
750 750
	$("#myFlatSendReplyBtn").bind("click",newReplySendFn);
751 751
	//点击最新咨询查看全部
752
	$("#lookAllConsult").click(function(){
752
	$("#lookAllConsult,#lookMyConsult").click(function(){
753 753
		$("#consultbtn").css({
754 754
			color:"#fff",
755 755
			background:"#f99550"
@ -829,7 +829,7 @@ $(function(){
829 829
						$("#wbcon1").append('<span id="wbcen">暂无最新咨询消息~~</span>').css("height",height);
830 830
						var oHeight=($("#wbcon1").height()-$("#wbcen").height())/2;
831 831
						var oWidth=($("#wbcon1").width()-$("#wbcen").width())/2;					
832
						$("#wbcen").css({"display":"inline-block","margin-top":oHeight,"margin-left":oWidth});						
832
						$("#wbcen").css({"color":"#999","display":"inline-block","margin-top":oHeight,"margin-left":oWidth});						
833 833
					}
834 834
					
835 835
				}
@ -890,7 +890,7 @@ $(function(){
890 890
							$("#wbcon2").append('<span id="wbcent">暂无最新回复消息~~</span>').css("height",height);
891 891
							var oHeight=($("#wbcon2").height()+40-$("#wbcent").height())/2;
892 892
							var oWidth=($("#wbcon2").width()-$("#wbcent").width())/2;					
893
							$("#wbcent").css({"display":"inline-block","margin-top":oHeight,"margin-left":oWidth});
893
							$("#wbcent").css({"color":"#999","display":"inline-block","margin-top":oHeight,"margin-left":oWidth});
894 894
					}
895 895
					
896 896
				}

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

@ -27,11 +27,12 @@
27 27
        </div>
28 28
        <!--已登录-->
29 29
        <div class="onlogin">
30
	        <div class="head-portrait">
30
        	<a class="myWorkspace" href="workspaces.html">我的工作台</a>
31
	        <div class="head-portrait headRadius">
31 32
	        	<img class="portrait-p" />
32 33
	            <div class="personal-infor">
33 34
	                <div class="triangleB"></div>
34
	                <div class="personal-box">
35
	                <div class="personal-box bgRadius">
35 36
	                    <!-- <a href="#"><span class="icon icon1"></span>我的主页</a> -->
36 37
	                    <a href="information.html"><span class="icon icon2"></span>修改资料</a>
37 38
	                    <a href="account-set.html"><span class="icon icon3"></span>账户设置</a>
@ -40,14 +41,13 @@
40 41
	                
41 42
	            </div>
42 43
	        </div>
43
	        <a class="myWorkspace" href="workspaces.html">我的工作台</a>
44 44
        </div>
45 45
	</div>
46 46
</div>
47 47
<div id="container">
48 48
	<div class="content">
49 49
		<div class="information-head">
50
			<div class="head-org"><img id="orgImage"></div>	
50
			<div class="head-org headRadius"><img id="orgImage"></div>	
51 51
			<div class="head-center">
52 52
				<div class="infor-browse">
53 53
					<a href="#" class="named">北京科技大学</a><a href="#" class="modify"></a>
@ -72,7 +72,7 @@
72 72
                <div class="menublock">
73 73
                    <div class="left-title" >相似机构</div>
74 74
                    <div class="similarblock">
75
                    	<a href="" class="evaimg"><img src="" width="100%" height="100%"></a>
75
                    	<a href="" class="evaimg headRadius"><img src="" width="100%" height="100%"></a>
76 76
                    	<div class="rightsim">
77 77
	                          <p>机构姓名</p>
78 78
	                          <p>北京</p>
@ -81,7 +81,7 @@
81 81
	                    </div>
82 82
                    </div>
83 83
                    <div class="similarblock">
84
                    	<a href="" class="evaimg"><img src="" width="100%" height="100%"></a>
84
                    	<a href="" class="evaimg headRadius"><img src="" width="100%" height="100%"></a>
85 85
                    	<div class="rightsim">
86 86
	                          <p>机构姓名</p>
87 87
	                          <p>北京</p>

+ 11 - 20
src/main/webapp/photo-set.html

@ -28,7 +28,7 @@
28 28
								<div id="fileList" class="uploader-list"></div>
29 29
								<div id="filePicker">选择图片</div>
30 30
						 </div>
31
						<span class="resouimgmsg">尺寸240*240,大小在5M以内,<br/>JPG、PNG格式</span> 
31
						<span class="resouimgmsg">尺寸240*240,大小在5M以内,JPG、PNG格式</span> 
32 32
                     </div>
33 33
                     <!---->
34 34
                     <!--选择图片尺寸-->
@ -53,19 +53,19 @@
53 53
                 <div class="photo-size">
54 54
                     <div class="wr" id="preview-pane">
55 55
                         <div class="preview-container">
56
                             <p>头像预览</p>
56
                             <p style="margin:10px 20px;">头像预览</p>
57 57
                             <div class="pre-1">
58 58
                                 <img  src="" class="jcrop-preview jcrop_preview_s" alt="" id="largeImage"/>
59 59
                             </div>
60
                             <p>200px*200px</p>
60
                             <p>160px*160px</p>
61 61
                             <div class="pre-2">
62 62
                                 <img src="" class="jcrop-preview jcrop_preview_s" alt="" id="middleImage"/>
63 63
                             </div>
64
                             <p>66px*66px</p>
64
                             <p>50px*50px</p>
65 65
                             <div class="pre-3">
66 66
                                 <img src="" class="jcrop-preview jcrop_preview_s" alt="" id="smallImage"/>
67 67
                             </div>
68
                             <p>30px*30px</p>
68
                             <p>26px*26px</p>
69 69
                         </div>
70 70
                     </div>
71 71
                 </div>
@ -74,21 +74,12 @@
74 74
	<input id="y" type="hidden"/>
75 75
	<input id="w" type="hidden"/>
76 76
	<input id="h" type="hidden"/>
77
             <div class="upload-file">
78
             	  <!--<div class="fl">
79
                    <div class="upbtn"><span class="plus">+</span>本地上传<input type="file" class="filebtn"  name="file" id="uploadInput" ></div>
80
                     <p>只支持JPG、PNG、GIF,大小不超过5M</p> 
81
                 </div>
82
                 <div class="fl">
83
                 	<button type="button" id="uploadBtn">UPLOAD</button>
84
                 </div>
85
                 -->
86
                 <div class="clear"></div>
87
             </div>
88
	<input type="button" value="保存" class="inputtxt inputtxtbtn save" id="saveImage" >
89
	<input type="button" value="取消" class="inputtxt inputtxtbtn  close" >
90
	<input type="button" value="返回" class="inputtxt inputtxtbtn " id="back">
91
	
77

78
    <div style="overflow:hidden; margin:10px 0; font-size:14px;">
79
		<input type="button" value="保存" class="inputtxt inputtxtbtn save" id="saveImage" >
80
		<input type="button" value="取消" class="inputtxt inputtxtbtn  close" >
81
		<input type="button" value="返回" class="inputtxt inputtxtbtn " id="back">
82
	</div>
92 83
  </div>
93 84
</div>
94 85
 

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

@ -29,11 +29,12 @@
29 29
	        </div>
30 30
        <!--已登录-->
31 31
        <div class="onlogin">
32
	        <div class="head-portrait">
32
        	<a class="myWorkspace" href="workspaces.html">我的工作台</a>
33
	        <div class="head-portrait headRadius">
33 34
	        	<img class="portrait-p" />
34 35
	            <div class="personal-infor">
35 36
	                <div class="triangleB"></div>
36
	                <div class="personal-box">
37
	                <div class="personal-box bgRadius">
37 38
	                    <!-- <a href="#"><span class="icon icon1"></span>我的主页</a> -->
38 39
	                    <a href="information.html"><span class="icon icon2"></span>修改资料</a>
39 40
	                    <a href="account-set.html"><span class="icon icon3"></span>账户设置</a>
@ -42,7 +43,6 @@
42 43
	                
43 44
	            </div>
44 45
	        </div>
45
	        <a class="myWorkspace" href="workspaces.html">我的工作台</a>
46 46
        </div>
47 47
	</div>
48 48
	
@ -51,7 +51,7 @@
51 51
	<div class="content">
52 52
        <div class="content-in">
53 53
                <div class="sear-search">
54
                	<div class="simuselect floatL">
54
                	<div class="simuselect floatL" id="lookFor2">
55 55
	                	<div class="ulbox lookwho" onclick="showmenu()" id="div_select">找专家</div> 
56 56
						<ul id="li_show" class="lishow"> 
57 57
						    <li><div onclick="selectThis('找专家')">找专家</div></li> 

+ 3 - 3
src/main/webapp/workindex.html

@ -9,7 +9,7 @@
9 9
            <div class="workblock">
10 10
                <div class="worksubblock floatL">
11 11
                    <div class=" workhs floatL">
12
                        <a class="workhead" ><img src=""class="imgProfess" width="100%" height="100%"></a>
12
                        <a class="workhead headRadius" ><img src=""class="imgProfess" width="100%" height="100%"></a>
13 13
                        <p class="workstat">已完成咨询<span id="allConsultCount"></span>次</p>
14 14
                        <p id="evastarbox"><span class="evastar2"></span><span class="evastar2"></span><span class="evastar2"></span><span class="evastar2"></span><span class="evastar2"></span></p>
15 15
                        <!-- <p class="workstat">合作<br><span>12</span>次</p> -->
@ -45,7 +45,7 @@
45 45
                    <div class="worktit">最新咨询<a class="worklinkbtn floatR" id="lookAllConsult">查看全部</a></div>
46 46
                    <div class="wbcon" id="wbcon1">
47 47
                        <div class="leftwb floatL">
48
                            <a href="" class="wbimg"><img src="" width="100%" height="100%" id="proImage"></a>
48
                            <a href="" class="wbimg headRadius"><img src="" width="100%" height="100%" id="proImage"></a>
49 49
                            <p id="myFlatProName">专家姓名</p>
50 50
                            <p id="myFlatProTitle"><span id="myReplyProOffice"></span><span id="myReplyProTitle"></span></p>
51 51
                            <p id="myFlatProDepartment"><span id="myReplyProDepartment"></span><span id="myReplyProOrgName"></p>
@ -70,7 +70,7 @@
70 70
                    <div class="worktit">最新回复<a class="worklinkbtn floatR" id="lookAllReply">查看全部</a></div>
71 71
                    <div class="wbcon" id="wbcon2">
72 72
                        <div class="leftwb floatL">
73
                            <a href="" class="wbimg"><img src="" width="100%" height="100%" id="proreplayImage"></a>
73
                            <a href="" class="wbimg headRadius"><img src="" width="100%" height="100%" id="proreplayImage"></a>
74 74
                            <p id="myFlatReplyProName">专家姓名</p>
75 75
                            <p id="myFlatReplyProTitle"><span id="myProOffice"></span><span id="myProTitle"></span></p>
76 76
                            <p id="myFlatReplyProDepartment"><span id="myProDepartment"></span><span id="myProOrgName"></p>

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

@ -39,20 +39,19 @@
39 39
        </div>
40 40
        <!--已登录-->
41 41
        <div class="onlogin">
42
        	<a class="myWorkspace" href="workspaces.html">我的工作台</a>
42 43
	        <div class="head-portrait">
43
	        	<img class="portrait-p" />
44
	        	<img class="portrait-p headRadius" />
44 45
	            <div class="personal-infor">
45 46
	                <div class="triangleB"></div>
46
	                <div class="personal-box">
47
	                <div class="personal-box bgRadius">
47 48
	                    <!-- <a href="#"><span class="icon icon1"></span>我的主页</a> -->
48 49
	                    <a href="information.html"><span class="icon icon2"></span>修改资料</a>
49 50
	                    <a href="account-set.html"><span class="icon icon3"></span>账户设置</a>
50 51
	                    <a href="#" onClick="exit()"><span class="icon icon4"></span>退出登录</a>
51
	                </div>
52
	                
52
	                </div>              
53 53
	            </div>
54 54
	        </div>
55
	        <a class="myWorkspace" href="workspaces.html">我的工作台</a>
56 55
        </div>
57 56
	</div>
58 57
</div>