From 28d358574761e3103e8995120e4f5454ae3957d9 Mon Sep 17 00:00:00 2001
From: dcc <dcc@163.com>
Date: Tue, 16 Jul 2024 18:23:47 +0800
Subject: [PATCH] 123
---
src/views/wallet/menu/walletOverview.vue | 4 +++-
src/views/order/spotOrder.vue | 4 ++++
src/components/constract/index.vue | 8 +++++---
src/views/wallet/recharge.vue | 4 +++-
src/views/order/exchangeHistory.vue | 7 +++++++
src/views/order/contractHistoryOrder.vue | 5 ++++-
src/views/order/walletHistory.vue | 13 +++++++++++--
src/components/constract/PerpetualContract/positionCom/historyOrder.vue | 8 ++++----
src/views/order/deliveryHistoryOrder.vue | 7 +++++--
9 files changed, 46 insertions(+), 14 deletions(-)
diff --git a/src/components/constract/PerpetualContract/positionCom/historyOrder.vue b/src/components/constract/PerpetualContract/positionCom/historyOrder.vue
index cd3a24d..ca2274d 100644
--- a/src/components/constract/PerpetualContract/positionCom/historyOrder.vue
+++ b/src/components/constract/PerpetualContract/positionCom/historyOrder.vue
@@ -173,10 +173,10 @@
Axios.contractOrderList(data).then((res) => {
let result = res.data
- result.forEach((item) => {
- item.create_time = item.create_time.split(' ')[0] + ' ' + initDate(item.create_time.split(' ')[1])
- item.close_time = item.close_time.split(' ')[0] + ' ' + initDate(item.close_time.split(' ')[1])
- })
+ // result.forEach((item) => {
+ // item.create_time = item.create_time.split(' ')[0] + ' ' + initDate(item.create_time.split(' ')[1])
+ // item.close_time = item.close_time.split(' ')[0] + ' ' + initDate(item.close_time.split(' ')[1])
+ // })
this.tableData = res.data;
console.log(this.tableData,'this.tableData');
const noNext = res.data.length == 0 || res.data.length < 10;
diff --git a/src/components/constract/index.vue b/src/components/constract/index.vue
index c9f26f5..879e9fd 100644
--- a/src/components/constract/index.vue
+++ b/src/components/constract/index.vue
@@ -1087,11 +1087,11 @@
// 获取行情数据，用于币种数据展示和币种的弹窗
getRealTimeData(val, search) {
// console.log('获取行情数据，用于币种数据展示和币种的弹窗',val)
- Axios.getRealtime({ symbol: 'btc,plcl,eth,bnb,ada,omg,xtz,sol,' +
- 'xrp,doge,avax,link,ltc,algo,bch,luna,uni,icp,etc,fil,xlm' +
- ',atom,matic,theta,trx,ftt,bsv,eos,dai,comp,saga,prcl,tnsl' }).then((res) => {
+ const symbol = 'wld,wdc,btc,eth,xtz,ada,yfii,mln,yfi,dai,etc,xrp,ltc,usdc,knc,doge,vet,shib,qtum,icp'
+ Axios.getRealtime({ symbol,order: 'desc' }).then((res) => {
if (res.code == "0") {
var data = res.data;
+ console.log(data);
// console.log(this.$route.params.id,'this.$route.params.id')
var filtersVal = data.filter(
(val) => val.symbol == this.$route.params.id
@@ -1156,6 +1156,8 @@
this.orderListAsc("amount", "ask")
);
}
+
+ console.log(this.allListData,'this.allListData');
}
});
},
diff --git a/src/views/order/contractHistoryOrder.vue b/src/views/order/contractHistoryOrder.vue
index c804b4d..c3c3ef7 100644
--- a/src/views/order/contractHistoryOrder.vue
+++ b/src/views/order/contractHistoryOrder.vue
@@ -17,7 +17,6 @@
<el-table-column
prop="close_time"
:label="$t('message.user.shijian')"
- :formatter="formatterDate"
></el-table-column>
<!-- <el-table-column prop="order_no" label="订单号"></el-table-column> -->
<el-table-column
@@ -94,6 +93,7 @@
</template>
<script>
import { getContractOrder } from "@/api/order.js";
+import {initDate} from "@/utils/utils"
import dayjs from "dayjs";
export default {
name: "contractHistoryOrder",
@@ -128,6 +128,9 @@
};
const res = await getContractOrder(data);
this.tableData = res.data;
+ this.tableData.forEach( item => {
+ item.close_time = item.close_time.split(' ')[0] + ' ' + initDate(item.close_time.split(' ')[1])
+ })
this.tableLength = res.data.length;
if (this.tableLength == 0 || this.tableLength < 10) {
this.isNext = true;
diff --git a/src/views/order/deliveryHistoryOrder.vue b/src/views/order/deliveryHistoryOrder.vue
index 29b439c..c8ffd98 100644
--- a/src/views/order/deliveryHistoryOrder.vue
+++ b/src/views/order/deliveryHistoryOrder.vue
@@ -18,7 +18,6 @@
<el-table-column
prop="close_time"
:label="$t('message.home.kaicangshijian')"
- :formatter="getFormatTime"
></el-table-column>
<el-table-column prop="direction" :label="$t('message.home.fangxiang')">
<template #default="scope">
@@ -68,7 +67,6 @@
<el-table-column
prop="settlement_time"
:label="$t('message.home.daoqishijian')"
- :formatter="getFormatTime"
></el-table-column>
</el-table>
<!-- 分页 -->
@@ -85,6 +83,7 @@
</template>
<script>
import { getDeliveryOrder } from "@/api/order.js";
+import {initDate} from "@/utils/utils"
import dayjs from "dayjs";
export default {
name: "deliveryHistoryOrder",
@@ -119,6 +118,10 @@
const res = await getDeliveryOrder(data);
console.log(111, "交割合约订单接口", res.data);
this.tableData = res.data;
+ this.tableData.forEach( item => {
+ item.settlement_time = item.settlement_time.split(' ')[0] + ' ' + initDate(item.settlement_time.split(' ')[1])
+ item.close_time = item.close_time.split(' ')[0] + ' ' + initDate(item.close_time.split(' ')[1])
+ })
this.tableLength = res.data.length;
},
diff --git a/src/views/order/exchangeHistory.vue b/src/views/order/exchangeHistory.vue
index 466c375..091a7a1 100644
--- a/src/views/order/exchangeHistory.vue
+++ b/src/views/order/exchangeHistory.vue
@@ -56,6 +56,7 @@
<script>
// TODO 接口出参变了，兑换列表，
import { getExchangeOrder } from "@/api/order.js";
+import { initDate } from "@/utils/utils";
export default {
name: "exchangeHistory",
data() {
@@ -85,6 +86,12 @@
page_no: this.pageNum,
});
this.tableData = res.data;
+ this.tableData.forEach((item) => {
+ item.create_time =
+ item.create_time.split(" ")[0] +
+ " " +
+ initDate(item.create_time.split(" ")[1]);
+ });
this.tableLength = res.data.length;
},
diff --git a/src/views/order/spotOrder.vue b/src/views/order/spotOrder.vue
index aff5ddf..d92a357 100644
--- a/src/views/order/spotOrder.vue
+++ b/src/views/order/spotOrder.vue
@@ -100,6 +100,7 @@
</template>
<script>
import { getSpotOrder } from "@/api/order.js";
+import {initDate} from "@/utils/utils"
export default {
name: "spotOrder",
props: {
@@ -129,6 +130,9 @@
};
const res = await getSpotOrder(data);
this.tableData = res.data;
+ this.tableData.forEach((item,index) => {
+ item.create_time = item.create_time.split(' ')[0] + ' ' + initDate(item.create_time.split(' ')[1])
+ })
this.tableLength = res.data.length;
},
handleCurrentChange(val) {
diff --git a/src/views/order/walletHistory.vue b/src/views/order/walletHistory.vue
index cdb9ad0..5573b13 100644
--- a/src/views/order/walletHistory.vue
+++ b/src/views/order/walletHistory.vue
@@ -82,7 +82,7 @@
:empty-text="$t('message.home.noData')"
>
<el-table-column
- prop="createtimestr"
+ prop="createTimeStr"
:label="$t('message.user.shijian3')"
></el-table-column>
<el-table-column
@@ -152,7 +152,7 @@
<span class="label"
>{{ $t("message.user.dingdanshijian3") }}:
</span>
- <span>{{ detailData.create_time }}</span>
+ <span>{{ detailData.create_time.split(' ')[0] + ' ' + initDate(detailData.create_time.split(' ')[1]) }}</span>
</div>
<div>
<span class="label"> {{ $t("message.user.dingdanhao3") }}: </span>
@@ -201,10 +201,12 @@
</template>
<script>
import Axios2 from "@/api/wallet.js";
+import { initDate } from "@/utils/utils";
export default {
name: "exchangeHistory",
data() {
return {
+ initDate,
formInline: {
category: "",
start_time: "",
@@ -255,6 +257,13 @@
page_no: this.pageNum,
}).then((res) => {
this.tableData = res.data;
+ console.log(this.tableData);
+ this.tableData.forEach((item) => {
+ item.createTimeStr =
+ item.createTimeStr.split(" ")[0] +
+ " " +
+ initDate(item.createTimeStr.split(" ")[1]);
+ });
this.tableLength = res.data.length;
});
},
diff --git a/src/views/wallet/menu/walletOverview.vue b/src/views/wallet/menu/walletOverview.vue
index e86daff..055e544 100644
--- a/src/views/wallet/menu/walletOverview.vue
+++ b/src/views/wallet/menu/walletOverview.vue
@@ -160,7 +160,7 @@
{{ $t("message.user.chongzhi") }}
</div>
<div v-else>{{ $t("message.user.tixian") }}</div>
- <div class="linght-grey-color">{{ item.createTimeStr }}</div>
+ <div class="linght-grey-color">{{ item.createTimeStr.split(' ')[0] + ' ' + initDate(item.createTimeStr.split(' ')[1]) }}</div>
</div>
</div>
<div class="flex-column" style="text-align: right">
@@ -191,11 +191,13 @@
</template>
<script>
import Axios2 from "@/api/wallet.js";
+import {initDate} from "@/utils/utils"
export default {
name: "SpotAccounts",
data() {
return {
+ initDate,
MenuChooseIndex: 0,
total: 0,
eyetel: false,
diff --git a/src/views/wallet/recharge.vue b/src/views/wallet/recharge.vue
index 5e9888d..486ba42 100644
--- a/src/views/wallet/recharge.vue
+++ b/src/views/wallet/recharge.vue
@@ -344,7 +344,7 @@
<div class="css-kzcb6r">
<div class="css-cp92rp">
<div class="css-ig082u">
- {{ item.createTime }}
+ {{ item.createTime.split(' ')[0] + ' ' + initDate(item.createTime.split(' ')[1])}}
</div>
</div>
<div class="css-cp92rp">
@@ -424,11 +424,13 @@
import { handleSymbolImg } from "@/utils";
import ListCoins from "@/components/my/listCoins.vue";
import { Plus, CaretBottom, ArrowLeftBold } from "@element-plus/icons-vue";
+import {initDate} from "@/utils/utils"
export default {
components: { Plus, CaretBottom, ListCoins },
data() {
return {
+ initDate,
showListcoin: false,
listTitle: this.$t("message.user.ti24"),
listOpData: [
--
Gitblit v1.9.3