diff --git a/frontend/src/components/Layout.jsx b/frontend/src/components/Layout.jsx
index 97b75dd..993991b 100644
--- a/frontend/src/components/Layout.jsx
+++ b/frontend/src/components/Layout.jsx
@@ -15,10 +15,9 @@ const Layout = ({ children }) => {
   const location = useLocation();
   const [searchParams] = useSearchParams();
   const [mobileMenuOpen, setMobileMenuOpen] = useState(false);
-  const [loginVisible, setLoginVisible] = useState(false);
   const [profileVisible, setProfileVisible] = useState(false);
   
-  const { user, login, logout } = useAuth();
+  const { user, login, logout, loginModalVisible, showLoginModal, hideLoginModal } = useAuth();
 
   // 全局监听并持久化 ref 参数
   useEffect(() => {
@@ -178,7 +177,7 @@ const Layout = ({ children }) => {
                 </Dropdown>
               </div>
             ) : (
-              <Button type="primary" onClick={() => setLoginVisible(true)}>登录</Button>
+              <Button type="primary" onClick={showLoginModal}>登录</Button>
             )}
           </div>
           <style>{`
@@ -222,7 +221,7 @@ const Layout = ({ children }) => {
                  <Button type="link" danger onClick={handleLogout} style={{ marginTop: 10 }}>退出登录</Button>
                </div>
             ) : (
-              <Button type="primary" block onClick={() => { setLoginVisible(true); setMobileMenuOpen(false); }}>登录 / 注册</Button>
+              <Button type="primary" block onClick={() => { showLoginModal(); setMobileMenuOpen(false); }}>登录 / 注册</Button>
             )}
           </div>
           <Menu
@@ -236,8 +235,8 @@ const Layout = ({ children }) => {
         </Drawer>
 
         <LoginModal 
-          visible={loginVisible} 
-          onClose={() => setLoginVisible(false)}
+          visible={loginModalVisible} 
+          onClose={hideLoginModal}
           onLoginSuccess={(userData) => login(userData)}
         />
 
diff --git a/frontend/src/context/AuthContext.jsx b/frontend/src/context/AuthContext.jsx
index 7180a6a..f968336 100644
--- a/frontend/src/context/AuthContext.jsx
+++ b/frontend/src/context/AuthContext.jsx
@@ -7,6 +7,7 @@ const AuthContext = createContext(null);
 export const AuthProvider = ({ children }) => {
   const [user, setUser] = useState(null);
   const [loading, setLoading] = useState(true);
+  const [loginModalVisible, setLoginModalVisible] = useState(false);
 
   useEffect(() => {
     const initAuth = async () => {
@@ -71,8 +72,11 @@ export const AuthProvider = ({ children }) => {
       localStorage.setItem('user', JSON.stringify(newUser));
   };
 
+  const showLoginModal = () => setLoginModalVisible(true);
+  const hideLoginModal = () => setLoginModalVisible(false);
+
   return (
-    <AuthContext.Provider value={{ user, login, logout, updateUser, loading }}>
+    <AuthContext.Provider value={{ user, login, logout, updateUser, loading, loginModalVisible, showLoginModal, hideLoginModal }}>
       {children}
     </AuthContext.Provider>
   );
diff --git a/frontend/src/pages/ServiceDetail.jsx b/frontend/src/pages/ServiceDetail.jsx
index 52ed68c..c33b2e7 100644
--- a/frontend/src/pages/ServiceDetail.jsx
+++ b/frontend/src/pages/ServiceDetail.jsx
@@ -13,7 +13,7 @@ const ServiceDetail = () => {
   const navigate = useNavigate();
   const location = useLocation();
   const [searchParams] = useSearchParams();
-  const { user } = useAuth();
+  const { user, showLoginModal } = useAuth();
   const [service, setService] = useState(null);
   const [loading, setLoading] = useState(true);
   const [isModalOpen, setIsModalOpen] = useState(false);
@@ -223,7 +223,7 @@ const ServiceDetail = () => {
                             onClick={() => {
                                 if (!user) {
                                     message.info('请先登录后再进行咨询');
-                                    navigate('/login', { state: { from: location.pathname } });
+                                    showLoginModal();
                                     return;
                                 }
                                 setIsModalOpen(true);
diff --git a/frontend/src/pages/VCCourseDetail.jsx b/frontend/src/pages/VCCourseDetail.jsx
index 75cc83b..7a4bb43 100644
--- a/frontend/src/pages/VCCourseDetail.jsx
+++ b/frontend/src/pages/VCCourseDetail.jsx
@@ -21,7 +21,7 @@ const VCCourseDetail = () => {
   const navigate = useNavigate();
   const location = useLocation();
   const [searchParams] = useSearchParams();
-  const { user } = useAuth();
+  const { user, showLoginModal } = useAuth();
   const [course, setCourse] = useState(null);
   const [loading, setLoading] = useState(true);
   const [isModalOpen, setIsModalOpen] = useState(false);
@@ -276,7 +276,7 @@ const VCCourseDetail = () => {
                                         onClick={() => {
                                             if (!user) {
                                                 message.info('请先登录后再进行报名或购买');
-                                                navigate('/login', { state: { from: location.pathname } });
+                                                showLoginModal();
                                                 return;
                                             }
                                             setIsModalOpen(true);
@@ -445,14 +445,14 @@ const VCCourseDetail = () => {
                                 cursor: course.is_purchased ? 'not-allowed' : 'pointer'
                             }}
                             onClick={() => {
-                                if (course.is_purchased) return;
-                                if (!user) {
-                                    message.info('请先登录后再进行报名或购买');
-                                    navigate('/login', { state: { from: location.pathname } });
-                                    return;
-                                }
-                                setIsModalOpen(true);
-                            }}
+                                 if (course.is_purchased) return;
+                                 if (!user) {
+                                     message.info('请先登录后再进行报名或购买');
+                                     showLoginModal();
+                                     return;
+                                 }
+                                 setIsModalOpen(true);
+                             }}
                         >
                             {course.is_purchased ? '已购买' : (course.is_video_course ? '购买视频课程' : '立即报名 / 咨询')}
                         </Button>