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

articalInfo.html

@@ -52,7 +52,7 @@
					<div class="clearfix">		
						<a class="proinfor floatL" style="display:block;width:64%;" id="lineId">
							<div class="headblock floatL" style="width:40px"><img id="proHead" class="headimg headRadius" src="../images/default-photo.jpg" width="100%"></div>
							<div class="listtit2 floatL"><span style="margin-right:10px;color: #ff9900;" id="proName"></span><span id="proTitle"></span><span id="proOffice"></span><span id="proOrg"></span><span id="proAddress"></span></div>
							<div class="listtit2 floatL"><span style="color: #ff9900;" id="proName"></span><span style="margin-left:10px;" id="proTitle"></span><span id="proOffice"></span><span id="proOrg"></span><span id="proAddress"></span></div>
						</a>
						<div class="navOperate floatR">
							<span class="wrapicon upTop"></span>

cmp-portal/cmp-workspaces.html

@@ -50,7 +50,7 @@
			            <div class="workblock identityState" id="authBad" 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="workblock clearfix" id="authOk" style="display:none">

cmp-portal/css/cmpindex.css

@@ -62,6 +62,7 @@ a.worksubmenu.cmpBg{color: #FFFFFF;}
.workselectitem table tr .workcheck{ text-align:center;}
.worksitcon{ width:100%;margin-top:0; overflow:hidden; }
.worksitcon .titList{font-weight:bold;font-size:14px;padding-right: 130px;}
.worksitcon .titList em{font-style: normal;}
.worksitcon .lasttime{ font-size:13px; color:#666;}
.worksitcon .lasttime.rightTime{position: absolute; right: 20px;top:0}
.worksitcon span{ padding-right:4px;}

cmp-portal/css/common.css

@@ -518,7 +518,7 @@ a:active,a:hover{outline:0;text-decoration:none;}
/*倒三角*/
.to-bottom {display: inline-block;overflow: hidden;width: 0px;height: 0px;border: 6px solid #ccc;border-color: #ccc #fff; border-width: 6px 6px 0 6px;position: absolute;right: 0;top: 40%;}
/*/////////////////////表单样式/////////////////////// */
.frmtype{border:1px #b5b5b5 solid;font-size:14px;outline: none; padding:6px 20px 6px 10px;border-radius: 6px;}
.frmtype{border:1px #b5b5b5 solid;font-size:14px;line-height:16px;outline: none; padding:6px 20px 6px 10px;border-radius: 6px;}
.frmtype:focus{box-shadow: none;outline:none;border-color:#28b8fa;}
.frmtypeW{width:98%;margin: auto;}
textarea.frmtype{height:100px;}
@@ -603,8 +603,10 @@ button.btnModelBig:hover{
.nodatabox .keyword{font-size:20px; padding:0 6px;color:#555555;}
/***********************缺省页面*******************/
.containerCon{width:1100px;padding:0 20px;position:relative; margin:auto;overflow: hidden; }
.overInitial{overflow:initial;}
.containerCon{width:1100px;padding:0 20px;position:relative; margin:auto;}
.containerCon:before,.containerCon:after{display:table;content:" "}
.containerCon:after{clear: both;}
/*.overInitial{overflow:initial;}*/
/*新版footer*/
footer{position: absolute;right:0; left: 0;bottom:0;background: #373d41;color:#888;font-size:16px;line-height:30px;}
footer .containerCon{background: #373d41;}

cmp-portal/js/cmp-needShow.js

@@ -62,8 +62,8 @@ $(document).ready(function() {
						$("#authCompany").addClass("authicon-com-ok");
						$("#authCompany").attr("title","认证企业")
					}else{
						$("#authCompany").addClass("authicon-com-no");
						$("#authCompany").attr("title","未认证企业")
						/*$("#authCompany").addClass("authicon-com-no");
						$("#authCompany").attr("title","未认证企业")*/
					}
					if($data.organization.industry){
						$(".ellipsisSty").text($data.organization.industry);

cmp-portal/js/cmp-setAuth-imgup.js

@@ -21,14 +21,15 @@ function uploadFun(_this, num) {
/*上传文件生成cacheKey码*/
function ajaxFileUpload(num) {
	$.ajaxFileUpload({
		url: '/ajax/cachedFileUpload',
		url: '/ajax/cachedFileUpload?text=1',
		secureuri: false,
		fileElementId: 'fileone' + num,
		dataType: 'json',
		type: "POST", 
		dataType:"text/html",
		success: function(data, status) {
			console.log(data)
			if(data.success) {
				$("#fileone" + num).attr("data-id", data.data[0].cacheKey);
			var $data = JSON.parse(data);
			if($data.success) {
				$("#fileone" + num).attr("data-id", $data.data[0].cacheKey);
			}
		}
	})

cmp-portal/js/cmp-setAuth.js

@@ -2,9 +2,15 @@
$(function() {
	var orgid = $.cookie('orgId');
	var auth = GetQueryString("auth");
	var temp = [];
	/*查询企业认证状态*/
	authStatus();
	if(auth==1){
		$(".authup").removeClass("displayNone");
	}else{
		authStatus();	
	}
	
	$("#authsubmet").on("click", function() {
		var fileoneVal = $("#fileone1").attr("data-id");

cmp-portal/js/cmp-workspaces.js

@@ -14,8 +14,8 @@ $(document).ready(function() {
					var otext, oguimo;
					console.log(data);
					if($data.authStatus != 3) {
						$("#photoClass").addClass("authicon-com-no")
						$("#photoClass").attr("title", "未认证企业");
						/*$("#photoClass").addClass("authicon-com-no")
						$("#photoClass").attr("title", "未认证企业");*/
						$("#authBad").show();
					} else {
						$("#photoClass").addClass("authicon-com-ok");
@@ -188,7 +188,7 @@ $(document).ready(function() {
			}
			var ostring = '<li>'
			ostring += '<div class="leftlogo floatL">'
			ostring += '<img class="headRadius" src="' + img + '" />'
			ostring += '<img class="headRadius" src="' + img + '" width="100%"/>'
			ostring += '<div class="h4Font"><span>' + arr[i].professor.name + '</span></div></div>'
			ostring += '<div class="rightinfo floatL">'
			ostring += '<p class="h3Font fontweight ellipsisSty">' + arr[i].demandTitle + '</p>'

cmp-portal/js/companybrowinfor.js

@@ -21,9 +21,10 @@ $(document).ready(function() {
					$("#comName").text($data.name);
					if($data.authStatus == 3) {
						$("#authS").addClass("authicon-com-ok").attr("title", "认证企业");
					} else {
					} 
					/*else {
						$("#authS").addClass("authicon-com-no").attr("title", "未认证企业");
					}
					}*/
					if($data.hasOrgLogo) {
						$("#oimg").attr("src", "/images/org/" + $data.id + ".jpg");
					} else {

cmp-portal/js/public/cmpHeader.js

@@ -8,7 +8,7 @@
								'</div>' +
						'</div>' +	
					'<div class="container-fulid navheader">'+
					  '<div class="containerCon clearfix overInitial">'+
					  '<div class="containerCon clearfix">'+
					  		'<div class="floatL">'+
									'<div class="headlogo floatL">'+
											'<a href="javascript:;"><h1></h1></a>'+

css/common.css

@@ -186,7 +186,7 @@ button.btnModel[disabled]:hover{background:#d6d8de;}
}
/*认证标识相关*/
.authiconNew{/*position:absolute;top:1px;*/display: inline-block;margin-left:4px;background-position: center;background-repeat: no-repeat;}
.authiconNew{position:relative;top:2px;display: inline-block;margin-left:4px;background-position: center;background-repeat: no-repeat;}
.authicon-pro{width:16px;height:16px;background-image:url(../images/porfile_icon_zhuanjia_nor.png);background-size: cover;}/*科袖认证专家*/
.authicon-com-ok{width:16px;height:16px;background-image:url(../images/porfile_icon_qiye_hig.png);background-size: cover;}/*认证企业*/
.authicon-com-no{width:16px;height:16px;background-image:url(../images/porfile_icon_qiye_nor.png);background-size: cover;}/*未认证企业*/

css/index.css

@@ -1,4 +1,4 @@
\n @charset "utf-8";
 @charset "utf-8";
/* CSS Document */
html, body{}
@@ -145,7 +145,7 @@ input{ outline:none;}
.industrybox{font-size:14px; color:#999;  }
/*------------------------------------------------------------------------------------*/
/*账号设置*/
.account{ width:1050px; min-height:100px; margin:auto; padding: 40px 0;}
.account{ width:1050px; min-height:100px; margin:auto; padding: 40px 0;overflow: hidden;}
.account-set{ width:12%; min-height: 280px; float:left; background:#f8f8f8; border-radius:6px; margin-top:50px; overflow:hidden;}
.account-title{ height:58px; padding:0 20px;font-size:17px;line-height:68px;color:#a3a3a3;}
.leftsidebar{ display:block; width:100%; height:40px; padding-left:30px;font-size:15px;line-height:40px; color:#313131;}

discover.html

@@ -38,7 +38,7 @@
	</div>
</div>
<footer>
	<script type="text/javascript" src="js/Footer.js"></script>
	<script type="text/javascript" src="js/footer.js"></script>
</footer>
<script type="text/javascript" src="js/jquery.cookie.js"></script>
@@ -47,13 +47,5 @@
<script type="text/javascript" src="js/common.js"></script>
<script type="text/javascript" src="js/discover.js"></script>
<script>
	$(".tcdPageCode").createPage({
		pageCount: Math.ceil(1/2),
		current: 1,
		backFn: function(p) {
		}
	});
</script>
</body>
</html>

js/discover.js

@@ -2,9 +2,9 @@
$(function() {
	loginStatus();//判断个人是否登录
	var userid = $.cookie("userid");
	discover(10, 1);
	discover(10, 1,true);
	/*发现列表显示*/
	function discover(pageSize, pageNo) {
	function discover(pageSize, pageNo,isbind) {
		$.ajax({
			"url": "/ajax/article/pqFind",
			"type": "get",
@@ -66,15 +66,17 @@ $(function() {
						}
					}
					//分页
					$(".tcdPageCode").createPage({
						pageCount: Math.ceil(data.data.total / 10),
						current: data.data.pageNo,
						backFn: function(p) {
							$("#table-item").html("");
							discover(10, p);
							document.body.scrollTop = document.documentElement.scrollTop = 0;
						}
					});
					if(isbind==true){
						$(".tcdPageCode").createPage({
							pageCount: Math.ceil(data.data.total / 10),
							current: data.data.pageNo,
							backFn: function(p) {
								$("#table-item").html("");
								discover(10, p,false);
								document.body.scrollTop = document.documentElement.scrollTop = 0;
							}
						});
					}
					$(".loading").remove();
				}
@@ -129,9 +131,9 @@ $(function() {
					$itemlist.find("#userUrl").attr("href", "companybrowinfor.html?orgid=" + data.data.id);
					if(data.data.authStatus==3){
						$itemlist.find(".authiconNew").addClass("authicon-com-ok").attr("title", "认证企业");;	
					}else{
					}/*else{
						$itemlist.find(".authiconNew").addClass("authicon-com-no").attr("title", "未认证企业");;
					}
					}*/
				
				}
			},

js/information.brow.js

@@ -529,7 +529,7 @@ $(function() {
					//显示专家信息到保存数据
					name = $info.name;
					if($info.descp == undefined && $info.subject == undefined && $info.researchAreas.length == 0 && $info.industry == undefined && $info.edus.length == 0 && $info.jobs.length == 0 && $info.projects.length == 0 && $info.papers.length == 0 && $info.patents.length == 0 && $info.honors.length == 0) {
						$("div:contains('专家信息')").parents(".menublock").hide();
						$("div:contains('个人信息')").parents(".menublock").hide();
					}
					if($info.descp) {
						$("#descpS").text($info.descp);
@@ -638,7 +638,6 @@ $(function() {
						$("span:contains('荣誉及奖项')").parents(".introduction").hide();
						$("a:contains('荣誉及奖项')").hide();
					}
//下滑滚动不覆盖底部 
	var d;
	var t;

js/myDemand.js

@@ -1,7 +1,7 @@
$(document).ready(function() {
	loginStatus();//判断个人是否登录
	var yesNo = "",
		oSortType = 0;
		oSortType = 0,demandType;
	/*我的需求列表*/
	function myDemandList(isbind, page, pageNum, dema, sortType) {
		$.ajax({
@@ -159,17 +159,33 @@ $(document).ready(function() {
			},
			success: function(data, textState) {
				if(data.success) {
					console.log(data);
					var $rta=data.data;
					$("#induSub").val("");
					$("textarea").val("");
					$("#demandContent").val("");
					$("#navsub").find("li").removeClass("aimedLi");
					$("#mutChecked").find("li").removeClass("checkedLi");
					$('.checkNow').removeClass('checkNow');
					if($rta.authStatus!=3){
						location.href="realname-authentication.html";
						if($rta.orgAuth==1){
							$(".blackcover ").show();
							$("span:contains('企业需求')").addClass("checkNow");
							$("span:contains('个人需求')").addClass("checkNo");
							demandType=2;
						}else{
							location.href="realname-authentication.html";
						}
						
					}else{
						$(".blackcover ").show();
						$("#induSub").val("");
						$("textarea").val("");
						$("#demandContent").val("");
						$("#navsub").find("li").removeClass("aimedLi");
						$("#mutChecked").find("li").removeClass("checkedLi");
						
						if($rta.orgAuth==0){
							$("span:contains('企业需求')").addClass("checkNo");
							$("span:contains('个人需求')").addClass("checkNow");
							demandType=1;
						}else{
							demanTy();
						}
					}
					
				}
@@ -206,7 +222,28 @@ $(document).ready(function() {
			}
		}
	}
	/*切换需求类型*/
function demanTy() {
	var deTy = document.getElementsByClassName("boxnavTo")[0];
	var deTyChild = deTy.getElementsByTagName("span");
	if(deTyChild[0].className != "checkNo" && deTyChild[1].className != "checkNo") {
		for(var n = 0; n < deTyChild.length; n++) {
			(function(m) {
				deTyChild[m].onclick = function() {
					this.className = "checkNow";
					if(m == 0) {
						demandType=1;
						deTyChild[1].className = "";
					} else if(m == 1) {
						demandType=2;
						deTyChild[0].className = "";
					}
				}
			})(n);
		}
	}
}
	
	/*需求题目限制30个字*/
	$("#demandContent").on('keyup', function() {
		if(this.value.length > 30) {
@@ -325,7 +362,7 @@ $(document).ready(function() {
			data: {
				"demander": userid,
				"demandAim": consun,
				"demandType": 1,
				"demandType": demandType,
				"demandTitle": $("#demandContent").val(),
				"demandContent":$("textarea").val(),
				"args": arr

myDemand.html

@@ -32,8 +32,8 @@
					<li><label>请选择您的需求类型<em class="requiredcon">*</em></label></li>
					<li class="divideSpace" id="navsubTo" >
						<ul class="boxnav boxnavTo chooseBox clearfix">
							<li><span class='checkNow'>个人需求</span></li><!--默认状态是无class 选中状态checkNow-->
							<li><span class='checkNo'>企业需求</span></li><!--不可用状态checkNo-->
							<li><span>个人需求</span></li><!--默认状态是无class 选中状态checkNow-->
							<li><span>企业需求</span></li><!--不可用状态checkNo-->
						</ul>
						<div class="littipCh">
							<div class="littip">注：当企业入驻科袖后，企业的关联用户将可以发布企业需求</div>