Handy_Cao 1 rok pred
rodič
commit
c7baa87e44

+ 26 - 24
public/locales/en-US.json

@@ -110,7 +110,9 @@
         "fiveminutes": "5M",
         "thirtyminutes": "30M",
         "onehour": "1H",
-        "fourhour": "4H"
+        "fourhour": "4H",
+        "timestrade": "Times Trade",
+        "refprice": "Reference Price"
     },
     "account": {
         "title": "Funds Information",
@@ -211,7 +213,7 @@
             "historypresale": "History Presale",
             "presalewin": "Presale Win",
             "issueprice": "IssuePrice",
-            "goodsdetail": "Goods Detail",
+            "goodsdetail": "Goods Details",
             "winningthelottery": "Winning The Lottery",
             "totalqty": "TotalQty:",
             "earnest": "Earnest",
@@ -328,7 +330,7 @@
             "tips3": "Please enter the market maxsub"
         },
         "spot": {
-            "title": "Listing Detail",
+            "title": "Listing Details",
             "attachmenturl": "Image",
             "orderprice": "Order Price",
             "operate": "Operate",
@@ -377,7 +379,7 @@
             "tips14": "Please choice performance template"
         },
         "transfer": {
-            "title1": "Transfer Detail",
+            "title1": "Transfer Details",
             "qty": "Qty",
             "price": "Price",
             "sellname": "SellName",
@@ -407,8 +409,8 @@
         "feeTotal": "Fee Total:",
         "qtyTotal": "Qty Total:",
         "goodsorder": {
-            "title": "Goods Order",
-            "title2": "History Goods Order",
+            "title": "Goods Orders",
+            "title2": "History Goods Orders",
             "subtitle": "Goods Order Information",
             "goodsname": "Name/Code",
             "goodsname1": "GoodsName",
@@ -429,8 +431,8 @@
             "tips3": "Is the confirmation to be revoked?"
         },
         "goodstrade": {
-            "title": "Goods Trade",
-            "title2": "History Goods Trade",
+            "title": "Goods Trades",
+            "title2": "History Goods Trades",
             "subtitle": "Goods Trade Information",
             "goodsname": "Name/Code",
             "goodsname1":"GoodsName",
@@ -562,7 +564,7 @@
             "title": "Swap Trade",
             "subtitle": "Trade Information",
             "subtitle1": "History Swap Trade",
-            "subtitle2": "Swap Trade Detail",
+            "subtitle2": "Swap Trade Details",
             "goodsname": "Name/Code",
             "buyorsell": "BuyOrSell",
             "buildtype": "BuildType",
@@ -579,7 +581,7 @@
         "pricingorder": {
             "title": "Pricing Order",
             "subtitle": "Pricing Order Information",
-            "subtitle1": "Detail",
+            "subtitle1": "Details",
             "goodsname": "Name/Code",
             "ordertime": "OrderTime",
             "orderdate": "OrderDate",
@@ -595,7 +597,7 @@
         "pricingtrade": {
             "title": "Pricing Trade",
             "subtitle": "Pricing Trade Information",
-            "subtitle1": "Detail",
+            "subtitle1": "Details",
             "goodsname": "Name/Code",
             "buyorsell": "BuyOrSell",
             "tradetime": "TradeTime",
@@ -612,7 +614,7 @@
     },
     "position": {
         "title": "My Position",
-        "holddetail": "Hold Detail",
+        "holddetail": "Hold Details",
         "goods": {
             "title": "Order",
             "subtitle": "Position Info",
@@ -653,7 +655,7 @@
             "tips9": "Please enter the shipping address",
             "tips10": "Please enter the delivery information",
             "holddetail": {
-                "title": "Hold Detail",
+                "title": "Hold Details",
                 "marketname":"MarketName",
                 "tradeid":"TradeID",
                 "tradetime": "TradeTime",
@@ -714,7 +716,7 @@
         },
         "presale": {
             "title": "PreSale",
-            "title1": "PreSale Position Detail",
+            "title1": "PreSale Position Details",
             "subtitle": "PreSale Position Info",
             "goodsname": "Name/Code",
             "sellname": "SellName",
@@ -734,7 +736,7 @@
         },
         "transfer": {
             "title": "Transfer",
-            "title1": "Transfer Position Detail",
+            "title1": "Transfer Position Details",
             "subtitle": "Transfer Position Information",
             "goodsname": "Name/Code",
             "buyorsell": "BuyOrSell",
@@ -980,15 +982,15 @@
         "performanceqty": "PerformanceQty",
         "breach": "Breach",
         "modify": "Modify",
-        "detail": "Detail",
+        "detail": "Details",
         "breachapply": "Breach Apply",
         "remark": "Remark",
         "pleaseinputremark": "Please input remark",
-        "applybreach": "ApplyBreach",
+        "applybreach": "Apply Breach",
         "pleaseuploadtheattachment": "Please upload the attachment",
         "areyousureyouwanttoSubmitadefaultapplication?": "Are you sure you want to Submit a default application",
         "thedefaultapplicationissuccessful": "The default application is successful",
-        "performancedetail": "PerformanceDetail",
+        "performancedetail": "Performance Details",
         "pleaseenterthedelaydays": "Please enter the delay days",
         "delaydays": "DelayDays",
         "days": "Days",
@@ -1375,7 +1377,7 @@
         "customername": "UserName",
         "currency": "Currency",
         "tradedate": "ReckonDate",
-        "tradedetail": "TradeDetail",
+        "tradedetail": "Trade Details",
         "inamount": "CashIn",
         "outamount": "CashOut",
         "closepl": "ClosePl",
@@ -1385,11 +1387,11 @@
         "orioutamountfreeze": "OrioutAmountFreeze",
         "avaiableoutmoney": "AvaiableOutCash",
         "ordersumary": "OrderSumary",
-        "inoutamountdetail": "CashInOutDetail",
+        "inoutamountdetail": "CashInOut Details",
         "fundsinfo": "FundsInformation",
         "accountinfo": "AccountInformation",
         "reckondate": "ReckonDate",
-        "reportdetail": "ReportDetail",
+        "reportdetail": "Report Details",
         "balance": "Balance",
         "currentbalance": "CurrentBalance",
         "avaiablemoney": "AvaiableFunds",
@@ -1446,7 +1448,7 @@
             "bottom_goods_position_transfer": "Transfer",
             "bottom_goods_position_delivery16": "Delivery",
             "bottom_goods_position_delivery50": "Delivery",
-            "bottom_goods_detail": "HoldDetail",
+            "bottom_goods_detail": "Hold Details",
             "bottom_goods_order": "Order",
             "bottom_goods_trade": "Trade",
             "bottom_goods_delivery": "Delivery",
@@ -1457,13 +1459,13 @@
             "bottom_presell_transfertrader": "Transfer Trade",
             "bottom_presell_onlinedelivery": "Online Delivery",
             "bottom_spot": "Spot",
-            "bottom_spot_position": "HoldDetail",
+            "bottom_spot_position": "Hold Details",
             "bottom_spot_order": "Order",
             "bottom_spot_trade": "Trade",
             "bottom_spot_pickup": "Pick Up",
             "bottom_pricing": "Pricing & Listing",
             "bottom_pricing_position": "Position",
-            "bottom_pricing_detail": "HoldDetail",
+            "bottom_pricing_detail": "Hold Details",
             "bottom_pricing_order": "Order",
             "bottom_pricing_trade": "Trade",
             "bottom_swap": "Swap Market",

+ 3 - 1
public/locales/zh-CN.json

@@ -111,7 +111,9 @@
         "fiveminutes": "5分钟",
         "thirtyminutes": "30分钟",
         "onehour": "1小时",
-        "fourhour": "4小时"
+        "fourhour": "4小时",
+        "timestrade": "分时成交",
+        "refprice": "参考价格"
     },
     "account": {
         "title": "资金信息",

+ 11 - 7
src/constants/chart.ts

@@ -1,3 +1,7 @@
+import { i18n } from "@/stores"
+
+const { t } = i18n.global
+
 /**
  * 图表周期类型
  */
@@ -31,14 +35,14 @@ export enum ChartSeriesType {
  */
 export function getChartCycleTypeList() {
     return [
-        { label: '分时', value: ChartCycleType.Time },
-        { label: '1分钟', value: ChartCycleType.Minutes },
-        { label: '5分钟', value: ChartCycleType.Minutes5 },
-        { label: '30分钟', value: ChartCycleType.Minutes30 },
-        { label: '60分钟', value: ChartCycleType.Minutes60 },
+        { label: t('chart.time'), value: ChartCycleType.Time },
+        { label: t('chart.oneminutes'), value: ChartCycleType.Minutes },
+        { label: t('chart.fiveminutes'), value: ChartCycleType.Minutes5 },
+        { label: t('chart.thirtyminutes'), value: ChartCycleType.Minutes30 },
+        { label: t('chart.onehour'), value: ChartCycleType.Minutes60 },
         //{ label: '2小时', value: ChartCycleType.Hours2 },
-        { label: '4小时', value: ChartCycleType.Hours4 },
-        { label: '日线', value: ChartCycleType.Day },
+        { label: t('chart.fourhour'), value: ChartCycleType.Hours4 },
+        { label: t('chart.dayline'), value: ChartCycleType.Day },
     ]
 }
 

+ 3 - 2
src/packages/pc/components/modules/quote/tik/index.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="app-quote-tik">
         <div class="app-quote-tik__header">
-            <h4>{{ quoteDay?.marketid != 99201 ? '分时成交' : '参考价格' }}</h4>
+            <h4>{{ quoteDay?.marketid != 99201 ? t('chart.timestrade') : t('chart.refprice') }}</h4>
             <!-- <span>更多</span> -->
         </div>
         <div class="app-quote-tik__body" v-if="quoteDay">
@@ -23,7 +23,7 @@ import { ref } from 'vue'
 import { formatDate, handleNumberValue, handlePriceColor, formatDecimal } from '@/filters'
 import { useRequest } from '@/hooks/request'
 import { queryHistoryTikDatas, queryMarketRun } from '@/services/api/market'
-import { useFuturesStore } from '@/stores'
+import { useFuturesStore, i18n } from '@/stores'
 
 const props = defineProps({
     goodsCode: {
@@ -35,6 +35,7 @@ const props = defineProps({
 const { getGoodsQuote, quoteWatch } = useFuturesStore()
 const quoteDay = getGoodsQuote(props.goodsCode)
 const dataList = ref<Model.HistoryTikDatasRsp[]>([])
+const { t } = i18n.global
 
 const { run: getHistoryTikDatas } = useRequest(queryHistoryTikDatas, {
     manual: true,

+ 1 - 1
src/packages/pc/views/footer/goods/position/index.vue

@@ -57,7 +57,7 @@ const tableColumns = shallowRef<Model.TableColumn[]>([
     { field: 'curholderamount', label: t('position.goods.curholderamount') },
     { field: 'marketValue', label: t('position.goods.marketValue') },
     { field: 'closepl', label: t('position.goods.closepl') },
-    { field: 'operate', label: t('position.goods.closepl'), fixed: 'right', width: 140 },
+    { field: 'operate', label: t('common.operate'), fixed: 'right', width: 140 },
 ])
 
 const handleOperateButtons = (row: Model.TradePositionRsp) => {