diff --git a/main.html b/main.html new file mode 100644 index 0000000..76e54f8 --- /dev/null +++ b/main.html @@ -0,0 +1,28 @@ + + + + + + + + <%= htmlWebpackPlugin.options.title %> + + + + + + + + + + + +
+ + + diff --git a/manifest.json b/manifest.json index 1a2b381..bc42cc5 100644 --- a/manifest.json +++ b/manifest.json @@ -113,6 +113,7 @@ "base" : "./" }, "domain" : "https://app.ajcoins.com", - "title" : "AJCoins" + "title" : "AJCoins", + "template" : "main.html" } } diff --git a/pages/base/mine.vue b/pages/base/mine.vue index aad195c..c9ed4c6 100644 --- a/pages/base/mine.vue +++ b/pages/base/mine.vue @@ -108,7 +108,8 @@ style="position: relative"> - ≈{{ (account.funds_account_usd).toFixed(2) }} + + ≈{{ price1(account.funds_account_usd,2) }} {{ $t("base.d6") }}(USDT) @@ -163,21 +164,23 @@

{{ $t("base.b9") }}

-

{{ (item.usable_balance).toFixed(2) }} + +

{{ price2(item.usable_balance,2) }}

{{ $t("base.e2") }}

-

{{ item.freeze_balance }}

+

{{ price4(item.freeze_balance) }}

{{ $t("base.e3") }}(USD)

- {{ omitTo(item.usd_estimate, item.priceDecimals) | priceDecimals}} + + {{ price3(item.usd_estimate,2)}}

@@ -318,6 +321,45 @@ 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("."); + } + }, + price2(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'; + } + }, + price4(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; + } + }, + price3(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'; + } + }, getAuthInfo() { Profile.getAuthInfo().then(res => { @@ -350,9 +392,11 @@ export default { filterMoney(val, type) { if (this.hideMoney) return "******"; if (type) { - return this.omitTo(val, 8); + // return this.omitTo(val, 8); + return this.price1(val, 8); } else { - return this.omitTo(val, 2); + // return this.omitTo(val, 2); + return this.price1(val, 2); } }, diff --git a/pages/exchange/exchange-transaction.vue b/pages/exchange/exchange-transaction.vue index 2ec9b31..4abf90d 100644 --- a/pages/exchange/exchange-transaction.vue +++ b/pages/exchange/exchange-transaction.vue @@ -511,7 +511,7 @@ export default { let price = this.newPrice.price.toString(); let parts = price.split("."); parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ","); - return parts.join(","); + return parts.join("."); } } }, diff --git a/pages/exchange/open-position.vue b/pages/exchange/open-position.vue index 6e12b7e..97e0556 100644 --- a/pages/exchange/open-position.vue +++ b/pages/exchange/open-position.vue @@ -930,7 +930,7 @@ export default { let price = this.newPrice.price; let parts = price.split("."); parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ","); - return parts.join(","); + return parts.join("."); } } }, @@ -1019,7 +1019,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("."); } }, realtimePrice1(item){ @@ -1027,7 +1027,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("."); } }, onRefresh() { @@ -1344,13 +1344,13 @@ export default { res.data.account_equity = (parseInt(res.data.account_equity)).toFixed(2) var parts1 = res.data.account_equity.split("."); parts1[0] = parts1[0].replace(/\B(?=(\d{3})+(?!\d))/g, ","); - res.data.account_equity = parts1.join(","); + res.data.account_equity = parts1.join("."); res.data.usable_balance = res.data.usable_balance.toFixed(2).toString(); var parts = res.data.usable_balance.split("."); parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ","); - res.data.usable_balance = parts.join(","); + res.data.usable_balance = parts.join("."); this.accountInfo = res.data; diff --git a/pages/exchange/sell-and-buy.vue b/pages/exchange/sell-and-buy.vue index f4e767a..acebf6c 100644 --- a/pages/exchange/sell-and-buy.vue +++ b/pages/exchange/sell-and-buy.vue @@ -13,8 +13,8 @@ :key="idx" @click="$emit('price',item.price)" > - {{omitTo(item.price,2)}} - + + {{omitTo(price1(item.price),2)}} {{omitTo(item.price,4)}} {{omitTo(item.price,6)}} {{omitTo(item.amount,2)}} @@ -36,7 +36,8 @@ :key="idx" @click="$emit('price',item.price)" > - {{omitTo(item.price,2)}} + + {{omitTo(price1(item.price),2)}} {{omitTo(item.price,4)}} {{omitTo(item.price,6)}} {{omitTo(item.amount,2)}} @@ -111,7 +112,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/static/favicon.ico b/static/favicon.ico new file mode 100644 index 0000000..b498e08 Binary files /dev/null and b/static/favicon.ico differ diff --git a/utils/class/math.js b/utils/class/math.js index 959d61d..a9fc95a 100644 --- a/utils/class/math.js +++ b/utils/class/math.js @@ -89,8 +89,7 @@ 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() 方法会将数字的小数部分去掉，只保留整数部分。 let tmp = scientific2No(Math.trunc(val * Math.pow(10, scale))); @@ -119,13 +118,12 @@ function omitTo(val, scale) { } else { // 补全小数点 - ret = entity + ',' + precisionVal.padEnd(scale, '0'); + ret = entity + '.' + precisionVal.padEnd(scale, '0'); } // 检测整型值 } else { - val = val.replace(/\B(?=(\d{3})+(?!\d))/g, ","); - ret = val + ',' + '0'.repeat(scale); + ret = val + '.' + '0'.repeat(scale); } // 去除末尾可能产生的多余的.