feat: 登录逻辑问题调整
This commit is contained in:
@@ -61,34 +61,41 @@ export const checkToken = () => {
|
||||
};
|
||||
|
||||
// 刷新token
|
||||
export const refreshToken = async () => {
|
||||
return new Promise((resolve) => {
|
||||
checkPhone().then(async (checkRes) => {
|
||||
if (!checkRes.data) {
|
||||
resolve(true);
|
||||
return;
|
||||
}
|
||||
export const refreshToken = () => {
|
||||
return new Promise(async (resolve) => {
|
||||
const token = getStorageSyncToken();
|
||||
|
||||
uni.login({
|
||||
provider: "weixin", //使用微信登录
|
||||
success: async ({ code }) => {
|
||||
console.log("refreshToken", code);
|
||||
const params = {
|
||||
openIdCode: [code],
|
||||
grant_type: "wechat",
|
||||
scope: "server",
|
||||
clientId: clientId,
|
||||
};
|
||||
console.log("获取到的微信授权params:", JSON.stringify(params));
|
||||
const response = await wxLogin(params);
|
||||
if (!token) {
|
||||
resolve(true);
|
||||
return;
|
||||
}
|
||||
|
||||
if (response.access_token) {
|
||||
setStorageSyncToken(response.access_token);
|
||||
// 登录成功后,触发登录成功事件
|
||||
uni.$emit(NOTICE_EVENT_LOGIN_SUCCESS);
|
||||
}
|
||||
},
|
||||
});
|
||||
const checkRes = await checkPhone();
|
||||
|
||||
if (!checkRes.data) {
|
||||
resolve(true);
|
||||
return;
|
||||
}
|
||||
|
||||
uni.login({
|
||||
provider: "weixin", //使用微信登录
|
||||
success: async ({ code }) => {
|
||||
console.log("refreshToken", code);
|
||||
const params = {
|
||||
openIdCode: [code],
|
||||
grant_type: "wechat",
|
||||
scope: "server",
|
||||
clientId: clientId,
|
||||
};
|
||||
console.log("获取到的微信授权params:", JSON.stringify(params));
|
||||
const response = await wxLogin(params);
|
||||
|
||||
if (response.access_token) {
|
||||
setStorageSyncToken(response.access_token);
|
||||
// 登录成功后,触发登录成功事件
|
||||
uni.$emit(NOTICE_EVENT_LOGIN_SUCCESS);
|
||||
}
|
||||
},
|
||||
});
|
||||
});
|
||||
};
|
||||
|
||||
@@ -11,7 +11,6 @@ import { removeStorageSyncToken, setStorageSyncToken } from "../constant/token";
|
||||
|
||||
const loginAuth = (e) => {
|
||||
removeStorageSyncToken();
|
||||
const appStore = useAppStore();
|
||||
|
||||
return new Promise(async (resolve, reject) => {
|
||||
const openIdCode = await getWeChatAuthCode(e);
|
||||
|
||||
Reference in New Issue
Block a user