fix: 修复接口配置、退出登录后校验登录信息引起的错误

.env.development

@@ -3,4 +3,4 @@ VITE_GLOB_API_URL=http://111.22.182.169:49600
 # VITE_GLOB_API_URL=http://36.133.16.81:42111
 
 # API 接口地址前缀
-VITE_GLOB_API_URL_PREFIX=/jeecg-boot
+VITE_GLOB_API_URL_PREFIX=/jeecgboot

src/App.vue

@@ -2,12 +2,6 @@
     import { onExit } from '@dcloudio/uni-app'
     import { isDevMode } from '@/utils/env'
     import { usePermissions } from '@/hooks/app/usePermissions'
-    import * as UserInfoAPI from '@/api/model/userInfo'
-    import { useDictStore } from '@/store/modules/dict'
-    import { useUserStore } from '@/store/modules/user'
-
-    const userStore = useUserStore()
-    const dictStore = useDictStore()
 
     // import * as Push from '@/utils/push'
 
@@ -35,13 +29,6 @@
         }
         // #endif
     })
-    function getDictList() {
-        if (!userStore.getToken) return
-        if (Object.keys(dictStore.getDictList).length !== 0) return
-        UserInfoAPI.dictList().then((res) => {
-            dictStore.setDictList(res)
-        })
-    }
 
     onExit(() => {
         // 停用监听权限
@@ -50,7 +37,6 @@
 
     onShow(() => {
         console.log('App Show')
-        getDictList()
     })
 
     onHide(() => {
@@ -58,7 +44,7 @@
     })
 
     onError((err) => {
-        // Message.toast(`App Error: ${err}`)
+        Message.toast(`App Error: ${err}`)
         console.error('App Error:', err)
     })
 

src/pages/login/login.vue

@@ -8,7 +8,7 @@
 
     const userStore = useUserStore()
 
-    onLoad(async () => {
+    onShow(async () => {
         // 获取推送标识并设置 PushClientId 缓存
         // uni.getPushClientId({
         //     success: (res) => {
@@ -37,6 +37,7 @@
 
             // 跳转到登录页
             goHome()
+            Message.toast(`欢迎回来~`)
         } else {
             // 关闭启动页并检查更新
             try {
@@ -59,7 +60,7 @@
         show: false,
         isLogin: false,
         loading: false,
-        text: '',
+        text: defaultText,
         form: {
             rules: [
                 {
@@ -128,7 +129,7 @@
 
                             // 打开登录页
                             goHome()
-                            Message.toast(`登录成功, 欢迎回来!`)
+                            Message.toast(`登录成功, 欢迎回来~`)
                         } else {
                             Message.toast(body.message)
                             return false
@@ -153,7 +154,7 @@
     // 添加欢迎登录的文字打字动态效果
     let loop = null
     let direction = 'right'
-    const count = ref(0)
+    const count = ref(defaultText.length)
     watch(
         () => model.show,
         (show) => {
@@ -185,9 +186,12 @@
         },
     )
 
-    onUnload(() => {
-        model.show = false
+    onHide(() => {
         loop && clearInterval(loop)
+        loop = null
+        direction = 'right'
+        count.value = 0
+        model.show = false
     })
 
     function onReadConfirm(val) {
@@ -392,7 +396,7 @@
             // position: absolute;
             // left: 40rpx;
             // bottom: 40rpx;
-            font-size: 40rpx;
+            font-size: 38rpx;
             color: #474747;
             display: flex;
             flex-direction: column;

src/pages/shouye/shouye.vue

@@ -5,6 +5,12 @@
     import { closeSplashscreenAndChechUpgrade } from '@/utils/upgrade'
     import * as WeatherAPI from '@/api/model/weather'
     import * as HomeAPI from '@/api/model/home'
+    import * as UserInfoAPI from '@/api/model/userInfo'
+    import { useDictStore } from '@/store/modules/dict'
+    import { useUserStore } from '@/store/modules/user'
+
+    const userStore = useUserStore()
+    const dictStore = useDictStore()
 
     const model = reactive({
         // 湖南省人民政府
@@ -47,6 +53,9 @@
             },
         })
 
+        // 获取字典数据
+        getDictList()
+
         // 查询金刚区数据
         getServiceItems()
         getMenuItems()
@@ -106,6 +115,18 @@
         })
     }
 
+    function getDictList() {
+        if (!userStore.getToken) {
+            return
+        }
+        if (Object.keys(dictStore.getDictList).length !== 0) {
+            return
+        }
+        UserInfoAPI.dictList().then((res) => {
+            dictStore.setDictList(res)
+        })
+    }
+
     // 页面数据
     const pageData = reactive({
         // 顶部标题和搜索

src/store/modules/user.ts

 import { defineStore } from 'pinia'
 import { store } from '/@/store'
+import { useDictStore } from './dict'
 import { Storage } from '@/utils/storage'
 import { TOKEN_KEY, USER_INFO_KEY } from '@/enums/cacheEnum'
-import Navigate from '@/utils/page/navigate'
 import * as API from '/@/api/model/userInfo'
-import { useDictStore } from './dict'
 
 export interface UserInfo {
     id: string
@@ -37,6 +36,8 @@ export const useUserStore = defineStore({
                 this.token = token
                 return token
             }
+
+            return null
         },
         getUserInfo(): Nullable<UserInfo> {
             if (this.userInfo) {
@@ -62,11 +63,19 @@ export const useUserStore = defineStore({
     actions: {
         setToken(token: string) {
             this.token = token
+            if (!token) {
+                Storage.remove(TOKEN_KEY)
+            } else {
                 Storage.set(TOKEN_KEY, token)
+            }
         },
         setUserInfo(info: UserInfo) {
             this.userInfo = info
+            if (!info) {
+                Storage.remove(USER_INFO_KEY)
+            } else {
                 Storage.set(USER_INFO_KEY, info ? JSON.stringify(info) : null)
+            }
         },
         async logout() {
             if (this.loading) {
@@ -84,8 +93,10 @@ export const useUserStore = defineStore({
                 const dictStore = useDictStore(store)
                 dictStore.clearDict()
 
-                await Navigate.to('/pages/login/login')
                 this.loading = false
+                uni.reLaunch({
+                    url: '/pages/login/login',
+                })
             }
         },
         async refreshUserInfo() {

src/utils/http/axios/index.ts

@@ -48,8 +48,9 @@ const transform: AxiosTransform = {
         // 错误的时候返回
 
         const { data } = res
-        if (!data) {
+        if (!data || typeof data !== 'object') {
             // return '[HTTP] Request has no return value';
+            // Message.toast(`${JSON.stringify(options)} --- ${res.data}`)
             throw new Error(t('sys.api.apiRequestFailed'))
         }
         //  这里 status，body，message为 后台统一的字段，需要在 types.ts 内修改为项目自己的接口返回格式