继续完善前端登录模块

app/index/view/component/header.php

@@ -1,21 +1,21 @@
 <?php
 // 获取当前登录状态
 $isLoggedIn = false;
+$userInfo = [
+    'is_login' => false,
+    'name' => '',
+    'avatar' => '/static/images/avatar.png' // 默认头像
+];
 
-// 检查session
-if (session('user_id')) {
+// 检查cookie
+$userAccount = cookie('user_account');
+if ($userAccount) {
     $isLoggedIn = true;
-}
-// 如果session未登录，检查cookie
-else {
-    $userAccount = cookie('user_account');
-    if ($userAccount) {
-        // 恢复session
-        session('user_id', cookie('user_id'));
-        session('user_name', cookie('user_name'));
-        session('user_avatar', cookie('user_avatar'));
-        $isLoggedIn = true;
-    }
+    $userInfo = [
+        'is_login' => true,
+        'name' => cookie('user_name'),
+        'avatar' => cookie('user_avatar') ? cookie('user_avatar') : '/static/images/avatar.png'
+    ];
 }
 
 // 添加一个隐藏的div来存储登录状态
@@ -23,12 +23,6 @@ $loginStatus = [
     'isLoggedIn' => $isLoggedIn,
     'userAccount' => $userAccount ?? ''
 ];
-
-$userInfo = [
-    'is_login' => $isLoggedIn,
-    'name' => session('user_name'),
-    'avatar' => session('user_avatar') ? '/static/uploads/avatar/' . session('user_avatar') : '/static/images/avatar.png'
-];
 ?>
 
 <!-- 添加一个隐藏的div来存储登录状态 -->
@@ -74,10 +68,15 @@ $userInfo = [
                 </ul>
             </div>
             <div class="main-menu__right">
+                <div class="username">
+                    <?php if ($userInfo['is_login']): ?>
+                        <span class="username-text">{$userInfo.name}</span>
+                    <?php endif; ?>
+                </div>
                 <div class="layui-inline">
                     <!-- 根据登录状态显示不同的内容 -->
                     <?php if ($userInfo['is_login']): ?>
-                        <div class="layui-inline" style="position: relative;">
+                        <div class="layui-inline" style="position: relative;margin-left:20px;">
                             <img src="{$userInfo.avatar}" class="layui-circle"
                                 style="width: 40px; height: 40px; cursor: pointer;" id="userAvatarMain">
                             <div class="user-dropdown" id="userDropdownMain">
@@ -140,7 +139,7 @@ $userInfo = [
                 <div class="layui-inline">
                     <!-- 根据登录状态显示不同的内容 -->
                     <?php if ($userInfo['is_login']): ?>
-                        <div class="layui-inline" style="position: relative;">
+                        <div class="layui-inline" style="position: relative;margin-left:20px;">
                             <img src="{$userInfo.avatar}" class="layui-circle"
                                 style="width: 40px; height: 40px; cursor: pointer;" id="userAvatarSticky">
                             <div class="user-dropdown" id="userDropdownSticky">
@@ -371,6 +370,16 @@ $userInfo = [
     #test10 [carousel-item]>* {
         background: none !important;
     }
+
+    .main-menu__right {
+        display: flex;
+        align-items: center;
+    }
+
+    .username {
+        display: flex;
+        align-items: center;
+    }
 </style>
 
 <script>