From f1dc8f5a7f3a661ce19513a9ad47fe18e3e883ff Mon Sep 17 00:00:00 2001
From: jhzh <1628036192@qq.com>
Date: Mon, 12 Aug 2024 11:47:14 +0800
Subject: [PATCH] 1
---
src/components/constract/DeliveryContract/position.vue | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/src/components/constract/DeliveryContract/position.vue b/src/components/constract/DeliveryContract/position.vue
index 8bb36e1..5134fe1 100644
--- a/src/components/constract/DeliveryContract/position.vue
+++ b/src/components/constract/DeliveryContract/position.vue
@@ -54,7 +54,7 @@
<div>{{ $t("message.home.jiaogeshijian") }}</div>
<div>{{ $t("message.home.goumaijia") }}</div>
<div>{{ $t("message.home.jiesuanjia") }}</div>
- <div>{{ $t("message.home.yingkui") }}</div>
+ <div v-if="type == 'hisorders'">{{ $t("message.home.yingkui") }}</div>
<div class="flex-2">
{{ $t("message.home.daoqishijian") }}
</div>
@@ -80,7 +80,7 @@
>
<div>{{ item.name }}</div>
<div class="flex-2">
- {{ getFormatTime(item.open_time) }}
+ {{ item.open_time}}
</div>
<div v-if="item.direction == 'buy'" class="green">
{{ $t("message.jiaoyi.zuoduomairu") }}
@@ -94,10 +94,10 @@
<div>{{ item.time_num }} {{ item.time_unit }}</div>
<div>{{ item.open_price }}</div>
<div>{{ item.close_price }}</div>
- <div v-if="item.profit < 0" class="red">
+ <div v-if="type == 'hisorders' && item.profit < 0" class="red">
{{ item.profit }}
</div>
- <div v-else class="green">
+ <div v-if="type == 'hisorders' && item.profit >= 0" class="green">
{{ item.profit }}
</div>
@@ -106,7 +106,7 @@
<div v-if="item.state=='created'">已完成</div> -->
<!-- <div>{{ item.settlement_time }}</div>-->
<div class="flex-2">
- {{ getFormatTime(item.settlement_time) }}
+ {{ dateString(item.settlement_time).split(/ +/)[0] + ' ' + initDate(dateString(item.settlement_time).split(/ +/)[1])}}
</div>
<div
v-if="type == 'orders'"
@@ -234,6 +234,7 @@
:typeValue="2"
:dialogVisible="dialogVisible"
@closeDialog="handleCloseDetailDialog"
+ :showDetail="showDetail"
></delivery-detail-dialog>
</div>
</template>
@@ -248,6 +249,7 @@
import { useUserStore } from "@/store/user";
import AxiosCurrency from "@/api/currency.js";
import { handleSymbolImg } from "@/utils";
+import {initDate,dateString} from '@/utils/utils'
export default {
name: "deliveryDelegateList",
@@ -276,6 +278,8 @@
},
data() {
return {
+ initDate,
+ dateString,
type: "orders", //类型
currencyData: [],
symbol: "btc",
@@ -291,6 +295,7 @@
orderNumber: 0,
isNext: false,
isTop: false,
+ showDetail: {}
};
},
mounted() {
@@ -365,6 +370,11 @@
if (this.type == "orders") {
this.orderNumber = res?.total || res.data.length;
}
+ let result = res.data.sort(this.sortData)
+ // result.forEach(m => {//
+ // m.open_time = m.open_time.split(' ')[0] + ' ' + initDate(m.open_time.split(' ')[1])
+ // m.settlement_time = m.settlement_time.split(' ')[0] + ' ' + initDate(m.settlement_time.split(' ')[1])
+ // });
this.currencyData = res.data.sort(this.sortData);
this.currencyDataLength = res.data.length;
if (this.currencyDataLength == 0 || this.currencyDataLength < 10) {
@@ -391,7 +401,8 @@
order_no: item.order_no,
symbol: item.symbol,
};
- bus.emit("showDetail", obj);
+ // bus.emit("showDetail", obj);
+ this.showDetail = obj
this.dialogVisible = true;
},
//分页
--
Gitblit v1.9.3