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

Conflicts:
	js/myDemand.js

cmp-portal/js/cmp-setBind.js

							for(var j in hash) {
								$(this).attr("href", hash[url]);
								window.open(hash[url]);
								location.reload(true);
							}
							location.reload(true);
						});
					} else {
						$.MsgBox.Alert('提示', '发送邮箱验证失败')

cmp-portal/js/cmp-settled-log.js

				},
			});
		} else {
			$(".msgLog1 span").text("请输入正确是邮箱地址");
			$(".msgLog1 span").text("请输入正确的邮箱地址");
		}
	}

cmp-portal/js/cmp-workspaces.js

	companyDemand();
	/*跳转企业浏览页面*/
	$("#conmliu").on("click",function(){
		location.href="../companybrowinfor.html?orgId="+id;
		window.open("../companybrowinfor.html?orgId="+id);
	})
})

cmp-portal/js/public/cmpFooter.js

								'<div class="logo-block"></div>'+
								'<p>' +
									'<a class="listlink" href="javascript:void(0);" target="_blank" rel="nofollow">关于我们</a>' +
									'<a class="listlink" href="javascript:void(0);" target="_blank" rel="nofollow" id="cmpSet">企业入驻</a>' +
									'<a class="listlink" href="javascript:void(0);"  rel="nofollow" id="cmpSet">企业入驻</a>' +
									'<a class="listlink" href="javascript:void(0);" target="_blank" rel="nofollow">我是专家</a>' +
									'<a class="listlink" href="../privacy.html" target="_blank" rel="nofollow">用户协议</a>' +
									'<a class="listlink" href="../download.html" target="_blank" rel="nofollow">产品下载</a>' +

companybrowinfor.html

	</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>

css/index.css

.infor span,.infor2 span{ display:block; width:60px; height:26px; float:left;font-size:14px;line-height:26px; margin-left:10px;}
.select{  width:173px; height:24px; border-radius:5px; border:1px #f99550 solid; box-shadow:0 0 1px #f99550 inset; background:url(../images/downselect.png) no-repeat 150px center; float:left; overflow:hidden;}
.selectbtn{ width:200px; height:24px; border:none; background:url(../images/downselect.png) no-repeat 150px center; font-size:14px;line-height:26px; color:#999;}
.infor-save{ float:left; clear:both; width:130px; height:26px; background:#ff9900;box-shadow:none; border:none;cursor:pointer; color:#fff; border-radius:5px;font-size:14px;line-height:26px; margin-top:15px; margin-left:10px;  }
.infor-save{ float:left; clear:both; width:130px; height:26px; background:#ff9900;box-shadow:none; border:none;cursor:pointer; color:#fff; border-radius:5px;font-size:14px;line-height:16px; margin-top:15px; margin-left:10px;  }
.close,.close2{float: left;  width:130px; height:26px; border-radius:5px; font-weight:normal;background:none; box-shadow:none; border:none;cursor:pointer; padding:0;font-size:14px;line-height:26px; margin-top:15px; margin-left:5px;opacity: 1;color: #666; text-shadow:none; }
.close:hover,.close2:hover{ background:#ff9900; color:#fff; opacity: 1; }
.head-right{ float:right; margin-top:30px; position: relative;width:140px; height:140px; overflow:hidden;}

css/workspace.css

.linespace{height:20px;margin-top:20px;border-top:1px dashed #D6D6D6}
/*////////////我的关注/////////////////*/
.attentionBox{position:absolute;width:640px;left:50%;margin:80px 0 20px -320px;background:#fff;border-radius:10px;font-size:14px; z-index:1001; margin-bottom:40px;box-shadow: 2px 4px 10px 4px #555; -webkit-box-shadow: 2px 4px 10px 4px #555; -moz-box-shadow: 2px 4px 10px 4px #555; }
.attentionBox{position:absolute;width:640px;left:50%;margin:80px 0 20px -320px;background:#fff;border-radius:10px;font-size:14px; z-index:1001; margin-bottom:100px;box-shadow: 2px 4px 10px 4px #555; -webkit-box-shadow: 2px 4px 10px 4px #555; -moz-box-shadow: 2px 4px 10px 4px #555; }
.topTit{text-align:center;color:#FFFFFF; font-size:20px;line-height:46px;background: #ff9900;border-radius:10px 10px 0 0;height:46px;width: 100%;}
.fixbox{ background: #FFFFFF;/* position:fixed;top:46px;left:0;*/width:100%; z-index:1;}
.fixbox .fixbtn{ padding:0; margin: 0; overflow: hidden;}

information.html

								<div class="right-title"><span>科研文章</span>
									<div class="enterwork" id="enter1work">进入我的工作台</div>
								</div>
								<div class="infor-browse">
								
									<div class="shareabout shareabout1" style="margin: 0 30px;">
										<div class="sharesrcbox" style="width:642px;">
											<div class="sharescrollbox Acrollbox" id="keyanAr">
										<span class="resouprev resoubtn articalbtn"></span>
										<span class="resounext resoubtn articalbtn"></span>
									</div>
								</div>
								
							</div>
						<!--个人简介-->
						<div class="right-box introduction">
								<a class="edit"></a>
							</div>
							<div class="infor-browse">
								<ul class="edu-about edu-infor" id="industryShow">
								<ul class="edu-about edu-infor" style="padding:0;" id="industryShow">
								</ul>
							</div>

js/account-set.js

						if(data.success){
							if(data.data == true){
								$.MsgBox.Alert("消息提醒","设置成功,请重新登录");
								$("#mb_msgicon").css("background", 'url("images/sign_icon_chenggong_nor.png") 0% 0% / contain');
								/*location.href="login.html";*/
							}else{
				async: true,
				success:function(data){ 
					 $.MsgBox.Alert('消息提醒','邮箱绑定成功')
					 $("#mb_msgicon").css("background", 'url("images/sign_icon_chenggong_nor.png") 0% 0% / contain');
					 userpe();
				},
				error:function(){
				success:function(data){ 
					//console.log(data)
					 $.MsgBox.Alert('消息提醒','邮箱绑定成功')
					 $("#mb_msgicon").css("background", 'url("images/sign_icon_chenggong_nor.png") 0% 0% / contain');
					 var emaild = data.data.email;
					 emailhome(emaild);
					 $.cookie('userEmail',emaild,{path:"/"});
							if(data.data == true){
								$.cookie('userMobilePhone',phoneVal,{path:"/"}); 
								$(".cover2").hide();
								$.MsgBox.Alert("消息提醒","手机绑定成功!");	
								$.MsgBox.Alert("消息提醒","手机绑定成功!");
								$("#mb_msgicon").css("background", 'url("images/sign_icon_chenggong_nor.png") 0% 0% / contain');
								setTimeout(function(){
									location.href="account-set.html?seta=2";
								},1500);

js/footer.js

								'<div class="logo-block"></div>'+
								'<p>' +
									'<a class="listlink" href="javascript:void(0);" target="_blank" rel="nofollow">关于我们</a>' +
									'<a class="listlink" href="javascript:void(0);" target="_blank" rel="nofollow" id="cmpSet2">企业入驻</a>' +
									'<a class="listlink" href="javascript:void(0);" rel="nofollow" id="cmpSet2">企业入驻</a>' +
									'<a class="listlink" href="javascript:void(0);" target="_blank" rel="nofollow">我是专家</a>' +
									'<a class="listlink" href="privacy.html" target="_blank" rel="nofollow">用户协议</a>' +
									'<a class="listlink" href="download.html" target="_blank" rel="nofollow">产品下载</a>' +

js/information.brow.js

					"success": function(rdata) {
						if(rdata.success) {
							$.MsgBox.Alert('message', '资源"' + resName + '"申请发送成功!');
							$("#mb_msgicon").css("background", 'url("images/sign_icon_chenggong_nor.png") 0% 0% / contain');
							$(".blackcover").remove();
							$("body").css("position", "");
							//location.reload(true);

js/information.js

			//获取数据，填充页面
		$.get("/ajax/professor/info/" + userid, function($data) {
			if($data.success) {
				//console.log($data);
				console.log($data);
				var $info = $data.data;
				if($info) {
					//展示专家的信息
					}
					//alert($info.authentication)
					//alert($info.authType)
					if($info.authStatus) {
					if($info.authStatus==3) {
						$("#authSta").text("已认证");
					} else {
						$("#authSta").text("未认证");

js/login-email-find03.js

				if(data.success){
					if(data.data == true){
						$.MsgBox.Alert("消息","密码重置成功,3秒后自动调转登录页面!");
						$("#mb_msgicon").css("background", 'url("images/sign_icon_chenggong_nor.png") 0% 0% / contain');
						 window.setTimeout(function(){    
		                     location.href="login.html";
		                 }, 3000); 

js/login-phone-find01.js

			    	 return false; 
			    }else{
			    	$.MsgBox.Alert("消息","发送成功,请查看手机验证码!");
			    	$("#mb_msgicon").css("background", 'url("images/sign_icon_chenggong_nor.png") 0% 0% / contain');
					$(".msg2").text("");
			    	doClick();
			    }

js/login-phone-find02.js

						if(data.success){
							if(data.data == true){
								$.MsgBox.Alert("消息","密码重置成功,3秒后自动调转登录页面!");
								$("#mb_msgicon").css("background", 'url("images/sign_icon_chenggong_nor.png") 0% 0% / contain');
								 window.setTimeout(function(){    
				                     location.href="login.html";
				                 }, 3000); 

js/myDemand.js

$(document).ready(function() {
	loginStatus();//判断个人是否登录
	loginStatus(); //判断个人是否登录
	var yesNo = "",
		oSortType = 0,demandType;
		oSortType = 0,
		demandType, orgId;
	/*我的需求列表*/
	function myDemandList(isbind, page, pageNum, dema, sortType) {
		$.ajax({
			beforeSend: function() {},
			success: function(data, textState) {
				if(data.success) {
//					if(data.data.data.length==0){
//						return;
//					}
					//					if(data.data.data.length==0){
					//						return;
					//					}
					$(".workselectitem").html(" ");
					demandHtml(data.data.data);
					if(isbind == true) {
	/*发布新需求*/
	$("#needIssueBtn").click(function() {
		$.ajax({
			url: "/ajax/professor/auth",
			url: "/ajax/professor/baseInfo/" + userid,
			type: "GET",
			timeout: 10000,
			dataType: "json",
			data: {
				"id": userid,
			},
			success: function(data, textState) {
			success: function(data) {
				if(data.success) {
					console.log(data);
					var $rta=data.data;
					var $rta = data.data;
					orgId = $rta.orgId
					console.log(orgId)
					$("#induSub").val("");
					$("textarea").val("");
					$("#demandContent").val("");
					$("#navsub").find("li").removeClass("aimedLi");
					$("#mutChecked").find("li").removeClass("checkedLi");
					$('.checkNow').removeClass('checkNow');
					if($rta.authStatus!=3){
						if($rta.orgAuth==1){
					if($rta.authStatus != 3) {
						if($rta.orgAuth == 1) {
							$(".blackcover ").show();
							$("body").css("position","fixed");
							$("span:contains('企业需求')").addClass("checkNow");
							$("span:contains('个人需求')").addClass("checkNo");
							demandType=2;
						}else{
							location.href="realname-authentication.html";
							demandType = 2;
						} else {
							location.href = "realname-authentication.html";
						}
						
					}else{
					} else {
						$(".blackcover ").show();
						if($rta.orgAuth==0){
						$("body").css("position","fixed");
						if($rta.orgAuth == 0) {
							$("span:contains('企业需求')").addClass("checkNo");
							$("span:contains('个人需求')").addClass("checkNow");
							demandType=1;
						}else{
							demandType = 1;
						} else {
							demanTy();
						}
					}
					
				}
			},
			}
		})
		
	});
	$("#workclose2").click(function() {
			$(".blackcover ").hide();
			$("body").css("position","relative");
		})
		/*发布新需求目的*/
	var consun;
		}
	}
	/*切换需求类型*/
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 = "";
	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);
				})(n);
			}
		}
	}
}
	
	/*需求题目限制30个字*/
	$("#demandContent").on('keyup', function() {
		if(this.value.length > 30) {
				$.MsgBox.Alert("消息", "请先添加内容");
				return;
			}
			if(oinduSub.trim().length>10) {
			if(oinduSub.trim().length > 10) {
				$.MsgBox.Alert("消息", "不能多于10个字");
				return;
			}
		})
		/*发布新需求*/
	$("#postDemand").click(function() {
		var dd = $("#navsub").find(".aimedLi")
		var dd = $("#navsub").find(".aimedLi");
		var cc = $("#navsubTo").find(".checkNow");
		if(dd.length == 0) {
			$.MsgBox.Alert("消息", "请选择您发布需求的目的");
			return;
		}
		if(cc.length == 0) {
			$.MsgBox.Alert("消息", "请选择您的需求类型");
			return;
		}
		if(!$("#demandContent").val().trim()) {
			$.MsgBox.Alert("消息", "请填写需求主题");
			return;
				"demandAim": consun,
				"demandType": demandType,
				"demandTitle": $("#demandContent").val(),
				"demandContent":$("textarea").val(),
				"args": arr
				"demandContent": $("textarea").val(),
				"args": arr,
				"orgId": (demandType == 2) ? orgId : "",
			},
			success: function(data) {
				if(data.success) {
					myDemandList(true, 1, 5, yesNo, oSortType);
					$(".blackcover ").hide();
					$("body").css("position","relative");
					$.MsgBox.Alert("消息", "需求发布成功！很快会有专家与您联系，您可以在咨询列表中查看专家回复的信息");
					$("#mb_msgicon").css("background", 'url("images/sign_icon_chenggong_nor.png") 0% 0% / contain');
				}
			},
			error: function() {
	}
	/*判断是否是专家*/
	$.ajax({
			url: "/ajax/professor/auth",
			type: "GET",
			timeout: 10000,
			dataType: "json",
			data: {
				"id": userid,
			},
			success: function(data, textState) {
				if(data.success) {
					var $rta=data.data;
					if($rta.authType==0){
						$("#searchDemand").hide();
					}
					
		url: "/ajax/professor/auth",
		type: "GET",
		timeout: 10000,
		dataType: "json",
		data: {
			"id": userid,
		},
		success: function(data, textState) {
			if(data.success) {
				var $rta = data.data;
				if($rta.authType == 0) {
					$("#searchDemand").hide();
				}
			},
			error: function(XMLHttpRequest, textStats, errorThrown) {
			}
<<<<<<< HEAD
		})
})
=======
		},
		error: function(XMLHttpRequest, textStats, errorThrown) {
		}
	})
})
>>>>>>> refs/remotes/origin/dev

js/needShow.js

$(document).ready(function(){
	var demandId = GetQueryString("demandId");
	var consuId, demandTitle, demandContent, oDemandAim;
	loginStatus();//判断个人是否登录
	function angleDemand() {
		$.ajax({
			url: "/ajax/demand/queryOne",

js/needSure.js

$(document).ready(function() {
	var demandId = GetQueryString("demandId");
	var consuId, demandTitle, demandContent, oDemandAim;
	loginStatus();//判断个人是否登录
	
	function angleDemand() {
		$.ajax({
			url: "/ajax/demand/queryOne",

js/news-list.js

					newsname = data.data;
					//console.log(newsname);
					$.MsgBox.Alert("消息","文章发表成功！");	
					$("#mb_msgicon").css("background", 'url("images/sign_icon_chenggong_nor.png") 0% 0% / contain');
					newslist();
					$(".blackcover").remove();
					UE.delEditor('editor');

js/newsciresource.js

								$("body").css("position", "");
								getDataResource();
								$.MsgBox.Alert("消息", "资源发布成功");
								$("#mb_msgicon").css("background", 'url("images/sign_icon_chenggong_nor.png") 0% 0% / contain');
								UE.delEditor('editor');
							} else {
								$.MsgBox.Alert("消息", "资源发布失败");

js/sciresource.js

													$(".blackcover").remove();
													$("body").css("position","");												
													getDataResource();
													$.MsgBox.Alert("消息","资源发布成功");										
													$.MsgBox.Alert("消息","资源发布成功");
													$("#mb_msgicon").css("background", 'url("images/sign_icon_chenggong_nor.png") 0% 0% / contain');
											} 
											else 
											{
							$("body").css("position","");
							getDataResource();
							$.MsgBox.Alert('message',"报价成功");
							$("#mb_msgicon").css("background", 'url("images/sign_icon_chenggong_nor.png") 0% 0% / contain');
						} else {
							$.MsgBox.Alert('message',data.msg);
						}
							$("body").css("position","");
							getDataResource();
							$.MsgBox.Alert('message',"报价成功");
							$("#mb_msgicon").css("background", 'url("images/sign_icon_chenggong_nor.png") 0% 0% / contain');
						} else {
							$.MsgBox.Alert('message',data.msg);
						}
				 
					$.MsgBox.Confirm("消息", "确定支付吗？",getPay);
					 $.MsgBox.Alert('消息',"此次付款成功!");	
					 $("#mb_msgicon").css("background", 'url("images/sign_icon_chenggong_nor.png") 0% 0% / contain');
					
			 }
			 if(aa>bb){
									getPageData(6,1,false);
									$(".blackcover").remove();
									$("body").css("position","");
									$.MsgBox.Alert('消息',"资源申请信息修改成功");									
									$.MsgBox.Alert('消息',"资源申请信息修改成功");	
									$("#mb_msgicon").css("background", 'url("images/sign_icon_chenggong_nor.png") 0% 0% / contain');
								} else {
									$.MsgBox.Alert('消息',"资源申请信息修改失败");
								}

js/search.js

													'资源"' +
													resName +
													'"申请发送成功!');
											$("#mb_msgicon").css("background", 'url("images/sign_icon_chenggong_nor.png") 0% 0% / contain');
											$(".blackcover")
												.remove();
											$("body")

js/settings/account-binding.js

		success: function(data) {
			//console.log(data)
			$.MsgBox.Alert('消息提醒', '邮箱绑定成功')
			$("#mb_msgicon").css("background", 'url("images/sign_icon_chenggong_nor.png") 0% 0% / contain');
			var emaild = data.data.email;
			emailhome(emaild);
			$.cookie('userEmail', emaild, {
						});
						$(".cover2").hide();
						$.MsgBox.Alert("消息提醒", "手机绑定成功!");
						$("#mb_msgicon").css("background", 'url("images/sign_icon_chenggong_nor.png") 0% 0% / contain');
						location.reload(true);
					} else {
						$.MsgBox.Alert("消息提醒", "短信验证不正确，请检查后重新输入。");

js/settings/modify-password.js

						$.MsgBox.Confirm("消息提醒", "设置成功,请重新登录",function(){
							location.href="login.html";
						});
						$("#mb_msgicon").css("background", 'url("images/sign_icon_chenggong_nor.png") 0% 0% / contain');
					} else {
						$.MsgBox.Alert("消息提醒", "设置失败,请检查密码是否正确!");
					}

js/upload.js

		success:function(data){ 
			if(data.success) {
				$.MsgBox.Alert("消息提醒","认证图片上传成功");
				$("#mb_msgicon").css("background", 'url("images/sign_icon_chenggong_nor.png") 0% 0% / contain');
				window.location.href="account-set.html?set=3"; 
			}
		},

needList.html

                <div class="tcdPageCode getConsultPage"></div>
            </div>
        </div>
        <div class="workmysrc workmysrc3" id="getReply"> <!--displayNone-->
             <div class="workmenubox clearfix">
             	<div class="workmenufrm floatL">
             		<span class="frmtype frmbtn" id="needIssueBtn" style="padding:4px 24px;">发布新需求</span>
             	</div>
                <form class="workmenufrm floatR">
                   <div class="workselectbox floatL replySelect selcet1"> 
                    	<input id="replySelectId" type="text" value="0" style ="display:none;"/>
                        <span id="showStatus2" class="workselectmenu" tip="0">全部</span>
                        <div class="replyOption option1" style="display:none;">
	                        <ul id="downbox" class="workdropdown" > 
	                            <li  class=" workcurrent" tip="0">全部</li> 
	                            <li  class="" tip="1">发布中</li> 
	                             <li  class="" tip="2">已关闭</li>  
	                       </ul>
                        </div>
                    </div>
                    
                   <div class="workselectbox floatL timeType selcet4">
                    	<input type="text" id="timeTypeId" value="" style="display:none;">
                        <span  id="showTimeSort" class="workselectmenu" tim="0">按最早发布时间排序</span>
                        <div class="timeOption option4" style="display:none;">
	                        <ul id="downbox1" class="workdropdown workdropdown2" > 
	                            <li tim="0" class="cur workcurrent">按最早发布时间排序</li> 
	                            <li tim="1" class="cur">按最新发布时间排序</li> 
	                       </ul>
                        </div>
                       
                    </div>
                    
                    <input id="timeSortId2" type="text" value="0" style ="display:none;">
                
                </form>
             </div>   
             
            <div class="workselectcon" id="wode">
                <div id="workContainer2">
                	<div class='workselectitem'>
					  <table width='100%'><tbody><tr>
							<td style='position:relative;top:20px;'>
								<div class='workinfor worksitcon'>
									<h4><div class='titList h4Font' style="width:620px">XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX（需求主题）data[i]["consultTitle"]</div></h4>
									<h6 style='position:relative;'>
										<div class="clearfix">
											<div class="floatL">
												发布时间：<span class='lasttime'>2017年3月3日 14:40 </span>
											</div>
											<!--关闭之后显示-->
											<div class="floatL displayNone" style="margin-left:40px;">
												关闭时间：<span class='lasttime'>2017年3月3日 18:40 </span>
											</div>
										</div>
										<p class='rebackcon lastReplyCon' style="width: 860px;" >XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX（需求内容）lastReplyFn(userid,data[i]["consultId"])["lastReplyCon"]</p>
									</h6>
								</div>
								<div class='workhandle'>
									<div class='rightopert floatR'>
										<span class='replybtn'>查看
										</span>
									</div>
									<div class='leftstate floatR'>
										<span class='coultstate status-1'><i>发布中</i></span>
									</div>
									<div class='leftstate floatR'>
										<span class='coultstate status-4'><i>技术咨询</i></span>
									</div>
									<div class='leftstate floatR'>
										<span class='coultstate coulstAim status-4'><i>企业需求</i></span>
									</div>
								</div>
							</td>
						</tr></tbody></table>
					</div>
                </div>
                <div class="tcdPageCode getReplyPage"></div>
            </div>
        </div>
        
    </div>
</div>