feat(h5): calculate integer total from weighted dimensions across reports and admin

h5/js/admin.js

@@ -22,6 +22,7 @@ function fmtTime(iso) {
 }
 function fmtMs(ms) { return ms == null ? '-' : ms + 'ms'; }
 function fmtScore(v) { return v == null ? '-' : v; }
+function fmtTotal(v) { return v == null ? '--' : v; }
 
 var LV_CLASS = { '预警': 'lv-bad', '改善': 'lv-warn', '良好': 'lv-good' };
 var DIM_NAMES = ReportUI.dimNames;
@@ -145,7 +146,7 @@ function loadRecords() {
           '<td>' + esc(it.upload_status) + '</td>' +
           '<td><span class="st ' + (ST_CLASS[it.detect_status] || '') + '">' + esc(it.detect_status) + '</span>' +
             (it.fail_code ? '<div class="sub">' + esc(it.fail_code) + '</div>' : '') + '</td>' +
-          '<td><b>' + fmtScore(it.total_score) + '</b></td>' +
+          '<td><b>' + fmtTotal(it.total_score) + '</b></td>' +
           '<td>' + skinAgeHtml(it) + '</td>' +
           '<td>' + dimsHtml(it.dims) + '</td>' +
           '<td>' + esc(productName(it.essence)) + '<div class="sub">' + esc(ruleLabel(it)) + '</div></td>' +
@@ -405,13 +406,14 @@ function renderDetail(data) {
   /* 成功:评分 + 文案 */
   if (r.detect_status === '成功') {
     h += dSec('综合', '<div class="d-kv">' +
-      '<span>总分 <b>' + fmtScore(r.total_score) + '</b></span>' +
+      '<span>综合得分 <b>' + fmtTotal(r.total_score) + '</b></span>' +
       '<span>原始肌龄（新推荐依据） <b>' + ageText(r.skin_age) + '</b></span>' +
       '<span>前端展示肌龄 <b>' + ageText(r.skin_age_display) + '</b></span>' +
       '<span>六分类均分S <b>' + fmtScore(r.avg_s) + '</b></span>' +
       '<span>左下颌线角 <b>' + (r.jawline_angle_l != null ? r.jawline_angle_l + '°' : '-') + '</b></span>' +
       '<span>右下颌线角 <b>' + (r.jawline_angle_r != null ? r.jawline_angle_r + '°' : '-') + '</b></span>' +
       '</div>');
+    h += '<p class="sub">综合得分＝紧塑力×4＋透亮感×3＋稳韧力×3，按已计算的维度S分数（两位小数）加权，四舍五入取整数；任一维度缺失不生成综合得分，不使用接口总分。</p>';
     h += '<p class="sub">前端展示肌龄沿用实际年龄±3岁的修正；新推荐只使用原始肌龄。历史报告保留当时的推荐。</p>';
 
     /* 6 分类表格 */

h5/js/app.js

@@ -1487,13 +1487,8 @@
 
   function renderReport(vm, frontPhoto, sidePhoto, payload) {
     reportOwner = AccountClient.user() && AccountClient.user().id;
-    // 头部:综合评分(vm.total 缺失时回退三维度 S 均分×10)
-    var total = vm.total;
-    if (total == null) {
-      var ds = [vm.dims.firm.S, vm.dims.vita.S, vm.dims.stab.S], sum = 0, n = 0, i;
-      for (i = 0; i < 3; i++) if (typeof ds[i] === 'number') { sum += ds[i]; n++; }
-      if (n) total = Math.round(sum / n * 10);
-    }
+    // Historical snapshots also use their saved dimensions, never the old API total.
+    var total = SkinScore.weightedTotal(vm.dims);
     // 环形综合评分:满分 100,环长 2πr(r=52)≈326.73
     $('#stat-score').innerHTML = total != null ? '<b>' + total + '</b><i>分</i>' : '<b>--</b><i>分</i>';
     var ring = $('#ring-fg');

h5/js/skin-score.js

@@ -63,6 +63,18 @@
   }
   function round2(x) { return Math.round((x + 1e-9) * 100) / 100; } // 1e-9 修正 9.445 类浮点
   function sRaw(P) { return 7 + 3 * P / 100; }
+  // One shared 100-point total for H5, saved reports and admin. Never use the
+  // upstream total or reweight an incomplete set of dimensions.
+  function weightedTotal(dims) {
+    if (!dims) return null;
+    var keys = ['firm', 'vita', 'stab'], weights = [4, 3, 3], total = 0;
+    for (var i = 0; i < keys.length; i++) {
+      var score = dims[keys[i]] && dims[keys[i]].S;
+      if (!isNum(score) || score < 0 || score > 10) return null;
+      total += score * weights[i];
+    }
+    return Math.round(total + 1e-9);
+  }
   function sShow(P) { // 展示层钳制：P 可为负（肤色扣分/大面积敏感），S 会 <7，与文档「S 7.0–10.0」口径矛盾；
     if (P == null) return null;   // 仅钳展示值，推荐边界比较仍用未舍入维度 S 原值
     var s = sRaw(P);
@@ -814,7 +826,8 @@
     careAdvice.push({ tag: '生活方式', text: worst ? LIFESTYLE[worst.catKey] : '' });
 
     return {
-      total: pick(r, 'total_score'),
+      total: weightedTotal(dims),
+      totalRule: 'dimensions-433-v1',
       skinAgeRaw: skinAge,
       skinAgeDisplay: skinAgeDisplay,
       ageClampNote: ageClampNote,
@@ -902,6 +915,7 @@
     return val(result && result.skin_age);
   }
   return {
+    weightedTotal: weightedTotal,
     reportSkinAge: reportSkinAge,
     buildViewModel: buildViewModel,
     recommendProduct: recommendProduct,
@@ -952,7 +966,7 @@ if (typeof require === 'function' && typeof module !== 'undefined' && require.ma
     ok(vm.avgS === 9.32, '六分类S均分 9.32');
     ok(vm.worst.catKey === 'wrinkles' && vm.worst.P === 23, '最差分类 = 皱纹');
     ok(vm.focus.name === '紧塑力', '近期优先关注 = 最差维度紧塑力');
-    ok(vm.total === 79, '综合评分 = score_info.total_score');
+    ok(vm.total === 88, '综合得分 = round(7.69×4+9.45×3+9.55×3) = 88，不使用接口总分79');
     ok(vm.summary.indexOf('【综合】') === 0 && vm.summary.indexOf('25+束紧精华') > 0, '综合文案生成');
     ok(vm.cats.smooth.text.indexOf('粗大毛孔296颗、黑头39颗') >= 0 && vm.cats.smooth.text.indexOf('纹理分87') >= 0,
       '光滑话术含粗大毛孔/黑头/纹理分变量（分区计数 4 区求和 296）');