From 00401da859116af33fb7110c597f9ea6022e42d7 Mon Sep 17 00:00:00 2001
From: dcc <dcc@163.com>
Date: Sat, 03 Aug 2024 15:17:24 +0800
Subject: [PATCH] 123

---
 src/components/constract/DeliveryContract/position.vue |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/components/constract/DeliveryContract/position.vue b/src/components/constract/DeliveryContract/position.vue
index 8245942..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>
@@ -94,19 +94,19 @@
                       <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> -->
+                      </div>
 
                       <!-- <div>{{ item.order_no }}</div>
                             <div v-if="item.state=='submitted'">已提交</div>
                             <div v-if="item.state=='created'">已完成</div> -->
                       <!--                    <div>{{ item.settlement_time }}</div>-->
                       <div class="flex-2">
-                        {{ item.settlement_time}}
+                        {{ dateString(item.settlement_time).split(/ +/)[0] + ' ' + initDate(dateString(item.settlement_time).split(/ +/)[1])}}
                       </div>
                       <div
                         v-if="type == 'orders'"
@@ -249,7 +249,7 @@
 import { useUserStore } from "@/store/user";
 import AxiosCurrency from "@/api/currency.js";
 import { handleSymbolImg } from "@/utils";
-import {initDate} from '@/utils/utils'
+import {initDate,dateString} from '@/utils/utils'
 
 export default {
   name: "deliveryDelegateList",
@@ -278,6 +278,8 @@
   },
   data() {
     return {
+      initDate,
+      dateString,
       type: "orders", //类型
       currencyData: [],
       symbol: "btc",

--
Gitblit v1.9.3