Merge branch 'v20' of http://192.168.31.240:3000/MTP2.0_New/MTP20_WEB_GLOBAL into v20

public/locales/en-US.json

@@ -471,13 +471,13 @@
             "qty": "Quantity",
             "price": "Price",
             "sellname": "Issuing party",
-            "presaleprice": "Order price",
-            "lastprice": "Latest price",
+            "presaleprice": "Order Price",
+            "lastprice": "Latest Price",
             "transferdepositratio": "Transfer deposit ratio",
             "limitup": "Upper limit price",
             "limitdown": "Lower limit price",
-            "presaleprice1": "Order price",
-            "presaleprice2": "Proposed price",
+            "presaleprice1": "Order Price",
+            "presaleprice2": "Proposed Price",
             "username": "Listing party",
             "orderqty": "Quantity",
             "orderprice": "Price",
@@ -508,12 +508,12 @@
             "buildtype": "Type",
             "buyorsellbuildtype": "Direction/Type",
             "orderqty": "OrderQty",
-            "orderprice": "Order price",
+            "orderprice": "Order Price",
             "tradeqty": "Transaction volume",
             "orderstatus": "Order status",
             "ordertime": "Order time",
             "orderdate": "Order date",
-            "orderid": "Order number",
+            "orderid": "Order ID",
             "freezemargin": "Frozen Margin",
             "tips1": "Do you want to cancel this order?",
             "tips2": "Cancellation successful",
@@ -565,9 +565,9 @@
             "cancelqty": "Cancellation volume",
             "ordertime": "Order time",
             "orderdate": "Order date",
-            "orderprice": "Order price",
+            "orderprice": "Order Price",
             "wrtradeorderstatus": "Order status",
-            "wrtradeorderid": "Order number",
+            "wrtradeorderid": "Order ID",
             "tips1": "Are you sure you want to cancel?",
             "tips2": "Cancellation successful"
         },
@@ -595,8 +595,8 @@
             "subtitle": "Pre-sale subscription information",
             "subtitle1": "Historical pre-sale subscriptions",
             "goodsname": "Product code/name",
-            "orderqty": "Subscription amount",
-            "orderprice": "Subscription price",
+            "orderqty": "Subscription Amount",
+            "orderprice": "Subscription Price",
             "orderamount": "Subscription amount",
             "presaledepositalgorithm": "Deposit method",
             "presaledepositvalue": "Deposit ratio",
@@ -607,9 +607,9 @@
             "orderstatus": "Order status",
             "ordertime": "Order time",
             "orderdate": "Order time",
-            "tradeprice": "Proposed price",
+            "tradeprice": "Proposed Price",
             "tradeqty": "OrderQty",
-            "orderid": "Order number"
+            "orderid": "Order ID"
         },
         "transferorder": {
             "title": "Transfer order",
@@ -618,12 +618,12 @@
             "goodsname": "Product code/name",
             "buyorsell": "Direction",
             "orderqty": "OrderQty",
-            "orderprice": "Requested pric",
-            "presaleprice": "Order price",
+            "orderprice": "Requested Price",
+            "presaleprice": "Order Price",
             "tradeqty": "Transaction volume",
-            "orderstatus": "Order status",
-            "ordertime": "Order time",
-            "orderid": "Order number",
+            "orderstatus": "Order Status",
+            "ordertime": "Order Time",
+            "orderid": "Order ID",
             "tips1": "Do you want to cancel this order?",
             "tips2": "Cancellation successful"
         },
@@ -635,7 +635,7 @@
             "buyorsell": "Direction",
             "tradeqty": "Transfer volume",
             "tradeprice": "Transfer price",
-            "presaleprice": "Order price",
+            "presaleprice": "Order Price",
             "closepl": "Profit and loss",
             "accountname": "Counterparty",
             "tradetime": "Transaction time",
@@ -650,12 +650,12 @@
             "goodsname": "Product code/name",
             "buyorsell": "Direction",
             "orderqty": "OrderQty",
-            "orderprice": "Order price",
+            "orderprice": "Order Price",
             "tradeqty": "Transaction volume",
             "orderstatus": "Order status",
             "ordertime": "Order time",
             "orderdate": "Order date",
-            "orderid": "Order number",
+            "orderid": "Order ID",
             "tips1": "Are you sure you want to cancel?",
             "tips2": "Cancellation successful"
         },
@@ -686,10 +686,10 @@
             "orderdate": "Order date",
             "buyorsell": "BuyOrSell",
             "orderqty": "OrderQty",
-            "orderprice": "Order price",
+            "orderprice": "Order Price",
             "orderstatus": "Order status",
             "tradeqty": "Transaction amount",
-            "orderid": "Order number",
+            "orderid": "Order ID",
             "tips1": "Are you sure you want to cancel?",
             "tips2": "Cancellation successful"
         },
@@ -863,11 +863,11 @@
             "frozenqty": "FrozenQty",
             "enableqty": "EnableQty",
             "sellname": "Issuing party",
-            "presaleprice": "Order price",
+            "presaleprice": "Order Price",
             "closepl": "Reference profit and loss",
-            "averageprice": "Average position price",
+            "averageprice": "Average position Price",
             "holderqty": "PositionQty",
-            "holderprice": "Position price",
+            "holderprice": "Position Price",
             "tradeamount": "Total payment",
             "transferdepositratio": "Transfer deposit ratio",
             "transferdeposit": "Transfer deposit",
@@ -877,10 +877,10 @@
             "lasttradedate": "Last trading day",
             "deposit": "Paid deposit",
             "remainamount": "Remaining amount",
-            "presaleprice1": "Proposed price",
-            "limitup": "Upper limit price",
-            "limitdown": "Lower limit price",
-            "transferprice": "Transfer price",
+            "presaleprice1": "Proposed Price",
+            "limitup": "Upper limit Price",
+            "limitdown": "Lower limit Price",
+            "transferprice": "Transfer Price",
             "transferqty": "TransferQty",
             "giveupqty": "AbandonQty",
             "tips1": "Do you want to add the unpaid transfer deposit?",
@@ -896,7 +896,7 @@
             "curpositionqty": "Holding amount",
             "curholderamount": "Order amount",
             "frozenqty": "FrozenQty",
-            "lastprice": "Reference price",
+            "lastprice": "Reference Price",
             "enableqty": "EnableQty",
             "closepl": "Reference profit and loss",
             "expiredate": "Expiration date",
@@ -907,10 +907,10 @@
             "title": "Price fixing positions",
             "goodsname": "Product code/name",
             "buyorsell": "BuyOrSell",
-            "lastprice": "Current price",
+            "lastprice": "Current Price",
             "curpositionqty": "Holding amount",
             "averageprice": "AveragePrice",
-            "averageprice1": "Order price",
+            "averageprice1": "OrderPrice",
             "frozenqty": "FrozenQty",
             "curholderamount": "CurHolderAmount",
             "enableqty": "EnableQty",
@@ -937,7 +937,7 @@
             "choicewarehousename": "Select warehouse receipt",
             "qty": "Quantity",
             "deliveryqty": "SettlementQty",
-            "xdeliveryprice": "Order price",
+            "xdeliveryprice": "Order Price",
             "deliverypricemove": "Premium/Discount",
             "deliveryamount": "Total payment",
             "xgoodsremainamount": "Remaining payment",

src/packages/digital/views/contract/components/order/history/index.vue

@@ -17,21 +17,21 @@
                 </tr>
                 <tr>
                     <td>
-                        <span class="text-small">委托单号</span>
+                        <span class="text-small">{{ $t('order.goodsorder.orderid') }}</span>
                         <span>{{ item.orderid }}</span>
                     </td>
                     <td>
-                        <span class="text-small">委托状态</span>
+                        <span class="text-small">{{ $t('order.goodsorder.orderstatus') }}</span>
                         <span>{{ getWRTradeOrderStatusName(item.orderstatus) }}</span>
                     </td>
                 </tr>
                 <tr>
                     <td>
-                        <span class="text-small">委托价格({{ enumName(item.goodsid) }})</span>
+                        <span class="text-small">{{ `${t('order.goodsorder.orderprice')}(${enumName(item.goodsid)})` }}</span>
                         <span>{{ formatDecimal(item.orderprice, item.decimalplace) }}</span>
                     </td>
                     <td>
-                        <span class="text-small">委托数量({{ item.goodscode }})</span>
+                        <span class="text-small">{{ `${t('order.goodsorder.orderqty')}(${ item.goodscode })` }}</span>
                         <span>{{ item.orderqty }}</span>
                     </td>
                 </tr>

src/packages/digital/views/contract/components/order/list/index.vue

@@ -17,21 +17,21 @@
                 </tr>
                 <tr>
                     <td>
-                        <span class="text-small">委托单号</span>
+                        <span class="text-small">{{ $t('order.goodsorder.orderid') }}</span>
                         <span>{{ item.orderid }}</span>
                     </td>
                     <td>
-                        <span class="text-small">委托状态</span>
+                        <span class="text-small">{{ $t('order.goodsorder.orderstatus') }}</span>
                         <span>{{ getWRTradeOrderStatusName(item.orderstatus) }}</span>
                     </td>
                 </tr>
                 <tr>
                     <td>
-                        <span class="text-small">委托价格({{ enumName(item.goodsid) }})</span>
+                        <span class="text-small">{{ `${t('order.goodsorder.orderprice')}(${enumName(item.goodsid)})` }}</span>
                         <span>{{ formatDecimal(item.orderprice, item.decimalplace) }}</span>
                     </td>
                     <td>
-                        <span class="text-small">委托数量({{ item.goodscode }})</span>
+                        <span class="text-small">{{ `${t('order.goodsorder.orderqty')}(${ item.goodscode })` }}</span>
                         <span>{{ item.orderqty }}</span>
                     </td>
                 </tr>
@@ -57,7 +57,7 @@ import { getBuyOrSellName,getBuildTypeName, getWRTradeOrderStatusName, getGoodsC
 import { useRequest } from '@/hooks/request'
 import { useComponent } from '@/hooks/component'
 import { queryTradeOrderDetail } from '@/services/api/order'
-import { useFuturesStore } from '@/stores'
+import { i18n, useFuturesStore } from '@/stores'
 import eventBus from '@/services/bus'
 import AppPullRefresh from '@mobile/components/base/pull-refresh/index.vue'
 
@@ -68,6 +68,8 @@ const props = defineProps({
     }
 })
 
+const { global: { t } } = i18n
+
 const componentMap = new Map<string, unknown>([
     ['Cancel', defineAsyncComponent(() => import('../cancel/index.vue'))], // 撤销
 ])

src/packages/digital/views/contract/components/trade/history/index.vue

@@ -5,7 +5,7 @@
             <thead>
                 <tr>
                     <th>
-                        <span>{{ item.goodscode }}/{{ item.goodsname }}</span>
+                        <span>{{ item.goodscode }}/{{ goodsname(item.goodscode) }}</span>
                         <span class="text-small">
                             {{ formatDate(item.tradetime) }}
                         </span>
@@ -21,31 +21,31 @@
             <tbody>
                 <tr>
                     <td>
-                        <span class="text-small">成交单号</span>
+                        <span class="text-small">{{ $t('order.goodstrade.tradeid') }}</span>
                         <span>{{ item.tradeid }}</span>
                     </td>
                     <td>
-                        <span class="text-small">委托状态</span>
+                        <span class="text-small">{{ $t('order.goodsorder.orderstatus') }}</span>
                         <span>{{ getOrderhandleStatusName(item.status) }}</span>
                     </td>
                 </tr>
                 <tr>
                     <td>
-                        <span class="text-small">成交价格( {{ enumName(item.goodsid) }} )</span>
+                        <span class="text-small">{{ `${t('order.goodstrade.tradeprice')}(${enumName(item.goodsid)})` }}</span>
                         <span>{{ formatDecimal(item.tradeprice) }}</span>
                     </td>
                     <td>
-                        <span class="text-small">手续费({{ enumName(item.goodsid) }})</span>
+                        <span class="text-small">{{ `${t('order.goodstrade.charge')}(${enumName(item.goodsid)})` }}</span>
                         <span>{{ formatDecimal(item.charge) }}</span>
                     </td>
                 </tr>
                 <tr>
                     <td>
-                        <span class="text-small">成交数量({{ enumName(item.goodsid) }})</span>
+                        <span class="text-small">{{ `${t('order.goodstrade.tradeqty')}(${enumName(item.goodsid)})` }}</span>
                         <span>{{ item.tradeqty }}</span>
                     </td>
                     <td>
-                        <span class="text-small">平仓盈亏({{ enumName(item.goodsid) }})</span>
+                        <span class="text-small">{{ `${t('order.pricingtrade.closepl')}(${enumName(item.goodsid)})` }}</span>
                         <span>{{ formatDecimal(item.closepl) }}</span>
                     </td>
                 </tr>
@@ -60,7 +60,7 @@ import { formatDate, formatDecimal } from '@/filters'
 import { getBuyOrSellName, getBuildTypeName, getOrderhandleStatusName, getGoodsCurrencyItemName } from '@/constants/order'
 import { useRequest } from '@/hooks/request'
 import { queryHisTradeDetail } from '@/services/api/order'
-import { useFuturesStore } from '@/stores'
+import { i18n, useFuturesStore } from '@/stores'
 import AppPullRefresh from '@mobile/components/base/pull-refresh/index.vue'
 
 const props = defineProps({
@@ -73,6 +73,11 @@ const props = defineProps({
 const futuresStore = useFuturesStore()
 const pullRefreshRef = shallowRef()
 const dataList = shallowRef<Model.HisTradeDetailRsp[]>([])
+const { global: { t } } = i18n
+
+const goodsname = (code: string) => {
+    return futuresStore.getI18nGoodsName(code)
+}
 
 const { loading, pageIndex, pageCount, run } = useRequest(queryHisTradeDetail, {
     manual: true,

src/packages/digital/views/contract/components/trade/list/index.vue

@@ -5,7 +5,7 @@
             <thead>
                 <tr>
                     <th>
-                        <span>{{ item.goodscode }}/{{ item.goodsname }}</span>
+                        <span>{{ item.goodscode }}/{{ goodsname(item.goodscode) }}</span>
                         <span class="text-small">
                             {{ formatDate(item.tradetime) }}
                         </span>
@@ -21,31 +21,31 @@
             <tbody>
                 <tr>
                     <td>
-                        <span class="text-small">成交单号</span>
+                        <span class="text-small">{{ $t('order.goodstrade.tradeid') }}</span>
                         <span>{{ item.tradeid }}</span>
                     </td>
                     <td>
-                        <span class="text-small">委托状态</span>
+                        <span class="text-small">{{ $t('order.goodsorder.orderstatus') }}</span>
                         <span>{{ getOrderhandleStatusName(item.status) }}</span>
                     </td>
                 </tr>
                 <tr>
                     <td>
-                        <span class="text-small">成交价格({{ enumName(item.goodsid) }})</span>
+                        <span class="text-small">{{ `${t('order.goodstrade.tradeprice')}(${enumName(item.goodsid)})` }}</span>
                         <span>{{ formatDecimal(item.tradeprice) }}</span>
                     </td>
                     <td>
-                        <span class="text-small">手续费({{ enumName(item.goodsid) }})</span>
+                        <span class="text-small">{{ `${t('order.goodstrade.charge')}(${enumName(item.goodsid)})` }}</span>
                         <span>{{ formatDecimal(item.charge) }}</span>
                     </td>
                 </tr>
                 <tr>
                     <td>
-                        <span class="text-small">成交数量({{ enumName(item.goodsid) }})</span>
+                        <span class="text-small">{{ `${t('order.goodstrade.tradeqty')}(${enumName(item.goodsid)})` }}</span>
                         <span>{{ item.tradeqty }}</span>
                     </td>
                     <td>
-                        <span class="text-small">平仓盈亏({{ enumName(item.goodsid) }})</span>
+                        <span class="text-small">{{ `${t('order.pricingtrade.closepl')}(${enumName(item.goodsid)})` }}</span>
                         <span>{{ formatDecimal(item.closepl) }}</span>
                     </td>
                 </tr>
@@ -60,7 +60,7 @@ import { formatDate, formatDecimal } from '@/filters'
 import { getBuyOrSellName, getBuildTypeName, getGoodsCurrencyItemName, getOrderhandleStatusName } from '@/constants/order'
 import { useRequest } from '@/hooks/request'
 import { queryTradeDetail } from '@/services/api/order'
-import { useFuturesStore } from '@/stores'
+import { i18n, useFuturesStore } from '@/stores'
 import AppPullRefresh from '@mobile/components/base/pull-refresh/index.vue'
 
 const props = defineProps({
@@ -70,10 +70,15 @@ const props = defineProps({
     }
 })
 
+const { global: { t } } = i18n
 const futuresStore = useFuturesStore()
 const pullRefreshRef = shallowRef()
 const dataList = shallowRef<Model.TradeDetailRsp[]>([])
 
+const goodsname = (code: string) => {
+    return futuresStore.getI18nGoodsName(code)
+}
+
 const { loading, pageIndex, pageCount, run } = useRequest(queryTradeDetail, {
     manual: true,
     defaultParams: {

src/packages/digital/views/contract/goods/detail/index.vue

@@ -210,7 +210,7 @@ const formRules: { [key: string]: FieldRule[] } = {
 // 下单
 const onSubmit = () => {
     dialog({
-        message: '确认要提交吗？',
+        message: t('quote.goods.tips1'),
         showCancelButton: true,
     }).then(() => {
         const { marketid = 0, goodsid = 0 } = quote.value ?? {}