Merge branch 'master' into dev-v1.1

wupengfei

11 小时以前 ce7ff0effee22807c8d29a31d6f5f2713d3bf95c

 src/views/EnterpriseManage/components/ConfigureDialog.vue

@@ -49,35 +49,66 @@
          <div style="display: flex; width: 100%">
            <ProFormText v-model.trim="form.alipayAccount" placeholder="请输入支付宝账号">
            </ProFormText>
            <el-button
              style="margin-left: 10px"
              type="primary"
              link
              @click="handleOpenEnterpriseWallet"
            <el-button style="margin-left: 10px" type="primary" link @click="openEnterpriseWallet"
              >获取签约链接</el-button
            >
          </div>
        </ProFormItemV2>
        <ProFormItemV2
          label="支付宝姓名:"
          prop="name"
          :checkRules="[{ message: '请输入支付宝姓名' }]"
        >
          <ProFormText v-model.trim="form.name" placeholder="请输入支付宝姓名" />
        </ProFormItemV2>
        <ProFormItemV2
          label="商户ID:"
          prop="alipayMerchantId"
          :checkRules="[{ message: '请输入商户ID' }]"
        >
          <ProFormText v-model.trim="form.alipayMerchantId" placeholder="请输入商户ID" />
          <ProFormText v-model.trim="form.alipayMerchantId" placeholder="请输入商户ID" disabled />
        </ProFormItemV2>
        <ProFormItemV2 label="业务场景:" prop="scene" :checkRules="[{ message: '请选择业务场景' }]">
          <ProFormSelect
            v-model="form.scene"
            :valueEnum="EnumEnterpriseWalletExpandindirectOrderSceneText"
            placeholder="请选择业务场景"
          >
          </ProFormSelect>
        </ProFormItemV2>
        <ProFormItemV2
          label="图片:"
          prop="url"
          :check-rules="[{ type: 'upload', message: '请上传图片' }]"
          label="场景描述:"
          prop="sceneDirections"
          :checkRules="[{ message: '请输入场景描述' }]"
        >
          <ProFormImageUpload v-model:file-url="form.url" :limitFileCount="1"></ProFormImageUpload>
          <ProFormText
            v-model.trim="form.sceneDirections"
            placeholder="谁/通过什么媒介（APP/web/小程序)/主要为谁提供什么服务/用于在什么场景给什么人群转账"
          />
        </ProFormItemV2>
        <ProFormItemV2
          label="图片:"
          prop="url"
          :check-rules="[{ type: 'upload', message: '请上传图片' }]"
          label="转账场景截图:"
          prop="sceneFiles"
          :check-rules="[{ type: 'upload', message: '请上传转账场景截图' }]"
        >
          <ProFormImageUpload v-model:file-url="form.url" :limitFileCount="1"></ProFormImageUpload>
          <ProFormUpload
            v-model:file-url="form.sceneFiles"
            :limit="5"
            :limitFileSize="10"
            accept="png,jpg,jpeg,pdf"
          ></ProFormUpload>
        </ProFormItemV2>
        <ProFormItemV2
          label="资质文件:"
          prop="sceneQualificationFiles"
          :check-rules="[{ type: 'upload', message: '请上传资质文件' }]"
        >
          <ProFormUpload
            v-model:file-url="form.sceneQualificationFiles"
            :limit="5"
            :limitFileSize="10"
            accept="png,jpg,jpeg,pdf"
          ></ProFormUpload>
        </ProFormItemV2>
        <ProFormItemV2 label="签约状态:" prop="signStatus" required>
          <span>{{ EnumEnterpriseWalletSignStatusText[form.signStatus] }}</span>
@@ -155,6 +186,7 @@
  useFormDialog,
  UploadUserFile,
  ProFormImageUpload,
  ProFormUpload,
} from '@bole-core/components';
import { BoleRegExp } from '@bole-core/core';
import {
@@ -166,6 +198,7 @@
  EnumElectronSignAccess,
  EnumEnterpriseWalletSignStatusText,
  EnumEnterpriseWalletExpandindirectOrderStatusText,
  EnumEnterpriseWalletExpandindirectOrderSceneText,
} from '@/constants';
import * as enterpriseWalletServices from '@/services/api/enterpriseWallet';
import AlipayWalletOpen from './AlipayWalletOpen.vue';
@@ -190,7 +223,13 @@
  signStatus: EnumEnterpriseWalletSignStatus;
  expandindirectOrderStatus: EnumEnterpriseWalletExpandindirectOrderStatus;

  url: UploadUserFile[];
  name: string;
  scene: EnumEnterpriseWalletExpandindirectOrderScene;
  sceneDirections: string;
  /**转账场景截图 */
  sceneFiles: UploadUserFile[];
  /**商户行业资质图片或协议文本 */
  sceneQualificationFiles: UploadUserFile[];
};

const form = defineModel<Form>('form');
@@ -203,7 +242,9 @@

const dialogForm = ref<FormInstance>();

const { enabledElectronSignSettings } = useEnabledElectronSignSettings();
const { enabledElectronSignSettings } = useEnabledElectronSignSettings({
  all: true,
});

async function handleCheckBankAccount() {
  try {
@@ -214,6 +255,17 @@
    if (alipayWallet) {
      form.value.signStatus = alipayWallet.signStatus;
      form.value.expandindirectOrderStatus = alipayWallet.expandindirectOrderStatus;
    }
  } catch (error) {}
}

async function getEnterpriseWalletExpandindirectOrder() {
  try {
    let res = await enterpriseWalletServices.getEnterpriseWalletExpandindirectOrder({
      enterpriseId: form.value.id,
    });
    if (res) {
      form.value.expandindirectOrderStatus = res.orderStatus;
    }
  } catch (error) {}
}
@@ -240,23 +292,21 @@
  },
});

async function handleOpenEnterpriseWallet() {
  try {
    if (!dialogForm.value) return;
    const valid = await dialogForm.value.validateField(['alipayAccount', 'alipayMerchantId']);
    if (valid) {
      openEnterpriseWallet();
    }
  } catch (error) {}
}
// async function handleOpenEnterpriseWallet() {
//   try {
//     if (!dialogForm.value) return;
//     const valid = await dialogForm.value.validateField(['alipayAccount', 'alipayMerchantId']);
//     if (valid) {
//       openEnterpriseWallet();
//     }
//   } catch (error) {}
// }

async function openEnterpriseWallet() {
  try {
    let params: API.OpenEnterpriseWalletCommand = {
      access: EnumEnterpriseWalletAccess.Alipay,
      enterpriseId: form.value.id,
      account: form.value.alipayAccount,
      merchantId: form.value.alipayMerchantId,
    };
    let res = await enterpriseWalletServices.openEnterpriseWallet(params);
    if (res) {