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

css/workspace.css

@@ -197,8 +197,8 @@ body,html{background: #f4f6f8;}
	width:650px;
	line-height: 24px;
	display:block;
	white-space:nowrap; 
	overflow:hidden;
	white-space:nowrap; 
	overflow:hidden;
	text-overflow:ellipsis;
}
@@ -256,8 +256,8 @@ body,html{background: #f4f6f8;}
.dialogcontain .dialoginfo .dialogtitTopic{ font-weight: bold;font-size:18px;}
.dialogcontain .dialoginfo .thanksblock{/*width:400px; margin:auto;*/}
/*.dialogcontain .dialoginfo .thankbox{ margin:2px 6px;}*/
.dialogcontain .dialoginfo .evadbox{ overflow:hidden;  /*position: relative; width:164px;*/}
/*.dialogcontain .dialoginfo .evadbox .evadegree{position: absolute;right: 2px;top: 2px;}
.dialogcontain .dialoginfo .evadbox{ overflow:hidden;  /*position: relative; width:164px;*/}
/*.dialogcontain .dialoginfo .evadbox .evadegree{position: absolute;right: 2px;top: 2px;}
.dialogcontain .dialoginfo .evamargin{ margin:auto;}*/
/*.dialogcontain .dialoginfo .evadtit{ margin:2px 6px;}*/
@@ -388,8 +388,8 @@ border-color:#FF9900; color:#FFFFFF}
.attentList li .proinfor{display: block;}
.attentList li:hover{background: #EFEFEF;}
.attentList li:first-child{margin-top:0}
.attentList li:after{position: absolute;bottom: 0;right: 0;left:126px;height: 1px;content: '';background-color: #c8c7cc;
    -webkit-transform: scaleY(.5);
.attentList li:after{position: absolute;bottom: 0;right: 0;left:126px;height: 1px;content: '';background-color: #c8c7cc;
    -webkit-transform: scaleY(.5);
            transform: scaleY(.5);}
.attentList li:last-child:after{background: none;}

information-brow.html

@@ -283,4 +283,4 @@
			</script>
	</body>
</html>
</html>

information.html

@@ -431,4 +431,4 @@
</script>
</body>
</html>
</html>

js/common.js

@@ -1013,4 +1013,5 @@ var r64 = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D",
				return out.substring(1);
			}
			return out;
		}
		}

js/consultSure.js

@@ -200,4 +200,4 @@ function submtbut(consultId, sendId, newtemp) {
			$.MsgBox.Alert('提示', "服务器链接超时");
		}
	});
}
}

js/demand.js

@@ -0,0 +1,351 @@
//用户id
var userid = $.cookie("userid");
//getConsultData参数
var pageSize = 5;
var pageNo, isbind, status, timeType, sortType;
getMyData(pageSize, 1, true, 0, 1, 0);
myRequirePullDownMenu();
function getMyData(pageSize, pageNo, isbind, status, timeType, sortType) {
	var params = {
		"consultantId": userid, //专家ID
		"status": status, //查询状态 0-全部，1-进行中，2-未感谢，3-未评价，4-已完成， 可以不传，默认为0
		"timeType": timeType, //排序目的 0-按发起时间，1-按最后回复时间，2-按完成时间 默认为0
		"sortType": sortType, //排序目的 0-倒序，1-正序 默认为0
		"pageSize": pageSize, //每页记录数 默认为5
		"pageNo": pageNo //当前页码 默认为1
	};
	$.ajax({
		url: "/ajax/consult/pqCon", //收到回复接口
		type: "get",
		data: params,
		dataType: "json",
		contentType: "application/x-www-form-urlencoded",
		success: function(response) {
			//数据为空时
			if(response["data"]["data"] == null || response["data"]["data"] == undefined || response["data"]["data"] == "") {
				return;
			} else {
				//拿到收到回复数据
				var replyStr;
				var allData = response.data;
				var myData = allData.data;
				$("#workContainer2").html("");
				if(myData.length != 0 && myData.length != null) {
					replyStr = handleData(myData, "consultId", "lookBtn");
					$("#workContainer2").append(replyStr);
				} else {
					return false;
				};
				//分页
				if(isbind == true) {
					$(".getReplyPage").createPage({
						pageCount: Math.ceil(allData.total / pageSize),
						current: allData.pageNo,
						backFn: function(p) {
							getMyData(pageSize, p, false, status, timeType, sortType);
						}
					});
				}
			}
		},
		error: function(response) {
			//收到回复错误返回
			$.MsgBox.Alert('提示', "收到回复数据请求失败");
		},
	});
};
//data:需要处理的数据，htmlStr:页面中需要的html字符串拼接，
//attrParams:数据中不同的参数比如:收到咨询是professorId，收到答复：consultantId
function handleData(data, attrParams, btnCls) {
	var htmlStr = '';
	var title,
		office,
		orgName,
		department,
		address;
	for(var i = 0; i < data.length; i++) {
		//text:回复/查看，state:进行中/已完成/未评价，photoUrl：头像地址，proModify：专家认证
		var text, state, stateStyle, photoUrl, proModify;
		var modifyclass = '';
		if(data[i]["professor"]) { //过滤没有专家对象的数据
			if(data[i]["consultStatus"] == 0) {
				state = "进行中";
				stateStyle = 'status-1';
				text = '回复';
			} else if(data[i]["consultStatus"] == 1) {
				text = "查看";
				state = "已完成";
				stateStyle = 'status-3';
				if(attrParams == 'consultId') {
					if(data[i]["assessStatus"] == 0) {
						state = "待评价";
						stateStyle = 'status-2';
					}
				}
			} else if(data[i]["consultStatus"] == 2) {
				text = "查看";
				state = "待回复";
				stateStyle = 'status-4';
			} else if(data[i]["consultStatus"] == 3) {
				text = "查看";
				state = "被谢绝";
				stateStyle = 'status-5';
			} else if(data[i]["consultStatus"] == undefined) {
				text = "";
				state = "";
			}
			//专家头像
			if(data[i]["professor"]["hasHeadImage"] == 0) {
				photoUrl = "images/default-photo.jpg"
			} else {
				photoUrl = "images/head/" + data[i]["professor"]["id"] + "_l.jpg"
			};
			//认证
			//			if(data[i]["professor"]["authentication"] == true){
			//				proModify = "display:inline-block;"
			//			}else{
			//				proModify = "display:none;"
			//			}
			if(data[i]["professor"].authType) { //专家
				modifyclass = 'authicon authicon-cu';
			} else { //普通用户
				if(data[i]["professor"].authStatus == 3) { 
					if(data[i]["professor"].authentication == 1) { //科研工作者
						modifyclass = "authicon2 authicon-mana";
	
					} else if(data[i]["professor"].authentication == 2) { //企业专家
						modifyclass = "authicon2 authicon-staff";
	
					} else { //学生
						modifyclass = "authicon2 authicon-stu";
					}
				}
			};
			//未读消息
			var unread = unreadConsultFn(userid, data[i]["consultId"], i);
			htmlStr += "<div class='workselectitem' id='" + data[i]["consultId"] + "' >" +
				"<table width='100%'><tbody><tr><td width='14%' class='messagebox'>" +
				"<a class='workhead workitimg headRadius'>" +
				"<img class='headPhoto' src='" + photoUrl + "'  width='100%' height='100%'>" +
				"</a>" +
				"<span class='msgprompt showUnreadMsg' style='" + unread.style + "' id='" + data[i]["consultId"] + "'>" + unread.unreadCount + "</span>" +
				"</td>" +
				"<td style='position:relative;top:20px;' width='86%'>" +
				"<div class='workinfor worksitcon'><h4><a class='named' id='nameS'> " + data[i]["professor"]["name"] + " </a>" +
				"<a class='modifyicon " + modifyclass + "'></a><input type='text' class='assessStar' value='" + data[i]["assessStar"] + "' style='display: none;'></h4><h6 class='h3Font'>";
			if(data[i]["professor"]["title"]) {
				htmlStr += "<span>" + data[i]["professor"]["title"] + "</span>, ";
			};
			if(data[i]["professor"]["office"]) {
				if(data[i]["professor"]["orgName"] || data[i]["professor"]["department"]) {
					htmlStr += "<span>" + data[i]["professor"]["office"] + "</span>, ";
				} else {
					htmlStr += "<span>" + data[i]["professor"]["office"] + "</span>";
				}
			};
			if(data[i]["professor"]["orgName"]) {
				if(data[i]["professor"]["department"]) {
					htmlStr += "<span>" + data[i]["professor"]["orgName"] + "</span>, ";
				} else {
					htmlStr += "<span>" + data[i]["professor"]["orgName"] + "</span>";
				}
			};
			if(data[i]["professor"]["department"]) {
				htmlStr += "<span>" + data[i]["professor"]["department"] + "</span>";
			};
			if(data[i]["professor"]["address"]) {
				htmlStr += ' | ' + "<span>" + data[i]["professor"]["address"] + "</span>";
			};
			htmlStr += "</h6><h6 style='position:relative;'>" +
				"<div class='titList'>咨询主题：<em class='h4Font'> " + data[i]["consultTitle"] + "  </em></div>" +
				"<span class='lasttime rightTime'>" + lastReplyFn(userid, data[i]["consultId"])["lastReplyTime"] + "</span>" +
				"<div style='height:70px;'><p class='rebackcon lastReplyCon' >" + lastReplyFn(userid, data[i]["consultId"])["lastReplyCon"] + "</p></div>" +
				"</h6></div>" +
				"<div class='workhandle'>" +
				"<div class='rightopert floatR'>" +
				"<span   attrP='" + attrParams + "' class='replybtn " + btnCls + "' id='" + data[i]["consultId"] + "' consultStatus='" + data[i]["consultStatus"] + "' assess='" + data[i]["assessStatus"] + "' thanks='" + data[i]["thanksStatus"] +
				"' onclick='clickLookBtn2(\"" + userid + "\",\"" + attrParams + "\",\"" + data[i]["consultId"] + "\"," + data[i]["consultStatus"] + "," + data[i]["assessStatus"] + "," + data[i]["thanksStatus"] + ");'>" +
				text +
				"</span>" +
				"<span class='moreopert complain'>...</span>" +
				"<ul class='moreopertbtn'>" +
				"<li>投诉</li>" +
				"</ul>" +
				"</div>" +
				"<div class='leftstate floatR'>" +
				"<span class='coultstate  " + stateStyle + "'><i>" + state + "</i></span>" +
				"</div>" +
				"<div class='leftstate floatR'>" +
				"<span class='coultstate coulstAim status-4'><i>" + data[i]["consultType"] + "</i></span>" +
				"</div>" +
				"</div>" +
				"</td>" +
				"</tr></tbody></table>" +
				"</div>";
		}
	};
	return htmlStr;
};
//未读信息接口
function unreadConsultFn(senderId, consultId, i) {
	var unreadCount, style;
	var params = {
		"senderId": senderId, //发送者ID
		"consultId": consultId //咨询ID
	};
	$.ajax({
		url: "/ajax/tidings/qaNotReadTidings",
		type: "get",
		async: false,
		data: params,
		success: function(response) {
			unreadCount = response["data"];
			console.log()
			if(unreadCount == 0) {
				style = "display:none;"
			} else {
				style = "display:block;"
			}
		},
		error: function(error) {
			$.MsgBox.Alert('提示', "未读消息请求失败");
		}
	});
	return {
		"unreadCount": unreadCount,
		"style": style
	}
};
//列表最后回复
function lastReplyFn(sendId, consultId) {
	var lastReplyTimeData, lastReplyTime, lastReplyCon;
	$.ajax({
		url: "/ajax/tidings/qaLastRevovery",
		async: false,
		data: {
			"consultId": consultId, //咨询ID
			"senderId": sendId //登录者ID
		},
		success: function(response) {
			//			console.log(response)
			if(response["data"] == null || response["data"] == "" || response["data"] == undefined) {
				lastReplyTimeData = '';
				lastReplyTime = '';
				lastReplyCon = '';
			} else {
				lastReplyTimeData = response["data"]["createTime"];
				lastReplyTime = lastReplyTimeData.substr(0, 4) + "-" + lastReplyTimeData.substr(4, 2) + "-" + lastReplyTimeData.substr(6, 2) + " " + lastReplyTimeData.substr(8, 2) + ":" + lastReplyTimeData.substr(10, 2)
				lastReplyCon = response["data"]["tidingsContant"];
			}
		},
		error: function(error) {
			$.MsgBox.Alert('提示', "最后回复数据失败");
		}
	});
	return {
		"lastReplyTime": lastReplyTime,
		"lastReplyCon": lastReplyCon
	};
};
//我的咨询下拉菜单处理函数
function myRequirePullDownMenu() {
	//点击下拉菜单
	$(".replyOption ul").find("li").click(function() {
		status = $(this).attr("tip");
		timeType = $("#showTimeSort2").attr("tim");
		sortType = $("#timeSortId2").val();
		$("#workContainer2").remove();
		$("#wode").append('<div id="workContainer2"></div>')
		$(".getReplyPage").remove();
		$("#wode").append('<div class="tcdPageCode getReplyPage"></div>');
		console.log(status + timeType + sortType);
		getMyData(pageSize, 1, true, status, timeType, sortType);
	});
	$(".timeOption2 ul").find("li").click(function() {
		status = $("#showStatus2").attr("tip");
		timeType = $(this).attr("tim");
		sortType = $("#timeSortId2").val();
		$("#workContainer2").remove();
		$("#wode").append('<div id="workContainer2"></div>')
		$(".getReplyPage").remove();
		$("#wode").append('<div class="tcdPageCode getReplyPage"></div>');
		console.log(status + timeType + sortType);
		getMyData(pageSize, 1, true, status, timeType, sortType);
	});
	var sortFlag2 = true;
	$("#replyArrow").click(function() {
		if(sortFlag2 == true) {
			$(this).find("div").css("background-position", "-20px 1px");
			$("#timeSortId2").val("1");
			sortFlag2 = false;
		} else {
			$(this).find("div").css("background-position", "0px 1px");
			$("#timeSortId2").val("0");
			sortFlag2 = true;
		};
		status = $("#showStatus2").attr("tip");
		timeType = $("#showTimeSort2").attr("tim");
		sortType = $("#timeSortId2").val();
		$("#workContainer2").remove();
		$("#wode").append('<div id="workContainer2"></div>')
		$(".getReplyPage").remove();
		$("#wode").append('<div class="tcdPageCode getReplyPage"></div>');
		console.log(status + timeType + sortType);
		getMyData(pageSize, 1, true, status, timeType, sortType);
	});
};
//咨询和回复中点击查看或者回复
function clickLookBtn2(sendId, attrParams, consultId, consultStatus, assessStatus, thanksStatus) {
	window.location.href = "diloags.html?sendId=" + sendId + "&attrParams=" + attrParams + "&consultId=" + consultId + "&consultStatus=" + consultStatus + "&assessStatus=" + assessStatus + "&thanksStatus=" + thanksStatus;
}

js/loginNew.js

@@ -7,8 +7,7 @@ $(function() {
		$(this).addClass("liactive").siblings().removeClass("liactive");
		$(".loginWays ul").eq($(this).index()).removeClass("displayNone").siblings().addClass("displayNone");
	})
})
var oTel=GetQueryString("tel");
})
 if(oTel==1) {
 	$(".loginWaySort li").eq(2).addClass("liactive").siblings().removeClass("liactive");
 	$(".loginWays ul").eq(2).removeClass("displayNone").siblings().addClass("displayNone");
@@ -299,7 +298,6 @@ function InvitationLogin(_this) {
			},
			async: false,
			success: function(data) {
				 console.log(data)
				if(data.success) {
					if(data.data != "null" && data.data != null) {
						if(data.data.auth == true) {
@@ -328,4 +326,4 @@ function login(_this, num) {
	} else if(num == 3) {
		VerificationLogin(_this);
	}
}
}

js/needList.js

@@ -177,4 +177,4 @@ $(document).ready(function() {
		var demand = $(this).attr("demanid");
		location.href = "needSure.html?demandId=" + demand;
	})
})
})

js/register.js

@@ -77,7 +77,6 @@ $(document).ready(function(){
						phoneNumber=true;
						$this.removeClass("frmmsg-warning");
						if(arg2==1) {
							doClick();
							getPhoneCode();
						}
					}
@@ -94,7 +93,7 @@ $(document).ready(function(){
		$(this).removeClass("frmmsg-warning");
	})
	$(".companysc").blur(function() {
		var authCode = $(".companysc").val();
		var authCode = $(this).val();
		if(authCode.length == 0) {
			$(".msgCmp03").find("span").text("请输入您收到的短信验证码");
			phoneMa=false;
@@ -128,6 +127,10 @@ $(document).ready(function(){
		var second = Math.ceil(60 - (nowTime - clickTime) / 1000);
		if(second > 0) {
			$("#getcode").html(second + "s后重新获取");
			if(second==1) {
				$("#changImage").attr("src","/ajax/PictureVC?"+new Date().getTime());
				$("#imgCode").val("");
			}
		} else {
			clearInterval(Timer);
			$("#getcode").html("免费获取验证码");
@@ -135,25 +138,61 @@ $(document).ready(function(){
		}
	}, 1000);
}
	$("#imgCode").on("blur",function(){
		if($("#imgCode").val().length==0) {
			$(".msgImage").text("请输入图形验证码");
			return;
		}else if($("#imgCode").val().length==4){
			$(".msgImage").text("");
			$(this).removeClass("frmmsg-warning");
		}else{
			$(".msgImage").text("图形验证码4位");
		}
	})
	$("#imgCode").on("focus",function(){
			$(".msgImage").text("");
			$(this).removeClass("frmmsg-warning");
	})
	/*发送手机验证码*/
	function getPhoneCode() {
		if($("#imgCode").val().length==0) {
			$(".msgImage").text("请输入图形验证码");
			return;
		}else if($("#imgCode").val().length==4){
			$(".msgImage").text("");
			$(this).removeClass("frmmsg-warning");
		}else{
			$(".msgImage").text("图形验证码4位");
			return;
		}
			$.ajax("/ajax/regmobilephone", {
				type: "get",
				async: true,
				success: function(data) {
					if(data.success) {
						state = data.data;
						doClick();
					}else{
						if(data.code==20001) {
							$(".msgImage").text("请输入正确的图形验证码");
							$("#changImage").attr("src","/ajax/PictureVC?"+new Date().getTime());
						}
					}
				},
				error: function() {
					$.MsgBox.Alert('message', '服务器连接超时')
				},
				data: {
					"mobilePhone": $("#lp_phone").val()
					"mobilePhone": $("#lp_phone").val(),
					"vcode":$('#imgCode').val(),
				},
				dataType: 'json'
			});
	}
	$("#changImage").on("click",function(){
		$(this).attr("src","/ajax/PictureVC?"+new Date().getTime());
	})
	
	/*登录密码校验*/
	
	$("#phone_password").focus(function(){
@@ -185,7 +224,7 @@ $(document).ready(function(){
	/*注册*/
	$("#regMess").on("keyup","#yourName,#lp_phone,.companysc,#phone_password",function(){
		if($("#yourName").val().length != 0 && $("#lp_phone").val().length != 0&&$(".companysc").val().length != 0&&$("#phone_password").val().length != 0) {
		if($("#yourName").val().length != 0 && $("#lp_phone").val().length != 0&&$("#imgCode").val().length != 0&&$(".companysc").val().length != 0&&$("#phone_password").val().length != 0) {
			$("#reg").removeAttr("disabled");
		}else{
			$("#reg").attr("disabled","disabled");

js/workindex.js

@@ -421,4 +421,4 @@ $(function() {
			}
		});
	}
});
});

myDemand.html

@@ -74,7 +74,7 @@
						</div>
						<div class="labelarea">
                        	<ul class="labelshow chooseBox clearfix" id="labelshow">
					       		<!--<li class="deleteSubject"><em>66666</em><span class="removeNu"><img src="images/move.png"></span></li>
					       		<!--<li class="deleteSubject"><em>66666</em><span class="removeNu"><img src="images/move.png"></span></li>
					       		<li class="deleteSubject"><em>66666</em><span class="removeNu"><img src="images/move.png"></span></li>-->
					       	</ul>
                        </div>

register.html

@@ -38,11 +38,20 @@
			    				<div class="frmmsg msgLog1"><span></span></div>
							</li>
							<li>
								<div class="col-w-8">
								<div class="col-w-7">
									<input type="text" class="frmtype frmtypeW" style="width: 98%;" placeholder="请输入图形验证码" id="imgCode"/>
								    <div class="frmmsg msgImage"><span></span></div>
							    </div>
							    <div class="col-w-5">
							    	<img src="/ajax/PictureVC" alt="" class="frmtypeW" id="changImage"/>
							    </div>
							</li>
							<li>
								<div class="col-w-7">
									<input type="tel" class="frmtype frmtypeW companysc" style="width: 98%;" placeholder="请输入短信验证码"/>
								    <div class="frmmsg msgCmp03"><span></span></div>
							    </div>
							    <div class="col-w-4">
							    <div class="col-w-5">
							    	<button type="button"  class="frmtype frmtypeW btnModel headRadius" id="getcode">获取验证码</button>
							    </div>
							</li>