diff --git a/apps/web-antd/package.json b/apps/web-antd/package.json index 847d65725..3f20b0f03 100644 --- a/apps/web-antd/package.json +++ b/apps/web-antd/package.json @@ -44,6 +44,7 @@ "@vben/types": "workspace:*", "@vben/utils": "workspace:*", "@videojs-player/vue": "catalog:", + "@vueuse/components": "catalog:", "@vueuse/core": "catalog:", "@vueuse/integrations": "catalog:", "ant-design-vue": "catalog:", diff --git a/apps/web-antd/src/api/mp/account/index.ts b/apps/web-antd/src/api/mp/account/index.ts index c5ee331b0..ec156eca2 100644 --- a/apps/web-antd/src/api/mp/account/index.ts +++ b/apps/web-antd/src/api/mp/account/index.ts @@ -5,12 +5,12 @@ import { requestClient } from '#/api/request'; export namespace MpAccountApi { /** 公众号账号信息 */ export interface Account { - id?: number; + id: number; name: string; - account: string; - appId: string; - appSecret: string; - token: string; + account?: string; + appId?: string; + appSecret?: string; + token?: string; aesKey?: string; qrCodeUrl?: string; remark?: string; 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 00a8c90b2..409137ee3 100644 --- a/apps/web-antd/src/locales/langs/en-US/page.json +++ b/apps/web-antd/src/locales/langs/en-US/page.json @@ -29,5 +29,11 @@ "tenant": { "placeholder": "Please select tenant", "success": "Switch tenant success" + }, + "mp": { + "upload": { + "invalidFormat": "Invalid {0} format!", + "maxSize": "{0} size cannot exceed {1}M!" + } } } 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 eefc4924b..f56160a6a 100644 --- a/apps/web-antd/src/locales/langs/zh-CN/page.json +++ b/apps/web-antd/src/locales/langs/zh-CN/page.json @@ -29,5 +29,11 @@ "tenant": { "placeholder": "请选择租户", "success": "切换租户成功" + }, + "mp": { + "upload": { + "invalidFormat": "上传{0}格式不对!", + "maxSize": "上传{0}大小不能超过{1}M!" + } } } diff --git a/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/component-container-property.vue b/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/component-container-property.vue index 0272acd0d..37cc1ac46 100644 --- a/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/component-container-property.vue +++ b/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/component-container-property.vue @@ -138,7 +138,11 @@ function handleSliderChange(prop: string) {

组件样式:

- + 纯色 图片 @@ -147,11 +151,17 @@ function handleSliderChange(prop: string) { - + 建议宽度 750px - - - diff --git a/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/carousel/property.vue b/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/carousel/property.vue index fc840dde3..bebf71f72 100644 --- a/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/carousel/property.vue +++ b/apps/web-antd/src/views/mall/promotion/components/diy-editor/components/mobile/carousel/property.vue @@ -34,49 +34,49 @@ const formData = useVModel(props, 'modelValue', emit);