修改企业logo显示方式

app/css/app.css

@@ -335,7 +335,7 @@ ul.boxnav li.set span:before{font-family:"iconfont";content: "\e733";font-size:1
/*专家相关信息*/
.infocontit{font-size:16px;line-height: 40px;min-height:40px;border-bottom: 1px solid #E5E5E5; position: relative;padding-left: 26px;color:#333}
.infocontit:before{position:absolute;top:50%;margin-top:-10px;left: 15px;;display:inline-block;content:"";width:4px;height:18px;border-radius:10px;background:#ff9900;}
.infocontitM{padding-left: 15px;}
.infocontitM{padding-left: 15px;font-size:15px;}
.infocontitM:before{content: none;}
.OnetitM{border-color: transparent;}
.infocon{padding:15px; font-size: 14px;color:#666;}
@@ -773,7 +773,9 @@ footer.chatFooter .mui-icon-paperplane {font-size: 16px;word-break: keep-all;lin
.table-item-media .table-item-name span{float:left;display:block;max-width:96%;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;}
.table-item-media .authicon{bottom:-2px;}
.cmplogo{ background: url(../images/default-icon.jpg);background-size: cover;border-radius:4px;}
.cmplogo{ background:#FFFFFF;border-radius:4px;overflow: hidden;}
.table-item-media .table-item-logo.cmplogo .boxBlock{width: 32px;height: 32px;}
.table-item-media .table-item-logo.cmplogo .boxBlock .boxBlockimg{margin-top:-2px}
.userhead{ background: url(../images/default-photo.jpg);background-size: cover;border-radius:50%;}
.cmpLable{border:1px solid;border-radius:3px;padding:2px 6px;font-style: normal;font-size: 10px; line-height: 14px; vertical-align: middle;margin-right: 15px;}
.cmpLable.articalLabel{border-color:#ff6b57;color:#ff6b57;}
@@ -1000,8 +1002,8 @@ footer.chatFooter .mui-icon-paperplane {font-size: 16px;word-break: keep-all;lin
.filterClass.filterActive .mui-navigate-right:after{content: '\e580'}
/*****************************2017.04新版登录表单样式************************/
.frmboxNew{margin:12px;border-radius: 6px;overflow: hidden;}
.frmboxNew .frmbtn{margin:0;font-size: 14px;line-height:40px;padding:0;height:40px;vertical-align: middle;}
.frmboxNew{margin:12px;border-radius:4px;overflow: hidden;}
.frmboxNew .frmbtn{margin:0;font-size: 14px;line-height:40px;padding:0;height:40px;border-radius:4px;vertical-align: middle;}
.frmboxNew .frm-input .frmtype{height:48px;}
.mui-input-group.frmboxNew .mui-input-row{height:48px;}
.mui-input-group.frmboxNew .mui-input-row:after{left: 0;}
@@ -1171,3 +1173,10 @@ ul.tagList>li .h2Font{color: #666; -webkit-user-select:text;}
.cardInfo .h2Font{font-size:14px;color: #666;}
.cardInfo .h3Font{font-size:13px;line-height: 16px;color: #666;}
.cardInfo .icon-address{position:relative;top:2px;}
/*反馈意见以及投诉*/
.mui-input-row.textBox{position: relative;background:#fff;}
.mui-input-row.textBox .conTextare {min-height: 260px;font-size: 14px;border:none;}
.mui-input-row.textBox .conCommit {position: absolute;bottom: 0;right: 10px;color:#BBBBBB}

app/js/articleShow.js

@@ -203,9 +203,18 @@ mui.plusReady(function() {
		},
		business: function($data) {
			//console.log(JSON.stringify($data));
			document.getElementById('name').innerHTML = $data.name;
			if($data.forShort){
				document.getElementById('name').innerHTML = $data.forShort;
			}else{
				document.getElementById('name').innerHTML = $data.name;
			}
			document.getElementById("messImg").classList.add("cmpHead");
			document.getElementById("messImg").innerHTML='<div class="boxBlock" style="width:48px;height:48px;"><img class="boxBlockimg" id="companyImg" src="../images/default-icon.jpg"></div>'
			if($data.hasOrgLogo) {
				document.getElementById("messImg").style.backgroundImage = "url(" + baseUrl + "/images/org/" + $data.id + ".jpg" + ")";
				document.getElementById("companyImg").src= baseUrl + "/images/org/" + $data.id + ".jpg";
			}
			if($data.authStatus==3){
				document.getElementById("auth").classList.add("authicon-com-ok");
			}
			mui('#personAL').on('tap', '#messImg,#name', function() {
				mui.openWindow({
@@ -292,7 +301,11 @@ mui.plusReady(function() {
				userType = autho($data.editProfessor.authType, $data.editProfessor.orgAuth, $data.editProfessor.authStatus);
			} else {
				userType = {};
				namepo = $data.organization.name;
				if($data.organization.forShort){
					namepo = $data.organization.forShort;
				}else{
					namepo = $data.organization.name;
				}
				if($data.organization.authStatus == 3) {
					userType.sty = "authicon-com-ok"
				} else {
@@ -339,12 +352,19 @@ mui.plusReady(function() {
					traditional: true,
					success: function(data) {
						if(data.success) {
							var namepo=""
							var li = document.createElement("li");
							if( of == 1) {
								namepo = data.data.name;
								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 {
								if(data.data.forShort){
									namepo = data.data.forShort;
								}else{
									namepo = data.data.name;
								}
								var userType = {};
								if(data.data.authStatus == 3) {
									userType.sty = 'authicon-com-ok'
@@ -360,7 +380,7 @@ mui.plusReady(function() {
								'<div class="madiaHead artHead" style="background-image:url(' + arImg + ')"></div>' +
								'<div class="madiaInfo OmadiaInfo">' +
								'<p class="mui-ellipsis-2 h1Font">' + title + '</p>' +
								'<p><span class="h2Font">' + data.data.name + '</span><em class="authicon ' + userType.sty + '" title="科袖认证专家"></em></p>' +
								'<p><span class="h2Font">' + namepo + '</span><em class="authicon ' + userType.sty + '" title="科袖认证专家"></em></p>' +
								'</div>' +
								'</div>'
							document.getElementById("articleList").appendChild(li);
@@ -441,7 +461,7 @@ mui.plusReady(function() {
		mui('#personAL').on('tap', '#messImg,#name', function() {
			var id = oArticleModule.oWner;
			plus.nativeUI.showWaiting(); //显示原生等待框
			plus.webview.create("../html/proinforbrow.html", 'proinforbrow.html', {}, {
			plus.webview.create("../html/userInforShow.html", 'userInforShow.html', {}, {
				proid: id
			}); //后台创建webview并打开show.html
		})
@@ -462,7 +482,7 @@ mui.plusReady(function() {
	mui('#expertList').on('tap', 'li', function() {
		var id = this.getAttribute("data-id");
		plus.nativeUI.showWaiting(); //显示原生等待框
		plus.webview.create("../html/proinforbrow.html", 'proinforbrow.html', {}, {
		plus.webview.create("../html/userInforShow.html", 'userInforShow.html', {}, {
			proid: id
		});
	})
@@ -470,7 +490,7 @@ mui.plusReady(function() {
	mui('.commentBlock').on('tap', '.useHead,.h1Font', function() {
		var id = this.getAttribute("data-id");
		plus.nativeUI.showWaiting(); //显示原生等待框
		plus.webview.create("../html/proinforbrow.html", 'proinforbrow.html', {}, {
		plus.webview.create("../html/userInforShow.html", 'userInforShow.html', {}, {
			proid: id
		});
	})

app/js/attentedList.js

@@ -195,7 +195,7 @@ mui.ready(function() {
							var li = document.createElement("li");
							li.setAttribute("data-id", $data[i].id);
							var oimg = ($data[i].hasOrgLogo) ? baseUrl + "/images/org/" + $data[i].id + ".jpg" : "../images/default-icon.jpg";
							var oAuth = ($data[i].authStatus == 3) ? 'authicon - com - ok' : '';
							var oAuth = ($data[i].authStatus == 3) ? 'authicon-com-ok' : '';
							var orgName = ($data[i].forShort) ? $data[i].forShort : $data[i].name;
							var orgType = ($data[i].orgType == '2') ? "上市企业" : "";
							var orgOther = ($data[i].industry) ? $data[i].industry.replace(/,/gi, " | ") : "";
@@ -360,7 +360,12 @@ mui.ready(function() {
					}
					li.setAttribute("owner-id", dataItem.organization.id);
					li.setAttribute("data-type", 2);
					name = dataItem.organization.name;
					if(dataItem.organization.forShort){
						name = dataItem.organization.forShort;
					}else{
						name = dataItem.organization.name;
					}
					
				}
				li.setAttribute("data-id", dataItem.articleId);
				li.setAttribute("data-flag", 3);

app/js/cmpInforShow.js

@@ -282,7 +282,7 @@ mui.ready(function() {
				var share = buildShareService("weixin");
				if(share) {
					shareMessage(share, "WXSceneSession", {
						content: document.getElementById("industryShow").innerHTML.substr(0,20),
						content: document.getElementById("industryShow").innerHTML.substr(0,40),
						title: document.getElementById("companyName").innerHTML,
						href: baseUrl + "/e/c.html?id=" + orgId ,
						thumbs: [oUrl]
@@ -292,7 +292,7 @@ mui.ready(function() {
				var share = buildShareService("weixin");
				if(share) {
					shareMessage(share, "WXSceneTimeline", {
						content: document.getElementById("industryShow").innerHTML.substr(0,20),
						content: document.getElementById("industryShow").innerHTML.substr(0,40),
						title: document.getElementById("companyName").innerHTML,
						href: baseUrl + "/e/c.html?id=" + orgId ,
						thumbs: [oUrl]

app/js/discover.js

@@ -265,6 +265,7 @@ function datalistEach(datalist) {
			$itemlist.find("#newstype").addClass("articalLabel");
			$itemlist.find("#newsimg").addClass("artical-default");
			$itemlist.find("#userimg").addClass("cmplogo");
			$itemlist.find("#userimg").html('<div class="boxBlock"><img class="boxBlockimg companyImg" src="../images/default-icon.jpg"></div>');
			if(item.image) {
				$itemlist.find("#newsimg").attr("style", "background-image: url(" + baseUrl + "/data/article/" + item.image + ");");
			}
@@ -283,6 +284,7 @@ function datalistEach(datalist) {
			$itemlist.find("#newstype").addClass("resourceLabel");
			$itemlist.find("#newsimg").addClass("resource-default");
			$itemlist.find("#userimg").addClass("cmplogo");
			$itemlist.find("#userimg").html('<div class="boxBlock"><img class="boxBlockimg companyImg" src="../images/default-icon.jpg"></div>');
			if(item.image) {
				$itemlist.find("#newsimg").attr("style", "background-image: url(" + baseUrl + "/data/resource/" + item.image + ");");
			}
@@ -332,7 +334,7 @@ function cmpFun(id, $itemlist) {
					$itemlist.find("#nameSpan").text(data.data.name);
				}
				if(data.data.hasOrgLogo) {
					$itemlist.find("#userimg").attr("style", "background-image: url(" + baseUrl + "/images/org/" + data.data.id + ".jpg);");
					$itemlist.find(".companyImg").attr("src",baseUrl + "/images/org/" + data.data.id + ".jpg");
				}
				$itemlist.find(".userurl").attr("data-id", data.data.id);
				$itemlist.find(".userurl").attr("data-iftauth", data.data.authStatus);

app/js/paperShow.js

@@ -246,7 +246,7 @@ mui.plusReady(function() {
			var share = buildShareService("weixin");
			if(share) {
				shareMessage(share, "WXSceneSession", {
					content: document.getElementById("paperAbstract").innerHTML.substring(0,20),
					content: document.getElementById("paperAbstract").innerHTML.substring(0,40),
					title: document.getElementById("paperName").innerHTML,
					href: baseUrl + "/e/l.html?id=" + paperId ,
					thumbs: [oUrl]
@@ -256,7 +256,7 @@ mui.plusReady(function() {
			var share = buildShareService("weixin");
			if(share) {
				shareMessage(share, "WXSceneTimeline", {
					content: document.getElementById("paperAbstract").innerHTML.substring(0,20),
					content: document.getElementById("paperAbstract").innerHTML.substring(0,40),
					title: document.getElementById("paperName").innerHTML,
					href: baseUrl + "/e/l.html?id=" + paperId ,
					thumbs: [oUrl]

app/js/patentShow.js

@@ -251,7 +251,7 @@ mui.plusReady(function() {
			var share = buildShareService("weixin");
			if(share) {
				shareMessage(share, "WXSceneSession", {
					content: document.getElementById("patentAbstract").innerHTML.substring(0,20),
					content: document.getElementById("patentAbstract").innerHTML.substring(0,40),
					title: document.getElementById("patentName").innerHTML,
					href: baseUrl + "/e/z.html?id=" + patentId ,
					thumbs: [oUrl]
@@ -261,7 +261,7 @@ mui.plusReady(function() {
			var share = buildShareService("weixin");
			if(share) {
				shareMessage(share, "WXSceneTimeline", {
					content: document.getElementById("patentAbstract").innerHTML.substring(0,20),
					content: document.getElementById("patentAbstract").innerHTML.substring(0,40),
					title: document.getElementById("patentName").innerHTML,
					href: baseUrl + "/e/z.html?id=" + patentId ,
					thumbs: [oUrl]

app/js/resourceShow.js

@@ -101,13 +101,18 @@ mui.plusReady(function() {
							othisInfo.setAttribute("data-id",mydata.organization.id);
							othisInfo.setAttribute("data-status",mydata.organization.authStatus);
							othisInfo.setAttribute("data-type",mydata.resourceType);
							othisName.innerHTML = mydata.organization.name;
							if(mydata.organization.forShort){
								othisName.innerHTML = mydata.organization.forShort;
							}else{
								othisName.innerHTML = mydata.organization.name;
							}
							if(mydata.organization.subject) {
								othisOther.innerHTML = (mydata.organization.subject).replace(/,/, " | ");
							}
							othisPic.classList.add("cmpHead");
							othisPic.innerHTML='<div class="boxBlock" style="width:48px;height:48px;"><img class="boxBlockimg" id="companyImg" src="../images/default-icon.jpg"></div>'
							if(mydata.organization.hasOrgLogo) {
								othisPic.style.backgroundImage = 'url('+ baseUrl +'/images/org/' + mydata.organization.id + '.jpg)';
								document.getElementById("companyImg").src= baseUrl + "/images/org/" + mydata.organization.id + ".jpg";
							}
							if(mydata.organization.authStatus==3){
								oauthFlag.classList.add("authicon-com-ok");	
@@ -219,8 +224,10 @@ mui.plusReady(function() {
								dataType: "json",
								success: function(data) {
									if(data.success) {
										var comName="";
										if($html[n].article.articleType==1) {
											var stl = autho(data.data.authType, data.data.orgAuth, data.data.authStatus);
											comName=data.data.name;
										}else {
											var stl={};
											stl.sty="";
@@ -229,6 +236,11 @@ mui.plusReady(function() {
												stl.sty="authicon-com-ok";
												stl.title="认证企业";
											}
											if(data.data.forShort){
												comName=data.data.forShort;
											}else{
												comName=data.data.name;
											}
										}
										var likeRUl = document.getElementById("likeArtical");
										var likeRli = document.createElement("li");
@@ -244,7 +256,7 @@ mui.plusReady(function() {
										}
										str += '<div class="madiaInfo OmadiaInfo">'
										str += '<p class="mui-ellipsis-2 h1Font">' + $html[n].article.articleTitle + '</p>'
										str += '<p><span class="h2Font">' + data.data.name + '</span><em class="authicon ' + stl.sty + '" title="' + stl.title + '"></em></p>'
										str += '<p><span class="h2Font">' + comName + '</span><em class="authicon ' + stl.sty + '" title="' + stl.title + '"></em></p>'
										str += '</div></div>'
										likeRli.innerHTML = str;
										likeRUl.appendChild(likeRli,likeRUl.lastChild);
@@ -304,7 +316,12 @@ mui.plusReady(function() {
								stl.sty="authicon-com-ok";
								stl.title="认证企业";
							}
							var name= $respond[i].organization.name;
							var name="";
							if($respond[i].organization.forShort){
								name= $respond[i].organization.forShort;
							}else{
								name= $respond[i].organization.name;
							}
						}else {
							var stl = autho($respond[i].editProfessor.authType, $respond[i].editProfessor.orgAuth, $respond[i].editProfessor.authStatus);
							var name= $respond[i].editProfessor.name;

app/js/searchListNew2.js

@@ -252,7 +252,11 @@ mui.ready(function() {
						userType = autho($data.editProfessor.authType, $data.editProfessor.orgAuth, $data.editProfessor.authStatus);
					} else {
						userType = {};
						namepo = $data.organization.name;
						if($data.organization.forShort){
							namepo = $data.organization.forShort;
						}else{
							namepo = $data.organization.name;
						}
						if($data.organization.authStatus == 3) {
							userType.sty = "authicon-com-ok"
						} else {
@@ -367,7 +371,11 @@ mui.ready(function() {
						}
						li.setAttribute("owner-id", $data[i].editOrganization.id);
						li.setAttribute("data-type", 2);
						name = $data[i].editOrganization.name;
						if($data[i].editOrganization.forShort){
							name = $data[i].editOrganization.forShort;
						}else{
							name = $data[i].editOrganization.name;
						}
					}
					li.setAttribute("data-id", $data[i].articleId);
					li.setAttribute("data-flag", 3);
@@ -602,7 +610,7 @@ mui.ready(function() {
					var li = document.createElement("li");
					li.setAttribute("data-id", $data[i].id);
					var oimg = ($data[i].hasOrgLogo) ? baseUrl + "/images/org/" + $data[i].id + ".jpg" : "../images/default-icon.jpg";
					var oAuth = ($data[i].authStatus == 3) ? 'authicon - com - ok' : '';
					var oAuth = ($data[i].authStatus == 3) ? 'authicon-com-ok' : '';
					var orgName = ($data[i].forShort) ? $data[i].forShort : $data[i].name;
					var orgType = ($data[i].orgType == '2') ? "上市企业" : "";
					var orgOther = ($data[i].industry) ? $data[i].industry.replace(/,/gi, " | ") : "";
@@ -623,6 +631,8 @@ mui.ready(function() {
		}
		if(webview.qiFlag == 1) {
			document.getElementById("searchval").setAttribute("placeholder", "请输入专家姓名、机构、研究方向");
			document.getElementById("sele").classList.remove("displayNone");
			document.getElementById("searB").classList.add("searchboxNewT");
			search.oAjaxGet(baseUrl + "/ajax/professor/pqAPP", {
				"key": obj.ex,
				"subject": subject,
@@ -634,6 +644,8 @@ mui.ready(function() {
			}, "get", search.oExeprt);
		} else if(webview.qiFlag == 2) {
			document.getElementById("searchval").setAttribute("placeholder", "输入资源名称、用途、机构或相关关键词");
			document.getElementById("sele").classList.add("displayNone");
			document.getElementById("searB").classList.remove("searchboxNewT");
			search.oAjaxGet(baseUrl + "/ajax/resource/firstpq", {
				"key": obj.rs,
				"pageSize": pageSize,
@@ -641,6 +653,8 @@ mui.ready(function() {
			}, "get", search.resource);
		} else if(webview.qiFlag == 3) {
			document.getElementById("searchval").setAttribute("placeholder", "输入文章标题、作者或相关关键词");
			document.getElementById("sele").classList.add("displayNone");
			document.getElementById("searB").classList.remove("searchboxNewT");
			search.oAjaxGet(baseUrl + "/ajax/article/firstpq", {
				"key": obj.ar,
				"pageSize": pageSize,
@@ -648,6 +662,8 @@ mui.ready(function() {
			}, "get", search.article);
		} else if(webview.qiFlag == 4) {
			document.getElementById("searchval").setAttribute("placeholder", "输入专利名称、发明人、专利号或相关关键词");
			document.getElementById("sele").classList.add("displayNone");
			document.getElementById("searB").classList.remove("searchboxNewT");			
			search.oAjaxGet(baseUrl + "/ajax/ppatent/pq", {
				"qw": obj.pt,
				"pageSize": pageSize,
@@ -655,6 +671,8 @@ mui.ready(function() {
			}, "get", search.patent);
		} else if(webview.qiFlag == 5) {
			document.getElementById("searchval").setAttribute("placeholder", "输入论文题目、作者或相关关键词");
			document.getElementById("sele").classList.add("displayNone");
			document.getElementById("searB").classList.remove("searchboxNewT");	
			search.oAjaxGet(baseUrl + "/ajax/ppaper/pq", {
				"qw": obj.pp,
				"pageSize": pageSize,
@@ -662,6 +680,8 @@ mui.ready(function() {
			}, "get", search.paper);
		} else if(webview.qiFlag == 6) {
			document.getElementById("searchval").setAttribute("placeholder", "输入企业名称、产品名称或相关关键词");
			document.getElementById("sele").classList.add("displayNone");
			document.getElementById("searB").classList.remove("searchboxNewT");	
			search.oAjaxGet(baseUrl + "/ajax/org/find/pq", {
				"kw": obj.co,
				"pageSize": pageSize,
@@ -849,6 +869,8 @@ mui.ready(function() {
			if($this.innerHTML == "找专家") {
				tabFlag = 1;
				document.getElementById("searchval").setAttribute("placeholder", "请输入专家姓名、机构、研究方向");
				document.getElementById("sele").classList.remove("displayNone");
				document.getElementById("searB").classList.add("searchboxNewT");
				if(key2[0] == 1) {
					pageNo.ex = 1;
					search.oAjaxGet(baseUrl + "/ajax/professor/pqAPP", {
@@ -883,6 +905,8 @@ mui.ready(function() {
			} else if($this.innerHTML == "找资源") {
				tabFlag = 2;
				document.getElementById("searchval").setAttribute("placeholder", "输入资源名称、用途、机构或相关关键词");
				document.getElementById("sele").classList.add("displayNone");
				document.getElementById("searB").classList.remove("searchboxNewT");
				if(key2[2] == 1) {
					flag = 1;
					pageNo.rs = 1;
@@ -909,6 +933,8 @@ mui.ready(function() {
			} else if($this.innerHTML == "找文章") {
				tabFlag = 3;
				document.getElementById("searchval").setAttribute("placeholder", "输入文章标题、作者或相关关键词");
				document.getElementById("sele").classList.add("displayNone");
				document.getElementById("searB").classList.remove("searchboxNewT");
				if(key2[5] == 1) {
					flag = 1;
					pageNo.ar = 1;
@@ -935,6 +961,8 @@ mui.ready(function() {
			} else if($this.innerHTML == "找专利") {
				tabFlag = 4;
				document.getElementById("searchval").setAttribute("placeholder", "输入专利名称、发明人、专利号或相关关键词");
				document.getElementById("sele").classList.add("displayNone");
				document.getElementById("searB").classList.remove("searchboxNewT");
				if(key2[3] == 1) {
					flag = 1;
					pageNo.pt = 1;
@@ -961,6 +989,8 @@ mui.ready(function() {
			} else if($this.innerHTML == "找论文") {
				tabFlag = 5;
				document.getElementById("searchval").setAttribute("placeholder", "输入论文题目、作者或相关关键词");
				document.getElementById("sele").classList.add("displayNone");
				document.getElementById("searB").classList.remove("searchboxNewT");
				if(key2[4] == 1) {
					flag = 1;
					pageNo.pp = 1;
@@ -987,6 +1017,8 @@ mui.ready(function() {
			}else if($this.innerHTML == "找企业") {
				tabFlag = 6;
				document.getElementById("searchval").setAttribute("placeholder", "输入企业名称、产品名称或相关关键词");
				document.getElementById("sele").classList.add("displayNone");
				document.getElementById("searB").classList.remove("searchboxNewT");
				if(key2[1] == 1) {
					flag = 1;
					pageNo.co = 1;