From 04c77dbf77c2573e51c1aefb90f9573d44f84a6a Mon Sep 17 00:00:00 2001
From: dekun <dekun@local>
Date: Wed, 10 Jun 2026 23:50:19 +0800
Subject: [PATCH] Support ultrawide layout with equal columns and taiji
 branding.

Use 50/50 mode workspace columns, widen content to 1920px on fish screens, replace header logo with taiji icon, and add full-page taiji backdrop.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 app/bazi/page.tsx                    |  3 +-
 app/combined/page.tsx                |  3 +-
 app/globals.css                      |  6 +++-
 app/learn/other/page.tsx             |  3 +-
 app/learn/page.tsx                   |  3 +-
 app/liuyao/page.tsx                  |  3 +-
 app/page.tsx                         |  3 +-
 components/footer.tsx                |  5 ++-
 components/header.tsx                | 11 +++---
 components/layout/mode-workspace.tsx | 15 ++++----
 components/layout/taiji-backdrop.tsx | 15 ++++++++
 components/modes/bazi-form.tsx       |  4 +--
 components/modes/combined-form.tsx   |  4 +--
 components/modes/liuyao-form.tsx     |  4 +--
 components/page-shell.tsx            |  8 ++---
 components/result-ai.tsx             |  5 +--
 components/svg/taiji.tsx             | 53 ++++++++++++++++++++++++++++
 lib/layout.ts                        |  3 ++
 18 files changed, 120 insertions(+), 31 deletions(-)
 create mode 100644 components/layout/taiji-backdrop.tsx
 create mode 100644 components/svg/taiji.tsx
 create mode 100644 lib/layout.ts

diff --git a/app/bazi/page.tsx b/app/bazi/page.tsx
index c53194b..3f46976 100644
--- a/app/bazi/page.tsx
+++ b/app/bazi/page.tsx
@@ -1,10 +1,11 @@
 import PageShell from "@/components/page-shell";
 import BaziForm from "@/components/modes/bazi-form";
+import { APP_CONTAINER } from "@/lib/layout";
 
 export default function BaziPage() {
   return (
     <PageShell>
-      <div className="border-b border-border/40 px-4 py-6 text-center">
+      <div className={`${APP_CONTAINER} border-b border-border/40 py-6 text-center`}>
         <h1 className="text-2xl font-bold tracking-wide">生辰八字</h1>
         <p className="mt-2 text-sm text-muted-foreground">
           四柱排盘 · 十神大运 · AI 命理解读
diff --git a/app/combined/page.tsx b/app/combined/page.tsx
index cd671cc..dc357ca 100644
--- a/app/combined/page.tsx
+++ b/app/combined/page.tsx
@@ -1,10 +1,11 @@
 import PageShell from "@/components/page-shell";
 import CombinedForm from "@/components/modes/combined-form";
+import { APP_CONTAINER } from "@/lib/layout";
 
 export default function CombinedPage() {
   return (
     <PageShell>
-      <div className="border-b border-border/40 px-4 py-6 text-center">
+      <div className={`${APP_CONTAINER} border-b border-border/40 py-6 text-center`}>
         <h1 className="text-2xl font-bold tracking-wide">综合测算</h1>
         <p className="mt-2 text-sm text-muted-foreground">
           天时 · 地利 · 人和 · 六爻可选
diff --git a/app/globals.css b/app/globals.css
index 57db292..b6d129c 100644
--- a/app/globals.css
+++ b/app/globals.css
@@ -72,7 +72,7 @@
   }
 
   body {
-    @apply gap flex flex-col bg-background text-foreground zen-bg;
+    @apply gap flex flex-col bg-background/95 text-foreground;
   }
 
   body {
@@ -122,4 +122,8 @@
   .zen-card-glow {
     background: radial-gradient(circle, hsl(var(--primary) / 0.06) 0%, transparent 70%);
   }
+
+  .zen-card {
+    @apply bg-card/85 backdrop-blur-sm;
+  }
 }
diff --git a/app/learn/other/page.tsx b/app/learn/other/page.tsx
index 07cb34b..c5a8d51 100644
--- a/app/learn/other/page.tsx
+++ b/app/learn/other/page.tsx
@@ -2,6 +2,7 @@ import Link from "next/link";
 import PageShell from "@/components/page-shell";
 import { GuaGrid } from "@/components/learn/gua-grid";
 import { ZenCard } from "@/components/ui/zen-card";
+import { APP_CONTAINER } from "@/lib/layout";
 import {
   getGuaName,
   guaNumFromMark,
@@ -17,7 +18,7 @@ export default async function LearnOtherPage() {
   }));
 
   return (
-    <PageShell className="max-w-6xl px-4 py-8">
+    <PageShell className={`${APP_CONTAINER} py-8`}>
       <div className="mb-8 text-center">
         <h1 className="text-2xl font-bold tracking-wide">易经学习</h1>
         <p className="mt-2 text-sm text-muted-foreground">
diff --git a/app/learn/page.tsx b/app/learn/page.tsx
index 4506b24..33a3db4 100644
--- a/app/learn/page.tsx
+++ b/app/learn/page.tsx
@@ -2,6 +2,7 @@ import Link from "next/link";
 import PageShell from "@/components/page-shell";
 import { GuaGrid } from "@/components/learn/gua-grid";
 import { ZenCard } from "@/components/ui/zen-card";
+import { APP_CONTAINER } from "@/lib/layout";
 import {
   getGuaName,
   guaNumFromMark,
@@ -17,7 +18,7 @@ export default async function LearnPage() {
   }));
 
   return (
-    <PageShell className="max-w-6xl px-4 py-8">
+    <PageShell className={`${APP_CONTAINER} py-8`}>
       <div className="mb-8 text-center">
         <h1 className="text-2xl font-bold tracking-wide">易经学习</h1>
         <p className="mt-2 text-sm text-muted-foreground">
diff --git a/app/liuyao/page.tsx b/app/liuyao/page.tsx
index 79ec8c5..479f1f2 100644
--- a/app/liuyao/page.tsx
+++ b/app/liuyao/page.tsx
@@ -1,10 +1,11 @@
 import PageShell from "@/components/page-shell";
 import LiuyaoForm from "@/components/modes/liuyao-form";
+import { APP_CONTAINER } from "@/lib/layout";
 
 export default function LiuyaoPage() {
   return (
     <PageShell>
-      <div className="border-b border-border/40 px-4 py-6 text-center">
+      <div className={`${APP_CONTAINER} border-b border-border/40 py-6 text-center`}>
         <h1 className="text-2xl font-bold tracking-wide">六爻算卦</h1>
         <p className="mt-2 text-sm text-muted-foreground">
           问事 · 起卦时空 · 线上 / 线下六爻
diff --git a/app/page.tsx b/app/page.tsx
index 27fb497..0a8196b 100644
--- a/app/page.tsx
+++ b/app/page.tsx
@@ -2,6 +2,7 @@ import Link from "next/link";
 import PageShell from "@/components/page-shell";
 import { BookOpen, BrainCircuit, Compass, Sparkles } from "lucide-react";
 import { ZenCard } from "@/components/ui/zen-card";
+import { APP_CONTAINER } from "@/lib/layout";
 
 const MODULES = [
   {
@@ -36,7 +37,7 @@ const MODULES = [
 
 export default function Home() {
   return (
-    <PageShell className="max-w-4xl px-4 py-10 sm:py-14">
+    <PageShell className={`${APP_CONTAINER} py-10 sm:py-14`}>
       <div className="mb-10 text-center">
         <p className="text-4xl opacity-30">☯</p>
         <h1 className="mt-2 text-3xl font-bold tracking-[0.2em]">知命阁</h1>
diff --git a/components/footer.tsx b/components/footer.tsx
index 4486d51..9b79204 100644
--- a/components/footer.tsx
+++ b/components/footer.tsx
@@ -1,9 +1,12 @@
 import React from "react";
 import { VERSION } from "@/lib/constant";
+import { APP_CONTAINER } from "@/lib/layout";
 
 function Footer() {
   return (
-    <footer className="mx-auto flex items-center gap-1 text-xs text-muted-foreground/80">
+    <footer
+      className={`${APP_CONTAINER} relative z-10 flex items-center justify-center gap-1 py-4 text-xs text-muted-foreground/80`}
+    >
       <span className="italic">心诚则灵</span>
       <span className="text-muted-foreground/60">·</span>
       <span>知命阁 v{VERSION}</span>
diff --git a/components/header.tsx b/components/header.tsx
index b1ff160..3ba8d88 100644
--- a/components/header.tsx
+++ b/components/header.tsx
@@ -1,8 +1,9 @@
 "use client";
 import Link from "next/link";
 import { usePathname } from "next/navigation";
-import { ChatGPT } from "@/components/svg";
+import { TaijiIcon } from "@/components/svg/taiji";
 import { ModeToggle } from "@/components/mode-toggle";
+import { APP_CONTAINER } from "@/lib/layout";
 
 const NAV_ITEMS = [
   { href: "/learn", label: "易经学习" },
@@ -34,11 +35,11 @@ function NavLink({ href, label }: { href: string; label: string }) {
 
 export default function Header() {
   return (
-    <header className="border-b border-border/40 bg-card/60 py-3 shadow-sm backdrop-blur-md">
-      <div className="mx-auto flex w-full max-w-6xl flex-col gap-2 px-4 sm:flex-row sm:items-center sm:justify-between">
+    <header className="relative z-10 border-b border-border/40 bg-card/70 py-3 shadow-sm backdrop-blur-md">
+      <div className={`${APP_CONTAINER} flex flex-col gap-2 sm:flex-row sm:items-center sm:justify-between`}>
         <Link href="/" className="flex items-center justify-center gap-2 sm:justify-start">
-          <ChatGPT />
-          <span className="font-medium">知命阁</span>
+          <TaijiIcon />
+          <span className="font-medium tracking-wide">知命阁</span>
         </Link>
         <nav className="flex flex-wrap items-center justify-center gap-x-4 gap-y-1">
           {NAV_ITEMS.map((item) => (
diff --git a/components/layout/mode-workspace.tsx b/components/layout/mode-workspace.tsx
index 9f3944d..8fa84fc 100644
--- a/components/layout/mode-workspace.tsx
+++ b/components/layout/mode-workspace.tsx
@@ -1,6 +1,7 @@
 "use client";
 
 import { Sparkles } from "lucide-react";
+import { APP_CONTAINER } from "@/lib/layout";
 
 export function ModeWorkspace({
   children,
@@ -12,18 +13,20 @@ export function ModeWorkspace({
   aiTitle?: string;
 }) {
   return (
-    <div className="mx-auto w-full max-w-6xl px-4 py-6 lg:py-8">
-      <div className="grid gap-6 lg:grid-cols-[minmax(0,1fr)_minmax(280px,380px)] lg:items-start lg:gap-8">
-        <div className="space-y-5">{children}</div>
-        <aside className="lg:sticky lg:top-6">
-          <div className="zen-card flex min-h-[320px] flex-col rounded-2xl border border-border/60 bg-card/90 shadow-md backdrop-blur-sm lg:min-h-[calc(100vh-8rem)]">
+    <div className={`${APP_CONTAINER} py-6 lg:py-8`}>
+      <div className="grid gap-6 lg:grid-cols-2 lg:items-stretch lg:gap-8 xl:gap-10">
+        <div className="grid h-full min-h-0 auto-rows-fr gap-5 lg:min-h-[calc(100vh-9rem)]">
+          {children}
+        </div>
+        <aside className="flex min-h-[320px] flex-col lg:min-h-[calc(100vh-9rem)]">
+          <div className="zen-card flex min-h-0 flex-1 flex-col rounded-2xl border border-border/60 bg-card/90 shadow-md backdrop-blur-sm">
             <div className="flex items-center gap-2 border-b border-border/50 px-5 py-4">
               <Sparkles size={18} className="text-primary/80" />
               <h2 className="text-sm font-medium tracking-widest text-muted-foreground">
                 {aiTitle}
               </h2>
             </div>
-            <div className="flex flex-1 flex-col p-4 sm:p-5">{aiPanel}</div>
+            <div className="flex min-h-0 flex-1 flex-col p-4 sm:p-5">{aiPanel}</div>
           </div>
         </aside>
       </div>
diff --git a/components/layout/taiji-backdrop.tsx b/components/layout/taiji-backdrop.tsx
new file mode 100644
index 0000000..44a07c5
--- /dev/null
+++ b/components/layout/taiji-backdrop.tsx
@@ -0,0 +1,15 @@
+import { TaijiWatermark } from "@/components/svg/taiji";
+
+/** 全页太极背景水印 */
+export default function TaijiBackdrop() {
+  return (
+    <div
+      aria-hidden
+      className="pointer-events-none fixed inset-0 -z-10 overflow-hidden bg-background/80"
+    >
+      <TaijiWatermark className="absolute left-1/2 top-1/2 h-[min(95vmin,1200px)] w-[min(95vmin,1200px)] -translate-x-1/2 -translate-y-1/2 opacity-90" />
+      <TaijiWatermark className="absolute -right-[8%] top-[6%] h-[min(42vmin,520px)] w-[min(42vmin,520px)] opacity-45" />
+      <TaijiWatermark className="absolute -left-[10%] bottom-[4%] h-[min(38vmin,460px)] w-[min(38vmin,460px)] opacity-40" />
+    </div>
+  );
+}
diff --git a/components/modes/bazi-form.tsx b/components/modes/bazi-form.tsx
index 080867a..c41efca 100644
--- a/components/modes/bazi-form.tsx
+++ b/components/modes/bazi-form.tsx
@@ -109,7 +109,7 @@ export default function BaziForm() {
         />
       }
     >
-      <ZenCard title="出生 · 命局" subtitle="四柱排盘所需信息">
+      <ZenCard title="出生 · 命局" subtitle="四柱排盘所需信息" className="flex h-full min-h-0 flex-col">
         <DateTimePicker
           label="出生日期 / 时间"
           date={date}
@@ -148,7 +148,7 @@ export default function BaziForm() {
         />
       </ZenCard>
 
-      <ZenCard title="问事 · 排盘" subtitle="所求与命盘结果">
+      <ZenCard title="问事 · 排盘" subtitle="所求与命盘结果" className="flex h-full min-h-0 flex-col">
         <Textarea
           placeholder="事业、婚姻、健康等..."
           value={question}
diff --git a/components/modes/combined-form.tsx b/components/modes/combined-form.tsx
index 0689ecd..70e3508 100644
--- a/components/modes/combined-form.tsx
+++ b/components/modes/combined-form.tsx
@@ -156,7 +156,7 @@ export default function CombinedForm() {
         />
       }
     >
-      <ZenCard title="人和 · 生辰" subtitle="出生时空与地域">
+      <ZenCard title="人和 · 生辰" subtitle="出生时空与地域" className="flex h-full min-h-0 flex-col">
         <DateTimePicker
           label="出生日期 / 时间"
           date={birthDate}
@@ -195,7 +195,7 @@ export default function CombinedForm() {
         />
       </ZenCard>
 
-      <ZenCard title="天时地利 · 问事" subtitle="当前时空与所求">
+      <ZenCard title="天时地利 · 问事" subtitle="当前时空与所求" className="flex h-full min-h-0 flex-col">
         <RegionSelect
           label="当前所在地域"
           provinceCode={currentProvince}
diff --git a/components/modes/liuyao-form.tsx b/components/modes/liuyao-form.tsx
index fe6e3dc..0e9a55d 100644
--- a/components/modes/liuyao-form.tsx
+++ b/components/modes/liuyao-form.tsx
@@ -117,7 +117,7 @@ export default function LiuyaoForm() {
         />
       }
     >
-      <ZenCard title="问事 · 心意" subtitle="所求何事，心诚则灵">
+      <ZenCard title="问事 · 心意" subtitle="所求何事，心诚则灵" className="flex h-full min-h-0 flex-col">
         <Textarea
           placeholder="您想算点什么？"
           value={question}
@@ -139,7 +139,7 @@ export default function LiuyaoForm() {
         </div>
       </ZenCard>
 
-      <ZenCard title="起卦 · 时空" subtitle="地域、时辰与六爻">
+      <ZenCard title="起卦 · 时空" subtitle="地域、时辰与六爻" className="flex h-full min-h-0 flex-col">
         <RegionSelect
           label="起卦地域"
           provinceCode={provinceCode}
diff --git a/components/page-shell.tsx b/components/page-shell.tsx
index a1f9978..1f1c433 100644
--- a/components/page-shell.tsx
+++ b/components/page-shell.tsx
@@ -1,5 +1,6 @@
 import Header from "@/components/header";
 import Footer from "@/components/footer";
+import TaijiBackdrop from "@/components/layout/taiji-backdrop";
 
 export default function PageShell({
   children,
@@ -9,11 +10,10 @@ export default function PageShell({
   className?: string;
 }) {
   return (
-    <div className="flex min-h-screen flex-col">
+    <div className="relative flex min-h-screen flex-col">
+      <TaijiBackdrop />
       <Header />
-      <div className={`mx-auto flex w-full flex-1 flex-col ${className}`}>
-        {children}
-      </div>
+      <div className={`flex w-full flex-1 flex-col ${className}`}>{children}</div>
       <Footer />
     </div>
   );
diff --git a/components/result-ai.tsx b/components/result-ai.tsx
index 5d880bf..1a2a49a 100644
--- a/components/result-ai.tsx
+++ b/components/result-ai.tsx
@@ -2,6 +2,7 @@ import React, { useEffect, useRef, useState } from "react";
 import { RotateCw } from "lucide-react";
 import Markdown from "react-markdown";
 import { Button } from "@/components/ui/button";
+import { TaijiIcon } from "@/components/svg/taiji";
 import { cn } from "@/lib/utils";
 
 function ResultAI({
@@ -85,8 +86,8 @@ function ResultAI({
           <p className="text-sm text-muted-foreground">正在等待 AI 响应...</p>
         ) : (
           <div className="flex h-full min-h-[200px] flex-col items-center justify-center text-center text-muted-foreground">
-            <p className="text-4xl opacity-20">☯</p>
-            <p className="mt-3 max-w-[200px] text-sm leading-relaxed">
+            <TaijiIcon className="h-16 w-16 opacity-25" />
+            <p className="mt-3 max-w-[220px] text-sm leading-relaxed">
               {emptyHint}
             </p>
           </div>
diff --git a/components/svg/taiji.tsx b/components/svg/taiji.tsx
new file mode 100644
index 0000000..1cc73a7
--- /dev/null
+++ b/components/svg/taiji.tsx
@@ -0,0 +1,53 @@
+import React from "react";
+import { cn } from "@/lib/utils";
+
+const YANG = "fill-stone-100 dark:fill-stone-200";
+const YIN = "fill-stone-800 dark:fill-stone-900";
+
+/** 太极阴阳鱼图标（页眉 Logo） */
+export const TaijiIcon = React.memo(function TaijiIcon({
+  className,
+}: {
+  className?: string;
+}) {
+  return (
+    <svg
+      viewBox="0 0 64 64"
+      xmlns="http://www.w3.org/2000/svg"
+      className={cn("h-7 w-7 shrink-0 drop-shadow-sm", className)}
+      aria-hidden
+    >
+      <circle cx="32" cy="32" r="30" className={YANG} />
+      <path
+        d="M32 2a30 30 0 0 1 0 60 15 15 0 0 1 0-30 15 15 0 0 0 0-30z"
+        className={YIN}
+      />
+      <circle cx="32" cy="17" r="5" className={YANG} />
+      <circle cx="32" cy="47" r="5" className={YIN} />
+    </svg>
+  );
+});
+
+/** 背景用水印版太极 */
+export function TaijiWatermark({
+  className,
+}: {
+  className?: string;
+}) {
+  return (
+    <svg
+      viewBox="0 0 200 200"
+      xmlns="http://www.w3.org/2000/svg"
+      className={className}
+      aria-hidden
+    >
+      <circle cx="100" cy="100" r="98" className={`${YANG} opacity-[0.35]`} />
+      <path
+        d="M100 2a98 98 0 0 1 0 196 49 49 0 0 1 0-98 49 49 0 0 0 0-98z"
+        className={`${YIN} opacity-[0.08] dark:opacity-[0.12]`}
+      />
+      <circle cx="100" cy="51" r="10" className={`${YANG} opacity-50`} />
+      <circle cx="100" cy="149" r="10" className={`${YIN} opacity-20 dark:opacity-30`} />
+    </svg>
+  );
+}
diff --git a/lib/layout.ts b/lib/layout.ts
new file mode 100644
index 0000000..69b4ab9
--- /dev/null
+++ b/lib/layout.ts
@@ -0,0 +1,3 @@
+/** 全站内容区宽度：手机满宽，带鱼屏最大约 1920px 并留边距 */
+export const APP_CONTAINER =
+  "mx-auto w-full max-w-[min(100%,1920px)] px-4 sm:px-6 lg:px-8 xl:px-12 2xl:px-16";