From 963a2313f4f8959715293d38f69894078150d508 Mon Sep 17 00:00:00 2001
From: lzhe <lzhe@example.com>
Date: 星期五, 14 六月 2024 11:29:47 +0800
Subject: [PATCH] Merge branch 'master' of http://www.beijingsoft.cn:9090/r/smart-web

---
 src/utils/request.js |   22 +++++++++++++++-------
 1 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index 0519da1..346ff97 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -35,11 +35,11 @@
 axios.interceptors.response.use(
 	(response) => {
 		if (response.data.code && response.data.code !== 200) {
-			ElMessage({
-				message: response.data.msg,
-				type: 'warning',
-			})
-			return new Error()
+			// ElMessage({
+			// 	message: response.data.msg,
+			// 	type: 'warning',
+			// })
+			// return new Error()
 			// return new Error();
 		}
 		return response;
@@ -118,7 +118,14 @@
 			}).then((response) => {
 				resolve(response.data);
 			}).catch((error) => {
-				reject(error);
+				if (error?.status == 400) {
+					ElMessage({
+						message: error.data.msg,
+						type: 'warning',
+					})
+				} else {
+					reject(error);
+				}
 			})
 		})
 	},
@@ -156,7 +163,6 @@
 	 */
 	postJ: function (url, data = {}, config = {}) {
 		return new Promise((resolve, reject) => {
-			console.log(qsStringify(data))
 			axios({
 				method: 'post',
 				url: url,
@@ -166,6 +172,7 @@
 			}).then((response) => {
 				resolve(response.data);
 			}).catch((error) => {
+				resolve(error.data);
 				reject(error);
 			})
 		})
@@ -185,6 +192,7 @@
 			}).then((response) => {
 				resolve(response.data);
 			}).catch((error) => {
+				resolve(error.data);
 				reject(error);
 			})
 		})

--
Gitblit v1.9.3