Handy_Cao 1 год назад
Родитель
Сommit
1667ea1767
31 измененных файлов с 384 добавлено и 275 удалено
  1. 55 7
      public/locales/en-US.json
  2. 59 11
      public/locales/zh-CN.json
  3. 16 14
      src/packages/mobile/views/order/list/components/goodsorder/detail/Index.vue
  4. 7 7
      src/packages/mobile/views/order/list/components/goodsorder/history/Index.vue
  5. 11 10
      src/packages/mobile/views/order/list/components/goodsorder/list/Index.vue
  6. 11 11
      src/packages/mobile/views/order/list/components/goodstrade/detail/Index.vue
  7. 8 8
      src/packages/mobile/views/order/list/components/goodstrade/history/Index.vue
  8. 7 7
      src/packages/mobile/views/order/list/components/goodstrade/list/Index.vue
  9. 4 2
      src/packages/mobile/views/order/list/components/listingorder/detail/Index.vue
  10. 12 12
      src/packages/mobile/views/order/list/components/listingtrade/detail/Index.vue
  11. 7 7
      src/packages/mobile/views/order/list/components/listingtrade/history/Index.vue
  12. 4 4
      src/packages/mobile/views/order/list/components/listingtrade/list/Index.vue
  13. 17 17
      src/packages/mobile/views/order/list/components/presale/detail/Index.vue
  14. 10 10
      src/packages/mobile/views/order/list/components/presale/history/index.vue
  15. 9 9
      src/packages/mobile/views/order/list/components/presale/list/Index.vue
  16. 15 13
      src/packages/mobile/views/order/list/components/pricingorder/detail/Index.vue
  17. 9 7
      src/packages/mobile/views/order/list/components/pricingorder/list/Index.vue
  18. 12 12
      src/packages/mobile/views/order/list/components/pricingtrade/detail/Index.vue
  19. 6 6
      src/packages/mobile/views/order/list/components/pricingtrade/list/Index.vue
  20. 15 14
      src/packages/mobile/views/order/list/components/swaporder/detail/Index.vue
  21. 6 6
      src/packages/mobile/views/order/list/components/swaporder/history/Index.vue
  22. 9 9
      src/packages/mobile/views/order/list/components/swaporder/list/Index.vue
  23. 13 13
      src/packages/mobile/views/order/list/components/swaptrade/detail/Index.vue
  24. 7 7
      src/packages/mobile/views/order/list/components/swaptrade/history/Index.vue
  25. 6 6
      src/packages/mobile/views/order/list/components/swaptrade/list/Index.vue
  26. 14 12
      src/packages/mobile/views/order/list/components/transferorder/detail/Index.vue
  27. 5 5
      src/packages/mobile/views/order/list/components/transferorder/history/index.vue
  28. 8 7
      src/packages/mobile/views/order/list/components/transferorder/list/Index.vue
  29. 11 11
      src/packages/mobile/views/order/list/components/transfertrade/detail/Index.vue
  30. 6 6
      src/packages/mobile/views/order/list/components/transfertrade/history/index.vue
  31. 5 5
      src/packages/mobile/views/order/list/components/transfertrade/list/Index.vue

+ 55 - 7
public/locales/en-US.json

@@ -257,12 +257,16 @@
             "goodsname": "Name/Codee",
             "buyorsell": "BuyOrSell",
             "buildtype": "BuildType",
+            "buyorsellbuildtype": "BuyOrSell/BuildType",
             "orderqty": "OrderQty",
             "orderprice": "OrderPrice",
             "tradeqty": "TradeQty",
             "orderstatus": "OrderStatus",
             "ordertime": "OrderTime",
-            "orderid": "OrderID"
+            "orderdate": "OrderDate",
+            "orderid": "OrderID",
+            "tips1": "Is the confirmation to be revoked?",
+            "tips2": "Revocation is successful"
         },
         "goodstrade": {
             "title": "Goods Trade",
@@ -271,11 +275,13 @@
             "goodsname": "Name/Code",
             "buyorsell": "BuyOrSell",
             "buildtype": "BuildType",
+            "buildtypebuyorsell": "BuildType/BuyOrSell",
             "tradeqty": "TradeQty",
             "tradeprice": "TradePrice",
             "charge": "Charge",
-            "closepl": "Close Pl",
+            "closepl": "ClosePl",
             "tradetime": "TradeTime",
+            "tradedate": "TradeDate",
             "tradeid": "TradeID"
         },
         "listingorder": {
@@ -310,12 +316,14 @@
             "tradeqty": "TradeQty",
             "tradeamount": "TradeAmount",
             "tradetime": "TradeTime",
+            "tradedate": "TradeDate",
             "matchusername": "MatchUserName",
             "wrtradedetailid": "WrTradeDetailID"
         },
         "presale": {
             "title": "Presale Subscription",
             "subtitle": "Presale Subscription Information",
+            "subtitle1": "History Presale Subscription",
             "goodsname": "Name/Code",
             "orderqty": "OrderQty",
             "orderprice": "OrderPrice",
@@ -328,6 +336,7 @@
             "endtime": "End",
             "orderstatus": "OrderStatus",
             "ordertime": "OrderTime",
+            "orderdate": "OrderDate",
             "tradeprice": "TradePrice",
             "tradeqty": "TradeQty",
             "orderid": "OrderID"
@@ -335,6 +344,7 @@
         "transferorder": {
             "title": "Transfer Order",
             "subtitle": "Transfer Order Information",
+            "subtitle1": "History Transfer Order",
             "goodsname": "Name/Code",
             "orderqty": "OrderQty",
             "orderprice": "OrderPrice",
@@ -342,11 +352,14 @@
             "tradeqty": "TradeQty",
             "orderstatus": "OrderStatus",
             "ordertime": "OrderTime",
-            "orderid": "OrderID"
+            "orderid": "OrderID",
+            "tips1": "Cancel the order?",
+            "tips2": "Revocation is successful"
         },
         "transfertrade": {
             "title": "Transfer Trade",
             "subtitle": "Transfer Trade Information",
+            "subtitle1": "History Transfer Trade ",
             "goodsname": "Name/Code",
             "buyorsell": "BuyOrSell",
             "tradeqty": "TradeQty",
@@ -355,11 +368,14 @@
             "closepl": "ClosePl",
             "accountname": "AccountName",
             "tradetime": "TradeTime",
+            "tradedate": "TradeDate",
             "orderid": "OrderID"
         },
         "swaporder": {
             "title": "Swap Order",
             "subtitle": "Order Information",
+            "subtitle1": "History Swap Order",
+            "subtitle2": "Swap Order Details",
             "goodsname": "Name/Code",
             "buyorsell": "BuyOrSell",
             "orderqty": "OrderQty",
@@ -367,11 +383,16 @@
             "tradeqty": "TradeQty",
             "orderstatus": "OrderStatus",
             "ordertime": "OrderTime",
-            "orderid": "OrderID"
+            "orderdate": "OrderDate",
+            "orderid": "OrderID",
+            "tips1": "Is the confirmation to be revoked?",
+            "tips2": "Revocation is successful"
         },
         "swaptrade": {
             "title": "Swap Trade",
             "subtitle": "Trade Information",
+            "subtitle1": "History Swap Trade",
+            "subtitle2": "Swap Trade Detail",
             "goodsname": "Name/Code",
             "buyorsell": "BuyOrSell",
             "buildtype": "BuildType",
@@ -380,15 +401,42 @@
             "tradeamount": "TradeAmount",
             "charge": "Charge",
             "closepl": "ClosePl",
-            "matchaccountid": "MatchAccountid",
+            "matchaccountid": "Counterparties",
             "tradetime": "TradeTime",
+            "tradedate": "TradeDate",
             "tradeid": "TradeID"
         },
         "pricingorder": {
-            "title": "Pricing Order"
+            "title": "Pricing Order",
+            "subtitle": "Pricing Order Information",
+            "subtitle1": "Detail",
+            "goodsname": "Name/Code",
+            "ordertime": "OrderTime",
+            "orderdate": "OrderDate",
+            "buyorsell": "BuyOrSell",
+            "orderqty": "OrderQty",
+            "orderprice": "OrderPrice",
+            "orderstatus":"OrderStatus",
+            "tradeqty": "TradeQty",
+            "orderid": "OrderID",
+            "tips1": "Is the confirmation to be revoked?",
+            "tips2": "Revocation is successful"
         },
         "pricingtrade": {
-            "title": "Pricing Trade"
+            "title": "Pricing Trade",
+            "subtitle": "Pricing Trade Information",
+            "subtitle1": "Detail",
+            "goodsname": "Name/Code",
+            "buyorsell": "BuyOrSell",
+            "tradetime": "TradeTime",
+            "tradedate": "TradeDate",
+            "matchaccountid": "Counterparties",
+            "buildtype": "BuildType",
+            "tradeprice": "TradePrice",
+            "charge": "Charge",
+            "tradeqty": "TradeQty",
+            "tradeid": "TradeID",
+            "closepl": "ClosePl"
         }
     },
     "position": {

+ 59 - 11
public/locales/zh-CN.json

@@ -252,31 +252,37 @@
     "order": {
         "title": "我的订单",
         "goodsorder": {
-            "title": "订单委托",
+            "title": "订单委托",
             "title2": "历史订单委托",
             "subtitle": "订单委托信息",
             "goodsname": "商品代码/名称",
             "buyorsell": "方向",
             "buildtype": "类型",
+            "buyorsellbuildtype": "方向/类型",
             "orderqty": "委托量",
             "orderprice": "委托价格",
             "tradeqty": "成交量",
             "orderstatus": "委托状态",
-            "ordertime": "委托日期",
-            "orderid": "委托单号"
+            "ordertime": "委托时间",
+            "orderdate": "委托日期",
+            "orderid": "委托单号",
+            "tips1": "是否撤销该委托单?",
+            "tips2": "撤销成功"
         },
         "goodstrade": {
-            "title": "订单成交",
+            "title": "订单成交",
             "title2": "历史订单成交",
             "subtitle": "订单成交信息",
             "goodsname": "商品代码/名称",
             "buyorsell": "方向",
             "buildtype": "类型",
+            "buildtypebuyorsell": "类型/方向",
             "tradeqty": "成交量",
             "tradeprice": "成交价格",
             "charge": "手续费",
             "closepl": "平仓损益",
             "tradetime": "成交时间",
+            "tradedate": "成交日期",
             "tradeid": "成交单号"
         },
         "listingorder": {
@@ -300,7 +306,7 @@
             "tips2": "撤销成功"
         },
         "listingtrade": {
-            "title": "挂牌成交",
+            "title": "挂牌成交",
             "title2": "历史挂牌成交",
             "subtitle": "挂牌成交信息",
             "goodsname": "商品代码/名称",
@@ -311,12 +317,14 @@
             "tradeqty": "成交量",
             "tradeamount": "成交金额",
             "tradetime": "成交时间",
+            "tradedate": "成交日期",
             "matchusername": "对手方",
             "wrtradedetailid": "成交单号"
         },
         "presale": {
             "title": "预售认购",
             "subtitle": "预售认购信息",
+            "subtitle1": "历史预售认购",
             "goodsname": "商品代码/名称",
             "orderqty": "认购量",
             "orderprice": "认购价",
@@ -329,13 +337,15 @@
             "endtime": "结束日期",
             "orderstatus": "委托状态",
             "ordertime": "委托时间",
+            "orderdate": "委托日期",
             "tradeprice": "预售价",
             "tradeqty": "订单量",
             "orderid": "委托单号"
         },
         "transferorder": {
-            "title": "转让委托",
+            "title": "转让委托",
             "subtitle": "转让委托信息",
+            "subtitle1": "历史转让委托",
             "goodsname": "商品代码/名称",
             "orderqty": "转让量",
             "orderprice": "转让价",
@@ -343,11 +353,14 @@
             "tradeqty": "摘牌量",
             "orderstatus": "委托状态",
             "ordertime": "委托时间",
-            "orderid": "委托单号"
+            "orderid": "委托单号",
+            "tips1": "是否撤销该委托单?",
+            "tips2": "撤销成功"
         },
         "transfertrade": {
-            "title": "转让成交",
+            "title": "转让成交",
             "subtitle": "转让成交信息",
+            "subtitle1": "历史转让成交",
             "goodsname": "商品代码/名称",
             "buyorsell": "方向",
             "tradeqty": "转让量",
@@ -356,11 +369,14 @@
             "closepl": "损益",
             "accountname": "对手方",
             "tradetime": "成交时间",
+            "tradedate": "成交日期",
             "orderid": "成交单号"
         },
         "swaporder": {
             "title": "掉期委托",
             "subtitle": "委托信息",
+            "subtitle1": "历史委托",
+            "subtitle2": "委托详情",
             "goodsname": "商品代码/名称",
             "buyorsell": "方向",
             "orderqty": "委托量",
@@ -368,11 +384,16 @@
             "tradeqty": "成交量",
             "orderstatus": "委托状态",
             "ordertime": "委托时间",
-            "orderid": "委托单号"
+            "orderdate": "委托日期",
+            "orderid": "委托单号",
+            "tips1": "确认要撤销吗?",
+            "tips2": "撤销成功"
         },
         "swaptrade": {
             "title": "掉期成交",
             "subtitle": "成交信息",
+            "subtitle1": "历史成交",
+            "subtitle2": "成交详情",
             "goodsname": "商品代码/名称",
             "buyorsell": "方向",
             "buildtype": "类型",
@@ -383,13 +404,40 @@
             "closepl": "交收盈亏",
             "matchaccountid": "贸易对方",
             "tradetime": "成交时间",
+            "tradedate": "成交日期",
             "tradeid": "成交单号"
         },
         "pricingorder": {
-            "title": "点价委托"
+            "title": "点价委托",
+            "subtitle": "挂牌点价委托信息",
+            "subtitle1": "详细",
+            "goodsname": "商品代码/名称",
+            "ordertime": "委托时间",
+            "orderdate": "委托日期",
+            "buyorsell": "方向",
+            "orderqty": "委托量",
+            "orderprice": "委托价格",
+            "orderstatus":"委托状态",
+            "tradeqty": "成交量",
+            "orderid": "委托单号",
+            "tips1": "确认要撤销吗?",
+            "tips2": "撤销成功"
         },
         "pricingtrade": {
-            "title": "点价成交"
+            "title": "点价成交",
+            "subtitle": "挂牌点价成交信息",
+            "subtitle1": "详细",
+            "goodsname": "商品代码/名称",
+            "buyorsell": "方向",
+            "tradetime": "成交时间",
+            "tradedate": "成交时间",
+            "matchaccountid": "对手方",
+            "buildtype": "类型",
+            "tradeprice": "成交价格",
+            "charge": "手续费",
+            "tradeqty": "成交量",
+            "tradeid": "成交单号",
+            "closepl": "平仓盈亏"
         }
     },
     "position": {

+ 16 - 14
src/packages/mobile/views/order/list/components/goodsorder/detail/Index.vue

@@ -3,23 +3,23 @@
     <app-modal direction="right-top" height="100%" width="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
-                <app-navbar title="订单委托单" @back="closed" />
+                <app-navbar :title="$t('order.goodsorder.title')" @back="closed" />
             </template>
             <div class="order-detail__container g-form__container">
-                <CellGroup title="订单委托信息">
-                    <Cell title="商品代码/名称" :value="selectedRow.goodscode + '/' + selectedRow.goodsname" />
-                    <Cell title="方向" :value="getBuyOrSellName(selectedRow.buyorsell)" />
-                    <Cell title="类型" :value="getBuildTypeName(selectedRow.buildtype)" />
-                    <Cell title="委托量" :value="selectedRow.orderqty" />
-                    <Cell title="委托价格" :value="formatDecimal(selectedRow.orderprice)" />
-                    <Cell title="成交量" :value="selectedRow.tradeqty" />
-                    <Cell title="委托状态" :value="getWRTradeOrderStatusName(selectedRow.orderstatus)" />
-                    <Cell title="委托时间" :value="formatDate(selectedRow.ordertime)" />
-                    <Cell title="委托单号" :value="selectedRow.orderid" />
+                <CellGroup :title="$t('order.goodsorder.title')">
+                    <Cell :title="$t('order.goodsorder.subtitle')" :value="selectedRow.goodscode + '/' + selectedRow.goodsname" />
+                    <Cell :title="$t('order.goodsorder.buyorsell')" :value="getBuyOrSellName(selectedRow.buyorsell)" />
+                    <Cell :title="$t('order.goodsorder.buildtype')" :value="getBuildTypeName(selectedRow.buildtype)" />
+                    <Cell :title="$t('order.goodsorder.orderqty')" :value="selectedRow.orderqty" />
+                    <Cell :title="$t('order.goodsorder.orderprice')" :value="formatDecimal(selectedRow.orderprice)" />
+                    <Cell :title="$t('order.goodsorder.tradeqty')" :value="selectedRow.tradeqty" />
+                    <Cell :title="$t('order.goodsorder.orderstatus')" :value="getWRTradeOrderStatusName(selectedRow.orderstatus)" />
+                    <Cell :title="$t('order.goodsorder.ordertime')" :value="formatDate(selectedRow.ordertime)" />
+                    <Cell :title="$t('order.goodsorder.orderid')" :value="selectedRow.orderid" />
                 </CellGroup>
             </div>
             <template #footer v-if="[3, 7, 12].includes(selectedRow.orderstatus)">
-                <Button type="danger" block square @click="onCancelSumit">撤销</Button>
+                <Button type="danger" block square @click="onCancelSumit">{{ $t('operation.cancel2') }}</Button>
             </template>
         </app-view>
     </app-modal>
@@ -33,7 +33,9 @@ import { getBuyOrSellName, getWRTradeOrderStatusName, getBuildTypeName } from '@
 import { formatDate, formatDecimal, handleRequestBigNumber } from '@/filters'
 import { useCancelOrder } from '@/business/trade'
 import { dialog, fullloading } from '@/utils/vant'
+import { i18n } from '@/stores'
 
+const { global: { t } } = i18n
 const showModal = shallowRef(true)
 // 是否刷新父组件数据
 const refresh = shallowRef(false)
@@ -48,7 +50,7 @@ const props = defineProps({
 
 const onCancelSumit = () => {
     dialog({
-        message: '确认要撤销吗?',
+        message: t('order.goodsorder.tips2'),
         showCancelButton: true,
     }).then(() => {
         const { marketid, goodsid } = props.selectedRow
@@ -59,7 +61,7 @@ const onCancelSumit = () => {
         /// loding....
         fullloading((hideLoading) => {
             cancelSubmit().then(() => {
-                hideLoading('撤销成功')
+                hideLoading(t('order.goodsorder.tips2'))
                 closed(true)
             }).catch((err) => {
                 hideLoading(err, 'fail')

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

@@ -3,7 +3,7 @@
     <app-modal direction="right-top" height="100%" width="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
-                <app-navbar title="历史订单委托" @back="closed">
+                <app-navbar :title="$t('order.goodsorder.title2')" @back="closed">
                     <template #footer>
                         <app-calendar :default-date="[currentDate]" @confirm="onConfirm" />
                     </template>
@@ -24,31 +24,31 @@
                         <div class="g-order-list__content">
                             <ul>
                                 <li>
-                                    <span>方向类型</span>
+                                    <span>{{ $t('order.goodsorder.buyorsellbuildtype') }}</span>
                                     <span>
                                         {{ getBuyOrSellName(item.buyorsell) + getBuildTypeName(item.buildtype) }}
                                     </span>
                                 </li>
                                 <li>
-                                    <span>委托量</span>
+                                    <span>{{ $t('order.goodsorder.orderqty') }}</span>
                                     <span>{{ item.orderqty }}</span>
                                 </li>
                                 <li>
-                                    <span>委托价格</span>
+                                    <span>{{ $t('order.goodsorder.orderprice') }}</span>
                                     <span>{{ item.orderprice }}</span>
                                 </li>
                                 <li>
-                                    <span>成交量</span>
+                                    <span>{{ $t('order.goodsorder.tradeqty') }}</span>
                                     <span>{{ item.tradeqty }}</span>
                                 </li>
                                 <li>
-                                    <span>委托日期</span>
+                                    <span>{{ $t('order.goodsorder.orderdate') }}</span>
                                     <span>{{ formatDate(item.ordertime, 'YYYY-MM-DD') }}</span>
                                 </li>
                             </ul>
                         </div>
                         <div class="g-order-list__btnbar">
-                            <Button size="small" @click="showComponent('detail', item)" round>详情</Button>
+                            <Button size="small" @click="showComponent('detail', item)" round>{{ $t('operation.details') }}</Button>
                         </div>
                     </div>
                 </div>

+ 11 - 10
src/packages/mobile/views/order/list/components/goodsorder/list/Index.vue

@@ -15,31 +15,31 @@
                 <div class="g-order-list__content">
                     <ul>
                         <li>
-                            <span>方向类型</span>
+                            <span>{{ $t('order.goodsorder.buyorsellbuildtype') }}</span>
                             <span>{{ getBuyOrSellName(item.buyorsell) + getBuildTypeName(item.buildtype) }}</span>
                         </li>
                         <li>
-                            <span>委托量</span>
+                            <span>{{ $t('order.goodsorder.orderqty') }}</span>
                             <span>{{ item.orderqty }}</span>
                         </li>
                         <li>
-                            <span>委托价格</span>
+                            <span>{{ $t('order.goodsorder.orderprice') }}</span>
                             <span>{{ formatDecimal(item.orderprice) }}</span>
                         </li>
                         <li>
-                            <span>成交量</span>
+                            <span>{{ $t('order.goodsorder.tradeqty') }}</span>
                             <span>{{ item.tradeqty }}</span>
                         </li>
                         <li>
-                            <span>委托日期</span>
+                            <span>{{ $t('order.goodsorder.orderdate') }}</span>
                             <span>{{ formatDate(item.ordertime, 'YYYY-MM-DD') }}</span>
                         </li>
                     </ul>
                 </div>
                 <div class="g-order-list__btnbar">
                     <Button size="small" v-if="[3, 7, 12].includes(item.orderstatus)" @click="onCancelSumit(item)"
-                        round>撤销</Button>
-                    <Button size="small" @click="showComponent('detail', item)" round>详情</Button>
+                        round>{{ $t('operation.cancel2') }}</Button>
+                    <Button size="small" @click="showComponent('detail', item)" round>{{ $t('operation.details') }}</Button>
                 </div>
             </div>
         </div>
@@ -59,7 +59,7 @@ import { formatDate, formatDecimal, handleRequestBigNumber } from '@/filters'
 import { useCancelOrder } from '@/business/trade'
 import { dialog } from '@/utils/vant'
 import { fullloading } from '@/utils/vant'
-
+import { i18n } from '@/stores'
 import AppPullRefresh from '@mobile/components/base/pull-refresh/index.vue'
 
 const componentMap = new Map<string, unknown>([
@@ -71,6 +71,7 @@ const dataList = shallowRef<Model.TradeOrderDetailRsp[]>([])
 const selectedRow = shallowRef<Model.TradeOrderDetailRsp>()
 const error = shallowRef(false)
 const pullRefreshRef = shallowRef()
+const { global: { t } } = i18n
 
 const { componentRef, componentId, openComponent, closeComponent } = useComponent(() => {
     pullRefreshRef.value?.refresh()
@@ -94,7 +95,7 @@ const { loading, pageIndex, pageCount, run } = useRequest(queryTradeOrderDetail,
 
 const onCancelSumit = (item: Model.TradeOrderDetailRsp) => {
     dialog({
-        message: '确认要撤销吗?',
+        message: t('order.goodsorder.tips1'),
         showCancelButton: true,
     }).then(() => {
         const { marketid, goodsid } = item
@@ -104,7 +105,7 @@ const onCancelSumit = (item: Model.TradeOrderDetailRsp) => {
         /// loding....
         fullloading((hideLoading) => {
             cancelSubmit().then(() => {
-                hideLoading('撤销成功')
+                hideLoading(t('order.goodsorder.tips2'))
                 pullRefreshRef.value?.refresh()
             }).catch((err) => {
                 hideLoading(err, 'fail')

+ 11 - 11
src/packages/mobile/views/order/list/components/goodstrade/detail/Index.vue

@@ -3,20 +3,20 @@
     <app-modal direction="right-top" height="100%" width="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
-                <app-navbar title="订单成交单" @back="closed" />
+                <app-navbar :title="$t('order.goodstrade.title')" @back="closed" />
             </template>
             <div class="order-detail__container g-form__container">
-                <CellGroup title="订单成交信息">
-                    <Cell title="商品代码/名称" :value="selectedRow.goodscode + '/' + selectedRow.goodsname" />
-                    <Cell title="方向" :value="getBuyOrSellName(selectedRow.buyorsell)" />
-                    <Cell title="类型" :value="getBuildTypeName(selectedRow.buildtype)" />
-                    <Cell title="成交量" :value="selectedRow.tradeqty" />
-                    <Cell title="成交价格" :value="formatDecimal(selectedRow.tradeprice)" />
-                    <Cell title="手续费" :value="formatDecimal(selectedRow.charge)" />
-                    <Cell title="平仓损益" :value="formatDecimal(selectedRow.closepl)" />
+                <CellGroup :title="$t('order.goodstrade.subtitle')">
+                    <Cell :title="$t('order.goodstrade.goodsname')" :value="selectedRow.goodscode + '/' + selectedRow.goodsname" />
+                    <Cell :title="$t('order.goodstrade.buyorsell')" :value="getBuyOrSellName(selectedRow.buyorsell)" />
+                    <Cell :title="$t('order.goodstrade.buildtype')" :value="getBuildTypeName(selectedRow.buildtype)" />
+                    <Cell :title="$t('order.goodstrade.tradeqty')" :value="selectedRow.tradeqty" />
+                    <Cell :title="$t('order.goodstrade.tradeprice')" :value="formatDecimal(selectedRow.tradeprice)" />
+                    <Cell :title="$t('order.goodstrade.charge')" :value="formatDecimal(selectedRow.charge)" />
+                    <Cell :title="$t('order.goodstrade.closepl')" :value="formatDecimal(selectedRow.closepl)" />
                     <!-- <Cell title="成交对手" :value="tmMatchAccountID(selectedRow.matchaccountid)" /> -->
-                    <Cell title="成交时间" :value="formatDate(selectedRow.tradetime)" />
-                    <Cell title="成交单号" :value="selectedRow.tradeid" />
+                    <Cell :title="$t('order.goodstrade.tradetime')" :value="formatDate(selectedRow.tradetime)" />
+                    <Cell :title="$t('order.goodstrade.tradeid')" :value="selectedRow.tradeid" />
                 </CellGroup>
             </div>
         </app-view>

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

@@ -3,7 +3,7 @@
     <app-modal direction="right-top" height="100%" width="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
-                <app-navbar title="历史订单成交" @back="closed">
+                <app-navbar :title="$t('order.goodstrade.title2')" @back="closed">
                     <template #footer>
                         <app-calendar :default-date="[currentDate]" @confirm="onConfirm" />
                     </template>
@@ -24,35 +24,35 @@
                         <div class="g-order-list__content">
                             <ul>
                                 <li>
-                                    <span>类型</span>
+                                    <span>{{ $t('order.goodstrade.buildtypebuyorsell') }}</span>
                                     <span>
                                         {{ getBuildTypeName(item.buildtype) + getBuyOrSellName(item.buyorsell) }}
                                     </span>
                                 </li>
                                 <li>
-                                    <span>成交价格</span>
+                                    <span>{{ $t('order.goodstrade.tradeprice') }}</span>
                                     <span>{{ item.tradeprice }}</span>
                                 </li>
                                 <li>
-                                    <span>手续费</span>
+                                    <span>{{ $t('order.goodstrade.charge') }}</span>
                                     <span>{{ item.charge }}</span>
                                 </li>
                                 <li>
-                                    <span>成交量</span>
+                                    <span>{{ $t('order.goodstrade.tradeqty') }}</span>
                                     <span>{{ item.tradeqty }}</span>
                                 </li>
                                 <li>
-                                    <span>平仓盈亏</span>
+                                    <span>{{ $t('order.goodstrade.closepl') }}</span>
                                     <span>{{ item.closepl }}</span>
                                 </li>
                                 <li>
-                                    <span>成交日期</span>
+                                    <span>{{ $t('order.goodstrade.tradedate') }}</span>
                                     <span>{{ formatDate(item.tradetime, 'YYYY-MM-DD') }}</span>
                                 </li>
                             </ul>
                         </div>
                         <div class="g-order-list__btnbar">
-                            <Button size="small" @click="showComponent('detail', item)" round>详情</Button>
+                            <Button size="small" @click="showComponent('detail', item)" round>{{ $t('operation.details') }}</Button>
                         </div>
                     </div>
                 </div>

+ 7 - 7
src/packages/mobile/views/order/list/components/goodstrade/list/Index.vue

@@ -15,33 +15,33 @@
                 <div class="g-order-list__content">
                     <ul>
                         <li>
-                            <span>类型/方向</span>
+                            <span>{{ $t('order.goodstrade.buildtypebuyorsell') }}</span>
                             <span>{{ getBuildTypeName(item.buildtype) }}/{{ getBuyOrSellName(item.buyorsell) }}</span>
                         </li>
                         <li>
-                            <span>成交价格</span>
+                            <span>{{ $t('order.goodstrade.tradeprice') }}</span>
                             <span>{{ formatDecimal(item.tradeprice) }}</span>
                         </li>
                         <li>
-                            <span>手续费</span>
+                            <span>{{ $t('order.goodstrade.charge') }}</span>
                             <span>{{ formatDecimal(item.charge) }}</span>
                         </li>
                         <li>
-                            <span>成交量</span>
+                            <span>{{ $t('order.goodstrade.tradeqty') }}</span>
                             <span>{{ item.tradeqty }}</span>
                         </li>
                         <li>
-                            <span>平仓盈亏</span>
+                            <span>{{ $t('order.goodstrade.closepl') }}</span>
                             <span>{{ formatDecimal(item.closepl) }}</span>
                         </li>
                         <li>
-                            <span>成交日期</span>
+                            <span>{{ $t('order.goodstrade.tradedate') }}</span>
                             <span>{{ formatDate(item.tradetime, 'YYYY-MM-DD') }}</span>
                         </li>
                     </ul>
                 </div>
                 <div class="g-order-list__btnbar">
-                    <Button size="small" @click="showComponent('detail', item)" round>详情</Button>
+                    <Button size="small" @click="showComponent('detail', item)" round>{{ $t('operation.details') }}</Button>
                 </div>
             </div>
         </div>

+ 4 - 2
src/packages/mobile/views/order/list/components/listingorder/detail/Index.vue

@@ -35,7 +35,9 @@ import { getBuyOrSellName, getWRTradeOrderStatusName, getWrTradeTypeName } from
 import { formatDate, formatDecimal } from '@/filters'
 import { useWrListingCancelOrder } from '@/business/trade'
 import { dialog, fullloading } from '@/utils/vant'
+import { i18n } from '@/stores'
 
+const { global: { t } } = i18n
 const showModal = shallowRef(true)
 // 是否刷新父组件数据
 const refresh = shallowRef(false)
@@ -50,7 +52,7 @@ const props = defineProps({
 
 const onCancelSumit = () => {
     dialog({
-        message: '确认要撤销吗?',
+        message: t('order.listingorder.tips1'),
         showCancelButton: true,
     }).then(() => {
         ///  参数信息
@@ -61,7 +63,7 @@ const onCancelSumit = () => {
         /// loding....
         fullloading((hideLoading) => {
             cancelSubmit().then(() => {
-                hideLoading('撤销成功')
+                hideLoading(t('order.listingorder.tips2'))
                 closed(true)
             }).catch((err) => {
                 hideLoading(err, 'fail')

+ 12 - 12
src/packages/mobile/views/order/list/components/listingtrade/detail/Index.vue

@@ -3,20 +3,20 @@
     <app-modal direction="right-top" height="100%" width="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
-                <app-navbar title="挂牌成交单" @back="closed" />
+                <app-navbar :title="$t('order.listingtrade.title')" @back="closed" />
             </template>
             <div class="order-detail__container g-form__container">
-                <CellGroup title="挂牌成交信息">
-                    <Cell title="商品代码/名称" :value="selectedRow.wrstandardcode + '/' + selectedRow.wrstandardname" />
-                    <Cell title="仓库" :value="selectedRow.warehousename" />
-                    <Cell title="类型" :value="getWrTradeTypeName(selectedRow.wrtradetype)" />
-                    <Cell title="方向" :value="getBuyOrSellName(selectedRow.buyorsell)" />
-                    <Cell title="成交价格" :value="formatDecimal(selectedRow.tradeprice)" />
-                    <Cell title="成交量" :value="formatDecimal(selectedRow.tradeqty)" />
-                    <Cell title="成交金额" :value="formatDecimal(selectedRow.tradeqty * selectedRow.tradeprice)" />
-                    <Cell title="成交时间" :value="formatDate(selectedRow.tradetime)" />
-                    <Cell title="对手方" :value="selectedRow.matchusername" />
-                    <Cell title="成交单号" :value="selectedRow.wrtradedetailid" />
+                <CellGroup :title="$t('order.listingtrade.subtitle')">
+                    <Cell :title="$t('order.listingtrade.goodsname')" :value="selectedRow.wrstandardcode + '/' + selectedRow.wrstandardname" />
+                    <Cell :title="$t('order.listingtrade.warehousename')" :value="selectedRow.warehousename" />
+                    <Cell :title="$t('order.listingtrade.wrtradetype')" :value="getWrTradeTypeName(selectedRow.wrtradetype)" />
+                    <Cell :title="$t('order.listingtrade.buyorsell')" :value="getBuyOrSellName(selectedRow.buyorsell)" />
+                    <Cell :title="$t('order.listingtrade.tradeprice')" :value="formatDecimal(selectedRow.tradeprice)" />
+                    <Cell :title="$t('order.listingtrade.tradeqty')" :value="formatDecimal(selectedRow.tradeqty)" />
+                    <Cell :title="$t('order.listingtrade.tradeamount')" :value="formatDecimal(selectedRow.tradeqty * selectedRow.tradeprice)" />
+                    <Cell :title="$t('order.listingtrade.tradetime')" :value="formatDate(selectedRow.tradetime)" />
+                    <Cell :title="$t('order.listingtrade.matchusername')" :value="selectedRow.matchusername" />
+                    <Cell :title="$t('order.listingtrade.wrtradedetailid')" :value="selectedRow.wrtradedetailid" />
                 </CellGroup>
             </div>
         </app-view>

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

@@ -3,7 +3,7 @@
     <app-modal direction="right-top" height="100%" width="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
-                <app-navbar title="历史挂牌成交" @back="closed">
+                <app-navbar :title="$t('order.listingtrade.title2')" @back="closed">
                     <template #footer>
                         <app-calendar :default-date="[currentDate]" @confirm="onConfirm" />
                     </template>
@@ -22,23 +22,23 @@
                         <div class="g-order-list__content">
                             <ul>
                                 <li>
-                                    <span>方向</span>
+                                    <span>{{ $t('order.listingtrade.buyorsell') }}</span>
                                     <span>{{ getBuyOrSellName(item.buyorsell) }}</span>
                                 </li>
                                 <li>
-                                    <span>成交量</span>
+                                    <span>{{ $t('order.listingtrade.tradeqty') }}</span>
                                     <span>{{ item.tradeqty }}</span>
                                 </li>
                                 <li>
-                                    <span>成交价格</span>
-                                    <span>{{ formatDecimal(item.tradeqty) }}</span>
+                                    <span>{{ $t('order.listingtrade.tradeprice') }}</span>
+                                    <span>{{ formatDecimal(item.tradeprice) }}</span>
                                 </li>
                                 <li>
-                                    <span>成交金额</span>
+                                    <span>{{ $t('order.listingtrade.tradeamount') }}</span>
                                     <span>{{ formatDecimal(item.tradeprice * item.tradeqty) }}</span>
                                 </li>
                                 <li>
-                                    <span>成交日期</span>
+                                    <span>{{ $t('order.listingtrade.tradedate') }}</span>
                                     <span>{{ formatDate(item.tradedate, 'YYYY-MM-DD') }}</span>
                                 </li>
                             </ul>

+ 4 - 4
src/packages/mobile/views/order/list/components/listingtrade/list/Index.vue

@@ -16,19 +16,19 @@
                 <div class="g-order-list__content">
                     <ul>
                         <li>
-                            <span>成交量</span>
+                            <span>{{ $t('order.listingtrade.tradeqty') }}</span>
                             <span>{{ item.tradeqty }}</span>
                         </li>
                         <li>
-                            <span>成交价格</span>
+                            <span>{{ $t('order.listingtrade.tradeprice') }}</span>
                             <span>{{ item.tradeprice }}</span>
                         </li>
                         <li>
-                            <span>成交金额</span>
+                            <span>{{ $t('order.listingtrade.tradeamount') }}</span>
                             <span>{{ formatDecimal(item.tradeprice * item.tradeqty) }}</span>
                         </li>
                         <li>
-                            <span>成交日期</span>
+                            <span>{{ $t('order.listingtrade.tradedate') }}</span>
                             <span>{{ formatDate(item.tradedate, 'YYYY-MM-DD') }}</span>
                         </li>
                     </ul>

+ 17 - 17
src/packages/mobile/views/order/list/components/presale/detail/Index.vue

@@ -3,25 +3,25 @@
     <app-modal direction="right-top" height="100%" width="100%" v-model:show="showModal">
         <app-view class="g-form">
             <template #header>
-                <app-navbar title="预售认购单" @back="closed" />
+                <app-navbar :title="$t('order.presale.title')" @back="closed" />
             </template>
             <div class="g-form__container">
-                <CellGroup title="预售认购信息">
-                    <Cell title="商品代码/名称" :value="`${selectedRow.goodscode}/${selectedRow.goodsname}`" />
-                    <Cell title="认购量" :value="selectedRow.orderqty" />
-                    <Cell title="认购价" :value="selectedRow.orderprice" />
-                    <Cell title="认购金额" :value="(selectedRow.orderprice * selectedRow.orderqty).toFixed(2)" />
-                    <Cell title="定金方式" :value="selectedRow.presaledepositalgorithm === 1 ? '比率' : '固定'" />
-                    <Cell title="定金比例" :value="parsePercent(selectedRow.presaledepositvalue)" />
-                    <Cell title="预售定金" :value="selectedRow.freezemargin" />
-                    <Cell title="发售方" :value="selectedRow.sellname" />
-                    <Cell title="开始日期" :value="formatDate(selectedRow.starttime, 'YYYY-MM-DD')" />
-                    <Cell title="结束日期" :value="formatDate(selectedRow.endtime, 'YYYY-MM-DD')" />
-                    <Cell title="委托状态" :value="getOrderStatusName(selectedRow.orderstatus)" />
-                    <Cell title="委托时间" :value="selectedRow.ordertime" />
-                    <Cell title="预售价" :value="handleNumberValue(selectedRow.tradeprice)" />
-                    <Cell title="订单量" :value="handleNumberValue(selectedRow.tradeqty)" />
-                    <Cell title="委托单号" :value="selectedRow.orderid" />
+                <CellGroup :title="$t('order.presale.subtitle')">
+                    <Cell :title="$t('order.presale.goodsname')" :value="`${selectedRow.goodscode}/${selectedRow.goodsname}`" />
+                    <Cell :title="$t('order.presale.orderqty')" :value="selectedRow.orderqty" />
+                    <Cell :title="$t('order.presale.orderprice')" :value="selectedRow.orderprice" />
+                    <Cell :title="$t('order.presale.orderamount')" :value="(selectedRow.orderprice * selectedRow.orderqty).toFixed(2)" />
+                    <Cell :title="$t('order.presale.presaledepositalgorithm')" :value="selectedRow.presaledepositalgorithm === 1 ? '比率' : '固定'" />
+                    <Cell :title="$t('order.presale.presaledepositvalue')" :value="parsePercent(selectedRow.presaledepositvalue)" />
+                    <Cell :title="$t('order.presale.freezemargin')" :value="selectedRow.freezemargin" />
+                    <Cell :title="$t('order.presale.sellname')" :value="selectedRow.sellname" />
+                    <Cell :title="$t('order.presale.starttime')" :value="formatDate(selectedRow.starttime, 'YYYY-MM-DD')" />
+                    <Cell :title="$t('order.presale.endtime')" :value="formatDate(selectedRow.endtime, 'YYYY-MM-DD')" />
+                    <Cell :title="$t('order.presale.orderstatus')" :value="getOrderStatusName(selectedRow.orderstatus)" />
+                    <Cell :title="$t('order.presale.ordertime')" :value="selectedRow.ordertime" />
+                    <Cell :title="$t('order.presale.tradeprice')" :value="handleNumberValue(selectedRow.tradeprice)" />
+                    <Cell :title="$t('order.presale.tradeqty')" :value="handleNumberValue(selectedRow.tradeqty)" />
+                    <Cell :title="$t('order.presale.orderid')" :value="selectedRow.orderid" />
                 </CellGroup>
             </div>
         </app-view>

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

@@ -3,7 +3,7 @@
     <app-modal direction="right-top" height="100%" width="100%" v-model:show="showModal">
         <app-view class="g-form">
             <template #header>
-                <app-navbar title="历史预售认购" @back="closed">
+                <app-navbar :title="$t('order.presale.subtitle1')" @back="closed">
                     <template #footer>
                         <app-calendar :default-date="[currentDate]" @confirm="onConfirm" />
                     </template>
@@ -24,39 +24,39 @@
                         <div class="g-order-list__content">
                             <ul>
                                 <li>
-                                    <span>认购量</span>
+                                    <span>{{ $t('order.presale.orderqty') }}</span>
                                     <span>{{ item.orderqty }}</span>
                                 </li>
                                 <li>
-                                    <span>认购价</span>
+                                    <span>{{ $t('order.presale.orderprice') }}</span>
                                     <span>{{ item.orderprice }}</span>
                                 </li>
                                 <li>
-                                    <span>发售方</span>
+                                    <span>{{ $t('order.presale.sellname') }}</span>
                                     <span>{{ item.sellname }}</span>
                                 </li>
                                 <li>
-                                    <span>认购金额</span>
+                                    <span>{{ $t('order.presale.orderamount') }}</span>
                                     <span>{{ handleNumberValue(item.orderprice * item.orderqty) }}</span>
                                 </li>
                                 <li>
-                                    <span>定金比例</span>
+                                    <span>{{ $t('order.presale.presaledepositvalue') }}</span>
                                     <span>{{ parsePercent(item.presaledepositvalue) }}</span>
                                 </li>
                                 <li>
-                                    <span>预售定金</span>
+                                    <span>{{ $t('order.presale.freezemargin') }}</span>
                                     <span>{{ handleNumberValue(item.freezemargin) }}</span>
                                 </li>
                                 <li>
-                                    <span>开始日期</span>
+                                    <span>{{ $t('order.presale.starttime') }}</span>
                                     <span>{{ formatDate(item.starttime, 'YYYY-MM-DD') }}</span>
                                 </li>
                                 <li>
-                                    <span>结束日期</span>
+                                    <span>{{ $t('order.presale.endtime') }}</span>
                                     <span>{{ formatDate(item.endtime, 'YYYY-MM-DD') }}</span>
                                 </li>
                                 <li>
-                                    <span>委托日期</span>
+                                    <span>{{ $t('order.presale.orderdate') }}</span>
                                     <span>{{ formatDate(item.ordertime, 'YYYY-MM-DD') }}</span>
                                 </li>
                             </ul>

+ 9 - 9
src/packages/mobile/views/order/list/components/presale/list/Index.vue

@@ -15,39 +15,39 @@
                 <div class="g-order-list__content">
                     <ul>
                         <li>
-                            <span>认购量</span>
+                            <span>{{ $t('order.presale.orderqty') }}</span>
                             <span>{{ item.orderqty }}</span>
                         </li>
                         <li>
-                            <span>认购价</span>
+                            <span>{{ $t('order.presale.orderprice') }}</span>
                             <span>{{ item.orderprice }}</span>
                         </li>
                         <li>
-                            <span>发售方</span>
+                            <span>{{ $t('order.presale.sellname') }}</span>
                             <span>{{ item.sellname }}</span>
                         </li>
                         <li>
-                            <span>认购金额</span>
+                            <span>{{ $t('order.presale.orderamount') }}</span>
                             <span>{{ formatDecimal(item.orderprice * item.orderqty) }}</span>
                         </li>
                         <li>
-                            <span>定金比例</span>
+                            <span>{{ $t('order.presale.presaledepositvalue') }}</span>
                             <span>{{ parsePercent(item.presaledepositvalue) }}</span>
                         </li>
                         <li>
-                            <span>预售定金</span>
+                            <span>{{ $t('order.presale.freezemargin') }}</span>
                             <span>{{ handleNumberValue(item.freezemargin) }}</span>
                         </li>
                         <li>
-                            <span>开始日期</span>
+                            <span>{{ $t('order.presale.starttime') }}</span>
                             <span>{{ formatDate(item.starttime, 'YYYY-MM-DD') }}</span>
                         </li>
                         <li>
-                            <span>结束日期</span>
+                            <span>{{ $t('order.presale.endtime') }}</span>
                             <span>{{ formatDate(item.endtime, 'YYYY-MM-DD') }}</span>
                         </li>
                         <li>
-                            <span>委托日期</span>
+                            <span>{{ $t('order.presale.orderdate') }}</span>
                             <span>{{ formatDate(item.ordertime, 'YYYY-MM-DD') }}</span>
                         </li>
                     </ul>

+ 15 - 13
src/packages/mobile/views/order/list/components/pricingorder/detail/Index.vue

@@ -3,22 +3,22 @@
     <app-modal direction="right-top" height="100%" width="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
-                <app-navbar title="详细" @back="closed" />
+                <app-navbar :title="详细" @back="closed" />
             </template>
             <div class="order-detail__container g-form__container">
-                <CellGroup title="挂牌点价委托信息">
-                    <Cell title="商品代码/名称" :value="selectedRow.goodscode + '/' + selectedRow.goodsname" />
-                    <Cell title="方向" :value="getBuyOrSellName(selectedRow.buyorsell)" />
-                    <Cell title="委托量" :value="formatDecimal(selectedRow.orderqty)" />
-                    <Cell title="委托价格" :value="formatDecimal(selectedRow.orderprice)" />
-                    <Cell title="成交量" :value="formatDecimal(selectedRow.tradeqty)" />
-                    <Cell title="委托状态" :value="getWRTradeOrderStatusName(selectedRow.orderstatus)" />
-                    <Cell title="委托时间" :value="formatDate(selectedRow.ordertime)" />
-                    <Cell title="委托单号" :value="selectedRow.orderid" />
+                <CellGroup :title="$t('order.pricingorder.subtitle')">
+                    <Cell :title="$t('order.pricingorder.goodsname')" :value="selectedRow.goodscode + '/' + selectedRow.goodsname" />
+                    <Cell :title="$t('order.pricingorder.buyorsell')" :value="getBuyOrSellName(selectedRow.buyorsell)" />
+                    <Cell :title="$t('order.pricingorder.orderqty')" :value="formatDecimal(selectedRow.orderqty)" />
+                    <Cell :title="$t('order.pricingorder.orderprice')" :value="formatDecimal(selectedRow.orderprice)" />
+                    <Cell :title="$t('order.pricingorder.tradeqty')" :value="formatDecimal(selectedRow.tradeqty)" />
+                    <Cell :title="$t('order.pricingorder.orderstatus')" :value="getWRTradeOrderStatusName(selectedRow.orderstatus)" />
+                    <Cell :title="$t('order.pricingorder.ordertime')" :value="formatDate(selectedRow.ordertime)" />
+                    <Cell :title="$t('order.pricingorder.orderid')" :value="selectedRow.orderid" />
                 </CellGroup>
             </div>
             <template #footer v-if="selectedRow.orderstatus === 3 || selectedRow.orderstatus === 7">
-                <Button type="danger" block square @click="onCancelSumit">撤销</Button>
+                <Button type="danger" block square @click="onCancelSumit">{{ $t('operation.cancel2') }}</Button>
             </template>
         </app-view>
     </app-modal>
@@ -32,7 +32,9 @@ import { getBuyOrSellName, getWRTradeOrderStatusName } from '@/constants/order'
 import { formatDate, formatDecimal, handleRequestBigNumber } from '@/filters'
 import { useCancelOrder } from '@/business/trade'
 import { dialog, fullloading } from '@/utils/vant'
+import { i18n } from '@/stores'
 
+const { global: { t } } = i18n
 const showModal = shallowRef(true)
 // 是否刷新父组件数据
 const refresh = shallowRef(false)
@@ -48,7 +50,7 @@ const props = defineProps({
 const onCancelSumit = () => {
     console.log('goodsid')
     dialog({
-        message: '确认要撤销吗?',
+        message: t('order.pricingorder.tips1'),
         showCancelButton: true,
     }).then(() => {
         const { marketid, goodsid } = props.selectedRow
@@ -59,7 +61,7 @@ const onCancelSumit = () => {
         /// loding....
         fullloading((hideLoading) => {
             cancelSubmit().then(() => {
-                hideLoading('撤销成功')
+                hideLoading(t('order.pricingorder.tips2'))
                 closed(true)
             }).catch((err) => {
                 hideLoading(err, 'fail')

+ 9 - 7
src/packages/mobile/views/order/list/components/pricingorder/list/Index.vue

@@ -15,23 +15,23 @@
                 <div class="g-order-list__content">
                     <ul>
                         <li>
-                            <span>委托日期</span>
+                            <span>{{ $t('order.pricingorder.orderdate') }}</span>
                             <span>{{ formatDate(item.ordertime, 'YYYY-MM-DD') }}</span>
                         </li>
                         <li>
-                            <span>方向</span>
+                            <span>{{ $t('order.pricingorder.buyorsell') }}</span>
                             <span>{{ getBuyOrSellName(item.buyorsell) }}</span>
                         </li>
                         <li>
-                            <span>委托量</span>
+                            <span>{{ $t('order.pricingorder.orderqty') }}</span>
                             <span>{{ formatDecimal(item.orderqty) }}</span>
                         </li>
                         <li>
-                            <span>委托价格</span>
+                            <span>{{ $t('order.pricingorder.orderprice') }}</span>
                             <span>{{ formatDecimal(item.orderprice) }}</span>
                         </li>
                         <li>
-                            <span>成交量</span>
+                            <span>{{ $t('order.pricingorder.tradeqty') }}</span>
                             <span>{{ formatDecimal(item.tradeqty) }}</span>
                         </li>
                     </ul>
@@ -59,6 +59,7 @@ import { formatDate, formatDecimal, handleRequestBigNumber } from '@/filters'
 import { useCancelOrder } from '@/business/trade'
 import { dialog } from '@/utils/vant'
 import { fullloading } from '@/utils/vant'
+import { i18n } from '@/stores'
 
 import AppPullRefresh from '@mobile/components/base/pull-refresh/index.vue'
 
@@ -66,6 +67,7 @@ const componentMap = new Map<string, unknown>([
     ['detail', defineAsyncComponent(() => import('../detail/Index.vue'))]
 ])
 
+const { global: { t } } = i18n
 const { cancelSubmit, formData } = useCancelOrder()
 const dataList = shallowRef<Model.TradeOrderDetailRsp[]>([])
 const selectedRow = shallowRef<Model.TradeOrderDetailRsp>()
@@ -94,7 +96,7 @@ const { loading, pageIndex, pageCount, run } = useRequest(queryTradeOrderDetail,
 
 const onCancelSumit = (item: Model.TradeOrderDetailRsp) => {
     dialog({
-        message: '确认要撤销吗?',
+        message: t('order.pricingorder.tips1'),
         showCancelButton: true,
     }).then(() => {
         formData.Header = { MarketID: item.marketid, GoodsID: item.goodsid }
@@ -103,7 +105,7 @@ const onCancelSumit = (item: Model.TradeOrderDetailRsp) => {
         /// loding....
         fullloading((hideLoading) => {
             cancelSubmit().then(() => {
-                hideLoading('撤销成功')
+                hideLoading(t('order.pricingorder.tips2'))
             }).catch((err) => {
                 hideLoading(err, 'fail')
             })

+ 12 - 12
src/packages/mobile/views/order/list/components/pricingtrade/detail/Index.vue

@@ -3,20 +3,20 @@
     <app-modal direction="right-top" height="100%" width="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
-                <app-navbar title="详细" @back="closed" />
+                <app-navbar :title="$t('order.pricingtrade.subtitle1')" @back="closed" />
             </template>
             <div class="order-detail__container g-form__container">
-                <CellGroup title="挂牌点价成交信息">
-                    <Cell title="商品代码/名称" :value="selectedRow.goodscode + '/' + selectedRow.goodsname" />
-                    <Cell title="方向" :value="getBuyOrSellName(selectedRow.buyorsell)" />
-                    <Cell title="类型" :value="getBuildTypeName(selectedRow.buildtype)" />
-                    <Cell title="成交量" :value="selectedRow.tradeqty" />
-                    <Cell title="成交价格" :value="formatDecimal(selectedRow.tradeprice)" />
-                    <Cell title="手续费" :value="formatDecimal(selectedRow.charge)" />
-                    <Cell title="平仓损益" :value="formatDecimal(selectedRow.closepl)" />
-                    <Cell title="对手方" :value="tmMatchAccountID(selectedRow.matchaccountid)" />
-                    <Cell title="成交时间" :value="formatDate(selectedRow.tradetime)" />
-                    <Cell title="成交单号" :value="selectedRow.tradeid" />
+                <CellGroup :title="$t('order.pricingtrade.subtitle')">
+                    <Cell :title="$t('order.pricingtrade.goodsname')" :value="selectedRow.goodscode + '/' + selectedRow.goodsname" />
+                    <Cell :title="$t('order.pricingtrade.buyorsell')" :value="getBuyOrSellName(selectedRow.buyorsell)" />
+                    <Cell :title="$t('order.pricingtrade.buildtype')" :value="getBuildTypeName(selectedRow.buildtype)" />
+                    <Cell :title="$t('order.pricingtrade.tradeqty')" :value="selectedRow.tradeqty" />
+                    <Cell :title="$t('order.pricingtrade.tradeprice')" :value="formatDecimal(selectedRow.tradeprice)" />
+                    <Cell :title="$t('order.pricingtrade.charge')" :value="formatDecimal(selectedRow.charge)" />
+                    <Cell :title="$t('order.pricingtrade.closepl')" :value="formatDecimal(selectedRow.closepl)" />
+                    <Cell :title="$t('order.pricingtrade.matchaccountid')" :value="tmMatchAccountID(selectedRow.matchaccountid)" />
+                    <Cell :title="$t('order.pricingtrade.tradetime')" :value="formatDate(selectedRow.tradetime)" />
+                    <Cell :title="$t('order.pricingtrade.tradeid')" :value="selectedRow.tradeid" />
                 </CellGroup>
             </div>
         </app-view>

+ 6 - 6
src/packages/mobile/views/order/list/components/pricingtrade/list/Index.vue

@@ -12,27 +12,27 @@
                 <div class="g-order-list__content">
                     <ul>
                         <li>
-                            <span>成交日期</span>
+                            <span>{{ $t('order.pricingtrade.tradedate') }}</span>
                             <span>{{ formatDate(item.tradetime, 'YYYY-MM-DD') }}</span>
                         </li>
                         <li>
-                            <span>类型</span>
+                            <span>{{ $t('order.pricingtrade.buildtype') }}</span>
                             <span>{{ getBuildTypeName(item.buildtype) + getBuyOrSellName(item.buyorsell) }}</span>
                         </li>
                         <li>
-                            <span>成交价格</span>
+                            <span>{{ $t('order.pricingtrade.tradeprice') }}</span>
                             <span>{{ formatDecimal(item.tradeprice) }}</span>
                         </li>
                         <li>
-                            <span>手续费</span>
+                            <span>{{ $t('order.pricingtrade.charge') }}</span>
                             <span>{{ formatDecimal(item.charge) }}</span>
                         </li>
                         <li>
-                            <span>成交量</span>
+                            <span>{{ $t('order.pricingtrade.tradeqty') }}</span>
                             <span>{{ item.tradeqty }}</span>
                         </li>
                         <li>
-                            <span>平仓盈亏</span>
+                            <span>{{ $t('order.pricingtrade.closepl') }}</span>
                             <span>{{ formatDecimal(item.closepl) }}</span>
                         </li>
                     </ul>

+ 15 - 14
src/packages/mobile/views/order/list/components/swaporder/detail/Index.vue

@@ -3,22 +3,22 @@
     <app-modal direction="right-top" height="100%" width="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
-                <app-navbar title="委托详情" @back="closed" />
+                <app-navbar :title="$t('order.swaporder.subtitle2')" @back="closed" />
             </template>
             <div class="order-detail__container g-form__container">
-                <CellGroup title="委托信息">
-                    <Cell title="商品代码/名称" :value="selectedRow.goodscode + '/' + selectedRow.goodsname" />
-                    <Cell title="方向" :value="getBuyOrSellName(selectedRow.buyorsell)" />
-                    <Cell title="委托量" :value="formatDecimal(selectedRow.orderqty)" />
-                    <Cell title="委托价格" :value="formatDecimal(selectedRow.orderprice)" />
-                    <Cell title="成交量" :value="formatDecimal(selectedRow.tradeqty)" />
-                    <Cell title="委托状态" :value="getWRTradeOrderStatusName(selectedRow.orderstatus)" />
-                    <Cell title="委托时间" :value="formatDate(selectedRow.ordertime)" />
-                    <Cell title="委托单号" :value="selectedRow.orderid" />
+                <CellGroup :title="$t('order.swaporder.subtitle')">
+                    <Cell :title="$t('order.swaporder.goodsname')" :value="selectedRow.goodscode + '/' + selectedRow.goodsname" />
+                    <Cell :title="$t('order.swaporder.buyorsell')" :value="getBuyOrSellName(selectedRow.buyorsell)" />
+                    <Cell :title="$t('order.swaporder.orderqty')" :value="formatDecimal(selectedRow.orderqty)" />
+                    <Cell :title="$t('order.swaporder.orderprice')" :value="formatDecimal(selectedRow.orderprice)" />
+                    <Cell :title="$t('order.swaporder.tradeqty')" :value="formatDecimal(selectedRow.tradeqty)" />
+                    <Cell :title="$t('order.swaporder.orderstatus')" :value="getWRTradeOrderStatusName(selectedRow.orderstatus)" />
+                    <Cell :title="$t('order.swaporder.ordertime')" :value="formatDate(selectedRow.ordertime)" />
+                    <Cell :title="$t('order.swaporder.orderid')" :value="selectedRow.orderid" />
                 </CellGroup>
             </div>
             <template #footer v-if="selectedRow.orderstatus === 3 || selectedRow.orderstatus === 7">
-                <Button type="danger" block square @click="onCancelSumit">撤销</Button>
+                <Button type="danger" block square @click="onCancelSumit">{{ $t('operation.cancel2') }}</Button>
             </template>
         </app-view>
     </app-modal>
@@ -32,12 +32,13 @@ import { getBuyOrSellName, getWRTradeOrderStatusName } from '@/constants/order'
 import { formatDate, formatDecimal, handleRequestBigNumber } from '@/filters'
 import { useCancelOrder } from '@/business/trade'
 import { dialog, fullloading } from '@/utils/vant'
+import { i18n } from '@/stores'
 
 const showModal = shallowRef(true)
 // 是否刷新父组件数据
 const refresh = shallowRef(false)
 const { cancelSubmit, formData } = useCancelOrder()
-
+const { global: { t } } = i18n
 const props = defineProps({
     selectedRow: {
         type: Object as PropType<Model.TradeOrderDetailRsp>,
@@ -47,7 +48,7 @@ const props = defineProps({
 
 const onCancelSumit = () => {
     dialog({
-        message: '确认要撤销吗?',
+        message: t('order.swaporder.tips1'),
         showCancelButton: true,
     }).then(() => {
         /// 市场ID
@@ -57,7 +58,7 @@ const onCancelSumit = () => {
         /// loding....
         fullloading((hideLoading) => {
             cancelSubmit().then(() => {
-                hideLoading('撤销成功')
+                hideLoading(t('order.swaporder.tips2'))
                 closed(true)
             }).catch((err) => {
                 hideLoading(err, 'fail')

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

@@ -3,7 +3,7 @@
     <app-modal direction="right-top" height="100%" width="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
-                <app-navbar title="历史委托" @back="closed">
+                <app-navbar :title="$t('order.swaporder.subtitle1')" @back="closed">
                     <template #footer>
                         <app-calendar :default-date="[currentDate]" @confirm="onConfirm" />
                     </template>
@@ -24,23 +24,23 @@
                         <div class="g-order-list__content">
                             <ul>
                                 <li>
-                                    <span>方向</span>
+                                    <span>{{ $t('order.swaporder.buyorsell') }}</span>
                                     <span>{{ getBuyOrSellName(item.buyorsell) }}</span>
                                 </li>
                                 <li>
-                                    <span>委托量</span>
+                                    <span>{{ $t('order.swaporder.orderqty') }}</span>
                                     <span>{{ item.orderqty }}</span>
                                 </li>
                                 <li>
-                                    <span>委托价格</span>
+                                    <span>{{ $t('order.swaporder.orderprice') }}</span>
                                     <span>{{ item.orderprice }}</span>
                                 </li>
                                 <li>
-                                    <span>成交量</span>
+                                    <span>{{ $t('order.swaporder.tradeqty') }}</span>
                                     <span>{{ item.tradeqty }}</span>
                                 </li>
                                 <li>
-                                    <span>委托日期</span>
+                                    <span>{{ $t('order.swaporder.orderdate') }}</span>
                                     <span>{{ formatDate(item.ordertime, 'YYYY-MM-DD') }}</span>
                                 </li>
                             </ul>

+ 9 - 9
src/packages/mobile/views/order/list/components/swaporder/list/Index.vue

@@ -15,23 +15,23 @@
                 <div class="g-order-list__content">
                     <ul>
                         <li>
-                            <span>方向</span>
+                            <span>{{ $t('order.swaporder.buyorsell') }}</span>
                             <span>{{ getBuyOrSellName(item.buyorsell) }}</span>
                         </li>
                         <li>
-                            <span>委托量</span>
+                            <span>{{ $t('order.swaporder.orderqty') }}</span>
                             <span>{{ item.orderqty }}</span>
                         </li>
                         <li>
-                            <span>委托价格</span>
+                            <span>{{ $t('order.swaporder.orderprice') }}</span>
                             <span>{{ formatDecimal(item.orderprice) }}</span>
                         </li>
                         <li>
-                            <span>成交量</span>
+                            <span>{{ $t('order.swaporder.tradeqty') }}</span>
                             <span>{{ item.tradeqty }}</span>
                         </li>
                         <li>
-                            <span>委托日期</span>
+                            <span>{{ $t('order.swaporder.orderdate') }}</span>
                             <span>{{ formatDate(item.ordertime, 'YYYY-MM-DD') }}</span>
                         </li>
                     </ul>
@@ -59,13 +59,13 @@ import { formatDate, formatDecimal, handleRequestBigNumber } from '@/filters'
 import { useCancelOrder } from '@/business/trade'
 import { dialog } from '@/utils/vant'
 import { fullloading } from '@/utils/vant'
-
+import { i18n } from '@/stores'
 import AppPullRefresh from '@mobile/components/base/pull-refresh/index.vue'
 
 const componentMap = new Map<string, unknown>([
     ['detail', defineAsyncComponent(() => import('../detail/Index.vue'))]
 ])
-
+const { global: { t } } = i18n
 const { cancelSubmit, formData } = useCancelOrder()
 const dataList = shallowRef<Model.TradeOrderDetailRsp[]>([])
 const selectedRow = shallowRef<Model.TradeOrderDetailRsp>()
@@ -94,7 +94,7 @@ const { loading, pageIndex, pageCount, run } = useRequest(queryTradeOrderDetail,
 
 const onCancelSumit = (item: Model.TradeOrderDetailRsp) => {
     dialog({
-        message: '确认要撤销吗?',
+        message: t('order.swaporder.tips1'),
         showCancelButton: true,
     }).then(() => {
         formData.Header = { MarketID: item.marketid, GoodsID: item.goodsid }
@@ -103,7 +103,7 @@ const onCancelSumit = (item: Model.TradeOrderDetailRsp) => {
         /// loding....
         fullloading((hideLoading) => {
             cancelSubmit().then(() => {
-                hideLoading('撤销成功')
+                hideLoading(t('order.swaporder.tips2'))
             }).catch((err) => {
                 hideLoading(err, 'fail')
             })

+ 13 - 13
src/packages/mobile/views/order/list/components/swaptrade/detail/Index.vue

@@ -3,21 +3,21 @@
     <app-modal direction="right-top" height="100%" width="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
-                <app-navbar title="成交详情" @back="closed" />
+                <app-navbar :title="$t('order.swaptrade.subtitle2')" @back="closed" />
             </template>
             <div class="order-detail__container g-form__container">
-                <CellGroup title="成交信息">
-                    <Cell title="商品代码/名称" :value="selectedRow.goodscode + '/' + selectedRow.goodsname" />
-                    <Cell title="方向" :value="getBuyOrSellName(selectedRow.buyorsell)" />
-                    <Cell title="类型" :value="getBuildTypeName(selectedRow.buildtype)" />
-                    <Cell title="成交量" :value="formatDecimal(selectedRow.tradeqty)" />
-                    <Cell title="成交价格" :value="formatDecimal(selectedRow.tradeprice)" />
-                    <Cell title="成交金额" :value="formatDecimal(selectedRow.tradeamount)" />
-                    <Cell title="手续费" :value="formatDecimal(selectedRow.charge)" />
-                    <Cell title="交收盈亏" :value="formatDecimal(selectedRow.closepl)" />
-                    <Cell title="贸易对方" :value="tmMatchAccountID(selectedRow.matchaccountid)" />
-                    <Cell title="成交时间" :value="formatDate(selectedRow.tradetime)" />
-                    <Cell title="成交单号" :value="selectedRow.tradeid" />
+                <CellGroup :title="$t('order.swaptrade.subtitle')">
+                    <Cell :title="$t('order.swaptrade.goodsname')" :value="selectedRow.goodscode + '/' + selectedRow.goodsname" />
+                    <Cell :title="$t('order.swaptrade.buyorsell')" :value="getBuyOrSellName(selectedRow.buyorsell)" />
+                    <Cell :title="$t('order.swaptrade.buildtype')" :value="getBuildTypeName(selectedRow.buildtype)" />
+                    <Cell :title="$t('order.swaptrade.tradeqty')" :value="formatDecimal(selectedRow.tradeqty)" />
+                    <Cell :title="$t('order.swaptrade.tradeprice')" :value="formatDecimal(selectedRow.tradeprice)" />
+                    <Cell :title="$t('order.swaptrade.tradeamount')" :value="formatDecimal(selectedRow.tradeamount)" />
+                    <Cell :title="$t('order.swaptrade.charge')" :value="formatDecimal(selectedRow.charge)" />
+                    <Cell :title="$t('order.swaptrade.closepl')" :value="formatDecimal(selectedRow.closepl)" />
+                    <Cell :title="$t('order.swaptrade.matchaccountid')" :value="tmMatchAccountID(selectedRow.matchaccountid)" />
+                    <Cell :title="$t('order.swaptrade.tradetime')" :value="formatDate(selectedRow.tradetime)" />
+                    <Cell :title="$t('order.swaptrade.tradeid')" :value="selectedRow.tradeid" />
                 </CellGroup>
             </div>
         </app-view>

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

@@ -3,7 +3,7 @@
     <app-modal direction="right-top" height="100%" width="100%" v-model:show="showModal" :refresh="refresh">
         <app-view class="g-form">
             <template #header>
-                <app-navbar title="历史成交" @back="closed">
+                <app-navbar :title="$t('order.swaptrade.subtitle1')" @back="closed">
                     <template #footer>
                         <app-calendar :default-date="[currentDate]" @confirm="onConfirm" />
                     </template>
@@ -21,29 +21,29 @@
                         <div class="g-order-list__content">
                             <ul>
                                 <li>
-                                    <span>类型</span>
+                                    <span>{{ $t('order.swaptrade.buildtype') }}</span>
                                     <span>
                                         {{ getBuildTypeName(item.buildtype) + getBuyOrSellName(item.buyorsell) }}
                                     </span>
                                 </li>
                                 <li>
-                                    <span>成交价格</span>
+                                    <span>{{ $t('order.swaptrade.tradeprice') }}</span>
                                     <span>{{ item.tradeprice }}</span>
                                 </li>
                                 <li>
-                                    <span>手续费</span>
+                                    <span>{{ $t('order.swaptrade.charge') }}</span>
                                     <span>{{ item.charge }}</span>
                                 </li>
                                 <li>
-                                    <span>成交量</span>
+                                    <span>{{ $t('order.swaptrade.tradeqty') }}</span>
                                     <span>{{ item.tradeqty }}</span>
                                 </li>
                                 <li>
-                                    <span>交收盈亏</span>
+                                    <span>{{ $t('order.swaptrade.closepl') }}</span>
                                     <span>{{ item.closepl }}</span>
                                 </li>
                                 <li>
-                                    <span>成交日期</span>
+                                    <span>{{ $t('order.swaptrade.tradedate') }}</span>
                                     <span>{{ formatDate(item.tradetime, 'YYYY-MM-DD') }}</span>
                                 </li>
                             </ul>

+ 6 - 6
src/packages/mobile/views/order/list/components/swaptrade/list/Index.vue

@@ -12,27 +12,27 @@
                 <div class="g-order-list__content">
                     <ul>
                         <li>
-                            <span>类型</span>
+                            <span>{{ $t}}</span>
                             <span>{{ getBuildTypeName(item.buildtype) + getBuyOrSellName(item.buyorsell) }}</span>
                         </li>
                         <li>
-                            <span>成交价格</span>
+                            <span>{{ $t('order.swaptrade.tradeprice') }}</span>
                             <span>{{ formatDecimal(item.tradeprice) }}</span>
                         </li>
                         <li>
-                            <span>手续费</span>
+                            <span>{{ $t('order.swaptrade.charge') }}</span>
                             <span>{{ formatDecimal(item.charge) }}</span>
                         </li>
                         <li>
-                            <span>成交量</span>
+                            <span>{{ $t('order.swaptrade.tradeqty') }}</span>
                             <span>{{ formatDecimal(item.tradeqty) }}</span>
                         </li>
                         <li>
-                            <span>交收盈亏</span>
+                            <span>{{ $t('order.swaptrade.closepl') }}</span>
                             <span>{{ formatDecimal(item.closepl) }}</span>
                         </li>
                         <li>
-                            <span>成交日期</span>
+                            <span>{{ $t('order.swaptrade.tradedate') }}</span>
                             <span>{{ formatDate(item.tradetime, 'YYYY-MM-DD') }}</span>
                         </li>
                     </ul>

+ 14 - 12
src/packages/mobile/views/order/list/components/transferorder/detail/Index.vue

@@ -3,22 +3,22 @@
     <app-modal direction="right-top" height="100%" width="100%" v-model:show="showModal">
         <app-view class="g-form">
             <template #header>
-                <app-navbar title="转让委托单" @back="closed" />
+                <app-navbar :title="t('order.transferorder.title')" @back="closed" />
             </template>
             <div class="g-form__container">
                 <CellGroup title="转让委托信息">
-                    <Cell title="商品代码/名称" :value="`${selectedRow.goodscode}/${selectedRow.goodsname}`" />
-                    <Cell title="转让量" :value="selectedRow.orderqty" />
-                    <Cell title="转让价" :value="selectedRow.orderprice" />
-                    <Cell title="订货价" :value="selectedRow.presaleprice" />
-                    <Cell title="摘牌量" :value="selectedRow.tradeqty" />
-                    <Cell title="委托状态" :value="getOrderStatusName(selectedRow.orderstatus)" />
-                    <Cell title="委托时间" :value="selectedRow.ordertime" />
-                    <Cell title="委托单号" :value="selectedRow.orderid" />
+                    <Cell :title="t('order.transferorder.goodsname')" :value="`${selectedRow.goodscode}/${selectedRow.goodsname}`" />
+                    <Cell :title="t('order.transferorder.orderqty')" :value="selectedRow.orderqty" />
+                    <Cell :title="t('order.transferorder.orderprice')" :value="selectedRow.orderprice" />
+                    <Cell :title="t('order.transferorder.presaleprice')" :value="selectedRow.presaleprice" />
+                    <Cell :title="t('order.transferorder.tradeqty')" :value="selectedRow.tradeqty" />
+                    <Cell :title="t('order.transferorder.orderstatus')" :value="getOrderStatusName(selectedRow.orderstatus)" />
+                    <Cell :title="t('order.transferorder.ordertime')" :value="selectedRow.ordertime" />
+                    <Cell :title="t('order.transferorder.orderid')" :value="selectedRow.orderid" />
                 </CellGroup>
             </div>
             <template #footer v-if="[3, 7].includes(selectedRow.orderstatus)">
-                <Button type="danger" block square @click="onCancelSumit(selectedRow)">撤销</Button>
+                <Button type="danger" block square @click="onCancelSumit(selectedRow)">{{ $t('operation.cancel2') }}</Button>
             </template>
         </app-view>
     </app-modal>
@@ -33,6 +33,7 @@ import { dialog, fullloading } from '@/utils/vant'
 import { useCancelOrder } from '@/business/trade'
 import { EOperateType } from '@/constants/client'
 import AppModal from '@/components/base/modal/index.vue'
+import { i18n } from '@/stores'
 
 defineProps({
     selectedRow: {
@@ -41,6 +42,7 @@ defineProps({
     }
 })
 
+const { global: { t } } = i18n
 const showModal = shallowRef(true)
 // 是否刷新父组件数据
 const refresh = shallowRef(false)
@@ -49,7 +51,7 @@ const { cancelSubmit, formData } = useCancelOrder()
 // 撤销
 const onCancelSumit = (row: Model.MineTradeOrdersRsp) => {
     dialog({
-        message: '是否撤销该委托单?',
+        message: t('order.transferorder.tips1'),
         showCancelButton: true,
     }).then(() => {
         formData.Header = {
@@ -61,7 +63,7 @@ const onCancelSumit = (row: Model.MineTradeOrdersRsp) => {
 
         fullloading((hideLoading) => {
             cancelSubmit().then(() => {
-                hideLoading('撤销成功')
+                hideLoading(t('order.transferorder.tips2'))
                 closed(true)
             }).catch((err) => {
                 hideLoading(err, 'fail')

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

@@ -3,7 +3,7 @@
     <app-modal direction="right-top" height="100%" width="100%" v-model:show="showModal">
         <app-view class="g-form">
             <template #header>
-                <app-navbar title="历史转让委托" @back="closed">
+                <app-navbar :title="$t('order.transferorder.subtitle1')" @back="closed">
                     <template #footer>
                         <app-calendar :default-date="[currentDate]" @confirm="onConfirm" />
                     </template>
@@ -24,19 +24,19 @@
                         <div class="g-order-list__content">
                             <ul>
                                 <li>
-                                    <span>转让量</span>
+                                    <span>{{ $t('order.transferorder.orderqty') }}</span>
                                     <span>{{ item.orderqty }}</span>
                                 </li>
                                 <li>
-                                    <span>转让价</span>
+                                    <span>{{ $t('order.transferorder.orderprice') }}</span>
                                     <span>{{ item.orderprice }}</span>
                                 </li>
                                 <li>
-                                    <span>摘牌量</span>
+                                    <span>{{ $t('order.transferorder.tradeqty') }}</span>
                                     <span>{{ item.tradeqty }}</span>
                                 </li>
                                 <li>
-                                    <span>订货价</span>
+                                    <span>{{ $t('order.transferorder.presaleprice') }}</span>
                                     <span>{{ item.presaleprice }}</span>
                                 </li>
                             </ul>

+ 8 - 7
src/packages/mobile/views/order/list/components/transferorder/list/Index.vue

@@ -16,19 +16,19 @@
                 <div class="g-order-list__content">
                     <ul>
                         <li>
-                            <span>转让量</span>
+                            <span>{{ $t('order.transferorder.orderqty') }}</span>
                             <span>{{ item.orderqty }}</span>
                         </li>
                         <li>
-                            <span>转让价</span>
+                            <span>{{ $t('order.transferorder.orderprice') }}</span>
                             <span>{{ item.orderprice }}</span>
                         </li>
                         <li>
-                            <span>摘牌量</span>
+                            <span>{{ $t('order.transferorder.tradeqty') }}</span>
                             <span>{{ item.tradeqty }}</span>
                         </li>
                         <li>
-                            <span>订货价</span>
+                            <span>{{ $t('order.transferorder.presaleprice') }}</span>
                             <span>{{ item.presaleprice }}</span>
                         </li>
                     </ul>
@@ -57,11 +57,12 @@ import { queryMineTradeOrders } from '@/services/api/transfer'
 import { useCancelOrder } from '@/business/trade'
 import AppPullRefresh from '@mobile/components/base/pull-refresh/index.vue'
 import { getOrderStatusName } from '@/constants/order'
+import { i18n } from '@/stores'
 
 const componentMap = new Map<string, unknown>([
     ['detail', defineAsyncComponent(() => import('../detail/Index.vue'))],
 ])
-
+const { global: { t } } = i18n
 const { cancelSubmit, formData } = useCancelOrder()
 const dataList = shallowRef<Model.MineTradeOrdersRsp[]>([])
 const selectedRow = shallowRef<Model.MineTradeOrdersRsp>()
@@ -95,7 +96,7 @@ const showComponent = (componentName: string, row: Model.MineTradeOrdersRsp) =>
 // 撤销
 const cancel = (row: Model.MineTradeOrdersRsp) => {
     dialog({
-        message: '是否撤销该委托单?',
+        message: t('order.transferorder.tips1'),
         showCancelButton: true,
     }).then(() => {
         formData.Header = {
@@ -107,7 +108,7 @@ const cancel = (row: Model.MineTradeOrdersRsp) => {
 
         fullloading((hideLoading) => {
             cancelSubmit().then(() => {
-                hideLoading('撤销成功')
+                hideLoading(t('order.transferorder.tips2'))
                 pullRefreshRef.value?.refresh()
             }).catch((err) => {
                 hideLoading(err, 'fail')

+ 11 - 11
src/packages/mobile/views/order/list/components/transfertrade/detail/Index.vue

@@ -3,19 +3,19 @@
     <app-modal direction="right-top" height="100%" width="100%" v-model:show="showModal">
         <app-view class="g-form">
             <template #header>
-                <app-navbar title="转让成交单" @back="closed" />
+                <app-navbar :title="$t('order.transfertrade.title')" @back="closed" />
             </template>
             <div class="g-form__container">
-                <CellGroup title="转让成交信息">
-                    <Cell title="商品代码/名称" :value="`${selectedRow.goodscode}/${selectedRow.goodsname}`" />
-                    <Cell title="方向" :value="getBuyOrSellName(selectedRow.buyorsell)" />
-                    <Cell title="转让量" :value="selectedRow.tradeqty" />
-                    <Cell title="转让价" :value="selectedRow.tradeprice" />
-                    <Cell title="订货价" :value="selectedRow.presaleprice" />
-                    <Cell title="损益" :value="selectedRow.closepl" />
-                    <Cell title="对手方" :value="selectedRow.accountname || selectedRow.accountid" />
-                    <Cell title="成交时间" :value="selectedRow.tradetime" />
-                    <Cell title="成交单号" :value="selectedRow.orderid" />
+                <CellGroup :title="$t('order.transfertrade.subtitle')">
+                    <Cell :title="$t('order.transfertrade.goodsname')" :value="`${selectedRow.goodscode}/${selectedRow.goodsname}`" />
+                    <Cell :title="$t('order.transfertrade.buyorsell')" :value="getBuyOrSellName(selectedRow.buyorsell)" />
+                    <Cell :title="$t('order.transfertrade.tradeqty')" :value="selectedRow.tradeqty" />
+                    <Cell :title="$t('order.transfertrade.tradeprice')" :value="selectedRow.tradeprice" />
+                    <Cell :title="$t('order.transfertrade.presaleprice')" :value="selectedRow.presaleprice" />
+                    <Cell :title="$t('order.transfertrade.closepl')" :value="selectedRow.closepl" />
+                    <Cell :title="$t('order.transfertrade.accountname')" :value="selectedRow.accountname || selectedRow.accountid" />
+                    <Cell :title="$t('order.transfertrade.tradetime')" :value="selectedRow.tradetime" />
+                    <Cell :title="$t('order.transfertrade.orderid')" :value="selectedRow.orderid" />
                 </CellGroup>
             </div>
         </app-view>

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

@@ -3,7 +3,7 @@
     <app-modal direction="right-top" height="100%" width="100%" v-model:show="showModal">
         <app-view class="g-form">
             <template #header>
-                <app-navbar title="历史转让成交" @back="closed">
+                <app-navbar :title="$t('order.transfertrade.subtitle1')" @back="closed">
                     <template #footer>
                         <app-calendar :default-date="[currentDate]" @confirm="onConfirm" />
                     </template>
@@ -24,23 +24,23 @@
                         <div class="g-order-list__content">
                             <ul>
                                 <li>
-                                    <span>转让量</span>
+                                    <span>{{ $t('order.transfertrade.tradeqty') }}</span>
                                     <span>{{ item.tradeqty }}</span>
                                 </li>
                                 <li>
-                                    <span>转让价</span>
+                                    <span>{{ $t('order.transfertrade.tradeprice') }}</span>
                                     <span>{{ item.tradeprice }}</span>
                                 </li>
                                 <li>
-                                    <span>订货价</span>
+                                    <span>{{ $t('order.transfertrade.presaleprice') }}</span>
                                     <span>{{ item.presaleprice }}</span>
                                 </li>
                                 <li>
-                                    <span>损益</span>
+                                    <span>{{ $t('order.transfertrade.closepl') }}</span>
                                     <span>{{ handleNumberValue(item.closepl) }}</span>
                                 </li>
                                 <li>
-                                    <span>成交日期</span>
+                                    <span>{{ $t('order.transfertrade.tradedate') }}</span>
                                     <span>{{ formatDate(item.tradetime, 'YYYY-MM-DD') }}</span>
                                 </li>
                             </ul>

+ 5 - 5
src/packages/mobile/views/order/list/components/transfertrade/list/Index.vue

@@ -15,23 +15,23 @@
                 <div class="g-order-list__content">
                     <ul>
                         <li>
-                            <span>转让量</span>
+                            <span>{{ $t('order.transfertrade.tradeqty') }}</span>
                             <span>{{ item.tradeqty }}</span>
                         </li>
                         <li>
-                            <span>转让价</span>
+                            <span>{{ $t('order.transfertrade.tradeprice') }}</span>
                             <span>{{ item.tradeprice }}</span>
                         </li>
                         <li>
-                            <span>订货价</span>
+                            <span>{{ $t('order.transfertrade.presaleprice') }}</span>
                             <span>{{ item.presaleprice }}</span>
                         </li>
                         <li>
-                            <span>损益</span>
+                            <span>{{ $t('order.transfertrade.closepl') }}</span>
                             <span>{{ handleNumberValue(item.closepl) }}</span>
                         </li>
                         <li>
-                            <span>成交日期</span>
+                            <span>{{ $t('order.transfertrade.tradedate') }}</span>
                             <span>{{ formatDate(item.tradetime, 'YYYY-MM-DD') }}</span>
                         </li>
                     </ul>