From c9b76d0f45910d5138e6bcd59b3591e502ea5f3f Mon Sep 17 00:00:00 2001
From: 董国庆 <364620639@qq.com>
Date: 星期五, 10 一月 2025 15:12:44 +0800
Subject: [PATCH] Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/americanContainer

---
 src/utils/request.js |   49 +++++++++++++++++++++++++++++--------------------
 1 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index e4ef7d6..f619333 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -59,30 +59,39 @@
     }
     const res = response;
     if (res.data.status == 0) {
-      if (!res.data) {
+      if (res.data.data.result && res.data.data.result == -1) {
+        Message({
+          message: res.data.data.msg || '服务器错误',
+          type: 'error',
+          duration: 2000
+        })
+        return Promise.reject(res.data)
+      }
+      if (!res.data.data) {
         return Promise.resolve({})
       }
       return Promise.resolve(res.data)
-    } else {
-      if (res.data.status == 103 || res.data.status == 401) {
-        Message({
-          message: res.data.msg || '登录已过期,请重新登录',
-          type: 'warning',
-          duration: 2000
-        })
-        store.commit('SET_USERINFO', {})
-        store.commit('SET_USERNAME', '')
-        localStorage.clear()
-        window.location.replace('/');
-        return Promise.reject(res.data)
-      }
-      Message({
-        message: res.data.msg || '服务器错误',
-        type: 'error',
-        duration: 2000
-      })
-      return Promise.reject(res.data)
     }
+    // else {
+    //   if (res.data.status == 103 || res.data.status == 401) {
+    //     Message({
+    //       message: res.data.data.msg || '登录已过期,请重新登录',
+    //       type: 'warning',
+    //       duration: 2000
+    //     })
+    //     store.commit('SET_USERINFO', {})
+    //     store.commit('SET_USERNAME', '')
+    //     localStorage.clear()
+    //     window.location.replace('/');
+    //     return Promise.reject(res.data)
+    //   }
+    //   Message({
+    //     message: res.data.data.msg || '服务器错误',
+    //     type: 'error',
+    //     duration: 2000
+    //   })
+    //   return Promise.reject(res.data)
+    // }
   },
   error => {
     return Promise.reject(error.message)

--
Gitblit v1.7.1