From 22e18c27abb9fdf4b11fd9e08bb7811e147a48c4 Mon Sep 17 00:00:00 2001
From: deploy <deploy@local>
Date: Mon, 2 Nov 2026 12:46:19 +0000
Subject: [PATCH] =?UTF-8?q?=E5=AD=95=E5=A6=88=E5=B9=BF=E5=9C=BA=E7=80=91?=
 =?UTF-8?q?=E5=B8=83=E6=B5=81=EF=BC=9A=E5=9B=BE=E4=B8=8A=E5=B8=A6=E5=AD=97?=
 =?UTF-8?q?=E5=8D=A1=E6=8F=90=E5=88=B0=E7=BA=A6=2045%=EF=BC=88=E6=AF=8F?=
 =?UTF-8?q?=E5=88=97=E5=B8=A6=E5=AD=97/=E4=B8=8D=E5=B8=A6=E5=AD=97?=
 =?UTF-8?q?=E4=BA=A4=E6=9B=BF=E3=80=81=E4=B8=A4=E5=88=97=E9=94=99=E5=BC=80?=
 =?UTF-8?q?=EF=BC=8C=E5=8E=8B=E5=A4=A7=E5=AD=97=E4=B8=8E=E8=B4=B4=E7=BA=B8?=
 =?UTF-8?q?=E5=AD=97=E8=BD=AE=E6=8D=A2=EF=BC=89=EF=BC=9B=E3=80=8C=E5=85=A8?=
 =?UTF-8?q?=E9=83=A8=E3=80=8D=E6=AF=8F=208=20=E5=BC=A0=E5=B8=96=E5=AD=90?=
 =?UTF-8?q?=E6=8F=92=201=20=E5=BC=A0=E6=B5=8B=E8=AF=95=E5=8D=A1=EF=BC=88?=
 =?UTF-8?q?=E7=BA=A6=2011%=EF=BC=8C=E5=85=88=E7=B2=BE=E9=80=89=E5=86=8D?=
 =?UTF-8?q?=E6=8C=89=E7=83=AD=E5=BA=A6=EF=BC=89=EF=BC=9Bv26110227?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 demo/gch/v4.js              |  2 +-
 guangchang/ceshi/index.html |  4 ++--
 guangchang/index.html       | 27 +++++++++++++++------------
 guangchang/mine/index.html  |  2 +-
 index.html                  |  8 ++++----
 js/app.js                   |  2 +-
 6 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/demo/gch/v4.js b/demo/gch/v4.js
index 697ecd5..a0d7c12 100644
--- a/demo/gch/v4.js
+++ b/demo/gch/v4.js
@@ -187,5 +187,5 @@
 }
   /* feed.js 首页默认不加载（index.html 只引了 topics.js），这里按需拉一次 */
   if (window.GC_FEED) init();
-  else { var fs = document.createElement('script'); fs.src = 'guangchang/feed.js?v=26110226'; fs.onload = fs.onerror = init; document.body.appendChild(fs); }
+  else { var fs = document.createElement('script'); fs.src = 'guangchang/feed.js?v=26110227'; fs.onload = fs.onerror = init; document.body.appendChild(fs); }
 })();
diff --git a/guangchang/ceshi/index.html b/guangchang/ceshi/index.html
index 9e98196..5718b9f 100644
--- a/guangchang/ceshi/index.html
+++ b/guangchang/ceshi/index.html
@@ -325,8 +325,8 @@ mark{background:linear-gradient(transparent 62%,var(--c20) 0);color:inherit;padd
 </div>
 <div class="toast" id="toast"></div>
 
-<script src="meta.js?v=26110226"></script>
-<script src="tests.js?v=26110226"></script>
+<script src="meta.js?v=26110227"></script>
+<script src="tests.js?v=26110227"></script>
 <script>
 (function () {
   'use strict';
diff --git a/guangchang/index.html b/guangchang/index.html
index c19576d..80320ef 100644
--- a/guangchang/index.html
+++ b/guangchang/index.html
@@ -604,10 +604,10 @@ button{font:inherit;color:inherit;border:0;background:none;padding:0;cursor:poin
 <div id="sheet" role="dialog" aria-modal="true"><i class="sg"></i><div class="sbd" id="sbd"></div></div>
 <div class="toast" id="toast"></div>
 
-<script src="topics.js?v=26110226"></script>
-<script src="data.js?v=26110226"></script>
-<script src="feed.js?v=26110226"></script>
-<script src="ceshi/meta.js?v=26110226"></script>
+<script src="topics.js?v=26110227"></script>
+<script src="data.js?v=26110227"></script>
+<script src="feed.js?v=26110227"></script>
+<script src="ceshi/meta.js?v=26110227"></script>
 <script>
 (function () {
   'use strict';
@@ -792,12 +792,12 @@ button{font:inherit;color:inherit;border:0;background:none;padding:0;cursor:poin
     haptic(); location.href = target;
   }
   /* 11-02 v2 用户：「测一测放到『经验』后边；孕妈广场上现在那个测一测删掉；『大家在聊』里穿插几个测一测，点了进对应的测试」
-     → CATS 加第 5 个分类 ceshi；选中时 #head 放说明卡、#fh 放分组胶囊、#wf 瀑布流放 25 张测试卡；「全部」信息流按 CS_AT 位置穿插 CS_MIX 里的测试卡。
+     → CATS 加第 5 个分类 ceshi；选中时 #head 放说明卡、#fh 放分组胶囊、#wf 瀑布流放 25 张测试卡；「全部」信息流每 8 张帖子穿插 1 张测试卡（先 CS_MIX 再按热度）。
      测试目录只引轻量 ceshi/meta.js；题库在 ceshi/tests.js，只在测试页加载。 */
   var TM = window.GC_TESTS_META || [], TMBY = {};
   TM.forEach(function (x) { TMBY[x.id] = x; });
   var TG = { quiz: '知识考卷', psy: '趣味心理', game: '趣味闯关', shop: '好物配置' }, tGrp = '';
-  var CS_MIX = ['t11', 't29', 't01', 't24', 't26', 't16', 't03', 't27', 't14', 't21', 't30', 't18'], CS_AT = [3, 10, 18, 27, 37, 48, 60, 73, 87, 102, 118, 135];
+  var CS_MIX = ['t11', 't29', 't01', 't24', 't26', 't16', 't03', 't27', 't14', 't21', 't30', 't18'];
   function csDone() { try { return (JSON.parse(localStorage.getItem('mmbox.gcts.v1') || '{}')[param('openid') || '_guest']) || {}; } catch (e) { return {}; } }
   function ceshiURL(id, fromTab) {
     var q = new URLSearchParams(location.search); ['t', 'n', 'c', 'id', 'mine', 'write'].forEach(function (k) { q.delete(k); });
@@ -939,14 +939,16 @@ button{font:inherit;color:inherit;border:0;background:none;padding:0;cursor:poin
     var cw = cols[0].clientWidth || 175;
     wf.style.setProperty('--cw', cw + 'px');
     /* 真瀑布流：每张卡放进当前更矮的那一列（逐张量高，标题一行/两行也算进去） */
-    var hs = [0, 0], tmp = document.createElement('div'), STY = ['', 'ov', '', '', 'tg', '', '', 'ov', '', 'tg', '', ''];
+    var hs = [0, 0], tmp = document.createElement('div'), lastTx = [false, true], txN = [0, 1];   /* 11-02 用户：图上带字的卡至少占 40% → 每列「带字 / 不带字」交替（测试卡算不带字），两列错开一格，带字的在压大字 ov / 贴纸字 tg 间轮换；整体约 45% */
     if (catF === 'ceshi') {
       $('#more').innerHTML = ceshiListHTML(); return;
     }
-    /* 「全部」信息流：按 CS_AT 位置穿插测试卡 */
+    /* 「全部」信息流：穿插测试卡 */
     if (!cur && !catF && TM.length) {
       var dn = csDone(), mixed = [], ci = 0;
-      list.forEach(function (n, k) { while (ci < CS_AT.length && CS_AT[ci] === mixed.length) { if (TMBY[CS_MIX[ci]]) mixed.push({ test: TMBY[CS_MIX[ci]] }); ci++; } mixed.push(n); });
+      /* 测试卡：第 3 位起每 8 张帖子插 1 张（约占 1/9），先出 CS_MIX 精选，再按热度轮完其余测试 */
+      var csq = CS_MIX.concat(byHot(TM).map(function (x) { return x.id; }).filter(function (id) { return CS_MIX.indexOf(id) < 0; }));
+      list.forEach(function (n, k) { if (k >= 3 && (k - 3) % 8 === 0) { var tid = csq[ci++ % csq.length]; if (TMBY[tid]) mixed.push({ test: TMBY[tid] }); } mixed.push(n); });
       list = [{ mine: 1 }].concat(mixed);
     }
     var nk = 0;
@@ -959,13 +961,14 @@ button{font:inherit;color:inherit;border:0;background:none;padding:0;cursor:poin
       if (n.test) {
         tmp.innerHTML = testCardHTML(n.test, dn);
         var te = tmp.firstChild; te.style.animationDelay = Math.min(k, 10) * 30 + 'ms';
-        var tc0 = hs[0] <= hs[1] ? 0 : 1; cols[tc0].appendChild(te); hs[tc0] += te.offsetHeight + 8;
+        var tc0 = hs[0] <= hs[1] ? 0 : 1; cols[tc0].appendChild(te); hs[tc0] += te.offsetHeight + 8; lastTx[tc0] = false;
         return;
       }
       k = nk++;
-      tmp.innerHTML = cardHTML(n, !cur, STY[k % STY.length]);
+      var c = hs[0] <= hs[1] ? 0 : 1, sty = !lastTx[c] && n.photo ? (txN[c]++ % 2 ? 'tg' : 'ov') : '';
+      lastTx[c] = !!sty;
+      tmp.innerHTML = cardHTML(n, !cur, sty);
       var el = tmp.firstChild; el.style.animationDelay = Math.min(k, 10) * 30 + 'ms';
-      var c = hs[0] <= hs[1] ? 0 : 1;
       cols[c].appendChild(el);
       hs[c] += el.offsetHeight + 8;
     });
diff --git a/guangchang/mine/index.html b/guangchang/mine/index.html
index 25f08c0..5adcc25 100644
--- a/guangchang/mine/index.html
+++ b/guangchang/mine/index.html
@@ -105,7 +105,7 @@ main{padding:6px 16px 0}
 </div>
 <div class="wb"><button type="button" id="write"><svg class="ic" viewBox="0 0 24 24"><path d="M12 20h9M16.5 3.5a2.1 2.1 0 013 3L7 19l-4 1 1-4z"/></svg>写新的故事</button></div>
 
-<script src="../topics.js?v=26110226"></script>
+<script src="../topics.js?v=26110227"></script>
 <script>
 (function () {
   'use strict';
diff --git a/index.html b/index.html
index c1ee2d5..2963f5c 100644
--- a/index.html
+++ b/index.html
@@ -7,7 +7,7 @@
 <meta name="mobile-web-app-capable" content="yes">
 <meta name="apple-mobile-web-app-capable" content="yes">
 <title>兜爸心选 · 孕育陪伴</title>
-<!-- V:26110226 缓存版本标记：改 css/js 时同步 bump 该值（与 js/app.js 的 VER 同源），静态资源按 mtime 走 ETag 自动刷新 -->
+<!-- V:26110227 缓存版本标记：改 css/js 时同步 bump 该值（与 js/app.js 的 VER 同源），静态资源按 mtime 走 ETag 自动刷新 -->
 <link rel="stylesheet" href="mama-box.css">
 <link rel="stylesheet" href="night.css">
 <!-- 夜晚模式：首屏绘制前就按上次的选择加 class，避免先白后黑闪一下（开关在首页右上角 #nightBtn，逻辑见 app.js） -->
@@ -2498,7 +2498,7 @@
 <script src="/_bridge/avatar-picker.js?v=26101105"></script>
 <script src="/_bridge/hand-icons.js?v=26101202"></script>
 <script src="js/zodiac-art.js"></script>
-<script src="guangchang/topics.js?v=26110226"></script>
+<script src="guangchang/topics.js?v=26110227"></script>
 <script src="js/app.js"></script>
 <script>
 /* 11-02 首页「孕妈广场」效果稿：地址带 ?gcv=1~6 时，把 #gcHome 换成 demo/gch/vN.css + vN.js 的版式并滚到这一块。
@@ -2506,7 +2506,7 @@
 (function () {
   var m = location.search.match(/[?&]gcv=([1-6])(?:&|$)/);
   if (!m) window.__gcDefault = 1;
-  var n = m ? m[1] : '6', l = document.createElement('link'), s = document.createElement('script'), q = m ? Date.now() : 'v=26110226';
+  var n = m ? m[1] : '6', l = document.createElement('link'), s = document.createElement('script'), q = m ? Date.now() : 'v=26110227';
   l.rel = 'stylesheet'; l.href = 'demo/gch/v' + n + '.css?' + q;
   s.src = 'demo/gch/v' + n + '.js?' + q;
   if (m) s.onload = function () { setTimeout(function () { var el = document.getElementById('gcHome'); if (el) el.scrollIntoView({ block: 'center' }); }, 900); };
@@ -2514,7 +2514,7 @@
   /* 11-02 品牌露出（用户定 4 处都要）：默认加载，?brand=0 可关掉对比；⚠️ 上正式前和 V6 一起并进正式代码，别依赖 demo/ */
   if (!/[?&]brand=0/.test(location.search)) {
     var bl = document.createElement('link'), bs = document.createElement('script');
-    bl.rel = 'stylesheet'; bl.href = 'demo/brand/brand.css?v=26110226'; bs.src = 'demo/brand/brand.js?v=26110226';
+    bl.rel = 'stylesheet'; bl.href = 'demo/brand/brand.css?v=26110227'; bs.src = 'demo/brand/brand.js?v=26110227';
     document.head.appendChild(bl); document.body.appendChild(bs);
   }
 })();
diff --git a/js/app.js b/js/app.js
index 6b96745..4c74b39 100644
--- a/js/app.js
+++ b/js/app.js
@@ -3,7 +3,7 @@
 (function () {
   'use strict';
   /* 页面版本号（YYMMDD+序号）：显示在「关于兜爸心选」页底部；bump 时同步 head 注释与 ?v= */
-  var VER = '26110226';
+  var VER = '26110227';
   const $ = (s, c) => (c || document).querySelector(s);
   const $$ = (s, c) => Array.from((c || document).querySelectorAll(s));