From 2596fc93ae00f047cb03fe67869bd64da2af7ad2 Mon Sep 17 00:00:00 2001
From: jxdnsong <592566207@qq.com>
Date: Sun, 02 Apr 2023 14:32:58 +0800
Subject: [PATCH] 1111

---
 src/store/modules/user.js |   29 ++++++++++++++++-------------
 1 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 7fdeeda..575eff1 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -2,7 +2,7 @@
  * @Author: shuishen 1109946754@qq.com
  * @Date: 2022-12-27 09:33:01
  * @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2023-02-20 15:53:27
+ * @LastEditTime: 2023-04-02 12:18:26
  * @FilePath: \srs-police-affairs\src\store\modules\user.js
  * @Description: 
  * 
@@ -38,25 +38,28 @@
                 )
                     .then((res) => {
                         const data = res.data
-                        if (data.error_description) {
-                            Message({
-                                message: data.error_description,
-                                type: "error",
-                            })
+                        if (res.status != 200) {
+                            if (data.error_description) {
+                                Message({
+                                    message: data.error_description,
+                                    type: "error",
+                                })
+                                reject(res)
+                            } else {
+                                Message({
+                                    message: '系统异常,请联系管理员',
+                                    type: "error",
+                                })
+                                reject(res)
+                            }
                         }
-                        // else if (res.status != 200) {
-                        //     Message({
-                        //         message: '系统异常,请联系管理员',
-                        //         type: "error",
-                        //     })
-                        // }
                         else {
                             commit("SET_TOKEN", data.access_token)
                             commit('SET_USER_INFO', data)
                             commit('SET_REFRESH_TOKEN', data.refresh_token)
                             commit('SET_TENANT_ID', data.tenant_id)
+                            resolve()
                         }
-                        resolve()
                     })
                     .catch((error) => {
                         reject(error)

--
Gitblit v1.9.3