From 7db4369a3c1ee7dddc840c348c81e74e65a13f5d Mon Sep 17 00:00:00 2001
From: "157578146@qq.com" <157578146@qq.com>
Date: Thu, 24 Aug 2023 14:57:25 +0800
Subject: [PATCH] 8.24

---
 src/pages/collection/merge.vue | 2 ++
 src/plugins/request/index.js   | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/pages/collection/merge.vue b/src/pages/collection/merge.vue
index f252673..d778a9c 100644
--- a/src/pages/collection/merge.vue
+++ b/src/pages/collection/merge.vue
@@ -1298,6 +1298,8 @@
                                       if(res.status!=200) return   this.$Message.error(res.msg);
                                 this.$Message.success(res.msg);
                                       this.getList();
+                              }).catch(res=>{
+                                console.log(res,'res')
                               })
                               },
                           });
diff --git a/src/plugins/request/index.js b/src/plugins/request/index.js
index 68ee7db..7c9ae85 100644
--- a/src/plugins/request/index.js
+++ b/src/plugins/request/index.js
@@ -118,10 +118,10 @@ service.interceptors.response.use(
         tryHideFullScreenLoading();
         const code = response.data.status;
         switch (code) {
-            case 200:
+            case 200: case 400:
                 // [ 示例 ] code === 0 代表没有错误
                 return response.data;
-            case 400: case 400011: case 400012:
+            case 400011: case 400012:
                 return Promise.reject(response.data || { msg: '未知错误' });
             // [ 示例 ] 其它和后台约定的 code
             // errorCreate(response.data.msg);