From d9d85ea4f5f9c5df8fb599dcd11384fb54213b97 Mon Sep 17 00:00:00 2001 From: ltlzx <942659938@qq.com> Date: Thu, 17 Mar 2022 17:30:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/KLine.vue | 2 +- src/i18n/cn.json | 1 + src/i18n/en.json | 55 +++++++++++++------------ src/views/components/inner-transfer.vue | 14 +++++-- src/views/contract/exchange-store.vue | 12 ++++-- src/views/contract/index.vue | 10 +++-- src/views/exchange/book-trades.vue | 5 ++- src/views/exchange/make-deal.vue | 10 ++++- src/views/forgotPwd/index.vue | 2 +- src/views/profile/index.vue | 2 +- src/views/signIn/index.vue | 2 +- src/views/wallet/exchange-assets.vue | 3 ++ 12 files changed, 73 insertions(+), 45 deletions(-) diff --git a/src/components/KLine.vue b/src/components/KLine.vue index 6daf66d..043a2d5 100644 --- a/src/components/KLine.vue +++ b/src/components/KLine.vue @@ -24,7 +24,7 @@ export default { data() { return { model: null, // 数据模型 - interval: "1" // [字符串格式]和TV的resolution同步 + interval: "5" // [字符串格式]和TV的resolution同步 }; }, diff --git a/src/i18n/cn.json b/src/i18n/cn.json index 8ee96d7..a7d7e1b 100644 --- a/src/i18n/cn.json +++ b/src/i18n/cn.json @@ -231,6 +231,7 @@ "rememberMe": "记住我", "noAccountYet": "还没有账号", "goRegister": "注册", + "goRegister1": "注册", "safety": "安全性验证", "regAccount": "注册账号", "email": "邮箱", diff --git a/src/i18n/en.json b/src/i18n/en.json index 5a986ee..92ccc08 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -47,8 +47,8 @@ "activity": "Marketing activities", "news": "Industry news", "contactUs": "Contact Us", - "sign_in": "Sign in", - "sign_up": "Sign up", + "sign_in": "Log In", + "sign_up": "Register", "noRecord": "No Record", "getCode": "Get Code", "export": "Export", @@ -98,7 +98,7 @@ "order-amount": "Amount", "order-total": "Total", "avg-price": "Average Price", - "direction": "Direction", + "direction": "Side", "order-type": "Type", "executed-amount": "Executed", "executed-total": "Turnover", @@ -180,10 +180,10 @@ "notMore": "not more", "allRead": "all read", "newMessage": "new message", - "footerTips1": "risk investment in the market needs to be cautious.", - "footerTips2": "legal notice: the website is operated by {name}", - "footerTips3": "risk tip: digital asset trading may cause your principal loss, please make sure you fully understand the risks.", - "footerTips4": "Restricted areas: unable to provide services to residents of specific countries / regions, such as Israel and the Islamic Republic of China" + "footerTips1": "Risk investment in the market needs to be cautious.", + "footerTips2": "Legal Notice: The website is operated by {name}", + "footerTips3": "Risk Tip: Digital asset trading may cause your principal loss, please make sure you fully understand the risks.", + "footerTips4": "Restricted Areas: Unable to provide services to residents of specific countries / regions, such as Israel and the Islamic Republic of China" }, "exchange": { "search": "Search", @@ -199,7 +199,7 @@ "order-total": "Order Total", "balance": "Available Balance", "enter-price": "Enter the Price", - "enter-amount": "Enter the Amount", + "enter-amount": "Enter the amount", "enter-total": "Enter the Total", "at-best-price": "Execute at the best available price", "trigger-price": "Enter the Trigger Price", @@ -222,20 +222,21 @@ "passwordLength": "the password needs a length of {num}", "new-password": "Enter a new password", "confirm-password": "Confirm password", - "forgetPassword": "forget password", + "forgetPassword": "Forget password", "rememberMe": "remember me", - "noAccountYet": "don't have a account yet", - "goRegister": "register immediately", + "noAccountYet": "No account", + "goRegister": "Register Account", + "goRegister1":"Register now", "login": "Log In", "come": "Welcome back! Let’s trade.", "account": "Account", "enterEccount": "Enter your account", - "enter-account": "Enter Phone Number/Email", + "enter-account": "Enter the registered Email", "pwd": "Password", "enterPwd": "Enter Password", "forgotPwd": "Forgot Password?", "dontAccunt": "Don’t have an account yet?", - "registerBtn": "Register", + "registerBtn": "Create Account", "SMS": "SMS", "Google": "Google", "google-code": "Google Code", @@ -249,8 +250,8 @@ "iSee": "I have knew", "terms": "the privacy terms and agreements", "reg": "Register", - "hasAccount": "Already has an account", - "toLogin": "login in", + "hasAccount": "Already have an account", + "toLogin": "Log In", "country": "Country code", "enterMobile": "Enter your phone number", "invalidPhone":"Invalid mobile number", @@ -275,7 +276,7 @@ "phoneCorrect": "Please make sure the mobile phone and area code are correct", "securePhone": "Please make sure your phone signal is stable", "verCode": "Verify Code", - "referrer": "Referrer", + "referrer": "Referral Code", "referrer1": "Please fill in by the recommender", "phoneNum": "Phone Number", "enterPhoneNum": "Enter Phone Number", @@ -326,8 +327,8 @@ "inconsistent": "The password does not match!", "reset": "Reset completed. Please login again", "back": "Back", - "sign-in": "Sign In", - "find-password": "Retrieve Password", + "sign-in": "Account Login", + "find-password": "Reset login password", "submit": "Submit", "confirmpassword": "The two passwords are inconsistent" }, @@ -498,7 +499,7 @@ "FinancialAccount": "Financial Account", "contractFlow": "Contract Flow", "info": "Details", - "money": "amount" + "money": "Amount" }, "contact": { "contact": "Contact Us", @@ -506,7 +507,7 @@ "fullName": "Full Name", "enterFullName": "please enter your fullname", "email": "Email", - "enterEmail": "please enter the email address", + "enterEmail": "Enter your email", "consultingService": "Consulting Item", "pleseSelect": "choose please!", "info": "Message", @@ -870,7 +871,7 @@ "a5": "Entrust freeze", "a6": "Unrealized PNL", "a7": "Risk Rate", - "a8": "Liq Price", + "a8": "Liq.Price", "a9": "Symbol", "b0": "Leverage", "b1": "Time", @@ -939,15 +940,15 @@ "h4": "Success", "h5": "Symbols", "h6": "Change", - "h7": "High Price", - "h8": "Low Price", - "h9": "Volume", + "h7": "High", + "h8": "Low", + "h9": "Turnover", "i0": "Positions", "i1": "Open Orders", "i2": "Order History", "i3": "Side", - "i4": "Multi", - "i5": "Empty", + "i4": "Open Long", + "i5": "Open short", "i6": "Only display current", "i7": "TP", "i8": "SL", @@ -1105,7 +1106,7 @@ }, "addinfo": { "MarketTrend": "MarketTrend", - "HourlyCurrencyUpdates": "Hourly Currency Updates", + "HourlyCurrencyUpdates": " hour Market trend", "TopEncryptionRiskManagement": "TOP ENCRYPTION RISK MANAGEMENT", "EscortYourPropertySafety": "ESCORT YOUR PROPERTY SAFETY", "BuyCoins": "BuyCoins", diff --git a/src/views/components/inner-transfer.vue b/src/views/components/inner-transfer.vue index 1e2d82b..f158d4c 100644 --- a/src/views/components/inner-transfer.vue +++ b/src/views/components/inner-transfer.vue @@ -17,6 +17,7 @@
{ @@ -164,6 +165,7 @@ export default { leaf: true }; }); + resolve(arr); }); } @@ -174,6 +176,7 @@ export default { lazyLoad: (node, resolve) => { let { level } = node; if (!level) { + console.info(this.toList) resolve(this.toList); } else { this.accountPairList(node.value, list => { @@ -250,6 +253,7 @@ export default { // 获取划转币种 getUserCoinAssets: lodash.debounce(function() { + // console.info(this.form) Wallet.coinList({ from_account: this.form.from_account, to_account: this.form.to_account, @@ -358,7 +362,9 @@ export default { }) }, created() { + this.accounts(); + this.getUserCoinAssets() } }; diff --git a/src/views/contract/exchange-store.vue b/src/views/contract/exchange-store.vue index c04cb75..ea52429 100644 --- a/src/views/contract/exchange-store.vue +++ b/src/views/contract/exchange-store.vue @@ -144,7 +144,7 @@
{{ shortPosition }} {{ $t("contract.e2") }}
-
+
-
+
{{ $t("contract.e7") }} {{ maxNum }}
@@ -168,7 +168,8 @@ {{ $t("contract.d2") }} -
+ +
{{ $t("contract.e7") }} {{ maxNum }}
@@ -461,3 +462,8 @@ export default { } }; + diff --git a/src/views/contract/index.vue b/src/views/contract/index.vue index 3555cf7..b068ada 100644 --- a/src/views/contract/index.vue +++ b/src/views/contract/index.vue @@ -89,15 +89,15 @@
- {{ $t("contract.h7") }} + 24H {{ $t("contract.h7") }}
- {{ activeContract.high }} + {{ activeContract.high }}
- {{ $t("contract.h8") }} + 24H {{ $t("contract.h8") }}
{{ activeContract.low }} @@ -105,7 +105,9 @@
- 24H{{ $t("contract.h9") }}（{{ $t("contract.e2") }}） + 24H {{ $t("contract.h9") }} + + (USDT)
{{ activeContract.vol }} diff --git a/src/views/exchange/book-trades.vue b/src/views/exchange/book-trades.vue index 4adba88..033fc7c 100644 --- a/src/views/exchange/book-trades.vue +++ b/src/views/exchange/book-trades.vue @@ -6,7 +6,10 @@ {{ $t("exchange.price") }}({{pair.to}}) - {{ $t("exchange.amount") }}({{pair.from}}) + {{ $t("exchange.amount") }} + + ({{pair.to}}) + {{ $t("exchange.total") }}({{pair.from}}) diff --git a/src/views/exchange/make-deal.vue b/src/views/exchange/make-deal.vue index 4d2f233..a275566 100644 --- a/src/views/exchange/make-deal.vue +++ b/src/views/exchange/make-deal.vue @@ -179,8 +179,9 @@

- {{ $t('exchange.balance') }} + {{ $t('exchange.amount') }} {{toBalance}} {{pair.to}}
+ {{ $t('exchange.balance') }} {{fromBalance}} {{pair.from}}

@@ -257,8 +258,10 @@

-

{{ $t('exchange.balance') }} +

+ {{$t('exchange.amount')}} {{toBalance}} {{pair.to}}
+ {{ $t('exchange.balance') }} {{fromBalance}} {{pair.from}}

@@ -435,6 +438,8 @@ export default { }); }, renderBuyAmount(val, index) { + console.info(val) + console.info(this.buyorder) if (!this.buyorder.entrust_price) { this.visibles.buy.limitPrice = true; this.msgList.buy[1] = this.$t('nav.set'); @@ -686,6 +691,7 @@ export default { created() { this.getCoinInfo() + this.reset(); }, } diff --git a/src/views/forgotPwd/index.vue b/src/views/forgotPwd/index.vue index 26c498b..a69c586 100644 --- a/src/views/forgotPwd/index.vue +++ b/src/views/forgotPwd/index.vue @@ -51,7 +51,7 @@

Remembered your password? - Sign in here + Log In

diff --git a/src/views/profile/index.vue b/src/views/profile/index.vue index e8f5fbd..c19c33b 100644 --- a/src/views/profile/index.vue +++ b/src/views/profile/index.vue @@ -26,7 +26,7 @@
{{$t('profile.max')}} 1k - USD + USD 24 {{$t('profile.limitH')}} {{$t('profile.tips')}} diff --git a/src/views/signIn/index.vue b/src/views/signIn/index.vue index c7c9ed0..f3ea0c8 100644 --- a/src/views/signIn/index.vue +++ b/src/views/signIn/index.vue @@ -68,7 +68,7 @@

{{$t('login.noAccountYet')}}? - {{$t('login.goRegister')}} + {{$t('login.goRegister1')}}

diff --git a/src/views/wallet/exchange-assets.vue b/src/views/wallet/exchange-assets.vue index d5b322a..ebd5503 100644 --- a/src/views/wallet/exchange-assets.vue +++ b/src/views/wallet/exchange-assets.vue @@ -750,4 +750,7 @@ created() { background-color: #1e2834; } } + .label{ + font-size: 16px; + }