xxxxx

public/locales/en-US.json

@@ -51,7 +51,8 @@
         "tips14": "The contract is successfully submitted, please wait patiently for review.",
         "tips15": "Confirm success",
         "tips16": "Confirmation failure:",
-        "all": "All"
+        "all": "All",
+        "calendar": "Date Choice"
     },
     "tabbar": {
         "home": "Home",
@@ -1250,6 +1251,10 @@
         "tips9": "Please send a letter to the settlement center to modify the information before modifying, otherwise it will affect the deposit and withdrawal of funds.",
         "tips10": "Please go to the mobile App to sign the agreement!",
         "tips11": "Please select bank information!",
+        "tips12": "Are you sure you want to terminate the contract?",
+        "tips13": "The termination was successfully submitted, please confirm the result later",
+        "tips14": "Choose Bank",
+        "tips15": "Please enter the bank name",
         "search": {
             "title": "Search BranchBank",
             "Pleaseenterbranchbankname": "Please enter branch bank name",

public/locales/th-TH.json

@@ -52,7 +52,8 @@
         "tips14": "การเซ็นสัญญาประสบความสำเร็จโปรดรอการตรวจสอบ",
         "tips15": "ยืนยันการทำงาน",
         "tips16": "ยืนยันความล้มเหลว:",
-        "all": "ทั้งหมด"
+        "all": "ทั้งหมด",
+        "calendar": "การเลือก"
     },
     "tabbar": {
         "home": "หน้าหลัก",
@@ -1254,6 +1255,10 @@
         "tips9": "โปรดส่งจดหมายไป ที่ศูนย์แห่งการชำระบัญชีก่อนแล้วค่อยแก้ไขข้อมูลไม่ เช่น นั้น จะมีผลต่อทองคำออกมา",
         "tips10": "กรุณาไป ที่แอพโทรศัพท์เพื่อลงนามในการดำเนินการ!",
         "tips11": "โปรดเลือกข้อมูลของธนาคาร!",
+        "tips12": "ยืนยันเกี่ยวกับการลดลง?",
+        "tips13": "ส่งสำเร็จละช่วยยืนยันผลทีหลังนะ",
+        "tips14": "เลือกธนาคาร",
+        "tips15": "กรุณาใส่ชื่อธนาคาร",
         "search": {
             "title": "ตรวจสอบแถว",
             "Pleaseenterbranchbankname": "โปรดป้อนชื่อของแถว",

public/locales/zh-CN.json

@@ -52,7 +52,8 @@
         "tips14": "签约提交成功，请耐心等待审核。",
         "tips15": "确认成功",
         "tips16": "确认失败：",
-        "all": "全部"
+        "all": "全部",
+        "calendar": "日期选择"
     },
     "tabbar": {
         "home": "首页",
@@ -560,10 +561,10 @@
             "subtitle1": "历史转让委托",
             "goodsname": "商品代码/名称",
             "buyorsell" : "方向",
-            "orderqty": "转让量",
-            "orderprice": "转让价",
+            "orderqty": "委托量",
+            "orderprice": "委托价",
             "presaleprice": "订货价",
-            "tradeqty": "摘牌量",
+            "tradeqty": "成交量",
             "orderstatus": "委托状态",
             "ordertime": "委托时间",
             "orderid": "委托单号",
@@ -1254,6 +1255,10 @@
         "tips9": "请先发函到结算中心修改信息后再修改，否则将会影响入金、出金。",
         "tips10": "请前往手机App进行协议签署操作!",
         "tips11": "请选择银行信息!",
+        "tips12": "确认要解约吗？",
+        "tips13": "解约提交成功，请稍后确认结果",
+        "tips14": "选择银行",
+        "tips15": "请输入银行名称",
         "search": {
             "title": "查询支行",
             "Pleaseenterbranchbankname": "请输入支行名称",

public/locales/zh-TW.json

@@ -52,7 +52,8 @@
         "tips14": "簽約提交成功，請耐心等待審覈。",
         "tips15": "確認成功",
         "tips16": "確認失敗：",
-        "all": "全部"
+        "all": "全部",
+        "calendar": "日期選擇"
     },
     "tabbar": {
         "home": "首頁",
@@ -1254,6 +1255,10 @@
         "tips9": "請先發函到結算中心修改信息後再修改，否則將會影響入金、出金。",
         "tips10": "請前往手機App進行協議簽署操作!",
         "tips11": "請選擇銀行信息!",
+        "tips12": "確認要解約嗎？",
+        "tips13": "解約提交成功，請稍後確認結果",
+        "tips14": "選擇銀行",
+        "tips15": "請輸入銀行名稱",
         "search": {
             "title": "查詢支行",
             "Pleaseenterbranchbankname": "請輸入支行名稱",

src/constants/receipt.ts

@@ -1,6 +1,7 @@
-import { useEnumStore } from '@/stores'
+import { useEnumStore, i18n } from '@/stores'
 
 const { getEnumTypeName } = useEnumStore()
+const { t } = i18n.global
 
 /**
  * 发票类型
@@ -16,8 +17,8 @@ export enum ReceiptType {
  */
 export function getReceiptTypeList() {
     return [
-        { label: '个人', value: ReceiptType.Consumer },
-        { label: '企业', value: ReceiptType.Company },
+        { label: t('mine.invoice.personal'), value: ReceiptType.Consumer },
+        { label: t('mine.invoice.company'), value: ReceiptType.Company },
     ]
 }
 

src/packages/mobile/components/base/select/index.vue

@@ -4,7 +4,7 @@
             <input class="'app-select__input'" v-model="inputValue" :placeholder="placeholder" readonly />
         </slot>
         <Popup v-model:show="show" position="bottom" teleport="body" round>
-            <Picker :columns="columns" @cancel="onCancel" @confirm="onConfirm">
+            <Picker :columns="columns" @cancel="onCancel" @confirm="onConfirm" :confirm-button-text="$t('operation.confirm')" :cancel-button-text="$t('operation.cancel')"
                 <template #option="{ text, index }">
                     <slot name="option" :row="options[index]" :index="index">
                         {{ text }}

src/packages/mobile/views/bank/capital/statement/history/index.vue

@@ -4,7 +4,7 @@
             <template #header>
                 <app-navbar :title="$t('banksign.capital.hisamountlogs')" @back="closed">
                     <template #footer>
-                        <app-calendar :default-date="[currentDate]" @confirm="onConfirm">
+                        <app-calendar :default-date="[currentDate]" @confirm="onConfirm" :title="$t('common.calendar')" :confirm-text="$t('operation.confirm')">
                             <app-select v-model="operatetype" :options="operateTypeSearchList"
                                 :optionProps="{ label: 'label', value: 'value' }" @confirm="onSelectConfirm">
                                 <template #default="{ label }">

src/packages/mobile/views/bank/sign/Index.vue

@@ -48,11 +48,14 @@ import { useNavigation } from '@mobile/router/navigation'
 import { useRequest } from '@/hooks/request'
 import { queryCusBankSignBank } from '@/services/api/bank'
 import { shallowRef } from 'vue'
+import { i18n } from "@/stores"
 
 const componentMap = new Map<string, unknown>([
     ['edit', defineAsyncComponent(() => import('./components/edit/Index.vue'))],
 ])
 
+const { t } = i18n.global
+
 const cusBank = shallowRef<Model.CusBankSignBankRsp>()
 const { componentRef, componentId, openComponent, closeComponent } = useComponent(() => formRefresh())
 const { cancelSubmit, formRefresh, bankInfo, isloaded } = useDoCancelBankSign()
@@ -72,13 +75,13 @@ useRequest(queryCusBankSignBank, {
 
 const formSubmit = () => {
     dialog({
-        message: '确认解约？',
+        message: t('banksign.tips12'),
         showCancelButton: true
     }).then(() => {
         fullloading((hideLoading) => {
             cancelSubmit().then(() => {
                 hideLoading()
-                dialog('解约提交成功，请稍后确认结果。').then(() => {
+                dialog(t('banksign.tips13')).then(() => {
                     router.back()
                 })
             }).catch((err) => {
@@ -95,7 +98,7 @@ const showComponent = (isEdit: boolean) => {
 
 const beforeShowComponent = () => {
     if (bankInfo.value?.cusbankid === 'jdjs') {
-        dialog('请先发函到结算中心修改信息后再修改，否则将会影响入金、出金。').then(() => {
+        dialog(t('banksign.tips9')).then(() => {
             showComponent(true)
         })
     } else {

src/packages/mobile/views/bank/sign/components/edit/select-bank/index.vue

@@ -2,16 +2,16 @@
     <app-modal direction="right-top" height="100%" width="100%" v-model:show="showModal">
         <app-view class="g-form">
             <template #header>
-                <app-navbar title="选择银行">
+                <app-navbar :title="$t('banksign.tips14')">
                     <template #footer>
                         <Form action="/">
-                            <Search placeholder="请输入银行名称" v-model="keyword" />
+                            <Search :placeholder="$t('banksign.tips15')" v-model="keyword" />
                         </Form>
                     </template>
                 </app-navbar>
             </template>
             <RadioGroup v-model="checked" style="padding-bottom: 50px;" v-if="bankList.length">
-                <CellGroup title="选择银行">
+                <CellGroup :title="$t('banksign.tips15')">
                     <template v-for="(item, index) in bankList" :key="index">
                         <Cell :title="item.bankname" :label="item.bankid" clickable @click="onChange(item)">
                             <template #icon>

src/packages/mobile/views/mine/Index.vue

@@ -214,7 +214,9 @@ const doInOutMoney = (tab: string) => {
 const userLogout = () => {
     dialog({
         message: t('banksign.tips5'),
-        showCancelButton: true
+        showCancelButton: true,
+        cancelButtonText: t('operation.cancel'),
+        confirmButtonText: t('operation.confirm'),
     }).then(() => {
         loginStore.clearAutoLoginData()
         eventBus.$emit('LogoutNotify')

src/packages/mobile/views/order/delivery/components/online/history/Index.vue

@@ -5,7 +5,7 @@
             <template #header>
                 <app-navbar :title="$t('delivery.online.title2')" @back="closed">
                     <template #footer>
-                        <app-calendar :default-date="[currentDate]" @confirm="onConfirm" />
+                        <app-calendar :default-date="[currentDate]" @confirm="onConfirm" :title="$t('common.calendar')" :confirm-text="$t('operation.confirm')" />
                     </template>
                 </app-navbar>
             </template>

src/packages/mobile/views/order/list/components/goodsorder/history/Index.vue

@@ -5,7 +5,7 @@
             <template #header>
                 <app-navbar :title="$t('order.goodsorder.title2')" @back="closed">
                     <template #footer>
-                        <app-calendar :default-date="[currentDate]" @confirm="onConfirm" />
+                        <app-calendar :default-date="[currentDate]" @confirm="onConfirm" :title="$t('common.calendar')" :confirm-text="$t('operation.confirm')" />
                     </template>
                 </app-navbar>
             </template>

src/packages/mobile/views/order/list/components/goodstrade/history/Index.vue

@@ -5,7 +5,7 @@
             <template #header>
                 <app-navbar :title="$t('order.goodstrade.title2')" @back="closed">
                     <template #footer>
-                        <app-calendar :default-date="[currentDate]" @confirm="onConfirm" />
+                        <app-calendar :default-date="[currentDate]" @confirm="onConfirm" :title="$t('common.calendar')" :confirm-text="$t('operation.confirm')" />
                     </template>
                 </app-navbar>
             </template>

src/packages/mobile/views/order/list/components/listingorder/history/Index.vue

@@ -5,7 +5,7 @@
             <template #header>
                 <app-navbar :title="$t('order.listingorder.title2')" @back="closed">
                     <template #footer>
-                        <app-calendar :default-date="[currentDate]" @confirm="onConfirm" />
+                        <app-calendar :default-date="[currentDate]" @confirm="onConfirm" :title="$t('common.calendar')" :confirm-text="$t('operation.confirm')" />
                     </template>
                 </app-navbar>
             </template>

src/packages/mobile/views/order/list/components/listingtrade/history/Index.vue

@@ -5,7 +5,7 @@
             <template #header>
                 <app-navbar :title="$t('order.listingtrade.title2')" @back="closed">
                     <template #footer>
-                        <app-calendar :default-date="[currentDate]" @confirm="onConfirm" />
+                        <app-calendar :default-date="[currentDate]" @confirm="onConfirm" :title="$t('common.calendar')" :confirm-text="$t('operation.confirm')" />
                     </template>
                 </app-navbar>
             </template>

src/packages/mobile/views/order/list/components/presale/history/index.vue

@@ -5,7 +5,7 @@
             <template #header>
                 <app-navbar :title="$t('order.presale.subtitle1')" @back="closed">
                     <template #footer>
-                        <app-calendar :default-date="[currentDate]" @confirm="onConfirm" />
+                        <app-calendar :default-date="[currentDate]" @confirm="onConfirm" :title="$t('common.calendar')" :confirm-text="$t('operation.confirm')" />
                     </template>
                 </app-navbar>
             </template>

src/packages/mobile/views/order/list/components/swaporder/history/Index.vue

@@ -5,7 +5,7 @@
             <template #header>
                 <app-navbar :title="$t('order.swaporder.subtitle1')" @back="closed">
                     <template #footer>
-                        <app-calendar :default-date="[currentDate]" @confirm="onConfirm" />
+                        <app-calendar :default-date="[currentDate]" @confirm="onConfirm" :title="$t('common.calendar')" :confirm-text="$t('operation.confirm')" />
                     </template>
                 </app-navbar>
             </template>

src/packages/mobile/views/order/list/components/swaptrade/history/Index.vue

@@ -5,7 +5,7 @@
             <template #header>
                 <app-navbar :title="$t('order.swaptrade.subtitle1')" @back="closed">
                     <template #footer>
-                        <app-calendar :default-date="[currentDate]" @confirm="onConfirm" />
+                        <app-calendar :default-date="[currentDate]" @confirm="onConfirm" :title="$t('common.calendar')" :confirm-text="$t('operation.confirm')" />
                     </template>
                 </app-navbar>
             </template>

src/packages/mobile/views/order/list/components/transferorder/history/index.vue

@@ -5,7 +5,7 @@
             <template #header>
                 <app-navbar :title="$t('order.transferorder.subtitle1')" @back="closed">
                     <template #footer>
-                        <app-calendar :default-date="[currentDate]" @confirm="onConfirm" />
+                        <app-calendar :default-date="[currentDate]" @confirm="onConfirm" :title="$t('common.calendar')" :confirm-text="$t('operation.confirm')" />
                     </template>
                 </app-navbar>
             </template>

src/packages/mobile/views/order/list/components/transfertrade/history/index.vue

@@ -5,7 +5,7 @@
             <template #header>
                 <app-navbar :title="$t('order.transfertrade.subtitle1')" @back="closed">
                     <template #footer>
-                        <app-calendar :default-date="[currentDate]" @confirm="onConfirm" />
+                        <app-calendar :default-date="[currentDate]" @confirm="onConfirm" :title="$t('common.calendar')" :confirm-text="$t('operation.confirm')" />
                     </template>
                 </app-navbar>
             </template>

src/packages/mobile/views/order/performance/components/history/Index.vue

@@ -4,7 +4,7 @@
             <template #header>
                 <app-navbar :title="$t(buyorsell === 0 ? 'performance.buyhisperformanceinfo' : 'performance.sellhisperformanceinfo')" @back="closed">
                     <template #footer>
-                        <app-calendar :default-date="[currentDate]" @confirm="onConfirm" />
+                        <app-calendar :default-date="[currentDate]" @confirm="onConfirm" :title="$t('common.calendar')" :confirm-text="$t('operation.confirm')" />
                     </template>
                 </app-navbar>
             </template>

src/packages/mobile/views/order/position/components/pricing/list/Index.vue

@@ -44,8 +44,8 @@
                     </ul>
                 </div>
                 <div class="g-order-list__btnbar">
-                    <Button size="small" @click="onClosed(item)" v-if="!fromTrade" round>平仓</Button>
-                    <Button size="small" @click="callBack(item)" v-if="fromTrade" round>平仓</Button>
+                    <Button size="small" @click="onClosed(item)" v-if="!fromTrade" round>{{ $t('operation.close') }}</Button>
+                    <Button size="small" @click="callBack(item)" v-if="fromTrade" round>{{ $t('operation.close') }}</Button>
                 </div>
             </div>
         </div>

src/packages/pc/views/account/holdsign/components/cancel/index.vue

@@ -1,7 +1,7 @@
 <!-- 账户管理-入金代扣签约-解约 -->
 <template>
     <app-drawer title="提示" v-model:show="show" :loading="loading" :refresh="refresh">
-        <div class="g-text-message">确认要解约吗？</div>
+        <div class="g-text-message">{{ t('banksign.tips12') }}</div>
         <template #footer>
             <el-button type="info" @click="onCancel(false)">{{ t('operation.cancel') }}</el-button>
             <el-button type="primary" @click="onCancelSumit()">{{ t('operation.submit') }}</el-button>
@@ -29,7 +29,7 @@ const onCancel = (isRefresh = false) => {
 const onCancelSumit = () => {
     /// 提交
     onSubmit().then(() => {
-        ElMessage.success('解约提交成功，请稍后确认结果')
+        ElMessage.success(t('banksign.tips13'))
         onCancel(true)
     }).catch((err) => {
         ElMessage.error(err)

src/packages/pc/views/account/sign/components/cancel/index.vue

@@ -1,7 +1,7 @@
 <!-- 账户管理-签约账号管理-解约 -->
 <template>
     <app-drawer :title="t('common.tips')" v-model:show="show" :loading="loading" :refresh="refresh">
-        <div class="g-text-message">确认要解约吗？</div>
+        <div class="g-text-message">{{ t('banksign.tips12') }}</div>
         <template #footer>
             <el-button type="info" @click="onCancel(false)">{{ t('operation.cancel') }}</el-button>
             <el-button type="primary" @click="onCancelSumit()">{{ t('operation.submit') }}</el-button>
@@ -42,7 +42,7 @@ const onCancelSumit = () => {
     formData.AccountCode = accountcode
     /// 提交
     cancelSubmit().then(() => {
-        ElMessage.success('解约提交成功，请稍后确认结果')
+        ElMessage.success(t('banksign.tips13'))
         onCancel(true)
     }).catch((err) => {
         ElMessage.error(err)

src/packages/pc/views/footer/presell/transferorder/index.vue

@@ -7,18 +7,19 @@
         <template #goodsname="{ row }">
             {{ row.goodsname }}/{{ row.goodscode }}
         </template>
-        <!-- 商品代码/名称 -->
-
+         <!-- 方向 -->
+         <template #buyorsell="{ value }">
+            {{ getBuyOrSellName(value) }}
+        </template>
+        <!-- 委托状态 -->
         <template #orderstatus="{ value }">
             {{ getOrderStatusName(value) }}
         </template>
         <!-- 成交时间 -->
-
         <template #ordertime="{ value }">
             {{ formatDate(value) }}
         </template>
         <!-- 展开行 -->
-
         <template #expand="{ row }">
             <div class="buttonbar">
                 <el-button type="danger" v-if="[3, 7, 12].includes(row.orderstatus)" size="small"
@@ -38,7 +39,7 @@ import { ref, defineAsyncComponent,onUnmounted } from 'vue'
 import { formatDate } from '@/filters'
 import { useRequest } from '@/hooks/request'
 import { queryMineTradeOrders } from '@/services/api/transfer'
-import { getOrderStatusName } from '@/constants/order'
+import { getBuyOrSellName, getOrderStatusName } from '@/constants/order'
 import { useComponent } from '@/hooks/component'
 import { useComposeTable } from '@pc/components/base/table'
 import { i18n } from '@/stores'
@@ -70,6 +71,7 @@ const { t } = i18n.global
 
 const tableColumns = ref<Model.TableColumn[]>([
     { field: 'goodsname', label: 'order.transferorder.goodsname' },
+    { field: 'buyorsell', label: 'order.transferorder.buyorsell' },
     { field: 'orderqty', label: 'order.transferorder.orderqty' },
     { field: 'orderprice', label: 'order.transferorder.orderprice' },
     { field: 'presaleprice', label: 'order.transferorder.presaleprice' },

src/packages/pc/views/query/inoutapply/history/index.vue

@@ -54,7 +54,7 @@ filterOptons.selectList = [
         selectedValue: undefined,
         options: [
             { label: t('mine.cashin'), value: 1 },
-            { label:t('mine.cashout'), value: 2 },
+            { label: t('mine.cashout'), value: 2 },
         ]
     },
     {

src/packages/pc/views/query/inoutapply/list/index.vue

@@ -48,8 +48,8 @@ filterOptons.selectList = [
         key: 'querytype',
         selectedValue: undefined,
         options: [
-            { label: '出金', value: 1 },
-            { label: '入金', value: 2 },
+            { label: t('banksign.wallet.cashout'), value: 1 },
+            { label: t('banksign.wallet.cashin'), value: 2 },
         ]
     },
     {