显示时间规则，相关资源文章专家有数据显示无数据隐藏

articalIssue.html

@@ -55,8 +55,8 @@
       							<span class="" id="filePicker">上传图片</span>
	        					<!--未上传图片时-->
	        					<div class="upFront">
		        					<p>文章封面大图<em class="requiredcon">*</em></p>
		        					<p>JPG/PNG格式，2M以内。</p>
		        					<p>文章封面图片<em class="requiredcon">*</em></p>
		        					<p>JPG/PNG格式，2M以内</p>
		        					<span class="upbtn">上传图片</span>
	        					</div>
	        					<!--已上传图片时-->

articalPreview.html

@@ -35,7 +35,7 @@
						
					</ul>
					<!--相关专家-->
					<div class="form-item otherShow otherShowFirst">
					<div class="form-item otherShow otherShowFirst displayNone">
						<div class="aboutTit">相关专家</div>
						<div class="form-result">
							<ul id="relevantExperts">
@@ -44,7 +44,7 @@
						</div>
					</div>
					<!--相关资源-->
					<div class="form-item otherShow">
					<div class="form-item otherShow displayNone">
						<div class="aboutTit">相关资源</div>
						<div class="form-result aboutRes">
							<ul id="resources">

articalShow.html

@@ -22,68 +22,70 @@
		<div class="contentCon clearfix conBlock">
			<div class="leftconBox floatL">
				<div class="showDetail">
					<div class="h1Font" id="articleTitle"></div>
					<div class="h2Font"><span id="publishTime">2月23日 14:38</span> <span class="readNum" id="pageViews"></span></div>
					<div class="showBigOpen" id="articleImg"></div>
					<!--文章内容区-->
					<div class="showMain" id="articleContent"></div>
					<!--标签模块-->
					<ul class="tagList" id="tagList">
					
					</ul>
					<!--相关专家-->
					<div class="form-item otherShow otherShowFirst">
						<div class="aboutTit">相关专家</div>
						<div class="form-result">
							<ul id="relevantExperts">
								
							</ul>
					<div class="offmsg">
						<div class="h1Font" id="articleTitle"></div>
						<div class="h2Font"><span id="publishTime">2月23日 14:38</span> <span class="readNum" id="pageViews"></span></div>
						<div class="showBigOpen" id="articleImg"></div>
						<!--文章内容区-->
						<div class="showMain" id="articleContent"></div>
						<!--标签模块-->
						<ul class="tagList" id="tagList">
						
						</ul>
						<!--相关专家-->
						<div class="form-item otherShow otherShowFirst displayNone">
							<div class="aboutTit">相关专家</div>
							<div class="form-result">
								<ul id="relevantExperts">
									
								</ul>
							</div>
						</div>
					</div>
					<!--相关资源-->
					<div class="form-item otherShow">
						<div class="aboutTit">相关资源</div>
						<div class="form-result aboutRes">
							<ul id="resources">
								
							</ul>
						<!--相关资源-->
						<div class="form-item otherShow displayNone">
							<div class="aboutTit">相关资源</div>
							<div class="form-result aboutRes">
								<ul id="resources">
									
								</ul>
							</div>
						</div>
					</div>
					
					<!--点赞模块-->
					<div class="thumbBlock">
						<span class="thumbBtn thunbgo">赞</span>
					</div>
					<!--分享操作栏-->
					<div class="shareBlock clearfix">
						<div class="form-item shareInfo floatL">
							<a href="" class="useurl" > 
								<div class="madiaHead useHead userimg"></div>
								<div class="madiaInfo">
									<span class="h1Font ellipsisSty username"></span>
									<em class="authiconNew labels" id="" title="科袖认证专家"></em>
								</div>
							</a>
						
						<!--点赞模块-->
						<div class="thumbBlock">
							<span class="thumbBtn thunbgo">赞</span>
						</div>
						<ul class="shareWays floatR">
							<li><a href="#messagego" style="color: #fff;"><em class="operateicon icon-message"></em><span class="message">240</span></a> </li>
							<li id="attention"><em class="operateicon icon-collect"></em></li>
							<li>
								<em class="operateicon icon-wechat shareWeixin">
									<div class="shareCode clearfix">
										<div class="floatL" id="qrcode"></div>
										<div class="shareWord floatR">
											<p>打开微信“扫一扫”，<br/>打开网页后点击屏幕右上角“分享”按钮</p>
										</div>
						<!--分享操作栏-->
						<div class="shareBlock clearfix">
							<div class="form-item shareInfo floatL">
								<a href="" class="useurl" > 
									<div class="madiaHead useHead userimg"></div>
									<div class="madiaInfo">
										<span class="h1Font ellipsisSty username"></span>
										<em class="authiconNew labels" id="" title="科袖认证专家"></em>
									</div>
								</em>
							</li>
							<li><a href id="weibo" target="_blank"><em class="operateicon icon-sina"></em></a></li>
							<!--<li><em class="operateicon icon-qq"></em><n class="message"></span></li>-->
							<li><em class="operateicon icon-totop upTop"></em></li>
						</ul>
								</a>
							</div>
							<ul class="shareWays floatR">
								<li class="wordHave"><em class="operateicon icon-message"></em><span class="message"></span><n class="message"></span></li>
								<li id="attention"><em class="operateicon icon-collect"></em></li>
								<li>
									<em class="operateicon icon-wechat shareWeixin">
										<div class="shareCode clearfix">
											<div class="floatL" id="qrcode"></div>
											<div class="shareWord floatR">
												<p>打开微信“扫一扫”，<br/>打开网页后点击屏幕右上角“分享”按钮</p>
											</div>
										</div>
									</em>
								</li>
								<li><a href id="weibo" target="_blank"><em class="operateicon icon-sina"></em></a></li>
								<!--<li><em class="operateicon icon-qq"></em></li>-->
								<li><em class="operateicon icon-totop upTop"></em></li>
							</ul>
						</div>
						<div class="share-bottom"></div>
					</div>
					<div class="share-bottom"></div>
					<div class="ifLogin" id="messagego">
					    <!--未登录-->
					    <div class="ifLoginUn displayNone">
@@ -110,7 +112,7 @@
						<button class="frmconbtn btnCancel displayNone" id="moreArtical">查看更多留言</button>
					</div>
					<!--相关文章-->
					<div class="form-item otherShow">
					<div class="form-item otherShow displayNone">
						<div class="aboutTit">相关文章</div>
						<div class="form-result aboutRes pointOk">
							<ul id="abutartical">
@@ -165,26 +167,25 @@
<script type="text/javascript" src="js/weixinshare/qrcode.min.js"></script>
<script type="text/javascript" src="js/articalShow.js"></script>
<script type="text/javascript">
	$(".textareaboxEmp").keyup(function(){
		$(this).css("content","none");
	})
	$('.upTop').click(function(){$('html,body').animate({scrollTop: '0px'}, 800);}); 
	$('.wordHave').click(function(){$('html,body').animate({scrollTop: ($('.resTop').height()+80)+'px'}, 800);}); 
	$('.shareWeixin').hover(function(){$('.shareCode').stop(true,false).fadeToggle();});
	//微信分享
	var qrcode = new QRCode(document.getElementById("qrcode"), {
		width: 100,
		height: 100
	$(function() {
		$('.upTop').click(function(){$('html,body').animate({scrollTop: '0px'}, 800);}); //置顶
		$('.wordHave').click(function(){$('html,body').animate({scrollTop: ($('.offmsg').outerHeight(true)+60)+'px'}, 800);}); //留言
		$('.shareWeixin').hover(function(){$('.shareCode').stop(true,false).fadeToggle();});//微信分享
		//微信分享
		var qrcode = new QRCode(document.getElementById("qrcode"), {
			width: 100,
			height: 100
		});
	
		function makeCode() {
			var hurl = window.location.host;
			var articleId = GetQueryString("articleId");
			var elurl = "http://" + hurl + "/ekexiu/shareArticalinfor.html?articleId=" + articleId;
			qrcode.makeCode(elurl);
		}
		makeCode();
	});
	function makeCode() {
		var hurl = window.location.host;
		var articleId = GetQueryString("articleId");
		var elurl = "http://" + hurl + "/ekexiu/shareArticalinfor.html?articleId=" + articleId;
		qrcode.makeCode(elurl);
	}
	makeCode();
	//留言分享操作栏		
	//留言分享操作栏	
	setTimeout(function() {
		var oShareW = $('.share-nav').outerWidth(true);
		$('.shareBlock').scrollFix( {
@@ -194,7 +195,8 @@
			width: oShareW ,
	        zIndex : 997
	    });	
	}, 1000);	
	},300);
	$("html,body").animate({"scrollTop": "1px"}, 400); 
</script>
</body>
</html>

cmp-portal/js/articalModify.js

@@ -28,7 +28,7 @@ $(function() {
	//校验关键字
	$("#KeyWord").on({
		focus: function() {
			$("#keyPrompt").text("最多可添加5个关键词、每个关键词最多10个字");
			$("#keyPrompt").text("最多可添加5个关键词，每个关键词10字以内");
		},
		blur: function() {
			$("#keyPrompt").text("");

cmp-portal/js/cmp-articalList.js

@@ -189,7 +189,7 @@ function articalList(pageSize, pageNo, isbind, num) {
		var d = s.substr(6, 2);
		var h = s.substr(8, 2);
		var minute = s.substr(10, 2);
		var formatTime = m.replace(/\b(0+)/gi, "") + "月" + d + "日 " + h + ":" + minute;
		var formatTime = m.replace(/\b(0+)/gi, "") + "月" + d.replace(/\b(0+)/gi, "") + "日 " + h + ":" + minute;
		return formatTime;
	}
}

cmp-portal/resourceIssue.html

@@ -33,8 +33,8 @@
			        					<span class="" id="filePicker">上传图片</span>
			        					<!--未上传图片时-->
			        					<div class="upFront" id="uploader">
				        					<p>JPG/PNG格式</p>
				        					<p>2M以内<em class="requiredcon">*</em></p>
				        					<p>资源图片<em class="requiredcon">*</em></p>
				        					<p>JPG/PNG格式，2M以内</p>
				            				<span class="upbtn">上传图片</span>
			        					</div>
				            		</div>

js/articalList.js

@@ -190,7 +190,7 @@ function articalList(pageSize, pageNo, isbind, num) {
		var d = s.substr(6, 2);
		var h = s.substr(8, 2);
		var minute = s.substr(10, 2);
		var formatTime = m.replace(/\b(0+)/gi, "") + "月" + d + "日 " + h + ":" + minute;
		var formatTime = m.replace(/\b(0+)/gi, "") + "月" + d.replace(/\b(0+)/gi, "") + "日 " + h + ":" + minute;
		return formatTime;
	}
}

js/articalModify.js

@@ -29,7 +29,7 @@ $(function() {
	//校验关键字
	$("#KeyWord").on({
		focus: function() {
			$("#keyPrompt").text("最多可添加5个关键词、每个关键词最多10个字");
			$("#keyPrompt").text("最多可添加5个关键词，每个关键词10字以内");
		},
		blur: function() {
			$("#keyPrompt").text("");
@@ -670,7 +670,7 @@ $(function() {
	}
    
    function timeGeshi(otm) {
		var otme = otm.substring(0, 4) + "-" + otm.substring(4, 6) + "-" + otm.substring(6, 8) + " " + otm.substring(8, 10)+ ":" + otm.substring(10, 12);
		var otme = otm.substring(0, 4) + "-" + otm.substring(4, 6).replace(/\b(0+)/gi, "") + "-" + otm.substring(6, 8).replace(/\b(0+)/gi, "") + " " + otm.substring(8, 10)+ ":" + otm.substring(10, 12);
		return otme;
	}

js/articalPreview.js

@@ -136,16 +136,17 @@ $(function() {
			"type" :  "GET" ,
			"dataType" : "json",
			"success" : function(data) {
				if (data.success && data.data){
				if (data.success && data.data!=""){
					$("#relevantExperts").parent().parent().removeClass("displayNone");
					var itemlist = '';
					$("#trelevantExperts").html("");
					var itemlist = '<li>';
					var itemlist = '<li><a class="flexCenter">';
						itemlist += '<div class="madiaHead useHead" id="userimg"></div>';
						itemlist += '<div class="madiaInfo">';
						itemlist += '<p><span class="h1Font" id="userName"></span><em class="authiconNew" title=""></em></p>';
						itemlist += '<p class="ellipsisSty h2Font" id="usertitle"></p>';
						itemlist += '<p class="h2Font ellipsisSty" id="researchAreas"></p>';
						itemlist += '</div></li>';
						itemlist += '</div></a></li>';
						$itemlist = $(itemlist);
						$("#relevantExperts").append($itemlist);
						var title = data.data.title || "";
@@ -216,7 +217,8 @@ $(function() {
			"data" :{"resourceId":resourceId},
			"success" : function(data) {
				console.log(data);
				if (data.success && data.data){
				if (data.success && data.data!=""){
					$("#resources").parent().parent().removeClass("displayNone");
					var itemlist = '<li>';
						itemlist += '<div class="madiaHead resouseHead" id="userimg"></div>';
						itemlist += '<div class="madiaInfo">';
@@ -252,7 +254,7 @@ $(function() {
		var d = s.substr(6, 2);
		var h = s.substr(8, 2);
		var minute = s.substr(10, 2);
		var formatTime = m.replace(/\b(0+)/gi, "") + "月" + d + "日 " + h + ":" + minute;
		var formatTime = m.replace(/\b(0+)/gi, "") + "月" + d.replace(/\b(0+)/gi, "") + "日 " + h + ":" + minute;
		return formatTime;
	}
	

js/articalShow.js

@@ -168,7 +168,8 @@ $(function() {
			"type" :  "GET" ,
			"dataType" : "json",
			"success" : function(data) {
				if (data.success && data.data){
				if (data.success && data.data!=""){
					$("#relevantExperts").parent().parent().removeClass("displayNone");
					var itemlist = '';
					$("#trelevantExperts").html("");
					var itemlist = '<li><a href="" class="flexCenter urlgo" style="min-height:80px;">';
@@ -210,6 +211,9 @@ $(function() {
						$itemlist.find(".authiconNew").attr("title", userType.title);
						$itemlist.find(".authiconNew").addClass(userType.sty);
						
				}else{
					alert(0)
					$("#relevantExperts").parent().parent().style.display="none";
				}
			},
			"error":function(){
@@ -249,7 +253,8 @@ $(function() {
			"data" :{"resourceId":resourceId},
			"success" : function(data) {
				console.log(data);
				if (data.success && data.data){
				if (data.success && data.data!=""){
					$("#resources").parent().parent().removeClass("displayNone");
					var itemlist = '<li><a href="" class="flexCenter urlgo">';
						itemlist += '<div class="madiaHead resouseHead" id="userimg"></div>';
						itemlist += '<div class="madiaInfo">';
@@ -304,7 +309,8 @@ $(function() {
			"traditional": true, //传数组必须加这个
			"success" : function(data) {
				console.log(data);
				if (data.success && data.data){
				if (data.success && data.data!=""){
					$("#abutartical").parent().parent().removeClass("displayNone");
					var itemlist = '';
					$("#abutartical").html("");
					for(var i = 0; i < data.data.length; i++) {
@@ -378,7 +384,7 @@ $(function() {
		var d = s.substr(6, 2);
		var h = s.substr(8, 2);
		var minute = s.substr(10, 2);
		var formatTime = m.replace(/\b(0+)/gi, "") + "月" + d + "日 " + h + ":" + minute;
		var formatTime = m.replace(/\b(0+)/gi, "") + "月" + d.replace(/\b(0+)/gi, "") + "日 " + h + ":" + minute;
		return formatTime;
	}
	
@@ -422,7 +428,7 @@ $('.thumbBlock').on("click",".thunbgo",function(){
	if (userid && userid != "null" && userid != null) {
		addAgree();
	}else{
		$.MsgBox.Alert('提示',"请先登录再进行关注");
		$.MsgBox.Alert('提示',"请先登录再进行点赞");
		$("#mb_btn_ok").val("去登录");
		var aele = document.createElement('a');
		$("#mb_btnbox").append(aele);
@@ -854,8 +860,11 @@ function commenTime(startTime){
    }else if(date3 > 86400000 && date3 < 172800000){
    	return "昨天 " + startTime.substring(10,12) + ":" +startTime.substring(12,14);
    	
    }else{
    	return startTime.substring(4,6) + "月" + startTime.substring(6,8) + "日 " + startTime.substring(8,10) + ":" + startTime.substring(10,12);
    }else if(date3 > 172800000){
    	return startTime.substring(4,6).replace(/\b(0+)/gi, "") + "月" + startTime.substring(6,8).replace(/\b(0+)/gi, "") + "日 " + startTime.substring(8,10) + ":" + startTime.substring(10,12);
    }
    else{
    	return startTime.substring(0,4)  + "年" + startTime.substring(4,6).replace(/\b(0+)/gi, "") + "月" + startTime.substring(6,8).replace(/\b(0+)/gi, "") + "日 " + startTime.substring(8,10) + ":" + startTime.substring(10,12);
    }
  
}

js/discover.js

@@ -167,7 +167,7 @@ $(function() {
		var d = s.substr(6, 2);
		var h = s.substr(8, 2);
		var minute = s.substr(10, 2);
		var formatTime = m.replace(/\b(0+)/gi, "") + "月" + d + "日 " + h + ":" + minute;
		var formatTime = m.replace(/\b(0+)/gi, "") + "月" + d.replace(/\b(0+)/gi, "")+ "日 " + h + ":" + minute;
		return formatTime;
	}

js/resourceImport.js

@@ -4,7 +4,7 @@ $(document).ready(function(){
	var userid = $.cookie("userid");
	var resourceId;
	/*资源列表查询*/
	function getRecourceMe(n,isbind) {
	function getRecourceMe(n,isbind,num) {
		var resourceNameVa=$("#resouceName").val();
		var $info={};
		$info.professorId=userid;
@@ -19,11 +19,22 @@ $(document).ready(function(){
			"success": function(data) {
				if(data.success) {
					$(".importUl").html("");
					if(data.data.data.length==0) {
						$("#noresource").removeClass("displayNone");
						return;
					if(num==1) {
						if(data.data.data.length==0) {
							$("#noresource").removeClass("displayNone");
							$(".noContip").text("没有需要导入的资源");
							return;
						}else{
							$("#noresource").addClass("displayNone");
						}
					}else{
						$("#noresource").addClass("displayNone");
						if(data.data.data.length==0) {
							$("#noresource").removeClass("displayNone");
							$(".noContip").text("没有符合该搜索条件的内容");
							return;
						}else{
							$("#noresource").addClass("displayNone");
						}
					}
					resourceHtml(data.data.data);
					if(isbind == true) {

resourceImport.html

@@ -85,7 +85,7 @@
						        <div class="nodata">
						            <div class="picbox picNull"></div>
						            <div class="txtbox">
						            	<p class="noContip">暂时没有符合该搜索条件的内容</p>
						            	<p class="noContip"></p>
						            </div>
						        </div>
						    </div>

resourceIssue.html

@@ -33,8 +33,8 @@
			        					<span class="" id="filePicker">上传图片</span>
			        					<!--未上传图片时-->
			        					<div class="upFront" id="uploader">
				        					<p>JPG/PNG格式</p>
				        					<p>2M以内<em class="requiredcon">*</em></p>
				        					<p>资源图片<em class="requiredcon">*</em></p>
				        					<p>JPG/PNG格式，2M以内</p>
				            				<span class="upbtn">上传图片</span>
			        					</div>
				            		</div>