浏览代码

Merge branch 'master' of http://121.42.53.174:3000/bulomakaka/ekexiu.app.git

lipengtao 8 年之前
父节点
当前提交
d85cfda15e
共有 5 个文件被更改,包括 55 次插入125 次删除
  1. 5 37
      app/html/consultlist.html
  2. 1 1
      app/js/chats.js
  3. 18 8
      app/js/claims.js
  4. 18 64
      app/js/consult.js
  5. 13 15
      app/js/feedback.js

+ 5 - 37
app/html/consultlist.html

84
    	<input type="text" id="sortval" value="1" />
84
    	<input type="text" id="sortval" value="1" />
85
	</div>
85
	</div>
86
    <!-- 主页面内容容器 -->
86
    <!-- 主页面内容容器 -->
87
    <div class="mui-content">
87
    <div class="mui-content" id="logined">
88
    	<!-- 主界面具体展示内容 -->
88
    	<!-- 主界面具体展示内容 -->
89
    	<div class="filterbox2 filterdiv" style="top:44px ;left: 0;">
89
    	<div class="filterbox2 filterdiv" style="top:44px ;left: 0;">
90
			<ul class="filterblock2">
90
			<ul class="filterblock2">
157
       	
157
       	
158
       	<div id="zixunpullrefresh" class="mui-card-content"  style="margin-top:40px; ">
158
       	<div id="zixunpullrefresh" class="mui-card-content"  style="margin-top:40px; ">
159
	      <ul class="mui-table-view protable" id="table">
159
	      <ul class="mui-table-view protable" id="table">
160
				<li class="mui-table-view-cell mui-media">
161
					<div class="coutopicbox">
162
						<span class="coutheme mui-ellipsis mui-pull-left">title</span>
163
						<div class="coustatus mui-pull-right"><span class="aimlabel">consultType</span>
164
							<span class="'+statusStyle+' status" consultId="'+item[" consultId "]+'">status</span></div>
165
					</div>
166
					<a class="proinfor itemBtn" consultId="'+item[" consultId "]+'" consultantId="'+item[" consultantId "]+'">
167
						<span class="mui-badge mui-badge-danger readstate " style ="display: none;">unreadCount</span>
168
						<img class="mui-media-object mui-pull-left headimg headRadius" src="'+photoUrl+'">
169
						<div class="mui-media-body">
170
							<span class="listtit">'+item["professor"]["name"]+'<em class="mui-icon iconfont icon-vip '+proModify+'"></em><span class="thistime">'+lastReplyTime+'</span></span>
171
							<p class="listtit2"><span>'+zhicehng+'</span><span>'+zhiwei+'</span><span>'+orgName+'</span><span>'+address+'</span></p>
172
							<p class="listtit3">'+lastReplyCon+'</p>
173
						</div>
174
					</a>
175
	           </li>
176
	           
177
	           <li class="mui-table-view-cell mui-media">
178
					<div class="coutopicbox">
179
						<span class="coutheme mui-ellipsis mui-pull-left">title</span>
180
						<div class="coustatus mui-pull-right"><span class="aimlabel">consultType</span>
181
							<span class="'+statusStyle+' status" consultId="'+item[" consultId "]+'">status</span></div>
182
					</div>
183
					<a class="proinfor itemBtn" consultId="'+item[" consultId "]+'" consultantId="'+item[" consultantId "]+'">
184
						<span class="mui-badge mui-badge-danger readstate " style ="display: none;">unreadCount</span>
185
						<img class="mui-media-object mui-pull-left headimg headRadius" src="'+photoUrl+'">
186
						<div class="mui-media-body">
187
							<span class="listtit">'+item["professor"]["name"]+'<em class="mui-icon iconfont icon-vip '+proModify+'"></em><span class="thistime">'+lastReplyTime+'</span></span>
188
							<p class="listtit2"><span>'+zhicehng+'</span><span>'+zhiwei+'</span><span>'+orgName+'</span><span>'+address+'</span></p>
189
							<p class="listtit3">'+lastReplyCon+'</p>
190
						</div>
191
					</a>
192
	           </li>
160
				
193
	        </ul>
161
	        </ul>
194
        </div>
162
        </div>
195
        
163
        
197
    </div>
165
    </div>
198
	
166
	
199
	<!--未登录或者未注册时咨询主页面-->
167
	<!--未登录或者未注册时咨询主页面-->
200
	<div class="mui-content" >
168
	<div class="mui-content" id="unlogin">
201
		<div class="imgdiv">
169
		<div class="imgdiv">
202
			<img class="chat" src="../images/chat.png"/>
170
			<img class="chat" src="../images/chat.png"/>
203
		</div>
171
		</div>
217
	<script src="../js/consult.js"></script>
185
	<script src="../js/consult.js"></script>
218
   	<script type="text/javascript" charset="utf-8">
186
   	<script type="text/javascript" charset="utf-8">
219
   	mui.plusReady(function() {
187
   	mui.plusReady(function() {
220
   		var  content1 = document.querySelectorAll('.mui-content')[0];
221
      	var  content2 = document.querySelectorAll('.mui-content')[1];
188
   		var  content1 = document.getElementById('logined');
189
      	var  content2 = document.getElementById('unlogin');
222
   		var userid = plus.storage.getItem('userid');
190
   		var userid = plus.storage.getItem('userid');
223
   		if(userid == null || userid == 'null'){
191
   		if(userid == null || userid == 'null'){
224
   			content1.style.display = 'none';
192
   			content1.style.display = 'none';

+ 1 - 1
app/js/chats.js

246
			
246
			
247
			var consultList = plus.webview.getWebviewById('html/consultlist.html');
247
			var consultList = plus.webview.getWebviewById('html/consultlist.html');
248
//			console.log(consultId)
248
//			console.log(consultId)
249
			consultList.show();
249
//			consultList.show();
250
			mui.fire(consultList,'backlist',{'consultId':consultId,'status':status}); 
250
			mui.fire(consultList,'backlist',{'consultId':consultId,'status':status}); 
251
	
251
	
252
		});
252
		});

+ 18 - 8
app/js/claims.js

4
	
4
	
5
	/*提交*/
5
	/*提交*/
6
	function sendClaims(userid) {
6
	function sendClaims(userid) {
7
		mui.ajax(baseUrl+'',{
7
		console.log('投诉内容:=='+tousuCon.value);
8
		mui.ajax(baseUrl+'/ajax/complain',{
8
			data:{
9
			data:{
9
				
10
				"professorId": userid, //投诉人ID (必填)
11
				"complainContant": tousuCon.value, //投诉内容 (必填)
12
				"appellee": "", //被投诉ID (可为空,类型为建议时为空)
13
				"complainType": 1 //投诉类型 (0-建议,1-投诉) 
10
			},
14
			},
11
			dataType:'json',//服务器返回json格式数据
15
			dataType:'json',//服务器返回json格式数据
12
			type:'post',//HTTP请求类型
16
			type:'post',//HTTP请求类型
13
			timeout:10000,//超时时间设置为10秒;
17
			timeout:10000,//超时时间设置为10秒;
14
			success:function(data){
18
			success:function(data){
15
				
16
			},
19
				console.log(data.data);
20
				if(data.data){
21
					tousuCon.value = '';//投诉完成后,清空容器
22
					mui.toast('已提交');
23
				}
24
			}, 
17
			error:function(xhr,type,errorThrown){
25
			error:function(xhr,type,errorThrown){
18
				mui.toast('提交失败');
26
				mui.toast('提交失败');
19
			}
27
			}
46
		var self = plus.webview.currentWebview();
54
		var self = plus.webview.currentWebview();
47
		var userId = self.userId;
55
		var userId = self.userId;
48
		console.log(userId);
56
		console.log(userId);
49
	});
50
	
51
	sendBtn.addEventListener('tap',function(){
52
//			sendClaims(userId);
57
		
58
		sendBtn.addEventListener('tap',function(){
59
			sendClaims(userId);
60
		});
61
		
62
		
53
	});
63
	});
54
	
64
	
55
});
65
});

+ 18 - 64
app/js/consult.js

1
/*是否登录,要显示的,mui-content*/
1
/*是否登录,要显示的,mui-content*/
2
var  content1 = document.querySelectorAll('.mui-content')[0];
3
var  content2 = document.querySelectorAll('.mui-content')[1];
2
var  content1 = document.getElementById('logined');
3
var  content2 = document.getElementById('unlogin');
4
4
5
var pageIndex = 1; // 页数
5
var pageIndex = 1; // 页数
6
var allPages = 1; // 总页数
6
var allPages = 1; // 总页数
85
mui.init({
85
mui.init({
86
    pullRefresh: {
86
    pullRefresh: {
87
    	container: '#zixunpullrefresh',
87
    	container: '#zixunpullrefresh',
88
    	/*down: {
88
    	down: {
89
        	auto: true,
89
        	auto: true,
90
		    contentdown : "下拉可以刷新",
90
		    contentdown : "下拉可以刷新",
91
		    contentover : "释放立即刷新",
91
		    contentover : "释放立即刷新",
92
		    contentrefresh : "正在刷新...",
92
		    contentrefresh : "正在刷新...",
93
            callback: pulldownRefresh
93
            callback: pulldownRefresh
94
       },*/
94
       },
95
        up: {
95
        up: {
96
            contentrefresh: '正在加载...',
96
            contentrefresh: '正在加载...',
97
            callback: pullupRefresh
97
            callback: pullupRefresh
104
function pulldownRefresh() {
104
function pulldownRefresh() {
105
    pageIndex = 1;
105
    pageIndex = 1;
106
    console.log('下拉刷新');
106
    console.log('下拉刷新');
107
    /*document.querySelector('header.mui-bar').style.display='none';
108
    document.querySelector('.filterdiv').style.display='none';*/
107
    //table.innerHTML = '';
109
    //table.innerHTML = '';
108
    setTimeout(function() {
110
    setTimeout(function() {
109
        getaData();
111
        getaData();
117
    pageIndex = ++pageIndex;
119
    pageIndex = ++pageIndex;
118
    console.log('第'+pageIndex+'页');
120
    console.log('第'+pageIndex+'页');
119
    console.log('上拉加载更多');
121
    console.log('上拉加载更多');
122
    
120
    setTimeout(function() {
123
    setTimeout(function() {
121
        getaData();
124
        getaData();
122
    }, 1000);
125
    }, 1000);
202
                    if (allPages == 1) { //下拉刷新需要先清空数据
205
                    if (allPages == 1) { //下拉刷新需要先清空数据
203
                        table.innerHTML = '';// 在这里清空可以防止刷新时白屏
206
                        table.innerHTML = '';// 在这里清空可以防止刷新时白屏
204
                    }
207
                    }
208
                    if(pageIndex == 1){
209
                    	table.innerHTML = '';
210
                    	/*document.querySelector('header.mui-bar').style.display='block';
211
    					document.querySelector('.filterdiv').style.display='block';*/
212
                    }
205
                    
213
                    
206
                    eachData(userid,datalist);
214
                    eachData(userid,datalist);
207
                   
215
                   
384
	});
392
	});
385
	
393
	
386
function eachData(userid,datalist) {
394
function eachData(userid,datalist) {
395
	
387
	/*表格填充数据 mui.each是异步的*/
396
	/*表格填充数据 mui.each是异步的*/
388
    mui.each(datalist, function(index, item) {
397
    mui.each(datalist, function(index, item) {
389
    	var title,
398
    	var title,
390
			zhicehng,
391
			zhiwei,
392
			orgName,
393
			address,
394
			lastReply,
399
			lastReply,
395
			status,
400
			status,
396
			statusStyle,
401
			statusStyle,
402
			photoUrl,
407
			photoUrl,
403
			consultType,
408
			consultType,
404
			chatlength;
409
			chatlength;
405
			
410
		
411
		//过滤professor为空
412
		if(item["professor"]){
413
		
406
		chatlength = isChat(item['consultId'],userid);//判断对方是否有发出消息
414
		chatlength = isChat(item['consultId'],userid);//判断对方是否有发出消息
407
		if(chatlength == 0){
415
		if(chatlength == 0){
408
			title =  item["consultTitle"];	
416
			title =  item["consultTitle"];	
434
			}
442
			}
435
		};
443
		};
436
		
444
		
437
		if(item["professor"] == undefined){
438
			return ;
439
		}
440
		
445
		
441
		(item["professor"]["authentication"] == true)? proModify = 'authicon' : proModify = 'unauthicon';
446
		(item["professor"]["authentication"] == true)? proModify = 'authicon' : proModify = 'unauthicon';
442
		(item["professor"]["hasHeadImage"] == 0) ? photoUrl = "../images/default-photo.jpg":photoUrl = baseUrl + "/images/head/" + item["professor"].id + "_m.jpg";
447
		(item["professor"]["hasHeadImage"] == 0) ? photoUrl = "../images/default-photo.jpg":photoUrl = baseUrl + "/images/head/" + item["professor"].id + "_m.jpg";
443
		
448
		
444
		/*if(item["professor"]["title"] == undefined || item["professor"]["title"] == null || item["professor"]["title"] == ''){
445
			zhicehng = '';
446
		}else {
447
			zhicehng = item["professor"]["title"];
448
		}
449
		if(item["professor"]["office"] == undefined || item["professor"]["office"] == null || item["professor"]["office"] == ''){
450
			zhiwei = '';
451
		}else {
452
			if(zhicehng != ''){
453
				zhiwei = ', '+item["professor"]["office"];
454
			}else{
455
				zhiwei = item["professor"]["office"];
456
			}
457
		}
458
		if(item["professor"]["orgName"] == undefined || item["professor"]["orgName"] == null || item["professor"]["orgName"] == ''){
459
			orgName = '';
460
		}else {
461
			if(zhicehng != '' || zhiwei != ''){
462
				orgName = ', '+item["professor"]["orgName"];
463
			}else {
464
				orgName = item["professor"]["orgName"];
465
			}
466
		}
467
		if(item["professor"]["address"] == undefined || item["professor"]["address"] == null || item["professor"]["address"] == ''){
468
			address = '';
469
		}else {
470
			if(zhicehng != '' || zhiwei != '' || orgName !=''){
471
				address = ' | ' + item["professor"]["address"];
472
			}else {
473
				address = item["professor"]["address"];
474
			}
475
		}*/
476
		
477
		
478
		
479
		
480
		
481
		//咨询类型,只取两个字
449
		//咨询类型,只取两个字
482
		if(item["consultType"]) {
450
		if(item["consultType"]) {
483
			consultType = item["consultType"].substr(0,2);
451
			consultType = item["consultType"].substr(0,2);
526
        str +='</p><p class="listtit3 onlyone">'+lastReplyCon+'</p></div></a>';
494
        str +='</p><p class="listtit3 onlyone">'+lastReplyCon+'</p></div></a>';
527
        
495
        
528
		li.innerHTML = str;
496
		li.innerHTML = str;
529
		
530
		
531
        /*li.innerHTML = '<div class="coutopicbox">'
532
            		+ '<span class="coutheme mui-ellipsis mui-pull-left">'+title+'</span>'
533
            		+ '<div class="coustatus mui-pull-right"><span class="aimlabel">'+consultType+'</span>'
534
            		+ '<span class="'+statusStyle+' status" consultId="'+item["consultId"]+'">'+status+'</span></div></div>'
535
            		+ '<a class="proinfor itemBtn" consultId="'+item["consultId"]+'" consultantId="'+item["consultantId"]+'" >'
536
					+ '<span class="mui-badge mui-badge-danger readstate '+unreadStyle+'" consultId="'+item["consultId"]+'">'+unreadCount+'</span>'
537
	        		+ '<img class="mui-media-object mui-pull-left headimg headRadius" src="'+photoUrl+'">'
538
            		+ '<div class="mui-media-body">'
539
            		+ '<span class="listtit">'+item["professor"]["name"]+'<em class="mui-icon iconfont icon-vip '+proModify+'"></em><span class="thistime">'+lastReplyTime+'</span></span>'	
540
            		+ '<p class="listtit2"><span>'+zhicehng+'</span><span>'+zhiwei+'</span><span>'+orgName+'</span><span>'+address+'</span></p>'
541
            		+ '<p class="listtit3 onlyone">'+lastReplyCon+'</p>'
542
            		+ '</div></a>';*/
543
            		
544
        table.appendChild(li,table.firstChild);
497
        table.appendChild(li,table.firstChild);
498
       }
545
    });
499
    });
546
	
500
	
547
};
501
};

+ 13 - 15
app/js/feedback.js

5
	
5
	
6
	/*提交反馈*/
6
	/*提交反馈*/
7
	function sendFeedBack(userid){
7
	function sendFeedBack(userid){
8
		
9
		mui.ajax(baseUrl+'',{
8
		console.log('反馈内容:=='+feedbackCon.value);
9
//		console.log(typeof(feedbackCon.value))
10
		mui.ajax(baseUrl+'/ajax/complain',{
10
			data:{
11
			data:{
11
				
12
				"professorId": userid, //投诉人ID (必填)
13
				"complainContant": feedbackCon.value, //投诉内容 (必填)
14
				"appellee": "", //被投诉ID (可为空,类型为建议时为空)
15
				"complainType": 0 //投诉类型 (0-建议,1-投诉) 
12
			},
16
			},
13
			dataType:'json',//服务器返回json格式数据
17
			dataType:'json',//服务器返回json格式数据
14
			type:'post',//HTTP请求类型
18
			type:'post',//HTTP请求类型
15
			timeout:10000,//超时时间设置为10秒;
19
			timeout:10000,//超时时间设置为10秒;
16
			success:function(data){
20
			success:function(data){
17
				
21
//				console.log(data.data);
22
				if(data.data){
23
					feedbackCon.value = '';//反馈完成后,清空容器
24
					mui.toast('谢谢,已提交');
25
				}
18
			},
26
			},
19
			error:function(xhr,type,errorThrown){
27
			error:function(xhr,type,errorThrown){
20
				mui.toast('反馈失败');
28
				mui.toast('反馈失败');
50
		console.log(userId);
58
		console.log(userId);
51
		
59
		
52
		sendBtn.addEventListener('tap',function(){
60
		sendBtn.addEventListener('tap',function(){
53
//			sendFeedBack(userId);
61
			sendFeedBack(userId);
54
		});
62
		});
55
		
63
		
56
		
57
		
58
		
59
		
60
		
61
		
62
		
63
		
64
		
65
		
66
	});
64
	});
67
	
65
	
68
});
66
});