From 6188192b00d97ea8aac27f0d1ba3dd3a8764c46c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=93=E5=B9=B3=E8=89=BA?= <52643018@qq.com>
Date: Wed, 15 Sep 2021 14:29:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E8=8E=B7=E5=8F=96=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
 pages/user/my/center.vue         | 134 +++++++++++++++++++++++++++++--
 pages/user/my/setting.vue        |   5 +-
 pages/user/register/register.vue |  62 +++++---------
 3 files changed, 149 insertions(+), 52 deletions(-)
diff --git a/pages/user/my/center.vue b/pages/user/my/center.vue
index ba3f040..d9670c9 100644
--- a/pages/user/my/center.vue
+++ b/pages/user/my/center.vue
@@ -6,12 +6,13 @@
 			
 			
 			
-				
-					
-						
+				
+					
+						
+						
 					
-					
-						182****5380 
+					
+						{{ userInfo.mobile_replace || '未登录,点此登录' }}
 						
 					
 				
@@ -99,6 +100,7 @@
 
 
 
diff --git a/pages/user/my/setting.vue b/pages/user/my/setting.vue
index fc7ae0e..2edc5a6 100644
--- a/pages/user/my/setting.vue
+++ b/pages/user/my/setting.vue
@@ -95,10 +95,7 @@
 	export default {
 		methods: {
 			signOut(){
-				// TODO 借用该按钮进入登录页,对接逻辑时删除
-				// pages/user/register/register  微信
-				// pages/user/loginType/loginType 手机号
-				this.$url('/pages/user/register/register');
+				this.$msg('敬请期待')
 			}
 		}
 	}
diff --git a/pages/user/register/register.vue b/pages/user/register/register.vue
index 2f9f924..7672f55 100644
--- a/pages/user/register/register.vue
+++ b/pages/user/register/register.vue
@@ -132,23 +132,7 @@
 							var access_token = res.data.token_type + ' ' + res.data.access_token;
 							var expires_in = res.data.expires_in || 315360000;
 							this.$cookieStorage.set("user_token", access_token, expires_in);
-							
-							if (this.url) {
-								uni.redirectTo({
-									url: "/" + this.url,
-									// fail: () => {
-									// 	uni.switchTab({
-									// 		url: "/" + this.url
-									// 	});
-									// }
-								})
-			
-							} else {
-								// uni.switchTab({
-								// 	url: '/pages/user/personal/personal'
-								// });
-								this.$url('/pages/user/my/center', {type: 'launch'})
-							}
+							this.getUserInfo(access_token);
 						} else {
 							uni.hideLoading();
 						}
@@ -215,33 +199,9 @@
 						if (res.data.access_token) {
 							var access_token = res.data.token_type + ' ' + res.data.access_token;
 							var expires_in = res.data.expires_in || 315360000; // debugger;
-			
+							this.getUserInfo(access_token);
 							this.$cookieStorage.set("user_token", access_token, expires_in); // this.$cookieStorage.set("user_token",access_token,expires_in);
 							// uni.setStorageSync("user_token",access_token);
-			
-							if (this.url) {
-			// 					var path = ['pages/entity/store/store', 'pages/index/index/index',
-			// 						'pages/index/classification/classification', 'pages/store/tabCart/tabCart', 'pages/user/personal/personal',
-			// 						'pages/travels/index/index', 'pages/user/collar/collar'
-			// 					];
-			// 					var pathIndex = path.indexOf(this.url);
-			
-			// 					if (pathIndex == -1) {
-			// 						uni.redirectTo({
-			// 							url: "/" + this.url
-			// 						});
-			// 					} else {
-			// 						uni.switchTab({
-			// 							url: "/" + this.url
-			// 						});
-			// 					}
-								this.$url("/" + this.url, {type: 'redirect'});
-							} else {
-								// uni.switchTab({
-								// 	url: '/pages/user/personal/personal'
-								// });
-								this.$url('/pages/user/my/center', {type: 'launch'})
-							}
 						} else {
 							uni.showModal({
 								content: res.message || '请求失败,请重试',
@@ -264,6 +224,24 @@
 					});
 				});
 			},
+			// 接口获取用户信息
+			getUserInfo(token){
+				this.$http.get({
+					api: 'api/user',
+					header: {
+						Authorization: token
+					}
+				}).then(res => {
+					// console.log("1111", res)
+					// this.userInfo = res.data;
+					this.$cookieStorage.set('user_info', res.data);
+					if (this.url) {
+						this.$url("/" + this.url, {type: 'redirect'});
+					} else {
+						this.$url('/pages/user/my/center', {type: 'launch'})
+					}
+				})
+			},
 			// 跳转到手机号验证码登录
 			toPhoneLogin(){
 				if (this.url) {