diff --git a/src/global.less b/src/global.less index ad4be4f..dd8f756 100644 --- a/src/global.less +++ b/src/global.less @@ -19,8 +19,8 @@ body, } .ant-pro-global-footer { - margin-top: 0; - margin-bottom: 0; + margin-top: 0 !important; + margin-bottom: 0 !important; } .ant-pro-sider.ant-layout-sider.ant-pro-sider-fixed { diff --git a/src/pages/ChatLogs/components/ChatTime.tsx b/src/pages/ChatLogs/components/ChatTime.tsx index f0ab88c..b30564b 100644 --- a/src/pages/ChatLogs/components/ChatTime.tsx +++ b/src/pages/ChatLogs/components/ChatTime.tsx @@ -14,13 +14,12 @@ export const ChatTime: React.FC = (props) => { const now = new Date(); const msgtimeStr = props.msgtime.replace(/-/g, '/'); const msgtime = new Date(msgtimeStr); - console.log(msgtime); const yesterday = new Date(); yesterday.setDate(yesterday.getDate() - 1); const dayDiff = (new Date( - `${now.getFullYear()}-${padWith(now.getMonth() + 1)}-${padWith(now.getDate())} 00:00:00`, + `${now.getFullYear()}/${padWith(now.getMonth() + 1)}/${padWith(now.getDate())} 00:00:00`, ).getTime() - new Date(msgtimeStr).getTime()) / (24 * 60 * 60 * 1000) + diff --git a/src/pages/ChatLogsPhone/index.tsx b/src/pages/ChatLogsPhone/index.tsx index d7968bf..b9599d7 100644 --- a/src/pages/ChatLogsPhone/index.tsx +++ b/src/pages/ChatLogsPhone/index.tsx @@ -629,6 +629,7 @@ const ChatLogsPhone: React.FC = () => { } onClose={() => { setOpenChatContentDrawer(false); + setChatLogs([]); }} bodyStyle={{ padding: 0, background: '#F5F5F5' }} >