From 2e8d3fc21fc1470e7c39a5ada810b3e36c999f89 Mon Sep 17 00:00:00 2001
From: JayChou <xxx@gmail.com>
Date: Tue, 3 Dec 2024 11:49:08 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9B=B4=E6=96=B0=20?=
 =?UTF-8?q?=E6=8A=A5=E5=90=8D=E5=BE=85=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/registrationGroup/index.vue      |  6 ++++--
 src/views/registrationPersonage/index.vue  | 18 +++++++++---------
 src/views/userInfo/components/reacList.vue |  6 ++++--
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/views/registrationGroup/index.vue b/src/views/registrationGroup/index.vue
index 787bdd8..eb381cb 100644
--- a/src/views/registrationGroup/index.vue
+++ b/src/views/registrationGroup/index.vue
@@ -150,9 +150,9 @@
       </div>
     </el-card>
     <div class="bottom">
-      <el-button class="btn" @click="$router.back()">{{ isDisable ? '返回' : '取消报名'}}</el-button>
+      <el-button class="btn" @click="$router.back()">{{ isDisable ? '返回' : isEdit ? '取消修改' : '取消报名' }}</el-button>
       <el-button class="btn cyan" @click="submit" :loading="loading"  :disabled="isDisable">
-        确认报名
+        {{  isEdit ? '确认修改' : '确认报名' }}
       </el-button>
     </div>
   </div>
@@ -175,6 +175,8 @@ const route = useRoute()
 const router = useRouter()
 const isDisable = ref(false)
 isDisable.value = route.query.info as any
+const isEdit = ref(false)
+isEdit.value = route.query.edit as any
 // 用户信息
 const { userInfo: info } = toRefs(user)
 
diff --git a/src/views/registrationPersonage/index.vue b/src/views/registrationPersonage/index.vue
index 15480b2..1397da3 100644
--- a/src/views/registrationPersonage/index.vue
+++ b/src/views/registrationPersonage/index.vue
@@ -104,12 +104,12 @@
           <div class="label">邮箱</div>
           <div class="text">{{ info.email }}</div>
         </div>
-        <div class="info-box">
+        <!-- <div class="info-box">
           <div class="label">队伍名称</div>
           <div class="text">
             <el-input v-model="upData.teamName"></el-input>
           </div>
-        </div>
+        </div> -->
         <!-- <div class="info-box">
                     <div class="label">院系</div>
                     <div class="text">国际教育学院</div>
@@ -192,13 +192,13 @@ const subLoading = ref(false)
 async function submit() {
   upData.value.teamManagementList[0].realname = info.value.realname
   upData.value.teamManagementList[0].userId = info.value.id
-  if (!upData.value.teamName) {
-    ElMessage({
-      message: '队伍名称不能为空',
-      type: 'warning',
-    })
-    return
-  }
+  // if (!upData.value.teamName) {
+  //   ElMessage({
+  //     message: '队伍名称不能为空',
+  //     type: 'warning',
+  //   })
+  //   return
+  // }
   try {
     subLoading.value = true
     const res: any = await getSignUpApi(upData.value)
diff --git a/src/views/userInfo/components/reacList.vue b/src/views/userInfo/components/reacList.vue
index 15cd32e..68e7e51 100644
--- a/src/views/userInfo/components/reacList.vue
+++ b/src/views/userInfo/components/reacList.vue
@@ -12,7 +12,7 @@
         <el-table-column label="比赛类型" prop="entryFormat" />
         <el-table-column label="报名编号" prop="enrollCode" />
         <el-table-column label="比赛状态" prop="enrollStatic_dictText" />
-        <el-table-column label="比赛状态">
+        <el-table-column label="报名状态">
           <template #default="{ row }">
             {{ formatstatus(row.workStatus) }}
           </template>
@@ -54,7 +54,7 @@
               type="primary"
               size="small"
               @click="saveEvent(row.enrollCode)"
-              :disabled="row.workStatus != '4' || row.workStatus != '3'"
+              v-if="row.workStatus == '4' || row.workStatus == '3'"
             >
               提交
             </el-button>
@@ -208,6 +208,8 @@ const download = async (url:any,name:any) => {
 const saveEvent = async (id: any) => {
   const res: any = await sava({ applyCode: id, status: 5 })
   ElMessage.success(res.message)
+  getList()
+
 }
 
 const formatstatus = (status: any) => {