public/crmeb_java
1
0
Fork 0
mirror of https://gitee.com/ZhongBangKeJi/crmeb_java.git synced 2026-04-23 12:08:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
337031187
2021-05-06 14:47:32 +08:00
parent 5f2ff73d1e
commit bad75eb84e
2 changed files with 45 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/libs/routine.js
View File

@@ -122,17 +122,15 @@ class Routine
return new Promise((resolve, reject)=>{ return new Promise((resolve, reject)=>{
login(code,data).then(res=>{ login(code,data).then(res=>{
if(res.data.type==='login'){ 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); return resolve(res);
}).catch(res=>{ }).catch(res=>{
return reject(res); return reject(res);
}) })
}) });
} }
} }

21
app/pages/users/wechat_login/index.vue
View File

@@ -269,14 +269,12 @@
uni.hideLoading(); uni.hideLoading();
}); });
}, },
getWxUser(code) { getWxUser(code, res) {
let self = this let self = this
Routine.getUserInfo()
.then(res => {
let userInfo = res.userInfo; let userInfo = res.userInfo;
userInfo.code = code; userInfo.code = code;
userInfo.spread_spid = app.globalData.spid;//获取推广人ID userInfo.spread_spid = app.globalData.spid; //获取推广人ID
userInfo.spread_code = app.globalData.code;//获取推广人分享二维码ID userInfo.spread_code = app.globalData.code; //获取推广人分享二维码ID
userInfo.avatar = userInfo.userInfo.avatarUrl; userInfo.avatar = userInfo.userInfo.avatarUrl;
userInfo.city = userInfo.userInfo.city; userInfo.city = userInfo.userInfo.city;
userInfo.country = userInfo.userInfo.country; userInfo.country = userInfo.userInfo.country;
@@ -286,17 +284,15 @@
userInfo.type = 'routine' userInfo.type = 'routine'
Routine.authUserInfo(userInfo.code, userInfo) Routine.authUserInfo(userInfo.code, userInfo)
.then(res => { .then(res => {
console.log(res)
self.authKey = res.data.key; self.authKey = res.data.key;
if (res.data.type === 'register') { if (res.data.type === 'register') {
uni.hideLoading(); uni.hideLoading();
self.isPhoneBox = true self.isPhoneBox = true
} else { }
if (res.data.type === 'login') {
uni.hideLoading(); uni.hideLoading();
let time = res.data.expires_time - self.$Cache.time();
self.$store.commit('LOGIN', { self.$store.commit('LOGIN', {
token: res.data.token, token: res.data.token
time: time
}); });
self.$util.Tips({ self.$util.Tips({
title: res, title: res,
@@ -314,10 +310,7 @@
duration: 2000 duration: 2000
}); });
}); });
})
.catch(res => {
uni.hideLoading();
});
}, },