fix: pay app

apps/web-antd/src/views/pay/app/data.ts

@@ -54,7 +54,6 @@ export function useGridColumns<T = PayAppApi.App>(
     {
       field: 'status',
       title: '状态',
-      minWidth: 100,
       align: 'center',
       cellRender: {
         attrs: { beforeChange: onStatusChange },

apps/web-antd/src/views/pay/app/index.vue

@@ -100,7 +100,7 @@ function isChannelExists(channels: string[], channelCode: string) {
 }
 
 async function openChannelForm(row: PayAppApi.App, payCode: string) {
-  channelModalApi.setData({ id: row.id || 0, payCode }).open();
+  channelModalApi.setData({ id: row.id, payCode }).open();
 }
 
 const [Grid, gridApi] = useVbenVxeGrid({
@@ -139,8 +139,8 @@ const [Grid, gridApi] = useVbenVxeGrid({
       <DocAlert title="支付功能开启" url="https://doc.iocoder.cn/pay/build/" />
     </template>
 
-    <AppModal @reload="onRefresh" />
+    <AppModal @success="onRefresh" />
-    <ChannelModal @reload="onRefresh" />
+    <ChannelModal @success="onRefresh" />
 
     <Grid>
       <template #toolbar-tools>
@@ -185,27 +185,17 @@ const [Grid, gridApi] = useVbenVxeGrid({
           :actions="[
             {
               type: 'primary',
-              icon: 'lucide:check',
+              icon: isChannelExists(
-              shape: 'circle',
+                row.channelCodes,
-              ifShow: isChannelExists(
+                PayChannelEnum.ALIPAY_APP.code,
+              )
+                ? 'lucide:check'
+                : 'lucide:x',
+              danger: !isChannelExists(
                 row.channelCodes,
                 PayChannelEnum.ALIPAY_APP.code,
               ),
-              onClick: openChannelForm.bind(
-                null,
-                row,
-                PayChannelEnum.ALIPAY_APP.code,
-              ),
-            },
-            {
-              type: 'primary',
-              danger: true,
-              icon: 'lucide:x',
               shape: 'circle',
-              ifShow: !isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.ALIPAY_APP.code,
-              ),
               onClick: openChannelForm.bind(
                 null,
                 row,
@@ -220,27 +210,17 @@ const [Grid, gridApi] = useVbenVxeGrid({
           :actions="[
             {
               type: 'primary',
-              icon: 'lucide:check',
+              icon: isChannelExists(
-              shape: 'circle',
+                row.channelCodes,
-              ifShow: isChannelExists(
+                PayChannelEnum.ALIPAY_PC.code,
+              )
+                ? 'lucide:check'
+                : 'lucide:x',
+              danger: !isChannelExists(
                 row.channelCodes,
                 PayChannelEnum.ALIPAY_PC.code,
               ),
-              onClick: openChannelForm.bind(
-                null,
-                row,
-                PayChannelEnum.ALIPAY_PC.code,
-              ),
-            },
-            {
-              type: 'primary',
-              danger: true,
-              icon: 'lucide:x',
               shape: 'circle',
-              ifShow: !isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.ALIPAY_PC.code,
-              ),
               onClick: openChannelForm.bind(
                 null,
                 row,
@@ -255,27 +235,17 @@ const [Grid, gridApi] = useVbenVxeGrid({
           :actions="[
             {
               type: 'primary',
-              icon: 'lucide:check',
+              icon: isChannelExists(
-              shape: 'circle',
+                row.channelCodes,
-              ifShow: isChannelExists(
+                PayChannelEnum.ALIPAY_WAP.code,
+              )
+                ? 'lucide:check'
+                : 'lucide:x',
+              danger: !isChannelExists(
                 row.channelCodes,
                 PayChannelEnum.ALIPAY_WAP.code,
               ),
-              onClick: openChannelForm.bind(
-                null,
-                row,
-                PayChannelEnum.ALIPAY_WAP.code,
-              ),
-            },
-            {
-              type: 'primary',
-              danger: true,
-              icon: 'lucide:x',
               shape: 'circle',
-              ifShow: !isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.ALIPAY_WAP.code,
-              ),
               onClick: openChannelForm.bind(
                 null,
                 row,
@@ -290,27 +260,17 @@ const [Grid, gridApi] = useVbenVxeGrid({
           :actions="[
             {
               type: 'primary',
-              icon: 'lucide:check',
+              icon: isChannelExists(
-              shape: 'circle',
+                row.channelCodes,
-              ifShow: isChannelExists(
+                PayChannelEnum.ALIPAY_QR.code,
+              )
+                ? 'lucide:check'
+                : 'lucide:x',
+              danger: !isChannelExists(
                 row.channelCodes,
                 PayChannelEnum.ALIPAY_QR.code,
               ),
-              onClick: openChannelForm.bind(
-                null,
-                row,
-                PayChannelEnum.ALIPAY_QR.code,
-              ),
-            },
-            {
-              type: 'primary',
-              danger: true,
-              icon: 'lucide:x',
               shape: 'circle',
-              ifShow: !isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.ALIPAY_QR.code,
-              ),
               onClick: openChannelForm.bind(
                 null,
                 row,
@@ -325,27 +285,17 @@ const [Grid, gridApi] = useVbenVxeGrid({
           :actions="[
             {
               type: 'primary',
-              icon: 'lucide:check',
+              icon: isChannelExists(
-              shape: 'circle',
+                row.channelCodes,
-              ifShow: isChannelExists(
+                PayChannelEnum.ALIPAY_BAR.code,
+              )
+                ? 'lucide:check'
+                : 'lucide:x',
+              danger: !isChannelExists(
                 row.channelCodes,
                 PayChannelEnum.ALIPAY_BAR.code,
               ),
-              onClick: openChannelForm.bind(
-                null,
-                row,
-                PayChannelEnum.ALIPAY_BAR.code,
-              ),
-            },
-            {
-              type: 'primary',
-              danger: true,
-              icon: 'lucide:x',
               shape: 'circle',
-              ifShow: !isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.ALIPAY_BAR.code,
-              ),
               onClick: openChannelForm.bind(
                 null,
                 row,
@@ -360,27 +310,17 @@ const [Grid, gridApi] = useVbenVxeGrid({
           :actions="[
             {
               type: 'primary',
-              icon: 'lucide:check',
+              icon: isChannelExists(
-              shape: 'circle',
+                row.channelCodes,
-              ifShow: isChannelExists(
+                PayChannelEnum.WX_LITE.code,
+              )
+                ? 'lucide:check'
+                : 'lucide:x',
+              danger: !isChannelExists(
                 row.channelCodes,
                 PayChannelEnum.WX_LITE.code,
               ),
-              onClick: openChannelForm.bind(
-                null,
-                row,
-                PayChannelEnum.WX_LITE.code,
-              ),
-            },
-            {
-              type: 'primary',
-              danger: true,
-              icon: 'lucide:x',
               shape: 'circle',
-              ifShow: !isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.WX_LITE.code,
-              ),
               onClick: openChannelForm.bind(
                 null,
                 row,
@@ -395,27 +335,17 @@ const [Grid, gridApi] = useVbenVxeGrid({
           :actions="[
             {
               type: 'primary',
-              icon: 'lucide:check',
+              icon: isChannelExists(
-              shape: 'circle',
+                row.channelCodes,
-              ifShow: isChannelExists(
+                PayChannelEnum.WX_PUB.code,
+              )
+                ? 'lucide:check'
+                : 'lucide:x',
+              danger: !isChannelExists(
                 row.channelCodes,
                 PayChannelEnum.WX_PUB.code,
               ),
-              onClick: openChannelForm.bind(
-                null,
-                row,
-                PayChannelEnum.WX_PUB.code,
-              ),
-            },
-            {
-              type: 'primary',
-              danger: true,
-              icon: 'lucide:x',
               shape: 'circle',
-              ifShow: !isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.WX_PUB.code,
-              ),
               onClick: openChannelForm.bind(
                 null,
                 row,
@@ -430,27 +360,17 @@ const [Grid, gridApi] = useVbenVxeGrid({
           :actions="[
             {
               type: 'primary',
-              icon: 'lucide:check',
+              icon: isChannelExists(
-              shape: 'circle',
+                row.channelCodes,
-              ifShow: isChannelExists(
+                PayChannelEnum.WX_APP.code,
+              )
+                ? 'lucide:check'
+                : 'lucide:x',
+              danger: !isChannelExists(
                 row.channelCodes,
                 PayChannelEnum.WX_APP.code,
               ),
-              onClick: openChannelForm.bind(
-                null,
-                row,
-                PayChannelEnum.WX_APP.code,
-              ),
-            },
-            {
-              type: 'primary',
-              danger: true,
-              icon: 'lucide:x',
               shape: 'circle',
-              ifShow: !isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.WX_APP.code,
-              ),
               onClick: openChannelForm.bind(
                 null,
                 row,
@@ -465,27 +385,17 @@ const [Grid, gridApi] = useVbenVxeGrid({
           :actions="[
             {
               type: 'primary',
-              icon: 'lucide:check',
+              icon: isChannelExists(
-              shape: 'circle',
+                row.channelCodes,
-              ifShow: isChannelExists(
+                PayChannelEnum.WX_NATIVE.code,
+              )
+                ? 'lucide:check'
+                : 'lucide:x',
+              danger: !isChannelExists(
                 row.channelCodes,
                 PayChannelEnum.WX_NATIVE.code,
               ),
-              onClick: openChannelForm.bind(
-                null,
-                row,
-                PayChannelEnum.WX_NATIVE.code,
-              ),
-            },
-            {
-              type: 'primary',
-              danger: true,
-              icon: 'lucide:x',
               shape: 'circle',
-              ifShow: !isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.WX_NATIVE.code,
-              ),
               onClick: openChannelForm.bind(
                 null,
                 row,
@@ -500,27 +410,17 @@ const [Grid, gridApi] = useVbenVxeGrid({
           :actions="[
             {
               type: 'primary',
-              icon: 'lucide:check',
+              icon: isChannelExists(
-              shape: 'circle',
+                row.channelCodes,
-              ifShow: isChannelExists(
+                PayChannelEnum.WX_WAP.code,
+              )
+                ? 'lucide:check'
+                : 'lucide:x',
+              danger: !isChannelExists(
                 row.channelCodes,
                 PayChannelEnum.WX_WAP.code,
               ),
-              onClick: openChannelForm.bind(
-                null,
-                row,
-                PayChannelEnum.WX_WAP.code,
-              ),
-            },
-            {
-              type: 'primary',
-              danger: true,
-              icon: 'lucide:x',
               shape: 'circle',
-              ifShow: !isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.WX_WAP.code,
-              ),
               onClick: openChannelForm.bind(
                 null,
                 row,
@@ -535,27 +435,17 @@ const [Grid, gridApi] = useVbenVxeGrid({
           :actions="[
             {
               type: 'primary',
-              icon: 'lucide:check',
+              icon: isChannelExists(
-              shape: 'circle',
+                row.channelCodes,
-              ifShow: isChannelExists(
+                PayChannelEnum.WX_BAR.code,
+              )
+                ? 'lucide:check'
+                : 'lucide:x',
+              danger: !isChannelExists(
                 row.channelCodes,
                 PayChannelEnum.WX_BAR.code,
               ),
-              onClick: openChannelForm.bind(
-                null,
-                row,
-                PayChannelEnum.WX_BAR.code,
-              ),
-            },
-            {
-              type: 'primary',
-              danger: true,
-              icon: 'lucide:x',
               shape: 'circle',
-              ifShow: !isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.WX_BAR.code,
-              ),
               onClick: openChannelForm.bind(
                 null,
                 row,
@@ -570,27 +460,17 @@ const [Grid, gridApi] = useVbenVxeGrid({
           :actions="[
             {
               type: 'primary',
-              icon: 'lucide:check',
+              icon: isChannelExists(
-              shape: 'circle',
+                row.channelCodes,
-              ifShow: isChannelExists(
+                PayChannelEnum.WALLET.code,
+              )
+                ? 'lucide:check'
+                : 'lucide:x',
+              danger: !isChannelExists(
                 row.channelCodes,
                 PayChannelEnum.WALLET.code,
               ),
-              onClick: openChannelForm.bind(
-                null,
-                row,
-                PayChannelEnum.WALLET.code,
-              ),
-            },
-            {
-              type: 'primary',
-              danger: true,
-              icon: 'lucide:x',
               shape: 'circle',
-              ifShow: !isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.WALLET.code,
-              ),
               onClick: openChannelForm.bind(
                 null,
                 row,
@@ -605,27 +485,14 @@ const [Grid, gridApi] = useVbenVxeGrid({
           :actions="[
             {
               type: 'primary',
-              icon: 'lucide:check',
+              icon: isChannelExists(row.channelCodes, PayChannelEnum.MOCK.code)
-              shape: 'circle',
+                ? 'lucide:check'
-              ifShow: isChannelExists(
+                : 'lucide:x',
+              danger: !isChannelExists(
                 row.channelCodes,
                 PayChannelEnum.MOCK.code,
               ),
-              onClick: openChannelForm.bind(
-                null,
-                row,
-                PayChannelEnum.MOCK.code,
-              ),
-            },
-            {
-              type: 'primary',
-              danger: true,
-              icon: 'lucide:x',
               shape: 'circle',
-              ifShow: !isChannelExists(
-                row.channelCodes,
-                PayChannelEnum.MOCK.code,
-              ),
               onClick: openChannelForm.bind(
                 null,
                 row,

apps/web-antd/src/views/pay/app/modules/channel-form.vue

@@ -10,16 +10,17 @@ import { message } from 'ant-design-vue';
 
 import { useVbenForm } from '#/adapter/form';
 import { createChannel, getChannel, updateChannel } from '#/api/pay/channel';
+import { CommonStatusEnum } from '#/utils';
 
 import { channelSchema } from './data';
 
 const emit = defineEmits(['success']);
-const formData = ref<PayChannelApi.Channel>();
+const formData = ref<any>();
 const formType = ref<string>('');
 const title = computed(() => {
-  return formData.value?.id
+  return formData.value?.id === 0
-    ? $t('ui.actionTitle.edit', '应用')
+    ? $t('ui.actionTitle.create', '应用')
-    : $t('ui.actionTitle.create', '应用');
+    : $t('ui.actionTitle.edit', '应用');
 });
 
 const [Form, formApi] = useVbenForm({
@@ -43,8 +44,17 @@ const [Modal, modalApi] = useVbenModal({
     modalApi.lock();
     // 提交表单
     const data = (await formApi.getValues()) as PayChannelApi.Channel;
+    // 只保留表单中实际存在的字段，且值不为 undefined
+    const data2 = Object.fromEntries(
+      Object.entries(data).filter(([key, value]) => {
+        // 检查字段是否在表单中存在，且值不为 undefined
+        return key in data && value !== undefined;
+      }),
+    );
+    const data3 = { ...formData.value, ...data2 };
+    data3.config = JSON.stringify(data3.config);
     try {
-      await (formData.value?.id ? updateChannel(data) : createChannel(data));
+      await (data3.id ? updateChannel(data3) : createChannel(data3));
       // 关闭并提示
       await modalApi.close();
       emit('success');
@@ -67,18 +77,80 @@ const [Modal, modalApi] = useVbenModal({
       return;
     }
     modalApi.lock();
+    formType.value = payCode;
     if (payCode.includes('alipay_')) {
-      formType.value = 'alipay';
+      formData.value = {
+        appId: id,
+        code: payCode,
+        status: CommonStatusEnum.ENABLE,
+        remark: '',
+        feeRate: null,
+        config: {
+          appId: '',
+          serverUrl: null,
+          signType: 'RSA2',
+          mode: null,
+          privateKey: '',
+          alipayPublicKey: '',
+          appCertContent: '',
+          alipayPublicCertContent: '',
+          rootCertContent: '',
+          encryptType: '',
+          encryptKey: '',
+        },
+      };
     } else if (payCode.includes('mock')) {
-      formType.value = 'mock';
+      formData.value = {
+        appId: id,
+        code: payCode,
+        status: CommonStatusEnum.ENABLE,
+        remark: '',
+        feeRate: 0,
+        config: {
+          name: 'mock-conf',
+        },
+      };
     } else if (payCode.includes('wallet')) {
-      formType.value = 'wallet';
+      formData.value = {
+        appId: id,
+        code: payCode,
+        status: CommonStatusEnum.ENABLE,
+        remark: '',
+        feeRate: 0,
+        config: {
+          name: 'mock-conf',
+        },
+      };
     } else if (payCode.includes('wx')) {
-      formType.value = 'wx';
+      formData.value = {
+        appId: id,
+        code: payCode,
+        status: CommonStatusEnum.ENABLE,
+        feeRate: undefined,
+        remark: '',
+        config: {
+          appId: '',
+          mchId: '',
+          apiVersion: '',
+          mchKey: '',
+          keyContent: '',
+          privateKeyContent: '',
+          certSerialNo: '',
+          apiV3Key: '',
+          publicKeyContent: '',
+          publicKeyId: '',
+        },
+      };
     }
 
     try {
-      formData.value = await getChannel(id, payCode);
+      const res = await getChannel(id, payCode);
+      formData.value = {
+        ...res,
+        config: {
+          ...JSON.parse(res.config),
+        },
+      };
       // 设置到 values
       await formApi.setValues(formData.value);
     } finally {

apps/web-antd/src/views/pay/app/modules/data.ts

@@ -6,18 +6,8 @@ import { InputUpload } from '#/components/upload';
 import { DICT_TYPE, getDictOptions } from '#/utils/dict';
 
 export function channelSchema(formType: string): VbenFormSchema[] {
-  switch (formType) {
+  if (formType.includes('alipay_')) {
-    case 'alipay': {
     return [
-        {
-          label: '商户编号',
-          fieldName: 'id',
-          component: 'Input',
-          dependencies: {
-            show: () => false,
-            triggerFields: [''],
-          },
-        },
       {
         label: '应用编号',
         fieldName: 'appId',
@@ -27,23 +17,16 @@ export function channelSchema(formType: string): VbenFormSchema[] {
           triggerFields: [''],
         },
       },
-        {
-          label: '渠道编码',
-          fieldName: 'code',
-          component: 'Input',
-          dependencies: {
-            show: () => false,
-            triggerFields: [''],
-          },
-        },
       {
         label: '渠道费率',
         fieldName: 'feeRate',
-          component: 'Input',
+        component: 'InputNumber',
         rules: 'required',
         componentProps: {
           placeholder: '请输入渠道费率',
+          addonAfter: '%',
         },
+        defaultValue: 0,
       },
       {
         label: '开放平台 APPID',
@@ -62,7 +45,7 @@ export function channelSchema(formType: string): VbenFormSchema[] {
         componentProps: {
           options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
         },
-          defaultValue: 1,
+        defaultValue: 0,
       },
       {
         label: '网关地址',
@@ -105,11 +88,11 @@ export function channelSchema(formType: string): VbenFormSchema[] {
         componentProps: {
           options: [
             {
-                value: 0,
+              value: 1,
               label: '公钥模式',
             },
             {
-                value: 1,
+              value: 2,
               label: '证书模式',
             },
           ],
@@ -124,12 +107,6 @@ export function channelSchema(formType: string): VbenFormSchema[] {
           placeholder: '请输入应用私钥',
           rows: 8,
         },
-          dependencies: {
-            show(values) {
-              return values.config.mode !== undefined;
-            },
-            triggerFields: ['config'],
-          },
       },
       {
         label: '支付宝公钥',
@@ -142,7 +119,7 @@ export function channelSchema(formType: string): VbenFormSchema[] {
         },
         dependencies: {
           show(values) {
-              return values?.config?.mode === 0;
+            return values?.config?.mode === 1;
           },
           triggerFields: ['config.mode', 'mode', 'config'],
         },
@@ -160,7 +137,7 @@ export function channelSchema(formType: string): VbenFormSchema[] {
         rules: 'required',
         dependencies: {
           show(values) {
-              return values?.config?.mode === 1;
+            return values?.config?.mode === 2;
           },
           triggerFields: ['config.mode', 'mode', 'config'],
         },
@@ -178,7 +155,7 @@ export function channelSchema(formType: string): VbenFormSchema[] {
         rules: 'required',
         dependencies: {
           show(values) {
-              return values?.config?.mode === 1;
+            return values?.config?.mode === 2;
           },
           triggerFields: ['config.mode', 'mode', 'config'],
         },
@@ -196,7 +173,7 @@ export function channelSchema(formType: string): VbenFormSchema[] {
         rules: 'required',
         dependencies: {
           show(values) {
-              return values?.config?.mode === 1;
+            return values?.config?.mode === 2;
           },
           triggerFields: ['config.mode', 'mode', 'config'],
         },
@@ -220,28 +197,29 @@ export function channelSchema(formType: string): VbenFormSchema[] {
         },
         defaultValue: 'NONE',
       },
+      {
+        label: '接口内容加密密钥',
+        fieldName: 'config.encryptKey',
+        component: 'Input',
+        rules: 'required',
+        dependencies: {
+          show(values) {
+            return values?.config?.encryptType === 'AES';
+          },
+          triggerFields: ['config.encryptType', 'encryptType', 'config'],
+        },
+      },
       {
         label: '备注',
         fieldName: 'remark',
-          component: 'Textarea',
+        component: 'Input',
         componentProps: {
-            rows: 3,
           placeholder: '请输入备注',
         },
       },
     ];
-    }
+  } else if (formType.includes('mock') || formType.includes('wallet')) {
-    case 'mock': {
     return [
-        {
-          label: '商户编号',
-          fieldName: 'id',
-          component: 'Input',
-          dependencies: {
-            show: () => false,
-            triggerFields: [''],
-          },
-        },
       {
         label: '应用编号',
         fieldName: 'appId',
@@ -259,7 +237,7 @@ export function channelSchema(formType: string): VbenFormSchema[] {
         componentProps: {
           options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
         },
-          defaultValue: 1,
+        defaultValue: 0,
       },
       {
         label: '渠道编码',
@@ -273,11 +251,13 @@ export function channelSchema(formType: string): VbenFormSchema[] {
       {
         label: '渠道费率',
         fieldName: 'feeRate',
-          component: 'Input',
+        component: 'InputNumber',
         rules: 'required',
         componentProps: {
           placeholder: '请输入渠道费率',
+          addonAfter: '%',
         },
+        defaultValue: 0,
         dependencies: {
           show: () => false,
           triggerFields: [''],
@@ -286,88 +266,14 @@ export function channelSchema(formType: string): VbenFormSchema[] {
       {
         label: '备注',
         fieldName: 'remark',
-          component: 'Textarea',
+        component: 'Input',
         componentProps: {
-            rows: 3,
           placeholder: '请输入备注',
         },
       },
     ];
-    }
+  } else if (formType.includes('wx')) {
-    case 'wallet': {
     return [
-        {
-          label: '商户编号',
-          fieldName: 'id',
-          component: 'Input',
-          dependencies: {
-            show: () => false,
-            triggerFields: [''],
-          },
-        },
-        {
-          label: '应用编号',
-          fieldName: 'appId',
-          component: 'Input',
-          dependencies: {
-            show: () => false,
-            triggerFields: [''],
-          },
-        },
-        {
-          label: '渠道状态',
-          fieldName: 'status',
-          component: 'RadioGroup',
-          rules: 'required',
-          componentProps: {
-            options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
-          },
-          defaultValue: 1,
-        },
-        {
-          label: '渠道编码',
-          fieldName: 'code',
-          component: 'Input',
-          dependencies: {
-            show: () => false,
-            triggerFields: [''],
-          },
-        },
-        {
-          label: '渠道费率',
-          fieldName: 'feeRate',
-          component: 'Input',
-          rules: 'required',
-          componentProps: {
-            placeholder: '请输入渠道费率',
-          },
-          dependencies: {
-            show: () => false,
-            triggerFields: [''],
-          },
-        },
-        {
-          label: '备注',
-          fieldName: 'remark',
-          component: 'Textarea',
-          componentProps: {
-            rows: 3,
-            placeholder: '请输入备注',
-          },
-        },
-      ];
-    }
-    case 'wx': {
-      return [
-        {
-          label: '商户编号',
-          fieldName: 'id',
-          component: 'Input',
-          dependencies: {
-            show: () => false,
-            triggerFields: [''],
-          },
-        },
       {
         label: '应用编号',
         fieldName: 'appId',
@@ -389,15 +295,18 @@ export function channelSchema(formType: string): VbenFormSchema[] {
       {
         label: '渠道费率',
         fieldName: 'feeRate',
-          component: 'Input',
+        component: 'InputNumber',
         rules: 'required',
         componentProps: {
           placeholder: '请输入渠道费率',
+          addonAfter: '%',
         },
+        defaultValue: 0,
       },
       {
         label: '微信 APPID',
         fieldName: 'config.appId',
+        help: '前往微信商户平台[https://pay.weixin.qq.com/index.php/extend/merchant_appid/mapay_platform/account_manage]查看 APPID',
         component: 'Input',
         rules: 'required',
         componentProps: {
@@ -407,6 +316,7 @@ export function channelSchema(formType: string): VbenFormSchema[] {
       {
         label: '商户号',
         fieldName: 'config.mchId',
+        help: '前往微信商户平台[https://pay.weixin.qq.com/index.php/extend/pay_setting]查看商户号',
         component: 'Input',
         rules: 'required',
         componentProps: {
@@ -421,7 +331,7 @@ export function channelSchema(formType: string): VbenFormSchema[] {
         componentProps: {
           options: getDictOptions(DICT_TYPE.COMMON_STATUS, 'number'),
         },
-          defaultValue: 1,
+        defaultValue: 0,
       },
       {
         label: 'API 版本',
@@ -466,7 +376,7 @@ export function channelSchema(formType: string): VbenFormSchema[] {
             placeholder: '请上传 apiclient_cert.p12 证书',
           },
           fileUploadProps: {
-              accept: ['p12 '],
+            accept: ['p12'],
           },
         }),
         rules: 'required',
@@ -517,6 +427,7 @@ export function channelSchema(formType: string): VbenFormSchema[] {
         label: '证书序列号',
         fieldName: 'config.certSerialNo',
         component: 'Input',
+        help: '前往微信商户平台[https://pay.weixin.qq.com/index.php/core/cert/api_cert#/api-cert-manage]查看证书序列号',
         rules: 'required',
         componentProps: {
           placeholder: '请输入证书序列号',
@@ -528,19 +439,53 @@ export function channelSchema(formType: string): VbenFormSchema[] {
           triggerFields: ['config.mode', 'mode', 'config'],
         },
       },
+      {
+        label: 'public_key.pem 证书',
+        fieldName: 'config.publicKeyContent',
+        component: h(InputUpload, {
+          inputType: 'textarea',
+          textareaProps: {
+            rows: 8,
+            placeholder: '请上传 public_key.pem 证书',
+          },
+          fileUploadProps: {
+            accept: ['pem'],
+          },
+        }),
+        rules: 'required',
+        dependencies: {
+          show(values) {
+            return values?.config?.apiVersion === 'v3';
+          },
+          triggerFields: ['config.mode', 'mode', 'config'],
+        },
+      },
+      {
+        label: '公钥 ID',
+        fieldName: 'config.publicKeyId',
+        component: 'Input',
+        help: '微信支付公钥产品简介及使用说明[https://pay.weixin.qq.com/doc/v3/merchant/4012153196]',
+        rules: 'required',
+        componentProps: {
+          placeholder: '请输入公钥 ID',
+        },
+        dependencies: {
+          show(values) {
+            return values?.config?.apiVersion === 'v3';
+          },
+          triggerFields: ['config.mode', 'mode', 'config'],
+        },
+      },
       {
         label: '备注',
         fieldName: 'remark',
-          component: 'Textarea',
+        component: 'Input',
         componentProps: {
-            rows: 3,
           placeholder: '请输入备注',
         },
       },
     ];
-    }
+  } else {
-    default: {
     return [];
   }
-  }
 }