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/locales/langs/en-US/page.json b/apps/web-antd/src/locales/langs/en-US/page.json index 40a19ac6b..2d972fe0c 100644 --- a/apps/web-antd/src/locales/langs/en-US/page.json +++ b/apps/web-antd/src/locales/langs/en-US/page.json @@ -34,7 +34,10 @@ "mp": { "upload": { "invalidFormat": "Invalid {0} format!", - "maxSize": "{0} size cannot exceed {1}M!" + "maxSize": "{0} size cannot exceed {1}M!", + "image": "Image", + "video": "Video", + "voice": "Voice" } } } diff --git a/apps/web-antd/src/locales/langs/zh-CN/page.json b/apps/web-antd/src/locales/langs/zh-CN/page.json index 5d1c246e1..d7ef79e6e 100644 --- a/apps/web-antd/src/locales/langs/zh-CN/page.json +++ b/apps/web-antd/src/locales/langs/zh-CN/page.json @@ -34,7 +34,10 @@ "mp": { "upload": { "invalidFormat": "上传{0}格式不对!", - "maxSize": "上传{0}大小不能超过{1}M!" + "maxSize": "上传{0}大小不能超过{1}M!", + "image": "图片", + "video": "视频", + "voice": "语音" } } } diff --git a/apps/web-antd/src/views/mall/product/spu/components/spu-and-sku-list.vue b/apps/web-antd/src/views/mall/product/spu/components/spu-and-sku-list.vue index ddc1ab3d8..ea5cc0b8a 100644 --- a/apps/web-antd/src/views/mall/product/spu/components/spu-and-sku-list.vue +++ b/apps/web-antd/src/views/mall/product/spu/components/spu-and-sku-list.vue @@ -1,7 +1,5 @@ diff --git a/apps/web-antd/src/views/mp/components/wx-material-select/wx-material-select.vue b/apps/web-antd/src/views/mp/components/wx-material-select/wx-material-select.vue index 1026b7e78..ea767382b 100644 --- a/apps/web-antd/src/views/mp/components/wx-material-select/wx-material-select.vue +++ b/apps/web-antd/src/views/mp/components/wx-material-select/wx-material-select.vue @@ -1,5 +1,6 @@ - - diff --git a/apps/web-antd/src/views/mp/components/wx-reply/tab-image.vue b/apps/web-antd/src/views/mp/components/wx-reply/tab-image.vue index a7e26d069..9754b1fd3 100644 --- a/apps/web-antd/src/views/mp/components/wx-reply/tab-image.vue +++ b/apps/web-antd/src/views/mp/components/wx-reply/tab-image.vue @@ -104,10 +104,18 @@ function selectMaterial(item: any) { - - diff --git a/apps/web-antd/src/views/mp/components/wx-reply/tab-voice.vue b/apps/web-antd/src/views/mp/components/wx-reply/tab-voice.vue index a09fb9e62..94db76d3d 100644 --- a/apps/web-antd/src/views/mp/components/wx-reply/tab-voice.vue +++ b/apps/web-antd/src/views/mp/components/wx-reply/tab-voice.vue @@ -105,12 +105,19 @@ function selectMaterial(item: Reply) {