Browse Source

企业浏览页面logo全部显示

luyanan 7 years ago
parent
commit
5e0681d1b9
5 changed files with 21 additions and 12 deletions
  1. 7 3
      cmpInforShow.html
  2. 3 0
      css/common.css
  3. 2 2
      css/genindex.css
  4. 1 1
      js/cmpInforShow.js
  5. 8 6
      js/paperImport.js

+ 7 - 3
cmpInforShow.html

@ -22,10 +22,14 @@
22 22
</header>
23 23
<div id="container">
24 24
	<div class="containerCon">
25
		<div class="contentCon clearfix">
25
		<div class="contentCon">
26 26
			<div class="headconBox flexCenter">
27
				<div class="headimgBox cmpimgBox floatL" id="proHead"></div>
28
                <div class="reInfoBlock floatL">
27
				<div class="headimgBox cmpimgBox">
28
					<div class="boxBlock">
29
						<img class="boxBlockimg" src="" id="proHead" />
30
					</div>
31
				</div>
32
                <div class="reInfoBlock">
29 33
                	<div class="h1Font"><span id="proName"></span><em class="authiconNew" id="proAuth"></em></div>
30 34
                	<div class="h2Font ellipsisSty"><span id="proTit"></span> <span id="proOther"></span></div>
31 35
                	<div class="operateBlock bottomShow">

+ 3 - 0
css/common.css

@ -165,6 +165,9 @@ input{ outline:none;}
165 165
.ResImgBox .resImg{max-width: 100%;max-height: 100%;vertical-align: middle;position: relative;}
166 166
.ResImgBox:before {content: ' ';display: inline-block;vertical-align: middle;width: 0;height: 100%;overflow: hidden;margin-left: 0px;}
167 167
.beforMargin:before{margin-left:-4px;}
168
/*图片在容器中无变形居中显示*//*display: table;table-layout: fixed;*/
169
.boxBlock{width:140px; height:140px;display: table-cell;vertical-align:middle; text-align:center;overflow: hidden;}
170
.boxBlockimg{max-width: 100%;max-height: 100%;vertical-align:middle;height:auto !important; overflow-y:auto;}
168 171

169 172
/*kexiu用户协议*/
170 173
.privacyBox{max-width:1100px;padding: 2% 4% 6%;background:#fafafa;margin:auto;line-height:28px;font-size:15px;}

+ 2 - 2
css/genindex.css

@ -572,8 +572,8 @@ div.zoomMask{position:absolute;background:url("../images/g-resource-mask.png") r
572 572
.headconBox{padding:30px;min-height:200px;background: #fff;position: relative;margin-bottom: 20px;}
573 573
.bottomShow .shareCode{bottom:auto;top:30px;}
574 574
.bottomShow .shareCode:after{border:12px solid transparent;border-bottom-color:rgba(0,0,0,.6);top:-24px;left:22px;bottom:auto;}
575
.headconBox .headimgBox{width: 140px;height: 140px;position:absolute;overflow:hidden;border:1px solid #E5E5E5;border-radius:50%;background-image:url(../images/default-photo.jpg);background-size: cover;}
576
.headconBox .cmpimgBox{border-radius:0;background-image:url(../images/default-icon.jpg);}
575
.headconBox .headimgBox{width: 142px;height: 142px;position:absolute;overflow:hidden;border:1px solid #E5E5E5;border-radius:50%;background-image:url(../images/default-photo.jpg);background-size: cover;}
576
.headconBox .cmpimgBox{border-radius:0;background:#fff;}
577 577
.headconBox .reInfoBlock{width:100%;padding-left:170px;}
578 578
.headconBox .reInfoBlock .h1Font{font-size: 18px;color:#666;margin-bottom:10px;}
579 579
.headconBox .reInfoBlock .h2Font{font-size: 16px;color:#666;margin-bottom:8px;}

+ 1 - 1
js/cmpInforShow.js

@ -176,7 +176,7 @@ $(function() {
176 176
				//console.log($info)
177 177
				if(data.success) {
178 178
					if($info.hasOrgLogo) {
179
						$("#proHead").css("background-image", "url(/images/org/" + $info.id + ".jpg)");
179
						$("#proHead").attr("src", "/images/org/" + $info.id + ".jpg");
180 180
					}
181 181
					if($info.forShort) {
182 182
						$("#proName").text($info.forShort);

+ 8 - 6
js/paperImport.js

@ -7,7 +7,7 @@ $(document).ready(function(){
7 7
	var userName = $.cookie("userName");
8 8
	var paperId;
9 9
	
10
	/*资源列表查询*/
10
	/*论文列表查询*/
11 11
	function getPaperMe(n,isbind,num) {
12 12
		var paperNameVa=$("#paperName").val();
13 13
		var $info={};
@ -84,13 +84,15 @@ function paperHtml($data) {
84 84
 		var oName1=$data[i].name;
85 85
 		var oId=$data[i].id;
86 86
 		
87
		var oT,oText;
87
		var oT,oText,cs;
88 88
		if($data[i].professorId.substring(0,1)!="#") {
89
			oT="importSpan-2";
89
			oT="importSpan-3";
90 90
			oText="已导入";
91
			cs="auto";
91 92
		}else{
92 93
			oT="importSpan-1";
93 94
			oText="导入";
95
			cs="pointer";
94 96
		}
95 97
		var oString = '<li>' +
96 98
		'<a class="flexCenter">' +
@ -102,7 +104,7 @@ function paperHtml($data) {
102 104
		'</div>' +
103 105
		'</a>' +
104 106
		'<div class="importBtn">' +
105
		'<span class="importResource '+oT+'" data-id="'+oId+'" flag="1">'+oText+'</span>' +
107
		'<span class="importResource '+oT+'" data-id="'+oId+'" flag="1" style="cursor:'+cs+'">'+oText+'</span>' +
106 108
		/*'<span class="importSpan-2">再次导入</span>' +
107 109
		'<span class="importSpan-3">已导入</span>' +*/
108 110
		'</div>' +
@ -110,7 +112,7 @@ function paperHtml($data) {
110 112
		$(".importUl").append(oString);
111 113
 	}
112 114
 }
113
	/*输入资源名称限制字数*/
115
	/*输入论文名称限制字数*/
114 116
	$("#paperName").bind({
115 117
		keyup: function() {
116 118
			if($(this).val().length > 50) {
@ -125,7 +127,7 @@ function paperHtml($data) {
125 127
		getPaperMe(1,true);
126 128
	})
127 129

128
	/*导入资源*/
130
	/*导入论文*/
129 131
	$(".importUl").on("click",".importResource",function(){
130 132
		var oF=$(this).attr("flag");
131 133
		if(oF!=1) return;