From 7091ff3b2680956c6ae5d77ee4d9b58309d7498b Mon Sep 17 00:00:00 2001
From: quantulr <35954003+quantulr@users.noreply.github.com>
Date: Fri, 15 Sep 2023 15:03:15 +0800
Subject: [PATCH] bugfix

---
 src/plugins/modal.js                                        | 2 +-
 src/views/admin/enterprise/account/bill.vue                 | 2 +-
 src/views/admin/laboratory/research/paper/index.vue         | 4 ++--
 .../admin/laboratory/research/research-project/index.vue    | 4 ++--
 src/views/website/activity/activity.vue                     | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/plugins/modal.js b/src/plugins/modal.js
index 625f7b9..d26059c 100644
--- a/src/plugins/modal.js
+++ b/src/plugins/modal.js
@@ -64,7 +64,7 @@ export default {
   confirm(content) {
     return ElMessageBox.confirm(content, t("common.systemPrompt"), {
       confirmButtonText: t("common.confirm"),
-      cancelButtonText: t("common.confirm"),
+      cancelButtonText: t("common.cancel"),
       type: "warning",
     });
   },
diff --git a/src/views/admin/enterprise/account/bill.vue b/src/views/admin/enterprise/account/bill.vue
index fd37bb6..17ba325 100644
--- a/src/views/admin/enterprise/account/bill.vue
+++ b/src/views/admin/enterprise/account/bill.vue
@@ -477,7 +477,7 @@ const submitForm = async () => {
   await formRef.value.validate();
   if (form.value.id) {
     await updateCasDealLog(form.value);
-    ElMessage.success(t("admin.common.applicationSuccess"));
+    ElMessage.success(t("admin.table.applicationSuccess"));
     showEditDialog.value = false;
     getList();
   } else {
diff --git a/src/views/admin/laboratory/research/paper/index.vue b/src/views/admin/laboratory/research/paper/index.vue
index d03dbf8..934a955 100644
--- a/src/views/admin/laboratory/research/paper/index.vue
+++ b/src/views/admin/laboratory/research/paper/index.vue
@@ -8,14 +8,14 @@
       @submit.prevent
     >
       <el-form-item
-        :label="t('admin.form.name', { type: t('admin.common.achievement') })"
+        :label="t('admin.form.name', { type: t('admin.common.paper') })"
         prop="title"
       >
         <el-input
           v-model="queryParams.title"
           clearable
           :placeholder="
-            t('admin.form.placeholder', { type: t('admin.common.patent') })
+            t('admin.form.placeholder', { type: t('admin.common.paper') })
           "
           size="small"
           style="width: 240px"
diff --git a/src/views/admin/laboratory/research/research-project/index.vue b/src/views/admin/laboratory/research/research-project/index.vue
index 76ec459..e307ee5 100644
--- a/src/views/admin/laboratory/research/research-project/index.vue
+++ b/src/views/admin/laboratory/research/research-project/index.vue
@@ -8,14 +8,14 @@
       @submit.prevent
     >
       <el-form-item
-        :label="t('admin.form.name', { type: t('admin.common.achievement') })"
+        :label="t('admin.form.name', { type: t('admin.common.researchProject') })"
         prop="name"
       >
         <el-input
           v-model="queryParams.name"
           clearable
           :placeholder="
-            t('admin.form.placeholder', { type: t('admin.common.patent') })
+            t('admin.form.placeholder', { type: t('admin.common.researchProject') })
           "
           size="small"
           style="width: 240px"
diff --git a/src/views/website/activity/activity.vue b/src/views/website/activity/activity.vue
index 2a39289..6970710 100644
--- a/src/views/website/activity/activity.vue
+++ b/src/views/website/activity/activity.vue
@@ -265,7 +265,7 @@
           <el-col :span="12">
             <el-form-item :label="t('input.age')" prop="age">
               <el-input-number
-                :placeholder="t('activity.inputAge')"
+                :placeholder="t('input.inputAge')"
                 v-model="signUpForm.age"
               ></el-input-number>
             </el-form-item>
@@ -273,9 +273,9 @@
           <el-col :span="12">
             <el-form-item :label="t('input.gender')" prop="gender">
               <el-radio-group v-model="signUpForm.gender">
-                <el-radio label="1">{{ t("activity.male") }}</el-radio>
+                <el-radio label="1">{{ t("gender.male") }}</el-radio>
                 <el-radio label="2">
-                  {{ t("activity.female") }}
+                  {{ t("gender.female") }}
                 </el-radio>
               </el-radio-group>
             </el-form-item>