From e32040676a51a9adb6f20130d2bf27be563234ea Mon Sep 17 00:00:00 2001
From: gaofeng <1212121@qq.com>
Date: Wed, 13 May 2026 10:20: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/common.php              |  2 +-
 app/home/view/public/newnav.html | 16 ++++++--
 public/static/css/newin.css      | 70 ++++++++++++++++++++++++++++++++
 3 files changed, 84 insertions(+), 4 deletions(-)

diff --git a/app/home/common.php b/app/home/common.php
index 2949f0c..6a6acab 100644
--- a/app/home/common.php
+++ b/app/home/common.php
@@ -14,7 +14,7 @@ const SOURCE = 'evisa.hkpgsow.cn';
 const OSS_URL = 'https://files.jzvisa.com/' .  BUCKET . '/';
 const PAY_TYPE = ['1' => 'wechatpay', '2' => 'alipay'];
 
-
+const INCOICETYPE = '17';
 const CONFIG_JSON_NATION_EN = './json/nation_en.json';
 const CONFIG_JSON_PHONE_PREFIX_EN = './json/phone_prefix_en.json';
 const CONFIG_JSON_TRAVEL_COUNTRY_EN = './json/travel_country_en.json';
diff --git a/app/home/view/public/newnav.html b/app/home/view/public/newnav.html
index 584db45..e2058a7 100644
--- a/app/home/view/public/newnav.html
+++ b/app/home/view/public/newnav.html
@@ -33,10 +33,20 @@
                 </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>
+                    <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" href="{:url('user/index')}">登录</a></li>
+                    <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>
diff --git a/public/static/css/newin.css b/public/static/css/newin.css
index bc4c823..3a9c28b 100644
--- a/public/static/css/newin.css
+++ b/public/static/css/newin.css
@@ -602,6 +602,20 @@ footer a:hover{ color:#fff; text-decoration:underline; }
 .topbar .topbar-user-nav .nav-link{
     white-space: nowrap;
 }
+.topbar .topbar-user-btn{
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    gap: 8px;
+    border: 1px solid rgba(255,255,255,.36);
+    border-radius: 14px;
+    background: rgba(255,255,255,.08);
+    font-weight: 800;
+}
+.topbar .topbar-user-btn i{
+    font-size: 22px;
+    line-height: 1;
+}
 /* PC：#nav 在同一行靠右 */
 @media (min-width: 1200px){
     .topbar .topbar-inner{
@@ -710,6 +724,62 @@ footer a:hover{ color:#fff; text-decoration:underline; }
 .why2-item h6{ margin: 0 0 4px; font-weight: 900; }
 .why2-item p{ margin:0; color: rgba(15,23,42,.70); font-size: 13px; line-height:1.75; }
 
+/* Public nav layout */
+@media (min-width: 1200px){
+    .topbar .navbar{
+        min-height: 140px;
+    }
+    .topbar .topbar-inner{
+        max-width: none;
+        padding-left: 36px;
+        padding-right: 138px;
+    }
+    .topbar .topbar-head{
+        display: none;
+    }
+    .topbar .topbar-nav{
+        display: flex !important;
+        align-items: center;
+        justify-content: space-between;
+        gap: 24px;
+    }
+    .topbar .topbar-main-nav{
+        flex: 1 1 auto;
+        justify-content: flex-start;
+        gap: 40px !important;
+    }
+    .topbar .topbar-main-nav .nav-link{
+        padding: 0;
+        font-size: 28px;
+        font-weight: 500;
+        line-height: 1.2;
+    }
+    .topbar .topbar-user-nav{
+        flex: 0 0 auto;
+        justify-content: flex-end;
+        margin-left: auto;
+    }
+    .topbar .topbar-user-btn{
+        min-width: 196px;
+        height: 68px;
+        padding: 0 22px;
+        font-size: 28px;
+        border-radius: 14px;
+    }
+    .topbar .topbar-logout-link{
+        font-size: 18px;
+        padding-left: 6px;
+        padding-right: 0;
+    }
+}
+
+@media (max-width: 1199.98px){
+    .topbar .topbar-user-btn{
+        width: 100%;
+        border-radius: 10px;
+    }
+}
+
 /* ---- Passport upload icon button ---- */
 .passport-wrap{ position:relative; }
 .passport-upload{