From 4b896d2c15f73248a5571a9952f3bbdefe6e230f Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期五, 05 九月 2025 16:02:53 +0800 Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobAdmin --- src/views/EnterpriseManage/components/ConfigureDialog.vue | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/views/EnterpriseManage/components/ConfigureDialog.vue b/src/views/EnterpriseManage/components/ConfigureDialog.vue index 46b8b87..e094b3c 100644 --- a/src/views/EnterpriseManage/components/ConfigureDialog.vue +++ b/src/views/EnterpriseManage/components/ConfigureDialog.vue @@ -118,7 +118,7 @@ </span> </template> </ProDialog> - <QrcodeDialog v-bind="dialogQrcodeProps"></QrcodeDialog> + <AlipayWalletOpen v-bind="dialogQrcodeProps"></AlipayWalletOpen> </template> <script setup lang="ts"> @@ -144,7 +144,7 @@ EnumElectronSignAccess, } from '@/constants'; import * as enterpriseWalletServices from '@/services/api/enterpriseWallet'; -import QrcodeDialog from './QrcodeDialog.vue'; +import AlipayWalletOpen from './AlipayWalletOpen.vue'; defineOptions({ name: 'ConfigureDialog', @@ -161,6 +161,7 @@ smsCost: number; alipayAccount: string; alipayMerchantId: string; + id: string; }; const form = defineModel<Form>('form'); @@ -195,7 +196,7 @@ const { dialogProps: dialogQrcodeProps, handleAdd } = useFormDialog({ defaultFormParams: { - qrcodeUrl: '', + alipayUrl: '', }, }); @@ -203,11 +204,12 @@ try { let params: API.OpenEnterpriseWalletCommand = { access: EnumEnterpriseWalletAccess.Alipay, + enterpriseId: form.value.id, }; let res = await enterpriseWalletServices.openEnterpriseWallet(params); if (res) { handleAdd({ - qrcodeUrl: res.signUrl, + alipayUrl: res.signUrl, }); } } catch (error) {} -- Gitblit v1.9.1