新增：模型计价编辑器适配新计费结构（mediaPrices媒体价格模板、thinking/outputAudio/outputResolution中文展示与下拉）

Co-Authored-By: Claude Code <noreply@anthropic.com>

src/views/system/price/component/modelEditor.vue

@@ -43,37 +43,36 @@
 						<div class="rc-sec match">命中条件 match</div>
 						<el-form label-position="top" size="small">
 							<div class="rc-grid">
-								<el-form-item label="媒体类型">
-									<el-select v-model="r.mediaType" class="rc-control">
-										<el-option v-for="o in MEDIA_TYPE_OPTIONS" :key="o.value" :label="o.label" :value="o.value" />
-									</el-select>
-								</el-form-item>
 								<template v-if="subject.modelType === 'reason'">
-									<el-form-item label="thinking">
+									<el-form-item label="思考模式">
 										<el-select v-model="r.thinking" class="rc-control">
-											<el-option v-for="o in BOOL_TRIPLE_OPTIONS" :key="o.value" :label="o.label" :value="o.value" />
+											<el-option v-for="o in THINKING_OPTIONS" :key="o.value" :label="o.label" :value="o.value" />
 										</el-select>
 									</el-form-item>
-									<el-form-item label="输入 token 下界">
+									<el-form-item label="输入长度下界">
 										<el-input-number v-model="r.inLenMin" :min="0" :precision="0" :controls="false" class="rc-control" />
 									</el-form-item>
-									<el-form-item label="输入 token 上界">
+									<el-form-item label="输入长度上界">
 										<el-input-number v-model="r.inLenMax" :min="0" :precision="0" :controls="false" class="rc-control" />
 									</el-form-item>
 								</template>
 								<template v-if="subject.modelType === 'video'">
-									<el-form-item label="outputAudio">
+									<el-form-item label="输出音频">
 										<el-select v-model="r.outputAudio" class="rc-control">
-											<el-option v-for="o in BOOL_TRIPLE_OPTIONS" :key="o.value" :label="o.label" :value="o.value" />
+											<el-option v-for="o in OUTPUT_AUDIO_OPTIONS" :key="o.value" :label="o.label" :value="o.value" />
 										</el-select>
 									</el-form-item>
-									<el-form-item label="outputResolution">
+									<el-form-item label="输出分辨率">
-										<el-input v-model="r.outputResolution" placeholder="480p/720p/1080p/2k/4k" class="rc-control" />
+										<el-select v-model="r.outputResolution" class="rc-control">
+											<el-option v-for="o in RESOLUTION_OPTIONS.video" :key="o.value" :label="o.label" :value="o.value" />
+										</el-select>
 									</el-form-item>
 								</template>
 								<template v-if="subject.modelType === 'image'">
-									<el-form-item label="outputResolution">
+									<el-form-item label="输出分辨率">
-										<el-input v-model="r.outputResolution" placeholder="512x512/1024x1024/2048x2048" class="rc-control" />
+										<el-select v-model="r.outputResolution" class="rc-control">
+											<el-option v-for="o in RESOLUTION_OPTIONS.image" :key="o.value" :label="o.label" :value="o.value" />
+										</el-select>
 									</el-form-item>
 								</template>
 							</div>
@@ -100,6 +99,22 @@
 								</template>
 							</div>
 						</el-form>
+
+						<!-- 媒体价格模板（仅 token 单位）：媒体命中条件已移除，改为对特定媒体类型设独立覆盖价 mediaPrices -->
+						<div v-if="isTokenUnit" class="media-price-section">
+							<div class="rc-sec price">媒体价格模板 mediaPrices（可选）</div>
+							<div v-for="(mp, mIdx) in r.mediaPrices" :key="mIdx" class="media-price-row">
+								<el-select v-model="mp.mediaType" class="mp-media" placeholder="媒体类型">
+									<el-option v-for="o in getAvailableMediaOptions(r, mIdx)" :key="o.value" :label="o.label" :value="o.value" />
+								</el-select>
+								<el-input-number v-model="mp.input" :min="0" :precision="6" :step="0.0001" :controls="false" class="mp-num" placeholder="input" />
+								<el-input-number v-model="mp.output" :min="0" :precision="6" :step="0.0001" :controls="false" class="mp-num" placeholder="output" />
+								<el-input-number v-model="mp.cacheHit" :min="0" :precision="6" :step="0.0001" :controls="false" class="mp-num" placeholder="cacheHit" />
+								<el-button type="danger" text size="small" @click="removeMediaPrice(r, mIdx)">删除</el-button>
+							</div>
+							<el-button size="small" class="media-add-btn" @click="addMediaPrice(r)">+ 添加媒体价格</el-button>
+							<div class="mp-tip">基础价（input/output/cacheHit）为默认价；媒体模板仅覆盖指定媒体类型的价，未选媒体类型的行保存时丢弃。</div>
+						</div>
 					</div>
 
 					<el-button size="small" class="add-btn" @click="addRule">+ 添加规则</el-button>
@@ -147,14 +162,17 @@
 <script setup lang="ts">
 import { computed, ref, watch } from 'vue';
 import {
-	BOOL_TRIPLE_OPTIONS,
 	EXAMPLES,
-	MEDIA_TYPE_OPTIONS,
+	MEDIA_PRICE_OPTIONS,
+	OUTPUT_AUDIO_OPTIONS,
+	RESOLUTION_OPTIONS,
+	THINKING_OPTIONS,
 	UNIT_OPTIONS,
 	type BuiltModelRule,
 	type BuiltModelRuleMatch,
 	type Currency,
 	type EditorInitConfig,
+	type MediaPriceRow,
 	type ModelRule,
 	type ModelRules,
 	type Subject,
@@ -193,7 +211,6 @@ const priceNote = computed(() =>
 function emptyRule(): ModelRule {
 	return {
 		name: '',
-		mediaType: '',
 		thinking: '',
 		outputAudio: '',
 		outputResolution: '',
@@ -203,6 +220,7 @@ function emptyRule(): ModelRule {
 		output: 0,
 		cacheHit: 0,
 		unitPrice: 0,
+		mediaPrices: [],
 	};
 }
 
@@ -216,7 +234,6 @@ function loadExample(index: number) {
 	if (ex.minBalance != null) minBalance.value = ex.minBalance;
 	modelRules.value = ex.rules.map((r) => ({
 		name: r.name,
-		mediaType: (r.mediaType as ModelRule['mediaType']) || '',
 		thinking: (r.thinking == null ? '' : String(r.thinking)) as ModelRule['thinking'],
 		outputAudio: (r.outputAudio == null ? '' : String(r.outputAudio)) as ModelRule['outputAudio'],
 		outputResolution: r.outputResolution || '',
@@ -226,6 +243,7 @@ function loadExample(index: number) {
 		output: r.output ?? 0,
 		cacheHit: r.cacheHit ?? 0,
 		unitPrice: r.unitPrice ?? 0,
+		mediaPrices: mediaPricesToRows(r.mediaPrices),
 	}));
 	onUnitChange();
 }
@@ -248,7 +266,6 @@ function fromBuiltRule(r: BuiltModelRule): ModelRule {
 	const m = r.match;
 	return {
 		name: r.name,
-		mediaType: (m?.mediaType as ModelRule['mediaType']) || '',
 		thinking: (m?.thinking == null ? '' : String(m.thinking)) as ModelRule['thinking'],
 		outputAudio: (m?.outputAudio == null ? '' : String(m.outputAudio)) as ModelRule['outputAudio'],
 		outputResolution: m?.outputResolution || '',
@@ -258,6 +275,7 @@ function fromBuiltRule(r: BuiltModelRule): ModelRule {
 		output: r.price.output ?? 0,
 		cacheHit: r.price.cacheHit ?? 0,
 		unitPrice: r.price.unitPrice ?? 0,
+		mediaPrices: mediaPricesToRows(r.mediaPrices),
 	};
 }
 
@@ -277,15 +295,16 @@ function applyInit(cfg: EditorInitConfig) {
 /** 过滤空白规则：规则名或任一命中/价格字段非空才保留 */
 function keepRule(r: ModelRule): boolean {
 	if (r.name.trim()) return true;
-	if (r.mediaType || r.thinking || r.outputAudio || r.outputResolution) return true;
+	if (r.thinking || r.outputAudio || r.outputResolution) return true;
 	if (r.inLenMin != null || r.inLenMax != null) return true;
-	return r.input > 0 || r.output > 0 || r.cacheHit > 0 || r.unitPrice > 0;
+	if (r.input > 0 || r.output > 0 || r.cacheHit > 0 || r.unitPrice > 0) return true;
+	// 仅填写了媒体价格模板也算有效规则
+	return !!buildMediaPrices(r.mediaPrices);
 }
 
 /** 编辑器行态 → 构建态规则（match 只收录非空字段） */
 function buildBuiltRule(r: ModelRule): BuiltModelRule {
 	const match: BuiltModelRuleMatch = {};
-	if (r.mediaType) match.mediaType = r.mediaType;
 	if (r.thinking === 'true' || r.thinking === 'false') match.thinking = r.thinking === 'true';
 	if (r.outputAudio === 'true' || r.outputAudio === 'false') match.outputAudio = r.outputAudio === 'true';
 	if (r.outputResolution) match.outputResolution = r.outputResolution;
@@ -298,9 +317,54 @@ function buildBuiltRule(r: ModelRule): BuiltModelRule {
 		name: r.name,
 		match: Object.keys(match).length ? match : undefined,
 		price,
+		mediaPrices: buildMediaPrices(r.mediaPrices),
 	};
 }
 
+/** 媒体价格行 → mediaPrices 对象（仅保留填写了价格的媒体；无覆盖返回 undefined 不写入） */
+function buildMediaPrices(rows: MediaPriceRow[]): Record<string, Record<string, number>> | undefined {
+	if (!rows?.length) return undefined;
+	const map: Record<string, Record<string, number>> = {};
+	rows.forEach((row) => {
+		if (!row.mediaType) return;
+		const prices: Record<string, number> = {};
+		if (row.input > 0) prices.input = row.input;
+		if (row.output > 0) prices.output = row.output;
+		if (row.cacheHit > 0) prices.cacheHit = row.cacheHit;
+		if (Object.keys(prices).length) map[row.mediaType] = prices;
+	});
+	return Object.keys(map).length ? map : undefined;
+}
+
+/** mediaPrices 对象 → 编辑态媒体价格行（兼容后端两种结构：按媒体分组的内层对象，或空/缺失） */
+function mediaPricesToRows(mediaPrices?: unknown): MediaPriceRow[] {
+	if (!mediaPrices || typeof mediaPrices !== 'object') return [];
+	return Object.entries(mediaPrices as Record<string, Record<string, number | undefined>>)
+		.filter(([, prices]) => prices && typeof prices === 'object')
+		.map(([mediaType, prices]) => ({
+			mediaType,
+			input: prices.input ?? 0,
+			output: prices.output ?? 0,
+			cacheHit: prices.cacheHit ?? 0,
+		}));
+}
+
+/** 添加一条媒体价格行 */
+function addMediaPrice(r: ModelRule) {
+	r.mediaPrices.push({ mediaType: '', input: 0, output: 0, cacheHit: 0 });
+}
+
+/** 删除一条媒体价格行 */
+function removeMediaPrice(r: ModelRule, index: number) {
+	r.mediaPrices.splice(index, 1);
+}
+
+/** 媒体价格行的可选媒体：排除本规则其他行已选中的媒体，避免同一条规则重复选择同一媒体 */
+function getAvailableMediaOptions(r: ModelRule, curIndex: number) {
+	const selected = new Set(r.mediaPrices.filter((_, i) => i !== curIndex).map((row) => row.mediaType));
+	return MEDIA_PRICE_OPTIONS.filter((opt) => !selected.has(opt.value) || r.mediaPrices[curIndex]?.mediaType === opt.value);
+}
+
 /** 构建模型费率 JSON（对齐后端结构，由父组件 stringify 提交） */
 function buildRules(): ModelRules {
 	return {
@@ -467,6 +531,41 @@ defineExpose({ save });
 	width: 100%;
 }
 
+/* 媒体价格模板区（token 单位）：基础价下方的媒体覆盖价动态行 */
+.media-price-section {
+	margin-top: 12px;
+	border-top: 1px dashed #e4e7ed;
+	padding-top: 10px;
+}
+
+.media-price-row {
+	display: flex;
+	align-items: center;
+	gap: 8px;
+	margin-bottom: 8px;
+
+	.mp-media {
+		width: 120px;
+		flex-shrink: 0;
+	}
+
+	.mp-num {
+		flex: 1;
+		min-width: 0;
+	}
+}
+
+.media-add-btn {
+	width: 100%;
+}
+
+.mp-tip {
+	font-size: 12px;
+	color: #909399;
+	line-height: 1.7;
+	margin-top: 8px;
+}
+
 .note {
 	border: 1px solid #e6a23c;
 	background: #fdf6ec;

src/views/system/price/mock.ts

@@ -4,7 +4,7 @@
  * 说明：
  * - 计价对象枚举来自后端 GET .../subjects（见 src/api/trade/pricing/index.ts），
  *   本文件提供后端项 → 页面 Subject 的映射（中文 modelType/modelTypeCode → 英文枚举等）
- * - 计价配置读取后端的 rules JSON 字符串（JSON.parse），保存时 JSON.stringify 提交
+ * - 计价配置读取/提交后端的 rules 均为对象（config/get 返回对象，save 也传对象）
  * - 模型类型编码：reason=100推理 / image=200图片 / audio=300音频 / video=600视频
  * - EXAMPLES 仅为编辑器本地"示例填充" UX，不参与后端数据
  */
@@ -37,6 +37,8 @@ export interface ApiSubjectItem {
 	modelType?: string;
 	/** 仅 model：模型类型编码（100推理/200图片/300音频/600视频） */
 	modelTypeCode?: number;
+	/** 该对象支持的计费模式（workflow/business 由后端 subjects.chargeModes 下发；model 无此字段） */
+	chargeModes?: string[];
 }
 
 /** modelTypeCode → 英文模型类型 */
@@ -47,12 +49,6 @@ export const MODEL_TYPE_CODE_TO_EN: Record<number, ModelType> = {
 	600: 'video',
 };
 
-/** 各 subjectType 固定的计费模式（后端不下发 modes，按类型硬编码展示） */
-export const SUBJECT_MODE_MAP: Partial<Record<SubjectType, string[]>> = {
-	workflow: ['per_item', 'per_second', 'per_token'],
-	business: ['per_period'],
-};
-
 /** 后端枚举项 → 页面 Subject */
 export function toSubject(item: ApiSubjectItem): Subject {
 	if (item.subjectType === 'model') {
@@ -71,7 +67,7 @@ export function toSubject(item: ApiSubjectItem): Subject {
 		type: item.subjectType,
 		id: item.subjectId,
 		name: item.name,
-		modes: SUBJECT_MODE_MAP[item.subjectType] ?? [],
+		modes: item.chargeModes ?? [],
 		hasConfig: false,
 	};
 }
@@ -90,7 +86,7 @@ export interface Subject {
 	modelTypeCode?: number;
 	/** 仅 model：模型中文类型（推理/视频/音频/图片） */
 	typeLabel?: string;
-	/** workflow/business：支持的计费模式（本地硬编码） */
+	/** workflow/business：支持的计费模式（后端 subjects.chargeModes 下发） */
 	modes?: string[];
 	/** 是否已配置计价（选中后由 config/get 判断） */
 	hasConfig: boolean;
@@ -122,10 +118,21 @@ export interface WorkflowRules {
 
 /* ================= 模型费率 JSON ================= */
 
-/** 编辑器内部规则行态（thinking/outputAudio 用字符串承载"未设置"） */
+/** 媒体价格模板行（token 单位）：对特定媒体类型设置独立覆盖价（mediaPrices） */
+export interface MediaPriceRow {
+	/** 媒体类型：text / audio / video / image */
+	mediaType: string;
+	/** 输入单价 */
+	input: number;
+	/** 输出单价 */
+	output: number;
+	/** 缓存命中输入单价 */
+	cacheHit: number;
+}
+
+/** 编辑器内部规则行态（thinking/outputAudio 用字符串承载"未设置"；媒体命中条件已移除，媒体改走价格模板） */
 export interface ModelRule {
 	name: string;
-	mediaType: '' | 'text' | 'audio' | 'video' | 'image';
 	thinking: '' | 'true' | 'false';
 	outputAudio: '' | 'true' | 'false';
 	outputResolution: string;
@@ -139,12 +146,13 @@ export interface ModelRule {
 	cacheHit: number;
 	/** 非 token 单位：每单位单价 */
 	unitPrice: number;
+	/** 媒体价格模板行（token 单位；空数组=无媒体覆盖价） */
+	mediaPrices: MediaPriceRow[];
 }
 
 /** 示例数据源规则（thinking/outputAudio 为布尔，由 loadExample 转换） */
 export interface ExampleRule {
 	name: string;
-	mediaType?: string;
 	thinking?: boolean;
 	outputAudio?: boolean;
 	outputResolution?: string;
@@ -154,11 +162,12 @@ export interface ExampleRule {
 	output?: number;
 	cacheHit?: number;
 	unitPrice?: number;
+	/** 媒体价格模板示例（可选）：媒体类型 → 覆盖价 */
+	mediaPrices?: Record<string, { input?: number; output?: number; cacheHit?: number }>;
 }
 
-/** 构建态：规则命中条件 */
+/** 构建态：规则命中条件（媒体类型已改为价格模板，不再作为命中条件） */
 export interface BuiltModelRuleMatch {
-	mediaType?: string;
 	thinking?: boolean;
 	outputAudio?: boolean;
 	outputResolution?: string;
@@ -171,6 +180,8 @@ export interface BuiltModelRule {
 	name: string;
 	match?: BuiltModelRuleMatch;
 	price: Record<string, number>;
+	/** 媒体价格模板（token 单位）：媒体类型 → 该媒体独立覆盖价；无覆盖时省略 */
+	mediaPrices?: Record<string, Record<string, number>>;
 }
 
 /** 模型费率 JSON 结构（对齐后端，含内嵌币种） */
@@ -238,30 +249,56 @@ export const UNIT_OPTIONS: { value: Unit; label: string }[] = [
 	{ value: 'per_char', label: 'per_char（每字）' },
 ];
 
-export const MEDIA_TYPE_OPTIONS: { value: ModelRule['mediaType']; label: string }[] = [
+/** 媒体价格模板可选媒体类型（媒体命中条件已移除，媒体改按模板定价） */
-	{ value: '', label: '不限制' },
+export const MEDIA_PRICE_OPTIONS: { value: 'text' | 'audio' | 'video' | 'image'; label: string }[] = [
 	{ value: 'text', label: '文本 text' },
 	{ value: 'audio', label: '音频 audio' },
 	{ value: 'video', label: '视频 video' },
 	{ value: 'image', label: '图片 image' },
 ];
 
-export const BOOL_TRIPLE_OPTIONS: { value: '' | 'true' | 'false'; label: string }[] = [
+/** outputAudio 命中条件（video）：给用户展示中文（有声/无声） */
+export const OUTPUT_AUDIO_OPTIONS: { value: '' | 'true' | 'false'; label: string }[] = [
+	{ value: '', label: '不限制' },
+	{ value: 'true', label: '有声' },
+	{ value: 'false', label: '无声' },
+];
+
+/** thinking 命中条件（reason）：给用户展示中文（是/否） */
+export const THINKING_OPTIONS: { value: '' | 'true' | 'false'; label: string }[] = [
 	{ value: '', label: '不限制' },
 	{ value: 'true', label: '是' },
 	{ value: 'false', label: '否' },
 ];
 
+/** 输出分辨率命中条件下拉选项（按模型类型区分：video 横版 / image 方形） */
+export const RESOLUTION_OPTIONS: Record<'video' | 'image', { value: string; label: string }[]> = {
+	video: [
+		{ value: '', label: '不限制' },
+		{ value: '480p', label: '480p' },
+		{ value: '720p', label: '720p' },
+		{ value: '1080p', label: '1080p' },
+		{ value: '2k', label: '2k' },
+		{ value: '4k', label: '4k' },
+	],
+	image: [
+		{ value: '', label: '不限制' },
+		{ value: '512x512', label: '512x512' },
+		{ value: '1024x1024', label: '1024x1024' },
+		{ value: '2048x2048', label: '2048x2048' },
+	],
+};
+
 /** 模型示例（本地填充 UX，逐字对应原型定价配置） */
 export const EXAMPLES: ModelExampleMap = {
 	video: [
 		{
-			label: '视频·按秒（分辨率×有声/无声×输入媒体）',
+			label: '视频·按秒（分辨率×有声/无声）',
 			unit: 'per_second',
 			tiered: false,
 			rules: [
-				{ name: '无声-720p-输入不含视频', mediaType: 'text', outputAudio: false, outputResolution: '720p', unitPrice: 0.8 },
+				{ name: '无声-720p', outputAudio: false, outputResolution: '720p', unitPrice: 0.8 },
-				{ name: '有声-1080p-输入含视频', mediaType: 'video', outputAudio: true, outputResolution: '1080p', unitPrice: 1.5 },
+				{ name: '有声-1080p', outputAudio: true, outputResolution: '1080p', unitPrice: 1.5 },
 			],
 		},
 		{
@@ -269,20 +306,28 @@ export const EXAMPLES: ModelExampleMap = {
 			unit: 'per_1M',
 			tiered: false,
 			rules: [
-				{ name: '文本输入-无声-1080p', mediaType: 'text', outputAudio: false, outputResolution: '1080p', input: 0.6, output: 3.6, cacheHit: 0.12 },
+				{ name: '无声-1080p', outputAudio: false, outputResolution: '1080p', input: 0.6, output: 3.6, cacheHit: 0.12 },
-				{ name: '视频输入-有声-1080p', mediaType: 'video', outputAudio: true, outputResolution: '1080p', input: 9, output: 27, cacheHit: 1.8 },
+				{ name: '有声-1080p', outputAudio: true, outputResolution: '1080p', input: 9, output: 27, cacheHit: 1.8 },
 			],
 		},
 	],
 	reason: [
 		{
-			label: '推理·阶梯（思考×输入token档×输入媒体）',
+			label: '推理·阶梯（思考×输入长度档×媒体模板）',
 			unit: 'per_1M',
 			tiered: true,
 			rules: [
-				{ name: '思考-输入≤32000-文本', mediaType: 'text', thinking: true, inLenMax: 32000, input: 0.6, output: 3.6, cacheHit: 0.12 },
+				{ name: '思考-输入长度[0,32k]', thinking: true, inLenMax: 32000, input: 0.6, output: 3.6, cacheHit: 0.12 },
-				{ name: '思考-输入32001~128000-文本', mediaType: 'text', thinking: true, inLenMin: 32001, inLenMax: 128000, input: 0.9, output: 5.4, cacheHit: 0.18 },
+				{
-				{ name: '思考-输入含音频', mediaType: 'audio', thinking: true, input: 9, output: 3.6, cacheHit: 1.8 },
+					name: '思考-输入长度(32k,128k]',
+					thinking: true,
+					inLenMin: 32001,
+					inLenMax: 128000,
+					input: 0.9,
+					output: 5.4,
+					cacheHit: 0.18,
+					mediaPrices: { audio: { input: 9, output: 3.6, cacheHit: 1.8 } },
+				},
 				{ name: '非思考-统一价', thinking: false, input: 0.3, output: 1.2, cacheHit: 0.06 },
 			],
 		},