From 6ddaa3a755a4e0ab57ff60dc09e05af40bd5fc03 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sun, 21 Jun 2026 21:24:05 -0700 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=90=B8=E6=94=B6=20Vue3=20=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E6=94=B6=E6=95=9B=E4=B8=8E=E4=BD=8E=E9=A3=8E=E9=99=A9?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 三端对齐 AI image 入参类型：DALL3 width/height 转 number，MJ base64Array 必填并初始化 - 收敛 CRM/BPM/IOT/Pay/Member/Mall/MP/Infra 等模块 VO 与表单类型 - 修复 mall kefu conversationList.toSorted 未写回导致排序无效 - Reward 商品范围数组改必填并初始化，表单直接绑定数组字段 - BPM form-design 去掉多余 props 捕获，收敛 form-create rule 类型 - simple-process 子流程固定多实例数量用 number 输入、string 存储 - 修复 web-ele 用户任务超时天数 ISO duration：P...D 而非 PT...D - 修复 web-antd BPM 表单设计模板孤立 > 噪声 验证：web-antd/web-ele clean typecheck 通过；web-antdv-next 既有错误未命中本轮文件 --- apps/web-antd/src/api/ai/image/index.ts | 6 ++-- .../src/api/crm/business/status/index.ts | 9 ++--- apps/web-antd/src/api/infra/codegen/index.ts | 16 +++++++-- .../src/api/infra/demo/demo03/erp/index.ts | 10 +++--- .../src/api/infra/demo/demo03/inner/index.ts | 10 +++--- .../src/api/infra/demo/demo03/normal/index.ts | 10 +++--- apps/web-antd/src/api/iot/ota/task/index.ts | 4 +-- apps/web-antd/src/api/iot/thingmodel/index.ts | 34 ++++++++++++++----- .../combination/combinationActivity.ts | 3 +- .../mall/promotion/reward/rewardActivity.ts | 6 ++-- .../mall/promotion/seckill/seckillActivity.ts | 2 +- .../src/api/mall/trade/config/index.ts | 19 ++++++----- apps/web-antd/src/api/member/config/index.ts | 2 +- apps/web-antd/src/api/member/user/index.ts | 24 +++++++------ apps/web-antd/src/api/mp/tag/index.ts | 8 ++++- apps/web-antd/src/api/pay/notify/index.ts | 14 ++++++-- apps/web-antd/src/store/mall/kefu.ts | 2 +- .../src/views/ai/image/index/modules/card.vue | 16 ++++----- .../ai/image/index/modules/dall3/index.vue | 4 +-- .../image/index/modules/midjourney/index.vue | 1 + .../child-process-node-config.vue | 8 ++++- .../bpm/model/form/modules/form-design.vue | 21 ++++++------ .../processInstance/create/modules/form.vue | 4 +-- .../src/views/crm/business/status/data.ts | 4 +-- .../crm/business/status/modules/form.vue | 6 ++-- .../infra/codegen/modules/generation-info.vue | 8 ++--- .../infra/demo/general/demo03/erp/index.vue | 2 +- .../demo/general/demo03/erp/modules/form.vue | 15 ++++++-- .../general/demo03/inner/modules/form.vue | 15 ++++++-- .../general/demo03/normal/modules/form.vue | 15 ++++++-- .../scene/form/configs/condition-config.vue | 2 +- .../configs/current-time-condition-config.vue | 2 +- .../configs/main-condition-inner-config.vue | 2 +- .../views/iot/thingmodel/modules/property.vue | 2 +- .../mall/promotion/rewardActivity/data.ts | 18 ++++------ .../promotion/rewardActivity/modules/form.vue | 18 ++++++++-- .../member/user/modules/balance-form.vue | 4 +-- apps/web-antdv-next/src/api/ai/image/index.ts | 6 ++-- .../src/api/crm/business/status/index.ts | 9 ++--- .../src/api/infra/codegen/index.ts | 16 +++++++-- .../src/api/infra/demo/demo03/erp/index.ts | 10 +++--- .../src/api/infra/demo/demo03/inner/index.ts | 10 +++--- .../src/api/infra/demo/demo03/normal/index.ts | 10 +++--- .../src/api/iot/ota/task/index.ts | 4 +-- .../src/api/iot/thingmodel/index.ts | 34 ++++++++++++++----- .../combination/combinationActivity.ts | 3 +- .../mall/promotion/reward/rewardActivity.ts | 6 ++-- .../mall/promotion/seckill/seckillActivity.ts | 2 +- .../src/api/mall/trade/config/index.ts | 19 ++++++----- .../src/api/member/config/index.ts | 2 +- .../src/api/member/user/index.ts | 24 +++++++------ apps/web-antdv-next/src/api/mp/tag/index.ts | 8 ++++- .../src/api/pay/notify/index.ts | 14 ++++++-- apps/web-antdv-next/src/store/mall/kefu.ts | 2 +- .../src/views/ai/image/index/modules/card.vue | 16 ++++----- .../ai/image/index/modules/dall3/index.vue | 4 +-- .../image/index/modules/midjourney/index.vue | 1 + .../child-process-node-config.vue | 8 ++++- .../bpm/model/form/modules/form-design.vue | 24 +++++++------ .../processInstance/create/modules/form.vue | 4 +-- .../src/views/crm/business/status/data.ts | 4 +-- .../crm/business/status/modules/form.vue | 6 ++-- .../infra/codegen/modules/generation-info.vue | 8 ++--- .../infra/demo/general/demo03/erp/index.vue | 2 +- .../scene/form/configs/condition-config.vue | 2 +- .../configs/current-time-condition-config.vue | 2 +- .../configs/main-condition-inner-config.vue | 2 +- .../views/iot/thingmodel/modules/property.vue | 2 +- .../mall/promotion/rewardActivity/data.ts | 18 ++++------ .../promotion/rewardActivity/modules/form.vue | 18 ++++++++-- .../member/user/modules/balance-form.vue | 4 +-- apps/web-ele/src/api/ai/image/index.ts | 6 ++-- .../src/api/crm/business/status/index.ts | 9 ++--- apps/web-ele/src/api/infra/codegen/index.ts | 16 +++++++-- .../src/api/infra/demo/demo03/erp/index.ts | 8 ++--- .../src/api/infra/demo/demo03/inner/index.ts | 8 ++--- .../src/api/infra/demo/demo03/normal/index.ts | 8 ++--- apps/web-ele/src/api/iot/ota/task/index.ts | 4 +-- apps/web-ele/src/api/iot/thingmodel/index.ts | 34 ++++++++++++++----- .../combination/combinationActivity.ts | 3 +- .../mall/promotion/reward/rewardActivity.ts | 6 ++-- .../mall/promotion/seckill/seckillActivity.ts | 2 +- .../src/api/mall/trade/config/index.ts | 19 ++++++----- apps/web-ele/src/api/member/config/index.ts | 2 +- apps/web-ele/src/api/member/user/index.ts | 24 +++++++------ apps/web-ele/src/api/mp/tag/index.ts | 8 ++++- apps/web-ele/src/api/pay/notify/index.ts | 14 ++++++-- apps/web-ele/src/store/mall/kefu.ts | 2 +- .../src/views/ai/image/index/modules/card.vue | 16 ++++----- .../ai/image/index/modules/dall3/index.vue | 4 +-- .../image/index/modules/midjourney/index.vue | 1 + .../child-process-node-config.vue | 8 ++++- .../nodes-config/user-task-node-config.vue | 6 ++-- .../bpm/model/form/modules/form-design.vue | 20 ++++++----- .../processInstance/create/modules/form.vue | 4 +-- .../src/views/crm/business/status/data.ts | 4 +-- .../crm/business/status/modules/form.vue | 6 ++-- .../infra/codegen/modules/generation-info.vue | 8 ++--- .../scene/form/configs/condition-config.vue | 2 +- .../configs/current-time-condition-config.vue | 2 +- .../configs/main-condition-inner-config.vue | 2 +- .../views/iot/thingmodel/modules/property.vue | 2 +- .../mall/promotion/rewardActivity/data.ts | 18 ++++------ .../promotion/rewardActivity/modules/form.vue | 18 ++++++++-- .../member/user/modules/balance-form.vue | 4 +-- 105 files changed, 586 insertions(+), 362 deletions(-) diff --git a/apps/web-antd/src/api/ai/image/index.ts b/apps/web-antd/src/api/ai/image/index.ts index dfbf58b08..b5e7db176 100644 --- a/apps/web-antd/src/api/ai/image/index.ts +++ b/apps/web-antd/src/api/ai/image/index.ts @@ -34,15 +34,15 @@ export namespace AiImageApi { prompt: string; // 提示词 modelId: number; // 模型 style: string; // 图像生成的风格 - width: string; // 图片宽度 - height: string; // 图片高度 + width: number; // 图片宽度 + height: number; // 图片高度 options: object; // 绘制参数，Map } export interface ImageMidjourneyImagineReqVO { prompt: string; // 提示词 modelId: number; // 模型 - base64Array?: string[]; // size不能为空 + base64Array: string[]; // 参考图 base64 列表 width: string; // 图片宽度 height: string; // 图片高度 version: string; // 版本 diff --git a/apps/web-antd/src/api/crm/business/status/index.ts b/apps/web-antd/src/api/crm/business/status/index.ts index fb42abaff..0f6a812fa 100644 --- a/apps/web-antd/src/api/crm/business/status/index.ts +++ b/apps/web-antd/src/api/crm/business/status/index.ts @@ -11,15 +11,16 @@ export namespace CrmBusinessStatusApi { deptNames?: string[]; creator?: string; createTime?: Date; - statuses?: BusinessStatusType[]; + statuses: BusinessStatusType[]; } /** 商机状态信息 */ export interface BusinessStatusType { id?: number; name: string; - percent: number; - [x: string]: any; + percent?: number; + endStatus?: number; + key?: string; } } @@ -43,7 +44,7 @@ export const DEFAULT_STATUSES = [ name: '无效', percent: 0, }, -]; +] satisfies CrmBusinessStatusApi.BusinessStatusType[]; /** 查询商机状态组列表 */ export function getBusinessStatusPage(params: PageParam) { diff --git a/apps/web-antd/src/api/infra/codegen/index.ts b/apps/web-antd/src/api/infra/codegen/index.ts index 992d41d2d..342b1a456 100644 --- a/apps/web-antd/src/api/infra/codegen/index.ts +++ b/apps/web-antd/src/api/infra/codegen/index.ts @@ -24,6 +24,18 @@ export namespace InfraCodegenApi { parentMenuId: number; } + /** 代码生成表保存请求 */ + export interface CodegenTableSaveReqVO extends CodegenTable { + frontType?: null | number; + genPath?: string; + genType?: string; + masterTableId?: number; + subJoinColumnId?: number; + subJoinMany?: boolean; + treeParentColumnId?: number; + treeNameColumnId?: number; + } + /** 代码生成字段定义 */ export interface CodegenColumn { id: number; @@ -54,7 +66,7 @@ export namespace InfraCodegenApi { /** 代码生成详情 */ export interface CodegenDetail { - table: CodegenTable; + table: CodegenTableSaveReqVO; columns: CodegenColumn[]; } @@ -66,7 +78,7 @@ export namespace InfraCodegenApi { /** 更新代码生成请求 */ export interface CodegenUpdateReqVO { - table: any | CodegenTable; + table: CodegenTableSaveReqVO; columns: CodegenColumn[]; } diff --git a/apps/web-antd/src/api/infra/demo/demo03/erp/index.ts b/apps/web-antd/src/api/infra/demo/demo03/erp/index.ts index 6dc7e352a..7f8ec6271 100644 --- a/apps/web-antd/src/api/infra/demo/demo03/erp/index.ts +++ b/apps/web-antd/src/api/infra/demo/demo03/erp/index.ts @@ -1,5 +1,3 @@ -import type { Dayjs } from 'dayjs'; - import type { PageParam, PageResult } from '@vben/request'; import { requestClient } from '#/api/request'; @@ -7,7 +5,7 @@ import { requestClient } from '#/api/request'; export namespace Demo03StudentApi { /** 学生课程信息 */ export interface Demo03Course { - id: number; // 编号 + id?: number; // 编号 studentId?: number; // 学生编号 name?: string; // 名字 score?: number; // 分数 @@ -15,7 +13,7 @@ export namespace Demo03StudentApi { /** 学生班级信息 */ export interface Demo03Grade { - id: number; // 编号 + id?: number; // 编号 studentId?: number; // 学生编号 name?: string; // 名字 teacher?: string; // 班主任 @@ -23,10 +21,10 @@ export namespace Demo03StudentApi { /** 学生信息 */ export interface Demo03Student { - id: number; // 编号 + id?: number; // 编号 name?: string; // 名字 sex?: number; // 性别 - birthday?: Dayjs | string; // 出生日期 + birthday?: number | string; // 出生日期 description?: string; // 简介 } } diff --git a/apps/web-antd/src/api/infra/demo/demo03/inner/index.ts b/apps/web-antd/src/api/infra/demo/demo03/inner/index.ts index 02bfbcc66..0aef41a40 100644 --- a/apps/web-antd/src/api/infra/demo/demo03/inner/index.ts +++ b/apps/web-antd/src/api/infra/demo/demo03/inner/index.ts @@ -1,5 +1,3 @@ -import type { Dayjs } from 'dayjs'; - import type { PageParam, PageResult } from '@vben/request'; import { requestClient } from '#/api/request'; @@ -7,7 +5,7 @@ import { requestClient } from '#/api/request'; export namespace Demo03StudentApi { /** 学生课程信息 */ export interface Demo03Course { - id: number; // 编号 + id?: number; // 编号 studentId?: number; // 学生编号 name?: string; // 名字 score?: number; // 分数 @@ -15,7 +13,7 @@ export namespace Demo03StudentApi { /** 学生班级信息 */ export interface Demo03Grade { - id: number; // 编号 + id?: number; // 编号 studentId?: number; // 学生编号 name?: string; // 名字 teacher?: string; // 班主任 @@ -23,10 +21,10 @@ export namespace Demo03StudentApi { /** 学生信息 */ export interface Demo03Student { - id: number; // 编号 + id?: number; // 编号 name?: string; // 名字 sex?: number; // 性别 - birthday?: Dayjs | string; // 出生日期 + birthday?: number | string; // 出生日期 description?: string; // 简介 demo03courses?: Demo03Course[]; demo03grade?: Demo03Grade; diff --git a/apps/web-antd/src/api/infra/demo/demo03/normal/index.ts b/apps/web-antd/src/api/infra/demo/demo03/normal/index.ts index 2a085a153..7c03cd913 100644 --- a/apps/web-antd/src/api/infra/demo/demo03/normal/index.ts +++ b/apps/web-antd/src/api/infra/demo/demo03/normal/index.ts @@ -1,5 +1,3 @@ -import type { Dayjs } from 'dayjs'; - import type { PageParam, PageResult } from '@vben/request'; import { requestClient } from '#/api/request'; @@ -7,7 +5,7 @@ import { requestClient } from '#/api/request'; export namespace Demo03StudentApi { /** 学生课程信息 */ export interface Demo03Course { - id: number; // 编号 + id?: number; // 编号 studentId?: number; // 学生编号 name?: string; // 名字 score?: number; // 分数 @@ -15,7 +13,7 @@ export namespace Demo03StudentApi { /** 学生班级信息 */ export interface Demo03Grade { - id: number; // 编号 + id?: number; // 编号 studentId?: number; // 学生编号 name?: string; // 名字 teacher?: string; // 班主任 @@ -23,10 +21,10 @@ export namespace Demo03StudentApi { /** 学生信息 */ export interface Demo03Student { - id: number; // 编号 + id?: number; // 编号 name?: string; // 名字 sex?: number; // 性别 - birthday?: Dayjs | string; // 出生日期 + birthday?: number | string; // 出生日期 description?: string; // 简介 demo03courses?: Demo03Course[]; demo03grade?: Demo03Grade; diff --git a/apps/web-antd/src/api/iot/ota/task/index.ts b/apps/web-antd/src/api/iot/ota/task/index.ts index 7f4f5d6fb..fd417cc2b 100644 --- a/apps/web-antd/src/api/iot/ota/task/index.ts +++ b/apps/web-antd/src/api/iot/ota/task/index.ts @@ -6,11 +6,11 @@ export namespace IoTOtaTaskApi { /** IoT OTA 升级任务 */ export interface Task { id?: number; - name?: string; + name: string; description?: string; firmwareId?: number; status?: number; - deviceScope?: number; + deviceScope: number; deviceIds?: number[]; deviceTotalCount?: number; deviceSuccessCount?: number; diff --git a/apps/web-antd/src/api/iot/thingmodel/index.ts b/apps/web-antd/src/api/iot/thingmodel/index.ts index 88665ebc9..755e8d30a 100644 --- a/apps/web-antd/src/api/iot/thingmodel/index.ts +++ b/apps/web-antd/src/api/iot/thingmodel/index.ts @@ -30,8 +30,8 @@ export namespace ThingModelApi { required?: boolean; dataType?: string; description?: string; - dataSpecs?: any; - dataSpecsList?: any[]; + dataSpecs?: ThingModelDataSpecs; + dataSpecsList?: ThingModelPropertyDataSpecs[]; } /** IoT 物模型服务 */ @@ -64,8 +64,8 @@ export namespace ThingModelApi { direction?: string; paraOrder?: number; dataType?: string; - dataSpecs?: any; - dataSpecsList?: any[]; + dataSpecs?: ThingModelDataSpecs; + dataSpecsList?: ThingModelPropertyDataSpecs[]; } /** IoT 物模型 TSL（树形）响应 */ @@ -78,19 +78,35 @@ export namespace ThingModelApi { } /** IoT 数据定义（数值型） */ - export interface DataSpecsNumberData { + export interface ThingModelDataSpecs { + accessMode?: string; + childDataType?: string; + dataSpecs?: ThingModelDataSpecs; + dataSpecsList?: ThingModelPropertyDataSpecs[]; + dataType?: string; + defaultValue?: string; + description?: string; + identifier?: string; + length?: number | string; min?: number | string; max?: number | string; + name?: string; + precise?: string; + required?: boolean; + size?: number | string; step?: number | string; unit?: string; unitName?: string; + value?: number | string; } + /** IoT 数据定义（数值型） */ + export type DataSpecsNumberData = ThingModelDataSpecs; + /** IoT 数据定义（枚举/布尔型） */ - export interface DataSpecsEnumOrBoolData { - value: number | string; - name: string; - } + export type DataSpecsEnumOrBoolData = ThingModelDataSpecs; + + export type ThingModelPropertyDataSpecs = Property & ThingModelDataSpecs; } /** 生成「必填 + 数字」类校验器：拼到 size / length / 枚举值上 */ diff --git a/apps/web-antd/src/api/mall/promotion/combination/combinationActivity.ts b/apps/web-antd/src/api/mall/promotion/combination/combinationActivity.ts index 19af95e95..4cb72f075 100644 --- a/apps/web-antd/src/api/mall/promotion/combination/combinationActivity.ts +++ b/apps/web-antd/src/api/mall/promotion/combination/combinationActivity.ts @@ -8,6 +8,7 @@ export namespace MallCombinationActivityApi { id?: number; // 活动编号 name?: string; // 活动名称 spuId?: number; // 商品 SPU 编号 + spuName?: string; // 商品 SPU 名称 totalLimitCount?: number; // 总限购数量 singleLimitCount?: number; // 单次限购数量 startTime?: Date; // 开始时间 @@ -21,7 +22,7 @@ export namespace MallCombinationActivityApi { limitDuration?: number; // 限制时长 combinationPrice?: number; // 拼团价格 products: CombinationProduct[]; // 商品列表 - picUrl?: any; + picUrl?: string; // 商品图片 } /** 拼团活动所需属性 */ diff --git a/apps/web-antd/src/api/mall/promotion/reward/rewardActivity.ts b/apps/web-antd/src/api/mall/promotion/reward/rewardActivity.ts index e59cad300..ebb1ce2a9 100644 --- a/apps/web-antd/src/api/mall/promotion/reward/rewardActivity.ts +++ b/apps/web-antd/src/api/mall/promotion/reward/rewardActivity.ts @@ -26,9 +26,9 @@ export namespace MallRewardActivityApi { conditionType?: number; // 条件类型 productScope?: number; // 商品范围 rules: RewardRule[]; // 优惠规则列表 - productScopeValues?: number[]; // 商品范围值（仅表单使用）：值为品类编号列表、商品编号列表 - productCategoryIds?: number[]; // 商品分类编号列表（仅表单使用） - productSpuIds?: number[]; // 商品 SPU 编号列表（仅表单使用） + productScopeValues: number[]; // 商品范围值（仅表单使用）：值为品类编号列表、商品编号列表 + productCategoryIds: number[]; // 商品分类编号列表（仅表单使用） + productSpuIds: number[]; // 商品 SPU 编号列表（仅表单使用） } } diff --git a/apps/web-antd/src/api/mall/promotion/seckill/seckillActivity.ts b/apps/web-antd/src/api/mall/promotion/seckill/seckillActivity.ts index 1c18c5e3b..ae085c9cd 100644 --- a/apps/web-antd/src/api/mall/promotion/seckill/seckillActivity.ts +++ b/apps/web-antd/src/api/mall/promotion/seckill/seckillActivity.ts @@ -31,7 +31,7 @@ export namespace MallSeckillActivityApi { totalStock?: number; // 秒杀总库存 seckillPrice?: number; // 秒杀价格 products?: SeckillProduct[]; // 秒杀商品列表 - picUrl?: any; + picUrl?: string; // 商品图片 } } diff --git a/apps/web-antd/src/api/mall/trade/config/index.ts b/apps/web-antd/src/api/mall/trade/config/index.ts index de419d290..c46e3c6e9 100644 --- a/apps/web-antd/src/api/mall/trade/config/index.ts +++ b/apps/web-antd/src/api/mall/trade/config/index.ts @@ -4,20 +4,21 @@ export namespace MallTradeConfigApi { /** 交易中心配置 */ export interface Config { id?: number; - afterSaleRefundReasons?: string[]; - afterSaleReturnReasons?: string[]; - deliveryExpressFreeEnabled?: boolean; - deliveryExpressFreePrice?: number; - deliveryPickUpEnabled?: boolean; + afterSaleRefundReasons: string[]; + afterSaleReturnReasons: string[]; + deliveryExpressFreeEnabled: boolean; + deliveryExpressFreePrice: number; + deliveryPickUpEnabled: boolean; brokerageEnabled?: boolean; brokerageEnabledCondition?: number; brokerageBindMode?: number; - brokeragePosterUrls?: string; + brokeragePosterUrls: string[]; brokerageFirstPercent?: number; brokerageSecondPercent?: number; - brokerageWithdrawMinPrice?: number; - brokerageFrozenDays?: number; - brokerageWithdrawTypes?: string; + brokerageWithdrawMinPrice: number; + brokerageFrozenDays: number; + brokerageWithdrawFeePercent: number; + brokerageWithdrawTypes: number[]; tencentLbsKey?: string; } } diff --git a/apps/web-antd/src/api/member/config/index.ts b/apps/web-antd/src/api/member/config/index.ts index 073110d66..799e4c400 100644 --- a/apps/web-antd/src/api/member/config/index.ts +++ b/apps/web-antd/src/api/member/config/index.ts @@ -4,7 +4,7 @@ export namespace MemberConfigApi { /** 积分设置信息 */ export interface Config { id?: number; - pointTradeDeductEnable: number; + pointTradeDeductEnable: boolean; pointTradeDeductUnitPrice: number; pointTradeDeductMaxPrice: number; pointTradeGivePoint: number; diff --git a/apps/web-antd/src/api/member/user/index.ts b/apps/web-antd/src/api/member/user/index.ts index 35229ad98..0e197b466 100644 --- a/apps/web-antd/src/api/member/user/index.ts +++ b/apps/web-antd/src/api/member/user/index.ts @@ -10,27 +10,31 @@ export namespace MemberUserApi { birthday?: number; createTime?: number; loginDate?: number; - loginIp: string; - mark: string; - mobile: string; + loginIp?: string; + mark?: string; + mobile?: string; email?: string; name?: string; nickname?: string; - registerIp: string; - sex: number; - status: number; + registerIp?: string; + sex?: number; + status?: number; areaId?: number; areaName?: string; - levelName: string; - point?: number; - totalPoint?: number; - experience?: number; + tagIds?: number[]; + groupId?: number; + levelId?: number; + levelName?: null | string; + point?: null | number; + totalPoint?: null | number; + experience?: null | number; } /** 会员用户等级更新信息 */ export interface UserUpdateLevelReqVO { id: number; levelId: number; + reason: string; } /** 会员用户积分更新信息 */ diff --git a/apps/web-antd/src/api/mp/tag/index.ts b/apps/web-antd/src/api/mp/tag/index.ts index df8fd3423..86ccbf4fe 100644 --- a/apps/web-antd/src/api/mp/tag/index.ts +++ b/apps/web-antd/src/api/mp/tag/index.ts @@ -11,6 +11,12 @@ export namespace MpTagApi { count?: number; createTime?: Date; } + + /** 标签精简信息 */ + export interface SimpleTag { + tagId: number; + name: string; + } } /** 创建公众号标签 */ @@ -46,7 +52,7 @@ export function getTagPage(params: PageParam) { /** 获取公众号标签精简信息列表 */ export function getSimpleTagList() { - return requestClient.get('/mp/tag/list-all-simple'); + return requestClient.get('/mp/tag/list-all-simple'); } /** 同步公众号标签 */ diff --git a/apps/web-antd/src/api/pay/notify/index.ts b/apps/web-antd/src/api/pay/notify/index.ts index c4fb7b209..51b96eca3 100644 --- a/apps/web-antd/src/api/pay/notify/index.ts +++ b/apps/web-antd/src/api/pay/notify/index.ts @@ -3,6 +3,16 @@ import type { PageParam, PageResult } from '@vben/request'; import { requestClient } from '#/api/request'; export namespace PayNotifyApi { + /** 支付通知日志 */ + export interface NotifyLog { + id?: number; + status?: number; + notifyTimes?: number; + lastExecuteTime?: Date; + createTime?: Date; + response?: string; + } + /** 支付通知任务 */ export interface NotifyTask { id: number; @@ -20,13 +30,13 @@ export namespace PayNotifyApi { maxNotifyTimes: number; createTime: Date; updateTime: Date; - logs?: any[]; + logs?: NotifyLog[]; } } /** 获得支付通知明细 */ export function getNotifyTaskDetail(id: number) { - return requestClient.get(`/pay/notify/get-detail?id=${id}`); + return requestClient.get(`/pay/notify/get-detail?id=${id}`); } /** 获得支付通知分页 */ diff --git a/apps/web-antd/src/store/mall/kefu.ts b/apps/web-antd/src/store/mall/kefu.ts index c30087375..b34bb6b60 100644 --- a/apps/web-antd/src/store/mall/kefu.ts +++ b/apps/web-antd/src/store/mall/kefu.ts @@ -90,7 +90,7 @@ export const useMallKefuStore = defineStore('mall-kefu', { }, conversationSort() { // 按置顶属性和最后消息时间排序 - this.conversationList.toSorted((a, b) => { + this.conversationList = this.conversationList.toSorted((a, b) => { // 按照置顶排序，置顶的会在前面 if (a.adminPinned !== b.adminPinned) { return a.adminPinned ? -1 : 1; diff --git a/apps/web-antd/src/views/ai/image/index/modules/card.vue b/apps/web-antd/src/views/ai/image/index/modules/card.vue index 4e0d59fc4..8f83b6bc3 100644 --- a/apps/web-antd/src/views/ai/image/index/modules/card.vue +++ b/apps/web-antd/src/views/ai/image/index/modules/card.vue @@ -20,8 +20,8 @@ const props = defineProps({ const emits = defineEmits(['onBtnClick', 'onMjBtnClick']); /** 处理点击事件 */ -async function handleButtonClick(type: string, detail: AiImageApi.Image) { - emits('onBtnClick', type, detail); +async function handleButtonClick(type: string) { + emits('onBtnClick', type, props.detail); } /** 处理 Midjourney 按钮点击事件 */ @@ -79,28 +79,28 @@ onMounted(async () => { @@ -119,8 +119,8 @@ onMounted(async () => {