diff --git a/src/hooks/bootx/useFormEdit.ts b/src/hooks/bootx/useFormEdit.ts
index a1555fe1..b9268e1a 100644
--- a/src/hooks/bootx/useFormEdit.ts
+++ b/src/hooks/bootx/useFormEdit.ts
@@ -1,4 +1,4 @@
-import { reactive, toRefs } from 'vue'
+import { reactive, toRefs, unref } from "vue";
 import { FormEditType } from '@/enums/formTypeEnum'
 import { setIcon } from 'vxe-table'
 
@@ -83,7 +83,7 @@ export default function () {
   function diffForm(rawForm, editForm, ...keys) {
     const form = {}
     for (const key of keys) {
-      form[key] = rawForm[key] === editForm[key] ? undefined : editForm[key]
+      form[key] = unref(rawForm)[key] === unref(editForm)[key] ? undefined : unref(editForm)[key]
     }
     return form
   }
diff --git a/src/views/daxpay/admin/channel/alipay/config/AlipayConfig.api.ts b/src/views/daxpay/admin/channel/alipay/config/AlipayConfig.api.ts
new file mode 100644
index 00000000..2edb8027
--- /dev/null
+++ b/src/views/daxpay/admin/channel/alipay/config/AlipayConfig.api.ts
@@ -0,0 +1,66 @@
+import { defHttp } from '@/utils/http/axios'
+import { Result } from '#/axios'
+import {  MchEntity } from "#/web";
+import { unref } from 'vue'
+
+/**
+ * 获取单条
+ */
+export function getConfig(id) {
+  return defHttp.get<Result<AlipayConfig>>({
+    url: '/alipay/config/findById',
+    params: { id: unref(id) },
+  })
+}
+
+/**
+ * 保存或更新
+ */
+export function saveOrUpdate(obj: AlipayConfig) {
+  return defHttp.post({
+    url: '/alipay/config/saveOrUpdate',
+    data: obj,
+  })
+}
+
+/**
+ * 支付宝配置
+ */
+export interface AlipayConfig extends MchEntity {
+  // 商户号
+  mchNo?: string
+  // 商户AppId
+  appId?: string
+  // 支付宝商户appId
+  outAppId?: string
+  // 是否启用
+  enable: boolean
+  // 支付限额
+  limitAmount?: number
+  // 商户账号ID
+  alipayUserId?: string
+  // 授权回调地址
+  redirectUrl?: string
+  // 服务器异步通知页面路径
+  notifyUrl?: string
+  // 页面跳转同步通知页面路径
+  returnUrl?: string
+  // 请求网关地址
+  serverUrl?: string
+  // 认证方式
+  authType?: string
+  // 签名类型
+  signType?: string
+  // 支付宝公钥
+  alipayPublicKey?: string
+  // 私钥
+  privateKey?: string
+  // 应用公钥
+  appCert?: string
+  // 支付宝公钥证书
+  alipayCert?: string
+  // 支付宝CA根证书
+  alipayRootCert?: string
+  // 是否沙箱环境
+  sandbox?: boolean
+}
diff --git a/src/views/daxpay/admin/channel/alipay/config/AlipayConfigEdit.vue b/src/views/daxpay/admin/channel/alipay/config/AlipayConfigEdit.vue
new file mode 100644
index 00000000..6a22f1a5
--- /dev/null
+++ b/src/views/daxpay/admin/channel/alipay/config/AlipayConfigEdit.vue
@@ -0,0 +1,336 @@
+<template>
+  <basic-drawer
+    showFooter
+    v-bind="$attrs"
+    width="60%"
+    title="支付宝支付配置"
+    :open="visible"
+    :maskClosable="false"
+    @close="handleCancel"
+  >
+    <a-spin :spinning="confirmLoading">
+      <a-form
+        class="small-from-item"
+        ref="formRef"
+        :model="form"
+        :rules="rules"
+        :validate-trigger="['blur', 'change']"
+        :label-col="labelCol"
+        :wrapper-col="wrapperCol"
+      >
+        <a-form-item label="主键" name="id" :hidden="true">
+          <a-input v-model:value="form.id" />
+        </a-form-item>
+        <a-form-item label="AppId" name="outAppId">
+          <a-input v-model:value="form.outAppId" placeholder="请输入支付宝商户AppId" />
+        </a-form-item>
+        <a-form-item label="是否启用" name="enable">
+          <a-switch
+            checked-children="启用"
+            un-checked-children="停用"
+            v-model:checked="form.enable"
+          />
+        </a-form-item>
+        <a-form-item name="limitAmount">
+          <template #label>
+            <basic-title
+              helpMessage="每次发起支付的金额不能超过该值，如果同时配置了全局支付限额，则以额度低的为准"
+            >
+              支付限额(元)
+            </basic-title>
+          </template>
+          <a-input-number
+            :precision="2"
+            :min="0.01"
+            v-model:value="form.limitAmount"
+            placeholder="请输入支付限额(元)"
+          />
+        </a-form-item>
+        <a-form-item name="alipayUserId">
+          <template #label>
+            <basic-title
+              helpMessage="是商家与支付宝签约后，商家获得的支付宝商家唯一识别码，以 2088 开头的 16 位数字组成，在开放平台中账户中心获取"
+              >合作者身份ID
+            </basic-title>
+          </template>
+          <a-input v-model:value="form.alipayUserId" placeholder="请输入合作者身份ID" />
+        </a-form-item>
+        <a-form-item label="支付网关地址" name="serverUrl">
+          <a-input v-model:value="form.serverUrl" placeholder="请输入支付网关地址" />
+        </a-form-item>
+        <a-form-item label="沙箱环境" name="sandbox">
+          <a-switch checked-children="是" un-checked-children="否" v-model:checked="form.sandbox" />
+        </a-form-item>
+        <a-form-item label="认证方式" name="authType">
+          <a-select
+            allowClear
+            v-model:value="form.authType"
+            style="width: 100%"
+            placeholder="选择认证方式"
+          >
+            <a-select-option key="key">公钥模式</a-select-option>
+            <a-select-option key="cart">证书模式</a-select-option>
+          </a-select>
+        </a-form-item>
+        <a-form-item label="签名类型" name="signType">
+          <a-select
+            allowClear
+            v-model:value="form.signType"
+            style="width: 100%"
+            placeholder="选择签名类型"
+          >
+            <a-select-option key="RSA2">RSA2秘钥</a-select-option>
+          </a-select>
+        </a-form-item>
+        <a-form-item v-show="form.authType === 'key'" label="支付宝公钥" name="alipayPublicKey">
+          <a-textarea
+            :rows="5"
+            v-model:value="form.alipayPublicKey"
+            placeholder="请输入支付宝公钥"
+          />
+        </a-form-item>
+        <a-form-item label="应用私钥" v-show="form.authType === 'key'" name="privateKey">
+          <a-textarea :rows="5" v-model:value="form.privateKey" placeholder="请输入应用私钥" />
+        </a-form-item>
+        <a-form-item v-show="form.authType === 'cart'" label="应用公钥证书" name="appCert">
+          <a-upload
+            v-if="!form.appCert"
+            :disabled="showable"
+            name="file"
+            :multiple="false"
+            :action="uploadAction"
+            :headers="tokenHeader"
+            :showUploadList="false"
+            @change="(info) => handleChange(info, 'appCert')"
+          >
+            <a-button type="primary" preIcon="carbon:cloud-upload"> 应用证书上传 </a-button>
+          </a-upload>
+          <a-input v-else defaultValue="apiclient_cert" disabled>
+            <template #addonAfter v-if="!showable">
+              <a-tooltip>
+                <template #title> 删除上传的证书文件 </template>
+                <icon
+                  @click="form.appCert = ''"
+                  icon="ant-design:close-circle-outlined"
+                  :size="20"
+                />
+              </a-tooltip>
+            </template>
+          </a-input>
+        </a-form-item>
+        <a-form-item v-show="form.authType === 'cart'" label="支付宝公钥证书" name="alipayCert">
+          <a-upload
+            v-if="!form.alipayCert"
+            :disabled="showable"
+            name="file"
+            :multiple="false"
+            :action="uploadAction"
+            :headers="tokenHeader"
+            :showUploadList="false"
+            @change="(info) => handleChange(info, 'alipayCert')"
+          >
+            <a-button type="primary" preIcon="carbon:cloud-upload"> 公钥证书上传 </a-button>
+          </a-upload>
+          <a-input v-else defaultValue="alipay.cert" disabled>
+            <template #addonAfter v-if="!showable">
+              <a-tooltip>
+                <template #title> 删除上传的证书文件 </template>
+                <icon
+                  @click="form.alipayCert = ''"
+                  icon="ant-design:close-circle-outlined"
+                  :size="20"
+                />
+              </a-tooltip>
+            </template>
+          </a-input>
+        </a-form-item>
+        <a-form-item v-show="form.authType === 'cart'" label="支付宝CA根证书" name="alipayRootCert">
+          <a-upload
+            v-if="!form.alipayRootCert"
+            :disabled="showable"
+            name="file"
+            :multiple="false"
+            :action="uploadAction"
+            :headers="tokenHeader"
+            :showUploadList="false"
+            @change="(info) => handleChange(info, 'alipayRootCert')"
+          >
+            <a-button type="primary" preIcon="carbon:cloud-upload"> CA根证书上传 </a-button>
+          </a-upload>
+          <a-input v-else defaultValue="alipayRootCert" disabled>
+            <template #addonAfter v-if="!showable">
+              <a-tooltip>
+                <template #title> 删除上传的证书文件 </template>
+                <icon
+                  @click="form.alipayRootCert = ''"
+                  icon="ant-design:close-circle-outlined"
+                  :size="20"
+                />
+              </a-tooltip>
+            </template>
+          </a-input>
+        </a-form-item>
+      </a-form>
+    </a-spin>
+    <template #footer>
+      <a-space>
+        <a-button key="cancel" @click="handleCancel">取消</a-button>
+        <a-button
+          v-if="!showable"
+          key="forward"
+          :loading="confirmLoading"
+          type="primary"
+          @click="handleOk"
+          >保存</a-button
+        >
+      </a-space>
+    </template>
+  </basic-drawer>
+</template>
+
+<script lang="ts" setup>
+  import { computed, nextTick, ref } from 'vue'
+  import useFormEdit from '@/hooks/bootx/useFormEdit'
+  import { saveOrUpdate, AlipayConfig, getConfig } from './AlipayConfig.api'
+  import { FormInstance, Rule } from 'ant-design-vue/lib/form'
+  import { useUpload } from '@/hooks/bootx/useUpload'
+  import { useMessage } from '@/hooks/web/useMessage'
+  import { BasicDrawer } from '@/components/Drawer'
+  import { Icon } from '@/components/Icon'
+  import BasicTitle from '@/components/Basic/src/BasicTitle.vue'
+  import { ChannelConfig } from '@/views/daxpay/admin/merchant/channel/ChannelConfig.api'
+
+  const { handleCancel, diffForm, labelCol, wrapperCol, confirmLoading, visible, showable } =
+    useFormEdit()
+  // 读取证书内容
+  const { tokenHeader, uploadAction } = useUpload('/alipay/config/readPem')
+  const { createMessage } = useMessage()
+
+  const formRef = ref<FormInstance>()
+  const channelConfig = ref<ChannelConfig>({})
+
+  const form = ref({
+    outAppId: '',
+    enable: false,
+    limitAmount: 20000,
+    notifyUrl: '',
+    returnUrl: '',
+    serverUrl: '',
+    authType: 'key',
+    signType: 'RSA2',
+    alipayPublicKey: '',
+    appCert: '',
+    alipayCert: '',
+    alipayRootCert: '',
+    privateKey: '',
+    sandbox: false,
+    remark: '',
+  } as AlipayConfig)
+  let rawForm: any = {}
+  // 校验
+  const rules = computed(() => {
+    return {
+      outAppId: [{ required: true, message: '请输入AppId' }],
+      enable: [{ required: true, message: '请选择是否启用' }],
+      limitAmount: [{ required: true, message: '请输入单次支付限额' }],
+      serverUrl: [{ required: true, message: '请输入请求网关地址' }],
+      authType: [{ required: true, message: '请选择认证方式' }],
+      signType: [{ required: true, message: '请选择加密类型' }],
+      alipayPublicKey: [{ required: form.value.authType === 'key', message: '请输入支付宝公钥' }],
+      privateKey: [{ required: form.value.authType === 'key', message: '请输入支付私钥' }],
+      appCert: [{ required: form.value.authType === 'cart', message: '请输入应用证书' }],
+      alipayCert: [{ required: form.value.authType === 'cart', message: '请输入支付宝证书' }],
+      alipayRootCert: [
+        { required: form.value.authType === 'cart', message: '请输入支付宝CA根证书' },
+      ],
+      sandbox: [{ required: true, message: '请选择是否为沙箱环境' }],
+      expireTime: [{ required: true, message: '请输入默认超时配置' }],
+      payWays: [{ required: true, message: '请选择支持的支付类型' }],
+    } as Record<string, Rule[]>
+  })
+  // 事件
+  const emits = defineEmits(['ok'])
+  /**
+   * 入口
+   */
+  function init(config: ChannelConfig) {
+    channelConfig.value = config
+    resetForm()
+    visible.value = true
+    getInfo()
+  }
+  /**
+   * 获取信息
+   */
+  function getInfo() {
+    if (channelConfig.value.id) {
+      getConfig(channelConfig.value.id).then(({ data }) => {
+        confirmLoading.value = true
+        rawForm = { ...data }
+        form.value = data
+        confirmLoading.value = false
+      })
+    }
+  }
+  /**
+   * 更新
+   */
+  function handleOk() {
+    formRef.value?.validate().then(() => {
+      confirmLoading.value = true
+      saveOrUpdate({
+        mchNo: channelConfig.value.mchNo,
+        appId: channelConfig.value.appId,
+        ...form.value,
+        ...diffForm(
+          rawForm,
+          form.value,
+          'alipayPublicKey',
+          'appCert',
+          'alipayCert',
+          'alipayRootCert',
+          'privateKey',
+        ),
+      })
+        .then(() => {
+          createMessage.success('保存成功')
+          handleCancel()
+          emits('ok')
+        })
+        .finally(() => {
+          confirmLoading.value = false
+        })
+    })
+  }
+  /**
+   * 文件上传
+   */
+  function handleChange(info, fieldName) {
+    // 上传完毕
+    if (info.file.status === 'done') {
+      const res = info.file.response
+      if (!res.code) {
+        form.value[fieldName] = res.data
+        createMessage.success(`${info.file.name} 上传成功!`)
+      } else {
+        createMessage.error(`${res.msg}`)
+      }
+    } else if (info.file.status === 'error') {
+      createMessage.error('上传失败')
+    }
+  }
+
+  /**
+   * 重置表单
+   */
+  function resetForm() {
+    nextTick(() => {
+      formRef.value?.resetFields()
+    })
+  }
+  defineExpose({
+    init,
+  })
+</script>
+
+<style lang="less" scoped></style>
diff --git a/src/views/daxpay/admin/channel/wechat/config/WechatPayConfig.api.ts b/src/views/daxpay/admin/channel/wechat/config/WechatPayConfig.api.ts
new file mode 100644
index 00000000..a7102dff
--- /dev/null
+++ b/src/views/daxpay/admin/channel/wechat/config/WechatPayConfig.api.ts
@@ -0,0 +1,59 @@
+import { defHttp } from '@/utils/http/axios'
+import { Result } from '#/axios'
+import { MchEntity } from '#/web'
+import { unref } from 'vue'
+/**
+ * 获取单条
+ */
+export function getConfig(id) {
+  return defHttp.get<Result<WechatPayConfig>>({
+    url: '/wechat/pay/config/findById',
+    params: { id: unref(id) },
+  })
+}
+
+/**
+ * 保存或更新
+ */
+export function saveOrUpdate(obj: WechatPayConfig) {
+  return defHttp.post({
+    url: '/wechat/pay/config/saveOrUpdate',
+    data: obj,
+  })
+}
+
+/**
+ * 微信支付配置
+ */
+export interface WechatPayConfig extends MchEntity {
+  // 微信应用AppId
+  wxAppId?: string
+  // 微信商户号
+  wxMchId?: string
+  // 是否启用
+  enable: boolean
+  // 支付限额
+  limitAmount?: number
+  // API 版本
+  apiVersion: string
+  // 商户平台「API安全」中的 APIv2 密钥
+  apiKeyV2?: string
+  // 商户平台「API安全」中的 APIv3 密钥
+  apiKeyV3?: string
+  // APPID对应的接口密码，用于获取接口调用凭证access_token时使用
+  appSecret?: string
+  // p12的文件id
+  p12?: string | null
+  // 应用域名，回调中会使用此参数
+  domain?: string
+  // 授权回调地址
+  redirectUrl?: string
+  // 服务器异步通知页面路径
+  notifyUrl?: string
+  // 页面跳转同步通知页面路径
+  returnUrl?: string
+  // 是否沙箱环境
+  sandbox?: boolean
+  // 备注
+  remark?: string
+}
diff --git a/src/views/daxpay/admin/channel/wechat/config/WechatPayConfigEdit.vue b/src/views/daxpay/admin/channel/wechat/config/WechatPayConfigEdit.vue
new file mode 100644
index 00000000..e736edc0
--- /dev/null
+++ b/src/views/daxpay/admin/channel/wechat/config/WechatPayConfigEdit.vue
@@ -0,0 +1,276 @@
+<template>
+  <basic-drawer
+    showFooter
+    v-bind="$attrs"
+    width="60%"
+    title="微信支付配置"
+    :open="visible"
+    :maskClosable="false"
+    @close="handleCancel"
+  >
+    <a-spin :spinning="confirmLoading">
+      <a-form
+        class="small-from-item"
+        ref="formRef"
+        :model="form"
+        :rules="rules"
+        :validate-trigger="['blur', 'change']"
+        :label-col="labelCol"
+        :wrapper-col="wrapperCol"
+      >
+        <a-form-item label="主键" name="id" :hidden="true">
+          <a-input v-model:value="form.id" :disabled="showable" />
+        </a-form-item>
+        <a-form-item label="商户号" name="wxMchId">
+          <a-input v-model:value="form.wxMchId" :disabled="showable" placeholder="请输入商户号" />
+        </a-form-item>
+        <a-form-item label="应用编号" name="wxAppId">
+          <a-input
+            v-model:value="form.wxAppId"
+            :disabled="showable"
+            placeholder="请输入微信应用AppId"
+          />
+        </a-form-item>
+        <a-form-item label="AppSecret" name="appSecret">
+          <a-input
+            v-model:value="form.appSecret"
+            :disabled="showable"
+            placeholder="APPID对应的接口密码，用于获取接口调用凭证时使用"
+          />
+        </a-form-item>
+        <a-form-item label="是否启用" name="enable">
+          <a-switch
+            checked-children="启用"
+            un-checked-children="停用"
+            v-model:checked="form.enable"
+          />
+        </a-form-item>
+        <a-form-item name="limitAmount">
+          <template #label>
+            <basic-title
+              helpMessage="每次发起支付的金额不能超过该值，如果同时配置了全局支付限额，则以额度低的为准"
+            >
+              支付限额(元)
+            </basic-title>
+          </template>
+          <a-input-number
+            :precision="2"
+            :min="0.01"
+            v-model:value="form.limitAmount"
+            placeholder="请输入支付限额(元)"
+          />
+        </a-form-item>
+        <a-form-item label="沙箱环境" name="sandbox">
+          <a-switch checked-children="是" un-checked-children="否" v-model:checked="form.sandbox" />
+        </a-form-item>
+        <a-form-item label="API版本" name="apiVersion">
+          <a-radio-group v-model:value="form.apiVersion" button-style="solid">
+            <a-radio-button value="apiV2"> Api_V2 </a-radio-button>
+            <a-radio-button value="apiV3"> Api_V3 </a-radio-button>
+          </a-radio-group>
+        </a-form-item>
+        <a-form-item label="APIv2密钥" name="apiKeyV2">
+          <a-textarea
+            :rows="3"
+            :disabled="showable"
+            v-model:value="form.apiKeyV2"
+            placeholder="请输入APIv2密钥"
+          />
+        </a-form-item>
+        <a-form-item label="APIv3密钥" name="apiKeyV3">
+          <a-textarea
+            :rows="3"
+            :disabled="showable"
+            v-model:value="form.apiKeyV3"
+            placeholder="请输入APIv3密钥"
+          />
+        </a-form-item>
+        <a-form-item name="p12">
+          <template #label>
+            <basic-title helpMessage="例如退款、转账时，必须要配置p12证书才可以执行">
+              p12证书
+            </basic-title>
+          </template>
+          <a-upload
+            v-if="!form.p12"
+            :disabled="showable"
+            name="file"
+            :multiple="false"
+            :action="uploadAction"
+            :headers="tokenHeader"
+            :showUploadList="false"
+            @change="(info) => handleChange(info, 'p12')"
+          >
+            <a-button type="primary" preIcon="carbon:cloud-upload"> p12证书上传 </a-button>
+          </a-upload>
+          <a-input v-else defaultValue="apiclient_cert.p12" disabled>
+            <template #addonAfter v-if="!showable">
+              <a-tooltip>
+                <template #title> 删除上传的证书文件 </template>
+                <icon @click="form.p12 = ''" icon="ant-design:close-circle-outlined" :size="20" />
+              </a-tooltip>
+            </template>
+          </a-input>
+        </a-form-item>
+      </a-form>
+    </a-spin>
+    <template #footer>
+      <a-space>
+        <a-button key="cancel" @click="handleCancel">取消</a-button>
+        <a-button
+          v-if="!showable"
+          key="forward"
+          :loading="confirmLoading"
+          type="primary"
+          @click="handleOk"
+          >保存</a-button
+        >
+      </a-space>
+    </template>
+  </basic-drawer>
+</template>
+
+<script lang="ts" setup>
+  import { computed, nextTick, ref } from 'vue'
+  import useFormEdit from '@/hooks/bootx/useFormEdit'
+  import { getConfig, saveOrUpdate, WechatPayConfig } from './WechatPayConfig.api'
+  import { FormInstance, Rule } from 'ant-design-vue/lib/form'
+  import { BasicDrawer } from '@/components/Drawer'
+  import Icon from '@/components/Icon/Icon.vue'
+  import { useUpload } from '@/hooks/bootx/useUpload'
+  import { useMessage } from '@/hooks/web/useMessage'
+  import BasicTitle from '@/components/Basic/src/BasicTitle.vue'
+  import { ChannelConfig } from '@/views/daxpay/admin/merchant/channel/ChannelConfig.api'
+
+  const { handleCancel, diffForm, labelCol, wrapperCol, confirmLoading, visible, showable } =
+    useFormEdit()
+  // 文件上传
+  const { tokenHeader, uploadAction } = useUpload('/wechat/pay/config/toBase64')
+  const { createMessage } = useMessage()
+
+  // 表单
+  const formRef = ref<FormInstance>()
+  let rawForm: any = {}
+  let form = ref<WechatPayConfig>({
+    id: null,
+    enable: false,
+    limitAmount: 20000,
+    apiVersion: 'apiV2',
+    wxMchId: '',
+    wxAppId: '',
+    appSecret: '',
+    p12: null,
+    apiKeyV2: '',
+    apiKeyV3: '',
+    notifyUrl: '',
+    returnUrl: '',
+    sandbox: false,
+    remark: '',
+  })
+
+  const channelConfig = ref<ChannelConfig>({})
+
+  // 校验
+  const rules = computed(() => {
+    return {
+      wxMchId: [{ required: true, message: '请输入商户号' }],
+      limitAmount: [{ required: true, message: '请输入单次支付限额' }],
+      wxAppId: [{ required: true, message: '请输入应用编号' }],
+      appSecret: [{ required: true, message: '请输入AppSecret' }],
+      enable: [{ required: true, message: '请选择是否启用' }],
+      notifyUrl: [{ required: true, message: '请输入异步通知页面地址' }],
+      returnUrl: [{ required: true, message: '请输入同步通知页面地址' }],
+      sandbox: [{ required: true, message: '请选择是否为沙箱环境' }],
+      apiVersion: [{ required: true, message: '请选择支付API版本' }],
+      apiKeyV2: [{ required: form.value.apiVersion === 'apiV2', message: '请输入V2秘钥' }],
+      apiKeyV3: [{ required: form.value.apiVersion === 'apiV3', message: '请输入V3秘钥' }],
+      // p12: [{ required: true, message: '请上传p12证书' }],
+      payWays: [{ required: true, message: '请选择支持的支付类型' }],
+    } as Record<string, Rule[]>
+  })
+
+  // 事件
+  const emits = defineEmits(['ok'])
+  /**
+   * 入口
+   */
+  function init(config: ChannelConfig) {
+    channelConfig.value = config
+    visible.value = true
+    resetForm()
+    getInfo()
+  }
+  /**
+   * 获取信息
+   */
+  function getInfo() {
+    if (channelConfig.value.id) {
+      confirmLoading.value = true
+      getConfig(channelConfig.value.id).then(({ data }) => {
+        rawForm = { ...data }
+        form.value = data
+        confirmLoading.value = false
+      })
+    }
+  }
+  /**
+   * 保存
+   */
+  function handleOk() {
+    formRef.value?.validate().then(() => {
+      confirmLoading.value = true
+      saveOrUpdate({
+        mchNo: channelConfig.value.mchNo,
+        appId: channelConfig.value.appId,
+        ...form.value,
+        ...diffForm(
+          rawForm,
+          form.value,
+          'wxMchId',
+          'wxAppId',
+          'p12',
+          'appSecret',
+          'apiKeyV2',
+          'apiKeyV3',
+        ),
+      })
+        .then(() => {
+          handleCancel()
+          createMessage.success('保存成功')
+          emits('ok')
+        })
+        .finally(() => {
+          confirmLoading.value = false
+        })
+    })
+  }
+
+  // 重置表单
+  function resetForm() {
+    nextTick(() => {
+      formRef.value?.resetFields()
+    })
+  }
+  /**
+   * 文件上传
+   */
+  function handleChange(info, fieldName) {
+    // 上传完毕
+    if (info.file.status === 'done') {
+      const res = info.file.response
+      if (!res.code) {
+        form[fieldName] = res.data
+        createMessage.success(`${info.file.name} 上传成功!`)
+      } else {
+        createMessage.error(`${res.msg}`)
+      }
+    } else if (info.file.status === 'error') {
+      createMessage.error('上传失败')
+    }
+  }
+  defineExpose({
+    init,
+  })
+</script>
+
+<style lang="less" scoped></style>
diff --git a/src/views/daxpay/admin/merchant/app/MchAppEdit.vue b/src/views/daxpay/admin/merchant/app/MchAppEdit.vue
index e2747780..d05bb330 100644
--- a/src/views/daxpay/admin/merchant/app/MchAppEdit.vue
+++ b/src/views/daxpay/admin/merchant/app/MchAppEdit.vue
@@ -8,79 +8,89 @@
     :open="visible"
     @close="handleCancel"
   >
-    <a-form
-      class="small-from-item"
-      :model="form"
-      ref="formRef"
-      :validate-trigger="['blur', 'change']"
-      :rules="rules"
-      :label-col="labelCol"
-      :wrapper-col="wrapperCol"
-    >
-      <a-form-item label="主键" name="id" :hidden="true">
-        <a-input v-model:value="form.id" :disabled="showable" />
-      </a-form-item>
-      <a-form-item label="商户号" name="mchNo">
-        <a-select
-          v-model:value="form.mchNo"
-          :disabled="showable"
-          placeholder="请选择商户"
-          :options="mchNoOptions"
-        />
-      </a-form-item>
-      <a-form-item label="应用号" name="appId" v-if="!addable">
-        <a-tag> {{ form.appId }}</a-tag>
-      </a-form-item>
-      <a-form-item label="应用名称" name="appName">
-        <a-input v-model:value="form.appName" :disabled="showable" placeholder="请输入应用名称" />
-      </a-form-item>
-      <a-form-item label="请求验签" name="reqSign">
-        <a-switch
-          v-model:checked="form.reqSign"
-          checked-children="启用"
-          un-checked-children="停用"
-        />
-      </a-form-item>
-      <a-form-item label="支付限额(元)" name="limitAmount">
-        <a-input-number
-          v-model:value="form.limitAmount"
-          :min="0.01"
-          :precision="2"
-          :disabled="showable"
-          placeholder="请输入支付限额(元)"
-        />
-      </a-form-item>
-      <a-form-item label="订单超时时间(分钟)" name="orderTimeout">
-        <a-input-number
-          v-model:value="form.orderTimeout"
-          :min="5"
-          :precision="0"
-          :disabled="showable"
-          placeholder="请输入订单默认超时时间(分钟)"
-        />
-      </a-form-item>
-      <a-form-item label="签名方式" name="signType">
-        <a-radio-group v-model:value="form.signType" button-style="solid">
-          <a-radio-button value="HMAC_SHA256">HMAC_SHA256</a-radio-button>
-          <a-radio-button value="SM3">SM3</a-radio-button>
-        </a-radio-group>
-      </a-form-item>
-      <a-form-item label="签名秘钥" name="signSecret">
-        <a-textarea v-model:value="form.signSecret" :disabled="showable" placeholder="请输入公钥" />
-        <a-button type="link" @click="genSignSecret">生成秘钥</a-button>
-      </a-form-item>
-      <a-form-item label="通知方式" name="notifyType">
-        <a-radio-group v-model:value="form.notifyType" button-style="solid">
-          <a-radio-button value="none">不启用</a-radio-button>
-          <a-radio-button value="http">http</a-radio-button>
-          <a-radio-button value="websocket">websocket</a-radio-button>
-          <a-radio-button disabled value="mq">消息队列</a-radio-button>
-        </a-radio-group>
-      </a-form-item>
-      <a-form-item label="通知地址" name="notifyUrl" v-if="form.notifyType !== 'none'">
-        <a-input v-model:value="form.notifyUrl" :disabled="showable" placeholder="请输入通知地址" />
-      </a-form-item>
-    </a-form>
+    <a-spin :spinning="confirmLoading">
+      <a-form
+        class="small-from-item"
+        :model="form"
+        ref="formRef"
+        :validate-trigger="['blur', 'change']"
+        :rules="rules"
+        :label-col="labelCol"
+        :wrapper-col="wrapperCol"
+      >
+        <a-form-item label="主键" name="id" :hidden="true">
+          <a-input v-model:value="form.id" :disabled="showable" />
+        </a-form-item>
+        <a-form-item label="商户号" name="mchNo">
+          <a-select
+            v-model:value="form.mchNo"
+            :disabled="showable"
+            placeholder="请选择商户"
+            :options="mchNoOptions"
+          />
+        </a-form-item>
+        <a-form-item label="应用号" name="appId" v-if="!addable">
+          <a-tag> {{ form.appId }}</a-tag>
+        </a-form-item>
+        <a-form-item label="应用名称" name="appName">
+          <a-input v-model:value="form.appName" :disabled="showable" placeholder="请输入应用名称" />
+        </a-form-item>
+        <a-form-item label="请求验签" name="reqSign">
+          <a-switch
+            v-model:checked="form.reqSign"
+            checked-children="启用"
+            un-checked-children="停用"
+          />
+        </a-form-item>
+        <a-form-item label="支付限额(元)" name="limitAmount">
+          <a-input-number
+            v-model:value="form.limitAmount"
+            :min="0.01"
+            :precision="2"
+            :disabled="showable"
+            placeholder="请输入支付限额(元)"
+          />
+        </a-form-item>
+        <a-form-item label="订单超时时间(分钟)" name="orderTimeout">
+          <a-input-number
+            v-model:value="form.orderTimeout"
+            :min="5"
+            :precision="0"
+            :disabled="showable"
+            placeholder="请输入订单默认超时时间(分钟)"
+          />
+        </a-form-item>
+        <a-form-item label="签名方式" name="signType">
+          <a-radio-group v-model:value="form.signType" button-style="solid">
+            <a-radio-button value="HMAC_SHA256">HMAC_SHA256</a-radio-button>
+            <a-radio-button value="SM3">SM3</a-radio-button>
+          </a-radio-group>
+        </a-form-item>
+        <a-form-item label="签名秘钥" name="signSecret">
+          <a-textarea
+            v-model:value="form.signSecret"
+            :disabled="showable"
+            placeholder="请输入公钥"
+          />
+          <a-button type="link" @click="genSignSecret">生成秘钥</a-button>
+        </a-form-item>
+        <a-form-item label="通知方式" name="notifyType">
+          <a-radio-group v-model:value="form.notifyType" button-style="solid">
+            <a-radio-button value="none">不启用</a-radio-button>
+            <a-radio-button value="http">http</a-radio-button>
+            <a-radio-button value="websocket">websocket</a-radio-button>
+            <a-radio-button disabled value="mq">消息队列</a-radio-button>
+          </a-radio-group>
+        </a-form-item>
+        <a-form-item label="通知地址" name="notifyUrl" v-if="form.notifyType !== 'none'">
+          <a-input
+            v-model:value="form.notifyUrl"
+            :disabled="showable"
+            placeholder="请输入通知地址"
+          />
+        </a-form-item>
+      </a-form>
+    </a-spin>
     <template #footer>
       <a-space>
         <a-button key="cancel" @click="handleCancel">取消</a-button>
diff --git a/src/views/daxpay/admin/merchant/app/MchAppList.vue b/src/views/daxpay/admin/merchant/app/MchAppList.vue
index 1370b1fd..7e92e41f 100644
--- a/src/views/daxpay/admin/merchant/app/MchAppList.vue
+++ b/src/views/daxpay/admin/merchant/app/MchAppList.vue
@@ -60,8 +60,8 @@
         :total="pagination.total"
         @page-change="handleTableChange"
       />
-      <MchAppEdit ref="mchApp" @ok="queryPage" />
-      <ChannelSetup ref="channelSetup" />
+      <mch-app-edit ref="mchApp" @ok="queryPage" />
+      <channel-config-list ref="channelSetup" />
     </div>
   </div>
 </template>
@@ -80,7 +80,7 @@
   import { useDict } from '@/hooks/bootx/useDict'
   import { dropdown as merchantDropdown } from '@/views/daxpay/admin/merchant/info/Merchant.api'
   import { LabeledValue } from 'ant-design-vue/lib/select'
-  import ChannelSetup from '@/views/daxpay/admin/merchant/channel/ChannelSetup.vue'
+  import ChannelConfigList from '@/views/daxpay/admin/merchant/channel/ChannelConfigList.vue'
 
   // 使用hooks
   const {
diff --git a/src/views/daxpay/admin/merchant/channel/ChannelConfig.api.ts b/src/views/daxpay/admin/merchant/channel/ChannelConfig.api.ts
index 9138cc3d..a50d24f6 100644
--- a/src/views/daxpay/admin/merchant/channel/ChannelConfig.api.ts
+++ b/src/views/daxpay/admin/merchant/channel/ChannelConfig.api.ts
@@ -1,6 +1,7 @@
 import { defHttp } from '@/utils/http/axios'
 import { Result } from '#/axios'
-import { BaseEntity } from '#/web'
+import { MchEntity } from '#/web'
+import { unref } from 'vue'
 
 /**
  * 列表
@@ -9,7 +10,7 @@ export function findAll(appId) {
   return defHttp.get<Result<ChannelConfig[]>>({
     url: '/channel/config/findAllByAppId',
     params: {
-      appId,
+      appId: unref(appId),
     },
   })
 }
@@ -17,8 +18,7 @@ export function findAll(appId) {
 /**
  * 支付通道配着
  */
-export interface ChannelConfig extends BaseEntity {
-  // 通道编码
+export interface ChannelConfig extends MchEntity {
   channel?: string
   // 通道名称
   name?: string
diff --git a/src/views/daxpay/admin/merchant/channel/ChannelConfigEdit.vue b/src/views/daxpay/admin/merchant/channel/ChannelConfigEdit.vue
new file mode 100644
index 00000000..de0177ec
--- /dev/null
+++ b/src/views/daxpay/admin/merchant/channel/ChannelConfigEdit.vue
@@ -0,0 +1,53 @@
+<template>
+  <alipay-config-edit ref="alipay" @ok="ok" />
+  <wechat-pay-config-edit ref="wechat" @ok="ok" />
+</template>
+<script setup lang="ts">
+  import { useMessage } from '@/hooks/web/useMessage'
+  import { ChannelEnum } from '@/enums/daxpay/ChannelEnum'
+  import { ChannelConfig } from './ChannelConfig.api'
+  import AlipayConfigEdit from '@/views/daxpay/admin/channel/alipay/config/AlipayConfigEdit.vue'
+  import WechatPayConfigEdit from '@/views/daxpay/admin/channel/wechat/config/WechatPayConfigEdit.vue'
+  import { ref } from 'vue'
+
+  const { createMessage } = useMessage()
+
+  let alipay = ref<any>()
+  let wechat = ref<any>()
+  let union = ref<any>()
+  // 事件
+  const emits = defineEmits(['ok'])
+  /**
+   * 打开
+   */
+  function show(record: ChannelConfig) {
+    switch (record.channel) {
+      case ChannelEnum.ALI: {
+        alipay.value.init(record)
+        break
+      }
+      case ChannelEnum.WECHAT: {
+        wechat.value.init(record)
+        break
+      }
+      case ChannelEnum.UNION_PAY: {
+        union.value.init(record)
+        break
+      }
+      default: {
+        createMessage.info('暂未支持, 请期待...')
+      }
+    }
+  }
+
+  /**
+   * 操作完成回调
+   */
+  function ok() {
+    emits('ok')
+  }
+
+  defineExpose({ show })
+</script>
+
+<style scoped lang="less"></style>
diff --git a/src/views/daxpay/admin/merchant/channel/ChannelSetup.vue b/src/views/daxpay/admin/merchant/channel/ChannelConfigList.vue
similarity index 81%
rename from src/views/daxpay/admin/merchant/channel/ChannelSetup.vue
rename to src/views/daxpay/admin/merchant/channel/ChannelConfigList.vue
index f587b247..2ffb28cb 100644
--- a/src/views/daxpay/admin/merchant/channel/ChannelSetup.vue
+++ b/src/views/daxpay/admin/merchant/channel/ChannelConfigList.vue
@@ -12,7 +12,7 @@
       <a-spin :spinning="confirmLoading">
         <a-list
           style="margin-left: 20px"
-          :grid="{ gutter: 16, xs: 1, sm: 2, md: 3, lg: 4, xl: 5, xxl: 6 }"
+          :grid="{ gutter: 16, xs: 1, sm: 1, md: 2, lg: 3, xl: 4, xxl: 5 }"
           :data-source="channelConfigs"
         >
           <template #renderItem="{ item }">
@@ -25,15 +25,28 @@
                   :fallback="fallbackImg"
                 />
               </template>
-              <a-card-meta
-                style="display: flex; justify-content: space-between"
-                :title="item.name"
-              />
+              <a-card-meta style="display: flex; justify-content: space-between" :title="item.name">
+                <template #description>
+                  <template v-if="item.enable">
+                    <a-badge dot color="green" />
+                    <span style="color: green">已启用</span>
+                  </template>
+                  <template v-else-if="item.enable === false">
+                    <a-badge dot color="red" />
+                    <span style="color: red">未启用</span>
+                  </template>
+                  <template v-else>
+                    <a-badge dot color="grey" />
+                    <span style="color: grey">未配置</span>
+                  </template>
+                </template>
+              </a-card-meta>
             </a-card>
           </template>
         </a-list>
       </a-spin>
     </div>
+    <ChannelConfigEdit ref="channelConfigEdit" @ok="query" />
   </basic-drawer>
 </template>
 
@@ -45,11 +58,14 @@
   import alipay from '@/assets/daxpay/alipay.svg'
   import wechat from '@/assets/daxpay/wechat.svg'
   import unionPay from '@/assets/daxpay/unionPay.svg'
+  import ChannelConfigEdit from '@/views/daxpay/admin/merchant/channel/ChannelConfigEdit.vue'
 
   const confirmLoading = ref(false)
   const channelConfigs = ref<ChannelConfig[]>([])
 
-  const channelPayConfigEdit = ref<any>()
+  const currentAppId = ref('')
+
+  const channelConfigEdit = ref<any>()
   const visible = ref(false)
 
   // 默认图片的base64值
@@ -61,9 +77,17 @@
    */
   async function init(appId: string) {
     visible.value = true
-    confirmLoading.value = true
+    currentAppId.value = appId
+    query()
+  }
+
+  /**
+   * 查询
+   */
+  function query() {
     // 列表信息
-    findAll(appId).then(({ data }) => {
+    confirmLoading.value = true
+    findAll(currentAppId.value).then(({ data }) => {
       channelConfigs.value = data
       confirmLoading.value = false
     })
@@ -73,7 +97,7 @@
    * 打开支付设置界面
    */
   function setting(record: ChannelConfig) {
-    channelPayConfigEdit.value.show(record)
+    channelConfigEdit.value.show(record)
   }
 
   /**
diff --git a/src/views/daxpay/admin/merchant/info/MerchantEdit.vue b/src/views/daxpay/admin/merchant/info/MerchantEdit.vue
index b491ac57..963ba984 100644
--- a/src/views/daxpay/admin/merchant/info/MerchantEdit.vue
+++ b/src/views/daxpay/admin/merchant/info/MerchantEdit.vue
@@ -8,63 +8,65 @@
     :open="visible"
     @close="handleCancel"
   >
-    <a-form
-      class="small-from-item"
-      :model="form"
-      ref="formRef"
-      :validate-trigger="['blur', 'change']"
-      :rules="rules"
-      :label-col="labelCol"
-      :wrapper-col="wrapperCol"
-    >
-      <a-form-item label="主键" name="id" :hidden="true">
-        <a-input v-model:value="form.id" :disabled="showable" />
-      </a-form-item>
-      <a-form-item label="商户号" name="mchNo" v-show="!addable">
-        <a-input v-model:value="form.mchNo" disabled />
-      </a-form-item>
-      <a-form-item label="商户名称" name="mchName">
-        <a-input v-model:value="form.mchName" :disabled="showable" placeholder="请输入商户名称" />
-      </a-form-item>
-      <a-form-item label="公司名称" name="companyName">
-        <a-input v-model:value="form.mchName" :disabled="showable" placeholder="请输入公司名称" />
-      </a-form-item>
-      <a-form-item label="证件类型" name="idType">
-        <a-select
-          v-model:value="form.idType"
-          :disabled="showable"
-          allow-clear
-          placeholder="请选择证件类型"
-        >
-          <a-select-option value="1">身份证</a-select-option>
-          <a-select-option value="2">护照</a-select-option>
-          <a-select-option value="3">港澳居民来往内地通行证</a-select-option>
-          <a-select-option value="4">台湾居民来往大陆通行证</a-select-option>
-          <a-select-option value="5">户口簿</a-select-option>
-          <a-select-option value="6">军人证</a-select-option>
-        </a-select>
-      </a-form-item>
-      <a-form-item label="证件号" name="idNo">
-        <a-input v-model:value="form.idNo" :disabled="showable" placeholder="请输入证件号" />
-      </a-form-item>
-      <a-form-item label="联系方式" name="contact">
-        <a-input v-model:value="form.contact" :disabled="showable" placeholder="请输入联系方式" />
-      </a-form-item>
-      <a-form-item label="法人名称" name="legalPerson">
-        <a-input
-          v-model:value="form.legalPerson"
-          :disabled="showable"
-          placeholder="请输入法人名称"
-        />
-      </a-form-item>
-      <a-form-item label="法人证件号码" name="legalPersonIdNo">
-        <a-input
-          v-model:value="form.legalPersonIdNo"
-          :disabled="showable"
-          placeholder="请输入法人证件号码"
-        />
-      </a-form-item>
-    </a-form>
+    <a-spin :spinning="confirmLoading">
+      <a-form
+        class="small-from-item"
+        :model="form"
+        ref="formRef"
+        :validate-trigger="['blur', 'change']"
+        :rules="rules"
+        :label-col="labelCol"
+        :wrapper-col="wrapperCol"
+      >
+        <a-form-item label="主键" name="id" :hidden="true">
+          <a-input v-model:value="form.id" :disabled="showable" />
+        </a-form-item>
+        <a-form-item label="商户号" name="mchNo" v-show="!addable">
+          <a-input v-model:value="form.mchNo" disabled />
+        </a-form-item>
+        <a-form-item label="商户名称" name="mchName">
+          <a-input v-model:value="form.mchName" :disabled="showable" placeholder="请输入商户名称" />
+        </a-form-item>
+        <a-form-item label="公司名称" name="companyName">
+          <a-input v-model:value="form.mchName" :disabled="showable" placeholder="请输入公司名称" />
+        </a-form-item>
+        <a-form-item label="证件类型" name="idType">
+          <a-select
+            v-model:value="form.idType"
+            :disabled="showable"
+            allow-clear
+            placeholder="请选择证件类型"
+          >
+            <a-select-option value="1">身份证</a-select-option>
+            <a-select-option value="2">护照</a-select-option>
+            <a-select-option value="3">港澳居民来往内地通行证</a-select-option>
+            <a-select-option value="4">台湾居民来往大陆通行证</a-select-option>
+            <a-select-option value="5">户口簿</a-select-option>
+            <a-select-option value="6">军人证</a-select-option>
+          </a-select>
+        </a-form-item>
+        <a-form-item label="证件号" name="idNo">
+          <a-input v-model:value="form.idNo" :disabled="showable" placeholder="请输入证件号" />
+        </a-form-item>
+        <a-form-item label="联系方式" name="contact">
+          <a-input v-model:value="form.contact" :disabled="showable" placeholder="请输入联系方式" />
+        </a-form-item>
+        <a-form-item label="法人名称" name="legalPerson">
+          <a-input
+            v-model:value="form.legalPerson"
+            :disabled="showable"
+            placeholder="请输入法人名称"
+          />
+        </a-form-item>
+        <a-form-item label="法人证件号码" name="legalPersonIdNo">
+          <a-input
+            v-model:value="form.legalPersonIdNo"
+            :disabled="showable"
+            placeholder="请输入法人证件号码"
+          />
+        </a-form-item>
+      </a-form>
+    </a-spin>
     <template #footer>
       <a-space>
         <a-button key="cancel" @click="handleCancel">取消</a-button>
diff --git a/types/web.d.ts b/types/web.d.ts
index 0d74f45d..31c74650 100644
--- a/types/web.d.ts
+++ b/types/web.d.ts
@@ -30,6 +30,14 @@ export interface BaseEntity {
   createTime?: string | null
 }
 
+/**
+ * 商户应用基础实体对象
+ */
+export interface MchEntity extends BaseEntity {
+  mchNo?: string
+  appId?: string
+}
+
 /**
  * 键值对对象
  */