From 14610c0a3c22afcd2390fb6cf0f973bb95df7302 Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Sun, 6 Nov 2022 19:16:12 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8A=A0=E6=9B=B4=E5=A4=9A=E7=9A=84?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/login/loading.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pages/login/loading.vue b/pages/login/loading.vue
index 6367933..95a9a9e 100644
--- a/pages/login/loading.vue
+++ b/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 })
@@ -34,8 +34,10 @@
 					title:'获取用户信息',
 					content:openUrl
 				})
+				console.log('获取用户信息');
 			  apiLogin.boeLogin(token).then(rs=>{
 				if(rs.status==200){
+					console.log('获取用户信息成功');
 					uni.showModal({
 						title:'获取用户成功',
 						content:openUrl
@@ -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

From ba0c306f3c3c2e327df660178fedf7778345bc5b Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Sun, 6 Nov 2022 19:18:37 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/login/loading.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/login/loading.vue b/pages/login/loading.vue
index 95a9a9e..5f06414 100644
--- a/pages/login/loading.vue
+++ b/pages/login/loading.vue
@@ -32,7 +32,7 @@
 			}else{
 				uni.showModal({
 					title:'获取用户信息',
-					content:openUrl
+					content:''
 				})
 				console.log('获取用户信息');
 			  apiLogin.boeLogin(token).then(rs=>{
@@ -40,7 +40,7 @@
 					console.log('获取用户信息成功');
 					uni.showModal({
 						title:'获取用户成功',
-						content:openUrl
+						content:rs.status
 					})
 				  //setToken(rs.result.access_token);
 				  //加载用户信息