Browse Source

修改咨询按钮为联系
弹窗式登录
发现模块中栏目顺序的更换

luyanan 7 years ago
parent
commit
fe778e0393

+ 1 - 4
articalShow.html

@ -196,6 +196,7 @@
196 196
<script type="text/javascript" src="js/scrollfix.js"></script>
197 197
<script type="text/javascript" src="js/weixinshare/qrcode.min.js"></script>
198 198
<script type="text/javascript" src="js/articalShow.js"></script>
199
<script type="text/javascript" src="js/quickLogin.js"></script>
199 200
<script type="text/javascript">
200 201
	$(function() {
201 202
//		$('.upTop').click(function(){$('html,body').animate({scrollTop: '0px'}, 800);}); //置顶
@ -215,10 +216,6 @@
215 216
		}
216 217
		makeCode();
217 218
	});
218
	//留言分享操作栏	
219
		
220
		
221
	
222 219

223 220
	
224 221
</script>

+ 0 - 287
cmp-portal/js/companybrowinfor.js

@ -1,287 +0,0 @@
1
$(document).ready(function() {
2
	var id = GetQueryString("orgId");
3
	var oComDescp,oComIndustry,oComSubject,oComQualification,oComUser;
4
	loginStatus();//判断个人是否登录
5
	$(document).scroll(function(){
6
			var top3 = $(window).height();
7
			var top5 = $(".content-left").height();
8
			var top4 = $("#container").height();
9
			var top1 = $(document).scrollTop();
10
			var top2 = $("#container").height() - top3 + (top3 - 80 - top5) - 10; //变成绝对定位	
11
			if(top1 >= 300) {
12
				$(".content-left").css({
13
					"position": "fixed",
14
					"top": "80px"
15
				});
16
				if(top1 >= top2) {
17
					$('.information-content').css("position", "static");
18
					$(".content-left").css("position", "absolute");
19
					$(".content-left").css("top", top4 - top5 - 10 + "px");
20
				} else {
21
					$('.information-content').css("position", "relative");
22
					$(".content-left").css({
23
						"position": "fixed",
24
						"top": "80px"
25
					});
26
				}
27
			} else {
28
				$(".content-left").css({
29
					"position": "static"
30
				});
31
			}
32
	})
33
	/*企业信息*/
34
	function companyInformation() {
35
		$.ajax({
36
			url: "/ajax/org/" + id,
37
			type: "GET",
38
			timeout: 10000,
39
			dataType: "json",
40
			beforeSend: function() {},
41
			success: function(data, textState) {
42
				if(data.success) {
43
					var $data = data.data;
44
					var companytitle = $data.name + "-科袖网";
45
					window.setTimeout(function() {
46
						document.title = companytitle;
47
					}, 500);
48

49
					$("#comName").text($data.name);
50
					if($data.authStatus == 3) {
51
						$("#authS").addClass("authicon-com-ok").attr("title", "认证企业");
52
					} 
53
					/*else {
54
						$("#authS").addClass("authicon-com-no").attr("title", "未认证企业");
55
					}*/
56
					if($data.hasOrgLogo) {
57
						$("#oimg").attr("src", "/images/org/" + $data.id + ".jpg");
58
					} else {
59
						$("#oimg").attr("src", "images/default-icon.jpg");
60
					}
61
					if($data.orgUrl) {
62
						$("#inteAddress").text($data.orgUrl);
63
					} else {
64
						$("#inteAddress").text("");
65
					}
66
					if($data.foundTime) {
67
						var oTime = timeGeshi($data.foundTime);
68
						$("#createTime").text(oTime);
69
					} else {
70
						$("#createTime").remove();
71
					}
72
					if($data.city) {
73
						$("#ocity").text($data.city);
74
					}
75
					if($data.descp) {
76
						$(".editbox").text($data.descp);
77
					} else {
78
						oComDescp=0;
79
						$("span:contains('企业简介')").parents(".introduction").hide();
80
						$("a:contains('企业简介')").hide();
81
					}
82
					if($data.orgSize) {
83
						switch($data.orgSize) {
84
							case '1':
85
								$("#qualificationList").text("50人以内")
86
								break;
87
							case '2':
88
								$("#qualificationList").text("50-100人")
89
								break;
90
							case '3':
91
								$("#qualificationList").text("100-200人")
92
								break;
93
							case '4':
94
								$("#qualificationList").text("200-500人")
95
								break;
96
							case '5':
97
								$("#qualificationList").text("500-1000人")
98
								break;
99
							case '6':
100
								$("#qualificationList").text("1000人以上")
101
								break;
102
							default:
103
								break;
104
						}
105
					} else {
106
						$("#qualificationList").remove();
107
					}
108
					if($data.orgType) {
109
						switch($data.orgType) {
110
							case '2':
111
								$("#orgType").text("国有企业");
112
								break;
113
							case '3':
114
								$("#orgType").text("上市企业");
115
								break;
116
							case '4':
117
								$("#orgType").text("合资企业");
118
								break;
119
							case '5':
120
								$("#orgType").text("私人企业");
121
								break;
122
							case '6':
123
								$("#orgType").text("外资企业");
124
								break;
125
							case '7':
126
								$("#orgType").text("初创企业");
127
								break;
128
							default:
129
								break;
130
						}
131
					}else{
132
						$("#orgType").remove();
133
					}
134
					if($data.industry) {
135
						indu($data.industry, '#industryShow')
136
					} else {
137
						oComIndustry=0;
138
						$("span:contains('所属行业')").parents(".introduction").hide();
139
						$("a:contains('所属行业')").hide();
140
					}
141
					if($data.subject) {
142
						indu($data.subject, '#subjectShow')
143
					} else {
144
						oComSubject=0;
145
						$("span:contains('专注领域')").parents(".introduction").hide();
146
						$("a:contains('专注领域')").hide();
147
					}
148
					if($data.qualification) {
149
						indu($data.qualification, '#qiye ')
150
					} else {
151
						oComQualification=0;
152
						$("span:contains('企业资质')").parents(".introduction").hide();
153
						$("a:contains('企业资质')").hide();
154
					}
155
				}
156
			},
157
			error: function(XMLHttpRequest, textStats, errorThrown) {
158
				$.MsgBox.Alert('提示', '服务器请求失败')
159
			}
160
		})
161
	}
162
	/*时间格式转换*/
163
	function timeGeshi(otm) {
164
		var otme = otm.substring(0, 4) + "-" + otm.substring(4, 6) + "-" + otm.substring(6, 8);
165
		return otme;
166
	}
167
	/*应用行业及领域及企业纸质*/
168
	function indu(oString, oSelector) {
169
		var arr = oString.split(",");
170
		var oArr = new Array();
171
		var i;
172
		for(i in arr) {
173
			if(oSelector == "#subjectShow") {
174
				oArr.push('<div class="acad">' + arr[i] + '</div>');
175
			} else {
176
				oArr.push('<li>' + arr[i] + '</li>');
177
			}
178
		}
179
		$(oSelector).html(oArr.join(""));
180
	}
181
	/*获取所有的企业用户*/
182
	function companyUser() {
183
		$.ajax({
184
			url: "/ajax/professor/qaOrgAuth",
185
			type: "GET",
186
			timeout: 10000,
187
			dataType: "json",
188
			data: {
189
				"orgId": id,
190
				orgAuth:1
191
			},
192
			beforeSend: function() {},
193
			success: function(data, textState) {
194
				if(data.success) {
195
					var $info = data.data;
196
					if($info.length==0){
197
						$("span:contains('企业用户')").parents(".introduction").hide();
198
						$("a:contains('企业用户')").hide();
199
						oComUser=0;
200
						if(oComDescp==0&&oComIndustry==0&&oComSubject==0&&oComQualification==0&&oComUser==0){
201
							$("div:contains('企业信息')").parents(".content-left").hide();
202
						}
203
					}
204
					userHtml($info);
205
				}
206
			},
207
			error: function(XMLHttpRequest, textStats, errorThrown) {
208
				$.MsgBox.Alert('提示', '服务器请求失败')
209
			}
210
		})
211
	}
212
	/*填充企业下用户*/
213
	function userHtml(arr) {
214
		for(var i = 0; i < arr.length; i++) {
215
			var tiof = "",
216
				img;
217
			if(arr[i].hasHeadImage) {
218
				img = "/images/head/" + arr[i].id + "_l.jpg";
219
			} else {
220
				img = "images/default-photo.jpg"
221
			}
222
			if(arr[i].title) {
223
				if(arr[i].office) {
224
					tiof = arr[i].title + " ," + arr[i].office;
225
				} else {
226
					tiof = arr[i].title;
227
				}
228
			} else {
229
				if(arr[i].office) {
230
					tiof = arr[i].office;
231
				}
232
			}
233
			var oString = '<dd>'
234
			oString += '<div class="staffChild">'
235
			oString += '<img class="userRadius" src="' + img + '" width="100%" data-id="'+arr[i].id+'" style="cursor:pointer"/>'
236
			oString += '</div><div class="h4Font"><span>' + arr[i].name + '</span></div>'
237
			oString += '<div class="h4Font">' + tiof + '</div></dd>'
238
			$("#userList").append(oString);
239
		}
240
	}
241
	companyInformation();
242
	companyUser();
243
	/*企业文章*/
244
	$.ajax({
245
		url: "/ajax/article/qaOrgPublish",
246
		dataType: 'json', //数据格式类型
247
		type: 'GET', //http请求类型
248
		data: {
249
			"orgId": id
250
		},
251
		timeout: 10000, //超时设置
252
		success: function(data) {
253
			if(data.success) {
254
				if(data.data.length==0){
255
					$("span:contains('科研文章')").parents(".introduction").hide();
256
				}
257
					for(var i = 0; i < data.data.length; i++) {
258
						var add = '<li><a href="articalShow.html?articleId=' + data.data[i].articleId +'" style="display:block;">'
259
						add += '<div class="art_topicBox"><div class="art_img" style=""></div>'
260
						add += '<div class="art_tbox"><h6 id="artical_topic" >' + data.data[i].articleTitle + '</h6></div>'
261
						add += '</div><div class="tagsBox"><span></span></div>'
262
						add += '</a></li>';
263
						$add = $(add);
264
						$("#reachArticle").append($add);
265
						$add.find('.tagsBox span').text(data.data[i].subject); //data.data[i].subject
266
						if(data.data[i].articleImg) {
267
							$add.find(".art_img").attr("style", "background: url(/data/article/" + data.data[i].articleImg + ") center center no-repeat;background-size:cover;");
268
						}
269

270
					}
271
					//资源轮播
272
					var $content2 = $(".sharescrollbox.Acrollbox");
273
					var childcount2 = $content2.find(".otherRes.shareshow li").length;
274
					Carousel(3, 3, 3, childcount2, $content2, $(".articalbtn.resounext"), $(".articalbtn.resouprev"));
275
			}
276
		},
277
		error: function() {
278
			return;
279
		}
280
	});
281
	/*点击企业员工头像跳转个人浏览页面*/
282
	$("#userList").on("click","img",function(){
283
		var dataId=$(this).attr("data-id");
284
		console.log(dataId)
285
		location.href="information-brow.html?professorId="+dataId;
286
	})
287
}) 

+ 2 - 2
cmpInforShow.html

@ -9,7 +9,6 @@
9 9
<link rel="shortcut icon" type="image/x-icon" href="images/favicon.png" media="screen" />
10 10
<link href="css/bootstrap.min.css" rel="stylesheet">
11 11
<link type="text/css" href="css/common.css" rel="stylesheet">
12
<!--<link type="text/css" href="css/popup.css" rel="stylesheet">-->
13 12
<link type="text/css" href="css/genindex.css" rel="stylesheet">
14 13
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
15 14
</head>
@ -29,7 +28,7 @@
29 28
						<img class="boxBlockimg" src="" id="proHead" />
30 29
					</div>
31 30
				</div>
32
                <div class="reInfoBlock">
31
                <div class="reInfoBlock" style="padding-left: 230px;">
33 32
                	<div class="h1Font"><span id="proName"></span><em class="authiconNew" id="proAuth"></em></div>
34 33
                	<div class="h2Font ellipsisSty"><span id="proTit"></span> <span id="proOther"></span></div>
35 34
                	<div class="operateBlock bottomShow">
@ -260,6 +259,7 @@
260 259
<script type="text/javascript" src="js/jquery.page.js"></script>
261 260
<script type="text/javascript" src="js/common.js"></script>
262 261
<script type="text/javascript" src="js/cmpInforShow.js"></script>
262
<script type="text/javascript" src="js/quickLogin.js"></script>
263 263
<script>
264 264
	//微信分享
265 265
	var qrcode = new QRCode(document.getElementById("qrcode"), {

+ 6 - 32
css/common.css

@ -77,7 +77,6 @@ textarea.frmtype{line-height:20px;padding:6px 8px;min-height:100px;}
77 77
.frmtype:focus{ border:1px solid #ff8500;box-shadow: none;outline:none}
78 78
.frmbtn{ width:100px; margin:10px; background:#ff9900; color:#fff; border:none; }
79 79
.frmrbtn{ background:none; color:#303030; border:none; }
80
.updownbtn{text-decoration:underline; color:#333;}
81 80

82 81
body{height:auto;position: relative;min-height: 100%;}
83 82
input{ outline:none;}
@ -90,22 +89,6 @@ input{ outline:none;}
90 89

91 90
/*主体部分*/
92 91
.contentBody{width:1050px;height:auto; margin:10px auto; padding:80px 0 2px 0; }
93
/*产品下载  */
94
.appstore{width:1000px;color: #696969;text-align: center;margin:90px auto 30px;position:relative;}
95
.kexiu_logo{margin: 0 20px; position: relative;text-align: left;}
96
.kexiu_logo img{ width:300px;}
97
.appstoreBody{margin:8% 0;}
98
.appstore .computer-image {width:700px;height:510px; background: url(../images/download_windows.png) center center no-repeat;background-size:100% 100%;}
99
.appstore .subhead{font-size: 16px;line-height: 40px;color: #888;}
100
.downloadBox{}
101
.downloadBtn{position:relative;display: inline-block;vertical-align: middle;margin:30px auto 10px;overflow:hidden;}
102
.downloadBtn .download-btn {position: relative;margin: 20px 10px;border: 1px solid #999;border-radius: 6px;padding: 10px 30px;color: #666;line-height: 46px;font-size: 16px;display: block;width: 240px;height: 70px;}
103
.downloadBtn .download-btn:hover{ background:#f3f3f3;}
104
.downloadBtn .download-btn .app-android-icon, .downloadBtn .download-btn .app-ios-icon {float: left;display: block;width: 39px;height: 47px;margin-right: 10px;background: url(../images/app-icons.png) no-repeat;}
105
.downloadBtn .download-btn .app-android-icon { background-position: 0 -60px;}
106
.appcodeBox{ text-align:center;}
107
.appcodeBox .app_code{width:240px; height:240px; margin:10px 20px 0;}
108

109 92

110 93
/*------------------------------------------------------------------------------------*/
111 94

@ -128,18 +111,6 @@ input{ outline:none;}
128 111
.authicon-staff-no{width:44px;height:16px;background-image:url(../images/porfile_icon_yuangong_nor.png);background-size: cover;}/*企业未认证员工*/
129 112
.authicon-real{width: 24px;height:16px;background-image:url(../images/porfile_icon_shimin_nor.png);background-size: cover;}/*实名认证用户*/
130 113

131
/*/////////// 专家认证图标 //////////////*/
132
.authobject{ float:left;}
133

134
/*//////////专家身份认证状态////////////*/
135
/*已认证*/
136
.authword{ padding:2px 6px; margin-left:6px;border-radius:4px; color: #FFFFFF; font-size: 12px;}
137
.authed{ background: #FF9900; }
138
/*认证中*/
139
.authing{background: #03CE30;}
140
/*未认证*/
141
.unauth{background: #efefef;color: #CCCCCC;}
142

143 114
/***********************缺省页面*******************/
144 115
.nodatatip{width:40%;margin:100px auto;overflow:hidden;height:100px; font-size:16px; text-align:center;color:#aaa;}
145 116
.nodatabox{/*width:100%;*//*height: 100%;*/padding:40px; margin:20px auto;text-align: center;}
@ -151,10 +122,10 @@ input{ outline:none;}
151 122
.nodatabox .keyword{font-size:22px; padding:0 6px;color:#555555;}
152 123
/***********************缺省页面*******************/
153 124

154
.ResImgBox{display: inline-block;text-align: center;max-width:100px;width:100px;height:100px;background:#FAFAFA;border:1px solid #F8F8F8;overflow: hidden;padding:2px;border-radius:4px;}
125
/*.ResImgBox{display: inline-block;text-align: center;max-width:100px;width:100px;height:100px;background:#FAFAFA;border:1px solid #F8F8F8;overflow: hidden;padding:2px;border-radius:4px;}
155 126
.ResImgBox .resImg{max-width: 100%;max-height: 100%;vertical-align: middle;position: relative;}
156 127
.ResImgBox:before {content: ' ';display: inline-block;vertical-align: middle;width: 0;height: 100%;overflow: hidden;margin-left: 0px;}
157
.beforMargin:before{margin-left:-4px;}
128
.beforMargin:before{margin-left:-4px;}*/
158 129
/*图片在容器中无变形居中显示*//*display: table;table-layout: fixed;*/
159 130
.boxBlock{width:140px; height:140px;display: table-cell;vertical-align:middle; text-align:center;overflow: hidden;}
160 131
.boxBlockimg{max-width: 100%;max-height: 100%;vertical-align:middle;height:auto !important; overflow-y:auto;}
@ -217,7 +188,10 @@ header .headuser{overflow: hidden;border:1px solid #E5E5E5; width: 42px;height:
217 188
header .headuser img{max-width: 40px;max-height: 100%;vertical-align:middle;height:auto !important; overflow-y:auto;}
218 189
header .headnavbtn{margin:14px 6px;}
219 190
header .headnavbtn a{color:#666;font-size:15px;}
220
header .headnavbtn li{float:right;margin:0 6px;}
191
header .headnavbtn li{float:left;margin:0 6px;}
192
header .headnavbtn li.mymessage{padding:0 20px;cursor: pointer;}
193
header .headnavbtn li.mymessage>a{position:relative;}
194
header .headnavbtn li.mymessage>a>.badge{position:relative;right:12%;top:-10px;background:#FF0000;}
221 195
header .headnavbtn .teyaologin{padding:4px 20px;border-radius:6px;margin-right:16px;}
222 196
header .navbtn{width: 18px;height:20px;cursor: pointer; padding:10px 18px;background-position:center;background-repeat:no-repeat;}
223 197
header .navnews{background-image: url(../images/nav_button_news_nor.png);background-size:contain;}

+ 20 - 17
css/genindex.css

@ -243,7 +243,7 @@ ul.filterUl.filterUlactive{height:auto;}
243 243
ul.filterUl>li{float:left;margin:0 5px 4px;padding:0 10px;cursor: pointer;color:#999;border:1px solid transparent;}
244 244
ul.filterUl>li.filterCurrent{border-color:#e1e1e1;border-radius: 20px;color:#ff9900;}
245 245
246
.listdiv{margin-bottom:20px;overflow: hidden;}
246
.listdiv{overflow: hidden;}
247 247
.listdiv .searchCon{background: #FFFFFF;overflow: hidden;margin-top:20px;}
248 248
.listdiv ul.listitemdiv{background: #FFFFFF;position: relative;min-height:300px;}
249 249
ul.listitemdiv li{position:relative;min-height:132px;padding:15px 20px;}
@ -252,7 +252,7 @@ ul.listitemdiv li:after{content: "";position: absolute;left: 0;right: 0;bottom:
252 252
ul.listitemdiv li a.linkhref{display: block;width: 100%;}
253 253
ul.listitemdiv li .lefthead{width: 164px;height: 110px;margin-top:-55px;position:absolute;top:50%;overflow: hidden;background-size: cover;background-position: center;/*border:1px solid #e5e5e5;*/}
254 254
ul.listitemdiv li .userheadt{width: 100px;height:100px;margin-top:-50px;background-image: url(../images/default-photo.jpg);}
255
ul.listitemdiv li .centercon{padding-left:120px;padding-right:200px;}
255
ul.listitemdiv li .centercon{padding-left:120px;padding-right:20px;}
256 256
ul.listitemdiv li .centercon .h1font{font-size: 16px;line-height: 28px; color:#333;}
257 257
ul.listitemdiv li .centercon .h2font{font-size: 14px;line-height: 24px; color:#666;}
258 258
ul.listitemdiv li .centercon .showInfo>span{margin-right:20px}
@ -342,6 +342,8 @@ ul.artAbout .frmadd{width:auto;position:absolute;right:0;top:0;background: #ff99
342 342
.form-item .madiaHead.useHead{background-image: url(../images/default-photo.jpg);border-radius: 50%;}
343 343
.form-item .madiaHead.cmpHead{background:#FFFFFF;border-radius:0;}
344 344
.form-item .madiaHead.cmpHead .boxBlock{width:118px;height:80px;}
345
.form-item .madiaHead.cmpHead2{width:50px;height:34px;margin-top:-17px}
346
.form-item .madiaHead.cmpHead .boxBlock{width:50px;height:34px;}
345 347
.form-item .madiaHead.resouseHead{background-image: url(../images/default-resource.jpg);border-radius:0;}
346 348
.form-item .madiaHead.paperHead{background-image: url(../images/default-paper.jpg);border-radius:0;}
347 349
.form-item .madiaHead.patentHead{background-image: url(../images/default-patent.jpg);border-radius:0;}
@ -349,7 +351,7 @@ ul.artAbout .frmadd{width:auto;position:absolute;right:0;top:0;background: #ff99
349 351
.form-item .madiaInfo{width:100%;padding-left:62px;margin:2px 0;}
350 352
.form-item ul .h1Font{font-size:16px;color:#333;line-height: 20px;margin-bottom:4px;}
351 353
.form-item ul .h2Font,.form-item ol .h2Font{font-size:14px;color:#666;line-height: 22px;}
352
.form-item ul .time{font-size:14px;/*color:#666;*/line-height: 22px;}
354
.form-item ul .time{font-size:14px;color:#666;line-height: 22px;}
353 355
.form-item ul .h3Font{font-size:13px;color:#999;line-height:20px;}
354 356
.form-item ul .circlePre{display: inline-block;content:"";width:5px;height: 5px;border-radius: 50%;background:#ff9900;position: relative;top:-3px;margin-right:5px;}
355 357
.form-drop>ul>li{position:relative;min-height:76px;padding:12px;cursor:pointer;background: #FFFFFF;}
@ -620,22 +622,22 @@ div.zoomMask{position:absolute;background:url("../images/g-resource-mask.png") r
620 622
.workmenu{text-align: center;float: left;width:12%;background: #fff;}
621 623
.workmenu>ul>li>a{display: inline-block;width: 100%;height:52px;line-height: 52px;color:#666;font-size:16px;background-size:18px 18px;background-position:14px center;background-repeat: no-repeat;}
622 624
.workmenu>ul>li:nth-child(1)>a{background-image:url(../images/g_article_icon_gongzuotai_nor.png);}
623
.workmenu>ul>li:nth-child(2)>a{background-image:url(../images/g_article_icon_zixun_nor.png);}
624
.workmenu>ul>li:nth-child(3)>a{background-image:url(../images/g_article_icon_xuqiu_nor.png);}
625
.workmenu>ul>li:nth-child(4)>a{background-image:url(../images/g_article_icon_ziyuan_nor.png);}
626
.workmenu>ul>li:nth-child(5)>a{background-image:url(../images/g_article_icon_zhuanli_nor.png);}
627
.workmenu>ul>li:nth-child(6)>a{background-image:url(../images/g_article_icon_lunwen_nor.png);}
628
.workmenu>ul>li:nth-child(7)>a{background-image:url(../images/g_article_icon_wenzhang_nor.png);}
625
.workmenu>ul>li.zixunIcon>a{background-image:url(../images/g_article_icon_zixun_nor.png);}
626
.workmenu>ul>li.demandIcon>a{background-image:url(../images/g_article_icon_xuqiu_nor.png);}
627
.workmenu>ul>li.resIcon>a{background-image:url(../images/g_article_icon_ziyuan_nor.png);}
628
.workmenu>ul>li.patentIcon>a{background-image:url(../images/g_article_icon_zhuanli_nor.png);}
629
.workmenu>ul>li.paperIcon>a{background-image:url(../images/g_article_icon_lunwen_nor.png);}
630
.workmenu>ul>li.artIcon>a{background-image:url(../images/g_article_icon_wenzhang_nor.png);}
629 631
.workmenu>ul>li>a:hover{background-color: #f0f0f0;}
630 632
.workmenu>ul>li:first-child>a:hover{background-color: #fff;}
631 633
.workmenu>ul>.nowLi>a{background-color:  #f7eee1;color:#ff9900;}
632 634
.workmenu>ul>li.nowLi:nth-child(1)>a{background-image:url(../images/g_article_icon_gongzuotai_hig.png);}
633
.workmenu>ul>li.nowLi:nth-child(2)>a{background-image:url(../images/g_article_icon_zixun_hig.png);}
634
.workmenu>ul>li.nowLi:nth-child(3)>a{background-image:url(../images/g_article_icon_xuqiu_hig.png);}
635
.workmenu>ul>li.nowLi:nth-child(4)>a{background-image:url(../images/g_article_icon_ziyuan_hig.png);}
636
.workmenu>ul>li.nowLi:nth-child(5)>a{background-image:url(../images/g_article_icon_zhuanli_hig.png);}
637
.workmenu>ul>li.nowLi:nth-child(6)>a{background-image:url(../images/g_article_icon_lunwen_hig.png);}
638
.workmenu>ul>li.nowLi:nth-child(7)>a{background-image:url(../images/g_article_icon_wenzhang_hig.png);}
635
.workmenu>ul>li.zixunIcon.nowLi>a{background-image:url(../images/g_article_icon_zixun_hig.png);}
636
.workmenu>ul>li.demandIcon.nowLi>a{background-image:url(../images/g_article_icon_xuqiu_hig.png);}
637
.workmenu>ul>li.resIcon.nowLi>a{background-image:url(../images/g_article_icon_ziyuan_hig.png);}
638
.workmenu>ul>li.patentIcon.nowLi>a{background-image:url(../images/g_article_icon_zhuanli_hig.png);}
639
.workmenu>ul>li.paperIcon.nowLi>a{background-image:url(../images/g_article_icon_lunwen_hig.png);}
640
.workmenu>ul>li.artIcon.nowLi>a{background-image:url(../images/g_article_icon_wenzhang_hig.png);}
639 641
640 642
.workmenu>ul>.nowLi>a:hover{background-color: #f7eee1;}
641 643
.conBlock .workconG{float:right;position:relative;width:87%;background: #FFFFFF;margin-bottom:20px;}
@ -681,8 +683,9 @@ div.zoomMask{position:absolute;background:url("../images/g-resource-mask.png") r
681 683
.headconBox{padding:30px;min-height:200px;background: #fff;position: relative;margin-bottom: 20px;}
682 684
.bottomShow .shareCode{bottom:auto;top:30px;}
683 685
.bottomShow .shareCode:after{border:12px solid transparent;border-bottom-color:rgba(0,0,0,.6);top:-24px;left:22px;bottom:auto;}
684
.headconBox .headimgBox{width: 142px;height: 142px;position:absolute;overflow:hidden;border:1px solid #E5E5E5;border-radius:50%;background-image:url(../images/default-photo.jpg);background-size: cover;top: 50%;margin-top: -71px;}
685
.headconBox .cmpimgBox{border-radius:0;background:#fff;}
686
.headconBox .headimgBox{width: 140px;height: 140px;position:absolute;overflow:hidden;border:1px solid #E5E5E5;border-radius:50%;background-image:url(../images/default-photo.jpg);background-size: cover;top: 50%;margin-top: -71px;}
687
.headconBox .cmpimgBox{width:210px;border-radius:0;background:#fff;}
688
.headconBox .cmpimgBox .boxBlock{width:210px;}
686 689
.headconBox .reInfoBlock{width:100%;padding-left:170px;}
687 690
.headconBox .reInfoBlock .h1Font{font-size: 18px;color:#666;margin-bottom:10px;}
688 691
.headconBox .reInfoBlock .h2Font{font-size: 16px;color:#666;margin-bottom:8px;}

+ 4 - 4
css/workspace.css

@ -141,7 +141,7 @@ body,html{background: #f4f6f8;}
141 141
.objectsrc{float:left;  width:28%; margin:10px 20px;  height:120px; border-radius:4px; background:#fbeed5; /*border:1px dashed #e5e5e5;*/ padding:30px 10px; cursor:pointer; }
142 142
.objectsrc:hover{ background:#F1D299;}
143 143
.objectsrc p{ line-height:24px; text-align:center;}
144
.objectsrc .objectstate{/* background:url(../images/progressing.png) 52px 2px no-repeat;*/}
144
.objectsrc .objectstate{}
145 145
146 146
.otherRes{padding:10px;margin-right:-12px;}
147 147
.otherRes li{ width: 202px;float:left;overflow: hidden;border: 1px solid #e4e5e7;margin:0 12px 12px 0;border-radius: 6px;cursor: pointer;}
@ -182,8 +182,8 @@ body,html{background: #f4f6f8;}
182 182
.workcurrent{ background:url(../images/selected.png) no-repeat 90% center #f7f7f7; }
183 183
184 184
.orderedbtn{ padding:1px 6px;  cursor:pointer; }
185
.orderedbtn div{width:20px; height:20px; background:url(../images/order.png) no-repeat 0 1px #ff9900 ; border-radius:4px;}
186
185
/*.orderedbtn div{width:20px; height:20px; background:url(../images/order.png) no-repeat 0 1px #ff9900 ; border-radius:4px;}
186
*/
187 187
.workselectcon{ padding:10px;}
188 188
.workselectitem{/*  overflow:hidden; */ margin:6px 0;padding: 0 10px; padding-left: 20px;}
189 189
.workselectitem:nth-child(odd){background:#F8F8F8;}
@ -233,7 +233,7 @@ body,html{background: #f4f6f8;}
233 233
.workobjcon{ overflow:hidden; background:#fff; min-height:600px; margin-top:10px; padding:20px;}
234 234
.workobjcon .objectsrc{ width:20%; height:200px; /*border:1px solid #e5e5e5;*/ }
235 235
.workobjcon .objectsrc div{ margin:20px 4px;}
236
.workobjcon .objectsrc .objectstate{/* background:url(../images/progressing.png) 40px 2px no-repeat; */margin:20px;}
236
.workobjcon .objectsrc .objectstate{}
237 237
.workobjcon .newobjects{ border:2px dashed #e5e5e5;background:#F5F5F5;}
238 238
.workobjcon .newobjects ul li{ float:left;}
239 239
.workobjcon .newobjects .newobjectbox{ margin: 10px 30px;}

+ 1 - 0
demandShow.html

@ -89,6 +89,7 @@
89 89
<script type="text/javascript" src="js/jquery.page.js"></script>
90 90
<script type="text/javascript" src="js/common.js"></script>
91 91
<script type="text/javascript" src="js/demandShow.js"></script>
92
<script type="text/javascript" src="js/quickLogin.js"></script>
92 93
<script type="text/javascript">
93 94
	//分享关注按钮
94 95
	$('.shareWeixin').hover(function(){$(this).find('.shareCode').stop(true,false).fadeToggle();});

+ 32 - 9
discover.html

@ -26,15 +26,15 @@
26 26
				<div class="table-box">
27 27
					<div class="table-tab">
28 28
						<ul class="table-tab-item clearfix">
29
							<li class="table-tab-slide table-tab-slide-active">最新文章</li>
30
							<li class="table-tab-slide">前沿动态</li>
31
							<li class="table-tab-slide">学术经验</li>
32
							<li class="table-tab-slide">分析检测</li>
33
							<li class="table-tab-slide">会议培训</li>
29
							<li class="table-tab-slide table-tab-slide-active" data-col="0">最新文章</li>
30
							<li class="table-tab-slide" data-col="3">前沿动态</li>
31
							<li class="table-tab-slide" data-col="4">学术经验</li>
32
							<li class="table-tab-slide" data-col="5">分析检测</li>
33
							<li class="table-tab-slide" data-col="7">科袖访谈</li>
34 34
							<li class="rightbtn"><span>更多栏目</span><em class="foldtr"></em>
35 35
								<ul class="table-drop">
36
									<li class="table-tab-slide">科袖访谈</li>
37
									<li class="table-tab-slide">招聘招生</li>
36
									<li class="table-tab-slide" data-col="6">会议培训</li>
37
									<li class="table-tab-slide" data-col="8">招聘招生</li>
38 38
								</ul>
39 39
							</li>
40 40
							
@ -59,11 +59,11 @@
59 59
								<div class="tcdPageCode"></div>
60 60
					    	</div>
61 61
					    	<div class="table-item-list">
62
					    		<ul class="listitemdiv listmorediv" id="table-item-4"></ul>
62
					    		<ul class="listitemdiv listmorediv" id="table-item-5"></ul>
63 63
								<div class="tcdPageCode"></div>
64 64
					    	</div>
65 65
					    	<div class="table-item-list">
66
					    		<ul class="listitemdiv listmorediv" id="table-item-5"></ul>
66
					    		<ul class="listitemdiv listmorediv" id="table-item-4"></ul>
67 67
								<div class="tcdPageCode"></div>
68 68
					    	</div>
69 69
					    	<div class="table-item-list">
@ -102,6 +102,9 @@
102 102
		</div>
103 103
	</div>
104 104
</div>
105
<div class="footer_tools">
106
  <a id="scrollUp" href="javascript:;" title="返回顶部"></a>
107
</div>
105 108
<footer>
106 109
	<script type="text/javascript" src="js/footer.js"></script>
107 110
</footer>
@ -111,5 +114,25 @@
111 114
<script type="text/javascript" src="js/jquery.page.js"></script>
112 115
<script type="text/javascript" src="js/common.js"></script>
113 116
<script type="text/javascript" src="js/discover.js"></script>
117
<script type="text/javascript">
118
$(function () {
119
	//回到顶部
120
	var $body = $(document.body);;
121
	var $bottomTools = $('.footer_tools');
122
	$(window).scroll(function () {
123
		var scrollHeight = $(document).height();
124
		var scrollTop = $(window).scrollTop();
125
		var $footerHeight = $('footer').outerHeight(true);
126
		var $windowHeight = $(window).innerHeight();
127
		scrollTop > 50 ? $("#scrollUp").fadeIn(200).css("display","block") : $("#scrollUp").fadeOut(200);			
128
		$bottomTools.css("bottom", scrollHeight - scrollTop - $footerHeight > $windowHeight ? 20 : $windowHeight + scrollTop + $footerHeight + 20 - scrollHeight);
129
	});
130
	$('#scrollUp').click(function (e) {
131
		e.preventDefault();
132
		$('html,body').animate({ scrollTop:0});
133
	});
134

135
});
136
</script>
114 137
</body>
115 138
</html>

+ 1 - 1
js/articalList.js

@ -1,6 +1,6 @@
1 1
/*文章个人列表*/
2 2
$(function() {
3
	$(".onlogin .headnavbtn li").eq(0).addClass("navcurrent");
3
	$(".onlogin .headnavbtn li.mywork").addClass("navcurrent");
4 4
	$(".workmenu>ul>li:contains('文章')").addClass("nowLi");
5 5
	loginStatus(); //判断个人是否登录
6 6
	valUser();

+ 12 - 52
js/articalShow.js

@ -590,19 +590,9 @@ $('.thumbBlock').on("click",".thunbgo",function(){
590 590
	if (userid && userid != "null" && userid != null) {
591 591
		addAgree();
592 592
	}else{
593
		$.MsgBox.Alert('提示',"请先登录再进行点赞");
594
		$("#mb_btn_ok").val("去登录");
595
		var aele = document.createElement('a');
596
		$("#mb_btnbox").append(aele);
597
		$("#mb_btnbox a").css({
598
			'display': "block",
599
			'width': '100%',
600
			'height': '40px',
601
			'position': 'absolute',
602
			'bottom': '-6px',
603
			'left': '0'
604
		});
605
		aele.setAttribute('href', '../login.html');
593
		quickLog();
594
		operatTab();
595
		closeLog();
606 596
	}
607 597
})
608 598

@ -666,19 +656,9 @@ $("#expert").on('click','.attenSpan',function(){
666 656
			collectionAbout($("#Zname").attr("dataid"),$(this), 1);
667 657
		}	
668 658
	}else{
669
		$.MsgBox.Alert('提示',"请先登录再进行关注");
670
		$("#mb_btn_ok").val("去登录");
671
		var aele = document.createElement('a');
672
		$("#mb_btnbox").append(aele);
673
		$("#mb_btnbox a").css({
674
			'display': "block",
675
			'width': '100%',
676
			'height': '40px',
677
			'position': 'absolute',
678
			'bottom': '-6px',
679
			'left': '0'
680
		});
681
		aele.setAttribute('href', '../login.html');
659
		quickLog();
660
		operatTab();
661
		closeLog();
682 662
	}
683 663
})
684 664
$("#enterprise").on('click','.attenSpan',function(){
@ -689,19 +669,9 @@ $("#enterprise").on('click','.attenSpan',function(){
689 669
			collectionAbout($("#Qname").attr("dataid"),$(this),6);
690 670
		}	
691 671
	}else{
692
		$.MsgBox.Alert('提示',"请先登录再进行关注");
693
		$("#mb_btn_ok").val("去登录");
694
		var aele = document.createElement('a');
695
		$("#mb_btnbox").append(aele);
696
		$("#mb_btnbox a").css({
697
			'display': "block",
698
			'width': '100%',
699
			'height': '40px',
700
			'position': 'absolute',
701
			'bottom': '-6px',
702
			'left': '0'
703
		});
704
		aele.setAttribute('href', '../login.html');
672
		quickLog();
673
		operatTab();
674
		closeLog();
705 675
	}
706 676
})
707 677
//点击文章收藏
@ -713,19 +683,9 @@ $('#attention').on("click","em",function(){
713 683
			collectionAbout(articleId,$(this),3)
714 684
		}	
715 685
	}else{
716
		$.MsgBox.Alert('提示',"请先登录再进行收藏");
717
		$("#mb_btn_ok").val("去登录");
718
		var aele = document.createElement('a');
719
		$("#mb_btnbox").append(aele);
720
		$("#mb_btnbox a").css({
721
			'display': "block",
722
			'width': '100%',
723
			'height': '40px',
724
			'position': 'absolute',
725
			'bottom': '-6px',
726
			'left': '0'
727
		});
728
		aele.setAttribute('href', '../login.html');
686
		quickLog();
687
		operatTab();
688
		closeLog();
729 689
	}
730 690
})
731 691


+ 6 - 16
js/cmpInforShow.js

@ -33,8 +33,7 @@ $(function() {
33 33
		$("#attendmyGo").on("click",function(){
34 34
			$(".mainNavUl li.rightbtn").addClass("liNow").siblings().removeClass("liNow");
35 35
			$(".navconBox .moreNav").show();
36
			$("#item1user").hide();
37
			$("#item7user").show();
36
			$("#item7user").show().siblings().hide();
38 37
			$(".moreNavUl li.attendMy").addClass("liNow").siblings().removeClass("liNow");
39 38
			$("#item7user>.coninfobox").eq(7).show().siblings().hide();
40 39
			attentMy();
@ -50,19 +49,9 @@ $(function() {
50 49
				guanzhuNum();
51 50
				attentMy();
52 51
			}else{
53
				$.MsgBox.Alert("提示", "请先登录再进行关注");
54
				$("#mb_btn_ok").val("去登录");
55
				var aele = document.createElement('a');
56
				$("#mb_btnbox").append(aele);
57
				$("#mb_btnbox a").css({
58
					'display': "block",
59
					'width': '100%',
60
					'height': '40px',
61
					'position': 'absolute',
62
					'bottom': '-6px',
63
					'left': '0'
64
				});
65
				aele.setAttribute('href', '../login.html');
52
				quickLog();
53
				operatTab();
54
				closeLog();
66 55
			}
67 56
		});	
68 57
@ -311,6 +300,7 @@ $(function() {
311 300
							if(data.data.data[i].articleImg) {
312 301
								madiaHead = '/data/article/' + data.data.data[i].articleImg;
313 302
							}
303
							var sowU=""
314 304
							if(data.data.data[i].pageViews!=0){
315 305
								if(data.data.data[i].articleAgree!=0){
316 306
									sowU='<li><span>阅读量 '+data.data.data[i].pageViews+'</span></li><li><span>赞 '+data.data.data[i].articleAgree+'</span></li>'
@ -564,7 +554,7 @@ $(function() {
564 554
				if (data.success && data.data!=""){
565 555
					$("#relateCmp").parents(".conBlock").removeClass("displayNone");
566 556
					var itemlist = '<li class="flexCenter"><a target="_blank" href="" class="urlgo">';
567
						itemlist += '<div class="madiaHead cmpHead" style="width:50px;height:36px;margin-top:-18px;"><div class="boxBlock" style="width: 50px;height: 36px;">';
557
						itemlist += '<div class="madiaHead cmpHead cmpHead2"><div class="boxBlock">';
568 558
						itemlist += '<img class="boxBlockimg" id="userimg" src="" /></div></div>';
569 559
						itemlist += '<div class="madiaInfo">';
570 560
						itemlist += '<p class="clearfix"><span class="h1Font ellipsisSty floatL" style="display:block;max-width:136px" id="userName"></span><em class="authiconNew floatL" title=""></em></p>';

+ 6 - 26
js/demandShow.js

@ -14,19 +14,9 @@ $(document).ready(function() {
14 14
				collectionAbout(demandId,$(this), 7);
15 15
			}
16 16
		} else {
17
			$.MsgBox.Alert('提示', "请先登录再进行收藏");
18
			$("#mb_btn_ok").val("去登录");
19
			var aele = document.createElement('a');
20
			$("#mb_btnbox").append(aele);
21
			$("#mb_btnbox a").css({
22
				'display': "block",
23
				'width': '100%',
24
				'height': '40px',
25
				'position': 'absolute',
26
				'bottom': '-6px',
27
				'left': '0'
28
			});
29
			aele.setAttribute('href', '../login.html');
17
			quickLog();
18
			operatTab();
19
			closeLog();
30 20
		}
31 21
	})
32 22
	//点击关注按钮
@ -39,19 +29,9 @@ $(document).ready(function() {
39 29
				collectionAbout(pId, $(this),1);
40 30
			}
41 31
		}else{
42
			$.MsgBox.Alert("提示", "请先登录再进行关注");
43
			$("#mb_btn_ok").val("去登录");
44
			var aele = document.createElement('a');
45
			$("#mb_btnbox").append(aele);
46
			$("#mb_btnbox a").css({
47
				'display': "block",
48
				'width': '100%',
49
				'height': '40px',
50
				'position': 'absolute',
51
				'bottom': '-6px',
52
				'left': '0'
53
			});
54
			aele.setAttribute('href', '../login.html');
32
			quickLog();
33
			operatTab();
34
			closeLog();
55 35
		}
56 36
	});
57 37
	$(".showStatus").on("click",".meSendBack",function(){

+ 2 - 1
js/discover.js

@ -58,6 +58,7 @@ $(function() {
58 58
	$(".table-tab-item").on("click","li",function(){
59 59
		if($(this).is('.table-tab-slide')){
60 60
			linkNum = $(this).index(".table-tab-slide");
61
			dataColNum=$(this).attr('data-col');
61 62
			$(".table-tab-slide").removeClass("table-tab-slide-active");
62 63
			$(this).addClass("table-tab-slide-active");
63 64
			$(".table-drop").fadeOut(1000);
@ -71,7 +72,7 @@ $(function() {
71 72
			if(linkNum==0){
72 73
				listShow(exculdeId2s,1,0,true);
73 74
			}else{
74
				var thisNum=linkNum+2;
75
				var thisNum=dataColNum;
75 76
				listShow(exculdeIds,1,thisNum,true);
76 77
			}
77 78
		}else{

+ 13 - 12
js/header.js

@ -19,10 +19,10 @@ var headerHtml = '';
19 19
					//未登录状态
20 20
					'<div class="unlogin floatR displayNone">'+
21 21
						'<ul class="headnavbtn floatR">'+
22
								'<li><a href="register.html">注册</a></li>'+
23
								'<li><a>|</a></li>'+
24
								'<li><a href="login.html">登录</a></li>'+
25 22
								'<li><a href="login.html?tel=1" class="teyaologin">特邀专家登录</a></li>'+
23
								'<li><a href="login.html">登录</a></li>'+
24
								'<li><a>|</a></li>'+
25
								'<li><a href="register.html">注册</a></li>'+
26 26
						'</ul>' +
27 27
					'</div>' +
28 28
					//已登录状态
@ -30,17 +30,18 @@ var headerHtml = '';
30 30
						'<div class="headuserimg floatR">'+
31 31
								'<div class="headuser userRadius"><img class="portrait-p" src="../images/default-photo.jpg" /></div>'+
32 32
								'<div class="comuserSelf displayNone">' +
33
		                '<div class="triangleB"></div>'+
34
		                '<div class="personal-box bgRadius">'+
35
		                	'<a href="" class="goMyInf"><span class="icon icon1"></span>我的主页</a>'+
36
		                    '<a href="information.html"><span class="icon icon2"></span>修改资料</a>'+
37
		                    '<a href="account-set.html"><span class="icon icon3"></span>账户设置</a>'+
38
		                    '<a href="javascript:;" onClick="exit()"><span class="icon icon4"></span>退出登录</a>'+
39
		                '</div> '+            
40
		           ' </div>' + 
33
					                '<div class="triangleB"></div>'+
34
					                '<div class="personal-box bgRadius">'+
35
					                	'<a href="" class="goMyInf"><span class="icon icon1"></span>我的主页</a>'+
36
					                    '<a href="information.html"><span class="icon icon2"></span>修改资料</a>'+
37
					                    '<a href="account-set.html"><span class="icon icon3"></span>账户设置</a>'+
38
					                    '<a href="javascript:;" onClick="exit()"><span class="icon icon4"></span>退出登录</a>'+
39
					                '</div> '+            
40
					           ' </div>' + 
41 41
						'</div>' +
42 42
						'<ul class="headnavbtn floatR">'+
43
								'<li><a href="myConsult.html">我的工作台</a></li>'+
43
								'<li class="mymessage"><a>消息<span class="badge">3</span></a></li>'+
44
								'<li class="mywork"><a href="myDemand.html">我的工作台</a></li>'+
44 45
						'</ul>' +
45 46
					'</div>' +
46 47
				'</div>' +

+ 1 - 1
js/myDemand.js

@ -1,5 +1,5 @@
1 1
$(document).ready(function() {
2
	$(".onlogin .headnavbtn li").eq(0).addClass("navcurrent");
2
	$(".onlogin .headnavbtn li.mywork").addClass("navcurrent");
3 3
	$(".workmenu>ul>li:contains('需求')").addClass("nowLi");
4 4
	loginStatus(); //判断个人是否登录
5 5
	valUser();

+ 1 - 1
js/needList.js

@ -1,5 +1,5 @@
1 1
$(document).ready(function() {
2
	$(".onlogin .headnavbtn li").eq(0).addClass("navcurrent");
2
	$(".onlogin .headnavbtn li.mywork").addClass("navcurrent");
3 3
	$(".workmenu>ul>li:contains('需求')").addClass("nowLi");
4 4
	loginStatus();//判断个人是否登录
5 5
	valUser();

+ 1 - 1
js/paperImport.js

@ -1,5 +1,5 @@
1 1
$(document).ready(function(){
2
	$(".onlogin .headnavbtn li").eq(0).addClass("navcurrent");
2
	$(".onlogin .headnavbtn li.mywork").addClass("navcurrent");
3 3
	$(".workmenu>ul>li:contains('论文')").addClass("nowLi");
4 4
	loginStatus(); //判断个人是否登录
5 5
	valUser();

+ 1 - 1
js/paperList.js

@ -1,5 +1,5 @@
1 1
$(document).ready(function(){
2
	$(".onlogin .headnavbtn li").eq(0).addClass("navcurrent");
2
	$(".onlogin .headnavbtn li.mywork").addClass("navcurrent");
3 3
	$(".workmenu>ul>li:contains('论文')").addClass("nowLi");
4 4
	loginStatus(); //判断个人是否登录
5 5
	valUser();

+ 9 - 39
js/paperShow.js

@ -21,19 +21,9 @@ $(document).ready(function() {
21 21
				collectionAbout(paperId,$(this), 5);
22 22
			}
23 23
		}else{
24
			$.MsgBox.Alert("提示", "请先登录再进行收藏");
25
			$("#mb_btn_ok").val("去登录");
26
			var aele = document.createElement('a');
27
			$("#mb_btnbox").append(aele);
28
			$("#mb_btnbox a").css({
29
				'display': "block",
30
				'width': '100%',
31
				'height': '40px',
32
				'position': 'absolute',
33
				'bottom': '-6px',
34
				'left': '0'
35
			});
36
			aele.setAttribute('href', '../login.html');
24
			quickLog();
25
			operatTab();
26
			closeLog();
37 27
		}
38 28
	});
39 29
	
@ -66,19 +56,9 @@ $(document).ready(function() {
66 56
				collectionAbout(pId,$(this),1);
67 57
			}
68 58
		}else{
69
			$.MsgBox.Alert("提示", "请先登录再进行关注");
70
			$("#mb_btn_ok").val("去登录");
71
			var aele = document.createElement('a');
72
			$("#mb_btnbox").append(aele);
73
			$("#mb_btnbox a").css({
74
				'display': "block",
75
				'width': '100%',
76
				'height': '40px',
77
				'position': 'absolute',
78
				'bottom': '-6px',
79
				'left': '0'
80
			});
81
			aele.setAttribute('href', '../login.html');
59
			quickLog();
60
			operatTab();
61
			closeLog();
82 62
		}
83 63
	});
84 64

@ -383,19 +363,9 @@ $('.thumbBlock').on("click",".thunbgo",function(){
383 363
	if (userid && userid != "null" && userid != null) {
384 364
		addAgree();
385 365
	}else{
386
		$.MsgBox.Alert('提示',"请先登录再进行点赞");
387
		$("#mb_btn_ok").val("去登录");
388
		var aele = document.createElement('a');
389
		$("#mb_btnbox").append(aele);
390
		$("#mb_btnbox a").css({
391
			'display': "block",
392
			'width': '100%',
393
			'height': '40px',
394
			'position': 'absolute',
395
			'bottom': '-6px',
396
			'left': '0'
397
		});
398
		aele.setAttribute('href', '../login.html');
366
		quickLog();
367
		operatTab();
368
		closeLog();
399 369
	}
400 370
})
401 371
/*点赞*/

+ 1 - 1
js/patentImport.js

@ -1,5 +1,5 @@
1 1
$(document).ready(function() {
2
	$(".onlogin .headnavbtn li").eq(0).addClass("navcurrent");
2
	$(".onlogin .headnavbtn li.mywork").addClass("navcurrent");
3 3
	$(".workmenu>ul>li:contains('专利')").addClass("nowLi");
4 4
	loginStatus(); //判断个人是否登录
5 5
	valUser();

+ 1 - 1
js/patentList.js

@ -1,5 +1,5 @@
1 1
$(document).ready(function(){
2
	$(".onlogin .headnavbtn li").eq(0).addClass("navcurrent");
2
	$(".onlogin .headnavbtn li.mywork").addClass("navcurrent");
3 3
	$(".workmenu>ul>li:contains('专利')").addClass("nowLi");
4 4
	loginStatus(); //判断个人是否登录
5 5
	valUser();

+ 9 - 39
js/patentShow.js

@ -273,19 +273,9 @@ $(document).ready(function() {
273 273
					collectionAbout(GetQueryString("patentId"),$(this), 4);
274 274
				}
275 275
			} else {
276
				$.MsgBox.Alert('提示', "请先登录再进行收藏");
277
				$("#mb_btn_ok").val("去登录");
278
				var aele = document.createElement('a');
279
				$("#mb_btnbox").append(aele);
280
				$("#mb_btnbox a").css({
281
					'display': "block",
282
					'width': '100%',
283
					'height': '40px',
284
					'position': 'absolute',
285
					'bottom': '-6px',
286
					'left': '0'
287
				});
288
				aele.setAttribute('href', '../login.html');
276
				quickLog();
277
				operatTab();
278
				closeLog();
289 279
			}
290 280
		})
291 281
		$("body").on("click", ".closeThis", function() {
@ -318,19 +308,9 @@ $(document).ready(function() {
318 308
					collectionAbout(pId, $(this),1);
319 309
				}
320 310
			}else{
321
				$.MsgBox.Alert("提示", "请先登录再进行关注");
322
				$("#mb_btn_ok").val("去登录");
323
				var aele = document.createElement('a');
324
				$("#mb_btnbox").append(aele);
325
				$("#mb_btnbox a").css({
326
					'display': "block",
327
					'width': '100%',
328
					'height': '40px',
329
					'position': 'absolute',
330
					'bottom': '-6px',
331
					'left': '0'
332
				});
333
				aele.setAttribute('href', '../login.html');
311
				quickLog();
312
				operatTab();
313
				closeLog();
334 314
			}
335 315
		});
336 316
						
@ -489,19 +469,9 @@ $('.thumbBlock').on("click",".thunbgo",function(){
489 469
	if (userid && userid != "null" && userid != null) {
490 470
		addAgree();
491 471
	}else{
492
		$.MsgBox.Alert('提示',"请先登录再进行点赞");
493
		$("#mb_btn_ok").val("去登录");
494
		var aele = document.createElement('a');
495
		$("#mb_btnbox").append(aele);
496
		$("#mb_btnbox a").css({
497
			'display': "block",
498
			'width': '100%',
499
			'height': '40px',
500
			'position': 'absolute',
501
			'bottom': '-6px',
502
			'left': '0'
503
		});
504
		aele.setAttribute('href', '../login.html');
472
		quickLog();
473
		operatTab();
474
		closeLog();
505 475
	}
506 476
})
507 477
/*点赞*/

+ 377 - 0
js/quickLogin.js

@ -0,0 +1,377 @@
1
function quickLog(){
2
	$("body").prepend('<div class="blackcover2" style="display:block;z-index:1080"></div>');
3
	var strCon=''
4
		strCon+='<div class="setTimeBlock modelContain cmpAllFrm" style="display:block;margin-top:-250px"><form style="padding:20px">'
5
		strCon+='<div style="margin:-20px -20px 10px;"><span class="mb_tit">登录科袖</span><a class="mb_close"></a></div>'
6
		strCon+='<ul class="loginWaySort">'
7
		strCon+='	<li class="col-w-4 liactive">密码登录</li>'
8
		strCon+='	<li class="col-w-4">短信登录</li>'
9
		strCon+='	<li class="col-w-4">邀请码登录</li>'
10
		strCon+='</ul>'
11
		strCon+='<div class="waysBlock">'
12
		strCon+=' <div class="loginWays">'
13
			strCon+='<ul class="cmpAllUl cmpCoverUl">'
14
				strCon+='<li><input type="text" class="frmtype frmtypeW username" placeholder="请输入手机或邮箱" onBlur="nameVal(this)" onfocus="getFocus(this)" onkeyup="checkLoginButtn(this)" />'
15
					strCon+='<div class="frmmsg msgLog1"><span></span></div></li>'
16
				strCon+='<li><input type="password" class="frmtype frmtypeW passwd" placeholder="请输入密码" onBlur="passwordVal(this)" onfocus="getFocus(this)"  onkeyup="checkLoginButtn(this)"/>'
17
					strCon+='<div class="frmmsg msgLog2"><span></span></div></li>'
18
				strCon+='<li><button type="button" class="frmtype frmtypeW btnModel save-block loginSubmit" disabled onclick="login(this,1)" >登录</button>'
19
					strCon+='<div class="frmmsg"><span></span></div></li>'
20
			strCon+='</ul>'
21
			strCon+='<ul class="cmpAllUl cmpCoverUl displayNone">'
22
				strCon+='<li><input type="phone" class="frmtype frmtypeW username phoneuser" placeholder="请输入手机号码" onBlur="phoneVal(this)" onfocus="getFocus(this)" onkeyup="checkLoginButtn(this)" />'
23
					strCon+='<div class="frmmsg msgLog1"><span></span></div></li>'
24
				strCon+='<li><div class="col-w-8"><input type="tel" class="frmtype frmtypeW passwd" style="width: 98%;" placeholder="请输入短信验证码" onblur="codeVerification(this)" onfocus="getFocus(this)" onkeyup="checkLoginButtn(this)" />'
25
					strCon+='<div class="frmmsg msgCmp03"><span></span></div></div>'
26
					strCon+='<div class="col-w-4"><button type="button"  class="frmtype frmtypeW btnModel" id="getcode" onclick="phoneSend(this)">获取验证码</button></div></li>'
27
				strCon+='<li><button type="button" disabled class="frmtype frmtypeW btnModel save-block loginSubmit"  disabled  onclick="login(this,3)">登录</button></li>'
28
			strCon+='</ul>'
29
			strCon+='<ul class="cmpAllUl cmpCoverUl displayNone">'
30
				strCon+='<li><input type="text" class="frmtype frmtypeW username" placeholder="请输入手机或邮箱" onBlur="nameVal(this)" onfocus="getFocus(this)" onkeyup="checkLoginButtn(this)"/>'
31
					strCon+='<div class="frmmsg msgLog1"><span></span></div></li>'
32
				strCon+='<li><input type="text" class="frmtype frmtypeW passwd" placeholder="请输入邀请码" onblur="codeVal(this)" onfocus="getFocus(this)" onkeyup="checkLoginButtn(this)" />'
33
					strCon+='<div class="frmmsg msgLog2"><span></span></div></li>'
34
				strCon+='<li><button type="button" disabled class="frmtype frmtypeW btnModel save-block loginSubmit"  disabled onclick="login(this,2)">登录</button></li>'
35
			strCon+='</ul>'
36
		strCon+='</div>'
37
		strCon+='<div class="clearfix" style="margin-top:-15px;">'
38
			strCon+='<a href="pwdFindNew.html" class="fontLink floatL">忘记密码?</a>'
39
			strCon+='<span class="floatR" style="color:#999">没有账号?<a href="register.html" class="fontLink">立即注册</a></span>'
40
		strCon+='</div></div>'
41
		strCon+='</form></div>'
42
	$("body").append(strCon)
43
}
44

45
function operatTab(){
46
	$(".loginWaySort").on("click", "li", function() {
47
		$(this).parents("#container").find("input").val("");
48
		$(this).parents("#container").find(".frmmsg span").text("");
49
		$(this).parents("#container").find("input").removeClass("frmmsg-warning");
50
		$(this).parents("#container").find(".loginSubmit").attr("disabled", true);
51
		$(this).addClass("liactive").siblings().removeClass("liactive");
52
		$(".loginWays ul").eq($(this).index()).removeClass("displayNone").siblings().addClass("displayNone");
53
	})
54
}
55
function closeLog(){
56
	$(".setTimeBlock").on("click",".mb_close",function(){
57
		$(".blackcover2").remove();
58
		$(this).parents(".modelContain.cmpAllFrm").remove();
59
	})
60
}
61

62
var namePass = false;
63
var passwordPass = false;
64
var codePass = false;
65
var verification = false;
66
var namePasstt = false;
67
/*校验登录按钮显示状态*/
68
function checkLoginButtn(_this) {
69
	var username = $(_this).parents(".cmpCoverUl").find(".username").val();
70
	var passwd = $(_this).parents(".cmpCoverUl").find(".passwd").val();
71
	if(username == "" || passwd == "") {
72
		$(_this).parents(".cmpCoverUl").find(".loginSubmit").attr("disabled", true);
73
	} else {
74
		$(_this).parents(".cmpCoverUl").find(".loginSubmit").attr("disabled", false);
75
	}
76
}
77

78
/*获取焦点*/
79
function getFocus(_this) {
80
	$(_this).next().find("span").text("");
81
	$(_this).removeClass("frmmsg-warning");
82
}
83

84
//校验登录手机和邮箱账户
85
function nameVal(_this) {
86
	var loginName = $(_this).val();
87
	var gunf = /^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/;
88
	var hunPhone = /^1[3|4|5|7|8]\d{9}$/;
89
	if(loginName.length == "") {
90
		$(_this).next().find("span").text("请输入您的手机或邮箱");
91
		$(_this).addClass("frmmsg-warning");
92
	} else if(gunf.test(loginName.trim())) {
93
		userRegisterOk(_this);
94
		$(_this).next().find("span").text("");
95
		$(_this).removeClass("frmmsg-warning");
96
		namePass = true;
97
	} else if(hunPhone.test(loginName.trim())) {
98
		userRegisterOk(_this);
99
		$(_this).next().find("span").text("");
100
		$(_this).removeClass("frmmsg-warning");
101
		namePass = true;
102
	} else {
103
		$(_this).next().find("span").text("请输入正确的手机或邮箱");
104
		$(_this).addClass("frmmsg-warning");
105
	}
106
}
107

108
//校验登录手机账户
109
function phoneVal(_this,org) {
110
	var loginName = $(_this).val();
111
	var hunPhone = /^1[3|4|5|7|8]\d{9}$/;
112
	if(loginName.length == "") {
113
		$(_this).next().find("span").text("请输入您的手机号码");
114
		$(_this).addClass("frmmsg-warning");
115
	} else if(hunPhone.test(loginName.trim())) {
116
		userRegisterOk(_this,org);
117
		$(_this).next().find("span").text("");
118
		$(_this).removeClass("frmmsg-warning");
119
		namePass = true;
120
	} else {
121
		$(_this).next().find("span").text("请输入正确的手机号码");
122
		$(_this).addClass("frmmsg-warning");
123
	}
124
}
125

126
//判断账号是否注册
127
function userRegisterOk(_this,org) {
128
	var loginName = $(_this).val();
129
	$.ajax("/ajax/isReg?key=" + loginName, {
130
		type: "GET",
131
		async: true,
132
		success: function($data) {
133
			if($data.data == true) {
134
				$(_this).next().find("span").text("该账号不存在,请检查后重试");
135
				$(_this).addClass("frmmsg-warning");
136
			} else {
137
				$(_this).next().find("span").text("");
138
				$(_this).removeClass("frmmsg-warning");
139
				if(org==1){
140
					doClick("#getcode");
141
					phoneVerificationCode("#getcode");
142
				}
143
			}
144
		},
145
		error: function() {
146
			$.MsgBox.Alert('消息', '服务器请求失败')
147
		},
148
	});
149
}
150

151
//校验登录密码
152
function passwordVal(_this) {
153
	var passwd = $(_this).val();
154
	if(passwd.length == "") {
155
		$(_this).next().find("span").text("请输入您的登录密码");
156
		$(_this).addClass("frmmsg-warning");
157
	} else if(passwd.length < 6) {
158
		$(_this).next().find("span").text("密码由6-24个字符组成,区分大小写");
159
		$(_this).addClass("frmmsg-warning");
160
	} else {
161
		$(_this).next().find("span").text("");
162
		$(_this).removeClass("frmmsg-warning");
163
		passwordPass = true;
164
	}
165
}
166

167
//验证短信验证码
168
function codeVerification(_this) {
169
	var code = $(_this).val();
170
	var reg = /^\d{4}$/;
171
	if(code.length == "") {
172
		$(_this).next().find("span").text("请输入您收到的短信验证码");
173
		$(_this).addClass("frmmsg-warning");
174
	} else if(!reg.test(code)) {
175
		$(_this).next().find("span").text("验证码为4位数字");
176
		$(_this).addClass("frmmsg-warning");
177
	} else {
178
		$(_this).next().find("span").text("");
179
		$(_this).removeClass("frmmsg-warning");
180
		verification = true;
181
	}
182
}
183

184
//手机发送验证码
185
function phoneSend(_this) {
186
	phoneVal(".phoneuser",1)
187
}
188

189
function doClick(_this) {
190
	$(_this).attr("disabled", true);
191
	$(_this).text("60s后重新获取");
192
	var clickTime = new Date().getTime();
193
	var Timer = setInterval(function() {
194
		var nowTime = new Date().getTime();
195
		var second = Math.ceil(60 - (nowTime - clickTime) / 1000);
196
		if(second > 0) {
197
			$(_this).text(second + "s后重新获取");
198
		} else {
199
			clearInterval(Timer);
200
			$(_this).text("获取验证码");
201
			$(_this).attr("disabled", false);
202
		}
203
	}, 1000);
204
}
205

206
//手机发送验证码结束
207
var state;
208

209
function phoneVerificationCode(_this) {
210
	var lp_phone = $(_this).parents(".cmpCoverUl").find(".username").val();
211
	$.ajax("/ajax/sendMobileForLogin", {
212
		type: "get",
213
		dataType: 'json',
214
		data: {
215
			"mobilePhone": lp_phone
216
		},
217
		async: true,
218
		success: function(data) {
219
			console.log(JSON.stringify(data))
220
			if(data.success) {
221
				state = data.data;
222
			}
223
		},
224
		error: function() {
225
			$.MsgBox.Alert('消息', '服务器请求失败')
226
		}
227
	});
228
};
229

230
//验证邀请码
231
function codeVal(_this) {
232
	var code = $(_this).val();
233
	var reg = /^\d{6}$/;
234
	if(code.length == "") {
235
		$(_this).next().find("span").text("请输入您收到的邀请码");
236
		$(_this).addClass("frmmsg-warning");
237
	} else if(!reg.test(code)) {
238
		$(_this).next().find("span").text("邀请码为6位数字");
239
		$(_this).addClass("frmmsg-warning");
240
	} else {
241
		$(_this).next().find("span").text("");
242
		$(_this).removeClass("frmmsg-warning");
243
		codePass = true;
244
	}
245
}
246

247
//判断用户第一次登录,是否填写了个人信息
248
function firstLogin() {
249
	var professorId = $.cookie('userid');
250
	$.ajax({
251
		"url": "ajax/professor/" + professorId,
252
		"type": "get",
253
		"async": false,
254
		"success": function(data) {
255
			console.log(data)
256
			if(data.success) {
257
				if(data.data.authentication || data.data.authentication===0){
258
					location.reload();
259
				}else{
260
					location.href = "fillinfo-select.html?id=" + professorId;	
261
				}
262
			}	
263
		},
264
		"error": function() {
265
			$.MsgBox.Alert('消息', '服务器请求失败')
266
		}
267
	})
268
}
269

270
//密码登录
271
function passwdLogin(_this) {
272
	var loginName = $(_this).parents(".cmpCoverUl").find(".username");
273
	var passwordd = $(_this).parents(".cmpCoverUl").find(".passwd");
274
	if(namePass && passwordPass) {
275
		$.ajax("/ajax/login", {
276
			type: "POST",
277
			data: {
278
				"pw": passwordd.val(),
279
				"lk": loginName.val()
280
			},
281
			dataType: 'json',
282
			async: false,
283
			success: function(data) {
284
				if(data.success) {
285
					if(data.data != "null" && data.data != null) {
286
						firstLogin();
287
					} else {
288
						$(_this).parents(".cmpCoverUl").find(".msgLog2 span").text("账号与密码不匹配,请检查后重试");
289
					}
290
				}
291
			},
292
			error: function() {
293
				$.MsgBox.Alert('消息', '服务器请求失败');
294
			}
295
		});
296
	}
297
}
298

299
//手机验证码登录
300
function VerificationLogin(_this) {
301
	var loginName = $(_this).parents(".cmpCoverUl").find(".username");
302
	var code = $(_this).parents(".cmpCoverUl").find(".passwd");
303
	if(namePass && verification) {
304
		$.ajax("/ajax/mobileLogin", {
305
			type: "POST",
306
			dataType: 'json',
307
			data: {
308
				"state": state,
309
				"mobilePhone": loginName.val(),
310
				"validateCode": code.val()
311
			},
312
			async: false,
313
			success: function(data) {
314
				console.log(data)
315
				if(data.success) {
316
					if(data.data != "null" && data.data != null) {
317
						firstLogin();
318
					}
319
				} else {
320
					if(data.code == -1) {
321
						$(_this).parents(".cmpCoverUl").find(".msgCmp03 span").text("验证码已过期,请重新获取");
322
					} else if(data.code == -3 || data.code == 0) {
323
						$(_this).parents(".cmpCoverUl").find(".msgCmp03 span").text("验证码错误,请检查后重试");
324
					}
325
				}
326
			},
327
			error: function() {
328
				$.MsgBox.Alert('消息', '服务器请求失败');
329
			},
330
		});
331
	}
332
}
333

334
//邀请码登录
335
function InvitationLogin(_this) {
336
	var loginName = $(_this).parents(".cmpCoverUl").find(".username");
337
	var code = $(_this).parents(".cmpCoverUl").find(".passwd");
338
	if(namePass && codePass) {
339
		$.ajax("/ajax/invitelogin", {
340
			type: "POST",
341
			dataType: 'json',
342
			data: {
343
				"code": code.val(),
344
				"key": loginName.val()
345
			},
346
			async: false,
347
			success: function(data) {
348
				 console.log(data)
349
				if(data.success) {
350
					if(data.data != "null" && data.data != null) {
351
						if(data.data.auth == true) {
352
							location.reload();
353
						} else {
354
							location.href = "loginInviteFirst.html";
355
						}
356
					} else {
357
						$(_this).parents(".cmpCoverUl").find(".msgLog2 span").text("邀请码错误,请检查后重试");
358
					}
359
				}
360
			},
361
			error: function() {
362
				$.MsgBox.Alert('消息', '服务器请求失败');
363
			},
364
		});
365
	}
366
}
367

368
//提交登录
369
function login(_this, num) {
370
	if(num == 1) {
371
		passwdLogin(_this);
372
	} else if(num == 2) {
373
		InvitationLogin(_this);
374
	} else if(num == 3) {
375
		VerificationLogin(_this);
376
	}
377
}

+ 1 - 1
js/resourceImport.js

@ -1,5 +1,5 @@
1 1
$(document).ready(function(){
2
	$(".onlogin .headnavbtn li").eq(0).addClass("navcurrent");
2
	$(".onlogin .headnavbtn li.mywork").addClass("navcurrent");
3 3
	$(".workmenu>ul>li:contains('资源')").addClass("nowLi");
4 4
	loginStatus(); //判断个人是否登录
5 5
	valUser();

+ 2 - 27
js/resourceList.js

@ -1,5 +1,5 @@
1 1
$(document).ready(function(){
2
	$(".onlogin .headnavbtn li").eq(0).addClass("navcurrent");
2
	$(".onlogin .headnavbtn li.mywork").addClass("navcurrent");
3 3
	$(".workmenu>ul>li:contains('资源')").addClass("nowLi");
4 4
	loginStatus(); //判断个人是否登录
5 5
	valUser();
@ -115,7 +115,7 @@ $(document).ready(function(){
115 115
						}
116 116
					},
117 117
					"data": {"resourceId":resourceId},
118
					"beforeSend": function() { /*console.log(this.data)*/ },
118
					"beforeSend": function() {  },
119 119
					"contentType": "application/x-www-form-urlencoded",
120 120
					dataType: "json"
121 121
				});
@ -134,29 +134,4 @@ $(document).ready(function(){
134 134
		$(".aboutRes").append('<div class="tcdPageCode"></div>');
135 135
		getRecourceMe(1,true);
136 136
	})
137
//	getProfessorData(userid);
138
//	function getProfessorData(professorId) {
139
//		$.ajax({
140
//			"url": "/ajax/professor/editBaseInfo/" + professorId,
141
//			"type": "get",
142
//			"async": true,
143
//			"success": function(data) {
144
//				if(data.success) {
145
//					var oAuthType=data.data.authType;
146
//					if(oAuthType==0){
147
//						$("a:contains('需求')").attr("href","myDemand.html");
148
//					}else if(oAuthType==1){
149
//						$("a:contains('需求')").attr("href","needList.html");
150
//					}
151
//					
152
//					
153
//				} else {
154
//					$.MsgBox.Alert("消息", "服务器连接失败");
155
//				}
156
//			},
157
//			"error": function() {
158
//				$.MsgBox.Alert('message', '服务器连接失败');
159
//			}
160
//		})
161
//	}
162 137
})

+ 0 - 45
js/resourcePreview.js

@ -72,9 +72,6 @@ $(document).ready(function() {
72 72
				$("#orgType").text($da.editProfessor.orgName);
73 73
			}
74 74
			professorId = $da.editProfessor.id;
75
			/*if(userid!=professorId) {
76
				$(".goSpan").show();
77
			}*/
78 75
			var professorFlag = autho($da.editProfessor.authType, $da.editProfessor.orgAuth, $da.editProfessor.authStatus);
79 76
			$("#authFlag").addClass(professorFlag.sty).attr("title", professorFlag.title);
80 77
			if($da.editProfessor.hasHeadImage == 1) {
@ -146,48 +143,6 @@ $(document).ready(function() {
146 143
		}
147 144

148 145
	}
149
	/*点击名字及头像跳转个人浏览页面*/
150
	$("#nameS,#headImg").click(function() {
151
		location.href = "userInforShow.html?professorId=" + professorId;
152
	})
153
	/*点击咨询*/
154
	$("#consultin").on("click", function() {
155
		clickResouceConsultHandler();
156
	});
157
	/*咨询函数*/
158
	function clickResouceConsultHandler() {
159
		if(userid && userid != "null" && userid != null) {
160
			ConsultApply();
161
			concultProInfo(professorId); //专家信息common.js中
162
			//默认选中资源咨询和标题
163
			for(var i = 0; i < $("ul.menucon").children().length; i++) {
164
				$("ul.menucon").children().eq(i).removeClass("clicknow");
165
				$("ul.menucon").children().eq(1).addClass("clicknow");
166
			}
167
			var consultTitleVal = $(".h2Font").text();
168
			$("#consultTitle").val("关于" + consultTitleVal + "的咨询");
169
			//点击的发送
170
			$("#sendConsultBtn").click(function() {
171
				sendConsultHandler(professorId); //common.js中
172
			});
173
		} else {
174

175
			$.MsgBox.Alert("消息提醒", "请先登录再进行咨询");
176
			$("#mb_btn_ok").val("去登录");
177
			var aele = document.createElement('a');
178
			$("#mb_btnbox").append(aele);
179
			$("#mb_btnbox a").css({
180
				'display': "block",
181
				'width': '100%',
182
				'height': '40px',
183
				'position': 'absolute',
184
				'bottom': '-6px',
185
				'left': '0'
186
			});
187
			aele.setAttribute('href', '../login.html');
188
		}
189

190
	};
191 146
	
192 147

193 148
	selUse();

+ 43 - 84
js/resourceShow.js

@ -410,52 +410,41 @@ $(document).ready(function() {
410 410
		location.href = "resourceShow.html?resourceId=" + $(this).attr("data-id");
411 411
	})
412 412
	/*点击咨询*/
413
	$("#consultin").on("click", function() {
414
		clickResouceConsultHandler();
415
	});
416
	$("#expertli").on("click", ".addbtn", function() {
417
		var $this = $(this);
418
		clickResouceConsultHandler($this);
419
	})
413
//	$("#consultin").on("click", function() {
414
//		clickResouceConsultHandler();
415
//	});
416
//	$("#expertli").on("click", ".addbtn", function() {
417
//		var $this = $(this);
418
//		clickResouceConsultHandler($this);
419
//	})
420 420
	/*咨询函数*/
421
	function clickResouceConsultHandler($this) {
422
		if(userid && userid != "null" && userid != null) {
423
			ConsultApply();
424
			if(!professorId) {
425
				concultProInfo($this.attr("data-id")); //专家信息common.js中
426
			} else {
427
				concultProInfo(professorId); //专家信息common.js中
428
			}
429

430
			//默认选中资源咨询和标题
431
			for(var i = 0; i < $("ul.menucon").children().length; i++) {
432
				$("ul.menucon").children().eq(i).removeClass("clicknow");
433
				$("ul.menucon").children().eq(1).addClass("clicknow");
434
			}
435
			var consultTitleVal = $("#resourceName").text();
436
			$("#consultTitle").val("关于" + consultTitleVal + "的咨询");
437
			//点击的发送
438
			$("#sendConsultBtn").click(function() {
439
				sendConsultHandler(professorId); //common.js中
440
			});
441
		} else {
442

443
			$.MsgBox.Alert("消息提醒", "请先登录再进行咨询");
444
			$("#mb_btn_ok").val("去登录");
445
			var aele = document.createElement('a');
446
			$("#mb_btnbox").append(aele);
447
			$("#mb_btnbox a").css({
448
				'display': "block",
449
				'width': '100%',
450
				'height': '40px',
451
				'position': 'absolute',
452
				'bottom': '-6px',
453
				'left': '0'
454
			});
455
			aele.setAttribute('href', '../login.html');
456
		}
457

458
	};
421
//	function clickResouceConsultHandler($this) {
422
//		if(userid && userid != "null" && userid != null) {
423
//			ConsultApply();
424
//			if(!professorId) {
425
//				concultProInfo($this.attr("data-id")); //专家信息common.js中
426
//			} else {
427
//				concultProInfo(professorId); //专家信息common.js中
428
//			}
429
//
430
//			//默认选中资源咨询和标题
431
//			for(var i = 0; i < $("ul.menucon").children().length; i++) {
432
//				$("ul.menucon").children().eq(i).removeClass("clicknow");
433
//				$("ul.menucon").children().eq(1).addClass("clicknow");
434
//			}
435
//			var consultTitleVal = $("#resourceName").text();
436
//			$("#consultTitle").val("关于" + consultTitleVal + "的咨询");
437
//			//点击的发送
438
//			$("#sendConsultBtn").click(function() {
439
//				sendConsultHandler(professorId); //common.js中
440
//			});
441
//		} else {
442
//			quickLog();
443
//			operatTab();
444
//			closeLog();
445
//		}
446
//
447
//	};
459 448
	//点击专家关注
460 449
	$("#person").on("click",'.attenSpan',function() {
461 450
		if(userid && userid != "null" && userid != null) {
@ -465,19 +454,9 @@ $(document).ready(function() {
465 454
				collectionAbout(professorId,$(this),1);
466 455
			}	
467 456
		} else {
468
			$.MsgBox.Alert('提示', "请先登录再进行关注");
469
			$("#mb_btn_ok").val("去登录");
470
			var aele = document.createElement('a');
471
			$("#mb_btnbox").append(aele);
472
			$("#mb_btnbox a").css({
473
				'display': "block",
474
				'width': '100%',
475
				'height': '40px',
476
				'position': 'absolute',
477
				'bottom': '-6px',
478
				'left': '0'
479
			});
480
			aele.setAttribute('href', '../login.html');
457
			quickLog();
458
			operatTab();
459
			closeLog();
481 460
		}
482 461
	})
483 462
	$("#enterprise").on("click",'.attenSpan',function() {
@ -488,19 +467,9 @@ $(document).ready(function() {
488 467
				collectionAbout($(".qiyego").attr('dataid'),$(this),6);
489 468
			}	
490 469
		} else {
491
			$.MsgBox.Alert('提示', "请先登录再进行关注");
492
			$("#mb_btn_ok").val("去登录");
493
			var aele = document.createElement('a');
494
			$("#mb_btnbox").append(aele);
495
			$("#mb_btnbox a").css({
496
				'display': "block",
497
				'width': '100%',
498
				'height': '40px',
499
				'position': 'absolute',
500
				'bottom': '-6px',
501
				'left': '0'
502
			});
503
			aele.setAttribute('href', '../login.html');
470
			quickLog();
471
			operatTab();
472
			closeLog();
504 473
		}
505 474
	})
506 475

@ -513,19 +482,9 @@ $(document).ready(function() {
513 482
				collectionAbout(resourceId,$(this),2)
514 483
			}
515 484
		} else {
516
			$.MsgBox.Alert('提示', "请先登录再进行收藏");
517
			$("#mb_btn_ok").val("去登录");
518
			var aele = document.createElement('a');
519
			$("#mb_btnbox").append(aele);
520
			$("#mb_btnbox a").css({
521
				'display': "block",
522
				'width': '100%',
523
				'height': '40px',
524
				'position': 'absolute',
525
				'bottom': '-6px',
526
				'left': '0'
527
			});
528
			aele.setAttribute('href', '../login.html');
485
			quickLog();
486
			operatTab();
487
			closeLog();
529 488
		}
530 489
	})
531 490


+ 33 - 32
js/searchNew.js

@ -69,7 +69,7 @@ $(function() {
69 69
	applicationIndustryVal();
70 70
	cityVal();
71 71
	//切换搜索范围
72
	jquerytab("col-w-12");
72
	jquerytab("searchWon");
73 73
	//筛选条件的选择
74 74
	$(".filterUl").on("click","li",function(){
75 75
		this.parentNode.querySelector('li.filterCurrent').classList.remove("filterCurrent");
@ -101,6 +101,7 @@ $(function() {
101 101
	$(".searchsome").keydown(function(e) {
102 102
		if(e.which == 13) {
103 103
			num = $(".liactive").attr("data-id");
104
			keyt =$(".searchsome").val()
104 105
			if(num==1){
105 106
				expertBox();
106 107
			}else if(num==2){
@ -284,32 +285,32 @@ $(function() {
284 285
		});
285 286
	}
286 287
	
287
	//专家点击咨询
288
	$('#expertList').on("click",".rightop",function(){
289
		if (userid && userid != "null" && userid != null) {
290
			var professorId = $(this).attr("id");
291
				ConsultApply();
292
				//点击的发送
293
				$("#sendConsultBtn").click(function() {
294
					sendConsultHandler($(this).attr("proId"))
295
				});
296
				concultProInfo(professorId);
297
		}else{
298
			$.MsgBox.Alert('提示',"请先登录再进行咨询");
299
			$("#mb_btn_ok").val("去登录");
300
			var aele = document.createElement('a');
301
			$("#mb_btnbox").append(aele);
302
			$("#mb_btnbox a").css({
303
				'display': "block",
304
				'width': '100%',
305
				'height': '40px',
306
				'position': 'absolute',
307
				'bottom': '-6px',
308
				'left': '0'
309
			});
310
			aele.setAttribute('href', '../login.html');
311
		}
312
	})
288
//	//专家点击咨询
289
//	$('#expertList').on("click",".rightop",function(){
290
//		if (userid && userid != "null" && userid != null) {
291
//			var professorId = $(this).attr("id");
292
//				ConsultApply();
293
//				//点击的发送
294
//				$("#sendConsultBtn").click(function() {
295
//					sendConsultHandler($(this).attr("proId"))
296
//				});
297
//				concultProInfo(professorId);
298
//		}else{
299
//			$.MsgBox.Alert('提示',"请先登录再进行咨询");
300
//			$("#mb_btn_ok").val("去登录");
301
//			var aele = document.createElement('a');
302
//			$("#mb_btnbox").append(aele);
303
//			$("#mb_btnbox a").css({
304
//				'display': "block",
305
//				'width': '100%',
306
//				'height': '40px',
307
//				'position': 'absolute',
308
//				'bottom': '-6px',
309
//				'left': '0'
310
//			});
311
//			aele.setAttribute('href', '../login.html');
312
//		}
313
//	})
313 314
	
314 315
	//专家
315 316
	function expertListVal(keyt,subject,industry,address,authType,pageSize,pageNo,isexpert) {
@ -345,17 +346,17 @@ $(function() {
345 346
							itemlist += '<em class="authiconNew" title="科袖认证专家"></em></p>';
346 347
							itemlist += '<p class="h2font ellipsisSty" id="ellipsisSty">职称/职位,所在机构</p>';
347 348
							itemlist += '<p class="h2font ellipsisSty" id="researchAreas"></p>';
348
							itemlist += '</div></a><span class="rightop" style="display:none"  id="">咨询</span>';
349
							itemlist += '</div></a>';//<span class="rightop" style="display:none"  id="">咨询</span>
349 350
							itemlist += '</li>';
350 351
							$itemlist = $(itemlist);
351 352
							$("#expertList").append($itemlist);
352 353
							var datalist = data.data.data[i];
353 354
							$itemlist.find(".expertUrl").attr("href", "userInforShow.html?professorId=" + datalist.id );
354 355
							$itemlist.find("#Name").text(datalist.name);
355
							$itemlist.find(".rightop").attr("id",datalist.id);
356
							if(datalist.id != userid){
357
								$itemlist.find(".rightop").show();
358
							}
356
//							$itemlist.find(".rightop").attr("id",datalist.id);
357
//							if(datalist.id != userid){
358
//								$itemlist.find(".rightop").show();
359
//							}
359 360
							var userType = autho(datalist.authType, datalist.orgAuth, datalist.authStatus);
360 361
							$itemlist.find(".authiconNew").attr("title", userType.title);
361 362
							$itemlist.find(".authiconNew").addClass(userType.sty);

+ 5 - 6
js/workMenu.js

@ -1,12 +1,11 @@
1 1
var Html = '';
2 2
	Html += '<ul>'+
3 3
	        	'<li><a>工作台</a></li>'+
4
	        	'<li><a href="javascript:;" id="gozixu">咨询</a></li>'+
5
	        	'<li><a href="myDemand.html">需求</a></li>'+
6
	        	'<li><a href="resourceList.html">资源</a></li>'+
7
	        	'<li><a href="patentList.html">专利</a></li>'+
8
	        	'<li><a href="paperList.html">文</a></li>'+
9
	        	'<li><a href="articalList.html">文章</a></li>'+
4
	        	'<li class="demandIcon"><a href="myDemand.html">需求</a></li>'+
5
	        	'<li class="resIcon"><a href="resourceList.html">资源</a></li>'+
6
	        	'<li class="patentIcon"><a href="patentList.html">专利</a></li>'+
7
	        	'<li class="paperIcon"><a href="paperList.html">论文</a></li>'+
8
	        	'<li class="artIcon"><a href="articalList.html">文</a></li>'+
10 9
	        '</ul>';
11 10
	
12 11
document.write(Html);

+ 0 - 2
myDemand.html

@ -10,8 +10,6 @@
10 10
<link type="text/css" rel="stylesheet" href="css/datetimepicker.css">
11 11
<link type="text/css" href="css/reset.css" rel="stylesheet" />
12 12
<link type="text/css" href="css/common.css" rel="stylesheet">
13
<!--<link type="text/css" href="css/workspace.css" rel="stylesheet">
14
<link type="text/css" href="css/popup.css" rel="stylesheet">-->
15 13
<link type="text/css" href="css/genindex.css" rel="stylesheet">
16 14
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
17 15
</head>

+ 1 - 0
paperShow.html

@ -158,6 +158,7 @@
158 158
<script type="text/javascript" src="js/jquery.page.js"></script>
159 159
<script type="text/javascript" src="js/common.js"></script>
160 160
<script type="text/javascript" src="js/paperShow.js"></script>
161
<script type="text/javascript" src="js/quickLogin.js"></script>
161 162
<script type="text/javascript">
162 163

163 164
	//分享关注按钮

+ 1 - 0
patentShow.html

@ -196,6 +196,7 @@
196 196
<script type="text/javascript" src="js/jquery.page.js"></script>
197 197
<script type="text/javascript" src="js/common.js"></script>
198 198
<script type="text/javascript" src="js/patentShow.js"></script>
199
<script type="text/javascript" src="js/quickLogin.js"></script>
199 200
<script type="text/javascript">
200 201

201 202
	//分享关注按钮

+ 0 - 4
resourcePreview.html

@ -106,10 +106,6 @@
106 106
						<p class="h2Font" id="titleOffice"></p>
107 107
						<p class="h2Font" id="orgType"></p>
108 108
					</div>
109
					<div class="goSpan" style="display:none">
110
						<span class="consultSpan" id="consultin">咨询</span>
111
						<span class="attenSpan">关注</span>
112
					</div>
113 109
				</div>
114 110
				<div class="conItem conItemG alignCenter displayNone" id="enterprise" style="border:none;padding:30px;">
115 111
					<a class="qiyego">

+ 3 - 2
resourceShow.html

@ -125,7 +125,7 @@
125 125
						<p class="h2Font" id="orgType"></p>
126 126
					</div>
127 127
					<div class="goSpan" style="display:none">
128
						<span class="consultSpan" id="consultin">咨询</span>
128
						<span class="consultSpan" id="consultin">联系</span>
129 129
						<span class="attenSpan">关注</span>
130 130
					</div>
131 131
					<div class="form-item otherBlock currentBlock displayNone">
@ -185,8 +185,9 @@
185 185
<script type="text/javascript" src="js/weixinshare/qrcode.min.js"></script>
186 186
<script type="text/javascript" src="js/jquery.page.js"></script>
187 187
<script type="text/javascript" src="js/common.js"></script>
188
<script type="text/javascript" src="js/popup.js"></script>
188
<!--<script type="text/javascript" src="js/popup.js"></script>-->
189 189
<script type="text/javascript" src="js/resourceShow.js"></script>
190
<script type="text/javascript" src="js/quickLogin.js"></script>
190 191
<script type="text/javascript">
191 192
	//微信分享
192 193
	var qrcode = new QRCode(document.getElementById("qrcode"), {

+ 31 - 5
searchNew.html

@ -21,12 +21,9 @@
21 21
<div id="container">
22 22
	<div class="containerCon">
23 23
		<div class="contentCon clearfix">
24
			<div class="col-w-12">
24
			<div class="leftconBox searchWon floatL" style="background: none;margin-bottom: 0;">
25 25
				<div class="searchdiv">
26 26
					<input type="search" name="searchsome" class="searchsome col-w-12" placeholder="请输入专家姓名、机构、研究方向" />
27
					<!--找专家:请输入专家姓名、机构、研究方向
28
		  				找资源:请输入资源名称、用途、机构
29
						找文章:请输入文章标题、作者-->
30 27
					<span class="searchgo">搜索</span>
31 28
				</div>
32 29
				<ul class="choosediv clearfix filterdiv">
@ -161,9 +158,19 @@
161 158
					</div>
162 159
				</div>
163 160
			</div>
161
			<div class="rightconBox floatR">
162
				<div class="conItem advertBox">
163
					<ul class="advertItem">
164
						<li><a href="download.html" target="_blank"><img src="images/find_img_xiazai_nor.png" /></a></li>
165
					</ul>
166
				</div>
167
			</div>
164 168
		</div>
165 169
	</div>
166 170
</div>
171
<div class="footer_tools">
172
  <a id="scrollUp" href="javascript:;" title="返回顶部"></a>
173
</div>
167 174
<footer>
168 175
	<script type="text/javascript" src="js/footer.js"></script>
169 176
</footer>
@ -172,8 +179,27 @@
172 179
<script type="text/javascript" src="js/jquery.similar.msgbox.js"></script>
173 180
<script type="text/javascript" src="js/jquery.page.js"></script>
174 181
<script type="text/javascript" src="js/common.js"></script>
175
<script type="text/javascript" src="js/popup.js"></script>
182
<!--<script type="text/javascript" src="js/popup.js"></script>-->
176 183
<script type="text/javascript" src="js/searchNew.js"></script>
184
<script type="text/javascript">
185
$(function () {
186
	//回到顶部
187
	var $body = $(document.body);;
188
	var $bottomTools = $('.footer_tools');
189
	$(window).scroll(function () {
190
		var scrollHeight = $(document).height();
191
		var scrollTop = $(window).scrollTop();
192
		var $footerHeight = $('footer').outerHeight(true);
193
		var $windowHeight = $(window).innerHeight();
194
		scrollTop > 50 ? $("#scrollUp").fadeIn(200).css("display","block") : $("#scrollUp").fadeOut(200);			
195
		$bottomTools.css("bottom", scrollHeight - scrollTop - $footerHeight > $windowHeight ? 20 : $windowHeight + scrollTop + $footerHeight + 20 - scrollHeight);
196
	});
197
	$('#scrollUp').click(function (e) {
198
		e.preventDefault();
199
		$('html,body').animate({ scrollTop:0});
200
	});
177 201

202
});
203
</script>
178 204
</body>
179 205
</html>