diff --git a/numerology.db b/numerology.db index 61750b7..ea83d11 100644 Binary files a/numerology.db and b/numerology.db differ diff --git a/numerology.db-shm b/numerology.db-shm index 6f33558..b9524ac 100644 Binary files a/numerology.db-shm and b/numerology.db-shm differ diff --git a/numerology.db-wal b/numerology.db-wal index 7e1ea28..799c1d7 100644 Binary files a/numerology.db-wal and b/numerology.db-wal differ diff --git a/src/components/AnalysisResultDisplay.tsx b/src/components/AnalysisResultDisplay.tsx index 14acd6b..c49c8a2 100644 --- a/src/components/AnalysisResultDisplay.tsx +++ b/src/components/AnalysisResultDisplay.tsx @@ -432,6 +432,22 @@ const AnalysisResultDisplay: React.FC = ({ return renderBaziAnalysis(); } + // 对于易经占卜,如果有 question 参数,直接返回 CompleteYijingAnalysis 组件(不添加额外容器) + if (analysisType === 'yijing' && question) { + return ( + + ); + } + + // 对于紫微斗数,如果有 birthDate 参数,直接返回 CompleteZiweiAnalysis 组件(不添加额外容器) + if (analysisType === 'ziwei' && birthDate) { + return ; + } + // 如果没有分析结果数据 if (!analysisResult) { return ( diff --git a/src/components/CompleteYijingAnalysis.tsx b/src/components/CompleteYijingAnalysis.tsx index 9d2f7b0..b7ba617 100644 --- a/src/components/CompleteYijingAnalysis.tsx +++ b/src/components/CompleteYijingAnalysis.tsx @@ -88,12 +88,12 @@ const CompleteYijingAnalysis: React.FC = ({ // 渲染加载状态 if (isLoading) { return ( -
- +
+ - -

正在进行专业易经占卜

-

请稍候,正在为您起卦分析...

+ +

正在进行专业易经占卜

+

请稍候,正在为您起卦分析...

@@ -103,7 +103,7 @@ const CompleteYijingAnalysis: React.FC = ({ // 渲染错误状态 if (error) { return ( -
+
@@ -123,12 +123,12 @@ const CompleteYijingAnalysis: React.FC = ({ if (!analysisData) { return ( -
- +
+
⚠️
-

数据获取异常

-

未能获取到完整的分析数据,请重新提交占卜

+

数据获取异常

+

未能获取到完整的分析数据,请重新提交占卜

@@ -141,11 +141,11 @@ const CompleteYijingAnalysis: React.FC = ({ return ( {title} @@ -252,18 +252,18 @@ const CompleteYijingAnalysis: React.FC = ({ }; return ( -
+
{/* 标题和基本信息 */} - + - + 易经占卜分析报告 -
+
{analysisData.analysis_date} @@ -277,22 +277,22 @@ const CompleteYijingAnalysis: React.FC = ({
{/* 占卜信息 */} -
-

占卜信息

+
+

占卜信息

-

问题:{analysisData.basic_info.divination_data.question}

-

方法:{analysisData.basic_info.divination_data.method}

+

问题:{analysisData.basic_info.divination_data.question}

+

方法:{analysisData.basic_info.divination_data.method}

-

问题类型: +

问题类型: {analysisData.dynamic_guidance.question_analysis.type}

-

关注重点:{analysisData.dynamic_guidance.question_analysis.focus}

+

关注重点:{analysisData.dynamic_guidance.question_analysis.focus}

@@ -304,7 +304,7 @@ const CompleteYijingAnalysis: React.FC = ({
{/* 本卦 */}
-

+

本卦

@@ -316,9 +316,9 @@ const CompleteYijingAnalysis: React.FC = ({ }, '本卦', true)} {/* 八卦结构 */} - + - + 八卦结构 @@ -328,9 +328,9 @@ const CompleteYijingAnalysis: React.FC = ({ {renderTrigramInfo(analysisData.basic_info.hexagram_info.hexagram_structure.upper_trigram, '上卦')} {renderTrigramInfo(analysisData.basic_info.hexagram_info.hexagram_structure.lower_trigram, '下卦')}
-
-
八卦组合分析
-

{analysisData.detailed_analysis.hexagram_analysis.trigram_analysis}

+
+
八卦组合分析
+

{analysisData.detailed_analysis.hexagram_analysis.trigram_analysis}

@@ -338,7 +338,7 @@ const CompleteYijingAnalysis: React.FC = ({ {/* 变卦 */}
-

+

变卦

@@ -359,9 +359,9 @@ const CompleteYijingAnalysis: React.FC = ({ )} {/* 变化分析 */} - + - + 变化分析 @@ -369,16 +369,16 @@ const CompleteYijingAnalysis: React.FC = ({
-
转化洞察
-

{analysisData.detailed_analysis.changing_hexagram_analysis.transformation_insight}

+
转化洞察
+

{analysisData.detailed_analysis.changing_hexagram_analysis.transformation_insight}

-
变化指导
-

{analysisData.detailed_analysis.changing_hexagram_analysis.guidance}

+
变化指导
+

{analysisData.detailed_analysis.changing_hexagram_analysis.guidance}

-
时机把握
-

{analysisData.detailed_analysis.changing_hexagram_analysis.timing}

+
时机把握
+

{analysisData.detailed_analysis.changing_hexagram_analysis.timing}

@@ -387,9 +387,9 @@ const CompleteYijingAnalysis: React.FC = ({
{/* 卦辞象传 */} - + - + 卦辞象传 @@ -397,12 +397,12 @@ const CompleteYijingAnalysis: React.FC = ({
-

彖传(卦辞)

-

{analysisData.detailed_analysis.hexagram_analysis.judgment}

+

彖传(卦辞)

+

{analysisData.detailed_analysis.hexagram_analysis.judgment}

-
-

象传(卦象)

-

{analysisData.detailed_analysis.hexagram_analysis.image}

+
+

象传(卦象)

+

{analysisData.detailed_analysis.hexagram_analysis.image}

@@ -410,13 +410,13 @@ const CompleteYijingAnalysis: React.FC = ({ {/* 动爻分析 */} {analysisData.detailed_analysis.changing_lines_analysis && ( - + - + 动爻分析 -

动爻数量:{analysisData.detailed_analysis.changing_lines_analysis.changing_lines_count}爻

+

动爻数量:{analysisData.detailed_analysis.changing_lines_analysis.changing_lines_count}爻

{renderChangingLinesAnalysis(analysisData.detailed_analysis.changing_lines_analysis)} @@ -426,27 +426,27 @@ const CompleteYijingAnalysis: React.FC = ({ {/* 高级分析 */} {analysisData.detailed_analysis.advanced_analysis && ( - + - + 高级分析 -

互卦、错卦、综卦深度解析

+

互卦、错卦、综卦深度解析

{/* 互卦 */} -
-

+
+

🔄 互卦 - {analysisData.detailed_analysis.advanced_analysis.inter_hexagram.name}

{analysisData.detailed_analysis.advanced_analysis.inter_hexagram.symbol}
-
{analysisData.detailed_analysis.advanced_analysis.inter_hexagram.meaning}
+
{analysisData.detailed_analysis.advanced_analysis.inter_hexagram.meaning}
-

{analysisData.detailed_analysis.advanced_analysis.inter_hexagram.analysis}

+

{analysisData.detailed_analysis.advanced_analysis.inter_hexagram.analysis}

{/* 错卦 */} @@ -463,23 +463,23 @@ const CompleteYijingAnalysis: React.FC = ({

{/* 综卦 */} -
-

+
+

🔀 综卦 - {analysisData.detailed_analysis.advanced_analysis.reverse_hexagram.name}

{analysisData.detailed_analysis.advanced_analysis.reverse_hexagram.symbol}
-
{analysisData.detailed_analysis.advanced_analysis.reverse_hexagram.meaning}
+
{analysisData.detailed_analysis.advanced_analysis.reverse_hexagram.meaning}
-

{analysisData.detailed_analysis.advanced_analysis.reverse_hexagram.analysis}

+

{analysisData.detailed_analysis.advanced_analysis.reverse_hexagram.analysis}

{/* 综合洞察 */} -
-

四卦综合洞察

-

{analysisData.detailed_analysis.advanced_analysis.comprehensive_insight}

+
+

四卦综合洞察

+

{analysisData.detailed_analysis.advanced_analysis.comprehensive_insight}

@@ -489,40 +489,40 @@ const CompleteYijingAnalysis: React.FC = ({ {analysisData.detailed_analysis.numerology_analysis && ( - + 象数分析 -

八卦数理与时间共振分析

+

八卦数理与时间共振分析

-

上卦数

-
{analysisData.detailed_analysis.numerology_analysis.upper_trigram_number.number}
-
{analysisData.detailed_analysis.numerology_analysis.upper_trigram_number.meaning}
-
{analysisData.detailed_analysis.numerology_analysis.upper_trigram_number.influence}
+

上卦数

+
{analysisData.detailed_analysis.numerology_analysis.upper_trigram_number.number}
+
{analysisData.detailed_analysis.numerology_analysis.upper_trigram_number.meaning}
+
{analysisData.detailed_analysis.numerology_analysis.upper_trigram_number.influence}
-
-

下卦数

-
{analysisData.detailed_analysis.numerology_analysis.lower_trigram_number.number}
-
{analysisData.detailed_analysis.numerology_analysis.lower_trigram_number.meaning}
-
{analysisData.detailed_analysis.numerology_analysis.lower_trigram_number.influence}
+
+

下卦数

+
{analysisData.detailed_analysis.numerology_analysis.lower_trigram_number.number}
+
{analysisData.detailed_analysis.numerology_analysis.lower_trigram_number.meaning}
+
{analysisData.detailed_analysis.numerology_analysis.lower_trigram_number.influence}
-
-

组合能量

-
{analysisData.detailed_analysis.numerology_analysis.combined_energy.total}
-
{analysisData.detailed_analysis.numerology_analysis.combined_energy.interpretation}
-
{analysisData.detailed_analysis.numerology_analysis.combined_energy.harmony}
+
+

组合能量

+
{analysisData.detailed_analysis.numerology_analysis.combined_energy.total}
+
{analysisData.detailed_analysis.numerology_analysis.combined_energy.interpretation}
+
{analysisData.detailed_analysis.numerology_analysis.combined_energy.harmony}
-
-

时间共振

-
{analysisData.detailed_analysis.numerology_analysis.time_resonance.resonance_number}
-
{analysisData.detailed_analysis.numerology_analysis.time_resonance.meaning}
-
{analysisData.detailed_analysis.numerology_analysis.time_resonance.interpretation}
+
+

时间共振

+
{analysisData.detailed_analysis.numerology_analysis.time_resonance.resonance_number}
+
{analysisData.detailed_analysis.numerology_analysis.time_resonance.meaning}
+
{analysisData.detailed_analysis.numerology_analysis.time_resonance.interpretation}
@@ -531,9 +531,9 @@ const CompleteYijingAnalysis: React.FC = ({ {/* 五行分析 */} {analysisData.detailed_analysis.hexagram_analysis.five_elements && ( - + - + 五行分析 @@ -594,9 +594,9 @@ const CompleteYijingAnalysis: React.FC = ({ {/* 时间分析 */} {analysisData.dynamic_guidance.time_analysis && ( - + - + 时间分析 @@ -650,48 +650,48 @@ const CompleteYijingAnalysis: React.FC = ({ {/* 专业指导 */}
{/* 针对性指导 */} - + - + 针对性指导
-
-

专业分析

-

{analysisData.dynamic_guidance.targeted_guidance}

+
+

专业分析

+

{analysisData.dynamic_guidance.targeted_guidance}

-
-

实用建议

-

{analysisData.dynamic_guidance.practical_advice}

+
+

实用建议

+

{analysisData.dynamic_guidance.practical_advice}

{/* 易经智慧 */} - + - + 易经智慧
-
-

核心信息

-

{analysisData.divination_wisdom.key_message}

-
-
-

行动建议

-

{analysisData.divination_wisdom.action_advice}

+
+

核心信息

+

{analysisData.divination_wisdom.key_message}

-

时机把握

-

{analysisData.divination_wisdom.timing_guidance}

+

行动建议

+

{analysisData.divination_wisdom.action_advice}

+
+
+

时机把握

+

{analysisData.divination_wisdom.timing_guidance}

@@ -699,16 +699,16 @@ const CompleteYijingAnalysis: React.FC = ({
{/* 哲学洞察 */} - + - + 哲学洞察 -
-

+

+

{analysisData.divination_wisdom.philosophical_insight}

diff --git a/src/pages/AnalysisPage.tsx b/src/pages/AnalysisPage.tsx index a4184ec..798ffa6 100644 --- a/src/pages/AnalysisPage.tsx +++ b/src/pages/AnalysisPage.tsx @@ -158,7 +158,7 @@ const AnalysisPage: React.FC = () => { ]; return ( -
+
{/* 分析类型选择 */}