From ef4241b82fca8b7685930ab3427bf8d2515f5b23 Mon Sep 17 00:00:00 2001
From: erio <asakifeng@gmail.com>
Date: Sat, 14 Mar 2026 04:42:39 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20admin=E5=B8=83=E5=B1=80=E9=97=B4?=
 =?UTF-8?q?=E9=9A=99=E4=B8=BB=E9=A2=98=E9=80=82=E9=85=8D=20+=20=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E6=A8=A1=E5=9E=8B=E7=A7=BB=E8=87=B3/v1/messages=20bad?=
 =?UTF-8?q?ge=E5=86=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- AdminLayout添加主题背景色包裹，消除tab与内容间的未适配间隙
- 缩小nav底部margin (mb-4 → mb-1)
- SubscriptionPlanCard默认模型从独立区块移到/v1/messages badge后面
---
 src/app/admin/layout.tsx                | 54 +++++++++++++------------
 src/components/SubscriptionPlanCard.tsx | 24 +++--------
 2 files changed, 35 insertions(+), 43 deletions(-)

diff --git a/src/app/admin/layout.tsx b/src/app/admin/layout.tsx
index 733f70c..7267dbd 100644
--- a/src/app/admin/layout.tsx
+++ b/src/app/admin/layout.tsx
@@ -11,7 +11,7 @@ const NAV_ITEMS = [
   { path: '/admin/subscriptions', label: { zh: '订阅管理', en: 'Subscriptions' } },
 ];
 
-function AdminNav() {
+function AdminLayoutInner({ children }: { children: React.ReactNode }) {
   const searchParams = useSearchParams();
   const pathname = usePathname();
   const token = searchParams.get('token') || '';
@@ -35,39 +35,43 @@ function AdminNav() {
   };
 
   return (
-    <nav
-      className={[
-        'mb-4 flex flex-wrap gap-1 rounded-xl border p-1',
-        isDark ? 'border-slate-700 bg-slate-800/70' : 'border-slate-200 bg-slate-100/90',
-      ].join(' ')}
-    >
-      {NAV_ITEMS.map((item) => (
-        <a
-          key={item.path}
-          href={buildUrl(item.path)}
+    <div className={['min-h-screen', isDark ? 'bg-slate-950' : 'bg-slate-100'].join(' ')}>
+      <div className="px-2 pt-2 sm:px-3 sm:pt-3">
+        <nav
           className={[
-            'rounded-lg px-3 py-1.5 text-xs font-medium transition-colors',
-            isActive(item.path)
-              ? isDark
-                ? 'bg-indigo-500/30 text-indigo-100 ring-1 ring-indigo-300/35'
-                : 'bg-white text-slate-900 ring-1 ring-slate-300 shadow-sm'
-              : isDark
-                ? 'text-slate-400 hover:text-slate-200 hover:bg-slate-700/50'
-                : 'text-slate-500 hover:text-slate-700 hover:bg-slate-200/70',
+            'mb-1 flex flex-wrap gap-1 rounded-xl border p-1',
+            isDark ? 'border-slate-700 bg-slate-800/70' : 'border-slate-200 bg-slate-100/90',
           ].join(' ')}
         >
-          {item.label[locale]}
-        </a>
-      ))}
-    </nav>
+          {NAV_ITEMS.map((item) => (
+            <a
+              key={item.path}
+              href={buildUrl(item.path)}
+              className={[
+                'rounded-lg px-3 py-1.5 text-xs font-medium transition-colors',
+                isActive(item.path)
+                  ? isDark
+                    ? 'bg-indigo-500/30 text-indigo-100 ring-1 ring-indigo-300/35'
+                    : 'bg-white text-slate-900 ring-1 ring-slate-300 shadow-sm'
+                  : isDark
+                    ? 'text-slate-400 hover:text-slate-200 hover:bg-slate-700/50'
+                    : 'text-slate-500 hover:text-slate-700 hover:bg-slate-200/70',
+              ].join(' ')}
+            >
+              {item.label[locale]}
+            </a>
+          ))}
+        </nav>
+      </div>
+      {children}
+    </div>
   );
 }
 
 export default function AdminLayout({ children }: { children: React.ReactNode }) {
   return (
     <Suspense>
-      <AdminNav />
-      {children}
+      <AdminLayoutInner>{children}</AdminLayoutInner>
     </Suspense>
   );
 }
diff --git a/src/components/SubscriptionPlanCard.tsx b/src/components/SubscriptionPlanCard.tsx
index e274938..8570759 100644
--- a/src/components/SubscriptionPlanCard.tsx
+++ b/src/components/SubscriptionPlanCard.tsx
@@ -73,11 +73,16 @@ export default function SubscriptionPlanCard({ plan, onSubscribe, isDark, locale
           {isOpenAI && plan.allowMessagesDispatch && (
             <span
               className={[
-                'rounded-full px-2 py-0.5 text-xs font-medium',
+                'inline-flex items-center gap-1.5 rounded-full px-2 py-0.5 text-xs font-medium',
                 isDark ? 'bg-green-500/20 text-green-300' : 'bg-green-100 text-green-700',
               ].join(' ')}
             >
               /v1/messages
+              {plan.defaultMappedModel && (
+                <span className={['font-mono', isDark ? 'text-green-400' : 'text-green-800'].join(' ')}>
+                  {plan.defaultMappedModel}
+                </span>
+              )}
             </span>
           )}
         </div>
@@ -149,23 +154,6 @@ export default function SubscriptionPlanCard({ plan, onSubscribe, isDark, locale
         </div>
       )}
 
-      {/* OpenAI specific: default model */}
-      {isOpenAI && plan.defaultMappedModel && (
-        <div
-          className={[
-            'mb-4 flex items-center justify-between rounded-lg border px-3 py-2 text-sm',
-            isDark ? 'border-green-500/30 bg-green-500/10' : 'border-green-200 bg-green-50/50',
-          ].join(' ')}
-        >
-          <span className={isDark ? 'text-slate-400' : 'text-slate-500'}>
-            {pickLocaleText(locale, '默认模型', 'Default Model')}
-          </span>
-          <span className={['text-xs font-mono', isDark ? 'text-slate-300' : 'text-slate-700'].join(' ')}>
-            {plan.defaultMappedModel}
-          </span>
-        </div>
-      )}
-
       {/* Features */}
       {plan.features.length > 0 && (
         <div className="mb-5">