merge lll-fix-nodata-img into master
邀请通知更新 Created-by: LovableCat Commit-by: LovableCat Merged-by: LovableCat Description: 邀请通知更新 See merge request: hk_openRepo/OpenRepo_Portal!45
This commit is contained in:
@@ -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",
|
||||
|
||||
@@ -55,6 +55,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({
|
||||
@@ -73,7 +74,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;
|
||||
|
||||
@@ -142,6 +142,7 @@ import {
|
||||
type UserInfoType,
|
||||
} from '@/api/organizationManage/organizationManageType';
|
||||
import {getUserInfo} from "@/api/user";
|
||||
import dayjs from "dayjs";
|
||||
|
||||
const userInfo = shallowRef<UserInfoType>({
|
||||
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 {
|
||||
|
||||
Reference in New Issue
Block a user