Update pages/Login.tsx

pages/Login.tsx

@@ -13,6 +13,24 @@ const AVATAR_SEEDS = [
   'Miss kitty', 'Loki', 'Sassy', 'Simba', 'Oliver', 'Princess', 'Garfield', 'Salem'
 ];
 
+const gradeOrder: Record<string, number> = {
+  '一年级': 1, '二年级': 2, '三年级': 3, '四年级': 4, '五年级': 5, '六年级': 6,
+  '初一': 7, '七年级': 7, '初二': 8, '八年级': 8, '初三': 9, '九年级': 9,
+  '高一': 10, '高二': 11, '高三': 12
+};
+
+const sortClasses = (a: ClassInfo, b: ClassInfo) => {
+  const gA = gradeOrder[a.grade] || 99;
+  const gB = gradeOrder[b.grade] || 99;
+  if (gA !== gB) return gA - gB;
+  
+  const nA = parseInt(a.className.replace(/[^0-9]/g, '')) || 0;
+  const nB = parseInt(b.className.replace(/[^0-9]/g, '')) || 0;
+  if (nA !== nB) return nA - nB;
+  
+  return a.className.localeCompare(b.className);
+};
+
 export const Login: React.FC<LoginProps> = ({ onLogin }) => {
   const [view, setView] = useState<'login' | 'register'>('login');
   
@@ -55,7 +73,8 @@ export const Login: React.FC<LoginProps> = ({ onLogin }) => {
        fetch(`${location.origin}/api/public/meta?schoolId=${regForm.schoolId}`)
          .then(res => res.json())
          .then(data => {
-            setSchoolClasses(data.classes || []);
+            const sortedClasses = (data.classes || []).sort(sortClasses);
+            setSchoolClasses(sortedClasses);
             setSchoolSubjects(data.subjects || []);
          })
          .catch(console.error);