Browse Source

兼容不同系统报错

黄琪勇 1 year ago
parent
commit
208db687f0
5 changed files with 15 additions and 14 deletions
  1. 1 1
      src/api/user.api.ts
  2. 11 11
      src/plugin/httpAjax.ts
  3. 1 1
      src/router/index.ts
  4. 1 0
      src/type.d.ts
  5. 1 1
      src/viewsframe/layout/layout.vue

+ 1 - 1
src/api/user.api.ts

@@ -39,7 +39,7 @@ export const queryUserInfo_gym = () => {
 // 退出登录
 export const logout_gym = () => {
    return httpAxios_gym.axioseRquest({
-      method: "post",
+      method: "get",
       url: "/api-auth/exit",
       headers: {
          "Content-Type": "x-www-form-urlencoded"

+ 11 - 11
src/plugin/httpAjax.ts

@@ -25,7 +25,7 @@ export const httpAjaxErrMsg = function <T extends axiosApiType, P extends Parame
             if (data.code !== 200) {
                ElMessage({
                   showClose: true,
-                  message: data.message,
+                  message: data.message || data.msg,
                   type: "error"
                })
             }
@@ -34,7 +34,7 @@ export const httpAjaxErrMsg = function <T extends axiosApiType, P extends Parame
          .catch(err => {
             ElMessage({
                showClose: true,
-               message: err.message,
+               message: err.message || err.msg,
                type: "error"
             })
             resolve(err)
@@ -69,7 +69,7 @@ export const httpAjaxLoadingErrMsg = function <T extends axiosApiType, P extends
             if (data.code !== 200) {
                ElMessage({
                   showClose: true,
-                  message: data.message,
+                  message: data.message || data.msg,
                   type: "error"
                })
             }
@@ -79,7 +79,7 @@ export const httpAjaxLoadingErrMsg = function <T extends axiosApiType, P extends
             LoadingBar.loading(false)
             ElMessage({
                showClose: true,
-               message: err.message,
+               message: err.message || err.msg,
                type: "error"
             })
             resolve(err)
@@ -98,7 +98,7 @@ export const httpAjaxCrud = function <T extends axiosApiType, P extends Paramete
                ElNotification({
                   type: "success",
                   title: "成功",
-                  message: data.message,
+                  message: data.message || data.msg,
                   position: "top-right",
                   duration: 3000
                })
@@ -106,7 +106,7 @@ export const httpAjaxCrud = function <T extends axiosApiType, P extends Paramete
                ElNotification({
                   type: "error",
                   title: "失败",
-                  message: data.message,
+                  message: data.message || data.msg,
                   position: "top-right",
                   duration: 3000
                })
@@ -118,7 +118,7 @@ export const httpAjaxCrud = function <T extends axiosApiType, P extends Paramete
             ElNotification({
                type: "error",
                title: "失败",
-               message: err.message,
+               message: err.message || err.msg,
                position: "top-right",
                duration: 3000
             })
@@ -136,12 +136,12 @@ export const httpAjaxAlert = function <T extends axiosApiType, P extends Paramet
             LoadingBar.loading(false)
             const data = res.data as apiResDataType
             if (data.code === 200) {
-               ElMessageBox.alert(data.message, "提示", {
+               ElMessageBox.alert(data.message || data.msg, "提示", {
                   confirmButtonText: "关闭",
                   type: "success"
                })
             } else {
-               ElMessageBox.alert(data.message, "提示", {
+               ElMessageBox.alert(data.message || data.msg, "提示", {
                   confirmButtonText: "关闭",
                   type: "error"
                })
@@ -150,7 +150,7 @@ export const httpAjaxAlert = function <T extends axiosApiType, P extends Paramet
          })
          .catch(err => {
             LoadingBar.loading(false)
-            ElMessageBox.alert(err.message, "提示", {
+            ElMessageBox.alert(err.message || err.msg, "提示", {
                confirmButtonText: "关闭",
                type: "error"
             })
@@ -180,7 +180,7 @@ export const httpAjaxDownload = function <T extends axiosApiType, P extends Para
          LoadingBar.loading(false)
          ElMessage({
             showClose: true,
-            message: err.message,
+            message: err.message || err.msg,
             type: "error"
          })
       })

+ 1 - 1
src/router/index.ts

@@ -50,7 +50,7 @@ router.beforeEach((to, from, next) => {
             .catch((err: apiResDataType) => {
                //退出 清空,当是登录权限问题时候 axios 里面会清空
                if (err.code !== CODE401) {
-                  ElMessage.error(err.message)
+                  ElMessage.error(err.message || err.msg)
                   userStoreHook.resetUser()
                }
             })

+ 1 - 0
src/type.d.ts

@@ -7,6 +7,7 @@ declare interface apiResDataType {
    code: number
    data: any
    message: string
+   msg?: string
 }
 
 /*

+ 1 - 1
src/viewsframe/layout/layout.vue

@@ -56,7 +56,7 @@ function handleLogout() {
       .loginOut()
       .then()
       .catch((err: apiResDataType) => {
-         ElMessage.error(err.message)
+         ElMessage.error(err.message || err.msg)
       })
 }
 </script>