From 361ae581ae321c625fd4afecaffce61c6f8ac5ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=83=E8=B4=A7?= <252048765@qq.com> Date: Sat, 5 Jul 2025 07:11:54 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E6=A0=BC=E5=BC=8F=EF=BC=8C=E8=B0=83=E6=95=B4=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E9=A1=BA=E5=BA=8F=E5=92=8C=E5=86=85=E5=AE=B9=E5=AF=B9?= =?UTF-8?q?=E9=BD=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-ele/src/adapter/vxe-table.ts | 9 +++++-- .../components/description/description.vue | 2 +- apps/web-ele/src/views/pay/cashier/index.vue | 2 +- .../src/views/pay/demo/order/index.vue | 2 +- .../src/views/pay/demo/withdraw/index.vue | 2 +- .../src/views/pay/notify/modules/detail.vue | 8 +++++- apps/web-ele/src/views/pay/order/data.ts | 26 ++++++++++++------- apps/web-ele/src/views/pay/order/index.vue | 3 ++- .../src/views/pay/order/modules/detail.vue | 2 +- 9 files changed, 38 insertions(+), 18 deletions(-) diff --git a/apps/web-ele/src/adapter/vxe-table.ts b/apps/web-ele/src/adapter/vxe-table.ts index 1abd4e865..5bf8b3137 100644 --- a/apps/web-ele/src/adapter/vxe-table.ts +++ b/apps/web-ele/src/adapter/vxe-table.ts @@ -10,7 +10,13 @@ import { setupVbenVxeTable, useVbenVxeGrid, } from '@vben/plugins/vxe-table'; -import { erpCountInputFormatter, erpNumberFormatter, formatPast2, isFunction, isString } from '@vben/utils'; +import { + erpCountInputFormatter, + erpNumberFormatter, + formatPast2, + isFunction, + isString, +} from '@vben/utils'; import { ElButton, ElImage, ElPopconfirm, ElSwitch } from 'element-plus'; @@ -285,7 +291,6 @@ setupVbenVxeTable({ return `${erpNumberFormatter(cellValue, digits)}元`; }, }); - }, useVbenForm, }); diff --git a/apps/web-ele/src/components/description/description.vue b/apps/web-ele/src/components/description/description.vue index 78efe72d3..424ecb620 100644 --- a/apps/web-ele/src/components/description/description.vue +++ b/apps/web-ele/src/components/description/description.vue @@ -53,8 +53,8 @@ const Description = defineComponent({ {...props} border={props.componentProps?.border} column={props.componentProps?.column} - extra={props.componentProps?.extra} direction={props.componentProps?.direction} + extra={props.componentProps?.extra} size={props.componentProps?.size} title={props.componentProps?.title} > diff --git a/apps/web-ele/src/views/pay/cashier/index.vue b/apps/web-ele/src/views/pay/cashier/index.vue index e00b58037..d6476d1b7 100644 --- a/apps/web-ele/src/views/pay/cashier/index.vue +++ b/apps/web-ele/src/views/pay/cashier/index.vue @@ -12,9 +12,9 @@ import { ElButton, ElCard, ElDescriptions, + ElImage, ElInput, ElMessage, - ElImage, } from 'element-plus'; import { getOrder, submitOrder } from '#/api/pay/order'; diff --git a/apps/web-ele/src/views/pay/demo/order/index.vue b/apps/web-ele/src/views/pay/demo/order/index.vue index 28c196f2d..229d93863 100644 --- a/apps/web-ele/src/views/pay/demo/order/index.vue +++ b/apps/web-ele/src/views/pay/demo/order/index.vue @@ -7,7 +7,7 @@ import { useRouter } from 'vue-router'; import { DocAlert, Page, useVbenModal } from '@vben/common-ui'; import { formatDateTime } from '@vben/utils'; -import { ElMessage, ElLoading } from 'element-plus'; +import { ElLoading, ElMessage } from 'element-plus'; import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table'; import { getDemoOrderPage, refundDemoOrder } from '#/api/pay/demo/order'; diff --git a/apps/web-ele/src/views/pay/demo/withdraw/index.vue b/apps/web-ele/src/views/pay/demo/withdraw/index.vue index d52834026..58f1a9a77 100644 --- a/apps/web-ele/src/views/pay/demo/withdraw/index.vue +++ b/apps/web-ele/src/views/pay/demo/withdraw/index.vue @@ -5,7 +5,7 @@ import type { DemoWithdrawApi } from '#/api/pay/demo/withdraw'; import { DocAlert, Page, useVbenModal } from '@vben/common-ui'; import { erpPriceInputFormatter } from '@vben/utils'; -import { ElMessage, ElLoading, ElTag } from 'element-plus'; +import { ElLoading, ElMessage, ElTag } from 'element-plus'; import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table'; import { diff --git a/apps/web-ele/src/views/pay/notify/modules/detail.vue b/apps/web-ele/src/views/pay/notify/modules/detail.vue index ff73f2139..bbc1a315a 100644 --- a/apps/web-ele/src/views/pay/notify/modules/detail.vue +++ b/apps/web-ele/src/views/pay/notify/modules/detail.vue @@ -4,7 +4,13 @@ import { ref } from 'vue'; import { useVbenModal } from '@vben/common-ui'; import { formatDateTime } from '@vben/utils'; -import { ElDescriptions, ElDescriptionsItem, ElDivider, ElTable, ElTag } from 'element-plus'; +import { + ElDescriptions, + ElDescriptionsItem, + ElDivider, + ElTable, + ElTag, +} from 'element-plus'; import { getNotifyTaskDetail } from '#/api/pay/notify'; import { DictTag } from '#/components/dict-tag'; diff --git a/apps/web-ele/src/views/pay/order/data.ts b/apps/web-ele/src/views/pay/order/data.ts index 4638f161d..cf45aa528 100644 --- a/apps/web-ele/src/views/pay/order/data.ts +++ b/apps/web-ele/src/views/pay/order/data.ts @@ -1,7 +1,7 @@ import type { VbenFormSchema } from '#/adapter/form'; import type { VxeTableGridOptions } from '#/adapter/vxe-table'; -import type { DescriptionItemSchema } from '#/components/description'; import type { PayOrderApi } from '#/api/pay/order'; +import type { DescriptionItemSchema } from '#/components/description'; import { h } from 'vue'; @@ -175,37 +175,44 @@ export function useDetailSchema(): DescriptionItemSchema[] { { field: 'price', label: '支付金额', - content: (data: PayOrderApi.Order) => `￥${erpPriceInputFormatter(data?.price)}`, + content: (data: PayOrderApi.Order) => + `￥${erpPriceInputFormatter(data?.price)}`, }, { field: 'channelFeePrice', label: '手续费', - content: (data: PayOrderApi.Order) => `￥${erpPriceInputFormatter(data?.channelFeePrice)}`, + content: (data: PayOrderApi.Order) => + `￥${erpPriceInputFormatter(data?.channelFeePrice)}`, }, { field: 'channelFeeRate', label: '手续费比例', - content: (data: PayOrderApi.Order) => `${erpPriceInputFormatter(data?.channelFeeRate)}%`, + content: (data: PayOrderApi.Order) => + `${erpPriceInputFormatter(data?.channelFeeRate)}%`, }, { field: 'successTime', label: '支付时间', - content: (data: PayOrderApi.Order) => formatDateTime(data?.successTime) as string, + content: (data: PayOrderApi.Order) => + formatDateTime(data?.successTime) as string, }, { field: 'expireTime', label: '失效时间', - content: (data: PayOrderApi.Order) => formatDateTime(data?.expireTime) as string, + content: (data: PayOrderApi.Order) => + formatDateTime(data?.expireTime) as string, }, { field: 'createTime', label: '创建时间', - content: (data: PayOrderApi.Order) => formatDateTime(data?.createTime) as string, + content: (data: PayOrderApi.Order) => + formatDateTime(data?.createTime) as string, }, { field: 'updateTime', label: '更新时间', - content: (data: PayOrderApi.Order) => formatDateTime(data?.updateTime) as string, + content: (data: PayOrderApi.Order) => + formatDateTime(data?.updateTime) as string, }, { field: 'subject', @@ -241,7 +248,8 @@ export function useDetailSchema(): DescriptionItemSchema[] { { field: 'refundPrice', label: '退款金额', - content: (data: PayOrderApi.Order) => `￥${erpPriceInputFormatter(data?.refundPrice)}`, + content: (data: PayOrderApi.Order) => + `￥${erpPriceInputFormatter(data?.refundPrice)}`, }, { field: 'notifyUrl', diff --git a/apps/web-ele/src/views/pay/order/index.vue b/apps/web-ele/src/views/pay/order/index.vue index 73d543e2d..716131b25 100644 --- a/apps/web-ele/src/views/pay/order/index.vue +++ b/apps/web-ele/src/views/pay/order/index.vue @@ -99,7 +99,8 @@ const [Grid, gridApi] = useVbenVxeGrid({