From ba6ac7a420de6fe6559359d7bb50db0a26d007da Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sun, 21 Jun 2026 01:10:09 -0700 Subject: [PATCH] =?UTF-8?q?fix(ts):=20=E6=89=B9=E9=87=8F=E6=94=B6=E6=95=9B?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E9=97=AE=E9=A2=98=E5=B9=B6=E6=94=AF=E6=8C=81?= =?UTF-8?q?=20Dialog=20loading?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Dialog 增加 loading prop,支付详情弹窗改用统一加载态 - 对齐支付/会员/商城等 API VO 类型,修复 dall3 尺寸入参转换 - 复用 VO/ReqVO 简化表单和查询参数类型 - 必填字段使用非空断言,减少过度防御 - 忽略 .playwright-cli 自动化测试产物 ts:check 478 → 252,无新增类型错误 --- .gitignore | 1 + src/api/ai/chat/conversation/index.ts | 2 +- src/api/ai/image/index.ts | 4 +- src/api/mall/product/favorite.ts | 10 ++- src/api/mall/trade/afterSale/index.ts | 23 +++++- src/api/mall/trade/brokerage/user/index.ts | 7 +- src/api/mall/trade/config/index.ts | 18 +++-- src/api/mall/trade/delivery/express/index.ts | 11 ++- .../trade/delivery/expressTemplate/index.ts | 19 +++-- .../mall/trade/delivery/pickUpStore/index.ts | 38 +++++++--- src/api/mall/trade/order/index.ts | 8 +- src/api/member/config/index.ts | 6 +- src/api/member/experience-record/index.ts | 7 +- src/api/member/user/index.ts | 61 +++++++++------ src/api/pay/app/index.ts | 2 +- src/api/pay/notify/index.ts | 36 ++++++++- src/api/pay/order/index.ts | 76 +++++++------------ src/api/pay/refund/index.ts | 68 +++++------------ src/api/pay/transfer/index.ts | 34 ++++++++- src/api/pay/wallet/balance/index.ts | 8 +- src/api/system/dict/dict.data.ts | 6 +- src/api/system/dict/dict.type.ts | 4 +- src/api/system/mail/account/index.ts | 2 +- src/components/Dialog/src/Dialog.vue | 17 +++-- .../conversation/ConversationList.vue | 16 ++-- .../conversation/ConversationUpdateForm.vue | 12 ++- .../ai/image/index/components/ImageCard.vue | 30 +++----- .../ai/image/index/components/dall3/index.vue | 4 +- .../index/components/midjourney/index.vue | 1 + .../mall/product/spu/form/DeliveryForm.vue | 4 +- .../mall/trade/afterSale/detail/index.vue | 49 +++++------- .../user/BrokerageUserCreateForm.vue | 8 +- .../user/BrokerageUserListDialog.vue | 4 +- src/views/mall/trade/config/index.vue | 2 +- .../trade/delivery/express/ExpressForm.vue | 4 +- .../expressTemplate/ExpressTemplateForm.vue | 25 +++--- .../mall/trade/delivery/pickUpOrder/index.vue | 10 +-- .../DeliveryPickUpStoreBindForm.vue | 28 +++---- .../delivery/pickUpStore/PickUpStoreForm.vue | 11 ++- .../components/StoreStaffTableSelect.vue | 32 ++++---- .../order/components/OrderTableColumn.vue | 1 + src/views/mall/trade/order/detail/index.vue | 9 ++- .../trade/order/form/OrderDeliveryForm.vue | 4 +- src/views/mall/trade/order/index.vue | 4 +- src/views/member/config/index.vue | 4 +- src/views/member/user/UserForm.vue | 11 ++- .../user/components/UserBalanceUpdateForm.vue | 16 ++-- .../user/components/UserLevelUpdateForm.vue | 26 +++++-- .../user/components/UserPointUpdateForm.vue | 25 +++--- .../member/user/detail/UserBasicInfo.vue | 4 +- .../member/user/detail/UserBrokerageList.vue | 4 +- .../member/user/detail/UserCouponList.vue | 2 +- .../user/detail/UserExperienceRecordList.vue | 16 ++-- .../member/user/detail/UserFavoriteList.vue | 9 ++- .../member/user/detail/UserOrderList.vue | 6 +- src/views/member/user/detail/index.vue | 2 +- src/views/member/user/index.vue | 14 ++-- .../components/channel/AlipayChannelForm.vue | 2 +- src/views/pay/cashier/index.vue | 13 +++- src/views/pay/notify/NotifyDetail.vue | 12 +-- src/views/pay/notify/index.vue | 20 ++--- src/views/pay/order/OrderDetail.vue | 33 +++++--- src/views/pay/order/index.vue | 34 +++++---- src/views/pay/refund/RefundDetail.vue | 22 ++++-- src/views/pay/refund/index.vue | 42 +++++----- src/views/pay/transfer/TransferDetail.vue | 23 ++++-- src/views/pay/transfer/index.vue | 36 +++++---- src/views/system/dict/DictTypeForm.vue | 4 +- src/views/system/dict/data/DictDataForm.vue | 4 +- src/views/system/dict/data/index.vue | 2 +- src/views/system/dict/index.vue | 2 +- .../system/mail/account/MailAccountForm.vue | 4 +- src/views/system/mail/account/index.vue | 2 +- src/views/system/mail/log/index.vue | 2 +- .../system/mail/template/MailTemplateForm.vue | 2 +- src/views/system/mail/template/index.vue | 2 +- src/views/system/menu/index.vue | 6 +- src/views/system/notice/index.vue | 2 +- src/views/system/post/index.vue | 2 +- src/views/system/sms/log/SmsLogDetail.vue | 10 +-- 80 files changed, 650 insertions(+), 496 deletions(-) diff --git a/.gitignore b/.gitignore index 9fc0edc7f..7172bd708 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ auto-*.d.ts .idea .history output/ +.playwright-cli/ diff --git a/src/api/ai/chat/conversation/index.ts b/src/api/ai/chat/conversation/index.ts index 6ce4482fc..14be6c77f 100644 --- a/src/api/ai/chat/conversation/index.ts +++ b/src/api/ai/chat/conversation/index.ts @@ -39,7 +39,7 @@ export const ChatConversationApi = { }, // 删除【我的】聊天对话 - deleteChatConversationMy: async (id: string) => { + deleteChatConversationMy: async (id: number) => { return await request.delete({ url: `/ai/chat/conversation/delete-my?id=${id}` }) }, diff --git a/src/api/ai/image/index.ts b/src/api/ai/image/index.ts index ab2bcf724..aff183580 100644 --- a/src/api/ai/image/index.ts +++ b/src/api/ai/image/index.ts @@ -23,8 +23,8 @@ export interface ImageDrawReqVO { prompt: string // 提示词 modelId: number // 模型 style: string // 图像生成的风格 - width: string // 图片宽度 - height: string // 图片高度 + width: number // 图片宽度 + height: number // 图片高度 options: object // 绘制参数,Map } diff --git a/src/api/mall/product/favorite.ts b/src/api/mall/product/favorite.ts index 3834eed07..5a06cdc86 100644 --- a/src/api/mall/product/favorite.ts +++ b/src/api/mall/product/favorite.ts @@ -2,11 +2,17 @@ import request from '@/config/axios' export interface Favorite { id?: number - userId?: string // 用户编号 + userId?: number // 用户编号 spuId?: number | null // 商品 SPU 编号 + name?: string + picUrl?: string + price?: number + salesCount?: number + createTime?: Date + status?: number } // 获得 ProductFavorite 列表 export const getFavoritePage = (params: PageParam) => { - return request.get({ url: '/product/favorite/page', params }) + return request.get>({ url: '/product/favorite/page', params }) } diff --git a/src/api/mall/trade/afterSale/index.ts b/src/api/mall/trade/afterSale/index.ts index a109ee6b9..d0b1f9636 100644 --- a/src/api/mall/trade/afterSale/index.ts +++ b/src/api/mall/trade/afterSale/index.ts @@ -1,4 +1,5 @@ import request from '@/config/axios' +import type { OrderItemRespVO, OrderVO } from '@/api/mall/trade/order' export interface TradeAfterSaleVO { id?: number | null // 售后编号,主键自增 @@ -32,6 +33,21 @@ export interface TradeAfterSaleVO { receiveReason?: string // 收货备注 } +export interface TradeAfterSaleDetailVO extends TradeAfterSaleVO { + order: OrderVO + orderItem?: OrderItemRespVO + user?: { + id?: number + nickname?: string + } + logs: Array<{ + id?: number + createTime?: Date + content?: string + userType?: number + }> +} + export interface ProductPropertiesVO { propertyId?: number | null // 属性的编号 propertyName?: string // 属性的名称 @@ -41,12 +57,15 @@ export interface ProductPropertiesVO { // 获得交易售后分页 export const getAfterSalePage = async (params) => { - return await request.get({ url: `/trade/after-sale/page`, params }) + return await request.get>({ + url: `/trade/after-sale/page`, + params + }) } // 获得交易售后详情 export const getAfterSale = async (id: any) => { - return await request.get({ url: `/trade/after-sale/get-detail?id=${id}` }) + return await request.get({ url: `/trade/after-sale/get-detail?id=${id}` }) } // 同意售后 diff --git a/src/api/mall/trade/brokerage/user/index.ts b/src/api/mall/trade/brokerage/user/index.ts index 8ed69771f..d4f15c307 100644 --- a/src/api/mall/trade/brokerage/user/index.ts +++ b/src/api/mall/trade/brokerage/user/index.ts @@ -20,12 +20,15 @@ export const createBrokerageUser = (data: any) => { // 查询分销用户列表 export const getBrokerageUserPage = async (params: any) => { - return await request.get({ url: `/trade/brokerage-user/page`, params }) + return await request.get>({ + url: `/trade/brokerage-user/page`, + params + }) } // 查询分销用户详情 export const getBrokerageUser = async (id: number) => { - return await request.get({ url: `/trade/brokerage-user/get?id=` + id }) + return await request.get({ url: `/trade/brokerage-user/get?id=` + id }) } // 修改推广员 diff --git a/src/api/mall/trade/config/index.ts b/src/api/mall/trade/config/index.ts index 43fdbdf14..b51a45252 100644 --- a/src/api/mall/trade/config/index.ts +++ b/src/api/mall/trade/config/index.ts @@ -1,20 +1,28 @@ import request from '@/config/axios' export interface ConfigVO { + id?: number | null + afterSaleRefundReasons: string[] + afterSaleReturnReasons: string[] + deliveryExpressFreeEnabled: boolean + deliveryExpressFreePrice: number + deliveryPickUpEnabled: boolean brokerageEnabled: boolean - brokerageEnabledCondition: number - brokerageBindMode: number - brokeragePosterUrls: string + brokerageEnabledCondition?: number + brokerageBindMode?: number + brokeragePosterUrls: string[] brokerageFirstPercent: number brokerageSecondPercent: number brokerageWithdrawMinPrice: number + brokerageWithdrawFeePercent: number brokerageFrozenDays: number - brokerageWithdrawTypes: string + brokerageWithdrawTypes: number[] + tencentLbsKey?: string } // 查询交易中心配置详情 export const getTradeConfig = async () => { - return await request.get({ url: `/trade/config/get` }) + return await request.get({ url: `/trade/config/get` }) } // 保存交易中心配置 diff --git a/src/api/mall/trade/delivery/express/index.ts b/src/api/mall/trade/delivery/express/index.ts index 0070bcd6a..50ee5730e 100644 --- a/src/api/mall/trade/delivery/express/index.ts +++ b/src/api/mall/trade/delivery/express/index.ts @@ -1,7 +1,7 @@ import request from '@/config/axios' export interface DeliveryExpressVO { - id: number + id?: number code: string name: string logo: string @@ -11,17 +11,20 @@ export interface DeliveryExpressVO { // 查询快递公司列表 export const getDeliveryExpressPage = async (params: PageParam) => { - return await request.get({ url: '/trade/delivery/express/page', params }) + return await request.get>({ + url: '/trade/delivery/express/page', + params + }) } // 查询快递公司详情 export const getDeliveryExpress = async (id: number) => { - return await request.get({ url: '/trade/delivery/express/get?id=' + id }) + return await request.get({ url: '/trade/delivery/express/get?id=' + id }) } // 获得快递公司精简信息列表 export const getSimpleDeliveryExpressList = () => { - return request.get({ url: '/trade/delivery/express/list-all-simple' }) + return request.get({ url: '/trade/delivery/express/list-all-simple' }) } // 新增快递公司 diff --git a/src/api/mall/trade/delivery/expressTemplate/index.ts b/src/api/mall/trade/delivery/expressTemplate/index.ts index 9ed23bc1c..3931295a5 100644 --- a/src/api/mall/trade/delivery/expressTemplate/index.ts +++ b/src/api/mall/trade/delivery/expressTemplate/index.ts @@ -1,12 +1,12 @@ import request from '@/config/axios' export interface DeliveryExpressTemplateVO { - id: number + id?: number name: string chargeMode: number sort: number - templateCharge: ExpressTemplateChargeVO[] - templateFree: ExpressTemplateFreeVO[] + charges: ExpressTemplateChargeVO[] + frees: ExpressTemplateFreeVO[] } export declare type ExpressTemplateChargeVO = { @@ -25,17 +25,24 @@ export declare type ExpressTemplateFreeVO = { // 查询快递运费模板列表 export const getDeliveryExpressTemplatePage = async (params: PageParam) => { - return await request.get({ url: '/trade/delivery/express-template/page', params }) + return await request.get>({ + url: '/trade/delivery/express-template/page', + params + }) } // 查询快递运费模板详情 export const getDeliveryExpressTemplate = async (id: number) => { - return await request.get({ url: '/trade/delivery/express-template/get?id=' + id }) + return await request.get({ + url: '/trade/delivery/express-template/get?id=' + id + }) } // 查询快递运费模板详情 export const getSimpleTemplateList = async () => { - return await request.get({ url: '/trade/delivery/express-template/list-all-simple' }) + return await request.get({ + url: '/trade/delivery/express-template/list-all-simple' + }) } // 新增快递运费模板 diff --git a/src/api/mall/trade/delivery/pickUpStore/index.ts b/src/api/mall/trade/delivery/pickUpStore/index.ts index ea6c852ba..888f0596d 100644 --- a/src/api/mall/trade/delivery/pickUpStore/index.ts +++ b/src/api/mall/trade/delivery/pickUpStore/index.ts @@ -1,34 +1,48 @@ import request from '@/config/axios' +import type { UserVO } from '@/api/system/user' export interface DeliveryPickUpStoreVO { - id: number + id?: number name: string introduction: string phone: string - areaId: number + areaId?: number detailAddress: string logo: string - openingTime: string - closingTime: string - latitude: number - longitude: number + openingTime?: string + closingTime?: string + latitude?: number + longitude?: number status: number - verifyUserIds: number[] // 绑定用户编号组数 + verifyUserIds?: number[] // 绑定用户编号组数 + verifyUsers?: UserVO[] // 绑定用户列表 +} + +export interface DeliveryPickUpStoreBindReqVO { + id: number + verifyUserIds: number[] } // 查询自提门店列表 export const getDeliveryPickUpStorePage = async (params: any) => { - return await request.get({ url: '/trade/delivery/pick-up-store/page', params }) + return await request.get>({ + url: '/trade/delivery/pick-up-store/page', + params + }) } // 查询自提门店详情 export const getDeliveryPickUpStore = async (id: number) => { - return await request.get({ url: '/trade/delivery/pick-up-store/get?id=' + id }) + return await request.get({ + url: '/trade/delivery/pick-up-store/get?id=' + id + }) } // 查询自提门店精简列表 -export const getSimpleDeliveryPickUpStoreList = async (): Promise => { - return await request.get({ url: '/trade/delivery/pick-up-store/simple-list' }) +export const getSimpleDeliveryPickUpStoreList = async () => { + return await request.get({ + url: '/trade/delivery/pick-up-store/simple-list' + }) } // 新增自提门店 @@ -47,6 +61,6 @@ export const deleteDeliveryPickUpStore = async (id: number) => { } // 绑定自提店员 -export const bindStoreStaffId = async (data: any) => { +export const bindStoreStaffId = async (data: DeliveryPickUpStoreBindReqVO) => { return await request.post({ url: '/trade/delivery/pick-up-store/bind', data }) } diff --git a/src/api/mall/trade/order/index.ts b/src/api/mall/trade/order/index.ts index 37fee8c76..673eb1f00 100644 --- a/src/api/mall/trade/order/index.ts +++ b/src/api/mall/trade/order/index.ts @@ -122,7 +122,7 @@ export interface TradeOrderSummaryRespVO { // 查询交易订单列表 export const getOrderPage = async (params: any) => { - return await request.get({ url: `/trade/order/page`, params }) + return await request.get>({ url: `/trade/order/page`, params }) } // 查询交易订单统计 @@ -132,12 +132,14 @@ export const getOrderSummary = async (params: any) => { // 查询交易订单详情 export const getOrder = async (id: number | null) => { - return await request.get({ url: `/trade/order/get-detail?id=` + id }) + return await request.get({ url: `/trade/order/get-detail?id=` + id }) } // 查询交易订单物流详情 export const getExpressTrackList = async (id: number | null) => { - return await request.get({ url: `/trade/order/get-express-track-list?id=` + id }) + return await request.get>({ + url: `/trade/order/get-express-track-list?id=` + id + }) } export interface DeliveryVO { diff --git a/src/api/member/config/index.ts b/src/api/member/config/index.ts index 7ddca16bb..dbeb4a524 100644 --- a/src/api/member/config/index.ts +++ b/src/api/member/config/index.ts @@ -1,8 +1,8 @@ import request from '@/config/axios' export interface ConfigVO { - id: number - pointTradeDeductEnable: number + id?: number + pointTradeDeductEnable: boolean pointTradeDeductUnitPrice: number pointTradeDeductMaxPrice: number pointTradeGivePoint: number @@ -10,7 +10,7 @@ export interface ConfigVO { // 查询积分设置详情 export const getConfig = async () => { - return await request.get({ url: `/member/config/get` }) + return await request.get({ url: `/member/config/get` }) } // 新增修改积分设置 diff --git a/src/api/member/experience-record/index.ts b/src/api/member/experience-record/index.ts index 6d40a48da..a09dc4d44 100644 --- a/src/api/member/experience-record/index.ts +++ b/src/api/member/experience-record/index.ts @@ -13,10 +13,13 @@ export interface ExperienceRecordVO { // 查询会员经验记录列表 export const getExperienceRecordPage = async (params) => { - return await request.get({ url: `/member/experience-record/page`, params }) + return await request.get>({ + url: `/member/experience-record/page`, + params + }) } // 查询会员经验记录详情 export const getExperienceRecord = async (id: number) => { - return await request.get({ url: `/member/experience-record/get?id=` + id }) + return await request.get({ url: `/member/experience-record/get?id=` + id }) } diff --git a/src/api/member/user/index.ts b/src/api/member/user/index.ts index 89f17c763..f84e54638 100644 --- a/src/api/member/user/index.ts +++ b/src/api/member/user/index.ts @@ -1,36 +1,51 @@ import request from '@/config/axios' export interface UserVO { + id?: number + avatar?: string + birthday?: number + createTime?: number + loginDate?: number + loginIp?: string + mark?: string + mobile?: string + email?: string + password?: string + name?: string + nickname?: string + registerIp?: string + sex?: number + status?: number + areaId?: number + areaName?: string + tagIds?: number[] + groupId?: number + levelId?: number + levelName?: string | null + point?: number | null + totalPoint?: number | null + experience?: number | null +} + +export interface UserLevelUpdateReqVO { id: number - avatar: string | undefined - birthday: number | undefined - createTime: number | undefined - loginDate: number | undefined - loginIp: string - mark: string - mobile: string - email: string | undefined - name: string | undefined - nickname: string | undefined - registerIp: string - sex: number - status: number - areaId: number | undefined - areaName: string | undefined - levelName: string | null - point: number | undefined | null - totalPoint: number | undefined | null - experience: number | null | undefined + levelId: number + reason: string +} + +export interface UserPointUpdateReqVO { + id: number + point: number } // 查询会员用户列表 export const getUserPage = async (params) => { - return await request.get({ url: `/member/user/page`, params }) + return await request.get>({ url: `/member/user/page`, params }) } // 查询会员用户详情 export const getUser = async (id: number) => { - return await request.get({ url: `/member/user/get?id=` + id }) + return await request.get({ url: `/member/user/get?id=` + id }) } // 修改会员用户 @@ -39,11 +54,11 @@ export const updateUser = async (data: UserVO) => { } // 修改会员用户等级 -export const updateUserLevel = async (data: any) => { +export const updateUserLevel = async (data: UserLevelUpdateReqVO) => { return await request.put({ url: `/member/user/update-level`, data }) } // 修改会员用户积分 -export const updateUserPoint = async (data: any) => { +export const updateUserPoint = async (data: UserPointUpdateReqVO) => { return await request.put({ url: `/member/user/update-point`, data }) } diff --git a/src/api/pay/app/index.ts b/src/api/pay/app/index.ts index d6fa83cf9..d0dd42a20 100644 --- a/src/api/pay/app/index.ts +++ b/src/api/pay/app/index.ts @@ -62,7 +62,7 @@ export const deleteApp = (id: number) => { // 获得支付应用列表 export const getAppList = () => { - return request.get({ + return request.get({ url: '/pay/app/list' }) } diff --git a/src/api/pay/notify/index.ts b/src/api/pay/notify/index.ts index dc8bd8870..263365870 100644 --- a/src/api/pay/notify/index.ts +++ b/src/api/pay/notify/index.ts @@ -1,15 +1,43 @@ import request from '@/config/axios' +export interface NotifyLogVO { + id?: number + status?: number + notifyTimes?: number + lastExecuteTime?: Date + createTime?: Date + response?: string +} + +export interface NotifyTaskVO { + id?: number + appId?: number + appName?: string + merchantOrderId?: string + merchantRefundId?: string + merchantTransferId?: string + dataId?: number + type?: number + status?: number + notifyTimes?: number + maxNotifyTimes?: number + lastExecuteTime?: Date + nextNotifyTime?: Date + createTime?: Date + updateTime?: Date + logs?: NotifyLogVO[] +} + // 获得支付通知明细 -export const getNotifyTaskDetail = (id) => { - return request.get({ +export const getNotifyTaskDetail = (id: number) => { + return request.get({ url: '/pay/notify/get-detail?id=' + id }) } // 获得支付通知分页 -export const getNotifyTaskPage = (query) => { - return request.get({ +export const getNotifyTaskPage = (query: any) => { + return request.get>({ url: '/pay/notify/page', params: query }) diff --git a/src/api/pay/order/index.ts b/src/api/pay/order/index.ts index 6460c4d19..fae28e62b 100644 --- a/src/api/pay/order/index.ts +++ b/src/api/pay/order/index.ts @@ -12,6 +12,7 @@ export interface OrderVO { notifyUrl: string notifyStatus: number amount: number + price: number channelFeeRate: number channelFeeAmount: number status: number @@ -28,64 +29,43 @@ export interface OrderVO { createTime: Date } -export interface OrderPageReqVO extends PageParam { - merchantId?: number - appId?: number - channelId?: number - channelCode?: string +export interface OrderDetailVO { merchantOrderId?: string + no?: string + appId?: number + appName?: string + status?: number + price?: number + refundPrice?: number + channelFeePrice?: number + channelFeeRate?: number + successTime?: Date + expireTime?: Date + createTime?: Date + updateTime?: Date subject?: string body?: string - notifyUrl?: string - notifyStatus?: number - amount?: number - channelFeeRate?: number - channelFeeAmount?: number - status?: number - expireTime?: Date[] - successTime?: Date[] - notifyTime?: Date[] - successExtensionId?: number - refundStatus?: number - refundTimes?: number - channelUserId?: string - channelOrderNo?: string - createTime?: Date[] -} - -export interface OrderExportReqVO { - merchantId?: number - appId?: number - channelId?: number channelCode?: string - merchantOrderId?: string - subject?: string - body?: string - notifyUrl?: string - notifyStatus?: number - amount?: number - channelFeeRate?: number - channelFeeAmount?: number - status?: number - expireTime?: Date[] - successTime?: Date[] - notifyTime?: Date[] - successExtensionId?: number - refundStatus?: number - refundTimes?: number - channelUserId?: string + userIp?: string channelOrderNo?: string - createTime?: Date[] + channelUserId?: string + notifyUrl?: string + extension?: { + channelNotifyData?: string + } } // 查询列表支付订单 -export const getOrderPage = async (params: OrderPageReqVO) => { - return await request.get({ url: '/pay/order/page', params }) +export const getOrderPage = async (params: any) => { + return await request.get>({ + url: '/pay/order/page', + params + }) } // 查询详情支付订单 export const getOrder = async (id: number, sync?: boolean) => { - return await request.get({ + return await request.get({ url: '/pay/order/get', params: { id, @@ -96,7 +76,7 @@ export const getOrder = async (id: number, sync?: boolean) => { // 获得支付订单的明细 export const getOrderDetail = async (id: number) => { - return await request.get({ url: '/pay/order/get-detail?id=' + id }) + return await request.get({ url: '/pay/order/get-detail?id=' + id }) } // 提交支付订单 @@ -105,6 +85,6 @@ export const submitOrder = async (data: any) => { } // 导出支付订单 -export const exportOrder = async (params: OrderExportReqVO) => { +export const exportOrder = async (params: any) => { return await request.download({ url: '/pay/order/export-excel', params }) } diff --git a/src/api/pay/refund/index.ts b/src/api/pay/refund/index.ts index 4b587f223..fbdef80e0 100644 --- a/src/api/pay/refund/index.ts +++ b/src/api/pay/refund/index.ts @@ -29,70 +29,36 @@ export interface RefundVO { createTime: Date } -export interface RefundPageReqVO extends PageParam { - merchantId?: number - appId?: number - channelId?: number - channelCode?: string - orderId?: string - tradeNo?: string +export interface RefundDetailVO { + merchantRefundId?: string + channelRefundNo?: string merchantOrderId?: string - merchantRefundNo?: string - notifyUrl?: string - notifyStatus?: number + channelOrderNo?: string + appId?: number + appName?: string + payPrice?: number + refundPrice?: number status?: number - type?: number - payAmount?: number - refundAmount?: number + successTime?: Date + createTime?: Date + updateTime?: Date + channelCode?: string reason?: string userIp?: string - channelOrderNo?: string - channelRefundNo?: string - channelErrorCode?: string - channelErrorMsg?: string - channelExtras?: string - expireTime?: Date[] - successTime?: Date[] - notifyTime?: Date[] - createTime?: Date[] -} - -export interface PayRefundExportReqVO { - merchantId?: number - appId?: number - channelId?: number - channelCode?: string - orderId?: string - tradeNo?: string - merchantOrderId?: string - merchantRefundNo?: string notifyUrl?: string - notifyStatus?: number - status?: number - type?: number - payAmount?: number - refundAmount?: number - reason?: string - userIp?: string - channelOrderNo?: string - channelRefundNo?: string channelErrorCode?: string channelErrorMsg?: string - channelExtras?: string - expireTime?: Date[] - successTime?: Date[] - notifyTime?: Date[] - createTime?: Date[] + channelNotifyData?: string } // 查询列表退款订单 -export const getRefundPage = (params: RefundPageReqVO) => { - return request.get({ url: '/pay/refund/page', params }) +export const getRefundPage = (params: any) => { + return request.get>({ url: '/pay/refund/page', params }) } // 查询详情退款订单 export const getRefund = (id: number) => { - return request.get({ url: '/pay/refund/get?id=' + id }) + return request.get({ url: '/pay/refund/get?id=' + id }) } // 新增退款订单 @@ -111,6 +77,6 @@ export const deleteRefund = (id: number) => { } // 导出退款订单 -export const exportRefund = (params: PayRefundExportReqVO) => { +export const exportRefund = (params: any) => { return request.download({ url: '/pay/refund/export-excel', params }) } diff --git a/src/api/pay/transfer/index.ts b/src/api/pay/transfer/index.ts index 72a080add..80be11300 100644 --- a/src/api/pay/transfer/index.ts +++ b/src/api/pay/transfer/index.ts @@ -1,16 +1,42 @@ import request from '@/config/axios' +export interface TransferVO { + id?: number + no?: string + appId?: number + appName?: string + channelId?: number + channelCode?: string + merchantTransferId?: string + type?: string + status?: number + successTime?: Date + price?: number + subject?: string + userName?: string + userAccount?: string + accountNo?: string + channelTransferNo?: string + userIp?: string + notifyUrl?: string + channelNotifyData?: string + createTime?: Date +} + // 查询转账单列表 -export const getTransferPage = async (params: PageParam) => { - return await request.get({ url: `/pay/transfer/page`, params }) +export const getTransferPage = async (params: any) => { + return await request.get>({ + url: `/pay/transfer/page`, + params + }) } // 查询转账单详情 export const getTransfer = async (id: number) => { - return await request.get({ url: '/pay/transfer/get?id=' + id }) + return await request.get({ url: '/pay/transfer/get?id=' + id }) } // 导出转账单 -export const exportTransfer = async (params: PageParam) => { +export const exportTransfer = async (params: any) => { return await request.download({ url: '/pay/transfer/export-excel', params }) } diff --git a/src/api/pay/wallet/balance/index.ts b/src/api/pay/wallet/balance/index.ts index d7c3edde7..153bf471d 100644 --- a/src/api/pay/wallet/balance/index.ts +++ b/src/api/pay/wallet/balance/index.ts @@ -16,6 +16,12 @@ export interface WalletVO { freezePrice: number } +/** 修改会员钱包余额 Request VO */ +export interface WalletBalanceUpdateReqVO { + userId: number + balance: number +} + /** 查询用户钱包详情 */ export const getWallet = async (params: PayWalletUserReqVO) => { return await request.get({ url: `/pay/wallet/get`, params }) @@ -27,6 +33,6 @@ export const getWalletPage = async (params: any) => { } /** 修改会员钱包余额 */ -export const updateWalletBalance = async (data: any) => { +export const updateWalletBalance = async (data: WalletBalanceUpdateReqVO) => { return await request.put({ url: `/pay/wallet/update-balance`, data }) } diff --git a/src/api/system/dict/dict.data.ts b/src/api/system/dict/dict.data.ts index 730e194cb..2e40978a5 100644 --- a/src/api/system/dict/dict.data.ts +++ b/src/api/system/dict/dict.data.ts @@ -1,8 +1,8 @@ import request from '@/config/axios' export interface DictDataVO { - id: number - sort: number + id?: number + sort?: number label: string value: string dictType: string @@ -10,7 +10,7 @@ export interface DictDataVO { colorType: string cssClass: string remark: string - createTime: Date + createTime?: Date } // 查询字典数据(精简)列表 diff --git a/src/api/system/dict/dict.type.ts b/src/api/system/dict/dict.type.ts index af6ad5eae..e1c60d6ca 100644 --- a/src/api/system/dict/dict.type.ts +++ b/src/api/system/dict/dict.type.ts @@ -1,12 +1,12 @@ import request from '@/config/axios' export interface DictTypeVO { - id: number + id?: number name: string type: string status: number remark: string - createTime: Date + createTime?: Date } // 查询字典(精简)列表 diff --git a/src/api/system/mail/account/index.ts b/src/api/system/mail/account/index.ts index f9c334066..dcdbd93f9 100644 --- a/src/api/system/mail/account/index.ts +++ b/src/api/system/mail/account/index.ts @@ -1,7 +1,7 @@ import request from '@/config/axios' export interface MailAccountVO { - id: number + id?: number mail: string username: string password: string diff --git a/src/components/Dialog/src/Dialog.vue b/src/components/Dialog/src/Dialog.vue index 019971c33..0002a24ee 100644 --- a/src/components/Dialog/src/Dialog.vue +++ b/src/components/Dialog/src/Dialog.vue @@ -13,11 +13,12 @@ const props = defineProps({ fullscreen: propTypes.bool.def(true), width: propTypes.oneOfType([String, Number]).def('40%'), scroll: propTypes.bool.def(false), // 是否开启滚动条。如果是的话,按照 maxHeight 设置最大高度 - maxHeight: propTypes.oneOfType([String, Number]).def('400px') + maxHeight: propTypes.oneOfType([String, Number]).def('400px'), + loading: propTypes.bool.def(false) }) const getBindValue = computed(() => { - const delArr: string[] = ['fullscreen', 'title', 'maxHeight', 'appendToBody'] + const delArr: string[] = ['fullscreen', 'title', 'maxHeight', 'appendToBody', 'loading'] const attrs = useAttrs() const obj = { ...attrs, ...props } for (const key in obj) { @@ -111,10 +112,14 @@ function closedHandler() { - - - - +
+ +