Browse Source

专家点赞功能bug修改

luyanan 8 years ago
parent
commit
0bfd6fbb53

+ 4 - 3
src/main/webapp/css/index.css

@ -256,12 +256,13 @@ input[type='radio'].radio:checked + .radio {background:url(../images/redio.png)
256 256
.listbox{ margin:5px 0;max-width:100%; margin-left:15px; overflow:hidden; /*border:1px solid red;*/}
257 257
.list-area{ overflow:hidden; padding:10px 0 20px 0; width:670px; margin:10px auto; background:#f8f8f8;}
258 258
.listbox-browse{ min-height:26px; position:relative;}
259
.list-browse{ height:24px;box-shadow:2px 2px 1px #c9c9c9 ; text-align:center;font-size:14px;line-height:26px; color:#666; margin-left:15px; float:left;cursor:pointer;padding-right: 8px; overflow:hidden;}
259
.list-browse{ height:24px;box-shadow:2px 2px 1px #c9c9c9 ; text-align:center;font-size:14px;line-height:26px; color:#666; margin-left:15px; float:left;cursor:pointer;padding-right: 8px;max-width: 60%;text-overflow: ellipsis;white-space: nowrap; overflow:hidden;}
260 260
.plus{ float:left;display:block; width:26px; height:26px; cursor:pointer; background:url(../images/thumb-up.png) no-repeat 0 0; margin-left:10px;  }
261 261
.line{ width:110px; height:1px; background:#ccc; float:left; margin-left:30px; margin-top:12px;}
262
.like-num{ float:right;max-width:380px;height:26px; padding:0 20px; overflow:hidden; }
263
.like-people{ width:26px; height:26px; float:right; overflow:hidden; margin-right:5px; background:url(../images/default-photo.png) no-repeat center center; background-size:100% 100%;-moz-background-size:100% 100%;}
262
.like-num{ float:right;max-width:38%;height:26px; padding:0 20px; overflow:hidden; }
263
.like-people{ width:26px; height:26px; float:left; overflow:hidden; margin-right:5px; background:url(../images/default-photo.png) no-repeat center center; background-size:100% 100%;-moz-background-size:100% 100%;}
264 264
.like-people img{ width:100%; height:100%;}
265
.like-more{ display: block; border:1px solid #CCCCCC; background:url(../images/likemore.png) no-repeat center center;}
265 266
.triangleR{ display:block; width:0; height:0; border:8px solid transparent; border-left-color:#f0f1f3; float:right; margin-right:20px;margin-top:6px; cursor: pointer;}
266 267
.acad{  height:26px;border:1px #c9c9c9 solid; border-radius:5px; text-align:center;font-size:14px;line-height:26px;color:#3e3e3e; margin:6px 0; margin-left:15px; float:left;cursor:pointer;padding:0 8px;}
267 268
.list{  height:26px;border:1px #c9c9c9 solid; border-radius:5px; text-align:center;font-size:14px;line-height:26px; color:#3e3e3e; margin-top:12px; margin-left:15px; float:left;cursor:pointer;padding-right: 8px; overflow:hidden;}

BIN
src/main/webapp/images/likemore.png


+ 2 - 2
src/main/webapp/information-brow.html

@ -245,8 +245,8 @@
245 245
    			<a class="authobject named" id="foot_proname"></a>
246 246
    			<em class=" authicon-cu" id="foot_promodify"></em>
247 247
    		</div>
248
			<div class="position"><span id="foot_protitle"></span><span></span ><span class="address" id="foot_proaddress"></span></div>				
249
			<div class="science"><span id="foot_prodepar"></span><span id="foot_proorgname"></span ></div>								
248
			<div class="position"><span id="foot_protitle"></span><span></span ></div>				
249
			<div class="science"><span id="foot_prodepar"></span><span id="foot_proorgname"></span ><span class="address" id="foot_proaddress"></span></div>								
250 250
    	</div>
251 251
        <div class="coulstbtn floatR"><span>咨询</span></div>
252 252
    </div>

+ 66 - 40
src/main/webapp/js/information.brow.js

@ -155,54 +155,80 @@ loginStatus();//读取用户头像
155 155
						
156 156
					}
157 157
				}
158
			}
159
			var researchAreaShow = function ($datas,$datarecords){
160
				if($datas != undefined &&  $datas.length != 0 ){
161
					for(var i =0 ; i< $datas.length;++i){
158
			}			
159
			var researchAreaShow = function($datas, $datarecords) {
160
				if($datas != undefined && $datas.length != 0) {
161
					var html = [];
162
					for(var i = 0; i < $datas.length; ++i) {
162 163
						var $data = $datas[i];
163 164
						var $photos = [];
164
						//获取头像
165
						if($datarecords.length>0){
166
							$photos = getRecords($datarecords,$data.caption);
165
						//获取头像					
166
						if($datarecords.length > 0) {
167
							$photos = getRecords($datarecords, $data.caption);
167 168
						}
168
						var isAgree = $.inArray(userid, $photos);
169
170
						var showDiv= "<div class='listbox listbox-browse clear'><div class='list-browse'><span class='like'>"+$data.count+"</span>"+$data.caption+"</div><span class='plus' data-pid='"+$data.professorId+"' data-caption='"+$data.caption+"' data-isagree='"+isAgree+"'></span><div class='like-num'>";
171
						if($photos.length>10){
172
							showDiv += "<div class='triangleR'></div>";
169
						var isAgree = -1;
170
						for(var j = 0; j < $photos.length; j++) {
171
							if(userid == $photos[j].id)
172
								isAgree++;
173 173
						}
174
						
175
						if($photos.length>0){
176
							for(var j =0 ; j< $photos.length;++j){
177
								showDiv += "<span class='like-people headRadius'><img class='like-h' src='/images/head/"+$photos[j]+"_s.jpg'></span>";
178
								
179
							} 
174
						if(isAgree) {
175
							var showDiv = "<div class='listbox listbox-browse clear'><div class='list-browse'><span class='like'>" + $data.count + "</span>" + $data.caption + "</div><span class='plus ' data-pid='" + $data.professorId + "' data-caption='" + $data.caption + "' data-isagree='" + isAgree + "' ></span><div class='like-num'>";
176
						} else {
177
							var showDiv = "<div class='listbox listbox-browse clear'><div class='list-browse'><span class='like'>" + $data.count + "</span>" + $data.caption + "</div><span class='plus' style=' background-position-y:-26px' data-pid='" + $data.professorId + "' data-caption='" + $data.caption + "' data-isagree='" + isAgree + "' ></span><div class='like-num'>";
180 178
						}
181
						showDiv += "</div></div>";
182
						$("#researchAreaShow").append(showDiv);
183
						
184
						$(".like-h").load(function(){								
185
						})
186
						.error(function(){
187
							$(this).attr("src","/images/default-photo.jpg");
188
						});	
189
							
179
						if($photos.length < 6) {
180
							for(var j = 0; j < $photos.length; ++j) {
181
								if($photos[j].img) {
182
									showDiv += "<span class='like-people headRadius'><img class='like-h' src='../images/head/" + $photos[j].id + "_s.jpg'></span>";
183
								} else {
184
									showDiv += "<span class='like-people headRadius'><img class='like-h' src='../images/default-photo.jpg'></span>";
185
								}
186
							}
187
						} else {
188
							for(var j = $photos.length - 5; j < $photos.length; ++j) {
189
								if($photos[j].img) {									
190
									showDiv += "<span class='like-people headRadius'><img class='like-h' src='../images/head/" + $photos[j].id + "_s.jpg'></span>";
191
								} else {
192
									showDiv += "<span class='like-people headRadius'><img class='like-h' src='../images/default-photo.jpg'></span>";
193
								}
194
							}
195
							showDiv += "<span class='like-people like-more headRadius'></span>";
196
						}
197
						showDiv += "</div></div></div>";
198
						html.push(showDiv);
190 199
					}
191
				}			
200
					document.getElementById("researchAreaShow").innerHTML = html.join('');
201
				}
192 202
			}
193
			var getRecords = function ($researchAreaLogs,caption){
194
			     var ret=[];
195
			     for(var i = 0 ;i < $researchAreaLogs.length ; i++){
196
			     	if(caption==$researchAreaLogs[i].caption){
197
			     		ret.push($researchAreaLogs[i].opreteProfessorId);
198
			     	}
199
			     }
200
			     return ret;
203
			var getRecords = function($researchAreaLogs, caption) {
204
				var ret = [];
205
				var t = 0;
206
				for(var i = 0; i < $researchAreaLogs.length; i++) {
207
					if(caption == $researchAreaLogs[i].caption) {
208
						ret[t] = {
209
							id: $researchAreaLogs[i].opreteProfessorId,
210
							img: $researchAreaLogs[i].hasHeadImage
211
						}
212
						t++;
213
					}
214
				}
215
				return ret;
201 216
			}
202
203
217
			var clFlag = 1;
204 218
			$("#researchAreaShow").on("click",".plus",function(){
205 219
				if(userid && userid != null && userid != "null"){
220
					//点赞变化样式
221
					if(clFlag) {
222
						clFlag = 0;
223
					} else {
224
						return;
225
					}
226
					if($(this).data("isagree")>-1){
227
						$(this).stop(true,true).animate({backgroundPositionY:0},300);//变成未点赞样式
228
					}else{
229
						$(this).stop(true,true).animate({backgroundPositionY:-26},300);//变成点赞样式
230
					}
231
					
206 232
					$.ajax({
207 233
						"url" : $(this).data("isagree")>-1?"/ajax/researchArea/unAgree":"/ajax/researchArea/agree",
208 234
						"type" : "POST",
@ -212,14 +238,14 @@ loginStatus();//读取用户头像
212 238
							if ($data.success) {
213 239
								$.get("/ajax/professor/info/" + professorId, function($data) {
214 240
					    			if ($data.success) 
215
					    			{
241
					    			{clFlag=1;
216 242
										var $info = $data.data;
217 243
										if ($info) 
218 244
										{
219 245
											$("#researchAreaShow").empty("")
220 246
											if ($info.researchAreas)
221 247
											{
222
												researchAreaShow($info.researchAreas,$info.researchAreaLogs);
248
												researchAreaShow($info.researchAreas,$info.editResearchAreaLogs);
223 249
											}
224 250
										}
225 251
										

+ 1 - 1
src/main/webapp/js/popup.js

@ -767,7 +767,7 @@ function ConsultApply() {
767 767
		PopHtml += '<div class="consultmenu">';
768 768
		PopHtml += '<div class="menutit">请选择您的咨询类型</div>';
769 769
		PopHtml += '<ul class="menucon"><li>技术咨询</li><li>资源咨询</li><li>其他事务</li> </ul>';
770
		PopHtml += '<div class="pripolicy"><h3>隐私条款</h3><p>为使您的请求得到快速响应,您填写的信息可能被他的助手或科袖工作人员查阅,所以请不要填写机密信息。</p></div>';
770
//		PopHtml += '<div class="pripolicy"><h3>隐私条款</h3><p>为使您的请求得到快速响应,您填写的信息可能被他的助手或科袖工作人员查阅,所以请不要填写机密信息。</p></div>';
771 771
        PopHtml += '</div></div>';
772 772

773 773
		PopHtml += ' <div class="consultright floatL">';