Merge branch 'master' of codeup.aliyun.com:6265f483e4166464dc2f9c14/boeu/mobile

pages/login/loading.vue

@@ -19,7 +19,7 @@
 		mounted() {
 			let token=getToken();
 			let $this=this;
-			//console.log(token,'得到token');
+			console.log(token,'得到token');
 			if(!token){
 				console.log('未获得token,转向登录');
 			  //this.$router.push({ path: process.env.VUE_APP_LOGIN_URL })
@@ -32,13 +32,15 @@
 			}else{
 				uni.showModal({
 					title:'获取用户信息',
-					content:openUrl
+					content:''
 				})
+				console.log('获取用户信息');
 			  apiLogin.boeLogin(token).then(rs=>{
 				if(rs.status==200){
+					console.log('获取用户信息成功');
 					uni.showModal({
 						title:'获取用户成功',
-						content:openUrl
+						content:rs.status
 					})
 				  //setToken(rs.result.access_token);
 				  //加载用户信息
@@ -51,6 +53,7 @@
 						 uni.setStorageSync("boe_new_login",1);//记录新登录
 						 let openUrl=$this.toUrl;
 						 if(openUrl){
+							console.log('跳转url='+openUrl);
 							if(openUrl.startsWith('http')){
 								uni.showModal({
 									title:'跳转url0',
@@ -75,12 +78,14 @@
 								}
 							}
 						 }else{
+							console.log('跳转到首页');
 							uni.switchTab({
 								url:'/pages/index/index'
 							})
 						 }
 						 
 					}).catch(error => {
+						console.log('加载用户信息错误：',error);
 					    uni.showModal({
 						title:'错误',
 					    	content:error