diff --git a/src/favicon.ico b/src/favicon.ico index 0ad0971..b498e08 100644 Binary files a/src/favicon.ico and b/src/favicon.ico differ diff --git a/src/utils/class/math.js b/src/utils/class/math.js index c64abe3..d75bafb 100644 --- a/src/utils/class/math.js +++ b/src/utils/class/math.js @@ -89,7 +89,6 @@ function omitTo(val, scale) { if (val.toString().indexOf(".") > -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 fa056ce..b498e08 100644 Binary files a/static/favicon.ico and b/static/favicon.ico differ