Browse Source

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

xiaoai_123 8 years ago
parent
commit
95e018da31
5 changed files with 232 additions and 150 deletions
  1. 14 79
      app/html/index_home.html
  2. 2 2
      app/html/security.html
  3. 5 0
      app/js/bindphone.js
  4. 155 50
      app/js/index.js
  5. 56 19
      app/js/security.js

+ 14 - 79
app/html/index_home.html

@ -6,6 +6,7 @@
6 6
<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
7 7
<link href="../css/mui.min.css" rel="stylesheet" />
8 8
<link href="../css/app.css" rel="stylesheet" />
9
<link href="../css/iconfont.css" rel="stylesheet" />
9 10
</head>
10 11
<body>
11 12
	
@ -127,89 +128,23 @@
127 128
        	<div class="maintitbox">
128 129
        		<h4 class="maintit">热门专家</h4>
129 130
        	</div>
130
	        <ul class="mui-table-view protable" id="indexlist">
131
	            <li class="mui-table-view-cell mui-media">
132
	                <a class="proinfor" href="html/proinforbrow.html">
133
	                    <img class="mui-media-object mui-pull-left headimg" src="../images/default-photo.jpg">
134
	                    <div class="mui-media-body">
135
	                        <span class="listtit">专家姓名<img class="smallicon authicon" src="images/authicon.png"/></span>	
136
	                        <p class="listtit2"><span>职称</span>,<span>职务</span>,<span>所属机构</span> | <span>所在地</span></p>
137
	                    	<p class="mui-ellipsis listtit3"><span>研究方向标题A</span>、<span>研究方向标题B</span></p>
138
	                    	<p class="mui-ellipsis listtit3"><span>设备资源名称A</span>、<span>设备资源名称B</span>、<span>设备资源名称B</span></p>
139
	                    </div>
140
	                </a>
141
	            </li>
142
	            <li class="mui-table-view-cell mui-media">
143
	                <a href="javascript:;">
144
	                    <img class="mui-media-object mui-pull-left headimg" src="images/default-photo.jpg">
145
	                    <div class="mui-media-body">
146
	                        <span class="listtit">专家姓名<img class="smallicon authicon" src="images/authicon.png"/></span>	
147
	                        <p class="listtit2"><span>职称</span>,<span>职务</span>, <span>所属机构</span> | <span>所在地</span></p>
148
	                    	<p class="mui-ellipsis listtit3"><span>研究方向标题A</span>、<span>研究方向标题B</span></p>
149
	                    	<p class="mui-ellipsis listtit3"><span>设备资源名称A</span>、<span>设备资源名称B</span>、<span>设备资源名称B</span></p>
150
	                    </div>
151
	                </a>
152
	            </li>
153
	            <li class="mui-table-view-cell mui-media">
154
	                <a href="javascript:;">
155
	                    <img class="mui-media-object mui-pull-left headimg" src="images/default-photo.jpg">
156
	                    <div class="mui-media-body">
157
	                        <span class="listtit">专家姓名<img class="smallicon authicon" src="images/authicon.png"/></span>	
158
	                        <p class="listtit2"><span>职称</span>,<span>职务</span>, <span>所属机构</span> | <span>所在地</span></p>
159
	                    	<p class="mui-ellipsis listtit3"><span>研究方向标题A</span>、<span>研究方向标题B</span></p>
160
	                    	<p class="mui-ellipsis listtit3"><span>设备资源名称A</span>、<span>设备资源名称B</span>、<span>设备资源名称B</span></p>
161
	                    </div>
162
	                </a>
163
	            </li>
164
	            <li class="mui-table-view-cell mui-media">
165
	                <a href="javascript:;">
166
	                    <img class="mui-media-object mui-pull-left headimg" src="images/default-photo.jpg">
167
	                    <div class="mui-media-body">
168
	                        <span class="listtit">专家姓名<img class="smallicon authicon" src="images/authicon.png"/></span>	
169
	                        <p class="listtit2"><span>职称</span>,<span>职务</span>, <span>所属机构</span> | <span>所在地</span></p>
170
	                    	<p class="mui-ellipsis listtit3"><span>研究方向标题A</span>、<span>研究方向标题B</span></p>
171
	                    	<p class="mui-ellipsis listtit3"><span>设备资源名称A</span>、<span>设备资源名称B</span>、<span>设备资源名称B</span></p>
172
	                    </div>
173
	                </a>
174
	            </li>
175
	            <li class="mui-table-view-cell mui-media">
176
	                <a href="javascript:;">
177
	                    <img class="mui-media-object mui-pull-left headimg" src="images/default-photo.jpg">
178
	                    <div class="mui-media-body">
179
	                        <span class="listtit">专家姓名<img class="smallicon authicon" src="images/authicon.png"/></span>	
180
	                        <p class="listtit2"><span>职称</span>,<span>职务</span>, <span>所属机构</span> | <span>所在地</span></p>
181
	                    	<p class="mui-ellipsis listtit3"><span>研究方向标题A</span>、<span>研究方向标题B</span></p>
182
	                    	<p class="mui-ellipsis listtit3"><span>设备资源名称A</span>、<span>设备资源名称B</span>、<span>设备资源名称B</span></p>
183
	                    </div>
184
	                </a>
185
	            </li>
186
	            <li class="mui-table-view-cell mui-media">
187
	                <a href="javascript:;">
188
	                    <img class="mui-media-object mui-pull-left headimg" src="images/default-photo.jpg">
189
	                    <div class="mui-media-body">
190
	                        <span class="listtit">专家姓名<img class="smallicon authicon" src="images/authicon.png"/></span>	
191
	                        <p class="listtit2"><span>职称</span>,<span>职务</span>, <span>所属机构</span> | <span>所在地</span></p>
192
	                    	<p class="mui-ellipsis listtit3"><span>研究方向标题A</span>、<span>研究方向标题B</span></p>
193
	                    	<p class="mui-ellipsis listtit3"><span>设备资源名称A</span>、<span>设备资源名称B</span>、<span>设备资源名称B</span></p>
194
	                    </div>
195
	                </a>
196
	            </li>
197
	            <li class="mui-table-view-cell mui-media">
198
	                <a href="javascript:;">
199
	                    <img class="mui-media-object mui-pull-left headimg" src="images/default-photo.jpg">
200
	                    <div class="mui-media-body">
201
	                        <span class="listtit">专家姓名<img class="smallicon authicon" src="images/authicon.png"/></span>	
202
	                        <p class="listtit2"><span>职称</span>,<span>职务</span>, <span>所属机构</span> | <span>所在地</span></p>
203
	                    	<p class="mui-ellipsis listtit3"><span>研究方向标题A</span>、<span>研究方向标题B</span></p>
204
	                    	<p class="mui-ellipsis listtit3"><span>设备资源名称A</span>、<span>设备资源名称B</span>、<span>设备资源名称B</span></p>
205
	                    </div>
206
	                </a>
207
	            </li>
208
	        </ul>
131
			
132
			<div id="pullrefresh" class="mui-content mui-scroll-wrapper">
133
				<div class="mui-scroll">
134
					<!--数据列表-->
135
					<ul class="mui-table-view mui-table-view-chevron list">
136
						
137
					</ul>
138
				</div>
139
			</div>
140
			
141
			
209 142
		</div>
143
		
210 144
    </div>
211 145
    <script src="../js/public/mui.min.js"></script>
212 146
	<script src="../js/public/base.js"></script>
213 147
	<script src="../js/index.js"></script>
148

214 149
</body>
215 150
</html>

+ 2 - 2
app/html/security.html

@ -31,13 +31,13 @@
31 31
				    <li class="mui-table-view-cell">
32 32
				        <a class="mui-navigate-right" id="bdPhone">
33 33
				        	<span class="mui-pull-left">已绑定手机</span>
34
				        	<span class="rightword" id="phonename">183******82</span>
34
				        	<span class="rightword" id="phonename"></span>
35 35
				        </a>
36 36
				    </li>
37 37
				    <li class="mui-table-view-cell">
38 38
				        <a class="mui-navigate-right" id="bdEmail">
39 39
				        	<span class="mui-pull-left">已绑定邮箱</span>
40
				        	<span class="rightword" id="emailname">183******82@qq.com</span>
40
				        	<span class="rightword" id="emailname"></span>
41 41
				        </a>
42 42
				    </li>
43 43
				</ul>

+ 5 - 0
app/js/bindphone.js

@ -170,6 +170,11 @@ mui.ready(function() {
170 170
					console.log(data.data);
171 171
					if(data.success && data.data) {
172 172
						plus.nativeUI.toast("手机绑定成功", toastStyle);
173
						var securityPage = plus.webview.getWebviewById('html/security.html');
174
						mui.fire(securityPage, 'closeUser', {
175
							phoneName: phoneName.value
176
						});
177
						mui.currentWebview.close();
173 178
						return;
174 179
					}else{
175 180
						plus.nativeUI.toast("手机绑定失败", toastStyle);

+ 155 - 50
app/js/index.js

@ -1,63 +1,168 @@
1 1
//首页
2
mui.ready(function() {
3
	/*定义全局变量*/
4
	var indexlist = document.getElementById("indexlist");
5
	var search = document.getElementById("search");
6
	
2
var pageIndex = 1; // 页数
3
var allPages = 1; // 总页数
4
var table = document.body.querySelector('.list');
5
var search = document.getElementById("search");
6

7
/*点击搜索按钮*/
8
search.addEventListener('focus', function() {
9
	var searchpage = mui.preload({
10
	    url: '../html/search.html',
11
		id: '../html/search.html',
12
	});
13
	searchpage.show("slide-in-right",150);
14
});
15

16
/*页面数据初始化*/
17
getOnePase();
18

19
mui.init({
20
	pullRefresh: {
21
		container: '#pullrefresh',
22
		up: {
23
			contentrefresh: '正在加载...',
24
			callback: pullupRefresh
25
		}
26
	}
27
});
28

29
function pullupRefresh() {
30
	pageIndex = ++pageIndex;
31
	setTimeout(function() {
32
		getaData()
33
	}, 1000);
34
}
35

36
if(mui.os.plus) {
7 37
	mui.plusReady(function() {
8
		
9
		/*点击搜索按钮*/
10
		search.addEventListener('focus', function() {
11
			var searchpage = mui.preload({
12
			    url: '../html/search.html',
13
				id: '../html/search.html',
14
			});
15
			searchpage.show("slide-in-right",150);
16
		});
17
		
18
		mui.ajax(baseUrl + '/ajax/professor/pqBaseInfo', {
38
		setTimeout(function() {
39
			mui('#pullrefresh').pullRefresh().pulldownLoading();
40
		}, 500);
41
	});
42
} else {
43
	mui.ready(function() {
44
		mui('#pullrefresh').pullRefresh().pulldownLoading();
45
	});
46
}
47

48
/*获取上拉加载更多数据*/
49
function getaData() {
50
	mui.plusReady(function() {
51
		mui.ajax(baseUrl + '/ajax/professor/pqHot', {
52
			data: {
53
				"pageNo": pageIndex,
54
				"pageSize": 10,
55
			},
19 56
			dataType: 'json', //数据格式类型
20 57
			type: 'GET', //http请求类型
21
			success: function($data) {
22
				var str = JSON.stringify($data.data)
23
				console.log(str);
24
				var finallist = '';
25
				if($data.success) {
26
					for(var i = 0; i < $data.data.pageSize; i++) {
27
						
28
						/*获取头像*/
29
						if($data.data.data[i].hasHeadImage == 1) {
30
							var img = "../images/head/" + $data.data.data[i].id + "_m.jpg";
31
						} else {
32
							var img = "../images/default-photo.jpg";
33
						}
34
						
35
						/*获取研究方向信息*/
36
						var researchAreas = $data.data.data[i].researchAreas;
37
						var rlist = ''
38
						for(var n = 0; n < researchAreas.length; n++) {
39
							console.log(researchAreas[n].caption);
40
							rlist+= '<span>' + researchAreas[n].caption + '</span>、';
41
						}
42
						
43
		               	//创建HTML标签  
44
						finallist += '<li class="mui-table-view-cell mui-media"><a class="proinfor" ';
45
						finallist += '<p><img class="mui-media-object mui-pull-left headimg" src="' + img + '"></p>';
46
						finallist += '<div class="mui-media-body">';
47
						finallist += '<span class="listtit">' + $data.data.data[i].name + '<img class="smallicon authicon" src="images/authicon.png"/></span>';
48
						finallist += '<p class="listtit2"><span>' + $data.data.data[i].title + '</span>,<span>职务</span>,<span>' + $data.data.data[i].orgName + '</span> | <span>' + $data.data.data[i].address + '</span></p>';
49
						finallist += '<p class="mui-ellipsis listtit3">'+rlist+'</p>';
50
						finallist += '<p class="mui-ellipsis listtit3"><span>设备资源名称A</span>、<span>设备资源名称B</span>、<span>设备资源名称B</span></p>';
51
						finallist += '</div></a></li>';
58
			timeout: 10000,
59
			success: function(data) {
60
				if(data.success) {
61
					//console.log("成功");
62
					var dice1 = data.data.total; //总条数
63
					var dice2 = data.data.pageSize; //每页条数
64
					var result = '';
65
					if(pageIndex == 1) { //下拉刷新需要先清空数据
66
						table.innerHTML = ''; // 在这里清空可以防止刷新时白屏
52 67
					}
68
					allPages = dice1 / dice2;
69
					var datalist = data.data.data;
70
					datalistEach(datalist);
71
					if(pageIndex < allPages) {
72
						mui('#pullrefresh').pullRefresh().endPullupToRefresh(false); /*能上拉*/
73
					} else {
74
						mui('#pullrefresh').pullRefresh().endPullupToRefresh(true); /*不能上拉*/
75
					}
76
				}
77
			},
78
			error: function() {
79
				plus.nativeUI.toast("服务器链接超时", toastStyle);
80
				mui('#pullrefresh').pullRefresh().endPullupToRefresh(true);
81
			}
82
		});
83
	});
84
}
85

86
/*获取第一页数据*/
87
function getOnePase() {
88
	mui.plusReady(function() {
89
		mui.ajax(baseUrl + '/ajax/professor/pqHot', {
90
			data: {
91
				"pageNo": 1,
92
				"pageSize": 10,
93
			},
94
			dataType: 'json', //数据格式类型
95
			type: 'GET', //http请求类型
96
			timeout: 10000,
97
			success: function(data) {
98
				if(data.success) {
99
					var datalist = data.data.data;
100
					datalistEach(datalist);
53 101
				}
54
				indexlist.innerHTML = finallist;
55
				
56 102
			},
57 103
			error: function() {
58 104
				plus.nativeUI.toast("服务器链接超时", toastStyle);
59 105
			}
60 106
		});
107
	});
108
}
109

110
/*数据遍历*/
111
function datalistEach(datalist) {
112
	mui.each(datalist, function(index, item) {
113
		/*获取头像*/
114
		if(item.hasHeadImage == 1) {
115
			var img = "../images/head/" + item.id + "_m.jpg";
116
		} else {
117
			var img = "../images/default-photo.jpg";
118
		}
119

120
		/*获取研究方向信息*/
121
		var researchAreas = item.researchAreas;
122
		var rlist = ''
123
		for(var n = 0; n < researchAreas.length; n++) {
124
			//console.log(researchAreas[n].caption);
125
			rlist = '<span>' + researchAreas[n].caption + '</span>、';
126
		}
127

128
		/*获取资源信息*/
129
		var resources = item.resources;
130
		var zlist = ''
131
		for(var m = 0; m < resources.length; m++) {
132
			//console.log(resources[m].caption);
133
			zlist = '<span>' + resources[m].resourceName + '</span>、';
134
		}
135

136
		var title = item.title || "";
137
		var office = item.office || "";
138
		var orgName = item.orgName || "";
139
		var address = item.address || "";
61 140

141
		if(title != "") {
142
			title = title + " , ";
143
		}
144
		if(office != "") {
145
			office = office + " , ";
146
		}
147
		if(orgName != "") {
148
			orgName = orgName;
149
		}
150
		if(address != "") {
151
			address = " | " + address;
152
		}
153

154
		var li = document.createElement('li');
155
		li.className = 'mui-table-view-cell mui-media';
156

157
		li.innerHTML = '<a class="proinfor" ' +
158
			'<p><img class="mui-media-object mui-pull-left headimg" src="' + img + '"></p>' +
159
			'<div class="mui-media-body">' +
160
			'<span class="listtit">' + item.name + '<em class="mui-icon iconfont icon-vip authicon"></em></span>' +
161
			'<p class="listtit2"><span>' + title + '</span><span>' + office + '</span><span>' + orgName + '</span><span>' + address + '</span></p>' +
162
			'<p class="mui-ellipsis listtit3">' + rlist + '</p>' +
163
			'<p class="mui-ellipsis listtit3">' + zlist + '</p>' +
164
			'</div></a></li>';
165

166
		table.appendChild(li, table.firstChild);
62 167
	});
63
});
168
}

+ 56 - 19
app/js/security.js

@ -8,29 +8,23 @@ mui.ready(function() {
8 8
	var phoneName = document.getElementById("phonename");
9 9
	var emailName = document.getElementById("emailname");
10 10
	var verified = document.getElementById("verified");
11

12
	var phoneCookie = "15010738349"
13
	var emailCookie = "374353146@qq.com";
11
	var phoneCookie = "";
12
	var emailCookie = "";
14 13

15 14
	mui.plusReady(function() {
16 15
		
17 16
		isAuthentication();
18

19
		/*判断是否绑定了手机号*/
20
		if(phoneCookie != "" && phoneCookie != null && phoneCookie != "null") {
21
			console.log(phoneCookie);
22
			phoneName.innerText = (phoneCookie.substring(0, 3) + "****" + phoneCookie.substring(7, 11));
23
		} else {
24
			phoneName.innerText = ("ddd");
25
		}
26

27
		/*判断是否绑定了邮箱*/
28
		if(emailCookie != "" && emailCookie != null && emailCookie != "null") {
29
			emailName.innerText = (emailCookie);
30
		} else {
31
			phoneName.innerText = ("");
32
		}
33

17
		
18
		lookup();
19
		
20
		/*退出绑定手机页面*/
21
        window.addEventListener('securityPage',function(event){
22
		    phoneName = event.detail.id;
23
		    ifPhoneAmdEmail(phoneCookie)
24
		})
25
		
26
		
27
		
34 28
		bdEmail.addEventListener('tap', function() {
35 29
			mui.openWindow({
36 30
				url: '../html/bindmail.html',
@ -61,12 +55,30 @@ mui.ready(function() {
61 55
			});
62 56
		})
63 57

58
		function ifPhoneAmdEmail(){
59
			/*判断是否绑定了手机号*/
60
			if(phoneCookie != "" && phoneCookie != null && phoneCookie != "null") {
61
				/*phoneName.innerText = (phoneCookie.substring(0, 3) + "****" + phoneCookie.substring(7, 11));*/
62
				 phoneName.innerText = (phoneCookie);
63
			} else {
64
				phoneName.innerText = ("请绑定手机号");
65
			}
66
	
67
			/*判断是否绑定了邮箱*/
68
			if(emailCookie != "" && emailCookie != null && emailCookie != "null") {
69
				emailName.innerText = (emailCookie);
70
			} else {
71
				emailName.innerText = ("请绑定邮箱");
72
			}
73
		}
74

64 75
		function isAuthentication() {
65 76
			var userId = plus.storage.getItem('userid');
66 77
			mui.ajax(baseUrl + "/ajax/professor/editBaseInfo/" + userId, {
67 78
				dataType: 'json', //数据格式类型
68 79
				type: 'GET', //http请求类型
69 80
				timeout: 10000, //超时设置
81
				async: false,
70 82
				success: function(data) {
71 83
					var $info = data.data || {}
72 84
					if(data.success && data.data) {
@ -83,6 +95,31 @@ mui.ready(function() {
83 95
				}
84 96
			});
85 97
		}
98
        
99
        function lookup() {
100
			var userId = plus.storage.getItem('userid');
101
			mui.ajax(baseUrl + "/ajax/qaUser" , {
102
				data:{
103
					id:userId
104
				},
105
				dataType: 'json', //数据格式类型
106
				type: 'GET', //http请求类型
107
				timeout: 10000, //超时设置
108
				async: false,
109
				success: function(data) {
110
					var $info = data.data || {}
111
					if(data.success && $info) {
112
						emailCookie = $info.email;
113
						phoneCookie = $info.mobilePhone;
114
                        ifPhoneAmdEmail(phoneCookie,emailCookie)					
115
					}
116
				},
117
				error: function() {
118
					plus.nativeUI.toast("服务器链接超时", toastStyle);
119
					return;
120
				}
121
			});
122
		}
86 123

87 124
	})
88 125