diff --git a/README.md b/README.md index 1f070c7..988d566 100644 --- a/README.md +++ b/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 diff --git a/doc/价格管理平台.bmpr b/doc/价格管理平台.bmpr index 6f91c6d..0128426 100644 Binary files a/doc/价格管理平台.bmpr and b/doc/价格管理平台.bmpr differ diff --git a/package.json b/package.json index f2ea881..dd93ac5 100644 --- a/package.json +++ b/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", diff --git a/src/stores/Auth.js b/src/stores/Auth.js index ef05fdc..83da003 100644 --- a/src/stores/Auth.js +++ b/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() diff --git a/src/views/products/Manage.jsx b/src/views/products/Manage.jsx index 4b2f2b6..a46dab8 100644 --- a/src/views/products/Manage.jsx +++ b/src/views/products/Manage.jsx @@ -82,11 +82,12 @@ function Index() { render: (_, r) => ( {t('Edit')} - {r.audit_state_id >= 0 ? ( + {t('Audit')} + {/* {r.audit_state_id >= 0 ? ( {t('Audit')} ) : ( {t('Audit')} - )} + )} */}