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

cmp-portal/cmp-updateinfo.html

@@ -140,30 +140,30 @@
										<li>
											<span class="col-w-2 lableSpan">企业地址：</span>
											<div class="col-w-10">
												<input type="text" class="frmcontype" placeholder="如：北京市海淀区学院路方兴大厦" />
												<input type="text" class="frmcontype" placeholder="如：北京市海淀区学院路方兴大厦" id="cmpAddress"/>
											</div>
										</li>
										<li>
											<span class="col-w-2 lableSpan">联系电话：</span>
											<div class="col-w-5">
												<input type="tel" class="frmcontype" placeholder="请填写办公电话" />
												<input type="tel" class="frmcontype" placeholder="请填写办公电话" id="phone"/>
											</div>
										</li>
										<li>
											<span class="col-w-2 lableSpan">联系邮箱：</span>
											<div class="col-w-5">
												<input type="email" class="frmcontype" placeholder="请填写客服邮箱" />
												<input type="email" class="frmcontype" placeholder="请填写客服邮箱" id="mail"/>
											</div>
										</li>
										<li class="form-item">
											<span class="col-w-2 lableSpan">所属行业：</span>
											<div class="col-w-10">
												<div class="col-w-12" style="position: relative;">
													<input type="text" class="frmcontype" placeholder="请填写企业所属的行业，如：制造业、互联网、服务业" />
													<button type="button" class="frmcontype btnModel frmadd">添加</button>
													<input type="text" class="frmcontype oinput" placeholder="请填写企业所属的行业，如：制造业、互联网、服务业" />
													<button type="button" class="frmcontype btnModel frmadd" style="display:none;">添加</button>
													<div class="form-drop keydrop">
														<ul>
															<li>2233</li>
															
														</ul>
													</div>
												</div>
@@ -178,11 +178,11 @@
											<span class="col-w-2 lableSpan">专注领域：</span>
											<div class="col-w-10">
												<div class="col-w-12" style="position: relative;">
													<input type="text" class="frmcontype" placeholder="请填写企业专注的领域，如：腐蚀防护、石墨烯、纳米材料" />
													<button type="button" class="frmcontype btnModel frmadd">添加</button>
													<input type="text" class="frmcontype oinput" placeholder="请填写企业专注的领域，如：腐蚀防护、石墨烯、纳米材料" />
													<button type="button" class="frmcontype btnModel frmadd" style="display:none;">添加</button>
													<div class="form-drop keydrop">
														<ul>
															<li>2233</li>
															
														</ul>
													</div>
												</div>
@@ -204,8 +204,8 @@
											<span class="col-w-2 lableSpan">企业资质：</span>
											<div class="col-w-10">
												<div class="col-w-12" style="position: relative;">
													<input type="text" class="frmcontype" placeholder="请填写企业获得的资质，如：ISO9000认证、高新技术企业认证" />
													<button type="button" class="frmcontype btnModel frmadd">添加</button>
													<input type="text" class="frmcontype oinput" placeholder="请填写企业获得的资质，如：ISO9000认证、高新技术企业认证" />
													<button type="button" class="frmcontype btnModel frmadd" style="display:none">添加</button>
												</div>
												<div class="form-result keyResult" style="margin-right: -10px;">
													<ul class="ulspace editUlistC clearfix" id="subjectList">
@@ -218,11 +218,11 @@
											<span class="col-w-2 lableSpan">供应商领域：</span>
											<div class="col-w-10">
												<div class="col-w-12" style="position: relative;">
													<input type="text" class="frmcontype" placeholder="请填写企业上游所涉及的领域" />
													<button type="button" class="frmcontype btnModel frmadd">添加</button>
													<input type="text" class="frmcontype oinput" placeholder="请填写企业上游所涉及的领域" />
													<button type="button" class="frmcontype btnModel frmadd" style="display:none;">添加</button>
													<div class="form-drop keydrop">
														<ul>
															<li>2233</li>
															
														</ul>
													</div>
												</div>
@@ -237,11 +237,11 @@
											<span class="col-w-2 lableSpan">客户领域：</span>
											<div class="col-w-10">
												<div class="col-w-12" style="position: relative;">
													<input type="text" class="frmcontype" placeholder="请填写企业下游所涉及的领域" />
													<button type="button" class="frmcontype btnModel frmadd">添加</button>
													<input type="text" class="frmcontype oinput" placeholder="请填写企业下游所涉及的领域" />
													<button type="button" class="frmcontype btnModel frmadd" style="display:none;">添加</button>
													<div class="form-drop keydrop">
														<ul>
															<li>2233</li>
															
														</ul>
													</div>
												</div>

cmp-portal/js/articalIssue.js

@@ -11,14 +11,14 @@ $(function() {
	//校验标题
	$("#newstitle").on({
		focus: function() {
			$(this).prev().find("span").text("30字以内");
			$(this).prev().find("span").text("50字以内");
		},
		blur: function() {
			$(this).prev().find("span").text("");
		},
		keyup: function() {
			if($(this).val().length > 30) {
				$(this).val($(this).val().substr(0, 30));
			if($(this).val().length > 50) {
				$(this).val($(this).val().substr(0, 50));
			}
		}
	})

cmp-portal/js/articalModify.js

@@ -16,14 +16,14 @@ $(function() {
	//校验标题
	$("#newstitle").on({
		focus: function() {
			$(this).prev().find("span").text("30字以内");
			$(this).prev().find("span").text("50字以内");
		},
		blur: function() {
			$(this).prev().find("span").text("");
		},
		keyup: function() {
			if($(this).val().length > 30) {
				$(this).val($(this).val().substr(0, 30));
			if($(this).val().length > 50) {
				$(this).val($(this).val().substr(0, 50));
			}
		}
	})
@@ -485,7 +485,8 @@ $(function() {
			imgflase = true;
		}*/
		if(newstitle==""){
			$("#aboutTit span").text("请输入文章标题");
			$.MsgBox.Alert('提示', '请输入文章标题')
			return;
		}else{
			$("#aboutTit span").text("");
			titleflase = true;

cmp-portal/js/cmp-updateinfo.js

@@ -1,9 +1,9 @@
$(document).ready(function() {
	$(".onlogin .headnavbtn li").eq(0).addClass("navcurrent");
	var id = $.cookie('orgId');
	if(id == "" || id == null || id == "null"){
    	location.href = "cmp-settled-log.html";
    }
	if(id == "" || id == null || id == "null") {
		location.href = "cmp-settled-log.html";
	}
	var fileId = null;
	var cacheImageKey = null;
	/*企业信息*/
@@ -64,17 +64,32 @@ $(document).ready(function() {
						indu($data.subject, '#subjectList')
					}
					if($data.qualification) {
						indu($data.qualification, '.editUlistC ')
						indu($data.qualification, '.editUlistC')
					}
					if($data.fieldOfSupplier) {
						indu($data.fieldOfSupplier, '#subjectListOut')
					}
					if($data.fieldOfCustomer) {
						indu($data.fieldOfCustomer, '#subjectListIn')
					}
					if($data.addr) {
						$("#cmpAddress").val($data.addr);
					}
					if($data.contactNum) {
						$("#phone").val($data.contactNum);
					}
					if($data.email) {
						$("#mail").val($data.email);
					}
					//省份城市颜色
					if($("#oprovince").text()=="请选择企业总部所在省或直辖市"){
					if($("#oprovince").text() == "请选择企业总部所在省或直辖市") {
						$("#oprovince").removeClass("mr_select");
					}else{
					} else {
						$("#oprovince").addClass("mr_select");
					}
					if($("#ocity").text()=="请选择企业总部所在城市"){
					if($("#ocity").text() == "请选择企业总部所在城市") {
						$("#ocity").removeClass("mr_select");
					}else{
					} else {
						$("#ocity").addClass("mr_select");
					}
				}
@@ -85,7 +100,7 @@ $(document).ready(function() {
		})
	}
	companyInformation()
		/*时间格式*/
	/*时间格式*/
	function timeGeshi(otm) {
		var otme = otm.substring(0, 4) + "-" + otm.substring(4, 6) + "-" + otm.substring(6, 8);
		return otme;
@@ -119,7 +134,7 @@ $(document).ready(function() {
		},
		keyup: function(e) {
			if($("textarea").val().length > 500) {
				$("textarea").val($("textarea").val().substring(0,500));
				$("textarea").val($("textarea").val().substring(0, 500));
				e.preventDefault();
			}
			setTimeout(function() {
@@ -127,6 +142,114 @@ $(document).ready(function() {
			}, 1);
		}
	});
	$(".oinput").bind({
		paste: function(e) {
			var pastedText;
			if (window.clipboardData  &&  window.clipboardData.getData)  {  // IE
				            
				pastedText  = $(this).val() +  window.clipboardData.getData('Text');          
			} 
			else  {            
				pastedText  = $(this).val() +  e.originalEvent.clipboardData.getData('Text'); //e.clipboardData.getData('text/plain');
				          
			}
			$(this).val(pastedText.substring(0, 10));
			var $this = $(this);
			setTimeout(function() {
				if($this.val().trim()) {
					$this.siblings("button").show();
				} else {
					$this.siblings("button").hide();
				}
			}, 1);
			e.preventDefault();
		},
		cut: function(e) {
			var $this = $(this);
			setTimeout(function() {
				if($this.val().trim()) {
					$this.siblings("button").show();
				} else {
					$this.siblings("button").hide();
				}
			}, 1);
		},
		blur:function(){
			var $this=$(this);
		setTimeout(function(){
			$this.siblings(".keydrop").hide();
		},500)
		},
		focus:function(){
			$(this).siblings(".keydrop").show();
		},
		keyup: function(e) {
			if($(this).val().trim()) {
				$(this).siblings("button").show();
				var lNum = $.trim($(this).val()).length;
				if(lNum > 10) {
					$(this).val($(this).val().substr(0, 10));
				} else if(0 < lNum && lNum < 10) {
					var $this = $(this)
					$("#addKeyword").show();
					$.ajax({
						"url": "/ajax/dataDict/qaHotKey",
						"type": "GET",
						"success": function(data) {
							console.log(data);
							if(data.success) {
								if(data.data.length == 0) {
									$this.siblings(".keydrop").addClass("displayNone");
									$this.siblings(".keydrop").find("ul").html("");
								} else {
									$this.siblings(".keydrop").removeClass("displayNone");
									var oSr = "";
									for(var i = 0; i < data.data.length; i++) {
										oSr += '<li>' + data.data[i].caption + '<div class="closeThis"></div></li>';
									}
									$this.siblings(".keydrop").find("ul").html(oSr);
								}
							} else {
								$this.siblings(".keydrop").addClass("displayNone");
								$this.siblings(".keydrop").find("ul").html("");
							}
						},
						"data": {
							"key": $(this).val()
						},
						dataType: "json",
						'error': function() {
							$.MsgBox.Alert('提示', '服务器连接超时！');
						}
					});
				}
			} else {
				$(this).siblings("button").hide();
				$(this).siblings(".keydrop").addClass("displayNone");
				$(this).siblings(".keydrop").find("ul").html("");
			}
		}
	})
	$(".keydrop").on("click","li",function(){
		var oValue = $(this).text();
		var oJudge = $(this).parents(".col-w-12").siblings().find("ul.ulspace li");
		for(var i = 0; i < oJudge.length; i++) {
			if(oValue == oJudge[i].innerText) {
				$.MsgBox.Alert('提示', '添加内容不能重复');
				return;
			}
		}
		$(this).parents(".col-w-12").siblings().find("ul.ulspace").append('<li>' + oValue + '<div class="closeThis"></div></li>');
		$(this).parents(".keydrop").siblings("input").val("");
		$(this).parents(".keydrop").siblings("button").hide();
		if(oJudge.length == 4) {
			$(this).parents(".keydrop").siblings("input").val("");
			$(this).parents(".col-w-12").hide();
		}
		$(this).parent("ul").html("")
	})
	/*应用行业及领域及企业资质*/
	function indu(oString, oSelector) {
		var arr = oString.split(",");
@@ -139,123 +262,161 @@ $(document).ready(function() {
	}
	/*删除*/
	$("body").on("click", ".closeThis", function() {
			$(this).parent().remove();
		})
		if($(this).parent().length < 5) {
			$(this).parents(".keyResult").siblings("div").show();
		}
		$(this).parent().remove();
	})
	/*添加*/
	$("button:contains('添加')").click(function() {
			var oValue = $(this).siblings("input").val().trim();
			var oJudge = $(this).parent().siblings().find("ul.ulspace li");
			if(!oValue) {
				$.MsgBox.Alert('提示', '请先填写内容');
				return;
			}
			if(oValue.length > 10) {
				$.MsgBox.Alert('提示', '添加内容不能超过10个字');
		var oValue = $(this).siblings("input").val().trim();
		var oJudge = $(this).parent().siblings().find("ul.ulspace li");
		if(!oValue) {
			$.MsgBox.Alert('提示', '请先填写内容');
			return;
		}
		if(oValue.length > 10) {
			$.MsgBox.Alert('提示', '添加内容不能超过10个字');
			return;
		}
		for(var i = 0; i < oJudge.length; i++) {
			if(oValue == oJudge[i].innerText) {
				$.MsgBox.Alert('提示', '添加内容不能重复');
				return;
			}
			for(var i = 0; i < oJudge.length; i++) {
				if(oValue == oJudge[i].innerText) {
					$.MsgBox.Alert('提示', '添加内容不能重复');
					return;
				}
			}
			$(this).parent().siblings().find("ul.ulspace").append('<li>' + oValue + '<div class="closeThis"></div></li>');
			$(this).siblings("input").val("");
		})
		}
		$(this).parent().siblings().find("ul.ulspace").append('<li>' + oValue + '<div class="closeThis"></div></li>');
		$(this).hide();
		$(this).siblings("input").val("");
		if(oJudge.length == 4) {
			$(this).val("").parents(".col-w-12").hide();
		}
		$(this).siblings(".keydrop").find("ul").html("");
	})
	/*保存*/
	$("button:contains('保存')").click(function() {
		var oBusinessAbbreviation = $("#businessAbbreviation").val().trim();
		if(!oBusinessAbbreviation) {
				$.MsgBox.Alert('提示', '企业简称不能为空');
				return;
			}
			if(oBusinessAbbreviation.length > 10) {
				$.MsgBox.Alert('提示', '企业简称不能超过10个字');
				return;
			}
			/*
			var oTextArea = $("textarea").val().trim();
			var oBusinessType = $("#orgType").find("option").length;
			var oBusinessDimensions = $("#qualificationList").find("li.cmpBg.listactive").length;
			var oIndustryNumber = $("#industryList").find("li").length;
			var oSubjectNumber = $("#subjectList").find("li").length;
			var oEditUlistCNumber = $(".editUlistC ").find("li").length;
			$.MsgBox.Alert('提示', '企业简称不能为空');
			return;
		}
		if(oBusinessAbbreviation.length > 10) {
			$.MsgBox.Alert('提示', '企业简称不能超过10个字');
			return;
		}
		/*
		var oTextArea = $("textarea").val().trim();
		var oBusinessType = $("#orgType").find("option").length;
		var oBusinessDimensions = $("#qualificationList").find("li.cmpBg.listactive").length;
		var oIndustryNumber = $("#industryList").find("li").length;
		var oSubjectNumber = $("#subjectList").find("li").length;
		var oEditUlistCNumber = $(".editUlistC ").find("li").length;
			
			if(!oTextArea) {
				$.MsgBox.Alert('提示', '企业简介不能为空');
				return;
			}
			if(oBusinessType == 0) {
				$.MsgBox.Alert('提示', '请选择企业类型');
				return;
			}
			if(oIndustryNumber == 0) {
				$.MsgBox.Alert('提示', '企业所属行业必填一项');
		if(!oTextArea) {
			$.MsgBox.Alert('提示', '企业简介不能为空');
			return;
		}
		if(oBusinessType == 0) {
			$.MsgBox.Alert('提示', '请选择企业类型');
			return;
		}
		if(oIndustryNumber == 0) {
			$.MsgBox.Alert('提示', '企业所属行业必填一项');
			return;
		}
		if(oSubjectNumber == 0) {
			$.MsgBox.Alert('提示', '企业所属领域必填一项');
			return;
		}
		if(oBusinessDimensions == 0) {
			$.MsgBox.Alert('提示', '请选择企业规模');
			return;
		}
		if(oEditUlistCNumber == 0) {
			$.MsgBox.Alert('提示', '企业资质必填一项');
			return;
		}*/
		var $info = {};
		$info.id = id;
		if(cacheImageKey != null) {
			$info.fn = cacheImageKey;
		}
		$info.forShort = $("#businessAbbreviation").val();
		if($("#orgType").find("option:selected").text() != "请选择最符合的一项") {
			$info.orgType = $("#orgType").find("option:selected").text()
		}
		if($("#qualificationList").find("option:selected").text() != "请选择员工数量范围") {
			$info.orgSize = $("#qualificationList").find("option:selected").text();
		}
		if($("#inteAddress").val().trim()) {
			if($("#inteAddress").val().trim().length > 20) {
				$.MsgBox.Alert('提示', '企业官网 20个字之内!');
				return;
			}
			if(oSubjectNumber == 0) {
				$.MsgBox.Alert('提示', '企业所属领域必填一项');
			$info.orgUrl = $("#inteAddress").val();
		}
		if($("#oprovince").text() != "请选择企业总部所在省或直辖市") {
			$info.province = $("#oprovince").text();
		}
		if($("#ocity").text() != "请选择企业总部所在城市") {
			$info.city = $("#ocity").text();
		}
		if($("#createTime").val()) {
			$info.foundTime = st6($("#createTime").val());
		}
		if($("#cmpAddress").val().trim()) {
			if($("#cmpAddress").val().trim().length > 20) {
				$.MsgBox.Alert('提示', '企业地址 20个字之内!');
				return;
			} else {
				$info.addr = $("#cmpAddress").val();
			}
			if(oBusinessDimensions == 0) {
				$.MsgBox.Alert('提示', '请选择企业规模');
		}
		if($("#phone").val().trim()) {
			if($("#phone").val().trim().length > 50) {
				$.MsgBox.Alert('提示', '办公电话50个字之内!');
				return;
			} else {
				$info.contactNum = $("#cmpAddress").val();
			}
			if(oEditUlistCNumber == 0) {
				$.MsgBox.Alert('提示', '企业资质必填一项');
		}
		if($("#mail").val().trim()) {
			if($("#mail").val().trim().indexOf("@")) {
				$info.email = $("#mail").val();
			} else {
				$.MsgBox.Alert('提示', '邮箱格式不正确');
				return;
			}*/
			var $info = {};
			$info.id = id;
			if(cacheImageKey != null) {
				$info.fn = cacheImageKey;
			}
			$info.forShort = $("#businessAbbreviation").val();
			$info.orgType = $("#orgType").val();
			$info.orgSize = $("#qualificationList").val();
			if($("#inteAddress").val().trim()) {
				if($("#inteAddress").val().trim().length>20) {
						$.MsgBox.Alert('提示', '企业官网 20个字之内!');
						return;
		}
		$info.descp = $("textarea").val();
		$info.industry = oString("#industryList");
		$info.subject = oString("#subjectList");
		$info.qualification = oString(".editUlistC");
		$info.fieldOfCustomer=oString(subjectListIn);
		$info.fieldOfSupplier==oString(subjectListOut);
		$.ajax({
			url: "/ajax/org/update",
			type: "POST",
			data: $info,
			timeout: 10000,
			dataType: "json",
			beforeSend: function() {},
			success: function(data, textState) {
				if(data.success) {
					$.MsgBox.Alert('提示', '修改成功');
					$("#mb_msgicon").css("background", 'url("images/sign_icon_chenggong_nor.png") 0% 0% / contain');
					setTimeout(function() {
						location.reload(false)
					}, 500);
				}
				$info.orgUrl = $("#inteAddress").val();
			}
			if($("#oprovince").text() != "请选择企业总部所在省或直辖市") {
				$info.province = $("#oprovince").text();
			}
			if($("#ocity").text() != "请选择企业总部所在城市") {
				$info.city = $("#ocity").text();
			}
			if($("#createTime").val()) {
				$info.foundTime = st6($("#createTime").val());
			},
			error: function(XMLHttpRequest, textStats, errorThrown) {
				$.MsgBox.Alert('提示', '服务器请求失败')
			}
			$info.descp = $("textarea").val();
			$info.industry = oString("#industryList");
			$info.subject = oString("#subjectList");
			$info.qualification = oString(".editUlistC");
			$.ajax({
				url: "/ajax/org/update",
				type: "POST",
				data: $info,
				timeout: 10000,
				dataType: "json",
				beforeSend: function() {},
				success: function(data, textState) {
					if(data.success) {
						$.MsgBox.Alert('提示', '修改成功');
						$("#mb_msgicon").css("background", 'url("images/sign_icon_chenggong_nor.png") 0% 0% / contain');
						setTimeout(function(){
							location.reload(false)
						},500);
					}
				},
				error: function(XMLHttpRequest, textStats, errorThrown) {
					$.MsgBox.Alert('提示', '服务器请求失败')
				}
			})
		})
	})
	/*应用行业,学术领域,企业纸质生成字符串*/
	function oString(sele) {
		var len = $(sele).find("li");
@@ -306,9 +467,9 @@ $(document).ready(function() {
		}*/
	});
	 uploader.onError = function( code ) {
        	$.MsgBox.Alert('提示', '请上传jpg、jpeg、png格式的图片，大小不超过5M')
        };
	uploader.onError = function(code) {
		$.MsgBox.Alert('提示', '请上传jpg、jpeg、png格式的图片，大小不超过5M')
	};
	uploader.on('uploadSuccess', function(file, data) {
		uploader.removeFile(fileId);
		cacheImageKey = data.data[0].cacheKey;
@@ -316,18 +477,18 @@ $(document).ready(function() {
	});
	/*取消*/
	$("#Ocancel").click(function() {
		location.href="cmp-workspaces.html"
		location.href = "cmp-workspaces.html"
	})
	/*选择省份*/
	$(document).on("click", "#Province li a", function() {
		var aVal = $(this).text();
		$(this).parent().parent().parent().find('.mr_show').text(aVal);
		$(this).parent().parent().parent().find('input[name=cho_Province]').val(aVal);
		
		if($("#oprovince").text()=="请选择企业总部所在省或直辖市"){
		if($("#oprovince").text() == "请选择企业总部所在省或直辖市") {
			$("#oprovince").removeClass("mr_select");
			$("#ocity").removeClass("mr_select");
		}else{
		} else {
			$("#oprovince").addClass("mr_select");
			$("#ocity").removeClass("mr_select");
		}
@@ -337,11 +498,11 @@ $(document).ready(function() {
		var aVal = $(this).text();
		$(this).parent().parent().parent().find('.mr_show').text(aVal);
		$(this).parent().parent().parent().find('input[name=cho_City]').val(aVal);
		if($("#ocity").text()=="请选择企业总部所在城市"){
		if($("#ocity").text() == "请选择企业总部所在城市") {
			$("#ocity").removeClass("mr_select");
		}else{
		} else {
			$("#ocity").addClass("mr_select");
		}
	});
	
})

cmpInforShow.html

@@ -52,9 +52,9 @@
			</div>
			<div class="navconBox">
				<ul class="clearfix">
					<li class="liNow">主页</li>
					<li>资源</li>
					<li>文章</li>
					<li class="liNow" style="display:none">主页</li>
					<li style="display:none">资源</li>
					<li style="display:none">文章</li>
					<li>资料</li>
				</ul>
			</div>
@@ -98,14 +98,9 @@
								
							</ul>
							<!--无搜索结果-->
							<div class="nodatabox displayNone">
						        <div class="nodata">
						            <div class="picbox picNull"></div>
						            <div class="txtbox">
						            	<p class="noContip"></p>
						            </div>
						        </div>
						    </div>
							 <div class="tcdPageCode resoucePageCode">
						       	
						       </div>
						</div>
					</div>
				</div>
@@ -115,15 +110,10 @@
							<ul id="proArticel">
								
							</ul>
							<!--无搜索结果-->
							<div class="nodatabox displayNone">
						        <div class="nodata">
						            <div class="picbox picNull"></div>
						            <div class="txtbox">
						            	<p class="noContip"></p>
						            </div>
						        </div>
						    </div>
							<!--无搜索结果-->							
						       <div class="tcdPageCode expertPageCode">
						       	
						       </div>						    
						</div>
					</div>
				</div>

e/a.html

@@ -110,6 +110,7 @@
						console.log($data);
						document.getElementById("articleName").innerHTML = $data.articleTitle;
						shareTitle=$data.articleTitle;
						$("#oTime").text(commenTime($data.createTime))
						document.title=$data.articleTitle;
						stt = $data.articleImg.substring(0, 9);
						imgUrl="http://www.ekexiu.com/data/article/" + stt + $data.articleId + "_s.jpg";
@@ -145,7 +146,11 @@
					},
					business: function($data) {
						//console.log(JSON.stringify($data));
						document.getElementById('name').innerHTML = $data.name;
						if($data.forShort) {
							document.getElementById('name').innerHTML = $data.forShort;
						}else{
							document.getElementById('name').innerHTML = $data.name;
						}
						if($data.hasOrgLogo) {
							document.getElementById("messImg").style.backgroundImage = "url(../images/org/" + $data.id + ".jpg" + ")";
						}
@@ -274,6 +279,34 @@
					}
				});
			function commenTime(startTime){
	var nowTimg =  new Date();
	var startdate = new Date(); 
	startdate.setFullYear(parseInt(startTime.substring(0,4)));
	startdate.setMonth(parseInt(startTime.substring(4,6))-1);
	startdate.setDate(parseInt(startTime.substring(6,8)));
	startdate.setHours(parseInt(startTime.substring(8,10)));
	startdate.setMinutes(parseInt(startTime.substring(10,12)));
	startdate.setSeconds(parseInt(startTime.substring(12,14)));
	var date3=nowTimg.getTime()-startdate.getTime();  //时间差的毫秒数
    var hours = parseInt((date3 % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60));
    var minutes = parseInt((date3 % (1000 * 60 * 60)) / (1000 * 60));
    if(date3 < 60000){
    	return "刚刚";
    }else if(date3 >= 60000 && date3 < 3600000){
    	return minutes + "分钟前";
    }else if(date3 >= 3600000 && date3 < 86400000){
    	return hours + "小时前";
    }else if(date3 >= 86400000 && date3 < 172800000){
    	return "昨天 " + startTime.substring(8,10) + ":" +startTime.substring(10,12);
    	
    }else if(date3 >= 172800000 && date3 < 31536000000){
    	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);
    }
}
			})
		</script>

e/r.html

@@ -185,7 +185,12 @@ $(document).ready(function() {
						othisInfo.setAttribute("data-id",mydata.organization.id);
						othisInfo.setAttribute("data-status",mydata.organization.authStatus);
						othisInfo.setAttribute("data-type",mydata.resourceType);
						othisName.innerHTML = mydata.organization.name;
						if(mydata.organization.forShort) {
							othisName.innerHTML = mydata.organization.forShort;
						}else{
							othisName.innerHTML = mydata.organization.name;
						}
						
						if(mydata.organization.subject){
							othisOther.innerHTML = (mydata.organization.subject).replace(/,/, " | ");
						}

js/articalIssue.js

@@ -10,14 +10,14 @@ $(function() {
	//校验标题
	$("#newstitle").on({
		focus: function() {
			$(this).prev().find("span").text("30字以内");
			$(this).prev().find("span").text("50字以内");
		},
		blur: function() {
			$(this).prev().find("span").text("");
		},
		keyup: function() {
			if($(this).val().length > 30) {
				$(this).val($(this).val().substr(0, 30));
			if($(this).val().length > 50) {
				$(this).val($(this).val().substr(0, 50));
			}
		}
	})

js/articalModify.js

@@ -15,14 +15,14 @@ $(function() {
	//校验标题
	$("#newstitle").on({
		focus: function() {
			$(this).prev().find("span").text("30字以内");
			$(this).prev().find("span").text("50字以内");
		},
		blur: function() {
			$(this).prev().find("span").text("");
		},
		keyup: function() {
			if($(this).val().length > 30) {
				$(this).val($(this).val().substr(0, 30));
			if($(this).val().length > 50) {
				$(this).val($(this).val().substr(0, 50));
			}
		}
	})
@@ -482,7 +482,8 @@ $(function() {
			imgflase = true;
		}*/
		if(newstitle==""){
			$("#aboutTit span").text("请输入文章标题");
			$.MsgBox.Alert('提示', '请输入文章标题')
			return;
		}else{
			$("#aboutTit span").text("");
			titleflase = true;

js/articalShow.js

@@ -50,7 +50,7 @@ $(function() {
					var weibotitle = data.data.articleTitle;
					var weibourl =window.location.href;
					var weibopic ="http://"+window.location.host+"/data/article/" + data.data.articleImg;
					$("#weibo").attr("href","http://service.weibo.com/share/share.php?appkey=3677230589&title="+weibotitle+"&url="+weibourl+"&pic="+weibopic+"&ralateUid=6242830109&searchPic=false&style=simple");
					$("#weibo").attr("href","http://service.weibo.com/share/share.php?appkey=3677230589&title="+encodeURIComponent(weibotitle)+"&url="+encodeURIComponent(weibourl)+"&pic="+encodeURIComponent(weibopic)+"&content=utf-8"+"&ralateUid=6242830109&searchPic=false&style=simple");
				}
				
				var articletitle = data.data.articleTitle + "-科袖网";
@@ -217,7 +217,6 @@ $(function() {
						$itemlist.find(".authiconNew").addClass(userType.sty);
						
				}else{
					alert(0)
					$("#relevantExperts").parent().parent().style.display="none";
				}
			},

js/cmpInforShow.js

@@ -7,8 +7,8 @@ $(function() {
	
	if(orgId) {
		getCmpInfo(orgId);//获取个人详细信息
		getResource();//获取个人发布的资源
		getArticle();//获取个人发布的文章
		getResource(1,10,true);//获取个人发布的资源
		getArticle(1,10,true);//获取个人发布的文章
		
		//点击关注按钮
//		$("#attentBtn").on('click', function() {
@@ -52,7 +52,8 @@ $(function() {
	}
		
	
	var subjectShow = function(data) {
function subjectShow(data) {
		console.log(data)
		if(data != undefined && data.length != 0) {
			var subs = new Array();
			if(data.indexOf(',')) {
@@ -67,7 +68,7 @@ $(function() {
			}
		}
	}
	var qualificationShow = function(data) {
function qualificationShow(data) {
		if(data != undefined && data.length != 0) {
			var subs = new Array();
			if(data.indexOf(',')) {
@@ -88,7 +89,7 @@ $(function() {
		$.ajax({
			type:"get",
			url:"/ajax/org/"+ orgId,
			async:true,
			async:false,
			success: function(data) {
				var $info = data.data;
				//console.log($info)
@@ -96,7 +97,11 @@ $(function() {
					if($info.hasOrgLogo){
						$("#proHead").css("background-image","url(/images/org/"+ $info.id +".jpg)");
					}
					$("#proName").text($info.name);
					if($info.forShort) {
						$("#proName").text($info.forShort);
					}else{
						$("#proName").text($info.name);
					}
					if($info.authStatus=="3"){
						$("#proAuth").addClass("authicon-com-ok"); 
						$("#proAuth").attr("title","科袖认证企业");
@@ -109,7 +114,7 @@ $(function() {
						proOther = $info.industry.replace(/，/gi," | ");
					}
					$("#proOther").text(proOther);
					if($info.orgType){
					if($info.orgType=="2"){
						$("#proTit").html(orgTypeShow[$info.orgType] + "<span style='margin-right:10px;'></span>");
					}
					var llqtitle=$info.name + "-" + proOther + "-科袖网";//修改浏览器title信息
@@ -117,11 +122,14 @@ $(function() {
					//简介
					if($info.descp) {
						$("#descpS").text($info.descp);
						$(".navconBox").find("li:contains('主页')").show();
					} else {
						$("#descpS").parents(".coninfobox").hide();
					}
					//学术领域					
					//学术领域		
					console.log($info.subject)
					if($info.subject) {
						$(".navconBox").find("li:contains('主页')").show();
						subjectShow($info.subject);
					} else {
						$("#subjectShow").parents(".coninfobox").hide();
@@ -155,7 +163,7 @@ $(function() {
					var weibotitle = $info.name;
					var weibourl = window.location.href;
					var weibopic ="http://"+window.location.host+"/images/org/"+ $info.id +".jpg";
					$("#weibo").attr("href","http://service.weibo.com/share/share.php?appkey=3677230589&title="+weibotitle+"&url="+weibourl+"&pic="+weibopic+"&ralateUid=6242830109&searchPic=false&style=simple");
					$("#weibo").attr("href","http://service.weibo.com/share/share.php?appkey=3677230589&title="+encodeURIComponent(weibotitle)+"&url="+encodeURIComponent(weibourl)+"&pic="+encodeURIComponent(weibopic)+"&content=utf-8"+"&ralateUid=6242830109&searchPic=false&style=simple");
				}
			},
			error: function() {
@@ -164,29 +172,33 @@ $(function() {
		});
	}
	//获取资源
	function getResource(){
	function getResource(pageSize,pageNo,isbind){
		$.ajax({
			"url": "/ajax/resource/qaOrgPublish",
			"type": "get",
			"async": false,
			"data": {
				"orgId": orgId
				"orgId": orgId,
				"pageSize":pageSize,
				"pageNo":pageNo
			},
			"success": function(data) {
				//console.log(data);
				if(data.success) {
					var madiaHead ='';
					if(data.data.length > 0){
						for(var i = 0; i < data.data.length; i++) {
							if(data.data[i].images.length) {
								madiaHead ='/data/resource/' + data.data[i].images[0].imageSrc ;
					if(data.data.data.length > 0){
						$(".navconBox").find("li:contains('资源')").show();
						$(".navconBox").find("li:contains('主页')").show();
						for(var i = 0; i < data.data.data.length; i++) {
							var madiaHead ='';
							if(data.data.data[i].images.length) {
								madiaHead ='/data/resource/' + data.data.data[i].images[0].imageSrc ;
							}else{
								madiaHead ='/images/default-resource.jpg';
							}
							var strAdd = '';
							strAdd += '<li><a href="resourceShow.html?resourceId='+ data.data[i].resourceId +'" class="flexCenter urlgo">';
							strAdd += '<li><a href="resourceShow.html?resourceId='+ data.data.data[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">'+ data.data[i].resourceName +'</p><p class="h2Font ellipsisSty">应用用途：'+ data.data[i].supportedServices+'</p></div>';				
							strAdd += '<div class="madiaInfo"><p class="h1Font ellipsisSty-2">'+ data.data.data[i].resourceName +'</p><p class="h2Font ellipsisSty">应用用途：'+ data.data.data[i].supportedServices+'</p></div>';				
							strAdd += '</a></li>';
							
							if(i==0){
@@ -194,6 +206,17 @@ $(function() {
							}
							$("#proResource").append(strAdd);
						}
						if(isbind==true){
						$(".resoucePageCode").createPage({
							pageCount: Math.ceil(data.data.total / 10),
							current: data.data.pageNo,
							backFn: function(p) {
								$("#proResource").html("");
								getResource(10,p,false);
								//document.body.scrollTop = document.documentElement.scrollTop = 0;
							}
						});
					}
					}else{
						$("#proResource + .nodatabox").show();
						$("#proResource + .nodatabox").find(".noContip").text("主人尚未发布任何资源");
@@ -207,48 +230,73 @@ $(function() {
		});
	}
	//获取文章
	function getArticle(){
	function getArticle(pageSize,pageNo,isbind){
		$.ajax({
			url: "/ajax/article/qaOrgPublish",
			url: "/ajax/article/pqProPublish",
			dataType: 'json', //数据格式类型
			type: 'GET', //http请求类型
			data: {
				"orgId": orgId
				"orgId": orgId,
				"pageSize":pageSize,
				"pageNo":pageNo
			},
			timeout: 10000, //超时设置
			success: function(data) {
				if(data.success) {
					var madiaHead ='/images/default-artical.jpg';
					if(data.data.length > 0){
						for(var i = 0; i < data.data.length; i++) {
							if(data.data[i].articleImg) {
								madiaHead ='/data/article/' + data.data[i].articleImg ;
					if(data.data.data.length > 0){
						$(".navconBox").find("li:contains('文章')").show();
						$(".navconBox").find("li:contains('主页')").show();
						for(var i = 0; i < data.data.data.length; i++) {
							var madiaHead ='/images/default-artical.jpg';
							if(data.data.data[i].articleImg) {
								madiaHead ='/data/article/' + data.data.data[i].articleImg ;
							}
							var strAdd = '';
							strAdd += '<li><a href="articalShow.html?articleId='+ data.data[i].articleId +'" class="flexCenter urlgo">';
							strAdd += '<li><a href="articalShow.html?articleId='+ data.data.data[i].articleId +'" class="flexCenter urlgo">';
							strAdd += '<div class="madiaHead artHead" style="background-image:url('+ madiaHead +')"></div>';
							strAdd += '<div class="madiaInfo"><p class="h1Font ellipsisSty-2">'+ data.data[i].articleTitle +'</p>';
							strAdd += '<div class="madiaInfo"><p class="h1Font ellipsisSty-2">'+ data.data.data[i].articleTitle +'</p>';
							strAdd += '<ul class="h2Font clearfix">';
							strAdd += '<li><span class="time">'+ commenTime(data.data[i].publishTime) +'</span></li>';
							strAdd += '<li><span id="pageViews">阅读量 '+ data.data[i].pageViews +'</span></li>';
							strAdd += '<li><span id="articleAgree">点赞  '+ data.data[i].articleAgree +'</span></li>';
							strAdd += '<li><span class="time">'+ commenTime(data.data.data[i].publishTime) +'</span></li>';
							strAdd += '<li><span id="pageViews">阅读量 '+ data.data.data[i].pageViews +'</span></li>';
							strAdd += '<li><span id="articleAgree">点赞  '+ data.data.data[i].articleAgree +'</span></li>';
							strAdd += '<li><span id="comment"></span></li>';
							strAdd += '</ul></div>';
							strAdd += '</a></li>';
							
							var $strAdd = $(strAdd);
							$("#proArticel").append( $strAdd);
							commentnum(data.data[i].articleId, $strAdd) //文章评论数
							commentnum(data.data.data[i].articleId, $strAdd) //文章评论数
							if(i==0){
								$("#showArticle").append(strAdd);
								commentnum(data.data[0].articleId, $strAdd)
								commentnum(data.data.data[0].articleId, $strAdd)
							}
						
						}
						if(isbind==true){
						$(".expertPageCode").createPage({
							pageCount: Math.ceil(data.data.total / 10),
							current: data.data.pageNo,
							backFn: function(p) {
								$("#proArticel").html("");
								getArticle(10,p,false);
								//document.body.scrollTop = document.documentElement.scrollTop = 0;
							}
						});
					}
					}else{
						$("#proArticel + .nodatabox").show();
						$("#proArticel + .nodatabox").find(".noContip").text("主人尚未发布任何文章");
						$("#showArticle").parents(".coninfobox").hide();
						var i=0;
						$("#item1user").find('.coninfobox').each(function(){
							if($(this).css("display") == "none"){
								i++;
							}
						})
						if(	i==4) {
							$(".navconBox ul>li").eq(3).addClass("liNow").siblings().removeClass("liNow");
							$("#item6user").show()
						}
					}
				}
			},

js/discover.js

@@ -140,7 +140,11 @@ $(function() {
			"success": function(data) {
				console.log(data);
				if(data.success && data.data) {
					$itemlist.find("#nameSpan").text(data.data.name);
					if(data.data.forShort) {
						$itemlist.find("#nameSpan").text(data.data.forShort);
					}else{
						$itemlist.find("#nameSpan").text(data.data.name);
					}
					if(data.data.hasOrgLogo) {
						$itemlist.find("#userimg").attr("style", "background-image: url(/images/org/" + data.data.id + ".jpg);");
					}

js/resourceShow.js

@@ -176,7 +176,7 @@ $(document).ready(function() {
				"rel": '../images/default-resource.jpg'
			});
		}
		$("#weibo").attr("href", "http://service.weibo.com/share/share.php?appkey=3677230589&title=" + weibotitle + "&url=" + weibourl + "&pic=" + weibopic + "&ralateUid=6242830109&searchPic=false&style=simple");
		$("#weibo").attr("href","http://service.weibo.com/share/share.php?appkey=3677230589&title="+encodeURIComponent(weibotitle)+"&url="+encodeURIComponent(weibourl)+"&pic="+encodeURIComponent(weibopic)+"&content=utf-8"+"&ralateUid=6242830109&searchPic=false&style=simple");
	}
	/*点击名字及头像跳转个人浏览页面*/
	$("#nameS,#headImg").click(function() {