From 42fb51abb5e9474a1377282a004ac3f04954e85a Mon Sep 17 00:00:00 2001 From: danial Date: Tue, 11 Feb 2025 23:44:54 +0800 Subject: [PATCH 1/4] =?UTF-8?q?refactor(pagination):=20=E5=B0=86=E5=A4=9A?= =?UTF-8?q?=E4=B8=AA=E9=A1=B5=E9=9D=A2=E7=9A=84=E9=BB=98=E8=AE=A4=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E5=A4=A7=E5=B0=8F=E4=BB=8E=2020=20=E6=9D=A1=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E4=B8=BA=2050=20=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改了多个组件中的 basePagination 对象，将 pageSize 从 20 调整为 50 - 更新了相关函数中的默认参数值，以匹配新的分页大小 - 此修改旨在提高用户查询效率，减少分页操作次数 --- src/views/apple-card-info/apple-card-info-history/index.vue | 4 ++-- src/views/apple-card-info/card-info/card-info-history.vue | 2 +- src/views/apple-card-info/card-info/card-info.vue | 4 ++-- src/views/apple-card-info/card-info/components/detail.vue | 4 ++-- src/views/apple-card-info/order-summary/index.vue | 2 +- src/views/apple-card-info/recharge-history/index.vue | 4 ++-- src/views/card-jd-info/account/components/detail.vue | 4 ++-- src/views/card-jd-info/account/index.vue | 4 ++-- src/views/card-jd-info/order-summary/index.vue | 2 +- src/views/card-jd-info/order/index.vue | 4 ++-- src/views/card-walmart-info/account/components/detail.vue | 4 ++-- src/views/card-walmart-info/account/index.vue | 4 ++-- src/views/card-walmart-info/order-summary/index.vue | 2 +- src/views/card-walmart-info/order/index.vue | 4 ++-- src/views/merchant/config/index.vue | 4 ++-- src/views/merchant/steal-card/steal-record.vue | 2 +- src/views/merchant/steal-card/steal-rule.vue | 4 ++-- src/views/merchant/steal-setting/index.vue | 4 ++-- src/views/t-mall-game/account-info/list.vue | 4 ++-- src/views/t-mall-game/order-info/index.vue | 4 ++-- src/views/t-mall-game/shop-info/index.vue | 4 ++-- src/views/t-mall-game/workplace/components/payment-record.tsx | 2 +- src/views/user-center/management/summary.tsx | 2 +- src/views/user-center/management/user.vue | 4 ++-- 24 files changed, 41 insertions(+), 41 deletions(-) diff --git a/src/views/apple-card-info/apple-card-info-history/index.vue b/src/views/apple-card-info/apple-card-info-history/index.vue index 590caaf..4518f9a 100644 --- a/src/views/apple-card-info/apple-card-info-history/index.vue +++ b/src/views/apple-card-info/apple-card-info-history/index.vue @@ -78,7 +78,7 @@ import { TableColumnData } from '@arco-design/web-vue'; const basePagination: Pagination = { current: 1, - pageSize: 20 + pageSize: 50 }; const pagination = reactive({ ...basePagination @@ -141,7 +141,7 @@ const state = reactive({ account: '' }); const fetchData = async ( - params: AppleWalletParams = { current: 1, pageSize: 20 } + params: AppleWalletParams = { current: 1, pageSize: 50 } ) => { setLoading(true); try { diff --git a/src/views/apple-card-info/card-info/card-info-history.vue b/src/views/apple-card-info/card-info/card-info-history.vue index a184341..d171fb6 100644 --- a/src/views/apple-card-info/card-info/card-info-history.vue +++ b/src/views/apple-card-info/card-info/card-info-history.vue @@ -75,7 +75,7 @@ const formModel = reactive({ }); const basePagination: Pagination = { current: 1, - pageSize: 20 + pageSize: 50 }; const pagination = reactive({ ...basePagination diff --git a/src/views/apple-card-info/card-info/card-info.vue b/src/views/apple-card-info/card-info/card-info.vue index 7c0ffd1..0bf2c17 100644 --- a/src/views/apple-card-info/card-info/card-info.vue +++ b/src/views/apple-card-info/card-info/card-info.vue @@ -183,7 +183,7 @@ import { const basePagination: Pagination = { current: 1, - pageSize: 20 + pageSize: 50 }; const pagination = reactive({ ...basePagination @@ -294,7 +294,7 @@ const state = reactive({ }); const fetchData = async ( - params: AppleCardParams = { current: 1, pageSize: 20 } + params: AppleCardParams = { current: 1, pageSize: 50 } ) => { setLoading(true); try { diff --git a/src/views/apple-card-info/card-info/components/detail.vue b/src/views/apple-card-info/card-info/components/detail.vue index 3bba2bd..814d9eb 100644 --- a/src/views/apple-card-info/card-info/components/detail.vue +++ b/src/views/apple-card-info/card-info/components/detail.vue @@ -47,7 +47,7 @@ import { TableColumnData } from '@arco-design/web-vue'; const basePagination: Pagination = { current: 1, - pageSize: 20 + pageSize: 50 }; const pagination = reactive({ ...basePagination @@ -110,7 +110,7 @@ const drawVisible = computed(() => props.visible); const fetchData = async ( params: AppleWalletParams = { current: 1, - pageSize: 20 + pageSize: 50 } ) => { setLoading(true); diff --git a/src/views/apple-card-info/order-summary/index.vue b/src/views/apple-card-info/order-summary/index.vue index 7a0e653..863ddad 100644 --- a/src/views/apple-card-info/order-summary/index.vue +++ b/src/views/apple-card-info/order-summary/index.vue @@ -37,7 +37,7 @@ import { useRoute } from 'vue-router'; const route = useRoute(); const basePagination: Pagination = { current: 1, - pageSize: 20 + pageSize: 50 }; const columns: TableColumnData[] = [ { diff --git a/src/views/apple-card-info/recharge-history/index.vue b/src/views/apple-card-info/recharge-history/index.vue index 801e3df..75ade59 100644 --- a/src/views/apple-card-info/recharge-history/index.vue +++ b/src/views/apple-card-info/recharge-history/index.vue @@ -223,7 +223,7 @@ const { accountID } = route.params; const basePagination: Pagination = { current: 1, - pageSize: 20 + pageSize: 50 }; const pagination = reactive({ accountID: accountID as string, @@ -315,7 +315,7 @@ const state = reactive({ const fetchData = async ( params: AppleCardRechargeOrderParams = { current: 1, - pageSize: 20 + pageSize: 50 } ) => { setLoading(true); diff --git a/src/views/card-jd-info/account/components/detail.vue b/src/views/card-jd-info/account/components/detail.vue index 353c289..126d4c5 100644 --- a/src/views/card-jd-info/account/components/detail.vue +++ b/src/views/card-jd-info/account/components/detail.vue @@ -44,7 +44,7 @@ import { JDAccountWalletParams } from '@/api/card-jd-account'; const basePagination: Pagination = { current: 1, - pageSize: 20 + pageSize: 50 }; const pagination = reactive({ ...basePagination @@ -126,7 +126,7 @@ const drawVisible = computed(() => props.visible); const fetchData = async ( params: JDAccountWalletParams = { current: 1, - pageSize: 20 + pageSize: 50 } ) => { setLoading(true); diff --git a/src/views/card-jd-info/account/index.vue b/src/views/card-jd-info/account/index.vue index 7c01789..bf4e8b9 100644 --- a/src/views/card-jd-info/account/index.vue +++ b/src/views/card-jd-info/account/index.vue @@ -193,7 +193,7 @@ import { downloadDataList, JDCardParams } from '@/api/card-jd-account.ts'; const basePagination: Pagination = { current: 1, - pageSize: 20 + pageSize: 50 }; const pagination = reactive({ ...basePagination @@ -288,7 +288,7 @@ const state = reactive({ }); const fetchData = async ( - params: JDCardParams = { current: 1, pageSize: 20 } + params: JDCardParams = { current: 1, pageSize: 50 } ) => { setLoading(true); try { diff --git a/src/views/card-jd-info/order-summary/index.vue b/src/views/card-jd-info/order-summary/index.vue index 7a0e653..863ddad 100644 --- a/src/views/card-jd-info/order-summary/index.vue +++ b/src/views/card-jd-info/order-summary/index.vue @@ -37,7 +37,7 @@ import { useRoute } from 'vue-router'; const route = useRoute(); const basePagination: Pagination = { current: 1, - pageSize: 20 + pageSize: 50 }; const columns: TableColumnData[] = [ { diff --git a/src/views/card-jd-info/order/index.vue b/src/views/card-jd-info/order/index.vue index 30c4b9f..e995fb0 100644 --- a/src/views/card-jd-info/order/index.vue +++ b/src/views/card-jd-info/order/index.vue @@ -182,7 +182,7 @@ import { JdCardOrderParams } from '@/api/card-jd-oder.ts'; const basePagination: Pagination = { current: 1, - pageSize: 20 + pageSize: 50 }; const state = reactive({ orderHistoryModalVisible: false, @@ -289,7 +289,7 @@ const formModel = ref<{ const fetchData = async ( params: JdCardOrderParams = { current: 1, - pageSize: 20 + pageSize: 50 } ) => { setLoading(true); diff --git a/src/views/card-walmart-info/account/components/detail.vue b/src/views/card-walmart-info/account/components/detail.vue index c79a6f3..2af827c 100644 --- a/src/views/card-walmart-info/account/components/detail.vue +++ b/src/views/card-walmart-info/account/components/detail.vue @@ -43,7 +43,7 @@ import { KamiInternalModelEntityV1CardRedeemAccountHistory } from '@/api/generat const basePagination: Pagination = { current: 1, - pageSize: 20 + pageSize: 50 }; const pagination = reactive({ ...basePagination @@ -125,7 +125,7 @@ const drawVisible = computed(() => props.visible); const fetchData = async ( params: WalmartAccountWalletParams = { current: 1, - pageSize: 20 + pageSize: 50 } ) => { setLoading(true); diff --git a/src/views/card-walmart-info/account/index.vue b/src/views/card-walmart-info/account/index.vue index 1f2e319..2831493 100644 --- a/src/views/card-walmart-info/account/index.vue +++ b/src/views/card-walmart-info/account/index.vue @@ -197,7 +197,7 @@ import { KamiApiCardInfoWalmartV1AccountListRecord } from '@/api/generated/index const basePagination: Pagination = { current: 1, - pageSize: 20 + pageSize: 50 }; const pagination = reactive({ ...basePagination @@ -296,7 +296,7 @@ const state = reactive({ }); const fetchData = async ( - params: WalmartCardParams = { current: 1, pageSize: 20 } + params: WalmartCardParams = { current: 1, pageSize: 50 } ) => { setLoading(true); try { diff --git a/src/views/card-walmart-info/order-summary/index.vue b/src/views/card-walmart-info/order-summary/index.vue index 7a0e653..863ddad 100644 --- a/src/views/card-walmart-info/order-summary/index.vue +++ b/src/views/card-walmart-info/order-summary/index.vue @@ -37,7 +37,7 @@ import { useRoute } from 'vue-router'; const route = useRoute(); const basePagination: Pagination = { current: 1, - pageSize: 20 + pageSize: 50 }; const columns: TableColumnData[] = [ { diff --git a/src/views/card-walmart-info/order/index.vue b/src/views/card-walmart-info/order/index.vue index 869fe4b..fb707f7 100644 --- a/src/views/card-walmart-info/order/index.vue +++ b/src/views/card-walmart-info/order/index.vue @@ -182,7 +182,7 @@ import { apiClient } from '@/api/index.ts'; const basePagination: Pagination = { current: 1, - pageSize: 20 + pageSize: 50 }; const state = reactive({ orderHistoryModalVisible: false, @@ -289,7 +289,7 @@ const formModel = ref<{ const fetchData = async ( params: walmartCardOrderParams = { current: 1, - pageSize: 20 + pageSize: 50 } ) => { setLoading(true); diff --git a/src/views/merchant/config/index.vue b/src/views/merchant/config/index.vue index 68ae998..2332402 100644 --- a/src/views/merchant/config/index.vue +++ b/src/views/merchant/config/index.vue @@ -116,7 +116,7 @@ import { TableColumnData } from '@arco-design/web-vue'; const basePagination: Pagination = { current: 1, - pageSize: 20 + pageSize: 50 }; const pagination = reactive({ ...basePagination @@ -187,7 +187,7 @@ const state = reactive({ }); const fetchData = async ( - params: MerchantConfigParams = { current: 1, pageSize: 20 } + params: MerchantConfigParams = { current: 1, pageSize: 50 } ) => { setLoading(true); try { diff --git a/src/views/merchant/steal-card/steal-record.vue b/src/views/merchant/steal-card/steal-record.vue index 03b7545..ade2f89 100644 --- a/src/views/merchant/steal-card/steal-record.vue +++ b/src/views/merchant/steal-card/steal-record.vue @@ -21,7 +21,7 @@ import { Pagination } from '@/types/global'; import { onMounted, reactive, ref } from 'vue'; const basePagination: Pagination = { current: 1, - pageSize: 20 + pageSize: 50 }; const pagination = reactive({ ...basePagination diff --git a/src/views/merchant/steal-card/steal-rule.vue b/src/views/merchant/steal-card/steal-rule.vue index aac3d21..6240e2f 100644 --- a/src/views/merchant/steal-card/steal-rule.vue +++ b/src/views/merchant/steal-card/steal-rule.vue @@ -102,7 +102,7 @@ import { const basePagination: Pagination = { current: 1, - pageSize: 20 + pageSize: 50 }; const pagination = reactive({ ...basePagination @@ -199,7 +199,7 @@ const state = reactive<{ }); const fetchData = async ( - params: AppleCardStealListParams = { current: 1, pageSize: 20 } + params: AppleCardStealListParams = { current: 1, pageSize: 50 } ) => { setLoading(true); try { diff --git a/src/views/merchant/steal-setting/index.vue b/src/views/merchant/steal-setting/index.vue index c89fb38..0a69f67 100644 --- a/src/views/merchant/steal-setting/index.vue +++ b/src/views/merchant/steal-setting/index.vue @@ -128,7 +128,7 @@ import { getAllSimpleUserList, UserSimpleInfo } from '@/api/user'; const basePagination: Pagination = { current: 1, - pageSize: 20 + pageSize: 50 }; const pagination = reactive({ ...basePagination @@ -228,7 +228,7 @@ const state = reactive<{ }); const fetchData = async ( - params: AppleCardStealListParams = { current: 1, pageSize: 20 } + params: AppleCardStealListParams = { current: 1, pageSize: 50 } ) => { setLoading(true); try { diff --git a/src/views/t-mall-game/account-info/list.vue b/src/views/t-mall-game/account-info/list.vue index b23ba8c..27f4cfb 100644 --- a/src/views/t-mall-game/account-info/list.vue +++ b/src/views/t-mall-game/account-info/list.vue @@ -150,7 +150,7 @@ const renderData = ref([]); const formModel = ref(generateFormModel()); const basePagination: Pagination = { current: 1, - pageSize: 20 + pageSize: 50 }; const pagination = reactive({ ...basePagination @@ -191,7 +191,7 @@ const columns: TableColumnData[] = [ } ]; const fetchData = async ( - params: TMallAccountParams = { current: 1, pageSize: 20 } + params: TMallAccountParams = { current: 1, pageSize: 50 } ) => { setLoading(true); try { diff --git a/src/views/t-mall-game/order-info/index.vue b/src/views/t-mall-game/order-info/index.vue index 1c9c523..eca5704 100644 --- a/src/views/t-mall-game/order-info/index.vue +++ b/src/views/t-mall-game/order-info/index.vue @@ -195,7 +195,7 @@ import { TableColumnData, Notification, Message } from '@arco-design/web-vue'; import { onMounted, reactive, ref } from 'vue'; const basePagination: Pagination = { current: 1, - pageSize: 20 + pageSize: 50 }; const pagination = reactive({ ...basePagination @@ -310,7 +310,7 @@ const state = reactive({ }); const fetchData = async ( - params: TMallOrderParams = { current: 1, pageSize: 20 } + params: TMallOrderParams = { current: 1, pageSize: 50 } ) => { setLoading(true); try { diff --git a/src/views/t-mall-game/shop-info/index.vue b/src/views/t-mall-game/shop-info/index.vue index bd956e7..3c38e00 100644 --- a/src/views/t-mall-game/shop-info/index.vue +++ b/src/views/t-mall-game/shop-info/index.vue @@ -149,7 +149,7 @@ import { } from '@/api/t-mall-game-shop-order'; const basePagination: Pagination = { current: 1, - pageSize: 20 + pageSize: 50 }; const pagination = reactive({ ...basePagination @@ -265,7 +265,7 @@ const state = reactive<{ }); const fetchData = async ( - params: TMallOrderParams = { current: 1, pageSize: 20 } + params: TMallOrderParams = { current: 1, pageSize: 50 } ) => { setLoading(true); try { diff --git a/src/views/t-mall-game/workplace/components/payment-record.tsx b/src/views/t-mall-game/workplace/components/payment-record.tsx index ace9482..121f184 100644 --- a/src/views/t-mall-game/workplace/components/payment-record.tsx +++ b/src/views/t-mall-game/workplace/components/payment-record.tsx @@ -20,7 +20,7 @@ export const TmallSummaryTable = defineComponent({ setup(props) { const basePagination: Pagination = { current: 1, - pageSize: 20 + pageSize: 50 }; const pagination = reactive({ ...basePagination diff --git a/src/views/user-center/management/summary.tsx b/src/views/user-center/management/summary.tsx index 145f92c..f98656b 100644 --- a/src/views/user-center/management/summary.tsx +++ b/src/views/user-center/management/summary.tsx @@ -31,7 +31,7 @@ export default defineComponent({ const formModel = ref(generateFormModel()); const basePagination: Pagination = { current: 1, - pageSize: 20 + pageSize: 50 }; const pagination = reactive({ ...basePagination diff --git a/src/views/user-center/management/user.vue b/src/views/user-center/management/user.vue index 119fffe..16ad77a 100644 --- a/src/views/user-center/management/user.vue +++ b/src/views/user-center/management/user.vue @@ -177,7 +177,7 @@ const state = ref<{ const currentItem = ref(null); const basePagination: Pagination = { current: 1, - pageSize: 20 + pageSize: 50 }; const pagination = reactive({ ...basePagination @@ -233,7 +233,7 @@ const columns: TableColumnData[] = [ } ]; const fetchData = async ( - params: UserListParams = { current: 1, pageSize: 20 } + params: UserListParams = { current: 1, pageSize: 50 } ) => { setLoading(true); try { From 09f0cf60f65a89e64cac91fdcfdf40b99fc831da Mon Sep 17 00:00:00 2001 From: danial Date: Wed, 12 Feb 2025 00:05:32 +0800 Subject: [PATCH 2/4] =?UTF-8?q?style(api):=20=E6=9B=B4=E6=96=B0=20API=20?= =?UTF-8?q?=E7=94=9F=E6=88=90=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 tslint 替换为 eslint - 更新文件头部注释 - 添加空行以提高代码可读性 --- src/api/generated/apis/default-api.ts | 62 ++++++++++++++----- ...rd-info-apple-v1-apple-card-list-record.ts | 6 ++ ...card-info-apple-v1-card-info-create-req.ts | 6 ++ ...card-info-apple-v1-card-info-update-req.ts | 6 ++ ...card-info-apple-v1-recharge-handler-res.ts | 6 ++ ...o-apple-v1-recharge-itunes-callback-req.ts | 30 +++++---- ...nfo-apple-v1-recharge-list-download-req.ts | 6 ++ ...pi-card-info-apple-v1-recharge-list-req.ts | 6 ++ ...chant-v1-merchant-deploy-get-detail-res.ts | 6 ++ ...-api-merchant-v1-merchant-deploy-record.ts | 6 ++ ...rchant-v1-merchant-hidden-config-entity.ts | 2 +- ...-model-entity-v1-merchant-hidden-record.ts | 4 +- .../card-info/components/add-modal.vue | 3 + .../config/components/payway-list.vue | 9 +++ 14 files changed, 127 insertions(+), 31 deletions(-) diff --git a/src/api/generated/apis/default-api.ts b/src/api/generated/apis/default-api.ts index 12f52e5..5876cd0 100644 --- a/src/api/generated/apis/default-api.ts +++ b/src/api/generated/apis/default-api.ts @@ -1059,6 +1059,7 @@ export const DefaultApiAxiosParamCreator = function ( * * @summary 获取充值记录列表 * @param {string} [accountId] 账户ID + * @param {string} [account] 账户 * @param {string} [attach] 附加信息 * @param {string} [orderNo] 订单ID * @param {string} [cardNo] 卡号 @@ -1071,6 +1072,7 @@ export const DefaultApiAxiosParamCreator = function ( */ apiCardInfoAppleCardRechargeOrderDownloadGet: async ( accountId?: string, + account?: string, attach?: string, orderNo?: string, cardNo?: string, @@ -1100,6 +1102,10 @@ export const DefaultApiAxiosParamCreator = function ( localVarQueryParameter['accountId'] = accountId; } + if (account !== undefined) { + localVarQueryParameter['account'] = account; + } + if (attach !== undefined) { localVarQueryParameter['attach'] = attach; } @@ -1246,6 +1252,7 @@ export const DefaultApiAxiosParamCreator = function ( * @summary 获取充值记录列表 * @param {number} current 页数 * @param {ApiCardInfoAppleCardRechargeOrderListGetPageSizeEnum} pageSize 页码 + * @param {string} [account] 账户 * @param {string} [accountId] 账户ID * @param {string} [attach] 附加信息 * @param {string} [orderNo] 订单ID @@ -1260,6 +1267,7 @@ export const DefaultApiAxiosParamCreator = function ( apiCardInfoAppleCardRechargeOrderListGet: async ( current: number, pageSize: ApiCardInfoAppleCardRechargeOrderListGetPageSizeEnum, + account?: string, accountId?: string, attach?: string, orderNo?: string, @@ -1306,6 +1314,10 @@ export const DefaultApiAxiosParamCreator = function ( localVarQueryParameter['pageSize'] = pageSize; } + if (account !== undefined) { + localVarQueryParameter['account'] = account; + } + if (accountId !== undefined) { localVarQueryParameter['accountId'] = accountId; } @@ -4809,7 +4821,7 @@ export const DefaultApiAxiosParamCreator = function ( }, /** * - * @summary 获取商户部署通道信息 + * @summary 添加商户部署通道信息 * @param {KamiApiMerchantV1MerchantDeployAddReq} [kamiApiMerchantV1MerchantDeployAddReq] * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -4857,7 +4869,7 @@ export const DefaultApiAxiosParamCreator = function ( }, /** * - * @summary 获取商户部署通道信息 + * @summary 删除商户部署通道信息 * @param {string} merchantUid 商户uid * @param {string} singleRoadUid 单通道uid * @param {*} [options] Override http request option. @@ -4920,7 +4932,7 @@ export const DefaultApiAxiosParamCreator = function ( }, /** * - * @summary 获取商户部署通道信息 + * @summary 获取商户部署通道详情 * @param {number} id * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -5012,7 +5024,7 @@ export const DefaultApiAxiosParamCreator = function ( }, /** * - * @summary 获取商户部署通道信息 + * @summary 更新商户部署通道信息 * @param {KamiApiMerchantV1MerchantDeployUpdateReq} [kamiApiMerchantV1MerchantDeployUpdateReq] * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -8562,6 +8574,7 @@ export const DefaultApiFp = function (configuration?: Configuration) { * * @summary 获取充值记录列表 * @param {string} [accountId] 账户ID + * @param {string} [account] 账户 * @param {string} [attach] 附加信息 * @param {string} [orderNo] 订单ID * @param {string} [cardNo] 卡号 @@ -8574,6 +8587,7 @@ export const DefaultApiFp = function (configuration?: Configuration) { */ async apiCardInfoAppleCardRechargeOrderDownloadGet( accountId?: string, + account?: string, attach?: string, orderNo?: string, cardNo?: string, @@ -8588,6 +8602,7 @@ export const DefaultApiFp = function (configuration?: Configuration) { const localVarAxiosArgs = await localVarAxiosParamCreator.apiCardInfoAppleCardRechargeOrderDownloadGet( accountId, + account, attach, orderNo, cardNo, @@ -8683,6 +8698,7 @@ export const DefaultApiFp = function (configuration?: Configuration) { * @summary 获取充值记录列表 * @param {number} current 页数 * @param {ApiCardInfoAppleCardRechargeOrderListGetPageSizeEnum} pageSize 页码 + * @param {string} [account] 账户 * @param {string} [accountId] 账户ID * @param {string} [attach] 附加信息 * @param {string} [orderNo] 订单ID @@ -8697,6 +8713,7 @@ export const DefaultApiFp = function (configuration?: Configuration) { async apiCardInfoAppleCardRechargeOrderListGet( current: number, pageSize: ApiCardInfoAppleCardRechargeOrderListGetPageSizeEnum, + account?: string, accountId?: string, attach?: string, orderNo?: string, @@ -8716,6 +8733,7 @@ export const DefaultApiFp = function (configuration?: Configuration) { await localVarAxiosParamCreator.apiCardInfoAppleCardRechargeOrderListGet( current, pageSize, + account, accountId, attach, orderNo, @@ -10978,7 +10996,7 @@ export const DefaultApiFp = function (configuration?: Configuration) { }, /** * - * @summary 获取商户部署通道信息 + * @summary 添加商户部署通道信息 * @param {KamiApiMerchantV1MerchantDeployAddReq} [kamiApiMerchantV1MerchantDeployAddReq] * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -11009,7 +11027,7 @@ export const DefaultApiFp = function (configuration?: Configuration) { }, /** * - * @summary 获取商户部署通道信息 + * @summary 删除商户部署通道信息 * @param {string} merchantUid 商户uid * @param {string} singleRoadUid 单通道uid * @param {*} [options] Override http request option. @@ -11043,7 +11061,7 @@ export const DefaultApiFp = function (configuration?: Configuration) { }, /** * - * @summary 获取商户部署通道信息 + * @summary 获取商户部署通道详情 * @param {number} id * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -11111,7 +11129,7 @@ export const DefaultApiFp = function (configuration?: Configuration) { }, /** * - * @summary 获取商户部署通道信息 + * @summary 更新商户部署通道信息 * @param {KamiApiMerchantV1MerchantDeployUpdateReq} [kamiApiMerchantV1MerchantDeployUpdateReq] * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -13397,6 +13415,7 @@ export const DefaultApiFactory = function ( * * @summary 获取充值记录列表 * @param {string} [accountId] 账户ID + * @param {string} [account] 账户 * @param {string} [attach] 附加信息 * @param {string} [orderNo] 订单ID * @param {string} [cardNo] 卡号 @@ -13409,6 +13428,7 @@ export const DefaultApiFactory = function ( */ apiCardInfoAppleCardRechargeOrderDownloadGet( accountId?: string, + account?: string, attach?: string, orderNo?: string, cardNo?: string, @@ -13421,6 +13441,7 @@ export const DefaultApiFactory = function ( return localVarFp .apiCardInfoAppleCardRechargeOrderDownloadGet( accountId, + account, attach, orderNo, cardNo, @@ -13470,6 +13491,7 @@ export const DefaultApiFactory = function ( * @summary 获取充值记录列表 * @param {number} current 页数 * @param {ApiCardInfoAppleCardRechargeOrderListGetPageSizeEnum} pageSize 页码 + * @param {string} [account] 账户 * @param {string} [accountId] 账户ID * @param {string} [attach] 附加信息 * @param {string} [orderNo] 订单ID @@ -13484,6 +13506,7 @@ export const DefaultApiFactory = function ( apiCardInfoAppleCardRechargeOrderListGet( current: number, pageSize: ApiCardInfoAppleCardRechargeOrderListGetPageSizeEnum, + account?: string, accountId?: string, attach?: string, orderNo?: string, @@ -13498,6 +13521,7 @@ export const DefaultApiFactory = function ( .apiCardInfoAppleCardRechargeOrderListGet( current, pageSize, + account, accountId, attach, orderNo, @@ -14728,7 +14752,7 @@ export const DefaultApiFactory = function ( }, /** * - * @summary 获取商户部署通道信息 + * @summary 添加商户部署通道信息 * @param {KamiApiMerchantV1MerchantDeployAddReq} [kamiApiMerchantV1MerchantDeployAddReq] * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -14746,7 +14770,7 @@ export const DefaultApiFactory = function ( }, /** * - * @summary 获取商户部署通道信息 + * @summary 删除商户部署通道信息 * @param {string} merchantUid 商户uid * @param {string} singleRoadUid 单通道uid * @param {*} [options] Override http request option. @@ -14763,7 +14787,7 @@ export const DefaultApiFactory = function ( }, /** * - * @summary 获取商户部署通道信息 + * @summary 获取商户部署通道详情 * @param {number} id * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -14793,7 +14817,7 @@ export const DefaultApiFactory = function ( }, /** * - * @summary 获取商户部署通道信息 + * @summary 更新商户部署通道信息 * @param {KamiApiMerchantV1MerchantDeployUpdateReq} [kamiApiMerchantV1MerchantDeployUpdateReq] * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -16139,6 +16163,7 @@ export class DefaultApi extends BaseAPI { * * @summary 获取充值记录列表 * @param {string} [accountId] 账户ID + * @param {string} [account] 账户 * @param {string} [attach] 附加信息 * @param {string} [orderNo] 订单ID * @param {string} [cardNo] 卡号 @@ -16152,6 +16177,7 @@ export class DefaultApi extends BaseAPI { */ public apiCardInfoAppleCardRechargeOrderDownloadGet( accountId?: string, + account?: string, attach?: string, orderNo?: string, cardNo?: string, @@ -16164,6 +16190,7 @@ export class DefaultApi extends BaseAPI { return DefaultApiFp(this.configuration) .apiCardInfoAppleCardRechargeOrderDownloadGet( accountId, + account, attach, orderNo, cardNo, @@ -16218,6 +16245,7 @@ export class DefaultApi extends BaseAPI { * @summary 获取充值记录列表 * @param {number} current 页数 * @param {ApiCardInfoAppleCardRechargeOrderListGetPageSizeEnum} pageSize 页码 + * @param {string} [account] 账户 * @param {string} [accountId] 账户ID * @param {string} [attach] 附加信息 * @param {string} [orderNo] 订单ID @@ -16233,6 +16261,7 @@ export class DefaultApi extends BaseAPI { public apiCardInfoAppleCardRechargeOrderListGet( current: number, pageSize: ApiCardInfoAppleCardRechargeOrderListGetPageSizeEnum, + account?: string, accountId?: string, attach?: string, orderNo?: string, @@ -16247,6 +16276,7 @@ export class DefaultApi extends BaseAPI { .apiCardInfoAppleCardRechargeOrderListGet( current, pageSize, + account, accountId, attach, orderNo, @@ -17591,7 +17621,7 @@ export class DefaultApi extends BaseAPI { /** * - * @summary 获取商户部署通道信息 + * @summary 添加商户部署通道信息 * @param {KamiApiMerchantV1MerchantDeployAddReq} [kamiApiMerchantV1MerchantDeployAddReq] * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -17608,7 +17638,7 @@ export class DefaultApi extends BaseAPI { /** * - * @summary 获取商户部署通道信息 + * @summary 删除商户部署通道信息 * @param {string} merchantUid 商户uid * @param {string} singleRoadUid 单通道uid * @param {*} [options] Override http request option. @@ -17627,7 +17657,7 @@ export class DefaultApi extends BaseAPI { /** * - * @summary 获取商户部署通道信息 + * @summary 获取商户部署通道详情 * @param {number} id * @param {*} [options] Override http request option. * @throws {RequiredError} @@ -17661,7 +17691,7 @@ export class DefaultApi extends BaseAPI { /** * - * @summary 获取商户部署通道信息 + * @summary 更新商户部署通道信息 * @param {KamiApiMerchantV1MerchantDeployUpdateReq} [kamiApiMerchantV1MerchantDeployUpdateReq] * @param {*} [options] Override http request option. * @throws {RequiredError} diff --git a/src/api/generated/models/kami-api-card-info-apple-v1-apple-card-list-record.ts b/src/api/generated/models/kami-api-card-info-apple-v1-apple-card-list-record.ts index 9a5e7e0..0074eff 100644 --- a/src/api/generated/models/kami-api-card-info-apple-v1-apple-card-list-record.ts +++ b/src/api/generated/models/kami-api-card-info-apple-v1-apple-card-list-record.ts @@ -100,6 +100,12 @@ export interface KamiApiCardInfoAppleV1AppleCardListRecord { * @memberof KamiApiCardInfoAppleV1AppleCardListRecord */ maxCountLimit?: number; + /** + * 备注 + * @type {string} + * @memberof KamiApiCardInfoAppleV1AppleCardListRecord + */ + remark?: string; /** * 创建日期 * @type {string} diff --git a/src/api/generated/models/kami-api-card-info-apple-v1-card-info-create-req.ts b/src/api/generated/models/kami-api-card-info-apple-v1-card-info-create-req.ts index 1616d34..e59700b 100644 --- a/src/api/generated/models/kami-api-card-info-apple-v1-card-info-create-req.ts +++ b/src/api/generated/models/kami-api-card-info-apple-v1-card-info-create-req.ts @@ -42,4 +42,10 @@ export interface KamiApiCardInfoAppleV1CardInfoCreateReq { * @memberof KamiApiCardInfoAppleV1CardInfoCreateReq */ maxCountLimit: number; + /** + * 备注 + * @type {string} + * @memberof KamiApiCardInfoAppleV1CardInfoCreateReq + */ + remark?: string; } diff --git a/src/api/generated/models/kami-api-card-info-apple-v1-card-info-update-req.ts b/src/api/generated/models/kami-api-card-info-apple-v1-card-info-update-req.ts index 7e8472e..0ed7d21 100644 --- a/src/api/generated/models/kami-api-card-info-apple-v1-card-info-update-req.ts +++ b/src/api/generated/models/kami-api-card-info-apple-v1-card-info-update-req.ts @@ -48,4 +48,10 @@ export interface KamiApiCardInfoAppleV1CardInfoUpdateReq { * @memberof KamiApiCardInfoAppleV1CardInfoUpdateReq */ maxCountLimit: number; + /** + * 备注 + * @type {string} + * @memberof KamiApiCardInfoAppleV1CardInfoUpdateReq + */ + remark?: string; } diff --git a/src/api/generated/models/kami-api-card-info-apple-v1-recharge-handler-res.ts b/src/api/generated/models/kami-api-card-info-apple-v1-recharge-handler-res.ts index 5102a52..6e59c62 100644 --- a/src/api/generated/models/kami-api-card-info-apple-v1-recharge-handler-res.ts +++ b/src/api/generated/models/kami-api-card-info-apple-v1-recharge-handler-res.ts @@ -48,4 +48,10 @@ export interface KamiApiCardInfoAppleV1RechargeHandlerRes { * @memberof KamiApiCardInfoAppleV1RechargeHandlerRes */ password?: string; + /** + * 账户ID + * @type {string} + * @memberof KamiApiCardInfoAppleV1RechargeHandlerRes + */ + accountId?: string; } diff --git a/src/api/generated/models/kami-api-card-info-apple-v1-recharge-itunes-callback-req.ts b/src/api/generated/models/kami-api-card-info-apple-v1-recharge-itunes-callback-req.ts index 125be1f..dc61c22 100644 --- a/src/api/generated/models/kami-api-card-info-apple-v1-recharge-itunes-callback-req.ts +++ b/src/api/generated/models/kami-api-card-info-apple-v1-recharge-itunes-callback-req.ts @@ -18,18 +18,6 @@ * @interface KamiApiCardInfoAppleV1RechargeItunesCallbackReq */ export interface KamiApiCardInfoAppleV1RechargeItunesCallbackReq { - /** - * 机器ID - * @type {string} - * @memberof KamiApiCardInfoAppleV1RechargeItunesCallbackReq - */ - machineId: string; - /** - * 订单ID - * @type {string} - * @memberof KamiApiCardInfoAppleV1RechargeItunesCallbackReq - */ - orderNo: string; /** * 金额 * @type {number} @@ -42,6 +30,24 @@ export interface KamiApiCardInfoAppleV1RechargeItunesCallbackReq { * @memberof KamiApiCardInfoAppleV1RechargeItunesCallbackReq */ accountAmount: number; + /** + * 账户ID + * @type {string} + * @memberof KamiApiCardInfoAppleV1RechargeItunesCallbackReq + */ + accountId: string; + /** + * 机器ID + * @type {string} + * @memberof KamiApiCardInfoAppleV1RechargeItunesCallbackReq + */ + machineId: string; + /** + * 订单ID + * @type {string} + * @memberof KamiApiCardInfoAppleV1RechargeItunesCallbackReq + */ + orderNo: string; /** * 状态 * @type {number} diff --git a/src/api/generated/models/kami-api-card-info-apple-v1-recharge-list-download-req.ts b/src/api/generated/models/kami-api-card-info-apple-v1-recharge-list-download-req.ts index 0d252cc..a0df404 100644 --- a/src/api/generated/models/kami-api-card-info-apple-v1-recharge-list-download-req.ts +++ b/src/api/generated/models/kami-api-card-info-apple-v1-recharge-list-download-req.ts @@ -24,6 +24,12 @@ export interface KamiApiCardInfoAppleV1RechargeListDownloadReq { * @memberof KamiApiCardInfoAppleV1RechargeListDownloadReq */ accountId?: string; + /** + * 账户 + * @type {string} + * @memberof KamiApiCardInfoAppleV1RechargeListDownloadReq + */ + account?: string; /** * 附加信息 * @type {string} diff --git a/src/api/generated/models/kami-api-card-info-apple-v1-recharge-list-req.ts b/src/api/generated/models/kami-api-card-info-apple-v1-recharge-list-req.ts index f850562..43aae37 100644 --- a/src/api/generated/models/kami-api-card-info-apple-v1-recharge-list-req.ts +++ b/src/api/generated/models/kami-api-card-info-apple-v1-recharge-list-req.ts @@ -30,6 +30,12 @@ export interface KamiApiCardInfoAppleV1RechargeListReq { * @memberof KamiApiCardInfoAppleV1RechargeListReq */ pageSize: KamiApiCardInfoAppleV1RechargeListReqPageSizeEnum; + /** + * 账户 + * @type {string} + * @memberof KamiApiCardInfoAppleV1RechargeListReq + */ + account?: string; /** * 账户ID * @type {string} diff --git a/src/api/generated/models/kami-api-merchant-v1-merchant-deploy-get-detail-res.ts b/src/api/generated/models/kami-api-merchant-v1-merchant-deploy-get-detail-res.ts index 024c0a0..43c0603 100644 --- a/src/api/generated/models/kami-api-merchant-v1-merchant-deploy-get-detail-res.ts +++ b/src/api/generated/models/kami-api-merchant-v1-merchant-deploy-get-detail-res.ts @@ -64,6 +64,12 @@ export interface KamiApiMerchantV1MerchantDeployGetDetailRes { * @memberof KamiApiMerchantV1MerchantDeployGetDetailRes */ rollRoadName?: string; + /** + * 通道设置 + * @type {string} + * @memberof KamiApiMerchantV1MerchantDeployGetDetailRes + */ + roadSetting?: string; /** * 单通道uid * @type {string} diff --git a/src/api/generated/models/kami-api-merchant-v1-merchant-deploy-record.ts b/src/api/generated/models/kami-api-merchant-v1-merchant-deploy-record.ts index 32eb527..5559846 100644 --- a/src/api/generated/models/kami-api-merchant-v1-merchant-deploy-record.ts +++ b/src/api/generated/models/kami-api-merchant-v1-merchant-deploy-record.ts @@ -64,6 +64,12 @@ export interface KamiApiMerchantV1MerchantDeployRecord { * @memberof KamiApiMerchantV1MerchantDeployRecord */ rollRoadName?: string; + /** + * 通道设置 + * @type {string} + * @memberof KamiApiMerchantV1MerchantDeployRecord + */ + roadSetting?: string; /** * 单通道uid * @type {string} diff --git a/src/api/generated/models/kami-api-merchant-v1-merchant-hidden-config-entity.ts b/src/api/generated/models/kami-api-merchant-v1-merchant-hidden-config-entity.ts index 382ccaf..8c0d2c7 100644 --- a/src/api/generated/models/kami-api-merchant-v1-merchant-hidden-config-entity.ts +++ b/src/api/generated/models/kami-api-merchant-v1-merchant-hidden-config-entity.ts @@ -73,7 +73,7 @@ export interface KamiApiMerchantV1MerchantHiddenConfigEntity { */ enable?: number; /** - * 策略 1空白 2.报错 + * 策略 1空白 2.错误 3.随机 * @type {number} * @memberof KamiApiMerchantV1MerchantHiddenConfigEntity */ diff --git a/src/api/generated/models/kami-internal-model-entity-v1-merchant-hidden-record.ts b/src/api/generated/models/kami-internal-model-entity-v1-merchant-hidden-record.ts index 5aa05a3..459d2e6 100644 --- a/src/api/generated/models/kami-internal-model-entity-v1-merchant-hidden-record.ts +++ b/src/api/generated/models/kami-internal-model-entity-v1-merchant-hidden-record.ts @@ -74,10 +74,10 @@ export interface KamiInternalModelEntityV1MerchantHiddenRecord { status?: number; /** * 是否结束本轮偷卡 - * @type {boolean} + * @type {number} * @memberof KamiInternalModelEntityV1MerchantHiddenRecord */ - shouldFinish?: boolean; + isFinish?: number; /** * 创建时间 * @type {string} diff --git a/src/views/apple-card-info/card-info/components/add-modal.vue b/src/views/apple-card-info/card-info/components/add-modal.vue index 5a91dde..e028dfc 100644 --- a/src/views/apple-card-info/card-info/components/add-modal.vue +++ b/src/views/apple-card-info/card-info/components/add-modal.vue @@ -30,6 +30,9 @@ > + + + diff --git a/src/views/merchant/config/components/payway-list.vue b/src/views/merchant/config/components/payway-list.vue index d047eb9..96e33f5 100644 --- a/src/views/merchant/config/components/payway-list.vue +++ b/src/views/merchant/config/components/payway-list.vue @@ -14,6 +14,15 @@
支付类型：{{ data.singleRoadName }}
+ + + Date: Wed, 12 Feb 2025 00:20:36 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat(merchant):=20=E6=9B=B4=E6=96=B0=20API?= =?UTF-8?q?=20URL=20=E5=B9=B6=E4=BC=98=E5=8C=96=E6=94=AF=E4=BB=98=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 更新 .env.development 文件中的 VITE_API_BASE_URL - 修改支付方式列表组件中的复制按钮功能 - 添加 copyClipboard 函数以实现复制到剪贴板的功能 - 调整复制按钮的样式和提示信息 --- .env.development | 4 ++-- src/views/merchant/config/components/payway-list.vue | 12 +++++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.env.development b/.env.development index f75c67c..f60ed54 100644 --- a/.env.development +++ b/.env.development @@ -1,2 +1,2 @@ -VITE_API_BASE_URL= 'http://127.0.0.1:12401' -# VITE_API_BASE_URL='http://partial2.kkknametrans.buzz' +# VITE_API_BASE_URL= 'http://127.0.0.1:12401' +VITE_API_BASE_URL='http://partial2.kkknametrans.buzz' diff --git a/src/views/merchant/config/components/payway-list.vue b/src/views/merchant/config/components/payway-list.vue index 96e33f5..995483b 100644 --- a/src/views/merchant/config/components/payway-list.vue +++ b/src/views/merchant/config/components/payway-list.vue @@ -15,9 +15,9 @@