Merge branch 'main' of github.com:hainatravel/GHHub

README.md

@@ -14,7 +14,8 @@ npm version premajor --no-git-tag-version
 1.0.0 -> 2.0.0-0
 --preid beta | alpha | rc
 npm version prerelease --preid beta --no-git-tag-version
-2.0.0-0 -> 2.0.0-1 -> 2.0.0-2 ..n -> 2.0.0-n
+npm version prerelease
+2.0.0-alpha-0 -> 2.0.0-alpha-1 -> 2.0.0-alpha-2 ..n -> 2.0.0-alpha-n
 npm version patch --no-git-tag-version
 2.0.0-n -> 2.0.0
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "global-highlights-hub",
   "private": true,
-  "version": "2.0.0-alpha.1",
+  "version": "2.0.0-alpha.2",
   "type": "module",
   "scripts": {
     "dev": "vite",

src/stores/Auth.js

@@ -64,6 +64,8 @@ const useAuthStore = create((set, get) => ({
     const { startTokenInterval, loadUserPermission } = get()
     const { setStorage, loginToken } = usingStorage()
 
+    // Dev 模式使用 localStorage，会有 token 失效情况，需要手动删除
+    // Prod 环境没有该问题
     const userJson = await fetchUserDetail(loginToken)
 
     appendRequestParams('token', loginToken)
@@ -140,10 +142,11 @@ const useAuthStore = create((set, get) => ({
     const { logout } = get()
 
     async function checkTokenTimeout() {
+      // TODO：Token 失效后要跳转到登录页面
       const { LastReqDate } = await fetchLastRequet()
-      const lastReqDate = new Date(LastReqDate)
+      const lastReqDateTime = new Date(LastReqDate).getTime()
       const now = new Date()
-      const diffTime = now.getTime() - lastReqDate.getTime()
+      const diffTime = now.getTime() - lastReqDateTime
       const diffHours = diffTime/1000/60/60
       if (diffHours > 1) {
         logout()

src/views/products/Manage.jsx

@@ -82,11 +82,12 @@ function Index() {
       render: (_, r) => (
         <Space size={'large'}>
           <Link to={`/products/${r.travel_agency_id}/${searchValues.use_year || 'all'}/${searchValues.audit_state || 'all'}/edit`}>{t('Edit')}</Link>
-          {r.audit_state_id >= 0 ? (
+          <Link to={`/products/${r.travel_agency_id}/${searchValues.use_year || 'all'}/${searchValues.audit_state || 'all'}/audit`}>{t('Audit')}</Link>
+            {/* {r.audit_state_id >= 0 ? (
             <Link to={`/products/${r.travel_agency_id}/${searchValues.use_year || 'all'}/${searchValues.audit_state || 'all'}/audit`}>{t('Audit')}</Link>
           ) : (
             <span className='text-muted'>{t('Audit')}</span>
-          )}
+          )} */}
           <Button type='link' size={'small'} onClick={() => openCopyModal(r, '#')}>
             {t('Copy') + '-' + t('products:#')}
           </Button>