diff --git a/app/components/HjcEnterpriseForm.vue b/app/components/HjcEnterpriseForm.vue new file mode 100644 index 0000000..5599045 --- /dev/null +++ b/app/components/HjcEnterpriseForm.vue @@ -0,0 +1,292 @@ + + + + + diff --git a/app/composables/useHjcAuth.ts b/app/composables/useHjcAuth.ts index cc9723f..d0e5c0a 100644 --- a/app/composables/useHjcAuth.ts +++ b/app/composables/useHjcAuth.ts @@ -13,29 +13,38 @@ export function useHjcAuth() { } async function login(enterpriseName: string, password: string) { - const res: any = await $fetch('/api/tender/login', { - method: 'POST', - body: { enterpriseName, password } - }) - if (res?.access_token) { - token.value = res.access_token - user.value = res.user || null - return { ok: true, user: res.user } + try { + const res: any = await $fetch('/api/tender/login', { + method: 'POST', + body: { enterpriseName, password } + }) + // mp-api 统一返回 ApiResult{code,message,data},code===0 成功 + if (res?.code === 0 && res.data?.access_token) { + token.value = res.data.access_token + user.value = res.data.user || null + return { ok: true, user: res.data.user } + } + return { ok: false, message: res?.message || '登录失败' } + } catch (e: any) { + return { ok: false, message: e?.data?.statusMessage || e?.message || '登录失败' } } - return { ok: false, message: res?.message || '登录失败' } } async function register(payload: Record) { - const res: any = await $fetch('/api/tender/register', { - method: 'POST', - body: payload - }) - if (res?.access_token) { - token.value = res.access_token - user.value = res.user || null - return { ok: true, user: res.user } + try { + const res: any = await $fetch('/api/tender/register', { + method: 'POST', + body: payload + }) + if (res?.code === 0 && res.data?.access_token) { + token.value = res.data.access_token + user.value = res.data.user || null + return { ok: true, user: res.data.user } + } + return { ok: false, message: res?.message || '注册失败' } + } catch (e: any) { + return { ok: false, message: e?.data?.statusMessage || e?.message || '注册失败' } } - return { ok: false, message: res?.message || '注册失败' } } function logout() { diff --git a/app/pages/register.vue b/app/pages/register.vue index 6801b25..557f5be 100644 --- a/app/pages/register.vue +++ b/app/pages/register.vue @@ -1,37 +1,31 @@ - - diff --git a/server/api/tender/enterprise/save.post.ts b/server/api/tender/enterprise/save.post.ts index 5645529..fb687c3 100644 --- a/server/api/tender/enterprise/save.post.ts +++ b/server/api/tender/enterprise/save.post.ts @@ -7,6 +7,8 @@ import { getTenantFromContext } from '../../../utils/tenant' * 提交/更新企业资质(信息+证件) * POST /api/tender/enterprise/save { name, creditCode, ..., materials: [] } * 代理到 mp-api /api/hjc/enterprise/save;需登录态。 + * + * 约定:原样透传 ApiResult{code,message,data},由前端依据 code===0 判定成功并展示 message。 */ export default defineEventHandler(async (event) => { const config = useRuntimeConfig() @@ -16,7 +18,7 @@ export default defineEventHandler(async (event) => { const auth = getHeader(event, 'authorization') || (cookieToken ? `Bearer ${cookieToken}` : null) try { - const res = await $fetch('/hjc/enterprise/save', { + return await $fetch('/hjc/enterprise/save', { baseURL: config.public.modulesApiBase, method: 'POST', headers: { @@ -25,13 +27,11 @@ export default defineEventHandler(async (event) => { }, query: { TenantId: ctx.tenantId }, body - }) as any - const data = res && res.data !== undefined ? res.data : res - return data + }) } catch (error: any) { throw createError({ statusCode: error?.statusCode || error?.response?.status || 502, - statusMessage: error?.statusMessage || 'Failed to save enterprise' + statusMessage: error?.data?.message || error?.statusMessage || 'Failed to save enterprise' }) } }) diff --git a/server/api/tender/auth/login.post.ts b/server/api/tender/login.post.ts similarity index 66% rename from server/api/tender/auth/login.post.ts rename to server/api/tender/login.post.ts index e39df5f..399a23b 100644 --- a/server/api/tender/auth/login.post.ts +++ b/server/api/tender/login.post.ts @@ -1,12 +1,13 @@ import { $fetch } from 'ofetch' import { createError, defineEventHandler, readBody } from 'h3' import { useRuntimeConfig } from '#imports' -import { getTenantFromContext } from '../../../utils/tenant' +import { getTenantFromContext } from '../../utils/tenant' /** * 企业登录 * POST /api/tender/login { enterpriseName, password } - * 代理到 mp-api /api/hjc/auth/login;成功返回 LoginResult{ access_token, user }。 + * 代理到 mp-api /api/hjc/auth/login;原样透传 ApiResult{code,message,data}, + * 由 useHjcAuth 依据 code===0 判定并展示 message。 */ export default defineEventHandler(async (event) => { const config = useRuntimeConfig() @@ -14,19 +15,17 @@ export default defineEventHandler(async (event) => { const body = await readBody(event) try { - const res = await $fetch('/hjc/auth/login', { + return await $fetch('/hjc/auth/login', { baseURL: config.public.modulesApiBase, method: 'POST', headers: { TenantId: ctx.tenantId }, query: { TenantId: ctx.tenantId }, body - }) as any - const data = res && res.data !== undefined ? res.data : res - return data + }) } catch (error: any) { throw createError({ statusCode: error?.statusCode || error?.response?.status || 502, - statusMessage: error?.statusMessage || 'Failed to login' + statusMessage: error?.data?.message || error?.statusMessage || 'Failed to login' }) } }) diff --git a/server/api/tender/auth/register.post.ts b/server/api/tender/ocr/recognize.post.ts similarity index 55% rename from server/api/tender/auth/register.post.ts rename to server/api/tender/ocr/recognize.post.ts index a12c2b3..3836b6b 100644 --- a/server/api/tender/auth/register.post.ts +++ b/server/api/tender/ocr/recognize.post.ts @@ -4,9 +4,11 @@ import { useRuntimeConfig } from '#imports' import { getTenantFromContext } from '../../../utils/tenant' /** - * 企业注册 - * POST /api/tender/register { enterpriseName, password, creditCode, ... } - * 代理到 mp-api /api/hjc/auth/register;成功返回 LoginResult{ access_token, user }。 + * 证件 OCR 识别(身份证人像面 / 营业执照) + * POST /api/tender/ocr/recognize { materialType: 'idcard_front' | 'license', fileUrl } + * 代理到 mp-api /api/hjc/ocr/recognize(匿名放行,注册页在登录前调用)。 + * + * OCR 未配置 AK 时后端返回失败,前端提示「识别失败,请手动填写」,不阻断提交。 */ export default defineEventHandler(async (event) => { const config = useRuntimeConfig() @@ -14,19 +16,18 @@ export default defineEventHandler(async (event) => { const body = await readBody(event) try { - const res = await $fetch('/hjc/auth/register', { + const res = await $fetch('/hjc/ocr/recognize', { baseURL: config.public.modulesApiBase, method: 'POST', headers: { TenantId: ctx.tenantId }, query: { TenantId: ctx.tenantId }, body }) as any - const data = res && res.data !== undefined ? res.data : res - return data + return res && res.data !== undefined ? res.data : res } catch (error: any) { throw createError({ statusCode: error?.statusCode || error?.response?.status || 502, - statusMessage: error?.statusMessage || 'Failed to register' + statusMessage: error?.data?.message || error?.statusMessage || '识别失败' }) } }) diff --git a/server/api/tender/register.post.ts b/server/api/tender/register.post.ts new file mode 100644 index 0000000..d1b7e7d --- /dev/null +++ b/server/api/tender/register.post.ts @@ -0,0 +1,34 @@ +import { $fetch } from 'ofetch' +import { createError, defineEventHandler, readBody } from 'h3' +import { useRuntimeConfig } from '#imports' +import { getTenantFromContext } from '../../utils/tenant' + +/** + * 企业注册(一站式:企业 + 经办人 + 授权 + 证件材料) + * POST /api/tender/register { enterpriseName, password, creditCode, ..., materials: [] } + * 代理到 mp-api /api/hjc/auth/register。 + * + * 约定:mp-api 的业务结果(含校验失败)一律 HTTP 200 + ApiResult{code,message,data}, + * 这里**原样透传**给前端,由 useHjcAuth 依据 code===0 判定并把 message 展示出来。 + * 仅网络/HTTP 层错误才抛 createError。 + */ +export default defineEventHandler(async (event) => { + const config = useRuntimeConfig() + const ctx = getTenantFromContext(event, config) + const body = await readBody(event) + + try { + return await $fetch('/hjc/auth/register', { + baseURL: config.public.modulesApiBase, + method: 'POST', + headers: { TenantId: ctx.tenantId }, + query: { TenantId: ctx.tenantId }, + body + }) + } catch (error: any) { + throw createError({ + statusCode: error?.statusCode || error?.response?.status || 502, + statusMessage: error?.data?.message || error?.statusMessage || 'Failed to register' + }) + } +}) diff --git a/server/api/tender/upload.post.ts b/server/api/tender/upload.post.ts new file mode 100644 index 0000000..37f2753 --- /dev/null +++ b/server/api/tender/upload.post.ts @@ -0,0 +1,45 @@ +import { $fetch } from 'ofetch' +import { createError, defineEventHandler, getHeader, readRawBody } from 'h3' +import { useRuntimeConfig } from '#imports' +import { getTenantFromContext } from '../../utils/tenant' + +/** + * 资质证件上传(注册页与资质页共用) + * POST /api/tender/upload (multipart/form-data, 字段名 file) + * 代理到 mp-api /api/hjc/auth/upload(匿名放行,登录前后均可用)。 + * + * 说明:与 h5 一致走「证件上传」链路;该接口不写 file_record 表, + * 上传结果以 URL 存在 hjc_enterprise_material.file_url。 + */ +export default defineEventHandler(async (event) => { + const config = useRuntimeConfig() + const ctx = getTenantFromContext(event, config) + const contentType = getHeader(event, 'content-type') || '' + if (!contentType.includes('multipart/form-data')) { + throw createError({ statusCode: 400, statusMessage: 'Content-Type must be multipart/form-data' }) + } + // 原样转发 multipart 原始字节(含 boundary),避免丢失文件流 + const raw = await readRawBody(event, false) + if (!raw) { + throw createError({ statusCode: 400, statusMessage: '上传文件为空' }) + } + + try { + const res = await $fetch('/hjc/auth/upload', { + baseURL: config.public.modulesApiBase, + method: 'POST', + headers: { + TenantId: ctx.tenantId, + 'Content-Type': contentType + }, + query: { TenantId: ctx.tenantId }, + body: raw + }) as any + return res && res.data !== undefined ? res.data : res + } catch (error: any) { + throw createError({ + statusCode: error?.statusCode || error?.response?.status || 502, + statusMessage: error?.data?.message || error?.statusMessage || '上传失败' + }) + } +})