From ea7d275dd5b910332434458b208d38f3a8ad535f Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期四, 30 十月 2025 09:23:08 +0800
Subject: [PATCH] Merge branch 'master' into dev-1.3
---
src/views/ServiceChargeManage/components/RechargeEnterpriseWalletDialog.vue | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/views/ServiceChargeManage/components/RechargeEnterpriseWalletDialog.vue b/src/views/ServiceChargeManage/components/RechargeEnterpriseWalletDialog.vue
index cc37bb6..95ac936 100644
--- a/src/views/ServiceChargeManage/components/RechargeEnterpriseWalletDialog.vue
+++ b/src/views/ServiceChargeManage/components/RechargeEnterpriseWalletDialog.vue
@@ -8,6 +8,14 @@
:width="700"
>
<ProForm :model="form" ref="dialogForm" label-width="120px">
+ <ProFormItemV2 label="閽卞寘閫氶亾:" prop="access" :check-rules="[{ message: '璇烽�夋嫨閽卞寘閫氶亾' }]">
+ <ProFormSelect
+ v-model="form.access"
+ :valueEnum="EnumEnterpriseWalletAccessTextOnlyAlipay"
+ placeholder="璇烽�夋嫨閽卞寘閫氶亾"
+ >
+ </ProFormSelect>
+ </ProFormItemV2>
<ProFormItemV2
label="鍏呭�奸噾棰濓細"
prop="amount"
@@ -43,9 +51,11 @@
ProFormItemV2,
ProFormTextArea,
useFormDialog,
+ ProFormSelect,
} from '@bole-core/components';
import * as enterpriseWalletServices from '@/services/api/enterpriseWallet';
import AlipayWalletRecharge from './AlipayWalletRecharge.vue';
+import { EnumEnterpriseWalletAccessTextOnlyAlipay } from '@/constants';
defineOptions({
name: 'RechargeEnterpriseWalletDialog',
@@ -55,6 +65,7 @@
title?: string;
amount: number;
remark: string;
+ access: EnumEnterpriseWalletAccess;
};
const visible = defineModel({ type: Boolean });
@@ -77,15 +88,16 @@
async function rechargeEnterpriseWallet() {
try {
let params: API.RechargeEnterpriseWalletCommand = {
- access: EnumEnterpriseWalletAccess.Alipay,
+ access: form.value.access,
amount: form.value.amount,
remark: form.value.remark,
};
let res = await enterpriseWalletServices.rechargeEnterpriseWallet(params);
if (res) {
- handleAlipayWalletAdd({
- alipayUrl: res.payUrl,
- });
+ // handleAlipayWalletAdd({
+ // alipayUrl: res.payUrl,
+ // });
+ window.open(res.payUrl, '_blank');
}
} catch (error) {}
}
--
Gitblit v1.9.1