From f865c0b0207dd227f22067832905ce15062ec2f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E6=A2=93=E5=BD=AD?= <tianbohe0@163.com>
Date: Tue, 7 Apr 2026 23:54:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=9B=E4=BA=8B=E9=A1=B5=E9=9D=A2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/marchant/certification/index.vue     | 18 ++++++++++++++++--
 .../match/manage/Steps/Step3ProjectConfig.vue  |  3 +--
 src/views/match/manage/work.vue                |  7 +++----
 src/views/match/project/index.vue              |  3 +--
 src/views/user/registration/index.vue          |  9 ---------
 5 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/src/views/marchant/certification/index.vue b/src/views/marchant/certification/index.vue
index 79f0ebc..f60e377 100644
--- a/src/views/marchant/certification/index.vue
+++ b/src/views/marchant/certification/index.vue
@@ -217,8 +217,8 @@ onMounted(() => {
 }
 
 .preview-area {
-	width: 280px;
-	height: 200px;
+	width: 178px;
+	height: 178px;
 	border: 1px solid var(--el-border-color);
 	border-radius: 8px;
 	overflow: hidden;
@@ -246,12 +246,17 @@ onMounted(() => {
 
 <style>
 .avatar-uploader .el-upload {
+	width: 178px;
+	height: 178px;
 	border: 1px dashed var(--el-border-color);
 	border-radius: 6px;
 	cursor: pointer;
 	position: relative;
 	overflow: hidden;
 	transition: var(--el-transition-duration-fast);
+	display: flex;
+	align-items: center;
+	justify-content: center;
 }
 
 .avatar-uploader .el-upload:hover {
@@ -264,6 +269,9 @@ onMounted(() => {
 	width: 178px;
 	height: 178px;
 	text-align: center;
+	display: flex;
+	align-items: center;
+	justify-content: center;
 }
 </style>
 
@@ -271,8 +279,14 @@ onMounted(() => {
 .upload-placeholder {
 	color: #8c939d;
 	text-align: center;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	justify-content: center;
+	height: 100%;
 }
 
+
 .cert-form {
 	background: var(--el-bg-color);
 	padding: 24px;
diff --git a/src/views/match/manage/Steps/Step3ProjectConfig.vue b/src/views/match/manage/Steps/Step3ProjectConfig.vue
index 3655fde..ce1c0c0 100644
--- a/src/views/match/manage/Steps/Step3ProjectConfig.vue
+++ b/src/views/match/manage/Steps/Step3ProjectConfig.vue
@@ -132,8 +132,7 @@
 					{{ scope.row.projectTypeName }}
 				</template>
 				<template #completionCount="scope">
-					{{ scope.row.projectTypeId == '1003' || scope.row.projectTypeId == '1004' ? 1 :
-						scope.row.completionCount }}
+					{{ scope.row.completionCount }}
 				</template>
 			</ProTable>
 			<template #footer>
diff --git a/src/views/match/manage/work.vue b/src/views/match/manage/work.vue
index 9227d81..11fbce4 100644
--- a/src/views/match/manage/work.vue
+++ b/src/views/match/manage/work.vue
@@ -8,7 +8,7 @@
                 <div style="height:50px;"></div>
                 <Step3ProjectConfig v-model:modelValue="formData.projectConfig" :readonly="true" />
                 <div style="height:50px;"></div>
-                <Step4FeeConfig v-model:modelValue="formData.feeConfig" :readonly="true" />
+                <Step4FeeConfig v-model:modelValue="formData.feeConfig" :readonly="true" :projects="formData.projectConfig.projects" />
                 <div style="height:100px;"></div>
             </el-tab-pane>
             <el-tab-pane label="报名管理" name="second">
@@ -79,11 +79,8 @@
                     <el-descriptions-item label="类型：">{{ item.projectType }}</el-descriptions-item>
                     <el-descriptions-item label="时长：">{{ item.totalDurationMinutes }}:{{ item.durationSeconds
                         }}</el-descriptions-item>
-                    <!-- <el-descriptions-item label="费用">{{ item.fee }}</el-descriptions-item> -->
                     <el-descriptions-item :label="`组别${idx + 1}:`" v-for="(group, idx) in item.groups">
                         <el-tag>{{ group.groupName }}</el-tag>
-                        <!-- <span style="margin: 0 10px;">{{ group.birthDateStart }} -- {{ group.birthDateEnd
-									}}</span> -->
                         <span style="margin: 0 70px;">参与人数: {{ group.participantCount }}</span>
                     </el-descriptions-item>
                 </el-descriptions>
@@ -225,6 +222,8 @@ const formData = ref({
         creditCode: '',
         bankName: '',
         accountNumber: '',
+        businessLicenseUrl: '',
+        projectPrices: {},
     },
 });
 // 打开弹窗
diff --git a/src/views/match/project/index.vue b/src/views/match/project/index.vue
index 355062c..c81270b 100644
--- a/src/views/match/project/index.vue
+++ b/src/views/match/project/index.vue
@@ -18,8 +18,7 @@
 			</template>
 
 			<template #completionCount="scope">
-				{{ scope.row.projectTypeId == '1003' || scope.row.projectTypeId == '1004' ? 1 :
-					scope.row.completionCount }}
+				{{ scope.row.completionCount }}
 			</template>
 
 			<template #action="scope">
diff --git a/src/views/user/registration/index.vue b/src/views/user/registration/index.vue
index 7416055..b61354b 100644
--- a/src/views/user/registration/index.vue
+++ b/src/views/user/registration/index.vue
@@ -814,15 +814,6 @@ const toggleGroupSelection = (id) => {
 	if (idx >= 0) {
 		selectedGroupIds.value.splice(idx, 1);
 	} else {
-		// 检查是否已经选择了其他项目的组别
-		const groupToAdd = allGroups.value.find(g => g.id === id);
-		if (groupToAdd && selectedGroupIds.value.length > 0) {
-			const existingProjectId = allGroups.value.find(g => g.id === selectedGroupIds.value[0])?.projectId;
-			if (groupToAdd.projectId !== existingProjectId) {
-				ElMessage.warning('一次报名只能选择一个项目，请先取消已选择的项目');
-				return;
-			}
-		}
 		selectedGroupIds.value.push(id);
 	}
 };