From 3a04a01cd7e7f6d2b1422a71515e9be42cf08355 Mon Sep 17 00:00:00 2001 From: danial Date: Thu, 15 May 2025 17:20:15 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=AF=8F=E6=97=A5?= =?UTF-8?q?=E7=A6=81=E7=94=A8=E3=80=81=E4=B8=B4=E6=97=B6=E7=A6=81=E7=94=A8?= =?UTF-8?q?=E5=92=8C=E8=BF=87=E6=9C=9F=E7=8A=B6=E6=80=81=EF=BC=8C=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E8=AE=A2=E5=8D=95=E5=92=8C=E8=B4=A6=E6=88=B7=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E6=8E=A5=E5=8F=A3=E7=9A=84=E7=8A=B6=E6=80=81=E5=A4=84?= =?UTF-8?q?=E7=90=86=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/generated/apis/ck-api.ts | 13 ++++++++----- .../kami-api-card-redeem-jd-v1-account-add-req.ts | 5 ++++- .../kami-api-card-redeem-jd-v1-account-get-res.ts | 5 ++++- .../kami-api-card-redeem-jd-v1-account-list-req.ts | 5 ++++- ...kami-api-card-redeem-jd-v1-account-status-req.ts | 5 ++++- ...kami-api-card-redeem-jd-v1-account-update-req.ts | 5 ++++- .../kami-api-card-redeem-jd-v1-cookie-info.ts | 5 ++++- .../kami-api-card-redeem-jd-v1-order-list-req.ts | 4 ++-- .../kami-api-card-redeem-jd-v1-place-order-res.ts | 4 ++-- src/views/card-jd-ck/account/index.vue | 6 ++++++ src/views/card-jd-ck/order/index.vue | 8 ++++++-- 11 files changed, 48 insertions(+), 17 deletions(-) diff --git a/src/api/generated/apis/ck-api.ts b/src/api/generated/apis/ck-api.ts index e870193..c6b0075 100644 --- a/src/api/generated/apis/ck-api.ts +++ b/src/api/generated/apis/ck-api.ts @@ -1124,7 +1124,7 @@ export interface CkApiApiCookieInfoJdAccountListGetRequest { /** * 状态 - * @type {'disable' | 'normal'} + * @type {'dailyDisable' | 'disable' | 'expired' | 'normal' | 'tmpDisable'} * @memberof CkApiApiCookieInfoJdAccountListGet */ readonly status?: ApiCookieInfoJdAccountListGetStatusEnum; @@ -1208,7 +1208,7 @@ export interface CkApiApiCookieInfoJdOrderListGetRequest { /** * 状态 - * @type {'fail' | 'init' | 'success'} + * @type {'init' | 'placeFail' | 'placeSuccess'} * @memberof CkApiApiCookieInfoJdOrderListGet */ readonly status?: ApiCookieInfoJdOrderListGetStatusEnum; @@ -1415,8 +1415,11 @@ export enum ApiCookieInfoJdAccountListGetPageSizeEnum { * @enum {string} */ export enum ApiCookieInfoJdAccountListGetStatusEnum { + DailyDisable = 'dailyDisable', Disable = 'disable', - Normal = 'normal' + Expired = 'expired', + Normal = 'normal', + TmpDisable = 'tmpDisable' } /** * @export @@ -1435,7 +1438,7 @@ export enum ApiCookieInfoJdOrderListGetPageSizeEnum { * @enum {string} */ export enum ApiCookieInfoJdOrderListGetStatusEnum { - Fail = 'fail', Init = 'init', - Success = 'success' + PlaceFail = 'placeFail', + PlaceSuccess = 'placeSuccess' } diff --git a/src/api/generated/models/kami-api-card-redeem-jd-v1-account-add-req.ts b/src/api/generated/models/kami-api-card-redeem-jd-v1-account-add-req.ts index 05da73c..6ded00c 100644 --- a/src/api/generated/models/kami-api-card-redeem-jd-v1-account-add-req.ts +++ b/src/api/generated/models/kami-api-card-redeem-jd-v1-account-add-req.ts @@ -49,6 +49,9 @@ export interface KamiApiCardRedeemJdV1AccountAddReq { * @enum {string} */ export enum KamiApiCardRedeemJdV1AccountAddReqStatusEnum { + DailyDisable = 'dailyDisable', Disable = 'disable', - Normal = 'normal' + Expired = 'expired', + Normal = 'normal', + TmpDisable = 'tmpDisable' } diff --git a/src/api/generated/models/kami-api-card-redeem-jd-v1-account-get-res.ts b/src/api/generated/models/kami-api-card-redeem-jd-v1-account-get-res.ts index b7b2e52..3025dee 100644 --- a/src/api/generated/models/kami-api-card-redeem-jd-v1-account-get-res.ts +++ b/src/api/generated/models/kami-api-card-redeem-jd-v1-account-get-res.ts @@ -85,6 +85,9 @@ export interface KamiApiCardRedeemJdV1AccountGetRes { * @enum {string} */ export enum KamiApiCardRedeemJdV1AccountGetResStatusEnum { + DailyDisable = 'dailyDisable', Disable = 'disable', - Normal = 'normal' + Expired = 'expired', + Normal = 'normal', + TmpDisable = 'tmpDisable' } diff --git a/src/api/generated/models/kami-api-card-redeem-jd-v1-account-list-req.ts b/src/api/generated/models/kami-api-card-redeem-jd-v1-account-list-req.ts index dfb1555..d797f0b 100644 --- a/src/api/generated/models/kami-api-card-redeem-jd-v1-account-list-req.ts +++ b/src/api/generated/models/kami-api-card-redeem-jd-v1-account-list-req.ts @@ -67,6 +67,9 @@ export enum KamiApiCardRedeemJdV1AccountListReqPageSizeEnum { * @enum {string} */ export enum KamiApiCardRedeemJdV1AccountListReqStatusEnum { + DailyDisable = 'dailyDisable', Disable = 'disable', - Normal = 'normal' + Expired = 'expired', + Normal = 'normal', + TmpDisable = 'tmpDisable' } diff --git a/src/api/generated/models/kami-api-card-redeem-jd-v1-account-status-req.ts b/src/api/generated/models/kami-api-card-redeem-jd-v1-account-status-req.ts index 8c547dd..f1c7bad 100644 --- a/src/api/generated/models/kami-api-card-redeem-jd-v1-account-status-req.ts +++ b/src/api/generated/models/kami-api-card-redeem-jd-v1-account-status-req.ts @@ -37,6 +37,9 @@ export interface KamiApiCardRedeemJdV1AccountStatusReq { * @enum {string} */ export enum KamiApiCardRedeemJdV1AccountStatusReqStatusEnum { + DailyDisable = 'dailyDisable', Disable = 'disable', - Normal = 'normal' + Expired = 'expired', + Normal = 'normal', + TmpDisable = 'tmpDisable' } diff --git a/src/api/generated/models/kami-api-card-redeem-jd-v1-account-update-req.ts b/src/api/generated/models/kami-api-card-redeem-jd-v1-account-update-req.ts index a532108..cef1002 100644 --- a/src/api/generated/models/kami-api-card-redeem-jd-v1-account-update-req.ts +++ b/src/api/generated/models/kami-api-card-redeem-jd-v1-account-update-req.ts @@ -55,6 +55,9 @@ export interface KamiApiCardRedeemJdV1AccountUpdateReq { * @enum {string} */ export enum KamiApiCardRedeemJdV1AccountUpdateReqStatusEnum { + DailyDisable = 'dailyDisable', Disable = 'disable', - Normal = 'normal' + Expired = 'expired', + Normal = 'normal', + TmpDisable = 'tmpDisable' } diff --git a/src/api/generated/models/kami-api-card-redeem-jd-v1-cookie-info.ts b/src/api/generated/models/kami-api-card-redeem-jd-v1-cookie-info.ts index 518648d..a59de39 100644 --- a/src/api/generated/models/kami-api-card-redeem-jd-v1-cookie-info.ts +++ b/src/api/generated/models/kami-api-card-redeem-jd-v1-cookie-info.ts @@ -85,6 +85,9 @@ export interface KamiApiCardRedeemJdV1CookieInfo { * @enum {string} */ export enum KamiApiCardRedeemJdV1CookieInfoStatusEnum { + DailyDisable = 'dailyDisable', Disable = 'disable', - Normal = 'normal' + Expired = 'expired', + Normal = 'normal', + TmpDisable = 'tmpDisable' } diff --git a/src/api/generated/models/kami-api-card-redeem-jd-v1-order-list-req.ts b/src/api/generated/models/kami-api-card-redeem-jd-v1-order-list-req.ts index a9ee0cc..6e33abb 100644 --- a/src/api/generated/models/kami-api-card-redeem-jd-v1-order-list-req.ts +++ b/src/api/generated/models/kami-api-card-redeem-jd-v1-order-list-req.ts @@ -67,7 +67,7 @@ export enum KamiApiCardRedeemJdV1OrderListReqPageSizeEnum { * @enum {string} */ export enum KamiApiCardRedeemJdV1OrderListReqStatusEnum { - Fail = 'fail', Init = 'init', - Success = 'success' + PlaceFail = 'placeFail', + PlaceSuccess = 'placeSuccess' } diff --git a/src/api/generated/models/kami-api-card-redeem-jd-v1-place-order-res.ts b/src/api/generated/models/kami-api-card-redeem-jd-v1-place-order-res.ts index e633ad6..f7b21ed 100644 --- a/src/api/generated/models/kami-api-card-redeem-jd-v1-place-order-res.ts +++ b/src/api/generated/models/kami-api-card-redeem-jd-v1-place-order-res.ts @@ -55,7 +55,7 @@ export interface KamiApiCardRedeemJdV1PlaceOrderRes { * @enum {string} */ export enum KamiApiCardRedeemJdV1PlaceOrderResOrderStatusEnum { - Fail = 'fail', Init = 'init', - Success = 'success' + PlaceFail = 'placeFail', + PlaceSuccess = 'placeSuccess' } diff --git a/src/views/card-jd-ck/account/index.vue b/src/views/card-jd-ck/account/index.vue index db75f74..7155971 100644 --- a/src/views/card-jd-ck/account/index.vue +++ b/src/views/card-jd-ck/account/index.vue @@ -329,6 +329,12 @@ const statusMapper = ( return { text: '正常', color: 'green' }; case KamiApiCardRedeemJdV1AccountAddReqStatusEnum.Disable: return { text: '禁用', color: 'red' }; + case KamiApiCardRedeemJdV1AccountAddReqStatusEnum.DailyDisable: + return { text: '每日禁用', color: 'purple' }; + case KamiApiCardRedeemJdV1AccountAddReqStatusEnum.TmpDisable: + return { text: '临时禁用', color: 'orange' }; + case KamiApiCardRedeemJdV1AccountAddReqStatusEnum.Expired: + return { text: '过期', color: 'red' }; default: return { text: '未知', color: 'gray' }; } diff --git a/src/views/card-jd-ck/order/index.vue b/src/views/card-jd-ck/order/index.vue index 8ede15d..e54d210 100644 --- a/src/views/card-jd-ck/order/index.vue +++ b/src/views/card-jd-ck/order/index.vue @@ -151,13 +151,17 @@ const columns: TableColumnData[] = [ dataIndex: 'orderNo' }, { - title: '京东订单号', - dataIndex: 'jdOrderNo' + title: '拉单ck', + dataIndex: 'cookie.name' }, { title: '系统订单号', dataIndex: 'bankOrderId' }, + { + title: '京东订单号', + dataIndex: 'jdOrderNo' + }, { title: '支付链接', dataIndex: 'wxPay'