diff --git a/src/enums/daxpay/daxpayClientEnum.ts b/src/enums/daxpay/daxpayClientEnum.ts
new file mode 100644
index 000000000..5368f436d
--- /dev/null
+++ b/src/enums/daxpay/daxpayClientEnum.ts
@@ -0,0 +1,14 @@
+/**
+ * 终端类型
+ */
+export enum DaxPayClientEnum {
+  /**
+   * 运营端
+   */
+  ADMIN = 'dax-pay-admin',
+
+  /**
+   * 商户端
+   */
+  MERCHANT = 'dax-pay-merchant',
+}
diff --git a/src/utils/env.ts b/src/utils/env.ts
index beff5e2a6..94244153b 100644
--- a/src/utils/env.ts
+++ b/src/utils/env.ts
@@ -1,6 +1,7 @@
 import type { GlobEnvConfig } from '#/config'
 import pkg from '../../package.json'
 import { API_ADDRESS } from '@/enums/cacheEnum'
+import { DaxPayClientEnum } from "@/enums/daxpay/daxpayClientEnum";
 
 export function getCommonStoragePrefix() {
   const { VITE_GLOB_APP_TITLE } = getAppEnvConfig()
@@ -51,16 +52,6 @@ export function getAppEnvConfig() {
   }
 }
 
-/**
- * @description: Development mode
- */
-export const devMode = 'development'
-
-/**
- * @description: Production mode
- */
-export const prodMode = 'production'
-
 /**
  * @description: Get environment variables
  * @returns:
@@ -87,3 +78,10 @@ export function isDevMode(): boolean {
 export function isProdMode(): boolean {
   return import.meta.env.PROD
 }
+
+/**
+ * 是否为运营端
+ */
+export function isAdmin() {
+  return import.meta.env.VITE_GLOB_APP_CLIENT === DaxPayClientEnum.ADMIN
+}
diff --git a/src/views/daxpay/admin/channel/alipay/config/AlipayConfig.api.ts b/src/views/daxpay/common/channel/alipay/config/AlipayConfig.api.ts
similarity index 97%
rename from src/views/daxpay/admin/channel/alipay/config/AlipayConfig.api.ts
rename to src/views/daxpay/common/channel/alipay/config/AlipayConfig.api.ts
index f12f1fc3c..e703e17a9 100644
--- a/src/views/daxpay/admin/channel/alipay/config/AlipayConfig.api.ts
+++ b/src/views/daxpay/common/channel/alipay/config/AlipayConfig.api.ts
@@ -1,6 +1,6 @@
 import { defHttp } from '@/utils/http/axios'
 import { Result } from '#/axios'
-import {  MchEntity } from "#/web";
+import { MchEntity } from '#/web'
 import { unref } from 'vue'
 
 /**
diff --git a/src/views/daxpay/admin/channel/alipay/config/AlipayConfigEdit.vue b/src/views/daxpay/common/channel/alipay/config/AlipayConfigEdit.vue
similarity index 99%
rename from src/views/daxpay/admin/channel/alipay/config/AlipayConfigEdit.vue
rename to src/views/daxpay/common/channel/alipay/config/AlipayConfigEdit.vue
index 9033ecb61..bd931de24 100644
--- a/src/views/daxpay/admin/channel/alipay/config/AlipayConfigEdit.vue
+++ b/src/views/daxpay/common/channel/alipay/config/AlipayConfigEdit.vue
@@ -198,7 +198,7 @@
   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'
+  import { ChannelConfig } from '@/views/daxpay/common/merchant/channel/ChannelConfig.api'
 
   const { handleCancel, diffForm, labelCol, wrapperCol, confirmLoading, visible, showable } =
     useFormEdit()
diff --git a/src/views/daxpay/admin/channel/wechat/config/WechatPayConfig.api.ts b/src/views/daxpay/common/channel/wechat/config/WechatPayConfig.api.ts
similarity index 100%
rename from src/views/daxpay/admin/channel/wechat/config/WechatPayConfig.api.ts
rename to src/views/daxpay/common/channel/wechat/config/WechatPayConfig.api.ts
diff --git a/src/views/daxpay/admin/channel/wechat/config/WechatPayConfigEdit.vue b/src/views/daxpay/common/channel/wechat/config/WechatPayConfigEdit.vue
similarity index 98%
rename from src/views/daxpay/admin/channel/wechat/config/WechatPayConfigEdit.vue
rename to src/views/daxpay/common/channel/wechat/config/WechatPayConfigEdit.vue
index b4185fae3..96003ccab 100644
--- a/src/views/daxpay/admin/channel/wechat/config/WechatPayConfigEdit.vue
+++ b/src/views/daxpay/common/channel/wechat/config/WechatPayConfigEdit.vue
@@ -205,11 +205,11 @@
   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 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'
+  import { ChannelConfig } from '@/views/daxpay/common/merchant/channel/ChannelConfig.api'
 
   const { handleCancel, diffForm, labelCol, wrapperCol, confirmLoading, visible, showable } =
     useFormEdit()
diff --git a/src/views/daxpay/admin/constant/api/ApiConst.api.ts b/src/views/daxpay/common/constant/api/ApiConst.api.ts
similarity index 100%
rename from src/views/daxpay/admin/constant/api/ApiConst.api.ts
rename to src/views/daxpay/common/constant/api/ApiConst.api.ts
diff --git a/src/views/daxpay/admin/constant/api/ApiConstList.vue b/src/views/daxpay/common/constant/api/ApiConstList.vue
similarity index 100%
rename from src/views/daxpay/admin/constant/api/ApiConstList.vue
rename to src/views/daxpay/common/constant/api/ApiConstList.vue
diff --git a/src/views/daxpay/admin/constant/channel/ChannelConst.api.ts b/src/views/daxpay/common/constant/channel/ChannelConst.api.ts
similarity index 100%
rename from src/views/daxpay/admin/constant/channel/ChannelConst.api.ts
rename to src/views/daxpay/common/constant/channel/ChannelConst.api.ts
diff --git a/src/views/daxpay/admin/constant/channel/ChannelConstList.vue b/src/views/daxpay/common/constant/channel/ChannelConstList.vue
similarity index 100%
rename from src/views/daxpay/admin/constant/channel/ChannelConstList.vue
rename to src/views/daxpay/common/constant/channel/ChannelConstList.vue
diff --git a/src/views/daxpay/admin/constant/method/MethodConst.api.ts b/src/views/daxpay/common/constant/method/MethodConst.api.ts
similarity index 100%
rename from src/views/daxpay/admin/constant/method/MethodConst.api.ts
rename to src/views/daxpay/common/constant/method/MethodConst.api.ts
diff --git a/src/views/daxpay/admin/constant/method/MethodConstList.vue b/src/views/daxpay/common/constant/method/MethodConstList.vue
similarity index 93%
rename from src/views/daxpay/admin/constant/method/MethodConstList.vue
rename to src/views/daxpay/common/constant/method/MethodConstList.vue
index dca7b4830..a7d67bd20 100644
--- a/src/views/daxpay/admin/constant/method/MethodConstList.vue
+++ b/src/views/daxpay/common/constant/method/MethodConstList.vue
@@ -11,7 +11,13 @@
     <div class="m-3 p-3 bg-white">
       <vxe-toolbar ref="xToolbar" custom :refresh="{ queryMethod: queryPage }" />
       <div class="h-65vh">
-        <vxe-table height="auto" row-id="id" ref="xTable" :data="pagination.records" :loading="loading">
+        <vxe-table
+          height="auto"
+          row-id="id"
+          ref="xTable"
+          :data="pagination.records"
+          :loading="loading"
+        >
           <vxe-column type="seq" width="60" />
           <vxe-column field="code" title="编码" />
           <vxe-column field="name" title="名称" />
diff --git a/src/views/daxpay/admin/constant/notify/NotifyConst.api.ts b/src/views/daxpay/common/constant/notify/NotifyConst.api.ts
similarity index 100%
rename from src/views/daxpay/admin/constant/notify/NotifyConst.api.ts
rename to src/views/daxpay/common/constant/notify/NotifyConst.api.ts
diff --git a/src/views/daxpay/admin/constant/notify/NotifyConstList.vue b/src/views/daxpay/common/constant/notify/NotifyConstList.vue
similarity index 100%
rename from src/views/daxpay/admin/constant/notify/NotifyConstList.vue
rename to src/views/daxpay/common/constant/notify/NotifyConstList.vue
diff --git a/src/views/daxpay/admin/merchant/app/MchApp.api.ts b/src/views/daxpay/common/merchant/app/MchApp.api.ts
similarity index 96%
rename from src/views/daxpay/admin/merchant/app/MchApp.api.ts
rename to src/views/daxpay/common/merchant/app/MchApp.api.ts
index 8614ce5fa..e954c670b 100644
--- a/src/views/daxpay/admin/merchant/app/MchApp.api.ts
+++ b/src/views/daxpay/common/merchant/app/MchApp.api.ts
@@ -1,7 +1,7 @@
 import { defHttp } from '@/utils/http/axios'
 import { PageResult, Result } from '#/axios'
 import { BaseEntity } from '#/web'
-import {LabeledValue} from "ant-design-vue/lib/select";
+import { LabeledValue } from 'ant-design-vue/lib/select'
 
 /**
  * 分页
diff --git a/src/views/daxpay/admin/merchant/app/MchAppEdit.vue b/src/views/daxpay/common/merchant/app/MchAppEdit.vue
similarity index 100%
rename from src/views/daxpay/admin/merchant/app/MchAppEdit.vue
rename to src/views/daxpay/common/merchant/app/MchAppEdit.vue
diff --git a/src/views/daxpay/admin/merchant/app/MchAppList.vue b/src/views/daxpay/common/merchant/app/MchAppList.vue
similarity index 96%
rename from src/views/daxpay/admin/merchant/app/MchAppList.vue
rename to src/views/daxpay/common/merchant/app/MchAppList.vue
index 9f1bab6ae..f884eb4d7 100644
--- a/src/views/daxpay/admin/merchant/app/MchAppList.vue
+++ b/src/views/daxpay/common/merchant/app/MchAppList.vue
@@ -98,8 +98,8 @@
   import { useDict } from '@/hooks/bootx/useDict'
   import { merchantDropdown } from '@/views/daxpay/admin/merchant/info/Merchant.api'
   import { LabeledValue } from 'ant-design-vue/lib/select'
-  import ChannelConfigList from '@/views/daxpay/admin/merchant/channel/ChannelConfigList.vue'
-  import MerchantNotifyConfigList from '../notify/MerchantNotifyConfigList.vue'
+  import ChannelConfigList from '@/views/daxpay/common/merchant/channel/ChannelConfigList.vue'
+  import MerchantNotifyConfigList from '@/views/daxpay/common/merchant/notify/MerchantNotifyConfigList.vue'
   import Icon from '@/components/Icon/Icon.vue'
 
   // 使用hooks
diff --git a/src/views/daxpay/admin/merchant/channel/ChannelConfig.api.ts b/src/views/daxpay/common/merchant/channel/ChannelConfig.api.ts
similarity index 100%
rename from src/views/daxpay/admin/merchant/channel/ChannelConfig.api.ts
rename to src/views/daxpay/common/merchant/channel/ChannelConfig.api.ts
diff --git a/src/views/daxpay/admin/merchant/channel/ChannelConfigEdit.vue b/src/views/daxpay/common/merchant/channel/ChannelConfigEdit.vue
similarity index 84%
rename from src/views/daxpay/admin/merchant/channel/ChannelConfigEdit.vue
rename to src/views/daxpay/common/merchant/channel/ChannelConfigEdit.vue
index a4940d6dc..e8a3554aa 100644
--- a/src/views/daxpay/admin/merchant/channel/ChannelConfigEdit.vue
+++ b/src/views/daxpay/common/merchant/channel/ChannelConfigEdit.vue
@@ -6,8 +6,8 @@
   import { useMessage } from '@/hooks/web/useMessage'
   import { PaymentEnum } from '@/enums/daxpay/PaymentEnum'
   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 AlipayConfigEdit from '@/views/daxpay/common/channel/alipay/config/AlipayConfigEdit.vue'
+  import WechatPayConfigEdit from '@/views/daxpay/common/channel/wechat/config/WechatPayConfigEdit.vue'
   import { ref } from 'vue'
 
   const { createMessage } = useMessage()
diff --git a/src/views/daxpay/admin/merchant/channel/ChannelConfigList.vue b/src/views/daxpay/common/merchant/channel/ChannelConfigList.vue
similarity index 98%
rename from src/views/daxpay/admin/merchant/channel/ChannelConfigList.vue
rename to src/views/daxpay/common/merchant/channel/ChannelConfigList.vue
index f981acf4c..daa8a6e5d 100644
--- a/src/views/daxpay/admin/merchant/channel/ChannelConfigList.vue
+++ b/src/views/daxpay/common/merchant/channel/ChannelConfigList.vue
@@ -58,7 +58,7 @@
   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'
+  import ChannelConfigEdit from '@/views/daxpay/common/merchant/channel/ChannelConfigEdit.vue'
 
   const confirmLoading = ref(false)
   const channelConfigs = ref<ChannelConfig[]>([])
diff --git a/src/views/daxpay/admin/merchant/notify/MerchantNotifyConfig.api.ts b/src/views/daxpay/common/merchant/notify/MerchantNotifyConfig.api.ts
similarity index 100%
rename from src/views/daxpay/admin/merchant/notify/MerchantNotifyConfig.api.ts
rename to src/views/daxpay/common/merchant/notify/MerchantNotifyConfig.api.ts
diff --git a/src/views/daxpay/admin/merchant/notify/MerchantNotifyConfigList.vue b/src/views/daxpay/common/merchant/notify/MerchantNotifyConfigList.vue
similarity index 100%
rename from src/views/daxpay/admin/merchant/notify/MerchantNotifyConfigList.vue
rename to src/views/daxpay/common/merchant/notify/MerchantNotifyConfigList.vue
diff --git a/src/views/daxpay/admin/notice/callback/CallbackRecordInfo.vue b/src/views/daxpay/common/notice/callback/CallbackRecordInfo.vue
similarity index 100%
rename from src/views/daxpay/admin/notice/callback/CallbackRecordInfo.vue
rename to src/views/daxpay/common/notice/callback/CallbackRecordInfo.vue
diff --git a/src/views/daxpay/admin/notice/callback/CallbackRecordList.vue b/src/views/daxpay/common/notice/callback/CallbackRecordList.vue
similarity index 100%
rename from src/views/daxpay/admin/notice/callback/CallbackRecordList.vue
rename to src/views/daxpay/common/notice/callback/CallbackRecordList.vue
diff --git a/src/views/daxpay/admin/notice/callback/CallbackTask.api.ts b/src/views/daxpay/common/notice/callback/CallbackTask.api.ts
similarity index 100%
rename from src/views/daxpay/admin/notice/callback/CallbackTask.api.ts
rename to src/views/daxpay/common/notice/callback/CallbackTask.api.ts
diff --git a/src/views/daxpay/admin/notice/callback/CallbackTaskInfo.vue b/src/views/daxpay/common/notice/callback/CallbackTaskInfo.vue
similarity index 100%
rename from src/views/daxpay/admin/notice/callback/CallbackTaskInfo.vue
rename to src/views/daxpay/common/notice/callback/CallbackTaskInfo.vue
diff --git a/src/views/daxpay/admin/notice/callback/CallbackTaskList.vue b/src/views/daxpay/common/notice/callback/CallbackTaskList.vue
similarity index 75%
rename from src/views/daxpay/admin/notice/callback/CallbackTaskList.vue
rename to src/views/daxpay/common/notice/callback/CallbackTaskList.vue
index 02cc5a4c1..5c502d16d 100644
--- a/src/views/daxpay/admin/notice/callback/CallbackTaskList.vue
+++ b/src/views/daxpay/common/notice/callback/CallbackTaskList.vue
@@ -26,7 +26,7 @@
             </a-link>
           </template>
         </vxe-column>
-        <vxe-column field="noticeType" title="交易类型" :min-width="120" align="center">
+        <vxe-column field="tradeType" title="交易类型" :min-width="120" align="center">
           <template #default="{ row }">
             <a-tag>{{ dictConvert('trade_type', row.tradeType) }}</a-tag>
           </template>
@@ -48,6 +48,8 @@
         />
         <vxe-column field="latestTime" title="最后发送时间" sortable :min-width="170" />
         <vxe-column field="createTime" title="创建时间" sortable :min-width="170" />
+        <vxe-column field="mchNo" title="商户号" :min-width="150" />
+        <vxe-column field="appId" title="应用号" :min-width="150" />
         <vxe-column fixed="right" width="180" :showOverflow="false" title="操作">
           <template #default="{ row }">
             <a-link @click="show(row)">查看</a-link>
@@ -75,7 +77,7 @@
 </template>
 
 <script lang="ts" setup>
-  import { computed, onMounted, ref } from 'vue'
+  import { computed, onMounted, ref, watch } from 'vue'
   import { CallbackTask, page, send } from './CallbackTask.api'
   import useTablePage from '@/hooks/bootx/useTablePage'
   import BQuery from '@/components/Bootx/Query/BQuery.vue'
@@ -86,9 +88,11 @@
   import ALink from '@/components/Link/Link.vue'
   import { LabeledValue } from 'ant-design-vue/lib/select'
   import CallbackTaskInfo from './CallbackTaskInfo.vue'
-  import PayOrderInfo from '@/views/daxpay/admin/order/pay/PayOrderInfo.vue'
-  import TransferOrderInfo from '@/views/daxpay/admin/order/transfer/TransferOrderInfo.vue'
+  import PayOrderInfo from '@/views/daxpay/common/order/pay/PayOrderInfo.vue'
+  import TransferOrderInfo from '@/views/daxpay/common/order/transfer/TransferOrderInfo.vue'
   import CallbackRecordList from './CallbackRecordList.vue'
+  import { merchantDropdown } from '@/views/daxpay/admin/merchant/info/Merchant.api'
+  import { mchAppDropdown } from '@/views/daxpay/common/merchant/app/MchApp.api'
 
   // 使用hooks
   const {
@@ -104,22 +108,38 @@
   } = useTablePage(queryPage)
   const { createMessage, createConfirm } = useMessage()
   const { dictConvert, dictDropDown } = useDict()
-  let noticeTypeList = ref<LabeledValue[]>([])
+  let tradeTypeList = ref<LabeledValue[]>([])
 
   // 查询条件
   const fields = computed(() => {
     return [
       { field: 'tradeNo', type: STRING, name: '平台交易号', placeholder: '请输入完整平台交易号' },
       {
-        field: 'noticeType',
+        field: 'tradeType',
         type: LIST,
-        name: '消息类型',
-        placeholder: '请选择消息类型',
-        selectList: noticeTypeList.value,
+        name: '通知类型',
+        placeholder: '请选择通知类型',
+        selectList: tradeTypeList.value,
+      },
+      {
+        field: 'mchNo',
+        type: LIST,
+        name: '商户号',
+        placeholder: '请选择商户号',
+        selectList: mchNoOptions.value,
+      },
+      {
+        field: 'appId',
+        type: LIST,
+        name: '应用号',
+        placeholder: '请先选择商户后选择应用号',
+        selectList: mchAppOptions.value,
       },
     ] as QueryField[]
   })
 
+  const mchNoOptions = ref<LabeledValue[]>([])
+  const mchAppOptions = ref<LabeledValue[]>([])
   const noticeRecordList = ref<any>()
   const noticeTaskInfo = ref<any>()
   const payOrderInfo = ref<any>()
@@ -130,20 +150,39 @@
 
   onMounted(() => {
     vxeBind()
-    init()
+    initData()
     queryPage()
   })
   function vxeBind() {
     xTable.value?.connect(xToolbar.value as VxeToolbarInstance)
   }
+  watch(
+    () => model.queryParam?.mchNo,
+    (value) => changeMch(value),
+  )
 
   /**
    * 初始化
    */
-  async function init() {
-    noticeTypeList.value = await dictDropDown('ClientNoticeType')
+  async function initData() {
+    merchantDropdown().then(({ data }) => {
+      mchNoOptions.value = data
+    })
+    tradeTypeList.value = await dictDropDown('trade_type')
+  }
+  /**
+   * 商户变动后更新应用列表
+   */
+  function changeMch(mchNo) {
+    if (mchNo) {
+      mchAppDropdown(mchNo).then(({ data }) => {
+        mchAppOptions.value = data
+      })
+    } else {
+      mchAppOptions.value = []
+      model.queryParam.appId = undefined
+    }
   }
-
   /**
    * 分页查询
    */
diff --git a/src/views/daxpay/admin/notice/notify/NotifyRecordInfo.vue b/src/views/daxpay/common/notice/notify/NotifyRecordInfo.vue
similarity index 100%
rename from src/views/daxpay/admin/notice/notify/NotifyRecordInfo.vue
rename to src/views/daxpay/common/notice/notify/NotifyRecordInfo.vue
diff --git a/src/views/daxpay/admin/notice/notify/NotifyRecordList.vue b/src/views/daxpay/common/notice/notify/NotifyRecordList.vue
similarity index 100%
rename from src/views/daxpay/admin/notice/notify/NotifyRecordList.vue
rename to src/views/daxpay/common/notice/notify/NotifyRecordList.vue
diff --git a/src/views/daxpay/admin/notice/notify/NotifyTask.api.ts b/src/views/daxpay/common/notice/notify/NotifyTask.api.ts
similarity index 100%
rename from src/views/daxpay/admin/notice/notify/NotifyTask.api.ts
rename to src/views/daxpay/common/notice/notify/NotifyTask.api.ts
diff --git a/src/views/daxpay/admin/notice/notify/NotifyTaskInfo.vue b/src/views/daxpay/common/notice/notify/NotifyTaskInfo.vue
similarity index 100%
rename from src/views/daxpay/admin/notice/notify/NotifyTaskInfo.vue
rename to src/views/daxpay/common/notice/notify/NotifyTaskInfo.vue
diff --git a/src/views/daxpay/admin/notice/notify/NotifyTaskList.vue b/src/views/daxpay/common/notice/notify/NotifyTaskList.vue
similarity index 77%
rename from src/views/daxpay/admin/notice/notify/NotifyTaskList.vue
rename to src/views/daxpay/common/notice/notify/NotifyTaskList.vue
index c02088b92..4d0f902f0 100644
--- a/src/views/daxpay/admin/notice/notify/NotifyTaskList.vue
+++ b/src/views/daxpay/common/notice/notify/NotifyTaskList.vue
@@ -44,6 +44,8 @@
           <vxe-column field="delayCount" title="延迟重试次数" sortable :min-width="150" />
           <vxe-column field="latestTime" title="最后发送时间" sortable :min-width="170" />
           <vxe-column field="createTime" title="创建时间" sortable :min-width="170" />
+          <vxe-column field="mchNo" title="商户号" :min-width="150" />
+          <vxe-column field="appId" title="应用号" :min-width="150" />
           <vxe-column fixed="right" width="180" :showOverflow="false" title="操作">
             <template #default="{ row }">
               <a-link @click="show(row)">查看</a-link>
@@ -73,7 +75,7 @@
 </template>
 
 <script lang="ts" setup>
-  import { computed, onMounted, ref } from 'vue'
+  import { computed, onMounted, ref, watch } from 'vue'
   import { NotifyTask, page, send } from './NotifyTask.api'
   import useTablePage from '@/hooks/bootx/useTablePage'
   import BQuery from '@/components/Bootx/Query/BQuery.vue'
@@ -84,11 +86,13 @@
   import ALink from '@/components/Link/Link.vue'
   import { LabeledValue } from 'ant-design-vue/lib/select'
   import NotifyTaskInfo from './NotifyTaskInfo.vue'
-  import PayOrderInfo from '@/views/daxpay/admin/order/pay/PayOrderInfo.vue'
-  import TransferOrderInfo from '@/views/daxpay/admin/order/transfer/TransferOrderInfo.vue'
+  import PayOrderInfo from '@/views/daxpay/common/order/pay/PayOrderInfo.vue'
+  import TransferOrderInfo from '@/views/daxpay/common/order/transfer/TransferOrderInfo.vue'
   import NotifyRecordList from './NotifyRecordList.vue'
   import { NotifyContentTypeEnum } from '@/enums/daxpay/PaymentEnum'
-  import RefundOrderInfo from '@/views/daxpay/admin/order/refund/RefundOrderInfo.vue'
+  import RefundOrderInfo from '@/views/daxpay/common/order/refund/RefundOrderInfo.vue'
+  import { merchantDropdown } from '@/views/daxpay/admin/merchant/info/Merchant.api'
+  import { mchAppDropdown } from '@/views/daxpay/common/merchant/app/MchApp.api'
 
   // 使用hooks
   const {
@@ -109,17 +113,33 @@
   // 查询条件
   const fields = computed(() => {
     return [
-      { field: 'tradeNo', type: STRING, name: '平台交易号', placeholder: '请输入完整平台交易号' },
+      { field: 'tradeNo', type: STRING, name: '平台交易号', placeholder: '请输入平台交易号' },
       {
         field: 'noticeType',
         type: LIST,
-        name: '消息类型',
-        placeholder: '请选择消息类型',
+        name: '通知类型',
+        placeholder: '请选择通知类型',
         selectList: noticeTypeList.value,
       },
+      {
+        field: 'mchNo',
+        type: LIST,
+        name: '商户号',
+        placeholder: '请选择商户号',
+        selectList: mchNoOptions.value,
+      },
+      {
+        field: 'appId',
+        type: LIST,
+        name: '应用号',
+        placeholder: '请先选择商户后选择应用号',
+        selectList: mchAppOptions.value,
+      },
     ] as QueryField[]
   })
 
+  const mchNoOptions = ref<LabeledValue[]>([])
+  const mchAppOptions = ref<LabeledValue[]>([])
   const notifyRecordList = ref<any>()
   const notifyTaskInfo = ref<any>()
   const payOrderInfo = ref<any>()
@@ -130,20 +150,39 @@
 
   onMounted(() => {
     vxeBind()
-    init()
+    initData()
     queryPage()
   })
   function vxeBind() {
     xTable.value?.connect(xToolbar.value as VxeToolbarInstance)
   }
+  watch(
+    () => model.queryParam?.mchNo,
+    (value) => changeMch(value),
+  )
 
   /**
    * 初始化
    */
-  async function init() {
-    noticeTypeList.value = await dictDropDown('ClientNoticeType')
+  async function initData() {
+    merchantDropdown().then(({ data }) => {
+      mchNoOptions.value = data
+    })
+    noticeTypeList.value = await dictDropDown('notify_content_type')
+  }
+  /**
+   * 商户变动后更新应用列表
+   */
+  function changeMch(mchNo) {
+    if (mchNo) {
+      mchAppDropdown(mchNo).then(({ data }) => {
+        mchAppOptions.value = data
+      })
+    } else {
+      mchAppOptions.value = []
+      model.queryParam.appId = undefined
+    }
   }
-
   /**
    * 分页查询
    */
diff --git a/src/views/daxpay/admin/order/pay/PayOrder.api.ts b/src/views/daxpay/common/order/pay/PayOrder.api.ts
similarity index 100%
rename from src/views/daxpay/admin/order/pay/PayOrder.api.ts
rename to src/views/daxpay/common/order/pay/PayOrder.api.ts
diff --git a/src/views/daxpay/admin/order/pay/PayOrderInfo.vue b/src/views/daxpay/common/order/pay/PayOrderInfo.vue
similarity index 100%
rename from src/views/daxpay/admin/order/pay/PayOrderInfo.vue
rename to src/views/daxpay/common/order/pay/PayOrderInfo.vue
diff --git a/src/views/daxpay/admin/order/pay/PayOrderList.vue b/src/views/daxpay/common/order/pay/PayOrderList.vue
similarity index 90%
rename from src/views/daxpay/admin/order/pay/PayOrderList.vue
rename to src/views/daxpay/common/order/pay/PayOrderList.vue
index 880d6fb0f..26d740467 100644
--- a/src/views/daxpay/admin/order/pay/PayOrderList.vue
+++ b/src/views/daxpay/common/order/pay/PayOrderList.vue
@@ -73,7 +73,7 @@
           </vxe-column>
           <vxe-column field="createTime" title="创建时间" sortable :min-width="230" />
           <vxe-column field="mchNo" title="商户号" :min-width="150" />
-          <vxe-column field="appId" title="商户号" :min-width="150" />
+          <vxe-column field="appId" title="应用号" :min-width="150" />
           <vxe-column fixed="right" width="120" :showOverflow="false" title="操作">
             <template #default="{ row }">
               <a-link @click="show(row)">查看</a-link>
@@ -136,7 +136,7 @@
 </template>
 
 <script lang="ts" setup>
-  import { computed, onMounted, ref } from 'vue'
+  import { computed, onMounted, ref, watch } from 'vue'
   import {
     allocationByOrderNo,
     close,
@@ -162,6 +162,8 @@
     PayRefundStatusEnum,
     PayStatusEnum,
   } from '@/enums/daxpay/TradeStatusEnum'
+  import { merchantDropdown } from '@/views/daxpay/admin/merchant/info/Merchant.api'
+  import { mchAppDropdown } from '@/views/daxpay/common/merchant/app/MchApp.api'
 
   // 使用hooks
   const {
@@ -178,6 +180,8 @@
   const { createMessage, createConfirm } = useMessage()
   const { dictConvert, dictDropDown } = useDict()
 
+  const mchNoOptions = ref<LabeledValue[]>([])
+  const mchAppOptions = ref<LabeledValue[]>([])
   const channelList = ref<LabeledValue[]>([])
   const methodList = ref<LabeledValue[]>([])
   const payStatusList = ref<LabeledValue[]>([])
@@ -215,8 +219,20 @@
         selectList: payRefundStatusList.value,
       },
       { field: 'allocStatus', name: '支付状态', type: LIST, selectList: payAllocStatusList.value },
-      { field: 'mchNo', type: STRING, name: '商户号', placeholder: '请输入商户号' },
-      { field: 'appId', type: STRING, name: '应用号', placeholder: '请输入应用号' },
+      {
+        field: 'mchNo',
+        type: LIST,
+        name: '商户号',
+        placeholder: '请选择商户号',
+        selectList: mchNoOptions.value,
+      },
+      {
+        field: 'appId',
+        type: LIST,
+        name: '应用号',
+        placeholder: '请先选择商户后选择应用号',
+        selectList: mchAppOptions.value,
+      },
     ] as QueryField[]
   })
 
@@ -226,6 +242,12 @@
   const refundModel = ref<any>()
   const totalAmount = ref<number>(0.0)
 
+  // 提供一个 getter 函数
+  watch(
+    () => model.queryParam?.mchNo,
+    (value) => changeMch(value),
+  )
+
   onMounted(() => {
     initData()
     vxeBind()
@@ -239,12 +261,30 @@
    * 初始化数据
    */
   async function initData() {
+    merchantDropdown().then(({ data }) => {
+      mchNoOptions.value = data
+    })
     channelList.value = await dictDropDown('channel')
     methodList.value = await dictDropDown('pay_method')
     payStatusList.value = await dictDropDown('pay_status')
     payRefundStatusList.value = await dictDropDown('pay_refund_status')
     payAllocStatusList.value = await dictDropDown('pay_alloc_status')
   }
+
+  /**
+   * 商户变动后更新应用列表
+   */
+  function changeMch(mchNo) {
+    if (mchNo) {
+      mchAppDropdown(mchNo).then(({ data }) => {
+        mchAppOptions.value = data
+      })
+    } else {
+      mchAppOptions.value = []
+      model.queryParam.appId = undefined
+    }
+  }
+
   /**
    * 分页查询
    */
diff --git a/src/views/daxpay/admin/order/pay/RefundModel.vue b/src/views/daxpay/common/order/pay/RefundModel.vue
similarity index 100%
rename from src/views/daxpay/admin/order/pay/RefundModel.vue
rename to src/views/daxpay/common/order/pay/RefundModel.vue
diff --git a/src/views/daxpay/admin/order/refund/RefundOrder.api.ts b/src/views/daxpay/common/order/refund/RefundOrder.api.ts
similarity index 100%
rename from src/views/daxpay/admin/order/refund/RefundOrder.api.ts
rename to src/views/daxpay/common/order/refund/RefundOrder.api.ts
diff --git a/src/views/daxpay/admin/order/refund/RefundOrderInfo.vue b/src/views/daxpay/common/order/refund/RefundOrderInfo.vue
similarity index 100%
rename from src/views/daxpay/admin/order/refund/RefundOrderInfo.vue
rename to src/views/daxpay/common/order/refund/RefundOrderInfo.vue
diff --git a/src/views/daxpay/admin/order/refund/RefundOrderList.vue b/src/views/daxpay/common/order/refund/RefundOrderList.vue
similarity index 88%
rename from src/views/daxpay/admin/order/refund/RefundOrderList.vue
rename to src/views/daxpay/common/order/refund/RefundOrderList.vue
index ff24802b4..08584d66a 100644
--- a/src/views/daxpay/admin/order/refund/RefundOrderList.vue
+++ b/src/views/daxpay/common/order/refund/RefundOrderList.vue
@@ -62,7 +62,7 @@
           <vxe-column field="createTime" title="创建时间" sortable :min-width="230" />
 
           <vxe-column field="mchNo" title="商户号" :min-width="150" />
-          <vxe-column field="appId" title="商户号" :min-width="150" />
+          <vxe-column field="appId" title="应用号" :min-width="150" />
           <vxe-column fixed="right" width="120" :showOverflow="false" title="操作">
             <template #default="{ row }">
               <a-link @click="show(row)">查看</a-link>
@@ -109,7 +109,7 @@
 </template>
 
 <script lang="ts" setup>
-  import { computed, onMounted, ref } from 'vue'
+  import { computed, onMounted, ref, watch } from 'vue'
   import {
     closeRefund,
     getTotalAmount,
@@ -130,6 +130,8 @@
   import ALink from '@/components/Link/Link.vue'
   import { RefundStatusEnum } from '@/enums/daxpay/TradeStatusEnum'
   import { Icon } from '@/components/Icon'
+  import { merchantDropdown } from '@/views/daxpay/admin/merchant/info/Merchant.api'
+  import { mchAppDropdown } from '@/views/daxpay/common/merchant/app/MchApp.api'
 
   // 使用hooks
   const {
@@ -146,6 +148,8 @@
   const { createMessage, createConfirm } = useMessage()
   const { dictConvert, dictDropDown } = useDict()
 
+  const mchNoOptions = ref<LabeledValue[]>([])
+  const mchAppOptions = ref<LabeledValue[]>([])
   const channelList = ref<LabeledValue[]>([])
   const refundStatusList = ref<LabeledValue[]>([])
   const totalAmount = ref<number>(0.0)
@@ -178,8 +182,20 @@
         selectList: refundStatusList.value,
       },
       { field: 'channel', name: '支付通道', type: LIST, selectList: channelList.value },
-      { field: 'mchNo', type: STRING, name: '商户号', placeholder: '请输入商户号' },
-      { field: 'appId', type: STRING, name: '应用号', placeholder: '请输入应用号' },
+      {
+        field: 'mchNo',
+        type: LIST,
+        name: '商户号',
+        placeholder: '请选择商户号',
+        selectList: mchNoOptions.value,
+      },
+      {
+        field: 'appId',
+        type: LIST,
+        name: '应用号',
+        placeholder: '请先选择商户后选择应用号',
+        selectList: mchAppOptions.value,
+      },
     ] as QueryField[]
   })
 
@@ -187,6 +203,10 @@
   const xToolbar = ref<VxeToolbarInstance>()
   const refundOrderInfo = ref<any>()
   const payOrderInfo = ref<any>()
+  watch(
+    () => model.queryParam?.mchNo,
+    (value) => changeMch(value),
+  )
 
   onMounted(() => {
     initData()
@@ -201,10 +221,27 @@
    * 初始化数据
    */
   async function initData() {
+    merchantDropdown().then(({ data }) => {
+      mchNoOptions.value = data
+    })
     refundStatusList.value = await dictDropDown('RefundStatus')
     channelList.value = await dictDropDown('channel')
   }
 
+  /**
+   * 商户变动后更新应用列表
+   */
+  function changeMch(mchNo) {
+    if (mchNo) {
+      mchAppDropdown(mchNo).then(({ data }) => {
+        mchAppOptions.value = data
+      })
+    } else {
+      mchAppOptions.value = []
+      model.queryParam.appId = undefined
+    }
+  }
+
   /**
    * 分页查询
    */
diff --git a/src/views/daxpay/admin/order/transfer/TransferOrder.api.ts b/src/views/daxpay/common/order/transfer/TransferOrder.api.ts
similarity index 100%
rename from src/views/daxpay/admin/order/transfer/TransferOrder.api.ts
rename to src/views/daxpay/common/order/transfer/TransferOrder.api.ts
diff --git a/src/views/daxpay/admin/order/transfer/TransferOrderInfo.vue b/src/views/daxpay/common/order/transfer/TransferOrderInfo.vue
similarity index 100%
rename from src/views/daxpay/admin/order/transfer/TransferOrderInfo.vue
rename to src/views/daxpay/common/order/transfer/TransferOrderInfo.vue
diff --git a/src/views/daxpay/admin/order/transfer/TransferOrderList.vue b/src/views/daxpay/common/order/transfer/TransferOrderList.vue
similarity index 87%
rename from src/views/daxpay/admin/order/transfer/TransferOrderList.vue
rename to src/views/daxpay/common/order/transfer/TransferOrderList.vue
index 56645c1ea..985f29e3a 100644
--- a/src/views/daxpay/admin/order/transfer/TransferOrderList.vue
+++ b/src/views/daxpay/common/order/transfer/TransferOrderList.vue
@@ -57,7 +57,7 @@
           <vxe-column field="createTime" title="创建时间" sortable :min-width="170" />
 
           <vxe-column field="mchNo" title="商户号" :min-width="150" />
-          <vxe-column field="appId" title="商户号" :min-width="150" />
+          <vxe-column field="appId" title="应用号" :min-width="150" />
           <vxe-column fixed="right" :width="120" :showOverflow="false" title="操作">
             <template #default="{ row }">
               <a-link @click="show(row)">查看</a-link>
@@ -107,7 +107,7 @@
 </template>
 
 <script lang="ts" setup>
-  import { computed, onMounted, ref } from 'vue'
+  import { computed, onMounted, ref, watch } from 'vue'
   import {
     closeTransfer,
     getTotalAmount,
@@ -127,6 +127,8 @@
   import ALink from '/@/components/Link/Link.vue'
   import { TransferStatusEnum } from '@/enums/daxpay/TradeStatusEnum'
   import { Icon } from '@/components/Icon'
+  import { merchantDropdown } from '@/views/daxpay/admin/merchant/info/Merchant.api'
+  import { mchAppDropdown } from '@/views/daxpay/common/merchant/app/MchApp.api'
 
   // 使用hooks
   const {
@@ -143,6 +145,8 @@
   const { createMessage, createConfirm } = useMessage()
   const { dictConvert, dictDropDown } = useDict()
 
+  const mchNoOptions = ref<LabeledValue[]>([])
+  const mchAppOptions = ref<LabeledValue[]>([])
   let channelList = ref<LabeledValue[]>([])
   let transferStatusList = ref<LabeledValue[]>([])
   let totalAmount = ref<number>(0.0)
@@ -163,8 +167,20 @@
         selectList: transferStatusList.value,
       },
       { field: 'channel', name: '转账通道', type: LIST, selectList: channelList.value },
-      { field: 'mchNo', type: STRING, name: '商户号', placeholder: '请输入商户号' },
-      { field: 'appId', type: STRING, name: '应用号', placeholder: '请输入应用号' },
+      {
+        field: 'mchNo',
+        type: LIST,
+        name: '商户号',
+        placeholder: '请选择商户号',
+        selectList: mchNoOptions.value,
+      },
+      {
+        field: 'appId',
+        type: LIST,
+        name: '应用号',
+        placeholder: '请先选择商户后选择应用号',
+        selectList: mchAppOptions.value,
+      },
     ] as QueryField[]
   })
 
@@ -172,6 +188,11 @@
   const xToolbar = ref<VxeToolbarInstance>()
   const transferOrderInfo = ref<any>()
 
+  watch(
+    () => model.queryParam?.mchNo,
+    (value) => changeMch(value),
+  )
+
   onMounted(() => {
     initData()
     vxeBind()
@@ -185,10 +206,26 @@
    * 初始化数据
    */
   async function initData() {
+    merchantDropdown().then(({ data }) => {
+      mchNoOptions.value = data
+    })
     transferStatusList.value = await dictDropDown('transfer_status')
     channelList.value = await dictDropDown('channel')
   }
 
+  /**
+   * 商户变动后更新应用列表
+   */
+  function changeMch(mchNo) {
+    if (mchNo) {
+      mchAppDropdown(mchNo).then(({ data }) => {
+        mchAppOptions.value = data
+      })
+    } else {
+      mchAppOptions.value = []
+      model.queryParam.appId = undefined
+    }
+  }
   /**
    * 分页查询
    */
diff --git a/src/views/daxpay/admin/reconcile/discrepancy/ReconcileDiscrepancy.api.ts b/src/views/daxpay/common/reconcile/discrepancy/ReconcileDiscrepancy.api.ts
similarity index 100%
rename from src/views/daxpay/admin/reconcile/discrepancy/ReconcileDiscrepancy.api.ts
rename to src/views/daxpay/common/reconcile/discrepancy/ReconcileDiscrepancy.api.ts
diff --git a/src/views/daxpay/admin/reconcile/discrepancy/ReconcileDiscrepancyInfo.vue b/src/views/daxpay/common/reconcile/discrepancy/ReconcileDiscrepancyInfo.vue
similarity index 98%
rename from src/views/daxpay/admin/reconcile/discrepancy/ReconcileDiscrepancyInfo.vue
rename to src/views/daxpay/common/reconcile/discrepancy/ReconcileDiscrepancyInfo.vue
index d75129395..b43e99dcc 100644
--- a/src/views/daxpay/admin/reconcile/discrepancy/ReconcileDiscrepancyInfo.vue
+++ b/src/views/daxpay/common/reconcile/discrepancy/ReconcileDiscrepancyInfo.vue
@@ -27,8 +27,7 @@
       <a-descriptions-item label="交易号(平台)" :span="1">
         {{ discrepancy.tradeNo }}
       </a-descriptions-item>
-      <a-descriptions-item label="" :span="1">
-      </a-descriptions-item>
+      <a-descriptions-item label="" :span="1" />
       <a-descriptions-item label="通道交易号(平台)" :span="1">
         {{ discrepancy.outTradeNo }}
       </a-descriptions-item>
diff --git a/src/views/daxpay/admin/reconcile/discrepancy/ReconcileDiscrepancyList.vue b/src/views/daxpay/common/reconcile/discrepancy/ReconcileDiscrepancyList.vue
similarity index 87%
rename from src/views/daxpay/admin/reconcile/discrepancy/ReconcileDiscrepancyList.vue
rename to src/views/daxpay/common/reconcile/discrepancy/ReconcileDiscrepancyList.vue
index 6625ef354..f9ea04466 100644
--- a/src/views/daxpay/admin/reconcile/discrepancy/ReconcileDiscrepancyList.vue
+++ b/src/views/daxpay/common/reconcile/discrepancy/ReconcileDiscrepancyList.vue
@@ -110,7 +110,7 @@
 </template>
 
 <script setup lang="ts">
-  import { computed, nextTick, onMounted, ref } from 'vue'
+  import { computed, nextTick, onMounted, ref, watch } from 'vue'
   import { page } from './ReconcileDiscrepancy.api'
   import useTablePage from '@/hooks/bootx/useTablePage'
   import { VxeTable, VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
@@ -121,9 +121,11 @@
   import { TradeTypeEnum } from '@/enums/daxpay/PaymentEnum'
   import ReconcileDiscrepancyInfo from './ReconcileDiscrepancyInfo.vue'
   import ReconcileStatementInfo from '../statement/ReconcileStatementInfo.vue'
-  import PayOrderInfo from '@/views/daxpay/admin/order/pay/PayOrderInfo.vue'
-  import RefundOrderInfo from '@/views/daxpay/admin/order/refund/RefundOrderInfo.vue'
-  import TransferOrderInfo from '@/views/daxpay/admin/order/transfer/TransferOrderInfo.vue'
+  import PayOrderInfo from '@/views/daxpay/common/order/pay/PayOrderInfo.vue'
+  import RefundOrderInfo from '@/views/daxpay/common/order/refund/RefundOrderInfo.vue'
+  import TransferOrderInfo from '@/views/daxpay/common/order/transfer/TransferOrderInfo.vue'
+  import { merchantDropdown } from '@/views/daxpay/admin/merchant/info/Merchant.api'
+  import { mchAppDropdown } from '@/views/daxpay/common/merchant/app/MchApp.api'
 
   // 使用hooks
   const {
@@ -139,6 +141,8 @@
   } = useTablePage(queryPage)
   const { dictDropDown, dictConvert } = useDict()
 
+  const mchNoOptions = ref<LabeledValue[]>([])
+  const mchAppOptions = ref<LabeledValue[]>([])
   let channelList = ref<LabeledValue[]>([])
   let discrepancyTypeList = ref<LabeledValue[]>([])
   let tradeStatusList = ref<LabeledValue[]>([])
@@ -209,6 +213,20 @@
         placeholder: '请选择交易状态(通道)',
         selectList: tradeStatusList.value,
       },
+      {
+        field: 'mchNo',
+        type: LIST,
+        name: '商户号',
+        placeholder: '请选择商户号',
+        selectList: mchNoOptions.value,
+      },
+      {
+        field: 'appId',
+        type: LIST,
+        name: '应用号',
+        placeholder: '请先选择商户后选择应用号',
+        selectList: mchAppOptions.value,
+      },
     ] as QueryField[]
   })
 
@@ -228,16 +246,36 @@
     initData()
     init()
   })
-
+  watch(
+    () => model.queryParam?.mchNo,
+    (value) => changeMch(value),
+  )
   /**
    * 初始化基础数据
    */
   async function initData() {
+    merchantDropdown().then(({ data }) => {
+      mchNoOptions.value = data
+    })
     discrepancyTypeList.value = await dictDropDown('reconcile_discrepancy_type')
     channelList.value = await dictDropDown('channel')
     tradeStatusList.value = await dictDropDown('trade_status')
     tradeTypeList.value = await dictDropDown('trade_type')
   }
+
+  /**
+   * 商户变动后更新应用列表
+   */
+  function changeMch(mchNo) {
+    if (mchNo) {
+      mchAppDropdown(mchNo).then(({ data }) => {
+        mchAppOptions.value = data
+      })
+    } else {
+      mchAppOptions.value = []
+      model.queryParam.appId = undefined
+    }
+  }
   /**
    * 入口
    */
diff --git a/src/views/daxpay/admin/reconcile/statement/ReconcileStatement.api.ts b/src/views/daxpay/common/reconcile/statement/ReconcileStatement.api.ts
similarity index 100%
rename from src/views/daxpay/admin/reconcile/statement/ReconcileStatement.api.ts
rename to src/views/daxpay/common/reconcile/statement/ReconcileStatement.api.ts
diff --git a/src/views/daxpay/admin/reconcile/statement/ReconcileStatementCreate.vue b/src/views/daxpay/common/reconcile/statement/ReconcileStatementCreate.vue
similarity index 98%
rename from src/views/daxpay/admin/reconcile/statement/ReconcileStatementCreate.vue
rename to src/views/daxpay/common/reconcile/statement/ReconcileStatementCreate.vue
index c465cfae3..5f4effb05 100644
--- a/src/views/daxpay/admin/reconcile/statement/ReconcileStatementCreate.vue
+++ b/src/views/daxpay/common/reconcile/statement/ReconcileStatementCreate.vue
@@ -76,7 +76,7 @@
   import XEUtils from 'xe-utils'
   import { create, ReconcileCreatParam } from './ReconcileStatement.api'
   import { merchantDropdown } from '@/views/daxpay/admin/merchant/info/Merchant.api'
-  import { mchAppDropdown } from '@/views/daxpay/admin/merchant/app/MchApp.api'
+  import { mchAppDropdown } from '@/views/daxpay/common/merchant/app/MchApp.api'
 
   const {
     handleCancel,
diff --git a/src/views/daxpay/admin/reconcile/statement/ReconcileStatementInfo.vue b/src/views/daxpay/common/reconcile/statement/ReconcileStatementInfo.vue
similarity index 100%
rename from src/views/daxpay/admin/reconcile/statement/ReconcileStatementInfo.vue
rename to src/views/daxpay/common/reconcile/statement/ReconcileStatementInfo.vue
diff --git a/src/views/daxpay/admin/reconcile/statement/ReconcileStatementList.vue b/src/views/daxpay/common/reconcile/statement/ReconcileStatementList.vue
similarity index 89%
rename from src/views/daxpay/admin/reconcile/statement/ReconcileStatementList.vue
rename to src/views/daxpay/common/reconcile/statement/ReconcileStatementList.vue
index dc75f54aa..1024fb941 100644
--- a/src/views/daxpay/admin/reconcile/statement/ReconcileStatementList.vue
+++ b/src/views/daxpay/common/reconcile/statement/ReconcileStatementList.vue
@@ -121,7 +121,7 @@
 </template>
 
 <script setup lang="ts">
-  import { computed, nextTick, onMounted, ref } from 'vue'
+  import { computed, nextTick, onMounted, ref, watch } from 'vue'
   import { compare, downAndSave, page } from './ReconcileStatement.api'
   import useTablePage from '@/hooks/bootx/useTablePage'
   import { VxeTable, VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
@@ -135,6 +135,8 @@
   import ReconcileStatementCreate from './ReconcileStatementCreate.vue'
   import ReconcileStatementInfo from './ReconcileStatementInfo.vue'
   import { useFilePlatform } from '@/hooks/bootx/useFilePlatform'
+  import { merchantDropdown } from '@/views/daxpay/admin/merchant/info/Merchant.api'
+  import { mchAppDropdown } from '@/views/daxpay/common/merchant/app/MchApp.api'
 
   // 使用hooks
   const {
@@ -152,6 +154,8 @@
   const { createMessage, createConfirm } = useMessage()
   const { getFileUrl } = useFilePlatform()
 
+  const mchNoOptions = ref<LabeledValue[]>([])
+  const mchAppOptions = ref<LabeledValue[]>([])
   let channelList = ref<LabeledValue[]>([])
   let resultList = ref<LabeledValue[]>([])
 
@@ -182,8 +186,20 @@
           { label: '未完成', value: false },
         ],
       },
-      { field: 'mchNo', type: STRING, name: '商户号', placeholder: '请输入商户号' },
-      { field: 'appId', type: STRING, name: '应用号', placeholder: '请输入应用号' },
+      {
+        field: 'mchNo',
+        type: LIST,
+        name: '商户号',
+        placeholder: '请选择商户号',
+        selectList: mchNoOptions.value,
+      },
+      {
+        field: 'appId',
+        type: LIST,
+        name: '应用号',
+        placeholder: '请先选择商户后选择应用号',
+        selectList: mchAppOptions.value,
+      },
     ] as QueryField[]
   })
 
@@ -195,7 +211,10 @@
   nextTick(() => {
     xTable.value?.connect(xToolbar.value as VxeToolbarInstance)
   })
-
+  watch(
+    () => model.queryParam?.mchNo,
+    (value) => changeMch(value),
+  )
   onMounted(() => {
     initData()
     init()
@@ -205,9 +224,26 @@
    * 初始化基础数据
    */
   async function initData() {
+    merchantDropdown().then(({ data }) => {
+      mchNoOptions.value = data
+    })
     channelList.value = await dictDropDown('channel')
     resultList.value = await dictDropDown('reconcile_result')
   }
+
+  /**
+   * 商户变动后更新应用列表
+   */
+  function changeMch(mchNo) {
+    if (mchNo) {
+      mchAppDropdown(mchNo).then(({ data }) => {
+        mchAppOptions.value = data
+      })
+    } else {
+      mchAppOptions.value = []
+      model.queryParam.appId = undefined
+    }
+  }
   /**
    * 入口
    */
diff --git a/src/views/daxpay/admin/record/callback/TradeCallbackRecord.api.ts b/src/views/daxpay/common/record/callback/TradeCallbackRecord.api.ts
similarity index 100%
rename from src/views/daxpay/admin/record/callback/TradeCallbackRecord.api.ts
rename to src/views/daxpay/common/record/callback/TradeCallbackRecord.api.ts
diff --git a/src/views/daxpay/admin/record/callback/TradeCallbackRecordInfo.vue b/src/views/daxpay/common/record/callback/TradeCallbackRecordInfo.vue
similarity index 100%
rename from src/views/daxpay/admin/record/callback/TradeCallbackRecordInfo.vue
rename to src/views/daxpay/common/record/callback/TradeCallbackRecordInfo.vue
diff --git a/src/views/daxpay/admin/record/callback/TradeCallbackRecordList.vue b/src/views/daxpay/common/record/callback/TradeCallbackRecordList.vue
similarity index 80%
rename from src/views/daxpay/admin/record/callback/TradeCallbackRecordList.vue
rename to src/views/daxpay/common/record/callback/TradeCallbackRecordList.vue
index d4a91a63c..25c3af640 100644
--- a/src/views/daxpay/admin/record/callback/TradeCallbackRecordList.vue
+++ b/src/views/daxpay/common/record/callback/TradeCallbackRecordList.vue
@@ -48,7 +48,7 @@
           <vxe-column field="msg" title="提示信息" :min-width="250" />
           <vxe-column field="createTime" title="通知时间" sortable :min-width="170" />
           <vxe-column field="mchNo" title="商户号" :min-width="150" />
-          <vxe-column field="appId" title="商户号" :min-width="150" />
+          <vxe-column field="appId" title="应用号" :min-width="150" />
           <vxe-column fixed="right" width="60" :showOverflow="false" title="操作">
             <template #default="{ row }">
               <span>
@@ -75,7 +75,7 @@
 </template>
 
 <script lang="ts" setup>
-  import { computed, onMounted, ref } from 'vue'
+  import { computed, onMounted, ref, watch } from 'vue'
   import { page, TradeCallbackRecord, cellStyle } from './TradeCallbackRecord.api'
   import useTablePage from '@/hooks/bootx/useTablePage'
   import { VxeTable, VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
@@ -84,10 +84,12 @@
   import { useDict } from '@/hooks/bootx/useDict'
   import CallbackRecordInfo from './TradeCallbackRecordInfo.vue'
   import { LabeledValue } from 'ant-design-vue/lib/select'
-  import PayOrderInfo from '@/views/daxpay/admin/order/pay/PayOrderInfo.vue'
-  import RefundOrderInfo from '@/views/daxpay/admin/order/refund/RefundOrderInfo.vue'
-  import TransferOrderInfo from '@/views/daxpay/admin/order/transfer/TransferOrderInfo.vue'
+  import PayOrderInfo from '@/views/daxpay/common/order/pay/PayOrderInfo.vue'
+  import RefundOrderInfo from '@/views/daxpay/common/order/refund/RefundOrderInfo.vue'
+  import TransferOrderInfo from '@/views/daxpay/common/order/transfer/TransferOrderInfo.vue'
   import { TradeTypeEnum } from '@/enums/daxpay/PaymentEnum'
+  import { merchantDropdown } from '@/views/daxpay/admin/merchant/info/Merchant.api'
+  import { mchAppDropdown } from '@/views/daxpay/common/merchant/app/MchApp.api'
 
   // 使用hooks
   const {
@@ -103,6 +105,8 @@
   } = useTablePage(queryPage)
   const { dictConvert, dictDropDown } = useDict()
 
+  const mchNoOptions = ref<LabeledValue[]>([])
+  const mchAppOptions = ref<LabeledValue[]>([])
   let channelList = ref<LabeledValue[]>([])
   let callbackTypeList = ref<LabeledValue[]>([])
   let callbackStatusList = ref<LabeledValue[]>([])
@@ -133,8 +137,20 @@
         placeholder: '请选择消息处理状态',
         selectList: callbackStatusList.value,
       },
-      { field: 'mchNo', type: STRING, name: '商户号', placeholder: '请输入商户号' },
-      { field: 'appId', type: STRING, name: '应用号', placeholder: '请输入应用号' },
+      {
+        field: 'mchNo',
+        type: LIST,
+        name: '商户号',
+        placeholder: '请选择商户号',
+        selectList: mchNoOptions.value,
+      },
+      {
+        field: 'appId',
+        type: LIST,
+        name: '应用号',
+        placeholder: '请先选择商户后选择应用号',
+        selectList: mchAppOptions.value,
+      },
     ] as QueryField[]
   })
 
@@ -144,7 +160,10 @@
   const payOrderInfo = ref<any>()
   const refundOrderInfo = ref<any>()
   const transferOrderInfo = ref<any>()
-
+  watch(
+    () => model.queryParam?.mchNo,
+    (value) => changeMch(value),
+  )
   onMounted(() => {
     initData()
     vxeBind()
@@ -158,10 +177,26 @@
    * 初始化
    */
   async function initData() {
+    merchantDropdown().then(({ data }) => {
+      mchNoOptions.value = data
+    })
     channelList.value = await dictDropDown('channel')
     callbackTypeList.value = await dictDropDown('trade_type')
     callbackStatusList.value = await dictDropDown('callback_status')
   }
+  /**
+   * 商户变动后更新应用列表
+   */
+  function changeMch(mchNo) {
+    if (mchNo) {
+      mchAppDropdown(mchNo).then(({ data }) => {
+        mchAppOptions.value = data
+      })
+    } else {
+      mchAppOptions.value = []
+      model.queryParam.appId = undefined
+    }
+  }
 
   /**
    * 分页查询
diff --git a/src/views/daxpay/admin/record/close/PayCloseRecord.api.ts b/src/views/daxpay/common/record/close/PayCloseRecord.api.ts
similarity index 100%
rename from src/views/daxpay/admin/record/close/PayCloseRecord.api.ts
rename to src/views/daxpay/common/record/close/PayCloseRecord.api.ts
diff --git a/src/views/daxpay/admin/record/close/PayCloseRecordInfo.vue b/src/views/daxpay/common/record/close/PayCloseRecordInfo.vue
similarity index 100%
rename from src/views/daxpay/admin/record/close/PayCloseRecordInfo.vue
rename to src/views/daxpay/common/record/close/PayCloseRecordInfo.vue
diff --git a/src/views/daxpay/admin/record/close/PayCloseRecordList.vue b/src/views/daxpay/common/record/close/PayCloseRecordList.vue
similarity index 80%
rename from src/views/daxpay/admin/record/close/PayCloseRecordList.vue
rename to src/views/daxpay/common/record/close/PayCloseRecordList.vue
index 2d07241f1..65ed53c28 100644
--- a/src/views/daxpay/admin/record/close/PayCloseRecordList.vue
+++ b/src/views/daxpay/common/record/close/PayCloseRecordList.vue
@@ -49,7 +49,7 @@
           <vxe-column field="clientIp" title="客户端IP" :min-width="120" />
           <vxe-column field="createTime" title="创建时间" :min-width="170" />
           <vxe-column field="mchNo" title="商户号" :min-width="150" />
-          <vxe-column field="appId" title="商户号" :min-width="150" />
+          <vxe-column field="appId" title="应用号" :min-width="150" />
           <vxe-column fixed="right" width="60" :showOverflow="false" title="操作">
             <template #default="{ row }">
               <span>
@@ -74,7 +74,7 @@
 </template>
 
 <script lang="ts" setup>
-  import { computed, onMounted, ref } from 'vue'
+  import { computed, onMounted, ref, watch } from 'vue'
   import { page } from './PayCloseRecord.api'
   import useTablePage from '@/hooks/bootx/useTablePage'
   import { VxeTable, VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
@@ -83,7 +83,9 @@
   import { useDict } from '@/hooks/bootx/useDict'
   import { LabeledValue } from 'ant-design-vue/lib/select'
   import PayCloseRecordInfo from './PayCloseRecordInfo.vue'
-  import PayOrderInfo from '@/views/daxpay/admin/order/pay/PayOrderInfo.vue'
+  import PayOrderInfo from '@/views/daxpay/common/order/pay/PayOrderInfo.vue'
+  import { merchantDropdown } from '@/views/daxpay/admin/merchant/info/Merchant.api'
+  import { mchAppDropdown } from '@/views/daxpay/common/merchant/app/MchApp.api'
 
   // 使用hooks
   const {
@@ -99,6 +101,8 @@
   } = useTablePage(queryPage)
   const { dictConvert, dictDropDown } = useDict()
 
+  const mchNoOptions = ref<LabeledValue[]>([])
+  const mchAppOptions = ref<LabeledValue[]>([])
   let payChannelList = ref<LabeledValue[]>([])
   let closeTypeList = ref<LabeledValue[]>([])
 
@@ -131,8 +135,20 @@
           { label: '失败', value: false },
         ],
       },
-      { field: 'mchNo', type: STRING, name: '商户号', placeholder: '请输入商户号' },
-      { field: 'appId', type: STRING, name: '应用号', placeholder: '请输入应用号' },
+      {
+        field: 'mchNo',
+        type: LIST,
+        name: '商户号',
+        placeholder: '请选择商户号',
+        selectList: mchNoOptions.value,
+      },
+      {
+        field: 'appId',
+        type: LIST,
+        name: '应用号',
+        placeholder: '请先选择商户后选择应用号',
+        selectList: mchAppOptions.value,
+      },
     ] as QueryField[]
   })
 
@@ -140,9 +156,12 @@
   const xToolbar = ref<VxeToolbarInstance>()
   const payCloseRecordInfo = ref<any>()
   const payOrderInfo = ref<any>()
-
+  watch(
+    () => model.queryParam?.mchNo,
+    (value) => changeMch(value),
+  )
   onMounted(() => {
-    init()
+    initData()
     vxeBind()
     queryPage()
   })
@@ -153,10 +172,26 @@
   /**
    * 初始化
    */
-  async function init() {
+  async function initData() {
+    merchantDropdown().then(({ data }) => {
+      mchNoOptions.value = data
+    })
     payChannelList.value = await dictDropDown('channel')
     closeTypeList.value = await dictDropDown('close_type')
   }
+  /**
+   * 商户变动后更新应用列表
+   */
+  function changeMch(mchNo) {
+    if (mchNo) {
+      mchAppDropdown(mchNo).then(({ data }) => {
+        mchAppOptions.value = data
+      })
+    } else {
+      mchAppOptions.value = []
+      model.queryParam.appId = undefined
+    }
+  }
 
   /**
    * 分页查询
diff --git a/src/views/daxpay/admin/record/flow/TradeFlowRecord.api.ts b/src/views/daxpay/common/record/flow/TradeFlowRecord.api.ts
similarity index 100%
rename from src/views/daxpay/admin/record/flow/TradeFlowRecord.api.ts
rename to src/views/daxpay/common/record/flow/TradeFlowRecord.api.ts
diff --git a/src/views/daxpay/admin/record/flow/TradeFlowRecordInfo.vue b/src/views/daxpay/common/record/flow/TradeFlowRecordInfo.vue
similarity index 100%
rename from src/views/daxpay/admin/record/flow/TradeFlowRecordInfo.vue
rename to src/views/daxpay/common/record/flow/TradeFlowRecordInfo.vue
diff --git a/src/views/daxpay/admin/record/flow/TradeFlowRecordList.vue b/src/views/daxpay/common/record/flow/TradeFlowRecordList.vue
similarity index 81%
rename from src/views/daxpay/admin/record/flow/TradeFlowRecordList.vue
rename to src/views/daxpay/common/record/flow/TradeFlowRecordList.vue
index f240f3d1b..535fea586 100644
--- a/src/views/daxpay/admin/record/flow/TradeFlowRecordList.vue
+++ b/src/views/daxpay/common/record/flow/TradeFlowRecordList.vue
@@ -57,7 +57,7 @@
           <vxe-column field="outTradeNo" title="通道交易号" :min-width="230" />
           <vxe-column field="createTime" title="时间" :min-width="170" sortable />
           <vxe-column field="mchNo" title="商户号" :min-width="150" />
-          <vxe-column field="appId" title="商户号" :min-width="150" />
+          <vxe-column field="appId" title="应用号" :min-width="150" />
           <vxe-column fixed="right" :min-width="60" :showOverflow="false" title="操作">
             <template #default="{ row }">
               <span>
@@ -84,7 +84,7 @@
 </template>
 
 <script lang="ts" setup>
-  import { computed, onMounted, ref } from 'vue'
+  import { computed, onMounted, ref, watch } from 'vue'
   import { amountSummary, page, TradeFlowRecord } from './TradeFlowRecord.api'
   import useTablePage from '@/hooks/bootx/useTablePage'
   import { VxeTable, VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
@@ -92,12 +92,14 @@
   import { LIST, QueryField, STRING } from '@/components/Bootx/Query/Query'
   import { useDict } from '@/hooks/bootx/useDict'
   import { LabeledValue } from 'ant-design-vue/lib/select'
-  import PayOrderInfo from '@/views/daxpay/admin/order/pay/PayOrderInfo.vue'
-  import RefundOrderInfo from '@/views/daxpay/admin/order/refund/RefundOrderInfo.vue'
-  import TransferOrderInfo from '@/views/daxpay/admin/order/transfer/TransferOrderInfo.vue'
+  import PayOrderInfo from '@/views/daxpay/common/order/pay/PayOrderInfo.vue'
+  import RefundOrderInfo from '@/views/daxpay/common/order/refund/RefundOrderInfo.vue'
+  import TransferOrderInfo from '@/views/daxpay/common/order/transfer/TransferOrderInfo.vue'
   import ALink from '@/components/Link/Link.vue'
   import TradeFlowRecordInfo from './TradeFlowRecordInfo.vue'
   import { TradeTypeEnum } from '@/enums/daxpay/PaymentEnum'
+  import { merchantDropdown } from '@/views/daxpay/admin/merchant/info/Merchant.api'
+  import { mchAppDropdown } from '@/views/daxpay/common/merchant/app/MchApp.api'
 
   // 使用hooks
   const {
@@ -111,6 +113,8 @@
   } = useTablePage(queryPage)
   const { dictConvert, dictDropDown } = useDict()
 
+  const mchNoOptions = ref<LabeledValue[]>([])
+  const mchAppOptions = ref<LabeledValue[]>([])
   const payChannelList = ref<LabeledValue[]>([])
   const tradeFlowRecordTypeList = ref<LabeledValue[]>([])
 
@@ -135,8 +139,20 @@
         placeholder: '请选择交易通道',
         selectList: payChannelList.value,
       },
-      { field: 'mchNo', type: STRING, name: '商户号', placeholder: '请输入商户号' },
-      { field: 'appId', type: STRING, name: '应用号', placeholder: '请输入应用号' },
+      {
+        field: 'mchNo',
+        type: LIST,
+        name: '商户号',
+        placeholder: '请选择商户号',
+        selectList: mchNoOptions.value,
+      },
+      {
+        field: 'appId',
+        type: LIST,
+        name: '应用号',
+        placeholder: '请先选择商户后选择应用号',
+        selectList: mchAppOptions.value,
+      },
     ] as QueryField[]
   })
 
@@ -153,22 +169,40 @@
   })
 
   onMounted(() => {
-    init()
+    initData()
     vxeBind()
     queryPage()
   })
   function vxeBind() {
     xTable.value?.connect(xToolbar.value as VxeToolbarInstance)
   }
-
+  watch(
+    () => model.queryParam?.mchNo,
+    (value) => changeMch(value),
+  )
   /**
    * 初始化
    */
-  async function init() {
+  async function initData() {
+    merchantDropdown().then(({ data }) => {
+      mchNoOptions.value = data
+    })
     tradeFlowRecordTypeList.value = await dictDropDown('trade_type')
     payChannelList.value = await dictDropDown('channel')
   }
-
+  /**
+   * 商户变动后更新应用列表
+   */
+  function changeMch(mchNo) {
+    if (mchNo) {
+      mchAppDropdown(mchNo).then(({ data }) => {
+        mchAppOptions.value = data
+      })
+    } else {
+      mchAppOptions.value = []
+      model.queryParam.appId = undefined
+    }
+  }
   /**
    * 分页查询
    */
diff --git a/src/views/daxpay/admin/record/sync/TradeSyncRecord.api.ts b/src/views/daxpay/common/record/sync/TradeSyncRecord.api.ts
similarity index 100%
rename from src/views/daxpay/admin/record/sync/TradeSyncRecord.api.ts
rename to src/views/daxpay/common/record/sync/TradeSyncRecord.api.ts
diff --git a/src/views/daxpay/admin/record/sync/TradeSyncRecordInfo.vue b/src/views/daxpay/common/record/sync/TradeSyncRecordInfo.vue
similarity index 100%
rename from src/views/daxpay/admin/record/sync/TradeSyncRecordInfo.vue
rename to src/views/daxpay/common/record/sync/TradeSyncRecordInfo.vue
diff --git a/src/views/daxpay/admin/record/sync/TradeSyncRecordList.vue b/src/views/daxpay/common/record/sync/TradeSyncRecordList.vue
similarity index 80%
rename from src/views/daxpay/admin/record/sync/TradeSyncRecordList.vue
rename to src/views/daxpay/common/record/sync/TradeSyncRecordList.vue
index 3240363aa..6f063eadf 100644
--- a/src/views/daxpay/admin/record/sync/TradeSyncRecordList.vue
+++ b/src/views/daxpay/common/record/sync/TradeSyncRecordList.vue
@@ -42,7 +42,7 @@
         <vxe-column field="errorMsg" title="错误消息" :min-width="160" />
         <vxe-column field="createTime" title="同步时间" :min-width="170" />
         <vxe-column field="mchNo" title="商户号" :min-width="150" />
-        <vxe-column field="appId" title="商户号" :min-width="150" />
+        <vxe-column field="appId" title="应用号" :min-width="150" />
         <vxe-column fixed="right" :min-width="50" :showOverflow="false" title="操作">
           <template #default="{ row }">
             <span>
@@ -68,7 +68,7 @@
 </template>
 
 <script lang="ts" setup>
-  import { computed, onMounted, ref } from 'vue'
+  import { computed, onMounted, ref, watch } from 'vue'
   import { page, TradeSyncRecord } from './TradeSyncRecord.api'
   import useTablePage from '@/hooks/bootx/useTablePage'
   import { VxeTableInstance, VxeToolbarInstance } from 'vxe-table'
@@ -78,10 +78,12 @@
   import { TradeTypeEnum } from '@/enums/daxpay/PaymentEnum'
   import { LabeledValue } from 'ant-design-vue/lib/select'
   import ALink from '/@/components/Link/Link.vue'
-  import PayOrderInfo from '@/views/daxpay/admin/order/pay/PayOrderInfo.vue'
+  import PayOrderInfo from '@/views/daxpay/common/order/pay/PayOrderInfo.vue'
   import TradeSyncRecordInfo from './TradeSyncRecordInfo.vue'
-  import RefundOrderInfo from '@/views/daxpay/admin/order/refund/RefundOrderInfo.vue'
-  import TransferOrderInfo from '@/views/daxpay/admin/order/transfer/TransferOrderInfo.vue'
+  import RefundOrderInfo from '@/views/daxpay/common/order/refund/RefundOrderInfo.vue'
+  import TransferOrderInfo from '@/views/daxpay/common/order/transfer/TransferOrderInfo.vue'
+  import { merchantDropdown } from '@/views/daxpay/admin/merchant/info/Merchant.api'
+  import { mchAppDropdown } from '@/views/daxpay/common/merchant/app/MchApp.api'
 
   // 使用hooks
   const {
@@ -95,6 +97,8 @@
   } = useTablePage(queryPage)
   const { dictConvert, dictDropDown } = useDict()
 
+  const mchNoOptions = ref<LabeledValue[]>([])
+  const mchAppOptions = ref<LabeledValue[]>([])
   let syncStatusList = ref<LabeledValue[]>([])
   let payChannelList = ref<LabeledValue[]>([])
   let syncTypeList = ref<LabeledValue[]>([])
@@ -126,8 +130,20 @@
         placeholder: '请选择同步通道',
         selectList: payChannelList.value,
       },
-      { field: 'mchNo', type: STRING, name: '商户号', placeholder: '请输入商户号' },
-      { field: 'appId', type: STRING, name: '应用号', placeholder: '请输入应用号' },
+      {
+        field: 'mchNo',
+        type: LIST,
+        name: '商户号',
+        placeholder: '请选择商户号',
+        selectList: mchNoOptions.value,
+      },
+      {
+        field: 'appId',
+        type: LIST,
+        name: '应用号',
+        placeholder: '请先选择商户后选择应用号',
+        selectList: mchAppOptions.value,
+      },
     ] as QueryField[]
   })
 
@@ -139,23 +155,41 @@
   const transferOrderInfo = ref<any>()
 
   onMounted(() => {
-    init()
+    initData()
     vxeBind()
     queryPage()
   })
   function vxeBind() {
     xTable.value?.connect(xToolbar.value as VxeToolbarInstance)
   }
-
+  watch(
+    () => model.queryParam?.mchNo,
+    (value) => changeMch(value),
+  )
   /**
    * 初始化
    */
-  async function init() {
+  async function initData() {
+    merchantDropdown().then(({ data }) => {
+      mchNoOptions.value = data
+    })
     syncStatusList.value = await dictDropDown('PaySyncStatus')
     payChannelList.value = await dictDropDown('channel')
     syncTypeList.value = await dictDropDown('PaymentType')
   }
-
+  /**
+   * 商户变动后更新应用列表
+   */
+  function changeMch(mchNo) {
+    if (mchNo) {
+      mchAppDropdown(mchNo).then(({ data }) => {
+        mchAppOptions.value = data
+      })
+    } else {
+      mchAppOptions.value = []
+      model.queryParam.appId = undefined
+    }
+  }
   /**
    * 分页查询
    */
diff --git a/src/views/daxpay/merchant/info/MerchantInfo.api.ts b/src/views/daxpay/merchant/info/MerchantInfo.api.ts
new file mode 100644
index 000000000..8f6edb748
--- /dev/null
+++ b/src/views/daxpay/merchant/info/MerchantInfo.api.ts
@@ -0,0 +1,12 @@
+import { defHttp } from '@/utils/http/axios'
+import { Result } from '#/axios'
+import { Merchant } from '@/views/daxpay/admin/merchant/info/Merchant.api'
+
+/**
+ * 获取商户信息
+ */
+export const get = () => {
+  return defHttp.get<Result<Merchant>>({
+    url: '/merchant/get',
+  })
+}
diff --git a/src/views/daxpay/merchant/info/MerchantInfo.vue b/src/views/daxpay/merchant/info/MerchantInfo.vue
new file mode 100644
index 000000000..3ae88d9d7
--- /dev/null
+++ b/src/views/daxpay/merchant/info/MerchantInfo.vue
@@ -0,0 +1,5 @@
+<script setup lang="ts"></script>
+
+<template></template>
+
+<style scoped lang="less"></style>
diff --git a/src/views/daxpay/merchant/user/MerchantUser.api.ts b/src/views/daxpay/merchant/user/MerchantUser.api.ts
new file mode 100644
index 000000000..c89dcee14
--- /dev/null
+++ b/src/views/daxpay/merchant/user/MerchantUser.api.ts
@@ -0,0 +1,43 @@
+import { defHttp } from '@/utils/http/axios'
+import { PageResult, Result } from '#/axios'
+import { UserInfo } from '@/views/iam/user/User.api'
+
+/**
+ * 用户列表
+ */
+export function findAll(params) {
+  return defHttp.get<Result<PageResult<UserInfo[]>>>({
+    url: '/merchant/user/page',
+    params,
+  })
+}
+
+/**
+ * 添加用户
+ */
+export function add(params) {
+  return defHttp.post<Result>({
+    url: '/merchant/user/add',
+    data: params,
+  })
+}
+
+/**
+ * 修根用户
+ */
+export function edit(params) {
+  return defHttp.post<Result>({
+    url: '/merchant/user/update',
+    data: params,
+  })
+}
+
+/**
+ * 分配角色
+ */
+export function assignRole(params) {
+  return defHttp.post<Result>({
+    url: '/merchant/user/assignRole',
+    data: params,
+  })
+}
diff --git a/src/views/daxpay/merchant/user/MerchantUserList.vue b/src/views/daxpay/merchant/user/MerchantUserList.vue
new file mode 100644
index 000000000..3ae88d9d7
--- /dev/null
+++ b/src/views/daxpay/merchant/user/MerchantUserList.vue
@@ -0,0 +1,5 @@
+<script setup lang="ts"></script>
+
+<template></template>
+
+<style scoped lang="less"></style>
diff --git a/src/views/iam/perm/menu/MenuEdit.vue b/src/views/iam/perm/menu/MenuEdit.vue
index 1ab4ae2b3..8a4f2cfcd 100644
--- a/src/views/iam/perm/menu/MenuEdit.vue
+++ b/src/views/iam/perm/menu/MenuEdit.vue
@@ -85,7 +85,12 @@
           />
         </a-form-item>
         <a-form-item label="菜单图标" name="icon">
-          <icon-picker v-model:value="form.icon" :disabled="showable" />
+          <icon-picker v-if="!showable" v-model:value="form.icon" :readonly="showable" />
+          <a-input v-else v-model:value="form.icon" disabled>
+            <template #addonAfter>
+              <Icon :icon="form.icon" />
+            </template>
+          </a-input>
         </a-form-item>
         <a-form-item label="排序" name="sortNo">
           <a-input-number
@@ -171,6 +176,7 @@
   import { IconPicker } from '@/components/Icon'
   import { BasicTitle } from '@/components/Basic'
   import { BasicDrawer } from '@/components/Drawer'
+  import Icon from '../../../../components/Icon/Icon.vue'
 
   defineComponent({
     name: 'MenuEdit',
diff --git a/src/views/iam/perm/path/PermPathList.vue b/src/views/iam/perm/path/PermPathList.vue
index b98424086..1e17c03fc 100644
--- a/src/views/iam/perm/path/PermPathList.vue
+++ b/src/views/iam/perm/path/PermPathList.vue
@@ -3,7 +3,7 @@
     <div class="m-3 p-3 pt-5 bg-white">
       <a-form class="page-query">
         <a-row :gutter="10">
-          <a-col :md="4" :sm="24">
+          <a-col :md="4" :sm="24" v-if="isAdmin()">
             <a-form-item label="终端">
               <a-select
                 v-model:value="clientCode"
@@ -78,7 +78,7 @@
   import PermPathInfo from './PermPathInfo.vue'
   import { Client, findAll } from '@/views/iam/client/Client.api'
   import XEUtils from 'xe-utils'
-  import { getAppEnvConfig } from '@/utils/env'
+  import { getAppEnvConfig, isAdmin } from '@/utils/env'
 
   const { createMessage, createConfirm } = useMessage()
 
diff --git a/src/views/iam/role/RoleMenuModal.vue b/src/views/iam/role/RoleMenuModal.vue
index 8a041149b..679423983 100644
--- a/src/views/iam/role/RoleMenuModal.vue
+++ b/src/views/iam/role/RoleMenuModal.vue
@@ -38,7 +38,12 @@
       </a-tree>
     </a-spin>
     <template #footer>
-      <a-select style="min-width: 100px" @change="clientSwitch" v-model:value="clientCode">
+      <a-select
+        style="min-width: 100px"
+        @change="clientSwitch"
+        v-model:value="clientCode"
+        v-if="isAdmin()"
+      >
         <a-select-option v-for="o in clients" :key="o.code">{{ o.name }}</a-select-option>
       </a-select>
       <a-dropdown style="margin-left: 5px" :trigger="['click']" placement="top">
@@ -67,7 +72,7 @@
 <script lang="ts" setup>
   import { BasicDrawer } from '@/components/Drawer'
   import { findAll as findClients, Client } from '@/views/iam/client/Client.api'
-  import { getAppEnvConfig } from '@/utils/env'
+  import { getAppEnvConfig, isAdmin } from '@/utils/env'
   import { RoleTree } from './Role.api'
   import { Tree, treeDataTranslate } from '@/utils/dataUtil'
   import XEUtils from 'xe-utils'
diff --git a/src/views/iam/role/RolePathModal.vue b/src/views/iam/role/RolePathModal.vue
index 9d2b9eb3f..3c3d5b792 100644
--- a/src/views/iam/role/RolePathModal.vue
+++ b/src/views/iam/role/RolePathModal.vue
@@ -37,7 +37,7 @@
       </a-tree>
     </a-spin>
     <template #footer>
-      <a-select style="min-width: 100px" @change="clientSwitch" v-model:value="clientCode">
+      <a-select v-if="isAdmin()" style="min-width: 100px" @change="clientSwitch" v-model:value="clientCode">
         <a-select-option v-for="o in clients" :key="o.code">{{ o.name }}</a-select-option>
       </a-select>
       <a-dropdown style="margin-left: 5px" :trigger="['click']" placement="top">
@@ -66,7 +66,7 @@
 <script lang="ts" setup>
   import { BasicDrawer } from '@/components/Drawer'
   import { findAll as findClients, Client } from '@/views/iam/client/Client.api'
-  import { getAppEnvConfig } from '@/utils/env'
+  import { getAppEnvConfig, isAdmin } from "@/utils/env";
   import { RoleTree } from './Role.api'
   import { Tree, treeDataTranslate } from '@/utils/dataUtil'
   import XEUtils from 'xe-utils'
diff --git a/types/web.d.ts b/types/web.d.ts
index 31c746507..f0a0a6f36 100644
--- a/types/web.d.ts
+++ b/types/web.d.ts
@@ -17,7 +17,7 @@ export interface TablePageModel<T = any> {
   // 分页参数
   pages: PageParam
   // 查询参数
-  queryParam: object
+  queryParam: any
   // 结果
   pagination: PageResult<T>
 }