xxxxx

oem/tss/locales/extras/en-US.json

@@ -109,7 +109,7 @@
         },
         "goods": {
             "subtitle": "Order information",
-            "orderid": "Order number",
+            "orderid": "OrderNo",
             "closepl": "Change in value",
             "buyorsell": "Order category",
             "holderqty": "Order quantity",
@@ -168,36 +168,36 @@
             "totalcharge": "Service charge summary:"
         },
         "wallet": {
-            "title": "Deposit/Withdrawal",
+            "title": "Deposit/WithDrawal",
             "cashin": "Deposit",
-            "cashout": "Withdrawal",
+            "cashout": "WithDrawal",
             "deposit": {
                 "subtitle": "Deposit platform",
                 "subtitle1": "Deposit time",
-                "inamount": "Deposit amount",
-                "pleaseenterinamount": "Please enter the deposit amount",
+                "inamount": "Amount",
+                "pleaseenterinamount": "Please enter deposit amount",
                 "time": "Deposit time: Weekdays",
-                "platformdepositbankname": "Platform deposit bank",
-                "platformdepositaccountno": "Platform deposit account",
-                "platformdepositaccount": "Platform deposit account",
-                "platformdepositsub-branch": "Platform deposit branch",
+                "platformdepositbankname": "Platform Bank",
+                "platformdepositaccountno": "Platform CardNo",
+                "platformdepositaccount": "Platform Account",
+                "platformdepositsub-branch": "Platform Branch",
                 "goldisnotwithinthetimeframe": "Deposit is out of time range",
                 "notice": "Holidays are based on notices and announcements; please do not operate on non-working days!",
                 "whetherthedeposittransferhasbeenmadeatthebankend": "Have you completed the deposit transfer at the bank?"
             },
             "withdraw": {
-                "subtitle": "Withdrawal time",
-                "outamount": "Withdrawal amount",
-                "pleaseenteroutamount": "Please enter the withdrawal amount",
-                "time": "Withdrawal time: Weekdays",
-                "theamountavailableis0": "Withdrawable amount is 0",
+                "subtitle": "WithDrawal time",
+                "outamount": "Amount",
+                "pleaseenteroutamount": "Please enter amount",
+                "time": "WithDrawal time: Weekdays",
+                "theamountavailableis0": "WithDrawable amount is 0",
                 "exceedingthepayableamount": "Exceeds the withdrawable amount",
-                "goldisnotwithinthetimeframe": "Withdrawal is out of time range",
+                "goldisnotwithinthetimeframe": "WithDrawal is out of time range",
                 "notice": "Holidays are based on notices and announcements; please do not operate on non-working days!",
-                "availableoutmoney": "Withdrawable amount"
+                "availableoutmoney": "EnableAmount:"
             },
             "inoutapply": {
-                "title": "Deposit/Withdrawal records",
+                "title": "Deposit/WithDrawal records",
                 "charge": "Order service fee"
             }
         }
@@ -219,7 +219,7 @@
         "banksign": "My bank card",
         "delivery": "Delivery pickup",
         "cashin": "Deposit",
-        "cashout": "Withdrawal",
+        "cashout": "WithDrawal",
         "myposition": "Held orders",
         "myorder": "Historical orders",
         "setting": {

public/locales/en-US.json

@@ -492,7 +492,7 @@
             "orderstatus": "Order status",
             "ordertime": "Order time",
             "orderdate": "Order date",
-            "orderid": "Order number",
+            "orderid": "OrderNo",
             "freezemargin": "Frozen amount",
             "tips1": "Do you want to cancel this order?",
             "tips2": "Cancellation successful",
@@ -545,7 +545,7 @@
             "orderdate": "Order date",
             "orderprice": "Order price",
             "wrtradeorderstatus": "Order status",
-            "wrtradeorderid": "Order number",
+            "wrtradeorderid": "OrderNo",
             "tips1": "Are you sure you want to cancel?",
             "tips2": "Cancellation successful"
         },
@@ -587,7 +587,7 @@
             "orderdate": "Order time",
             "tradeprice": "Proposed price",
             "tradeqty": "Order quantity",
-            "orderid": "Order number"
+            "orderid": "OrderNo"
         },
         "transferorder": {
             "title": "Transfer order",
@@ -601,7 +601,7 @@
             "tradeqty": "Transaction volume",
             "orderstatus": "Order status",
             "ordertime": "Order time",
-            "orderid": "Order number",
+            "orderid": "OrderNo",
             "tips1": "Do you want to cancel this order?",
             "tips2": "Cancellation successful"
         },
@@ -633,7 +633,7 @@
             "orderstatus": "Order status",
             "ordertime": "Order time",
             "orderdate": "Order date",
-            "orderid": "Order number",
+            "orderid": "OrderNo",
             "tips1": "Are you sure you want to cancel?",
             "tips2": "Cancellation successful"
         },
@@ -667,7 +667,7 @@
             "orderprice": "Order price",
             "orderstatus": "Order status",
             "tradeqty": "Transaction amount",
-            "orderid": "Order number",
+            "orderid": "OrderNo",
             "tips1": "Are you sure you want to cancel?",
             "tips2": "Cancellation successful"
         },
@@ -792,7 +792,7 @@
             "receipttype": "Invoice type:",
             "username": "Invoice title:",
             "taxpayerid": "Tax identification number:",
-            "receiptbank": "Bank of account:",
+            "receiptbank": "Bank account:",
             "receiptaccount": "Bank account number:",
             "address1": "Business address:",
             "contactinfo": "Business phone number:",
@@ -912,7 +912,7 @@
             "matchusername": "Sender",
             "deliverytime": "Application time",
             "xgoodscode": "Settlement contract",
-            "deliveryid": "Settlement order numbe",
+            "deliveryid": "Settlement OrderNo",
             "orderedqty": "Selected quantity"
         },
         "offline": {
@@ -929,7 +929,7 @@
             "reqtime": "Application time",
             "applydate": "Application date",
             "orderstatusdisplay": "Document status",
-            "deliveryorderid": "Settlement order number",
+            "deliveryorderid": "Settlement OrderNo",
             "tradeid": "Transaction number"
         },
         "spot": {
@@ -1066,8 +1066,8 @@
         "curstepname": "Current step",
         "starttime": "Start time",
         "starttime1": "Start time",
-        "relatedorderid": "Associated order number",
-        "performanceplanid": "Performance order number",
+        "relatedorderid": "Associated OrderNo",
+        "performanceplanid": "Performance OrderNo",
         "applyremark": "Remarks",
         "attachment": "Attachments",
         "contract": "Contact information",
@@ -1105,7 +1105,7 @@
         "receipttype": "Invoice type:",
         "username": "Invoice title:",
         "taxpayerid": "Tax identification number:",
-        "receiptbank": "Bank of account:",
+        "receiptbank": "Bank account:",
         "receiptaccount": "Bank account number:",
         "address1": "Business address:",
         "contactinfo": "Business phone number:",
@@ -1210,7 +1210,7 @@
             "receipttype": "Invoice type",
             "UserName": "Invoice title",
             "TaxpayerID": "Tax ID",
-            "ReceiptBank": "Bank of account",
+            "ReceiptBank": "Bank account",
             "ReceiptAccount": "Bank account number",
             "Address": "Company address",
             "ContactInfo": "Company phone number",
@@ -1251,18 +1251,18 @@
         "title": "Bank Management",
         "accountname": "Name",
         "accountname1": "Bank card account name",
-        "OpenBankAccId": "Bank of account",
+        "OpenBankAccId": "Bank account",
         "cardtype": "Document type",
         "cardno": "Document number",
         "cusbankname": "Custodian bank",
         "bankaccountno1": "Contract bank account number",
         "currency": "Currency",
         "bankname": "Contract bank",
-        "bankname1": "Bank name",
-        "bankno": "Bank card number",
+        "bankname1": "Bank Name",
+        "bankno": "Bank CardNo",
         "bankaccountname": "Name",
-        "mobilephone": "Phone number",
-        "branchbankname": "Branch name",
+        "mobilephone": "Phone Number",
+        "branchbankname": "Branch Name",
         "remark": "Remarks",
         "signstatus": "Status",
         "signagain": "Re-sign",
@@ -1271,23 +1271,23 @@
         "modify": "Modify",
         "addbanksign": "Add Bank Sign",
         "modifybanksign": "Modify Bank Sign",
-        "Pleaseselectyourbank": "Please select the bank of account",
+        "Pleaseselectyourbank": "Please select the bank account",
         "Pleaseenteryourmobilephonenumber": "Please enter the phone number",
         "Pleaseenterbankaccountname": "Please enter the bank card account name",
         "Pleaseenterbankaccountno": "Please enter the bank card account number",
-        "Pleaseenterbankno": "Please enter the bank card number",
+        "Pleaseenterbankno": "Please enter the bank cardNo",
         "youhavenotaddedasignedaccount": "You have not added a signed account",
         "fundstype": "Fund type",
         "pleasechoicefundstype": "Please select the fund type",
         "time": "Time",
         "operatetype": "Operation type",
         "amount": "Amount",
-        "bankaccountno": "Bank card number",
+        "bankaccountno": "Bank CardNo",
         "verificationcode": "Get verification code",
         "sendagain": "Resend",
         "sendfailure": "Sending failed",
-        "Pleaseenterbranchbankname": "Please enter the branch name of the bank of account",
-        "Pleaseenterbranchbankno": "Please enter the branch code of the bank of account",
+        "Pleaseenterbranchbankname": "Please enter the branch name of the bank account",
+        "Pleaseenterbranchbankno": "Please enter the branch code of the bank account",
         "submitsuccess1": "Submission of contract information modification successful.",
         "submitsuccess2": "Submission successful, please check the results later.",
         "tips1": "Add the signing account infos first!",
@@ -1327,7 +1327,7 @@
         },
         "wallet": {
             "title": "Cash In Out",
-            "applys": "Application records",
+            "applys": "Logs",
             "cashin": "Cash In",
             "cashout": "Cash Out",
             "deposit": {
@@ -1353,9 +1353,9 @@
             "withdraw": {
                 "subtitle": "CashOut Time",
                 "outamount": "OutAmount",
-                "bankname": "Bank of account",
-                "bankaccountno": "Bank card number",
-                "bankaccountname": "Name",
+                "bankname": "Bank Name",
+                "bankaccountno": "Bank CardNo",
+                "bankaccountname": "User Name",
                 "pleaseenteroutamount": "Enter out-amount",
                 "time": "Payment time: trading day ",
                 "notice": "Holidays to the notice, announcement shall prevail, non-trading days don't operate!",
@@ -1378,7 +1378,7 @@
                 "remark2": "Remarks",
                 "applystatus": "Status",
                 "bankaccountno": "Card number",
-                "bankname": "Bank of account",
+                "bankname": "Bank account",
                 "accountcode": "Fund account numb",
                 "accountname": "Name",
                 "amount": "Amount",
@@ -1692,7 +1692,7 @@
         "en": "Only English letters are allowed (no spaces)",
         "enname": "Only letters, numbers, and underscores are allowed",
         "cardno": "Invalid ID card number",
-        "bankcardno": "Invalid bank card number"
+        "bankcardno": "Invalid bank cardNo"
     },
     "tss": {
         "title": "Categorys",

src/packages/tss/views/bank/wallet/components/deposit/Index.vue

@@ -23,23 +23,23 @@
                 </Field>
                 <Field :label="$t('banksign.wallet.withdraw.bankaccountname')">
                     <template #input>
-                        {{ sign.bankaccountname }}
+                        {{ handleNoneValue(sign.bankaccountname) }}
                     </template>
                 </Field>
                 <Field :label="$t('banksign.wallet.withdraw.bankname')">
                     <template #input>
-                        {{ sign.bankname }}
+                        {{ handleNoneValue(sign.bankname) }}
                     </template>
                 </Field>
                 <Field :label="$t('banksign.wallet.withdraw.bankaccountno')">
                     <template #input>
-                        {{ sign.bankaccountno }}
+                        {{ handleNoneValue(sign.bankaccountno) }}
                     </template>
                 </Field>
                 <template v-for="(item, index) in configs" :key="index">
                     <Field v-if="item.usabletype === 1 || item.usabletype === userStore.userInfo?.userinfotype"
-                        :name="item.fieldcode" :label="item.fieldname" v-model="item.value"
-                        :placeholder="$t('common.pleaseenter')+`${item.fieldname}`" />
+                        :name="item.fieldcode" :label="item.fieldcode === 'bank_branch_name' ? $t('banksign.branchbankname') : item.fieldname" v-model="item.value"
+                        :placeholder="$t('common.pleaseenter')" />
                 </template>
             </CellGroup>
             <div class="tips_time">
@@ -92,6 +92,7 @@ import { useUserStore, useAccountStore, i18n } from '@/stores'
 import { useComponent } from '@/hooks/component'
 import Stepper from '@mobile/components/base/stepper/index.vue'
 import moment from 'moment'
+import { handleNoneValue } from '@/filters'
 
 const formRef = shallowRef<FormInstance>()
 const { formData, onSubmit, sign } = useDoDeposit()

src/packages/tss/views/bank/wallet/components/withdraw/Index.vue

@@ -11,23 +11,23 @@
                 </Field>
                 <Field :label="$t('banksign.wallet.withdraw.bankaccountname')">
                     <template #input>
-                        {{ sign.bankaccountname }}
+                        {{ handleNoneValue(sign.bankaccountname) }}
                     </template>
                 </Field>
                 <Field :label="$t('banksign.wallet.withdraw.bankname')">
                     <template #input>
-                        {{ sign.bankname }}
+                        {{ handleNoneValue(sign.bankname) }}
                     </template>
                 </Field>
                 <Field :label="$t('banksign.wallet.withdraw.bankaccountno')">
                     <template #input>
-                        {{ sign.bankaccountno }}
+                        {{ handleNoneValue(sign.bankaccountno) }}
                     </template>
                 </Field>
                 <template v-for="(item, index) in configs" :key="index">
                     <Field v-if="item.usabletype === 1 || item.usabletype === userStore.userInfo?.userinfotype"
-                        :name="item.fieldcode" :label="item.fieldname" v-model="item.value"
-                        :placeholder="$t('common.pleaseenter')+`${item.fieldname}`" />
+                        :name="item.fieldcode" :label="item.fieldcode === 'bank_branch_name' ? $t('banksign.branchbankname') : item.fieldname" v-model="item.value"
+                        :placeholder="$t('common.pleaseenter')" />
                 </template>
             </CellGroup>
             <div class="tips_time">
@@ -66,6 +66,7 @@ import { getServerTime } from '@/services/api/common'
 import { useNavigation } from '@mobile/router/navigation'
 import { useUserStore, i18n } from '@/stores'
 import moment from 'moment'
+import { handleNoneValue } from '@/filters'
 
 const { formData, onSubmit, sign } = useDoWithdraw()
 const { configs, cusBank, startTime, endTime } = useDoCusBankExtendConfigs(3)