Merge remote-tracking branch 'origin/test'

Conflicts:
	e/a.html

cmp-portal/js/cmp-updateinfo.js

@@ -19,8 +19,9 @@ $(document).ready(function() {
					console.log(data);
					var $data = data.data;
					$(".h1Font").text($data.name);
					var num=new Date().getTime();
					if($data.hasOrgLogo) {
						$("#oimg").attr("src", "/images/org/" + $data.id + ".jpg");
						$("#oimg").attr("src", "/images/org/" + $data.id + ".jpg?"+num);
					}
					if($data.orgUrl) {
						$("#inteAddress").val($data.orgUrl);

e/a.html

@@ -170,10 +170,14 @@
							document.getElementById('name').innerHTML = $data.forShort;
						}else{
							document.getElementById('name').innerHTML = $data.name;
						}
						}
						var mgimg="../images/default-icon.jpg";
						if($data.hasOrgLogo) {
							document.getElementById("companyImg").src= "/images/org/" + $data.id + ".jpg";
							mgimg="/images/org/" + $data.id + ".jpg";
						}
						document.getElementById("messImg").classList.add("cmpHead");
						document.getElementById("messImg").innerHTML='<div class="boxBlock" style="width:50px;height:50px;"><img class="boxBlockimg" id="companyImg" src="'+ mgimg+'"></div>'
						if($data.authStatus == 3) {
							document.getElementById("auth").classList.add("authicon-com-ok");
						}

e/r.html

@@ -208,11 +208,12 @@ $(document).ready(function() {
						if(mydata.organization.subject){
							othisOther.innerHTML = (mydata.organization.subject).replace(/,/, " | ");
						}
						othisPic.classList.add("cmpHead");
						othisPic.innerHTML='<div class="boxBlock" style="width:50px;height:50px;"><img class="boxBlockimg" id="companyImg" src="../images/default-icon.jpg"></div>'
						var mgimg="../images/default-icon.jpg";
						if(mydata.organization.hasOrgLogo) {
							document.getElementById("companyImg").src= "/images/org/" + mydata.organization.id + ".jpg";
							mgimg="/images/org/" + mydata.organization.id + ".jpg";
						}
						othisPic.classList.add("cmpHead");
						othisPic.innerHTML='<div class="boxBlock" style="width:50px;height:50px;"><img class="boxBlockimg" id="companyImg" src="'+ mgimg+'"></div>'
						if(mydata.organization.authStatus==3){
							oauthFlag.classList.add("authicon-com-ok");	
						}