Merge remote-tracking branch 'origin/dev' into test

cmp-portal/css/cmpindex.css

@@ -319,7 +319,7 @@ ul.artAbout .uploadFile .uploadblock{position:relative;width:100%;height:190px;p
ul.artAbout .uploadFile .upFront{position:relative;}
ul.artAbout .uploadFile .uploadtip{color:#999999}
ul.artAbout .uploadFile input.upInp[type="file"]{position:absolute;height: 46px;width:60%;bottom:30px;left:50%;margin-left:-30%;outline: none;opacity: 0;cursor: pointer;z-index:20;}
ul.artAbout .uploadFile .upbtn{display:inline-block;padding:7px 23px;background: #E5E5E5;color:#333333;margin-top:8px;}
ul.artAbout .uploadFile .upbtn{display:inline-block;padding:7px 23px;background: #E5E5E5;color:#333333;margin-top:30px;}
ul.artAbout .uploadFile .uploadblock .upBackbtn{position:absolute;bottom:30px;left:50%;margin-left:-55px;background:rgba(0,0,0,.5);color:#FFFFFF;z-index:10;display: none;}
.conBlock .aboutTit{font-size:16px;line-height:40px;color:#666666;margin-top:18px;}
/*ul.artAbout .editBlock{height:320px;border:1px solid #E5E5E5;}*/

cmp-portal/js/cmp-articalList.js

@@ -92,8 +92,12 @@ function articalList(pageSize, pageNo, isbind, num) {
					var datalist = data.data.data[i];
					$itemlist.attr("data-id", datalist.articleId);
					$itemlist.find("#arttitle").text(datalist.articleTitle);
					$itemlist.find("#articleAgree").text("点赞 " + datalist.articleAgree);
					$itemlist.find("#pageViews").text("阅读量 " + datalist.pageViews);
					if(datalist.articleAgree>0){
						$itemlist.find("#articleAgree").text("赞 " + datalist.articleAgree);
					}
					if(datalist.pageViews>0){
						$itemlist.find("#pageViews").text("阅读量 " + datalist.pageViews);
					}
					commentnum(datalist.articleId, $itemlist) //评论数
					if(datalist.articleImg) {
						$itemlist.find("#artimg").attr("style", "background-image: url(/data/article/" + datalist.articleImg + ");");
@@ -183,7 +187,9 @@ function articalList(pageSize, pageNo, isbind, num) {
			},
			"success": function(data) {
				if(data.success) {
					$itemlist.find("#comment").text("评论 " + data.data);
					if(data.data>0){
						$itemlist.find("#comment").text("留言 " + data.data);
					}
				}
			},
			"error": function() {

cmp-portal/js/public/common.js

@@ -44,6 +44,9 @@ $(document).ready(function() {
				$.MsgBox.Alert('提示', '服务器请求失败')
			},
		});
		$("#imglogo").on("click",function(){
			window.open("../cmpInforShow.html?orgId="+orgId);
		})
	} else {
		$(".unlogin").removeClass("displayNone");
		$(".onlogin").addClass("displayNone");

cmp-portal/js/resourceList.js

@@ -74,7 +74,7 @@ $(document).ready(function(){
	 			oLi="class='draftList'"
	 		}else{
	 			oTime="发布于 "+TimeTr($data[i].publishTime);
	 			pageview='<li><span>阅读量 '+$data[i].pageViews+'</span></li>';
	 			pageview='<li><span>浏览量 '+$data[i].pageViews+'</span></li>';
	 			oHtml="../resourceShow.html"
	 		}
	 	var oStr='<li '+oLi+'>'+

cmp-portal/resourceIssue.html

@@ -34,7 +34,7 @@
			        					<div class="upFront" id="uploader">
				        					<p>资源图片<em class="requiredcon">*</em></p>
				        					<p class="uploadtip">JPG/JPEG/PNG格式，<br/>2M以内</p>
				            				<span class="upbtn">上传图片</span>
				            				<span class="upbtn" style="margin-top:8px">上传图片</span>
			        					</div>
				            		</div>
			        			</div>

css/genindex.css

@@ -293,7 +293,7 @@ ul.artAbout .uploadFile .uploadblock{position:relative;width:100%;height:190px;p
ul.artAbout .uploadFile .upFront{position:relative;}
ul.artAbout .uploadFile .uploadtip{color:#999999}
ul.artAbout .uploadFile input.upInp[type="file"]{position:absolute;height: 46px;width:60%;bottom:30px;left:50%;margin-left:-30%;outline: none;opacity: 0;cursor: pointer;z-index:20;}
ul.artAbout .uploadFile .upbtn{display:inline-block;padding:7px 23px;background: #E5E5E5;color:#333333;margin-top:8px;}
ul.artAbout .uploadFile .upbtn{display:inline-block;padding:7px 23px;background: #E5E5E5;color:#333333;margin-top:30px;}
ul.artAbout .uploadFile .uploadblock .upBackbtn{position:absolute;bottom:30px;left:50%;margin-left:-55px;background:rgba(0,0,0,.5);color:#FFFFFF;z-index:10;display: none;}
.conBlock .aboutTit{font-size:16px;line-height:40px;color:#666666;margin-top:18px;}
ul.artAbout #filePicker{position:absolute;left:50%; bottom:22px; margin-left:-52px;opacity:0; z-index:88;}

js/common.js

@@ -129,6 +129,9 @@ function loginStatus() {
		if(userAuth == "true" && authentication != "null") {
			$(".onlogin").show();
			$(".unlogin").hide();
			$(".portrait-p").on("click",function(){
				window.open("userInforShow.html?professorId="+userid);
			})
			$(".portrait-p").attr("src", "/images/head/" + userid + "_m.jpg");
			$(".portrait-p").load(function() { //判断图片是否加载，加载不成功默认有默认的图像									
				})

js/paperList.js

@@ -114,8 +114,14 @@ function lewordNum(pId) {
 			oTime="导入于 "+TimeTr($data[i].assTime);
 			pageview='<li><span>阅读量 '+$data[i].pageViews+'</span></li>';
 			oHtml="paperShow.html"
 			var thub='<li><span>赞 '+isAgreeNum($data[i].id)+'</span></li>';
 			var lew='<li><span>留言 '+lewordNum($data[i].id)+'</span></li>';
 			var thub="";
 			if(isAgreeNum($data[i].id)!=0){
 				thub='<li><span>赞 '+isAgreeNum($data[i].id)+'</span></li>';
 			}
 			var lew="";
 			if(lewordNum($data[i].id)!=0){
 			    lew='<li><span>留言 '+lewordNum($data[i].id)+'</span></li>';
 			}
	 		var oStr='<li '+oLi+'>'+
				'<a href="'+oHtml+'?paperId='+$data[i].id+'" target="_blank">'+
					'<div class="madiaHead paperHead"></div>'	+						

js/patentList.js

@@ -113,9 +113,14 @@ function lewordNum(pId) {
 			oTime="导入于 "+TimeTr($data[i].assTime);
 			pageview='<li><span>阅读量 '+$data[i].pageViews+'</span></li>';
 			oHtml="patentShow.html"
 			var thub='<li><span>赞 '+isAgreeNum($data[i].id)+'</span></li>';
 			var lew='<li><span>留言 '+lewordNum($data[i].id)+'</span></li>';
 			
 			var thub="";
 			if(isAgreeNum($data[i].id)!=0){
 				thub='<li><span>赞 '+isAgreeNum($data[i].id)+'</span></li>';
 			}
 			var lew="";
 			if(lewordNum($data[i].id)!=0){
 			    lew='<li><span>留言 '+lewordNum($data[i].id)+'</span></li>';
 			}
	 	var oStr='<li '+oLi+'>'+
				'<a href="'+oHtml+'?patentId='+$data[i].id+'" target="_blank">'+
					'<div class="madiaHead patentHead"></div>'	+						

js/resourceList.js

@@ -74,7 +74,7 @@ $(document).ready(function(){
	 			oLi="class='draftList'"
	 		}else{
	 			oTime="发布于 "+TimeTr($data[i].publishTime);
	 			pageview='<li><span>阅读量 '+$data[i].pageViews+'</span></li>';
	 			pageview='<li><span>浏览量 '+$data[i].pageViews+'</span></li>';
	 			oHtml="resourceShow.html"
	 		}
	 	var oStr='<li '+oLi+'>'+

js/userInforShow.js

@@ -691,7 +691,7 @@ $(function() {
							var strAdd = '';
							strAdd += '<li><a traget="_blank" href="resourceShow.html?resourceId='+ dataStr[i].resourceId +'" class="flexCenter urlgo">';
							strAdd += '<div class="madiaHead resouseHead" style="background-image:url('+ madiaHead +')"></div>';
							strAdd += '<div class="madiaInfo"><p class="h1Font ellipsisSty-2">'+ dataStr[i].resourceName +'</p><p class="h2Font ellipsisSty">应用用途：'+ dataStr[i].supportedServices+'</p></div>';				
							strAdd += '<div class="madiaInfo"><p class="h1Font ellipsisSty">'+ dataStr[i].resourceName +'</p><p class="h2Font ellipsisSty-2">用途：'+ dataStr[i].supportedServices+'</p></div>';				
							strAdd += '</a></li>';
							var $strAdd = $(strAdd);
							$("#proResource").append(strAdd);

resourceIssue.html

@@ -32,7 +32,7 @@
			        					<div class="upFront" id="uploader">
				        					<p>资源图片<em class="requiredcon">*</em></p>
				        					<p class="uploadtip">JPG/JPEG/PNG格式，<br/>2M以内</p>
				            				<span class="upbtn">上传图片</span>
				            				<span class="upbtn" style="margin-top:8px">上传图片</span>
			        					</div>
				            		</div>
			        			</div>