xxxxx

public/locales/en-US.json

@@ -16,7 +16,7 @@
         "save": "Save",
         "tips": "Tips",
         "submitsuccess": "Submit Successful",
-        "submitsuccess1": "Submit Successful, please confirm the result later",
+        "submitsuccess1": "Submit Successful, confirm the result later",
         "pleaseenter": "Please enter",
         "ikonw": "I Konw",
         "operate": "Operate",
@@ -29,9 +29,9 @@
         "startdate": "StartDate",
         "enddate": "EndDate",
         "choice": "Please choice",
-        "choice1": "Please enter kewords",
+        "choice1": "Enter kewords",
         "choice2": "Choice",
-        "choice3": "Please select a region",
+        "choice3": "Select a region",
         "yes": "Yes",
         "no": "No",
         "submitfailure": "Submit Failure:",
@@ -49,7 +49,7 @@
         "tips11": "Failure to send",
         "tips12": "Not under contract",
         "tips13": "The signing information has been modified successfully",
-        "tips14": "The contract is successfully submitted, please wait patiently for review.",
+        "tips14": "The contract is successfully submitted, wait patiently for review.",
         "tips15": "Confirm success",
         "tips16": "Confirmation failure:",
         "all": "All",
@@ -254,7 +254,7 @@
             "avaiablefunds": "Avaiable Funds",
             "presalestatus": "PreSaleStatus",
             "ordercannotbegreaterthan": "orderqty can not begreater than",
-            "pleaseenterthesubscriptionquantity": "Please enter the subscription quantity"
+            "pleaseenterthesubscriptionquantity": "Enter the subscription quantity"
         },
         "goods": {
             "title": "Delisting",
@@ -270,7 +270,7 @@
             "tips1": "Are you sure to submit it?",
             "tips2": "*If there is a reverse order with a price match, the system will automatically cancel it",
             "tips3": "The submission was successful.",
-            "tips4": "Please enter the delisting qty",
+            "tips4": "Enter the delisting qty",
             "delistingqty": "Delisting Qty",
             "delistingbuyorsell": "BuySell",
             "remainqty": "RemainQty",
@@ -298,8 +298,8 @@
             "avaiableMoney": "Avaiable Funds",
             "SubscriptionQty": "SubscriptionQty",
             "ended": "Ended",
-            "tips1": "Please input quantity",
-            "tips2": "Please enter the price"
+            "tips1": "Input quantity",
+            "tips2": "Enter the price"
         },
         "swap": {
             "title": "Listing",
@@ -334,13 +334,13 @@
             "buyprice": "BuyPrice",
             "tips4": "You can't make a deal with yourself", 
             "tips5": "The listing was submitted successfully.",
-            "tips6": "Please enter the price",
-            "tips7": "Please enter the listing price",
-            "tips8": "Please enter the listing quantity",
-            "tips9": "Please enter the basis",
-            "tips10": "Please enter the listing basis",
-            "tips11": "Please enter delisting price",
-            "tips12": "Please enter the delisting quantity",
+            "tips6": "Enter the price",
+            "tips7": "Enter the listing price",
+            "tips8": "Enter the listing quantity",
+            "tips9": "Enter the basis",
+            "tips10": "Enter the listing basis",
+            "tips11": "Enter delisting price",
+            "tips12": "Enter the delisting quantity",
             "tips13": "The submission was successful.",
             "tips14": "Delisting immediately?"
         },
@@ -360,9 +360,9 @@
             "enableQty": "Estimate Buy Qty",
             "deposit": "Deposit",
             "avaiableMoney": "Avaiable Funds",
-            "tips1": "Please enter the order qty",
-            "tips2": "Please enter the order price",
-            "tips3": "Please enter the market maxsub"
+            "tips1": "Enter the order qty",
+            "tips2": "Enter the order price",
+            "tips3": "Enter the market maxsub"
         },
         "spot": {
             "title": "Listing Details",
@@ -380,10 +380,10 @@
             "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",
+            "tips1": "Select the performance template",
+            "tips2": "Enter the price",
+            "tips3": "Select the spot warehouse receipt",
+            "tips4": "Input quantity",
             "tips5": "Insufficient amount available",
             "tips6": "The listing was submitted successfully.",
             "subtitle": "Spot Order",
@@ -433,8 +433,8 @@
             "buyorderqty": "BuyOrderQty",
             "transferprice": "TransferPrice",
             "orderqty1": "OrderQty",
-            "tips1": "Please enter the price",
-            "tips2": "Please input quantity",
+            "tips1": "Input price",
+            "tips2": "Input quantity",
             "tips3": "Submission is successful"
         }
     },
@@ -469,8 +469,8 @@
                 "goodsId": "Goods",
                 "buyOrSell": "BuySell",
                 "price": "Price",
-                "tips1": "Please select the goods to be commissioned",
-                "tips2": "Please enter the cancellation price"
+                "tips1": "Select goods to be commissioned",
+                "tips2": "Enter the cancellation price"
             }
         },
         "goodstrade": {
@@ -687,16 +687,16 @@
             "marketValue": "MarketValue",
             "holderprice": "HolderPrice",
             "deliveryinfo": "DeliveryInfo",
-            "tips1": "Please enter the transfer price",
-            "tips2": "Please enter the transfer quantity",
+            "tips1": "Enter transfer price",
+            "tips2": "Enter transfer quantity",
             "tips3": "Confirm the transfer?",
             "tips4": "Successful transfer",
             "tips5": "Do you want to confirm the delivery?",
             "tips6": "Successful delivery",
-            "tips7": "'Please input the delivery quantity'",
+            "tips7": "'Enter delivery quantity'",
             "tips8": "Not less than the minimum delivery amount",
-            "tips9": "Please enter the shipping address",
-            "tips10": "Please enter the delivery infos",
+            "tips9": "Enter the shipping address",
+            "tips10": "Enter the delivery infos",
             "holddetail": {
                 "title": "Hold Details",
                 "marketname":"MarketName",
@@ -736,18 +736,18 @@
             "wrstandardname": "WrstandardName",
             "deliverygoodsname": "DeliveryGoodsName",
             "wrholdeno": "WRHoldeNo",
-            "tips1": "Please select the performance template",
-            "tips2": "Please enter the price",
+            "tips1": "Select performance template",
+            "tips2": "Enter price",
             "tips3": "Please input quantity",
             "tips4": "Insufficient amount available",
             "tips5": "Successful listing",
             "tips6": "Submission is successful",
-            "tips7": "Please enter the invoice infos",
-            "tips8": "Please enter the shipping address",
-            "tips9": "Please select the delivery area",
-            "tips10": "Please enter your contact infos",
-            "tips11": "Please enter the contact person",
-            "tips12": "Please enter the delivery quantity",
+            "tips7": "Enter invoice infos",
+            "tips8": "Enter shipping address",
+            "tips9": "Select delivery area",
+            "tips10": "Enter your contact infos",
+            "tips11": "Enter the contact person",
+            "tips12": "Enter the delivery quantity",
             "receipttype": "InvoiceType：",
             "username": "InvoicePayable：",
             "taxpayerid": "TaxNumber：",
@@ -813,8 +813,8 @@
             "giveupqty": "Qty",
             "tips1": "Is there any additional unpaid transfer deposit?",
             "tips2": "Submission is successful",
-            "tips3": "Please enter the price",
-            "tips4": "Please input quantity"
+            "tips3": "Enter price",
+            "tips4": "Input quantity"
         },
         "swap": {
             "title": "Swap",
@@ -924,13 +924,13 @@
             "applytime": "ApplyTime",
             "verificationpwd": "Password Verification",
             "sure": "Sure",
-            "tips1": "Please enter your login password",
+            "tips1": "Enter your login password",
             "tips2": "I have read and agree",
             "tips3": "《Position transfer agreement》",
             "tips4": "Confirm success",
             "tips5": "Password verification failed",
-            "tips6": "Please agree to the Position Transfer Agreement",
-            "tips7": "Please enter the password"
+            "tips6": "Agree to the Position Transfer Agreement",
+            "tips7": "Enter password"
         },
         "out": {
             "goodsdisplay": "Name/Code",
@@ -958,11 +958,11 @@
             "freezedays": "FreezeDays",
             "tips1": "I have read and agree",
             "tips2": "《Position transfer agreement》",
-            "tips3": "'Please enter customer number or mobile phone number'",
-            "tips4": "Please select goods to transfer",
-            "tips5": "Please enter the transfer price",
-            "tips6": "Please enter the transfer quantity",
-            "tips7": "Please enter the number of freezing days",
+            "tips3": "'Enter customer number or mobile phone number'",
+            "tips4": "Select goods to transfer",
+            "tips5": "Enter the transfer price",
+            "tips6": "Enter transfer quantity",
+            "tips7": "Enter number of freezing days",
             "tips8": "The submission was successful, please check the result later",
             "tips9": "Please agree to the Position Transfer Agreement"
         }
@@ -1043,7 +1043,7 @@
         "areyousureyouwanttoSubmitadefaultapplication?": "Are you sure you want to Submit a default application",
         "thedefaultapplicationissuccessful": "The default application is successful",
         "performancedetail": "Performance Details",
-        "pleaseenterthedelaydays": "Please enter the delay days",
+        "pleaseenterthedelaydays": "Enter the delay days",
         "delaydays": "DelayDays",
         "days": "Days",
         "executinfo": "ExecutInfo",
@@ -1051,8 +1051,8 @@
         "applyexecute": "ApplyExecute",
         "receiptinfo": "ReceiptInfo",
         "address": "Address",
-        "pleaseentertheaddress": "Please enter the address",
-        "pleaseenterthecontractinfo": "Please enter the contract info",
+        "pleaseentertheaddress": "Enter the address",
+        "pleaseenterthecontractinfo": "Enter the contract info",
         "buyuserinfo": "BuyUserInfo",
         "selluserinfo": "SellUserInfo",
         "modifyinfo": "ModifyInfo",
@@ -1072,12 +1072,12 @@
         "remain": "remain",
         "tips1": "Do you want to apply for infos modification?",
         "tips2": "The application for infos modification is successful",
-        "tips3": "Please enter the shipping address infos",
-        "tips4": "Please enter the invoice infos",
-        "tips5": "Please enter your contact infos",
+        "tips3": "Enter the shipping address infos",
+        "tips4": "Enter the invoice infos",
+        "tips5": "Enter your contact infos",
         "tips6": "Do you want to perform the steps manually?",
-        "tips7": "Please enter the extension days",
-        "tips8": "Please enter remark infos",
+        "tips7": "Enter the extension days",
+        "tips8": "Enter remark infos",
         "tips9": "Are you sure you want to extend your application?",
         "tips10": "Application for extension is successful",
         "tips11": "Immediately execute the application successfully",
@@ -1135,7 +1135,7 @@
             "addressinfo": "Address Infos",
             "wechat": "Wechat",
             "email": "Email",
-            "tips1": "Please enter Wechat"
+            "tips1": "Enter Wechat"
         },
         "address": {
             "title": "Address Management",
@@ -1149,10 +1149,10 @@
             "isdefault": "IsDefault",
             "modifyaddressinfo": "Modify",
             "addaddressinfo": "Add Address",
-            "tips1": "Please enter the consignee",
-            "tips2": "Please enter your contact number",
-            "tips3": "Please select the delivery area",
-            "tips4": "Please enter the address details",
+            "tips1": "Enter the consignee",
+            "tips2": "Enter your contact number",
+            "tips3": "Select the delivery area",
+            "tips4": "Enter the address details",
             "tips5": "Delete the shipping address?",
             "tips6": "Is the address set as the default?"
         },
@@ -1171,8 +1171,8 @@
             "Address": "Address",
             "ContactInfo": "ContactInfo",
             "Email": "Email",
-            "tips1": "Please enter the username",
-            "tips2": "Please enter the taxpayerid",
+            "tips1": "Enter the username",
+            "tips2": "Enter the taxpayerid",
             "tips3": "Do you want to delete the invoice?",
             "addinvoice": "Add Invoice"
         },
@@ -1226,9 +1226,9 @@
         "addbanksign": "Add Bank Sign",
         "modifybanksign": "Modify Bank Sign",
         "Pleaseselectyourbank": "Please select your bank",
-        "Pleaseenteryourmobilephonenumber": "Please enter mobile number",
-        "Pleaseenterbankaccountname": "Please enter bank account name",
-        "Pleaseenterbankaccountno": "Please enter bank account no",
+        "Pleaseenteryourmobilephonenumber": "Enter mobile number",
+        "Pleaseenterbankaccountname": "Enter bank account name",
+        "Pleaseenterbankaccountno": "Enter bank account no",
         "youhavenotaddedasignedaccount": "You have not added a signed account",
         "fundstype": "FundsType",
         "pleasechoicefundstype": "Please choice funds type",
@@ -1239,8 +1239,8 @@
         "verificationcode": "VerifyCode",
         "sendagain": "Send Again",
         "sendfailure": "Send Failure",
-        "Pleaseenterbranchbankname": "Please enter branch bankname",
-        "Pleaseenterbranchbankno": "Please enter branch bankno",
+        "Pleaseenterbranchbankname": "Enter branch bankname",
+        "Pleaseenterbranchbankno": "Enter branch bankno",
         "submitsuccess1": "Modification and submission of signing infos was successful.",
         "submitsuccess2": "The signing was successfully submitted, please confirm the result later.",
         "tips1": "Please add the signing account infos first!",
@@ -1257,10 +1257,10 @@
         "tips12": "Are you sure you want to terminate the contract?",
         "tips13": "The termination was successfully submitted, please confirm the result later",
         "tips14": "Choose Bank",
-        "tips15": "Please enter the bank name",
+        "tips15": "Enter bank name",
         "search": {
             "title": "Search BranchBank",
-            "Pleaseenterbranchbankname": "Please enter branch bank name",
+            "Pleaseenterbranchbankname": "Enter branch-bank name",
             "choicebranchbank": "choice branch bank",
             "nodatas": "No Datas",
             "searching": "Searching..."
@@ -1287,7 +1287,7 @@
                 "subtitle": "CashIn Platform",
                 "subtitle1": "CashIn Time",
                 "inamount": "InAmount",
-                "pleaseenterinamount": "Please enter in amount",
+                "pleaseenterinamount": "Enter in-amount",
                 "credit": "Certificate",
                 "time": "Payment time: trading day ",
                 "notice": "Holidays to the notice, announcement shall prevail, non-trading days do not operate!",
@@ -1308,7 +1308,7 @@
                 "bankname": "BankName",
                 "bankaccountno": "BankAccountNo",
                 "bankaccountname": "BankAccountName",
-                "pleaseenteroutamount": "Please enter out amount",
+                "pleaseenteroutamount": "Enter out-amount",
                 "time": "Payment time: trading day ",
                 "notice": "Holidays to the notice, announcement shall prevail, non-trading days do not operate!",
                 "theamountavailableis0": "The amount available is 0",
@@ -1348,8 +1348,8 @@
             "ruleszcxy": "《 User Registration Agreement 》",
             "rulesyhkhfxgzs": "《 Notice of user account opening risk 》",
             "checked": "I have read and agree",
-            "Pleaseenterausername": "Please enter a user name",
-            "Pleaseenterthepassword": "Please enter the password",
+            "Pleaseenterausername": "Enter user name",
+            "Pleaseenterthepassword": "Enter password",
             "startfailure": "Initialization failure",
             "loading": "loading...",
             "tips1": "For the security of your account, please change the password!",
@@ -1383,9 +1383,9 @@
             "newpwd": "New Pwd",
             "confirmpwd": "Conform Pwd",
             "oldpwd": "Old Pwd",
-            "tips1": "Please enter the old password",
-            "tips2": "Please enter the new password",
-            "tips3": "Please re-enter the new password",
+            "tips1": "Enter the old password",
+            "tips2": "Enter the new password",
+            "tips3": "Reenter the new password",
             "tips4": "Password input is inconsistent!",
             "tips5": "Password changed successfully, please log in again."
         },
@@ -1398,14 +1398,14 @@
             "newpwd": "New Pwd",
             "confirmpwd": "Conform Pwd",
             "resetpwd": "Reset Pwd",
-            "tips1": "Please enter mobile phone",
-            "tips2": "Please enter SMS verification code",
-            "tips3": "Please enter new password",
-            "tips4": "Please enter confirmation password",
+            "tips1": "Enter mobile phone",
+            "tips2": "Enter SMS verification code",
+            "tips3": "Enter new password",
+            "tips4": "Enter confirmation password",
             "tips5": "Combination of two characters with a minimum length of 6 bits",
-            "tips6": "The new password is inconsistent with the confirmation password",
+            "tips6": "New password is inconsistent with the confirmation password",
             "tips7": "Failure to send",
-            "tips8": "Password reset successfully, please log in again."
+            "tips8": "Reset successfully, please log in again."
         },
         "cancel": {
             "title": "Cancel Service",
@@ -1429,10 +1429,10 @@
             "modifyremark": "Modify Remark",
             "authstatus": "Status",
             "submit": "Submit Authentication",
-            "pleaseentertheusername": "Please enter the customer name",
-            "pleaseenterthecardnum": "Please enter the card num",
-            "pleaseuploadthecardbackphoto": "Please upload the card back photo",
-            "pleaseuploadthecardfrontphoto": "Please upload the card front photo",
+            "pleaseentertheusername": "Enter the customer name",
+            "pleaseenterthecardnum": "Enter the card num",
+            "pleaseuploadthecardbackphoto": "Upload the card back photo",
+            "pleaseuploadthecardfrontphoto": "Upload the card front photo",
             "pleaseselectthecardtype": "Please select the card type",
             "openfailure": "Account opening failed, your age does not meet the account opening requirements",
             "opensuccess": "The real-name authentication submission request was successful"
@@ -1440,8 +1440,8 @@
         "avater": {
             "title": "Avater",
             "cardbackphotourl": "User Avater",
-            "tips": "Please select the correct image type",
-            "tips1": "Please upload your profile picture"
+            "tips": "Select the correct image type",
+            "tips1": "Upload your profile picture"
         }
     },
     "report": {
@@ -1511,7 +1511,7 @@
         "testTip": "Under verification...",
         "tipTxt": "Swipe right to verify",
         "successTip": "Success",
-        "failTip": "Verification failed. Please try again"
+        "failTip": "Verification failed. Try again"
     },
     "pcroute": {
         "bottom": {
@@ -1620,5 +1620,15 @@
             "account_address": "Address",
             "account_receipt": "Invoice"
         }
+    },
+    "regex": {
+        "password": "Password must contain any two or more combinations of letters, numbers, special symbols, a minimum length of 6 characters",
+        "phone": "Invalid mobile phone number",
+        "email": "Invalid email address",
+        "en": "English letters only (no Spaces allowed)",
+        "enname": "Only English letters, numbers and underscores can be entered",
+        "cardno": "ID number is not in compliance",
+        "bankcardno": "Bank card number is not in compliance"
+        
     }
 }

public/locales/th-TH.json

@@ -1625,5 +1625,14 @@
             "account_address": "การจัดการ ที่อยู่ของการรับ",
             "account_receipt": "การจัดการข้อมูลใบแจ้งราคา"
         }
+    },
+    "regex": {
+        "password": "รหัสผ่านจะต้องมีมากกว่า สองตัวอักษรตัวเลข และสัญลักษณ์พิเศษ ที่มีความยาวน้อย ที่สุด 6 บิต",
+        "phone": "หมายเลขโทรศัพท์ไม่ถูกต้อง",
+        "email": "ที่อยู่กล่องจดหมายใช้ไม่ได้",
+        "en": "ป้อนตัวอักษรภาษาอังกฤษเท่านั้น (ไม่มีช่องว่า ง)",
+        "enname": "พิมพ์ตัวอักษรภาษาอังกฤษตัวเลขขีดเส้นใต้เท่านั้น",
+        "cardno": "หมายเลขบัตรประชาชนไม่ปฏิบัติตาม",
+        "bankcardno": "หมายเลขบัตรธนาคารไม่สอดคล้อง"
     }
 }

public/locales/zh-CN.json

@@ -1625,5 +1625,15 @@
             "account_address": "收货地址管理",
             "account_receipt": "发票信息管理"
         }
+    },
+    "regex": {
+        "password": "密码必须包含字母、数字、特殊符号中的任意两种以上组合，长度最少6位",
+        "phone": "手机号码无效",
+        "email": "邮箱地址无效",
+        "en": "只能输入英文字母（不允许空格）",
+        "enname": "只能输入英文字母、数字、下划线",
+        "cardno": "身份证号码不合规",
+        "bankcardno": "银行卡号码不合规"
+        
     }
 }

public/locales/zh-TW.json

@@ -1625,5 +1625,15 @@
             "account_address": "收貨地址管理",
             "account_receipt": "發票信息管理"
         }
+    },
+    "regex": {
+        "password": "密碼必須包含字母、數字、特殊符號中的任意兩種以上組合，長度最少6位",
+        "phone": "手機號碼無效",
+        "email": "郵箱地址無效",
+        "en": "只能輸入英文字母（不允許空格）",
+        "enname": "只能輸入英文字母、數字、下劃線",
+        "cardno": "身份證號碼不合規",
+        "bankcardno": "銀行卡號碼不合規"
+        
     }
 }

src/constants/regex.ts

@@ -1,33 +1,35 @@
+import { i18n } from "@/stores";
+
 /**
  * 表单验证规则
  */
 export const validateRules = {
     password: {
         validate: (val: string) => /^(?![0-9]+$)(?![a-z]+$)(?![A-Z]+$)(?!([^(0-9a-zA-Z)])+$)^.{6,64}$/.test(val),
-        message: '密码必须包含字母、数字、特殊符号中的任意两种以上组合，长度最少6位',
+        message: i18n.global.t('regex.password'),
     },
     phone: {
         validate: (val: string) => /^$|^1[3456789]\d{9}$/.test(val),
-        message: '手机号码无效',
+        message: i18n.global.t('regex.phone'),
     },
     email: {
         validate: (val: string) => /^$|^([a-zA-Z]|[0-9])(\w)+@[a-zA-Z0-9]+\.([a-zA-Z]{2,4})$/.test(val),
-        message: '邮箱地址无效',
+        message: i18n.global.t('regex.email'),
     },
     en: {
         validate: (val: string) => /^[A-Za-z]+$/.test(val),
-        message: '只能输入英文字母（不允许空格）',
+        message: i18n.global.t('regex.en'),
     },
     enname: {
         validate: (val: string) => /^[a-zA-Z0-9_]{1,}$/.test(val),
-        message: '只能输入英文字母、数字、下划线',
+        message: i18n.global.t('regex.enname'),
     },
     cardno: {
         validate: (val: string) => /^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/.test(val),
-        message: '身份证号码不合规',
+        message: i18n.global.t('regex.cardno'),
     },
     bankcardno: {
         validate: (val: string) => /^([1-9]{1})(\d{11}|\d{15}|\d{16}|\d{17}|\d{18})$/.test(val),
-        message: '银行卡号码不合规',
+        message: i18n.global.t('regex.bankcardno'),
     }
 }

src/packages/pc/views/footer/presell/transferposition/index.vue

@@ -68,7 +68,13 @@ const componentMap = new Map<string, unknown>([
 const { getTableColumns } = useTableColumnsStore()
 const tableColumns = shallowRef<Model.TableColumn[]>([])
 const { t } = i18n.global
-const { loading, dataList, run } = useRequest(queryMineTradePositionExs, {})
+const dataList = shallowRef<Model.MineTradePositionExsRsp[]>()
+
+const { loading, run } = useRequest(queryMineTradePositionExs, {
+    onSuccess(res) {
+        dataList.value = res.data.filter(e => e.buycurpositionqty != 0)
+    },
+})
 
 const { componentRef, componentId, openComponent, closeComponent } = useComponent(() => {
     run()