From 264ae424801ec3d1a1d6046121ecf3884deea069 Mon Sep 17 00:00:00 2001
From: lxf <1371462558@qq.com>
Date: Tue, 15 Jul 2025 11:36:04 +0800
Subject: [PATCH] Merge branch 'dev6.19' of http://124.156.157.155:8060/r/composite_h5-main into dev6.19
---
src/views/optional/index.vue | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/src/views/optional/index.vue b/src/views/optional/index.vue
index 1773b22..558d1cf 100644
--- a/src/views/optional/index.vue
+++ b/src/views/optional/index.vue
@@ -13,6 +13,9 @@
<div class="flex items-center rounded-14 bg-#3640f0 px-10 ml-10" @click="goTo('/cryptos/exchangePage')">
<div class="text-13 font-bold">{{ t('兑换') }}</div>
</div>
+ <div class="flex items-center rounded-14 bg-#3640f0 px-10 ml-10" @click="goTo('/cryptos/funds')">
+ <div class="text-13 font-bold">{{ t('资产') }}</div>
+ </div>
<div class="flex flex-1 justify-end">
<!-- <img src="@/assets/imgs/icon-order.png" class="w-14 h-15" draggable="false"> -->
</div>
@@ -35,15 +38,15 @@
<div class="text-12 pt-10">
<div class="flex justify-between items-center">
<div style="color: rgb(150, 150, 150);">{{t('可用')}}({{ currency.name }})</div>
- <div class="title text-blue-600">{{ currency.mark_price }}</div>
+ <div class="title text-blue-600">{{ currency.usable }}</div>
</div>
<div class="my-16 flex justify-between items-center">
<div style="color: rgb(150, 150, 150);">{{ t('处理中') }}({{ currency.name }})</div>
- <div>{{ 0 }}</div>
+ <div>{{ currency.freeze_amount }}</div>
</div>
<div class="flex justify-between items-center">
<div style="color: rgb(150, 150, 150);">{{ t('转换') }}(USDT)</div>
- <div></div>
+ <div>{{ currency.usdt }}</div>
</div>
</div>
</div>
@@ -56,6 +59,7 @@
<script setup>
import { ref, onMounted } from 'vue';
import { _getContractBySymbolType, _contractOrder } from '@/service/etf.api';
+import { _getAllWallet } from '@/service/fund.api';
import { useI18n } from "vue-i18n";
import {useRouter} from 'vue-router';
const { t } = useI18n()
@@ -87,15 +91,16 @@
const getOrderList = async () => {
const params = {
- type: 'orders',
- page_no: 1,
- page_size: 'all',
- symbolType: 'forex'
+ // type: 'orders',
+ // page_no: 1,
+ // page_size: 'all',
+ symbolType: 'cryptos'
};
- const response = await _contractOrder(params);
+
+ const response = await _getAllWallet(params);
console.log(response, 'response')
// 处理订单数据
- currencies.value = response
+ currencies.value = response.extends
};
</script>
--
Gitblit v1.9.3