From bdd5b7a820cb5b5ca892a10988bdfe09ba8e58e3 Mon Sep 17 00:00:00 2001 From: deploy Date: Wed, 4 Nov 2026 01:52:03 +0000 Subject: [PATCH] =?UTF-8?q?v26110284=20=E7=99=BE=E5=AE=9D=E7=AE=B16?= =?UTF-8?q?=E6=9D=A1=E9=9A=8F=E6=9C=BA2=E6=9D=A1=E7=AC=AC=E4=BA=8C?= =?UTF-8?q?=E8=A1=8C=E6=94=B9=E3=80=8C=E8=B0=81=E6=B5=8B=E5=87=BA/?= =?UTF-8?q?=E7=AE=97=E5=87=BA=E4=BA=86=E4=BB=80=E4=B9=88=E3=80=8D=E6=BB=9A?= =?UTF-8?q?=E5=8A=A8=E3=80=81=E5=8D=95=E5=AD=97=E7=BC=A9=E5=B0=8F=E3=80=81?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=BA=95=E9=83=A8=E8=BD=AE=E6=92=AD=E6=9D=A1?= =?UTF-8?q?=EF=BC=9B=E9=A6=96=E9=A1=B5=E5=B9=BF=E5=9C=BA=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E5=B7=A6=E4=B8=8B=E8=A7=92=E3=80=8C=E8=BF=9B=E5=AD=95=E5=A6=88?= =?UTF-8?q?=E5=B9=BF=E5=9C=BA=E3=80=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 5.5 --- guangchang/ceshi/index.html | 4 +- guangchang/ceshi/meta.js | 2 + guangchang/index.html | 10 ++-- guangchang/mine/index.html | 2 +- index.html | 16 +++---- js/app.js | 2 +- js/gch/v4.js | 2 +- js/gch/v6.css | 2 + js/gch/v6.js | 4 +- js/kit.css | 35 ++++++-------- js/kit.js | 94 ++++++++++++++++++------------------- topic/_shared/tools.js | 4 +- 12 files changed, 87 insertions(+), 90 deletions(-) diff --git a/guangchang/ceshi/index.html b/guangchang/ceshi/index.html index 1fa64e4..b3d54d1 100644 --- a/guangchang/ceshi/index.html +++ b/guangchang/ceshi/index.html @@ -320,8 +320,8 @@ mark{background:linear-gradient(transparent 62%,var(--c20) 0);color:inherit;padd
- - + + - - - + + + + + @@ -2559,17 +2559,17 @@ - + - - + + - + diff --git a/js/app.js b/js/app.js index 12277b8..a8f71b9 100644 --- a/js/app.js +++ b/js/app.js @@ -3,7 +3,7 @@ (function () { 'use strict'; /* 页面版本号（YYMMDD+序号）：显示在「关于兜爸心选」页底部；bump 时同步 head 注释与 ?v= */ - var VER = '26110283'; + var VER = '26110284'; const $ = (s, c) => (c || document).querySelector(s); const $$ = (s, c) => Array.from((c || document).querySelectorAll(s)); diff --git a/js/gch/v4.js b/js/gch/v4.js index 192ee2a..66dca13 100644 --- a/js/gch/v4.js +++ b/js/gch/v4.js @@ -231,5 +231,5 @@ } /* feed.js 首页默认不加载（index.html 只引了 topics.js），这里按需拉一次 */ if (window.GC_FEED) init(); - else { var fs = document.createElement('script'); fs.src = 'guangchang/feed.js?v=26110283'; fs.onload = fs.onerror = init; document.body.appendChild(fs); } + else { var fs = document.createElement('script'); fs.src = 'guangchang/feed.js?v=26110284'; fs.onload = fs.onerror = init; document.body.appendChild(fs); } })(); diff --git a/js/gch/v6.css b/js/gch/v6.css index 98552ac..3a5b090 100644 --- a/js/gch/v6.css +++ b/js/gch/v6.css @@ -103,3 +103,5 @@ html.night #gcHome.gv4.gv6 .g6-all{background:none;color:#B9A6B1} html.night #gcHome.gv4.gv6 .g6-avs img{border-color:#2F2737} @media (prefers-reduced-motion:reduce){#gcHome.gv4.gv6 .g6-avs img.sw-i{animation:none}#gcHome.gv4.gv6 .g6-avs img{transition:none}} #gcHome.gv4.gv6 .g6-nt .ms-h{flex-wrap:nowrap;white-space:nowrap} +/* 11-04 用户：模块左下角粉色「进孕妈广场 ›」删掉（上面已有「去广场看更多 ›」） */ +#gcHome.gv4.gv6 .g4-all{display:none} diff --git a/js/gch/v6.js b/js/gch/v6.js index fc8d366..6ac292e 100644 --- a/js/gch/v6.js +++ b/js/gch/v6.js @@ -6,9 +6,9 @@ (function () { var sec = document.getElementById('gcHome'); if (!sec) return; - var l = document.createElement('link'); l.rel = 'stylesheet'; l.href = 'js/gch/v4.css?v=26110283'; + var l = document.createElement('link'); l.rel = 'stylesheet'; l.href = 'js/gch/v4.css?v=26110284'; document.head.appendChild(l); - var s = document.createElement('script'); s.src = 'js/gch/v4.js?v=26110283'; + var s = document.createElement('script'); s.src = 'js/gch/v4.js?v=26110284'; s.onload = function () { if (sec.querySelector('.g4-foot')) merge(); else sec.addEventListener('gc4-ready', merge, { once: true }); }; /* v4 要先拉 feed.js 才渲染 */ document.body.appendChild(s); diff --git a/js/kit.css b/js/kit.css index 715d714..e63ac7e 100644 --- a/js/kit.css +++ b/js/kit.css @@ -79,24 +79,17 @@ html.night .kit-pn .kit-rows .kr:first-child{border-top-color:#3C3345} html.night .kit-pn .kit-rows .kr{border-bottom-color:rgba(255,255,255,.1)} /* 11-04 6 条前面的图标换成单字「测 / 问 / 算」 */ .kr-ic.kr-ch{font-size:16px;font-weight:900;line-height:1;font-family:inherit} -/* 11-04 6 条下面「大家刚刚在用」轮播：一行一条往上翻（kit.js ticker） */ -.kit-tk{display:flex;align-items:center;gap:8px;margin:6px 2px 4px;padding:0 12px;height:40px;border-radius:99px;background:rgba(255,236,226,.7)} -.tk-dot{flex:none;width:7px;height:7px;border-radius:50%;background:#FF6A3D;box-shadow:0 0 0 0 rgba(255,106,61,.5);animation:tkDot 1.6s ease-out infinite} -@keyframes tkDot{70%{box-shadow:0 0 0 6px rgba(255,106,61,0)}100%{box-shadow:0 0 0 0 rgba(255,106,61,0)}} -.tk-w{position:relative;flex:1;min-width:0;height:40px;overflow:hidden} -.tk-i{position:absolute;inset:0;display:flex;align-items:center;gap:7px;text-decoration:none;color:#6E5A55;font-size:12.5px;opacity:0;transform:translateY(100%);transition:transform .45s ease,opacity .45s ease} -.tk-i.on{opacity:1;transform:none} -.tk-i.up{opacity:0;transform:translateY(-100%)} -.tk-i img{flex:none;width:22px;height:22px;border-radius:50%;object-fit:cover;border:1.5px solid #fff;background:#FFE3D3} -.tk-t{flex:1;min-width:0;white-space:nowrap;overflow:hidden;text-overflow:ellipsis} -.tk-t em{font-style:normal;font-weight:700;color:#3A2A26;margin-right:4px} -.tk-t b{font-weight:800;color:#F04A2E} -.tk-c{flex:none;display:grid;place-items:center;width:18px;height:18px;border-radius:6px;font-style:normal;font-size:11px;font-weight:900} -.tk-i.t-qz .tk-c{background:#F1ECFF;color:#7C5CFC} -.tk-i.t-qa .tk-c{background:#E3F5EE;color:#2E9B78} -.tk-i.t-js .tk-c{background:#FFEEDF;color:#E86F22} -.tk-i small{flex:none;font-size:11px;color:#B5A39C} -html.night .kit-tk{background:rgba(255,255,255,.06)} -html.night .tk-i{color:#CDBFC7} -html.night .tk-t em{color:#F1E6EE} -@media (prefers-reduced-motion:reduce){.tk-i{transition:none}.tk-dot{animation:none}} +/* 11-04 二改：单字再小一号 */ +.kr-ic.kr-ch{width:30px;height:30px;border-radius:9px;font-size:13.5px} +/* 11-04 随机 2 条的第二行换成「谁测出了什么」滚动（kit.js lvRun） */ +.kr-lv{position:relative;display:block;height:18px;overflow:hidden} +.lv-i{position:absolute;left:0;right:0;top:0;display:flex;align-items:center;gap:4px;height:18px;font-size:11.5px;color:#8F7F79;white-space:nowrap;opacity:0;transform:translateY(100%);transition:transform .45s ease,opacity .45s ease} +.lv-i.on{opacity:1;transform:none} +.lv-i.up{opacity:0;transform:translateY(-100%)} +.lv-i img{flex:none;width:16px;height:16px;border-radius:50%;object-fit:cover;background:#FFE3D3} +.lv-i em{font-style:normal;font-weight:700;color:#5A4842;margin-right:1px} +.lv-i b{font-weight:800;color:#F04A2E} +.kr.t-qz .lv-i{color:#7C5CFC}.kr.t-js .lv-i{color:#E86F22} +.kr .lv-i{overflow:hidden;text-overflow:ellipsis} +html.night .lv-i em{color:#F1E6EE} +@media (prefers-reduced-motion:reduce){.lv-i{transition:none}} diff --git a/js/kit.js b/js/kit.js index c376f82..1807a7e 100644 --- a/js/kit.js +++ b/js/kit.js @@ -9,7 +9,7 @@ if (/[?&]kit=0(?:&|$)/.test(location.search)) return; var box = document.getElementById('kit'), sec = document.getElementById('kitHome'); if (!box || !sec) return; - var V = '26110283'; + var V = '26110284'; var l = document.createElement('link'); l.rel = 'stylesheet'; l.href = 'js/kit.css?v=' + V; document.head.appendChild(l); document.documentElement.classList.add('has-kit'); @@ -108,60 +108,60 @@ /* 11-03 用户：「这 6 条跟下面孕妈广场那 6 条太像，换个形式」→（便签墙试过，用户要回到一行一条的排列，只换样式） 一行一条，但不用名次数字和配图：左边按类型的彩色图标块（测试紫 / 百问绿 / 计算器橙），中间问题 + 类型·人数，右边 ›（11-03 用户嫌乱，样式收成一张白卡，见 kit.css）。 */ L.className = 'kit-list kit-rows'; - L.innerHTML = d.r.map(function (x) { + var can = d.r.map(function (x, i) { return lvList(x) ? i : -1; }).filter(function (i) { return i >= 0; }); + if (!LV_PICK || LV_PICK.some(function (i) { return can.indexOf(i) < 0; })) { + LV_PICK = can.slice().sort(function () { return Math.random() - .5; }).slice(0, 2); + } + L.innerHTML = d.r.map(function (x, i) { + var lv = LV_PICK.indexOf(i) >= 0 && lvList(x); return '' + KR_CH[x.c] + '' + - '' + esc(x.q) + '' + TAG[x.c] + '' + FIRE + '' + wan(x.n) + '' + x.u + '' + + '' + esc(x.q) + '' + (lv ? lvHTML(lv) : '' + TAG[x.c] + '' + FIRE + '' + wan(x.n) + '' + x.u + '') + '' + '' + KR_GO[x.c] + ''; }).join(''); + lvRun(); } - /* ---------- 6 条下面：「大家刚刚在用」轮播 ---------- - 11-04 用户：「6 个问题底部放个轮播：谁谁谁测出自己是什么类型、谁谁谁算出养娃要花几十万……」 - → 一行一条，每 3.2 秒往上翻一条；测试结果取 tests.js 里真实的类型名，花费 / 产假 / 体重是计算器按常见输入能算出的数，百问取当前热门题。 - 昵称、头像、时间都是模拟（同「N 人测过」口径，AGENTS.md 12b，12-31 复核），点一下进对应那一项。 */ - var TK_NM = ['小满妈妈', '糯米团子', '橙子不酸', '鹿鹿呀', '安安的妈', '豆包本包', '一只小葵', '阿圆', '栗子酱', '桃桃乌龙', '芝麻汤圆', '晴天娃娃', + /* ---------- 6 条里随机 2 条：类型·人数 那一行换成「谁测出了什么 / 谁算出了多少」滚动 ---------- + 11-04 用户：「轮播别单独放底下，放到标题下面，替换『多少人测过』那行；谁谁谁测了、结果是什么；6 条里随机挑 2 条，其余照常显示」 + → 只从测试 / 计算器里挑（有结果可说），每次打开随机；测试结果取 meta.js GC_RES（tests.js 真实结果名），计算器结果是常见输入能算出的数。 + 昵称、头像均模拟（同「N 人测过」口径，AGENTS.md 12b，12-31 复核）。 */ + var LV_NM = ['小满妈妈', '糯米团子', '橙子不酸', '鹿鹿呀', '安安的妈', '豆包本包', '一只小葵', '阿圆', '栗子酱', '桃桃乌龙', '芝麻汤圆', '晴天娃娃', '果冻布丁', '岁岁平安', '叮当妈', '饭团子', '奶糖不甜', '小鱼干', '朵朵妈咪', '暖暖', '布丁要长大', '花卷儿', '柚子茶', '星星的妈']; - var TK_AV = ['p02', 'm05', 'p05', 'm12', 'k04', 'p09', 'm16', 'p11', 'm07', 'k10', 'p03', 'm19', 'p13', 'm02', 'k06', 'p06', 'm10', 'p12', 'm21', 'p07', 'm04', 'k12', 'p14', 'm15']; - var TK_FIX = [ - ['qz', '测出自己是「松弛感满分型」妈妈', 't11'], ['js', '算了算，养到 18 岁大约要 62.8 万', 'topic/huafei/'], - ['qz', '测出宝宝会是「好奇探险家」小性格', 't24'], ['js', '算出产假能休 178 天（广东）', 'topic/zhichang/'], - ['qz', '测出自己是「性价比务实玩家」', 't29'], ['js', '算出孕期该长 16～28 斤', '/yunqi-tizhong/'], - ['qz', '测出自己是「计划表女王型」', 't11'], ['js', '算出生娃头一年大概花 9.6 万', 'topic/huafei/'], - ['qz', '测出宝宝会是「温柔小暖阳」', 't24'], ['js', '算了算，养到 18 岁大约要 48.5 万', 'topic/huafei/'], - ['qz', '测出自己是「细节控守护型」', 't18'], ['js', '算出产假能休 158 天（浙江）', 'topic/zhichang/'] - ]; - var TK_AGO = ['刚刚', '刚刚', '1 分钟前', '2 分钟前', '刚刚', '3 分钟前']; - var tk = null, tkI = 0, tkT = 0; - function tkItems() { - var qa = (QA || []).filter(function (x) { return x.href && !/^topic\/(huafei|ceshi|duiyou|zhichang)\/$/.test(x.href); }).slice(0, 6), out = []; - TK_FIX.forEach(function (f, i) { - out.push(f); - if (i % 2 && qa[(i - 1) / 2]) out.push(['qa', '看了「' + esc(qa[(i - 1) / 2].q) + '」', qa[(i - 1) / 2].href]); - }); - return out.map(function (f, i) { - var j = (i + day) % TK_NM.length, h = f[0] === 'qz' ? 'guangchang/ceshi/' + cleanQ({ id: f[2] }) - : f[0] === 'qa' ? f[2] + location.search + location.hash - : f[2] + (f[2] === 'topic/zhichang/' ? (location.search ? location.search + '&' : '?') + 'calc=1' : location.search) + location.hash; - return '' + - '' + esc(TK_NM[j]) + '' + (f[0] === 'qa' ? f[1] : f[1]) + '' + KR_CH[f[0]] + '' + TK_AGO[i % TK_AGO.length] + ''; - }); + var LV_AV = ['p02', 'm05', 'p05', 'm12', 'k04', 'p09', 'm16', 'p11', 'm07', 'k10', 'p03', 'm19', 'p13', 'm02', 'k06', 'p06', 'm10', 'p12', 'm21', 'p07', 'm04', 'k12', 'p14', 'm15']; + var LV_JS = { + 'topic/huafei/': ['算出养到 18 岁约 62.8 万', '算出头一年约 9.6 万', '算出养到 3 岁约 21.4 万', '算出养到 18 岁约 48.5 万'], + '/yunqi-tizhong/': ['算出孕期该长 16～28 斤', '算出孕期该长 22～32 斤', '算出孕期该长 14～22 斤'], + '/taier-guzhong/': ['估出宝宝约 1.6 斤', '估出宝宝约 2.3 斤', '估出宝宝约 3.1 斤'], + 'topic/zhichang/': ['算出产假能休 178 天（广东）', '算出产假能休 158 天（上海）', '算出产假能休 188 天（河南）', '算出产假能休 180 天（吉林）'] + }; + var LV_PICK = null, lvT = 0, lvN = Math.floor(Math.random() * LV_NM.length); + function lvList(x) { + if (x.c === 'qz') { + var id = (x.href.match(/[?&]id=(t\d+)/) || [])[1], r = (window.GC_RES || {})[id]; + return r && r.length ? r.map(function (t) { return '测出「' + esc(t) + '」'; }) : null; + } + var k = Object.keys(LV_JS).filter(function (h) { return x.href.indexOf(h) === 0; })[0]; + return k ? LV_JS[k] : null; } - function ticker() { - var pn = box.querySelector('.kit-pn'); if (!pn) return; - var it = tkItems(); - if (!tk) { tk = document.createElement('div'); tk.className = 'kit-tk'; tk.setAttribute('aria-live', 'off'); pn.appendChild(tk); } - tk.innerHTML = '
' + it.join('') + '
'; - var els = tk.querySelectorAll('.tk-i'); tkI = 0; if (els[0]) els[0].classList.add('on'); - clearInterval(tkT); - tkT = setInterval(function () { - if (document.hidden || !tk.offsetParent) return; - var a = els[tkI]; tkI = (tkI + 1) % els.length; var b = els[tkI]; - a.classList.remove('on'); a.classList.add('up'); - setTimeout(function () { a.classList.remove('up'); }, 450); - b.classList.add('on'); - }, 3200); + function lvHTML(l) { + return '' + l.map(function (t, i) { + var j = (lvN++) % LV_NM.length; + return '' + LV_NM[j] + '' + t + ''; + }).join('') + ''; + } + function lvRun() { + clearInterval(lvT); + lvT = setInterval(function () { + if (document.hidden) return; + box.querySelectorAll('.kr-lv').forEach(function (w) { + var a = w.querySelector('.lv-i.on'), b = (a && a.nextElementSibling) || w.firstElementChild; + if (!a || a === b) return; + a.classList.remove('on'); a.classList.add('up'); setTimeout(function () { a.classList.remove('up'); }, 450); + b.classList.add('on'); + }); + }, 3000); } fetch('assets/data/qa/hot.json?v=' + V).then(function (r) { return r.ok ? r.json() : []; }).catch(function () { return []; }) - .then(function (a) { QA = Array.isArray(a) ? a : []; paint(); ticker(); }); + .then(function (a) { QA = Array.isArray(a) ? a : []; paint(); }); if (!window.gcTested) { var ms = document.createElement('script'); ms.src = 'guangchang/ceshi/meta.js?v=' + V; ms.onload = paint; document.body.appendChild(ms); } window.addEventListener('mb-preg', paint); setTimeout(paint, 3000); /* 「此刻」总人数接口晚到时按后台配置的人数重算一次 */ diff --git a/topic/_shared/tools.js b/topic/_shared/tools.js index 07c211a..f60697a 100644 --- a/topic/_shared/tools.js +++ b/topic/_shared/tools.js @@ -68,7 +68,7 @@ function getJSON(u) { return fetch(u, { cache: 'no-cache' }).then(function (r) { if (!r.ok) throw r.status; return r.json(); }); } function related(box) { - getJSON('../_shared/idx.json?v=26110283').then(function (idx) { + getJSON('../_shared/idx.json?v=26110284').then(function (idx) { var me = null; idx.forEach(function (x) { if (x[0] === SLUG) me = x; }); var tag = me ? me[2] : '', h = 0; for (var i = 0; i < SLUG.length; i++) h = (h * 31 + SLUG.charCodeAt(i)) >>> 0; var rest = idx.filter(function (x) { return x[0] !== SLUG; }); @@ -175,7 +175,7 @@ } fetch(API + '/comments?kind=topic&target=' + encodeURIComponent(SLUG) + (OID ? '&openid=' + encodeURIComponent(OID) : '')) .then(function (r) { return r.json(); }).then(function (j) { if (j && j.code === 200) { RC = j.result; paint(); } }).catch(function () {}); - getJSON('../_shared/cm/' + SLUG + '.json?v=26110283').then(function (d) { L = d.c || []; paint(); }).catch(function () { paint(); }); + getJSON('../_shared/cm/' + SLUG + '.json?v=26110284').then(function (d) { L = d.c || []; paint(); }).catch(function () { paint(); }); } function extras(el) {