From 0f75e2ede118457d361f51ca4c3a906b11e70482 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期一, 13 十月 2025 14:37:26 +0800
Subject: [PATCH] Merge branch 'dev-1.1.2' of http://120.26.58.240:8888/r/flexJobAdmin into dev-1.1.2
---
vite.config.ts | 5 +++++
src/views/EnterpriseManage/components/WechatConfigureView.vue | 3 ++-
2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/views/EnterpriseManage/components/WechatConfigureView.vue b/src/views/EnterpriseManage/components/WechatConfigureView.vue
index bd6f784..50720b9 100644
--- a/src/views/EnterpriseManage/components/WechatConfigureView.vue
+++ b/src/views/EnterpriseManage/components/WechatConfigureView.vue
@@ -18,6 +18,7 @@
v-model.trim="form.contact_type"
:value-enum="EnumWeChatPayApplymentContactTypeText"
:button-style="false"
+ :convertEnumValue="false"
/>
</ProFormItemV2>
<ProFormItemV2
@@ -994,7 +995,7 @@
const form = reactive({
business_code: '',
- contact_type: '' as any as EnumWeChatPayApplymentContactType,
+ contact_type: EnumWeChatPayApplymentContactType.LEGAL,
contact_name: '',
contact_id_doc_type: '' as any as EnumWeChatPayApplymentIdDocType,
contact_id_number: '',
diff --git a/vite.config.ts b/vite.config.ts
index 8df0b81..9ce738e 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -94,6 +94,11 @@
}
: {},
},
+ css: {
+ preprocessorOptions: {
+ scss: { api: 'modern-compiler' },
+ },
+ },
plugins: getPluginsList(command, { VITE_LEGACY, VITE_COMPRESSION, VITE_AppType }),
define: {
__INTLIFY_PROD_DEVTOOLS__: false,
--
Gitblit v1.9.1