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

cmp-portal/cmp-needList.html

@@ -33,7 +33,7 @@
			        <div class="workblock identityState" id="identityState" style="display:none">
						<div class="nowState">
						   <p><span class="identProcess" id="identProcess">通过企业认证，员工可以在科袖网发布企业需求，<br />您可以在这里管理这些需求。</span><span class="identts" id="identts"></span></p>
						   <a href="cmp-setAuth.html"><button type="button" class="frmtype btnModel headRadius identBtn" id="identBtn">马上认证</button></a>
						   <a href="cmp-setAuth.html?auth=1"><button type="button" class="frmtype btnModel headRadius identBtn" id="identBtn">马上认证</button></a>
						</div>
					</div>
			        <div class="workmysrc" id="companyDemandList" style="display:none">	

cmp-portal/cmp-staffList.html

@@ -37,7 +37,7 @@
		            <div class="workblock identityState" id="identityState" style="display:none;">
						<div class="nowState">
						   <p><span class="identProcess" id="identProcess">通过企业认证后，您可以在这里认证企业员工，<br />这些【企业认证员工】可以在科袖网发布企业需求。</span><span class="identts" id="identts"></span></p>
						   <a href="cmp-setAuth.html"><button type="button" class="frmtype btnModel headRadius identBtn" id="identBtn">马上认证</button></a>
						   <a href="cmp-setAuth.html?auth=1"><button type="button" class="frmtype btnModel headRadius identBtn" id="identBtn">马上认证</button></a>
						</div>
					</div>
					<!--员工管理-->

cmp-portal/js/cmp-articalList.js

@@ -322,11 +322,11 @@ $(function() {
		PopHtml += '<li><div class="col-w-3">文章标题</div><div class="col-w-9 rightRequ"><input type="text" class="frmtype frmtypeW"  id="newsName"/><em class="requiredcon">*</em><div class="frmmsg msgLog1"><span></span></div></div></li>';
		PopHtml += '<li><div class="col-w-3">涉及学术领域</div><div class="col-w-9">';
		PopHtml += '<div class="col-w-9"><input type="text" class="frmtype frmtypeW" id="subject"/><div class="frmmsg msgLog workmsg3"><span></span></div></div>';
		PopHtml += '<div class="col-w-3"><button type="button" class="frmtype btnModel btnModel2 headRadius" id="subjectAdd">添加</button></div><ul class="ulspace editUlist clearfix" id="SubjectList"></ul>';
		PopHtml += '<div class="col-w-3"><button type="button" class="frmtype btnModel headRadius" id="subjectAdd">添加</button></div><ul class="ulspace editUlist clearfix" id="SubjectList"></ul>';
		PopHtml += '</div></li>';
		PopHtml += '<li><div class="col-w-3">涉及应用行业</div><div class="col-w-9">';
		PopHtml += '<div class="col-w-9"><input type="text" class="frmtype frmtypeW" id="industry"/><div class="frmmsg msgLog workmsg4"><span></span></div></div>'
		PopHtml += '<div class="col-w-3"><button type="button" class="frmtype btnModel btnModel2 headRadius" id="industryAdd">添加</button></div>';
		PopHtml += '<div class="col-w-3"><button type="button" class="frmtype btnModel headRadius" id="industryAdd">添加</button></div>';
		PopHtml += '<ul class="ulspace editUlist clearfix" id="industryList"></ul></div></li>';
		/////////////文章图片上传////////////////////
		PopHtml += '<div class="uploderArt"><div class="imgBlock" id="uploader">';

cmp-portal/js/cmp-pwdReset03.js

@@ -93,7 +93,7 @@ $(function() {
				success: function($data) {
					console.log($data)
					if($data.success && $data.data) {
						location.href = "cmp-pwdResetok.html";
						location.href = "cmp-pwdResetOk.html";
					}
				},
				error: function() {

cmp-portal/js/cmp-setAuth.js

@@ -5,12 +5,7 @@ $(function() {
	var auth = GetQueryString("auth");
	var temp = [];
	/*查询企业认证状态*/
	if(auth==1){
		$(".authup").removeClass("displayNone");
	}else{
		authStatus();	
	}
	
	authStatus();	
	$("#authsubmet").on("click", function() {
		var fileoneVal = $("#fileone1").attr("data-id");
@@ -44,11 +39,15 @@ $(function() {
							$(".authup").removeClass("displayNone");
						})
					} else if($data.data == 0) { //未认证
						$(".authks").removeClass("displayNone");
						$("#authks").on("click", function() {
							$(this).parents(".authks").addClass("displayNone");
						if(auth==1){
							$(".authup").removeClass("displayNone");
						})
						}else{
							$(".authks").removeClass("displayNone");
							$("#authks").on("click", function() {
								$(this).parents(".authks").addClass("displayNone");
								$(".authup").removeClass("displayNone");
							})
						}
					} else if($data.data == 1) { //待认证
						$(".authtj").removeClass("displayNone");
					} else if($data.data == 2) { //认证中
@@ -81,7 +80,8 @@ $(function() {
			success: function($data) {
				console.log($data)
				if($data.success) {
					location.reload(true);
					//location.reload(true);
					location.href = "cmp-setAuth.html";
				}
			},
			error: function() {

information.html

@@ -135,7 +135,7 @@
								<div class="infor-browse">
									<div class="shareabout shareabout1" style="margin: 0 30px;">
										<div class="sharesrcbox" style="width:642px;">
											<div class=" Acrollbox">
											<div class="sharescrollbox Acrollbox" id="keyanAr">
												<ul class="shareshow otherRes clearfix" id="reachArticle">
												
												</ul>
@@ -347,12 +347,12 @@
							<div class="infor-browse">
								<div class="shareabout" style="margin: 0 30px;">
									<div class="sharesrcbox" style="width:642px;">
										<div class="sharescrollbox">
										<div class="sharescrollbox" id="keyanRe">
										</div>
									</div>
									<span class="resouprev resoubtn"></span>
									<span class="resounext resoubtn"></span>
									<span class="resouprev resoubtn resoubtn2"></span>
									<span class="resounext resoubtn resoubtn2"></span>
								</div>
							</div>
						</div>

js/articalInfo.js

@@ -218,7 +218,7 @@ $(document).ready(function() {
					if($data.authStatus == 3) {
						$("#authFlag,#proTitle").replaceWith("<em class='authiconNew authicon-com-ok' title='认证企业'></em>");
					} else {
						$("#authFlag,#proTitle").replaceWith("<em class='authiconNew authicon-com-no' title='未认证企业'></em>");
						$("#authFlag,#proTitle").replaceWith("");
					}
					if($data.hasOrgLogo) {
						$("#headImg,#proHead").attr("src", "/images/org/" + $data.id + ".jpg");

js/information.brow.js

@@ -840,7 +840,7 @@ $(function() {
						add = "";
					}
					//资源轮播
					var $content = $(".sharescrollbox");
					var $content = $("#sharescrollbox");
					var childcount = $content.find(".sharesrc").length;
					Carousel(3, 3, 3, childcount, $content, $(".resoubtn2.resounext"), $(".resoubtn2.resouprev"));
					//科研资源中点咨询

js/information.js

@@ -2053,7 +2053,7 @@ $(function() {
					add += '<p class="briefinfor">应用用途：' + data.data[i].supportedServices + '</p>'
					add += '</div>'
					$add = $(add);
					$(".sharescrollbox").append($add);
					$("#keyanRe").append($add);
					/*$(".resouImage").load(function(){})
							.error(function(){
@@ -2069,9 +2069,9 @@ $(function() {
					//add="";
				}
				//资源轮播
				var $content = $(".sharescrollbox");
				var $content = $("#keyanRe");
				var childcount = $content.find(".sharesrc").length;
				Carousel(3, 3, 3, childcount, $content, $(".resounext"), $(".resouprev"));
				Carousel(3, 3, 3, childcount, $content, $(".resoubtn2.resounext"), $(".resoubtn2.resouprev"));
			} else {
				$.MsgBox.Alert("消息", "系统异常!");
			}
@@ -2135,7 +2135,7 @@ $(function() {
					}
					//资源轮播
					var $content2 = $(".sharescrollbox.Acrollbox");
					var $content2 = $("#keyanAr");
					var childcount2 = $content2.find(".otherRes.shareshow li").length;
					Carousel(3, 3, 3, childcount2, $content2, $(".articalbtn.resounext"), $(".articalbtn.resouprev"));
				}