Merge pull request 'zmr' (#45) from zmr into master

Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/45

pageA/login/login.vue

@@ -152,18 +152,27 @@
 					console.log(res)
 					// console.log(res)
 					if (res.errCode == 0) {
-						// 缓存用户的信息
+						if(res.data == ''){
-						uni.setStorage({
+							this.$refs.uToast.show({
-							key: 'user_info',
+								title: res.message,
-							data: res.data,
+								type: 'error'
-							success: function() {
+							})
-								console.log('success');
+							return false
-								// 跳转首页
+						}else{
-								uni.navigateTo({
+							// 缓存用户的信息
-									url : '/pageA/topick/topick'
+							uni.setStorage({
-								})
+								key: 'user_info',
-							}
+								data: res.data,
-						});
+								success: function() {
+									console.log('success');
+									// 跳转首页
+									uni.navigateTo({
+										url : '/pageA/topick/topick'
+									})
+								}
+							});
+						}
+						
 						
 						// 存储接口请求所需token
 						uni.setStorage({