Browse Source

浏览页企业信息显示bug,企业工作台中相关列表样式统一

luyanan 6 years ago
parent
commit
11bc56c74a

+ 0 - 1
articalPreview.html

@ -105,7 +105,6 @@
105 105
							<span class="authiconNew" title="科袖认证企业" id="QauthFlag"></span>
106 106
						</div>
107 107
						<p class="h2Font ellipsisSty" id="Qindustry"></p>
108
						<p class="h2Font" id="QorgType"></p>
109 108
					</div>
110 109
				</div>
111 110
			</div>

+ 0 - 1
articalShow.html

@ -192,7 +192,6 @@
192 192
								<span class="authiconNew" title="科袖认证企业" id="QauthFlag"></span>
193 193
							</div>
194 194
							<p class="h2Font ellipsisSty" id="Qindustry"></p>
195
							<p class="h2Font" id="QorgType"></p>
196 195
						</div>
197 196
						<div class="goSpan">
198 197
							<span class="attenSpan">关注</span>

+ 3 - 2
cmp-portal/css/cmpindex.css

@ -426,7 +426,7 @@ ul.tagList>li .h2Font{color:#666}
426 426
.itemListBolck .itemListCon .form-result>ul>li:hover{background:#EEEEEE;}
427 427
.itemListBolck .itemListCon .form-result{position:relative;margin:20px 0 30px;border-top:1px solid #E5E5E5;}
428 428
.itemListBolck .itemListCon .madiaHead{width:120px;height:80px;margin-top:-40px;}
429
.itemListBolck .itemListCon .madiaInfo>ul>li{float: left;margin-left:20px;}
429
/*.itemListBolck .itemListCon .madiaInfo>ul>li{float: left;margin-left:20px;}*/
430 430
.itemListBolck .itemListCon .madiaInfo>ul>li:first-child{margin-left:0;}
431 431
.itemListBolck .itemListCon .madiaInfo .column{color:#666;}
432 432
.itemListBolck .itemListCon .madiaInfo>ul>li>.column{border:1px solid #28b8fa;padding:0 4px;font-size: 12px;line-height:normal;color:#28b8fa;border-radius:4px;}
@ -578,7 +578,7 @@ div.zoomMask{position:absolute;background:url("../images/g-resource-mask.png") r
578 578
.block-item .show-head{width:60px;height:60px;border-radius:50%;background-size:cover;}
579 579
.block-item .show-info{flex:1 0 60px;padding-left:15px;width: 100%;overflow: hidden;}
580 580
.block-item .info-tit{font-size:16px;line-height:26px;color:#333;}
581
.block-item .info-tag{color:#666;font-size:14px;line-height:24px;}
581
.block-item .info-tag{color:#999;font-size:14px;line-height:24px;}
582 582
.block-btn{position:absolute;right:15px;top:50%;margin-top:-26px;display: none;}
583 583
.block-btnT{margin-top:-13px;}
584 584
.block-btn>span{line-height:26px;display:block;text-align: right;cursor: pointer;color:#999}
@ -617,3 +617,4 @@ ul.cmpAllUl>li.login-block{border-top: 1px solid #ccc;margin-top:10px;padding-to
617 617
618 618
#fileAttachList li{min-height:40px;padding-right:42px;max-height:60px;height:auto;}
619 619
.null-data{color:#999;line-height:32px;padding:0 15px}
620
.link-class{display:block;max-width:200px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;}

+ 4 - 3
cmp-portal/js/cmp-articalList.js

@ -67,17 +67,17 @@ function articalList(pageSize, pageNo, isbind, num) {
67 67
				for(var i = 0; i < data.data.data.length; i++) {
68 68
					if(data.data.data[i].status == 1) {
69 69
						var li = '<li class="newbox"><a href="" target="_blank" class="newurl">';
70
						var li2 = '<ul class="h2Font clearfix"><li><span class="column"></span></li><li><span class="time"></span></li><li><span id="pageViews"></span></li><li><span id="articleAgree"></span></li><li><span class="leaveMsgCount"></span></li></ul>';
70
						var li2 = '<ul class="showliTop h2Font clearfix"><li><span class="column"></span></li><li><span class="time"></span></li><li><span id="pageViews"></span></li><li><span id="articleAgree"></span></li><li><span class="leaveMsgCount"></span></li></ul>';
71 71
						var li3 = '';
72 72
						var li4 = '';
73 73
					} else if(data.data.data[i].status == 0) {
74 74
						var li = '<li class="newbox draftList"><a href="" target="_blank" class="newurl">';
75
						var li2 = '<ul class="h2Font clearfix"><li><span class="time"></span></li></ul>';
75
						var li2 = '<ul class="showliTop h2Font clearfix"><li><span class="time"></span></li></ul>';
76 76
						var li3 = '<span class="draftLable">草稿</span>';
77 77
						var li4 = '<li><a class="editThis" target="_blank"></a></li>';
78 78
					} else if(data.data.data[i].status == 2) {
79 79
						var li = '<li class="newbox draftList"><a href="" class="newurl">';
80
						var li2 = '<ul class="h2Font clearfix"><li><span class="time"></span></li></ul>';
80
						var li2 = '<ul class="showliTop h2Font clearfix"><li><span class="time"></span></li></ul>';
81 81
						var li3 = '<span class="draftLable" id="dsfbtime"></span>';
82 82
						var li4 = '<li><a class="editThis" target="_blank"></a></li>';
83 83
					}
@ -110,6 +110,7 @@ function articalList(pageSize, pageNo, isbind, num) {
110 110
						$itemlist.find(".column").text(columnType[datalist.colNum].fullName);
111 111
					}else{
112 112
						$itemlist.find(".column").css({"border":"none","padding":"0"})
113
						$itemlist.find(".column").parent().css("padding-right","0")
113 114
						$itemlist.find(".time").parent().css("margin-left","0");
114 115
					}
115 116
					if(datalist.status == 1) {//发布

+ 4 - 4
cmp-portal/js/cmp-procuctList.js

@ -145,10 +145,10 @@ $(document).ready(function() {
145 145
				'<div class="madiaHead resouseHead" style="background-image: url(' + imgSrc + ');"></div>' +
146 146
				'<div class="madiaInfo">' +
147 147
				'<p class="h1Font ellipsisSty">' + $data[i].name + '</p>' +
148
				'<ul class="h2Font clearfix">' +
149
				'<li><span>' + oTime + '</span></li>' + pageview + '<li><span class="ellipsisSty" id="oop" style="display:inline-block;max-width:200px;"></span></li>' +
148
				'<ul class="showliTop h2Font clearfix">' +
149
				'<li><span>' + oTime + '</span></li>' + pageview + '<li><span class="link-class oop"></span></li>' +
150 150
				'</ul>' +
151
				'<p><span>' + draftLable + '</span><span class="crel ellipsisSty" style="display:inline-block;max-width:200px;"></span></p>' +
151
				'<p>' + draftLable + '<span class="crel link-class"></span></p>' +
152 152
				'</div>' +
153 153
				'</a>' +
154 154
				'<ul class="madiaEdit">' +
@ -161,7 +161,7 @@ $(document).ready(function() {
161 161
			if($data[i].status == 2) {
162 162
				resourecRel.call($os.find(".crel"), $data[i].id);
163 163
			} else {
164
				resourecRel.call($os.find("#oop"), $data[i].id);
164
				resourecRel.call($os.find(".oop"), $data[i].id);
165 165
			}
166 166
		}
167 167
	}

+ 3 - 3
cmp-portal/js/resourceList.js

@ -145,10 +145,10 @@ $(document).ready(function() {
145 145
				'<div class="madiaHead resouseHead" style="background-image: url(' + imgSrc + ');"></div>' +
146 146
				'<div class="madiaInfo">' +
147 147
				'<p class="h1Font ellipsisSty">' + $data[i].resourceName + '</p>' +
148
				'<ul class="h2Font clearfix">' +
149
				'<li><span>' + oTime + '</span></li>' + pageview + '<li><span class="ellipsisSty oop" style="display:inline-block;max-width:200px;"></span></li>' +
148
				'<ul class="showliTop h2Font clearfix">' +
149
				'<li><span>' + oTime + '</span></li>' + pageview + '<li><span class="link-class oop"></span></li>' +
150 150
				'</ul>' +
151
				'<p><span>' + draftLable + '</span><span class="crel ellipsisSty" style="display:inline-block;max-width:200px;"></span></p>' +
151
				'<p>' + draftLable + '<span class="link-class crel"></span></p>' +
152 152
				'</div>' +
153 153
				'</a>' +
154 154
				'<ul class="madiaEdit">' +

+ 3 - 11
cmp-portal/js/serviceList.js

@ -145,8 +145,8 @@ $(document).ready(function() {
145 145
						'<div class="madiaInfo">'+					
146 146
							'<p class="h1Font ellipsisSty">'+$data[i].name+'</p>'+						
147 147
							'<ul class="showliTop h2Font clearfix">'+
148
								'<li><span>'+oTime+'</span></li>'+pageview+'<li><span id="oop" style="display:inline-block;max-width:200px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;"></span></li>' +
149
							'</ul><p><span>'+draftLable+'</span><span class="crel" style="display:inline-block;max-width:200px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;"></span></p>' +
148
								'<li><span>'+oTime+'</span></li>'+pageview+'<li><span class="link-class oop"></span></li>' +
149
							'</ul><p>'+draftLable+'<span class="crel link-class"></span></p>' +
150 150
						'</div>'+
151 151
				'</a>'+
152 152
				'<ul class="madiaEdit">'+
@ -157,17 +157,9 @@ $(document).ready(function() {
157 157
			var $os = $(oStr);
158 158
			$("#resourceList").append($os);
159 159
			if($data[i].status == 2) {
160
				if($data[i].num==0) {
161
					$os.find(".crel").text("未设置联系人");
162
					return;
163
				}
164 160
				resourecRel.call($os.find(".crel"), $data[i].id);
165 161
			} else {
166
				if($data[i].num==0) {
167
					$os.find("#oop").text("未设置联系人");
168
					return;
169
				}
170
				resourecRel.call($os.find("#oop"), $data[i].id);
162
				resourecRel.call($os.find(".oop"), $data[i].id);
171 163
			}
172 164
		}
173 165
	}

+ 0 - 1
fw_template_r3254/article.html

@ -197,7 +197,6 @@
197 197
								<span class="authiconNew" title="科袖认证企业" id="QauthFlag"></span>
198 198
							</div>
199 199
							<p class="h2Font ellipsisSty" id="Qindustry"></p>
200
							<p class="h2Font" id="QorgType"></p>
201 200
						</div>
202 201
						<div class="goSpan">
203 202
							<span class="attenSpan">关注</span>

+ 15 - 28
js/articalPreview.js

@ -194,10 +194,9 @@ $(function() {
194 194
					if(data.data.authStatus==3){
195 195
						$("#QauthFlag").addClass("authicon-com-ok").attr("title", "认证企业");;	
196 196
					}
197
					$("#Qindustry").text(QindustryShow(data.data.industry));
198
					
199
					$("#QorgType").text(orgTypeShow[data.data.orgType])
200
					
197
					if(data.data.industry) {
198
						$("#Qindustry").text(data.data.industry.replace(/,/gi, " | "));
199
					}
201 200
					if(!data.data.colMgr && !data.data.resMgr) {
202 201
						relatedProducts();
203 202
					}
@ -224,7 +223,9 @@ $(function() {
224 223
                    }else{
225 224
                        $("#companyImg").attr("src", "/images/default-plat.jpg");
226 225
                    }
227
                    $("#Qindustry").text(QindustryShow(data.data.industry));
226
                    if(data.data.industry) {
227
						$("#Qindustry").text(data.data.industry.replace(/,/gi, " | "));
228
					}
228 229
                }
229 230
            },
230 231
            "error": function() {
@ -395,20 +396,6 @@ $(function() {
395 396
		}			
396 397
	}
397 398
	
398
	//拆解企业应用行业
399
	function QindustryShow(data){
400
		if(data != undefined && data.length != 0 ){
401
			var subs = new Array();
402
			subs = data.replace(',',' | ');
403
			if(subs.length>0){
404
				for (var i = 0; i < subs.length; i++) 
405
				{
406
					$("#Qindustry").append(subs[i]);
407
				};
408
			}	
409
		}			
410
	}
411
	
412 399
	//相关企业
413 400
	function companylist() {
414 401
		$.ajax({
@ -455,25 +442,25 @@ $(function() {
455 442
	function busfil($data) {
456 443
		var itemlist = '<li><a href="" target="_blank" class="flexCenter urlgo">';
457 444
		itemlist += '<div class="madiaHead cmpHead">';
458
		itemlist += '<div class="boxBlock"><img class="boxBlockimg" src="" id="companyImg"></div></div>';
445
		itemlist += '<div class="boxBlock"><img class="boxBlockimg companyImg"></div></div>';
459 446
		itemlist += '<div class="madiaInfo">';
460
		itemlist += '<p class="h1Font"><span id="orgName"></span><em class="authiconNew"></em></p>';
461
		itemlist += '<p class="h2Font ellipsisSty"><span id="orgTit"></span> <span id="orgOther"></span></p>';
447
		itemlist += '<p class="h1Font"><span class="orgName"></span><em class="authiconNew"></em></p>';
448
		itemlist += '<p class="h2Font ellipsisSty"><span class="orgTit"></span> <span class="orgOther"></span></p>';
462 449
		itemlist += '</div></a></li>';
463 450
		$itemlist = $(itemlist);
464 451
		this.append($itemlist);
465 452
		var datalist = $data;
466 453
		var companyType = datalist.authStatus;
467 454
		if(datalist.forShort) {
468
			$itemlist.find("#orgName").text(datalist.forShort);
455
			$itemlist.find(".orgName").text(datalist.forShort);
469 456
		} else {
470
			$itemlist.find("#orgName").text(datalist.name);
457
			$itemlist.find(".orgName").text(datalist.name);
471 458
		}
472 459
		$itemlist.find(".urlgo").attr("href", "cmpInforShow.html?orgId=" + datalist.id);
473 460
		if(datalist.hasOrgLogo) {
474
			$itemlist.find("#companyImg").attr("src", "/images/org/" + datalist.id + ".jpg");
461
			$itemlist.find(".companyImg").attr("src", "/images/org/" + datalist.id + ".jpg");
475 462
		} else {
476
			$itemlist.find("#companyImg").attr("src", "/images/default-icon.jpg");
463
			$itemlist.find(".companyImg").attr("src", "/images/default-icon.jpg");
477 464
		}
478 465
		if(companyType == 3) {
479 466
			$itemlist.find(".authiconNew").addClass("authicon-com-ok").attr("title", "科袖认证企业");;
@ -482,10 +469,10 @@ $(function() {
482 469
		if(datalist.industry) {
483 470
			orgOther = datalist.industry.replace(/,/gi, " | ");
484 471
		}
485
		$itemlist.find("#orgOther").text(orgOther);
472
		$itemlist.find(".orgOther").text(orgOther);
486 473
	
487 474
		if(datalist.orgType == "2") {
488
			$("#orgTit").html(orgTypeShow[datalist.orgType] + "<span style='margin-right:10px;'></span>");
475
			$(".orgTit").html(orgTypeShow[datalist.orgType] + "<span style='margin-right:10px;'></span>");
489 476
		}
490 477
	
491 478
	}

+ 15 - 27
js/articalShow.js

@ -294,8 +294,9 @@ $(document).ready(function() {
294 294
					if(data.data.authStatus==3){
295 295
						$("#QauthFlag,.labels").addClass("authicon-com-ok").attr("title", "认证企业");;	
296 296
					}
297
					$("#Qindustry").text(QindustryShow(data.data.industry));
298
					$("#QorgType").text(orgTypeShow[data.data.orgType])
297
					if(data.data.industry) {
298
						$("#Qindustry").text(data.data.industry.replace(/,/gi, " | "));
299
					}
299 300
					if(userid){
300 301
						ifcollectionAbout(data.data.id,$("#enterprise").find(".attenSpan"), 6)
301 302
					}
@ -333,7 +334,9 @@ $(document).ready(function() {
333 334
                    }else{
334 335
                        $("#companyImg,#companyImg2").attr("src", "/images/default-plat.jpg");
335 336
                    }
336
                    $("#Qindustry").text(QindustryShow(data.data.industry));
337
                    if(data.data.industry) {
338
						$("#Qindustry").text(data.data.industry.replace(/,/gi, " | "));
339
					}
337 340
                    $("#enterprise").find(".attenSpan").hide();
338 341
                }
339 342
            },
@ -711,25 +714,25 @@ $(document).ready(function() {
711 714
	function busfil($data) {
712 715
		var itemlist = '<li><a href="" target="_blank" class="flexCenter urlgo">';
713 716
		itemlist += '<div class="madiaHead cmpHead">';
714
		itemlist += '<div class="boxBlock"><img class="boxBlockimg" src="" id="companyImg"></div></div>';
717
		itemlist += '<div class="boxBlock"><img class="boxBlockimg companyImg"></div></div>';
715 718
		itemlist += '<div class="madiaInfo">';
716
		itemlist += '<p class="h1Font"><span id="orgName"></span><em class="authiconNew"></em></p>';
717
		itemlist += '<p class="h2Font ellipsisSty"><span id="orgTit"></span> <span id="orgOther"></span></p>';
719
		itemlist += '<p class="h1Font"><span class="orgName"></span><em class="authiconNew"></em></p>';
720
		itemlist += '<p class="h2Font ellipsisSty"><span class="orgTit"></span> <span class="orgOther"></span></p>';
718 721
		itemlist += '</div></a></li>';
719 722
		$itemlist = $(itemlist);
720 723
		this.append($itemlist);
721 724
		var datalist = $data;
722 725
		var companyType = datalist.authStatus;
723 726
		if(datalist.forShort) {
724
			$itemlist.find("#orgName").text(datalist.forShort);
727
			$itemlist.find(".orgName").text(datalist.forShort);
725 728
		} else {
726
			$itemlist.find("#orgName").text(datalist.name);
729
			$itemlist.find(".orgName").text(datalist.name);
727 730
		}
728 731
		$itemlist.find(".urlgo").attr("href", "cmpInforShow.html?orgId=" + datalist.id);
729 732
		if(datalist.hasOrgLogo) {
730
			$itemlist.find("#companyImg").attr("src", "/images/org/" + datalist.id + ".jpg");
733
			$itemlist.find(".companyImg").attr("src", "/images/org/" + datalist.id + ".jpg");
731 734
		} else {
732
			$itemlist.find("#companyImg").attr("src", "/images/default-icon.jpg");
735
			$itemlist.find(".companyImg").attr("src", "/images/default-icon.jpg");
733 736
		}
734 737
		if(companyType == 3) {
735 738
			$itemlist.find(".authiconNew").addClass("authicon-com-ok").attr("title", "科袖认证企业");;
@ -738,10 +741,10 @@ $(document).ready(function() {
738 741
		if(datalist.industry) {
739 742
			orgOther = datalist.industry.replace(/,/gi, " | ");
740 743
		}
741
		$itemlist.find("#orgOther").text(orgOther);
744
		$itemlist.find(".orgOther").text(orgOther);
742 745
	
743 746
		if(datalist.orgType == "2") {
744
			$("#orgTit").html(orgTypeShow[datalist.orgType] + "<span style='margin-right:10px;'></span>");
747
			$(".orgTit").html(orgTypeShow[datalist.orgType] + "<span style='margin-right:10px;'></span>");
745 748
		}
746 749
	
747 750
	}
@ -855,21 +858,6 @@ $(document).ready(function() {
855 858
		}			
856 859
	}
857 860
	
858
	
859
	//拆解企业应用行业
860
	function QindustryShow(data){
861
		if(data != undefined && data.length != 0 ){
862
			var subs = new Array();
863
			subs = data.replace(',',' | ');
864
			if(subs.length>0){
865
				for (var i = 0; i < subs.length; i++) 
866
				{
867
					$("#Qindustry").append(subs[i]);
868
				};
869
			}	
870
		}			
871
	}
872
	
873 861
	//文章点击点赞
874 862
	$('.thumbBlock').on("click",".thunbgo",function(){
875 863
		if (userid && userid != "null" && userid != null) {

+ 23 - 28
js/articalShow2.js

@ -17,7 +17,7 @@ $(document).ready(function() {
17 17
	relevantExperts();
18 18
	relatedServices();
19 19
	relevantResources();
20
	queryFileAtach();
20

21 21
	pageViewLog(articleId,3)
22 22
	wlog("article",articleId,"1");
23 23
	$('.wordHave').click(function(){$('html,body').animate({scrollTop: ($('.offmsg').outerHeight(true)+60)+'px'}, 800);}); //留言
@ -295,11 +295,19 @@ $(document).ready(function() {
295 295
					if(data.data.authStatus==3){
296 296
						$("#QauthFlag,.labels").addClass("authicon-com-ok").attr("title", "认证企业");;	
297 297
					}
298
					$("#Qindustry").text(QindustryShow(data.data.industry));
299
					$("#QorgType").text(orgTypeShow[data.data.orgType])
298
					if(data.data.industry) {
299
						$("#Qindustry").text(data.data.industry.replace(/,/gi, " | "));
300
					}
300 301
					if(userid){
301 302
						ifcollectionAbout(data.data.id,$("#enterprise").find(".attenSpan"), 6)
302 303
					}
304
					
305
					if(!data.data.colMgr && !data.data.resMgr) {
306
						relatedProducts();
307
					}
308
					if(data.data.colMgr) {
309
						queryFileAtach();
310
					}
303 311
				}
304 312
			},
305 313
			"error": function() {
@ -331,7 +339,9 @@ $(document).ready(function() {
331 339
                    }else{
332 340
                        $("#companyImg,#companyImg2").attr("src", "/images/default-plat.jpg");
333 341
                    }
334
                    $("#Qindustry").text(QindustryShow(data.data.industry));
342
                    if(data.data.industry) {
343
						$("#Qindustry").text(data.data.industry.replace(/,/gi, " | "));
344
					}
335 345
                    $("#enterprise").find(".attenSpan").hide();
336 346
                }
337 347
            },
@ -710,25 +720,25 @@ $(document).ready(function() {
710 720
	function busfil($data) {
711 721
		var itemlist = '<li><a href="" target="_blank" class="flexCenter urlgo">';
712 722
		itemlist += '<div class="madiaHead cmpHead">';
713
		itemlist += '<div class="boxBlock"><img class="boxBlockimg" src="" id="companyImg"></div></div>';
723
		itemlist += '<div class="boxBlock"><img class="boxBlockimg companyImg"></div></div>';
714 724
		itemlist += '<div class="madiaInfo">';
715
		itemlist += '<p class="h1Font"><span id="orgName"></span><em class="authiconNew"></em></p>';
716
		itemlist += '<p class="h2Font ellipsisSty"><span id="orgTit"></span> <span id="orgOther"></span></p>';
725
		itemlist += '<p class="h1Font"><span class="orgName"></span><em class="authiconNew"></em></p>';
726
		itemlist += '<p class="h2Font ellipsisSty"><span class="orgTit"></span> <span class="orgOther"></span></p>';
717 727
		itemlist += '</div></a></li>';
718 728
		$itemlist = $(itemlist);
719 729
		this.append($itemlist);
720 730
		var datalist = $data;
721 731
		var companyType = datalist.authStatus;
722 732
		if(datalist.forShort) {
723
			$itemlist.find("#orgName").text(datalist.forShort);
733
			$itemlist.find(".orgName").text(datalist.forShort);
724 734
		} else {
725
			$itemlist.find("#orgName").text(datalist.name);
735
			$itemlist.find(".orgName").text(datalist.name);
726 736
		}
727 737
		$itemlist.find(".urlgo").attr("href", "/cmpInforShow.html?orgId=" + datalist.id);
728 738
		if(datalist.hasOrgLogo) {
729
			$itemlist.find("#companyImg").attr("src", "/images/org/" + datalist.id + ".jpg");
739
			$itemlist.find(".companyImg").attr("src", "/images/org/" + datalist.id + ".jpg");
730 740
		} else {
731
			$itemlist.find("#companyImg").attr("src", "/images/default-icon.jpg");
741
			$itemlist.find(".companyImg").attr("src", "/images/default-icon.jpg");
732 742
		}
733 743
		if(companyType == 3) {
734 744
			$itemlist.find(".authiconNew").addClass("authicon-com-ok").attr("title", "科袖认证企业");;
@ -737,10 +747,10 @@ $(document).ready(function() {
737 747
		if(datalist.industry) {
738 748
			orgOther = datalist.industry.replace(/,/gi, " | ");
739 749
		}
740
		$itemlist.find("#orgOther").text(orgOther);
750
		$itemlist.find(".orgOther").text(orgOther);
741 751
	
742 752
		if(datalist.orgType == "2") {
743
			$("#orgTit").html(orgTypeShow[datalist.orgType] + "<span style='margin-right:10px;'></span>");
753
			$(".orgTit").html(orgTypeShow[datalist.orgType] + "<span style='margin-right:10px;'></span>");
744 754
		}
745 755
	
746 756
	}
@ -854,21 +864,6 @@ $(document).ready(function() {
854 864
		}			
855 865
	}
856 866
	
857
	
858
	//拆解企业应用行业
859
	function QindustryShow(data){
860
		if(data != undefined && data.length != 0 ){
861
			var subs = new Array();
862
			subs = data.replace(',',' | ');
863
			if(subs.length>0){
864
				for (var i = 0; i < subs.length; i++) 
865
				{
866
					$("#Qindustry").append(subs[i]);
867
				};
868
			}	
869
		}			
870
	}
871
	
872 867
	//文章点击点赞
873 868
	$('.thumbBlock').on("click",".thunbgo",function(){
874 869
		if (userid && userid != "null" && userid != null) {

+ 54 - 53
js/productPreview.js

@ -52,7 +52,7 @@ $(document).ready(function() {
52 52
	/*处理资源html代码*/
53 53
	function resourceHtml($da) {
54 54
		comMess($da.owner);
55
		$("#resourceName").text($da.name ); //名字
55
		$("#resourceName").text($da.name); //名字
56 56
		$("#application").text($da.cnt); //应用用途
57 57
		if($da.producingArea) {
58 58
			$("#productArea").text($da.producingArea).parents("li").show();
@ -86,7 +86,7 @@ $(document).ready(function() {
86 86
			var arr = "";
87 87
			var images = $da.images.split(',')
88 88
			for(var i = 0; i < images.length; i++) {
89
				if(i==0) {
89
				if(i == 0) {
90 90
					var oString = '<li class="tb-selected">' +
91 91
						'<div class="tb-pic tb-s66">' +
92 92
						'<a href="javascript:void(0);">' +
@ -110,16 +110,16 @@ $(document).ready(function() {
110 110
		}
111 111

112 112
	}
113
	
114 113

115 114
	selUse();
115

116 116
	function selUse() {
117 117
		$.ajax({
118 118
			url: "/ajax/product/pro",
119 119
			type: "GET",
120 120
			timeout: 10000,
121 121
			dataType: "json",
122
			async:true,
122
			async: true,
123 123
			data: {
124 124
				"id": resourceId,
125 125
			},
@ -128,7 +128,7 @@ $(document).ready(function() {
128 128
				if(data.success) {
129 129
					//unauthUser(data.data);
130 130
					var arr = [];
131
					for(var i=0;i<data.data.length;i++) {
131
					for(var i = 0; i < data.data.length; i++) {
132 132
						arr.push(data.data[i].professor)
133 133
					}
134 134
					console.log(arr)
@ -140,14 +140,15 @@ $(document).ready(function() {
140 140
			}
141 141
		})
142 142
	}
143

143 144
	function professorList(par) {
144 145
		$.ajax({
145 146
			url: "/ajax/professor/qm",
146 147
			type: "GET",
147 148
			timeout: 10000,
148 149
			dataType: "json",
149
			async:true,
150
			traditional:true,
150
			async: true,
151
			traditional: true,
151 152
			data: {
152 153
				"id": par,
153 154
			},
@ -158,7 +159,7 @@ $(document).ready(function() {
158 159
						unauthUser(data.data);
159 160
						$("#resPerson").show();
160 161
					}
161
					
162

162 163
				}
163 164
			},
164 165
			error: function(XMLHttpRequest, textStats, errorThrown) {
@ -166,66 +167,66 @@ $(document).ready(function() {
166 167
			}
167 168
		})
168 169
	}
170

169 171
	function unauthUser($res) {
170
	var osting=""
171
	for(var i = 0; i < $res.length; i++) {
172
		var img;
173
		var styC="";
174
		var oClass = autho($res[i].authType, $res[i].orgAuth, $res[i].authStatus);
175
		var oTitle="";
176
		if($res[i].title) {
177
			oTitle=$res[i].title;
178
		}else{
179
			if($res[i].office) {
180
				oTitle=$res[i].office;
172
		var osting = ""
173
		for(var i = 0; i < $res.length; i++) {
174
			var img;
175
			var styC = "";
176
			var oClass = autho($res[i].authType, $res[i].orgAuth, $res[i].authStatus);
177
			var oTitle = "";
178
			if($res[i].title) {
179
				oTitle = $res[i].title;
180
			} else {
181
				if($res[i].office) {
182
					oTitle = $res[i].office;
183
				}
181 184
			}
182
		}
183
		if($res[i].hasHeadImage) {
185
			if($res[i].hasHeadImage) {
184 186
				img = "/images/head/" + $res[i].id + "_l.jpg";
185 187
			} else {
186 188
				img = "../images/default-photo.jpg"
187 189
			}
188
		var oSt = '<li>'
189
		oSt += '<div class="madiaHead useHead" id="userimg" style="background-image: url('+img+');"></div>'
190
		oSt += '<div class = "madiaInfo">'
191
		oSt += '<p class = "ellipsisSty">'
192
		oSt += '<span class = "h1Font" id="name">'+$res[i].name+'</span><em class="authicon '+oClass.sty+'" title="'+oClass.title+'"></em >'
193
		oSt += '</p>'
194
		oSt += '<p class="h2Font ellipsisSty">'+oTitle+'</p>'
195
		oSt += '</div>'
196
		oSt += '<div class="'+styC+'" flag=1></div>'
197
		oSt += '</li>'
198
		osting+=oSt;
190
			var oSt = '<li>'
191
			oSt += '<div class="madiaHead useHead" id="userimg" style="background-image: url(' + img + ');"></div>'
192
			oSt += '<div class = "madiaInfo">'
193
			oSt += '<p class = "ellipsisSty">'
194
			oSt += '<span class = "h1Font" id="name">' + $res[i].name + '</span><em class="authicon ' + oClass.sty + '" title="' + oClass.title + '"></em >'
195
			oSt += '</p>'
196
			oSt += '<p class="h2Font ellipsisSty">' + oTitle + '</p>'
197
			oSt += '</div>'
198
			oSt += '<div class="' + styC + '" flag=1></div>'
199
			oSt += '</li>'
200
			osting += oSt;
201
		}
202
		$("#expertli").html(osting);
199 203
	}
200
	$("#expertli").html(osting);
201
}
204

202 205
	function comMess(oid) {
203
	$.ajax({
204
			url: "/ajax/org/" +oid,
206
		$.ajax({
207
			url: "/ajax/org/" + oid,
205 208
			type: "GET",
206 209
			timeout: 10000,
207 210
			dataType: "json",
208
			async:"true",
211
			async: "true",
209 212
			success: function(data, textState) {
210 213
				if(data.success) {
211 214
					var $da = data.data;
212
			$("#enterprise,#resPerson").show();
213
			if($da.hasOrgLogo) {
214
				$("#companyImg").attr("src", "/images/org/" + $da.id + ".jpg");
215
			}else{
216
				$("#companyImg").attr("src", "/images/default-icon.jpg");
217
			}
218
			if($da.authStatus==3){
219
				$("#QauthFlag").addClass("authicon-com-ok").attr("title", "认证企业");	
220
			}
221
			$("#Qname").text($da.name);
222
			$("#Qindustry").text($da.subject);
223
			$("#QorgType").text(orgTypeShow[$da.orgType])
215
					$("#enterprise,#resPerson").show();
216
					if($da.hasOrgLogo) {
217
						$("#companyImg").attr("src", "/images/org/" + $da.id + ".jpg");
218
					} else {
219
						$("#companyImg").attr("src", "/images/default-icon.jpg");
220
					}
221
					if($da.authStatus == 3) {
222
						$("#QauthFlag").addClass("authicon-com-ok").attr("title", "认证企业");
223
					}
224
					$("#Qname").text($da.name);
225
					if($da.industry) {
226
						$("#Qindustry").text($da.industry.replace(/,/gi, " | "));
227
					}
224 228
				}
225
			},
226
			error: function(XMLHttpRequest, textStats, errorThrown) {
227
				$.MsgBox.Alert('提示', '服务器请求失败')
228 229
			}
229 230
		})
230
}
231
	}
231 232
})

+ 140 - 132
js/productShow.js

@ -2,8 +2,8 @@ $(document).ready(function() {
2 2
	loginStatus(); //判断个人是否登录
3 3
	var userid = $.cookie("userid");
4 4
	var resourceId = GetQueryString("productId");
5
	if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)){
6
	 	location.href="http://" + window.location.host + "/e/pr.html?id="+resourceId;
5
	if(navigator.userAgent.match(/(iPhone|iPod|Android|ios)/i)) {
6
		location.href = "http://" + window.location.host + "/e/pr.html?id=" + resourceId;
7 7
	}
8 8
	$(".jqzoom").imagezoom();
9 9
	$("#thumblist").on("click", "li a", function() {
@ -14,48 +14,46 @@ $(document).ready(function() {
14 14
	$('.shareWeixin').hover(function() {
15 15
		$('.shareCode').stop(true, false).fadeToggle();
16 16
	});
17
	
18
	ifcollectionAbout(resourceId,$("#attention").find("em"), 11)
19
	pageViewLog(resourceId,11)
17

18
	ifcollectionAbout(resourceId, $("#attention").find("em"), 11)
19
	pageViewLog(resourceId, 11)
20 20
	var professorId = "";
21 21
	getRecourceMe();
22
	
22

23 23
	//热门资源
24 24
	function recentlyRe(par) {
25
		var $info= {};
26
		$info.rows =6;
27
		$info.owner =par;
25
		var $info = {};
26
		$info.rows = 6;
27
		$info.owner = par;
28 28
		$.ajax({
29
			"url" :'/ajax/product/publish' ,
30
			"type" :  "GET" ,
31
			"dataType" : "json",
32
			"data" :$info,
33
			"success" : function(data) {
34
				if (data.success){
35
					var $data=data.data;
36
					var only=false;
37
					if($data.length>1){
38
						if($data.length >1 || ($data.length ==1 && resourceId == $data[0].id))
39
						$(".recentlyList").parents(".currentBlock").removeClass("displayNone");
40
						for(var i=0;i<$data.length;i++) {
41
							if(resourceId==$data[i].id) {
42
								
29
			"url": '/ajax/product/publish',
30
			"type": "GET",
31
			"dataType": "json",
32
			"data": $info,
33
			"success": function(data) {
34
				if(data.success) {
35
					var $data = data.data;
36
					var only = false;
37
					if($data.length > 1) {
38
						if($data.length > 1 || ($data.length == 1 && resourceId == $data[0].id))
39
							$(".recentlyList").parents(".currentBlock").removeClass("displayNone");
40
						for(var i = 0; i < $data.length; i++) {
41
							if(resourceId == $data[i].id) {
42

43 43
								continue;
44 44
							}
45
							var resIM='/data/product' + $data[i].images.split(",")[0];
46
							var str='<li><a class="flexCenter" style="min-height:46px;" href="productShow.html?productId='+$data[i].id+'">'+
47
									'<div class="madiaHead resourceHead" style="width:50px;height:36px;margin-top:-18px;background-image: url('+ resIM +');"></div>'+
48
								'<div class="madiaInfo"><p class="h2Font ellipsisSty-2">'+$data[i].name+'</p></div></a></li>'
49
							$(".recentlyList").append(str);	
45
							var resIM = '/data/product' + $data[i].images.split(",")[0];
46
							var str = '<li><a class="flexCenter" style="min-height:46px;" href="productShow.html?productId=' + $data[i].id + '">' +
47
								'<div class="madiaHead resourceHead" style="width:50px;height:36px;margin-top:-18px;background-image: url(' + resIM + ');"></div>' +
48
								'<div class="madiaInfo"><p class="h2Font ellipsisSty-2">' + $data[i].name + '</p></div></a></li>'
49
							$(".recentlyList").append(str);
50 50
						}
51 51
					}
52 52
				}
53
					
54
				
55
				
53

56 54
			},
57
			"error":function(){
58
				$.MsgBox.Alert('提示','链接服务器超时')
55
			"error": function() {
56
				$.MsgBox.Alert('提示', '链接服务器超时')
59 57
			}
60 58
		});
61 59
	}
@ -98,7 +96,7 @@ $(document).ready(function() {
98 96
	function resourceHtml($da) {
99 97
		comMess($da.owner);
100 98
		recentlyRe($da.owner);
101
		$("#resourceName").text($da.name ); //名字
99
		$("#resourceName").text($da.name); //名字
102 100
		$("#application").text($da.cnt); //应用用途
103 101
		if($da.producingArea) {
104 102
			$("#productArea").text($da.producingArea).parents("li").show();
@ -112,7 +110,7 @@ $(document).ready(function() {
112 110
		if($da.parameter) { //性能参数
113 111
			$("#performancePa").html(outHTML($da.parameter)).parents("li").show();
114 112
		}
115
		if($da.pageViews>0){
113
		if($da.pageViews > 0) {
116 114
			$("#pageView").html($da.pageViews)
117 115
		}
118 116
		if($da.keywords) {
@ -138,7 +136,7 @@ $(document).ready(function() {
138 136
			var arr = "";
139 137
			var images = $da.images.split(',')
140 138
			for(var i = 0; i < images.length; i++) {
141
				if(i==0) {
139
				if(i == 0) {
142 140
					var oString = '<li class="tb-selected">' +
143 141
						'<div class="tb-pic tb-s66">' +
144 142
						'<a href="javascript:void(0);">' +
@ -166,7 +164,7 @@ $(document).ready(function() {
166 164
				"rel": '../images/default-resource.jpg'
167 165
			});
168 166
		}
169
		$("#weibo").attr("href","http://service.weibo.com/share/share.php?appkey=3677230589&title="+encodeURIComponent(weibotitle)+"&url="+encodeURIComponent(weibourl)+"&pic="+encodeURIComponent(weibopic)+"&content=utf-8"+"&ralateUid=6242830109&searchPic=false&style=simple");
167
		$("#weibo").attr("href", "http://service.weibo.com/share/share.php?appkey=3677230589&title=" + encodeURIComponent(weibotitle) + "&url=" + encodeURIComponent(weibourl) + "&pic=" + encodeURIComponent(weibopic) + "&content=utf-8" + "&ralateUid=6242830109&searchPic=false&style=simple");
170 168

171 169
	}
172 170
	/*点击名字及头像跳转个人浏览页面*/
@ -174,24 +172,24 @@ $(document).ready(function() {
174 172
		location.href = "userInforShow.html?professorId=" + professorId;
175 173
	})
176 174
	//关键词标签点击进去搜索
177
	$(".tagList").on("click","li",function(){
175
	$(".tagList").on("click", "li", function() {
178 176
		var tagText = $(this).find("p").text();
179 177
		location.href = "searchNew.html?searchContent=" + tagText + "&tagflag=2";
180 178
	})
181 179
	/*点击咨询*/
182
	$("#consultin").on('click', function(){
180
	$("#consultin").on('click', function() {
183 181
		if(userid && userid != null && userid != 'null' && userid != undefined && userid != 'undefined') {
184
			location.href="tidings.html?id="+professorId
182
			location.href = "tidings.html?id=" + professorId
185 183
		} else {
186 184
			quickLog();
187 185
			operatTab();
188 186
			closeLog();
189 187
		}
190 188
	});
191
	$("#expertli").on("click",".addbtn",function(event) {
189
	$("#expertli").on("click", ".addbtn", function(event) {
192 190
		if(userid && userid != null && userid != 'null' && userid != undefined && userid != 'undefined') {
193
			var id=$(this).attr("data-id");
194
			location.href="tidings.html?id="+id;
191
			var id = $(this).attr("data-id");
192
			location.href = "tidings.html?id=" + id;
195 193
		} else {
196 194
			quickLog();
197 195
			operatTab();
@ -199,13 +197,13 @@ $(document).ready(function() {
199 197
		}
200 198
		event.stopPropagation()
201 199
	});
202
	$("#enterprise").on("click",'.attenSpan',function() {
200
	$("#enterprise").on("click", '.attenSpan', function() {
203 201
		if(userid && userid != "null" && userid != null) {
204
			if($(this).is('.attenedSpan')){
205
				cancelCollectionAbout($(".qiyego").attr('dataid'),$(this), 6)
202
			if($(this).is('.attenedSpan')) {
203
				cancelCollectionAbout($(".qiyego").attr('dataid'), $(this), 6)
206 204
			} else {
207
				collectionAbout($(".qiyego").attr('dataid'),$(this),6);
208
			}	
205
				collectionAbout($(".qiyego").attr('dataid'), $(this), 6);
206
			}
209 207
		} else {
210 208
			quickLog();
211 209
			operatTab();
@ -215,11 +213,11 @@ $(document).ready(function() {
215 213

216 214
	//点击产品收藏
217 215
	$('#attention em').click(function() {
218
		if (userid && userid != "null" && userid != null) {
219
			if($(this).is('.icon-collected')){
220
				cancelCollectionAbout(resourceId,$(this),11)
221
			}else{
222
				collectionAbout(resourceId,$(this),11)
216
		if(userid && userid != "null" && userid != null) {
217
			if($(this).is('.icon-collected')) {
218
				cancelCollectionAbout(resourceId, $(this), 11)
219
			} else {
220
				collectionAbout(resourceId, $(this), 11)
223 221
			}
224 222
		} else {
225 223
			quickLog();
@ -229,27 +227,28 @@ $(document).ready(function() {
229 227
	})
230 228

231 229
	selUse();
230

232 231
	function selUse() {
233 232
		$.ajax({
234 233
			url: "/ajax/product/pro",
235 234
			type: "GET",
236 235
			timeout: 10000,
237 236
			dataType: "json",
238
			async:true,
237
			async: true,
239 238
			data: {
240 239
				"id": resourceId,
241 240
			},
242 241
			success: function(data, textState) {
243 242
				console.log(data)
244 243
				if(data.success) {
245
					if(data.data.length>0){
244
					if(data.data.length > 0) {
246 245
						$("#expertli").parents(".currentBlock").removeClass("displayNone");
247
						
248
					}else{
246

247
					} else {
249 248
						$("#expertli").parents(".currentBlock").addClass("displayNone");
250 249
					}
251 250
					var arr = [];
252
					for(var i=0;i<data.data.length;i++) {
251
					for(var i = 0; i < data.data.length; i++) {
253 252
						arr.push(data.data[i].professor)
254 253
					}
255 254
					console.log(arr)
@ -261,14 +260,15 @@ $(document).ready(function() {
261 260
			}
262 261
		})
263 262
	}
263

264 264
	function professorList(par) {
265 265
		$.ajax({
266 266
			url: "/ajax/professor/qm",
267 267
			type: "GET",
268 268
			timeout: 10000,
269 269
			dataType: "json",
270
			async:true,
271
			traditional:true,
270
			async: true,
271
			traditional: true,
272 272
			data: {
273 273
				"id": par,
274 274
			},
@ -279,7 +279,7 @@ $(document).ready(function() {
279 279
						unauthUser(data.data);
280 280
						$("#resPerson").show();
281 281
					}
282
					
282

283 283
				}
284 284
			},
285 285
			error: function(XMLHttpRequest, textStats, errorThrown) {
@ -287,6 +287,7 @@ $(document).ready(function() {
287 287
			}
288 288
		})
289 289
	}
290

290 291
	function ajaxRequist(url, obj, type, fn) {
291 292
		$.ajax({
292 293
			url: url,
@ -304,87 +305,91 @@ $(document).ready(function() {
304 305
			}
305 306
		});
306 307
	}
308

307 309
	function unauthUser($res) {
308
	var osting=""
309
	for(var i = 0; i < $res.length; i++) {
310
		var img;
311
		var styC="";
312
		var oClass = autho($res[i].authType, $res[i].orgAuth, $res[i].authStatus);
313
		var oTitle="";
314
		if($res[i].title) {
315
			oTitle=$res[i].title;
316
		}else{
317
			if($res[i].office) {
318
				oTitle=$res[i].office;
310
		var osting = ""
311
		for(var i = 0; i < $res.length; i++) {
312
			var img;
313
			var styC = "";
314
			var oClass = autho($res[i].authType, $res[i].orgAuth, $res[i].authStatus);
315
			var oTitle = "";
316
			if($res[i].title) {
317
				oTitle = $res[i].title;
318
			} else {
319
				if($res[i].office) {
320
					oTitle = $res[i].office;
321
				}
319 322
			}
320
		}
321
		if($res[i].hasHeadImage) {
323
			if($res[i].hasHeadImage) {
322 324
				img = "/images/head/" + $res[i].id + "_l.jpg";
323 325
			} else {
324 326
				img = "../images/default-photo.jpg"
325 327
			}
326
		var oSt = '<li data-id="' + $res[i].id + '" style="cursor:pointer;">'
327
		oSt += '<div class="madiaHead useHead" id="userimg" style="background-image: url('+img+');"></div>'
328
		oSt += '<div class = "madiaInfo">'
329
		oSt += '<p class = "ellipsisSty">'
330
		oSt += '<span class = "h1Font" id="name">'+$res[i].name+'</span><em class="authicon '+oClass.sty+'" title="'+oClass.title+'"></em >'
331
		oSt += '</p>'
332
		oSt += '<p class="h2Font ellipsisSty">'+oTitle+'</p>'
333
		oSt += '</div>'
334
		if(userid != $res[i].id)
335
		oSt += '<span class="addbtn" data-id="' + $res[i].id + '">联系</span>'
336
		oSt += '</li>'
337
		osting+=oSt;
328
			var oSt = '<li data-id="' + $res[i].id + '" style="cursor:pointer;">'
329
			oSt += '<div class="madiaHead useHead" id="userimg" style="background-image: url(' + img + ');"></div>'
330
			oSt += '<div class = "madiaInfo">'
331
			oSt += '<p class = "ellipsisSty">'
332
			oSt += '<span class = "h1Font" id="name">' + $res[i].name + '</span><em class="authicon ' + oClass.sty + '" title="' + oClass.title + '"></em >'
333
			oSt += '</p>'
334
			oSt += '<p class="h2Font ellipsisSty">' + oTitle + '</p>'
335
			oSt += '</div>'
336
			if(userid != $res[i].id)
337
				oSt += '<span class="addbtn" data-id="' + $res[i].id + '">联系</span>'
338
			oSt += '</li>'
339
			osting += oSt;
340
		}
341
		$("#expertli").html(osting);
338 342
	}
339
	$("#expertli").html(osting);
340
}
343

341 344
	function comMess(oid) {
342
	$.ajax({
343
			url: "/ajax/org/" +oid,
345
		$.ajax({
346
			url: "/ajax/org/" + oid,
344 347
			type: "GET",
345 348
			timeout: 10000,
346 349
			dataType: "json",
347
			async:"true",
350
			async: "true",
348 351
			success: function(data, textState) {
349 352
				if(data.success) {
350 353
					var $da = data.data;
351
			$("#enterprise,#resPerson").show();
352
			if($da.hasOrgLogo) {
353
				$("#companyImg").attr("src", "/images/org/" + $da.id + ".jpg");
354
			}else{
355
				$("#companyImg").attr("src", "/images/default-icon.jpg");
356
			}
357
			if($da.authStatus==3){
358
				$("#QauthFlag").addClass("authicon-com-ok").attr("title", "认证企业");	
359
			}
360
			$("#Qname").text($da.name);
361
			$("#Qindustry").text($da.subject);
362
			$("#QorgType").text(orgTypeShow[$da.orgType])
363
			$(".qiyego").attr('dataid',$da.id);
364
			if(userid){
365
				ifcollectionAbout($da.id,$("#enterprise").find(".attenSpan"), 6)
366
			}
354
					$("#enterprise,#resPerson").show();
355
					if($da.hasOrgLogo) {
356
						$("#companyImg").attr("src", "/images/org/" + $da.id + ".jpg");
357
					} else {
358
						$("#companyImg").attr("src", "/images/default-icon.jpg");
359
					}
360
					if($da.authStatus == 3) {
361
						$("#QauthFlag").addClass("authicon-com-ok").attr("title", "认证企业");
362
					}
363
					$("#Qname").text($da.name);
364
					if($da.industry) {
365
						$("#Qindustry").text($da.industry.replace(/,/gi, " | "));
366
					}
367
					$(".qiyego").attr('dataid', $da.id);
368
					$(".qiyego").attr("href", "cmpInforShow.html?orgId=" + $da.id);
369
					if(userid) {
370
						ifcollectionAbout($da.id, $("#enterprise").find(".attenSpan"), 6)
371
					}
367 372
				}
368 373
			},
369 374
			error: function(XMLHttpRequest, textStats, errorThrown) {
370 375
				$.MsgBox.Alert('提示', '服务器请求失败')
371 376
			}
372 377
		})
373
}
374
	$("#expertli").on("click",function() {
378
	}
379
	$("#expertli").on("click", function() {
375 380
		location.href = "userInforShow.html?professorId=" + $(this).attr("data-id");
376 381
	})
377 382
	//纠错反馈
378
	$(".correctSubmit").on("click",function(){
379
		var cntCon=$(this).siblings(".correctCon").val();
380
		var cntUser="";
383
	$(".correctSubmit").on("click", function() {
384
		var cntCon = $(this).siblings(".correctCon").val();
385
		var cntUser = "";
381 386
		if(userid && userid != null && userid != "null") {
382 387
			cntUser = userid;
383 388
		}
384
		if(cntCon.length>500){
389
		if(cntCon.length > 500) {
385 390
			$.MsgBox.Alert('提示', '纠错反馈内容不得超过500个字');
386 391
			return;
387
		}else{
392
		} else {
388 393
			$.ajax({
389 394
				"url": "/ajax/feedback/error/product",
390 395
				"type": "POST",
@ -392,8 +397,8 @@ $(document).ready(function() {
392 397
				"async": true,
393 398
				"data": {
394 399
					"id": resourceId,
395
					"cnt":cntCon,
396
					"user":cntUser
400
					"cnt": cntCon,
401
					"user": cntUser
397 402
				},
398 403
				"success": function(data) {
399 404
					if(data.success) {
@ -420,41 +425,44 @@ $(document).ready(function() {
420 425
			"success": function(data) {
421 426
				if(data.success) {
422 427
					if(data.data.length > 0) {
423
						var $data=data.data;
428
						var $data = data.data;
424 429
						$("#oArticle").parents(".otherShow").removeClass("displayNone");
425 430
						for(var i = 0; i < $data.length; i++) {
426
							var str = "",ovel="";
431
							var str = "",
432
								ovel = "";
427 433
							/*if($data[i].pageViews) {
428 434
								ovel="阅读量 "+$data[i].pageViews;
429 435
							}*/
430 436
							str += '<li data-id="' + $data[i].articleId + '" data-createTime="' + $data[i].createTime + '" data-shareId="' + $data[i].shareId + '"><a class="flexCenter OflexCenter">'
431
							if( $data[i].articleImg) {
432
								str += '<div class="madiaHead artHead" style="background-image: url(/data/article/' +  $data[i].articleImg + ')"></div>'
437
							if($data[i].articleImg) {
438
								str += '<div class="madiaHead artHead" style="background-image: url(/data/article/' + $data[i].articleImg + ')"></div>'
433 439
							} else {
434 440
								str += '<div class="madiaHead artHead"></div>'
435 441
							}
436 442
							str += '<div class="madiaInfo"  style="margin-top:18px;padding-bottom:8px">'
437
							str += '<p class="h1Font ellipsisSty">' +  $data[i].articleTitle + '</p>'
438
							str += '<p class="h2Font"><span class=" name" style="margin-right:10px"></span><span class="time" style="margin-right:10px;">' + commenTime( $data[i].publishTime) + '</span></p>'
443
							str += '<p class="h1Font ellipsisSty">' + $data[i].articleTitle + '</p>'
444
							str += '<p class="h2Font"><span class=" name" style="margin-right:10px"></span><span class="time" style="margin-right:10px;">' + commenTime($data[i].publishTime) + '</span></p>'
439 445
							str += '</div></a></li>'
440 446
							//<span class="yue" style="margin-right:10px">'+ovel+'</span><span class="zan" style="margin-right:10px"></span><span class="leword"></span>
441
							var $str=$(str);
447
							var $str = $(str);
442 448
							$("#oArticle").append($str);
443
							(function($str,i) {
444
								if($data[i].articleType=="1") {
449
							(function($str, i) {
450
								if($data[i].articleType == "1") {
445 451
									ajaxRequist("/ajax/professor/baseInfo/" + $data[i].ownerId, {}, "get", function(data) {
446 452
										$str.find(".name").text(data.data.name);
447 453
									})
448
								}else if($data[i].articleType=="2"){
454
								} else if($data[i].articleType == "2") {
449 455
									ajaxRequist("/ajax/org/" + $data[i].ownerId, {}, "get", function(data) {
450 456
										if(data.data.forShort) {
451 457
											$str.find(".name").text(data.data.forShort);
452
										}else{
458
										} else {
453 459
											$str.find(".name").text(data.data.name);
454 460
										}
455 461
									})
456
								}else if($data[i].articleType=="3"){
457
									ajaxRequist("/ajax/platform/info", {id:$data[i].ownerId}, "get", function(data) {
462
								} else if($data[i].articleType == "3") {
463
									ajaxRequist("/ajax/platform/info", {
464
										id: $data[i].ownerId
465
									}, "get", function(data) {
458 466
										$str.find(".name").text(data.data.name);
459 467
									})
460 468
								}
@ -466,7 +474,7 @@ $(document).ready(function() {
466 474
											$str.find(".leword").text('留言 ' + data.data);
467 475
										}
468 476
									})*/
469
							})($str,i)
477
							})($str, i)
470 478
						}
471 479
					}
472 480
				}
@ -484,5 +492,5 @@ $(document).ready(function() {
484 492
		};
485 493
		location.href = "/" + pageUrl('a', oArticle)
486 494
	})
487
	
488
})
495

496
})

+ 3 - 2
js/resourcePreview.js

@ -88,8 +88,9 @@ $(document).ready(function() {
88 88
				$("#QauthFlag").addClass("authicon-com-ok").attr("title", "认证企业");	
89 89
			}
90 90
			$("#Qname").text($da.organization.name);
91
			$("#Qindustry").text($da.organization.subject);
92
			$("#QorgType").text(orgTypeShow[$da.organization.orgType])
91
			if($da.organization.industry) {
92
				$("#Qindustry").text($da.organization.industry.replace(/,/gi, " | "));
93
			}
93 94
		}
94 95
		if($da.spec) { //厂商型号
95 96
			$("#modelNumber").text($da.spec).parents("li").show();

+ 3 - 2
js/resourceShow.js

@ -161,8 +161,9 @@ $(document).ready(function() {
161 161
				$("#Qname").text($da.organization.name).attr("href","cmpInforShow.html?orgId="+$da.organization.id);
162 162
			}
163 163
			
164
			$("#Qindustry").text($da.organization.industry);
165
			$("#QorgType").text(orgTypeShow[$da.organization.orgType])
164
			if($da.organization.industry) {
165
				$("#Qindustry").text($da.organization.industry.replace(/,/gi, " | "));
166
			}
166 167
			if(userid){
167 168
				ifcollectionAbout($da.organization.id,$("#enterprise").find(".attenSpan"), 6)
168 169
			}

+ 3 - 2
js/sevricePreview.js

@ -132,8 +132,9 @@ $(document).ready(function() {
132 132
					$("#Qname").text($da.organization.name).attr("href", "cmpInforShow.html?orgId=" + $da.organization.id);
133 133
				}
134 134

135
				$("#Qindustry").text($da.organization.industry);
136
				$("#QorgType").text(orgTypeShow[$da.organization.orgType])
135
				if($da.organization.industry) {
136
					$("#Qindustry").text($da.organization.industry.replace(/,/gi, " | "));
137
				}
137 138
				if(userid) {
138 139
					ifcollectionAbout($da.organization.id, $("#enterprise").find(".attenSpan"), 6)
139 140
				}

+ 3 - 2
js/sevriceShow.js

@ -175,8 +175,9 @@ $(document).ready(function() {
175 175
					$("#Qname").text($da.organization.name).attr("href", "cmpInforShow.html?orgId=" + $da.organization.id);
176 176
				}
177 177

178
				$("#Qindustry").text($da.organization.industry);
179
				$("#QorgType").text(orgTypeShow[$da.organization.orgType])
178
				if($da.organization.industry) {
179
					$("#Qindustry").text($da.organization.industry.replace(/,/gi, " | "));
180
				}
180 181
				if(userid) {
181 182
					ifcollectionAbout($da.organization.id, $("#enterprise").find(".attenSpan"), 6)
182 183
				}

+ 1 - 2
productPreview.html

@ -4,7 +4,7 @@
4 4
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
5 5
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
6 6
<meta http-equiv="X-UA-Compatible" content="IE=edge">
7
<title>浏览资源-科袖网</title>
7
<title>浏览产品-科袖网</title>
8 8
<link rel="shortcut icon" type="image/x-icon" href="images/favicon.png" media="screen" />
9 9
<link href="css/bootstrap.min.css" rel="stylesheet">
10 10
<link type="text/css" href="css/common.css" rel="stylesheet">
@ -110,7 +110,6 @@
110 110
							<span class="authiconNew" title="" id="QauthFlag"></span>
111 111
						</div>
112 112
						<p class="h2Font ellipsisSty" id="Qindustry"></p>
113
						<p class="h2Font" id="QorgType"></p>
114 113
					</div>
115 114
				</div>
116 115
				<div class="conItem displayNone" id="resPerson">

+ 1 - 20
productShow.html

@ -4,7 +4,7 @@
4 4
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
5 5
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
6 6
<meta http-equiv="X-UA-Compatible" content="IE=edge">
7
<title>浏览资源-科袖网</title>
7
<title>浏览产品-科袖网</title>
8 8
<link rel="shortcut icon" type="image/x-icon" href="images/favicon.png" media="screen" />
9 9
<link href="css/bootstrap.min.css" rel="stylesheet">
10 10
<link type="text/css" href="css/common.css" rel="stylesheet">
@ -113,24 +113,6 @@
113 113
				</div>
114 114
			</div>
115 115
			<div class="rightconBox floatR">
116
				<div class="conItem conItemG alignCenter displayNone" id="person">
117
					<div class="madiaHead useHead" id="headImg" style="cursor:pointer"></div>
118
					<div class="proInfo">
119
						<div class="h3Font clearfix">
120
							<span class="h1Font" id="nameS" style="cursor:pointer"></span>
121
							<span class="authiconNew" title="" id="authFlag"></span>
122
						</div>
123
						<p class="h2Font" id="titleOffice"></p>
124
						<p class="h2Font" id="orgType"></p>
125
					</div>
126
					<div class="form-item otherBlock currentBlock displayNone">
127
						<div class="aboutTit">热门资源</div>
128
						<div class="form-result currentArt">
129
							<ul class="recentlyList">
130
							</ul>
131
						</div>
132
					</div>	
133
				</div>
134 116
				<div class="conItem conItemG alignCenter displayNone" id="enterprise">
135 117
					<a href="" class="qiyego">
136 118
						<div class="madiaHead cmpHead" id="Qimg">
@ -145,7 +127,6 @@
145 127
							<span class="authiconNew" title="" id="QauthFlag"></span>
146 128
						</div>
147 129
						<p class="h2Font ellipsisSty" id="Qindustry"></p>
148
						<p class="h2Font" id="QorgType"></p>
149 130
					</div>
150 131
					<div class="goSpan">
151 132
						<span class="attenSpan">关注</span>

+ 0 - 1
resourcePreview.html

@ -121,7 +121,6 @@
121 121
							<span class="authiconNew" title="" id="QauthFlag"></span>
122 122
						</div>
123 123
						<p class="h2Font ellipsisSty" id="Qindustry"></p>
124
						<p class="h2Font" id="QorgType"></p>
125 124
					</div>
126 125
				</div>
127 126
				<div class="conItem displayNone" id="resPerson">

+ 0 - 1
resourceShow.html

@ -166,7 +166,6 @@
166 166
							<span class="authiconNew" title="" id="QauthFlag"></span>
167 167
						</div>
168 168
						<p class="h2Font ellipsisSty" id="Qindustry"></p>
169
						<p class="h2Font" id="QorgType"></p>
170 169
					</div>
171 170
					<div class="goSpan">
172 171
						<span class="attenSpan">关注</span>

+ 0 - 1
sevricePreview.html

@ -106,7 +106,6 @@
106 106
							<span class="authiconNew" title="" id="QauthFlag"></span>
107 107
						</div>
108 108
						<p class="h2Font ellipsisSty" id="Qindustry"></p>
109
						<p class="h2Font" id="QorgType"></p>
110 109
					</div>
111 110
					
112 111
					<div class="form-item otherBlock currentBlock displayNone">

+ 0 - 1
sevriceShow.html

@ -151,7 +151,6 @@
151 151
							<span class="authiconNew" title="" id="QauthFlag"></span>
152 152
						</div>
153 153
						<p class="h2Font ellipsisSty" id="Qindustry"></p>
154
						<p class="h2Font" id="QorgType"></p>
155 154
					</div>
156 155
					<div class="goSpan">
157 156
						<span class="attenSpan">关注</span>