diff --git a/apps/daxpay-merchant/src/views/payment/channel-merchant/ChannelMerchantCreate.vue b/apps/daxpay-merchant/src/views/payment/channel-merchant/ChannelMerchantCreate.vue index 7ea4c5a6e..e55023fed 100644 --- a/apps/daxpay-merchant/src/views/payment/channel-merchant/ChannelMerchantCreate.vue +++ b/apps/daxpay-merchant/src/views/payment/channel-merchant/ChannelMerchantCreate.vue @@ -1,38 +1,18 @@ - {{ $t('payment.merchant.channelMerchant.createTitle') }} - - - - ({{ merchantInfo.mchName }}) + {{ + $t('payment.merchant.channelMerchant.createTitle') + }} diff --git a/apps/daxpay-merchant/src/views/payment/channel-merchant/ChannelMerchantList.vue b/apps/daxpay-merchant/src/views/payment/channel-merchant/ChannelMerchantList.vue index 922c00193..675ae098e 100644 --- a/apps/daxpay-merchant/src/views/payment/channel-merchant/ChannelMerchantList.vue +++ b/apps/daxpay-merchant/src/views/payment/channel-merchant/ChannelMerchantList.vue @@ -12,7 +12,6 @@ ChannelMerchantApi, type ChannelMerchantResult, } from '#/api/payment/global/channel-merchant/channel-merchant.api'; - import { MerchantApi, type MerchantInfo } from '#/api/payment/merchant/merchant.api'; import ChannelLogo from '#/components/channel/ChannelLogo.vue'; import { PermCodes } from '#/constants/perm-codes'; import { productChannelMap, productI18nMap, productNameMap } from '#/enums/payment'; @@ -28,15 +27,10 @@ const { hasPermission } = usePermission(); const loading = ref(false); - // 商户信息加载状态 - const merchantLoading = ref(false); // 切换启用状态按行 loading const enableLoadingMap = ref>({}); const xTable = ref(); const xToolbar = ref(); - // 当前商户号(MerchantApi.get,不走 URL) - const mchNo = ref(''); - const merchantInfo = ref({}); const list = ref([]); const pageConfig = ref({ currentPage: 1, @@ -79,18 +73,6 @@ }); } - /** 加载当前商户信息 */ - async function loadMerchantInfo() { - merchantLoading.value = true; - try { - const { data } = await MerchantApi.get(); - merchantInfo.value = data || {}; - mchNo.value = data?.mchNo || ''; - } finally { - merchantLoading.value = false; - } - } - /** 加载通道商户列表(后端强制当前商户) */ function loadList() { loading.value = true; @@ -166,9 +148,8 @@ }); } - onMounted(async () => { + onMounted(() => { xTable.value?.connectToolbar(xToolbar.value as VxeToolbarInstance); - await loadMerchantInfo(); loadList(); }); @@ -176,19 +157,6 @@ diff --git a/apps/daxpay-merchant/src/views/payment/merchant/code-config/CodePayConfig.vue b/apps/daxpay-merchant/src/views/payment/merchant/code-config/CodePayConfig.vue index de87317be..afbcf8015 100644 --- a/apps/daxpay-merchant/src/views/payment/merchant/code-config/CodePayConfig.vue +++ b/apps/daxpay-merchant/src/views/payment/merchant/code-config/CodePayConfig.vue @@ -52,7 +52,6 @@ const loading = ref(false); const editing = ref(false); const appInfo = ref({}); - const appName = computed(() => appInfo.value.appName || ''); const mchNo = computed(() => appInfo.value.mchNo || ''); const config = ref({}); @@ -472,7 +471,6 @@ {{ $t('menu.payment.merchant.codePayConfig') }} - ({{ appName }}) diff --git a/apps/daxpay-merchant/src/views/payment/merchant/credential/MerchantCredentialConfig.vue b/apps/daxpay-merchant/src/views/payment/merchant/credential/MerchantCredentialConfig.vue index 1507b3ac1..73af33618 100644 --- a/apps/daxpay-merchant/src/views/payment/merchant/credential/MerchantCredentialConfig.vue +++ b/apps/daxpay-merchant/src/views/payment/merchant/credential/MerchantCredentialConfig.vue @@ -13,7 +13,7 @@ type MerchantCredentialResult, } from '#/api/payment/merchant/credential.api'; import { KeyGenApi } from '#/api/payment/merchant/key-gen.api'; - import { MerchantApi, type MerchantInfo } from '#/api/payment/merchant/merchant.api'; + import { MerchantApi } from '#/api/payment/merchant/merchant.api'; import { PermCodes } from '#/constants/perm-codes'; import { useFormEdit } from '#/hooks/useFormEdit'; import { useMessage } from '#/hooks/useMessage'; @@ -32,7 +32,6 @@ const isEditing = ref(false); // 当前商户号(MerchantApi.get) const mchNo = ref(''); - const merchantInfo = ref({}); // 表单数据 const formState = ref({}); // 原始脱敏数据,用于 diffForm 比对 @@ -46,7 +45,6 @@ */ async function loadMerchantInfo() { const { data } = await MerchantApi.get(); - merchantInfo.value = data || {}; mchNo.value = data?.mchNo || ''; } @@ -199,11 +197,8 @@