diff --git a/src/components/core/layouts/art-header-bar/index.vue b/src/components/core/layouts/art-header-bar/index.vue
index 085a988..b19b50a 100644
--- a/src/components/core/layouts/art-header-bar/index.vue
+++ b/src/components/core/layouts/art-header-bar/index.vue
@@ -222,7 +222,7 @@
const settingStore = useSettingStore()
const userStore = useUserStore()
const router = useRouter()
- const { getUserInfo } = useUserStore()
+ const { getUserInfo, home_page } = useUserStore()
const {
showMenuButton,
showRefreshButton,
@@ -313,7 +313,7 @@
}
const toHome = () => {
- router.push(HOME_PAGE)
+ router.push(home_page)
}
const loginOut = () => {
diff --git a/src/components/core/layouts/art-menus/art-sidebar-menu/index.vue b/src/components/core/layouts/art-menus/art-sidebar-menu/index.vue
index 40d6fd6..dccdf07 100644
--- a/src/components/core/layouts/art-menus/art-sidebar-menu/index.vue
+++ b/src/components/core/layouts/art-menus/art-sidebar-menu/index.vue
@@ -112,11 +112,11 @@
import { isIframe } from '@/utils/navigation'
import { handleMenuJump } from '@/utils/navigation'
import SidebarSubmenu from './widget/SidebarSubmenu.vue'
-
+ import { useUserStore } from '@/store/modules/user'
const route = useRoute()
const router = useRouter()
const settingStore = useSettingStore()
-
+ const { home_page } = useUserStore()
const { getMenuOpenWidth, menuType, uniqueOpened, dualMenuShowText, menuOpen, getMenuTheme } =
storeToRefs(settingStore)
@@ -210,7 +210,7 @@
)
const toHome = () => {
- router.push(HOME_PAGE)
+ router.push(home_page)
}
let screenWidth = 0
diff --git a/src/components/core/views/exception/ArtException.vue b/src/components/core/views/exception/ArtException.vue
index 5c058eb..2b90eff 100644
--- a/src/components/core/views/exception/ArtException.vue
+++ b/src/components/core/views/exception/ArtException.vue
@@ -11,9 +11,10 @@
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 81ba270..eb6895f 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -27,6 +27,7 @@ export const useUserStore = defineStore(
const companyabbr = ref('')
const systemsid = ref('')
const systemsabbr = ref('')
+ const home_page = ref('')
const loginType = ref<'feishu' | 'upwd'>('upwd')
const tokenExpireAt = ref(0)
@@ -85,11 +86,15 @@ export const useUserStore = defineStore(
systemsid.value = id
systemsabbr.value = abbr
}
+ // 设置首页
+ const sethome_page = (page: string) => {
+ home_page.value = page
+ }
function restoreTokenTimer() {
const expireAt = Number(localStorage.getItem('token_expire_at') || '0')
if (accessToken.value && expireAt > Date.now()) {
const leftSeconds = Math.floor((expireAt - Date.now()) / 1000)
- scheduleTokenRefresh(leftSeconds);
+ scheduleTokenRefresh(leftSeconds)
}
}
@@ -142,6 +147,7 @@ export const useUserStore = defineStore(
systemsid.value = ''
companyabbr.value = ''
companyid.value = ''
+ home_page.value = ''
info.value = {}
isLogin.value = false
isLock.value = false
@@ -170,6 +176,7 @@ export const useUserStore = defineStore(
companyabbr,
systemsid,
systemsabbr,
+ home_page,
searchHistory,
loginType,
accessToken,
@@ -188,6 +195,7 @@ export const useUserStore = defineStore(
setCompany,
setSystems,
setLoginType,
+ sethome_page,
logOut,
restoreTokenTimer
}
diff --git a/src/views/auth/feishu-callback.vue b/src/views/auth/feishu-callback.vue
index a3da0f5..2fa1e3b 100644
--- a/src/views/auth/feishu-callback.vue
+++ b/src/views/auth/feishu-callback.vue
@@ -35,6 +35,8 @@ onMounted(async () => {
const userInfo = await UserService.getUserInfo()
userStore.setUserInfo(userInfo)
userStore.setLoginStatus(true)
+ userStore.sethome_page(data.home_url)
+ localStorage.setItem('home_page', data.home_url)
router.push(data.home_url)
// router.replace('/')
} catch (e: any) {
diff --git a/src/views/auth/login/index.vue b/src/views/auth/login/index.vue
index e781d8b..83e8c33 100644
--- a/src/views/auth/login/index.vue
+++ b/src/views/auth/login/index.vue
@@ -393,7 +393,8 @@
const userInfo = await UserService.getUserInfo()
userStore.setUserInfo(userInfo)
userStore.setLoginStatus(true)
-
+ userStore.sethome_page(data.home_url)
+ localStorage.setItem('home_page', data.home_url)
// 登录成功处理
showLoginSuccessNotice()
router.push(data.home_url)
diff --git a/src/views/crmpc/recycle/index.vue b/src/views/crmpc/recycle/index.vue
index f37ce92..920b060 100644
--- a/src/views/crmpc/recycle/index.vue
+++ b/src/views/crmpc/recycle/index.vue
@@ -41,7 +41,7 @@
const loading = ref(false)
const pagination = reactive({
currentPage: 1,
- pageSize: 20,
+ pageSize: 10,
total: 0
})