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

app/html/consultlist.html

@@ -161,19 +161,19 @@
				</div> 
			</div>
		</div>
		<div id="middlePopover2" class="mui-popover popoverbox mui-popover2">
			<div class="mui-popover-arrow"></div>
			<div class="mui-scroll-wrapper">
				<div class="mui-scroll">
					<ul class="mui-table-view mui-table-view-radio">
						<li class="mui-table-view-cell"><a class="mui-navigate-right" href="#" ck2="0">不限</a></li>
						<li class="mui-table-view-cell"><a class="mui-navigate-right" href="#" ck2="1">技术咨询</a></li>
						<li class="mui-table-view-cell"><a class="mui-navigate-right" href="#" ck2="2">资源咨询</a></li>
						<li class="mui-table-view-cell"><a class="mui-navigate-right" href="#" ck2="3">其他事务</a></li>
					</ul>
				</div>
			</div>
		</div>
		<!--<div id="middlePopover2" class="mui-popover popoverbox mui-popover2">
			<div class="mui-popover-arrow"></div>
			<div class="mui-scroll-wrapper">
				<div class="mui-scroll">
					<ul class="mui-table-view mui-table-view-radio">
						<li class="mui-table-view-cell"><a class="mui-navigate-right" href="#" ck2="0">不限</a></li>
						<li class="mui-table-view-cell"><a class="mui-navigate-right" href="#" ck2="1">技术咨询</a></li>
						<li class="mui-table-view-cell"><a class="mui-navigate-right" href="#" ck2="2">资源咨询</a></li>
						<li class="mui-table-view-cell"><a class="mui-navigate-right" href="#" ck2="3">其他事务</a></li>
					</ul>
				</div>
			</div>
		</div>-->
		<div id="middlePopover3" class="mui-popover popoverbox mui-popover3" style="height: 110px;">
			<div class="mui-popover-arrow"></div>
			<div class="mui-scroll-wrapper">
@@ -208,17 +208,17 @@
       	
       	<div class="filterbox2 filterdiv" style="top:0 ;left: 0;">
			<ul class="filterblock2">
				<li style="width:22%;">
					<a class="mui-btn mui-btn-block mui-btn-outlined filterlist2" id="consuitSta" style="display:none;">我的需求</a>
				<li style="width:25%;">
					<!--<a class="mui-btn mui-btn-block mui-btn-outlined filterlist2" id="consuitSta" style="display:none;">我的需求</a>-->
					<a href="#middlePopover1"  class="mui-btn mui-btn-block mui-btn-outlined filterlist2" id="consuitSta2"><span id="headck1" headck='1'>收到咨询</span><em class="mui-icon mui-icon-arrowdown"></em></a>
				</li>
				<li style="width:22%;">
				<!--<li style="width:22%;">
					<a href="#middlePopover2"  class="mui-btn mui-btn-block mui-btn-outlined filterlist2"><span id="headck2" headck='0'>咨询类型</span><em class="mui-icon mui-icon-arrowdown"></em></a>
				</li>
				<li style="width:22%;">
				</li>-->
				<li style="width:25%;">
					<a href="#middlePopover3"  class="mui-btn mui-btn-block mui-btn-outlined filterlist2"><span id="headck3" headck='0'>咨询状态</span><em class="mui-icon mui-icon-arrowdown"></em></a>
				</li>
				<li style="width:34%;">
				<li style="width:50%;">
					<a href="#middlePopover4"  class="mui-btn mui-btn-block mui-btn-outlined filterlist2" ><span id="headck4" headck='1'>按最后回复排序</span><em class="mui-icon mui-icon-arrowdown"></em></a>
				</li>
			</ul>

app/js/consult.js

@@ -81,15 +81,15 @@ function userInformation() {
			if(data.success && data.data) {
				//alert(oFlag1)
				if($info.authType==0) {
					document.getElementById("consuitSta").style.display="block";
					document.getElementById("consuitSta2").style.display="none";
					/*document.getElementById("consuitSta").style.display="block";
					document.getElementById("consuitSta2").style.display="none";*/
					document.getElementById("newszixun").innerHTML="待回复";
					document.getElementById("newsok").innerHTML="被谢绝";
					document.getElementById("newwc").innerHTML="待评价";
					document.getElementById("newwc").setAttribute("ck3","5")
				}else{
					document.getElementById("consuitSta").style.display="none";
					document.getElementById("consuitSta2").style.display="block";
					/*document.getElementById("consuitSta").style.display="none";
					document.getElementById("consuitSta2").style.display="block";*/
					if(oneedval.value==2){
						document.getElementById("newszixun").innerHTML="待回复";
						document.getElementById("newsok").innerHTML="被谢绝";
@@ -214,9 +214,9 @@ function initData() {
		userInformation();
		var userid = plus.storage.getItem('userid');
		plus.nativeUI.showWaiting(); //显示原生等待框
		if(oFlag1!=1){
		/*if(oFlag1!=1){
			oneedval.value = "2";
		}
		}*/
		mui.ajax(baseUrl + '/ajax/consult/pq', {
			data: {
				"professorId": userid,
@@ -269,9 +269,9 @@ function getOnePage() {
		userInformation();
		var userid = plus.storage.getItem('userid');
		var pageIndex = 1;
		if(oFlag1!=1){
		/*if(oFlag1!=1){
			oneedval.value = "2";
		}
		}*/
		
		mui.ajax(baseUrl + '/ajax/consult/pq', {
			data: {
@@ -320,9 +320,9 @@ function getOnePage() {
function getaData() {
	mui.plusReady(function() {
		var userid = plus.storage.getItem('userid');
		if(oFlag1!=1){
		/*if(oFlag1!=1){
			oneedval.value = "2";
		}
		}*/
		
		mui.ajax(baseUrl + '/ajax/consult/pq', {
			data: {
@@ -553,8 +553,8 @@ function eachData(userid, datalist) {
			(item["professor"]["hasHeadImage"] == 0) ? photoUrl = "../images/default-photo.jpg": photoUrl = baseUrl + "/images/head/" + item["professor"].id + "_l.jpg";
			//咨询类型，只取两个字
			if(item["consultType"]) {
				consultType = item["consultType"].substr(0, 2);
			if(item["consultType"]) {
				consultType = item["consultType"].substr(0, 2);
			}
			//最后回复
@@ -576,7 +576,7 @@ function eachData(userid, datalist) {
			var str = '';
			str += '<div class="coutopicbox"><span class="coutheme mui-ellipsis mui-pull-left">' + title + '</span>' +
				'<div class="coustatus mui-pull-right"><span class="aimlabel">' + consultType + '</span>' +
				'<div class="coustatus mui-pull-right">' +//<span class="aimlabel">' + consultType + '</span>
				'<span class="' + statusStyle + ' status" consultId="' + item["consultId"] + '">' + status + '</span></div></div>' +
				'<a class="proinfor itemBtn" consultId="' + item["consultId"] + '" consultantId="' + item["consultantId"] + '" consultStatus="'+item["consultStatus"]+'" >' +
				'<span class="mui-badge mui-badge-danger readstate ' + unreadStyle + '" consultId="' + item["consultId"] + '">' + unreadCount + '</span>' +
@@ -685,23 +685,23 @@ function checkedFun(i) {
			if(i==1){
				var value = this.getAttribute("ck1");
				//alert(value)
				if(value==2){
					document.getElementById("headck1").innerHTML = this.innerHTML;
					document.getElementById("headck1").setAttribute('headck', value);
					this.innerHTML="收到咨询";
					this.setAttribute("ck1","1");
					oneedval.value = '2';
				}else{
					document.getElementById("headck1").innerHTML = this.innerHTML;
					document.getElementById("headck1").setAttribute('headck', value);
					this.innerHTML="我的需求";
					this.setAttribute("ck1","2");
					oneedval.value = '1';
				if(value==2){
					document.getElementById("headck1").innerHTML = this.innerHTML;
					document.getElementById("headck1").setAttribute('headck', value);
					this.innerHTML="收到咨询";
					this.setAttribute("ck1","1");
					oneedval.value = '2';
				}else{
					document.getElementById("headck1").innerHTML = this.innerHTML;
					document.getElementById("headck1").setAttribute('headck', value);
					this.innerHTML="我的需求";
					this.setAttribute("ck1","2");
					oneedval.value = '1';
				}
				otypeval.value = '0';
				ostateval.value = '0';
				osortval.value = '1'; 
				document.getElementById("headck2").innerHTML = "咨询类型";
				/*document.getElementById("headck2").innerHTML = "咨询类型";*/
				document.getElementById("headck3").innerHTML = "咨询状态";
				document.getElementById("headck4").innerHTML = "按最后回复排序";
			    var aSpan=document.getElementById("logined").querySelectorAll("li");
@@ -713,11 +713,11 @@ function checkedFun(i) {
				var value = this.getAttribute("ck" + i);
				document.getElementById("headck" + i).setAttribute('headck', value); 
				//咨询类型传值不同，传""(空)，技术咨询、资源咨询、其他事务 
				otypeval.value = document.getElementById("headck2").getAttribute('headck');
				//otypeval.value = document.getElementById("headck2").getAttribute('headck');
				if(otypeval.value == 0) {
					otypeval.value = '';
				} else {
					otypeval.value = document.getElementById("headck2").innerHTML;
					//otypeval.value = document.getElementById("headck2").innerHTML;
				}
				
				if(oFlag1==1){