From 09be7b059212af7c99a8ab6ea45d4a3d8b9a61cb Mon Sep 17 00:00:00 2001
From: JayChou <xxx@gmail.com>
Date: Wed, 19 Feb 2025 15:55:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=99=BB=E5=BD=95=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F=E4=BB=8D=E7=84=B6=E6=8F=90=E7=A4=BA=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E7=A0=81=E9=94=99=E8=AF=AFbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/requset.ts                       |  3 +
 src/views/login/index.vue                  | 73 +++++++++++-----------
 src/views/userInfo/components/reacList.vue |  6 +-
 3 files changed, 46 insertions(+), 36 deletions(-)

diff --git a/src/utils/requset.ts b/src/utils/requset.ts
index 33fa339..4e50b31 100644
--- a/src/utils/requset.ts
+++ b/src/utils/requset.ts
@@ -19,6 +19,9 @@ server.interceptors.request.use((config) => {
 })
 // 创建相应拦截器
 server.interceptors.response.use((response) => {
+  if(response.data.code === 412){
+    return Promise.reject(response)
+  }
   return response.data
 })
 
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index fce987a..fb8049c 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -30,9 +30,9 @@
         </el-form>
         <!-- <div class="submit gradient" @click="submit">登录</div> -->
         <div class="btn">
-        <div @click="Router.push('/')">返回首页</div>
-        <div class="gradient" @click="submit">登录</div>
-      </div>
+          <div @click="Router.push('/')">返回首页</div>
+          <div class="gradient" @click="submit">登录</div>
+        </div>
       </div>
       <div class="registered">
         还没账号？
@@ -48,7 +48,7 @@ import { onMounted, reactive, ref, toRefs, watch } from 'vue'
 import { getCode } from '@/api/user'
 import userStore from '@/store/module/user'
 import { ElMessage } from 'element-plus'
-import { useRouter,useRoute } from 'vue-router'
+import { useRouter, useRoute } from 'vue-router'
 import RegisTered from './registered.vue'
 const route = useRoute()
 const useUserStore = userStore()
@@ -80,17 +80,20 @@ const submit = async () => {
     password: form.value.password,
     username: form.value.account,
   }
-  const res = await useUserStore.login(data)
-  console.log(res)
-  
-  if (res === 0) {
-    ElMessage('验证码错误')
-    getcodeinfo()
-  } else if (res === 1) {
-    ElMessage('账号或密码错误')
-    getcodeinfo()
-  } else {
-    Router.push('/')
+  try {
+    const res = await useUserStore.login(data)
+    console.log(res)
+    if (res === 0) {
+      ElMessage('验证码错误')
+      getcodeinfo()
+    } else if (res === 1) {
+      ElMessage('账号或密码错误')
+      getcodeinfo()
+    } else {
+      Router.push('/')
+    }
+  } catch (error: any) {
+    ElMessage(error.data.message)
   }
 }
 onMounted(() => {
@@ -98,7 +101,7 @@ onMounted(() => {
   // setTimeout(() => {
   //   getcodeinfo()
   // },6000)
-  if(route.query.registered){
+  if (route.query.registered) {
     registered()
   }
 })
@@ -191,26 +194,26 @@ const backLoginEvent = () => {
   }
 }
 .btn {
-    display: flex;
-    justify-content: space-between;
-    margin-top: 45px;
-    div {
-      width: 210px;
-      height: 42px;
-      text-align: center;
-      line-height: 42px;
-      font-size: 14px;
-      cursor: pointer;
-      border-radius: 10px;
-    }
-    div:nth-child(1) {
-      border: 1px solid #dbdbdb;
-      color: #3c3c3c;
-    }
-    div:nth-child(2) {
-      color: #fff;
-    }
+  display: flex;
+  justify-content: space-between;
+  margin-top: 45px;
+  div {
+    width: 210px;
+    height: 42px;
+    text-align: center;
+    line-height: 42px;
+    font-size: 14px;
+    cursor: pointer;
+    border-radius: 10px;
+  }
+  div:nth-child(1) {
+    border: 1px solid #dbdbdb;
+    color: #3c3c3c;
   }
+  div:nth-child(2) {
+    color: #fff;
+  }
+}
 :deep(.el-form-item) {
   display: flex;
   flex-direction: column;
diff --git a/src/views/userInfo/components/reacList.vue b/src/views/userInfo/components/reacList.vue
index 6f86b13..8eb4a92 100644
--- a/src/views/userInfo/components/reacList.vue
+++ b/src/views/userInfo/components/reacList.vue
@@ -6,9 +6,13 @@
       </template>
       <el-table :data="list" v-loading="isLoading">
         <el-table-column
+          label="年度比赛名称"
+          prop="compName"
+        />
+        <!-- <el-table-column
           label="年度比赛项目名称"
           prop="annualCompid_dictText"
-        />
+        /> -->
         <el-table-column label="比赛类型" prop="entryFormat" />
         <el-table-column label="报名编号" prop="enrollCode" />
         <el-table-column label="比赛状态" prop="enrollStatic_dictText" />