From 410bcba8773a6681cc389d73952612706039a691 Mon Sep 17 00:00:00 2001
From: dcc <dcc@163.com>
Date: Wed, 24 Jul 2024 16:41:41 +0800
Subject: [PATCH] 123

---
 src/views/wallet/spot.vue                                                  |    6 +++---
 src/components/constract/PerpetualContract/positionCom/currentPosition.vue |    2 +-
 jysPc6.8.zip                                                               |    0 
 src/components/constract/PerpetualContract/positionCom/historyOrder.vue    |   10 +++++++++-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/jysPc6.8.zip b/jysPc6.8.zip
index f3f4710..628ba3c 100644
--- a/jysPc6.8.zip
+++ b/jysPc6.8.zip
Binary files differ
diff --git a/src/components/constract/PerpetualContract/positionCom/currentPosition.vue b/src/components/constract/PerpetualContract/positionCom/currentPosition.vue
index 2ad405c..b774863 100644
--- a/src/components/constract/PerpetualContract/positionCom/currentPosition.vue
+++ b/src/components/constract/PerpetualContract/positionCom/currentPosition.vue
@@ -185,7 +185,7 @@
     },
     ratioFormatter(row) {
       const { change_ratio } = row;
-      const ratio = `${bigDecimal.divide(change_ratio, 100, 4)}%`;
+      const ratio = `${bigDecimal.divide(change_ratio * 100, 100, 2)}%`;
       return ratio;
     },
     directionFormatter(row, column, val) {
diff --git a/src/components/constract/PerpetualContract/positionCom/historyOrder.vue b/src/components/constract/PerpetualContract/positionCom/historyOrder.vue
index 1f68660..3de9965 100644
--- a/src/components/constract/PerpetualContract/positionCom/historyOrder.vue
+++ b/src/components/constract/PerpetualContract/positionCom/historyOrder.vue
@@ -80,6 +80,10 @@
           formatter: this.directionFormatter,
         },
         {
+          prop: "deposit_open",
+          label: "message.home.baozhengjin",
+        },
+        {
           prop: "trade_avg_price",
           label: "message.home.chengjiaojunjia",
         },
@@ -89,7 +93,7 @@
         },
 
         {
-          prop: "volume_open",
+          prop: "shuliang",
           label: "message.home.shuliang",
         },
         {
@@ -189,6 +193,10 @@
         //   item.close_time = item.close_time.split(' ')[0] + ' ' + initDate(item.close_time.split(' ')[1])
         // })
         this.tableData = res.data;
+        this.tableData.forEach(item => {
+          let shuliang = item.deposit_open*item.lever_rate/item.trade_avg_price
+          item.shuliang = shuliang.toFixed(4)
+        })
         // console.log(this.tableData,'this.tableData');
         const noNext = res.data.length == 0 || res.data.length < 10;
         this.noNext = noNext;
diff --git a/src/views/wallet/spot.vue b/src/views/wallet/spot.vue
index d0be301..6e55a51 100644
--- a/src/views/wallet/spot.vue
+++ b/src/views/wallet/spot.vue
@@ -25,9 +25,9 @@
       <div class="margin-top-bottom20">
         <total-assets :pageType="'financial'"></total-assets>
         <div class="tab-customize-box">
-          <el-input v-model="bizhong" style="width: 150px;" placeholder="搜索币种"/>
-          <el-button type="primary" style="margin-left: 10px;margin-right: 20px;" @click="getList">查询</el-button>
-          <el-checkbox v-model="yangCangchecked" label="隐藏0资产" size="large" @change="getList" />
+          <el-input v-model="bizhong" style="width: 150px;" :placeholder="$t('message.user.sousuobizhong')"/>
+          <el-button type="primary" style="margin-left: 10px;margin-right: 20px;" @click="getList">{{ $t('message.user.chaxun') }}</el-button>
+          <el-checkbox v-model="yangCangchecked" :label="$t('message.user.yincangzichan')" size="large" @change="getList" />
         </div>
       </div>
       <div>

--
Gitblit v1.9.3