diff --git a/apps/web-antd/src/api/system/user/index.ts b/apps/web-antd/src/api/system/user/index.ts index caa0204a9..1f4903682 100644 --- a/apps/web-antd/src/api/system/user/index.ts +++ b/apps/web-antd/src/api/system/user/index.ts @@ -41,6 +41,13 @@ export function getUser(id: number) { return requestClient.get(`/system/user/get?id=${id}`); } +/** 查询用户列表 */ +export function getUserList(ids: number[]) { + return requestClient.get('/system/user/list', { + params: { ids: ids.join(',') }, + }); +} + /** 新增用户 */ export function createUser(data: SystemUserApi.User) { return requestClient.post('/system/user/create', data); diff --git a/apps/web-antd/src/views/im/home/components/card/CardBubble.vue b/apps/web-antd/src/views/im/home/components/card/card-bubble.vue similarity index 97% rename from apps/web-antd/src/views/im/home/components/card/CardBubble.vue rename to apps/web-antd/src/views/im/home/components/card/card-bubble.vue index ce5c0d239..0fb56daa5 100644 --- a/apps/web-antd/src/views/im/home/components/card/CardBubble.vue +++ b/apps/web-antd/src/views/im/home/components/card/card-bubble.vue @@ -8,7 +8,7 @@ import { getCardLabelInfo } from '#/views/im/utils/message' -import UserAvatar from '../user/UserAvatar.vue' +import { UserAvatar } from '../user' defineOptions({ name: 'ImCardBubble' }) diff --git a/apps/web-antd/src/views/im/home/components/card/CardLineLabel.vue b/apps/web-antd/src/views/im/home/components/card/card-line-label.vue similarity index 100% rename from apps/web-antd/src/views/im/home/components/card/CardLineLabel.vue rename to apps/web-antd/src/views/im/home/components/card/card-line-label.vue diff --git a/apps/web-antd/src/views/im/home/components/card/index.ts b/apps/web-antd/src/views/im/home/components/card/index.ts new file mode 100644 index 000000000..ac62b1b09 --- /dev/null +++ b/apps/web-antd/src/views/im/home/components/card/index.ts @@ -0,0 +1,2 @@ +export { default as CardBubble } from './card-bubble.vue'; +export { default as CardLineLabel } from './card-line-label.vue'; diff --git a/apps/web-antd/src/views/im/home/components/ContextMenu.vue b/apps/web-antd/src/views/im/home/components/context-menu.vue similarity index 100% rename from apps/web-antd/src/views/im/home/components/ContextMenu.vue rename to apps/web-antd/src/views/im/home/components/context-menu.vue diff --git a/apps/web-antd/src/views/im/home/components/friend/FriendAddDialog.vue b/apps/web-antd/src/views/im/home/components/friend/friend-add-dialog.vue similarity index 98% rename from apps/web-antd/src/views/im/home/components/friend/FriendAddDialog.vue rename to apps/web-antd/src/views/im/home/components/friend/friend-add-dialog.vue index e83172b6a..bd8578848 100644 --- a/apps/web-antd/src/views/im/home/components/friend/FriendAddDialog.vue +++ b/apps/web-antd/src/views/im/home/components/friend/friend-add-dialog.vue @@ -14,7 +14,7 @@ import { getCurrentUserId } from '#/views/im/utils/auth' import { ImFriendAddSource } from '../../../utils/constants' import { getGenderColor, getGenderIcon } from '../../../utils/user' import { useFriendStore } from '../../store/friendStore' -import UserAvatar from '../user/UserAvatar.vue' +import { UserAvatar } from '../user' defineOptions({ name: 'ImFriendAddDialog' }) @@ -159,7 +159,13 @@ async function handleSubmitApply() { - 第一层 search:按昵称搜索用户列表 - 第二层 apply:选中用户后展开「申请添加朋友」表单(申请理由 + 备注) --> - +