diff --git a/apps/web-antd/src/api/mp/account/index.ts b/apps/web-antd/src/api/mp/account/index.ts index 20c0ebad7..aa8557f15 100644 --- a/apps/web-antd/src/api/mp/account/index.ts +++ b/apps/web-antd/src/api/mp/account/index.ts @@ -16,12 +16,6 @@ export namespace MpAccountApi { remark?: string; createTime?: Date; } - - // TODO @dylan:这个直接使用 Account,简化一点; - export interface AccountSimple { - id: number; - name: string; - } } /** 查询公众号账号列表 */ @@ -41,7 +35,7 @@ export function getAccount(id: number) { /** 查询公众号账号列表 */ export function getSimpleAccountList() { - return requestClient.get( + return requestClient.get( '/mp/account/list-all-simple', ); } diff --git a/apps/web-antd/src/api/mp/message/index.ts b/apps/web-antd/src/api/mp/message/index.ts index 5d0d17295..8395e2933 100644 --- a/apps/web-antd/src/api/mp/message/index.ts +++ b/apps/web-antd/src/api/mp/message/index.ts @@ -9,13 +9,29 @@ export namespace MpMessageApi { export interface Message { id?: number; accountId: number; - type: MessageType; + type: MessageType | string; openid: string; content: string; mediaId?: string; status: number; remark?: string; createTime?: Date; + sendFrom?: number; + userId?: number; + event?: string; + eventKey?: string; + mediaUrl?: string; + recognition?: string; + url?: string; + title?: string; + label?: string; + locationX?: number; + locationY?: number; + thumbMediaUrl?: string; + musicUrl?: string; + hqMusicUrl?: string; + description?: string; + articles?: any[]; } /** 发送消息请求 */ diff --git a/apps/web-antd/src/components/form-create/components/use-api-select.tsx b/apps/web-antd/src/components/form-create/components/use-api-select.tsx index 5de9903ff..c63e2cd1e 100644 --- a/apps/web-antd/src/components/form-create/components/use-api-select.tsx +++ b/apps/web-antd/src/components/form-create/components/use-api-select.tsx @@ -145,8 +145,8 @@ export function useApiSelect(option: ApiSelectProps) { } return { - label: label, - value: value, + label, + value, }; }); return; diff --git a/apps/web-antd/src/components/form-create/helpers.ts b/apps/web-antd/src/components/form-create/helpers.ts index cfc5de10b..f43b1ce6d 100644 --- a/apps/web-antd/src/components/form-create/helpers.ts +++ b/apps/web-antd/src/components/form-create/helpers.ts @@ -202,10 +202,10 @@ export async function useFormCreateDesigner(designer: Ref) { value: 'id', options: [ { label: '部门编号', value: 'id' }, - { label: '部门名称', value: 'name' } - ] - } - ] + { label: '部门名称', value: 'name' }, + ], + }, + ], }); const dictSelectRule = useDictSelectRule(); const apiSelectRule0 = useSelectRule({ diff --git a/apps/web-antd/src/components/select-modal/index.ts b/apps/web-antd/src/components/select-modal/index.ts index a03a07ca0..2b6e91893 100644 --- a/apps/web-antd/src/components/select-modal/index.ts +++ b/apps/web-antd/src/components/select-modal/index.ts @@ -1,3 +1,2 @@ -// TODO @xingyu:【待讨论】是不是把 user select 放到 user 目录的 components 下,dept select 放到 dept 目录的 components 下 export { default as DeptSelectModal } from './dept-select-modal.vue'; export { default as UserSelectModal } from './user-select-modal.vue'; diff --git a/apps/web-antd/src/components/select-modal/user-select-modal.vue b/apps/web-antd/src/components/select-modal/user-select-modal.vue index bd31a0d5c..77ef98155 100644 --- a/apps/web-antd/src/components/select-modal/user-select-modal.vue +++ b/apps/web-antd/src/components/select-modal/user-select-modal.vue @@ -1,6 +1,5 @@ diff --git a/apps/web-antd/src/views/mall/promotion/kefu/modules/member/member-info.vue b/apps/web-antd/src/views/mall/promotion/kefu/modules/member/member-info.vue index 4ffad2af4..742509d83 100644 --- a/apps/web-antd/src/views/mall/promotion/kefu/modules/member/member-info.vue +++ b/apps/web-antd/src/views/mall/promotion/kefu/modules/member/member-info.vue @@ -139,13 +139,13 @@ async function getUserData() {