Merge remote-tracking branch 'origin/main' into dev/chat

src/main.jsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import ReactDOM from 'react-dom/client'
-import { createBrowserRouter, RouterProvider, useNavigate } from 'react-router-dom'
+import { createBrowserRouter, RouterProvider } from 'react-router-dom'
 import { ThemeContext } from '@/stores/ThemeContext'
 import AuthApp from '@/views/AuthApp'
 import DesktopApp from '@/views/DesktopApp'
@@ -11,6 +11,7 @@ import ChatHistory from '@/views/ChatHistory'
 import SalesManagement from '@/views/SalesManagement'
 import DingdingQRCode from '@/views/dingding/QRCode'
 import DingdingCallback from '@/views/dingding/Callback'
+import DingdingLogout from '@/views/dingding/Logout'
 import AccountProfile from '@/views/AccountProfile'
 import ErrorPage from '@/components/ErrorPage'
 import Conversations from '@/views/Conversations/ChatWindow'
@@ -57,6 +58,7 @@ const router = createBrowserRouter([
     children: [
       { path: 'dingding/qrcode', element: <DingdingQRCode /> },
       { path: 'dingding/callback', element: <DingdingCallback /> },
+      { path: 'dingding/logout', element: <DingdingLogout /> },
       { path: 'mobile-login', element: <MobileLogin />},
     ],
   },

src/views/DesktopApp.jsx

@@ -5,7 +5,7 @@ import { DownOutlined } from '@ant-design/icons'
 import { Avatar, Col, Dropdown, Layout, Menu, Row, Space, Typography, theme, Badge } from 'antd'
 import 'dayjs/locale/zh-cn'
 import { useEffect, useState } from 'react'
-import { Link, NavLink, Outlet, useHref, useNavigate } from 'react-router-dom'
+import { Link, NavLink, Outlet, useHref } from 'react-router-dom'
 
 import '@/assets/App.css'
 import AppLogo from '@/assets/logo-gh.png'
@@ -16,7 +16,7 @@ const { Title } = Typography
 
 function DesktopApp() {
 
-  const { colorPrimary, borderRadius } = useThemeContext()
+  const { colorPrimary } = useThemeContext()
   const loginUser = useAuthStore(state => state.loginUser)
 
   const href = useHref()
@@ -94,7 +94,7 @@ function DesktopApp() {
                     type: 'divider',
                   },
                   {
-                    label: <Link to='/p/dingding/qrcode?out'>退出</Link>,
+                    label: <Link to='/p/dingding/logout'>退出</Link>,
                     key: '3',
                   },
                 ]

src/views/dingding/Logout.jsx

@@ -0,0 +1,32 @@
+import useAuthStore from '@/stores/AuthStore'
+import { Flex, Result, Spin, Typography } from 'antd'
+import { useEffect } from 'react'
+import { useNavigate } from 'react-router-dom'
+
+
+function Logout() {
+
+  const navigate = useNavigate()
+  
+  const { logout } = useAuthStore()
+
+  useEffect(() => {
+    logout()      
+    navigate('/p/dingding/qrcode')
+	}, [])
+
+  return (
+    <Flex justify='center' align='center' gap='middle' vertical>
+        <Result
+          status='success'
+          title='退出成功'
+          subTitle='正在跳转登陆页面'
+          extra={[
+            <Spin size='small' />
+          ]}
+        />
+      </Flex>
+  )
+}
+
+export default Logout

src/views/dingding/QRCode.jsx

@@ -1,7 +1,7 @@
 import useAuthStore from '@/stores/AuthStore'
 import { Flex, Result, Spin, Typography } from 'antd'
 import { useEffect } from 'react'
-import { useNavigate, useHref } from 'react-router-dom'
+import { useNavigate } from 'react-router-dom'
 
 const { Title } = Typography
 
@@ -10,20 +10,12 @@ const { Title } = Typography
 function QRCode() {
 
   const navigate = useNavigate()
-  const href = useHref()
   
-  const { loginStatus, loginUser, login, logout, setLoginStatus } = useAuthStore()
+  const { loginStatus, loginUser, login, setLoginStatus } = useAuthStore()
 
   useEffect(() => {
     if (loginUser.userId > 0) {
       navigate('/')
-    }
-	}, [href])
-
-  useEffect (() => {
-    if (location.search === '?out') {
-      logout()
-      navigate('/p/dingding/qrcode')
     }
 	}, [])