refactor: 将三天总结从框架层面合并到营养报告，统一UI设计

ui/app_builder.py

@@ -31,7 +31,6 @@ from utils import (
     render_family_preferences_html,
     render_family_memories_html,
     render_nutrition_report_html,
-    render_three_day_deficit_section,
 )
 
 # ============================================================
@@ -334,13 +333,12 @@ def _report_content(lang):
         )
 
     def generate_full_report(days, trimester):
-        """生成营养报告 + 三天缺失深度分析，合并为同一份 HTML"""
+        """生成营养报告（含三天缺失深度分析，框架层面合并）"""
         # — 基础营养报告 —
         records = diet_logger.get_recent_records(days=int(days))
         analysis = nutrition_analyzer.analyze_diet(records)
-        main_html = render_nutrition_report_html(analysis, days=int(days), lang=lang)
 
-        # — 三天缺失深度分析（调用插件） —
+        # — 三天缺失深度分析（调用插件，数据传入 render_nutrition_report_html 统一渲染） —
         try:
             ctx = LoopContext()
             ctx.briefing["trimester"] = trimester
@@ -349,10 +347,8 @@ def _report_content(lang):
         except Exception:
             deficit_data = {}
 
-        # 添加深度分析板块
-        three_day_html = render_three_day_deficit_section(deficit_data, lang=lang)
-
-        return main_html + three_day_html
+        # 所有内容由 render_nutrition_report_html 统一渲染（框架层面合并）
+        return render_nutrition_report_html(analysis, days=int(days), lang=lang, deficit_data=deficit_data)
 
     def on_slider_change(days, trimester):
         """Slider/Radio 变化时防抖 0.8s 后生成报告"""

utils.py

@@ -57,7 +57,6 @@ ZH = {
     "app_subtitle": "一个温馨的家庭式孕期AI伴侣",
     "tab_home_suffix": "首页",
     "tab_family_suffix": "家庭饮食习惯",
-    "tab_summary_suffix": "三天总结",
     "tab_report_suffix": "营养报告",
     "chat_label": "💬 对话",
     "msg_placeholder": "例如：我今天中午吃了番茄牛腩",
@@ -102,20 +101,15 @@ ZH = {
     "report_diversity": "饮食多样性",
     "report_suggestions": "饮食建议",
     "report_days": "近{days}天",
-    "three_day_title": "📊 三天深度营养分析",
-    "three_day_subtitle": "基于近三日饮食趋势的持续缺失追踪",
+    # 三天深度分析（已合并到营养报告中）
+    "three_day_title": "📊 三天深度营养趋势",
+    "three_day_subtitle": "基于近三日饮食数据的持续缺失追踪",
     "three_day_days": "分析了 {days} 天数据",
     "three_day_duration": "持续不足的营养素",
-    "three_day_deficit": "缺失风险",
-    "three_day_attention": "需关注",
-    "three_day_good": "摄入达标",
     "three_day_suggestions": "🍽️ 食材补充建议",
-    "three_day_summary": "📋 总结",
+    "three_day_summary": "📋 趋势总结",
     "three_day_no_data": "近三天无饮食记录，跳过深度分析",
     "three_day_all_good": "✅ 各营养素摄入基本达标，继续保持！",
-    "three_day_def_critical": "❌",
-    "three_day_def_warning": "⚠️",
-    "three_day_def_ok": "✅",
 }
 
 EN = {
@@ -123,7 +117,6 @@ EN = {
     "app_subtitle": "A cozy home-oriented AI companion for expectant mothers",
     "tab_home_suffix": "Home",
     "tab_family_suffix": "Family Diet",
-    "tab_summary_suffix": "3-Day Summary",
     "tab_report_suffix": "Nutrition Report",
     "chat_label": "💬 Chat",
     "msg_placeholder": "e.g. I had tomato beef brisket for lunch today",
@@ -168,20 +161,15 @@ EN = {
     "report_diversity": "Diet Diversity",
     "report_suggestions": "Dietary Suggestions",
     "report_days": "Last {days} days",
-    "three_day_title": "📊 3-Day Deep Analysis",
-    "three_day_subtitle": "Continuous deficiency tracking based on recent diet trends",
+    # 三天深度分析（合并到营养报告中）
+    "three_day_title": "📊 3-Day Nutrient Trends",
+    "three_day_subtitle": "Continuous deficiency tracking based on recent diet data",
     "three_day_days": "Analyzed {days} days of data",
     "three_day_duration": "Persistent Deficits",
-    "three_day_deficit": "Deficit Risk",
-    "three_day_attention": "Needs Attention",
-    "three_day_good": "Adequate Intake",
     "three_day_suggestions": "🍽️ Food Suggestions",
-    "three_day_summary": "📋 Summary",
+    "three_day_summary": "📋 Trend Summary",
     "three_day_no_data": "No diet records in the last 3 days, skipping deep analysis",
     "three_day_all_good": "✅ All nutrients adequate, keep it up!",
-    "three_day_def_critical": "❌",
-    "three_day_def_warning": "⚠️",
-    "three_day_def_ok": "✅",
 }
 
 
@@ -335,11 +323,17 @@ def render_family_memories_html(lang="zh") -> str:
 
 
 # ============================================================
-# 营养报告 HTML
+# 营养报告 HTML（含三天深度分析）
+# ============================================================
+# 统一的设计令牌（Design Tokens）
+# Header: 粉色渐变 background:linear-gradient(135deg,#FCE4EC,#FFF0F2)
+# 卡片: background:#fff; border-radius:14px; box-shadow + border
+# 建议: background:linear-gradient(135deg,#FFF8E1,#FFFDE7); border:1px solid #FFE082
+# 强调色: #880E4F (深粉红), #E91E63 (粉红), #E65100 (橙)
 # ============================================================
 
-def render_nutrition_report_html(analysis: dict, days: int, lang="zh") -> str:
-    """渲染营养报告为现代 Dashboard HTML"""
+def render_nutrition_report_html(analysis: dict, days: int, lang="zh", deficit_data: dict = None) -> str:
+    """渲染营养报告为现代 Dashboard HTML（含三天深度趋势分析）"""
     if not analysis or "error" in analysis:
         return f'<div style="padding:40px;text-align:center;color:#aaa;font-size:16px;">{analysis.get("error","暂无数据")}</div>'
 
@@ -405,6 +399,11 @@ def render_nutrition_report_html(analysis: dict, days: int, lang="zh") -> str:
 
     days_str = t("report_days", lang).format(days=days)
 
+    # ============================================================
+    # 三天深度趋势分析（合并到营养报告内）
+    # ============================================================
+    three_day_html = _render_deficit_section(deficit_data, lang)
+
     return f"""
     <div style="font-family:system-ui,-apple-system,sans-serif;max-width:100%;">
         <!-- Header -->
@@ -459,49 +458,14 @@ def render_nutrition_report_html(analysis: dict, days: int, lang="zh") -> str:
             <div style="font-weight:600;font-size:14px;margin-bottom:6px;color:#E65100;">💡 {t("report_suggestions", lang)}</div>
             {sug_items if sug_items else '<div style="font-size:13px;color:#888;">暂无建议</div>'}
         </div>
-    </div>"""
 
+        <!-- ★ 三天深度趋势分析 — 使用与营养报告统一的UI设计 -->
+        {three_day_html}
 
-# ============================================================
-# 营养素中英文对照表（用于三天总结双语展示）
-# ============================================================
-
-NUTRIENT_EN_NAMES = {
-    "能量(MJ)": "Energy",
-    "蛋白质(g)": "Protein",
-    "钙(mg)": "Calcium",
-    "铁(mg)": "Iron",
-    "锌(mg)": "Zinc",
-    "维生素A(μg RAE)": "Vitamin A",
-    "维生素D(μg)": "Vitamin D",
-    "维生素E(mg α-TE)": "Vitamin E",
-    "维生素B1(mg)": "Vitamin B1",
-    "维生素B2(mg)": "Vitamin B2",
-    "叶酸(μg DFE)": "Folate",
-    "碘(μg)": "Iodine",
-    "镁(mg)": "Magnesium",
-    "硒(μg)": "Selenium",
-    "钾(mg)": "Potassium",
-    "钠(mg)": "Sodium",
-    "磷(mg)": "Phosphorus",
-    "维生素C(mg)": "Vitamin C",
-    "膳食纤维(g)": "Dietary Fiber",
-}
-
-
-def _nutrient_display(name_cn: str, lang: str) -> str:
-    """返回营养素名的展示文本（中文模式显示中文+英文，英文模式显示英文）"""
-    en_name = NUTRIENT_EN_NAMES.get(name_cn, name_cn)
-    if lang == "zh":
-        return f"{name_cn} / {en_name}"
-    return en_name
-
+    </div>"""
 
-# ============================================================
-# 三天缺失深度分析 HTML（与营养报告统一视觉风格）
-# ============================================================
 
-def render_three_day_deficit_section(deficit_data: dict, lang="zh") -> str:
+def _render_deficit_section(deficit_data: dict, lang="zh") -> str:
     """
     渲染三天缺失深度分析板块，与营养报告使用同一套现代UI视觉语言。
 
@@ -513,7 +477,7 @@ def render_three_day_deficit_section(deficit_data: dict, lang="zh") -> str:
         lang: 语言标识 "zh" / "en"
 
     Returns:
-        str: 纯 HTML 字符串，可直接拼接到营养报告之后
+        str: 纯 HTML 字符串，使用与营养报告统一的风格
     """
     if not deficit_data:
         return ""
@@ -532,7 +496,7 @@ def render_three_day_deficit_section(deficit_data: dict, lang="zh") -> str:
             {no_data_msg}
         </div>"""
 
-    # ——— Persistent Deficits: 紧凑标签式展示（取代大卡片） ———
+    # ——— Persistent Deficits: 紧凑标签式展示 ———
     deficit_tags = ""
     for nutrient in persistent_deficits:
         nd = _nutrient_display(nutrient, lang)
@@ -554,7 +518,7 @@ def render_three_day_deficit_section(deficit_data: dict, lang="zh") -> str:
             🎉 {all_good}
         </span>"""
 
-    # ——— Food Suggestions: 扩大展示（使用2/3宽度，每行2个食物标签） ———
+    # ——— Food Suggestions ———
     from modules.nutrition_standards import DRIsParser
     suggestion_rows = ""
     for nutrient in persistent_deficits[:3]:
@@ -583,11 +547,10 @@ def render_three_day_deficit_section(deficit_data: dict, lang="zh") -> str:
             🎉 {t("three_day_all_good", lang)}
         </div>"""
 
-    # ——— Summary: 覆盖折叠纯文本，解析后用结构化UI展示 ———
+    # ——— Summary: 结构化UI展示 ———
     summary_sections_html = ""
     if report_text:
         lines = report_text.strip().split("\n")
-        # 分类行
         critical_items = []
         warning_items = []
         ok_items = []
@@ -662,31 +625,30 @@ def render_three_day_deficit_section(deficit_data: dict, lang="zh") -> str:
 
     days_label = t("three_day_days", lang).format(days=days_analyzed)
 
-    # ——— 拼装最终 HTML ———
-    # 布局: 左右比例 1:2 (deficit : suggestions)
-    # summary 在下方单独一行，结构化展示
+    # ——— 拼装最终 HTML（使用与营养报告统一的设计语言） ———
     return f"""
-    <div style="margin-top:20px;font-family:system-ui,-apple-system,sans-serif;max-width:100%;">
+    <!-- 三天深度趋势分析 — 使用与营养报告一致的粉色渐变主题 -->
+    <div style="margin-top:20px;">
 
-        <!-- ★ Header: 与营养报告统一的渐变风格 -->
-        <div style="background:linear-gradient(135deg,#E8F5E9,#F1F8E9);border-radius:18px;padding:20px 24px;margin-bottom:16px;">
+        <!-- 头部：与营养报告Header统一的粉色渐变 -->
+        <div style="background:linear-gradient(135deg,#FCE4EC,#FFF0F2);border-radius:18px;padding:20px 24px;margin-bottom:16px;">
             <div style="display:flex;justify-content:space-between;align-items:center;">
                 <div>
-                    <div style="font-size:20px;font-weight:700;color:#1B5E20;">{t("three_day_title", lang)}</div>
+                    <div style="font-size:20px;font-weight:700;color:#880E4F;">{t("three_day_title", lang)}</div>
                     <div style="color:#888;font-size:13px;margin-top:4px;">{t("three_day_subtitle", lang)}</div>
                 </div>
                 <div style="text-align:right;">
-                    <div style="font-size:32px;font-weight:800;color:#4CAF50;">{days_analyzed}</div>
-                    <div style="font-size:12px;color:#888;">天</div>
+                    <div style="font-size:32px;font-weight:800;color:#E91E63;">{days_analyzed}</div>
+                    <div style="font-size:12px;color:#888;">{'天' if lang == 'zh' else 'days'}</div>
                 </div>
             </div>
             <div style="margin-top:8px;font-size:13px;color:#555;">{days_label}</div>
         </div>
 
-        <!-- 双列布局 1:2 → 左侧:紧凑标签式缺失营养素 | 右侧:放大的食材建议 -->
+        <!-- 双列布局 1:2 → 左侧:缺失营养素标签 | 右侧:食材建议 -->
         <div style="display:grid;grid-template-columns:1fr 2fr;gap:12px;margin-bottom:16px;">
 
-            <!-- 左侧：持续不足的营养素 — 紧凑标签风格 -->
+            <!-- 左侧：持续不足的营养素 — 与报告一致的白色卡片 -->
             <div style="background:#fff;border-radius:14px;padding:16px;
                         box-shadow:0 1px 6px rgba(0,0,0,0.04);border:1px solid #f0f0f0;">
                 <div style="font-weight:600;font-size:14px;margin-bottom:12px;color:#333;">
@@ -697,7 +659,7 @@ def render_three_day_deficit_section(deficit_data: dict, lang="zh") -> str:
                 </div>
             </div>
 
-            <!-- 右侧：食材补充建议 — 放大展示 -->
+            <!-- 右侧：食材补充建议 — 与报告建议区一致的金色渐变 -->
             <div style="background:linear-gradient(135deg,#FFF8E1,#FFFDE7);border-radius:14px;padding:16px 20px;
                         border:1px solid #FFE082;">
                 <div style="font-weight:600;font-size:15px;margin-bottom:12px;color:#E65100;">
@@ -708,7 +670,7 @@ def render_three_day_deficit_section(deficit_data: dict, lang="zh") -> str:
 
         </div>
 
-        <!-- 总结部分：结构化UI展示（替代纯文本折叠） -->
+        <!-- 总结部分：结构化UI展示 -->
         {f'''
         <div style="background:#fff;border-radius:14px;padding:16px 20px;
                     box-shadow:0 1px 6px rgba(0,0,0,0.04);border:1px solid #f0f0f0;">
@@ -722,6 +684,47 @@ def render_three_day_deficit_section(deficit_data: dict, lang="zh") -> str:
     </div>"""
 
 
+# 保留旧函数名作为代理（兼容外部调用），标记为 deprecated
+def render_three_day_deficit_section(deficit_data: dict, lang="zh") -> str:
+    """已弃用：三天分析已合并到 render_nutrition_report_html 中。保留此函数保持兼容。"""
+    return _render_deficit_section(deficit_data, lang)
+
+
+# ============================================================
+# 营养素中英文对照表
+# ============================================================
+
+NUTRIENT_EN_NAMES = {
+    "能量(MJ)": "Energy",
+    "蛋白质(g)": "Protein",
+    "钙(mg)": "Calcium",
+    "铁(mg)": "Iron",
+    "锌(mg)": "Zinc",
+    "维生素A(μg RAE)": "Vitamin A",
+    "维生素D(μg)": "Vitamin D",
+    "维生素E(mg α-TE)": "Vitamin E",
+    "维生素B1(mg)": "Vitamin B1",
+    "维生素B2(mg)": "Vitamin B2",
+    "叶酸(μg DFE)": "Folate",
+    "碘(μg)": "Iodine",
+    "镁(mg)": "Magnesium",
+    "硒(μg)": "Selenium",
+    "钾(mg)": "Potassium",
+    "钠(mg)": "Sodium",
+    "磷(mg)": "Phosphorus",
+    "维生素C(mg)": "Vitamin C",
+    "膳食纤维(g)": "Dietary Fiber",
+}
+
+
+def _nutrient_display(name_cn: str, lang: str) -> str:
+    """返回营养素名的展示文本（中文模式显示中文+英文，英文模式显示英文）"""
+    en_name = NUTRIENT_EN_NAMES.get(name_cn, name_cn)
+    if lang == "zh":
+        return f"{name_cn} / {en_name}"
+    return en_name
+
+
 # ============================================================
 # 自定义 CSS 样式
 # ============================================================