From 6b5fc56396c1b429141e5018a4e4bcfed9e06eca Mon Sep 17 00:00:00 2001
From: gaofeng <1212121@qq.com>
Date: Wed, 13 May 2026 10:26:48 +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 | 34 ++++++++++++--------------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/app/home/view/public/newnav.html b/app/home/view/public/newnav.html
index e2058a7..62ccec1 100644
--- a/app/home/view/public/newnav.html
+++ b/app/home/view/public/newnav.html
@@ -15,7 +15,6 @@
 
                 <div class="topbar-right">
 
-
                     <button class="navbar-toggler  d-xl-none text-white border-0" type="button"
                             data-bs-toggle="collapse" data-bs-target="#nav">
                         <span class="navbar-toggler-icon" style="filter: invert(1)"></span>
@@ -24,31 +23,24 @@
             </div>
 
             <!-- 折叠菜单：永远在下一行展开 -->
-            <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">
+            <div class="collapse navbar-collapse" id="nav">
+                <ul class="navbar-nav mx-auto align-items-lg-center gap-lg-2 mt-2 mt-lg-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>
                 </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 topbar-user-btn" href="{:url('user/index')}">
-                            <i class="bi bi-person-circle"></i>
-                            <span>个人中心</span>
-                        </a>
-                    </li>
-                    <li class="nav-item"><a class="nav-link topbar-logout-link" href="{:url('login/logout')}">退出</a></li>
-                    {else/}
-                    <li class="nav-item">
-                        <a class="nav-link topbar-user-btn" href="{:url('user/index')}">
-                            <i class="bi bi-person-circle"></i>
-                            <span>登录</span>
-                        </a>
-                    </li>
-                    {/if}
-                </ul>
+            </div>
+
+            <div class="nav-user-actions">
+                <a class="nav-user-link" href="{:url('user/index')}">
+                    <i class="bi bi-person-circle"></i><span>个人中心</span>
+                </a>
+                {if session('user.id')}
+                <a class="nav-user-link" href="{:url('login/logout')}">
+                    <i class="bi bi-box-arrow-right"></i><span>退出</span>
+                </a>
+                {/if}
             </div>
 
         </div>