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

app/index.html

@@ -146,6 +146,10 @@ if(mui.os.ios) {
	mui('.mui-bar-tab').on('tap', 'a', function(e) {
		var targetTab = this.getAttribute('href');
		var num = this.getAttribute('dataid');
		if(num==2) {
			var web3 = plus.webview.getWebviewById("consultlistNew.html");
		   mui.fire(web3, "newId");
		}
		if(num==3){
			var myPage = plus.webview.getWebviewById('html/myaccount.html');
				mui.fire(myPage,'mPage', {});	

app/js/consultlistNew.js

@@ -165,7 +165,7 @@ mui.ready(function() {
				timeout: 10000, //超时时间设置为10秒；
				traditional: true, //传数组必须加这个
				success: function(data) {
					console.log(JSON.stringify(data))
					if(data.success) {
						$("#consultList").html("");
						var $data = data.data;

app/js/updateBasic-city.js

@@ -1,6 +1,7 @@
mui.ready(function() {
	mui.plusReady(function() {
		var web = plus.webview.currentWebview();
		console.log(JSON.stringify(web));
		var city, province,suc=1;
		
		var oadd={
@@ -84,6 +85,7 @@ mui.ready(function() {
			if(suc==0) return;
			cityResult.innerText = oadd.address + "-" + oadd.province;
			city=oadd.address;
			province=oadd.province;
		})
	})
})

app/js/updateBasic.js

@@ -31,7 +31,9 @@ mui.ready(function() {
							document.getElementById("userimg").style.backgroundImage = "url(" + baseUrl + "/images/head/" + $data.id + "_l.jpg?" + mun + ")";
						}
						var onp=document.querySelectorAll(".exName");
						if($data.orgAuth==0) {
						if($data.authType==1||$data.orgAuth=='1'||$data.authStatus==3) {
							onp[1].innerHTML=$data.name;
						}else {
							onp[0].style.display="none";
							onp[1].style.display="none";
							onp[2].style.display="block";
@@ -40,8 +42,7 @@ mui.ready(function() {
						
							bindEvent({selector:"name",txt:"请填写您的姓名",web:{html:'updataName.html',id:"updataName.html"}});
						}
						}else {
							onp[1].innerHTML=$data.name;
							
						}
						person.name=$data.name;
						if($data.orgName) {
@@ -80,8 +81,10 @@ mui.ready(function() {
							person.address="";
						}
						if($data.province) {
							console.log("111" +$data.province)
							person.province=$data.province;
						}else{
							console.log("222" +$data.province)
							person.province="";
						}
						if($data.email) {

app/js/userInforShow.js

@@ -85,6 +85,7 @@ mui.plusReady(function() {
			type: 'GET', //http请求类型
			timeout: 10000, //超时设置
			success: function(data) {
				console.log(JSON.stringify(data))
				plus.nativeUI.closeWaiting();
				plus.webview.currentWebview().show("slide-in-right", 150);
				var $data = data.data;
@@ -143,7 +144,7 @@ mui.plusReady(function() {
					researchAreaShow($data.researchAreas, $data.editResearchAreaLogs);
				} else {
					document.getElementById("professorReserachMess").style.display = "none";
				}
				} 
				//应用行业
				if($data.industry) {
					induSubjectShow({
@@ -166,7 +167,7 @@ mui.plusReady(function() {
		});
	}
	/*进入个人简介页面*/
	document.getElementById("professorBreifinfo").addEventListener("tap", function() {
	document.getElementById("detailProfessor").addEventListener("tap", function() {
		plus.nativeUI.showWaiting(); //显示原生等待框
		var webviewShow = plus.webview.create("../html/userInforShow-more.html", 'userInforShow-more.html', {}, {
			pId: proId