From 9125db295fcb2c12fbeb050426d5a5bad1794977 Mon Sep 17 00:00:00 2001
From: deploy <deploy@local>
Date: Sun, 25 Oct 2026 01:14:50 +0000
Subject: [PATCH] =?UTF-8?q?=E3=80=8C=E6=88=91=E7=9A=84=E3=80=8D=E5=A4=B4?=
 =?UTF-8?q?=E5=83=8F=E4=B8=8E=E5=85=B6=E4=BB=96=E5=BA=94=E7=94=A8=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80=20(v26102501)=EF=BC=9A=E5=95=86=E5=9F=8E=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=A4=B4=E5=83=8F=E5=BD=93=E7=A9=BA=E5=80=BC=EF=BC=8C?=
 =?UTF-8?q?=E9=80=80=E5=88=B0=E5=A4=B4=E5=83=8F=E5=BA=93=20avatarPicker.de?=
 =?UTF-8?q?faultFor(openid)?=
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>
---
 index.html |  4 ++--
 js/app.js  | 11 ++++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/index.html b/index.html
index 72a91c4..7010846 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:26102202 缓存版本标记：改 css/js 时同步 bump 该值（与 js/app.js 的 VER 同源），静态资源按 mtime 走 ETag 自动刷新 -->
+<!-- V:26102501 缓存版本标记：改 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） -->
@@ -2050,7 +2050,7 @@
 <!-- 2026-10-05 首页头图：宝宝时不时动一动小手小脚（独立文件，删掉这一行即下线） -->
 <script src="js/baby-limbs.js?v=26101201"></script>
 <script src="js/coach.js?v=26101211"></script>
-<script src="js/birth-flow.js?v=26102202"></script>
+<script src="js/birth-flow.js?v=26102501"></script>
 
 <!-- 禁止下拉回弹（2026-10-11 统一规则，与孕期体重同一段）：竖向拖动时从手指下往上找还能朝该方向滚的容器，找不到才拦；横滑、双指、可滚列表不受影响 -->
 <script>
diff --git a/js/app.js b/js/app.js
index 27ada01..3a11e83 100644
--- a/js/app.js
+++ b/js/app.js
@@ -3,7 +3,7 @@
 (function () {
   'use strict';
   /* 页面版本号（YYMMDD+序号）：显示在「关于兜爸心选」页底部；bump 时同步 head 注释与 ?v= */
-  var VER = '26102202';
+  var VER = '26102501';
   const $ = (s, c) => (c || document).querySelector(s);
   const $$ = (s, c) => Array.from((c || document).querySelectorAll(s));
 
@@ -3567,9 +3567,14 @@
         state.authorized = _authorized;
         /* 方案A：显示看 authorized 而不是 userName —— 后端退出只置 authorized=false，昵称/头像仍在库里 */
         var _n = $('#meName'); if (_n) _n.textContent = (_authorized && p.userName) || '未登录';
-        if (p.avatar && _authorized) {
+        /* 2026-10-25：和其他应用同一套取值（见 /yunyu/ js/app.js 头像取值注释）——
+           商城默认头像（shop.douba.top/uploads/system/…）当空值，退到头像库 avatarPicker.defaultFor(openid)，
+           否则「我的」显示商城灰头像、别的应用显示头像库图，同一个人两处不一样 */
+        var _av = (p.avatar && p.avatar.indexOf('/uploads/system/') < 0) ? p.avatar : '';
+        if (!_av) { try { if (window.avatarPicker && window.avatarPicker.defaultFor) _av = window.avatarPicker.defaultFor(openid); } catch (e) { /* 落到线稿小人 */ } }
+        if (_av && _authorized) {
           var _ai = $('#meAvatarImg'), _aw = $('#meAvatar');
-          if (_ai) _ai.src = p.avatar;
+          if (_ai) _ai.src = _av;
           if (_aw) _aw.classList.add('has-img');
         }
         /* 授权入口：未授权时显示（引导先授权）；退出按钮：已授权时显示 */