From 72ac82021c2a6ebdbeedddb70a21cfe2c000cd3e Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 10 Aug 2023 17:51:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BD=91=E7=BB=9C=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/js/dai/request-bipass.js    |  2 +-
 src/js/dai/request.js           |  3 +--
 src/js/epmet-result-resolver.js | 34 +++++++++++++++++++++++++++------
 src/utils/request.js            |  2 +-
 4 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/src/js/dai/request-bipass.js b/src/js/dai/request-bipass.js
index 2587d5c07..461e75474 100644
--- a/src/js/dai/request-bipass.js
+++ b/src/js/dai/request-bipass.js
@@ -60,7 +60,7 @@ const request = curry((method, uri, data = {}, params = {}) => {
 			reslove(
 				Object.assign({}, returnIniData, {
 					httpCode: "9999", //访问出现意外
-					msg: "网络错误",
+					msg: err,
 				})
 			);
 		};
diff --git a/src/js/dai/request.js b/src/js/dai/request.js
index c1ed79ac2..24676be2f 100644
--- a/src/js/dai/request.js
+++ b/src/js/dai/request.js
@@ -38,7 +38,6 @@ const request = curry(
         // if(typeof Vue.$afterRequestHook == 'function'){
         // 	retData = Vue.$afterRequestHook(retData);
         // }
-			console.log(res,'request1');
 
         if (res.data.code > 8000 && res.data.code < 10000) {
           message({
@@ -65,7 +64,7 @@ const request = curry(
         reslove(
           Object.assign({}, returnIniData, {
             httpCode: "9999", //访问出现意外
-            msg: err.data.msg,
+            msg:err,
           })
         );
       };
diff --git a/src/js/epmet-result-resolver.js b/src/js/epmet-result-resolver.js
index 783b03209..e589db19f 100644
--- a/src/js/epmet-result-resolver.js
+++ b/src/js/epmet-result-resolver.js
@@ -1,3 +1,12 @@
+/*
+ * @Author: mk 2403457699@qq.com
+ * @Date: 2023-07-17 09:46:32
+ * @LastEditors: mk 2403457699@qq.com
+ * @LastEditTime: 2023-08-10 17:49:44
+ * @Description: 更改提示信息,修改前是统一提示网络错误
+ * 
+ * 
+ */
 /**
  * 解析epmet后台返回结果,并且执行传入的逻辑
  * @param success_processor 正常返回执行的函数，代表要对data做何种操作。第一个参数是
@@ -36,12 +45,25 @@ export function EpmetResultResolver(env) {
         this.fail_processor();
       }
       
-      // 弹出消息
-      if (code < 8000) {
-        this._env.$message.error('服务器开小差了...')
-      } else {
-        this._env.$message.error(msg)
-      }
+    const errorMessages = {
+        10007: '当前帐号已在别处登录',
+        10006: '登陆超时,请重新登录',
+        10005: 'token为空,请重新登录'
+    };
+    
+    const errorCode = response.data.code;
+    
+    if (errorMessages.hasOwnProperty(errorCode)) {
+        this._env.$message.error(errorMessages[errorCode]);
+    } else {
+        this._env.$message.error(msg);
+    }
+    
+      // // 弹出消息
+      // if (code < 8000) {
+      //   this._env.$message.error('服务器开小差了...')
+      // } else {
+      // }
       
       return;
     }
diff --git a/src/utils/request.js b/src/utils/request.js
index c83accde3..3696ebe00 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -2,7 +2,7 @@
  * @Author: mk 2403457699@qq.com
  * @Date: 2023-03-18 11:24:39
  * @LastEditors: mk 2403457699@qq.com
- * @LastEditTime: 2023-08-10 16:34:23
+ * @LastEditTime: 2023-08-10 17:50:49
  * @Description: 请求拦截中添加
  * 
  *