Handy_Cao 1 год назад
Родитель
Сommit
68a31e3b78

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

@@ -325,6 +325,9 @@
         "pricing": {
             "title": "Trade",
             "title1": "Listing & Pricing",
+            "ordercancel": "OrderCancel",
+            "position": "Position",
+            "holdlb": "HoldLB",
             "goods": "Goods",
             "buyorsell": "BuySell",
             "pricemode": "PriceMode",
@@ -825,6 +828,10 @@
             "wrtypename": "WrTypeName",
             "wrtypename1": "UserName/WrstandardName/WarehouseName",
             "pricemove": "PriceMove",
+            "username": "Holder",
+            "needqty": "NeedQty",
+            "enableQty": "EnableQty",
+            "choicewarehousename": "Choice Wrstandard",
             "qty": "Qty",
             "deliveryqty": "DeliveryQty",
             "xdeliveryprice": "XDeliveryPrice",

+ 7 - 0
public/locales/th-TH.json

@@ -326,6 +326,9 @@
         "pricing": {
             "title": "สั่งซื้อสินค้า",
             "title1": "ลดราคา",
+            "ordercancel": "คำสั่ง ที่ได้รับการออก",
+            "position": "สรุปรวมทั้งหมด",
+            "holdlb": "รายละเอียด",
             "goods": "รายการ",
             "buyorsell": "ทิศทาง",
             "pricemode": "โหมด:",
@@ -829,6 +832,10 @@
             "wrtypename": "ชื่อรายการ",
             "wrtypename1": "ผู้ถือ/สินค้า/คลังสินค้า",
             "pricemove": "น้ำเปล่า",
+            "username": "ผู้ถือ",
+            "needqty": "จำเป็นต้องใช้สัญญา",
+            "choicewarehousename": "เลือกสิแฮมสเตอร์",
+            "enableQty": "จำนวนการเติม",
             "qty": "จำนวน",
             "deliveryqty": "จำนวนรายการ",
             "xdeliveryprice": "รายการ",

+ 7 - 0
public/locales/zh-CN.json

@@ -326,6 +326,9 @@
         "pricing": {
             "title": "交易下单",
             "title1": "挂牌点价",
+            "ordercancel": "订单可撤",
+            "position": "持仓汇总",
+            "holdlb": "持仓明细",
             "goods": "商品",
             "buyorsell": "方向",
             "pricemode": "方式",
@@ -829,6 +832,10 @@
             "wrtypename": "商品名称",
             "wrtypename1": "持有人/商品/仓库",
             "pricemove": "升贴水",
+            "username": "持有人",
+            "needqty": "所需合约量",
+            "enableQty": "可交收数量",
+            "choicewarehousename": "点选仓单",
             "qty": "数量",
             "deliveryqty": "交收数量",
             "xdeliveryprice": "订货价",

+ 3 - 2
src/packages/mobile/components/base/pull-refresh/index.vue

@@ -19,6 +19,7 @@
 <script lang="ts" setup>
 import { shallowRef, computed, nextTick, watch } from 'vue'
 import { List, PullRefresh, ListInstance } from 'vant'
+import { i18n } from '@/stores'
 
 const props = defineProps({
     loading: {
@@ -44,11 +45,11 @@ const props = defineProps({
     },
     finishedText: {
         type: String,
-        default: '没有更多了',
+        default: i18n.global.t('common.nomore'),
     },
     errorText: {
         type: String,
-        default: '请求失败,点击重新加载',
+        default: i18n.global.t('common.requestfailure'),
     }
 })
 

+ 8 - 8
src/packages/mobile/components/modules/delivery/index.vue

@@ -10,25 +10,25 @@
                     <slot name="header"></slot>
                 </CellGroup>
                 <CellGroup :title="$t('position.order.subtitle2')" inset>
-                    <Field name="wrstandardname" label="点选仓单" :placeholder="$t('common.choice')" input-align="right"
+                    <Field name="wrstandardname" :label="$t('position.order.choicewarehousename')" :placeholder="$t('common.choice')" input-align="right"
                         :rules="formRules.wrstandardname" v-model="checkedRow.wrstandardname"
                         @click="showWarehouseReceipt = true" is-link readonly />
                     <template v-if="checkedRow.deliverygoodsid">
-                        <Cell title="持有人" :value="checkedRow.username" />
-                        <Cell title="仓库" :value="checkedRow.warehousename" />
-                        <Cell title="数量" :value="checkedRow.avalidqty + (deliveryRelation?.enumdicname ?? '')" />
+                        <Cell :title="$t('delivery.online.username')" :value="checkedRow.username" />
+                        <Cell :title="$t('delivery.online.warehousename')" :value="checkedRow.warehousename" />
+                        <Cell :title="$t('delivery.online.qty')" :value="checkedRow.avalidqty + (deliveryRelation?.enumdicname ?? '')" />
                     </template>
                 </CellGroup>
                 <CellGroup inset>
-                    <Cell title="可交收数量" :value="(total * qtyStep) + (deliveryRelation?.enumdicname ?? '')" />
-                    <Field name="DeliveryQty" type="digit" :rules="formRules.DeliveryQty" label="交收数量">
+                    <Cell :title="$t('position.order.enableQty')" :value="(total * qtyStep) + (deliveryRelation?.enumdicname ?? '')" />
+                    <Field name="DeliveryQty" type="digit" :rules="formRules.DeliveryQty" :label="$t('delivery.online.deliveryqty')">
                         <template #input>
                             <Stepper v-model="formData.DeliveryQty" theme="round" button-size="22" :min="0"
                                 :max="maxQty" :step="qtyStep" integer />
                         </template>
                     </Field>
-                    <Cell title="所需合约量" :value="formData.DeliveryQty ? (formData.DeliveryQty / qtyStep) : 0" />
-                    <Cell title="升贴水" :value="discount.toFixed(2)" />
+                    <Cell :title="$t('position.order.choicewarehousename')" :value="formData.DeliveryQty ? (formData.DeliveryQty / qtyStep) : 0" />
+                    <Cell :title="$t('delivery.online.pricemove')" :value="discount.toFixed(2)" />
                     <slot name="form" :discount="discount" :qty="formData.DeliveryQty ?? 0"></slot>
                 </CellGroup>
             </Form>

+ 1 - 1
src/packages/mobile/views/ballot/list/Index.vue

@@ -26,7 +26,7 @@
                     </div>
                 </template>
             </Waterfall>
-            <Divider>发售历史</Divider>
+            <Divider>{{ $t('quote.ballot.historypresale') }}</Divider>
             <Waterfall class="g-goods-waterfall" :data-list="endList">
                 <template #default="{ item }">
                     <div class="goods" @click="toDetail(item)">

+ 5 - 5
src/packages/mobile/views/pricing/trade/Index.vue

@@ -10,12 +10,12 @@
         <div class="pricing-trade__form" v-if="quote">
             <div class="form-price">
                 <dl>
-                    <dt>买价</dt>
+                    <dt>{{ t('quote.bid') }}</dt>
                     <dd :class="quote.bidColor">{{ handleNumberValue(formatDecimal(quote.ask, quote.decimalplace)) }}
                     </dd>
                 </dl>
                 <dl>
-                    <dt>卖价</dt>
+                    <dt>{{ t('quote.ask') }}</dt>
                     <dd :class="quote.askColor">{{ handleNumberValue(formatDecimal(quote.bid, quote.decimalplace)) }}
                     </dd>
                 </dl>
@@ -202,17 +202,17 @@ const active = shallowRef('position')
 const components = [
     {
         name: 'cancel',
-        title: '订单可撤',
+        title: t('quote.pricing.ordercancel'),
         component: defineAsyncComponent(() => import('../trade/components/cancel/Index.vue')),
     },
     {
         name: 'position',
-        title: '持仓汇总',
+        title: t('quote.pricing.position'),
         component: defineAsyncComponent(() => import('@mobile/views/order/position/components/pricing/list/Index.vue')),
     },
     {
         name: 'holdlb',
-        title: '持仓明细',
+        title: t('quote.pricing.holdlb'),
         component: defineAsyncComponent(() => import('../trade/holdlb/Index.vue')),
     }
 ]

+ 1 - 1
src/packages/mobile/views/pricing/trade/holdlb/Index.vue

@@ -39,7 +39,7 @@
                     </ul>
                 </div>
                 <div class="g-order-list__btnbar" v-if="item.trademode === 10 && item.holderqty">
-                    <Button size="small" @click="callBack(item)" round>平仓</Button>
+                    <Button size="small" @click="callBack(item)" round>{{ $t('operation.close') }}</Button>
                 </div>
             </div>
         </div>

+ 4 - 1
src/packages/pc/views/market/trade/presell/ballot/index.vue

@@ -25,6 +25,7 @@ import { useRequest } from '@/hooks/request'
 import { useDataFilter } from '@/hooks/datatable'
 import { getWRPresaleStatusList, getWRPresaleStatusName } from '@/constants/order'
 import { queryPresaleAuctions } from '@/services/api/presale'
+import { i18n } from "@/stores"
 import AppTable from '@pc/components/base/table/index.vue'
 import AppFilter from '@pc/components/base/table-filter/index.vue'
 
@@ -36,6 +37,8 @@ const { filterOptons, getQueryParams } = useDataFilter<Model.PresaleAuctionsReq>
 const { componentRef, componentId, openComponent, closeComponent } = useComponent(() => run(), false)
 const selectedRow = shallowRef<Model.PresaleAuctionsRsp>()
 
+const { t } = i18n.global
+
 const { dataList, run, loading } = useRequest(queryPresaleAuctions, {
     params: {
         presalemode: 5,
@@ -63,7 +66,7 @@ filterOptons.selectList = [
 ]
 
 filterOptons.buttonList = [
-    { lable: '查询', className: 'el-button--info', onClick: () => onSearch() }
+    { lable: t('operation.search'), className: 'el-button--info', onClick: () => onSearch() }
 ]
 
 const onSearch = (clear = false) => {

+ 4 - 1
src/packages/pc/views/market/trade/presell/bidding/index.vue

@@ -25,6 +25,7 @@ import { useRequest } from '@/hooks/request'
 import { useDataFilter } from '@/hooks/datatable'
 import { getWRPresaleStatusList, getWRPresaleStatusName } from '@/constants/order'
 import { queryPresaleAuctions } from '@/services/api/presale'
+import { i18n } from "@/stores"
 import AppTable from '@pc/components/base/table/index.vue'
 import AppFilter from '@pc/components/base/table-filter/index.vue'
 
@@ -35,6 +36,8 @@ const componentMap = new Map<string, unknown>([
 const { filterOptons, getQueryParams } = useDataFilter<Model.PresaleAuctionsReq>()
 const { componentRef, componentId, openComponent, closeComponent } = useComponent(() => run(), false)
 const selectedRow = shallowRef<Model.PresaleAuctionsRsp>()
+    
+const { t } = i18n.global
 
 const { dataList, run, loading } = useRequest(queryPresaleAuctions, {
     params: {
@@ -63,7 +66,7 @@ filterOptons.selectList = [
 ]
 
 filterOptons.buttonList = [
-    { lable: '查询', className: 'el-button--info', onClick: () => onSearch() }
+    { lable: t('operation.search'), className: 'el-button--info', onClick: () => onSearch() }
 ]
 
 const onSearch = (clear = false) => {