From 0f6fe1eb6beba2067f7ef9a5b17070b97c8d7974 Mon Sep 17 00:00:00 2001
From: stivepeim <peimm126@126.com>
Date: Thu, 6 May 2021 14:47:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E6=8E=88=E6=9D=83=E7=99=BB=E5=BD=95=E5=90=8E=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/libs/routine.js                    | 10 ++-
 app/pages/users/wechat_login/index.vue | 89 ++++++++++++--------------
 2 files changed, 45 insertions(+), 54 deletions(-)

diff --git a/app/libs/routine.js b/app/libs/routine.js
index 8130e82c..e1c1734a 100644
--- a/app/libs/routine.js
+++ b/app/libs/routine.js
@@ -122,17 +122,15 @@ class Routine
 		return new Promise((resolve, reject)=>{
 			login(code,data).then(res=>{
 				if(res.data.type==='login'){
-					// let time = res.data.expiresTime - Cache.time();
-					store.commit('UPDATE_USERINFO', res.data.user);
-					store.commit('LOGIN', {token:res.data.token});
-					// Cache.set(EXPIRES_TIME,res.data.expiresTime,time);
-					Cache.set(USER_INFO,res.data.user);
+					store.commit('LOGIN', {
+						token: res.data.token
+					});
 				}
 				return resolve(res);
 			}).catch(res=>{
 				return reject(res);
 			})
-		})
+		});
 	}
 }
 
diff --git a/app/pages/users/wechat_login/index.vue b/app/pages/users/wechat_login/index.vue
index 7acc99c9..fac04bb4 100644
--- a/app/pages/users/wechat_login/index.vue
+++ b/app/pages/users/wechat_login/index.vue
@@ -269,56 +269,49 @@
 						uni.hideLoading();
 					});
 			},
-			getWxUser(code) {
-				let self = this
-				Routine.getUserInfo()
-					.then(res => {
-						let userInfo = res.userInfo;
-						userInfo.code = code;
-						userInfo.spread_spid = app.globalData.spid;//获取推广人ID
-						userInfo.spread_code = app.globalData.code;//获取推广人分享二维码ID
-						userInfo.avatar  = userInfo.userInfo.avatarUrl;
-						userInfo.city  = userInfo.userInfo.city;
-						userInfo.country  = userInfo.userInfo.country;
-						userInfo.nickName  = userInfo.userInfo.nickName;
-						userInfo.province  = userInfo.userInfo.province;
-						userInfo.sex  = userInfo.userInfo.gender;
-						userInfo.type = 'routine'
-						Routine.authUserInfo(userInfo.code, userInfo)
-							.then(res => {
-								console.log(res)
-								self.authKey = res.data.key;
-								if (res.data.type === 'register') {
-									uni.hideLoading();
-									self.isPhoneBox = true
-								} else {
-									uni.hideLoading();
-									let time = res.data.expires_time - self.$Cache.time();
-									self.$store.commit('LOGIN', {
-										token: res.data.token,
-										time: time
-									});
-									self.$util.Tips({
-										title: res,
-										icon: 'success'
-									}, {
-										tab: 3
-									})
-								}
-							})
-							.catch(res => {
-								uni.hideLoading();
-								uni.showToast({
-									title: res,
-									icon: 'none',
-									duration: 2000
-								});
-							});
-					})
-					.catch(res => {
+			getWxUser(code, res) {
+			let self = this
+			let userInfo = res.userInfo;
+			userInfo.code = code;
+			userInfo.spread_spid = app.globalData.spid; //获取推广人ID
+			userInfo.spread_code = app.globalData.code; //获取推广人分享二维码ID
+			userInfo.avatar = userInfo.userInfo.avatarUrl;
+			userInfo.city = userInfo.userInfo.city;
+			userInfo.country = userInfo.userInfo.country;
+			userInfo.nickName = userInfo.userInfo.nickName;
+			userInfo.province = userInfo.userInfo.province;
+			userInfo.sex = userInfo.userInfo.gender;
+			userInfo.type = 'routine'
+			Routine.authUserInfo(userInfo.code, userInfo)
+				.then(res => {
+					self.authKey = res.data.key;
+					if (res.data.type === 'register') {
 						uni.hideLoading();
+						self.isPhoneBox = true
+					}
+					if (res.data.type === 'login') {
+						uni.hideLoading();
+						self.$store.commit('LOGIN', {
+							token: res.data.token
+						});
+						self.$util.Tips({
+							title: res,
+							icon: 'success'
+						}, {
+							tab: 3
+						})
+					}
+				})
+				.catch(res => {
+					uni.hideLoading();
+					uni.showToast({
+						title: res,
+						icon: 'none',
+						duration: 2000
 					});
-			},
+				});
+
+		},
 
 
 			// #endif