Merge branch 'dev' of http://121.42.53.174:3000/jiapeng/portal-front.git into dev

css/index.css

@@ -463,7 +463,7 @@ label.edu-radio{ float:none;font-size:16px;line-height:26px; color:#868686; }
.resBrief2 .subtit{line-height: 42px; }
.resBrief2 .resAbout{margin-bottom: 20px;}
.art_topicBox{position: relative;display: block;}
.art_topicbox{ position:absolute;top:0;width:100%;height:100%;
.art_tbox{ position:absolute;top:0;width:100%;height:100%;
	background: -webkit-linear-gradient( rgba(0,0,0,0), rgba(0,0,0,0.2)); /* Safari 5.1 - 6.0 */
	background: -o-linear-gradient( rgba(0,0,0,0), rgba(0,0,0,0.2)); /* Opera 11.1 - 12.0 */
	background: -moz-linear-gradient( rgba(0,0,0,0), rgba(0,0,0,0.2)); /* Firefox 3.6 - 15 */
@@ -492,10 +492,10 @@ label.edu-radio{ float:none;font-size:16px;line-height:26px; color:#868686; }
.share-nav .wrapicon{display: inline-block;cursor:pointer;padding:0 10px;width: 24px;height: 24px;}
.share-nav .upTop{background: url(../images/wrapIcon.png) 0 0 no-repeat; background-size:100% auto ;}
.share-nav .upTop:hover{background: url(../images/wrapIcon.png) 0 -24px no-repeat; background-size:100% auto ;}
.share-nav .shareBtn{display: inline-block;position:relative;border:1px solid #52DA4D;color: #52DA4D; border-radius: 999em;cursor:pointer;padding:2px 24px;}
.share-nav .shareBttn{display: inline-block;position:relative;border:1px solid #52DA4D;color: #52DA4D; border-radius: 999em;cursor:pointer;padding:2px 24px;}
.share-nav .shareCode{position: absolute;top:-166px;left: 50%;margin-left: -80px;display: none;width: 160px;height:160px;}
.share-nav .shareCode img{width: 100%;}
.share-nav .shareBtn:hover{background: #52DA4D;color: #FFFFFF;}
.share-nav .shareBttn:hover{background: #52DA4D;color: #FFFFFF;}
.share-nav .wordHave{background: url(../images/wrapIcon.png) 0 -47px no-repeat; background-size:100% auto ;}
.share-nav .wordHave:hover{background: url(../images/wrapIcon.png) 0 -69px no-repeat; background-size:100% auto;}
.share-nav .listtit2{line-height: 40px;margin-left:10px;width:86%;color:#888;text-overflow:ellipsis;white-space: nowrap; overflow:hidden;}

css/workspace.css

@@ -118,7 +118,7 @@
.otherRes li:last-child{margin:0 0 12px 0;}
.otherRes li a{display: block;}
.art_topicBox{position: relative;display: block;}
.art_topicbox{ position:absolute;top:0;width:100%;height:100%;
.art_tbox{ position:absolute;top:0;width:100%;height:100%;
	background: -webkit-linear-gradient( rgba(0,0,0,0), rgba(0,0,0,0.2)); /* Safari 5.1 - 6.0 */
	background: -o-linear-gradient( rgba(0,0,0,0), rgba(0,0,0,0.2)); /* Opera 11.1 - 12.0 */
	background: -moz-linear-gradient( rgba(0,0,0,0), rgba(0,0,0,0.2)); /* Firefox 3.6 - 15 */

ekexiu/shareArticalinfor.html

@@ -27,7 +27,7 @@
		<div class="contentBody2">
			<div class="art_topicBox">
				<div class="art_img" id="articleImg"></div>
				<div class="art_topicbox">
				<div class="art_tbox">
					<h4 id="artical_topic"></h4>
				</div>
			</div>

js/articalInfo.js

@@ -143,20 +143,19 @@ $(document).ready(function() {
						}
					}
				}
				//留言分享操作栏				
				var height=$(".resTop").height()-$(window).height();
				var mainH = $("body");
				$(window).scroll( function() { 
					//console.log(height,mainH.scrollTop())
				   if(mainH.scrollTop()>=height){
				   	$('.share-nav').removeClass('fixed');
				   }
				   if(mainH.scrollTop()<height){
				   	$('.share-nav').addClass('fixed');
				   }
				} );
				
					
//				//留言分享操作栏				
//				var height=$(".resTop").height()-$(window).height();
//				var mainH = $("body");
//				$(window).scroll( function() { 
//					//console.log(height,mainH.scrollTop())
//				   if(mainH.scrollTop()>=height){
//				   	$('.share-nav').removeClass('fixed');
//				   }
//				   if(mainH.scrollTop()<height){
//				   	$('.share-nav').addClass('fixed');
//				   }
//				} );
		
			},
			error: function() {
				return;
@@ -206,7 +205,7 @@ $(document).ready(function() {
							add += '<a href="articalInfo.html?articleId=' + $data[i].articleId + '&professorId=' + professorId + '">'
							add += '<div class="art_topicBox">'
							add += '<div class="art_img"style="background:url(' + articleImg + ') center center no-repeat"></div>'
							add += '<div class="art_topicbox">'
							add += '<div class="art_tbox">'
							add += '<h6 id="artical_topic" >' + $data[i].articleTitle + '</h6>'
							add += '</div>'
							add += '</div>'
@@ -329,4 +328,5 @@ $(document).ready(function() {
	proArticle();
	message();
	userInformation();
	
})

js/information.brow.js

@@ -627,62 +627,69 @@ $(function() {
						$("a:contains('荣誉及奖项')").hide();
					}
					//下滑滚动不覆盖底部 
					var d;
					var t;
					$(function() {
						/*向下滚动时，header背景变半透明*/
						var top5 = $(".content-left").height();
						var top4 = $("#container").height();
						var top3 = $(window).height();
						$(document).scroll(function() {
							var top1 = $(document).scrollTop();
							var top2 = $("#container").height() - top3 + (top3 - 80 - top5) - 10; //变成绝对定位	
							if(top1 >= 300) {
								$(".content-left").css({
									"position": "fixed",
									"top": "80px"
								});
								if(top1 >= top2) {
									$('.information-content').css("position", "static");
									$(".content-left").css("position", "absolute");
									$(".content-left").css("top", top4 - top5 - 10 + "px");
								} else {
									$('.information-content').css("position", "relative");
									$(".content-left").css({
										"position": "fixed",
										"top": "80px"
									});
								}
							} else {
								$(".content-left").css({
									"position": "static"
								});
							}
//下滑滚动不覆盖底部 
	var d;
	var t;
	$(function() {
		var art_height;
		var isHidden=$("#reA").is(":hidden");//是否隐藏
		if(isHidden) {
			art_height=0;
		}else{
			art_height=$("#reA").outerHeight(true);
		}
		
		$(document).scroll(function() {
			var top3 = $(window).height();
			var top5 = $(".content-left").height();
			var top4 = $("#container").height() + art_height;
			//console.log(top5+","+top4+","+top3);
			var top1 = $(document).scrollTop();
			var top2 = $("#container").height() - top3 + (top3 - 80 - top5) - 10; //变成绝对定位	
			if(top1 >= 300) {
				$(".content-left").css({
					"position": "fixed",
					"top": "80px"
				});
				if(top1 >= top2) {
					$('.information-content').css("position", "static");
					$(".content-left").css("position", "absolute");
					$(".content-left").css("top", top4 - top5 - 10 + "px");
				} else {
					$('.information-content').css("position", "relative");
					$(".content-left").css({
						"position": "fixed",
						"top": "80px"
					});
				}
			} else {
				$(".content-left").css({
					"position": "static"
				});
			}
							//咨询框弹出
							var foot_height = $(".footerblock").height();
			//咨询框弹出
			var foot_height = $(".footerblock").height();
			if(top1 >= 180 && top1 < top4 - top3) {
				$(".coulstblock").slideDown();
				$(".coulstblock").css({
					"bottom": "0"
				});
			} else if(top1 >= top4 - top3) {
				$(".coulstblock").css({
					"bottom": -(top4 - top3 - top1 ) - art_height + "px"
				});
			} else {
				$(".coulstblock").slideUp();
				$(".coulstblock").css({
					"bottom": "0"
				});
			}
							if(top1 >= 180 && top1 < top4 - top3) {
								$(".coulstblock").slideDown();
								$(".coulstblock").css({
									"bottom": "0"
								});
							} else if(top1 >= top4 - top3) {
								$(".coulstblock").css({
									"bottom": -(top4 - top3 - top1) + "px"
								});
							} else {
								$(".coulstblock").slideUp();
								$(".coulstblock").css({
									"bottom": "0"
								});
							}
		})
	});
	//下滑滚动不覆盖底部 结束
						})
					});
					//下滑滚动不覆盖底部 结束
				}
			}
		});
@@ -744,7 +751,7 @@ $(function() {
					for(var i = 0; i < data.data.length; i++) {
						var add = '<li><a href="articalInfo.html?articleId=' + data.data[i].articleId + '&professorId=' + professorId + '" style="display:block;">'
						add += '<div class="art_topicBox"><div class="art_img" style=""></div>'
						add += '<div class="art_topicbox"><h6 id="artical_topic" >' + data.data[i].articleTitle + '</h6></div>'
						add += '<div class="art_tbox"><h6 id="artical_topic" >' + data.data[i].articleTitle + '</h6></div>'
						add += '</div><div class="tagsBox"><span></span></div>'
						add += '</a></li>';
						$add = $(add);
@@ -767,8 +774,8 @@ $(function() {
		}
	});
	var resou;
	
	//科研资源
	$.ajax({
		"url": "/ajax/resource/qapro",
		"type": "get",
@@ -1162,4 +1169,5 @@ $(function() {
		});
	}
		
})

js/information.js

@@ -2122,7 +2122,7 @@ $(function() {
					for(var i = 0; i < data.data.length; i++) {
						var add = '<li style="cursor:auto">'
						add += '<div class="art_topicBox"><div class="art_img" style="cursor:auto"></div>'
						add += '<div class="art_topicbox"><h6 id="artical_topic" >' + data.data[i].articleTitle + '</h6></div>'
						add += '<div class="art_tbox"><h6 id="artical_topic" >' + data.data[i].articleTitle + '</h6></div>'
						add += '</div><div class="tagsBox"><span></span></div>'
						add += '</li>';
						$add = $(add);

js/news-list.js

@@ -53,7 +53,7 @@ $(function() {
					for(var i = 0; i < data.data.length; i++) {
						var add = '<div class="addworkbtn-list addworkbtn-list2" ><div class="resoumag" data-title="">'
						add += '<div class="art_topicBox art_topicBox2"><div class="art_img" style=""></div>'
						add += '<div class="art_topicbox"><h6 id="artical_topic" >'+ data.data[i].articleTitle + '</h6></div>'
						add += '<div class="art_tbox"><h6 id="artical_topic" >'+ data.data[i].articleTitle + '</h6></div>'
						add += '</div><div class="tagsBox"><span></span></div>'
						add += '</div></div>';
						$add = $(add);

js/scrollfix.js

@@ -0,0 +1,221 @@
(function($) {
	//URI:http://caibaojian.com/scrollfix
	//author:caibaojian
	//website:http://caibaojian.com
	//descirption:scroll and fixed some div
	$.fn.scrollFix = function(options) {
		return this.each(function() {
			var opts = $.extend({}, $.fn.scrollFix.defaultOptions, options);
			var obj = $(this),
				base = this,
				selfTop = 0,
				selfLeft = 0,
				toTop = 0,
				parentOffsetLeft = 0,
				parentOffsetTop = 0,
				outerHeight,
				outerWidth,
				objWidth = 0,
				placeholder = jQuery('<div>'), //创建一个jquery对象
				optsTop = opts.distanceTop, //定义到顶部的高度
				endfix = 0; //开始停止固定的位置
			var originalPosition;
			var originalOffsetTop;
			var originalZIndex;
			var lastOffsetLeft = -1;
			var isUnfixed = true;
			//如果没有找到节点，不进行处理
			if (obj.length <= 0) {
				return;
			}
			if (lastOffsetLeft == -1) {
				originalZIndex = obj.css('z-index');
				position = obj.css('position');
				originalPosition = obj.css('position');
				originalOffsetTop = obj.css('top');
			}
			var zIndex = obj.css('zIndex');
			if (opts.zIndex != 0) {
				zIndex = opts.zIndex;
			}
			//获取相对定位或者绝对定位的父类
			var parents = obj.parent();
			var Position = parents.css('position');
			while (!/^relative|absolute$/i.test(Position)) { //检测浮动元素的父类元素定位为'relative'或者'absolute',是的话退出，否则的话，执行循环，继续寻找它的父类
				parents = parents.parent();
				Position = parents.css('position');
				if (/^body|html$/i.test(parents[0].tagName)) break; //假如父类元素的标签为body或者HTML，说明没有找到父类为以上的定位，退出循环
			}
			var ie6 = !-[1, ] && !window.XMLHttpRequest; //兼容IE6
			var resizeWindow = false;
			function resetScroll() {
				setUnfixed();
				selfTop = obj.offset().top; //对象距离顶部高度
				selfLeft = obj.offset().left; //对象距离左边宽度
				outerHeight = obj.outerHeight(); //对象高度
				outerHeight = parseFloat(outerHeight) + parseFloat(obj.css('marginBottom').replace(/auto/, 0));
				outerWidth = obj.outerWidth(); //对象外宽度
//				objWidth = obj.width();
				objWidth = obj.outerWidth(true);
				var documentHeight = $(document).height(); //文档高度
				var startTop = $(opts.startTop), //开始浮动固定对象
					startBottom = $(opts.startBottom),
					toBottom, //停止滚动位置距离底部的高度
					ScrollHeight; //对象滚动的高度
				//计算父类偏移值
				if (/^body|html$/i.test(parents[0].tagName)) { //当父类元素非body或者HTML时，说明找到了一个父类为'relative'或者'absolute'的元素，得出它的偏移高度
					parentOffsetTop = 0, parentOffsetLeft = 0;
				} else {
					parentOffsetLeft = parents.offset().left, parentOffsetTop = parents.offset().top;
				}
				// 计算父节点的上边到顶部距离
				// 如果 body 有 top 属性, 消除这些位移
				var bodyToTop = parseInt(jQuery('body').css('top'), 10);
				if (!isNaN(bodyToTop)) {
					optsTop += bodyToTop;
				}
				//计算停在底部的距离
				if (!isNaN(opts.endPos)) {
					toBottom = opts.endPos;
				} else {
					toBottom = parseFloat(documentHeight - $(opts.endPos).offset().top);
				}
				//计算需要滚动的高度以及停止滚动的高度
				ScrollHeight = parseFloat(documentHeight - toBottom - optsTop), endfix = parseFloat(ScrollHeight - outerHeight);
				//计算顶部的距离值
				if (startTop[0]) {
					var startTopOffset = startTop.offset(),
						startTopPos = startTopOffset.top;
					selfTop = startTopPos;
				}
				if (startBottom[0]) {
					var startBottomOffset = startBottom.offset(),
						startBottomPos = startBottomOffset.top,
						startBottomHeight = startBottom.outerHeight();
					selfTop = parseFloat(startBottomPos + startBottomHeight);
				}
				toTop = selfTop - optsTop;
				toTop = (toTop > 0) ? toTop : 0;
				var selfBottom = documentHeight - selfTop - outerHeight;
				//如果滚动停在底部的值不为0，并且自身到底部的高度小于上面这个值，不执行浮动固定
				if ((toBottom != 0) && (selfBottom <= toBottom)) {
					return;
				}
			}
			function setUnfixed() {
				if (!isUnfixed) {
					lastOffsetLeft = -1;
					placeholder.css("display", "none");
					obj.css({
						'z-index': originalZIndex,
						'width': '',
						'position': originalPosition,
						'left': '',
						'top': originalOffsetTop,
						'margin-left': ''
					});
					obj.removeClass('scrollfixed');
					isUnfixed = true;
				}
			}
			function onScroll() {
				lastOffsetLeft = 1;
				var ScrollTop = $(window).scrollTop();
				if (opts.bottom != -1) {
					ScrollTop = ScrollTop + $(window).height() - outerHeight - opts.bottom;
				}
				if (ScrollTop > toTop && (ScrollTop < endfix)) {
					if (ie6) { //IE6则使用这个样式
						obj.addClass(opts.baseClassName).css({
							"z-index": zIndex,
							"position": "absolute",
							"top": opts.bottom == -1 ? ScrollTop + optsTop - parentOffsetTop : ScrollTop - parentOffsetTop,
							"bottom": 'auto',
							"left": selfLeft - parentOffsetLeft,
							'width': objWidth
						})
					} else {
						obj.addClass(opts.baseClassName).css({
							"z-index": zIndex,
							"position": "fixed",
							"top": opts.bottom == -1 ? optsTop : '',
							"bottom": opts.bottom == -1 ? '' : opts.bottom,
							"left": selfLeft,
							"width": objWidth
						});
					}
					placeholder.css({
						'height': outerHeight,
						'width': outerWidth,
						'display': 'block'
					}).insertBefore(obj);
				} else if (ScrollTop >= endfix) {
					obj.addClass(opts.baseClassName).css({
						"z-index": zIndex,
						"position": "absolute",
						"top": endfix - parentOffsetTop + optsTop,
						'bottom': '',
						"left": selfLeft - parentOffsetLeft,
						"width": objWidth
					});
					placeholder.css({
						'height': outerHeight,
						'width': outerWidth,
						'display': 'block'
					}).insertBefore(obj)
				} else {
					obj.removeClass(opts.baseClassName).css({
						"z-index": originalZIndex,
						"position": "static",
						"top": "",
						"bottom": "",
						"left": ""
					});
					placeholder.remove()
				}
			}
			var Timer = 0;
			// if (isUnfixed) {
			resetScroll();
			// }
			$(window).on("scroll", function() {
				if (Timer) {
					clearTimeout(Timer);
				}
				Timer = setTimeout(onScroll, 0);
			});
			// 当发现调整屏幕大小时，重新执行代码
			$(window).on("resize", function() {
				if (Timer) {
					clearTimeout(Timer);
				}
				Timer = setTimeout(function() {
					isUnfixed = false;
					resetScroll();
					onScroll();
				}, 0);
			});
		})
	}
	$.fn.scrollFix.defaultOptions = {
		startTop: null, //滑到这个位置顶部时开始浮动，默认为空
		startBottom: null, //滑到这个位置末端开始浮动，默认为空
		distanceTop: 0, //固定在顶部的高度
		endPos: 0, //停靠在底部的位置，可以为jquery对象
		bottom: -1, //底部位置
		zIndex: 0, //z-index值
		baseClassName: 'scrollfixed' //开始固定时添加的类
	};
})(jQuery);

js/workindex.js

@@ -1081,7 +1081,7 @@ $(function(){
					for(var i = 0; i < data.data.length; i++) {
						var add = '<li><a href="articalInfo.html?articleId=' + data.data[i].articleId + '&professorId='+data.data[i].professorId+'">'
						add += '<div class="art_topicBox"><div class="art_img" style=""></div>'
						add += '<div class="art_topicbox"><h6 id="artical_topic" >' + data.data[i].articleTitle + '</h6></div>'
						add += '<div class="art_tbox"><h6 id="artical_topic" >' + data.data[i].articleTitle + '</h6></div>'
						add += '</div><div class="tagsBox"><span></span></div>'
						add += '</a></li>';
						$add = $(add);