Merge branch 'dev' into test

cmp-portal/js/articalIssue.js

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

cmp-portal/js/articalModify.js

@@ -517,8 +517,8 @@ releventService()
			$(".imgtis").text("");
			imgflase = true;
		}*/
		if(newstitle==""){
			$.MsgBox.Alert('提示', '请输入文章标题')
		if(newstitle==""){
			$.MsgBox.Alert('提示', '请输入文章标题')
			return;
		}else{
			$("#aboutTit span").text("");
@@ -681,7 +681,7 @@ releventService()
		}
		expertli(); //相关专家
		resourcesli(); //相关咨询
		$data.onergId = orgId;
		$data.ownenerId = orgId;
		$data.articleId=articleId;
		if($("#companys li").length) {
			$data.orgs = getAttrId.call($("#companys li"));
@@ -861,7 +861,7 @@ releventService()
 /*添加相关企业*/
relatCompanies("#company");
    /*添加相关企业*/
    function  relatCompanies(sel) {
    function  relatCompanies(sel) {
	$(sel).bind({
		paste: function(e) {
			var pastedText;
@@ -1009,4 +1009,4 @@ relatCompanies("#company");
			}
		})
	}
});
});

cmp-portal/js/cmp-articalList.js

@@ -38,11 +38,13 @@ $(function() {
function articalList(pageSize, pageNo, isbind, num) {
	var $data = {};
	if(num == 1) {
		$data.onergId = orgId;
		$data.ownenerId = orgId;
        $data.articleType = "2";
		$data.pageSize = pageSize;
		$data.pageNo = pageNo;
	} else {
		$data.onergId = orgId;
		$data.ownenerId = orgId;
        $data.articleType = "2";
		$data.pageSize = pageSize;
		$data.pageNo = pageNo;
		$data.articleTitle = $("#articleSearch").val();

e/a.html

@@ -17,9 +17,9 @@
<script type="text/javascript" src="../js/public/shareLeaveWord.js"></script>	
<script type="text/javascript" src="../js/public/openApp.js"></script>	
<script type="text/javascript">
	addscript("ad_article_h5_a");
	addscript("ad_article_h5_a");
	addscript("ad_article_h5_b");
	addscript("ad_article_h5_c");
	addscript("ad_article_h5_c");
</script>
<style>
	html,body {background: #FFFFFF;}
@@ -38,7 +38,7 @@
		<div class="h1Font hWeight" id="articleName"></div>
		<div class="madiaBlock">
			<ul class="mui-table-view noactiveTab">
				<li>
				<li class="plat">
					<div class="flexCenter clearfix">
						<a id="personAL">
							<div class="madiaHead useHead" id="messImg"></div>
@@ -142,7 +142,7 @@
			if(reType=="1"){
				var proId=this.getAttribute("data-id");
				location.href="http://" + window.location.host + "/e/p.html?id=" + proId;
			}else{
			}else if(reType=="2"){
				var cmpId=this.getAttribute("data-id");
				location.href="http://" + window.location.host + "/e/c.html?id=" + cmpId;
			}
@@ -228,17 +228,26 @@
						"articleId": oArticleModule.articleId,
						"rows": 5
					}, "get", oArticleModule.correlationArticle);
					document.getElementById("personAL").setAttribute("data-id",$data.professorId);
					oArticleModule.oAjaxGet("../ajax/professor/editBaseInfo/" + $data.professorId, "", "get", oArticleModule.professorMess);
				} else {
					document.getElementById("personAL").setAttribute("data-id",$data.ownerId);
					oArticleModule.oAjaxGet("../ajax/professor/editBaseInfo/" + $data.ownerId, "", "get", oArticleModule.professorMess);
				} else if($data.articleType == 2){
					oArticleModule.oAjaxGet("../ajax/article/ralateArticles", {
						"keys": arr,
						"orgId": oArticleModule.oWner,
						"articleId": oArticleModule.articleId,
						"rows": 5
					}, "get", oArticleModule.correlationArticle);
					document.getElementById("personAL").setAttribute("data-id",$data.onergId);
					oArticleModule.oAjaxGet("../ajax/org/" + $data.onergId, "", "get", oArticleModule.business);
					document.getElementById("personAL").setAttribute("data-id",$data.ownenerId);
					oArticleModule.oAjaxGet("../ajax/org/" + $data.ownenerId, "", "get", oArticleModule.business);
				}else if($data.articleType == 3){
					oArticleModule.oAjaxGet("../ajax/article/ralateArticles", {
						"keys": arr,
						"orgId": oArticleModule.oWner,
						"articleId": oArticleModule.articleId,
						"rows": 5
					}, "get", oArticleModule.correlationArticle);
					document.getElementById("personAL").setAttribute("data-id",$data.ownerId);
					oArticleModule.oAjaxGet("../ajax/platform/info", {id:$data.ownerId}, "get", oArticleModule.platform);
				}
				
			},
@@ -268,6 +277,17 @@
					document.getElementById("auth").classList.add("authicon-com-ok");
				}
			},
			platform: function($data) {
				document.getElementById('name').innerHTML = $data.name;
				var mgimg="../images/default-icon.jpg";
				if($data.logo!=null) {
					mgimg="/data/platform" + $data.logo;
				}
                $(".plat").css("cursor","default");
                $(".goSpan").hide();
				document.getElementById("messImg").classList.add("cmpHead2");
				document.getElementById("messImg").innerHTML='<div class="boxBlock"><img class="boxBlockimg" id="companyImg" src="'+ mgimg+'"></div>'
			},
			correlationExpert: function($data) {
				if($data.length == 0) {
					return;
@@ -429,9 +449,11 @@
				for(var i = 0; i < $data.length; i++) {
					var ourl, of ;
					if($data[i].articleType == 1) {
						ourl = "/ajax/professor/editBaseInfo/" + $data[i].professorId; of = 1;
					} else {
						ourl = "/ajax/org/" + $data[i].onergId; of = 2;
						ourl = "/ajax/professor/editBaseInfo/" + $data[i].ownerId; of = 1;
					} else if($data[i].articleType == 2) {
						ourl = "/ajax/org/" + $data[i].ownenerId; of = 2;
					} else if($data[i].articleType == 3) {
						ourl = "/ajax/platform/info"; of = 3;
					}
					var arImg = "../images/default-artical.jpg";
					if($data[i].articleImg) {
@@ -440,6 +462,7 @@
					var title = $data[i].articleTitle;
					$.ajax({
						url:ourl,
						data:{id:$data[i].ownerId},
						dataType: 'json', //服务器返回json格式数据
						type: "get", //HTTP请求类型
						timeout: 10000, //超时时间设置为10秒；
@@ -454,7 +477,7 @@
									var userType = autho(data.data.authType, data.data.orgAuth, data.data.authStatus);
									li.setAttribute("owner-id", data.data.id);
									li.setAttribute("data-type", 1);
								} else {
								} else if( of == 2){
									if(data.data.forShort){
										namepo = data.data.forShort;
									}else{
@@ -468,6 +491,10 @@
									}
									li.setAttribute("owner-id", data.data.id);
									li.setAttribute("data-type", 2);
								}else if( of == 3){
									namepo = data.data.name;
									li.setAttribute("owner-id", data.data.id);
									li.setAttribute("data-type", 3);
								}
								li.setAttribute("data-id", $data[i].articleId);
								li.className = "mui-table-view-cell";

e/c.html

@@ -445,12 +445,15 @@ $(document).ready(function() {
							}
							var oURL;
							if(StrData[i].articleType==1) {
								oURL="/ajax/professor/baseInfo/"+StrData[i].professorId;
							}else{
								oURL="/ajax/org/" + StrData[i].onergId;
								oURL="/ajax/professor/baseInfo/"+StrData[i].ownerId;
							}else if(StrData[i].articleType==2){
								oURL="/ajax/org/" + StrData[i].ownenerId;
							}else if(StrData[i].articleType==3){
								oURL="/ajax/platform/info";
							}
							$.ajax({
								url:oURL, 
								url:oURL,
								"data": {id:StrData[i].ownerId},
								"type": "GET",
								'dataType': "json",
								"success": function(data) {
@@ -470,15 +473,17 @@ $(document).ready(function() {
											thisAuth = userType.sty;
											add.setAttribute("owner-id", data.data.id);
											add.setAttribute("data-type", 1);
										}else {
										}else if(StrData[n].articleType==2){
											add.setAttribute("owner-id", data.data.id);
											add.setAttribute("data-type", 2);
											if(data.data.authStatus==3) {
												thisTitle = "科袖认证企业";
												thisAuth = "authicon-com-ok";
											}
										}else if(StrData[n].articleType==3){
											add.setAttribute("owner-id", data.data.id);
											add.setAttribute("data-type", 3);
										}
										
										var itemlist = '<div class="flexCenter OflexCenter clearfix"><div class="madiaHead artHead" style="background-image:url('+imgL+')"></div>';
											itemlist += '<div class="madiaInfo OmadiaInfo">';
											itemlist += '<p class="ellipsisSty-2 h1Font" id="usertitle">'+StrData[n].articleTitle+'</p>';

e/p.html

@@ -32,19 +32,19 @@
		<div class="mainbox displayNone">
			<div class="infocon madiaBlock needList" style="border:none">
				<ul class="mui-table-view" id="demandShow">
					<!--<li class="mui-table-view-cell">
						<div class="madiaInfo">
							<p class="h1Font ellipsisSty-2">需求主题寻求一名斯特林热机技术顾问需求主题寻求一名斯特林热机技术顾问需求主题寻求一名斯特林热机技术顾问</p>
							<p class="h2Font ellipsisSty-5">需求内容：我们是一家医疗器械公司，主要生产健康理疗类的电子产品，目前希望对护膝、护腰类的产品进行改进，
								想先找一位有资深设计经验的三维工业设计专家，通过三维建模的方式先设计出产品的三维模型，用于展示以及为后续生产做准备我们是一家医疗器械公司，主要生产健康理疗类的电子产品，目前希望对护膝、护腰类的产品进行改进，
								想先找一位有资深设计经验的三维工业设计专家，通过三维建模的方式先设计出</p>
							<div class="showli ellipsisSty">
								<span>北京市</span>
								<span>预期 1个月内</span>
								<span>预算 1万元以内</span>
								<span>有效期至 8月17日</span>
							</div>
						</div>
					<!--<li class="mui-table-view-cell">
						<div class="madiaInfo">
							<p class="h1Font ellipsisSty-2">需求主题寻求一名斯特林热机技术顾问需求主题寻求一名斯特林热机技术顾问需求主题寻求一名斯特林热机技术顾问</p>
							<p class="h2Font ellipsisSty-5">需求内容：我们是一家医疗器械公司，主要生产健康理疗类的电子产品，目前希望对护膝、护腰类的产品进行改进，
								想先找一位有资深设计经验的三维工业设计专家，通过三维建模的方式先设计出产品的三维模型，用于展示以及为后续生产做准备我们是一家医疗器械公司，主要生产健康理疗类的电子产品，目前希望对护膝、护腰类的产品进行改进，
								想先找一位有资深设计经验的三维工业设计专家，通过三维建模的方式先设计出</p>
							<div class="showli ellipsisSty">
								<span>北京市</span>
								<span>预期 1个月内</span>
								<span>预算 1万元以内</span>
								<span>有效期至 8月17日</span>
							</div>
						</div>
					</li>-->
				</ul>
			</div>
@@ -790,7 +790,7 @@ $(document).ready(function() {
	//相关文章信息
	function relevantarticalList(){
		$.ajax({
			"url" : "/ajax/article/byAssProfessor",
				"url" : "/ajax/article/byAssProfessor",
			"type" :  "GET" ,
			"dataType" : "json",
			"data" :{"id":proId},
@@ -816,12 +816,15 @@ $(document).ready(function() {
							}
							var oURL;
							if(StrData[i].articleType==1) {
								oURL="/ajax/professor/baseInfo/"+StrData[i].professorId;
							}else{
								oURL="/ajax/org/" + StrData[i].onergId;
								oURL="/ajax/professor/baseInfo/"+StrData[i].ownerId;
							}else if(StrData[i].articleType==2){
								oURL="/ajax/org/" + StrData[i].ownenerId;
							}else if(StrData[i].articleType==3){
								oURL="/ajax/platform/info";
							}
							$.ajax({
								"url":oURL,
								"data":{id:StrData[i].ownerId},
								"type": "GET",
								'dataType': "json",
								"success": function(data) {
@@ -835,11 +838,13 @@ $(document).ready(function() {
										userType = autho(data.data.authType, data.data.orgAuth, data.data.authStatus);
										thisTitle = userType.title;
										thisAuth = userType.sty;
									}else {
									}else if(StrData[n].articleType==2){
										if(data.data.authStatus==3) {
											thisTitle = "科袖认证企业";
											thisAuth = "authicon-com-ok";
										}
									}else if(StrData[n].articleType==3){
									}
									var add = document.createElement("li");
									add.className = "mui-table-view-cell flexCenter OflexCenter"; 

e/r.html

@@ -143,7 +143,7 @@ $(document).ready(function() {
		if(reType=="1"){
			var proId=this.getAttribute("data-id");
			location.href="http://" + window.location.host + "/e/p.html?id=" + proId;
		}else{
		}else if(reType=="2"){
			var cmpId=this.getAttribute("data-id");
			location.href="http://" + window.location.host + "/e/c.html?id=" + cmpId;
		}
@@ -329,7 +329,7 @@ $(document).ready(function() {
											var stl = autho(data.data.authType, data.data.orgAuth, data.data.authStatus);
											comName=data.data.name;
											likeRli.setAttribute("data-type", 1);
										}else {
										}else if($html[n].articleType==2){
											var stl={};
											stl.sty="";
											stl.title="";
@@ -343,6 +343,12 @@ $(document).ready(function() {
												comName=data.data.name;
											}
											likeRli.setAttribute("data-type", 2);
										}else if($html[n].articleType==3){
											var stl={};
											stl.sty="";
											stl.title="";
											comName=data.data.name;
											likeRli.setAttribute("data-type", 3);
										}
										
										var str = ""

e/s.html

@@ -131,7 +131,7 @@
					if(reType == "1") {
						var proId = this.getAttribute("data-id");
						location.href = "http://" + window.location.host + "/e/p.html?id=" + proId;
					} else {
					} else if(reType == "2"){
						var cmpId = this.getAttribute("data-id");
						location.href = "http://" + window.location.host + "/e/c.html?id=" + cmpId;
					}
@@ -371,12 +371,15 @@
									(function(n) {
										var oURL;
										if($html[i].articleType == 1) {
											oURL = "/ajax/professor/baseInfo/" + $html[i].professorId;
										} else {
											oURL = "/ajax/org/" + $html[i].onergId;
											oURL = "/ajax/professor/baseInfo/" + $html[i].ownerId;
										} else if($html[i].articleType == 2){
											oURL = "/ajax/org/" + $html[i].ownenerId;
										} else if($html[i].articleType == 3){
											oURL = "/ajax/platform/info" + $html[i].ownerId;
										}
										$.ajax({
											url: oURL,
											data:{id:$html[i].ownerId},
											type: "GET",
											dataType: "json",
											success: function(data) {
@@ -391,7 +394,7 @@
														var stl = autho(data.data.authType, data.data.orgAuth, data.data.authStatus);
														comName = data.data.name;
														likeRli.setAttribute("data-type", 1);
													} else {
													} else if($html[n].articleType == 2) {
														var stl = {};
														stl.sty = "";
														stl.title = "";
@@ -405,6 +408,12 @@
															comName = data.data.name;
														}
														likeRli.setAttribute("data-type", 2);
													} else if($html[n].articleType == 3) {
														var stl = {};
														stl.sty = "";
														stl.title = "";
														comName = data.data.name;
														likeRli.setAttribute("data-type", 3);
													}
													var str = ""

js/articalIssue.js

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

js/articalList.js

@@ -34,11 +34,13 @@ $(function() {
function articalList(pageSize, pageNo, isbind, num) {
	var $data = {};
	if(num == 1) {
		$data.professorId = userid;
		$data.ownerId = userid;
        $data.articleType = "1";
		$data.pageSize = pageSize;
		$data.pageNo = pageNo;
	} else {
		$data.professorId = userid;
		$data.ownerId = userid;
        $data.articleType = "1";
		$data.pageSize = pageSize;
		$data.pageNo = pageNo;
		$data.articleTitle = $("#articleSearch").val();

js/articalModify.js

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

js/articalPreview.js

@@ -104,13 +104,17 @@ $(function() {
					$("#tagList").text(industryShow(data.data.subject));
					if(data.data.articleType==1){
						$("#expert").removeClass("displayNone");
						expert(data.data.professorId);
						expert(data.data.ownerId);
					}
					if(data.data.articleType==2){
						$("#enterprise").removeClass("displayNone");
						cmpFun(data.data.onergId);
						cmpFun(data.data.ownenerId);
						companylist();
					}
                    if(data.data.articleType==3){
                        $("#enterprise").removeClass("displayNone");
                        platform(data.data.ownerId);
                    }
				}
				var articletitle = data.data.articleTitle + "-科袖网";
				window.setTimeout(function() {
@@ -182,6 +186,30 @@ $(function() {
			}
		});
	}
	/*平台信息*/
    function platform(platform) {
        $.ajax({
            "url": "/ajax/platform/info",
			"data":{id: platform},
            "type": "get",
            "dataType" : "json",
            "success": function(data) {
                if(data.success && data.data) {
                    $("#Qname").text(data.data.name);
                    if(data.data.logo!=null) {
                        $("#companyImg").attr("src", "/data/platform" + data.data.logo);
                    }else{
                        $("#companyImg").attr("src", "/images/default-plat.jpg");
                    }
                    $("#Qindustry").text(QindustryShow(data.data.industry));
                }
            },
            "error": function() {
                $.MsgBox.Alert('提示', '链接服务器超时')
            }
        });
    }
	
	
	//相关专家

js/articalShow.js

@@ -87,6 +87,47 @@ $(document).ready(function() {
			}
		});
	}
    //平台最近文章
    function platfromRecentlyArticle(obj) {
        $.ajax({
            "url" :"/ajax/article/pageQuery" ,
            "type" :  "GET" ,
            "dataType" : "json",
            "data" :{ownerId:obj,articleType:'3',status:'1'},
            "success" : function(data) {
                if (data.success){
                    var $data=data.data.data;
                    console.log($data);
                    var only=false;
                    if($data.length>1){
                        $(".recentlyList").parents(".currentBlock").removeClass("displayNone");
                        var oLeng=$data.length<5?$data.length:5;
                        for(var i=0;i<oLeng;i++) {
                            if(articleId==$data[i].articleId) {
                                only=true;
                                continue;
                            }
                            if(only==true) {
                                if(oLeng<5) {
                                }else{
                                    oLeng=6;
                                }
                            }
                            var listLi=$('<li class="flexCenter"></li>').appendTo($(".recentlyList"));
                            var str='<a href="/'+pageUrl('a',$data[i])+'"><p class="h2Font ellipsisSty-2"><em class="circlePre"></em>'+$data[i].articleTitle+'</p>'+
                                '<span class="smalltip">'+commenTime($data[i].publishTime)+'</span></a></li>'
                            $(str).appendTo(listLi);
                        }
                    }
                }
            },
            "error":function(){
                $.MsgBox.Alert('提示','链接服务器超时')
            }
        });
    }
	//初始化文章内容
	function articleshow(){
		$.ajax({
@@ -116,16 +157,22 @@ $(document).ready(function() {
					ifcollectionAbout(articleId,$("#attention").find("em"), 3)
					if(data.data.articleType==1){
						$("#expert").removeClass("displayNone");
						relevantarticalList(data.data.professorId,1);
						expert(data.data.professorId);
						recentlyArticle(2,{"professorId":data.data.professorId}) 
						relevantarticalList(data.data.ownerId);
						expert(data.data.ownerId);
						recentlyArticle(2,{"ownerId":data.data.ownerId})
					}
					if(data.data.articleType==2){
						$("#enterprise").removeClass("displayNone");
						relevantarticalList(data.data.orgId,2);
						cmpFun(data.data.onergId);
						relevantarticalList(data.data.ownerId);
						cmpFun(data.data.ownenerId);
						companylist();
						recentlyArticle(1,{"onergId":data.data.onergId});
						recentlyArticle(1,{"ownenerId":data.data.ownenerId});
					}
					if(data.data.articleType==3){
						$("#enterprise").removeClass("displayNone");
						relevantarticalList(data.data.ownerId);
						platform(data.data.ownerId);
                        platfromRecentlyArticle(data.data.ownerId);
					}
					var weibotitle = data.data.articleTitle;
					var weibourl =window.location.href;
@@ -237,6 +284,35 @@ $(document).ready(function() {
			}
		});
	}
    function platform(platformId) {
        $.ajax({
            "url": "/ajax/platform/info",
			"data":{id:platformId},
            "type": "get",
            "dataType" : "json",
            "success": function(data) {
                if(data.success && data.data) {
                    $(".userimg").removeClass("useHead");
					$("#Qname,.username").text(data.data.name);
                    $("#Qname").attr("dataid",data.data.id);
                    $(".qiyego,.useurl").attr("href", "javascript:void(0)");
                    $(".qiyego,.useurl").css("cursor", "default");
                    if(data.data.logo!=null) {
                        $(".userimg").attr("style", "background: #fff;");
                        $(".userimg").html('<div class="boxBlock" style="width:50px;height:50px"><img class="boxBlockimg" src="" id="companyImg2"></div>');
                        $("#companyImg,#companyImg2").attr("src", "/data/platform" + data.data.logo);
                    }else{
                        $("#companyImg,#companyImg2").attr("src", "/images/default-plat.jpg");
                    }
                    $("#Qindustry").text(QindustryShow(data.data.industry));
                    $("#enterprise").find(".attenSpan").hide();
                }
            },
            "error": function() {
                $.MsgBox.Alert('提示', '链接服务器超时')
            }
        });
    }
	//相关专家
	function relevantExperts(){
@@ -579,14 +655,9 @@ $(document).ready(function() {
	
	}
	//相关文章信息
	function relevantarticalList(id,num){
	function relevantarticalList(id){
	    keysli();
		if(num==1){
			var data = {"keys":experarray,"professorId":id,"articleId":articleId,"rows":10}	
		}
		if(num==2){
			var data = {"keys":experarray,"orgId":id,"articleId":articleId,"rows":10}	
		}
		var data = {"keys":experarray,"ownerId":id,"articleId":articleId,"rows":10}
		$.ajax({
			"url" : "/ajax/article/ralateArticles",
			"type" :  "GET" ,
@@ -618,7 +689,7 @@ $(document).ready(function() {
							$itemlist.find(".time").text(commenTime(datalist.publishTime))
							if(datalist.articleType==1){
								$.ajax({
									"url" : "/ajax/professor/baseInfo/"+datalist.professorId,
									"url" : "/ajax/professor/baseInfo/"+datalist.ownerId,
									"type" :  "GET" ,
									"dataType" : "json",
									"async":false,
@@ -635,12 +706,11 @@ $(document).ready(function() {
							}
							if(datalist.articleType==2){
								$.ajax({
									"url" : "/ajax/org/"+datalist.onergId,
									"url" : "/ajax/org/"+datalist.ownenerId,
									"type" :  "GET" ,
									"dataType" : "json",
									"async":false,
									"success" : function($data) {
										console.log($data)
										if ($data.success && $data.data){
											if($data.data.forShort){
												$itemlist.find(".username2").text($data.data.forShort);
@@ -654,6 +724,23 @@ $(document).ready(function() {
									}
								});
							}
							if(datalist.articleType==3){
								$.ajax({
									"url" : "/ajax/platform/info",
									"data":{id:datalist.ownerId},
									"type" :  "GET" ,
									"dataType" : "json",
									"async":false,
									"success" : function($data) {
										if ($data.success && $data.data){
											$itemlist.find(".username2").text($data.data.name);
										}
									},
									"error":function(){
										$.MsgBox.Alert('提示','链接服务器超时')
									}
								});
							}
							
					}
				}

js/articalShow2.js

@@ -88,6 +88,47 @@ $(document).ready(function() {
			}
		});
	}
    //平台最近文章
    function platfromRecentlyArticle(obj) {
        $.ajax({
            "url" :"/ajax/article/pageQuery" ,
            "type" :  "GET" ,
            "dataType" : "json",
            "data" :{ownerId:obj,articleType:'3',status:'1'},
            "success" : function(data) {
                if (data.success){
                    var $data=data.data.data;
                    var only=false;
                    if($data.length>1){
                        $(".recentlyList").parents(".currentBlock").removeClass("displayNone");
                        var oLeng=$data.length<5?$data.length:5;
                        for(var i=0;i<oLeng;i++) {
                            if(articleId==$data[i].articleId) {
                                only=true;
                                continue;
                            }
                            if(only==true) {
                                if(oLeng<5) {
                                }else{
                                    oLeng=6;
                                }
                            }
                            var listLi=$('<li class="flexCenter"></li>').appendTo($(".recentlyList"));
                            var str='<a href="/'+pageUrl('a',$data[i])+'"><p class="h2Font ellipsisSty-2"><em class="circlePre"></em>'+$data[i].articleTitle+'</p>'+
                                '<span class="smalltip">'+commenTime($data[i].publishTime)+'</span></a></li>'
                            $(str).appendTo(listLi);
                        }
                    }
                }
            },
            "error":function(){
                $.MsgBox.Alert('提示','链接服务器超时')
            }
        });
    }
	//初始化文章内容
	function articleshow(){
		$("#articleContent").html(window.staticPageData.articleContent);
@@ -117,17 +158,23 @@ $(document).ready(function() {
					ifcollectionAbout(articleId,$("#attention").find("em"), 3)
					if(data.data.articleType==1){
						$("#expert").removeClass("displayNone");
						relevantarticalList(data.data.professorId,1);
						expert(data.data.professorId);
						recentlyArticle(2,{"professorId":data.data.professorId}) 
						relevantarticalList(data.data.ownerId);
						expert(data.data.ownerId);
						recentlyArticle(2,{"ownerId":data.data.ownerId})
					}
					if(data.data.articleType==2){
						$("#enterprise").removeClass("displayNone");
						relevantarticalList(data.data.orgId,2);
						cmpFun(data.data.onergId);
						relevantarticalList(data.data.ownerId);
						cmpFun(data.data.ownenerId);
						companylist();
						recentlyArticle(1,{"onergId":data.data.onergId});
						recentlyArticle(1,{"ownenerId":data.data.ownenerId});
					}
                    if(data.data.articleType==3){
                        $("#enterprise").removeClass("displayNone");
                        relevantarticalList(data.data.ownerId);
                        platform(data.data.ownerId);
                        platfromRecentlyArticle(data.data.ownerId);
                    }
					var weibotitle = data.data.articleTitle;
					var weibourl =window.location.href;
					var weibopic ="http://"+window.location.host+"/data/article/" + data.data.articleImg;
@@ -238,8 +285,42 @@ $(document).ready(function() {
			}
		});
	}
    function platform(platformId) {
        $.ajax({
            "url": "/ajax/platform/info",
            "data":{id:platformId},
            "type": "get",
            "dataType" : "json",
            "success": function(data) {
                if(data.success && data.data) {
                    $(".userimg").removeClass("useHead");
                    if(data.data.forShort) {
                        $("#Qname,.username").text(data.data.forShort);
                    }else{
                        $("#Qname,.username").text(data.data.name);
                    }
                    $("#Qname").attr("dataid",data.data.id);
                    $(".qiyego,.useurl").attr("href", "javascript:void(0)");
                    $(".qiyego,.useurl").css("cursor", "default");
                    if(data.data.logo!=null) {
                        $(".userimg").attr("style","background: #fff;")
                        $(".userimg").html('<div class="boxBlock" style="width:50px;height:50px"><img class="boxBlockimg" src="" id="companyImg2"></div>');
                        $("#companyImg,#companyImg2").attr("src", "/data/platform" + data.data.logo);
                    }else{
                        $("#companyImg,#companyImg2").attr("src", "/images/default-plat.jpg");
                    }
                    $("#Qindustry").text(QindustryShow(data.data.industry));
                    $("#enterprise").find(".attenSpan").hide();
                }
            },
            "error": function() {
                $.MsgBox.Alert('提示', '链接服务器超时')
            }
        });
    }
	//相关专家
    //相关专家
	function relevantExperts(){
		$.ajax({
			"url": "/ajax/article/ralatePro",
@@ -580,14 +661,9 @@ $(document).ready(function() {
	
	}
	//相关文章信息
	function relevantarticalList(id,num){
	function relevantarticalList(id){
	    keysli();
		if(num==1){
			var data = {"keys":experarray,"professorId":id,"articleId":articleId,"rows":10}	
		}
		if(num==2){
			var data = {"keys":experarray,"orgId":id,"articleId":articleId,"rows":10}	
		}
		var data = {"keys":experarray,"ownerId":id,"articleId":articleId,"rows":10}
		$.ajax({
			"url" : "/ajax/article/ralateArticles",
			"type" :  "GET" ,
@@ -619,7 +695,7 @@ $(document).ready(function() {
							$itemlist.find(".time").text(commenTime(datalist.publishTime))
							if(datalist.articleType==1){
								$.ajax({
									"url" : "/ajax/professor/baseInfo/"+datalist.professorId,
									"url" : "/ajax/professor/baseInfo/"+datalist.ownerId,
									"type" :  "GET" ,
									"dataType" : "json",
									"async":false,
@@ -636,12 +712,11 @@ $(document).ready(function() {
							}
							if(datalist.articleType==2){
								$.ajax({
									"url" : "/ajax/org/"+datalist.onergId,
									"url" : "/ajax/org/"+datalist.ownenerId,
									"type" :  "GET" ,
									"dataType" : "json",
									"async":false,
									"success" : function($data) {
										console.log($data)
										if ($data.success && $data.data){
											if($data.data.forShort){
												$itemlist.find(".username2").text($data.data.forShort);
@@ -655,6 +730,23 @@ $(document).ready(function() {
									}
								});
							}
							if(datalist.articleType==3){
								$.ajax({
									"url" : "/ajax/platform/info",
									"data":{id:datalist.ownerId},
									"type" :  "GET" ,
									"dataType" : "json",
									"async":false,
									"success" : function($data) {
										if ($data.success && $data.data){
											$itemlist.find(".username2").text($data.data.name);
										}
									},
									"error":function(){
										$.MsgBox.Alert('提示','链接服务器超时')
									}
								});
							}
							
					}
				}

js/discover.js

@@ -623,9 +623,11 @@ $(function() {
		listLi.append( $strAdd);
		leaveMsgCount(dataStr.articleId,1, $strAdd);
		if(dataStr.articleType==1){
			userFun(dataStr.professorId, $strAdd);
		}else{
			cmpFun(dataStr.onergId, $strAdd);
			userFun(dataStr.ownerId, $strAdd);
		}else if(dataStr.articleType==2){
			cmpFun(dataStr.ownenerId, $strAdd);
		}else if(dataStr.articleType==3){
            platform(dataStr.ownerId, $strAdd);
		}
	}
@@ -676,9 +678,11 @@ $(function() {
		listLi.append($strAdd);
		leaveMsgCount(dataStr.articleId,1, $strAdd);
		if(dataStr.articleType==1){
			userFun(dataStr.professorId, $strAdd);
		}else{
			cmpFun(dataStr.onergId, $strAdd);
			userFun(dataStr.ownerId, $strAdd);
		}else if(dataStr.articleType==2){
			cmpFun(dataStr.ownenerId, $strAdd);
		}else if(dataStr.articleType==3){
			platform(dataStr.ownerId, $strAdd);
		}
	}
	
@@ -856,10 +860,28 @@ $(function() {
			}
		});
	}
	/*平台信息*/
    function platform(id,$listItem) {
        $.ajax({
            "url": "/ajax/platform/info",
            "data":{id:id},
            "type": "get",
            "async": true,
            "success": function(data) {
                if(data.success && data.data) {
                    $listItem.find(".ownerName").text(data.data.name);
                }
            },
            "error": function() {
                $.MsgBox.Alert('提示', '链接服务器超时')
            }
        });
    }
	
	function rightAllCon(){
		$.ajax({
			type:"get",
		$.ajax({
			type:"get",
			url:"/ajax/professor/editBaseInfo/"+userid,
			success:function(data){
				if(data.success){
@@ -873,7 +895,7 @@ $(function() {
							'<div class="h2Font">'+dataStr.name+'<span class="authiconNew ' + userType.sty + '" title="' + userType.title + '"></span></div>'
					$(".onlogined .owener-info").html(str)
				}
			}
			}
		});
		$.ajax({
			url: "/ajax/article/pqProPublish",

js/public/cacheUtil.js

@@ -1,6 +1,6 @@
(function(window) {
	var objCache={"professor":{},"company":{}};
	var objHCache={"professor":{},"company":{}};//队列（processing）
	var objCache={"professor":{},"company":{},"platform":{}};
	var objHCache={"professor":{},"company":{},"platform":{}};//队列（processing）
	var objCacheHandler={
		"professor":function(id){
@@ -50,7 +50,32 @@
					ha[i](false);
				}
			});
		}
		},
		"platform":function (id) {
            jQuery.ajax({
                url:"/ajax/platform/info",
				data:{id:id},
                type:"GET",
                success:function(res){
                    var ha = objHCache.platform[id];//jilu
                    delete objHCache.platform[id];
                    if(res.success){
                        objCache.platform[id]=res.data;
                        for(var i = 0 ;i < ha.length;++i){
                            ha[i](true,res.data);
                        }
                    }else{
                        for(var i = 0 ;i < ha.length;++i){
                            ha[i](false);
                        }
                    }
                },
                error:function(dfd){
                    ha[i](false);
                }
            });
        }
	};
	
	var cacheModel={
@@ -81,6 +106,20 @@
					objCacheHandler.company(id);
				}
			}
		},
		getPlatform:function(id,cb){
			var val =objCache.platform[id]
			if(val){
				cb(true,val);
			}else{
				if(objHCache.platform[id]){
					objHCache.platform[id].push(cb);
				}else{
					objHCache.platform[id]=[];
					objHCache.platform[id].push(cb);
					objCacheHandler.platform(id);
				}
			}
		}
	};
	window.cacheModel = cacheModel;

js/resourceShow.js

@@ -277,16 +277,18 @@ $(document).ready(function() {
	function relatedArticlesHtml($html) {
		var oURL;
		if($html.articleType==1) {
			oURL="/ajax/professor/baseInfo/" + $html.professorId;
		}else{
			oURL="/ajax/org/" + $html.onergId;
			oURL="/ajax/professor/baseInfo/" + $html.ownerId;
		}else if($html.articleType==2) {
			oURL="/ajax/org/" + $html.ownenerId;
		}else if($html.articleType==2) {
			oURL="/ajax/platform/info";
		}
		$.ajax({
			"url":oURL,
			"data":{id:$html.ownerId},
			"type": "GET",
			"success": function(data) {
				if(data.success) {
					console.log(data)
					var cmpname="";
					if(data.data.forShort){
						cmpname=data.data.forShort;
@@ -295,7 +297,7 @@ $(document).ready(function() {
					}
					if($html.articleType==1) {
						var stl = autho(data.data.authType, data.data.orgAuth, data.data.authStatus);
					}else {
					}else if($html.articleType==2){
						var stl={};
						stl.sty="";
						stl.title="";
@@ -303,6 +305,10 @@ $(document).ready(function() {
							stl.sty="authicon-com-ok";
							stl.title="认证企业";
						}
					}else if($html.articleType==3){
						var stl={};
						stl.sty="";
						stl.title="";
					}
					var str = ""
					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() {
	})
	
	
})
})

js/searchNew.js

@@ -419,7 +419,7 @@ $(function() {
							
						if($info[i].articleType=="1"){
							(function(mo){
								cacheModel.getProfessor($info[i].professorId,function(sc,value){
								cacheModel.getProfessor($info[i].ownerId,function(sc,value){
									if(sc){
										mo.find(".ownerName").html(value.name);
									}else{
@@ -429,7 +429,7 @@ $(function() {
							})($itemlist);
						}else if($info[i].articleType=="2"){
							(function(mo){
								cacheModel.getCompany($info[i].onergId,function(sc, value){
								cacheModel.getCompany($info[i].ownenerId,function(sc, value){
									if(sc){
										if(value.forShort){
											mo.find(".ownerName").html(value.forShort)
@@ -441,6 +441,16 @@ $(function() {
									}
								})
							})($itemlist);
						}else if($info[i].articleType=="3"){
							(function(mo){
								cacheModel.getPlatform($info[i].ownerId,function(sc, value){
									if(sc){
										mo.find(".ownerName").html(value.name)
									}else{
										console.log("error")
									}
								})
							})($itemlist);
						}
					}
				}

js/search_h5.js

@@ -437,7 +437,7 @@ $(function() {
							
						if($info[i].articleType=="1"){
							(function(mo){
								cacheModel.getProfessor($info[i].professorId,function(sc,value){
								cacheModel.getProfessor($info[i].ownerId,function(sc,value){
									if(sc){
										mo.find(".ownerName").html(value.name);
									}else{
@@ -447,7 +447,7 @@ $(function() {
							})($itemlist);
						}else if($info[i].articleType=="2"){
							(function(mo){
								cacheModel.getCompany($info[i].onergId,function(sc, value){
								cacheModel.getCompany($info[i].ownenerId,function(sc, value){
									if(sc){
										if(value.forShort){
											mo.find(".ownerName").html(value.forShort)
@@ -459,6 +459,16 @@ $(function() {
									}
								})
							})($itemlist);
						}else if($info[i].articleType=="3"){
							(function(mo){
								cacheModel.getPlatform($info[i].ownerId,function(sc, value){
									if(sc){
                                        mo.find(".ownerName").html(value.name);
									}else{
										console.log("error")
									}
								})
							})($itemlist);
						}
					}
				}

js/sevriceShow.js

@@ -355,17 +355,21 @@ $(document).ready(function() {
							$("#oArticle").append($str);
							(function($str,i) {
								if($data[i].articleType=="1") {
									ajaxRequist("/ajax/professor/baseInfo/" + $data[i].professorId, {}, "get", function(data) {
									ajaxRequist("/ajax/professor/baseInfo/" + $data[i].ownerId, {}, "get", function(data) {
										$str.find(".name").text(data.data.name);
									})
								}else{
									ajaxRequist("/ajax/org/" + $data[i].onergId, {}, "get", function(data) {
								}else if($data[i].articleType=="2"){
									ajaxRequist("/ajax/org/" + $data[i].ownenerId, {}, "get", function(data) {
										if(data.data.forShort) {
											$str.find(".name").text(data.data.forShort);
										}else{
											$str.find(".name").text(data.data.name);
										}
									})
								}else if($data[i].articleType=="3"){
									ajaxRequist("/ajax/platform/info", {id:$data[i].ownerId}, "get", function(data) {
										$str.find(".name").text(data.data.name);
									})
								}
								/*if($data[i].articleAgree) {
									$str.find(".zan").text('赞 ' + $data[i].articleAgree);

js/userInforShow.js

@@ -241,9 +241,9 @@ $(function() {
						$(".resAreaTip").removeClass("displayNone")
						return;
					}
					var arr=[];
					for(var i in $info) {
						arr[i]=$info[i].opreteProfessorId;
					var arr=[];
					for(var i in $info) {
						arr[i]=$info[i].opreteProfessorId;
					}
					detailPro(arr,"areaCon");
				}
@@ -1563,7 +1563,7 @@ $(function() {
					document.getElementById(obj).appendChild(li);
					if(dataItem.articleType=="1"){
						(function(mo){
							cacheModel.getProfessor(dataItem.professorId,function(sc,value){
							cacheModel.getProfessor(dataItem.ownerId,function(sc,value){
								if(sc){
									mo.find(".ownerName").html(value.name)
								}else{
@@ -1573,7 +1573,7 @@ $(function() {
						})($itemlist);
					}else if(dataItem.articleType=="2"){
						(function(mo){
							cacheModel.getCompany(dataItem.onergId,function(sc,value){
							cacheModel.getCompany(dataItem.ownenerId,function(sc,value){
								if(sc){
									if(value.forShort){
										mo.find(".ownerName").html(value.forShort)
@@ -1585,6 +1585,16 @@ $(function() {
								}
							})
						})($itemlist);
					}else if(dataItem.articleType=="3"){
						(function(mo){
							cacheModel.getPlatform(dataItem.ownerId,function(sc,value){
								if(sc){
									mo.find(".ownerName").html(value.name)
								}else{
									console.log("error")
								}
							})
						})($itemlist);
					}
				}
			});
@@ -1878,9 +1888,9 @@ $(function() {
				var pa=$(this).attr("rel")
				$("#"+pa).find("ul").html("")
				$("#"+pa).find(".js-load-more").show();
				watchO={
					beiTime:"",
					beiProId:"",
				watchO={
					beiTime:"",
					beiProId:"",
				}
				attentMyself(true);
			})
@@ -2014,8 +2024,8 @@ $(function() {
	            $("#tab6user").addClass("liNow").siblings().removeClass("liNow");
	            $("#item1user").hide();
	            $("#item6user").show();
	            if(userid === professorId) {
	                $(".wendaNav").show();
	            if(userid === professorId) {
	                $(".wendaNav").show();
	            }
	            $(".wendaNav li").eq(1).addClass("liNow").siblings().removeClass("liNow");
	            $("#item6drop2").show().siblings().hide();