diff --git a/src/views/card-jd-ck/order/index.vue b/src/views/card-jd-ck/order/index.vue index 713d97c..88c4c17 100644 --- a/src/views/card-jd-ck/order/index.vue +++ b/src/views/card-jd-ck/order/index.vue @@ -151,15 +151,15 @@ const columns: TableColumnData[] = [ }, { title: '订单号', - dataIndex: 'merchantId' + dataIndex: 'orderNo' }, { title: '京东订单号', - dataIndex: 'attach' + dataIndex: 'jdOrderNo' }, { title: '系统订单号', - dataIndex: 'cardTypeName' + dataIndex: 'bankOrderId' }, { title: '支付链接', @@ -171,10 +171,10 @@ const columns: TableColumnData[] = [ tooltip: true, ellipsis: true }, - { - title: '订单金额', - dataIndex: 'orderAmount' - }, + // { + // title: '订单金额', + // dataIndex: 'orderAmount' + // }, { title: '状态', dataIndex: 'status', @@ -183,12 +183,12 @@ const columns: TableColumnData[] = [ { title: '创建时间', dataIndex: 'createdAt' - }, - { - title: '操作', - dataIndex: 'operation', - slotName: 'operation' } + // { + // title: '操作', + // dataIndex: 'operation', + // slotName: 'operation' + // } ]; const generateFormModel = () => { diff --git a/src/views/dashboard/admin/components/content-chart.vue b/src/views/dashboard/admin/components/content-chart.vue index 9c75734..3d37d48 100644 --- a/src/views/dashboard/admin/components/content-chart.vue +++ b/src/views/dashboard/admin/components/content-chart.vue @@ -102,7 +102,7 @@ const detailData = ref([]); const rawData = ref([]); // 筛选选项数据 -const merchantOptions = ref<{ label: string; value: number }[]>([]); +const merchantOptions = ref<{ label: string; value: string }[]>([]); const roadOptions = ref<{ label: string; value: string }[]>([]); const dateOptions = ref<{ startDate: string; endDate: string }>({ startDate: '',