From e5108083cff1cb9b4df2de3fb845be56ea1622d4 Mon Sep 17 00:00:00 2001
From: dcc <dcc@163.com>
Date: Sat, 29 Jun 2024 15:38:34 +0800
Subject: [PATCH] 1233

---
 src/page/perpetualContract/orderDetail.vue |   29 ++++++++++++++++++-----------
 src/utils/filter.js                        |    7 ++++++-
 src/page/deliveryContract/hold.vue         |    8 ++++----
 3 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/src/page/deliveryContract/hold.vue b/src/page/deliveryContract/hold.vue
index 2a5af9e..390477a 100644
--- a/src/page/deliveryContract/hold.vue
+++ b/src/page/deliveryContract/hold.vue
@@ -73,10 +73,10 @@
         <div class="flex-1 flex flex-col items-end">
           <div class="text-grey">{{ $t("盈亏") }}</div>
           <div
-            class="mt-20"
-            :class="item.profit / 1 > 0 ? 'text-green' : 'text-red'"
-          >
-            {{ item.profit / 1 > 0 ? "+" + item.profit : item.profit }}
+            class="mt-20 text-green"
+           >
+           0
+            <!-- {{ item.profit / 1 > 0 ? "+" + item.profit : item.profit }} -->
           </div>
         </div>
       </div>
diff --git a/src/page/perpetualContract/orderDetail.vue b/src/page/perpetualContract/orderDetail.vue
index d38b023..79c5e9f 100644
--- a/src/page/perpetualContract/orderDetail.vue
+++ b/src/page/perpetualContract/orderDetail.vue
@@ -12,7 +12,7 @@
                 <div class="text-grey">{{ $t('操作') }}</div>
                 <div class="font-600"> {{ handleWord(detail.direction, detail.state, detail.price_type) }}&nbsp;{{
                     detail.name ? detail.name : '--'
-                }}</div>
+                    }}</div>
             </div>
             <div class="flex justify-between pb-68">
                 <div class="text-grey">{{ $t('状态') }}</div>
@@ -42,25 +42,25 @@
                 <div class="text-grey">{{ $t('平仓价格') }}</div>
                 <div class="textColor">{{ detail.close_avg_price }}</div>
             </div>
-			<div class="flex justify-between pb-68">
-			    <div class="text-grey">{{ $t('止盈') }}</div>
-			    <div class="textColor">{{ detail.stop_price_profit }}</div>
-			</div>
-			<div class="flex justify-between pb-68">
-			    <div class="text-grey">{{ $t('止损') }}</div>
-			    <div class="textColor">{{ detail.stop_price_loss }}</div>
-			</div>
+            <div class="flex justify-between pb-68">
+                <div class="text-grey">{{ $t('止盈') }}</div>
+                <div class="textColor">{{ detail.stop_price_profit }}</div>
+            </div>
+            <div class="flex justify-between pb-68">
+                <div class="text-grey">{{ $t('止损') }}</div>
+                <div class="textColor">{{ detail.stop_price_loss }}</div>
+            </div>
             <div class="flex justify-between pb-68">
                 <div class="text-grey">{{ $t('订单号') }}</div>
                 <div class="textColor">{{ detail.order_no }}</div>
             </div>
             <div class="flex justify-between pb-68">
                 <div class="text-grey">{{ $t('开仓时间') }}</div>
-                <div class="textColor">{{ detail.create_time }}</div>
+                <div class="textColor">{{ detail.create_time.split(' ')[0] + " " + this.initDate(detail.create_time.split(' ')[1]) }}</div>
             </div>
             <div class="flex justify-between pb-68">
                 <div class="text-grey">{{ $t('平仓时间') }}</div>
-                <div class="textColor">{{ detail.close_time }}</div>
+                <div class="textColor">{{ detail.create_time.split(' ')[0] + " " + this.initDate(detail.close_time.split(' ')[1]) }}</div>
             </div>
         </div>
     </div>
@@ -69,6 +69,7 @@
 <script>
 import { _orderHoldDetail } from "@/API/trade.api";
 import assetsHead from "@/components/assets-head";
+import { init } from "klinecharts";
 import { Popup } from "vant";
 export default {
     name: "orderDetail",
@@ -90,6 +91,12 @@
         }, 1000);
     },
     methods: {
+        initDate(originalTimeStr) {
+            const now = new Date(); // 创建一个当前日期时间的实例，这里只使用日期部分不影响时间部分
+            const timeParts = originalTimeStr.split(':'); // 将时间字符串拆分为时、分、秒
+            now.setHours(timeParts[0], timeParts[1], timeParts[2]); // 设置日期时间的小时、分钟、秒，但不改变日期
+            return now.toLocaleTimeString('en-US');
+        },
         handleText(state) {
             let str = '';
             if (state == 'created') {
diff --git a/src/utils/filter.js b/src/utils/filter.js
index 41476e6..a6d4c99 100644
--- a/src/utils/filter.js
+++ b/src/utils/filter.js
@@ -1,10 +1,15 @@
 import store from "@/store";
 export function _symbolName(str, type) {
-  const data = store.state?.home?.coinList;
+  let data = store.state?.home?.coinList;
   let symbol = "";
+  let result = data.find(item => item.symbol == "btc")
+  result.symbolFullName = 'BTC/USDT'
+  let result1 = data.find(item => item.symbol == "eth")
+  result1.symbolFullName = 'ETH/USDT'
   if (data) {
     // console.log(data, "====");
     let arr = data.filter((item) => item.symbol === str);
+    // console.log(arr,"====");
     if (arr[0] && arr[0]?.symbol === str) {
       let symbol1 = arr[0].symbolFullName;
       if (type) {

--
Gitblit v1.9.3