Merge branch 'develop' into production

.env.development

@@ -1,2 +1,2 @@
-VITE_API_BASE_URL= 'http://127.0.0.1:12401'
+# VITE_API_BASE_URL= 'http://127.0.0.1:12401'
-# VITE_API_BASE_URL='http://partial2.kkknametrans.buzz'
+VITE_API_BASE_URL='http://partial2.kkknametrans.buzz'

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}

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}

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;
 }

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;
 }

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;
 }

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}

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}

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}

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}

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}

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
    */

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}

src/assets/markdown/api.md

@@ -421,8 +421,8 @@ params.put("sign",md5(sb.toString()));
 | trxNo       | string   | 交易(系统账户)流水号       | 20190520123456789 |
 | payKey      | string   | 支付通道 key               | 20190520123456789 |
 | sign        | string   | 签名                       | xxx               |
-| tradeStatus | string   | 交易状态                   | success           |
+| statusCode | int   | 交易状态                   | 1 成功，0 通用失败 其他状态码待添加           |
-| statusCode  | string   | 订单状态                   | success           |
+| failReason  | string   | 订单状态                   | 失败的具体原因           |
 
 ### 签名算法
 

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 {

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

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 {

src/views/apple-card-info/card-info/components/add-modal.vue

@@ -30,6 +30,9 @@
       >
         <a-input-number v-model="formData.maxCountLimit" />
       </a-form-item>
+      <a-form-item field="remark" label="备注">
+        <a-input v-model="formData.remark" />
+      </a-form-item>
     </a-form>
   </a-modal>
 </template>

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);

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[] = [
   {

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);

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);

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 {

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[] = [
   {

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);

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);

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 {

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[] = [
   {

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);

src/views/merchant/config/components/payway-list.vue

@@ -14,6 +14,15 @@
             <div>支付类型：{{ data.singleRoadName }}</div>
             <div>
               <a-space>
+                <a-button
+                  status="success"
+                  size="small"
+                  @click="() => copyClipboard(data.roadSetting)"
+                >
+                  <template #icon>
+                    <icon-copy />
+                  </template>
+                </a-button>
                 <a-button
                   status="warning"
                   size="small"
@@ -127,7 +136,7 @@ import { isNumber } from '@/utils/is';
 import AddDeploy from './deploy/add-deploy.vue';
 import { openExternalLink } from './deploy/components/data';
 import { useClipboard } from '@vueuse/core';
-import { Message } from '@arco-design/web-vue';
+import { Message, Notification } from '@arco-design/web-vue';
 
 const props = defineProps<{
   uid: string;
@@ -168,6 +177,12 @@ const deleteDeploy = async (
   fetchData(uid);
 };
 
+const copyClipboard = async (roadSetting: string) => {
+  const { copy } = useClipboard();
+  await copy(roadSetting);
+  Notification.success(`${roadSetting}`);
+};
+
 const openLink = async (
   platformLabel: string,
   isLinkSingle: boolean,

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 {

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

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 {

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 {

src/views/t-mall-game/account-info/list.vue

@@ -150,7 +150,7 @@ const renderData = ref<TMallAccountRecord[]>([]);
 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 {

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 {

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 {

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

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

src/views/user-center/management/user.vue

@@ -177,7 +177,7 @@ const state = ref<{
 const currentItem = ref<UserRecord | null>(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 {