diff --git a/src/api/order/index.ts b/src/api/order/index.ts index 73075c3..62506f5 100644 --- a/src/api/order/index.ts +++ b/src/api/order/index.ts @@ -46,6 +46,19 @@ export async function listOrderPay(params?: OrderParam) { return Promise.reject(new Error(res.data.message)); } +/** + * 查询交费记录 + */ +export async function pageOrderPay(params?: OrderParam) { + const res = await request.get>('/shop/order-pay/page', { + params + }); + if (res.data.code === 0 && res.data.data) { + return res.data.data; + } + return Promise.reject(new Error(res.data.message)); +} + /** * 根据id查询订单 */ diff --git a/src/api/order/model/index.ts b/src/api/order/model/index.ts index 70e4164..efe4077 100644 --- a/src/api/order/model/index.ts +++ b/src/api/order/model/index.ts @@ -82,6 +82,35 @@ export interface Order { isRefund?:number; } +export interface OrderPay { + // 订单id + orderId?: number; + // 订单类型 + orderType?: string; + // 订单来源 + orderSource?: number; + // 来源记录ID + orderSourceId?: number; + // 来源记录的参数 (json格式) + orderSourceData?: string; + rentOrderId?: number; + // 订单编号 + orderNo?: string; + // 创建时间 + createTime?: string; + startTime?: string; + deliveryTime?: string; + expirationTime?: string; + expirationDay?: number; + // 状态 + status?: string; + // 用户ID + userId?: any; + equipmentCode: string; + merchantName?:string; +} + + /** * 订单搜索条件 */ diff --git a/src/views/yunxinwei/xufei/index.vue b/src/views/yunxinwei/xufei/index.vue index 6da38c9..1a68474 100644 --- a/src/views/yunxinwei/xufei/index.vue +++ b/src/views/yunxinwei/xufei/index.vue @@ -23,28 +23,19 @@ /> @@ -98,7 +74,7 @@ removeOrderRefund, removeBatchOrderRefund } from '@/api/order/refund'; - import { listOrderPay } from '@/api/order'; + import {listOrderPay, pageOrderPay} from '@/api/order'; import type { OrderRefund, OrderRefundParam } from '@/api/order/refund/model'; const props = defineProps<{ @@ -119,7 +95,8 @@ { title: '订单号', dataIndex: 'orderNo', - key: 'orderNo' + key: 'orderNo', + sorter: true }, { title: '电池型号', @@ -149,9 +126,8 @@ }, { title: '客户实名', - dataIndex: 'updateTime', - key: 'updateTime', - customRender: ({ text }) => toDateString(text) + dataIndex: 'realName', + key: 'realName' }, { title: '订单金额', @@ -202,7 +178,7 @@ where.tenantId = localStorage.getItem('tenantId'); where.isRenew = 0; console.log('isRenew'); - return listOrderPay({ + return pageOrderPay({ ...where, ...orders, page,