diff --git a/src/App.vue b/src/App.vue
index 2d886c5..946bdd9 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -4,7 +4,7 @@ import { getEvnUrl } from "@/request/api/config";
import { refreshToken } from "@/hooks/useGoLogin";
onLaunch(() => {
- getEvnUrl({ versionValue: "1.0.1" });
+ getEvnUrl({ versionValue: "1.0.2" });
refreshToken();
});
diff --git a/src/hooks/useGoLogin.js b/src/hooks/useGoLogin.js
index 0374d01..7bd1570 100644
--- a/src/hooks/useGoLogin.js
+++ b/src/hooks/useGoLogin.js
@@ -62,30 +62,29 @@ export const checkToken = () => {
// 刷新token
export const refreshToken = () => {
- const token = getStorageSyncToken();
+ return new Promise((resolve) => {
+ 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) {
- 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);
- }
- },
+ if (response.access_token) {
+ setStorageSyncToken(response.access_token);
+ // 登录成功后,触发登录成功事件
+ uni.$emit(NOTICE_EVENT_LOGIN_SUCCESS);
+ resolve(false)
+ } else {
+ resolve(true)
+ }
+ },
+ });
});
};
diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index d457389..bdea3e6 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -38,20 +38,11 @@
-
-
@@ -67,19 +58,19 @@