From 18cbcf606919f7ce1c3f9e24fb070b84226bf74a Mon Sep 17 00:00:00 2001
From: gaofeng <1212121@qq.com>
Date: Wed, 13 May 2026 10:16:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/home/view/public/newnav.html | 10 +++++---
 public/static/css/newin.css      | 43 +++++++++++++++++++++++++++++++-
 2 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/app/home/view/public/newnav.html b/app/home/view/public/newnav.html
index fa1c1d6..584db45 100644
--- a/app/home/view/public/newnav.html
+++ b/app/home/view/public/newnav.html
@@ -24,15 +24,19 @@
             </div>
 
             <!-- 折叠菜单：永远在下一行展开 -->
-            <div class="collapse navbar-collapse" id="nav">
-                <ul class="navbar-nav ms-auto align-items-lg-center gap-lg-2 mt-2 mt-lg-0">
+            <div class="collapse navbar-collapse topbar-nav" id="nav">
+                <ul class="navbar-nav topbar-main-nav align-items-xl-center gap-xl-2 mt-2 mt-xl-0">
                     <li class="nav-item"><a class="nav-link" href="{$base_path}/">{:lang('index.home')}</a></li>
                     <li class="nav-item"><a class="nav-link" href="{:url('visa/index')}">{:lang('index.online_application')}</a></li>
                     <li class="nav-item"><a class="nav-link" href="{:url('lookup/index')}">{:lang('index.entry_card_query')}</a></li>
                     <li class="nav-item"><a class="nav-link" href="{:url('news/index')}">{:lang('index.usage_help')}</a></li>
-                    <li class="nav-item"><a class="nav-link" href="{:url('user/index')}">个人中心</a></li>
+                </ul>
+                <ul class="navbar-nav topbar-user-nav align-items-xl-center gap-xl-2 mt-2 mt-xl-0">
                     {if session('user.id')}
+                    <li class="nav-item"><a class="nav-link" href="{:url('user/index')}">个人中心</a></li>
                     <li class="nav-item"><a class="nav-link" href="{:url('login/logout')}">退出</a></li>
+                    {else/}
+                    <li class="nav-item"><a class="nav-link" href="{:url('user/index')}">登录</a></li>
                     {/if}
                 </ul>
             </div>
diff --git a/public/static/css/newin.css b/public/static/css/newin.css
index 0383ab1..bc4c823 100644
--- a/public/static/css/newin.css
+++ b/public/static/css/newin.css
@@ -592,6 +592,16 @@ footer a:hover{ color:#fff; text-decoration:underline; }
 .navbar-collapse{
     text-align: center;
 }
+.topbar .topbar-nav{
+    min-width: 0;
+}
+.topbar .topbar-main-nav,
+.topbar .topbar-user-nav{
+    min-width: 0;
+}
+.topbar .topbar-user-nav .nav-link{
+    white-space: nowrap;
+}
 /* PC：#nav 在同一行靠右 */
 @media (min-width: 1200px){
     .topbar .topbar-inner{
@@ -599,10 +609,22 @@ footer a:hover{ color:#fff; text-decoration:underline; }
     }
     .topbar .navbar-collapse{
         flex: 1 1 auto;
-        justify-content: flex-end;         /* 菜单靠右 */
+        display: flex !important;
+        align-items: center;
+        justify-content: space-between;
+        gap: 16px;
     }
 
     /* PC 不需要右侧（手机语言 + 汉堡），避免空盒子影响对齐 */
+    .topbar .topbar-main-nav{
+        flex: 1 1 auto;
+        justify-content: center;
+    }
+    .topbar .topbar-user-nav{
+        flex: 0 0 auto;
+        justify-content: flex-end;
+        margin-left: auto;
+    }
     .topbar .topbar-right{
         display: none;
     }
@@ -629,6 +651,25 @@ footer a:hover{ color:#fff; text-decoration:underline; }
     }
 
     /* 右侧按钮统一高度对齐 */
+    .topbar .topbar-nav{
+        text-align: center;
+    }
+    .topbar .topbar-main-nav,
+    .topbar .topbar-user-nav{
+        width: 100%;
+        align-items: stretch;
+    }
+    .topbar .topbar-main-nav{
+        padding-top: 6px;
+    }
+    .topbar .topbar-user-nav{
+        border-top: 1px solid rgba(255,255,255,.14);
+        padding-top: 6px;
+    }
+    .topbar .topbar-main-nav .nav-link,
+    .topbar .topbar-user-nav .nav-link{
+        padding: 9px 8px;
+    }
     .topbar .lang-btn{
         height: 34px;
         line-height: 34px;