luyanan лет назад: 7
Родитель
Сommit
28c4aab38a

+ 6 - 4
app/css/app.css

@ -461,11 +461,13 @@ ul.boxnav li.set span:before{font-family:"iconfont";content: "\e733";font-size:1
461 461
.addlabel .addlabelbtn{position: absolute;right: 0;background:#FF9900; color: #fff; border-radius:0 6px 6px 0;border-color: #FF9900;  width: 18%; height: 40px;}
462 462
/*.labelarea{ margin: 20px 0;}*/
463 463
.labelshow{ margin: 0; padding:0;overflow: hidden;margin-right: -10px;}
464
.maincon .labelshow li{ list-style: none;padding-left:8px;border-radius:6px;margin-right:10px;margin-bottom:10px;background:#e5e5e5;font-size: 13px;float:left}
464
.maincon .labelshow li{ list-style: none;padding-left:8px;border-radius:6px;margin-right:10px;margin-bottom:10px;background:#e5e5e5;font-size: 13px;float:left;}
465 465
.maincon .labelshow li .mui-icon{ color: #FF9900; font-size:20px; margin-left: 10px;}
466 466
.maincon .labelshow li .closeThis{display:inline-block;background: #ff9900;color:#fff;padding:4px 8px;margin-left: 8px;}
467
.maincon .labelshow li .numThis{display:inline-block;background: #ff9900;color:#fff;padding:4px 8px;margin-right: 8px;min-width: 30px;text-align: center;}
468
.maincon .labelshowT li{padding:0; border-radius:0 6px 6px 0;}
467
.maincon .labelshow li .numThis{display:inline-block;display:inline-block;background: #ff9900;color:#fff;padding:4px 8px;margin-right: 8px;min-width: 30px;text-align: center;}
468
.maincon .labelshowT li{padding:0;border-radius:0 6px 6px 0;overflow: hidden;position: relative;max-width:96%;}
469
.maincon .labelshowT .otsave{display:inline-block;max-width:84%;padding: 4px; padding-right: 52px;text-overflow: ellipsis; white-space: nowrap;overflow: hidden;}
470
.maincon .labelshowT .closeThis{display:inline-block;position: absolute;right: 0;}
469 471
.selectbox{padding:0;/* margin: 4px 0;*/}
470 472

471 473
.downarrow{ position:absolute; right:10px; top:50%; margin-top:-12px; color: #999999;}
@ -1173,7 +1175,7 @@ ul.tagList>li .h2Font{color: #666; -webkit-user-select:text;}
1173 1175
.cardInfo .h1Font{font-size:16px;}
1174 1176
.cardInfo .h2Font{font-size:14px;color: #666;}
1175 1177
.cardInfo .h3Font{font-size:13px;line-height: 16px;color: #666;}
1176
.cardInfo .icon-address{position:relative;top:-4px;}
1178
.cardInfo .icon-address{position:relative;top:-5px;}
1177 1179

1178 1180
/*反馈意见以及投诉*/
1179 1181
.mui-input-row.textBox{position: relative;background:#fff;}

+ 1 - 1
app/html/cmpInforShow.html

@ -49,7 +49,7 @@
49 49
					<div class="cardInfo">
50 50
						<p><span class="h1Font" id="companyName"></span><em class="authicon" id="authFlag"></em></p>
51 51
						<p class="mui-ellipsis h2Font" id="industryShow"></p>
52
						<p class="h3Font"><em class="mui-icon iconfontnew icon-address"></em> <span id="address"></span></p>
52
						<p class="h3Font" id="address"></p>
53 53
					</div>		
54 54
				</div>
55 55
			</div>

+ 4 - 3
app/html/updateResearch.html

@ -28,9 +28,10 @@
28 28
							<button class="mui-btn mui-pull-left addlabelbtn">添加</button>
29 29
						</div>
30 30
	                    <div class="labelarea">
31
	                    	<ul class="labelshow labelshowT">
32
					       		<li><span class="numThis">234</span>dshfjk<span class="closeThis">删除</span></li>
33
					       		<li><span class="numThis">5</span>dshfjk<span class="closeThis">删除</span></li>
31
	                    	<ul class="labelshow labelshowT" style="margin-right: -10px;">
32
					       		<!--<li><span class='numThis mui-pull-left'>245</span><span class='otsave mui-pull-left'>腐蚀防护腐蚀防护石墨烯腐蚀防护纳米材料料</span><span class='closeThis mui-pull-right'>删除</span></li>
33
					       		<li><span class='numThis mui-pull-left'>2</span><span class='otsave mui-pull-left'>腐蚀</span><span class='closeThis mui-pull-right'>删除</span></li>
34
					       		<li><span class='numThis mui-pull-left'>2</span><span class='otsave mui-pull-left'>腐蚀腐蚀腐蚀</span><span class='closeThis mui-pull-right'>删除</span></li>-->
34 35
					       	</ul>
35 36
	                    </div>
36 37
						

+ 1 - 1
app/js/cmpInforShow.js

@ -99,7 +99,7 @@ mui.ready(function() {
99 99
						
100 100
						/*所在城市*/
101 101
						if($data.city) {
102
							document.getElementById("address").innerText = $data.city;
102
							document.getElementById("address").innerHTML = '<em class="mui-icon iconfontnew icon-address"></em> ' + $data.city;
103 103
						} else {
104 104
							document.getElementById("address").parentNode.style.display = "none";
105 105
						}

+ 3 - 3
app/js/updateResearch.js

@ -10,9 +10,9 @@ mui.ready(function() {
10 10
			var html = [];
11 11
			for(var i = 0; i < data.length; i++) {
12 12
				console.log(data[i].caption);
13
				html.push("<li><span class='numThis'>"+ data[i].count+"</span><span class='otsave'>" + data[i].caption + "</span><span class='closeThis'>删除</span></li>");
13
				html.push("<li><span class='numThis mui-pull-left'>"+ data[i].count+"</span><span class='otsave mui-pull-left'>" + data[i].caption + "</span><span class='closeThis'>删除</span></li>");
14 14
			};
15
			document.getElementsByClassName("labelshow")[0].innerHTML = html.join('');
15
			document.getElementsByClassName("labelshowT")[0].innerHTML = html.join('');
16 16
		}
17 17
		if(ws.researchAreas) {
18 18
			subjectShow(ws.researchAreas);
@ -56,7 +56,7 @@ mui.ready(function() {
56 56
					return;
57 57
				}
58 58
				var node = document.createElement("li");
59
				node.innerHTML = '<span class="numThis">0</span><span class="otsave">'+content + '</span><span class="closeThis">删除</span>';
59
				node.innerHTML = '<span class="numThis mui-pull-left">0</span><span class="otsave mui-pull-left">'+content + '</span><span class="closeThis">删除</span>';
60 60
				document.getElementsByClassName("labelshow")[0].appendChild(node);
61 61
				document.getElementsByTagName('input')[0].value = "";
62 62
				var lilength = document.getElementsByTagName("li").length;

+ 1 - 1
app/js/userInforShow-more.js

@ -172,7 +172,7 @@ mui.ready(function() {
172 172
								flag: 2
173 173
							});
174 174
						} else {
175
							document.getElementById("perfessorhonor").style.display = "none";
175
							document.getElementById("perfessorEducation").style.display = "none";
176 176
						}
177 177
					}
178 178
				},