Merge branch 'main' of github.com:hainatravel/global-sales

src/views/DesktopApp.jsx

@@ -62,9 +62,7 @@ function DesktopApp() {
             <NavLink to='/'>
               <img src={AppLogo} className='logo' alt='App logo' />
             </NavLink>
-            <Title level={3}>
+            <Title level={3}>销售平台</Title>
-              销售平台
-            </Title>
           </Col>
           <Col span={10}>
             <Menu
@@ -72,13 +70,20 @@ function DesktopApp() {
               selectedKeys={[defaultPath]}
               items={[
                 { key: '/order/follow', label: <Link to='/order/follow'>订单跟踪</Link> },
-                { key: '/order/chat', label: <Link to='/order/chat'>在线聊天
+                {
-                <Badge
+                  key: '/order/chat',
-                  count={totalNotify}
+                  label: (
-                  style={{
+                    <Link to='/order/chat'>
-                    backgroundColor: '#52c41a',
+                      在线聊天
-                  }}
+                      <Badge
-                /></Link> },
+                        count={totalNotify}
+                        style={{
+                          backgroundColor: '#52c41a',
+                        }}
+                      />
+                    </Link>
+                  ),
+                },
                 { key: '/chat/history', label: <Link to='/chat/history'>聊天记录</Link> },
               ]}
             />
@@ -92,23 +97,27 @@ function DesktopApp() {
                     label: <Link to='/account/profile'>个人资料</Link>,
                     key: '1',
                   },
+                  { type: 'divider' },
                   {
-                    type: 'divider',
+                    label: <ReloadPrompt force />,
+                    key: 'reload',
                   },
+                  { type: 'divider' },
                   {
                     label: <Link to='/p/dingding/logout'>退出</Link>,
                     key: '3',
                   },
-                ]
+                ],
               }}
-              trigger={['click']}
+              trigger={['click']}>
-            >
               <a onClick={(e) => e.preventDefault()} style={{ color: colorPrimary }}>
-                <Space><Avatar
+                <Space>
-                src={loginUser.avatarUrl}>{loginUser?.username?.substring(1)}</Avatar>{loginUser.username}<DownOutlined /></Space>
+                  <Avatar src={loginUser.avatarUrl}>{loginUser?.username?.substring(1)}</Avatar>
+                  {loginUser.username}
+                  <DownOutlined />
+                </Space>
               </a>
             </Dropdown>
-
           </Col>
         </Row>
       </Header>
@@ -125,7 +134,7 @@ function DesktopApp() {
       </Layout>
       <Footer>桂林海纳国际旅行社有限公司</Footer>
     </Layout>
-  )
+  );
 }
 
 export default DesktopApp

src/views/MobileApp.jsx

@@ -55,6 +55,11 @@ function MobileApp() {
           <Dropdown
             menu={{
               items: [
+                {
+                  label: <ReloadPrompt force />,
+                  key: 'reload',
+                },
+                { type: 'divider' },
                 {
                   label: <Link to='/p/dingding/logout'>退出</Link>,
                   key: '3',

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 && (<span>{APP_VERSION}</span>) } */}
-      {needRefresh && (
+      { (force || needRefresh) && (
-        <a className=' text-sky-600 px-2' onClick={() => updateServiceWorker(true)}>
+        <a className=' text-sky-600 pr-2' onClick={() => updateServiceWorker(true)}>
-          有新版本~点击更新🚀
+          系统更新{needRefresh && '🚀'}
         </a>
       )}
     </>