From 76d07c0c336eafb918fba27450d63865baeb0642 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期一, 29 九月 2025 09:19:56 +0800
Subject: [PATCH] Merge branch 'master' into dev-1.1.2
---
src/views/EnterpriseManage/components/ConfigureDialog.vue | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/views/EnterpriseManage/components/ConfigureDialog.vue b/src/views/EnterpriseManage/components/ConfigureDialog.vue
index ad4c081..ae35d49 100644
--- a/src/views/EnterpriseManage/components/ConfigureDialog.vue
+++ b/src/views/EnterpriseManage/components/ConfigureDialog.vue
@@ -13,9 +13,9 @@
<el-tab-pane lazy :name="EnterpriseConfigureType.AliPay">
<AliPayConfigureView :id="form.id" ref="aliPayConfigureViewRef" />
</el-tab-pane>
- <!-- <el-tab-pane lazy :name="EnterpriseConfigureType.Wechat">
+ <el-tab-pane lazy :name="EnterpriseConfigureType.Wechat">
<WechatConfigureView :id="form.id" ref="wechatConfigureViewRef" />
- </el-tab-pane> -->
+ </el-tab-pane>
<el-tab-pane lazy :name="EnterpriseConfigureType.Electronic">
<ElectronicConfigureView :id="form.id" ref="electronicConfigureViewRef" />
</el-tab-pane>
@@ -87,10 +87,9 @@
res = await electronicConfigureViewRef.value?.onConfirm?.();
} else if (form.value.enterpriseConfigureType === EnterpriseConfigureType.ShortMessage) {
res = await shortMessageConfigureViewRef.value?.onConfirm?.();
+ } else if (form.value.enterpriseConfigureType === EnterpriseConfigureType.Wechat) {
+ res = await wechatConfigureViewRef.value?.onConfirm?.();
}
- // else if (form.value.enterpriseConfigureType === EnterpriseConfigureType.Wechat) {
- // res = await wechatConfigureViewRef.value?.onConfirm?.();
- // }
if (res) {
emit('onConfirm');
}
--
Gitblit v1.9.1