优化

src/api/login.js

@@ -31,14 +31,6 @@ export function sendAVerificationCode(codeRs) {
     })
 }
 
-export function checkVerificationCode(codeRs, verificationCode) {
-    return request({
-        url: '/login/checkVerificationCode',
-        method: 'get',
-        params: {codeRs, verificationCode}
-    })
-}
-
 export function checkVerificationCodeV2(data) {
     return request({
         url: '/login/checkVerificationCodeV2',

src/components/cy/message-box/src/index.vue

@@ -222,35 +222,44 @@ onMounted(async () => {
 
 <template>
   <transition name="overlay_background">
-    <ElOverlay v-show="visible"
-               overlay-class="cy-message_overlay"
-               :z-index="zIndex">
+    <ElOverlay
+        v-show="visible"
+        overlay-class="cy-message_overlay"
+        :z-index="zIndex"
+    >
       <transition name="cy-enlarge" @after-leave="emits('vanish')">
-        <div role="dialog"
-             v-show="visible"
-             aria-modal="true"
-             class="cy-overlay-message-box"
-             @click="overlayClick">
-          <ElFocusTrap loop
-                       :trapped="visible"
-                       :focus-trap-el="rootRef"
-                       :focus-start-el="focusStartRef"
-                       @release-requested="onCloseRequested">
+        <div
+            role="dialog"
+            v-show="visible"
+            aria-modal="true"
+            class="cy-overlay-message-box"
+            @click="overlayClick"
+        >
+          <ElFocusTrap
+              loop
+              :trapped="visible"
+              :focus-trap-el="rootRef"
+              :focus-start-el="focusStartRef"
+              @release-requested="onCloseRequested"
+          >
             <div :class="dithering ? 'cy-message-box_dithering' : ''">
               <div ref="rootRef" tabindex="-1" class="cy-message-box" @click.stop>
                 <header ref="headerRef">
                   <div class="cy-message-box_title">
-                    <el-icon v-if="props.icon"
-                             :size="24"
-                             :style="{color: props.iconColor}">
+                    <el-icon
+                        v-if="props.icon"
+                        :size="24"
+                        :style="{color: props.iconColor}"
+                    >
                       <component :is="props.icon"/>
                     </el-icon>
                     {{ props.title }}
                   </div>
 
-                  <button @click.stop="handelClose('close')"
-                          v-if="props.showIcon"
-                          @keydown.prevent.enter="handelClose('close')">
+                  <button
+                      @click.stop="handelClose('close')"
+                      v-if="props.showIcon"
+                      @keydown.prevent.enter="handelClose('close')">
                     <el-icon>
                       <Close/>
                     </el-icon>

src/components/cy/message-box/src/message-box.type.ts

@@ -21,7 +21,7 @@ export interface MessageBoxType {
     beforeClose?: (inputValue: string) => boolean,
 }
 
-declare type  CyMessageClose = { action: 'cancel' | 'confirm' | 'close', value: string }
+declare type CyMessageClose = { action: 'cancel' | 'confirm' | 'close', value: string }
 
 export type CyMessageBoxShortcutMethod = ((
     options: MessageBoxType

src/utils/request.js

@@ -1,24 +1,10 @@
 import axios from 'axios'
-import {ElMessage, ElMessageBox, ElNotification} from 'element-plus'
+import {ElMessage, ElNotification} from 'element-plus'
 import router from '@/router'
 import {startLoading, endLoading} from './loading'
 import {CyMessageBox} from "@/components/cy/message-box";
 import {useProgressBarStore} from "@/pinia/progress-bar-store";
 
-let loginBox = null
-let popUps = null
-
-const createAPopup = (message = '错误信息') => {
-    if (popUps !== null) {
-        return
-    }
-    popUps = ElMessageBox.alert(message, '提示', {
-        type: "error",
-    }).finally(() => {
-        popUps = null
-    })
-}
-
 const service = axios.create({
     baseURL: import.meta.env.VITE_BASE_URL,
     withCredentials: true,
@@ -68,7 +54,6 @@ service.interceptors.response.use(
                 duration: 3500,
                 dangerouslyUseHTMLString: true,
                 message: response.data.message,
-                showClose: true,
             })
             return response.data.data
         }
@@ -77,8 +62,6 @@ service.interceptors.response.use(
                 type: "success",
                 message: response.data.message,
                 dangerouslyUseHTMLString: true,
-            }).then(() => {
-            }).catch(() => {
             })
             return response.data.data
         }
@@ -92,50 +75,49 @@ service.interceptors.response.use(
             return response.data.data
         }
 
-
         if (response.data.code > 1000 && response.data.code < 2000) {
             ElMessage({
                 type: 'error',
                 message: response.data.message,
                 duration: 3500,
-                showClose: true,
                 grouping: true,
             })
         } else if (response.data.code > 2000 && response.data.code < 3000) {
             if (response.data.code === 2003) {
-                ElMessageBox.alert(response.data.message, '提示', {
+                CyMessageBox.alert({
                     type: 'error',
-                    dangerouslyUseHTMLString: true,
-                    confirmButtonText: '确定',
-                }).then(() => {
+                    message: response.data.message,
+                    title: '提示',
+                    dangerouslyUseHTMLString: true
                 })
             } else {
-                ElMessageBox.alert(response.data.message, '提示', {
+                CyMessageBox.alert({
                     type: 'error',
-                    confirmButtonText: '确定',
-                }).then(() => {
+                    message: response.data.message,
+                    title: '提示',
                 })
             }
         } else if (response.data.code > 3000 && response.data.code < 4000) {
-            if (loginBox === null) {
-                loginBox = ElMessageBox.alert(response.data.message, '提示', {
-                    type: 'warning',
-                    confirmButtonText: '确定',
-                    showClose: false,
-                }).then(() => {
-                    loginBox = null
-                    router.push('/login')
-                })
-            }
+            CyMessageBox.alert({
+                type: 'error',
+                message: response.data.message,
+                title: '提示',
+                showIcon: false
+            }).then(() => {
+                router.push('/login')
+            })
         } else if (response.data.code === 5001) {
-            createAPopup(response.data.message)
+            CyMessageBox.alert({
+                type: 'error',
+                message: response.data.message,
+                title: '提示',
+            })
         }
         if (response.data.code === 6001) {
             ElMessage({
                 message: response.data.message,
                 type: 'error',
                 duration: 2500,
-                showClose: true,
                 grouping: true,
             })
             return {
@@ -143,19 +125,19 @@ service.interceptors.response.use(
                 data: response.data.data
             }
         } else if (response.data.code === 6002) {
-            ElMessageBox.alert(response.data.message, '提示', {
+            CyMessageBox.alert({
                 type: 'error',
-                confirmButtonText: '确定',
-            }).then(() => {
+                message: response.data.message,
+                title: '提示',
             })
             return Promise.reject(response.data.data)
         }
 
         if (response.data.code > 7000 && response.data.code < 8000) {
-            ElMessageBox.alert(response.data.message, '提示', {
+            CyMessageBox.alert({
                 type: 'error',
-                confirmButtonText: '确定',
-            }).then(() => {
+                message: response.data.message,
+                title: '提示',
             })
             return Promise.reject(response.data)
         }
@@ -181,7 +163,6 @@ service.interceptors.response.use(
             message: error,
             type: 'error',
             duration: 3500,
-            showClose: true,
             grouping: true,
         })
         useProgressBarStore().initialize({

src/views/system/login.vue

@@ -89,8 +89,8 @@ const submit = () => {
     codeRs: form.codeRs,
     password: form.password,
   }
-  localStorage.clear()
   loginApi(params).then((res) => {
+    localStorage.clear()
     userStore.setUserInfo(res)
     localStorage.removeItem('tabs')
     if (!checkPasswordStrength(params.password) && !isDev) {