Compare commits
3 Commits
b370cfd706
...
4b6def1d89
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4b6def1d89 | ||
|
|
5c3ad6ad75 | ||
|
|
b32bc4ec7e |
@ -2,6 +2,9 @@ import request from '@/utils/request'
|
||||
|
||||
const v = '1.0'
|
||||
|
||||
/** HH:mm(24 小时制、两位补零) */
|
||||
const HH_MM_PATTERN = /^([01]\d|2[0-3]):[0-5]\d$/
|
||||
|
||||
/** 自动出库规则配置(subject_config.auto_outbound_rules) */
|
||||
export type SettingWarehouseAutoOutboundRules = {
|
||||
enabled?: boolean
|
||||
@ -11,8 +14,32 @@ export type SettingWarehouseAutoOutboundRules = {
|
||||
require_sync?: boolean
|
||||
require_print?: boolean
|
||||
require_pick?: boolean
|
||||
/** 是否不出库当天订单(默认 true):开启后,当天放开时间前、「允许当天出库最后时间」之后复核的订单不自动出库 */
|
||||
exclude_same_day_outbound?: boolean
|
||||
/** 允许当天出库最后时间,格式 HH:mm,默认 06:00;复核时间早于该时间的订单不受「不出库当天订单」的影响 */
|
||||
same_day_outbound_deadline_time?: string
|
||||
/** 当天放开时间,格式 HH:mm,默认 22:00;开启「不出库当天订单」时,当天到达该时间后不再限制当天复核订单的自动出库 */
|
||||
same_day_outbound_release_time?: string
|
||||
}
|
||||
|
||||
/** auto_outbound_rules 中的布尔(flag)子项 */
|
||||
export const AUTO_OUTBOUND_RULE_FLAG_KEYS = [
|
||||
'enabled',
|
||||
'require_recheck',
|
||||
'require_pack',
|
||||
'require_weigh',
|
||||
'require_sync',
|
||||
'require_print',
|
||||
'require_pick',
|
||||
'exclude_same_day_outbound'
|
||||
] as const
|
||||
|
||||
/** auto_outbound_rules 中的 HH:mm 时间子项(缺省/空值回退默认,非空值原样保留交由后端校验) */
|
||||
export const AUTO_OUTBOUND_RULE_TIME_KEYS = [
|
||||
'same_day_outbound_deadline_time',
|
||||
'same_day_outbound_release_time'
|
||||
] as const
|
||||
|
||||
/** 文档默认:auto_outbound_rules 各子项默认值 */
|
||||
export const DEFAULT_AUTO_OUTBOUND_RULES: Required<SettingWarehouseAutoOutboundRules> = {
|
||||
enabled: false,
|
||||
@ -21,7 +48,10 @@ export const DEFAULT_AUTO_OUTBOUND_RULES: Required<SettingWarehouseAutoOutboundR
|
||||
require_weigh: true,
|
||||
require_sync: true,
|
||||
require_print: true,
|
||||
require_pick: true
|
||||
require_pick: true,
|
||||
exclude_same_day_outbound: true,
|
||||
same_day_outbound_deadline_time: '06:00',
|
||||
same_day_outbound_release_time: '22:00'
|
||||
}
|
||||
|
||||
/** 收货未入库提醒配置(subject_config.receiving_pending_inbound_notice) */
|
||||
@ -148,9 +178,136 @@ function clonePlainObject<T extends Record<string, unknown>>(src: T): T {
|
||||
return JSON.parse(JSON.stringify(src)) as T
|
||||
}
|
||||
|
||||
/** 归一化 getSettings / saveSettings 返回的 subject_config(补全文档默认项) */
|
||||
/**
|
||||
* 字段元信息 schema(只取归一化需要的部分)。来源二选一:
|
||||
* - getFieldMeta 的 `list` / `item_keys`(原始 meta,读 `type` / `default` / `item_keys`);
|
||||
* - 页面归一化后的表单字段(读 `type` / `defaultValue` / `itemFields`)。
|
||||
* `type` 兼容 meta 原始值(flag / integer / string_array…)与页面归一化值(boolean / number…)。
|
||||
*/
|
||||
export type WarehouseSubjectFieldSchema = {
|
||||
key: string
|
||||
type?: string
|
||||
/** meta 原始默认值 */
|
||||
default?: unknown
|
||||
/** 页面归一化后的默认值(优先) */
|
||||
defaultValue?: unknown
|
||||
/** 页面归一化后的子项 */
|
||||
itemFields?: WarehouseSubjectFieldSchema[]
|
||||
/** meta 原始子项 */
|
||||
item_keys?: WarehouseSubjectFieldSchema[]
|
||||
}
|
||||
|
||||
/** 取子项 schema(兼容 itemFields / item_keys 两种来源) */
|
||||
function schemaChildren(field: WarehouseSubjectFieldSchema): WarehouseSubjectFieldSchema[] {
|
||||
const children = field.itemFields ?? field.item_keys
|
||||
return Array.isArray(children) ? children : []
|
||||
}
|
||||
|
||||
function schemaFlagValue(value: unknown, fallback: unknown): boolean {
|
||||
if (value === true || value === 1 || value === '1') return true
|
||||
if (value === false || value === 0 || value === '0') return false
|
||||
return fallback === true || fallback === 1 || fallback === '1'
|
||||
}
|
||||
|
||||
const SCHEMA_FLAG_TYPES = new Set(['flag', 'boolean', 'bool', 'switch'])
|
||||
const SCHEMA_NUMBER_TYPES = new Set(['number', 'integer', 'int', 'float', 'decimal'])
|
||||
|
||||
/** 按字段 schema 归一化单个值;返回 undefined 表示该键不写入 */
|
||||
function normalizeSchemaValue(
|
||||
value: unknown,
|
||||
field: WarehouseSubjectFieldSchema,
|
||||
present: boolean
|
||||
): unknown {
|
||||
const type = String(field.type ?? '').toLowerCase()
|
||||
const fallback = field.defaultValue !== undefined ? field.defaultValue : field.default
|
||||
const children = schemaChildren(field)
|
||||
|
||||
// flag / boolean:兼容 true|false、1|0、'1'|'0',非法或缺省回退默认
|
||||
if (SCHEMA_FLAG_TYPES.has(type)) {
|
||||
if (!present && fallback === undefined) return undefined
|
||||
return schemaFlagValue(present ? value : fallback, fallback)
|
||||
}
|
||||
|
||||
// number / integer:非法或缺省回退默认(无默认则不写入)
|
||||
if (SCHEMA_NUMBER_TYPES.has(type)) {
|
||||
const num = Number(present ? value : fallback)
|
||||
if (Number.isFinite(num)) return num
|
||||
return fallback === undefined ? undefined : fallback
|
||||
}
|
||||
|
||||
// object:只保留 schema(meta item_keys)里声明的子项,逐项递归
|
||||
if (type === 'object') {
|
||||
if (!children.length) return present ? value : fallback
|
||||
const source =
|
||||
value && typeof value === 'object' && !Array.isArray(value)
|
||||
? (value as Record<string, unknown>)
|
||||
: fallback && typeof fallback === 'object' && !Array.isArray(fallback)
|
||||
? (fallback as Record<string, unknown>)
|
||||
: {}
|
||||
return normalizeSchemaObject(source, children)
|
||||
}
|
||||
|
||||
// array:逐项按子项 schema 归一化
|
||||
if (type === 'array') {
|
||||
const list = Array.isArray(value) ? value : Array.isArray(fallback) ? fallback : []
|
||||
if (!children.length) return list
|
||||
return list.map((item) =>
|
||||
item && typeof item === 'object' && !Array.isArray(item)
|
||||
? normalizeSchemaObject(item as Record<string, unknown>, children)
|
||||
: item
|
||||
)
|
||||
}
|
||||
|
||||
// string_array:字符串数组(去空去重)
|
||||
if (type === 'string_array') {
|
||||
const list = Array.isArray(value) ? value : Array.isArray(fallback) ? fallback : []
|
||||
return list
|
||||
.filter((v): v is string => typeof v === 'string' && v.trim() !== '')
|
||||
.map((v) => v.trim())
|
||||
}
|
||||
|
||||
// string / color / select / location:有值原样保留,缺省用默认
|
||||
if (!present) return fallback
|
||||
return value
|
||||
}
|
||||
|
||||
/** 按子项 schema 递归归一化对象(只保留 schema 中声明的子项) */
|
||||
function normalizeSchemaObject(
|
||||
source: Record<string, unknown>,
|
||||
children: WarehouseSubjectFieldSchema[]
|
||||
): Record<string, unknown> {
|
||||
const out: Record<string, unknown> = {}
|
||||
for (const child of children) {
|
||||
if (!child?.key) continue
|
||||
const normalized = normalizeSchemaValue(source[child.key], child, child.key in source)
|
||||
if (normalized !== undefined) out[child.key] = normalized
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
/**
|
||||
* 按 schema 归一化顶层 object / array 字段的子项(子项集合以 meta item_keys 为准,避免前端硬编码漂移)。
|
||||
* 顶层其它类型仍走各自既有归一化,不改动 flag 的 0/1 语义。
|
||||
*/
|
||||
function applySchemaToSubjectConfig(
|
||||
config: Record<string, unknown>,
|
||||
schema?: WarehouseSubjectFieldSchema[]
|
||||
): void {
|
||||
if (!Array.isArray(schema) || schema.length === 0) return
|
||||
for (const field of schema) {
|
||||
if (!field?.key) continue
|
||||
const type = String(field.type ?? '').toLowerCase()
|
||||
if (type !== 'object' && type !== 'array') continue
|
||||
if (!schemaChildren(field).length) continue
|
||||
const normalized = normalizeSchemaValue(config[field.key], field, field.key in config)
|
||||
if (normalized !== undefined) config[field.key] = normalized
|
||||
}
|
||||
}
|
||||
|
||||
/** 归一化 getSettings / saveSettings 返回的 subject_config(补全文档默认项;传入 schema 时按 meta 归一化子项) */
|
||||
export function normalizeWarehouseSubjectConfig(
|
||||
raw: unknown
|
||||
raw: unknown,
|
||||
schema?: WarehouseSubjectFieldSchema[]
|
||||
): SettingWarehouseSubjectConfig {
|
||||
const base =
|
||||
raw && typeof raw === 'object' && !Array.isArray(raw)
|
||||
@ -167,12 +324,33 @@ export function normalizeWarehouseSubjectConfig(
|
||||
? { ...(rulesRaw as Record<string, unknown>) }
|
||||
: ({} as Record<string, unknown>)
|
||||
|
||||
base.auto_outbound_rules = {
|
||||
...DEFAULT_AUTO_OUTBOUND_RULES,
|
||||
...Object.fromEntries(
|
||||
Object.entries(rules).filter(([, v]) => typeof v === 'boolean')
|
||||
// 兼容历史字段名:allow_same_day_outbound(旧,「允许当天出库」)= !exclude_same_day_outbound(新,「不出库当天订单」)
|
||||
if (!('exclude_same_day_outbound' in rules) && 'allow_same_day_outbound' in rules) {
|
||||
const legacyAllow = rules.allow_same_day_outbound
|
||||
rules.exclude_same_day_outbound = !(
|
||||
legacyAllow === true || legacyAllow === 1 || legacyAllow === '1'
|
||||
)
|
||||
} as SettingWarehouseAutoOutboundRules
|
||||
}
|
||||
|
||||
// 按白名单保留 flag 与 HH:mm 时间子项:不能只按「值是否为 boolean」过滤,
|
||||
// 否则 same_day_outbound_deadline_time / same_day_outbound_release_time(字符串)
|
||||
// 会在读取与保存时被静默丢弃。
|
||||
const normalizedRules: Record<string, unknown> = { ...DEFAULT_AUTO_OUTBOUND_RULES }
|
||||
for (const key of AUTO_OUTBOUND_RULE_FLAG_KEYS) {
|
||||
const value = rules[key]
|
||||
normalizedRules[key] =
|
||||
value === true || value === 1 || value === '1'
|
||||
? true
|
||||
: value === false || value === 0 || value === '0'
|
||||
? false
|
||||
: DEFAULT_AUTO_OUTBOUND_RULES[key]
|
||||
}
|
||||
for (const key of AUTO_OUTBOUND_RULE_TIME_KEYS) {
|
||||
const value = rules[key]
|
||||
const text = value === undefined || value === null ? '' : String(value).trim()
|
||||
normalizedRules[key] = text !== '' ? text : DEFAULT_AUTO_OUTBOUND_RULES[key]
|
||||
}
|
||||
base.auto_outbound_rules = normalizedRules as SettingWarehouseAutoOutboundRules
|
||||
|
||||
for (const key of WAREHOUSE_SENDER_FIELD_KEYS) {
|
||||
if (typeof base[key] !== 'string') {
|
||||
@ -220,11 +398,10 @@ export function normalizeWarehouseSubjectConfig(
|
||||
}
|
||||
|
||||
// 开始自动分配时间 / 截单时间(HH:mm,非法回退默认 08:00 / 18:00)
|
||||
const HHmmPattern = /^([01]\d|2[0-3]):[0-5]\d$/
|
||||
const allocTime = String(base.allocate_start_time ?? '')
|
||||
base.allocate_start_time = HHmmPattern.test(allocTime) ? allocTime : '08:00'
|
||||
base.allocate_start_time = HH_MM_PATTERN.test(allocTime) ? allocTime : '08:00'
|
||||
const cutoffTime = String(base.cutoff_order_time ?? '')
|
||||
base.cutoff_order_time = HHmmPattern.test(cutoffTime) ? cutoffTime : '18:00'
|
||||
base.cutoff_order_time = HH_MM_PATTERN.test(cutoffTime) ? cutoffTime : '18:00'
|
||||
|
||||
// 收货未入库提醒(enabled flag 兼容 boolean / 数字 / 字符串;notice_time 非法回退 08:30;
|
||||
// min_hours 默认 24;max_hours 默认 48 且必须大于 min_hours)
|
||||
@ -239,7 +416,7 @@ export function normalizeWarehouseSubjectConfig(
|
||||
noticeEnabled === true || noticeEnabled === 1 || noticeEnabled === '1'
|
||||
|
||||
const noticeTime = String(notice.notice_time ?? '')
|
||||
notice.notice_time = HHmmPattern.test(noticeTime)
|
||||
notice.notice_time = HH_MM_PATTERN.test(noticeTime)
|
||||
? noticeTime
|
||||
: DEFAULT_RECEIVING_PENDING_INBOUND_NOTICE.notice_time
|
||||
|
||||
@ -265,17 +442,38 @@ export function normalizeWarehouseSubjectConfig(
|
||||
base.receiving_pending_inbound_notice =
|
||||
notice as SettingWarehouseReceivingPendingInboundNotice
|
||||
|
||||
// 子项集合以 getFieldMeta 的 item_keys 为准(不再由前端硬编码子项 key):
|
||||
// 后端给 object / array 字段改名或加子项时,只要页面把 meta 字段(含 itemFields)传进来,
|
||||
// 读取与保存都会自动跟随,不会再出现「拉取的和提交的对不上」。
|
||||
applySchemaToSubjectConfig(base, schema)
|
||||
|
||||
// 跨字段约束:max_hours 必须大于 min_hours(schema 无法表达,放 schema 之后兜底)
|
||||
const finalNotice = base.receiving_pending_inbound_notice
|
||||
if (finalNotice && typeof finalNotice === 'object' && !Array.isArray(finalNotice)) {
|
||||
const finalObj = finalNotice as Record<string, unknown>
|
||||
const minH = Number(finalObj.min_hours)
|
||||
const maxH = Number(finalObj.max_hours)
|
||||
const safeMin = Number.isFinite(minH) ? minH : 0
|
||||
if (!Number.isFinite(maxH) || maxH <= safeMin) {
|
||||
finalObj.max_hours = Math.max(
|
||||
DEFAULT_RECEIVING_PENDING_INBOUND_NOTICE.max_hours,
|
||||
safeMin + 1
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
return base as SettingWarehouseSubjectConfig
|
||||
}
|
||||
|
||||
export function normalizeGetSettingsPayload(
|
||||
raw: Record<string, unknown> | null | undefined
|
||||
raw: Record<string, unknown> | null | undefined,
|
||||
schema?: WarehouseSubjectFieldSchema[]
|
||||
): SettingWarehouseSettingsPayload {
|
||||
const payload = raw && typeof raw === 'object' ? raw : {}
|
||||
const warehouseId = Number(payload.warehouse_id)
|
||||
return {
|
||||
warehouse_id: Number.isFinite(warehouseId) ? warehouseId : 0,
|
||||
subject_config: normalizeWarehouseSubjectConfig(payload.subject_config)
|
||||
subject_config: normalizeWarehouseSubjectConfig(payload.subject_config, schema)
|
||||
}
|
||||
}
|
||||
|
||||
@ -283,9 +481,11 @@ export function normalizeGetSettingsPayload(
|
||||
export function buildSaveSettingsRequest(options: {
|
||||
subject_config: SettingWarehouseSubjectConfig | Record<string, unknown>
|
||||
cache_warehouse_id?: number | null
|
||||
/** 字段元信息(页面归一化后的表单字段即可):用于按 item_keys 归一化 object / array 子项 */
|
||||
schema?: WarehouseSubjectFieldSchema[]
|
||||
}): SettingWarehouseSaveSettingsParams {
|
||||
const body: SettingWarehouseSaveSettingsParams = {
|
||||
subject_config: normalizeWarehouseSubjectConfig(options.subject_config)
|
||||
subject_config: normalizeWarehouseSubjectConfig(options.subject_config, options.schema)
|
||||
}
|
||||
const cacheId = options.cache_warehouse_id
|
||||
if (cacheId != null && Number.isFinite(cacheId) && cacheId > 0) {
|
||||
@ -295,9 +495,10 @@ export function buildSaveSettingsRequest(options: {
|
||||
}
|
||||
|
||||
export function normalizeSaveSettingsPayload(
|
||||
raw: Record<string, unknown> | null | undefined
|
||||
raw: Record<string, unknown> | null | undefined,
|
||||
schema?: WarehouseSubjectFieldSchema[]
|
||||
): SettingWarehouseSaveSettingsPayload {
|
||||
const base = normalizeGetSettingsPayload(raw)
|
||||
const base = normalizeGetSettingsPayload(raw, schema)
|
||||
const cleared = raw?.cache_cleared_warehouse_id
|
||||
const cacheCleared =
|
||||
cleared === null || cleared === undefined
|
||||
|
||||
@ -39,15 +39,43 @@ export function wechatGetAuthUrl(
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询当前仓库小程序的微信认证状态(wechat.queryauth)—— 无需入参,仓库由登录态上下文(ctx.user.store_id)决定。
|
||||
* 查询当前仓库小程序的微信认证状态(wechat.queryauth)—— 入参可选 `taskid`,仓库由登录态上下文(ctx.user.store_id)决定。
|
||||
*
|
||||
* 三种返回形态(均为 code 200 / success:true,需看 `is_verified` 与 `taskid`):
|
||||
* 1) 已认证:`{is_verified:true, appid, verify_type_id, verify_type_text, principal_name, signature,
|
||||
* service_type_id, account_status}`,message「小程序已认证」;
|
||||
* 2) 未认证但有认证任务:微信 `wxa/sec/queryauth` 结果 + `{appid, is_verified, task_status_text, apply_status_text}`;
|
||||
* 3) 未认证且无认证任务:`{is_verified:false, appid, taskid:null, task_status:null, apply_status:null}`,
|
||||
* message「尚未认证,且无认证任务」。
|
||||
*/
|
||||
export type WeChatQueryAuthData = {
|
||||
/** 小程序 AppID */
|
||||
appid: string
|
||||
/** 认证状态:0 未认证、1 认证中、2 认证通过、3 认证失败 */
|
||||
auth_state: number
|
||||
/** 认证状态中文文案 */
|
||||
auth_state_text: string
|
||||
appid?: string
|
||||
/** 是否已认证(verify_type_id >= 0 或 apply_status=4) */
|
||||
is_verified?: boolean
|
||||
/** 认证类型 ID:0 微信认证、1 新浪微博认证、3 资质通过未名称认证、4 资质通过+微博认证(-1 未认证) */
|
||||
verify_type_id?: number | null
|
||||
/** 认证类型中文文案 */
|
||||
verify_type_text?: string
|
||||
/** 认证主体名称 */
|
||||
principal_name?: string
|
||||
/** 帐号简介 */
|
||||
signature?: string
|
||||
/** 主体类型 ID(微信原值) */
|
||||
service_type_id?: number | null
|
||||
/** 帐号状态(微信原值) */
|
||||
account_status?: number | null
|
||||
/** 认证任务 ID(为空=后端没有认证任务) */
|
||||
taskid?: string | null
|
||||
/** 认证任务状态(微信 task_status,0/1/2/3…15) */
|
||||
task_status?: number | null
|
||||
/** 认证任务状态中文文案 */
|
||||
task_status_text?: string
|
||||
/** 认证审核单状态:0 审核单不存在、1 待支付、2 审核中、3 打回重填、4 认证通过、5 认证最终失败 */
|
||||
apply_status?: number | null
|
||||
/** 审核单状态中文文案 */
|
||||
apply_status_text?: string
|
||||
[key: string]: unknown
|
||||
}
|
||||
|
||||
export function wechatQueryAuth(): Promise<
|
||||
@ -66,6 +94,94 @@ export function wechatQueryAuth(): Promise<
|
||||
} as any)
|
||||
}
|
||||
|
||||
/**
|
||||
* 发起小程序认证(wechat.wxaauth)—— 后端分步:
|
||||
* 图片字段传 COS 文件 URL(http/https)→ 后端下载并调微信 `wxa/sec/wxaapi/uploadmedia` 换 media_id
|
||||
* → 替换请求体 → 调微信 `wxa/sec/wxaapi/wxaauth`(权限集 18)一步提交。
|
||||
* 成功后后端回写 `wms_wechat_app.auth_task_id`/`auth_apply_status`,返回 `taskid` 与 `auth_url`;
|
||||
* 小程序已认证(verify_type_id >= 0)时会拒绝重复发起。
|
||||
*/
|
||||
export type WeChatWxaauthParams = {
|
||||
/** 联系人类型:1 法人、2 管理员 */
|
||||
contact_type: number
|
||||
/** 联系人姓名 */
|
||||
contact_name: string
|
||||
/**
|
||||
* 其余白名单字段(后端透传微信 wxaauth 请求体):
|
||||
* contact_idcard_number/contact_mobile/contact_cert_photo/contact_nationality/contact_address/contact_email、
|
||||
* business_license_copy/business_license_number/business_license_address/business_license_expiration_date、
|
||||
* legal_persona_media/legal_persona_idcard_copy/legal_persona_name/legal_persona_idcard_number/
|
||||
* legal_persona_address/legal_persona_idcard_expiration_date、business_license_type/apply_type/
|
||||
* extra_wxa_secure_info/nickname、pic_list/qualification_list/qualification_extra/license_list/
|
||||
* statement_list、store_name/store_main_industry/store_scale/store_floor/store_address/open_type/pay_type。
|
||||
* 图片字段(contact_cert_photo/business_license_copy/legal_persona_idcard_copy/legal_persona_media、
|
||||
* pic_list 项的 pic_url、qualification_list 项 licence_list/certificate_list 的 value、statement_list 项的 value)
|
||||
* 支持传 COS 文件 URL;传非 URL 时视为已传 media_id 原样透传。
|
||||
*/
|
||||
[key: string]: unknown
|
||||
}
|
||||
|
||||
export type WeChatWxaauthData = {
|
||||
/** 小程序 AppID */
|
||||
appid?: string
|
||||
/** 认证任务 ID(已回写 auth_task_id,供 wechat.queryauth 查进度) */
|
||||
taskid?: string
|
||||
/** 小程序管理员认证链接(可选,打开后继续完成认证) */
|
||||
auth_url?: string
|
||||
/** 审核单状态:0 不存在、1 待支付、2 审核中 */
|
||||
apply_status?: number
|
||||
[key: string]: unknown
|
||||
}
|
||||
|
||||
export function wechatWxaauth(data: WeChatWxaauthParams): Promise<
|
||||
{ code?: number; message?: string; data?: WeChatWxaauthData } & Record<string, unknown>
|
||||
> {
|
||||
return request({
|
||||
url: '/system',
|
||||
method: 'post',
|
||||
params: {
|
||||
method: 'wechat.wxaauth',
|
||||
v,
|
||||
timestamp: new Date().getTime()
|
||||
},
|
||||
data,
|
||||
isSystemApi: true,
|
||||
// 材料图片需后端下载 + 上传微信换 media_id,耗时较长
|
||||
timeout: 180000
|
||||
} as any)
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取并同步当前仓库小程序基础信息(wechat.getAuthorizerInfo)——
|
||||
* 后端调微信 `api_get_authorizer_info` 拉取授权账号详情,将昵称/头像/原始ID/主体名称/签名/
|
||||
* 认证类型/账号状态/权限集等落库 `wms_wechat_app` 后返回完整数据;认证进度请用 wechat.queryauth。
|
||||
*/
|
||||
export type WeChatAuthorizerInfoData = {
|
||||
/** 当前仓库小程序 AppID */
|
||||
appid?: string
|
||||
/** 授权账号基本信息(nick_name/head_img/user_name/principal_name/signature/verify_type_info 等) */
|
||||
authorizer_info?: Record<string, unknown>
|
||||
/** 授权信息(authorizer_appid/func_info/authorizer_refresh_token) */
|
||||
authorization_info?: Record<string, unknown>
|
||||
[key: string]: unknown
|
||||
}
|
||||
|
||||
export function wechatGetAuthorizerInfo(): Promise<
|
||||
{ code?: number; message?: string; data?: WeChatAuthorizerInfoData } & Record<string, unknown>
|
||||
> {
|
||||
return request({
|
||||
url: '/system',
|
||||
method: 'post',
|
||||
params: {
|
||||
method: 'wechat.getAuthorizerInfo',
|
||||
v,
|
||||
timestamp: new Date().getTime()
|
||||
},
|
||||
data: {},
|
||||
isSystemApi: true
|
||||
} as any)
|
||||
}
|
||||
|
||||
/**
|
||||
* 快速注册企业小程序(wechat.registerMiniprogram)——
|
||||
* 调微信 fastregisterweapp?action=create(component_access_token)提交企业信息创建注册任务,
|
||||
@ -155,18 +271,15 @@ export function wechatGetTemplateList(): Promise<
|
||||
|
||||
/**
|
||||
* 上传代码并生成体验版(wechat.commit)——
|
||||
* 后端取当前仓库启用小程序,校验授权权限集 18(代码管理)与模板存在性后调微信 wxa/commit 上传代码,
|
||||
* 成功后回写 wms_wechat_app.template_id。
|
||||
* 入参**只有 template_id**(正整数):后端取当前仓库启用小程序 → 校验授权权限集 18(代码管理)
|
||||
* → 从模板库取该模板、直接用它自己的 `user_version`/`user_desc` 作为版本号与代码描述
|
||||
* (模板缺版本号/描述会直接失败,前端不再传)
|
||||
* → `ext_json` 由后端固定生成 `{extEnable:true, extAppid:当前小程序appid}`
|
||||
* → 调微信 wxa/commit → 成功后回写 `wms_wechat_app.template_id` 与 `user_version`。
|
||||
*/
|
||||
export type WeChatCommitParams = {
|
||||
/** 代码库中的代码模板 ID(由 wechat.getTemplateList 获取) */
|
||||
/** 代码库中的代码模板 ID(由 wechat.getTemplateList 获取,必须为正整数) */
|
||||
template_id: number
|
||||
/** ext.json 配置内容(JSON 字符串,控制 extAppid / 自定义字段等) */
|
||||
ext_json: string
|
||||
/** 代码版本号(≤64 字符) */
|
||||
user_version: string
|
||||
/** 代码描述 */
|
||||
user_desc: string
|
||||
}
|
||||
|
||||
export type WeChatCommitData = {
|
||||
@ -174,6 +287,17 @@ export type WeChatCommitData = {
|
||||
appid: string
|
||||
/** 已上传的模板 ID(同时回写 wms_wechat_app.template_id) */
|
||||
template_id: number
|
||||
/** 版本号(取自模板,由后端回传,非前端传入) */
|
||||
user_version?: string
|
||||
/** 代码描述(取自模板) */
|
||||
user_desc?: string
|
||||
/** 后端生成的 ext_json 字符串 */
|
||||
ext_json?: string
|
||||
/** 微信返回的 errcode(0=成功) */
|
||||
errcode?: number
|
||||
/** 微信返回的 errmsg */
|
||||
errmsg?: string
|
||||
[key: string]: unknown
|
||||
}
|
||||
|
||||
export function wechatCommit(
|
||||
@ -285,6 +409,8 @@ export function wechatSubmitAudit(
|
||||
export const wechat = {
|
||||
getAuthUrl: wechatGetAuthUrl,
|
||||
queryAuth: wechatQueryAuth,
|
||||
wxaauth: wechatWxaauth,
|
||||
getAuthorizerInfo: wechatGetAuthorizerInfo,
|
||||
registerMiniprogram: wechatRegisterMiniprogram,
|
||||
getTemplateList: wechatGetTemplateList,
|
||||
commit: wechatCommit,
|
||||
|
||||
@ -4,11 +4,20 @@
|
||||
- setting.warehouse.getweChatApp(settingWarehouseGetWeChatApp):拉取当前仓库已授权的微信小程序配置
|
||||
- wechat.getAuthUrl(wechatGetAuthUrl):未配置时点击「去授权」获取授权链接,并在新小窗口中打开
|
||||
- wechat.queryauth(wechatQueryAuth):查询当前仓库小程序的微信认证进度(左菜单「认证状态」)
|
||||
(返回 `{is_verified, appid, verify_type_id/verify_type_text, principal_name, signature, taskid,
|
||||
task_status/task_status_text, apply_status/apply_status_text}`)
|
||||
- wechat.wxaauth(wechatWxaauth):发起小程序认证(「认证状态」未认证时的「发起微信认证」弹窗):
|
||||
材料图片传 COS URL(后端自动下载并换 media_id)→ 微信 wxa/sec/wxaapi/wxaauth 一步提交,
|
||||
返回 taskid / auth_url;已认证时后端拒绝重复发起
|
||||
- wechat.getAuthorizerInfo(wechatGetAuthorizerInfo):同步微信侧小程序基础信息
|
||||
(昵称/主体/认证类型/账号状态/权限集 → 落库后刷新本页;头部「同步微信信息」按钮)
|
||||
- wechat.registerMiniprogram(wechatRegisterMiniprogram):提交企业信息创建企业小程序注册任务
|
||||
(「代注册小程序」弹窗;后端调微信 fastregisterweapp,法人微信收模板消息做人脸核身,
|
||||
接口返回 errcode/errmsg、**不返回链接**,故不再开小窗)
|
||||
- wechat.getTemplateList(wechatGetTemplateList):拉普通代码模板库列表(左菜单「发布」,后端缓存 24h)
|
||||
- wechat.commit(wechatCommit):选定模板上传代码、生成体验版(需授权权限集 18)
|
||||
(**入参只有 template_id**:版本号/代码描述由后端从模板库的模板取用,ext_json 由后端固定生成
|
||||
`{extEnable:true, extAppid:小程序appid}`;故页面不再展示这三项)
|
||||
- wechat.getTrialQRCode(wechatGetTrialQRCode):获取体验版二维码(后端转存 COS 后返回 URL)
|
||||
- wechat.submitAudit(wechatSubmitAudit):提交代码审核(后端仅在 audit_status!=1 时允许;回写 audit_id)
|
||||
⚠️ 无审核状态查询接口,页面只能回显「已提交 + 审核单 ID」
|
||||
@ -23,6 +32,9 @@
|
||||
5) 认证状态:切到「认证状态」菜单时按需查询一次,可手动刷新
|
||||
6) 发布:切到「发布」菜单时按需拉模板列表;上传代码成功后自动刷新配置并重取体验版二维码;
|
||||
提交审核后可回显审核单 ID
|
||||
7) 失败响应识别:本套接口失败时返回 `{flag:'failure', code:0, success:false, message, data:null}`,
|
||||
而 axios 拦截器把 code=0 也当作成功码 → 必须用 `okCode(res)` 显式判 flag/success,
|
||||
授权类失败(如「小程序未授权相关权限(权限集 18/86),请重新授权」)即使是静默刷新也要提示
|
||||
|
||||
使用方:
|
||||
1) basicManagement/newview 的 viewType='form' 标签页「微信小程序」
|
||||
@ -41,6 +53,18 @@
|
||||
</div>
|
||||
<div class="header-actions">
|
||||
<el-button :disabled="pageLoading" @click="loadConfig">刷新</el-button>
|
||||
<!-- 同步微信侧基础信息(主体/认证类型/账号状态/权限集)→ 后端落库后刷新本页 -->
|
||||
<el-tooltip :disabled="authorized" content="需先完成小程序授权" placement="bottom-end">
|
||||
<span class="mp-auth-trigger">
|
||||
<el-button
|
||||
:disabled="!authorized"
|
||||
:loading="authorizerInfoLoading"
|
||||
@click="handleSyncAuthorizerInfo"
|
||||
>
|
||||
同步微信信息
|
||||
</el-button>
|
||||
</span>
|
||||
</el-tooltip>
|
||||
<!-- 代注册走纯后端接口(无微信页面跳转),不受主域名限制 -->
|
||||
<el-button @click="handleRegister">代注册小程序</el-button>
|
||||
<el-tooltip :disabled="isMainDomain" :content="mainDomainTip" placement="bottom-end">
|
||||
@ -248,17 +272,52 @@
|
||||
|
||||
<template v-else-if="certInfo">
|
||||
<el-descriptions :column="1" border size="small" class="mp-cert__desc">
|
||||
<el-descriptions-item label="小程序 AppID">
|
||||
{{ certInfo.appid || '-' }}
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="认证状态">
|
||||
<el-tag :type="certStateMeta.type" size="small" effect="light">
|
||||
{{ certStateMeta.text }}
|
||||
</el-tag>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item v-for="row in certRows" :key="row.label" :label="row.label">
|
||||
{{ row.value }}
|
||||
</el-descriptions-item>
|
||||
</el-descriptions>
|
||||
|
||||
<el-alert
|
||||
v-if="!certInfo.is_verified && !certHasTask"
|
||||
type="info"
|
||||
show-icon
|
||||
:closable="false"
|
||||
class="mp-config-alert"
|
||||
title="尚未认证:需先发起微信认证任务"
|
||||
description="微信认证不会自动开始:点下方「发起微信认证」提交联系人/主体/法人/材料,后端换 media_id 后创建认证任务,再由法人微信完成核身与支付,本页才能看到进度。"
|
||||
/>
|
||||
|
||||
<ol v-if="!certInfo.is_verified" class="mp-cert__flow">
|
||||
<li>
|
||||
发起认证:点「发起微信认证」填写材料,后端调
|
||||
<code>wxa/sec/wxaapi/wxaauth</code> 创建认证任务(返回 taskid / auth_url)
|
||||
</li>
|
||||
<li>法人核身:法人微信号完成人脸核身 / 手机验证(任务状态 3 → 4 → 6 → 9)</li>
|
||||
<li>支付审核费:待支付 → 审核中(审核单状态 1 → 2)</li>
|
||||
<li>认证通过:审核单状态 4 时后端回写 verify_type_id=0,本页转为「已认证」</li>
|
||||
</ol>
|
||||
|
||||
<div class="mp-cert__actions">
|
||||
<el-tooltip
|
||||
v-if="!certInfo.is_verified"
|
||||
:content="
|
||||
certHasTask
|
||||
? `已存在认证任务 ${certInfo.taskid || ''},重新发起会创建新任务`
|
||||
: '填写认证材料并创建微信认证任务'
|
||||
"
|
||||
placement="top"
|
||||
>
|
||||
<span>
|
||||
<el-button size="small" type="primary" @click="openAuthApplyDialog">
|
||||
发起微信认证
|
||||
</el-button>
|
||||
</span>
|
||||
</el-tooltip>
|
||||
<el-button size="small" :loading="certLoading" @click="loadAuthStatus">
|
||||
刷新认证状态
|
||||
</el-button>
|
||||
@ -271,8 +330,8 @@
|
||||
show-icon
|
||||
:closable="false"
|
||||
class="mp-config-alert"
|
||||
title="认证主体 / 证件信息 / 有效期等待后端补充"
|
||||
description="wechat.queryauth 目前仅返回小程序 AppID 与认证进度(auth_state、auth_state_text);下方为规划中的内容分区。"
|
||||
title="认证材料 / 有效期 / 订单等待后端补充"
|
||||
description="wechat.queryauth 已返回:是否已认证、认证类型与主体名称、帐号简介(已认证时)、认证任务 ID、任务状态、审核单状态;主体证件、认证有效期、认证订单与支付记录等待后端补充。"
|
||||
/>
|
||||
|
||||
<div class="mp-placeholder">
|
||||
@ -295,7 +354,8 @@
|
||||
<h3 class="mp-panel__title">代码包上传</h3>
|
||||
<p class="mp-panel__desc">
|
||||
来源:wechat.getTemplateList / wechat.commit(取当前仓库启用小程序,需授权权限集 18
|
||||
代码管理;上传成功后后端回写 wms_wechat_app.template_id)
|
||||
代码管理)。commit 入参只有 template_id:版本号与代码描述取自所选模板,
|
||||
ext_json 由后端生成;上传成功后后端回写 wms_wechat_app.template_id / user_version。
|
||||
</p>
|
||||
</header>
|
||||
|
||||
@ -324,36 +384,6 @@
|
||||
</div>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="版本号">
|
||||
<el-input
|
||||
v-model="commitForm.user_version"
|
||||
maxlength="64"
|
||||
placeholder="如 1.0.0(≤64 字符)"
|
||||
class="mp-publish-input"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="代码描述">
|
||||
<el-input
|
||||
v-model="commitForm.user_desc"
|
||||
maxlength="64"
|
||||
placeholder="如 修复分球打印错位"
|
||||
class="mp-publish-input"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="ext_json">
|
||||
<el-input
|
||||
v-model="commitForm.ext_json"
|
||||
type="textarea"
|
||||
:rows="4"
|
||||
placeholder='{"extAppid":"wx...","ext":{}}'
|
||||
/>
|
||||
<p class="mp-publish-hint">
|
||||
JSON 字符串,用于控制 extAppid / 自定义字段;无特殊需求保留默认值即可
|
||||
</p>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item>
|
||||
<el-button type="primary" :loading="commitSubmitting" @click="submitCommit">
|
||||
上传代码并生成体验版
|
||||
@ -597,6 +627,173 @@
|
||||
</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
|
||||
<!-- ===== 发起微信认证:提交认证材料(wechat.wxaauth) ===== -->
|
||||
<el-dialog
|
||||
v-model="authApplyDialogVisible"
|
||||
title="发起微信认证"
|
||||
width="680px"
|
||||
align-center
|
||||
append-to-body
|
||||
:close-on-click-modal="false"
|
||||
>
|
||||
<el-alert
|
||||
type="warning"
|
||||
show-icon
|
||||
:closable="false"
|
||||
style="margin-bottom: 16px"
|
||||
title="提交后由微信侧继续:法人核身 → 支付审核费 → 审核中"
|
||||
description="带 * 为必填;材料图片可上传(后端自动换 media_id)或直接填 COS 文件 URL。进度在本页「认证状态」查看。"
|
||||
/>
|
||||
|
||||
<el-form
|
||||
ref="authApplyFormRef"
|
||||
:model="authApplyForm"
|
||||
:rules="authApplyRules"
|
||||
label-width="140px"
|
||||
label-position="right"
|
||||
>
|
||||
<el-divider content-position="left">联系人</el-divider>
|
||||
|
||||
<el-form-item label="联系人类型" prop="contact_type">
|
||||
<el-select v-model="authApplyForm.contact_type" style="width: 100%">
|
||||
<el-option :value="1" label="法人" />
|
||||
<el-option :value="2" label="管理员" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="联系人姓名" prop="contact_name">
|
||||
<el-input v-model="authApplyForm.contact_name" maxlength="64" placeholder="必填" />
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="联系人手机">
|
||||
<el-input v-model="authApplyForm.contact_mobile" maxlength="20" placeholder="选填" />
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="联系人身份证号">
|
||||
<el-input
|
||||
v-model="authApplyForm.contact_idcard_number"
|
||||
maxlength="32"
|
||||
placeholder="选填"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<el-divider content-position="left">认证名称与主体</el-divider>
|
||||
|
||||
<el-form-item label="认证名称">
|
||||
<el-input
|
||||
v-model="authApplyForm.nickname"
|
||||
maxlength="64"
|
||||
placeholder="选填;留空则由微信按主体名称命名"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="营业执照注册号">
|
||||
<el-input
|
||||
v-model="authApplyForm.business_license_number"
|
||||
maxlength="32"
|
||||
placeholder="选填,如统一社会信用代码"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="营业执照地址">
|
||||
<el-input
|
||||
v-model="authApplyForm.business_license_address"
|
||||
maxlength="128"
|
||||
placeholder="选填"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="营业执照有效期">
|
||||
<el-input
|
||||
v-model="authApplyForm.business_license_expiration_date"
|
||||
maxlength="32"
|
||||
placeholder="选填,如 2030-01-01;长期填 9999-12-31"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<el-divider content-position="left">法人信息</el-divider>
|
||||
|
||||
<el-form-item label="法人姓名">
|
||||
<el-input v-model="authApplyForm.legal_persona_name" maxlength="64" placeholder="选填" />
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="法人身份证号">
|
||||
<el-input
|
||||
v-model="authApplyForm.legal_persona_idcard_number"
|
||||
maxlength="32"
|
||||
placeholder="选填"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="法人证件有效期">
|
||||
<el-input
|
||||
v-model="authApplyForm.legal_persona_idcard_expiration_date"
|
||||
maxlength="32"
|
||||
placeholder="选填,如 2035-05-01"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<el-divider content-position="left">材料照片(选填)</el-divider>
|
||||
|
||||
<el-form-item
|
||||
v-for="media in AUTH_APPLY_MEDIA_FIELDS"
|
||||
:key="media.key"
|
||||
:label="media.label"
|
||||
>
|
||||
<div class="mp-media-row">
|
||||
<el-input
|
||||
v-model="authApplyForm[media.key]"
|
||||
placeholder="上传图片或直接填 COS 文件 URL"
|
||||
/>
|
||||
<el-upload
|
||||
:show-file-list="false"
|
||||
accept="image/*"
|
||||
:http-request="authMediaRequest(media.key)"
|
||||
>
|
||||
<el-button :loading="authMediaUploading === media.key">上传</el-button>
|
||||
</el-upload>
|
||||
<el-image
|
||||
v-if="authApplyForm[media.key]"
|
||||
:src="String(authApplyForm[media.key])"
|
||||
:preview-src-list="[String(authApplyForm[media.key])]"
|
||||
preview-teleported
|
||||
fit="cover"
|
||||
class="mp-media-preview"
|
||||
/>
|
||||
<el-button
|
||||
v-if="authApplyForm[media.key]"
|
||||
link
|
||||
type="primary"
|
||||
@click="authApplyForm[media.key] = ''"
|
||||
>
|
||||
清除
|
||||
</el-button>
|
||||
</div>
|
||||
</el-form-item>
|
||||
|
||||
<el-divider content-position="left">高级字段(选填)</el-divider>
|
||||
|
||||
<el-form-item label="JSON">
|
||||
<el-input
|
||||
v-model="authApplyExtraJson"
|
||||
type="textarea"
|
||||
:rows="4"
|
||||
placeholder='按微信 wxaauth 原样透传,如 {"apply_type":1,"pic_list":[{"pic_url":"https://..."}]}'
|
||||
/>
|
||||
<p class="mp-publish-hint">
|
||||
用于上方未覆盖的白名单字段(图片字段同样可填 COS URL);与上方字段同名时以此处为准
|
||||
</p>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
<template #footer>
|
||||
<el-button @click="authApplyDialogVisible = false">取消</el-button>
|
||||
<el-button type="primary" :loading="authApplySubmitting" @click="submitAuthApply">
|
||||
发起认证
|
||||
</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@ -610,23 +807,59 @@ import {
|
||||
} from '@/api/setting.warehouse/settingwarehouse'
|
||||
import {
|
||||
wechatCommit,
|
||||
wechatGetAuthorizerInfo,
|
||||
wechatGetAuthUrl,
|
||||
wechatGetTemplateList,
|
||||
wechatGetTrialQRCode,
|
||||
wechatQueryAuth,
|
||||
wechatRegisterMiniprogram,
|
||||
wechatSubmitAudit,
|
||||
wechatWxaauth,
|
||||
type WeChatAuditItem,
|
||||
type WeChatCommitData,
|
||||
type WeChatQueryAuthData,
|
||||
type WeChatRegisterMiniprogramParams,
|
||||
type WeChatSubmitAuditData,
|
||||
type WeChatTemplateItem,
|
||||
type WeChatTemplateListData
|
||||
type WeChatTemplateListData,
|
||||
type WeChatWxaauthData,
|
||||
type WeChatWxaauthParams
|
||||
} from '@/api/wechat/wechat'
|
||||
import { isMainDomainHost, normalizeFrontHost } from '@/stores/modules/frontBrand'
|
||||
import { uploadImageToCos } from '@/utils/cosImageUpload'
|
||||
defineOptions({ name: 'MiniProgramConfigForm' })
|
||||
|
||||
const okCode = (code: unknown) => code === 1 || code === 200 || code === 0
|
||||
/** 本套接口响应中与成功/失败判定相关的字段 */
|
||||
type ApiFlagFields = { code?: unknown; flag?: unknown; success?: unknown; message?: unknown }
|
||||
|
||||
/**
|
||||
* 判定接口是否成功。
|
||||
* ⚠️ 本套接口失败时返回 `{ flag:'failure', code:0, success:false, message, data:null }`,
|
||||
* 而 `code=0` 也被 axios 拦截器(SUCCESS_CODES)视为成功,因此**必须显式识别 flag/success**;
|
||||
* 否则「小程序未授权相关权限(权限集 18/86),请重新授权」这类失败会被当成成功(data 为 null 只显示空值)。
|
||||
*/
|
||||
const okCode = (res: unknown) => {
|
||||
if (!res || typeof res !== 'object') return false
|
||||
const raw = res as ApiFlagFields
|
||||
if (raw.flag === 'failure' || raw.flag === 'fail' || raw.success === false) return false
|
||||
return raw.code === 1 || raw.code === 200 || raw.code === 0
|
||||
}
|
||||
|
||||
/** 授权类失败(缺少授权权限集)→ 在提示里补上「重新授权」指引 */
|
||||
const AUTH_FAILURE_RE = /权限集|重新授权|未授权/
|
||||
|
||||
/**
|
||||
* 统一错误提示。
|
||||
* silent 仅抑制「非授权类」失败提示:授权类失败(权限集缺失)即使静默刷新也要提示,否则问题会被完全吞掉。
|
||||
*/
|
||||
function showApiError(res: unknown, fallback: string, silent = false) {
|
||||
const message = String((res as ApiFlagFields | null | undefined)?.message ?? '').trim() || fallback
|
||||
const authIssue = AUTH_FAILURE_RE.test(message)
|
||||
if (silent && !authIssue) return
|
||||
ElMessage.error(
|
||||
authIssue ? `${message}(请在「基础信息」中点击「重新授权」,确认授予全部权限后重试)` : message
|
||||
)
|
||||
}
|
||||
|
||||
// ============================================================
|
||||
// 常量
|
||||
@ -724,11 +957,11 @@ const MENU_LIST: MiniProgramMenuItem[] = [
|
||||
key: 'cert',
|
||||
label: '认证状态',
|
||||
icon: Medal,
|
||||
desc: '小程序微信认证状态(接口已接入:wechat.queryauth)',
|
||||
desc: '小程序微信认证状态与进度(已接入:wechat.queryauth 查询 / wechat.wxaauth 发起)',
|
||||
blocks: [
|
||||
{ title: '认证信息(待后端补充)', desc: '认证类型 / 认证主体名称 / 认证主体证件号 / 认证有效期' },
|
||||
{ title: '认证材料与支付(待后端补充)', desc: '认证订单与支付记录 / 认证结果通知 / 年审提醒' },
|
||||
{ title: '状态与记录(待后端补充)', desc: '认证历史记录 / 失败原因与重试' }
|
||||
{ title: '认证材料(待后端补充)', desc: '认证主体证件号 / 认证有效期 / 认证订单与支付记录' },
|
||||
{ title: '认证结果通知(待后端补充)', desc: '认证结果回调记录 / 失败原因与重试' },
|
||||
{ title: '认证历史(待后端补充)', desc: '认证历史记录 / 年审提醒' }
|
||||
]
|
||||
},
|
||||
{
|
||||
@ -842,17 +1075,14 @@ const templateLoaded = ref(false)
|
||||
const templateList = ref<WeChatTemplateItem[]>([])
|
||||
const templateFromCache = ref(false)
|
||||
const commitSubmitting = ref(false)
|
||||
const commitForm = reactive<{
|
||||
template_id?: number
|
||||
user_version: string
|
||||
user_desc: string
|
||||
ext_json: string
|
||||
}>({
|
||||
template_id: undefined,
|
||||
user_version: '',
|
||||
user_desc: '',
|
||||
ext_json: '{}'
|
||||
})
|
||||
/** 入参只有 template_id:版本号/代码描述取自模板,ext_json 由后端生成 */
|
||||
const commitForm = reactive<{ template_id?: number }>({ template_id: undefined })
|
||||
|
||||
/** 当前选中的模板(其 user_version / user_desc 会被后端直接当上传参数用,仅用于提交前校验) */
|
||||
const selectedTemplate = computed<WeChatTemplateItem | undefined>(() =>
|
||||
templateList.value.find((tpl) => Number(tpl.template_id) === Number(commitForm.template_id))
|
||||
)
|
||||
|
||||
const trialQRCodeLoading = ref(false)
|
||||
const trialQRCodePath = ref('')
|
||||
const trialQRCodeUrl = ref('')
|
||||
@ -1050,8 +1280,8 @@ async function loadConfig(options: { silent?: boolean } = {}) {
|
||||
if (!options.silent) pageLoading.value = true
|
||||
try {
|
||||
const res: any = await settingWarehouseGetWeChatApp()
|
||||
if (!res || !okCode(res.code)) {
|
||||
if (!options.silent) ElMessage.error(res?.message || '获取微信小程序配置失败')
|
||||
if (!okCode(res)) {
|
||||
showApiError(res, '获取微信小程序配置失败', options.silent)
|
||||
return
|
||||
}
|
||||
// 未授权时后端返回 data:null(不能用整包 res 兜底,否则 flag/timestamp 会被误判为已配置)
|
||||
@ -1074,20 +1304,110 @@ async function loadConfig(options: { silent?: boolean } = {}) {
|
||||
// ============================================================
|
||||
// 认证状态(wechat.queryauth)
|
||||
// ============================================================
|
||||
/** 认证状态码 → 标签文案与颜色(后端同时返回 auth_state_text,展示时优先用后端文案) */
|
||||
const CERT_STATE_META: Record<number, { text: string; type: 'info' | 'warning' | 'success' | 'danger' }> = {
|
||||
0: { text: '未认证', type: 'info' },
|
||||
1: { text: '认证中', type: 'warning' },
|
||||
2: { text: '认证通过', type: 'success' },
|
||||
3: { text: '认证失败', type: 'danger' }
|
||||
/** 已认证时的认证类型(后端返回 verify_type_text,缺省按 verify_type_id 兜底) */
|
||||
const VERIFY_TYPE_TEXT: Record<number, string> = {
|
||||
0: '微信认证',
|
||||
1: '新浪微博认证',
|
||||
3: '资质通过未名称认证',
|
||||
4: '资质通过+微博认证'
|
||||
}
|
||||
|
||||
/** 审核单状态(apply_status)→ 文案与颜色 */
|
||||
const APPLY_STATUS_META: Record<
|
||||
number,
|
||||
{ text: string; type: 'info' | 'warning' | 'success' | 'danger' }
|
||||
> = {
|
||||
0: { text: '审核单不存在', type: 'info' },
|
||||
1: { text: '待支付', type: 'warning' },
|
||||
2: { text: '审核中', type: 'warning' },
|
||||
3: { text: '打回重填', type: 'warning' },
|
||||
4: { text: '认证通过', type: 'success' },
|
||||
5: { text: '认证最终失败', type: 'danger' }
|
||||
}
|
||||
|
||||
/** 认证任务状态(task_status)→ 标签颜色(文案优先用后端 task_status_text) */
|
||||
const TASK_STATUS_TYPE: Record<number, 'info' | 'warning' | 'success' | 'danger'> = {
|
||||
0: 'info',
|
||||
1: 'danger',
|
||||
2: 'danger',
|
||||
3: 'warning',
|
||||
4: 'warning',
|
||||
5: 'danger',
|
||||
6: 'warning',
|
||||
7: 'warning',
|
||||
8: 'danger',
|
||||
9: 'warning',
|
||||
11: 'danger',
|
||||
12: 'warning',
|
||||
14: 'danger',
|
||||
15: 'warning'
|
||||
}
|
||||
|
||||
/** 认证主状态:已认证 → 审核单状态 → 认证任务状态 → 尚未认证 */
|
||||
const certStateMeta = computed<{ text: string; type: 'info' | 'warning' | 'success' | 'danger' }>(() => {
|
||||
const meta = CERT_STATE_META[Number(certInfo.value?.auth_state)]
|
||||
return {
|
||||
text: certInfo.value?.auth_state_text || meta?.text || '未知状态',
|
||||
type: meta?.type ?? 'info'
|
||||
const info = certInfo.value
|
||||
if (!info) return { text: '未知状态', type: 'info' }
|
||||
if (info.is_verified) {
|
||||
const typeId = info.verify_type_id === null || info.verify_type_id === undefined ? null : Number(info.verify_type_id)
|
||||
return {
|
||||
text: info.verify_type_text || (typeId !== null ? VERIFY_TYPE_TEXT[typeId] : '') || '已认证',
|
||||
type: 'success'
|
||||
}
|
||||
}
|
||||
if (info.apply_status !== null && info.apply_status !== undefined) {
|
||||
const status = Number(info.apply_status)
|
||||
const meta = APPLY_STATUS_META[status]
|
||||
return {
|
||||
text: info.apply_status_text || meta?.text || `未知状态(${status})`,
|
||||
type: meta?.type ?? 'info'
|
||||
}
|
||||
}
|
||||
if (info.task_status !== null && info.task_status !== undefined) {
|
||||
const status = Number(info.task_status)
|
||||
return {
|
||||
text: info.task_status_text || `认证任务进行中(${status})`,
|
||||
type: TASK_STATUS_TYPE[status] ?? 'warning'
|
||||
}
|
||||
}
|
||||
return { text: '尚未认证', type: 'info' }
|
||||
})
|
||||
|
||||
/** 是否存在认证任务(taskid / task_status);无任务即后端还没发起过认证 */
|
||||
const certHasTask = computed(() => {
|
||||
const info = certInfo.value
|
||||
if (!info) return false
|
||||
const hasTaskId = info.taskid !== null && info.taskid !== undefined && String(info.taskid).trim() !== ''
|
||||
const hasTaskStatus = info.task_status !== null && info.task_status !== undefined
|
||||
return hasTaskId || hasTaskStatus
|
||||
})
|
||||
|
||||
/** 认证明细(只展示能明确命名的字段,空值不占位) */
|
||||
const certRows = computed<{ label: string; value: string }[]>(() => {
|
||||
const info = certInfo.value
|
||||
if (!info) return []
|
||||
const rows: { label: string; value: string }[] = []
|
||||
const push = (label: string, value: unknown) => {
|
||||
if (value === null || value === undefined) return
|
||||
const text = String(value).trim()
|
||||
if (!text) return
|
||||
rows.push({ label, value: text })
|
||||
}
|
||||
|
||||
push('小程序 AppID', info.appid)
|
||||
if (info.is_verified) {
|
||||
const typeId =
|
||||
info.verify_type_id === null || info.verify_type_id === undefined ? null : Number(info.verify_type_id)
|
||||
push(
|
||||
'认证类型',
|
||||
info.verify_type_text || (typeId !== null ? VERIFY_TYPE_TEXT[typeId] : '') || (typeId !== null ? `认证类型 ${typeId}` : '')
|
||||
)
|
||||
push('主体名称', info.principal_name)
|
||||
push('帐号简介', info.signature)
|
||||
}
|
||||
push('认证任务 ID', info.taskid)
|
||||
push('任务状态', info.task_status_text)
|
||||
push('审核单状态', info.apply_status_text)
|
||||
return rows
|
||||
})
|
||||
|
||||
/** 查询认证状态(切到「认证状态」菜单时按需拉取,也可手动刷新) */
|
||||
@ -1095,8 +1415,8 @@ async function loadAuthStatus(options: { silent?: boolean } = {}) {
|
||||
if (!options.silent) certLoading.value = true
|
||||
try {
|
||||
const res: any = await wechatQueryAuth()
|
||||
if (!res || !okCode(res.code)) {
|
||||
if (!options.silent) ElMessage.error(res?.message || '查询小程序认证状态失败')
|
||||
if (!okCode(res)) {
|
||||
showApiError(res, '查询小程序认证状态失败', options.silent)
|
||||
return null
|
||||
}
|
||||
const payload = res.data
|
||||
@ -1141,8 +1461,8 @@ async function loadTemplateList(force = false) {
|
||||
templateLoading.value = true
|
||||
try {
|
||||
const res: any = await wechatGetTemplateList()
|
||||
if (!res || !okCode(res.code)) {
|
||||
ElMessage.error(res?.message || '获取代码模板列表失败')
|
||||
if (!okCode(res)) {
|
||||
showApiError(res, '获取代码模板列表失败')
|
||||
return null
|
||||
}
|
||||
const payload = (res.data ?? {}) as Partial<WeChatTemplateListData>
|
||||
@ -1158,51 +1478,35 @@ async function loadTemplateList(force = false) {
|
||||
}
|
||||
}
|
||||
|
||||
/** 上传代码并生成体验版(wechat.commit) */
|
||||
/** 上传代码并生成体验版(wechat.commit;入参只有 template_id,版本号/描述由后端从模板取) */
|
||||
async function submitCommit() {
|
||||
const templateId = commitForm.template_id
|
||||
if (templateId === undefined || templateId === null) {
|
||||
ElMessage.warning('请先选择代码模板')
|
||||
return
|
||||
}
|
||||
const version = commitForm.user_version.trim()
|
||||
if (!version) {
|
||||
ElMessage.warning('请填写版本号')
|
||||
const tpl = selectedTemplate.value
|
||||
if (!tpl) {
|
||||
ElMessage.warning('所选模板不在当前模板列表中,请先刷新模板')
|
||||
return
|
||||
}
|
||||
if (version.length > 64) {
|
||||
ElMessage.warning('版本号不能超过 64 个字符')
|
||||
return
|
||||
}
|
||||
const desc = commitForm.user_desc.trim()
|
||||
if (!desc) {
|
||||
ElMessage.warning('请填写代码描述')
|
||||
return
|
||||
}
|
||||
const extJson = commitForm.ext_json.trim() || '{}'
|
||||
try {
|
||||
JSON.parse(extJson)
|
||||
} catch {
|
||||
ElMessage.error('ext_json 不是合法的 JSON 字符串')
|
||||
// 后端直接取模板的 user_version / user_desc 上传,模板缺这两项必然失败 → 前端提前拦
|
||||
if (!String(tpl.user_version ?? '').trim() || !String(tpl.user_desc ?? '').trim()) {
|
||||
ElMessage.warning('所选模板缺少版本号或代码描述,请先在微信模板库补充后再上传')
|
||||
return
|
||||
}
|
||||
|
||||
commitSubmitting.value = true
|
||||
try {
|
||||
const res: any = await wechatCommit({
|
||||
template_id: templateId,
|
||||
ext_json: extJson,
|
||||
user_version: version,
|
||||
user_desc: desc
|
||||
})
|
||||
if (!res || !okCode(res.code)) {
|
||||
ElMessage.error(res?.message || '上传代码失败')
|
||||
const res: any = await wechatCommit({ template_id: Number(templateId) })
|
||||
if (!okCode(res)) {
|
||||
showApiError(res, '上传代码失败')
|
||||
return
|
||||
}
|
||||
const payload = (res.data ?? {}) as { appid?: string; template_id?: number }
|
||||
const payload = (res.data ?? {}) as WeChatCommitData
|
||||
ElMessage.success(
|
||||
payload.template_id != null
|
||||
? `代码已上传,体验版已生成(模板 #${payload.template_id})`
|
||||
payload.user_version
|
||||
? `代码已上传,体验版已生成(版本 ${payload.user_version})`
|
||||
: '代码已上传,体验版已生成'
|
||||
)
|
||||
// 后端会回写 wms_wechat_app.template_id,刷新基础信息保持一致
|
||||
@ -1223,8 +1527,8 @@ async function loadTrialQRCode(options: { silent?: boolean } = {}) {
|
||||
try {
|
||||
const path = trialQRCodePath.value.trim()
|
||||
const res: any = await wechatGetTrialQRCode(path ? { path } : {})
|
||||
if (!res || !okCode(res.code)) {
|
||||
if (!options.silent) ElMessage.error(res?.message || '获取体验版二维码失败')
|
||||
if (!okCode(res)) {
|
||||
showApiError(res, '获取体验版二维码失败', options.silent)
|
||||
return null
|
||||
}
|
||||
const payload = (res.data ?? {}) as { url?: string }
|
||||
@ -1269,8 +1573,8 @@ async function submitAudit() {
|
||||
privacy_api_not_use: auditForm.privacy_api_not_use || undefined,
|
||||
...(itemList ? { item_list: itemList } : {})
|
||||
})
|
||||
if (!res || !okCode(res.code)) {
|
||||
ElMessage.error(res?.message || '提交审核失败')
|
||||
if (!okCode(res)) {
|
||||
showApiError(res, '提交审核失败')
|
||||
return
|
||||
}
|
||||
const payload = (res.data ?? {}) as WeChatSubmitAuditData
|
||||
@ -1306,21 +1610,30 @@ function pickUrl(raw: Record<string, unknown>): string {
|
||||
return ''
|
||||
}
|
||||
|
||||
/** 在新小窗口中打开链接(授权) */
|
||||
function openSmallWindow(url: string, windowName: string, tipText: string) {
|
||||
/**
|
||||
* 在新小窗口中打开链接(授权 / 代注册共用)。
|
||||
* @param url 目标地址。
|
||||
* @param windowName 窗口名(同名窗口会被复用)。
|
||||
* @param tipText 打开后的提示文案。
|
||||
* @param shouldWatch 是否启动「授权小窗」配置轮询(发起认证改为手动刷新认证状态,传 false)。
|
||||
*/
|
||||
function openSmallWindow(url: string, windowName: string, tipText: string, shouldWatch = true) {
|
||||
const width = 760
|
||||
const height = 780
|
||||
const left = Math.max(0, Math.round((window.screen.width - width) / 2))
|
||||
const top = Math.max(0, Math.round((window.screen.height - height) / 2))
|
||||
const features = `width=${width},height=${height},left=${left},top=${top},resizable=yes,scrollbars=yes`
|
||||
|
||||
authWindow = window.open(url, windowName, features)
|
||||
if (!authWindow) {
|
||||
const opened = window.open(url, windowName, features)
|
||||
if (!opened) {
|
||||
ElMessage.warning('窗口被浏览器拦截:请允许本站弹出窗口后重试')
|
||||
return
|
||||
}
|
||||
ElMessage.info(tipText)
|
||||
startWatch()
|
||||
if (shouldWatch) {
|
||||
authWindow = opened
|
||||
startWatch()
|
||||
}
|
||||
}
|
||||
|
||||
/** 点击「去授权」:获取授权链接 → 打开小窗(仅主域名可用) */
|
||||
@ -1332,8 +1645,8 @@ async function handleAuthorize() {
|
||||
authUrlLoading.value = true
|
||||
try {
|
||||
const res: any = await wechatGetAuthUrl()
|
||||
if (!res || !okCode(res.code)) {
|
||||
ElMessage.error(res?.message || '获取微信授权链接失败')
|
||||
if (!okCode(res)) {
|
||||
showApiError(res, '获取微信授权链接失败')
|
||||
return
|
||||
}
|
||||
const url = pickUrl({ ...unwrapSettingWarehousePayload(res) })
|
||||
@ -1385,7 +1698,9 @@ async function submitRegister() {
|
||||
const nested = (raw.data && typeof raw.data === 'object' ? raw.data : {}) as Record<string, any>
|
||||
const errcode = Number(nested.errcode ?? raw.errcode)
|
||||
const errmsg = String(nested.errmsg ?? raw.errmsg ?? raw.message ?? '')
|
||||
if (!(okCode(raw.code) || errcode === 0)) {
|
||||
// flag/success 显式失败时,不能被 errcode===0 的兜底救回来
|
||||
const flagFailure = raw.flag === 'failure' || raw.flag === 'fail' || raw.success === false
|
||||
if (flagFailure || !(okCode(raw) || errcode === 0)) {
|
||||
ElMessage.error(errmsg || '提交代注册失败')
|
||||
return
|
||||
}
|
||||
@ -1401,6 +1716,182 @@ async function submitRegister() {
|
||||
}
|
||||
}
|
||||
|
||||
// ============================================================
|
||||
// 同步微信基础信息(wechat.getAuthorizerInfo)
|
||||
// ============================================================
|
||||
const authorizerInfoLoading = ref(false)
|
||||
|
||||
/** 调微信 api_get_authorizer_info 同步主体/认证类型/账号状态/权限集,落库后刷新本页 */
|
||||
async function handleSyncAuthorizerInfo() {
|
||||
if (!authorized.value) {
|
||||
ElMessage.warning('请先完成小程序授权')
|
||||
return
|
||||
}
|
||||
authorizerInfoLoading.value = true
|
||||
try {
|
||||
const res = await wechatGetAuthorizerInfo()
|
||||
if (!okCode(res)) {
|
||||
showApiError(res, '同步微信信息失败')
|
||||
return
|
||||
}
|
||||
ElMessage.success('已同步微信侧小程序基础信息')
|
||||
await loadConfig({ silent: true })
|
||||
// 认证类型 / 账号状态可能变化 → 认证状态重新查询
|
||||
certLoaded.value = false
|
||||
if (activeMenu.value === 'cert') await loadAuthStatus()
|
||||
} catch (e: unknown) {
|
||||
ElMessage.error(e instanceof Error ? e.message : '同步微信信息失败')
|
||||
} finally {
|
||||
authorizerInfoLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
// ============================================================
|
||||
// 发起微信认证(wechat.wxaauth)
|
||||
// ============================================================
|
||||
const authApplyDialogVisible = ref(false)
|
||||
const authApplySubmitting = ref(false)
|
||||
const authApplyFormRef = ref<FormInstance>()
|
||||
/** 正在上传的材料字段 key(用于按钮 loading) */
|
||||
const authMediaUploading = ref('')
|
||||
/** 高级字段 JSON:白名单字段原样透传,与上方表单同名时以此为准 */
|
||||
const authApplyExtraJson = ref('')
|
||||
|
||||
/** 发起认证表单:contact_type/contact_name 必填,其余选填(空值不提交) */
|
||||
const authApplyForm = reactive<Record<string, string | number>>({
|
||||
contact_type: 1,
|
||||
contact_name: '',
|
||||
contact_mobile: '',
|
||||
contact_idcard_number: '',
|
||||
nickname: '',
|
||||
business_license_number: '',
|
||||
business_license_address: '',
|
||||
business_license_expiration_date: '',
|
||||
legal_persona_name: '',
|
||||
legal_persona_idcard_number: '',
|
||||
legal_persona_idcard_expiration_date: '',
|
||||
business_license_copy: '',
|
||||
legal_persona_idcard_copy: '',
|
||||
contact_cert_photo: ''
|
||||
})
|
||||
|
||||
const authApplyRules: FormRules = {
|
||||
contact_type: [{ required: true, message: '请选择联系人类型', trigger: 'change' }],
|
||||
contact_name: [{ required: true, message: '请输入联系人姓名', trigger: 'blur' }]
|
||||
}
|
||||
|
||||
/** 选填字段:提交时非空才带上(图片字段允许填 COS URL,后端自动换 media_id) */
|
||||
const AUTH_APPLY_OPTIONAL_KEYS = [
|
||||
'contact_mobile',
|
||||
'contact_idcard_number',
|
||||
'nickname',
|
||||
'business_license_number',
|
||||
'business_license_address',
|
||||
'business_license_expiration_date',
|
||||
'legal_persona_name',
|
||||
'legal_persona_idcard_number',
|
||||
'legal_persona_idcard_expiration_date',
|
||||
'business_license_copy',
|
||||
'legal_persona_idcard_copy',
|
||||
'contact_cert_photo'
|
||||
] as const
|
||||
|
||||
/** 材料图片字段:可上传图片(换 COS URL)或直接填 URL */
|
||||
const AUTH_APPLY_MEDIA_FIELDS = [
|
||||
{ key: 'business_license_copy', label: '营业执照照片' },
|
||||
{ key: 'legal_persona_idcard_copy', label: '法人身份证照片' },
|
||||
{ key: 'contact_cert_photo', label: '联系人证件照片' }
|
||||
] as const
|
||||
|
||||
/** 打开「发起微信认证」弹窗(保留已填内容,仅清校验态) */
|
||||
function openAuthApplyDialog() {
|
||||
authApplyFormRef.value?.clearValidate()
|
||||
authApplyDialogVisible.value = true
|
||||
}
|
||||
|
||||
/** 材料图片上传:复用 COS 直传,后端提交前会自动换 media_id */
|
||||
function authMediaRequest(key: string) {
|
||||
return async (options: { file: File }) => {
|
||||
const file = options?.file
|
||||
if (!file) return
|
||||
authMediaUploading.value = key
|
||||
try {
|
||||
const uploaded = await uploadImageToCos(file)
|
||||
authApplyForm[key] = uploaded.fileUrl
|
||||
ElMessage.success('图片已上传')
|
||||
} catch (e: unknown) {
|
||||
ElMessage.error(e instanceof Error ? e.message : '图片上传失败')
|
||||
} finally {
|
||||
authMediaUploading.value = ''
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** 提交发起认证:成功刷新认证状态,必要时打开微信认证链接 */
|
||||
async function submitAuthApply() {
|
||||
const form = authApplyFormRef.value
|
||||
if (!form) return
|
||||
const valid = await form.validate().catch(() => false)
|
||||
if (!valid) return
|
||||
|
||||
// 高级字段:必须是 JSON 对象
|
||||
let extra: Record<string, unknown> = {}
|
||||
const rawExtra = authApplyExtraJson.value.trim()
|
||||
if (rawExtra) {
|
||||
try {
|
||||
const parsed: unknown = JSON.parse(rawExtra)
|
||||
if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
|
||||
ElMessage.error('高级字段必须是 JSON 对象')
|
||||
return
|
||||
}
|
||||
extra = parsed as Record<string, unknown>
|
||||
} catch {
|
||||
ElMessage.error('高级字段不是合法的 JSON')
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
const payload: WeChatWxaauthParams = {
|
||||
contact_type: Number(authApplyForm.contact_type) || 1,
|
||||
contact_name: String(authApplyForm.contact_name ?? '').trim()
|
||||
}
|
||||
for (const key of AUTH_APPLY_OPTIONAL_KEYS) {
|
||||
const value = String(authApplyForm[key] ?? '').trim()
|
||||
if (value) payload[key] = value
|
||||
}
|
||||
Object.assign(payload, extra)
|
||||
|
||||
authApplySubmitting.value = true
|
||||
try {
|
||||
const res = await wechatWxaauth(payload)
|
||||
if (!okCode(res)) {
|
||||
showApiError(res, '发起认证失败')
|
||||
return
|
||||
}
|
||||
const data = (res.data ?? {}) as WeChatWxaauthData
|
||||
authApplyDialogVisible.value = false
|
||||
ElMessage.success(
|
||||
data.taskid
|
||||
? `认证已发起(任务 ${data.taskid}),请前往微信完成认证`
|
||||
: '认证已发起,请前往微信完成认证'
|
||||
)
|
||||
const url = data.auth_url ? String(data.auth_url) : ''
|
||||
if (url) {
|
||||
openSmallWindow(
|
||||
url,
|
||||
'wx-miniprogram-auth-apply',
|
||||
'请在新窗口中完成微信认证(法人核身 / 支付审核费),完成后点「刷新认证状态」',
|
||||
false
|
||||
)
|
||||
}
|
||||
await loadAuthStatus()
|
||||
} catch (e: unknown) {
|
||||
ElMessage.error(e instanceof Error ? e.message : '发起认证失败')
|
||||
} finally {
|
||||
authApplySubmitting.value = false
|
||||
}
|
||||
}
|
||||
|
||||
/** 小窗打开期间轮询配置:流程完成即自动刷新 */
|
||||
function startWatch() {
|
||||
stopAuthWatch()
|
||||
@ -1618,6 +2109,38 @@ onBeforeUnmount(() => {
|
||||
margin-top: 12px;
|
||||
}
|
||||
|
||||
/* 未认证时的认证流程说明(发起认证接口待后端提供) */
|
||||
.mp-cert__flow {
|
||||
margin: 12px 0 0;
|
||||
padding-left: 20px;
|
||||
color: #606266;
|
||||
font-size: 13px;
|
||||
line-height: 1.9;
|
||||
}
|
||||
|
||||
.mp-cert__flow code {
|
||||
padding: 0 4px;
|
||||
border-radius: 3px;
|
||||
background: #f4f6f9;
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
/* 发起微信认证弹窗:材料图片行 */
|
||||
.mp-media-row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.mp-media-preview {
|
||||
flex: none;
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
border: 1px solid #e8eef7;
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
/* ===== 发布 / 代码包管理(wechat.getTemplateList / wechat.commit / wechat.getTrialQRCode) ===== */
|
||||
.mp-publish-form {
|
||||
max-width: 640px;
|
||||
|
||||
@ -209,6 +209,8 @@
|
||||
:model-value="String(getObjectFieldValue(field.key, itemKey.key) ?? '')"
|
||||
size="small"
|
||||
style="width:200px"
|
||||
:maxlength="itemKey.maxLength"
|
||||
placeholder="请输入"
|
||||
@update:model-value="onObjectFieldChange(field.key, itemKey.key, $event)"
|
||||
/>
|
||||
<span v-if="itemKey.description" class="object-editor__desc">{{ itemKey.description }}</span>
|
||||
@ -318,7 +320,10 @@ const FALLBACK_FIELDS: NormalizedField[] = [
|
||||
{ key: 'require_weigh', label: '要求已称重', type: 'boolean', description: 'weighing_weight>0,默认开启' },
|
||||
{ key: 'require_sync', label: '要求已同步', type: 'boolean', description: 'sync_status=fin,默认开启' },
|
||||
{ key: 'require_print', label: '要求已打印', type: 'boolean', description: 'print_status=fin,默认开启' },
|
||||
{ key: 'require_pick', label: '要求已拣货', type: 'boolean', description: 'pick_status=fin,默认开启' }
|
||||
{ key: 'require_pick', label: '要求已拣货', type: 'boolean', description: 'pick_status=fin,默认开启' },
|
||||
{ key: 'exclude_same_day_outbound', label: '不出库当天订单', type: 'boolean', defaultValue: true, description: '开启后,在当天放开时间前、「允许当天出库最后时间」之后复核的订单不自动出库,到达当天放开时间后恢复;默认开启' },
|
||||
{ key: 'same_day_outbound_deadline_time', label: '允许当天出库最后时间', type: 'string', maxLength: 5, defaultValue: '06:00', description: '格式 HH:mm,默认 06:00;复核时间早于该时间的订单不受「不出库当天订单」的影响' },
|
||||
{ key: 'same_day_outbound_release_time', label: '当天放开时间', type: 'string', maxLength: 5, defaultValue: '22:00', description: '格式 HH:mm,默认 22:00;开启「不出库当天订单」时,当天到达该时间后不再限制当天复核订单的自动出库' }
|
||||
]
|
||||
},
|
||||
{
|
||||
@ -596,7 +601,11 @@ function onLocationFieldChange(key: string, value: number | string | null) {
|
||||
}
|
||||
|
||||
function applySettingsPayload(settingsRes: SettingWarehouseSettingsPayload | Record<string, unknown>) {
|
||||
const normalized = normalizeGetSettingsPayload(settingsRes as Record<string, unknown>)
|
||||
// schema 传 meta 表单字段:object / array 子项按 item_keys 归一化(后端改名/加字段自动跟随)
|
||||
const normalized = normalizeGetSettingsPayload(
|
||||
settingsRes as Record<string, unknown>,
|
||||
displayFields.value
|
||||
)
|
||||
const wid = normalized.warehouse_id
|
||||
warehouseId.value = typeof wid === 'number' && wid > 0 ? wid : null
|
||||
const cfg = cloneSubjectConfig(normalized.subject_config)
|
||||
@ -631,13 +640,17 @@ async function loadAll() {
|
||||
if (!settingsRes || !okCode(settingsRes.code)) {
|
||||
throw new Error(settingsRes?.message || '获取仓库设置失败(getSettings)')
|
||||
}
|
||||
const settingsPayload = normalizeGetSettingsPayload(unwrapSettingWarehousePayload(settingsRes as Record<string, unknown>))
|
||||
applySettingsPayload(settingsPayload)
|
||||
// 先解析字段元信息(schema),再解析配置:配置里的 object / array 子项按 meta 归一化
|
||||
const metaPayload = unwrapSettingWarehousePayload(metaRes as Record<string, unknown>)
|
||||
const metaList = metaRes && okCode(metaRes.code) ? metaPayload.list : null
|
||||
const parsed = normalizeFieldMetaList(metaList)
|
||||
normalizedFields.value = parsed
|
||||
useMetaForm.value = parsed.length > 0
|
||||
const settingsPayload = normalizeGetSettingsPayload(
|
||||
unwrapSettingWarehousePayload(settingsRes as Record<string, unknown>),
|
||||
parsed
|
||||
)
|
||||
applySettingsPayload(settingsPayload)
|
||||
ensureFieldDefaults(subjectConfig, displayFields.value)
|
||||
if (metaRes && !okCode(metaRes.code)) {
|
||||
ElMessage.warning(metaRes.message || '字段元信息获取失败,已使用默认表单字段')
|
||||
@ -655,13 +668,20 @@ async function handleSave() {
|
||||
const payloadConfig = { ...subjectConfig }
|
||||
saving.value = true
|
||||
try {
|
||||
const body = buildSaveSettingsRequest({ subject_config: payloadConfig, cache_warehouse_id: cacheWarehouseId.value })
|
||||
const body = buildSaveSettingsRequest({
|
||||
subject_config: payloadConfig,
|
||||
cache_warehouse_id: cacheWarehouseId.value,
|
||||
schema: displayFields.value
|
||||
})
|
||||
const res = await settingWarehouseSaveSettings(body)
|
||||
if (!res || !okCode(res.code)) {
|
||||
throw new Error(res?.message || '保存失败')
|
||||
}
|
||||
ElMessage.success(res.message || '保存成功')
|
||||
const savePayload = normalizeSaveSettingsPayload(unwrapSettingWarehousePayload(res as Record<string, unknown>))
|
||||
const savePayload = normalizeSaveSettingsPayload(
|
||||
unwrapSettingWarehousePayload(res as Record<string, unknown>),
|
||||
displayFields.value
|
||||
)
|
||||
applySettingsPayload(savePayload)
|
||||
const cleared = savePayload.cache_cleared_warehouse_id
|
||||
if (cleared != null) ElMessage.info(`已清理仓库缓存:${cleared}`)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user