xsl/juzi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(scoring): use independent tone hydration minima and focus-first care

Browse Source
This commit is contained in:
xsl
2026-10-15 14:40:59 +08:00
parent 77493bdff5
commit 60f0965c5a
26 changed files with 2315 additions and 1014 deletions
Download Patch File Download Diff File Expand all files Collapse all files
h5/js/admin.js
+6 -5
View File
@@ -418,18 +418,19 @@ function renderDetail(data) {
if (r.wrinkle_score_rule === 'api-overall-v1') h += '<p class="sub">皱纹评分直接使用接口整体皱纹分数，不做100减分，也不再按分区严重度限分。</p>';
if (r.tone_scoring && r.tone_scoring.version === 'color-dark-circle-20-v1') {
var tone = r.tone_scoring;
h += '<p class="sub">肤色项＝色素扣斑分×80%＋黑眼圈评分×20%；再与水分项各占50%。色素扣斑分：' + esc(fmtToneScore(tone.pigment_adjusted_score)) + '，黑眼圈评分：' + esc(fmtToneScore(tone.dark_circle_score)) + '，合成肤色项：' + esc(fmtToneScore(tone.color_score)) + '，水分项：' + esc(fmtToneScore(tone.water_adjusted_score)) + '。缺项按有效权重归一。</p>';
h += '<p class="sub">肤色项＝色素扣斑分×80%＋黑眼圈评分×20%；' + (r.vita_score_rule ? '透亮感取独立肤色、水分、平滑度三项最低分，不再使用肤色水润平均分。' : '历史版本与水分项各占50%。') + '色素扣斑分：' + esc(fmtToneScore(tone.pigment_adjusted_score)) + '，黑眼圈评分：' + esc(fmtToneScore(tone.dark_circle_score)) + '，独立肤色项：' + esc(fmtToneScore(tone.color_score)) + '，水分项：' + esc(fmtToneScore(tone.water_adjusted_score)) + '。肤色缺项按有效权重归一。</p>';
}
h += '<p class="sub">前端展示肌龄限制在实际年龄±5岁；推荐仍使用原始肌龄。历史报告保留当时的推荐。</p>';
/* 6 分类表格 */
var catRows = '';
for (var i = 0; i < CAT_ORDER.length; i++) {
var ck = CAT_ORDER[i], cat = r.cats && r.cats[ck];
var catName = ({ contour: '轮廓', wrinkles: '皱纹', smooth: '平滑度', tone: '肤色 / 水分', sens: '泛红', acne: '痘痘' })[ck];
var scoreOrder = r.sub_scores ? ['contour','wrinkles','color','smooth','water','sens','acne'] : CAT_ORDER;
for (var i = 0; i < scoreOrder.length; i++) {
var ck = scoreOrder[i], cat = (r.sub_scores || r.cats || {})[ck];
var catName = ({ contour: '轮廓', wrinkles: '皱纹', smooth: '平滑度', color:'肤色', water:'水分', tone: '肤色 / 水分（历史）', sens: '泛红', acne: '痘痘' })[ck];
catRows += '<tr><td>' + esc(catName) + '</td><td>' + fmtScore(cat && cat.P) + '</td><td>' + fmtScore(cat && cat.S) + '</td><td>' + lvHtml(cat && cat.level) + '</td></tr>';
}
h += dSec('原始六分类评分（肤色 / 水分共用一项）', '<table class="d-table"><thead><tr><th>分类</th><th>P</th><th>S</th><th>档位</th></tr></thead><tbody>' + catRows + '</tbody></table>');
h += dSec(r.sub_scores ? '七项独立评分' : '历史六分类评分（肤色 / 水分共用一项）', '<table class="d-table"><thead><tr><th>分类</th><th>P</th><th>S</th><th>档位</th></tr></thead><tbody>' + catRows + '</tbody></table>');
/* 3 维度表格 */
var dimRows = '';
h5/js/report-copy.js
+2 -2
View File
@@ -23,7 +23,7 @@
"优秀": "肌肤质感表现优异，表面细腻平滑，角质层排列整齐，无明显粗大毛孔与黑头。"
},
"water": {
"改善": "水分分 {water_score}；缺水面积 {water_area}%、肌肤缺水比较严重 {water_sev}，肌肤含水量偏低，水润度不足，表面偏干燥，容易出现干纹。",
"改善": "水分分 {water_score}；缺水面积 {water_area}%，{water_severity_note}肌肤水润度有待提升，建议加强补水与保湿。",
"良好": "水分分 {water_score}；缺水面积 {water_area}%、肌肤含水量处于健康水平，整体水润度良好。",
"优秀": "水分分 {water_score}；角质层含水量充足，肌肤屏障锁水能力强，表面饱满水润，无干燥紧绷表现。"
},
@@ -56,7 +56,7 @@
"wrinkles": {
"改善": {
"care": "重视纹路管理，日常可使用含有肽类、胶原类成分的淡纹精华，针对眼周、法令纹等动态纹高发区域配合点按手法，遏制静态纹转化，帮肌肤恢复平滑细腻的状态。",
"lifestyle": "保证睡眠，注意睡姿，减少面部长期受压；减少夸张表情，避免揉眼、托腮等表情性挤压习惯，减少纹路加深。"
"lifestyle": "注意睡姿，减少面部长期受压；减少夸张表情，避免揉眼、托腮等表情性挤压习惯，减少纹路加深。"
},
"良好": {
"care": "加强日常淡纹与肌肤弹润护理，叠加使用含肽类、胶原类成分的淡纹精华，提升肌肤水润度与饱满感，维持肤表平滑。",
h5/js/report-ui.js
+34 -10
View File
@@ -85,9 +85,30 @@
var views = defs.map(function(d) {
var cat = vm.cats[d[3]], vars = Object.assign({}, cat.vars || {});
var level = levelMap[cat.level], valid = cat.P != null;
if (d[0] === 'color' && vars.melanin == null) valid = false;
if (d[0] === 'water' && vars.water_score == null) valid = false;
var viewP = cat.P;
if (d[0] === 'color') {
viewP = numeric(vars.color_score) ? vars.color_score : vars.tone_scoring && vars.tone_scoring.color_score;
valid = vars.melanin != null && numeric(viewP);
level = valid ? (viewP < 80 ? '改善' : viewP < 90 ? '良好' : '优秀') : null;
}
if (d[0] === 'water') {
// Water copy/advice is independent of pigment/dark circles. Reuse
// the existing water cross-check; never change dimension scoring.
var waterScore = vars.water_score;
var waterValid = numeric(waterScore) && waterScore >= 0 && waterScore <= 100;
viewP = waterValid ? waterScore : null;
if (waterValid && numeric(vars.water_sev) && vars.water_sev >= 60 && vars.water_sev <= 100 && waterScore >= 80) viewP = 100 - vars.water_sev;
valid = waterValid;
level = valid ? (viewP < 80 ? '改善' : viewP < 90 ? '良好' : '优秀') : null;
}
var template = valid && level ? Copy.conclusion[d[0]][level] : '';
if (d[0] === 'water' && valid) {
vars.water_severity_note = numeric(vars.water_sev) && vars.water_sev >= 0 && vars.water_sev <= 100
? (vars.water_sev >= 60 ? '缺水程度较高（严重度 {water_sev}），' : '缺水严重度 {water_sev}，') : '';
if (viewP !== vars.water_score) template = '水分分 {water_score}；缺水面积 {water_area}%，缺水严重度 {water_sev}。水分分数与缺水指标不一致，本次按缺水指标评估，建议加强补水与保湿。';
// Resolve the optional phrase before normal scalar substitution.
template = template.replace(/\{water_severity_note\}/g, vars.water_severity_note);
}
if (d[0] === 'contour') {
var severity = vars.dark_circle_sev;
var description = numeric(severity) ? ['无明显黑眼圈', '黑眼圈轻度', '黑眼圈中度', '黑眼圈重度'][severity] : null;
@@ -135,18 +156,21 @@
}
var details = d[0] === 'wrinkles' ? wrinkleDetails(result) : null;
var advice = level ? Copy.care[d[0]][level] : null;
return { key: d[0], name: d[1], dim: d[2], source: d[3], P: cat.P, level: level || null,
return { key: d[0], name: d[1], dim: d[2], source: d[3], P: viewP, level: level || null,
text: valid ? fill(template, vars) : '本次未检出有效数据，请重新拍摄后查看。',
details: details, valid: valid, advice: valid ? advice : null };
});
// Preserve selection of the two weakest original categories. Tone expands into
// color+water advice, with thresholds inherited from the same original category.
var ranked = Object.keys(vm.cats).filter(function(k) { return vm.cats[k].P != null; })
.sort(function(a,b) { return vm.cats[a].P - vm.cats[b].P; }).slice(0,2);
var chosen = views.filter(function(v) { return ranked.indexOf(v.source) >= 0 && v.advice; });
var care = chosen.map(function(v) { return { name: v.name, text: v.advice.care + v.advice.lifestyle }; });
var focus = focusOf(vm);
function priority(view) { return focus && view.dim === focus.key ? 0 : 1; }
function order(a, b) { return a.P - b.P || priority(a) - priority(b) || views.indexOf(a) - views.indexOf(b); }
// Select globally weakest three FIRST, then move selected focus members
// to the front. Never insert an unselected stronger focus-category view.
var chosen = views.filter(function(v) { return v.valid && numeric(v.P) && v.advice; }).sort(order).slice(0,3);
chosen.sort(function(a,b) { return priority(a) - priority(b) || order(a,b); });
var care = chosen.map(function(v) { return { key: v.key, name: v.name, dim: v.dim, P: v.P, level: v.level,
priority: priority(v) === 0, text: v.advice.care + v.advice.lifestyle }; });
var product = products.filter(function(p) { return p.match === vm.essence.name; })[0] || null;
return { version: Copy.version + '+feedback-2026-10-12', dims: dimNames, views: views, care: care, product: product, focus: focusOf(vm) };
return { version: Copy.version + '+feedback-2026-10-12+care-2026-10-15', careRule: 'seven-lowest-three-focus-first-v1', dims: dimNames, views: views, care: care, product: product, focus: focus };
}
return { dimensionScore: dimensionScore, build: build, products: products, levelMap: levelMap, dimNames: dimNames, wrinkleDetails: wrinkleDetails, focusOf: focusOf, customerText: customerText };
});
h5/js/skin-score.js
+10 -2
View File
@@ -752,9 +752,16 @@
var d = DIM_DEFS[i], ps = [], j;
for (j = 0; j < CAT_DEFS.length; j++) {
if (CAT_DEFS[j].dim !== d.key) continue;
if (d.key === 'vita' && CAT_DEFS[j].key === 'tone') continue; // retired combined score
var P = cats[CAT_DEFS[j].key].P;
if (P != null) ps.push(P);
}
if (d.key === 'vita') {
var toneVars = cats.tone.vars;
[toneVars.color_score, toneVars.tone_scoring && toneVars.tone_scoring.water_adjusted_score].forEach(function(score) {
if (isNum(score)) ps.push(score);
});
}
var dP = ps.length ? Math.min.apply(null, ps) : null;
if (!ps.length) notes.push(d.name + '：旗下分类数据全部缺失，维度不参与评分');
dims[d.key] = { name: d.name, P: dP, S: sShow(dP), level: levelOf(dP) };
@@ -848,6 +855,7 @@
return {
total: weightedTotal(dims),
totalRule: 'dimensions-433-v1',
vitaScoreRule: 'independent-color-water-smooth-min-v1',
wrinkleScoreRule: 'api-overall-v1',
acneScoreRule: 'three-view-type-max-v1',
skinAgeRaw: skinAge,
@@ -984,7 +992,7 @@ if (typeof require === 'function' && typeof module !== 'undefined' && require.ma
ok(vm.cats.sens.P === 98, '敏感P = min(98, 100−0.1×1.5=99.85) = 98（面积 0.001 小数口径×100）');
ok(vm.cats.acne.P === 85, '痘痘P = min(分级映射85, 100−14.5=85.5) = 85');
ok(vm.cats.wrinkles.S === 7.69 && vm.cats.smooth.S === 9.45 && vm.cats.tone.S === 9.45, 'S=7+3×P/100 两位小数（含 9.445→9.45 浮点修正）');
ok(vm.dims.firm.P === 23 && vm.dims.vita.P === 81.5 && vm.dims.stab.P === 85, '维度木桶 min：紧塑力23 / 活力感81.5 / 稳定力85');
ok(vm.dims.firm.P === 23 && vm.dims.vita.P === 80 && vm.dims.stab.P === 85, '维度木桶 min：紧塑力23 / 独立肤色短板80 / 稳定力85');
ok(vm.skinAgeRaw === 20 && vm.skinAgeDisplay === 20 && vm.ageClampNote === '', '肌肤年龄直接展示原值20，不按实际年龄钳制');
ok(vm.group === '25+组', '原始肌龄20 → 25+组');
ok(vm.essence.name === '25+束紧精华' && vm.recommendation.tier === 1,
@@ -1015,7 +1023,7 @@ if (typeof require === 'function' && typeof module !== 'undefined' && require.ma
console.log('== T2 木桶 min（显式构造） ==');
var vm2 = SS.buildViewModel(clone(SS.MOCK_RESULT), SS.MOCK_SIDE, { realAge: 40 });
ok(vm2.dims.firm.P === Math.min(vm2.cats.contour.P, vm2.cats.wrinkles.P)
&& vm2.dims.vita.P === Math.min(vm2.cats.smooth.P, vm2.cats.tone.P)
&& vm2.dims.vita.P === Math.min(vm2.cats.smooth.P, vm2.cats.tone.vars.color_score, vm2.cats.tone.vars.tone_scoring.water_adjusted_score)
&& vm2.dims.stab.P === Math.min(vm2.cats.sens.P, vm2.cats.acne.P), '三维度 P = min(旗下两分类)');
ok(vm2.group === '25+组', '实际年龄40不影响推荐，原始肌龄20仍为25+组');