From f9fb74be64b930e056f188b925e955b3c7cafbbd Mon Sep 17 00:00:00 2001
From: liaoxinyu <liaoxinyu@xingtongworld.com>
Date: Thu, 13 Mar 2025 14:08:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=88=E7=BA=A6=E4=BF=9D?=
 =?UTF-8?q?=E8=AF=81=E9=87=91=E5=8F=AA=E8=83=BD=E8=BE=93=E5=85=A52?=
 =?UTF-8?q?=E4=BD=8D=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/views/contract/exchange-store.vue | 13 +++++++++++++
 src/views/wallet/exchange-assets.vue  | 10 ++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/views/contract/exchange-store.vue b/src/views/contract/exchange-store.vue
index 9cc064f..b97d79f 100644
--- a/src/views/contract/exchange-store.vue
+++ b/src/views/contract/exchange-store.vue
@@ -101,6 +101,7 @@
               class="form-control"
               v-model="marginBuy"
               :placeholder="tips"
+			  @input="inputEnter(false)"
 			  title=""
           />
           <!-- <div class="input-group-append">
@@ -229,6 +230,7 @@
               class="form-control"
               v-model="marginSell"
               :placeholder="tips"
+			  @input="inputEnter(true)"
 			  title=""
           />
           <!-- <div class="input-group-append">
@@ -545,6 +547,17 @@ export default {
     }
   },
   methods: {
+	inputEnter(boll) {
+		if(boll){
+			this.marginSell = this.marginSell
+			    .replace(/[^\d.]/g, "") // 移除非数字、非小数点的字符
+			    .replace(/^(\d*\.?\d{0,2}).*$/, "$1"); // 限制最多两位小数
+		}else{
+			this.marginBuy = this.marginBuy
+			    .replace(/[^\d.]/g, "") // 移除非数字、非小数点的字符
+			    .replace(/^(\d*\.?\d{0,2}).*$/, "$1"); // 限制最多两位小数
+		}
+	},
     // 获取合约账户信息
     contractAccount(boo) {
       if (!this.isLogin) return;
diff --git a/src/views/wallet/exchange-assets.vue b/src/views/wallet/exchange-assets.vue
index 0452235..8838743 100644
--- a/src/views/wallet/exchange-assets.vue
+++ b/src/views/wallet/exchange-assets.vue
@@ -48,7 +48,8 @@
               <div class="my-1">
                 ≈
                 <span class="num h2">
-                  <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)}}</template>
                   <template v-else>********</template>
                 </span>
                 BTC
@@ -68,8 +69,8 @@
                     <div class="label">{{$t('wallet.capitalAccount')}}</div>
                     <div>
                       <span class="num h3">
-                        <template v-if="showValue">{{userAssets.funds_account_usd|omitTo(2)}}</template>
-                        <!-- <template v-if="showValue">{{price1(userAssets.funds_account_usd,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
@@ -91,7 +92,8 @@
                     <div class="label">{{$t('common.contractaccount')}}</div>
                     <div>
                       <span class="num h3">
-                        <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