feat: 优化登录逻辑
This commit is contained in:
@@ -1,7 +1,8 @@
|
||||
import { wxLogin, checkUserPhone } from "@/request/api/LoginApi";
|
||||
import { oauthToken, checkUserPhone } from "@/request/api/LoginApi";
|
||||
import { loginAuth, bindPhone } from "@/manager/LoginManager";
|
||||
import { clientId } from "@/constant/base";
|
||||
import { getAccessToken, setAccessToken } from "../constant/token";
|
||||
import { getAccessToken, removeAccessToken, setAccessToken } from "../constant/token";
|
||||
import { NOTICE_EVENT_LOGIN_SUCCESS } from "@/constant/constant";
|
||||
|
||||
// 跳转登录
|
||||
export const goLogin = () => uni.navigateTo({ url: "/pages/login/index" });
|
||||
@@ -40,7 +41,13 @@ export const onLogin = async (e) => {
|
||||
const params = { wechatPhoneCode: code, clientId: clientId };
|
||||
const res = await bindPhone(params);
|
||||
if (res.data) {
|
||||
// 登录成功后,触发登录成功事件
|
||||
uni.$emit(NOTICE_EVENT_LOGIN_SUCCESS);
|
||||
resolve();
|
||||
} else {
|
||||
console.log("绑定手机号失败");
|
||||
removeAccessToken();
|
||||
reject();
|
||||
}
|
||||
});
|
||||
});
|
||||
@@ -61,7 +68,7 @@ export const checkToken = () => {
|
||||
};
|
||||
|
||||
// 刷新token
|
||||
export const refreshToken = (needLogin = false) => {
|
||||
export const refreshToken = () => {
|
||||
return new Promise(async (resolve) => {
|
||||
uni.login({
|
||||
provider: "weixin", //使用微信登录
|
||||
@@ -75,18 +82,17 @@ export const refreshToken = (needLogin = false) => {
|
||||
};
|
||||
console.log("获取到的微信授权params:", JSON.stringify(params));
|
||||
|
||||
const response = await wxLogin(params);
|
||||
|
||||
if (needLogin && response.access_token) {
|
||||
setAccessToken(response.access_token);
|
||||
}
|
||||
|
||||
const response = await oauthToken(params);
|
||||
if (response.access_token) {
|
||||
setAccessToken(response.access_token);
|
||||
|
||||
const checkRes = await checkUserPhone({
|
||||
token: response.access_token,
|
||||
});
|
||||
|
||||
if (checkRes.data) {
|
||||
// 登录成功后,触发登录成功事件
|
||||
uni.$emit(NOTICE_EVENT_LOGIN_SUCCESS);
|
||||
resolve(false);
|
||||
} else {
|
||||
resolve(true);
|
||||
|
||||
Reference in New Issue
Block a user