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

Conflicts:
	js/workindex.js

cmp-portal/cmp-pwdReset02.html

@@ -58,10 +58,14 @@ $(function(){
	var companyEmailVal = GetQueryString("companyEmailVal");
	$("#emailShow").text(companyEmailVal);
	$("#emailGo").on("click", function(){
		 var url = companyEmailVal.split('@')[1];
		var url = companyEmailVal.split('@')[1];
        for (var j in hash){  
            $(this).attr("href", hash[url]); 
            location.href=hash[url]; 
            if(hash[url]==undefined){
        		location.href="http://mail." + url; 	
        	}else{
        	 	$(this).attr("href", hash[url]); 
            	location.href=hash[url]; 	
        	}
        }  
	});
})

cmp-portal/cmp-settled-active.html

@@ -50,9 +50,13 @@ $(function(){
	$("#emailShow").text(companyEmailVal);
	$("#emailGo").on("click", function(){
		 var url = companyEmailVal.split('@')[1];
        for (var j in hash){  
            $(this).attr("href", hash[url]); 
            location.href=hash[url]; 
        for (var j in hash){
        	if(hash[url]==undefined){
        		location.href="http://mail." + url; 	
        	}else{
        	 	$(this).attr("href", hash[url]); 
            	location.href=hash[url]; 	
        	}
        }  
	});
})

cmp-portal/cmp-workspaces.html

@@ -33,8 +33,10 @@
			        <div class="workconleft floatL">
			            <!--企业信息、相关记录-->
			            <div class="workblock clearfix">
			            	<div class="leftlogo boxBlock cmplogo headRadius floatL">
			            		<img class="boxBlockimg headRadius" src="" id="oimg"/>
			            	<div class="leftlogo floatL cmplogo">
			            		<div class="boxBlock headRadius" style="height:140px;width: 140px;">
				            		<img class="boxBlockimg headRadius" style="max-width: 140px;" src="" id="oimg"/>
				            	</div>
			            	</div>
							<div class="rightinfo cmpinfo floatL">
			            		<div class="h1Font"><span></span><em class="authicon" id="photoClass"></em></div>

cmp-portal/css/cmpindex.css

@@ -1,14 +1,15 @@
@charset "utf-8";
/* CSS Document */
body,html{/*background: #f4f6f8;*/}
.con-center{padding:20px 10px 40px; margin:10px auto;}
/*左侧菜单*/
.workmenu{text-align: center; float:left; width:12%; height:300px; background: #fafafa;border-radius: 6px;overflow: hidden;}
.workmenu{text-align: center; float:left; width:12%; height:300px; background: #FAFAFA;border-radius: 6px;overflow: hidden;}
a.workmenutit{height: 60px;padding: 0 20px;font-size:16px;line-height:60px; border-bottom:1px #28b8fa solid;cursor:pointer; display: block;color:#313131; }
a.worksubmenu{width:100%; height:40px; margin:10px 0;font-size:15px;line-height:40px; color:#313131;display: block;}
a.worksubmenu.cmpBg{color: #FFFFFF;}
/*右侧内容*/
.workcon{float:right; margin-left:10px; width:87%; background: #fafafa;border-radius:6px;overflow: hidden;}
.workcon{float:right; margin-left:10px; width:87%; background: #FAFAFA;border-radius:6px;overflow: hidden;}
.worksubcon{ padding:20px 16px;}
.workconleft{width:70%;}
.workcontit{height: 60px;padding: 0 20px;font-size:16px;line-height:60px;color: #606060; border-bottom:1px solid #e7e7e7;}
@@ -181,7 +182,8 @@ img.loading{position: absolute;left:50%;top:30%}
input.uploadInp[type="file"]{position:absolute;height: 40px;width: 100%;top: 0;outline: none;opacity: 0;cursor: pointer;}
.uploadInp .webuploader-pick{background: #28b8fa; height: 40px;width: 100%;line-height: 30px;margin: 0;}
.uploadInp .webuploader-element-invisible{height:40px}
.boxBlock.uploader-list{width: 140px; height:140px;background: #e8e8e8;;}
.boxBlock.uploader-list{width: 140px; height:140px;background: #e8e8e8;}
.boxBlock.uploader-list .boxBlockimg{max-width: 140px;}
.cmpFrmList{padding:10px 0;}
.cmpFrmList>li{position: relative;clear:both;margin:4px 0;padding:6px 0;}
@@ -282,6 +284,6 @@ ul.cmpAllUl.cmpArticalul.cmpArticalul2{width: 97%;margin:10px;}
.rightRequ .requiredcon{top:2px; right:-6px;left:auto;}
.uploderArt{position:absolute;width:200px;top:0px;right:-208px;text-align: center;}
.uploderArt .uploadInpArt{cursor:pointer;width: 100%;z-index: 10;color:#EFEFEF;}
.uploderArt .imgBlock{position: relative;width: 140px;margin: auto;}
.uploderArt .imgBlock{position: relative;width: 140px;margin: auto;overflow: hidden;}
.uploderArt .smalltip{line-height: 16px;}
.cmpArticalFrm .deleteFont{cursor:pointer;position:absolute; right:20px;top:40px;color: #FF0000;}

cmp-portal/css/common.css

@@ -564,7 +564,7 @@ button.btnModelBig:hover{
.modelClosebtn{position:absolute; top:0; right:-50px; display:block; width:20px; height:20px; background:url(../../images/workclose.png) center center no-repeat; padding:20px;cursor:pointer; z-index:1055;}  
.modelOpen{overflow: hidden;}
/*图片在容器中无变形居中显示*/
/*图片在容器中无变形居中显示*//*display: table;table-layout: fixed;*/
.boxBlock{width:200px; height:200px;display: table-cell;vertical-align:middle; text-align:center;overflow: hidden;}
.boxBlockimg{max-width: 100%;max-height: 100%;vertical-align:middle;height:auto !important; overflow-y:auto;}
@@ -608,7 +608,7 @@ button.btnModelBig:hover{
.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{position: absolute;right:0; left: 0;bottom:0;background: #373d41;color:#888;font-size:14px;line-height:30px;}
footer .containerCon{background: #373d41;}
footer a{color:#888;text-decoration: none;}
footer p .listlink{margin-right:25px;color:#888;}
@@ -634,12 +634,13 @@ header .topheader{background: #000;height:30px;font-size:14px;line-height:30px;}
header .topheader .containerCon{background: #000;}
header .topheader a{padding:0 10px;margin-right:16px;color:#FFFFFF}
header .topheader .downicon{background: url(../images/top_icon_shouji_nor.png) 0 center no-repeat;padding-left:18px;}
header .headlogo h1 {width: 60px;height: 30px;margin:14px 14px 14px 0;padding: 0;background-image: url(../images/home_icon_logo2.png);background-size:contain;overflow: hidden;}
header .headlogo h1 {width: 60px;height: 30px;margin:14px 14px 14px 0;padding: 0;background-image: url(../images/home_icon_cmplogo.png);background-size:contain;overflow: hidden;}
header .headnav{margin:0 14px;}
header .headnav li{float:left;margin:0 4px; padding:12px 0;}
header .headnav li a{ color:#FFFFFF; padding:14px 18px;}
header .headuser{overflow: hidden;border:1px solid #222222; width: 40px;height: 40px;margin:10px 0 10px 20px;cursor: pointer;}
header .headuserimg{position:relative;}
header .headuserimg{position:relative;padding: 10px 0 10px 20px; width: 60px;height: 60px;}
header .headuser{overflow: hidden;border:1px solid #222222; width: 40px;height: 40px;display: table-cell; vertical-align:middle; text-align:center;cursor: pointer;}
header .headuser img{max-width: 40px;max-height: 100%;vertical-align:middle;height:auto !important; overflow-y:auto;}
header .headnavbtn{margin:14px 6px;}
header .headnavbtn a{color:#FFFFFF;}
header .headnavbtn li{float:right;margin:0 6px;}

cmp-portal/js/cmp-articalList.js

@@ -121,6 +121,7 @@ $(function() {
					newsname = data.data;
					console.log(newsname);
					$.MsgBox.Alert("消息", "文章发表成功！");
					$("#mb_msgicon").css("background", 'url("images/sign_icon_chenggong_nor.png") 0% 0% / contain');
					newslist();
					UE.delEditor('editor');
					BombBoxlClose();

cmp-portal/js/cmp-setBind.js

@@ -102,8 +102,12 @@ $(function() {
						$("#emailGo").on("click", function() {
							var url = companyEmailVal.split('@')[1];
							for(var j in hash) {
								$(this).attr("href", hash[url]);
								window.open(hash[url]);
								if(hash[url]==undefined){
					        		window.open("http://mail." + url);
					        	}else{
					        	 	$(this).attr("href", hash[url]);
									window.open(hash[url]);
					        	}
							}
							location.reload(true);
						});

cmp-portal/js/cmp-setPwd.js

@@ -83,6 +83,7 @@ $(function() {
					console.log($data)
					if($data.data) {
						$.MsgBox.Alert('提示', '密码修改成功！');
						$("#mb_msgicon").css("background", 'url("images/sign_icon_chenggong_nor.png") 0% 0% / contain');
						$("#cmpAllUl input").val("");
						$("#newpwdSubmit").attr("disabled", true);
					}else{

cmp-portal/js/cmp-updateinfo.js

@@ -65,9 +65,11 @@ $(document).ready(function() {
							case '5':
								$("#qualificationList").find("li").eq(4).addClass("cmpBg listactive")
								break;
							default:
							case '6':
								$("#qualificationList").find("li").eq(5).addClass("cmpBg listactive")
								break;
							default:
								break;
						}
					}
					if($data.orgType) {
@@ -88,9 +90,11 @@ $(document).ready(function() {
							case '6':
								$("#orgType").find("li").eq(4).addClass("cmpBg listactive")
								break;
							default:
							case '7':
								$("#orgType").find("li").eq(5).addClass("cmpBg listactive")
								break;
							default:
								break;
						}
					}
					if($data.industry) {
@@ -193,7 +197,7 @@ $(document).ready(function() {
		})
		/*保存*/
	$("button:contains('保存')").click(function() {
			var oBusinessAbbreviation = $("#businessAbbreviation").val().trim();
			/*var oBusinessAbbreviation = $("#businessAbbreviation").val().trim();
			var oTextArea = $("textarea").val().trim();
			var oBusinessType = $("#orgType").find("li.cmpBg.listactive").length;
			var oBusinessDimensions = $("#qualificationList").find("li.cmpBg.listactive").length;
@@ -231,9 +235,7 @@ $(document).ready(function() {
			if(oEditUlistCNumber == 0) {
				$.MsgBox.Alert('提示', '企业资质必填一项');
				return;
			}
			/*					
			fn: 企业logo上传临时文件名 NULL 字符串*/
			}*/
			var tex = $("#orgType").find("li.cmpBg.listactive").text();
			var oTextGui = $("#qualificationList").find("li.cmpBg.listactive").text();
			var $info = {};
@@ -258,9 +260,11 @@ $(document).ready(function() {
				case '外资企业':
					$info.orgType = 6;
					break;
				default:
				case '初创企业':
					$info.orgType = 7;
					break;
				default:
					break;
			}
			switch(oTextGui) {
				case '50人以内':
@@ -278,9 +282,11 @@ $(document).ready(function() {
				case '500-1000人':
					$info.orgSize = 5;
					break;
				default:
				case '1000人以上':
					$info.orgSize = 6;
					break;
				default:
					break;
			}
			if($("#inteAddress").val().trim()) {
				$info.orgUrl = $("#inteAddress").val();
@@ -376,9 +382,7 @@ $(document).ready(function() {
	});
	/*取消*/
	$("#Ocancel").click(function() {
			fileId = null;
			cacheImageKey = null;
			companyInformation();
			location.href="cmp-workspaces.html"
		})
		/*选择城市*/
		/*选择城市填充js	*/

cmp-portal/js/cmp-workspaces.js

@@ -52,10 +52,14 @@ $(document).ready(function() {
							case '6':
								otext = "外资企业";
								break;
							default:
							case '7':
								otext = "初创企业";
								break;
							default:
								otext = "";
								break;
						}
						if(otext != "")
						$("#cmpBasic").append("<span>" + otext + "</span>")
					}
					if($data.orgSize) {
@@ -75,10 +79,14 @@ $(document).ready(function() {
							case '5':
								oguimo = "500-1000人";
								break;
							case '6':
								oguimo = "500-1000人";
								break;
							default:
								oguimo = "1000人以上";
								oguimo = "";
								break;
						}
						if(oguimo!="")
						$("#cmpBasic").append("<span>" + oguimo + "</span>")
					}
					if($data.foundTime) {

cmp-portal/js/companybrowinfor.js

@@ -96,9 +96,11 @@ $(document).ready(function() {
							case '5':
								$("#qualificationList").text("500-1000人")
								break;
							default:
							case '6':
								$("#qualificationList").text("1000人以上")
								break;
							default:
								break;
						}
					} else {
						$("#qualificationList").remove();
@@ -120,10 +122,14 @@ $(document).ready(function() {
							case '6':
								$("#orgType").text("外资企业");
								break;
							default:
							case '7':
								$("#orgType").text("初创企业");
								break;
							default:
								break;
						}
					}else{
						$("#orgType").remove();
					}
					if($data.industry) {
						indu($data.industry, '#industryShow')
@@ -225,7 +231,7 @@ $(document).ready(function() {
			}
			var oString = '<dd>'
			oString += '<div class="staffChild">'
			oString += '<img class="headRadius" src="' + img + '" width="100%" />'
			oString += '<img class="headRadius" src="' + img + '" width="100%" data-id="'+arr[i].id+'" style="cursor:pointer"/>'
			oString += '</div><div class="h4Font"><span>' + arr[i].name + '</span></div>'
			oString += '<div class="h4Font">' + tiof + '</div></dd>'
			$("#userList").append(oString);
@@ -270,5 +276,11 @@ $(document).ready(function() {
		error: function() {
			return;
		}
	});
	/*点击企业员工头像跳转个人浏览页面*/
	$("#userList").on("click","img",function(){
		var dataId=$(this).attr("data-id");
		console.log(dataId)
		location.href="information-brow.html?professorId="+dataId;
	})
})

cmp-portal/js/public/cmpFooter.js

@@ -11,7 +11,7 @@ footerHtml += '<div class="container-fulid">'+
								'<p>' +
									'<a class="listlink" href="javascript:void(0);" target="_blank" rel="nofollow">关于我们</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="javascript:void(0);"  rel="nofollow" id="perso">我是专家</a>' +
									'<a class="listlink" href="../privacy.html" target="_blank" rel="nofollow">用户协议</a>' +
									'<a class="listlink" href="../download.html" target="_blank" rel="nofollow">产品下载</a>' +
								'</p>' +
@@ -55,5 +55,12 @@ $(function(){
			location.href="cmp-settled-reg.html"
		}
	})
	$("#perso").click(function(){
	var userid = $.cookie('userid');
if(userid=="null"||userid==undefined){
			location.href="login.html";
		}
	location.href="../expert-authentication.html";
})
})

cmp-portal/js/public/cmpHeader.js

@@ -23,7 +23,7 @@
								//已登录状态
								'<div class="onlogin floatR displayNone">'+
									'<div class="headuserimg floatR">'+
											'<div class="headuser headRadius"><img src="../images/default-icon.jpg" width="100%" id="imglogo" /></div>'+
											'<div class="headuser headRadius"><img src="../images/default-icon.jpg" id="imglogo" /></div>'+
											'<div class="comuserSelf displayNone">' +
					                '<div class="triangleB"></div>'+
					                '<div class="personal-box bgRadius">'+

css/common.css

@@ -121,7 +121,7 @@ button.btnModel[disabled]:hover{background:#d6d8de;}
#header.firstL{ background:rgba(255,153,0,0);}
#header.firstB{ background:rgba(55,61,65,1);}
#header.Nosear{position:static;}
.logo{ display:block; width:80px; height:40px; background:url(../images/logo.png) no-repeat;background-size:100% 100%; /* margin-left:80px;*/ margin-top:10px; float:left;}
.logo{ display:block; width:60px; height:30px;margin:14px 14px 14px 0; background:url(../images/logo.png) no-repeat;background-size:100% 100%; float:left;}
.searchblock{ width:280px; height:35px; position:absolute; left:50%; top:50%; margin-left:-140px; margin-top:-17.5px;}
.search-txt{ width:220px;line-height:35px; height:35px; background:#fff; border:none;-moz-border-radius:6px 0 0 6px;-webkit-border-radius:6px 0 0 6px; border-radius:6px 0 0 6px; behavior:url(../js/ie-css3.htc); float:left;font-size:14px;padding-left:10px; color:#a3a3a3;}
.search-btn{ width:35px; height:35px; background:#fff; border-radius:0 6px 6px 0;-moz-border-radius:0 6px 6px 0;-webkit-border-radius:0 6px 6px 0; float:left; cursor:pointer; behavior:url(../js/ie-css3.htc);cursor:pointer;}
@@ -197,8 +197,8 @@ button.btnModel[disabled]:hover{background:#d6d8de;}
/*/////////// 专家认证图标 //////////////*/
.authobject{ float:left;}
.authicon{ float:left;width:18px; height:18px; background:url(../images/authsort2.png) no-repeat;}
.authicon-cu{background-position: 0 0;background-size:auto 100%;}/*认证科研型专家*/
.authicon{ float:left;width:16px; height:16px;background-size: cover;}
.authicon-cu{background-image: url(../images/porfile_icon_zhuanjia_nor.png);}/*认证科研型专家*/
.authicon-com{background-position: -20px 0;background-size:auto 100%;}/*认证企业型专家*/
/*/////////// 普通用户认证标识 //////////////*/
.authicon2{float:left;position:relative;width:60px; height:20px;margin: 0;background:url(../images/authsort.png) no-repeat;}
@@ -273,7 +273,7 @@ footer .weixincode span{background-image:url(../images/home_code_weixin.jpg);bac
/*新版header*/
header{background: #373d41;color:#888;font-size:16px;line-height:32px;height:60px;}
header .containerCon{background: #373d41;}
header .headlogo h1 {width: 64px;height: 32px;margin:14px 14px 14px 0;padding: 0;background-image: url(../images/home_icon_logo_orange.png);background-size:contain;overflow: hidden;}
header .headlogo h1 {width: 60px;height: 30px;margin: 14px 14px 14px 0;padding: 0;background-image: url(../images/home_icon_logo_orange.png);background-size:contain;overflow: hidden;}
header .headnav{margin:0 14px;}
header .headnav li{float:left;margin:0 4px; padding:12px 0;}
header .headnav li a{ color:#FFFFFF; padding:14px 18px;}

css/genindex.css

@@ -1,16 +1,17 @@
@charset "utf-8";
/* CSS Document */
html,body{background: #f4f6f8;}
.con-center{padding:20px 10px 40px; margin:10px auto;}
/*左侧菜单*/
.workmenu{text-align: center; float:left; width:12%; height:300px; background: #fafafa;border-radius: 6px;overflow: hidden;}
a.workmenutit{height: 60px;padding: 0 20px;font-size:16px;line-height:60px; border-bottom:1px #28b8fa solid;cursor:pointer; display: block;color:#313131; }
a.worksubmenu{width:100%; height:40px; margin:10px 0;font-size:15px;line-height:40px; color:#313131;display: block;}
a.worksubmenu.cmpBg{color: #FFFFFF;}
/*.workmenu{text-align: center; float:left; width:12%; height:300px; background: #fafafa;border-radius: 6px;overflow: hidden;}
a.workmenutit{height: 60px;padding: 0 20px;font-size:16px;line-height:60px; border-bottom:1px #28b8fa solid;cursor:pointer; display: block;color:#313131; }
a.worksubmenu{width:100%; height:40px; margin:10px 0;font-size:15px;line-height:40px; color:#313131;display: block;}
a.worksubmenu.cmpBg{color: #FFFFFF;}*/
/*右侧内容*/
.workcon{float:right; margin-left:10px; width:87%; background: #fafafa;border-radius:6px;overflow: hidden;}
.worksubcon{ padding:20px 16px;}
/*.workcon{float:right; margin-left:10px; width:87%; background: #fafafa;border-radius:6px;overflow: hidden;}
.worksubcon{ padding:20px 16px;}
.workconleft{width:70%;}
.workcontit{height: 60px;padding: 0 20px;font-size:16px;line-height:60px;color: #606060; border-bottom:1px solid #e7e7e7;}
.workcontit{height: 60px;padding: 0 20px;font-size:16px;line-height:60px;color: #606060; border-bottom:1px solid #e7e7e7;}*/
/*////////////工作台/////////////////*/
.workblock{width:100%; padding:10px; overflow:hidden; background:#fff; margin:0;margin-bottom:16px;}
@@ -98,94 +99,94 @@ a.worksubmenu.cmpBg{color: #FFFFFF;}
.workdropdown2 li{width:200px;}
/*需求查看*/
.consultdialogbox{ width:100%;padding: 20px 20px 80px 20px;color:#666;font-size:15px;line-height: 28px;}
.dialoghead{ padding:20px; border-radius:10px 10px 0 0; text-align:center; border-bottom:1px #d6d6d6 solid; background-color:#F3F3F3; position:relative;}
.dialoghead .backupbtn{ background:url(../../images/backup.png) no-repeat center center; width:24px; height:24px; padding:20px; position:absolute; top:50%; left:16px; margin-top:-16px; cursor:pointer;}
.dialoghead .dheadtit{width:680px; margin:auto; font-size: 18px;line-height: 18px; }
.dialoghead .dheadtit .dialogpro{ padding:0 10px; font-size: 20px; color:#333;}
.dialogcontain{ background:#fff; border-bottom:1px #d6d6d6 solid; position:relative;}
.dialogcontain .dialoginfo{padding: 30px 10px 20px 10px;}
.dialogcontain .dialoginfo .dialoginfotype{ padding: 1px 10px; color: #777;}
.dialogcontain .dialoginfo .dialogtit{ color: #333;font-size:15px;max-width:90%;}
.dialogcontain .dialoginfo .dialogtitTopic{ font-weight: bold;font-size:18px;max-width: 86%;}
.dialogcontain .dialoginfo .evadbox{ overflow:hidden; }
.dialogcontain .dialogstatus{ position:absolute;min-width:100px; top:-20px; right: -8px;padding: 0 60px;border-radius: 20px 0 0 20px;z-index: 2; line-height: 40px; }
.dialogcontain .dialogstatus em{position: absolute;width: 0px; height: 0px;border-top: 0px solid  #0776a9;border-bottom: 6px solid transparent;border-left: 8px solid #0776a9; border-right: 0px solid transparent;right: 0px; bottom: -5px;}
.consultBasicInfor{background: #ffffea;border-bottom:1px solid #d6d6d6;}
.consultBasic{width:50%;padding:10px 20px 20px 40px;}
.consultBasic:first-child{border-right:1px solid #d6d6d6;}
.consultBasic .workhs{width: auto;}
.consultBasic .workhs .workitimg{width:60px;}
.consultBasic .workinfor{width: auto;width:64%;padding:5px 16px;}
.consultBasic .workinfor .h1Font{font-size:18px;}
.consultBasic .workinfor h5{font-size:14px;}
.cBasicTit{font-size:16px;line-height:30px;text-align: center;}
.basicBtn{text-align: center;padding:80px 10px 60px 10px; background-color:#FFFFFF;}
.basicBtn span{padding:8px 40px;border-radius:6px;font-size: 15px;margin:4px;cursor: pointer;}
.basicBtn span.closeBtn{border:none;color:#FF0000}
/*.consultdialogbox{ width:100%;padding: 20px 20px 80px 20px;color:#666;font-size:15px;line-height: 28px;}
.dialoghead{ padding:20px; border-radius:10px 10px 0 0; text-align:center; border-bottom:1px #d6d6d6 solid; background-color:#F3F3F3; position:relative;}
.dialoghead .backupbtn{ background:url(../../images/backup.png) no-repeat center center; width:24px; height:24px; padding:20px; position:absolute; top:50%; left:16px; margin-top:-16px; cursor:pointer;}
.dialoghead .dheadtit{width:680px; margin:auto; font-size: 18px;line-height: 18px; }
.dialoghead .dheadtit .dialogpro{ padding:0 10px; font-size: 20px; color:#333;}
.dialogcontain{ background:#fff; border-bottom:1px #d6d6d6 solid; position:relative;}
.dialogcontain .dialoginfo{padding: 30px 10px 20px 10px;}
.dialogcontain .dialoginfo .dialoginfotype{ padding: 1px 10px; color: #777;}
.dialogcontain .dialoginfo .dialogtit{ color: #333;font-size:15px;max-width:90%;}
.dialogcontain .dialoginfo .dialogtitTopic{ font-weight: bold;font-size:18px;max-width: 86%;}
.dialogcontain .dialoginfo .evadbox{ overflow:hidden; }
.dialogcontain .dialogstatus{ position:absolute;min-width:100px; top:-20px; right: -8px;padding: 0 60px;border-radius: 20px 0 0 20px;z-index: 2; line-height: 40px; }
.dialogcontain .dialogstatus em{position: absolute;width: 0px; height: 0px;border-top: 0px solid  #0776a9;border-bottom: 6px solid transparent;border-left: 8px solid #0776a9; border-right: 0px solid transparent;right: 0px; bottom: -5px;}
.consultBasicInfor{background: #ffffea;border-bottom:1px solid #d6d6d6;}
.consultBasic{width:50%;padding:10px 20px 20px 40px;}
.consultBasic:first-child{border-right:1px solid #d6d6d6;}
.consultBasic .workhs{width: auto;}
.consultBasic .workhs .workitimg{width:60px;}
.consultBasic .workinfor{width: auto;width:64%;padding:5px 16px;}
.consultBasic .workinfor .h1Font{font-size:18px;}
.consultBasic .workinfor h5{font-size:14px;}
.cBasicTit{font-size:16px;line-height:30px;text-align: center;}
.basicBtn{text-align: center;padding:80px 10px 60px 10px; background-color:#FFFFFF;}
.basicBtn span{padding:8px 40px;border-radius:6px;font-size: 15px;margin:4px;cursor: pointer;}
.basicBtn span.closeBtn{border:none;color:#FF0000}*/
/*员工列表*/
.staffemail{width: 300px;padding-left:10px;}
.staffMana{margin:10px 4px;padding:10px; border:1px solid #D0D0D0;}
.staffMana li{ width: 48%;float:left;padding:10px;border:1px dashed #a6a6a6;margin:6px 1%;border-radius: 6px;}
.staffMana li .leftlogo{ margin: 8px 0;}
.staffinfo{width: 84%;padding-right: 40px;}
.staffinfo .btnPosition{right:-8px;}
.stafffrm{padding:2px 8px;}
.staffTip{background: #f5f5f5;padding: 10px;}
/*.staffemail{width: 300px;padding-left:10px;}
.staffMana{margin:10px 4px;padding:10px; border:1px solid #D0D0D0;}
.staffMana li{ width: 48%;float:left;padding:10px;border:1px dashed #a6a6a6;margin:6px 1%;border-radius: 6px;}
.staffMana li .leftlogo{ margin: 8px 0;}
.staffinfo{width: 84%;padding-right: 40px;}
.staffinfo .btnPosition{right:-8px;}
.stafffrm{padding:2px 8px;}
.staffTip{background: #f5f5f5;padding: 10px;}*/
/*企业信息浏览*/
.mainHead{background: #fafafa;padding:20px;margin:0 auto 10px;border-radius: 6px;}
.cmpLogoblock div{width: 180px;height: 180px;margin:auto;overflow: hidden;}
.menublock{height:420px;}
.subsidebar{cursor: pointer;}
.right-box{padding:8px;}
.right-title{ position:relative; overflow:hidden;}
.right-title span{font-size:20px;line-height:30px;}
.infor-browse{padding:0 16px;}
.infoList{ overflow: hidden;padding:6px 0;}
.infoList li{margin:4px;position: relative;overflow: hidden;}
.industryList li{padding-left: 10px;}
.industryList li:before{content: ' '; background: #666;display: block;width: 4px;height: 4px;border-radius: 50%; position: absolute;top:8px;left:0;}
.areaList{overflow: hidden;}
.areaList li{float:left;padding:6px 20px;border:1px solid #D6D6D6; border-radius:6px;}
.needTopic{ display:inline-table; max-width:76%;}
.needAim{margin-left:20px;}
.cmpStaff dl{width:100%;float:none;margin-right:-4%;}
.cmpStaff dd{max-width:120px;text-align: center;margin:2% 2.9% 1% 0;}
.cmpStaff dd .staffChild{width:80px;margin:auto}
/*.mainHead{background: #fafafa;padding:20px;margin:0 auto 10px;border-radius: 6px;}
.cmpLogoblock div{width: 180px;height: 180px;margin:auto;overflow: hidden;}
.menublock{height:420px;}
.subsidebar{cursor: pointer;}
.right-box{padding:8px;}
.right-title{ position:relative; overflow:hidden;}
.right-title span{font-size:20px;line-height:30px;}
.infor-browse{padding:0 16px;}
.infoList{ overflow: hidden;padding:6px 0;}
.infoList li{margin:4px;position: relative;overflow: hidden;}
.industryList li{padding-left: 10px;}
.industryList li:before{content: ' '; background: #666;display: block;width: 4px;height: 4px;border-radius: 50%; position: absolute;top:8px;left:0;}
.areaList{overflow: hidden;}
.areaList li{float:left;padding:6px 20px;border:1px solid #D6D6D6; border-radius:6px;}
.needTopic{ display:inline-table; max-width:76%;}
.needAim{margin-left:20px;}
.cmpStaff dl{width:100%;float:none;margin-right:-4%;}
.cmpStaff dd{max-width:120px;text-align: center;margin:2% 2.9% 1% 0;}
.cmpStaff dd .staffChild{width:80px;margin:auto}*/
/*修改企业信息*/
.uploadlogo{position:relative;background: rgba(40,184,250,.8); color:#FFFFFF;padding:8px 0;}
input.uploadInp[type="file"]{position:absolute;height: 40px;width: 100%;top: 0;outline: none;opacity: 0;cursor: pointer;}
.cmpFrmList{padding:10px 0;}
.cmpFrmList>li{position: relative;clear:both;margin:4px 0;padding:6px 0;}
.cmpFrmList>li:before,.cmpFrmList>li:after{display:table;content:" "}
.cmpFrmList>li:after{clear: both;}
.ulspace{padding:10px 0;}
.ulspace li{margin:4px;padding:6px 10px;text-align: center;border-width:1px;border-style:solid;border-color:#D6D6D6;border-radius:6px;}
.enterpriseType li{width:31%;float:left;}
.enterpriseType li.listactive{border-color:#28b8fa;}
.enterpriseType li.listactive:before{content:"";display:inline-block;width:14px;height:14px;margin-right:3px;background-image:url(../images/con_icon_selected.png);background-size:contain;overflow:hidden;}
.editUlist li{float:left; position:relative;padding:4px 36px 4px 10px;}
.editUlist li img{position:absolute;right:8px;top:8px;width: 12px;cursor: pointer;}
.editUlistC li{position:relative;width:96%;padding:6px 10px;margin:4px;}
.editUlistC li img{position:absolute;right:10px;top:10px;width: 12px;cursor: pointer;}
.paddingSpace{padding:0 6px;}
/*.uploadlogo{position:relative;background: rgba(40,184,250,.8); color:#FFFFFF;padding:8px 0;}
input.uploadInp[type="file"]{position:absolute;height: 40px;width: 100%;top: 0;outline: none;opacity: 0;cursor: pointer;}
.cmpFrmList{padding:10px 0;}
.cmpFrmList>li{position: relative;clear:both;margin:4px 0;padding:6px 0;}
.cmpFrmList>li:before,.cmpFrmList>li:after{display:table;content:" "}
.cmpFrmList>li:after{clear: both;}
.ulspace{padding:10px 0;}
.ulspace li{margin:4px;padding:6px 10px;text-align: center;border-width:1px;border-style:solid;border-color:#D6D6D6;border-radius:6px;}
.enterpriseType li{width:31%;float:left;}
.enterpriseType li.listactive{border-color:#28b8fa;}
.enterpriseType li.listactive:before{content:"";display:inline-block;width:14px;height:14px;margin-right:3px;background-image:url(../images/con_icon_selected.png);background-size:contain;overflow:hidden;}
.editUlist li{float:left; position:relative;padding:4px 36px 4px 10px;}
.editUlist li img{position:absolute;right:8px;top:8px;width: 12px;cursor: pointer;}
.editUlistC li{position:relative;width:96%;padding:6px 10px;margin:4px;}
.editUlistC li img{position:absolute;right:10px;top:10px;width: 12px;cursor: pointer;}
.paddingSpace{padding:0 6px;}*/
/*城市选择器*/
.citybox span{position:relative;width:96%;display:inline-block;padding:0 0 0 6px;cursor:pointer;margin:0;background:#fff;}
.citybox span .mr_show{ font-style:normal;width:100%;color:#AAAAAA;display:inline-block;height:32px;line-height:32px;position:relative;}
.citybox span .mr_sj{position: absolute;right: 10px;top: 13px;display:inline-block;height: 0;width: 0;border: 6px solid #fff;border-color: #28b8fa transparent transparent;}
.citybox span ul{width:98%;border-radius:0 0 5px 5px;position:absolute;border:1px solid #E8E8E8;background:#fff;left:-1px;top:32px;margin-bottom:10px;display:none;z-index:10;max-height:280px; overflow:auto;}
.citybox span ul li{width:100%;float:left;overflow:hidden;border-top:1px solid #E8E8E8;}
.citybox span ul li:first-child{border-top:0;}
.citybox span ul li a{display:block;height:30px;line-height:30px;padding:0 8px;color:#494949;}
/*.citybox span{position:relative;width:96%;display:inline-block;padding:0 0 0 6px;cursor:pointer;margin:0;background:#fff;}
.citybox span .mr_show{ font-style:normal;width:100%;color:#AAAAAA;display:inline-block;height:32px;line-height:32px;position:relative;}
.citybox span .mr_sj{position: absolute;right: 10px;top: 13px;display:inline-block;height: 0;width: 0;border: 6px solid #fff;border-color: #28b8fa transparent transparent;}
.citybox span ul{width:98%;border-radius:0 0 5px 5px;position:absolute;border:1px solid #E8E8E8;background:#fff;left:-1px;top:32px;margin-bottom:10px;display:none;z-index:10;max-height:280px; overflow:auto;}
.citybox span ul li{width:100%;float:left;overflow:hidden;border-top:1px solid #E8E8E8;}
.citybox span ul li:first-child{border-top:0;}
.citybox span ul li a{display:block;height:30px;line-height:30px;padding:0 8px;color:#494949;}*/
/*日期选择器*/
.input-append.date .dateIcon{position:absolute;right:14px; top:6px;}
/*.input-append.date .dateIcon{position:absolute;right:14px; top:6px;}*/
/*////////////个人设置/////////////////*/
a.workmenutit.accouttit{cursor: text;color: #a3a3a3;}
/*a.workmenutit.accouttit{cursor: text;color: #a3a3a3;}*/
ul.cmpAllUl{width:50%;margin:60px auto 20px;}
ul.cmpAllUl li{position:relative;clear:both;padding:6px 0;}
ul.cmpAllUl li:before,ul.cmpAllUl li:after{display:table;content:" "}

discover.html

@@ -10,9 +10,7 @@
<link type="text/css" href="css/common.css" rel="stylesheet">
<link type="text/css" href="css/genindex.css" rel="stylesheet">
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
<style type="text/css">
	html,body{background: #f4f6f8;}
</style>
</head>
<body>
@@ -28,10 +26,7 @@
			</div>
			<div class="advertBox floatR">
				<ul class="advertItem">
					<li><img src="images/banner/banner01.jpg" /></li>
					<li><img src="images/banner/banner01.jpg" /></li>
					<li><img src="images/banner/banner01.jpg" /></li>
					<li><img src="images/banner/banner01.jpg" /></li>
					<li><img src="images/find_img_xiazai_nor.png" /></li>
				</ul>
			</div>
		</div>

js/articalInfo.js

@@ -40,7 +40,8 @@ $(document).ready(function() {
			success: function(data) {
				var $info = data.data || {};
				if(data.success && data.data) {
					var oTime = $info.createTime.substring(0, 4) + "." + $info.createTime.substring(4, 6) + "." + $info.createTime.substring(6, 8) 
					//var oTime = $info.createTime.substring(0, 4) + "." + $info.createTime.substring(4, 6) + "." + $info.createTime.substring(6, 8) 
					var oTime=timeGeshi($info.createTime);
					$("#creTime").text(oTime);
					$("#articleName").text($info.articleTitle);
					if($info.subject) {
@@ -177,7 +178,8 @@ $(document).ready(function() {
					$(".commentList").html("");
					$(".message").text($info.length);
					for(var i = 0; i < $info.length; i++) {
						var time = $info[i].createTime.substring(0, 4) + "年" + $info[i].createTime.substring(4, 6) + "月" + $info[i].createTime.substring(6, 8) + "日 " + $info[i].createTime.substring(8, 10) + ":" + $info[i].createTime.substring(10, 12);
						//var time = $info[i].createTime.substring(0, 4) + "年" + $info[i].createTime.substring(4, 6) + "月" + $info[i].createTime.substring(6, 8) + "日 " + $info[i].createTime.substring(8, 10) + ":" + $info[i].createTime.substring(10, 12);
						var time=timeGeshi($info[i].createTime)
						if($info[i].professor.hasHeadImage){
							var img='/images/head/' + $info[i].professor.id + '_l.jpg'
						}else{
@@ -226,7 +228,7 @@ $(document).ready(function() {
						$("#headImg,#proHead").attr("src", "images/default-icon.jpg");
					}
					if($data.foundTime) {
						var oTime = timeGeshi($data.foundTime);
						var oTime = $data.foundTime.substring(0,4)+"-"+$data.foundTime.substring(4,6)+"-"+$data.foundTime.substring(6,8);
						$("#createTime").text(oTime);
					} 
					if($data.city) {
@@ -346,7 +348,14 @@ $(document).ready(function() {
	}
	/*时间格式转换*/
	function timeGeshi(otm) {
		var otme = otm.substring(0, 4) + "-" + otm.substring(4, 6) + "-" + otm.substring(6, 8);
		var ti=otm.substring(4, 5);
		var otme;
		if(ti=="0"){
			otme =otm.substring(5, 6) + "月" + otm.substring(6, 8)+"日 "+otm.substring(8, 10)+":"+otm.substring(10, 12);
		}else{
			otme =otm.substring(4, 6) + "月" + otm.substring(6, 8)+"日 "+otm.substring(8, 10)+":"+otm.substring(10, 12);
		}
		
		return otme;
	}
	function article() {

js/bind-mail.js

@@ -32,7 +32,11 @@ function emailSuccess() {
	$(".maillink").each(function() {
		var url = mailVal.split('@')[1];
		for(var j in hash) {
			$(this).attr("href", hash[url]);
			if(hash[url]==undefined){
        		$(this).attr("href", "http://mail." + url);
        	}else{
        	 	$(this).attr("href", hash[url]);
        	}
		}
	});
}

js/consult.js

@@ -1,4 +1,6 @@
loginStatus();//判断个人是否登录
$(function(){
	loginStatus();//判断个人是否登录
})
//用户id
var userid = $.cookie("userid");

js/footer.js

@@ -8,7 +8,7 @@ footerHtml += '<div class="container-fulid">'+
								'<p>' +
									'<a class="listlink" href="javascript:void(0);" target="_blank" rel="nofollow">关于我们</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="javascript:void(0);" rel="nofollow" id="perso">我是专家</a>' +
									'<a class="listlink" href="privacy.html" target="_blank" rel="nofollow">用户协议</a>' +
									'<a class="listlink" href="download.html" target="_blank" rel="nofollow">产品下载</a>' +
								'</p>' +
@@ -67,3 +67,10 @@ fHtml +='<div class="wrapper clearfix">' +
document.write(footerHtml);
$("#perso").click(function(){
	var userid = $.cookie('userid');
if(userid=="null"||userid==undefined){
			location.href="login.html";
		}
	location.href="expert-authentication.html";
})

js/header.js

@@ -30,7 +30,7 @@ headerHtml += '<div class="container-fulid">'+
//旧版header
var hHtml = '';
hHtml +='<div class="containerCon"><a href="index.html" alt="科袖" class="logo"></a>'+
	'<ul class="headnav floatL" style="margin-left:40px">'+
	'<ul class="headnav floatL" style="margin-left:26px">'+
			'<li><a href="index.html">首页</a></li>'+
			'<li><a href="discover.html">发现</a></li>'+
	'</ul>' +

js/index.js

@@ -54,30 +54,7 @@ $(function(){
		if(userid=="null"||userid==undefined){
			location.href="login.html";
		}
		$.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==1){
						location.href="needList.html";
					}else{
						location.href="expert-authentication.html"
					}
					
				}
			},
			error: function(XMLHttpRequest, textStats, errorThrown) {
			}
		})
		location.href="expert-authentication.html"
	})
	
	//热门领域

js/login-email-find02.js

@@ -13,8 +13,12 @@ $(function (){
    $("#emailGo").on("click", function(){
		 var url = GetQueryString("email").split('@')[1];
        for (var j in hash){  
            $(this).attr("href", hash[url]); 
            location.href=hash[url]; 
            if(hash[url]==undefined){
        		location.href="http://mail." + url; 	
        	}else{
        	 	$(this).attr("href", hash[url]); 
           		location.href=hash[url];	
        	}
        }  
	});
	

js/settings/account-binding.js

@@ -98,7 +98,11 @@ function emailSuccess() {
	$(".sett").each(function() {
		var url = mailVal.split('@')[1];
		for(var j in hash) {
			$(this).attr("href", hash[url]);
			if(hash[url]==undefined){
        		$(this).attr("href", "http://mail." + url);
        	}else{
        	 	$(this).attr("href", hash[url]);
        	}
		}
	});
}

js/workindex.js

@@ -49,9 +49,14 @@ $(function() {
					oAuthType=data.data.authType;
					if(oAuthType==0){
<<<<<<< HEAD
<<<<<<< HEAD
=======
						$("#ponUm").text("个我正在发布的需求")
>>>>>>> refs/heads/dev
=======
						$("#ponUm").text("个我正在发布的需求");
						$("#searchDemand").text(">>点击查看");
>>>>>>> refs/remotes/origin/dev
						demandNumMy(); 
					}else if(oAuthType==1){
						demandNum();