Parcourir la Source

文章接口变动

XMTT 7 ans auparavant
Parent
commit
84cebf3dc1

+ 3 - 2
cmp-portal/js/articalIssue.js

@ -463,7 +463,8 @@ function getAttrId() {
463 463
		}
464 464
		expertli(); //相关专家
465 465
		resourcesli(); //相关咨询
466
		$data.onergId = orgId;
466
		$data.ownenerId = orgId;
467
        $data.articleType = "2";
467 468
		if($("#companys li").length) {
468 469
			$data.orgs = getAttrId.call($("#companys li"));
469 470
		}
@ -745,4 +746,4 @@ function getAttrId() {
745 746
		$(this).parent("ul").html("")
746 747
	})
747 748
}
748
});
749
});

+ 5 - 5
cmp-portal/js/articalModify.js

@ -517,8 +517,8 @@ releventService()
517 517
			$(".imgtis").text("");
518 518
			imgflase = true;
519 519
		}*/
520
		if(newstitle==""){
521
			$.MsgBox.Alert('提示', '请输入文章标题')
520
		if(newstitle==""){
521
			$.MsgBox.Alert('提示', '请输入文章标题')
522 522
			return;
523 523
		}else{
524 524
			$("#aboutTit span").text("");
@ -681,7 +681,7 @@ releventService()
681 681
		}
682 682
		expertli(); //相关专家
683 683
		resourcesli(); //相关咨询
684
		$data.onergId = orgId;
684
		$data.ownenerId = orgId;
685 685
		$data.articleId=articleId;
686 686
		if($("#companys li").length) {
687 687
			$data.orgs = getAttrId.call($("#companys li"));
@ -861,7 +861,7 @@ releventService()
861 861
 /*添加相关企业*/
862 862
relatCompanies("#company");
863 863
    /*添加相关企业*/
864
    function  relatCompanies(sel) {
864
    function  relatCompanies(sel) {
865 865
	$(sel).bind({
866 866
		paste: function(e) {
867 867
			var pastedText;
@ -1009,4 +1009,4 @@ relatCompanies("#company");
1009 1009
			}
1010 1010
		})
1011 1011
	}
1012
});
1012
});

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

@ -38,11 +38,13 @@ $(function() {
38 38
function articalList(pageSize, pageNo, isbind, num) {
39 39
	var $data = {};
40 40
	if(num == 1) {
41
		$data.onergId = orgId;
41
		$data.ownenerId = orgId;
42
        $data.articleType = "2";
42 43
		$data.pageSize = pageSize;
43 44
		$data.pageNo = pageNo;
44 45
	} else {
45
		$data.onergId = orgId;
46
		$data.ownenerId = orgId;
47
        $data.articleType = "2";
46 48
		$data.pageSize = pageSize;
47 49
		$data.pageNo = pageNo;
48 50
		$data.articleTitle = $("#articleSearch").val();

+ 3 - 2
js/articalIssue.js

@ -360,7 +360,8 @@ $(function() {
360 360
		}
361 361
		expertli(); //相关专家
362 362
		resourcesli(); //相关咨询
363
		$data.professorId = userid;
363
		$data.ownerId = userid;
364
        $data.articleType = "1";
364 365
		$data.articleTitle = $("#newstitle").val();
365 366
		$data.subject = industryAll;
366 367
		$data.articleImg = $("#uploader").attr("data-id");
@ -592,4 +593,4 @@ $(function() {
592 593
			}
593 594
		}
594 595
	})
595
});
596
});

+ 4 - 2
js/articalList.js

@ -34,11 +34,13 @@ $(function() {
34 34
function articalList(pageSize, pageNo, isbind, num) {
35 35
	var $data = {};
36 36
	if(num == 1) {
37
		$data.professorId = userid;
37
		$data.ownerId = userid;
38
        $data.articleType = "1";
38 39
		$data.pageSize = pageSize;
39 40
		$data.pageNo = pageNo;
40 41
	} else {
41
		$data.professorId = userid;
42
		$data.ownerId = userid;
43
        $data.articleType = "1";
42 44
		$data.pageSize = pageSize;
43 45
		$data.pageNo = pageNo;
44 46
		$data.articleTitle = $("#articleSearch").val();

+ 3 - 3
js/articalModify.js

@ -404,7 +404,7 @@ $(function() {
404 404
			imgflase = true;
405 405
		}*/
406 406
		if(newstitle==""){
407
			$.MsgBox.Alert('提示', '请输入文章标题')
407
			$.MsgBox.Alert('提示', '请输入文章标题')
408 408
			return;
409 409
		}else{
410 410
			$("#aboutTit span").text("");
@ -526,7 +526,7 @@ $(function() {
526 526
		expertli();//相关专家
527 527
		resourcesli();//相关咨询
528 528
	    $data.articleId = articleId;
529
		$data.professorId = userid;
529
		$data.ownerId = userid;
530 530
		$data.articleTitle = $("#newstitle").val();
531 531
		$data.subject = industryAll;
532 532
		$data.articleImg = $("#uploader").attr("data-id");
@ -789,4 +789,4 @@ $(function() {
789 789
				})
790 790
		}
791 791
	})
792
});
792
});

+ 30 - 2
js/articalPreview.js

@ -104,13 +104,17 @@ $(function() {
104 104
					$("#tagList").text(industryShow(data.data.subject));
105 105
					if(data.data.articleType==1){
106 106
						$("#expert").removeClass("displayNone");
107
						expert(data.data.professorId);
107
						expert(data.data.ownerId);
108 108
					}
109 109
					if(data.data.articleType==2){
110 110
						$("#enterprise").removeClass("displayNone");
111
						cmpFun(data.data.onergId);
111
						cmpFun(data.data.ownenerId);
112 112
						companylist();
113 113
					}
114
                    if(data.data.articleType==3){
115
                        $("#enterprise").removeClass("displayNone");
116
                        platform(data.data.ownerId);
117
                    }
114 118
				}
115 119
				var articletitle = data.data.articleTitle + "-科袖网";
116 120
				window.setTimeout(function() {
@ -182,6 +186,30 @@ $(function() {
182 186
			}
183 187
		});
184 188
	}
189

190
	/*平台信息*/
191
    function platform(platform) {
192
        $.ajax({
193
            "url": "/ajax/platform/info",
194
			"data":{id: platform},
195
            "type": "get",
196
            "dataType" : "json",
197
            "success": function(data) {
198
                if(data.success && data.data) {
199
                    $("#Qname").text(data.data.name);
200
                    if(data.data.logo!=null) {
201
                        $("#companyImg").attr("src", "/data/platform" + data.data.logo);
202
                    }else{
203
                        $("#companyImg").attr("src", "/images/default-plat.jpg");
204
                    }
205
                    $("#Qindustry").text(QindustryShow(data.data.industry));
206
                }
207
            },
208
            "error": function() {
209
                $.MsgBox.Alert('提示', '链接服务器超时')
210
            }
211
        });
212
    }
185 213
	
186 214
	
187 215
	//相关专家

+ 103 - 16
js/articalShow.js

@ -87,6 +87,47 @@ $(document).ready(function() {
87 87
			}
88 88
		});
89 89
	}
90
    //平台最近文章
91
    function platfromRecentlyArticle(obj) {
92
        $.ajax({
93
            "url" :"/ajax/article/pageQuery" ,
94
            "type" :  "GET" ,
95
            "dataType" : "json",
96
            "data" :{ownerId:obj,articleType:'3',status:'1'},
97
            "success" : function(data) {
98
                if (data.success){
99
                    var $data=data.data.data;
100
                    console.log($data);
101
                    var only=false;
102
                    if($data.length>1){
103
                        $(".recentlyList").parents(".currentBlock").removeClass("displayNone");
104
                        var oLeng=$data.length<5?$data.length:5;
105
                        for(var i=0;i<oLeng;i++) {
106
                            if(articleId==$data[i].articleId) {
107
                                only=true;
108
                                continue;
109
                            }
110
                            if(only==true) {
111
                                if(oLeng<5) {
112

113
                                }else{
114
                                    oLeng=6;
115
                                }
116
                            }
117
                            var listLi=$('<li class="flexCenter"></li>').appendTo($(".recentlyList"));
118
                            var str='<a href="/'+pageUrl('a',$data[i])+'"><p class="h2Font ellipsisSty-2"><em class="circlePre"></em>'+$data[i].articleTitle+'</p>'+
119
                                '<span class="smalltip">'+commenTime($data[i].publishTime)+'</span></a></li>'
120
                            $(str).appendTo(listLi);
121
                        }
122
                    }
123
                }
124

125
            },
126
            "error":function(){
127
                $.MsgBox.Alert('提示','链接服务器超时')
128
            }
129
        });
130
    }
90 131
	//初始化文章内容
91 132
	function articleshow(){
92 133
		$.ajax({
@ -116,16 +157,22 @@ $(document).ready(function() {
116 157
					ifcollectionAbout(articleId,$("#attention").find("em"), 3)
117 158
					if(data.data.articleType==1){
118 159
						$("#expert").removeClass("displayNone");
119
						relevantarticalList(data.data.professorId,1);
120
						expert(data.data.professorId);
121
						recentlyArticle(2,{"professorId":data.data.professorId}) 
160
						relevantarticalList(data.data.ownerId);
161
						expert(data.data.ownerId);
162
						recentlyArticle(2,{"ownerId":data.data.ownerId})
122 163
					}
123 164
					if(data.data.articleType==2){
124 165
						$("#enterprise").removeClass("displayNone");
125
						relevantarticalList(data.data.orgId,2);
126
						cmpFun(data.data.onergId);
166
						relevantarticalList(data.data.ownerId);
167
						cmpFun(data.data.ownenerId);
127 168
						companylist();
128
						recentlyArticle(1,{"onergId":data.data.onergId});
169
						recentlyArticle(1,{"ownenerId":data.data.ownenerId});
170
					}
171
					if(data.data.articleType==3){
172
						$("#enterprise").removeClass("displayNone");
173
						relevantarticalList(data.data.ownerId);
174
						platform(data.data.ownerId);
175
                        platfromRecentlyArticle(data.data.ownerId);
129 176
					}
130 177
					var weibotitle = data.data.articleTitle;
131 178
					var weibourl =window.location.href;
@ -237,6 +284,35 @@ $(document).ready(function() {
237 284
			}
238 285
		});
239 286
	}
287
    function platform(platformId) {
288
        $.ajax({
289
            "url": "/ajax/platform/info",
290
			"data":{id:platformId},
291
            "type": "get",
292
            "dataType" : "json",
293
            "success": function(data) {
294
                if(data.success && data.data) {
295
                    $(".userimg").removeClass("useHead");
296
					$("#Qname,.username").text(data.data.name);
297
                    $("#Qname").attr("dataid",data.data.id);
298
                    $(".qiyego,.useurl").attr("href", "javascript:void(0)");
299
                    $(".qiyego,.useurl").css("cursor", "default");
300
                    if(data.data.logo!=null) {
301
                        $(".userimg").attr("style", "background: #fff;");
302
                        $(".userimg").html('<div class="boxBlock" style="width:50px;height:50px"><img class="boxBlockimg" src="" id="companyImg2"></div>');
303
                        $("#companyImg,#companyImg2").attr("src", "/data/platform" + data.data.logo);
304
                    }else{
305
                        $("#companyImg,#companyImg2").attr("src", "/images/default-plat.jpg");
306
                    }
307
                    $("#Qindustry").text(QindustryShow(data.data.industry));
308
                    $("#enterprise").find(".attenSpan").hide();
309
                }
310
            },
311
            "error": function() {
312
                $.MsgBox.Alert('提示', '链接服务器超时')
313
            }
314
        });
315
    }
240 316

241 317
	//相关专家
242 318
	function relevantExperts(){
@ -579,14 +655,9 @@ $(document).ready(function() {
579 655
	
580 656
	}
581 657
	//相关文章信息
582
	function relevantarticalList(id,num){
658
	function relevantarticalList(id){
583 659
	    keysli();
584
		if(num==1){
585
			var data = {"keys":experarray,"professorId":id,"articleId":articleId,"rows":10}	
586
		}
587
		if(num==2){
588
			var data = {"keys":experarray,"orgId":id,"articleId":articleId,"rows":10}	
589
		}
660
		var data = {"keys":experarray,"ownerId":id,"articleId":articleId,"rows":10}
590 661
		$.ajax({
591 662
			"url" : "/ajax/article/ralateArticles",
592 663
			"type" :  "GET" ,
@ -618,7 +689,7 @@ $(document).ready(function() {
618 689
							$itemlist.find(".time").text(commenTime(datalist.publishTime))
619 690
							if(datalist.articleType==1){
620 691
								$.ajax({
621
									"url" : "/ajax/professor/baseInfo/"+datalist.professorId,
692
									"url" : "/ajax/professor/baseInfo/"+datalist.ownerId,
622 693
									"type" :  "GET" ,
623 694
									"dataType" : "json",
624 695
									"async":false,
@ -635,12 +706,11 @@ $(document).ready(function() {
635 706
							}
636 707
							if(datalist.articleType==2){
637 708
								$.ajax({
638
									"url" : "/ajax/org/"+datalist.onergId,
709
									"url" : "/ajax/org/"+datalist.ownenerId,
639 710
									"type" :  "GET" ,
640 711
									"dataType" : "json",
641 712
									"async":false,
642 713
									"success" : function($data) {
643
										console.log($data)
644 714
										if ($data.success && $data.data){
645 715
											if($data.data.forShort){
646 716
												$itemlist.find(".username2").text($data.data.forShort);
@ -654,6 +724,23 @@ $(document).ready(function() {
654 724
									}
655 725
								});
656 726
							}
727
							if(datalist.articleType==3){
728
								$.ajax({
729
									"url" : "/ajax/platform/info",
730
									"data":{id:datalist.ownerId},
731
									"type" :  "GET" ,
732
									"dataType" : "json",
733
									"async":false,
734
									"success" : function($data) {
735
										if ($data.success && $data.data){
736
											$itemlist.find(".username2").text($data.data.name);
737
										}
738
									},
739
									"error":function(){
740
										$.MsgBox.Alert('提示','链接服务器超时')
741
									}
742
								});
743
							}
657 744
							
658 745
					}
659 746
				}

+ 109 - 17
js/articalShow2.js

@ -88,6 +88,47 @@ $(document).ready(function() {
88 88
			}
89 89
		});
90 90
	}
91
    //平台最近文章
92
    function platfromRecentlyArticle(obj) {
93
        $.ajax({
94
            "url" :"/ajax/article/pageQuery" ,
95
            "type" :  "GET" ,
96
            "dataType" : "json",
97
            "data" :{ownerId:obj,articleType:'3',status:'1'},
98
            "success" : function(data) {
99
                if (data.success){
100
                    var $data=data.data.data;
101
                    var only=false;
102
                    if($data.length>1){
103
                        $(".recentlyList").parents(".currentBlock").removeClass("displayNone");
104
                        var oLeng=$data.length<5?$data.length:5;
105
                        for(var i=0;i<oLeng;i++) {
106
                            if(articleId==$data[i].articleId) {
107
                                only=true;
108
                                continue;
109
                            }
110
                            if(only==true) {
111
                                if(oLeng<5) {
112

113
                                }else{
114
                                    oLeng=6;
115
                                }
116

117
                            }
118
                            var listLi=$('<li class="flexCenter"></li>').appendTo($(".recentlyList"));
119
                            var str='<a href="/'+pageUrl('a',$data[i])+'"><p class="h2Font ellipsisSty-2"><em class="circlePre"></em>'+$data[i].articleTitle+'</p>'+
120
                                '<span class="smalltip">'+commenTime($data[i].publishTime)+'</span></a></li>'
121
                            $(str).appendTo(listLi);
122
                        }
123
                    }
124
                }
125

126
            },
127
            "error":function(){
128
                $.MsgBox.Alert('提示','链接服务器超时')
129
            }
130
        });
131
    }
91 132
	//初始化文章内容
92 133
	function articleshow(){
93 134
		$("#articleContent").html(window.staticPageData.articleContent);
@ -117,17 +158,23 @@ $(document).ready(function() {
117 158
					ifcollectionAbout(articleId,$("#attention").find("em"), 3)
118 159
					if(data.data.articleType==1){
119 160
						$("#expert").removeClass("displayNone");
120
						relevantarticalList(data.data.professorId,1);
121
						expert(data.data.professorId);
122
						recentlyArticle(2,{"professorId":data.data.professorId}) 
161
						relevantarticalList(data.data.ownerId);
162
						expert(data.data.ownerId);
163
						recentlyArticle(2,{"ownerId":data.data.ownerId})
123 164
					}
124 165
					if(data.data.articleType==2){
125 166
						$("#enterprise").removeClass("displayNone");
126
						relevantarticalList(data.data.orgId,2);
127
						cmpFun(data.data.onergId);
167
						relevantarticalList(data.data.ownerId);
168
						cmpFun(data.data.ownenerId);
128 169
						companylist();
129
						recentlyArticle(1,{"onergId":data.data.onergId});
170
						recentlyArticle(1,{"ownenerId":data.data.ownenerId});
130 171
					}
172
                    if(data.data.articleType==3){
173
                        $("#enterprise").removeClass("displayNone");
174
                        relevantarticalList(data.data.ownerId);
175
                        platform(data.data.ownerId);
176
                        platfromRecentlyArticle(data.data.ownerId);
177
                    }
131 178
					var weibotitle = data.data.articleTitle;
132 179
					var weibourl =window.location.href;
133 180
					var weibopic ="http://"+window.location.host+"/data/article/" + data.data.articleImg;
@ -238,8 +285,42 @@ $(document).ready(function() {
238 285
			}
239 286
		});
240 287
	}
288
    function platform(platformId) {
289
        $.ajax({
290
            "url": "/ajax/platform/info",
291
            "data":{id:platformId},
292
            "type": "get",
293
            "dataType" : "json",
294
            "success": function(data) {
295
                if(data.success && data.data) {
296
                    $(".userimg").removeClass("useHead");
297
                    if(data.data.forShort) {
298
                        $("#Qname,.username").text(data.data.forShort);
299
                    }else{
300
                        $("#Qname,.username").text(data.data.name);
301
                    }
302
                    $("#Qname").attr("dataid",data.data.id);
303
                    $(".qiyego,.useurl").attr("href", "javascript:void(0)");
304
                    $(".qiyego,.useurl").css("cursor", "default");
305
                    if(data.data.logo!=null) {
306
                        $(".userimg").attr("style","background: #fff;")
307
                        $(".userimg").html('<div class="boxBlock" style="width:50px;height:50px"><img class="boxBlockimg" src="" id="companyImg2"></div>');
308
                        $("#companyImg,#companyImg2").attr("src", "/data/platform" + data.data.logo);
309
                    }else{
310
                        $("#companyImg,#companyImg2").attr("src", "/images/default-plat.jpg");
311
                    }
312
                    $("#Qindustry").text(QindustryShow(data.data.industry));
313
                    $("#enterprise").find(".attenSpan").hide();
314
                }
315
            },
316
            "error": function() {
317
                $.MsgBox.Alert('提示', '链接服务器超时')
318
            }
319
        });
320
    }
241 321

242
	//相关专家
322

323
    //相关专家
243 324
	function relevantExperts(){
244 325
		$.ajax({
245 326
			"url": "/ajax/article/ralatePro",
@ -580,14 +661,9 @@ $(document).ready(function() {
580 661
	
581 662
	}
582 663
	//相关文章信息
583
	function relevantarticalList(id,num){
664
	function relevantarticalList(id){
584 665
	    keysli();
585
		if(num==1){
586
			var data = {"keys":experarray,"professorId":id,"articleId":articleId,"rows":10}	
587
		}
588
		if(num==2){
589
			var data = {"keys":experarray,"orgId":id,"articleId":articleId,"rows":10}	
590
		}
666
		var data = {"keys":experarray,"ownerId":id,"articleId":articleId,"rows":10}
591 667
		$.ajax({
592 668
			"url" : "/ajax/article/ralateArticles",
593 669
			"type" :  "GET" ,
@ -619,7 +695,7 @@ $(document).ready(function() {
619 695
							$itemlist.find(".time").text(commenTime(datalist.publishTime))
620 696
							if(datalist.articleType==1){
621 697
								$.ajax({
622
									"url" : "/ajax/professor/baseInfo/"+datalist.professorId,
698
									"url" : "/ajax/professor/baseInfo/"+datalist.ownerId,
623 699
									"type" :  "GET" ,
624 700
									"dataType" : "json",
625 701
									"async":false,
@ -636,12 +712,11 @@ $(document).ready(function() {
636 712
							}
637 713
							if(datalist.articleType==2){
638 714
								$.ajax({
639
									"url" : "/ajax/org/"+datalist.onergId,
715
									"url" : "/ajax/org/"+datalist.ownenerId,
640 716
									"type" :  "GET" ,
641 717
									"dataType" : "json",
642 718
									"async":false,
643 719
									"success" : function($data) {
644
										console.log($data)
645 720
										if ($data.success && $data.data){
646 721
											if($data.data.forShort){
647 722
												$itemlist.find(".username2").text($data.data.forShort);
@ -655,6 +730,23 @@ $(document).ready(function() {
655 730
									}
656 731
								});
657 732
							}
733
							if(datalist.articleType==3){
734
								$.ajax({
735
									"url" : "/ajax/platform/info",
736
									"data":{id:datalist.ownerId},
737
									"type" :  "GET" ,
738
									"dataType" : "json",
739
									"async":false,
740
									"success" : function($data) {
741
										if ($data.success && $data.data){
742
											$itemlist.find(".username2").text($data.data.name);
743
										}
744
									},
745
									"error":function(){
746
										$.MsgBox.Alert('提示','链接服务器超时')
747
									}
748
								});
749
							}
658 750
							
659 751
					}
660 752
				}

+ 31 - 9
js/discover.js

@ -623,9 +623,11 @@ $(function() {
623 623
		listLi.append( $strAdd);
624 624
		leaveMsgCount(dataStr.articleId,1, $strAdd);
625 625
		if(dataStr.articleType==1){
626
			userFun(dataStr.professorId, $strAdd);
627
		}else{
628
			cmpFun(dataStr.onergId, $strAdd);
626
			userFun(dataStr.ownerId, $strAdd);
627
		}else if(dataStr.articleType==2){
628
			cmpFun(dataStr.ownenerId, $strAdd);
629
		}else if(dataStr.articleType==3){
630
            platform(dataStr.ownerId, $strAdd);
629 631
		}
630 632
	}
631 633

@ -676,9 +678,11 @@ $(function() {
676 678
		listLi.append($strAdd);
677 679
		leaveMsgCount(dataStr.articleId,1, $strAdd);
678 680
		if(dataStr.articleType==1){
679
			userFun(dataStr.professorId, $strAdd);
680
		}else{
681
			cmpFun(dataStr.onergId, $strAdd);
681
			userFun(dataStr.ownerId, $strAdd);
682
		}else if(dataStr.articleType==2){
683
			cmpFun(dataStr.ownenerId, $strAdd);
684
		}else if(dataStr.articleType==3){
685
			platform(dataStr.ownerId, $strAdd);
682 686
		}
683 687
	}
684 688
	
@ -856,10 +860,28 @@ $(function() {
856 860
			}
857 861
		});
858 862
	}
863

864
	/*平台信息*/
865
    function platform(id,$listItem) {
866
        $.ajax({
867
            "url": "/ajax/platform/info",
868
            "data":{id:id},
869
            "type": "get",
870
            "async": true,
871
            "success": function(data) {
872
                if(data.success && data.data) {
873
                    $listItem.find(".ownerName").text(data.data.name);
874
                }
875
            },
876
            "error": function() {
877
                $.MsgBox.Alert('提示', '链接服务器超时')
878
            }
879
        });
880
    }
859 881
	
860 882
	function rightAllCon(){
861
		$.ajax({
862
			type:"get",
883
		$.ajax({
884
			type:"get",
863 885
			url:"/ajax/professor/editBaseInfo/"+userid,
864 886
			success:function(data){
865 887
				if(data.success){
@ -873,7 +895,7 @@ $(function() {
873 895
							'<div class="h2Font">'+dataStr.name+'<span class="authiconNew ' + userType.sty + '" title="' + userType.title + '"></span></div>'
874 896
					$(".onlogined .owener-info").html(str)
875 897
				}
876
			}
898
			}
877 899
		});
878 900
		$.ajax({
879 901
			url: "/ajax/article/pqProPublish",

+ 12 - 6
js/resourceShow.js

@ -277,16 +277,18 @@ $(document).ready(function() {
277 277
	function relatedArticlesHtml($html) {
278 278
		var oURL;
279 279
		if($html.articleType==1) {
280
			oURL="/ajax/professor/baseInfo/" + $html.professorId;
281
		}else{
282
			oURL="/ajax/org/" + $html.onergId;
280
			oURL="/ajax/professor/baseInfo/" + $html.ownerId;
281
		}else if($html.articleType==2) {
282
			oURL="/ajax/org/" + $html.ownenerId;
283
		}else if($html.articleType==2) {
284
			oURL="/ajax/platform/info";
283 285
		}
284 286
		$.ajax({
285 287
			"url":oURL,
288
			"data":{id:$html.ownerId},
286 289
			"type": "GET",
287 290
			"success": function(data) {
288 291
				if(data.success) {
289
					console.log(data)
290 292
					var cmpname="";
291 293
					if(data.data.forShort){
292 294
						cmpname=data.data.forShort;
@ -295,7 +297,7 @@ $(document).ready(function() {
295 297
					}
296 298
					if($html.articleType==1) {
297 299
						var stl = autho(data.data.authType, data.data.orgAuth, data.data.authStatus);
298
					}else {
300
					}else if($html.articleType==2){
299 301
						var stl={};
300 302
						stl.sty="";
301 303
						stl.title="";
@ -303,6 +305,10 @@ $(document).ready(function() {
303 305
							stl.sty="authicon-com-ok";
304 306
							stl.title="认证企业";
305 307
						}
308
					}else if($html.articleType==3){
309
						var stl={};
310
						stl.sty="";
311
						stl.title="";
306 312
					}
307 313
					var str = ""
308 314
					str += '<li data-id="' + $html.articleId + '" data-createTime="' + $html.createTime + '" data-shareId="' + $html.shareId + '"><a class="flexCenter OflexCenter">'
@ -667,4 +673,4 @@ $(document).ready(function() {
667 673
	})
668 674
	
669 675
	
670
})
676
})

+ 12 - 2
js/searchNew.js

@ -419,7 +419,7 @@ $(function() {
419 419
							
420 420
						if($info[i].articleType=="1"){
421 421
							(function(mo){
422
								cacheModel.getProfessor($info[i].professorId,function(sc,value){
422
								cacheModel.getProfessor($info[i].ownerId,function(sc,value){
423 423
									if(sc){
424 424
										mo.find(".ownerName").html(value.name);
425 425
									}else{
@ -429,7 +429,7 @@ $(function() {
429 429
							})($itemlist);
430 430
						}else if($info[i].articleType=="2"){
431 431
							(function(mo){
432
								cacheModel.getCompany($info[i].onergId,function(sc, value){
432
								cacheModel.getCompany($info[i].ownenerId,function(sc, value){
433 433
									if(sc){
434 434
										if(value.forShort){
435 435
											mo.find(".ownerName").html(value.forShort)
@ -441,6 +441,16 @@ $(function() {
441 441
									}
442 442
								})
443 443
							})($itemlist);
444
						}else if($info[i].articleType=="3"){
445
							(function(mo){
446
								cacheModel.getPlatform($info[i].ownerId,function(sc, value){
447
									if(sc){
448
										mo.find(".ownerName").html(value.name)
449
									}else{
450
										console.log("error")
451
									}
452
								})
453
							})($itemlist);
444 454
						}
445 455
					}
446 456
				}

+ 7 - 3
js/sevriceShow.js

@ -355,17 +355,21 @@ $(document).ready(function() {
355 355
							$("#oArticle").append($str);
356 356
							(function($str,i) {
357 357
								if($data[i].articleType=="1") {
358
									ajaxRequist("/ajax/professor/baseInfo/" + $data[i].professorId, {}, "get", function(data) {
358
									ajaxRequist("/ajax/professor/baseInfo/" + $data[i].ownerId, {}, "get", function(data) {
359 359
										$str.find(".name").text(data.data.name);
360 360
									})
361
								}else{
362
									ajaxRequist("/ajax/org/" + $data[i].onergId, {}, "get", function(data) {
361
								}else if($data[i].articleType=="2"){
362
									ajaxRequist("/ajax/org/" + $data[i].ownenerId, {}, "get", function(data) {
363 363
										if(data.data.forShort) {
364 364
											$str.find(".name").text(data.data.forShort);
365 365
										}else{
366 366
											$str.find(".name").text(data.data.name);
367 367
										}
368 368
									})
369
								}else if($data[i].articleType=="3"){
370
									ajaxRequist("/ajax/platform/info", {id:$data[i].ownerId}, "get", function(data) {
371
										$str.find(".name").text(data.data.name);
372
									})
369 373
								}
370 374
								/*if($data[i].articleAgree) {
371 375
									$str.find(".zan").text('赞 ' + $data[i].articleAgree);

+ 20 - 10
js/userInforShow.js

@ -241,9 +241,9 @@ $(function() {
241 241
						$(".resAreaTip").removeClass("displayNone")
242 242
						return;
243 243
					}
244
					var arr=[];
245
					for(var i in $info) {
246
						arr[i]=$info[i].opreteProfessorId;
244
					var arr=[];
245
					for(var i in $info) {
246
						arr[i]=$info[i].opreteProfessorId;
247 247
					}
248 248
					detailPro(arr,"areaCon");
249 249
				}
@ -1563,7 +1563,7 @@ $(function() {
1563 1563
					document.getElementById(obj).appendChild(li);
1564 1564
					if(dataItem.articleType=="1"){
1565 1565
						(function(mo){
1566
							cacheModel.getProfessor(dataItem.professorId,function(sc,value){
1566
							cacheModel.getProfessor(dataItem.ownerId,function(sc,value){
1567 1567
								if(sc){
1568 1568
									mo.find(".ownerName").html(value.name)
1569 1569
								}else{
@ -1573,7 +1573,7 @@ $(function() {
1573 1573
						})($itemlist);
1574 1574
					}else if(dataItem.articleType=="2"){
1575 1575
						(function(mo){
1576
							cacheModel.getCompany(dataItem.onergId,function(sc,value){
1576
							cacheModel.getCompany(dataItem.ownenerId,function(sc,value){
1577 1577
								if(sc){
1578 1578
									if(value.forShort){
1579 1579
										mo.find(".ownerName").html(value.forShort)
@ -1585,6 +1585,16 @@ $(function() {
1585 1585
								}
1586 1586
							})
1587 1587
						})($itemlist);
1588
					}else if(dataItem.articleType=="3"){
1589
						(function(mo){
1590
							cacheModel.getPlatform(dataItem.ownerId,function(sc,value){
1591
								if(sc){
1592
									mo.find(".ownerName").html(value.name)
1593
								}else{
1594
									console.log("error")
1595
								}
1596
							})
1597
						})($itemlist);
1588 1598
					}
1589 1599
				}
1590 1600
			});
@ -1878,9 +1888,9 @@ $(function() {
1878 1888
				var pa=$(this).attr("rel")
1879 1889
				$("#"+pa).find("ul").html("")
1880 1890
				$("#"+pa).find(".js-load-more").show();
1881
				watchO={
1882
					beiTime:"",
1883
					beiProId:"",
1891
				watchO={
1892
					beiTime:"",
1893
					beiProId:"",
1884 1894
				}
1885 1895
				attentMyself(true);
1886 1896
			})
@ -2014,8 +2024,8 @@ $(function() {
2014 2024
	            $("#tab6user").addClass("liNow").siblings().removeClass("liNow");
2015 2025
	            $("#item1user").hide();
2016 2026
	            $("#item6user").show();
2017
	            if(userid === professorId) {
2018
	                $(".wendaNav").show();
2027
	            if(userid === professorId) {
2028
	                $(".wendaNav").show();
2019 2029
	            }
2020 2030
	            $(".wendaNav li").eq(1).addClass("liNow").siblings().removeClass("liNow");
2021 2031
	            $("#item6drop2").show().siblings().hide();