From 64a6e4e36235a9fb865a730b10663c3292b5c4d4 Mon Sep 17 00:00:00 2001 From: LovableCat Date: Wed, 19 Mar 2025 13:54:25 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=82=80=E8=AF=B7=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=20https://gitcode.com/hk=5FopenRepo/OpenRepo?= =?UTF-8?q?=5FPortal/issues/69?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- .../Jyh/PersonalCenter/Detail/InvitationNoticeList.vue | 6 ++++-- .../OrganizationManage/OrganizationManage.vue | 5 ++++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index bfada84..c312fa9 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "axios": "^1.6.8", "canvas-confetti": "^1.9.2", "crypto-js": "^4.1.1", - "dayjs": "^1.11.9", + "dayjs": "^1.11.13", "devui-theme": "^0.0.7", "dompurify": "^3.0.5", "js-cookie": "^3.0.5", diff --git a/src/views/Jyh/PersonalCenter/Detail/InvitationNoticeList.vue b/src/views/Jyh/PersonalCenter/Detail/InvitationNoticeList.vue index 187de92..e2f6dd7 100644 --- a/src/views/Jyh/PersonalCenter/Detail/InvitationNoticeList.vue +++ b/src/views/Jyh/PersonalCenter/Detail/InvitationNoticeList.vue @@ -56,6 +56,7 @@ import { acceptInvite, getInviteListData } from '@/api/jyh'; import { ref, shallowReactive } from 'vue'; import NoData from "@/components/NoData/NoData.vue"; import { Message } from 'vue-devui'; +import dayjs from "dayjs"; const noticeTableData = ref([]); const pager = shallowReactive({ @@ -74,7 +75,8 @@ const queryInviteListData = async () => { noticeTableData.value = data.data.data.data.map(item => { return { ...item, - content: `尊敬的用户，您好！为更好地整合资源、协同开发，现诚邀您加入${item.name}。` + content: `现诚邀您加入组织【${item.name}】。`, + createTime: dayjs(item.createTime).format('YYYY-MM-DD HH:mm:ss'), } }); pager.total = data.data.data.data.length; @@ -106,4 +108,4 @@ const handleAccept = async (row, type) => { text-align: right; } } - \ No newline at end of file + diff --git a/src/views/Jyh/PersonalCenter/OrganizationManage/OrganizationManage.vue b/src/views/Jyh/PersonalCenter/OrganizationManage/OrganizationManage.vue index 168b731..7365a03 100644 --- a/src/views/Jyh/PersonalCenter/OrganizationManage/OrganizationManage.vue +++ b/src/views/Jyh/PersonalCenter/OrganizationManage/OrganizationManage.vue @@ -142,6 +142,7 @@ import { type UserInfoType, } from '@/api/organizationManage/organizationManageType'; import {getUserInfo} from "@/api/user"; +import dayjs from "dayjs"; const userInfo = shallowRef({ username: '', @@ -323,7 +324,9 @@ async function getMemberList() { try { const res = await getOrganizationMemberListApi({ groupId: organizationInfo.value.groupId }); if (res.data?.code === 200) { - originMemberList = res.data?.data; + originMemberList = res.data?.data.map(item => { + return { ...item, createTime: dayjs(item.createTime).format('YYYY-MM-DD HH:mm:ss') }; + }); pager.total = originMemberList.length; updateFilterTableList(); } else { From 2953efb0f9651786ca83404128f8f4fc178b04e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E5=B0=91=E4=BC=9F?= Date: Wed, 19 Mar 2025 13:58:34 +0800 Subject: [PATCH 2/3] fix: login modal size --- src/components/LoginModal/index.vue | 9 +++++++-- src/views/Jyh/Home/index.vue | 9 ++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/components/LoginModal/index.vue b/src/components/LoginModal/index.vue index f149490..8d95d62 100644 --- a/src/components/LoginModal/index.vue +++ b/src/components/LoginModal/index.vue @@ -794,10 +794,15 @@ $active-title: var(--color-CG900); $active-color: var(--color-CG800); $inactive-title: var(--color-CG500); $active-panel: var(--color-G800); -iframe { +.login-modal-l iframe { border: 0; width: 100%; - height: 60vh; + height: 400px; +} +.login-modal-r iframe { + border: 0; + width: 100%; + height: 580px; } .login-modal { box-sizing: border-box; diff --git a/src/views/Jyh/Home/index.vue b/src/views/Jyh/Home/index.vue index 3eabbee..7b4ce3a 100644 --- a/src/views/Jyh/Home/index.vue +++ b/src/views/Jyh/Home/index.vue @@ -48,13 +48,7 @@ - +