Handy_Cao 1 일 전
부모
커밋
cc708e580f

+ 8 - 2
public/locales/en-US.json

@@ -92,7 +92,12 @@
         "update": "Update",
         "install": "Install",
         "hidden": "Hidden",
-        "downloading": "Downloading"
+        "downloading": "Downloading",
+        "click": "Click",
+        "numbers": "nuber",
+        "max": "the max",
+        "mini": "the mini",
+        "refresh": "refresh"
     },
     "tabbar": {
         "home": "Homepage",
@@ -1913,6 +1918,7 @@
         "closed": "Closed",
         "actived": "Enabled",
         "system": "Follow System",
-        "light": "Light mode"
+        "light": "Light mode",
+        "about": "About"
     }
 }

+ 8 - 2
public/locales/th-TH.json

@@ -92,7 +92,12 @@
         "update": "อัปเดต",
         "install": "ติดตั้ง",
         "hidden": "ซ่อน",
-        "downloading": "กำลังดาวน์โหลด"
+        "downloading": "กำลังดาวน์โหลด",
+        "click": "請點擊",
+        "numbers": "的數字",
+        "max": "最大",
+        "mini": "最小",
+        "refresh": "刷新"
     },
     "tabbar": {
         "home": "หน้าหลัก",
@@ -1916,6 +1921,7 @@
         "closed": "Closed",
         "actived": "Enabled",
         "system": "Follow System",
-        "light": "Light mode"
+        "light": "Light mode",
+        "about": "About"
     }
 }

+ 8 - 2
public/locales/vi-VN.json

@@ -92,7 +92,12 @@
         "update": "Nâng cấp",
         "install": "Cài đặt",
         "hidden": "Ẩn",
-        "downloading": "Đang tải"
+        "downloading": "Đang tải",
+        "click": "請點擊",
+        "numbers": "的數字",
+        "max": "最大",
+        "mini": "最小",
+        "refresh": "刷新"
     },
     "tabbar": {
         "home": "Trang chủ",
@@ -1913,6 +1918,7 @@
         "closed": "Closed",
         "actived": "Enabled",
         "system": "Follow System",
-        "light": "Light mode"
+        "light": "Light mode",
+        "about": "About"
     }
 }

+ 8 - 2
public/locales/zh-CN.json

@@ -92,7 +92,12 @@
         "update": "更新",
         "install": "安装",
         "hidden": "隐藏",
-        "downloading": "下载中"
+        "downloading": "下载中",
+        "click": "请点击",
+        "numbers": "的数字",
+        "max": "最大",
+        "mini": "最小",
+        "refresh": "刷新"
     },
     "tabbar": {
         "home": "首页",
@@ -1916,6 +1921,7 @@
         "closed": "已关闭",
         "actived": "已启用",
         "system": "跟随系统",
-        "light": "浅色模式"
+        "light": "浅色模式",
+        "about": "关于"
     }
 }

+ 8 - 2
public/locales/zh-TW.json

@@ -92,7 +92,12 @@
         "update": "更新",
         "install": "設定",
         "hidden": "隱藏",
-        "downloading": "下載中"
+        "downloading": "下載中",
+        "click": "請點擊",
+        "numbers": "的數字",
+        "max": "最大",
+        "mini": "最小",
+        "refresh": "刷新"
     },
     "tabbar": {
         "home": "首頁",
@@ -1916,6 +1921,7 @@
         "closed": "已關閉",
         "actived": "已啓用",
         "system": "跟隨系統",
-        "light": "淺色模式"
+        "light": "淺色模式",
+        "about": "关于"
     }
 }

+ 4 - 3
src/components/base/click-verify/index.vue

@@ -4,12 +4,12 @@
         <div class="click-verify__title">
             <div>
                 <slot name="tip" :mode="state.compareMode">
-                    <span>请点击 <b>{{ state.compareMode ? '最大' : '最小' }}</b> 的数字</span>
+                    <span>{{ t('common.click') }} <b>{{ state.compareMode ? t('common.max') : t('common.mini') }}</b> {{ t('common.numbers') }}</span>
                 </slot>
             </div>
             <div class="click-verify__close" @click="onRefresh">
                 <slot name="refresh">
-                    <span>刷新</span>
+                    <span>{{ t('common.refresh') }}</span>
                 </slot>
             </div>
         </div>
@@ -22,6 +22,7 @@
 </template>
 
 <script lang="ts" setup>
+import { i18n } from '@/stores'
 import { onMounted, ref, reactive, CSSProperties, nextTick } from 'vue'
 
 const props = defineProps({
@@ -37,7 +38,7 @@ const props = defineProps({
 })
 
 const emit = defineEmits(['success', 'error'])
-
+const { global: { t } } = i18n
 const imageRef = ref<HTMLDivElement>()
 
 const state = reactive<{

+ 1 - 1
src/packages/digital/views/account/certification/index.vue

@@ -5,7 +5,7 @@
             <app-navbar :title="t('user.authentication.title')" />
         </template>
         <Form ref="formRef" class="g-form__container" @submit="onSubmit">
-            <CellGroup title="信息填写" inset>
+            <CellGroup :title="t('user.authentication.filling')" inset>
                 <Field v-model="formData.username" name="username" :label="t('user.authentication.customername')"
                     :placeholder="t('user.authentication.pleaseentertheusername')" :rules="formRules.username" />
                 <Field name="cardtype" :label="t('user.authentication.cardtype')" :rules="formRules.cardtype" is-link>

+ 1 - 2
src/packages/digital/views/contract/components/order/list/index.vue

@@ -43,7 +43,7 @@
                     <tr>
                         <td colspan="2">
                             <Button v-if="[3, 7, 12].includes(item.orderstatus)" size="small"
-                                @click="cancelOrder(item)">撤销</Button>
+                                @click="cancelOrder(item)">{{ $t('operation.cancel') }}</Button>
                         </td>
                     </tr>
                 </tfoot>
@@ -92,7 +92,6 @@ const goodsname = (code: string) => {
     return futuresStore.getI18nGoodsName(code)
 }
 
-
 const { loading, pageIndex, pageCount, run } = useRequest(queryTradeOrderDetail, {
     manual: true,
     defaultParams: {

+ 1 - 1
src/packages/digital/views/setting/index.vue

@@ -41,7 +41,7 @@
                 </template>
             </Cell>
         </CellGroup>
-        <CellGroup title="关于">
+        <CellGroup :title="t('digital.about')">
             <Cell is-link :to="{ name: 'rules-zcxy' }">
                 <template #title>
                     <app-iconfont icon="g-icon-zcxy">{{ $t('rules.zcxy') }}</app-iconfont>

+ 8 - 3
src/packages/digital/views/spot/components/order/index.vue

@@ -9,7 +9,7 @@
                 <thead>
                     <tr>
                         <th>
-                            <span>{{ item.goodsname }}</span>
+                            <span>{{ item.goodscode }}/{{ goodsname(item.goodscode) }}</span>
                             <time class="text-small">{{ formatDate(item.ordertime) }}</time>
                         </th>
                         <th>
@@ -48,7 +48,7 @@
                 <tfoot>
                     <tr>
                         <td colspan="2">
-                            <Button size="small" @click="cancelOrder(item)">撤销</Button>
+                            <Button size="small" @click="cancelOrder(item)">{{ $t('operation.cancel') }}</Button>
                         </td>
                     </tr>
                 </tfoot>
@@ -96,6 +96,10 @@ const dateValue = shallowRef(props.params.tradedate?.split('-') ?? [])
 
 const { componentRef, componentId, openComponent, closeComponent } = useComponent()
 
+const goodsname = (code: string) => {
+    return futuresStore.getI18nGoodsName(code)
+}
+
 const { loading, pageIndex, pageCount, run } = useRequest(queryDigitalTradeOrderDetails, {
     manual: props.showDatePicker,
     defaultParams: props.params,
@@ -114,7 +118,8 @@ const tableList = computed(() => dataList.value.map((e) => {
         ...e,
         goodsname: quoteItem?.goodsname || e.goodsid,
         basecurrencycode: quoteItem?.basecurrencycode,
-        quotecurrencycode: quoteItem?.quotecurrencycode
+        quotecurrencycode: quoteItem?.quotecurrencycode,
+        goodscode: quoteItem?.goodscode
     }
 }))
 

+ 1 - 1
src/packages/mobile/components/modules/article/index.vue

@@ -3,7 +3,7 @@
         <h4 class="app-article__title">
             <span>{{ title }}</span>
             <span @click="$router.push({ name: 'news-list' })">
-                更多
+                {{ $t('common.more') }}
                 <Icon name="arrow" />
             </span>
         </h4>