From e27f11436a932d232815ee7437abbaeab679da2a Mon Sep 17 00:00:00 2001 From: admin <417727563@qq.com> Date: Wed, 26 Feb 2025 09:35:01 +0800 Subject: [PATCH 1/7] 1 --- src/views/home/index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/home/index.vue b/src/views/home/index.vue index dda4381..9810f2c 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -130,9 +130,9 @@ const toNewsDetail = (id: number) => { const newList = ref([]) const getNewsList = async () => { const res: any = await getColumnListApi() - console.log(res) + // console.log(res) newList.value = res.result.slice(0, 4) - console.log(newList.value, 'newList.value') + // console.log(newList.value, 'newList.value') newInfo.value = newList.value[0] getNewInfo(newList.value[0].id) } @@ -145,7 +145,7 @@ const childrenNewList = ref([]) const getNewInfo = async (id: any) => { const res: any = await queryEssayListApi(id) childrenNewList.value = res.result.records - console.log(childrenNewList, 'childrenNewList') + // console.log(childrenNewList, 'childrenNewList') } // 切换tab From 1e9cebaa57a6cffaf314c250f733d0f990df2e7f Mon Sep 17 00:00:00 2001 From: Ly <163999932+significative@users.noreply.github.com> Date: Thu, 27 Feb 2025 16:42:03 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/person.ts | 4 +- src/views/registrationPersonage/index.vue | 152 ++++++++++++++++------ 2 files changed, 115 insertions(+), 41 deletions(-) diff --git a/src/api/person.ts b/src/api/person.ts index 008205b..00e392a 100644 --- a/src/api/person.ts +++ b/src/api/person.ts @@ -59,7 +59,9 @@ interface SignUpData { entryFormat: '团队' | '个人' id: string instructorSheetList?: any[] - teamManagementList?: any[] + teamManagementList?: any[], + file:string + WorkName:any } interface MembersOrAdviser { diff --git a/src/views/registrationPersonage/index.vue b/src/views/registrationPersonage/index.vue index 8efc609..3da9415 100644 --- a/src/views/registrationPersonage/index.vue +++ b/src/views/registrationPersonage/index.vue @@ -25,11 +25,7 @@
{{ ndbs.annualid }}年度
{{ ndbs.name }}
- +
@@ -76,16 +72,10 @@
- +
- + @@ -93,23 +83,21 @@ - - - + + + + + +
-
+
@@ -179,16 +167,37 @@ {{ isDisable ? '返回' : isEdit ? '取消修改' : '取消报名' }} - + {{ isEdit ? '确认修改' : '确认报名' }}
+ + + + + + + + + + + + + + + From 56a4c0f4b3b9b412f84bdaff4af5e816319b003a Mon Sep 17 00:00:00 2001 From: Ly <163999932+significative@users.noreply.github.com> Date: Fri, 28 Feb 2025 14:40:44 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/registrationPersonage/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/registrationPersonage/index.vue b/src/views/registrationPersonage/index.vue index 3914d5d..d1780a5 100644 --- a/src/views/registrationPersonage/index.vue +++ b/src/views/registrationPersonage/index.vue @@ -167,7 +167,7 @@ {{ isDisable ? '返回' : isEdit ? '取消修改' : '取消报名' }} - 暂存修改 + 暂存信息 {{ isEdit ? '确认修改' : '确认报名' }} From e180cfd1a21c828bfe6dbcaa606ac57adf22c14f Mon Sep 17 00:00:00 2001 From: admin <417727563@qq.com> Date: Fri, 28 Feb 2025 16:58:08 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BD=9C=E5=93=81?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/registrationPersonage/index.vue | 6 +-- src/views/userInfo/components/reacList.vue | 44 +++++++++++----------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/views/registrationPersonage/index.vue b/src/views/registrationPersonage/index.vue index d1780a5..ea59836 100644 --- a/src/views/registrationPersonage/index.vue +++ b/src/views/registrationPersonage/index.vue @@ -167,8 +167,8 @@ {{ isDisable ? '返回' : isEdit ? '取消修改' : '取消报名' }} - 暂存信息 - + 暂存信息 + {{ isEdit ? '确认修改' : '确认报名' }} @@ -299,7 +299,7 @@ const ndbs = ref({}) const ndbsXm = ref({}) const subLoading = ref(false) -async function submit(substa:number) { +async function submit(substa:string) { console.log(ruleForm, 'ruleForm') if (!ruleForm.topicid) return ElMessage.warning('请选择题目') upData.value.teamManagementList[0].realname = info.value.realname diff --git a/src/views/userInfo/components/reacList.vue b/src/views/userInfo/components/reacList.vue index 3bf4de5..fe86d6e 100644 --- a/src/views/userInfo/components/reacList.vue +++ b/src/views/userInfo/components/reacList.vue @@ -16,11 +16,11 @@ - - - + + + + + - - - + + + + + + + + + + + + + +