Accueil Explorer Aide
S'inscrire Connexion
bulomakaka
/
ekexiu.app
Suivre 2
Voter 1
Fork 0
Code Tickets 0 Pull Requests 0 Commits 1092 Publications 0 Wiki
Parcourir la Source

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

luyanan 7 ans auparavant
Parent
2d79d7dd77 55131583ed
commit
a499837525
4 fichiers modifiés avec 119 ajouts et 118 suppressions
Vue séparée Afficher les stats Diff
  1. 67 67
      app/html/backBindUn.html
  2. 19 19
      app/html/consultlist.html
  3. 28 28
      app/js/consult.js
  4. 5 4
      app/js/public/base.js

+ 67 - 67
app/html/backBindUn.html
Voir le fichier 

@ -1,68 +1,68 @@
1 
<!doctype html>
2 
<html>
3
4 
	<head>
5 
		<meta charset="UTF-8">
6 
		<title>微信绑定-无账号</title>
7 
		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
8 
		<link href="../css/mui.min.css" rel="stylesheet" />
9 
		<link href="../css/iconfont.css" rel="stylesheet" />
10 
		<link href="../css/app.css" rel="stylesheet" />
11 
	</head>
12
13 
	<body>
14 
		<header class="mui-bar mui-bar-nav toptitbox">
15 
		    <a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left topback"></a>
16 
		    <h1 class="mui-title toptit">绑定手机</h1>
17 
		</header>
18 
		<div class="mui-content">
19 
			<div class="bindtip"><img src="../images/login_bg_tishi_1_nor@3x.png" width="100%" /></div>
20 
		    <form class="mui-input-group frmboxNew">
21 
		    	<div class="mui-input-row frm-input">
22 
		            <input type="text" class="mui-input-clear frmtype" value="此处回填微信名" id="weiChatName">
23 
		        </div>
24 
		        <div class="mui-input-row frm-input">
25 
		            <input type="tel" class="mui-input-clear frmtype" placeholder="请输入手机号码" id="phone">
26 
		        </div>
27 
		        <div class="mui-row mui-input-row frm-input">
28 
		        	<div class="mui-col-xs-8">
29 
		        		<input type="text" class="frmtype" placeholder="请输入图形验证码" id="imgCode">
30 
		        	</div>
31 
					<div class="mui-col-xs-4">
32 
						<img src="http://www.ekexiu.com/ajax/PictureVC" alt="" id="changImage" width="100%" height="48"/>
33 
					</div>
34 
				</div>
35 
		        <div class="mui-row mui-input-row frm-input">
36 
		        	<div class="mui-col-xs-8">
37 
		        		<input type="number" class="frmtype" placeholder="请输入验证码" id="phoneCode">
38 
		        	</div>
39 
					<div class="mui-col-xs-4">
40 
						<input type="button" class="frmtype getCode" disabled value="获取验证码" id="getPhoneCode">
41 
						<input type="button" class="frmtype getCode" value="" style="display: none;" id="getcodeoff">
42 
					</div>
43 
				</div>
44 
				<div class="mui-input-row frm-input">
45 
					<input type="password" class="frmtype" placeholder="请设置登录密码" id="setpassword">
46 
				</div>
47 
		    </form>
48
49 
		    <div class="mui-content-padded frmboxNew" style="margin-top: -4px">
50 
		    	<div class="protocolbox">
51 
			    	<label checked="true">
52 
			    		<span class="mui-icon iconfont icon-yuanxingxuanzhongfill"></span>
53 
	                    <input type="checkbox" name="checkbox" checked="true" style="display:none;">我已阅读并同意<a class="protocollink" id="protocollink">科袖用户协议</a>
54 
	               </label>
55 
		    	</div>
56 
				<button class="mui-btn mui-btn-block frmbtn frmactive" id="binding" disabled>绑&nbsp;定</button>
57 
				<p class="otherWordNew">
58 
					<span class="mui-pull-right" id="alreadyAccount">已有账号?</span>
59 
				</p>
60 
			</div>
61
62 
		</div>
63 
		<script src="../js/public/mui.min.js"></script>
64 
		<script src="../js/public/base.js"></script>
65 
		<script src="../js/backBindUn.js"></script>
66 
	</body>
67
1 
<!doctype html>
2 
<html>
3
4 
	<head>
5 
		<meta charset="UTF-8">
6 
		<title>微信绑定-无账号</title>
7 
		<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
8 
		<link href="../css/mui.min.css" rel="stylesheet" />
9 
		<link href="../css/iconfont.css" rel="stylesheet" />
10 
		<link href="../css/app.css" rel="stylesheet" />
11 
	</head>
12
13 
	<body>
14 
		<header class="mui-bar mui-bar-nav toptitbox">
15 
		    <a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left topback"></a>
16 
		    <h1 class="mui-title toptit">绑定手机</h1>
17 
		</header>
18 
		<div class="mui-content">
19 
			<div class="bindtip"><img src="../images/login_bg_tishi_1_nor@3x.png" width="100%" /></div>
20 
		    <form class="mui-input-group frmboxNew">
21 
		    	<div class="mui-input-row frm-input">
22 
		            <input type="text" class="mui-input-clear frmtype" value="此处回填微信名" id="weiChatName">
23 
		        </div>
24 
		        <div class="mui-input-row frm-input">
25 
		            <input type="tel" class="mui-input-clear frmtype" placeholder="请输入手机号码" id="phone">
26 
		        </div>
27 
		        <div class="mui-row mui-input-row frm-input">
28 
		        	<div class="mui-col-xs-8">
29 
		        		<input type="text" class="frmtype" placeholder="请输入图形验证码" id="imgCode">
30 
		        	</div>
31 
					<div class="mui-col-xs-4">
32 
						<img src="http://www.ekexiu.com/ajax/PictureVC" alt="" id="changImage" width="100%" height="48"/>
33 
					</div>
34 
				</div>
35 
		        <div class="mui-row mui-input-row frm-input">
36 
		        	<div class="mui-col-xs-8">
37 
		        		<input type="number" class="frmtype" placeholder="请输入验证码" id="phoneCode">
38 
		        	</div>
39 
					<div class="mui-col-xs-4">
40 
						<input type="button" class="frmtype getCode" disabled value="获取验证码" id="getPhoneCode">
41 
						<input type="button" class="frmtype getCode" value="" style="display: none;" id="getcodeoff">
42 
					</div>
43 
				</div>
44 
				<div class="mui-input-row frm-input">
45 
					<input type="password" class="frmtype" placeholder="请设置登录密码" id="setpassword">
46 
				</div>
47 
		    </form>
48
49 
		    <div class="mui-content-padded frmboxNew" style="margin-top: -4px">
50 
		    	<div class="protocolbox">
51 
			    	<label checked="true">
52 
			    		<span class="mui-icon iconfont icon-yuanxingxuanzhongfill"></span>
53 
	                    <input type="checkbox" name="checkbox" checked="true" style="display:none;">我已阅读并同意<a class="protocollink" id="protocollink">科袖用户协议</a>
54 
	               </label>
55 
		    	</div>
56 
				<button class="mui-btn mui-btn-block frmbtn frmactive" id="binding" disabled>绑&nbsp;定</button>
57 
				<p class="otherWordNew">
58 
					<span class="mui-pull-right" id="alreadyAccount">已有账号?</span>
59 
				</p>
60 
			</div>
61
62 
		</div>
63 
		<script src="../js/public/mui.min.js"></script>
64 
		<script src="../js/public/base.js"></script>
65 
		<script src="../js/backBindUn.js"></script>
66 
	</body>
67
68 68 
</html>

+ 19 - 19
app/html/consultlist.html
Voir le fichier 

@ -161,19 +161,19 @@
161 161 
				</div>
162 162 
			</div>
163 163 
		</div>
164 
		<div id="middlePopover2" class="mui-popover popoverbox mui-popover2">
165 
			<div class="mui-popover-arrow"></div>
166 
			<div class="mui-scroll-wrapper">
167 
				<div class="mui-scroll">
168 
					<ul class="mui-table-view mui-table-view-radio">
169 
						<li class="mui-table-view-cell"><a class="mui-navigate-right" href="#" ck2="0">不限</a></li>
170 
						<li class="mui-table-view-cell"><a class="mui-navigate-right" href="#" ck2="1">技术咨询</a></li>
171 
						<li class="mui-table-view-cell"><a class="mui-navigate-right" href="#" ck2="2">资源咨询</a></li>
172 
						<li class="mui-table-view-cell"><a class="mui-navigate-right" href="#" ck2="3">其他事务</a></li>
173 
					</ul>
174 
				</div>
175 
			</div>
176 
		</div>
164 
		<!--<div id="middlePopover2" class="mui-popover popoverbox mui-popover2">
165 
			<div class="mui-popover-arrow"></div>
166 
			<div class="mui-scroll-wrapper">
167 
				<div class="mui-scroll">
168 
					<ul class="mui-table-view mui-table-view-radio">
169 
						<li class="mui-table-view-cell"><a class="mui-navigate-right" href="#" ck2="0">不限</a></li>
170 
						<li class="mui-table-view-cell"><a class="mui-navigate-right" href="#" ck2="1">技术咨询</a></li>
171 
						<li class="mui-table-view-cell"><a class="mui-navigate-right" href="#" ck2="2">资源咨询</a></li>
172 
						<li class="mui-table-view-cell"><a class="mui-navigate-right" href="#" ck2="3">其他事务</a></li>
173 
					</ul>
174 
				</div>
175 
			</div>
176 
		</div>-->
177 177 
		<div id="middlePopover3" class="mui-popover popoverbox mui-popover3" style="height: 110px;">
178 178 
			<div class="mui-popover-arrow"></div>
179 179 
			<div class="mui-scroll-wrapper">
 
@ -208,17 +208,17 @@
208 208
209 209 
       	<div class="filterbox2 filterdiv" style="top:0 ;left: 0;">
210 210 
			<ul class="filterblock2">
211 
				<li style="width:22%;">
212 
					<a class="mui-btn mui-btn-block mui-btn-outlined filterlist2" id="consuitSta" style="display:none;">我的需求</a>
211 
				<li style="width:25%;">
212 
					<!--<a class="mui-btn mui-btn-block mui-btn-outlined filterlist2" id="consuitSta" style="display:none;">我的需求</a>-->
213 213 
					<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>
214 214 
				</li>
215 
				<li style="width:22%;">
215 
				<!--<li style="width:22%;">
216 216 
					<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>
217 
				</li>
218 
				<li style="width:22%;">
217 
				</li>-->
218 
				<li style="width:25%;">
219 219 
					<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>
220 220 
				</li>
221 
				<li style="width:34%;">
221 
				<li style="width:50%;">
222 222 
					<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>
223 223 
				</li>
224 224 
			</ul>

+ 28 - 28
app/js/consult.js
Voir le fichier 

@ -81,15 +81,15 @@ function userInformation() {
81 81 
			if(data.success && data.data) {
82 82 
				//alert(oFlag1)
83 83 
				if($info.authType==0) {
84 
					document.getElementById("consuitSta").style.display="block";
85 
					document.getElementById("consuitSta2").style.display="none";
84 
					/*document.getElementById("consuitSta").style.display="block";
85 
					document.getElementById("consuitSta2").style.display="none";*/
86 86 
					document.getElementById("newszixun").innerHTML="待回复";
87 87 
					document.getElementById("newsok").innerHTML="被谢绝";
88 88 
					document.getElementById("newwc").innerHTML="待评价";
89 89 
					document.getElementById("newwc").setAttribute("ck3","5")
90 90 
				}else{
91 
					document.getElementById("consuitSta").style.display="none";
92 
					document.getElementById("consuitSta2").style.display="block";
91 
					/*document.getElementById("consuitSta").style.display="none";
92 
					document.getElementById("consuitSta2").style.display="block";*/
93 93 
					if(oneedval.value==2){
94 94 
						document.getElementById("newszixun").innerHTML="待回复";
95 95 
						document.getElementById("newsok").innerHTML="被谢绝";
 
@ -214,9 +214,9 @@ function initData() {
214 214 
		userInformation();
215 215 
		var userid = plus.storage.getItem('userid');
216 216 
		plus.nativeUI.showWaiting(); //显示原生等待框
217 
		if(oFlag1!=1){
217 
		/*if(oFlag1!=1){
218 218 
			oneedval.value = "2";
219 
		}
219 
		}*/
220 220 
		mui.ajax(baseUrl + '/ajax/consult/pq', {
221 221 
			data: {
222 222 
				"professorId": userid,
 
@ -269,9 +269,9 @@ function getOnePage() {
269 269 
		userInformation();
270 270 
		var userid = plus.storage.getItem('userid');
271 271 
		var pageIndex = 1;
272 
		if(oFlag1!=1){
272 
		/*if(oFlag1!=1){
273 273 
			oneedval.value = "2";
274 
		}
274 
		}*/
275 275
276 276 
		mui.ajax(baseUrl + '/ajax/consult/pq', {
277 277 
			data: {
 
@ -320,9 +320,9 @@ function getOnePage() {
320 320 
function getaData() {
321 321 
	mui.plusReady(function() {
322 322 
		var userid = plus.storage.getItem('userid');
323 
		if(oFlag1!=1){
323 
		/*if(oFlag1!=1){
324 324 
			oneedval.value = "2";
325 
		}
325 
		}*/
326 326
327 327 
		mui.ajax(baseUrl + '/ajax/consult/pq', {
328 328 
			data: {
 
@ -553,8 +553,8 @@ function eachData(userid, datalist) {
553 553 
			(item["professor"]["hasHeadImage"] == 0) ? photoUrl = "../images/default-photo.jpg": photoUrl = baseUrl + "/images/head/" + item["professor"].id + "_l.jpg";
554 554
555 555 
			//咨询类型，只取两个字
556 
			if(item["consultType"]) {
557 
				consultType = item["consultType"].substr(0, 2);
556 
			if(item["consultType"]) {
557 
				consultType = item["consultType"].substr(0, 2);
558 558 
			}
559 559
560 560 
			//最后回复
 
@ -576,7 +576,7 @@ function eachData(userid, datalist) {
576 576
577 577 
			var str = '';
578 578 
			str += '<div class="coutopicbox"><span class="coutheme mui-ellipsis mui-pull-left">' + title + '</span>' +
579 
				'<div class="coustatus mui-pull-right"><span class="aimlabel">' + consultType + '</span>' +
579 
				'<div class="coustatus mui-pull-right">' +//<span class="aimlabel">' + consultType + '</span>
580 580 
				'<span class="' + statusStyle + ' status" consultId="' + item["consultId"] + '">' + status + '</span></div></div>' +
581 581 
				'<a class="proinfor itemBtn" consultId="' + item["consultId"] + '" consultantId="' + item["consultantId"] + '" consultStatus="'+item["consultStatus"]+'" >' +
582 582 
				'<span class="mui-badge mui-badge-danger readstate ' + unreadStyle + '" consultId="' + item["consultId"] + '">' + unreadCount + '</span>' +
 
@ -685,23 +685,23 @@ function checkedFun(i) {
685 685 
			if(i==1){
686 686 
				var value = this.getAttribute("ck1");
687 687 
				//alert(value)
688 
				if(value==2){
689 
					document.getElementById("headck1").innerHTML = this.innerHTML;
690 
					document.getElementById("headck1").setAttribute('headck', value);
691 
					this.innerHTML="收到咨询";
692 
					this.setAttribute("ck1","1");
693 
					oneedval.value = '2';
694 
				}else{
695 
					document.getElementById("headck1").innerHTML = this.innerHTML;
696 
					document.getElementById("headck1").setAttribute('headck', value);
697 
					this.innerHTML="我的需求";
698 
					this.setAttribute("ck1","2");
699 
					oneedval.value = '1';
688 
				if(value==2){
689 
					document.getElementById("headck1").innerHTML = this.innerHTML;
690 
					document.getElementById("headck1").setAttribute('headck', value);
691 
					this.innerHTML="收到咨询";
692 
					this.setAttribute("ck1","1");
693 
					oneedval.value = '2';
694 
				}else{
695 
					document.getElementById("headck1").innerHTML = this.innerHTML;
696 
					document.getElementById("headck1").setAttribute('headck', value);
697 
					this.innerHTML="我的需求";
698 
					this.setAttribute("ck1","2");
699 
					oneedval.value = '1';
700 700 
				}
701 701 
				otypeval.value = '0';
702 702 
				ostateval.value = '0';
703 703 
				osortval.value = '1';
704 
				document.getElementById("headck2").innerHTML = "咨询类型";
704 
				/*document.getElementById("headck2").innerHTML = "咨询类型";*/
705 705 
				document.getElementById("headck3").innerHTML = "咨询状态";
706 706 
				document.getElementById("headck4").innerHTML = "按最后回复排序";
707 707 
			    var aSpan=document.getElementById("logined").querySelectorAll("li");
 
@ -713,11 +713,11 @@ function checkedFun(i) {
713 713 
				var value = this.getAttribute("ck" + i);
714 714 
				document.getElementById("headck" + i).setAttribute('headck', value);
715 715 
				//咨询类型传值不同，传""(空)，技术咨询、资源咨询、其他事务
716 
				otypeval.value = document.getElementById("headck2").getAttribute('headck');
716 
				//otypeval.value = document.getElementById("headck2").getAttribute('headck');
717 717 
				if(otypeval.value == 0) {
718 718 
					otypeval.value = '';
719 719 
				} else {
720 
					otypeval.value = document.getElementById("headck2").innerHTML;
720 
					//otypeval.value = document.getElementById("headck2").innerHTML;
721 721 
				}
722 722
723 723 
				if(oFlag1==1){

+ 5 - 4
app/js/public/base.js
Voir le fichier 

@ -1,10 +1,11 @@
1 
//公共文件
2 
//mui.init();
1 
//公共文件
2 
//mui.init();
3
3 4 
//var baseUrl = "http://www.ekexiu.com";
4 5 
//var wlogurl="http://www.ekexiu.com:8082";
5 6 
var baseUrl = "http://192.168.3.233:81";
6 7 
var wlogurl = "http://192.168.3.233:8080";
7
8
8 9 
toastStyle = {
9 10 
	'verticalAlign': 'top',
10 11 
}

@ -674,4 +675,4 @@ mui.ready(function() {
674 675 
		}
675 676 
		wlog("ad", adId, "2");
676 677 
	})
677 
})
678 
})