修复 小程序授权登录后跳转问题

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('LOGIN', {
-					store.commit('UPDATE_USERINFO', res.data.user);
+						token: res.data.token
-					store.commit('LOGIN', {token:res.data.token});
+					});
-					// Cache.set(EXPIRES_TIME,res.data.expiresTime,time);
-					Cache.set(USER_INFO,res.data.user);
 				}
 				return resolve(res);
 			}).catch(res=>{
 				return reject(res);
 			})
-		})
+		});
 	}
 }
 

pages/users/wechat_login/index.vue

@@ -269,10 +269,8 @@
 						uni.hideLoading();
 					});
 			},
-			getWxUser(code) {
+			getWxUser(code, res) {
 			let self = this
-				Routine.getUserInfo()
-					.then(res => {
 			let userInfo = res.userInfo;
 			userInfo.code = code;
 			userInfo.spread_spid = app.globalData.spid; //获取推广人ID
@@ -286,17 +284,15 @@
 			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 {
+					}
+					if (res.data.type === 'login') {
 						uni.hideLoading();
-									let time = res.data.expires_time - self.$Cache.time();
 						self.$store.commit('LOGIN', {
-										token: res.data.token,
+							token: res.data.token
-										time: time
 						});
 						self.$util.Tips({
 							title: res,
@@ -314,10 +310,7 @@
 						duration: 2000
 					});
 				});
-					})
+
-					.catch(res => {
-						uni.hideLoading();
-					});
 		},