From b9fbd871074ba7b4f4893290fc669f3a8d62634b Mon Sep 17 00:00:00 2001
From: dcc <dcc@163.com>
Date: Sat, 03 Aug 2024 14:59:37 +0800
Subject: [PATCH] 123
---
src/views/wallet/menu/walletOverview.vue | 2
src/components/constract/DeliveryContract/DetailDialog.vue | 4 +-
src/views/order/spotOrder.vue | 2
src/components/spot/SpotPosition/positionTable.vue | 6 +-
src/views/wallet/recharge.vue | 2
src/views/order/exchangeHistory.vue | 4 +-
src/components/constract/DeliveryContract/position.vue | 6 ++-
src/views/order/contractHistoryOrder.vue | 2
src/views/order/walletHistory.vue | 6 +-
src/components/constract/PerpetualContract/positionCom/currentApplyPosition.vue | 2
src/utils/utils.js | 42 ++++++++++++++++++++-
src/views/order/deliveryHistoryOrder.vue | 4 +-
12 files changed, 61 insertions(+), 21 deletions(-)
diff --git a/src/components/constract/DeliveryContract/DetailDialog.vue b/src/components/constract/DeliveryContract/DetailDialog.vue
index d1e9c19..76dd84a 100644
--- a/src/components/constract/DeliveryContract/DetailDialog.vue
+++ b/src/components/constract/DeliveryContract/DetailDialog.vue
@@ -38,10 +38,10 @@
<!-- 盈亏 -->
<div v-show="showProfit" class="font-size18 text-center yingkui">
<div v-if="detailData.profit > 0" class="green">
- {{ $t("message.home.yingkui") }} {{ detailData.profit }} USD
+ {{ $t("message.home.yingkui") }} {{ detailData.profit }} USDT
</div>
<div v-else class="red">
- {{ $t("message.home.yingkui") }} {{ detailData.profit }} USD
+ {{ $t("message.home.yingkui") }} {{ detailData.profit }} USDT
</div>
</div>
<!-- 交割信息 -->
diff --git a/src/components/constract/DeliveryContract/position.vue b/src/components/constract/DeliveryContract/position.vue
index fa2fc20..5134fe1 100644
--- a/src/components/constract/DeliveryContract/position.vue
+++ b/src/components/constract/DeliveryContract/position.vue
@@ -106,7 +106,7 @@
<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",
diff --git a/src/components/constract/PerpetualContract/positionCom/currentApplyPosition.vue b/src/components/constract/PerpetualContract/positionCom/currentApplyPosition.vue
index b956c43..cbb77fd 100644
--- a/src/components/constract/PerpetualContract/positionCom/currentApplyPosition.vue
+++ b/src/components/constract/PerpetualContract/positionCom/currentApplyPosition.vue
@@ -79,7 +79,7 @@
prop: "create_time",
label: "message.home.shijian",
formatter: (row) => {
- return row.create_time.split(' ')[0] + ' ' + initDate(row.create_time.split(' ')[1])
+ return row.create_time.split(/ +/)[0] + ' ' + initDate(row.create_time.split(/ +/)[1])
}
},
{
diff --git a/src/components/spot/SpotPosition/positionTable.vue b/src/components/spot/SpotPosition/positionTable.vue
index 98907dd..b00b71d 100644
--- a/src/components/spot/SpotPosition/positionTable.vue
+++ b/src/components/spot/SpotPosition/positionTable.vue
@@ -22,7 +22,7 @@
v-for="(cItem, cIndex) in contentList"
:key="cIndex"
>
- <div>{{ cItem.create_time.split(' ')[0] + ' ' + initDate(cItem.create_time.split(' ')[1])}}</div>
+ <div>{{ cItem.create_time.split(/ +/)[0] + ' ' + initDate(cItem.create_time.split(/ +/)[1])}}</div>
<div>{{ cItem.name }}</div>
<div>
{{
@@ -66,7 +66,7 @@
v-for="(cItem, cIndex) in contentList"
:key="cIndex"
>
- <div>{{ cItem.create_time.split(' ')[0] + " " + initDate(cItem.create_time.split(' ')[1]) }}</div>
+ <div>{{ cItem.create_time.split(/ +/)[0] + " " + initDate(cItem.create_time.split(/ +/)[1]) }}</div>
<div>{{ cItem.name }}</div>
<div>
{{
@@ -104,7 +104,7 @@
v-for="(cItem, cIndex) in contentList"
:key="cIndex"
>
- <div>{{ cItem.create_time.split(' ')[0] + ' ' + initDate(cItem.create_time.split(' ')[1]) }}</div>
+ <div>{{ cItem.create_time.split(/ +/)[0] + ' ' + initDate(cItem.create_time.split(/ +/)[1]) }}</div>
<div>{{ cItem.name }}</div>
<div :class="[cItem.offset == 'open' ? 'buy' : 'sell']">
{{
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 2e61c45..c9c66e0 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -44,10 +44,48 @@
}
};
+//转成12小时制时间
export const initDate = (originalTimeStr) => {
const now = new Date(); // 创建一个当前日期时间的实例，这里只使用日期部分不影响时间部分
- const timeParts = originalTimeStr.split(':'); // 将时间字符串拆分为时、分、秒
+ const timeParts = originalTimeStr.split(":"); // 将时间字符串拆分为时、分、秒
now.setHours(timeParts[0], timeParts[1], timeParts[2]); // 设置日期时间的小时、分钟、秒，但不改变日期
- return now.toLocaleTimeString('en-US');
+ return now.toLocaleTimeString("en-US");
};
+//转成24小时制时间
+export const timeString = (timeString) => {
+ let [datePart, timePart, mPart] = timeString.split(/ +/);
+ let [hours, minutes, seconds] = timePart.split(":");
+ console.log(timePart, hours);
+ // 如果是下午（PM），并且小时不是12，则将其转换为24小时制
+ if (mPart.includes("PM") && hours !== "12") {
+ console.log(parseInt(hours, 10) + 12);
+ hours = parseInt(hours, 10) + 12;
+ }
+ // 如果是上午（AM）并且小时是12，则小时部分设为0
+ if (mPart.includes("AM") && hours === "12") {
+ hours = "00";
+ }
+ // 补足小时、分钟和秒的格式
+ hours = hours.toString().padStart(2, "0");
+ let twentyFourHourTimeString = `${datePart} ${hours}:${minutes}:${seconds}`;
+ return twentyFourHourTimeString
+};
+
+// 美国时间
+export const dateString = (inputDateTime) => {
+ let time
+ if(/[a-zA-Z]/.test(inputDateTime)){
+ time = timeString(inputDateTime)
+ }else{
+ time = inputDateTime
+ }
+ // 将输入的日期时间字符串转换为Date对象
+ var date = new Date(time.replace(/ /, "T"));
+ // 减去12小时
+ date.setHours(date.getHours() - 12);
+ // 格式化输出结果
+ var outputDateTime = date.toLocaleString()
+ outputDateTime = outputDateTime.replaceAll('/','-')
+ return outputDateTime
+};
diff --git a/src/views/order/contractHistoryOrder.vue b/src/views/order/contractHistoryOrder.vue
index c3c3ef7..84d0975 100644
--- a/src/views/order/contractHistoryOrder.vue
+++ b/src/views/order/contractHistoryOrder.vue
@@ -129,7 +129,7 @@
const res = await getContractOrder(data);
this.tableData = res.data;
this.tableData.forEach( item => {
- item.close_time = item.close_time.split(' ')[0] + ' ' + initDate(item.close_time.split(' ')[1])
+ item.close_time = item.close_time.split(/ +/)[0] + ' ' + initDate(item.close_time.split(/ +/)[1])
})
this.tableLength = res.data.length;
if (this.tableLength == 0 || this.tableLength < 10) {
diff --git a/src/views/order/deliveryHistoryOrder.vue b/src/views/order/deliveryHistoryOrder.vue
index c8ffd98..4b6a456 100644
--- a/src/views/order/deliveryHistoryOrder.vue
+++ b/src/views/order/deliveryHistoryOrder.vue
@@ -119,8 +119,8 @@
console.log(111, "交割合约订单接口", res.data);
this.tableData = res.data;
this.tableData.forEach( item => {
- item.settlement_time = item.settlement_time.split(' ')[0] + ' ' + initDate(item.settlement_time.split(' ')[1])
- item.close_time = item.close_time.split(' ')[0] + ' ' + initDate(item.close_time.split(' ')[1])
+ item.settlement_time = item.settlement_time.split(/ +/)[0] + ' ' + initDate(item.settlement_time.split(/ +/)[1])
+ item.close_time = item.close_time.split(/ +/)[0] + ' ' + initDate(item.close_time.split(/ +/)[1])
})
this.tableLength = res.data.length;
},
diff --git a/src/views/order/exchangeHistory.vue b/src/views/order/exchangeHistory.vue
index 091a7a1..4a8cb46 100644
--- a/src/views/order/exchangeHistory.vue
+++ b/src/views/order/exchangeHistory.vue
@@ -88,9 +88,9 @@
this.tableData = res.data;
this.tableData.forEach((item) => {
item.create_time =
- item.create_time.split(" ")[0] +
+ item.create_time.split(/ +/)[0] +
" " +
- initDate(item.create_time.split(" ")[1]);
+ initDate(item.create_time.split(/ +/)[1]);
});
this.tableLength = res.data.length;
},
diff --git a/src/views/order/spotOrder.vue b/src/views/order/spotOrder.vue
index d92a357..52dd264 100644
--- a/src/views/order/spotOrder.vue
+++ b/src/views/order/spotOrder.vue
@@ -131,7 +131,7 @@
const res = await getSpotOrder(data);
this.tableData = res.data;
this.tableData.forEach((item,index) => {
- item.create_time = item.create_time.split(' ')[0] + ' ' + initDate(item.create_time.split(' ')[1])
+ item.create_time = item.create_time.split(/ +/)[0] + ' ' + initDate(item.create_time.split(/ +/)[1])
})
this.tableLength = res.data.length;
},
diff --git a/src/views/order/walletHistory.vue b/src/views/order/walletHistory.vue
index 5573b13..9b1e326 100644
--- a/src/views/order/walletHistory.vue
+++ b/src/views/order/walletHistory.vue
@@ -152,7 +152,7 @@
<span class="label"
>{{ $t("message.user.dingdanshijian3") }}:
</span>
- <span>{{ detailData.create_time.split(' ')[0] + ' ' + initDate(detailData.create_time.split(' ')[1]) }}</span>
+ <span>{{ detailData.create_time.split(/ +/)[0] + ' ' + initDate(detailData.create_time.split(/ +/)[1]) }}</span>
</div>
<div>
<span class="label"> {{ $t("message.user.dingdanhao3") }}: </span>
@@ -260,9 +260,9 @@
console.log(this.tableData);
this.tableData.forEach((item) => {
item.createTimeStr =
- item.createTimeStr.split(" ")[0] +
+ item.createTimeStr.split(/ +/)[0] +
" " +
- initDate(item.createTimeStr.split(" ")[1]);
+ initDate(item.createTimeStr.split(/ +/)[1]);
});
this.tableLength = res.data.length;
});
diff --git a/src/views/wallet/menu/walletOverview.vue b/src/views/wallet/menu/walletOverview.vue
index 055e544..42804f2 100644
--- a/src/views/wallet/menu/walletOverview.vue
+++ b/src/views/wallet/menu/walletOverview.vue
@@ -160,7 +160,7 @@
{{ $t("message.user.chongzhi") }}
</div>
<div v-else>{{ $t("message.user.tixian") }}</div>
- <div class="linght-grey-color">{{ item.createTimeStr.split(' ')[0] + ' ' + initDate(item.createTimeStr.split(' ')[1]) }}</div>
+ <div class="linght-grey-color">{{ item.createTimeStr.split(/ +/)[0] + ' ' + initDate(item.createTimeStr.split(/ +/)[1]) }}</div>
</div>
</div>
<div class="flex-column" style="text-align: right">
diff --git a/src/views/wallet/recharge.vue b/src/views/wallet/recharge.vue
index 486ba42..748c6ac 100644
--- a/src/views/wallet/recharge.vue
+++ b/src/views/wallet/recharge.vue
@@ -344,7 +344,7 @@
<div class="css-kzcb6r">
<div class="css-cp92rp">
<div class="css-ig082u">
- {{ item.createTime.split(' ')[0] + ' ' + initDate(item.createTime.split(' ')[1])}}
+ {{ item.createTime.split(/ +/)[0] + ' ' + initDate(item.createTime.split(/ +/)[1])}}
</div>
</div>
<div class="css-cp92rp">
--
Gitblit v1.9.3