From cb99e5cf6a640c108e2fad940eaa7eae379184fc Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Fri, 11 Oct 2024 16:37:43 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=9D=E5=AD=98=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.ts                         | 12 ++++++++++--
 src/views/layout/components/navbar/index.vue | 20 ++++++++++++++++++--
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/src/utils/request.ts b/src/utils/request.ts
index 5b6c0949..134a9dfc 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -9,7 +9,12 @@ const message_error = (info: string) => {
     if (messageInstance) {
         messageInstance.close();
     }
-    messageInstance = ElMessage.error(info);
+    messageInstance = ElMessage.error({
+        type: 'error',
+        message: info,
+        duration: 30000,
+        showClose: true,
+    });
 };
 
 // 创建一个状态变量来跟踪是否已经弹出了退出登录的弹窗
@@ -20,7 +25,7 @@ const index = window.location.href.lastIndexOf('?s=');
 const pro_url = window.location.href.substring(0, index);
 const service = axios.create({
     baseURL: import.meta.env.VITE_APP_BASE_API == '/dev-api' ? import.meta.env.VITE_APP_BASE_API : pro_url + '?s=',
-    timeout: 50000,
+    timeout: 3000,
     headers: { 'Content-Type': 'application/json;charset=utf-8' },
 });
 /** @ts-ignore  */
@@ -71,7 +76,10 @@ service.interceptors.response.use(
         if (error.response && error.response.data) {
             const { msg, message } = error.response.data;
             message_error(msg || message || '系统出错');
+        } else {
+            message_error(error.message);
         }
+
         return Promise.reject(error.message);
     }
 );
diff --git a/src/views/layout/components/navbar/index.vue b/src/views/layout/components/navbar/index.vue
index c29fea73..0f321cfe 100644
--- a/src/views/layout/components/navbar/index.vue
+++ b/src/views/layout/components/navbar/index.vue
@@ -16,8 +16,8 @@
         <div class="nav-right">
             <el-button class="btn-plain" @click="upload_manage">上传管理</el-button>
             <el-button class="btn-plain" @click="preview_event">预览</el-button>
-            <el-button class="btn-plain" :disabled="saveDisabled" @click="save_event">仅保存</el-button>
-            <el-button class="btn-white" :disabled="saveDisabled" @click="save_close_event">保存关闭</el-button>
+            <el-button class="btn-plain" :class="saveDisabled ? 'disabled' : ''" :disabled="saveDisabled" @click="save_event">仅保存</el-button>
+            <el-button class="btn-white" :class="saveDisabled ? 'disabled' : ''" :disabled="saveDisabled" @click="save_close_event">保存关闭</el-button>
         </div>
     </div>
     <el-dialog v-model="dialog_visible" class="radius-lg" width="650" draggable :close-on-click-modal="false" append-to-body>
@@ -166,6 +166,14 @@ const confirm_event = async (formEl: FormInstance | undefined) => {
                 border-color: #fff;
                 color: $cr-primary;
             }
+            &.disabled {
+                opacity: 0.5;
+                &:hover {
+                    background-color: transparent;
+                    border-color: #fff;
+                    color: #fff;
+                }
+            }
         }
         .btn-white {
             background-color: #fff;
@@ -176,6 +184,14 @@ const confirm_event = async (formEl: FormInstance | undefined) => {
                 border-color: #1e7ede;
                 color: #fff;
             }
+            &.disabled {
+                opacity: 0.5;
+                &:hover {
+                    background-color: #fff;
+                    border-color: #fff;
+                    color: $cr-primary;
+                }
+            }
         }
     }
 }