chore(api): 更新OpenAPI生成代码并优化导入格式
- 添加 /* eslint-disable */ 注释以忽略ESLint警告 - 优化导入语句的格式,将多个导入合并为单行 - 删除多余的空行和注释块 - 重新生成DefaultApi相关接口代码 - 清理冗余的代码结构,提升可读性
This commit is contained in:
@@ -9,7 +9,7 @@
|
||||
| **changeType** | **string** | 变更类型 | [optional] [default to undefined] |
|
||||
| **statusBefore** | **number** | 变更前状态 | [optional] [default to undefined] |
|
||||
| **statusAfter** | **number** | 变更后状态 | [optional] [default to undefined] |
|
||||
| **userOrderId** | **string** | 关联的订单号 | [optional] [default to undefined] |
|
||||
| **orderId** | **string** | 关联的订单号 | [optional] [default to undefined] |
|
||||
| **failureCount** | **number** | 失败次数 | [optional] [default to undefined] |
|
||||
| **remark** | **string** | 备注信息 | [optional] [default to undefined] |
|
||||
| **createdAt** | **string** | 创建时间 | [optional] [default to undefined] |
|
||||
@@ -25,7 +25,7 @@ const instance: KamiApiJdCookieV1CookieHistoryInfo = {
|
||||
changeType,
|
||||
statusBefore,
|
||||
statusAfter,
|
||||
userOrderId,
|
||||
orderId,
|
||||
failureCount,
|
||||
remark,
|
||||
createdAt
|
||||
|
||||
@@ -36,7 +36,7 @@ export interface KamiApiJdCookieV1CookieHistoryInfo {
|
||||
/**
|
||||
* 关联的订单号
|
||||
*/
|
||||
userOrderId?: string;
|
||||
orderId?: string;
|
||||
/**
|
||||
* 失败次数
|
||||
*/
|
||||
|
||||
@@ -44,11 +44,11 @@
|
||||
</div>
|
||||
|
||||
<!-- 关联订单 -->
|
||||
<div v-if="item.userOrderId" class="order-info">
|
||||
<div v-if="item.orderId" class="order-info">
|
||||
<span class="label">关联订单:</span>
|
||||
<a-typography-text
|
||||
copyable
|
||||
:content="item.userOrderId"
|
||||
:content="item.orderId"
|
||||
class="order-id"
|
||||
/>
|
||||
</div>
|
||||
|
||||
@@ -205,9 +205,9 @@
|
||||
<a-descriptions-item label="支付链接过期时间">
|
||||
{{ currentOrder.wxPayExpireAt || '-' }}
|
||||
</a-descriptions-item>
|
||||
<a-descriptions-item label="关联订单ID">
|
||||
<!-- <a-descriptions-item label="关联订单ID">
|
||||
{{ currentOrder.orderId || '-' }}
|
||||
</a-descriptions-item>
|
||||
</a-descriptions-item> -->
|
||||
<a-descriptions-item label="卡号">
|
||||
<a-typography-text v-if="currentOrder.cardNo" copyable>
|
||||
{{ currentOrder.cardNo }}
|
||||
@@ -258,6 +258,7 @@ import type { KamiApiJdCookieV1JdOrderInfo } from '@/api/generated';
|
||||
import { getCategoryChineseName } from '@/utils/categoryMapping';
|
||||
import { JDOrderManagementApiFactory } from '@/api/generated';
|
||||
import OrderHistoryDrawer from './components/jd-order-history-drawer.vue';
|
||||
import { render } from 'nprogress';
|
||||
|
||||
const { loading, setLoading } = useLoading(true);
|
||||
|
||||
@@ -343,7 +344,10 @@ const columns: TableColumnData[] = [
|
||||
dataIndex: 'category',
|
||||
width: 120,
|
||||
ellipsis: true,
|
||||
tooltip: true
|
||||
tooltip: true,
|
||||
render: ({ record }) => {
|
||||
return getCategoryChineseName(record.category) || '-';
|
||||
}
|
||||
},
|
||||
{
|
||||
title: '订单金额',
|
||||
@@ -357,16 +361,16 @@ const columns: TableColumnData[] = [
|
||||
slotName: 'status',
|
||||
width: 100
|
||||
},
|
||||
{
|
||||
title: '关联订单ID',
|
||||
dataIndex: 'orderId',
|
||||
width: 140,
|
||||
ellipsis: true,
|
||||
tooltip: true,
|
||||
render: ({ record }) => {
|
||||
return record.orderId || '-';
|
||||
}
|
||||
},
|
||||
// {
|
||||
// title: '关联订单ID',
|
||||
// dataIndex: 'orderId',
|
||||
// width: 140,
|
||||
// ellipsis: true,
|
||||
// tooltip: true,
|
||||
// render: ({ record }) => {
|
||||
// return record.orderId || '-';
|
||||
// }
|
||||
// },
|
||||
{
|
||||
title: '卡号',
|
||||
dataIndex: 'cardNo',
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<template>
|
||||
<div class="container">
|
||||
<Breadcrumb :items="['京东订单管理', '订单管理']" />
|
||||
<a-card class="general-card" title="京东订单管理">
|
||||
<a-card class="general-card" title="订单管理">
|
||||
<a-row>
|
||||
<a-col :flex="1">
|
||||
<a-form
|
||||
@@ -190,6 +190,13 @@ const columns: TableColumnData[] = [
|
||||
return rowIndex + 1 + (pagination.current - 1) * pagination.pageSize;
|
||||
}
|
||||
},
|
||||
{
|
||||
title: '用户订单号',
|
||||
dataIndex: 'userOrderId',
|
||||
width: 180,
|
||||
ellipsis: true,
|
||||
tooltip: true
|
||||
},
|
||||
{
|
||||
title: '订单号',
|
||||
dataIndex: 'orderId',
|
||||
|
||||
Reference in New Issue
Block a user