merge v4.1.1 and fixed conflicts

2025-11-12 12:13:46 +08:00 · 2024-11-13 18:40:04 +08:00
parent bb8644dea0 4eaa518cf3
commit 44240f65d5
110 changed files with 4820 additions and 1977 deletions
--- a/web/src/utils/http.js
+++ b/web/src/utils/http.js
@@ -34,9 +34,15 @@ axios.interceptors.response.use(
            } else {
                removeUserToken()
            }
+            console.log(error.response.data)
+            error.response.data.message = "请先登录"
            return Promise.reject(error.response.data)
        }
-        return Promise.reject(error)
+        if (error.response.status === 400) {
+            return Promise.reject(new Error(error.response.data.message))
+        } else {
+            return Promise.reject(error)
+        }
    })