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 @@ - + - - - - - 检查 - - - - - @@ -60,8 +45,6 @@ - - @@ -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 @@
-
代理商
-
- -
-
-
-
商户应用
+
应用
- -
-
*
-
- -
-
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 @@