From fa7e0b0964e6bcc8f5f07789d880cdbc639d3bb4 Mon Sep 17 00:00:00 2001
From: guofei <guofeichu@gmail.com>
Date: Fri, 21 Jun 2024 18:49:18 +0800
Subject: [PATCH] fix: format utc

---
 src/pages/User/UserDetails.tsx | 4 ++--
 src/pages/User/index.tsx       | 9 +++++----
 src/utils/format.ts            | 6 ++++++
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/pages/User/UserDetails.tsx b/src/pages/User/UserDetails.tsx
index fabc307..9f3e125 100644
--- a/src/pages/User/UserDetails.tsx
+++ b/src/pages/User/UserDetails.tsx
@@ -1,6 +1,6 @@
 import { getUserByIdAPI } from '@/services/system/user';
 import { OrderPayType, OrderPayTypeStr, OrderStatus, UxOrderStatus, UxOrderStatusTag } from '@/utils/const';
-import { formatDateTime } from '@/utils/format';
+import { formatDateTimeToUTC } from '@/utils/format';
 import { AlipayCircleOutlined, WechatOutlined } from '@ant-design/icons';
 import { ActionType } from '@ant-design/pro-components';
 import { Descriptions, Empty, Form, Modal, Spin, Table, Tabs } from 'antd';
@@ -256,7 +256,7 @@ const UserDetailsModal = (props: PropTypes) => {
             title: '扩容时间',
             dataIndex: 'createDate',
             align: 'center',
-            render: (_, record: User.UserItemByInfo['dilatationLogs'][0]) => formatDateTime(record.createDate),
+            render: (_, record: User.UserItemByInfo['dilatationLogs'][0]) => formatDateTimeToUTC(record.createDate),
           },
           {
             title: '备注',
diff --git a/src/pages/User/index.tsx b/src/pages/User/index.tsx
index b351fc5..3a5ecde 100644
--- a/src/pages/User/index.tsx
+++ b/src/pages/User/index.tsx
@@ -2,7 +2,7 @@ import { changeStatusAPI, delUxUserAPI, getUserListAPI } from '@/services/system
 import { ActionType, ProColumns, ProTable } from '@ant-design/pro-components';
 import { App, Button, Radio, Space, TableProps, message } from 'antd';
 
-import { formatDateTime } from '@/utils/format';
+import { formatDateTimeToUTC } from '@/utils/format';
 import { useRef, useState } from 'react';
 import CreateModel from './CreateModule';
 import DilatationModel from './Dilatation';
@@ -181,7 +181,7 @@ const Page = () => {
       dataIndex: 'expired',
       align: 'center',
       hideInSearch: true,
-      renderText: (_, record: User.UserItem) => (!record.expired ? '-' : formatDateTime(record.expired)),
+      renderText: (_, record: User.UserItem) => (!record.expired ? '-' : formatDateTimeToUTC(record.expired)),
     },
     {
       title: '账户创建时间',
@@ -189,14 +189,15 @@ const Page = () => {
       align: 'center',
       hideInSearch: true,
       renderText: (_, record: User.UserItem) =>
-        !record.createdDateTime ? '-' : formatDateTime(record.createdDateTime),
+        !record.createdDateTime ? '-' : formatDateTimeToUTC(record.createdDateTime),
     },
     {
       title: '最后登录时间',
       dataIndex: 'lastLoginTime',
       align: 'center',
       hideInSearch: true,
-      renderText: (_, record: User.UserItem) => (!record.lastLoginTime ? '-' : formatDateTime(record.lastLoginTime)),
+      renderText: (_, record: User.UserItem) =>
+        !record.lastLoginTime ? '-' : formatDateTimeToUTC(record.lastLoginTime),
     },
     {
       title: '操作',
diff --git a/src/utils/format.ts b/src/utils/format.ts
index 6191520..1e9a4f8 100644
--- a/src/utils/format.ts
+++ b/src/utils/format.ts
@@ -1,5 +1,7 @@
 // @ts-ignore
 import dayjs from 'dayjs';
+import utc from 'dayjs/plugin/utc';
+dayjs.extend(utc);
 
 // 示例方法，没有实际意义
 export function trim(str: string) {
@@ -9,3 +11,7 @@ export function trim(str: string) {
 export const formatDateTime = (time: string) => {
   return dayjs(time).format('YYYY-MM-DD HH:ss:mm');
 };
+
+export const formatDateTimeToUTC = (time: string) => {
+  return dayjs(time).utc().format('YYYY-MM-DD HH:ss:mm');
+};