From bfb40fbb48cffd2bd996aed21abb44a497115272 Mon Sep 17 00:00:00 2001
From: zzzz <690498789@qq.com>
Date: Fri, 19 Apr 2024 06:05:18 +0800
Subject: [PATCH] 111
---
src/page/user/Warehouse.vue | 20 +++++-----
src/page/user/Warehouse/item.card.vue | 25 ++++++------
src/page/newUser/index.vue | 23 +++--------
3 files changed, 29 insertions(+), 39 deletions(-)
diff --git a/src/page/newUser/index.vue b/src/page/newUser/index.vue
index 793254d..2b34c15 100644
--- a/src/page/newUser/index.vue
+++ b/src/page/newUser/index.vue
@@ -29,7 +29,7 @@
<van-row class="van-row-box">
<van-col span="24">
<div class="content-all">
- <span>{{ $t("賬戶總資產") }}(USD)</span>
+ <span>{{ $t("賬戶總資產") }}({{ $USD }})</span>
<i @click="xy = !xy" class="iconfont xy"></i>
</div>
<div class="number-all">
@@ -37,7 +37,7 @@
</div>
</van-col>
</van-row>
- <van-row style="margin-top: 18px">
+ <!-- <van-row style="margin-top: 18px">
<div
class="van-col van-col--12"
style="margin-top: 10px"
@@ -54,7 +54,7 @@
</div>
</div>
</div>
- </van-row>
+ </van-row> -->
<van-row style="margin-top: 16px">
<van-col span="8" style="display: flex; justify-content: center">
<van-button
@@ -72,15 +72,6 @@
>{{ $t("提款") }}</van-button
>
</van-col>
- <!-- transferIndex -->
- <!-- <van-col span="8" style="display: flex; justify-content: center">
- <van-button
- @click="$router.push('/transferIndex')"
- class="btn-two"
- type="default"
- >{{ $t("hj245") }}</van-button
- >
- </van-col> -->
</van-row>
</div>
<div class="content-list-box">
@@ -107,9 +98,9 @@
<div class="DINPro">
{{ item.symbol }} {{ item.availableBalance || "0.00" }}
</div>
- <div class="DINPro">
+ <!-- <div class="DINPro">
≈ $ {{ item.availableBalanceUSD || "0.00" }}
- </div>
+ </div> -->
</div>
</li>
<li>
@@ -120,7 +111,7 @@
<div class="DINPro">
{{ item.symbol }} {{ item.freezeMoney || "0.00" }}
</div>
- <div class="DINPro">≈ $ {{ item.freezeMoney || "0.00" }}</div>
+ <!-- <div class="DINPro">≈ $ {{ item.freezeMoney || "0.00" }}</div> -->
</div>
</li>
</ul>
@@ -194,7 +185,7 @@
});
const arr = data.data.filter((item) => item.accectType === "ALL");
- this.asstesAll = arr[0].totalMoneyUSD;
+ this.asstesAll = arr[0].totalMoney;
}
},
tabsChange(e) {
diff --git a/src/page/user/Warehouse.vue b/src/page/user/Warehouse.vue
index ee7ac9c..32f6604 100644
--- a/src/page/user/Warehouse.vue
+++ b/src/page/user/Warehouse.vue
@@ -47,18 +47,18 @@
components: { card, itemCard, dataList },
data() {
return {
- actives: "1",
- active: "1",
+ actives: "2",
+ active: "2",
activeObj: {},
tabsArr: [
- {
- title: this.$t("hometips"),
- name: "1",
- bgc: "rgb(8, 82, 196)",
- laber: "ALL",
- symbolCode: "USD",
- symbol: "$",
- },
+ // {
+ // title: this.$t("hometips"),
+ // name: "1",
+ // bgc: "rgb(8, 82, 196)",
+ // laber: "ALL",
+ // symbolCode: "USD",
+ // symbol: "$",
+ // },
{
title: this.$t("ydgs"),
assname: this.$t("印股总资产"),
diff --git a/src/page/user/Warehouse/item.card.vue b/src/page/user/Warehouse/item.card.vue
index 1515024..cf2faee 100644
--- a/src/page/user/Warehouse/item.card.vue
+++ b/src/page/user/Warehouse/item.card.vue
@@ -6,9 +6,9 @@
{{ activeObj.assname }} ({{ activeObj.symbolCode }})
</div>
<div class="total-data">{{ activeObj.totalMoney || "0.0000" }}</div>
- <div class="total-data-huansuan" v-if="activeObj.symbolCode !== $USD">
+ <!-- <div class="total-data-huansuan" v-if="activeObj.symbolCode !== $USD">
≈ {{ $USD }} {{ activeObj.totalMoneyUSD || "0.0000" }}
- </div>
+ </div> -->
</div>
<div class="right" @click="closeAll">{{ $t("全部平仓") }}</div>
</div>
@@ -16,47 +16,47 @@
<div class="item-card-itembox">
<div class="item">
<div class="itembox-data">{{ activeObj.profitAndLoss }}</div>
- <div v-if="activeObj.symbolCode !== $USD" class="number-text">
+ <!-- <div v-if="activeObj.symbolCode !== $USD" class="number-text">
≈ {{ $USD }} {{ activeObj.profitAndLossUSD || "0.0000" }}
- </div>
+ </div> -->
<div class="itembox-name">
{{ $t("浮動盈虧") }} ({{ activeObj.symbolCode }})
</div>
</div>
<div class="item">
<div class="itembox-data">{{ activeObj.availableBalance }}</div>
- <div v-if="activeObj.symbolCode !== $USD" class="number-text">
+ <!-- <div v-if="activeObj.symbolCode !== $USD" class="number-text">
≈ {{ $USD }}
{{ activeObj.availableBalanceUSD || "0.0000" }}
- </div>
+ </div> -->
<div class="itembox-name">
{{ $t("可用資產") }} ({{ activeObj.symbolCode }})
</div>
</div>
<div class="item">
<div class="itembox-data">{{ activeObj.cumulativeProfitAndLoss }}</div>
- <div v-if="activeObj.symbolCode !== $USD" class="number-text">
+ <!-- <div v-if="activeObj.symbolCode !== $USD" class="number-text">
≈ {{ $USD }}
{{ activeObj.cumulativeProfitAndLossUSD || "0.0000" }}
- </div>
+ </div> -->
<div class="itembox-name">
{{ $t("累計盈虧") }} ({{ activeObj.symbolCode }})
</div>
</div>
<div class="item">
<div class="itembox-data">{{ activeObj.freezeMoney }}</div>
- <div v-if="activeObj.symbolCode !== $USD" class="number-text">
+ <!-- <div v-if="activeObj.symbolCode !== $USD" class="number-text">
≈ {{ $USD }} {{ activeObj.freezeMoneyUSD || "0.0000" }}
- </div>
+ </div> -->
<div class="itembox-name">
{{ $t("凍結資產") }} ({{ activeObj.symbolCode }})
</div>
</div>
<div class="item">
<div class="itembox-data">{{ activeObj.handlingCharge }}</div>
- <div v-if="activeObj.symbolCode !== $USD" class="number-text">
+ <!-- <div v-if="activeObj.symbolCode !== $USD" class="number-text">
≈ {{ $USD }} {{ activeObj.handlingChargeUSD || "0.0000" }}
- </div>
+ </div> -->
<div class="itembox-name">
{{ $t("總手續費") }} ({{ activeObj.symbolCode }})
</div>
@@ -98,7 +98,6 @@
},
closeAll() {
- // allsell()
this.$refs.closeAllDialog.show = true;
},
},
--
Gitblit v1.9.3