Browse Source

修改合约历史记录显示AM/PM

master
liaoxinyu 1 year ago
parent
commit
b401c43ade
  1. 2
      src/utils/class/date.js
  2. 2
      src/views/contract/handicap.vue
  3. 5
      src/views/contract/history-commission.vue

2
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 = {

2
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>

5
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:

Loading…
Cancel
Save