From 12ab80403fb88bc43199027f9edd6b7743f615b7 Mon Sep 17 00:00:00 2001 From: Jimmy Liow Date: Fri, 9 Aug 2024 15:21:53 +0800 Subject: [PATCH 1/3] =?UTF-8?q?perf:=20=E5=A2=9E=E5=8A=A0=E4=BB=B7?= =?UTF-8?q?=E6=A0=BC=E6=A0=A1=E9=AA=8C=E6=96=87=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/locales/en/products.json | 19 ++++++++----------- public/locales/zh/products.json | 18 ++++++++---------- .../products/Detail/ProductInfoQuotation.jsx | 2 +- 3 files changed, 17 insertions(+), 22 deletions(-) diff --git a/public/locales/en/products.json b/public/locales/en/products.json index e5e841c..3f271b1 100644 --- a/public/locales/en/products.json +++ b/public/locales/en/products.json @@ -104,18 +104,15 @@ "requiredTypes": "Please select product types", "requiredDept": "Please pick a owner department" }, - - "quotationTable": { - "Adult": "Adult", - "Child": "Child", - "Currency": "Currency", - "Unit": "Unit", - "GroupSize": "Group Size", - "UseDates": "Use Dates", - "Operation": "Operation", - "Weekdays": "Weekdays" + "Validation": { + "adultPrice": "请输入成人价", + "childrenPrice": "请输入儿童价", + "currency": "请输入币种", + "unit_name": "请输入类型", + "group_size_min": "请输入人等", + "group_size_max": "请输入人等", + "use_dates": "请输入有效期" }, - "sureSubmitAudit": "确认提交所有产品审核? 提交后，所有产品将进入待审核流程. ", "FormTooltip": { "Type": "Product Type", diff --git a/public/locales/zh/products.json b/public/locales/zh/products.json index 37cfb4f..c78f35c 100644 --- a/public/locales/zh/products.json +++ b/public/locales/zh/products.json @@ -94,17 +94,15 @@ "requiredTypes": "请选择产品类型", "requiredDept": "请选择所属小组" }, - "quotationTable": { - "Adult": "成人", - "Child": "儿童", - "Currency": "币种", - "Unit": "类型", - "GroupSize": "人等", - "UseDates": "使用日期", - "Weekdays": "周末", - "Operation": "Operation" + "Validation": { + "adultPrice": "请输入成人价", + "childrenPrice": "请输入儿童价", + "currency": "请输入币种", + "unit_name": "请输入类型", + "group_size_min": "请输入人等", + "group_size_max": "请输入人等", + "use_dates": "请输入有效期" }, - "sureSubmitAudit": "确认提交所有产品审核? 提交后，所有产品将进入待审核流程. ", "FormTooltip": { "Type": "Product Type", diff --git a/src/views/products/Detail/ProductInfoQuotation.jsx b/src/views/products/Detail/ProductInfoQuotation.jsx index 1ef3d4f..680ada5 100644 --- a/src/views/products/Detail/ProductInfoQuotation.jsx +++ b/src/views/products/Detail/ProductInfoQuotation.jsx @@ -1,5 +1,5 @@ import { useState } from 'react' -import { Table, Form, Modal, Button, Radio, Input, Flex, Card, Select, InputNumber, Checkbox, DatePicker, Space, App } from 'antd' +import { Table, Form, Modal, Button, Radio, Input, Flex, Card, InputNumber, Checkbox, DatePicker, Space, App } from 'antd' import { useTranslation } from 'react-i18next' import { CloseOutlined, StarTwoTone, PlusOutlined, ExclamationCircleFilled } from '@ant-design/icons' import { useDatePresets } from '@/hooks/useDatePresets' From d1977c180e223cc9141b9e256ee4dfa08c9863a4 Mon Sep 17 00:00:00 2001 From: Jimmy Liow Date: Fri, 9 Aug 2024 15:31:36 +0800 Subject: [PATCH 2/3] =?UTF-8?q?perf:=20=E5=88=A0=E9=99=A4=E4=B8=8D?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E7=9A=84=E5=A4=9A=E8=AF=AD=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/locales/en/products.json | 22 ++++++------------- public/locales/zh/products.json | 13 +++++------ .../products/Detail/ProductInfoQuotation.jsx | 14 ++++++------ 3 files changed, 20 insertions(+), 29 deletions(-) diff --git a/public/locales/en/products.json b/public/locales/en/products.json index 3f271b1..423f086 100644 --- a/public/locales/en/products.json +++ b/public/locales/en/products.json @@ -70,21 +70,13 @@ "adultPrice": "Adult price", "childrenPrice": "Child price", "currency": "Currency", - "Types": "Type", - "number": "Number", - "validityPeriod":"Validity period", - "operation": "Operation", - "price": "Price", - "weekends":"Weekends", - - "Quotation": "Quotation", - "Offer": "Offer", - - "Unit": "Unit", - "GroupSize": "Group Size", - "UseDates": "Use Dates", - - "Weekdays": "Weekdays", + "unit_name": "类型", + "group_size": "人等", + "use_dates": "有效期", + "operation": "操作", + "price": "价格", + "Offer": "报价", + "Weekdays": "周末", "OnWeekdays": "On Weekdays: ", "Unlimited": "Unlimited", diff --git a/public/locales/zh/products.json b/public/locales/zh/products.json index c78f35c..87df899 100644 --- a/public/locales/zh/products.json +++ b/public/locales/zh/products.json @@ -67,17 +67,16 @@ "adultPrice": "成人价", "childrenPrice": "儿童价", "currency": "币种", - "Types": "类型", - "number": "人等", - "validityPeriod": "有效期", + + "unit_name": "类型", + "group_size": "人等", + "use_dates": "有效期", "operation": "操作", "price": "价格", - "Quotation": "报价", "Offer": "报价", - "Unit": "单位", - "GroupSize": "人等", - "UseDates": "使用日期", + "Weekdays": "周末", + "OnWeekdays": "周: ", "Unlimited": "不限", "UseYear": "年份", diff --git a/src/views/products/Detail/ProductInfoQuotation.jsx b/src/views/products/Detail/ProductInfoQuotation.jsx index 680ada5..7dcdf66 100644 --- a/src/views/products/Detail/ProductInfoQuotation.jsx +++ b/src/views/products/Detail/ProductInfoQuotation.jsx @@ -204,20 +204,20 @@ const ProductInfoQuotation = ({ editable, ...props }) => { { title: t('products:childrenPrice'), dataIndex: 'child_cost', width: '4rem' }, { title: t('products:currency'), dataIndex: 'currency', width: '4rem' }, { - title: t('products:Types'), + title: t('products:unit_name'), dataIndex: 'unit_id', width: '4rem', render: (text) => (text === '0' ? '每人' : text === '1' ? '每团' : text), }, { - title: t('products:number'), + title: t('products:group_size'), dataIndex: 'group_size', width: '4rem', render: (_, record) => `${record.group_size_min}-${record.group_size_max}`, }, { - title: t('products:validityPeriod'), + title: t('products:use_dates'), dataIndex: 'use_dates', width: '6rem', render: (_, record) => `${record.use_dates_start}-${record.use_dates_end}`, @@ -411,7 +411,7 @@ const ProductInfoQuotation = ({ editable, ...props }) => { { { { Date: Fri, 9 Aug 2024 15:50:52 +0800 Subject: [PATCH 3/3] =?UTF-8?q?perf:=20=E8=B0=83=E6=95=B4=E4=BE=9B?= =?UTF-8?q?=E5=BA=94=E5=95=86=E5=90=8D=E5=AD=97=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/App.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/App.jsx b/src/views/App.jsx index 34b288f..2ee9b45 100644 --- a/src/views/App.jsx +++ b/src/views/App.jsx @@ -105,7 +105,7 @@ function App() {
- + App logo @@ -132,7 +132,7 @@ function App() { ]} /> - +

{currentUser?.travelAgencyName}