diff --git a/package.json b/package.json index bc5f245..7223cb8 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,8 @@ "build:prod": "vite build", "build:stage": "vite build --mode staging", "preview": "vite preview", - "format": "prettier --write \"**/*.{js,ts,tsx,jsx,vue,md}\"" + "format": "prettier --write \"**/*.{js,ts,tsx,jsx,vue,md}\"", + "caddy": "caddy run --config ./Caddyfile" }, "repository": { "type": "git", diff --git a/src/components/WebsiteHeader/index.vue b/src/components/WebsiteHeader/index.vue index 71ee830..9a564fe 100644 --- a/src/components/WebsiteHeader/index.vue +++ b/src/components/WebsiteHeader/index.vue @@ -182,14 +182,12 @@ - - - - diff --git a/src/views/admin/agent/bill/commission/withdraw-record.vue b/src/views/admin/agent/bill/commission/withdraw-record.vue deleted file mode 100644 index e8ab271..0000000 --- a/src/views/admin/agent/bill/commission/withdraw-record.vue +++ /dev/null @@ -1,95 +0,0 @@ - - - - - diff --git a/src/views/admin/agent/bill/exchange-record/index.vue b/src/views/admin/agent/bill/exchange-record/index.vue deleted file mode 100644 index 6c3ec92..0000000 --- a/src/views/admin/agent/bill/exchange-record/index.vue +++ /dev/null @@ -1,84 +0,0 @@ - - - - - diff --git a/src/views/admin/agent/bill/trade-auth/index.vue b/src/views/admin/agent/bill/trade-auth/index.vue deleted file mode 100644 index 59d3871..0000000 --- a/src/views/admin/agent/bill/trade-auth/index.vue +++ /dev/null @@ -1,51 +0,0 @@ - - - - - diff --git a/src/views/admin/agent/index.jsx b/src/views/admin/agent/index.jsx deleted file mode 100644 index 0cc9f67..0000000 --- a/src/views/admin/agent/index.jsx +++ /dev/null @@ -1,54 +0,0 @@ -import { defineComponent } from "vue"; -import StatisticsPanel from "@/views/components/StatisticsPanel.vue"; -import { getBrokerStatistic } from "@/api/admin/agent/home"; -import { ref } from "vue"; -import { useI18n } from "vue-i18n"; - -export default defineComponent({ - components: { - StatisticsPanel, - }, - setup() { - const { t } = useI18n(); - const statisticsList = ref([ - { - key: "enterpriseCount", - label: computed(() => t("admin.statistics.enterpriseCount")), - value: 0, - unit: "家", - }, - { - key: "runDemandCount", - label: computed(() => t("admin.statistics.serviceDemandCount")), - value: 0, - unit: "个", - }, - { - key: "orderTotal", - label: computed(() => t("admin.statistics.orderCount")), - value: 0, - unit: "元", - }, - { - key: "demandCount", - label: computed(() => t("admin.statistics.demandCount")), - value: 0, - unit: "个", - }, - ]); - - const loadStatistics = async () => { - const { data } = await getBrokerStatistic(); - statisticsList.value.forEach((item) => { - item.value = data[item.key] ?? 0; - }); - }; - loadStatistics(); - - return () => ( -
- -
- ); - }, -}); diff --git a/src/views/admin/agent/index.vue b/src/views/admin/agent/index.vue index c8171e0..b1e4553 100644 --- a/src/views/admin/agent/index.vue +++ b/src/views/admin/agent/index.vue @@ -1,7 +1,7 @@ diff --git a/src/views/admin/expert/components/ReleaseForm/index.vue b/src/views/admin/expert/components/ReleaseForm/index.vue index bf71aa4..a0bfd44 100644 --- a/src/views/admin/expert/components/ReleaseForm/index.vue +++ b/src/views/admin/expert/components/ReleaseForm/index.vue @@ -287,7 +287,7 @@ import { leadOptions, maturityOptions, } from "@/utils/parameter"; -import { computed, reactive, toRefs } from "vue"; +import { computed, reactive, ref, toRefs } from "vue"; import { useI18n } from "vue-i18n"; const { t } = useI18n(); diff --git a/src/views/admin/expert/demand/already.vue b/src/views/admin/expert/demand/already.vue index b8d19c5..27ef30a 100644 --- a/src/views/admin/expert/demand/already.vue +++ b/src/views/admin/expert/demand/already.vue @@ -318,7 +318,13 @@ const changePattent = (val) => { /** 删除按钮操作 */ function handleDelete(id) { modal - .confirm('是否确认删除数据编号为"' + id + '"的数据项?') + .confirm( + t("admin.common.confirmAction", { + type: t("admin.common.item"), + number: id, + action: t("admin.common.delete"), + }) + ) .then(function () { return deleteExpertCooperateEnterpriseByIds(id); }) diff --git a/src/views/admin/expert/demand/release.vue b/src/views/admin/expert/demand/release.vue index cc9fb57..2e9d54f 100644 --- a/src/views/admin/expert/demand/release.vue +++ b/src/views/admin/expert/demand/release.vue @@ -41,7 +41,11 @@ @@ -104,7 +108,11 @@ @@ -152,7 +160,7 @@ import tab from "@/plugins/tab"; import { ElMessage } from "element-plus"; import { useRoute } from "vue-router"; import { updateCount } from "@/api/admin/count.js"; -import { reactive, ref, toRefs } from "vue"; +import { computed, reactive, ref, toRefs } from "vue"; import { useI18n } from "vue-i18n"; const { t } = useI18n(); @@ -167,20 +175,60 @@ const data = reactive({ // postCode: undefined, }, rules: { - kinds: [{ required: true, message: "请选择需求类别" }], - title: [{ required: true, message: "需求名称不能为空", trigger: "blur" }], + kinds: [ + { + required: true, + message: computed(() => + t("admin.validation.required", { type: t("webSearch.demandType") }) + ), + }, + ], + title: [ + { + required: true, + /*"需求名称不能为空"*/ + message: computed(() => + t("admin.validation.required", { + type: t("webSearch.name", { + type: t("admin.common.demand"), + }), + }) + ), + trigger: "blur", + }, + ], description: [ { required: true, trigger: "blur", - message: "需求描述不能为空", + /*"需求描述不能为空"*/ + message: computed(() => + t("admin.validation.required", { + type: t("webSearch.demandDescription"), + }) + ), }, ], bankAccount: [ - { required: true, message: "需求联系人不能为空", trigger: "blur" }, + { + required: true, + /*"需求联系人不能为空"*/ + message: computed(() => + t("admin.validation.required", { + type: t("admin.form.demandContact"), + }) + ), + trigger: "blur", + }, ], bankPhone: [ - { required: true, message: "联系人手机号不能为空", trigger: "blur" }, + { + required: true, + /*"联系人手机号不能为空"*/ message: computed(() => + t("admin.form.contactPhone") + ), + trigger: "blur", + }, ], username: [ { @@ -189,9 +237,27 @@ const data = reactive({ trigger: "blur", }, ], - name: [{ required: true, message: "需求联系人不能为空", trigger: "blur" }], + name: [ + { + required: true, + /*"需求联系人不能为空"*/ + message: computed(() => + t("admin.validation.required", { + type: t("admin.form.demandContact"), + }) + ), + trigger: "blur", + }, + ], mobile: [ - { required: true, message: "需求联系人手机号不能为空", trigger: "blur" }, + { + required: true, + /*"需求联系人手机号不能为空"*/ + message: computed(() => + t("admin.validation.required", { type: t("admin.form.mobile") }) + ), + trigger: "blur", + }, ], // commitUserName: [ // { required: true, message: computed(()=>t('webContact.demandSubmit')), trigger: "blur" }, @@ -254,7 +320,11 @@ const getDetail = async () => { } }; if (route.query.id) { - const obj = Object.assign({}, route, { title: "修改需求" }); + const obj = Object.assign({}, route, { + title: t("admin.form.edit", { + type: t("admin.common.demand"), + }), + }); tab.updatePage(obj); getDetail(); } diff --git a/src/views/admin/expert/demand/serviceDemand.vue b/src/views/admin/expert/demand/serviceDemand.vue index de36b09..d592790 100644 --- a/src/views/admin/expert/demand/serviceDemand.vue +++ b/src/views/admin/expert/demand/serviceDemand.vue @@ -113,12 +113,13 @@ + \ No newline at end of file diff --git a/src/views/admin/expert/technology/release.vue b/src/views/admin/expert/technology/release.vue index e6501f9..0cc3bab 100644 --- a/src/views/admin/expert/technology/release.vue +++ b/src/views/admin/expert/technology/release.vue @@ -8,9 +8,9 @@ :labelWidth="labelWidth" />
- {{ - t("admin.form.saveDraft") - }} + {{ t("admin.form.saveDraft") }} + {{ t("admin.common.submitAudit") }} @@ -61,17 +61,17 @@ const submitForm = async (status) => { if (await releaseFormRef.value.validateForm()) { if (id) { await updateExpertAchievement({ ...form.value, status }); - ElMessage.success("修改成果成功"); + ElMessage.success(t("admin.common.editSuccess")); // router.back(); } else { await insertAchievement({ ...form.value, status }); - ElMessage.success("新增成果成功"); + ElMessage.success(t("admin.common.addSuccess")); // router.back(); } updateCount("achievement"); tab.closeOpenPage({ path: "/technology/achievement" }); } else { - console.log("校验未通过"); + console.log("validation failed"); } }; diff --git a/src/views/admin/expert/technology/research.vue b/src/views/admin/expert/technology/research.vue index 35bf338..9aef6bb 100644 --- a/src/views/admin/expert/technology/research.vue +++ b/src/views/admin/expert/technology/research.vue @@ -486,7 +486,6 @@ function handleShelf(row) { function handleDelete(id) { modal .confirm( - /*`是否确认删除数据编号为"${id}"的数据项?`*/ t("admin.common.confirmAction", { type: t("admin.common.researchProject"), action: t("admin.common.delete"), diff --git a/src/views/admin/laboratory/account/basic-info.vue b/src/views/admin/laboratory/account/basic-info.vue index dd3915c..919663d 100644 --- a/src/views/admin/laboratory/account/basic-info.vue +++ b/src/views/admin/laboratory/account/basic-info.vue @@ -19,9 +19,9 @@ /> + {{ - t("admin.common.submit") - }} + {{ t("admin.common.submit") }} +

@@ -63,9 +63,9 @@

- {{ - t("admin.common.submit") - }} + {{ t("admin.common.submit") }} +
@@ -81,6 +81,7 @@ import { } from "@/api/admin/laboratory/account"; import { ElMessage } from "element-plus"; import { useI18n } from "vue-i18n"; + const { t } = useI18n(); const data = reactive({ form: { @@ -90,11 +91,11 @@ const data = reactive({ personForm: {}, rules: { mobile: [ - { - pattern: /^1[3-9]\d{9}$/, - message: "请输入正确格式的手机号", - trigger: ["blur", "change"], - }, + /* { + pattern: /^1[3-9]\d{9}$/, + message: "请输入正确格式的手机号", + trigger: ["blur", "change"], + },*/ ], }, personRules: {}, @@ -135,7 +136,7 @@ const submitExpertForm = async () => { getBasicInfo(); }); } else { - console.log("校验未通过"); + console.log("validation failed"); } }; getBasicInfo(); diff --git a/src/views/admin/laboratory/research/achievement/index.vue b/src/views/admin/laboratory/research/achievement/index.vue index 2d5cad2..f938961 100644 --- a/src/views/admin/laboratory/research/achievement/index.vue +++ b/src/views/admin/laboratory/research/achievement/index.vue @@ -14,7 +14,13 @@ 删除 + > + {{ t("admin.common.delete") }} @@ -132,20 +139,20 @@ -
将文件拖到此处,或点击上传
+
{{ t("tips.uploadFile") }}