Handy_Cao 2 weeks ago
parent
commit
26d0e91704

+ 9 - 4
public/locales/en-US.json

@@ -244,7 +244,7 @@
         "sellusername": "Seller",
         "bid": "BidPrice",
         "ask": "SellPrice",
-        "selllprice": "SellPrice",
+        "sellprice": "SellPrice",
         "time": "Time",
         "vol": "Current volume",
         "holdvolume": "Hold Volume",
@@ -262,7 +262,7 @@
         "ordersell": "O-Sell",
         "transfersell": "T-Sell",
         "buy": "Buy",
-        "selll": "Sell",
+        "sell": "Sell",
         "bidlisting": "Bid orders",
         "asklisting": "Ask orders",
         "bid1": "Bid1",
@@ -426,7 +426,7 @@
             "wantbuy": "I want to buy",
             "wantsell": "I want to sell",
             "buylisting": "Buy Listing",
-            "selllisting": "Sell Listing",
+            "sellisting": "Sell Listing",
             "listingqty": "Listing amount",
             "paymentamount": "Payment amount",
             "avaiableMoney": "Available funds",
@@ -1860,6 +1860,11 @@
         "sp": "TP",
         "sl": "SL",
         "quoteprice": "QuotePrice",
-        "contractdetails": "Contract Details"
+        "contractdetails": "Contract Details",
+        "available": "Avaiable",
+        "tips1": "Please select the currency",
+        "tips2" : "Please enter the quantity",
+        "transfer1": "Contracts To Spots" ,
+        "transfer2": "Spots To Contracts" 
     }
 }

+ 9 - 4
public/locales/th-TH.json

@@ -244,7 +244,7 @@
         "sellusername": "ผู้ขาย",
         "bid": "ซื้อ",
         "ask": "ขาย",
-        "selllprice": "ราคาขาย",
+        "sellprice": "ราคาขาย",
         "time": "เวลา",
         "vol": "ปริมาณปัจจุบัน",
         "holdvolume": "ปริมาณคงค้าง",
@@ -262,7 +262,7 @@
         "ordersell": "สร้างคำสั่งขาย",
         "transfersell": "ขายโดยการโอน",
         "buy": "ซื้อ",
-        "selll": "ขาย",
+        "sell": "ขาย",
         "bidlisting": "ขึ้นทะเบียนซื้อ",
         "asklisting": "ขึ้นทะเบียนซื้อขาย",
         "bid1": "ราคาเสนอซื้อ 1",
@@ -428,7 +428,7 @@
             "wantbuy": "ฉันต้องการซื้อ",
             "wantsell": "ฉันต้องการขาย",
             "buylisting": "จดทะเบียนการซื้อ",
-            "selllisting": "จดทะเบียนการขาย",
+            "sellisting": "จดทะเบียนการขาย",
             "listingqty": "ปริมาณการจดทะเบียนรายการ",
             "paymentamount": "ยอดเงินค่าสินค้า",
             "avaiableMoney": "เงินทุนที่พร้อมใช้",
@@ -1863,6 +1863,11 @@
         "sp": "TP",
         "sl": "SL",
         "quoteprice": "ราคาตลาด",
-        "contractdetails": "Contract Details"
+        "contractdetails": "Contract Details",
+        "available": "Avaiable",
+        "tips1": "请选择币种",
+        "tips2" : "请输入数量",
+        "transfer1": "从 合约 到 现货" ,
+        "transfer2": "从 现货 到 合约" 
     }
 }

+ 9 - 4
public/locales/vi-VN.json

@@ -244,7 +244,7 @@
         "sellusername": "Bên bán",
         "bid": "BidPrice",
         "ask": "SellPrice",
-        "selllprice": "SellPrice",
+        "sellprice": "SellPrice",
         "time": "Thời gian",
         "vol": "Lượng hiện tại",
         "holdvolume": "Hold Volume",
@@ -262,7 +262,7 @@
         "ordersell": "O-Sell",
         "transfersell": "T-Sell",
         "buy": "Buy",
-        "selll": "Sell",
+        "sell": "Sell",
         "bidlisting": "Niêm yết mua",
         "asklisting": "Niêm yết bán",
         "bid1": "Mua 1",
@@ -426,7 +426,7 @@
             "wantbuy": "Tôi muốn mua",
             "wantsell": "Tôi muốn bán",
             "buylisting": "Niêm yết mua",
-            "selllisting": "Niêm yết bán",
+            "sellisting": "Niêm yết bán",
             "listingqty": "Lượng niêm yết",
             "paymentamount": "Số tiền hàng hóa",
             "avaiableMoney": "Vốn khả dụng",
@@ -1860,6 +1860,11 @@
         "sp": "Chốt lời",
         "sl": "Cắt lỗ",
         "quoteprice": "Giá thị trường",
-        "contractdetails": "Contract Details"
+        "contractdetails": "Contract Details",
+        "available": "Avaiable",
+        "tips1": "请选择币种",
+        "tips2" : "请输入数量",
+        "transfer1": "从 合约 到 现货" ,
+        "transfer2": "从 现货 到 合约" 
     }
 }

+ 9 - 4
public/locales/zh-CN.json

@@ -244,7 +244,7 @@
         "sellusername": "销售方",
         "bid": "买价",
         "ask": "卖价",
-        "selllprice": "销售价",
+        "sellprice": "销售价",
         "time": "时间",
         "vol": "现量",
         "holdvolume": "持仓量",
@@ -262,7 +262,7 @@
         "ordersell": "订立卖出",
         "transfersell": "转让卖出",
         "buy": "买入",
-        "selll": "卖出",
+        "sell": "卖出",
         "bidlisting": "买挂牌",
         "asklisting": "卖挂牌",
         "bid1": "买一",
@@ -428,7 +428,7 @@
             "wantbuy": "我要买",
             "wantsell": "我要卖",
             "buylisting": "买入挂牌",
-            "selllisting": "卖出挂牌",
+            "sellisting": "卖出挂牌",
             "listingqty": "挂牌量",
             "paymentamount": "货款金额",
             "avaiableMoney": "可用资金",
@@ -1863,6 +1863,11 @@
         "sp": "止盈",
         "sl": "止损",
         "quoteprice": "行情价格",
-        "contractdetails": "合约明细"
+        "contractdetails": "合约明细",
+        "available": "可用",
+        "tips1": "请选择币种",
+        "tips2" : "请输入数量",
+        "transfer1": "从 合约 到 现货" ,
+        "transfer2": "從 現貨 到 合約" 
     }
 }

+ 10 - 4
public/locales/zh-TW.json

@@ -244,7 +244,7 @@
         "sellusername": "銷售方",
         "bid": "買價",
         "ask": "賣價",
-        "selllprice": "銷售價",
+        "sellprice": "銷售價",
         "time": "時間",
         "vol": "現量",
         "holdvolume": "持倉量",
@@ -262,7 +262,7 @@
         "ordersell": "訂立賣出",
         "transfersell": "轉讓賣出",
         "buy": "買入",
-        "selll": "賣出",
+        "sell": "賣出",
         "bidlisting": "買掛牌",
         "asklisting": "賣掛牌",
         "bid1": "買一",
@@ -428,7 +428,7 @@
             "wantbuy": "我要買",
             "wantsell": "我要賣",
             "buylisting": "買入掛牌",
-            "selllisting": "賣出掛牌",
+            "sellisting": "賣出掛牌",
             "listingqty": "掛牌量",
             "paymentamount": "貨款金額",
             "avaiableMoney": "可用資金",
@@ -1863,6 +1863,12 @@
         "sp": "止盈",
         "sl": "止損",
         "quoteprice": "行情價格",
-        "contractdetails": "合約明細"
+        "contractdetails": "合約明細",
+        "available": "可用",
+        "tips1": "请选择币种",
+        "tips2" : "请输入数量",
+        "transfer1": "從 合約 到 現貨" ,
+        "transfer2": "Spots To Contracts" 
+
     }
 }

+ 2 - 2
src/constants/order.ts

@@ -74,8 +74,8 @@ export enum BillResult {
  */
 export function getBuyOrSellList(type = 0) {
     return [
-        { label: type ? '开多' : i18n.global.t('quote.buy'), value: BuyOrSell.Buy },
-        { label: type ? '开空' : i18n.global.t('quote.selll'), value: BuyOrSell.Sell },
+        { label: type ? i18n.global.t('digital.buy') : i18n.global.t('quote.buy'), value: BuyOrSell.Buy },
+        { label: type ? i18n.global.t('digital.sell') : i18n.global.t('quote.sell'), value: BuyOrSell.Sell },
     ]
 }
 

+ 11 - 11
src/packages/digital/views/wallet/transfer/index.vue

@@ -6,15 +6,15 @@
         </template>
         <div class="switch-group">
             <span :class="{ active: formData.DigitalTransferType === 3 }" @click="formData.DigitalTransferType = 3">
-                从 合约 到 现货
+                {{ $t('digital.transfer1') }}
             </span>
             <span :class="{ active: formData.DigitalTransferType === 4 }" @click="formData.DigitalTransferType = 4">
-                从 现货 到 合约
+                {{ $t('digital.transfer2') }}
             </span>
         </div>
         <Form ref="formRef" class="g-form__container" @submit="onSubmit">
             <CellGroup inset>
-                <Field name="CurrencyID" label="币种" label-align="top" :rules="formRules.CurrencyID"
+                <Field name="CurrencyID" :label="t('banksign.currency')" label-align="top" :rules="formRules.CurrencyID"
                     arrow-direction="down" is-link>
                     <template #input>
                         <app-select v-model="formData.CurrencyID" :options="currencyOptions" />
@@ -22,10 +22,10 @@
                 </Field>
             </CellGroup>
             <CellGroup inset>
-                <Cell title="数量"
-                    :value="`可用 (${formatDecimal(contractAccount?.avaiableBalance ?? 0, contractAccount?.currencydecimalplace)})`"
+                <Cell :title="t('mine.setting.qty')"
+                    :value="`${ t('digital.available')} (${formatDecimal(contractAccount?.avaiableBalance ?? 0, contractAccount?.currencydecimalplace)})`"
                     v-if="formData.DigitalTransferType === 3" />
-                <Cell title="数量" :value="`可用 (${spotBalance})`" v-if="formData.DigitalTransferType === 4" />
+                <Cell :title="t('mine.setting.qty')" :value="`${ t('digital.available')} (${spotBalance})`" v-if="formData.DigitalTransferType === 4" />
                 <Field name="Amount" label-align="top" :rules="formRules.Amount">
                     <template #input>
                         <app-stepper v-model="formData.Amount" :min="0" />
@@ -34,8 +34,8 @@
             </CellGroup>
         </Form>
         <div class="g-form__footer inset">
-            <Button block @click="routerBack">取消</Button>
-            <Button type="primary" block @click="formRef?.submit">划转</Button>
+            <Button block @click="routerBack">{{ $t('operation.cancel') }}</Button>
+            <Button type="primary" block @click="formRef?.submit">{{ $t('digital.wallet-transfer') }}</Button>
         </div>
     </app-view>
 </template>
@@ -108,11 +108,11 @@ const contractAccount = computed(() => accountStore.getAccountItem({
 // 表单验证规则
 const formRules: { [key: string]: FieldRule[] } = {
     CurrencyID: [{
-        message: '请选择币种',
+        message: t('digital.tips1'),
         validator: () => !!formData.CurrencyID
     }],
     Amount: [{
-        message: '请输入数量',
+        message: t('digital.tips2'),
         validator: () => !!formData.Amount
     }],
 }
@@ -125,7 +125,7 @@ const onSubmit = () => {
                 AccountID: contractAccount.value?.accountid
             }
         }).then(() => {
-            hideLoading('提交成功', 'success')
+            hideLoading(t('common.submitsuccess'), 'success')
             routerBack()
         }).catch((err) => {
             hideLoading(err, 'fail')

+ 1 - 1
src/packages/mobile/views/goods/detail/Index.vue

@@ -10,7 +10,7 @@
         <template #footer>
             <div class="g-form__footer">
                 <Button block type="danger" square @click="onListing(BuyOrSell.Buy)">{{ $t('quote.buy') }}</Button>
-                <Button block color="#199e00" square @click="onListing(BuyOrSell.Sell)">{{ $t('quote.selll') }}</Button>
+                <Button block color="#199e00" square @click="onListing(BuyOrSell.Sell)">{{ $t('quote.sell') }}</Button>
             </div>
             <component ref="componentRef" :is="componentMap.get(componentId)" v-bind="{ goodsCode, buyOrSell }"
                 @closed="closeComponent" v-if="componentId" />

+ 1 - 1
src/packages/mobile/views/goods/detail/components/listing/Index.vue

@@ -13,7 +13,7 @@
                         <template #input>
                             <RadioGroup v-model="direction" direction="horizontal">
                                 <Radio :name="0">{{ $t('quote.buy') }}</Radio>
-                                <Radio :name="1">{{ $t('quote.selll') }}</Radio>
+                                <Radio :name="1">{{ $t('quote.sell') }}</Radio>
                             </RadioGroup>
                         </template>
                     </Field>

+ 1 - 1
src/packages/mobile/views/goods/trade/index.vue

@@ -22,7 +22,7 @@
                     <template #operate="{ row, index }">
                         <Button size="small" type="primary" v-if="index === 0" round @click="onDelisting(row)"
                             style="width: 50px;">
-                            {{ tabIndex === BuyOrSell.Buy ? $t('quote.selll') : $t('quote.buy') }}
+                            {{ tabIndex === BuyOrSell.Buy ? $t('quote.sell') : $t('quote.buy') }}
                         </Button>
                     </template>
                 </app-list>

+ 1 - 1
src/packages/mobile/views/order/position/components/spot/listing/Index.vue

@@ -33,7 +33,7 @@
             </Form>
             <template #footer>
                 <div class="g-form__footer inset">
-                    <Button block square type="danger" @click="formRef?.submit">{{ $t('quote.selll') }}</Button>
+                    <Button block square type="danger" @click="formRef?.submit">{{ $t('quote.sell') }}</Button>
                 </div>
             </template>
         </app-view>

+ 2 - 2
src/packages/mobile/views/spot/detail/Index.vue

@@ -34,7 +34,7 @@
         </div>
         <div class="trade">
             <div class="trade-section sell" v-if="sellList.length">
-                <Cell :title="$t('quote.spot.selllisting')" />
+                <Cell :title="$t('quote.spot.sellisting')" />
                 <app-list :columns="columns" :data-list="sellList">
                     <template #operate="{ row }">
                         <Button size="small" round @click="delistingListing(row, BuyOrSell.Buy)">{{ $t('quote.buy') }}</Button>
@@ -45,7 +45,7 @@
                 <Cell :title="$t('quote.spot.buylisting')" />
                 <app-list :columns="columns" :data-list="buyList">
                     <template #operate="{ row }">
-                        <Button size="small" round @click="delistingListing(row, BuyOrSell.Sell)">{{ $t('quote.selll') }}</Button>
+                        <Button size="small" round @click="delistingListing(row, BuyOrSell.Sell)">{{ $t('quote.sell') }}</Button>
                     </template>
                 </app-list>
             </div>

+ 1 - 1
src/packages/mobile/views/spot/detail/components/delisting/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <app-popup class="supply-demand-listing" :title="buyorsell === BuyOrSell.Sell ? $t('quote.selll') : $t('quote.buy')"
+    <app-popup class="supply-demand-listing" :title="buyorsell === BuyOrSell.Sell ? $t('quote.sell') : $t('quote.buy')"
         v-model:show="showModal" :refresh="refresh">
         <Form class="supply-demand-listing__form" ref="formRef" @submit="onSubmit">
             <Field :label="$t('quote.spot.performancetemplate')">

+ 1 - 1
src/packages/mobile/views/swap/detail/components/delisting/Index.vue

@@ -90,7 +90,7 @@
         </Form>
         <template #footer>
             <Button type="danger" block round @click="formRef?.submit">
-                {{ selectedRow.buyorsell === 0 ? $t('quote.selll') : $t('quote.buy') }}
+                {{ selectedRow.buyorsell === 0 ? $t('quote.sell') : $t('quote.buy') }}
             </Button>
         </template>
     </app-popup>

+ 1 - 1
src/packages/mobile/views/transfer/detail2/index.vue

@@ -14,7 +14,7 @@
         <template #footer>
             <div class="g-form__footer">
                 <Button block type="danger" square @click="showComponent(BuyOrSell.Buy)">{{ $t('quote.buy') }}</Button>
-                <Button block color="#199e00" square @click="showComponent(BuyOrSell.Sell)">{{ $t('quote.selll') }}</Button>
+                <Button block color="#199e00" square @click="showComponent(BuyOrSell.Sell)">{{ $t('quote.sell') }}</Button>
             </div>
             <component ref="componentRef" :is="componentMap.get(componentId)" v-bind="{ goodsCode, buyOrSell }"
                 @closed="closeComponent" v-if="componentId" />

+ 1 - 1
src/packages/pc/components/modules/quote/forex/index.vue

@@ -134,7 +134,7 @@ const sellList = computed(() => {
         if (item) {
             const result = [
                 {
-                    label: t('quote.selllprice'),
+                    label: t('quote.sellprice'),
                     price: item.ask,
                     qty: item.askvolume,
                     color: item.askColor,

+ 1 - 1
src/packages/pc/views/market/trade/mall/index.vue

@@ -9,7 +9,7 @@
                 </h3>
                 <section @click="onRowClick(item)">
                     <dl>
-                        <dt>{{ t('quote.selllprice') }}</dt>
+                        <dt>{{ t('quote.sellprice') }}</dt>
                         <dd :class="item.askColor">{{ handleNumberValue(formatDecimal(item.ask, item.decimalplace)) }}
                         </dd>
                     </dl>

+ 1 - 1
src/packages/pc/views/market/trade/swap/detail/order/delisting/index.vue

@@ -64,7 +64,7 @@
         <template #footer>
             <el-button type="info" @click="onCancel(false)">{{ t('operation.cancel') }}</el-button>
             <el-button type="danger" :disabled="!formData.OrderQty || formData.OrderQty > selectedRow.orderqty"
-                @click="onSubmit(EBuildType.BUILDTYPE_OPEN)">{{ selectedRow.buyorsell === 0 ? t('quote.selll') :
+                @click="onSubmit(EBuildType.BUILDTYPE_OPEN)">{{ selectedRow.buyorsell === 0 ? t('quote.sell') :
                     t('quote.buy') }}</el-button>
         </template>
     </app-drawer>

+ 1 - 1
src/packages/qdhs/views/goods/detail/index.vue

@@ -22,7 +22,7 @@
                 <Button type="danger" :disabled="selectedIndex < 0" @click="onListing(BuyOrSell.Buy)" square
                     block>{{ $t('quote.buy') }}</Button>
                 <Button type="primary" :disabled="selectedIndex < 0" @click="onListing(BuyOrSell.Sell)" square
-                    block>{{ $t('quote.selll') }}</Button>
+                    block>{{ $t('quote.sell') }}</Button>
             </div>
             <component ref="componentRef" :is="componentMap.get(componentId)" v-bind="{ goodsCode, buyOrSell }"
                 @closed="closeComponent" v-if="componentId" />