Handy_Cao vor 1 Jahr
Ursprung
Commit
eb9dfbf8c9
25 geänderte Dateien mit 214 neuen und 124 gelöschten Zeilen
  1. 54 12
      public/locales/en-US.json
  2. 47 4
      public/locales/zh-CN.json
  3. 7 6
      src/packages/mobile/components/layouts/login/index.vue
  4. 2 3
      src/packages/mobile/views/ballot/detail/components/delisting/index.vue
  5. 14 14
      src/packages/mobile/views/order/list/components/listingorder/detail/Index.vue
  6. 7 7
      src/packages/mobile/views/order/list/components/listingorder/history/Index.vue
  7. 11 9
      src/packages/mobile/views/order/list/components/listingorder/list/Index.vue
  8. 1 1
      src/packages/mobile/views/order/list/components/listingtrade/history/Index.vue
  9. 1 1
      src/packages/mobile/views/order/list/components/listingtrade/list/Index.vue
  10. 1 1
      src/packages/mobile/views/order/list/components/presale/history/index.vue
  11. 1 1
      src/packages/mobile/views/order/list/components/presale/list/Index.vue
  12. 2 2
      src/packages/mobile/views/order/list/components/pricingorder/list/Index.vue
  13. 1 1
      src/packages/mobile/views/order/list/components/pricingtrade/list/Index.vue
  14. 1 1
      src/packages/mobile/views/order/list/components/swaporder/history/Index.vue
  15. 2 2
      src/packages/mobile/views/order/list/components/swaporder/list/Index.vue
  16. 1 1
      src/packages/mobile/views/order/list/components/swaptrade/history/Index.vue
  17. 1 1
      src/packages/mobile/views/order/list/components/swaptrade/list/Index.vue
  18. 1 1
      src/packages/mobile/views/order/list/components/transferorder/history/index.vue
  19. 2 2
      src/packages/mobile/views/order/list/components/transferorder/list/Index.vue
  20. 1 1
      src/packages/mobile/views/order/list/components/transfertrade/history/index.vue
  21. 1 1
      src/packages/mobile/views/order/list/components/transfertrade/list/Index.vue
  22. 10 10
      src/packages/mobile/views/presale/detail/Index.vue
  23. 12 12
      src/packages/mobile/views/presale/detail/components/delisting/index.vue
  24. 18 16
      src/packages/mobile/views/spot/detail/Index.vue
  25. 15 14
      src/packages/mobile/views/spot/detail/components/listing/index.vue

+ 54 - 12
public/locales/en-US.json

@@ -148,8 +148,8 @@
         "ballot": {
             "title": "Subscribe",
             "refprice": "RefPrice",
-            "starttime": "StartTime:",
-            "endtime": "EndTime:",
+            "starttime": "Start:",
+            "endtime": "End:",
             "historypresale": "History Presale",
             "presalewin": "Presale Win",
             "issueprice": "IssuePrice",
@@ -186,11 +186,23 @@
             "taaccount": "TaAccount"
         },
         "presale": {
+            "title": "Goods Details",
+            "bulk": "Bulk Bidding",
+            "earnest": "Earnest",
+            "transferdeposit": "TransferDeposit",
+            "totalqty": "Total Qty:",
+            "buy": "Want to make offer",
             "startprice": "StartPrice",
             "presalehistory": "Pre-sale History",
-            "starttime": "StartTime:",
-            "endtime": "EndTime:",
-            "presalebidding": "Pre-sale Bidding"
+            "starttime": "Start:",
+            "endtime": "End:",
+            "presalebidding": "Pre-sale Bidding",
+            "bidfor": "BidFor",
+            "SubscriptionPrice": "SubscriptionPrice",
+            "avaiableMoney": "Avaiable Funds",
+            "SubscriptionQty": "SubscriptionQty",
+            "tips1": "Please input quantity",
+            "tips2": "Please enter the price"
         },
         "swap": {
             "title": "Listing",
@@ -212,6 +224,28 @@
             "avaiableMoney": "Avaiable Funds",
             "tips1": "Please enter the order qty",
             "tips2": "Please enter the order price"
+        },
+        "spot": {
+            "title": "Listing Detail",
+            "orderprice": "Order Price",
+            "operate": "Operate",
+            "username": "UserName",
+            "orderqty": "OrderQty",
+            "wantbuy": "Want Buy",
+            "wantsell": "Want Sell",
+            "buylisting": "Buy Listing",
+            "selllisting": "Sell Listing",
+            "listingqty": "ListingQty",
+            "paymentamount": "PaymentAmount",
+            "avaiableMoney": "AvaiableFunds",
+            "enableqty": "EnableQty",
+            "listingprice": "ListingPrice",
+            "tips1": "Please select the performance template",
+            "tips2": "Please enter the price",
+            "tips3": "Please select the spot warehouse receipt",
+            "tips4": "Please input quantity",
+            "tips5": "Insufficient amount available",
+            "tips6": "The listing was submitted successfully."
         }
     },
     "order": {
@@ -258,8 +292,11 @@
             "cancelqty": "CancelQty",
             "ordertime": "OrderTime",
             "orderdate": "OrderDate",
+            "orderprice": "OrderPrice",
             "wrtradeorderstatus": "OrderStatus",
-            "wrtradeorderid": "WrTradeOrderID"
+            "wrtradeorderid": "WrTradeOrderID",
+            "tips1": "Is the confirmation to be revoked?",
+            "tips2": "Revocation is successful"
         },
         "listingtrade": {
             "title": "Listing Trade",
@@ -287,8 +324,8 @@
             "presaledepositvalue": "PreSaleDeposit",
             "freezemargin": "freezeMargin",
             "sellname": "SellName",
-            "starttime": "StartTime",
-            "endtime": "EndTime",
+            "starttime": "Start",
+            "endtime": "End",
             "orderstatus": "OrderStatus",
             "ordertime": "OrderTime",
             "tradeprice": "TradePrice",
@@ -415,8 +452,8 @@
             "subtitle": "PreSale Position Info",
             "goodsname": "Name/Code",
             "sellname": "SellName",
-            "starttime": "StartTime",
-            "endtime": "EndTime",
+            "starttime": "Start",
+            "endtime": "End",
             "tradeqty": "TradeQty",
             "openprice": "OpenPrice",
             "tradeamount": "TradeAmount",
@@ -555,7 +592,7 @@
         "buypaidamount": "BuyPaidAmount",
         "sellreceivedamount": "SellReceivedAmount",
         "curstepname": "CurStepName",
-        "starttime": "StartTime",
+        "starttime": "Start",
         "relatedorderid": "RelatedOrderID",
         "performanceplanid": "PerformanceplanID",
         "applyremark": "Remark",
@@ -781,7 +818,12 @@
             "rulesyhkhfxgzs": "《 Notice of user account opening risk 》",
             "checked": "I have read and agree",
             "Pleaseenterausername": "Please enter a user name",
-            "Pleaseenterthepassword": "Please enter the password"
+            "Pleaseenterthepassword": "Please enter the password",
+            "startfailure": "Initialization failure",
+            "loading": "loading...",
+            "tips1": "For the security of your account, please change the password!",
+            "logining": "logining...",
+            "tips2": "Please agree to the terms of use first"
         },
         "register": {
             "title": "User Register",

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

@@ -19,6 +19,7 @@
         "exit": "退出",
         "tryagain": "重试",
         "loading": "正在加载...",
+        "submiting": "提交中...",
         "nomore": "没有更多了",
         "requestfailure": "请求失败,点击重新加载"
     },
@@ -186,11 +187,23 @@
             "taaccount": "交易账户"
         },
         "presale": {
+            "title": "商品详情",
             "startprice": "起拍价",
             "presalehistory": "发售历史",
             "starttime": "开始:",
             "endtime": "结束:",
-            "presalebidding": "预售竞拍"
+            "bulk": "大宗竞拍",
+            "earnest": "预售定金",
+            "transferdeposit": "转让定金",
+            "totalqty": "总量:",
+            "buy": "我要出价",
+            "presalebidding": "预售竞拍",
+            "bidfor": "出价",
+            "SubscriptionPrice": "认购价",
+            "avaiableMoney": "可用资金",
+            "SubscriptionQty": "认购量",
+            "tips1": "请输入数量",
+            "tips2": "请输入价格"
         },
         "swap": {
             "title": "挂牌",
@@ -212,6 +225,28 @@
             "avaiableMoney": "可用资金",
             "tips1": "请输入数量",
             "tips2": "请输入价格"
+        },
+        "spot": {
+            "title": "挂牌详情",
+            "orderprice": "价格",
+            "operate": "操作",
+            "username": "挂牌方",
+            "orderqty": "数量",
+            "wantbuy": "我要买",
+            "wantsell": "我要卖",
+            "buylisting": "买入挂牌",
+            "selllisting": "卖出挂牌",
+            "listingqty": "挂牌量",
+            "paymentamount": "货款金额",
+            "avaiableMoney": "可用资金",
+            "enableqty": "可用量",
+            "listingprice": "挂牌价格",
+            "tips1": "请选择履约模板",
+            "tips2": "请输入价格",
+            "tips3": "请选择现货仓单",
+            "tips4": "请输入数量",
+            "tips5": "可用量不足",
+            "tips6": "挂牌提交成功。"
         }
     },
     "order": {
@@ -252,14 +287,17 @@
             "warehousename": "仓库",
             "wrtradetype": "类型",
             "buyorsell": "方向",
-            "fixedprice": "委托价格",
+            "fixedprice": "挂牌价格",
             "orderqty": "委托量",
             "tradeqty": "成交量",
             "cancelqty": "撤销量",
             "ordertime": "委托时间",
             "orderdate": "委托日期",
+            "orderprice": "委托价格",
             "wrtradeorderstatus": "委托状态",
-            "wrtradeorderid": "委托单号"
+            "wrtradeorderid": "委托单号",
+            "tips1": "确认要撤销吗?",
+            "tips2": "撤销成功"
         },
         "listingtrade": {
             "title": "挂牌成交",
@@ -782,7 +820,12 @@
             "rulesyhkhfxgzs": "《用户开户风险告知书》",
             "checked": "我已阅读并同意",
             "Pleaseenterausername": "请输入用户名",
-            "Pleaseenterthepassword": "请输入密码"
+            "Pleaseenterthepassword": "请输入密码",
+            "startfailure": "初始化失败",
+            "loading": "加载中...",
+            "tips1": "为了您的账户安全,请修改密码!",
+            "logining": "登录中...",
+            "tips2": "请先同意使用条款"
         },
         "register": {
             "title": "用户注册",

+ 7 - 6
src/packages/mobile/components/layouts/login/index.vue

@@ -48,7 +48,7 @@ import { Button, Field, CellGroup, Form, Checkbox, showFailToast, showToast } fr
 import { fullloading, dialog } from '@/utils/vant'
 import { useLogin } from '@/business/login'
 import { useNavigation } from '@mobile/router/navigation'
-import { useGlobalStore } from '@/stores'
+import { useGlobalStore, i18n } from '@/stores'
 import service from '@/services'
 import SliderVerify from '@/components/base/slider-verify/index.vue' // 临时调用,待优化
 import logoImage from '../../../assets/images/login-logo.png'
@@ -64,6 +64,7 @@ defineProps({
   }
 })
 
+const { global: { t } } = i18n
 const globalStore = useGlobalStore()
 const { setGlobalUrlParams, routerTo } = useNavigation()
 const { formData, userLogin } = useLogin()
@@ -81,9 +82,9 @@ const navigationTo = (name: string) => {
       hideLoading()
       routerTo(name)
     }).catch(() => {
-      showFailToast('初始化失败')
+      showFailToast(t('user.login.startfailure'))
     })
-  }, '加载中...')
+  }, t('user.login.loading'))
 }
 
 // 滑块验证 
@@ -102,7 +103,7 @@ const formSubmit = () => {
         userLogin().then((forcedPasswordChange) => {
           hideLoading()
           if (forcedPasswordChange) {
-            dialog('为了您的账户安全,请修改密码!').then(() => {
+            dialog(t('user.login.tips1')).then(() => {
               setGlobalUrlParams({ forcedPasswordChange })
               routerTo('user-password', true)
             })
@@ -119,9 +120,9 @@ const formSubmit = () => {
             showSliderVerify.value = true
           }, 0)
         })
-      }, '登录中...')
+      }, t('user.login.logining'))
     } else {
-      showToast('请先同意使用条款')
+      showToast(t('user.login.tips2'))
     }
   }
 }

+ 2 - 3
src/packages/mobile/views/ballot/detail/components/delisting/index.vue

@@ -39,12 +39,11 @@ import { shallowRef, PropType, onMounted, computed } from 'vue'
 import { Form, Field, Stepper, Button, FieldRule, FormInstance } from 'vant'
 import { fullloading, dialog } from '@/utils/vant'
 import { handleRequestBigNumber } from '@/filters'
-import { useAccountStore } from '@/stores'
+import { useAccountStore, i18n } from '@/stores'
 import { useOrder } from '@/business/trade'
 import AppPopup from '@mobile/components/base/popup/index.vue'
 import { BuyOrSell } from '@/constants/order'
 import { EPriceMode, EValidType } from '@/constants/client'
-import { useI18n } from 'vue-i18n'
 
 const props = defineProps({
     detail: {
@@ -53,7 +52,7 @@ const props = defineProps({
     },
 })
 
-const { t } = useI18n()
+const { global: { t } } = i18n
 const { formData, formSubmit } = useOrder()
 const accountStore = useAccountStore()
 const formRef = shallowRef<FormInstance>()

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

@@ -3,25 +3,25 @@
     <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.listingorder.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.fixedprice)" />
-                    <Cell title="委托量" :value="selectedRow.orderqty" />
-                    <Cell title="成交量" :value="selectedRow.tradeqty" />
-                    <Cell title="撤销量" :value="selectedRow.cancelqty" />
-                    <Cell title="委托时间" :value="formatDate(selectedRow.ordertime)" />
-                    <Cell title="委托状态" :value="getWRTradeOrderStatusName(selectedRow.wrtradeorderstatus)" />
-                    <Cell title="委托单号" :value="selectedRow.wrtradeorderid" />
+                <CellGroup :title="$t('order.listingorder.subtitle')">
+                    <Cell :title="$t('order.listingorder.goodsname')" :value="selectedRow.wrstandardcode + '/' + selectedRow.wrstandardname" />
+                    <Cell :title="$t('order.listingorder.warehousename')" :value="selectedRow.warehousename" />
+                    <Cell :title="$t('order.listingorder.wrtradetype')" :value="getWrTradeTypeName(selectedRow.wrtradetype)" />
+                    <Cell :title="$t('order.listingorder.buyorsell')" :value="getBuyOrSellName(selectedRow.buyorsell)" />
+                    <Cell :title="$t('order.listingorder.orderprice')" :value="formatDecimal(selectedRow.fixedprice)" />
+                    <Cell :title="$t('order.listingorder.orderqty')" :value="selectedRow.orderqty" />
+                    <Cell :title="$t('order.listingorder.tradeqty')" :value="selectedRow.tradeqty" />
+                    <Cell :title="$t('order.listingorder.cancelqty')" :value="selectedRow.cancelqty" />
+                    <Cell :title="$t('order.listingorder.ordertime')" :value="formatDate(selectedRow.ordertime)" />
+                    <Cell :title="$t('order.listingorder.wrtradeorderstatus')" :value="getWRTradeOrderStatusName(selectedRow.wrtradeorderstatus)" />
+                    <Cell :title="$t('order.listingorder.wrtradeorderid')" :value="selectedRow.wrtradeorderid" />
                 </CellGroup>
             </div>
             <template #footer v-if="[3, 7].includes(selectedRow.wrtradeorderstatus)">
-                <Button type="danger" block square @click="onCancelSumit">撤销</Button>
+                <Button type="danger" block square @click="onCancelSumit">{{ $t('operation.cancel2') }}</Button>
             </template>
         </app-view>
     </app-modal>

+ 7 - 7
src/packages/mobile/views/order/list/components/listingorder/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.listingorder.title2')" @back="closed">
                     <template #footer>
                         <app-calendar :default-date="[currentDate]" @confirm="onConfirm" />
                     </template>
@@ -25,29 +25,29 @@
                         <div class="g-order-list__content">
                             <ul>
                                 <li>
-                                    <span>方向</span>
+                                    <span>{{ $t('order.listingorder.buyorsell') }}</span>
                                     <span>{{ getBuyOrSellName(item.buyorsell) }}</span>
                                 </li>
                                 <li>
-                                    <span>挂牌量</span>
+                                    <span>{{ $t('order.listingorder.orderqty') }}</span>
                                     <span>{{ item.orderqty }}</span>
                                 </li>
                                 <li>
-                                    <span>挂牌价格</span>
+                                    <span>{{ $t('order.listingorder.orderprice') }}</span>
                                     <span>{{ formatDecimal(item.fixedprice) }}</span>
                                 </li>
                                 <li>
-                                    <span>成交量</span>
+                                    <span>{{ $t('order.listingorder.tradeqty') }}</span>
                                     <span>{{ item.tradeqty }}</span>
                                 </li>
                                 <li>
-                                    <span>委托日期</span>
+                                    <span>{{ $t('order.listingorder.ordertime') }}</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 - 9
src/packages/mobile/views/order/list/components/listingorder/list/Index.vue

@@ -16,31 +16,31 @@
                 <div class="g-order-list__content">
                     <ul>
                         <li>
-                            <span>方向</span>
+                            <span>{{ $t('order.listingorder.buyorsell') }}</span>
                             <span>{{ getBuyOrSellName(item.buyorsell) }}</span>
                         </li>
                         <li>
-                            <span>挂牌量</span>
+                            <span>{{ $t('order.listingorder.orderqty') }}</span>
                             <span>{{ item.orderqty }}</span>
                         </li>
                         <li>
-                            <span>挂牌价格</span>
+                            <span>{{ $t('order.listingorder.fixedprice') }}</span>
                             <span>{{ formatDecimal(item.fixedprice) }}</span>
                         </li>
                         <li>
-                            <span>成交量</span>
+                            <span>{{ $t('order.listingorder.tradeqty') }}</span>
                             <span>{{ item.tradeqty }}</span>
                         </li>
                         <li>
-                            <span>委托日期</span>
+                            <span>{{ $t('order.listingorder.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].includes(item.wrtradeorderstatus)" @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>
@@ -61,11 +61,13 @@ import { useWrListingCancelOrder } from '@/business/trade'
 import { dialog } from '@/utils/vant'
 import { fullloading } from '@/utils/vant'
 import AppPullRefresh from '@mobile/components/base/pull-refresh/index.vue'
+import { i18n } from '@/stores'
 
 const componentMap = new Map<string, unknown>([
     ['detail', defineAsyncComponent(() => import('../detail/Index.vue'))]
 ])
 
+const { global: { t } } = i18n
 const { cancelSubmit, formData } = useWrListingCancelOrder()
 const dataList = shallowRef<Model.WrOrderDetailRsp[]>([])
 const selectedRow = shallowRef<Model.WrOrderDetailRsp>()
@@ -96,7 +98,7 @@ const { loading, pageIndex, pageCount, run } = useRequest(queryWrOrderDetail, {
 
 const onCancelSumit = (item: Model.WrOrderDetailRsp) => {
     dialog({
-        message: '确认要撤销吗?',
+        message: t('order.listingorder.tips1'),
         showCancelButton: true,
     }).then(() => {
         ///  参数信息
@@ -106,7 +108,7 @@ const onCancelSumit = (item: Model.WrOrderDetailRsp) => {
         /// loding....
         fullloading((hideLoading) => {
             cancelSubmit().then(() => {
-                hideLoading('撤销成功')
+                hideLoading(t('order.listingorder.tips2'))
                 pullRefreshRef.value?.refresh()
             }).catch((err) => {
                 hideLoading(err, 'fail')

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

@@ -44,7 +44,7 @@
                             </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>

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

@@ -34,7 +34,7 @@
                     </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>

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

@@ -62,7 +62,7 @@
                             </ul>
                         </div>
                         <div class="g-order-list__btnbar">
-                            <Button size="small" @click="showComponent(item)" round>详情</Button>
+                            <Button size="small" @click="showComponent(item)" round>{{ $t('operation.details') }}</Button>
                         </div>
                     </div>
                 </div>

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

@@ -53,7 +53,7 @@
                     </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>

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

@@ -38,8 +38,8 @@
                 </div>
                 <div class="g-order-list__btnbar">
                     <Button size="small" v-if="(item.orderstatus === 3 || item.orderstatus === 7)"
-                        @click="onCancelSumit(item)" round>撤销</Button>
-                    <Button size="small" @click="showComponent('detail', item)" round>详情</Button>
+                        @click="onCancelSumit(item)" round>{{ $t('operation.cancel2') }}</Button>
+                    <Button size="small" @click="showComponent('detail', item)" round>{{ $t('operation.details') }}</Button>
                 </div>
             </div>
         </div>

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

@@ -38,7 +38,7 @@
                     </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>

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

@@ -46,7 +46,7 @@
                             </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>

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

@@ -38,8 +38,8 @@
                 </div>
                 <div class="g-order-list__btnbar">
                     <Button size="small" v-if="(item.orderstatus === 3 || item.orderstatus === 7)"
-                        @click="onCancelSumit(item)" round>撤销</Button>
-                    <Button size="small" @click="showComponent('detail', item)" round>详情</Button>
+                        @click="onCancelSumit(item)" round>{{ $t('operation.cancel2') }}</Button>
+                    <Button size="small" @click="showComponent('detail', item)" round>{{ $t('operation.details') }}</Button>
                 </div>
             </div>
         </div>

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

@@ -49,7 +49,7 @@
                             </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>

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

@@ -38,7 +38,7 @@
                     </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>

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

@@ -42,7 +42,7 @@
                             </ul>
                         </div>
                         <div class="g-order-list__btnbar">
-                            <Button size="small" @click="showComponent(item)" round>详情</Button>
+                            <Button size="small" @click="showComponent(item)" round>{{ $t('operation.details') }}</Button>
                         </div>
                     </div>
                 </div>

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

@@ -35,8 +35,8 @@
                 </div>
                 <div class="g-order-list__btnbar">
                     <Button size="small" @click="cancel(item)" v-if="[3, 7, 12].includes(item.orderstatus)"
-                        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>

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

@@ -46,7 +46,7 @@
                             </ul>
                         </div>
                         <div class="g-order-list__btnbar">
-                            <Button size="small" @click="showComponent(item)" round>详情</Button>
+                            <Button size="small" @click="showComponent(item)" round>{{ $t('operation.details') }}</Button>
                         </div>
                     </div>
                 </div>

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

@@ -37,7 +37,7 @@
                     </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>

+ 10 - 10
src/packages/mobile/views/presale/detail/Index.vue

@@ -1,37 +1,37 @@
 <template>
     <app-view class="g-detail">
         <template #header>
-            <app-navbar title="商品详情" />
+            <app-navbar :title="$t('quote.presale.title')" />
         </template>
         <Banner :data-list="detailBanners" />
         <div class="g-detail__buy">
             <div class="topic">
                 <div class="topic-left">
-                    <span class="price-text">起拍价</span>
+                    <span class="price-text">{{ $t('quote.presale.startprice') }}</span>
                     <span class="price-unit">¥</span>
                     <span class="price-integer">{{ detail.startprice?.toFixed(2) }}</span>
                 </div>
                 <div class="topic-right">
-                    <span>开始:{{ detail.starttime }}</span>
-                    <span>结束:{{ detail.endtime }}</span>
+                    <span>{{ $t('quote.presale.starttime') }}{{ detail.starttime }}</span>
+                    <span>{{ $t('quote.presale.endtime') }}{{ detail.endtime }}</span>
                 </div>
             </div>
             <div class="title">
-                <Tag type="danger" round>大宗竞拍</Tag>
+                <Tag type="danger" round>{{ $t('quote.presale.bulk') }}</Tag>
                 <span>{{ detail.sellname }}</span>
                 <span>{{ detail.goodscode }}/{{ detail.goodsname }}</span>
             </div>
             <div class="qty">
-                <span>总量:{{ detail.presaleqty }}</span>
+                <span>{{ $t('quote.presale.totalqty') }}{{ detail.presaleqty }}</span>
             </div>
             <div class="info">
                 <ul>
                     <li>
-                        <span>预售定金</span>
+                        <span>{{ $t('quote.presale.earnest') }}</span>
                         <span>{{ earnest }}</span>
                     </li>
                     <li>
-                        <span>转让定金</span>
+                        <span>{{ $t('quote.presale.transferdeposit') }}</span>
                         <span>{{ parsePercent(detail.transferdepositratio) }}</span>
                     </li>
                 </ul>
@@ -45,12 +45,12 @@
         <template #footer>
             <div class="g-detail__footer" v-if="detail.presalestatus === 2">
                 <div class="price">
-                    <span class="price-text">起拍价:</span>
+                    <span class="price-text">{{ $t('quote.presale.startprice') }}:</span>
                     <span class="price-unit">¥</span>
                     <span class="price-integer">{{ detail.startprice?.toFixed(2) }}</span>
                 </div>
                 <div class="submit">
-                    <span class="submit-button danger" @click="openComponent('delisting')">我要出价</span>
+                    <span class="submit-button danger" @click="openComponent('delisting')">{{ $t('quote.presale.buy') }}</span>
                 </div>
             </div>
             <component ref="componentRef" :is="componentMap.get(componentId)" v-bind="{ detail }" @closed="closeComponent"

+ 12 - 12
src/packages/mobile/views/presale/detail/components/delisting/index.vue

@@ -1,36 +1,36 @@
 <template>
-    <app-popup class="supply-demand-listing" title="出价" v-model:show="showModal" :refresh="refresh">
+    <app-popup class="supply-demand-listing" :title="$t('quote.presale.bidfor')" v-model:show="showModal" :refresh="refresh">
         <Form class="supply-demand-listing__form" ref="formRef" @submit="onSubmit">
-            <Field label="起拍价">
+            <Field :label="$t('quote.presale.startprice')">
                 <template #input>
                     <span>{{ detail.startprice }}</span>
                 </template>
             </Field>
-            <Field name="OrderPrice" :rules="formRules.OrderPrice" label="认购价">
+            <Field name="OrderPrice" :rules="formRules.OrderPrice" :label="$t('quote.presale.SubscriptionPrice')">
                 <template #input>
                     <Stepper v-model="formData.OrderPrice" theme="round" :min="detail.startprice" :decimal-length="quote?.decimalplace" :step="quote?.decimalvalue"
                         :auto-fixed="false" button-size="22" />
                 </template>
             </Field>
-            <Field name="OrderQty" :rules="formRules.OrderQty" label="认购量">
+            <Field name="OrderQty" :rules="formRules.OrderQty" :label="$t('quote.presale.SubscriptionQty')">
                 <template #input>
                     <Stepper v-model="formData.OrderQty" theme="round" :max="detail.presaleqty" button-size="22"
                         :auto-fixed="false" integer />
                 </template>
             </Field>
-            <Field label="预售定金">
+            <Field :label="$t('quote.presale.earnest')">
                 <template #input>
                     <span>{{ earnest }}</span>
                 </template>
             </Field>
-            <Field label="可用资金">
+            <Field :label="$t('quote.presale.avaiableMoney')">
                 <template #input>
                     <span>{{ accountStore.currentAccount.avaiableMoney?.toFixed(2) }}</span>
                 </template>
             </Field>
         </Form>
         <template #footer>
-            <Button type="danger" block round @click="formRef?.submit">提交</Button>
+            <Button type="danger" block round @click="formRef?.submit">{{ $t('operation.submit') }}</Button>
         </template>
     </app-popup>
 </template>
@@ -40,12 +40,11 @@ import { shallowRef, PropType, onMounted, computed } from 'vue'
 import { Form, Field, Stepper, Button, FieldRule, FormInstance } from 'vant'
 import { fullloading, dialog } from '@/utils/vant'
 import { parsePercent, handleRequestBigNumber } from '@/filters'
-import { useAccountStore, useFuturesStore } from '@/stores'
+import { useAccountStore, useFuturesStore, i18n } from '@/stores'
 import { useOrder } from '@/business/trade'
 import AppPopup from '@mobile/components/base/popup/index.vue'
 import { BuyOrSell } from '@/constants/order'
 import { EPriceMode, EValidType } from '@/constants/client'
-//import AppSelect from '@mobile/components/base/select/index.vue'
 
 const props = defineProps({
     detail: {
@@ -54,6 +53,7 @@ const props = defineProps({
     },
 })
 
+const { global: { t } } = i18n
 const { formData, formSubmit } = useOrder()
 const accountStore = useAccountStore()
 const futuresStore = useFuturesStore()
@@ -66,13 +66,13 @@ const quote = futuresStore.getGoodsQuote(props.detail.goodsid)
 // 表单验证规则
 const formRules: { [key in keyof Proto.OrderReq]?: FieldRule[] } = {
     OrderPrice: [{
-        message: '请输入价格',
+        message: t('quote.presale.tips2'),
         validator: () => {
             return !!formData.OrderPrice
         }
     }],
     OrderQty: [{
-        message: '请输入数量',
+        message: t('quote.presale.tips1'),
         validator: () => {
             return !!formData.OrderQty
         }
@@ -110,7 +110,7 @@ const onSubmit = () => {
     fullloading((hideLoading) => {
         formSubmit().then(() => {
             hideLoading()
-            dialog('提交成功').then(() => closed(true))
+            dialog(t('common.submitsuccess')).then(() => closed(true))
         }).catch((err) => {
             hideLoading(err, 'fail')
         })

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

@@ -1,7 +1,7 @@
 <template>
     <app-view class="g-detail">
         <template #header>
-            <app-navbar title="挂牌详情" />
+            <app-navbar :title="$t('quote.spot.title')" />
         </template>
         <Banner :data-list="topBanners" />
         <div class="g-detail__buy" v-if="quoteItem">
@@ -14,19 +14,19 @@
             <div class="info">
                 <ul>
                     <li>
-                        <span>卖价</span>
+                        <span>{{ $t('quote.ask') }}</span>
                         <span>{{ handleNumberValue(quoteItem.sellprice) }}</span>
                     </li>
                     <li>
-                        <span>卖量</span>
+                        <span>{{ $t('quote.askvolume') }}</span>
                         <span>{{ quoteItem.sellqty }}</span>
                     </li>
                     <li>
-                        <span>买价</span>
+                        <span>{{ $t('quote.bid') }}</span>
                         <span>{{ handleNumberValue(quoteItem.buyprice) }}</span>
                     </li>
                     <li>
-                        <span>买量</span>
+                        <span>{{ $t('quote.bidvolume') }}</span>
                         <span>{{ quoteItem.buyqty }}</span>
                     </li>
                 </ul>
@@ -34,7 +34,7 @@
         </div>
         <div class="trade">
             <div class="trade-section sell" v-if="sellList.length">
-                <Cell title="卖出挂牌" />
+                <Cell :title="$t('quote.spot.selllisting')" />
                 <app-list :columns="columns" :data-list="sellList">
                     <template #operate="{ row }">
                         <Button size="small" round @click="delistingListing(row, BuyOrSell.Buy)">{{ $t('quote.buy') }}</Button>
@@ -42,7 +42,7 @@
                 </app-list>
             </div>
             <div class="trade-section buy" v-if="buyList.length">
-                <Cell title="买入挂牌" />
+                <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>
@@ -64,9 +64,9 @@
                 </div> -->
                 <!-- <div class="submit"> -->
                 <Button block type="danger" square class="submit-button danger"
-                    @click="toggleListing(BuyOrSell.Buy)">我要买</Button>
+                    @click="toggleListing(BuyOrSell.Buy)">{{ $t('quote.spot.wantbuy') }}</Button>
                 <Button block color="#199e00" square class="submit-button warning"
-                    @click="toggleListing(BuyOrSell.Sell)">我要卖</Button>
+                    @click="toggleListing(BuyOrSell.Sell)">{{ $t('quote.spot.wantsell') }}</Button>
                 <!-- </div> -->
             </div>
             <component ref="componentRef" :is="componentMap.get(componentId)"
@@ -88,12 +88,14 @@ import eventBus from '@/services/bus'
 import AppList from '@mobile/components/base/list/index.vue'
 import Banner from '@mobile/components/base/banner/index.vue'
 import service from '@/services'
+import { i18n } from "@/stores";
 
 const componentMap = new Map<string, unknown>([
     ['listing', defineAsyncComponent(() => import('./components/listing/index.vue'))], // 挂牌
     ['delisting', defineAsyncComponent(() => import('./components/delisting/index.vue'))], // 摘牌
 ])
 
+const { global: { t } } = i18n
 const { getQueryString } = useNavigation()
 const { componentRef, componentId, openComponent, closeComponent } = useComponent()
 const quoteDetail = shallowRef<Model.OrderQuoteDetailRsp>() // 买卖详情
@@ -125,14 +127,14 @@ const { runAsync: getOrderQuoteDetail } = useRequest(queryOrderQuoteDetail, {
 })
 
 const columns: Model.TableColumn[] = oem != 'zrwyt' ? [
-    { field: 'username', label: '挂牌方' },
-    { field: 'orderqty', label: '数量' },
-    { field: 'fixedprice', label: '价格' },
-    { field: 'operate', label: '操作' },
+    { field: 'username', label: t('quote.spot.username') },
+    { field: 'orderqty', label: t('quote.spot.orderqty') },
+    { field: 'fixedprice', label: t('quote.spot.orderprice') },
+    { field: 'operate', label: t('quote.spot.operate') },
 ] : [
-    { field: 'orderqty', label: '数量' },
-    { field: 'fixedprice', label: '价格' },
-    { field: 'operate', label: '操作' },
+    { field: 'orderqty', label: t('quote.spot.orderqty') },
+    { field: 'fixedprice', label: t('quote.spot.orderprice') },
+    { field: 'operate', label: t('quote.spot.operate') },
 ]
 
 // 商品banner

+ 15 - 14
src/packages/mobile/views/spot/detail/components/listing/index.vue

@@ -1,10 +1,10 @@
 <template>
-    <app-popup class="supply-demand-listing" :title="buyorsell === BuyOrSell.Sell ? '我要卖' : '我要买'"
+    <app-popup class="supply-demand-listing" :title="buyorsell === BuyOrSell.Sell ? $t('quote.spot.wantbuy') : $t('quote.spot.wantsell')"
         v-model:show="showModal" :refresh="refresh">
         <Form class="supply-demand-listing__form" ref="formRef" @submit="onSubmit">
             <Performance ref="performanceRef" tmptype="0,2" name="PerformanceTemplateID"
                 v-model="formData.PerformanceTemplateID" />
-            <Field name="FixedPrice" :rules="formRules.FixedPrice" label="挂牌价格">
+            <Field name="FixedPrice" :rules="formRules.FixedPrice" :label="$t('quote.spot.listingprice')">
                 <template #input>
                     <Stepper v-model="formData.FixedPrice" theme="round" :decimal-length="2" :auto-fixed="false"
                         button-size="22" />
@@ -17,29 +17,29 @@
                         @confirm="onConfirm" />
                 </template>
             </Field> -->
-            <Field label="可用量" v-if="buyorsell === BuyOrSell.Sell">
+            <Field :label="$t('quote.spot.enableqty')" v-if="buyorsell === BuyOrSell.Sell">
                 <template #input>
                     <span>{{ selectedRow?.enableqty ?? 0 }}</span>
                 </template>
             </Field>
-            <Field name="OrderQty" :rules="formRules.OrderQty" label="挂牌量">
+            <Field name="OrderQty" :rules="formRules.OrderQty" :label="$t('quote.spot.listingqty')">
                 <template #input>
                     <Stepper v-model="formData.OrderQty" theme="round" button-size="22" :auto-fixed="false" integer />
                 </template>
             </Field>
-            <Field label="货款金额">
+            <Field :label="$t('quote.spot.paymentamount')">
                 <template #input>
                     <span>{{ amount }}</span>
                 </template>
             </Field>
-            <Field label="可用资金" v-if="buyorsell === BuyOrSell.Buy">
+            <Field :label="$t('quote.spot.avaiableMoney')" v-if="buyorsell === BuyOrSell.Buy">
                 <template #input>
                     <span>{{ accountStore.currentAccount.avaiableMoney?.toFixed(2) }}</span>
                 </template>
             </Field>
         </Form>
         <template #footer>
-            <Button type="danger" block round @click="formRef?.submit">提交</Button>
+            <Button type="danger" block round @click="formRef?.submit">{{ $t('operation.submit') }}</Button>
         </template>
     </app-popup>
 </template>
@@ -49,7 +49,7 @@ import { shallowRef, PropType, onMounted, defineAsyncComponent } from 'vue'
 import { Form, Field, Stepper, Button, FieldRule, FormInstance } from 'vant'
 import { fullloading, dialog } from '@/utils/vant'
 import { handleRequestBigNumber } from '@/filters'
-import { useAccountStore } from '@/stores'
+import { useAccountStore, i18n } from '@/stores'
 import { BuyOrSell } from '@/constants/order'
 import { queryHoldLB } from '@/services/api/order'
 import { useHdWROrder } from '@/business/trade'
@@ -69,6 +69,7 @@ const props = defineProps({
     }
 })
 
+const { global: { t } } = i18n
 const { formData, listingSubmit, amount } = useHdWROrder()
 const accountStore = useAccountStore()
 const formRef = shallowRef<FormInstance>()
@@ -82,32 +83,32 @@ const selectedRow = shallowRef<Model.HoldLBRsp>() //选中的现货仓单
 // 表单验证规则
 const formRules: { [key in keyof Proto.HdWROrderReq]?: FieldRule[] } = {
     PerformanceTemplateID: [{
-        message: '请选择履约模板',
+        message: t('quote.spot.tips1'),
         validator: () => {
             return !!formData.PerformanceTemplateID
         }
     }],
     FixedPrice: [{
-        message: '请输入价格',
+        message: t('quote.spot.tips2'),
         validator: () => {
             return !!formData.FixedPrice
         }
     }],
     WRFactorTypeId: [{
-        message: '请选择现货仓单',
+        message: t('quote.spot.tips3'),
         validator: () => {
             return !!selectedRow.value
         }
     }],
     OrderQty: [{
-        message: '请输入数量',
+        message: t('quote.spot.tips4'),
         validator: (val) => {
             if (val) {
                 const { enableqty = 0 } = selectedRow.value ?? {}
                 if (props.buyorsell === BuyOrSell.Buy || val <= enableqty) {
                     return true
                 }
-                return '可用量不足'
+                return t('quote.spot.tips5')
             }
             return false
         }
@@ -150,7 +151,7 @@ const onSubmit = () => {
     fullloading((hideLoading) => {
         listingSubmit().then(() => {
             hideLoading()
-            dialog('挂牌提交成功。').then(() => closed(true))
+            dialog(t('quote.spot.tips6')).then(() => closed(true))
         }).catch((err) => {
             hideLoading(err, 'fail')
         })