diff --git a/src/views/DesktopApp.jsx b/src/views/DesktopApp.jsx index bce8850..e74d855 100644 --- a/src/views/DesktopApp.jsx +++ b/src/views/DesktopApp.jsx @@ -62,9 +62,7 @@ function DesktopApp() { App logo - - 销售平台 - + 销售平台 订单跟踪 }, - { key: '/order/chat', label: 在线聊天 - }, + { + key: '/order/chat', + label: ( + + 在线聊天 + + + ), + }, { key: '/chat/history', label: 聊天记录 }, ]} /> @@ -92,23 +97,27 @@ function DesktopApp() { label: 个人资料, key: '1', }, + { type: 'divider' }, { - type: 'divider', + label: , + key: 'reload', }, + { type: 'divider' }, { label: 退出, key: '3', }, - ] + ], }} - trigger={['click']} - > + trigger={['click']}> e.preventDefault()} style={{ color: colorPrimary }}> - {loginUser?.username?.substring(1)}{loginUser.username} + + {loginUser?.username?.substring(1)} + {loginUser.username} + + - @@ -125,7 +134,7 @@ function DesktopApp() {
桂林海纳国际旅行社有限公司
- ) + ); } export default DesktopApp diff --git a/src/views/MobileApp.jsx b/src/views/MobileApp.jsx index cfbed2f..997a4a8 100644 --- a/src/views/MobileApp.jsx +++ b/src/views/MobileApp.jsx @@ -55,6 +55,11 @@ function MobileApp() { , + key: 'reload', + }, + { type: 'divider' }, { label: 退出, key: '3', diff --git a/src/views/ReloadPrompt.jsx b/src/views/ReloadPrompt.jsx index 8581446..9a5a9c2 100644 --- a/src/views/ReloadPrompt.jsx +++ b/src/views/ReloadPrompt.jsx @@ -5,30 +5,34 @@ import { useRegisterSW } from 'virtual:pwa-register/react'; // console.log(pwaInfo, 'pwaInfo'); -function ReloadPrompt() { +function ReloadPrompt({ force }) { const { offlineReady: [offlineReady, setOfflineReady], needRefresh: [needRefresh, setNeedRefresh], updateServiceWorker, } = useRegisterSW({ + onRegistered(r) { + r && + setTimeout(() => { + console.log('Checking for sw update, onRegistered', `__BUILD_DATE__`, `__APP_VERSION__`); + r.update(); + + setInterval(() => { + r.update(); + }, 1000 * 60 * 60 * 8); + }, 1000 * 3); + }, onRegisteredSW(swUrl, r) { - // console.log(`Service Worker at: ${swUrl}`); - // @ts-expect-error just ignore - // if (reloadSW === 'true') { r && setTimeout(() => { - console.log('Checking for sw update, ', `__BUILD_DATE__`, `__APP_VERSION__`); + console.log('Checking for sw update, onRegisteredSW', `__BUILD_DATE__`, `__APP_VERSION__`); r.update(); setInterval(() => { r.update(); }, 1000 * 60 * 60 * 8); }, 1000 * 3); - // } else { - // eslint-disable-next-line prefer-template - // console.log('SW Registered: ' + r); - // } }, onRegisterError(error) { console.log('SW registration error', error); @@ -43,9 +47,9 @@ function ReloadPrompt() { return ( <> {/* {offlineReady && ({APP_VERSION}) } */} - {needRefresh && ( - updateServiceWorker(true)}> - 有新版本~点击更新🚀 + { (force || needRefresh) && ( + updateServiceWorker(true)}> + 系统更新{needRefresh && '🚀'} )}