From 15af96bd140182ff74fab450d1244072cf2c207d Mon Sep 17 00:00:00 2001 From: liaoxinyu Date: Mon, 25 Dec 2023 18:15:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B0=8F=E6=95=B0=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/favicon.ico | Bin 4286 -> 4286 bytes src/utils/class/math.js | 2 - src/views/components/inner-transfer.vue | 15 ++++++- src/views/contract/account.vue | 2 +- src/views/contract/exchange-store.vue | 2 +- src/views/contract/handicap.vue | 2 +- src/views/contract/hold-position.vue | 6 +-- src/views/contract/index.vue | 2 +- src/views/exchange/book-trades.vue | 17 +++++--- src/views/exchange/make-deal.vue | 2 +- src/views/exchange/order-list.vue | 10 ++++- src/views/exchange/symbols.vue | 2 +- src/views/wallet/exchange-assets.vue | 51 ++++++++++++++++++++---- static/favicon.ico | Bin 4286 -> 4286 bytes 14 files changed, 87 insertions(+), 26 deletions(-) diff --git a/src/favicon.ico b/src/favicon.ico index 0ad097155d2516da143a1e4a52ff8556d8ddaa01..b498e0821b82126ab32c43546e0892e27f07093e 100644 GIT binary patch literal 4286 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 -1) { // 提取实体集和精度值 let [entity, precisionVal] = val.toString().split("."); - entity = entity.replace(/\B(?=(\d{3})+(?!\d))/g, ","); if (precisionVal.length > scale) { // trunc() 方法会将数字的小数部分去掉，只保留整数部分。 @@ -124,7 +123,6 @@ function omitTo(val, scale) { // 检测整型值 } else { - val = val.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ","); ret = val + '.' + '0'.repeat(scale); } diff --git a/src/views/components/inner-transfer.vue b/src/views/components/inner-transfer.vue index 70016c4..23aa7d5 100644 --- a/src/views/components/inner-transfer.vue +++ b/src/views/components/inner-transfer.vue @@ -88,9 +88,12 @@
{{ $t("wallet.balance") }}： - {{ + + {{ + price1(activeCoin.usable_balance,4) + }}   {{ form.coin_name }}
@@ -220,6 +223,14 @@ export default { components: {}, watch: {}, methods: { + price1(item,index){ + if (item) { + let price = item.toFixed(index).toString(); + let parts = price.split("."); + parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ","); + return parts.join("."); + } + }, // from切换 fromChange($ev) { this.form.from_account = this.fromValue[0]; diff --git a/src/views/contract/account.vue b/src/views/contract/account.vue index 47a8698..a9c5a20 100644 --- a/src/views/contract/account.vue +++ b/src/views/contract/account.vue @@ -73,7 +73,7 @@ export default { let price = item; let parts = price.split("."); parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ","); - return parts.join(","); + return parts.join("."); } }, } diff --git a/src/views/contract/exchange-store.vue b/src/views/contract/exchange-store.vue index ddad7ab..434ca59 100644 --- a/src/views/contract/exchange-store.vue +++ b/src/views/contract/exchange-store.vue @@ -350,7 +350,7 @@ export default { let price = item.toString(); let parts = price.split("."); parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ","); - return parts.join(","); + return parts.join("."); } }, // 获取合约账户信息 diff --git a/src/views/contract/handicap.vue b/src/views/contract/handicap.vue index 5b24156..9922f8a 100644 --- a/src/views/contract/handicap.vue +++ b/src/views/contract/handicap.vue @@ -209,7 +209,7 @@ export default { let price = item.toString(); let parts = price.split("."); parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ","); - return parts.join(","); + return parts.join("."); } }, getMarketInfo() { diff --git a/src/views/contract/hold-position.vue b/src/views/contract/hold-position.vue index b166996..9df6869 100644 --- a/src/views/contract/hold-position.vue +++ b/src/views/contract/hold-position.vue @@ -460,8 +460,8 @@ export default { required: false, }, newPrice: { - default: 0, - type: Number, + default: "0", + type: String, required: false, }, holdPositionAll: { @@ -508,7 +508,7 @@ export default { let price = item.toString(); let parts = price.split("."); parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ","); - return parts.join(","); + return parts.join("."); } }, tooltip($ev) { diff --git a/src/views/contract/index.vue b/src/views/contract/index.vue index f44d3aa..4dc5e59 100644 --- a/src/views/contract/index.vue +++ b/src/views/contract/index.vue @@ -289,7 +289,7 @@ export default { let price = item; let parts = price.split("."); parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ","); - return parts.join(","); + return parts.join("."); } }, ispopover1(item){ diff --git a/src/views/exchange/book-trades.vue b/src/views/exchange/book-trades.vue index d9efa27..44fb0b8 100644 --- a/src/views/exchange/book-trades.vue +++ b/src/views/exchange/book-trades.vue @@ -20,7 +20,7 @@ - {{ item.price|omitTo(priceDecimals) }} + {{ price1(item.price)|omitTo(priceDecimals) }} {{ item.amount|omitTo(qtyDecimals) }} {{ item.price|multiple(item.amount, priceDecimals) }} @@ -32,7 +32,7 @@ {{ $t("exchange.last-price") }} - {{ newTrade.price}} + {{ price1(newTrade.price) }} CNY @@ -62,7 +62,7 @@ - {{ item.price|omitTo(priceDecimals) }} + {{ price1(item.price)|omitTo(priceDecimals) }} {{ item.amount|omitTo(qtyDecimals) }} {{ item.price|multiple(item.amount, priceDecimals) }} @@ -105,7 +105,7 @@ -
{{ item.price }}
+
{{ price1(item.price) }}
{{ item.amount }}
{{ item.time }}
@@ -209,7 +209,14 @@ export default { }, methods: { - + price1(item){ + if (item) { + let price = item.toString(); + let parts = price.split("."); + parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ","); + return parts.join("."); + } + }, // 计算深度 当前数量 / 买卖最大值 getValue(amount) { const arr = this.buyList.concat(this.sellList).map(item => item.amount); diff --git a/src/views/exchange/make-deal.vue b/src/views/exchange/make-deal.vue index 17deca1..6178417 100644 --- a/src/views/exchange/make-deal.vue +++ b/src/views/exchange/make-deal.vue @@ -424,7 +424,7 @@ export default { let price = item.toString(); let parts = price.split("."); parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ","); - return parts.join(","); + return parts.join("."); } }, getCoinInfo(){ diff --git a/src/views/exchange/order-list.vue b/src/views/exchange/order-list.vue index d087d39..8dfe0db 100644 --- a/src/views/exchange/order-list.vue +++ b/src/views/exchange/order-list.vue @@ -51,7 +51,7 @@ - {{item.entrust_price|omitTo(priceDecimals)}} + {{price1(item.entrust_price)|omitTo(priceDecimals)}} {{item.amount|omitTo(qtyDecimals)}} @@ -209,6 +209,14 @@ export default { }; }, methods: { + price1(item){ + if (item) { + let price = item.toString(); + let parts = price.split("."); + parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ","); + return parts.join("."); + } + }, toggle(name) { this.currentTab = name; // 更新父组件 diff --git a/src/views/exchange/symbols.vue b/src/views/exchange/symbols.vue index a54d3a2..ded7014 100644 --- a/src/views/exchange/symbols.vue +++ b/src/views/exchange/symbols.vue @@ -149,7 +149,7 @@ export default { let price = item.toString(); let parts = price.split("."); parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ","); - return parts.join(","); + return parts.join("."); } }, diff --git a/src/views/wallet/exchange-assets.vue b/src/views/wallet/exchange-assets.vue index c9ca8d2..7a0bad1 100644 --- a/src/views/wallet/exchange-assets.vue +++ b/src/views/wallet/exchange-assets.vue @@ -26,7 +26,8 @@
≈ - + + BTC @@ -34,7 +35,8 @@
≈ - + + USDT @@ -45,7 +47,8 @@
{{$t('wallet.capitalAccount')}}
- + + USDT @@ -67,7 +70,8 @@
{{$t('common.contractaccount')}}
- + + USDT @@ -135,9 +139,11 @@ {{ item.coin_name }} - {{item.usable_balance |omitTo(2)}} - {{item.freeze_balance}} - {{item.usd_estimate |omitTo(2)}} + + {{price1(item.usable_balance,2)}} + {{price3(item.freeze_balance)}} + + {{price2(item.usd_estimate,2)}}
@@ -519,6 +525,37 @@ export default { } }, methods: { + price1(item,index){ + if (item) { + let price = item.toFixed(index).toString(); + let parts = price.split("."); + parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ","); + return parts.join("."); + }else{ + return '0.00'; + } + }, + price3(item){ + if (item) { + let price = item.toString(); + let parts = price.split("."); + parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ","); + return parts.join("."); + }else{ + return 0; + } + }, + price2(item,index){ + if (item) { + let num = parseFloat(item); + let price = num.toFixed(index).toString(); + let parts = price.split("."); + parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ","); + return parts.join("."); + } else { + return '0.00'; + } + }, //确认提交贝宝支付 paypalSbumit(){ if(!this.paypal.amount){ diff --git a/static/favicon.ico b/static/favicon.ico index fa056ce2ab2db9ca459b0792e31ce4bc003a60a3..b498e0821b82126ab32c43546e0892e27f07093e 100644 GIT binary patch literal 4286 zcmb`LYfx2H6vubK4_|bM{)l zwbovH?R^pAA^fJL3H~c89~B~12=OEYkHj1ZKR15xPXD31p`=9QaNYHkr&fEGO!?5$ z1Q{8V7Cg(^RP9em#8#qXpUG{_0Pj469OO5QnUkp9SmQJD+9rcn0SP&9b$_a!Tho>n z%Wkaq3re~sPF?NE2Xi=1uGNnqblvkdUYrz*qrVRfjU=V#c;CmZn;=WbVMW{3S`o|k|vU$*u>ZSqO_w7|$dGIo^PY$|` z&wkW8O^;RHclO;%LcWTid&f?Hc78kUJRLBZlC59audLnOPCkUd*izLr5V20Meq453 ze)dXHCzaQSQ!vLvH4=e7+nW*OPnL=L*-952Qa_&c6_u5YfPSbToJrp#yLU_ALbht#zMj&1zR=lujdCRA1zu0L0qb3fH)j3Z0I)AL*6XLTE@9g@+tVL$cTH8+9Si8}L z_eq_v#V!4?#_zTp!+V~!-%f=OoC~|L{Oln59{PG*eC!iDWdA$WJecKVGrzo7$pQBk z>mFm(dvnYEJ`+#;sIgU&fA-g*RM-hxZOPBff<48D;wp7d^JKp79Tc8A?E(e ze!zxHGW9ER&gT}>KF{%q`#sc{i)z&NO9kP5HWnYTyJhV1`sY8R>_ZXcj?U-%clUHF zImrDgyq@*5&QhGe>}(+B5ZEQH-rvbZ~c2a2{kz%x?ZWz*P_ZkB?lbm^1bRAYh8J-5<9ql%+KQP zKrpWJx7Dw@-~XBjZa!p~`LIRvHim1FYl7FC>_e})JI%F$u_K7L_)N=C!rwovKJaJQ zm<)aeB!sg~$jX##_GQmE0fP^24fs#!b{_N|wUGfI&ac?tqs#;QumJreI%Mf-{`?{TumcL0*vOLg@^_bv9PnT5EbzoMEryxRu&dw3JbAHX(eK(Sc-^^bFETX zh=_=VSOl@K5D`&9=6deTF7Ar^NYcqpIJq-(UuVt?t5h3)rIM0=wU<|_sFWH3u%)H} z*|!6}Y-9>#3S_@)_66JlDS_Dlg`A>ci-PuhmM`jB$-S5U{~7e8Hb-%YFlyA>1