From b401c43ade9efc3c52806d9f61a0763574a9f553 Mon Sep 17 00:00:00 2001
From: liaoxinyu <liaoxinyu@xingtongworld.com>
Date: Tue, 10 Dec 2024 09:29:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=88=E7=BA=A6=E5=8E=86?=
 =?UTF-8?q?=E5=8F=B2=E8=AE=B0=E5=BD=95=E6=98=BE=E7=A4=BAAM/PM?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/class/date.js                   | 2 +-
 src/views/contract/handicap.vue           | 2 +-
 src/views/contract/history-commission.vue | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/utils/class/date.js b/src/utils/class/date.js
index a536407..79ea865 100644
--- a/src/utils/class/date.js
+++ b/src/utils/class/date.js
@@ -127,7 +127,7 @@ function parseTime1(time, isOffset = false, cformat = null) {
 	// let format = cformat || '{y}-{m}-{d} {h}:{i}:{s}';
 	let format = cformat || '{y}-{m}-{d} {h}:{i}:{s} {a}';
 
-	const date = time2Date1(time, isOffset);
+	const date = time2Date(time, isOffset);
 
 	// 将日期时间值存入对象中
 	const dataObj = {
diff --git a/src/views/contract/handicap.vue b/src/views/contract/handicap.vue
index 868ce72..3302791 100644
--- a/src/views/contract/handicap.vue
+++ b/src/views/contract/handicap.vue
@@ -107,7 +107,7 @@
             {{ $t("contract.e1") }}({{ $t("contract.e2") }})
           </div>
         </div>
-        <div class="d-flex fn-14" v-for="(item, idx) in tradeList" :key="idx">
+        <div class="d-flex fn-14" v-for="(item, idx) in tradeList.slice(0,30)" :key="idx">
           <div class="w-10/24">
             {{ parseTime(item.ts, false, "{h}:{i}:{s}") }}
           </div>
diff --git a/src/views/contract/history-commission.vue b/src/views/contract/history-commission.vue
index eb3cc37..882435c 100644
--- a/src/views/contract/history-commission.vue
+++ b/src/views/contract/history-commission.vue
@@ -21,7 +21,8 @@
             <tr v-for="item in list" :key="item.id">
                 <td>{{ item.symbol }}/USDT</td>
                 <td>{{ item.lever_rate }}X</td>
-                <td>{{ item.updated_ats | parseTime}}</td>
+				<td>{{ item.updated_ats | parseTime1}}</td>
+                <!-- <td>{{ item.updated_ats | parseTime}}</td> -->
                 <!-- <td>{{ item.created_at | parseTime}}</td> -->
                 <td>{{ cals(item.side, item.order_type) }}</td>
                 <td>{{ item.traded_amount }}/{{ item.amount }}</td>
@@ -115,6 +116,7 @@
 <script>
 import Contract from "@/api/contract";
 import math from "@/utils/class/math";
+import date from "@/utils/class/date";
 export default {
   name: "history-commission",
   props: {
@@ -138,6 +140,7 @@ export default {
     this.getHistoryEntrust();
   },
   methods: {
+	parseTime1: date.parseTime1,
     status(status) {
       switch (status) {
         case 0: