yudao
/
mall-uniapp
mirror of https://gitee.com/yudaocode/yudao-mall-uniapp.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

pull/1/MERGE
stivepeim 2021-05-06 14:47:32 +08:00
parent 829babf74a
commit df945fc609
2 changed files with 45 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
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);
}) })
}) });
} }
} }

89
pages/users/wechat_login/index.vue
View File

@ -269,56 +269,49 @@
uni.hideLoading(); uni.hideLoading();
}); });
}, },
getWxUser(code) { getWxUser(code, res) {
let self = this let self = this
Routine.getUserInfo() let userInfo = res.userInfo;
.then(res => { userInfo.code = code;
let userInfo = res.userInfo; userInfo.spread_spid = app.globalData.spid; //获取推广人ID
userInfo.code = code; userInfo.spread_code = app.globalData.code; //获取推广人分享二维码ID
userInfo.spread_spid = app.globalData.spid;//获取推广人ID userInfo.avatar = userInfo.userInfo.avatarUrl;
userInfo.spread_code = app.globalData.code;//获取推广人分享二维码ID userInfo.city = userInfo.userInfo.city;
userInfo.avatar = userInfo.userInfo.avatarUrl; userInfo.country = userInfo.userInfo.country;
userInfo.city = userInfo.userInfo.city; userInfo.nickName = userInfo.userInfo.nickName;
userInfo.country = userInfo.userInfo.country; userInfo.province = userInfo.userInfo.province;
userInfo.nickName = userInfo.userInfo.nickName; userInfo.sex = userInfo.userInfo.gender;
userInfo.province = userInfo.userInfo.province; userInfo.type = 'routine'
userInfo.sex = userInfo.userInfo.gender; Routine.authUserInfo(userInfo.code, userInfo)
userInfo.type = 'routine' .then(res => {
Routine.authUserInfo(userInfo.code, userInfo) self.authKey = res.data.key;
.then(res => { if (res.data.type === 'register') {
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 => {
uni.hideLoading(); 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 // #endif