From 5913b702de5cbb9d0b2bb84a420f786026c4be6c Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 13 十月 2025 15:06:31 +0800
Subject: [PATCH] Merge branch 'dev-1.1.2' of http://120.26.58.240:8888/r/flexJobAdmin into dev-1.1.2
---
src/views/EnterpriseManage/components/WechatConfigureView.vue | 65 ++++++++++++++------------------
1 files changed, 29 insertions(+), 36 deletions(-)
diff --git a/src/views/EnterpriseManage/components/WechatConfigureView.vue b/src/views/EnterpriseManage/components/WechatConfigureView.vue
index 50720b9..7604bd3 100644
--- a/src/views/EnterpriseManage/components/WechatConfigureView.vue
+++ b/src/views/EnterpriseManage/components/WechatConfigureView.vue
@@ -894,7 +894,12 @@
prop="account_bank"
:checkRules="[{ message: '璇疯緭鍏ュ紑鎴烽摱琛�' }]"
>
- <ProFormText v-model.trim="form.account_bank" placeholder="璇疯緭鍏ュ紑鎴烽摱琛�" />
+ <!-- <ProFormText v-model.trim="form.account_bank" placeholder="璇疯緭鍏ュ紑鎴烽摱琛�" /> -->
+ <WeChatPayWalletBanksSelect
+ v-model.trim="form.account_bank"
+ placeholder="璇疯緭鍏ュ紑鎴烽摱琛�"
+ clearable
+ />
</ProFormItemV2>
<ProFormItemV2
label="寮�鎴烽摱琛岀渷甯傜紪鐮�:"
@@ -969,8 +974,15 @@
EnumWeChatPayApplymentSalesScenesTypeText,
EnumWeChatPayApplymentBankAccountTypeText,
} from '@/constants';
-import { convertApi2FormUrl, convertApi2FormUrlOnlyOne, downloadFileByUrl, format } from '@/utils';
+import {
+ convertApi2FormUrl,
+ convertApi2FormUrlOnlyOne,
+ downloadFileByUrl,
+ format,
+ convertApi2FormUrls,
+} from '@/utils';
import { Message } from '@bole-core/core';
+import WeChatPayWalletBanksSelect from './WeChatPayWalletBanksSelect.vue';
defineOptions({
name: 'WechatConfigureView',
@@ -1192,55 +1204,36 @@
form.biz_address_code = data.business_info?.sales_info?.biz_store_info?.biz_address_code;
form.biz_store_address =
data.business_info?.sales_info?.biz_store_info?.biz_store_address ?? '';
- form.store_entrance_pic =
- data.business_info?.sales_info?.biz_store_info?.store_entrance_pic.length > 0
- ? data.business_info?.sales_info?.biz_store_info?.store_entrance_pic.map((x) =>
- convertApi2FormUrl(x)
- )
- : [];
- form.indoor_pic =
- data.business_info?.sales_info?.biz_store_info?.indoor_pic.length > 0
- ? data.business_info?.sales_info?.biz_store_info?.indoor_pic.map((x) =>
- convertApi2FormUrl(x)
- )
- : [];
+ form.store_entrance_pic = convertApi2FormUrls(
+ data.business_info?.sales_info?.biz_store_info?.store_entrance_pic
+ );
+ form.indoor_pic = convertApi2FormUrls(
+ data.business_info?.sales_info?.biz_store_info?.indoor_pic
+ );
form.mp_appid = data.business_info?.sales_info?.mp_info?.mp_appid ?? '';
form.mp_sub_appid = data.business_info?.sales_info?.mp_info?.mp_sub_appid ?? '';
- form.mp_pics =
- data.business_info?.sales_info?.mp_info?.mp_pics.length > 0
- ? data.business_info?.sales_info?.mp_info?.mp_pics.map((x) => convertApi2FormUrl(x))
- : [];
+ form.mp_pics = convertApi2FormUrls(data.business_info?.sales_info?.mp_info?.mp_pics);
form.mini_program_appid =
data.business_info?.sales_info?.mini_program_info?.mini_program_appid ?? '';
form.mini_program_sub_appid =
data.business_info?.sales_info?.mini_program_info?.mini_program_sub_appid ?? '';
- form.mini_program_pics =
- data.business_info?.sales_info?.mini_program_info?.mini_program_pics.length > 0
- ? data.business_info?.sales_info?.mini_program_info?.mini_program_pics.map((x) =>
- convertApi2FormUrl(x)
- )
- : [];
+ form.mini_program_pics = convertApi2FormUrls(
+ data.business_info?.sales_info?.mini_program_info?.mini_program_pics
+ );
form.app_appid = data.business_info?.sales_info?.app_info?.app_appid ?? '';
form.app_sub_appid = data.business_info?.sales_info?.app_info?.app_sub_appid ?? '';
- form.app_pics =
- data.business_info?.sales_info?.app_info?.app_pics.length > 0
- ? data.business_info?.sales_info?.app_info?.app_pics.map((x) => convertApi2FormUrl(x))
- : [];
+ form.app_pics = convertApi2FormUrls(data.business_info?.sales_info?.app_info?.app_pics);
form.domain = data.business_info?.sales_info?.web_info?.domain ?? '';
form.web_authorisation = convertApi2FormUrlOnlyOne(
data.business_info?.sales_info?.web_info?.web_authorisation ?? ''
);
form.sub_corp_id = data.business_info?.sales_info?.wework_info?.sub_corp_id ?? '';
- form.wework_pics =
- data.business_info?.sales_info?.wework_info?.wework_pics.length > 0
- ? data.business_info?.sales_info?.wework_info?.wework_pics.map((x) => convertApi2FormUrl(x))
- : [];
+ form.wework_pics = convertApi2FormUrls(
+ data.business_info?.sales_info?.wework_info?.wework_pics
+ );
form.settlement_id = data.settlement_info?.settlement_id ?? '';
form.qualification_type = data.settlement_info?.qualification_type ?? '';
- form.qualifications =
- data.settlement_info?.qualifications?.length > 0
- ? data.settlement_info?.qualifications.map((x) => convertApi2FormUrl(x))
- : [];
+ form.qualifications = convertApi2FormUrls(data.settlement_info?.qualifications);
form.bank_account_type = data.bank_account_info?.bank_account_type;
form.account_name = data.bank_account_info?.account_name ?? '';
form.account_bank = data.bank_account_info?.account_bank ?? '';
--
Gitblit v1.9.1