feat: 登录逻辑问题调整

This commit is contained in:
duanshuwen
2025-12-25 23:04:51 +08:00
parent f027685072
commit dfadb06934
2 changed files with 33 additions and 27 deletions

View File

@@ -61,34 +61,41 @@ export const checkToken = () => {
}; };
// 刷新token // 刷新token
export const refreshToken = async () => { export const refreshToken = () => {
return new Promise((resolve) => { return new Promise(async (resolve) => {
checkPhone().then(async (checkRes) => { const token = getStorageSyncToken();
if (!checkRes.data) {
resolve(true);
return;
}
uni.login({ if (!token) {
provider: "weixin", //使用微信登录 resolve(true);
success: async ({ code }) => { return;
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) { const checkRes = await checkPhone();
setStorageSyncToken(response.access_token);
// 登录成功后,触发登录成功事件 if (!checkRes.data) {
uni.$emit(NOTICE_EVENT_LOGIN_SUCCESS); 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);
}
},
}); });
}); });
}; };

View File

@@ -11,7 +11,6 @@ import { removeStorageSyncToken, setStorageSyncToken } from "../constant/token";
const loginAuth = (e) => { const loginAuth = (e) => {
removeStorageSyncToken(); removeStorageSyncToken();
const appStore = useAppStore();
return new Promise(async (resolve, reject) => { return new Promise(async (resolve, reject) => {
const openIdCode = await getWeChatAuthCode(e); const openIdCode = await getWeChatAuthCode(e);