diff --git a/.env b/.env index 0bca3fa..8706e2e 100644 --- a/.env +++ b/.env @@ -1,3 +1,9 @@ +# 与主站同仓；/sub/auth/* 子账号登注册不依赖本开关。为 true 时根路径进 /sub/auth/login、侧栏为子账号受限菜单 +VITE_IS_SUB_PORTAL=false VITE_API_URL="https://api.tianyuanapi.com" VITE_CAPTCHA_SCENE_ID="wynt39to" -VITE_CAPTCHA_ENCRYPTED_MODE=false \ No newline at end of file +VITE_CAPTCHA_ENCRYPTED_MODE=false +# 子账号专属前端域名（生产建议配置，如 https://subsole.tianyuanapi.com） +VITE_SUB_PORTAL_BASE_URL="" +# 主控制台前端域名（用于从子域回跳主域，如 https://console.tianyuanapi.com） +VITE_MAIN_PORTAL_BASE_URL="" \ No newline at end of file diff --git a/.eslintrc-auto-import.json b/.eslintrc-auto-import.json index 55a19f9..666770a 100644 --- a/.eslintrc-auto-import.json +++ b/.eslintrc-auto-import.json @@ -366,7 +366,6 @@ "useThrottleFn": true, "useThrottledRefHistory": true, "useTimeAgo": true, - "useTimeAgoIntl": true, "useTimeout": true, "useTimeoutFn": true, "useTimeoutPoll": true, diff --git a/auto-imports.d.ts b/auto-imports.d.ts index 516d1ce..1af4034 100644 --- a/auto-imports.d.ts +++ b/auto-imports.d.ts @@ -817,7 +817,6 @@ declare module 'vue' { readonly useThrottleFn: UnwrapRef readonly useThrottledRefHistory: UnwrapRef readonly useTimeAgo: UnwrapRef - readonly useTimeAgoIntl: UnwrapRef readonly useTimeout: UnwrapRef readonly useTimeoutFn: UnwrapRef readonly useTimeoutPoll: UnwrapRef diff --git a/components.d.ts b/components.d.ts index 06a2b1e..2bdf440 100644 --- a/components.d.ts +++ b/components.d.ts @@ -58,6 +58,7 @@ declare module 'vue' { ElSegmented: typeof import('element-plus/es')['ElSegmented'] ElSelect: typeof import('element-plus/es')['ElSelect'] ElSkeleton: typeof import('element-plus/es')['ElSkeleton'] + ElSpace: typeof import('element-plus/es')['ElSpace'] ElSubMenu: typeof import('element-plus/es')['ElSubMenu'] ElSwitch: typeof import('element-plus/es')['ElSwitch'] ElTable: typeof import('element-plus/es')['ElTable'] diff --git a/src/api/index.js b/src/api/index.js index 2f4b01e..c0c360b 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -40,6 +40,20 @@ export const userApi = { getUserStats: () => request.get('/users/admin/stats') } +export const subPortalApi = { + register: (data) => request.post('/sub-portal/register', data) +} + +export const subordinateApi = { + createInvitation: (data) => request.post('/subordinate/invitations', data || {}), + listSubordinates: (params) => request.get('/subordinate/subordinates', { params }), + allocate: (data) => request.post('/subordinate/allocate', data), + listAllocations: (params) => request.get('/subordinate/allocations', { params }), + assignSubscription: (data) => request.post('/subordinate/assign-subscription', data), + listChildSubscriptions: (params) => request.get('/subordinate/child-subscriptions', { params }), + removeChildSubscription: (subscriptionId, data) => request.delete(`/subordinate/child-subscriptions/${subscriptionId}`, { data }) +} + // 验证码（阿里云滑块）相关接口 export const captchaApi = { // 获取加密场景 ID，用于前端加密模式初始化滑块 @@ -145,8 +159,8 @@ export const financeApi = { getAlipayOrderStatus: (params) => request.get('/finance/wallet/alipay-order-status', { params }), // 管理员充值功能 - transferRecharge: (data) => request.post('/admin/finance/transfer-recharge', data), - giftRecharge: (data) => request.post('/admin/finance/gift-recharge', data), + adminTransferRecharge: (data) => request.post('/admin/finance/transfer-recharge', data), + adminGiftRecharge: (data) => request.post('/admin/finance/gift-recharge', data), // 充值记录相关接口 getUserRechargeRecords: (params) => request.get('/finance/wallet/recharge-records', { params }), diff --git a/src/assets/logo.png b/src/assets/logo.png new file mode 100644 index 0000000..40beb05 Binary files /dev/null and b/src/assets/logo.png differ diff --git a/src/assets/logo.svg b/src/assets/logo.svg deleted file mode 100644 index 7565660..0000000 --- a/src/assets/logo.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/assets/styles/auth.css b/src/assets/styles/auth.css index 63dd2ce..3f8ea3e 100644 --- a/src/assets/styles/auth.css +++ b/src/assets/styles/auth.css @@ -2,33 +2,36 @@ /* 输入框样式优化 */ .auth-input :deep(.el-input__wrapper) { - border-radius: 8px !important; + border-radius: 10px !important; transition: all 0.3s ease !important; - border: 1px solid #d1d5db !important; + border: 1px solid #d5deef !important; + box-shadow: 0 1px 2px rgba(15, 23, 42, 0.04) !important; + min-height: 44px !important; } .auth-input :deep(.el-input__wrapper:hover) { - border-color: #3b82f6 !important; + border-color: #7aa9f8 !important; } .auth-input :deep(.el-input__wrapper.is-focus) { - border-color: #3b82f6 !important; - box-shadow: 0 0 0 2px rgba(59, 130, 246, 0.1) !important; + border-color: #2563eb !important; + box-shadow: 0 0 0 3px rgba(37, 99, 235, 0.13) !important; } /* 按钮样式优化 */ .auth-button :deep(.el-button--primary) { - border-radius: 8px !important; - font-weight: 500 !important; + border-radius: 10px !important; + font-weight: 600 !important; transition: all 0.3s ease !important; - background: linear-gradient(135deg, #3b82f6 0%, #1d4ed8 100%) !important; + background: linear-gradient(135deg, #2563eb 0%, #1d4ed8 55%, #1e40af 100%) !important; border: none !important; + box-shadow: 0 8px 18px rgba(37, 99, 235, 0.25) !important; } .auth-button :deep(.el-button--primary:hover) { transform: translateY(-1px) !important; - box-shadow: 0 4px 12px rgba(59, 130, 246, 0.3) !important; - background: linear-gradient(135deg, #2563eb 0%, #1e40af 100%) !important; + box-shadow: 0 12px 24px rgba(37, 99, 235, 0.32) !important; + background: linear-gradient(135deg, #1d4ed8 0%, #1e40af 100%) !important; } .auth-button :deep(.el-button--primary:active) { @@ -36,19 +39,61 @@ } /* Radio button 样式优化 */ +.auth-method-tabs { + border-radius: 12px; + padding: 4px; + background: linear-gradient(180deg, #f8fafc 0%, #eef2f7 100%); + border: 1px solid #e2e8f0; + display: flex !important; + width: 100%; +} + +.auth-method-tab { + flex: 1; +} + +.auth-method-tabs :deep(.el-radio-button) { + flex: 1; + display: block; +} + +.auth-method-tabs :deep(.el-radio-button__inner) { + width: 100%; + border-left: none !important; +} + +.auth-method-tabs :deep(.el-radio-button:first-child .el-radio-button__inner) { + border-radius: 10px !important; +} + +.auth-method-tabs :deep(.el-radio-button:last-child .el-radio-button__inner) { + border-radius: 10px !important; +} + +.auth-method-tabs :deep(.el-radio-button.is-active .el-radio-button__inner) { + border-color: transparent !important; +} + .auth-radio :deep(.el-radio-button__inner) { + width: 100% !important; border: none !important; + border-radius: 10px !important; background: transparent !important; - color: #6b7280 !important; - font-weight: 500 !important; + color: #475569 !important; + font-weight: 600 !important; transition: all 0.3s ease !important; - padding: 12px 16px !important; + padding: 10px 14px !important; + box-shadow: none !important; } .auth-radio :deep(.el-radio-button__original-radio:checked + .el-radio-button__inner) { - background: white !important; - color: #3b82f6 !important; - box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.06) !important; + background: #ffffff !important; + color: #0f172a !important; + box-shadow: 0 4px 12px rgba(15, 23, 42, 0.12) !important; +} + +.auth-radio :deep(.el-radio-button__inner:hover) { + color: #0f172a !important; } /* 表单标签样式 */ @@ -58,21 +103,21 @@ /* 链接样式 */ .auth-link { - @apply text-gray-600 hover:text-sky-600 transition-colors mx-2; + @apply text-slate-500 hover:text-blue-700 transition-colors mx-2; } /* 卡片样式 */ .auth-card { - @apply bg-white/95 backdrop-blur-sm shadow-2xl rounded-2xl border border-white/20; + @apply bg-white/96 shadow-2xl rounded-2xl border border-white/40; } /* 标题样式 */ .auth-title { - @apply text-2xl font-bold text-gray-900 mb-2; + @apply text-2xl font-bold text-slate-900 mb-2; } .auth-subtitle { - @apply text-gray-600 text-sm; + @apply text-slate-500 text-sm; } /* 响应式优化 */ diff --git a/src/components/layout/AppHeader.vue b/src/components/layout/AppHeader.vue index 73581c0..8d4b209 100644 --- a/src/components/layout/AppHeader.vue +++ b/src/components/layout/AppHeader.vue @@ -62,7 +62,7 @@ 个人中心 - + @@ -93,7 +93,7 @@ import { UserIcon as User } from '@heroicons/vue/24/outline' -const props = defineProps({ +defineProps({ title: { type: String, required: true @@ -115,11 +115,10 @@ const props = defineProps({ const emit = defineEmits(['user-command']) -const router = useRouter() const userStore = useUserStore() const appStore = useAppStore() -const showNotifications = ref(false) +const showHomeEntry = computed(() => userStore.accountKind !== 'subordinate') // 处理用户菜单命令 const handleUserCommand = async (command) => { diff --git a/src/components/layout/AppSidebar.vue b/src/components/layout/AppSidebar.vue index e500ba4..d87d811 100644 --- a/src/components/layout/AppSidebar.vue +++ b/src/components/layout/AppSidebar.vue @@ -28,7 +28,7 @@ -
+
@@ -56,6 +56,10 @@ const props = defineProps({ type: String, default: 'user', // 'user' | 'admin' validator: (value) => ['user', 'admin'].includes(value) + }, + showHomeLink: { + type: Boolean, + default: true } }) diff --git a/src/constants/menu.js b/src/constants/menu.js index 0401563..1a05b74 100644 --- a/src/constants/menu.js +++ b/src/constants/menu.js @@ -105,11 +105,68 @@ export const getMenuItems = (userType = 'user') => { return userMenuItems } -// 新增：获取用户可访问的菜单项（包含管理员菜单） -export const getUserAccessibleMenuItems = (userType = 'user') => { - const baseMenuItems = [...userMenuItems] +// 子账号/子站壳：受限侧栏（不展示主站运营外链入口由布局控制） +export const getSubordinateMenuItems = () => { + const financeGroup = userMenuItems.find((g) => g.group === '财务管理')?.children || [] + const devGroup = userMenuItems.find((g) => g.group === '开发者中心')?.children || [] + + return [ + { + group: '数据中心', + icon: ChartBar, + children: [ + { name: '我的订阅', path: '/subscriptions', icon: ShoppingCart } + ] + }, + { + group: '账户中心', + icon: User, + children: [ + { name: '账户中心', path: '/profile', icon: User }, + { name: '企业入驻', path: '/profile/certification', icon: ShieldCheck } + ] + }, + { + group: '财务管理', + icon: Wallet, + children: financeGroup.filter((item) => item.path === '/finance/transactions') + }, + { + group: '开发者中心', + icon: Setting, + children: devGroup.filter((item) => + ['/apis/debugger', '/apis/usage', '/apis/whitelist'].includes(item.path) + ) + } + ] +} + +// 新增：获取用户可访问的菜单项（包含管理员菜单） +// options: { accountKind, isSubPortal } 用于下属账号/子站独立构建 +export const getUserAccessibleMenuItems = (userType = 'user', _isCertified = false, options = {}) => { + const { accountKind = 'standalone', isSubPortal: subBuild = false } = options + + if (accountKind === 'subordinate' || subBuild) { + return getSubordinateMenuItems() + } + + const baseMenuItems = userMenuItems.map((group) => ({ + ...group, + children: group.children ? [...group.children] : undefined + })) + + // 主站：普通用户与管理员均可在「账户中心」进入下属管理（管理员同时具备用户侧能力） + const acc = baseMenuItems.find((g) => g.group === '账户中心') + if (acc && acc.children) { + const exists = acc.children.some((c) => c.path === '/parent/subordinates') + if (!exists) { + acc.children = [ + ...acc.children, + { name: '下属', path: '/parent/subordinates', icon: Users, requiresCertification: false } + ] + } + } - // 如果是管理员，添加管理员菜单组 if (userType === 'admin') { baseMenuItems.push({ group: '管理后台', diff --git a/src/constants/portal.js b/src/constants/portal.js new file mode 100644 index 0000000..a654e07 --- /dev/null +++ b/src/constants/portal.js @@ -0,0 +1,27 @@ +/** + * 子账号注册/登录为 /sub/auth/*，与主站同前端；VITE_IS_SUB_PORTAL=true 时仅多一层「根进子账号登录 + 侧栏子账号壳」 + */ +export const isSubPortal = import.meta.env.VITE_IS_SUB_PORTAL === 'true' + +const trimTrailingSlash = (value = '') => value.replace(/\/+$/, '') + +export const subPortalBaseURL = trimTrailingSlash(import.meta.env.VITE_SUB_PORTAL_BASE_URL || '') +export const mainPortalBaseURL = trimTrailingSlash(import.meta.env.VITE_MAIN_PORTAL_BASE_URL || '') + +const getOrigin = (url) => { + if (!url) return '' + try { + return new URL(url).origin + } catch { + return '' + } +} + +export const subPortalOrigin = getOrigin(subPortalBaseURL) +export const mainPortalOrigin = getOrigin(mainPortalBaseURL) +export const isPortalDomainConfigReady = Boolean(subPortalOrigin && mainPortalOrigin) + +export const isCurrentOrigin = (origin) => { + if (!origin || typeof window === 'undefined') return false + return window.location.origin === origin +} diff --git a/src/layouts/AuthLayout.vue b/src/layouts/AuthLayout.vue index 3d4f114..407fb33 100644 --- a/src/layouts/AuthLayout.vue +++ b/src/layouts/AuthLayout.vue @@ -1,25 +1,23 @@ @@ -29,34 +27,127 @@ diff --git a/src/layouts/MainLayout.vue b/src/layouts/MainLayout.vue index 55c5307..187dcf9 100644 --- a/src/layouts/MainLayout.vue +++ b/src/layouts/MainLayout.vue @@ -18,10 +18,10 @@ - + - +
@@ -42,7 +42,7 @@ /> - + @@ -52,6 +52,7 @@ import FloatingCustomerService from '@/components/common/FloatingCustomerService import AppHeader from '@/components/layout/AppHeader.vue' import AppSidebar from '@/components/layout/AppSidebar.vue' import NotificationPanel from '@/components/layout/NotificationPanel.vue' +import { isSubPortal } from '@/constants/portal' import { getCurrentPageCertificationConfig, getUserAccessibleMenuItems } from '@/constants/menu' import { useAppStore } from '@/stores/app' import { useUserStore } from '@/stores/user' @@ -63,16 +64,6 @@ const userStore = useUserStore() const showNotifications = ref(false) -// 性能优化：检测设备性能 -const isLowPerformanceDevice = computed(() => { - // 检测硬件并发数、内存等 - const hardwareConcurrency = navigator.hardwareConcurrency || 4 - const memory = navigator.deviceMemory || 4 - const isMobile = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent) - - return hardwareConcurrency <= 4 || memory <= 4 || isMobile -}) - // 根据用户类型计算布局属性 const isAdmin = computed(() => userStore.isAdmin) @@ -106,7 +97,10 @@ const notificationTheme = computed(() => { // 动态菜单项 const currentMenuItems = computed(() => { - return getUserAccessibleMenuItems(userStore.userType, userStore.isCertified) + return getUserAccessibleMenuItems(userStore.userType, userStore.isCertified, { + accountKind: userStore.accountKind, + isSubPortal + }) }) // 认证相关逻辑 @@ -135,10 +129,15 @@ const shouldShowCertificationNotice = computed(() => { return true }) +const showHomeLink = computed(() => !(userStore.accountKind === 'subordinate' || isSubPortal)) + // 处理用户菜单命令 const handleUserCommand = async (command) => { switch (command) { case 'home': + if (isSubPortal) { + return + } window.open('https://www.tianyuanapi.com/', '_blank', 'noopener') break case 'profile': @@ -163,8 +162,13 @@ const handleUserCommand = async (command) => { cancelButtonText: '取消', type: 'warning', }) + const isSubordinateAccount = userStore.accountKind === 'subordinate' userStore.logout() - router.push('/auth/login') + router.push( + isSubordinateAccount || isSubPortal + ? '/sub/auth/login' + : '/auth/login' + ) } catch { // 用户取消 } diff --git a/src/pages/admin/users/index.vue b/src/pages/admin/users/index.vue index 9b3d63c..19093ff 100644 --- a/src/pages/admin/users/index.vue +++ b/src/pages/admin/users/index.vue @@ -1042,10 +1042,10 @@ const handleSubmitRecharge = async () => { if (rechargeForm.rechargeType === 'transfer') { params.transfer_order_id = rechargeForm.transferOrderID - await financeApi.transferRecharge(params) + await financeApi.adminTransferRecharge(params) ElMessage.success('对公转账充值成功') } else { - await financeApi.giftRecharge(params) + await financeApi.adminGiftRecharge(params) ElMessage.success('赠送充值成功') } diff --git a/src/pages/api/ApiDebugger.vue b/src/pages/api/ApiDebugger.vue index 8117f39..a9e8f6d 100644 --- a/src/pages/api/ApiDebugger.vue +++ b/src/pages/api/ApiDebugger.vue @@ -622,12 +622,14 @@ import { ElMessage } from 'element-plus' import { marked } from 'marked' import { computed, nextTick, onMounted, reactive, ref, watch } from 'vue' import { useRoute, useRouter } from 'vue-router' +import { useUserStore } from '@/stores/user' import CodeDisplay from '@/components/common/CodeDisplay.vue' const router = useRouter() const route = useRoute() +const userStore = useUserStore() // 响应式数据 @@ -710,6 +712,9 @@ const filteredProducts = computed(() => { }) const canDebug = computed(() => { + if (!userStore.isCertified) { + return false + } if (!selectedProduct.value || !debugForm.accessId || !debugForm.secretKey) { return false } @@ -735,6 +740,10 @@ const canDebug = computed(() => { // 生命周期 onMounted(async () => { + if (!userStore.isCertified) { + ElMessage.warning('请先完成企业认证后再使用在线调试') + return + } await loadApiKeys() await loadUserProducts() // 自动选择产品的逻辑已在 loadUserProducts 中处理 @@ -1193,6 +1202,10 @@ const convertFieldTypes = (data) => { // 加密参数 const encryptParams = async () => { + if (!userStore.isCertified) { + ElMessage.warning('请先完成企业认证后再进行调试') + return + } if (!canDebug.value) { ElMessage.warning('请先填写完整的必填参数') return @@ -1278,6 +1291,10 @@ const resetForm = () => { // 开始调试 const handleDebug = async () => { + if (!userStore.isCertified) { + ElMessage.warning('请先完成企业认证后再发起请求') + return + } if (!canDebug.value) return // 新增：验证动态表单 diff --git a/src/pages/auth/Login.vue b/src/pages/auth/Login.vue index eb2019b..3c5018c 100644 --- a/src/pages/auth/Login.vue +++ b/src/pages/auth/Login.vue @@ -3,13 +3,13 @@

欢迎回来

-

请选择登录方式

+

使用账号信息登录控制台

- - + +
@@ -18,7 +18,7 @@ 验证码登录
- +
-
+
+ 还没有账号？ 忘记密码？ @@ -249,47 +250,3 @@ onUnmounted(() => { }) - diff --git a/src/pages/auth/Register.vue b/src/pages/auth/Register.vue index 498cdcb..201cf3c 100644 --- a/src/pages/auth/Register.vue +++ b/src/pages/auth/Register.vue @@ -3,7 +3,7 @@

创建账号

-

请填写以下信息完成注册

+

填写手机号与验证码，快速创建控制台账号

@@ -117,7 +117,7 @@
-
+
已有账号？去登录
@@ -133,6 +133,10 @@ {{ loading ? '注册中...' : '注册' }} + +

+ 注册即表示您同意平台相关服务条款与隐私政策 +

@@ -252,31 +256,3 @@ onUnmounted(() => { }) - diff --git a/src/pages/auth/ResetPassword.vue b/src/pages/auth/ResetPassword.vue index 749bd4c..f598cbe 100644 --- a/src/pages/auth/ResetPassword.vue +++ b/src/pages/auth/ResetPassword.vue @@ -3,7 +3,7 @@

重置密码

-

请输入手机号和验证码重置密码

+

验证手机号后重新设置登录密码

@@ -103,8 +103,8 @@
-
- +
+ 返回登录
@@ -121,6 +121,10 @@ {{ loading ? '重置中...' : '重置密码' }} + +

+ 为了账号安全，请使用强密码并妥善保管 +

@@ -130,8 +134,12 @@ import { useAliyunCaptcha } from '@/composables/useAliyunCaptcha' import { ElMessage } from 'element-plus' const router = useRouter() +const route = useRoute() const userStore = useUserStore() const { runWithCaptcha } = useAliyunCaptcha() +const loginRoutePath = computed(() => { + return route.path.startsWith('/sub/auth') ? '/sub/auth/login' : '/auth/login' +}) // 表单数据 const form = ref({ @@ -217,7 +225,7 @@ const onReset = async () => { const result = await userStore.resetPassword(resetData) if (result.success) { ElMessage.success('密码重置成功') - router.push('/auth/login') + router.push(loginRoutePath.value) } } catch (error) { console.error('密码重置失败:', error) @@ -234,31 +242,3 @@ onUnmounted(() => { }) - diff --git a/src/pages/parent/SubordinateManagement.vue b/src/pages/parent/SubordinateManagement.vue new file mode 100644 index 0000000..146d497 --- /dev/null +++ b/src/pages/parent/SubordinateManagement.vue @@ -0,0 +1,825 @@ + + + + + diff --git a/src/pages/profile/Profile.vue b/src/pages/profile/Profile.vue index 6954460..f154d38 100644 --- a/src/pages/profile/Profile.vue +++ b/src/pages/profile/Profile.vue @@ -30,6 +30,10 @@
+
+
当前账户余额
+
¥{{ walletBalance }}
+
@@ -432,7 +436,7 @@ + diff --git a/src/pages/sub-portal/SubRegister.vue b/src/pages/sub-portal/SubRegister.vue new file mode 100644 index 0000000..1a94369 --- /dev/null +++ b/src/pages/sub-portal/SubRegister.vue @@ -0,0 +1,148 @@ + + + + diff --git a/src/router/index.js b/src/router/index.js index a520d62..05feb49 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,12 +1,13 @@ import { useUserStore } from '@/stores/user' import { createRouter, createWebHistory } from 'vue-router' +import { isCurrentOrigin, isPortalDomainConfigReady, isSubPortal, mainPortalOrigin, subPortalOrigin } from '@/constants/portal' import { statisticsRoutes } from './modules/statistics' // 路由配置 const routes = [ { path: '/', - redirect: '/dashboard' + redirect: () => (isSubPortal ? '/sub/auth/login' : '/dashboard') }, { path: '/auth', @@ -51,6 +52,44 @@ const routes = [ } ] }, + { + path: '/sub/auth', + component: () => import('@/layouts/AuthLayout.vue'), + meta: { requiresAuth: false }, + children: [ + { + path: 'login', + name: 'SubLogin', + component: () => import('@/pages/sub-portal/SubLogin.vue'), + meta: { title: '子账号登录' } + }, + { + path: 'register', + name: 'SubRegister', + component: () => import('@/pages/sub-portal/SubRegister.vue'), + meta: { title: '子账号注册' } + }, + { + path: 'reset', + name: 'SubResetPassword', + component: () => import('@/pages/auth/ResetPassword.vue'), + meta: { title: '重置密码' } + } + ] + }, + { + path: '/parent/subordinates', + component: () => import('@/layouts/MainLayout.vue'), + meta: { requiresAuth: true, title: '下属' }, + children: [ + { + path: '', + name: 'ParentSubordinates', + component: () => import('@/pages/parent/SubordinateManagement.vue'), + meta: { title: '下属' } + } + ] + }, { path: '/products', component: () => import('@/layouts/MainLayout.vue'), @@ -344,9 +383,34 @@ const router = createRouter({ // 路由守卫 router.beforeEach(async (to, from, next) => { const userStore = useUserStore() + const loginPathByRoute = to.path.startsWith('/sub/') ? '/sub/auth/login' : '/auth/login' + const isSubAuthRoute = to.path.startsWith('/sub/auth') + const isMainAuthRoute = to.path.startsWith('/auth') + const subAuthToMainAuthPath = to.path.replace('/sub/auth', '/auth') + const mainAuthToSubAuthPath = to.path.replace('/auth', '/sub/auth') + + // 域名级认证路由隔离：子域只允许 /sub/auth/*，主域禁止 /sub/auth/* + if (isPortalDomainConfigReady) { + const onSubDomain = isCurrentOrigin(subPortalOrigin) + const onMainDomain = isCurrentOrigin(mainPortalOrigin) + + if (onSubDomain && isMainAuthRoute) { + next(mainAuthToSubAuthPath) + return + } + + if (onMainDomain && isSubAuthRoute) { + next(subAuthToMainAuthPath) + return + } + } else if (isSubPortal && isMainAuthRoute) { + // 子站壳模式下，即使未配置双域名，也只允许进入 /sub/auth/* + next(mainAuthToSubAuthPath) + return + } // 对于不需要认证的路由（如登录页），不等待初始化，直接放行 - const isAuthRoute = to.path.startsWith('/auth') + const isAuthRoute = to.path.startsWith('/auth') || to.path.startsWith('/sub/auth') const requiresAuth = to.meta.requiresAuth // 只有在需要认证的路由上才等待初始化 @@ -366,7 +430,7 @@ router.beforeEach(async (to, from, next) => { // 检查是否需要认证 if (requiresAuth && !userStore.isLoggedIn) { - next('/auth/login') + next(loginPathByRoute) return } @@ -376,12 +440,57 @@ router.beforeEach(async (to, from, next) => { return } - // 已登录用户访问认证页面，重定向到数据大厅 - if (isAuthRoute && userStore.isLoggedIn) { + // 登录态下强制要求主/子域配置完整，避免混域运行 + if (userStore.isLoggedIn && !isPortalDomainConfigReady) { + if (import.meta.env.PROD) { + userStore.logout() + next(loginPathByRoute) + return + } + } + + // 域名隔离：子账号登录态必须在子账号专属域名 + if (userStore.isLoggedIn && userStore.accountKind === 'subordinate' && subPortalOrigin && !isCurrentOrigin(subPortalOrigin)) { + window.location.replace(`${subPortalOrigin}${to.fullPath}`) + return + } + + // 域名隔离：普通/管理员账号不应停留在子账号专属域名 + if (userStore.isLoggedIn && userStore.accountKind !== 'subordinate' && subPortalOrigin && isCurrentOrigin(subPortalOrigin)) { + if (mainPortalOrigin) { + window.location.replace(`${mainPortalOrigin}${to.fullPath}`) + return + } next('/products') return } + // 已登录用户访问认证页面，按账号类型重定向到对应首页 + if (isAuthRoute && userStore.isLoggedIn) { + next(userStore.accountKind === 'subordinate' ? '/subscriptions' : '/dashboard') + return + } + + // 子站壳：禁止进入主站登录/注册路由（可合并子账号入口到 /sub/auth） + if (isSubPortal && (to.path.startsWith('/auth/login') || to.path.startsWith('/auth/register'))) { + next(to.path.replace('/auth/', '/sub/auth/')) + return + } + + // 主站与「子站壳」共仓：/sub/auth/* 始终可用，子账号注册/登录与主站 /auth 并存，邀请链接不依赖单独构建 + + // 下属账号不可进入主账号「下属」管理页 + if (to.path.startsWith('/parent/subordinates') && userStore.accountKind === 'subordinate') { + next('/subscriptions') + return + } + + // 下属账号不允许访问仪表盘 + if (to.path.startsWith('/dashboard') && userStore.accountKind === 'subordinate') { + next('/subscriptions') + return + } + next() }) diff --git a/src/stores/user.js b/src/stores/user.js index 5ffee25..cdbc1d1 100644 --- a/src/stores/user.js +++ b/src/stores/user.js @@ -92,6 +92,7 @@ */ import { userApi } from '@/api' +import { isSubPortal } from '@/constants/portal' import router from '@/router' import { authEventBus } from '@/utils/request' import { generateSMSRequest } from '@/utils/smsSignature' @@ -133,6 +134,10 @@ export const useUserStore = defineStore('user', () => { return user.value?.is_certified || false }) + const accountKind = computed(() => user.value?.account_kind || 'standalone') + + const isSubordinate = computed(() => accountKind.value === 'subordinate') + // 检查用户信息是否完整 const isUserInfoComplete = computed(() => { return user.value && @@ -162,6 +167,8 @@ export const useUserStore = defineStore('user', () => { return userType.value === role } + const loginHomePath = () => (isSubPortal ? '/sub/auth/login' : '/auth/login') + // 监听认证错误事件 const handleAuthError = (message) => { console.log('用户store收到认证错误事件:', message) @@ -173,7 +180,7 @@ export const useUserStore = defineStore('user', () => { console.log('收到版本退出登录事件:', event.detail) logout() ElMessage.error('系统已更新，请重新登录') - router.push('/auth/login') + router.push(loginHomePath()) } // 处理版本刷新事件 @@ -205,7 +212,7 @@ export const useUserStore = defineStore('user', () => { ElMessage.error('系统已更新，请重新登录') // 跳转到登录页面 - router.push('/auth/login') + router.push(loginHomePath()) return false } @@ -521,6 +528,8 @@ export const useUserStore = defineStore('user', () => { isCertified, // 新增 isUserInfoComplete, // 新增 hasRole, + accountKind, + isSubordinate, // 方法 login, diff --git a/src/utils/request.js b/src/utils/request.js index 4a4519c..0f0cc37 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -253,9 +253,12 @@ const handleAuthError = (message) => { // 显示错误消息 ElMessage.error(message) + const currentPath = router.currentRoute.value.path || '' + const loginPath = currentPath.startsWith('/sub/') ? '/sub/auth/login' : '/auth/login' + // 跳转到登录页面（如果不在登录页面） - if (router.currentRoute.value.path !== '/auth/login') { - router.push('/auth/login') + if (currentPath !== loginPath) { + router.push(loginPath) } }