update

src/business/login/index.ts

@@ -59,30 +59,13 @@ export function useLogin() {
         eventBus.$emit('LoginNotify') // 登录成功通知
     }
 
-    // 初始化业务数据
-    const initBaseData = async (autoLogin = false) => {
-        logining.value = true
-        try {
-            // 等待加载业务数据
-            await loadBaseData()
-            // 自动登录
-            if (autoLogin) {
-                const encryptedData = localData.getValue('autoLoginEncryptedData')
-                if (encryptedData) {
-                    try {
-                        const decryptedString = decryptAES(encryptedData)
-                        return await loginAction(JSON.parse(decryptedString))
-                    } catch (err) {
-                        console.error(err)
-                        eventBus.$emit('LogoutNotify')
-                    }
-                }
-            }
-            if (token.value) {
-                await loadUserData()
-            }
-        } finally {
-            logining.value = false
+    const autoLogin = () => {
+        const encryptedData = localData.getValue('autoLoginEncryptedData')
+        if (encryptedData) {
+            const decryptedString = decryptAES(encryptedData)
+            return loginAction(JSON.parse(decryptedString))
+        } else {
+            return Promise.reject('自动登录失败')
         }
     }
 
@@ -114,6 +97,21 @@ export function useLogin() {
         callback && callback()
     }
 
+    // 初始化业务数据
+    const initBaseData = async (enableAutoLogin = false) => {
+        logining.value = true
+        try {
+            await loadBaseData() // 等待加载业务数据
+            if (enableAutoLogin) {
+                await autoLogin()
+            } else if (token.value) {
+                await loadUserData()
+            }
+        } finally {
+            logining.value = false
+        }
+    }
+
     return {
         logining,
         formData,