修改小数点

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);
 	}
 

src/views/components/inner-transfer.vue

@@ -88,8 +88,11 @@
             <div class="input-group-append">
               <span class="input-group-text fn-12">
                 {{ $t("wallet.balance") }}：
-                <span class="fn-14">{{
+                <!-- <span class="fn-14">{{
                   activeCoin.usable_balance | omitTo(4)
+                }}</span> -->
+				<span class="fn-14">{{
+				  price1(activeCoin.usable_balance,4)
 				}}</span>
                 &nbsp; {{ form.coin_name }}
               </span>
@@ -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];

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(".");
 			}  
 		},
     }

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(".");
 	  	}  
 	  },
     // 获取合约账户信息

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() {

src/views/contract/hold-position.vue

@@ -460,8 +460,8 @@ export default {
         required: false,
     },
     newPrice: {
-        default: 0,
+        default: "0",
-        type: Number,
+        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) {

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){

src/views/exchange/book-trades.vue

@@ -20,7 +20,7 @@
                     </el-progress>
                     <!-- 卖单 使用弹性盒子倒序排列 -->
                     <tr style="display:block;" class="tb-cells" @click.stop="handleOrder(item.price)">
-                        <td class="w-33 red" title="pick this price to sell">{{ item.price|omitTo(priceDecimals) }}</td>
+                        <td class="w-33 red" title="pick this price to sell">{{ price1(item.price)|omitTo(priceDecimals) }}</td>
                         <td class="w-33 text-right">{{ item.amount|omitTo(qtyDecimals) }}</td>
                         <td class="w-33 text-right">{{ item.price|multiple(item.amount, priceDecimals) }}</td>
                     </tr>
@@ -32,7 +32,7 @@
                     <td class="w-33">
                         <span>{{ $t("exchange.last-price") }}</span>
                         <i :class="newTrade.changeRate > 0 ? 'tri-inc' : 'tri-dec'"></i>
-                        <b :class="newTrade.changeRate > 0 ? 'increace' : 'decreace'">{{ newTrade.price}}</b>
+                        <b :class="newTrade.changeRate > 0 ? 'increace' : 'decreace'">{{ price1(newTrade.price) }}</b>
                     </td>
                     <td class="w-33 text-right">
                         <span v-if="langs=='cn'">CNY</span>
@@ -62,7 +62,7 @@
                     </el-progress>
                     <!-- 卖单 使用弹性盒子倒序排列 -->
                     <tr style="display:block;" class="tb-cells" @click.stop="handleOrder(item.price)">
-                        <td class="w-33 green" title="pick this price to buy">{{ item.price|omitTo(priceDecimals) }}</td>
+                        <td class="w-33 green" title="pick this price to buy">{{ price1(item.price)|omitTo(priceDecimals) }}</td>
                         <td class="w-33 text-right">{{ item.amount|omitTo(qtyDecimals) }}</td>
                         <td class="w-33 text-right">{{ item.price|multiple(item.amount, priceDecimals) }}</td>
                     </tr>
@@ -105,7 +105,7 @@
 
                         <tr v-for="(item, index) in tradeList" :key="index">
                             <td style="display:block;width:100%">
-                                <div class="w-33" :style="{color : item.color}">{{ item.price }}</div>
+                                <div class="w-33" :style="{color : item.color}">{{ price1(item.price) }}</div>
                                 <div class="w-33 text-right">{{ item.amount }}</div>
                                 <div class="w-33 text-right">{{ item.time }}</div>
                             </td>
@@ -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);

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(){

src/views/exchange/order-list.vue

@@ -51,7 +51,7 @@
                                 <template v-if="item.type==2">{{ $t("common.market-type") }}</template>
                             </td>
 
-                            <td>{{item.entrust_price|omitTo(priceDecimals)}}</td>
+                            <td>{{price1(item.entrust_price)|omitTo(priceDecimals)}}</td>
 
                             <td>{{item.amount|omitTo(qtyDecimals)}}</td>
 
@@ -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;
             // 更新父组件

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(".");
 			}  
 		},
 

src/views/wallet/exchange-assets.vue

@@ -26,7 +26,8 @@
               <div class="my-1">
                 ≈
                 <span class="num h2 light-purple">
-                  <template v-if="showValue">{{userAssets.total_assets_btc|omitTo(4)}}</template>
+                  <!-- <template v-if="showValue">{{userAssets.total_assets_btc|omitTo(4)}}</template> -->
+                  <template v-if="showValue">{{price1(userAssets.total_assets_btc,4)|omitTo(4)}}</template>
                   <template v-else>********</template>
                 </span>
                 BTC
@@ -34,7 +35,8 @@
               <div class="my-1">
                 ≈
                 <span class="num h2 light-purple">
-                  <template v-if="showValue">{{userAssets.total_assets_usd|omitTo(2)}}</template>
+                  <!-- <template v-if="showValue">{{userAssets.total_assets_usd|omitTo(2)}}</template> -->
+                  <template v-if="showValue">{{price1(userAssets.total_assets_usd,2)}}</template>
                   <template v-else>********</template>
                 </span>
                 USDT
@@ -45,7 +47,8 @@
                     <div class="label">{{$t('wallet.capitalAccount')}}</div>
                     <div>
                       <span class="num h3 light-purple">
-                        <template v-if="showValue">{{userAssets.funds_account_usd|omitTo(2)}}</template>
+                        <!-- <template v-if="showValue">{{userAssets.funds_account_usd|omitTo(2)}}</template> -->
+                        <template v-if="showValue">{{price1(userAssets.funds_account_usd,2)}}</template>
                         <template v-else>********</template>
                       </span>
                       USDT
@@ -67,7 +70,8 @@
                     <div class="label">{{$t('common.contractaccount')}}</div>
                     <div>
                       <span class="num h3 light-purple">
-                        <template v-if="showValue">{{userAssets.contract_account_usd|omitTo(2)}}</template>
+                        <!-- <template v-if="showValue">{{userAssets.contract_account_usd|omitTo(2)}}</template> -->
+                        <template v-if="showValue">{{price1(userAssets.contract_account_usd,2)}}</template>
                         <template v-else>********</template>
                       </span>
                       USDT
@@ -135,9 +139,11 @@
                         {{ item.coin_name }}
                       </td>
                       <!-- <td>{{ item.freeze_balance|add(item.usable_balance) }}</td> -->
-                      <td>{{item.usable_balance |omitTo(2)}}</td>
+                      <!-- <td>{{item.usable_balance |omitTo(2)}}</td> -->
-                      <td>{{item.freeze_balance}}</td>
+					  <td>{{price1(item.usable_balance,2)}}</td>
-                      <td>{{item.usd_estimate |omitTo(2)}}</td>
+                      <td>{{price3(item.freeze_balance)}}</td>
+                      <!-- <td>{{item.usd_estimate |omitTo(2)}}</td> -->
+                      <td>{{price2(item.usd_estimate,2)}}</td>
                       <td>
                         <div class="btn-group btn-group-sm" role="group" aria-label="Basic example">
                             <!-- data-target="#deposite" -->
@@ -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){