Browse Source

企业名字优先级

jack 7 years ago
parent
commit
c7776cfa69
3 changed files with 24 additions and 4 deletions
  1. 5 1
      js/articalShow.js
  2. 6 1
      js/resourceShow.js
  3. 13 2
      js/searchNew.js

+ 5 - 1
js/articalShow.js

@ -111,7 +111,11 @@ $(function() {
111 111
			"success": function(data) {
112 112
				if(data.success && data.data) {
113 113
					$(".userimg").removeClass("useHead");
114
					$("#Qname,.username").text(data.data.name);
114
					if(data.data.forShort) {
115
						$("#Qname,.username").text(data.data.forShort);
116
					}else{
117
						$("#Qname,.username").text(data.data.name);
118
					}
115 119
					$(".qiyego,.useurl").attr("href", "cmpInforShow.html?orgId="+data.data.id);
116 120
					if(data.data.hasOrgLogo) {
117 121
						$("#Qimg,.userimg").attr("style", "background-image: url(/images/org/" + data.data.id + ".jpg);");

+ 6 - 1
js/resourceShow.js

@ -92,7 +92,12 @@ $(document).ready(function() {
92 92
					if($da.organization.authStatus==3){
93 93
						$("#QauthFlag").addClass("authicon-com-ok").attr("title", "认证企业");	
94 94
					}
95
					$("#Qname").text($da.organization.name).attr("href","userInforShow.html?orgId="+$da.organization.id);
95
					if($da.organization.forShort) {
96
						$("#Qname").text($da.organization.forShort).attr("href","cmpInforShow.html?orgId="+$da.organization.id);
97
					}else{
98
						$("#Qname").text($da.organization.name).attr("href","cmpInforShow.html?orgId="+$da.organization.id);
99
					}
100
					
96 101
					$("#Qindustry").text($da.organization.subject);
97 102
					$("#QorgType").text(orgTypeShow[$da.organization.orgType])
98 103
		}

+ 13 - 2
js/searchNew.js

@ -539,7 +539,13 @@ function articalListVal(pageSize, pageNo,isbind) {
539 539
							$itemlist.find(".authiconNew").attr("title", userType.title);
540 540
							$itemlist.find(".authiconNew").addClass(userType.sty);
541 541
						} else if(articleType == 2) { //企业文章
542
							$itemlist.find("#userName").text(datalist.editOrganization.name);
542
							if(datalist.editOrganization.forShort) {
543
								$itemlist.find("#userName").text(datalist.editOrganization.forShort);
544
							}else{
545
								alert(2)
546
								$itemlist.find("#username").text(datalist.editOrganization.name);
547
							}
548
							//$itemlist.find("#userName").text(datalist.editOrganization.name);
543 549
							if(datalist.editOrganization.authStatus==3){
544 550
								$itemlist.find(".authiconNew").addClass("authicon-com-ok").attr("title", "认证企业");;	
545 551
							}
@ -620,7 +626,12 @@ function resourceListVal(pageSize, pageNo,isresource) {
620 626
							$itemlist.find(".authiconNew").attr("title", userType.title);
621 627
							$itemlist.find(".authiconNew").addClass(userType.sty);
622 628
						} else if(resourceType == 2) { //企业资源
623
							$itemlist.find("#username").text(datalist.organization.name);
629
							if(datalist.organization.forShort) {
630
								$itemlist.find("#username").text(datalist.organization.forShort);
631
							}else{
632
								$itemlist.find("#username").text(datalist.organization.name);
633
							}
634
							
624 635
							if(datalist.organization.authStatus==3){
625 636
								$itemlist.find(".authiconNew").addClass("authicon-com-ok").attr("title", "认证企业");;	
626 637
							}