forked from wangziqi/gongxue-base
fix: guard H5 direct routes and refine legacy UI
This commit is contained in:
Codex
@@ -1,9 +1,9 @@
|
||||
import { useEffect, useState } from 'react';
|
||||
import Taro from '@tarojs/taro';
|
||||
import Taro, { useRouter } from '@tarojs/taro';
|
||||
import { Button, Text, View } from '@tarojs/components';
|
||||
import { appEnv, assertFrontendSecretsAreAbsent, ensureRuntimeConfigLoaded, isH5Runtime } from '@/env';
|
||||
import { resolveTenant } from '@/services/api';
|
||||
import { landingPath, requirePlatformAdmin, requireTenantAdmin } from '@/services/routeGuard';
|
||||
import { landingPath, requirePlatformAdmin, requireSignedIn, requireTenantAdmin, safeRedirectPath } from '@/services/routeGuard';
|
||||
import './index.css';
|
||||
|
||||
function hostFromRuntime() {
|
||||
@@ -12,23 +12,25 @@ function hostFromRuntime() {
|
||||
}
|
||||
|
||||
export default function BootstrapPage() {
|
||||
const router = useRouter();
|
||||
const [status, setStatus] = useState('正在解析租户');
|
||||
const [error, setError] = useState('');
|
||||
|
||||
useEffect(() => {
|
||||
const redirectPath = safeRedirectPath(router.params?.redirect ? decodeURIComponent(router.params.redirect) : landingPath());
|
||||
assertFrontendSecretsAreAbsent();
|
||||
ensureRuntimeConfigLoaded()
|
||||
.then(() => resolveTenant({ host: hostFromRuntime() }))
|
||||
.then(async () => {
|
||||
if (appEnv.portal === 'student') return null;
|
||||
setStatus('正在校验登录状态');
|
||||
if (appEnv.portal === 'platform-admin') return requirePlatformAdmin(landingPath());
|
||||
return requireTenantAdmin(landingPath());
|
||||
if (appEnv.portal === 'student') return requireSignedIn(redirectPath);
|
||||
if (appEnv.portal === 'platform-admin') return requirePlatformAdmin(redirectPath);
|
||||
return requireTenantAdmin(redirectPath);
|
||||
})
|
||||
.then(authPayload => {
|
||||
if (appEnv.portal !== 'student' && !authPayload) return;
|
||||
if (!authPayload) return;
|
||||
setStatus('租户解析完成');
|
||||
Taro.redirectTo({ url: landingPath() });
|
||||
Taro.redirectTo({ url: redirectPath });
|
||||
})
|
||||
.catch((nextError: Error) => {
|
||||
setError(nextError.message);
|
||||
|
||||
@@ -1,6 +1,72 @@
|
||||
.student-home-layout {
|
||||
position: relative;
|
||||
min-height: 100vh;
|
||||
}
|
||||
|
||||
.student-page {
|
||||
min-height: 100vh;
|
||||
padding: 28px;
|
||||
padding-bottom: 132px;
|
||||
}
|
||||
|
||||
.legacy-student-sidebar {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.legacy-mobile-dock {
|
||||
position: fixed;
|
||||
right: 18px;
|
||||
bottom: 18px;
|
||||
left: 18px;
|
||||
z-index: 30;
|
||||
display: flex;
|
||||
justify-content: space-around;
|
||||
gap: 4px;
|
||||
padding: 14px 12px;
|
||||
border: 1px solid rgba(255, 255, 255, 0.6);
|
||||
border-radius: 28px;
|
||||
background: rgba(255, 255, 255, 0.94);
|
||||
box-shadow: 0 14px 34px rgba(15, 23, 42, 0.18);
|
||||
}
|
||||
|
||||
.legacy-dock-item {
|
||||
display: flex;
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
gap: 5px;
|
||||
color: #9ca3af;
|
||||
}
|
||||
|
||||
.legacy-dock-item.active {
|
||||
color: var(--tiku-primary);
|
||||
}
|
||||
|
||||
.legacy-dock-dot {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
width: 42px;
|
||||
height: 42px;
|
||||
border-radius: 16px;
|
||||
background: #f1f5f9;
|
||||
font-size: 21px;
|
||||
font-weight: 900;
|
||||
line-height: 42px;
|
||||
}
|
||||
|
||||
.legacy-dock-item.active .legacy-dock-dot {
|
||||
background: var(--tiku-primary);
|
||||
color: #fff;
|
||||
box-shadow: 0 8px 18px rgba(17, 82, 212, 0.24);
|
||||
}
|
||||
|
||||
.legacy-dock-text {
|
||||
display: block;
|
||||
font-size: 18px;
|
||||
font-weight: 760;
|
||||
line-height: 1.2;
|
||||
}
|
||||
|
||||
.topbar {
|
||||
@@ -325,10 +391,183 @@
|
||||
}
|
||||
|
||||
@media (min-width: 900px) {
|
||||
.student-home-layout {
|
||||
display: grid;
|
||||
grid-template-columns: 260px minmax(0, 1fr);
|
||||
gap: 28px;
|
||||
min-height: 100vh;
|
||||
padding: 24px;
|
||||
}
|
||||
|
||||
.legacy-student-sidebar {
|
||||
position: sticky;
|
||||
top: 24px;
|
||||
display: flex;
|
||||
height: calc(100vh - 48px);
|
||||
flex-direction: column;
|
||||
padding: 22px;
|
||||
border: 1px solid rgba(226, 232, 240, 0.9);
|
||||
border-radius: 30px;
|
||||
background: rgba(255, 255, 255, 0.92);
|
||||
box-shadow: 0 16px 34px rgba(15, 23, 42, 0.08);
|
||||
}
|
||||
|
||||
.legacy-brand-block {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 14px;
|
||||
min-width: 0;
|
||||
padding: 6px 4px 24px;
|
||||
}
|
||||
|
||||
.legacy-brand-icon {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
flex: 0 0 48px;
|
||||
width: 48px;
|
||||
height: 48px;
|
||||
border-radius: 16px;
|
||||
background: var(--tiku-primary);
|
||||
box-shadow: 0 10px 20px rgba(17, 82, 212, 0.26);
|
||||
}
|
||||
|
||||
.legacy-brand-mark {
|
||||
color: #fff;
|
||||
font-size: 26px;
|
||||
font-weight: 950;
|
||||
}
|
||||
|
||||
.legacy-brand-copy {
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.legacy-brand-name {
|
||||
display: block;
|
||||
color: #111827;
|
||||
font-size: 19px;
|
||||
font-weight: 950;
|
||||
line-height: 1.25;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.legacy-brand-sub {
|
||||
display: block;
|
||||
margin-top: 3px;
|
||||
color: var(--tiku-primary);
|
||||
font-size: 14px;
|
||||
font-weight: 850;
|
||||
}
|
||||
|
||||
.legacy-nav-list {
|
||||
display: flex;
|
||||
flex: 1;
|
||||
flex-direction: column;
|
||||
gap: 8px;
|
||||
padding-top: 8px;
|
||||
border-top: 1px solid #f1f5f9;
|
||||
}
|
||||
|
||||
.legacy-nav-item {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 12px;
|
||||
min-height: 52px;
|
||||
padding: 0 14px;
|
||||
border-radius: 16px;
|
||||
color: #64748b;
|
||||
}
|
||||
|
||||
.legacy-nav-item.active {
|
||||
background: #111827;
|
||||
color: #fff;
|
||||
box-shadow: 0 8px 20px rgba(15, 23, 42, 0.16);
|
||||
}
|
||||
|
||||
.legacy-nav-dot {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
width: 28px;
|
||||
height: 28px;
|
||||
border-radius: 10px;
|
||||
background: #f1f5f9;
|
||||
color: inherit;
|
||||
font-size: 16px;
|
||||
font-weight: 900;
|
||||
}
|
||||
|
||||
.legacy-nav-item.active .legacy-nav-dot {
|
||||
background: rgba(255, 255, 255, 0.16);
|
||||
}
|
||||
|
||||
.legacy-nav-text {
|
||||
font-size: 18px;
|
||||
font-weight: 850;
|
||||
}
|
||||
|
||||
.legacy-sidebar-user {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 12px;
|
||||
padding-top: 18px;
|
||||
border-top: 1px solid #f1f5f9;
|
||||
}
|
||||
|
||||
.legacy-mini-avatar {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
flex: 0 0 44px;
|
||||
width: 44px;
|
||||
height: 44px;
|
||||
border-radius: 999px;
|
||||
background: linear-gradient(135deg, #1152d4, #60a5fa);
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.legacy-mini-avatar-mark {
|
||||
color: #fff;
|
||||
font-size: 20px;
|
||||
font-weight: 900;
|
||||
}
|
||||
|
||||
.legacy-sidebar-user-copy {
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.legacy-sidebar-user-name {
|
||||
display: block;
|
||||
color: #334155;
|
||||
font-size: 16px;
|
||||
font-weight: 850;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.legacy-sidebar-user-tag {
|
||||
display: inline-flex;
|
||||
margin-top: 4px;
|
||||
padding: 2px 8px;
|
||||
border-radius: 999px;
|
||||
background: linear-gradient(90deg, #fef3c7, #fde68a);
|
||||
color: #92400e;
|
||||
font-size: 13px;
|
||||
font-weight: 850;
|
||||
}
|
||||
|
||||
.legacy-mobile-dock {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.student-page {
|
||||
max-width: 980px;
|
||||
margin: 0 auto;
|
||||
padding: 36px;
|
||||
padding-bottom: 48px;
|
||||
}
|
||||
|
||||
.hero-band {
|
||||
|
||||
@@ -40,9 +40,42 @@ export default function StudentHomePage() {
|
||||
{ name: '消息通知', path: '/pages/student/notifications/index', meta: '通知 / 待办', tone: 'orange' },
|
||||
{ name: '个人中心', path: '/pages/student/profile/index', meta: '会员 / 订单', tone: 'slate' },
|
||||
];
|
||||
const navItems = [
|
||||
{ name: '首页', path: '/pages/student/home/index', active: true },
|
||||
{ name: '背单词', path: '/pages/student/vocabulary/index' },
|
||||
{ name: '知识手册', path: '/pages/student/handbook/index' },
|
||||
{ name: '购买', path: '/pages/student/checkout/index' },
|
||||
{ name: '分数线', path: '/pages/student/scoreline/index' },
|
||||
{ name: '我的', path: '/pages/student/profile/index' },
|
||||
];
|
||||
|
||||
return (
|
||||
<View className='student-page'>
|
||||
<View className='student-home-layout'>
|
||||
<View className='legacy-student-sidebar'>
|
||||
<View className='legacy-brand-block'>
|
||||
<View className='legacy-brand-icon'><Text className='legacy-brand-mark'>题</Text></View>
|
||||
<View className='legacy-brand-copy'>
|
||||
<Text className='legacy-brand-name'>{brandName}</Text>
|
||||
<Text className='legacy-brand-sub'>专升本刷题宝</Text>
|
||||
</View>
|
||||
</View>
|
||||
<View className='legacy-nav-list'>
|
||||
{navItems.map(item => (
|
||||
<View className={`legacy-nav-item ${item.active ? 'active' : ''}`} key={item.path} onClick={() => Taro.navigateTo({ url: item.path })}>
|
||||
<Text className='legacy-nav-dot'>{item.name.slice(0, 1)}</Text>
|
||||
<Text className='legacy-nav-text'>{item.name}</Text>
|
||||
</View>
|
||||
))}
|
||||
</View>
|
||||
<View className='legacy-sidebar-user'>
|
||||
<View className='legacy-mini-avatar'><Text className='legacy-mini-avatar-mark'>{(userName || '同').slice(0, 1)}</Text></View>
|
||||
<View className='legacy-sidebar-user-copy'>
|
||||
<Text className='legacy-sidebar-user-name'>{userName || '同学'}</Text>
|
||||
<Text className='legacy-sidebar-user-tag'>SVIP</Text>
|
||||
</View>
|
||||
</View>
|
||||
</View>
|
||||
<View className='student-page'>
|
||||
<View className='topbar'>
|
||||
<View className='home-user'>
|
||||
<View className='home-avatar'>
|
||||
@@ -116,6 +149,15 @@ export default function StudentHomePage() {
|
||||
))}
|
||||
</View>
|
||||
</View>
|
||||
</View>
|
||||
<View className='legacy-mobile-dock'>
|
||||
{navItems.slice(0, 5).map(item => (
|
||||
<View className={`legacy-dock-item ${item.active ? 'active' : ''}`} key={item.path} onClick={() => Taro.navigateTo({ url: item.path })}>
|
||||
<Text className='legacy-dock-dot'>{item.name.slice(0, 1)}</Text>
|
||||
<Text className='legacy-dock-text'>{item.name}</Text>
|
||||
</View>
|
||||
))}
|
||||
</View>
|
||||
</View>
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user