From d89b9160a8c230b6130d6de0357c520fc0d9c3e4 Mon Sep 17 00:00:00 2001
From: bootx <xxm1995@outlook.com>
Date: Sun, 16 Nov 2025 22:44:29 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=B8=8B=E6=8B=89=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E4=B8=8D=E7=94=9F=E6=95=88=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E5=92=8C=E5=8E=BB=E9=99=A4=E6=97=A0=E7=94=A8=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/bootx/useFormEdit.ts                |  5 +++-
 .../config/platform/PlatformBasicConfig.vue   |  2 +-
 .../config/platform/PlatformUrlConfig.vue     | 24 -------------------
 .../admin/dashboard/components/GrowCard.vue   | 15 +-----------
 .../admin/merchant/app/MchAppAdminEdit.vue    |  1 +
 .../common/develop/auth/ChannelAuth.vue       |  6 +++--
 .../develop/trade/DevelopTradeGateway.vue     |  2 ++
 .../common/develop/trade/DevelopTradePay.vue  |  2 ++
 .../develop/trade/DevelopTradeRefund.vue      |  2 ++
 .../develop/trade/DevelopTradeTransfer.vue    |  2 ++
 .../common/device/qrcode/BindAppModel.vue     |  1 +
 .../common/device/qrcode/BindBlankModel.vue   |  1 +
 .../common/device/qrcode/BindMchAppModel.vue  |  2 ++
 .../common/device/terminal/BindAppModel.vue   |  1 +
 .../device/terminal/BindMchAppModel.vue       |  2 ++
 .../common/onboarded/OnbMchInfoEdit.vue       |  1 +
 16 files changed, 27 insertions(+), 42 deletions(-)

diff --git a/src/hooks/bootx/useFormEdit.ts b/src/hooks/bootx/useFormEdit.ts
index 258fa24af..23d27b298 100644
--- a/src/hooks/bootx/useFormEdit.ts
+++ b/src/hooks/bootx/useFormEdit.ts
@@ -76,7 +76,10 @@ export default function () {
    * 搜索，供select下拉框组件进行筛选时使用(:filter-option="search")
    */
   function search(input: string, option) {
-    return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
+    return (
+      option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0 ||
+      option.value.toLowerCase().indexOf(input.toLowerCase()) >= 0
+    )
   }
 
   /**
diff --git a/src/views/daxpay/admin/config/platform/PlatformBasicConfig.vue b/src/views/daxpay/admin/config/platform/PlatformBasicConfig.vue
index bfabc9a06..8ab2f53cf 100644
--- a/src/views/daxpay/admin/config/platform/PlatformBasicConfig.vue
+++ b/src/views/daxpay/admin/config/platform/PlatformBasicConfig.vue
@@ -56,7 +56,7 @@
               </a-form-item>
             </a-col>
             <a-col :span="12">
-              <a-form-item label="默认服务商" tooltip="注册代理商时，默认的服务商">
+              <a-form-item label="默认服务商" tooltip="注册商户时，默认的服务商">
                 <a-select
                   style="width: 100%"
                   v-model:value="form.defaultIsvNo"
diff --git a/src/views/daxpay/admin/config/platform/PlatformUrlConfig.vue b/src/views/daxpay/admin/config/platform/PlatformUrlConfig.vue
index 5485b29f4..e4dae3977 100644
--- a/src/views/daxpay/admin/config/platform/PlatformUrlConfig.vue
+++ b/src/views/daxpay/admin/config/platform/PlatformUrlConfig.vue
@@ -17,21 +17,6 @@
                 </a-input-group>
               </a-form-item>
             </a-col>
-            <a-col :span="12">
-              <a-form-item label="代理商端网址">
-                <a-input-group compact>
-                  <a-input
-                    :disabled="!edit"
-                    style="width: calc(100% - 60px)"
-                    v-model:value="form.agentWebUrl"
-                    placeholder="请输入代理商端网址"
-                  />
-                  <a-button type="primary" :disabled="!edit" @click="checkAgentUrl">检查</a-button>
-                </a-input-group>
-              </a-form-item>
-            </a-col>
-          </a-row>
-          <a-row :gutter="[128, 24]">
             <a-col :span="12">
               <a-form-item label="运营端网址">
                 <a-input-group compact>
@@ -60,8 +45,6 @@
                 </a-input-group>
               </a-form-item>
             </a-col>
-          </a-row>
-          <a-row :gutter="[128, 24]">
             <a-col :span="12">
               <a-form-item label="网关H5端地址">
                 <a-input-group compact>
@@ -141,13 +124,6 @@
     checkUrl(`${removeTrailingSlash(form.value.mchWebUrl)}/server/echo`, '商户端地址')
   }
 
-  /**
-   * 检查代理端地址
-   */
-  function checkAgentUrl() {
-    checkUrl(`${removeTrailingSlash(form.value.agentWebUrl)}/server/echo`, '代理端地址')
-  }
-
   /**
    * 检查运营端网址地址
    */
diff --git a/src/views/daxpay/admin/dashboard/components/GrowCard.vue b/src/views/daxpay/admin/dashboard/components/GrowCard.vue
index cb7a96608..ca491f882 100644
--- a/src/views/daxpay/admin/dashboard/components/GrowCard.vue
+++ b/src/views/daxpay/admin/dashboard/components/GrowCard.vue
@@ -134,24 +134,11 @@
                 </div>
               </div>
               <div class="bus_item">
-                <div class="title">代理商</div>
-                <div class="number">
-                  <CountTo :startVal="0" :endVal="mchData.normalAppCount || 0" />
-                </div>
-              </div>
-              <div class="bus_item">
-                <div class="title">商户应用</div>
+                <div class="title">应用</div>
                 <div class="number">
                   <CountTo :startVal="0" :endVal="mchData.partnerCount || 0" />
                 </div>
               </div>
-
-              <div class="bus_item">
-                <div class="title">*</div>
-                <div class="number">
-                  <CountTo :startVal="0" :endVal="mchData.partnerAppCount || 0" />
-                </div>
-              </div>
             </div>
           </div>
         </div>
diff --git a/src/views/daxpay/admin/merchant/app/MchAppAdminEdit.vue b/src/views/daxpay/admin/merchant/app/MchAppAdminEdit.vue
index faf313005..ec2812b9e 100644
--- a/src/views/daxpay/admin/merchant/app/MchAppAdminEdit.vue
+++ b/src/views/daxpay/admin/merchant/app/MchAppAdminEdit.vue
@@ -23,6 +23,7 @@
         </a-form-item>
         <a-form-item label="所属商户" v-if="addable" name="mchNo">
           <a-select
+            show-search
             :filter-option="search"
             v-model:value="form.mchNo"
             :disabled="!addable"
diff --git a/src/views/daxpay/common/develop/auth/ChannelAuth.vue b/src/views/daxpay/common/develop/auth/ChannelAuth.vue
index efe44a070..c9e911277 100644
--- a/src/views/daxpay/common/develop/auth/ChannelAuth.vue
+++ b/src/views/daxpay/common/develop/auth/ChannelAuth.vue
@@ -14,7 +14,8 @@
       <a-form-item label="商户" name="mchNo">
         <a-select
           style="width: 320px"
-          :filter-option="search"
+          show-search
+            :filter-option="search"
           :options="merchantList"
           v-model:value="form.mchNo"
           placeholder="请选择商户"
@@ -23,7 +24,8 @@
       </a-form-item>
       <a-form-item label="商户应用" name="appId" v-show="form.mchNo">
         <a-select
-          :filter-option="search"
+          show-search
+            :filter-option="search"
           :options="mchAppList"
           v-model:value="form.appId"
           placeholder="请选择商户应用"
diff --git a/src/views/daxpay/common/develop/trade/DevelopTradeGateway.vue b/src/views/daxpay/common/develop/trade/DevelopTradeGateway.vue
index 5004c0aa5..411cab147 100644
--- a/src/views/daxpay/common/develop/trade/DevelopTradeGateway.vue
+++ b/src/views/daxpay/common/develop/trade/DevelopTradeGateway.vue
@@ -12,6 +12,7 @@
       >
         <a-form-item label="商户号" name="mchNo">
           <a-select
+            show-search
             :filter-option="search"
             v-model:value="form.mchNo"
             placeholder="请选择商户"
@@ -21,6 +22,7 @@
         </a-form-item>
         <a-form-item label="应用号" name="appId">
           <a-select
+            show-search
             :filter-option="search"
             :options="mchAppOptions"
             v-model:value="form.appId"
diff --git a/src/views/daxpay/common/develop/trade/DevelopTradePay.vue b/src/views/daxpay/common/develop/trade/DevelopTradePay.vue
index 91f998851..e9d0b8ff1 100644
--- a/src/views/daxpay/common/develop/trade/DevelopTradePay.vue
+++ b/src/views/daxpay/common/develop/trade/DevelopTradePay.vue
@@ -20,6 +20,7 @@
         </a-form-item>
         <a-form-item label="商户号" name="mchNo">
           <a-select
+            show-search
             :filter-option="search"
             v-model:value="form.mchNo"
             placeholder="请选择商户"
@@ -29,6 +30,7 @@
         </a-form-item>
         <a-form-item label="应用号" name="appId">
           <a-select
+            show-search
             :filter-option="search"
             :options="mchAppOptions"
             v-model:value="form.appId"
diff --git a/src/views/daxpay/common/develop/trade/DevelopTradeRefund.vue b/src/views/daxpay/common/develop/trade/DevelopTradeRefund.vue
index 5d1f7af0c..c8abab6bf 100644
--- a/src/views/daxpay/common/develop/trade/DevelopTradeRefund.vue
+++ b/src/views/daxpay/common/develop/trade/DevelopTradeRefund.vue
@@ -20,6 +20,7 @@
         </a-form-item>
         <a-form-item label="商户号" name="mchNo">
           <a-select
+            show-search
             :filter-option="search"
             v-model:value="form.mchNo"
             placeholder="请选择商户"
@@ -29,6 +30,7 @@
         </a-form-item>
         <a-form-item label="应用号" name="appId">
           <a-select
+            show-search
             :filter-option="search"
             :options="mchAppOptions"
             v-model:value="form.appId"
diff --git a/src/views/daxpay/common/develop/trade/DevelopTradeTransfer.vue b/src/views/daxpay/common/develop/trade/DevelopTradeTransfer.vue
index b6c04903b..d0ceb7f8f 100644
--- a/src/views/daxpay/common/develop/trade/DevelopTradeTransfer.vue
+++ b/src/views/daxpay/common/develop/trade/DevelopTradeTransfer.vue
@@ -20,6 +20,7 @@
         </a-form-item>
         <a-form-item label="商户号" name="mchNo">
           <a-select
+            show-search
             :filter-option="search"
             v-model:value="form.mchNo"
             placeholder="请选择商户"
@@ -29,6 +30,7 @@
         </a-form-item>
         <a-form-item label="应用号" name="appId">
           <a-select
+            show-search
             :filter-option="search"
             :options="mchAppOptions"
             v-model:value="form.appId"
diff --git a/src/views/daxpay/common/device/qrcode/BindAppModel.vue b/src/views/daxpay/common/device/qrcode/BindAppModel.vue
index 893c28e4e..39118cacb 100644
--- a/src/views/daxpay/common/device/qrcode/BindAppModel.vue
+++ b/src/views/daxpay/common/device/qrcode/BindAppModel.vue
@@ -20,6 +20,7 @@
       >
         <a-form-item label="应用" name="appId">
           <a-select
+            show-search
             :filter-option="search"
             :options="mchAppOptions"
             v-model:value="form.appId"
diff --git a/src/views/daxpay/common/device/qrcode/BindBlankModel.vue b/src/views/daxpay/common/device/qrcode/BindBlankModel.vue
index e2597cc67..ac90abfa2 100644
--- a/src/views/daxpay/common/device/qrcode/BindBlankModel.vue
+++ b/src/views/daxpay/common/device/qrcode/BindBlankModel.vue
@@ -23,6 +23,7 @@
         </a-form-item>
         <a-form-item label="商户应用" name="appId">
           <a-select
+            show-search
             :filter-option="search"
             :options="mchAppOptions"
             v-model:value="form.appId"
diff --git a/src/views/daxpay/common/device/qrcode/BindMchAppModel.vue b/src/views/daxpay/common/device/qrcode/BindMchAppModel.vue
index 74f851c13..c95494007 100644
--- a/src/views/daxpay/common/device/qrcode/BindMchAppModel.vue
+++ b/src/views/daxpay/common/device/qrcode/BindMchAppModel.vue
@@ -20,6 +20,7 @@
       >
         <a-form-item label="商户" name="mchNo">
           <a-select
+            show-search
             :filter-option="search"
             v-model:value="form.mchNo"
             placeholder="请选择商户"
@@ -29,6 +30,7 @@
         </a-form-item>
         <a-form-item label="应用" name="appId">
           <a-select
+            show-search
             :filter-option="search"
             :options="mchAppOptions"
             v-model:value="form.appId"
diff --git a/src/views/daxpay/common/device/terminal/BindAppModel.vue b/src/views/daxpay/common/device/terminal/BindAppModel.vue
index 8d6ca8972..c6f584105 100644
--- a/src/views/daxpay/common/device/terminal/BindAppModel.vue
+++ b/src/views/daxpay/common/device/terminal/BindAppModel.vue
@@ -20,6 +20,7 @@
       >
         <a-form-item label="应用" name="appId">
           <a-select
+            show-search
             :filter-option="search"
             :options="mchAppOptions"
             v-model:value="form.appId"
diff --git a/src/views/daxpay/common/device/terminal/BindMchAppModel.vue b/src/views/daxpay/common/device/terminal/BindMchAppModel.vue
index 3dd0ab394..c219f0083 100644
--- a/src/views/daxpay/common/device/terminal/BindMchAppModel.vue
+++ b/src/views/daxpay/common/device/terminal/BindMchAppModel.vue
@@ -20,6 +20,7 @@
       >
         <a-form-item label="商户" name="mchNo">
           <a-select
+            show-search
             :filter-option="search"
             v-model:value="form.mchNo"
             placeholder="请选择商户"
@@ -29,6 +30,7 @@
         </a-form-item>
         <a-form-item label="应用" name="appId">
           <a-select
+            show-search
             :filter-option="search"
             :options="mchAppOptions"
             v-model:value="form.appId"
diff --git a/src/views/daxpay/common/onboarded/OnbMchInfoEdit.vue b/src/views/daxpay/common/onboarded/OnbMchInfoEdit.vue
index 5724162c5..1dd34ac38 100644
--- a/src/views/daxpay/common/onboarded/OnbMchInfoEdit.vue
+++ b/src/views/daxpay/common/onboarded/OnbMchInfoEdit.vue
@@ -23,6 +23,7 @@
         </a-form-item>
         <a-form-item label="商户" name="mchNo">
           <a-select
+            show-search
             :filter-option="search"
             v-model:value="form.mchNo"
             placeholder="请选择商户"