Handy_Cao 1 年之前
父節點
當前提交
5c22e9732a

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

@@ -1,5 +1,603 @@
 {
     "app": {
         "name": "Muchinfo"
+    },
+    "common": {
+        "more": "More",
+        "details": "Details",
+        "placeholder": "Please enter",
+        "loadingfailed": "Loading failed",
+        "required": "Required",
+        "logout": "Log out",
+        "save": "Save",
+        "tips": "Tips"
+    },
+    "tabbar": {
+        "home": "Home",
+        "mine": "Mine"
+    },
+    "routes": {
+        "news": "News",
+        "notice": "Notices",
+        "capital": "FUnds",
+        "sign": "Bank Sign",
+        "profile": "Profiles",
+        "setting": "Settings",
+        "about": "About Us",
+        "modifypwd": "Modify Password",
+        "usercancel": "Cancellation Service"
+    },
+    "operation": {
+        "submit": "Submit",
+        "confirm": "Confirm",
+        "delete": "Delete",
+        "save": "Save",
+        "cancel": "Cancel",
+        "cancel2": "Undo",
+        "transfer": "Transfer",
+        "delivery": "Delivery",
+        "listing": "Listing",
+        "pickup": "Pick Up",
+        "details": "Details",
+        "deposit": "补足定金",
+        "deposit2": "追加定金",
+        "close": "平仓",
+        "default": "Breach",
+        "default2": "ApplyBreach",
+        "modify": "Modify",
+        "modify2": "Modify Info",
+        "extension": "延期申请",
+        "execution": "立即执行",
+        "payment": "Payment",
+        "disagree": "Disagree",
+        "agree": "Agree"
+    },
+    "chart": {
+        "time": "Time",
+        "minutes": "Minutes",
+        "dayline": "Day",
+        "weekline": "Week",
+        "monthline": "Month",
+        "yearline": "Year",
+        "oneminutes": "1M",
+        "fiveminutes": "5M",
+        "thirtyminutes": "30M",
+        "onehour": "1H",
+        "fourhour": "4H"
+    },
+    "account": {
+        "title": "Funds Information",
+        "account": "Account Code",
+        "accountid": "Account ID",
+        "balance": "Balance",
+        "balance2": "Balance Funds",
+        "currentbalance": "Current Balance",
+        "freezeMargin": "FreezeMargin",
+        "freezeMargin2": "FreezeMargin Funds",
+        "availableFunds": "Available",
+        "availableFunds2": "Available Funds",
+        "netWorth": "NetWorth",
+        "usedMargin": "UsedMargin",
+        "usedMargin2": "UsedMargin Funds",
+        "profitLoss": "Profit Loss",
+        "inamount": "Today Cash In",
+        "outamount": "Today Cash Out",
+        "closepl": "Today Close Pl",
+        "paycharge": "Pay Charge",
+        "tradestatus": "Trade Status",
+        "riskRate": "Risk Rate"
+    },
+    "quote": {
+        "goodsname": "Name/Code",
+        "averageprice": "Average",
+        "last": "last",
+        "rise": "Up Down",
+        "change": "Change",
+        "opened": "Opened",
+        "presettle": "Presettle",
+        "lowest": "Lowest",
+        "highest": "Highest",
+        "amplitude": "Amplitude",
+        "limitup": "LimitUp",
+        "limitdown": "LimitDown",
+        "bidvolume": "BidVolume",
+        "askvolume": "AskVolume",
+        "bid": "BidPrice",
+        "ask": "AskPrice",
+        "totalvolume": "Total Volume",
+        "totalturnover": "Total Turnover",
+        "buyhall": "Buy Hall",
+        "sellhall": "Sell Hall",
+        "buysellhall": "Buy Sell Hall",
+        "buy": "Buy",
+        "selll": "Sell",
+        "bid1": "Bid1",
+        "bid2": "Bid2",
+        "bid3": "Bid3",
+        "bid4": "Bid4",
+        "bid5": "Bid5",
+        "ask1": "Ask1",
+        "ask2": "Ask2",
+        "ask3": "Ask3",
+        "ask4": "Ask4",
+        "ask5": "Ask5"
+    },
+    "order": {
+        "title": "My Orders",
+        "goodsorder": {
+            "title": "Goods Order",
+            "title2": "History Goods Order",
+            "subtitle": "Goods Order Information",
+            "goodsname": "name/code",
+            "buyorsell": "direction",
+            "buildtype": "buildtype",
+            "orderqty": "orderqty",
+            "orderprice": "orderprice",
+            "tradeqty": "tradeqty",
+            "orderstatus": "orderstatus",
+            "ordertime": "ordertime",
+            "orderid": "orderid"
+        },
+        "goodstrade": {
+            "title": "Goods Trade",
+            "title2": "History Goods Trade",
+            "subtitle": "Goods Trade Information",
+            "goodsname": "name/code",
+            "buyorsell": "direction",
+            "buildtype": "buildtype",
+            "tradeqty": "tradeqty",
+            "tradeprice": "tradeprice",
+            "charge": "charge",
+            "closepl": "closepl",
+            "tradetime": "tradetime",
+            "tradeid": "tradeid"
+        },
+        "listingorder": {
+            "title": "Listing Order",
+            "title2": "History Listing Order",
+            "subtitle": "Listing Order Information",
+            "goodsname": "name/code",
+            "warehousename": "warehouse",
+            "wrtradetype": "wrtradetype",
+            "buyorsell": "direction",
+            "fixedprice": "fixedprice",
+            "orderqty": "orderqty",
+            "tradeqty": "tradeqty",
+            "cancelqty": "cancelqty",
+            "ordertime": "ordertime",
+            "wrtradeorderstatus": "orderstatus",
+            "wrtradeorderid": "orderid"
+        },
+        "listingtrade": {
+            "title": "Listing Trade",
+            "title2": "History Listing Trade",
+            "subtitle": "Listing Trade Information",
+            "goodsname": "name/code",
+            "warehousename": "warehouse",
+            "wrtradetype": "wrtradetype",
+            "buyorsell": "direction",
+            "tradeprice": "tradeprice",
+            "tradeqty": "tradeqty",
+            "tradeamount": "tradeamount",
+            "tradetime": "tradetime",
+            "matchusername": "matchusername",
+            "wrtradedetailid": "wrtradedetailid"
+        },
+        "presale": {
+            "title": "Presale Subscription",
+            "subtitle": "Presale Subscription Information",
+            "goodsname": "name/code",
+            "orderqty": "orderqty",
+            "orderprice": "orderprice",
+            "orderamount": "orderamount",
+            "presaledepositalgorithm": "presaledepositalgorithm",
+            "presaledepositvalue": "presaledeposit",
+            "freezemargin": "freezemargin",
+            "sellname": "sellname",
+            "starttime": "starttime",
+            "endtime": "endtime",
+            "orderstatus": "orderstatus",
+            "ordertime": "ordertime",
+            "tradeprice": "tradeprice",
+            "tradeqty": "tradeqty",
+            "orderid": "orderid"
+        },
+        "transferorder": {
+            "title": "Transfer Order",
+            "subtitle": "Transfer Order Information",
+            "goodsname": "name/code",
+            "orderqty": "orderqty",
+            "orderprice": "orderprice",
+            "presaleprice": "presaleprice",
+            "tradeqty": "tradeqty",
+            "orderstatus": "orderstatus",
+            "ordertime": "ordertime",
+            "orderid": "orderid"
+        },
+        "transfertrade": {
+            "title": "Transfer Trade",
+            "subtitle": "Transfer Trade Information",
+            "goodsname": "name/code",
+            "buyorsell": "direction",
+            "tradeqty": "tradeqty",
+            "tradeprice": "tradeprice",
+            "presaleprice": "presaleprice",
+            "closepl": "closepl",
+            "accountname": "accountname",
+            "tradetime": "tradetime",
+            "orderid": "orderid"
+        },
+        "swaporder": {
+            "title": "Swap Order",
+            "subtitle": "Order Information",
+            "goodsname": "name/code",
+            "buyorsell": "direction",
+            "orderqty": "orderqty",
+            "orderprice": "orderprice",
+            "tradeqty": "tradeqty",
+            "orderstatus": "orderstatus",
+            "ordertime": "ordertime",
+            "orderid": "orderid"
+        },
+        "swaptrade": {
+            "title": "Swap Trade",
+            "subtitle": "Trade Information",
+            "goodsname": "name/code",
+            "buyorsell": "direction",
+            "buildtype": "buildtype",
+            "tradeqty": "tradeqty",
+            "tradeprice": "tradeprice",
+            "tradeamount": "tradeamount",
+            "charge": "charge",
+            "closepl": "closepl",
+            "matchaccountid": "matchaccountid",
+            "tradetime": "tradetime",
+            "tradeid": "tradeid"
+        }
+    },
+    "position": {
+        "title": "My Position",
+        "holddetail": "Hold Detail",
+        "order": {
+            "title": "Order Position",
+            "subtitle": "Position Info",
+            "subtitle2": "Delivery Info",
+            "subtitle3": "Transfer Info",
+            "goodsname": "Name/Code",
+            "buyorsell": "Direction",
+            "curholderamount": "CurHolderAmount",
+            "curpositionqty": "CurPositionQty",
+            "averageprice": "AveragePrice",
+            "frozenqty": "FrozenQty",
+            "enableqty": "EnableQty",
+            "mindeliverylot": "MinDeliveryLot",
+            "closepl": "ClosePl",
+            "last": "Last",
+            "orderqty": "TransferQty",
+            "matchname": "MatchName",
+            "deliverylot": "DeliveryLot",
+            "deliveryqty": "DeliveryQty",
+            "address": "Address",
+            "transferprice": "Price",
+            "qty": "Qty"
+        },
+        "spot": {
+            "title": "Spot Position",
+            "subtitle": "Spot Position Info",
+            "subtitle2": "Listing Info",
+            "goodsname": "Name/Code",
+            "warehousename": "Warehouse",
+            "qty": "StockQty",
+            "freezerqty": "FreezerQty",
+            "enableqty": "EnableQty",
+            "orderqty": "OrderQty",
+            "fixedprice": "OrderPrice",
+            "performancetemplate": "Performance Template",
+            "orderqty2": "提货数量",
+            "appointmentmodel": "提货方式",
+            "contactname": "联系人",
+            "contactnum": "联系方式",
+            "district": "收货地区",
+            "address": "收货地址",
+            "remark": "发票信息"
+        },
+        "presale": {
+            "title": "预售持仓",
+            "subtitle": "预售持仓信息",
+            "goodsname": "name/code",
+            "sellname": "发售方",
+            "starttime": "开始日期",
+            "endtime": "结束日期",
+            "tradeqty": "认购量",
+            "openprice": "预售价",
+            "tradeamount": "总货款",
+            "transferdepositratio": "转让定金比例",
+            "transferdeposit": "转让定金",
+            "depositremain": "未付定金",
+            "paystatus": "支付状态",
+            "tradeid": "orderid"
+        },
+        "transfer": {
+            "title": "Transfer Position",
+            "subtitle": "Transfer Position Information",
+            "goodsname": "name/code",
+            "buycurholderamount": "buycurholderamount",
+            "buycurpositionqty": "buycurpositionqty",
+            "buyfrozenqty": "buyfrozenqty",
+            "enableqty": "enableqty",
+            "sellname": "sellname",
+            "presaleprice": "presaleprice",
+            "tradeamount": "tradeamount",
+            "transferdepositratio": "transferdepositratio",
+            "transferdeposit": "transferdeposit",
+            "depositremain": "depositremain",
+            "paystatus": "paystatus",
+            "lasttradedate": "lasttradedate"
+        },
+        "swap": {
+            "title": "Swap Position",
+            "averageprice": "averageprice",
+            "curpositionqty": "curpositionqty",
+            "curholderamount": "curholderamount",
+            "frozenqty": "frozenqty",
+            "lastprice": "lastprice",
+            "enableqty": "enableqty",
+            "closepl": "closepl",
+            "expiredate": "expiredate"
+        }
+    },
+    "delivery": {
+        "title": "Delivery Pick Up",
+        "online": {
+            "title": "Online Order",
+            "title2": "History Online Order",
+            "subtitle": "Online Order Information",
+            "wrtypename": "wrtypename",
+            "deliveryqty": "deliveryqty",
+            "xdeliveryprice": "xdeliveryprice",
+            "deliverypricemove": "deliverypricemove",
+            "deliveryamount": "deliveryamount",
+            "xgoodsremainamount": "xgoodsremainamount",
+            "deliverytotalamount": "deliverytotalamount",
+            "remaintotalamount": "remaintotalamount",
+            "warehousename": "warehousename",
+            "matchusername": "matchusername",
+            "deliverytime": "deliverytime",
+            "xgoodscode": "xgoodscode",
+            "deliveryid": "orderid"
+        },
+        "offline": {
+            "title": "Offline Order",
+            "subtitle": "Offline Order Information",
+            "goodsname": "name/code",
+            "buyorselldisplay": "direction",
+            "deliveryqty": "deliveryqty",
+            "deliveryprice": "deliveryprice",
+            "deliveryamount": "deliveryamount",
+            "matchusername": "matchusername",
+            "deliveryinfo": "deliveryinfo",
+            "reqtime": "reqtime",
+            "orderstatusdisplay": "orderstatus",
+            "deliveryorderid": "orderid"
+        },
+        "spot": {
+            "title": "Spot Order",
+            "subtitle": "Pick Up Information",
+            "goodsname": "name/code",
+            "warehousename": "warehouse",
+            "qty": "qty",
+            "appointmentmodeldisplay": "deliveryway",
+            "contactname": "username",
+            "contactnum": "mobile",
+            "address": "address",
+            "appointmentremark": "appointment",
+            "applytime": "applytime",
+            "applystatus": "applystatus",
+            "applyid": "orderid"
+        }
+    },
+    "transfer": {
+        "title": "Transfer Positions",
+        "in": {
+            "title": "My Transfer In",
+            "outusername": "OutUserName",
+            "qty": "Qty",
+            "transferprice": "TransferPrice",
+            "freezedays": "FreezeDays",
+            "goodscurprice": "GoodsCurPrice",
+            "incharge": "InCharge"
+        },
+        "out": {
+            "title": "My Transfer Out",
+            "inusername": "InUserName",
+            "qty": "Qty",
+            "transferprice": "TransferPrice",
+            "freezedays": "FreezeDays",
+            "goodscurprice": "GoodsCurPrice",
+            "outcharge": "OutCharge"
+        }
+    },
+    "performance": {
+        "title": "Performance",
+        "title2": "History Buy Performance",
+        "title3": "History Sell Performance",
+        "subtitle": "Execut Information",
+        "buy": "Buy Performance",
+        "sell": "Sell Performance",
+        "performancetype": "Type",
+        "wrstandardname": "WrstandardName",
+        "warehousename": "Warehouse",
+        "qty": "Qty",
+        "amount": "Amount",
+        "buyusername": "BuyUserName",
+        "sellusername": "SellUserName",
+        "buypaidamount": "BuyPaidAmount",
+        "sellreceivedamount": "SellReceivedAmount",
+        "curstepname": "CurStepName",
+        "starttime": "StartTime",
+        "relatedorderid": "RelatedOrderID",
+        "performanceplanid": "PerformanceplanID",
+        "applyremark": "Remark",
+        "attachment": "Attachment",
+        "contract": "Contract",
+        "receive": "Receive",
+        "receipt": "Receipt",
+        "more": "More",
+        "performancedate": "Date",
+        "performanceqty": "PerformanceQty",
+        "breach": "Breach",
+        "modify": "Modify",
+        "detail": "Detail",
+        "breachapply": "BreachApply",
+        "remark": "Remark",
+        "pleaseinputremark": "Please input remark",
+        "applybreach": "ApplyBreach",
+        "pleaseuploadtheattachment": "Please upload the attachment",
+        "areyousureyouwanttoSubmitadefaultapplication?": "Are you sure you want to Submit a default application",
+        "thedefaultapplicationissuccessful": "The default application is successful",
+        "performancedetail": "PerformanceDetail",
+        "pleaseenterthedelaydays": "Please enter the delay days",
+        "delaydays": "DelayDays",
+        "days": "Days",
+        "executinfo": "ExecutInfo",
+        "applydelay": "ApplyDelay",
+        "applyexecute": "ApplyExecute",
+        "receiptinfo": "ReceiptInfo",
+        "address": "Address",
+        "pleaseentertheaddress": "Please enter the address",
+        "pleaseenterthecontractinfo": "Please enter the contract info",
+        "buyuserinfo": "BuyUserInfo",
+        "selluserinfo": "SellUserInfo",
+        "modifyinfo": "ModifyInfo",
+        "buyhisperformanceinfo": "Buy History Performance",
+        "sellhisperformanceinfo": "Sell History Performance"
+    },
+    "settlement":{
+        "title": "Settlement Order"
+    },
+    "rules": {
+        "zcxy": "User Registration Agreement",
+        "yszc": "About Privacy",
+        "ryszc": "Privacy Policy",
+        "fwrx": "Service Hotline",
+        "zrxy": "Transfer Policy"
+    },
+    "mine": {
+        "title": "Mine",
+        "normal": "normal",
+        "balance": "Balance",
+        "netWorth": "NetWorth",
+        "freezeMargin": "FreezeMargin",
+        "usedMargin": "UsedMargin",
+        "availableFunds": "Available",
+        "riskRate": "RiskRate",
+        "cashin": "Cash In",
+        "cashout": "Cash Out",
+        "myposition": "My Positions",
+        "myorder": "My Orders",
+        "delivery": "Pick Up",
+        "performance": "Performance",
+        "fundsinfo": "Funds Information",
+        "authentication": "Authentication",
+        "banksign": "Bank Management",
+        "personalinformation": "Personal Information",
+        "settings": "Settings",
+        "aboutus": "About Us",
+        "protocol": "Agreements",
+        "positiontransfer": "Transfer",
+        "profile": {
+            "title": "Personal Information",
+            "invoiceinfo": "Invoice Information",
+            "addressinfo": "Address Information",
+            "wechat": "Wechat",
+            "email": "Email"
+        },
+        "address": {
+            "title": "Address Management",
+            "add": "Add",
+            "default": "Default",
+            "detail": "Details",
+            "phoneNum": "Mobile",
+            "receiverName": "UserName",
+            "region": "Region",
+            "modifyaddressinfo": "Modify",
+            "addaddressinfo": "Add Address"
+        }
+    },
+    "banksign": {
+        "title": "Bank Management",
+        "bankname": "BankName",
+        "bankaccountname": "AccountName",
+        "mobilephone": "Mobile",
+        "branchbankname": "Branch BankName",
+        "remark": "Remark",
+        "signstatus": "SignStatus",
+        "signagain": "SignAgain",
+        "cancel": "Cancel",
+        "modify": "Modify",
+        "add": "Add",
+        "youhavenotaddedasignedaccount": "You have not added a signed account",
+        "fundstype": "fundstype",
+        "pleasechoicefundstype": "Please choice funds type",
+        "time": "time",
+        "operatetype": "operatetype",
+        "amount": "amount",
+        "bankaccountno": "BankAccountNo",
+        "capital": {
+            "title": "Funds",
+            "hisamountlogs": "Historys"
+        },
+        "wallet": {
+            "title": "Cash In Out",
+            "applys": "Applys",
+            "cashin": "Cash In",
+            "cashout": "Cash Out"
+        }
+    },
+    "user": {
+        "password": {
+            "title": "Modify Password",
+            "newpwd": "New Pwd",
+            "confirmpwd": "Conform Pwd",
+            "oldpwd": "Old Pwd"
+        },
+        "cancel": {
+            "title": "Cancel Service",
+            "confirmcancellation": "Confirm cancellation",
+            "submitmessage": "After the account is cancelled, the system can no longer be used. If the account has a balance, it needs manual review to cancel the account. Are you sure to cancel the account?",
+            "tips_1": "In order to ensure the security of your account, the following conditions must be met when submitting the application for cancellation:",
+            "tips_2": "1. The account property has been settled",
+            "tips_3": "No assets, arrears, unsettled funds and spot.",
+            "tips_4": "2. The account is secure",
+            "tips_5": "The account is in normal use and there is no risk of theft.",
+            "tips_6": "3. There is no dispute over the account number"
+        }
+    },
+    "report": {
+        "title": "Dealer Statement",
+        "accountid": "AccouuntCode",
+        "customername": "UserName",
+        "currency": "Currency",
+        "tradedate": "Reckon Date",
+        "tradedetail": "Trade Detail",
+        "inamount": "Cash In",
+        "outamount": "Cash Out",
+        "closepl": "Close Pl",
+        "reckonpl": "Reckon Pl",
+        "paycharge": "Pay Charge",
+        "oriusedmargin": "Oriused Margin",
+        "orioutamountfreeze": "Oriout Amount Freeze",
+        "avaiableoutmoney": "Avaiable Out Cash",
+        "ordersumary": "Order Sumary",
+        "inoutamountdetail": "Cash In Out Detail",
+        "fundsinfo": "Funds Information",
+        "accountinfo": "Account Information",
+        "reckondate": "Reckon Date",
+        "reportdetail": "Report Detail"
+    },
+    "notices": {
+        "title": "Notice Announcement",
+        "notice": "Notice", 
+        "announcement": "Announcement"
     }
 }

+ 20 - 8
public/locales/zh-CN.json

@@ -8,7 +8,9 @@
         "placeholder": "请输入",
         "loadingfailed": "加载失败",
         "required": "必填",
-        "logout": "退出登录"
+        "logout": "退出登录",
+        "save": "保存",
+        "tips": "提示"
     },
     "tabbar": {
         "home": "首页",
@@ -85,10 +87,6 @@
         "tradestatus": "状态",
         "riskRate": "风险率"
     },
-    "bank": {
-        "recharge": "入金",
-        "withdrawal": "出金"
-    },
     "quote": {
         "goodsname": "商品/代码",
         "averageprice": "均价",
@@ -259,6 +257,7 @@
     },
     "position": {
         "title": "我的持仓",
+        "holddetail": "明细",
         "order": {
             "title": "订单持仓",
             "subtitle": "持仓信息",
@@ -278,7 +277,9 @@
             "matchname": "交收对手方",
             "deliverylot": "交收量",
             "deliveryqty": "交收数量",
-            "address": "收货地址"
+            "address": "收货地址",
+            "transferprice": "转让价格",
+            "qty": "转让量"
         },
         "spot": {
             "title": "现货持仓",
@@ -545,6 +546,12 @@
         "capital": {
             "title": "资金",
             "hisamountlogs": "历史资金流水"
+        },
+        "wallet": {
+            "title": "出入金",
+            "applys": "申请记录",
+            "cashin": "入金",
+            "cashout": "出金"
         }
     },
     "user": {
@@ -572,7 +579,7 @@
         "customername": "名称",
         "currency": "币种",
         "tradedate": "结算日期",
-        "tradedetail": "成交明细",
+        "tradedetail": "TradeDetail",
         "inamount": "银行入金",
         "outamount": "银行出金",
         "closepl": "转让损益",
@@ -586,6 +593,11 @@
         "fundsinfo": "资金信息",
         "accountinfo": "账户信息",
         "reckondate": "结算日期",
-        "reportdetail": "报表明细"
+        "reportdetail": "ReportDetail"
+    },
+    "notices": {
+        "title": "通知公告",
+        "notice": "通知", 
+        "announcement": "公告"
     }
 }

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

@@ -3,13 +3,13 @@
     <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('operation.delivery')" @back="closed" />
             </template>
             <Form ref="formRef" class="g-form__container" @submit="onSubmit">
-                <CellGroup title="持仓信息" inset v-if="$slots.header">
+                <CellGroup :title="$t('position.order.subtitle')" inset v-if="$slots.header">
                     <slot name="header"></slot>
                 </CellGroup>
-                <CellGroup title="交收信息" inset>
+                <CellGroup :title="$t('position.order.subtitle2')" inset>
                     <Field name="wrstandardname" label="点选仓单" placeholder="请选择" input-align="right"
                         :rules="formRules.wrstandardname" v-model="checkedRow.wrstandardname"
                         @click="showWarehouseReceipt = true" is-link readonly />
@@ -33,7 +33,9 @@
                 </CellGroup>
             </Form>
             <template #footer>
-                <Button block square type="danger" @click="formRef?.submit">提交</Button>
+                <div class="g-form__footer inset">
+                    <Button block square type="danger" @click="formRef?.submit">{{ $t('operation.delivery') }}</Button>
+                </div>
             </template>
         </app-view>
         <component :is="WarehouseReceipt" v-model:show="showWarehouseReceipt" :goods-id="goodsId" @change="onChange" />

+ 4 - 4
src/packages/mobile/views/bank/wallet/Index.vue

@@ -1,19 +1,19 @@
 <template>
     <app-view>
         <template #header>
-            <app-navbar title="出入金" >
+            <app-navbar :title="$t('banksign.wallet.title')" >
                 <template #right>
                     <div class="button-more" @click="openComponent('inoutapply')">
-                        <span>申请记录</span>
+                        <span>{{ $t('banksign.wallet.applys') }}</span>
                     </div>
                 </template>
             </app-navbar>
         </template>
         <Tabs v-model:active="active">
-            <Tab title="入金">
+            <Tab :title="$t('banksign.wallet.cashin')">
                 <app-deposit />
             </Tab>
-            <Tab title="出金">
+            <Tab :title="$t('banksign.wallet.cashout')">
                 <app-withdraw />
             </Tab>
         </Tabs>

+ 2 - 2
src/packages/mobile/views/bank/wallet/components/deposit/Index.vue

@@ -38,7 +38,7 @@
                 </div>
             </div>
             <CellGroup inset v-if="msg_324">
-                <Cell title="提示">
+                <Cell :title="$t('common.tips')">
                     <template #label>
                         <p v-html="msg_324" />
                     </template>
@@ -47,7 +47,7 @@
         </Form>
         <template #footer v-if="cusBank?.caninamount === 1">
             <div class="g-form__footer inset">
-                <Button round block type="danger" @click="formRef?.submit()">确定</Button>
+                <Button round block type="danger" @click="formRef?.submit()">{{ $t('operation.confirm') }}</Button>
             </div>
         </template>
     </app-view>

+ 3 - 3
src/packages/mobile/views/home/main/Index.vue

@@ -6,9 +6,9 @@
     <Banner :data-list="topBanners" />
     <PullRefresh class="home-main__container" v-model="refreshing" @refresh="onRefresh">
       <app-block>
-        <Cell value="更多" :to="{ name: 'notice-list' }" icon="volume" is-link>
+        <Cell :value="$t('common.more')" :to="{ name: 'notice-list' }" icon="volume" is-link>
           <template #title>
-            <Badge :offset="[10, 8]" :dot="noticeStore.unreadList.length > 0">通知公告</Badge>
+            <Badge :offset="[10, 8]" :dot="noticeStore.unreadList.length > 0">{{ $t('routes.notice') }}</Badge>
           </template>
         </Cell>
       </app-block>
@@ -26,7 +26,7 @@
       </app-block>
       <app-block class="home-main__news">
         <CellGroup class="article">
-          <Cell class="home-main__titlebar" title="市场资讯" value="更多" icon="fire" :to="{ name: 'news-list' }" is-link />
+          <Cell class="home-main__titlebar" :title="$t('routes.news')" :value="$t('common.more')" icon="fire" :to="{ name: 'news-list' }" is-link />
           <template v-for="(item, index) in newsList" :key="index">
             <Cell class="article-item" :title="item.title" :value="formatDate(item.publishdate, 'MM/DD')"
               :to="{ name: 'news-detail', query: { id: item.id } }" />

+ 0 - 2
src/packages/mobile/views/market/list/Index.vue

@@ -98,8 +98,6 @@ const subscribe = quoteSocket.createSubscribe()
 
 const columns: Model.TableColumn[] = [
     { field: 'goodsname', label: '商品/代码' },
-    // { field: 'ask', label: '卖价' },
-    // { field: 'bid', label: '买价' },
     { field: 'last', label: '最新价' },
     { field: 'rise', label: '涨跌' },
     { field: 'change', label: '幅度' },

+ 2 - 2
src/packages/mobile/views/mine/address/components/edit/Index.vue

@@ -12,9 +12,9 @@
                 <Form ref="formRef" class="g-form__container" @submit="formSubmit">
                     <CellGroup inset>
                         <Field v-model="formData.ReceiverName" :rules="formRules.ReceiverName" name="ReceiverName"
-                            :label="$t('common.receiverName')" :placeholder="$t('common.required')" />
+                            :label="$t('mine.address.receiverName')" :placeholder="$t('common.required')" />
                         <Field v-model="formData.PhoneNum" :rules="formRules.PhoneNum" type="tel" name="PhoneNum"
-                            :label="$t('common.phoneNum')" :placeholder="$t('common.required')" />
+                            :label="$t('mine.address.phoneNum')" :placeholder="$t('common.required')" />
                         <Field :rules="formRules.Region" name="Region" :label="$t('mine.address.region')" is-link v-if="!animation">
                             <template #input>
                                 <component :is="AppRegion" v-model="formData.DistrictID" :label="regionName"

+ 3 - 3
src/packages/mobile/views/notice/list/index.vue

@@ -1,11 +1,11 @@
 <template>
     <app-view>
         <template #header>
-            <app-navbar title="公告通知">
+            <app-navbar :title="$t('notices.title')">
                 <template #footer>
                     <Tabs v-model:active="active" @change="onTabChange">
-                        <Tab title="公告" :name="1" />
-                        <Tab title="通知" :name="2" />
+                        <Tab :title="$t('notices.notice')" :name="1" />
+                        <Tab :title="$t('notices.announcement')" :name="2" />
                     </Tabs>
                 </template>
             </app-navbar>

+ 2 - 2
src/packages/mobile/views/order/position/Index.vue

@@ -1,10 +1,10 @@
 <template>
     <app-view>
         <template #header>
-            <app-navbar title="我的持仓">
+            <app-navbar :title="$t('position.title')">
                 <template #right v-if="selectedComponent.detail">
                     <div class="button-more" @click="openComponent(selectedComponent.name)">
-                        <span>明细</span>
+                        <span>{{ $t('position.holddetail')}}</span>
                     </div>
                 </template>
             </app-navbar>

+ 17 - 15
src/packages/mobile/views/order/position/components/goods/close/Index.vue

@@ -3,18 +3,18 @@
     <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('operation.transfer')" @back="closed" />
             </template>
             <Form ref="formRef" class="g-form__container" @submit="onCloseSumit">
-                <CellGroup title="持仓信息" inset>
-                    <Cell title="商品代码/名称" :value="`${selectedRow.goodscode}/${selectedRow.goodsname}`" />
-                    <Cell title="持仓方向" :value="getBuyOrSellName(selectedRow.buyorsell)" />
-                    <Cell title="持仓金额" :value="formatDecimal(selectedRow.curholderamount)" />
-                    <Cell title="持仓量" :value="selectedRow.curpositionqty" />
-                    <Cell title="冻结量" :value="selectedRow.frozenqty" />
-                    <Cell title="可用量" :value="selectedRow.enableqty" />
-                    <Cell title="持仓均价" :value="selectedRow.averageprice" />
-                    <Cell title="参考损益">
+                <CellGroup :title="$t('position.order.subtitle')" inset>
+                    <Cell :title="$t('position.order.goodsname')" :value="`${selectedRow.goodscode}/${selectedRow.goodsname}`" />
+                    <Cell :title="$t('position.order.buyorsell')" :value="getBuyOrSellName(selectedRow.buyorsell)" />
+                    <Cell :title="$t('position.order.curholderamount')" :value="formatDecimal(selectedRow.curholderamount)" />
+                    <Cell :title="$t('position.order.curpositionqty')" :value="selectedRow.curpositionqty" />
+                    <Cell :title="$t('position.order.frozenqty')" :value="selectedRow.frozenqty" />
+                    <Cell :title="$t('position.order.enableqty')" :value="selectedRow.enableqty" />
+                    <Cell :title="$t('position.order.averageprice')" :value="selectedRow.averageprice" />
+                    <Cell :title="$t('position.order.closepl')">
                         <template #value>
                             <span :class="selectedRow.closeplColor">
                                 {{ formatDecimal(selectedRow.closepl, selectedRow.decimalplace) }}
@@ -22,15 +22,15 @@
                         </template>
                     </Cell>
                 </CellGroup>
-                <CellGroup title="转让信息" inset>
-                    <Cell title="当前价" :value="handleNumberValue(quote?.last)" />
-                    <Field name="OrderPrice" :rules="formRules.OrderPrice" label="转让价格">
+                <CellGroup :title="$t('position.order.subtitle3')" inset>
+                    <Cell :title="$t('position.order.last')" :value="handleNumberValue(quote?.last)" />
+                    <Field name="OrderPrice" :rules="formRules.OrderPrice" :label="$t('position.order.transferprice')">
                         <template #input>
                             <Stepper v-model="formData.OrderPrice" theme="round" button-size="22" :min="0"
                                 :decimal-length="quote?.decimalplace" :step="quote?.decimalvalue" :auto-fixed="false" />
                         </template>
                     </Field>
-                    <Field name="OrderQty" :rules="formRules.OrderQty" label="转让量">
+                    <Field name="OrderQty" :rules="formRules.OrderQty" :label="$t('position.order.qty')">
                         <template #input>
                             <div class="g-qty-group">
                                 <div class="g-qty-group__stepper">
@@ -47,7 +47,9 @@
                 </CellGroup>
             </Form>
             <template #footer>
-                <Button block square type="danger" @click="formRef?.submit">转让</Button>
+                <div class="g-form__footer inset">
+                    <Button block square type="danger" @click="formRef?.submit">{{ $t('operation.transfer') }}</Button>
+                </div>
             </template>
         </app-view>
     </app-modal>

+ 3 - 1
src/packages/mobile/views/order/position/components/goods/delivery50/index.vue

@@ -44,7 +44,9 @@
             </Form>
             <app-contact v-model:show="showContact" @change="contactChange" />
             <template #footer>
-                <Button block square type="danger" @click="formRef?.submit">提交</Button>
+                <div class="g-form__footer inset">
+                    <Button block square type="danger" @click="formRef?.submit">{{ $t('operation.delivery') }}</Button>
+                </div>
             </template>
         </app-view>
     </app-modal>

+ 8 - 8
src/packages/mobile/views/order/position/components/goods/list/Index.vue

@@ -16,27 +16,27 @@
                 <div class="g-order-list__content">
                     <ul>
                         <li>
-                            <span>持有量</span>
+                            <span>{{ $t('position.order.curpositionqty') }}</span>
                             <span>{{ item.curpositionqty }}</span>
                         </li>
                         <li>
-                            <span>持仓均价</span>
+                            <span>{{ $t('position.order.averageprice') }}</span>
                             <span>{{ handleNumberValue(item.averageprice) }}</span>
                         </li>
                         <li>
-                            <span>冻结量</span>
+                            <span>{{ $t('position.order.frozenqty') }}</span>
                             <span>{{ item.frozenqty }}</span>
                         </li>
                         <li>
-                            <span>持仓金额</span>
+                            <span>{{ $t('position.order.curholderamount') }}</span>
                             <span>{{ formatDecimal(item.curholderamount) }}</span>
                         </li>
                         <li>
-                            <span>可用量</span>
+                            <span>{{ $t('position.order.enableqty') }}</span>
                             <span>{{ item.enableqty }}</span>
                         </li>
                         <li>
-                            <span>参考损益</span>
+                            <span>{{ $t('position.order.closepl') }}</span>
                             <span :class="item.closeplColor">
                                 {{ formatDecimal(item.closepl, item.decimalplace) }}
                             </span>
@@ -44,9 +44,9 @@
                     </ul>
                 </div>
                 <div class="g-order-list__btnbar" v-if="item.enableqty">
-                    <Button size="small" @click="showComponent('close', item)" round>转让</Button>
+                    <Button size="small" @click="showComponent('close', item)" round>{{ $t('operation.transfer') }}</Button>
                     <Button size="small" @click="showComponent(item.trademode === 16 ? 'delivery16' : 'delivery50', item)"
-                        round v-if="showDelivery(item)">交收</Button>
+                        round v-if="showDelivery(item)">{{ $t('operation.delivery') }}</Button>
                 </div>
             </div>
         </div>

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

@@ -15,7 +15,7 @@
                 <div class="g-order-list__content">
                     <ul>
                         <li>
-                            <span>认购量</span>
+                            <span>{{ $t('position.presale.tradeqty') }}</span>
                             <span>{{ item.tradeqty }}</span>
                         </li>
                         <li>

+ 5 - 5
src/packages/mobile/views/order/position/components/spot/list/Index.vue

@@ -13,22 +13,22 @@
                 <div class="g-order-list__content">
                     <ul>
                         <li>
-                            <span>库存量</span>
+                            <span>{{ $t('position.spot.qty') }}</span>
                             <span>{{ item.qty }}</span>
                         </li>
                         <li>
-                            <span>冻结量</span>
+                            <span>{{ $t('position.spot.freezerqty') }}</span>
                             <span>{{ item.freezerqty }}</span>
                         </li>
                         <li>
-                            <span>可用量</span>
+                            <span>{{ $t('position.spot.enableqty') }}</span>
                             <span>{{ item.enableqty }}</span>
                         </li>
                     </ul>
                 </div>
                 <div class="g-order-list__btnbar">
-                    <Button size="small" @click="showComponent('listing', item)" round v-if="hasTradeMode17">挂牌</Button>
-                    <Button size="small" @click="showComponent('pickup', item)" round>提货</Button>
+                    <Button size="small" @click="showComponent('listing', item)" round v-if="hasTradeMode17">{{ $t('operation.listing') }}</Button>
+                    <Button size="small" @click="showComponent('pickup', item)" round>{{ $t('operation.pickup') }}</Button>
                 </div>
             </div>
         </div>

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

@@ -3,17 +3,17 @@
     <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('operation.listing')" @back="closed" />
             </template>
             <Form ref="formRef" class="g-form__container" @submit="onSubmit">
-                <CellGroup title="现货持仓信息" inset>
-                    <Cell title="商品代码/名称" :value="`${selectedRow.wrstandardcode}/${selectedRow.wrstandardname}`" />
-                    <Cell title="仓库" :value="selectedRow.warehousename" />
-                    <Cell title="库存量" :value="selectedRow.qty" />
-                    <Cell title="冻结量" :value="selectedRow.freezerqty" />
-                    <Cell title="可用量" :value="selectedRow.enableqty" />
+                <CellGroup :title="$t('position.spot.subtitle')" inset>
+                    <Cell :title="$t('position.spot.goodsname')" :value="`${selectedRow.wrstandardcode}/${selectedRow.wrstandardname}`" />
+                    <Cell :title="$t('position.spot.warehousename')" :value="selectedRow.warehousename" />
+                    <Cell :title="$t('position.spot.qty')" :value="selectedRow.qty" />
+                    <Cell :title="$t('position.spot.freezerqty')" :value="selectedRow.freezerqty" />
+                    <Cell :title="$t('position.spot.enableqty')" :value="selectedRow.enableqty" />
                 </CellGroup>
-                <CellGroup title="挂牌信息" inset>
+                <CellGroup :title="$t('position.spot.subtitle2')" inset>
                     <Performance ref="performanceRef" tmptype="0,2" name="PerformanceTemplateID"
                         v-model="formData.PerformanceTemplateID" />
                     <Field name="OrderQty" :rules="formRules.OrderQty" label="挂牌量">
@@ -31,7 +31,7 @@
                 </CellGroup>
             </Form>
             <template #footer>
-                <div class="g-form__footer">
+                <div class="g-form__footer inset">
                     <Button block square type="danger" @click="formRef?.submit">{{ $t('quote.selll') }}</Button>
                 </div>
             </template>

+ 1 - 1
src/packages/mobile/views/report/components/bank/index.vue

@@ -2,7 +2,7 @@
     <app-modal direction="right-top" height="100%" width="100%" v-model:show="showModal">
         <app-view>
             <template #header>
-                <app-navbar title="出入金明细" @back="closed" />
+                <app-navbar :title="$t('report.inoutamountdetail')" @back="closed" />
             </template>
             <app-pull-refresh ref="pullRefreshRef" v-model:loading="loading" v-model:error="error"
                 v-model:pageIndex="pageIndex" :page-count="pageCount" @refresh="run">

+ 9 - 9
src/packages/mobile/views/report/components/index.vue

@@ -19,18 +19,18 @@
                 <Cell :title="$t('account.inamount')" :value="handleAmount(taaccount?.inamount)" />
                 <Cell :title="$t('account.outamount')" :value="handleAmount(taaccount?.outamount)" />
                 <Cell :title="$t('account.closepl')" :value="handleAmount(taaccount?.closepl)" />
-                <Cell :title="$t('account.reckonpl')" :value="handleAmount(taaccount?.reckonpl)" />
-                <Cell :title="$t('account.paycharge')" :value="handleAmount(taaccount?.paycharge)" />
+                <Cell :title="$t('report.reckonpl')" :value="handleAmount(taaccount?.reckonpl)" />
+                <Cell :title="$t('report.paycharge')" :value="handleAmount(taaccount?.paycharge)" />
                 <Cell :title="$t('account.currentbalance')" :value="handleAmount(taaccount?.currentbalance)" />
-                <Cell :title="$t('account.oriusedmargin')" :value="handleAmount(taaccount?.oriusedmargin)" />
+                <Cell :title="$t('report.oriusedmargin')" :value="handleAmount(taaccount?.oriusedmargin)" />
                 <Cell :title="$t('account.availableFunds2')" :value="handleAmount(taaccount?.avaiablemoney)" />
-                <Cell :title="$t('account.orioutamountfreeze')" :value="handleAmount(taaccount?.orioutamountfreeze)" />
-                <Cell :title="$t('account.avaiableoutmoney')" :value="handleAmount(taaccount?.avaiableoutmoney)" />
+                <Cell :title="$t('report.orioutamountfreeze')" :value="handleAmount(taaccount?.orioutamountfreeze)" />
+                <Cell :title="$t('report.avaiableoutmoney')" :value="handleAmount(taaccount?.avaiableoutmoney)" />
             </CellGroup>
-            <CellGroup :title="$t('account.reportdetail')">
-                <Cell :title="$t('account.inoutamountdetail')" is-link @click="openComponent('bank')" />
-                <Cell :title="$t('account.ordersumary')" is-link @click="openComponent('position')" />
-                <Cell :title="$t('account.tradedetail')" is-link @click="openComponent('trade')" />
+            <CellGroup :title="$t('report.reportdetail')">
+                <Cell :title="$t('report.inoutamountdetail')" is-link @click="openComponent('bank')" />
+                <Cell :title="$t('report.ordersumary')" is-link @click="openComponent('position')" />
+                <Cell :title="$t('report.tradedetail')" is-link @click="openComponent('trade')" />
             </CellGroup>
             <Popup position="bottom" v-model:show="showPicker" round @click-overlay="dropdownItemRef.toggle()">
                 <DatePicker v-model="currentDate" :max-date="new Date()" :columns-type="columnsType"

+ 1 - 1
src/packages/mobile/views/report/components/position/index.vue

@@ -2,7 +2,7 @@
     <app-modal direction="right-top" height="100%" width="100%" v-model:show="showModal">
         <app-view>
             <template #header>
-                <app-navbar title="订单汇总" @back="closed" />
+                <app-navbar :title="$t('report.ordersumary')" @back="closed" />
             </template>
             <app-pull-refresh ref="pullRefreshRef" v-model:loading="loading" v-model:error="error"
                 v-model:pageIndex="pageIndex" :page-count="pageCount" @refresh="run">

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

@@ -2,7 +2,7 @@
     <app-modal direction="right-top" height="100%" width="100%" v-model:show="showModal">
         <app-view>
             <template #header>
-                <app-navbar title="成交明细" @back="closed" />
+                <app-navbar :title="$t('report.tradedetail')" @back="closed" />
             </template>
             <app-pull-refresh ref="pullRefreshRef" v-model:loading="loading" v-model:error="error"
                 v-model:pageIndex="pageIndex" :page-count="pageCount" @refresh="run">

+ 1 - 1
src/stores/modules/language.ts

@@ -6,7 +6,7 @@ import enUS from '@public/locales/en-US.json'
 const appLanguage = localData.getRef('appLanguage')
 
 export const i18n = createI18n({
-    locale: appLanguage.value,
+    locale: 'en-US',//appLanguage.value,
     messages: {
         'zh-CN': zhCN,
         'en-US': enUS