From 975d92d970e0224db7a700c0a293707d9e392870 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Wed, 4 Sep 2024 15:48:59 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=A7=A3=E5=86=B3=E5=A4=9A=E4=B8=AA=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=8A=A5=E9=94=99=EF=BC=8C=E5=87=BA=E7=8E=B0=E5=A4=9A?=
 =?UTF-8?q?=E4=B8=AA=E6=8F=90=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model-coupon/model-coupon-content.vue     |  4 +-
 src/utils/request.ts                          | 39 +++++++++++++------
 2 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/src/components/model-coupon/model-coupon-content.vue b/src/components/model-coupon/model-coupon-content.vue
index 6b8d73bf..3b916f84 100644
--- a/src/components/model-coupon/model-coupon-content.vue
+++ b/src/components/model-coupon/model-coupon-content.vue
@@ -28,7 +28,7 @@
                     </el-form-item>
                 </template>
                 <template v-else>
-                    <el-form-item label="文章分类">
+                    <el-form-item label="类型">
                         <el-select v-model="form.type" multiple collapse-tags placeholder="请选择优惠券类型">
                             <el-option v-for="item in base_list.coupon_type_list" :key="item.value" :label="item.name" :value="item.value" />
                         </el-select>
@@ -74,7 +74,7 @@ const new_url = ref('');
 const base_list = reactive({
     data_type_list: [
         { name: '默认', value: '0' },
-        { name: '手动', value: '1' },
+        { name: '自动', value: '1' },
     ],
     themeList: Array.from({ length: 7 }, (_, index) => ({
         id: String(index + 1),
diff --git a/src/utils/request.ts b/src/utils/request.ts
index cacc3264..bdd0cf81 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -1,6 +1,20 @@
 import axios, { InternalAxiosRequestConfig, AxiosResponse } from 'axios';
-import { ElMessage, ElMessageBox } from 'element-plus';
+import { ElMessage, ElMessageBox, type MessageHandler } from 'element-plus';
 import { get_cookie } from './index';
+
+// 提示拦截
+
+let messageInstance: MessageHandler;
+const message_error = (info: string) => {
+    if (messageInstance) {
+        messageInstance.close();
+    }
+    messageInstance = ElMessage.error(info);
+};
+
+// 创建一个状态变量来跟踪是否已经弹出了退出登录的弹窗
+const isLogoutModalShown = ref(true);
+
 // 创建 axios 实例
 const index = window.location.href.lastIndexOf('?s=');
 const pro_url = window.location.href.substring(0, index);
@@ -37,23 +51,26 @@ service.interceptors.response.use(
         if (code == 0) {
             return response.data;
         } else if (code == -400) {
-            ElMessageBox.alert(msg, '温馨提示', {
-                confirmButtonText: '确定',
-                showClose: false,
-                type: 'warning',
-            }).then(() => {
-                localStorage.clear(); // @vueuse/core 自动导入
-                window.location.href = data;
-            });
+            if (isLogoutModalShown.value) {
+                isLogoutModalShown.value = false;
+                ElMessageBox.alert(msg, '温馨提示', {
+                    confirmButtonText: '确定',
+                    showClose: false,
+                    type: 'warning',
+                }).then(() => {
+                    localStorage.clear(); // @vueuse/core 自动导入
+                    window.location.href = data;
+                });
+            }
         } else {
-            ElMessage.error(msg || message || '系统出错');
+            message_error(msg || message || '系统出错');
             return Promise.reject(new Error(msg || 'Error'));
         }
     },
     (error: any) => {
         if (error.response.data) {
             const { msg, message } = error.response.data;
-            ElMessage.error(msg || message || '系统出错');
+            message_error(msg || message || '系统出错');
         }
         return Promise.reject(error.message);
     }