Merge branch 'master' into dev-1.1.2

wupengfei

2025-09-29 76d07c0c336eafb918fba27450d63865baeb0642

 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');
  }