Upload 62 files

pages/UserList.tsx

@@ -2,7 +2,7 @@
 import React, { useState, useEffect } from 'react';
 import { User, UserRole, UserStatus, School, ClassInfo } from '../types';
 import { api } from '../services/api';
-import { Loader2, Check, X, Trash2, Edit, Briefcase, GraduationCap, AlertCircle, Bot } from 'lucide-react';
+import { Loader2, Check, X, Trash2, Edit, Briefcase, GraduationCap, AlertCircle, Bot, Building } from 'lucide-react';
 import { ConfirmModal } from '../components/ConfirmModal';
 import { Toast, ToastState } from '../components/Toast';
 
@@ -44,14 +44,28 @@ export const UserList: React.FC = () => {
   useEffect(() => { loadData(); }, []);
 
   const handleApprove = async (user: User) => {
+    // If pending school creation, notify admin
+    let confirmMsg = `确认批准 ${user.trueName || user.username} 的注册申请？`;
+    if (user.pendingSchoolData) {
+        confirmMsg = `⚠️ 重要：该用户申请创建新学校 [${user.pendingSchoolData.name}]。\n\n批准后，系统将自动创建该学校并将此账号设为校长。\n确定要批准吗？`;
+    }
+
     setConfirmModal({
         isOpen: true,
         title: '批准注册',
-        message: `确认批准 ${user.trueName || user.username} 的注册申请？`,
+        message: confirmMsg,
         onConfirm: async () => {
-            await api.users.update(user._id || String(user.id), { status: UserStatus.ACTIVE });
-            setToast({ show: true, message: '已批准', type: 'success' });
-            loadData();
+            try {
+                await api.users.update(user._id || String(user.id), { status: UserStatus.ACTIVE });
+                setToast({ show: true, message: '已批准', type: 'success' });
+                loadData();
+                // If created school, force refresh school list event for header
+                if (user.pendingSchoolData) {
+                    window.dispatchEvent(new Event('school-updated'));
+                }
+            } catch (e: any) {
+                setToast({ show: true, message: '操作失败: ' + (e.message || '未知错误'), type: 'error' });
+            }
         }
     });
   };
@@ -249,9 +263,19 @@ export const UserList: React.FC = () => {
                          {schools.map(s => <option key={s._id} value={s._id}>{s.name}</option>)}
                       </select>
                    ) : (
-                      <div className={`flex items-center space-x-1 group ${isAdmin && !isSelf ? 'cursor-pointer' : ''}`} onClick={() => isAdmin && !isSelf && setEditingUser(user)}>
-                         <span className="text-gray-700">{getSchoolName(user.schoolId)}</span>
-                         {isAdmin && !isSelf && <Edit size={12} className="text-gray-300 opacity-0 group-hover:opacity-100"/>}
+                      <div className={`flex flex-col ${isAdmin && !isSelf ? 'cursor-pointer group' : ''}`} onClick={() => isAdmin && !isSelf && setEditingUser(user)}>
+                         {user.pendingSchoolData ? (
+                             <div className="bg-amber-50 p-2 rounded border border-amber-100">
+                                <span className="text-[10px] bg-amber-200 text-amber-800 px-1.5 py-0.5 rounded w-fit mb-1 font-bold flex items-center gap-1"><Building size={10}/> 申请创建学校</span>
+                                <div className="text-gray-800 font-bold text-xs">{user.pendingSchoolData.name}</div>
+                                <div className="text-gray-400 text-[10px] font-mono">CODE: {user.pendingSchoolData.code}</div>
+                             </div>
+                         ) : (
+                             <div className="flex items-center space-x-1">
+                                 <span className="text-gray-700">{getSchoolName(user.schoolId)}</span>
+                                 {isAdmin && !isSelf && <Edit size={12} className="text-gray-300 opacity-0 group-hover:opacity-100"/>}
+                             </div>
+                         )}
                       </div>
                    )}
                 </td>

types.ts

@@ -35,6 +35,11 @@ export interface User {
     targetClass?: string;
     status: 'PENDING' | 'REJECTED';
   };
+  // For Principal creating a new school
+  pendingSchoolData?: {
+      name: string;
+      code: string;
+  };
   studentNo?: string;
   parentName?: string;
   parentPhone?: string;
@@ -290,6 +295,7 @@ export interface ExchangeRule {
   rewardType: 'DRAW_COUNT' | 'ITEM';
   rewardName: string;
   rewardValue: number;
+  achievementId?: string;
 }
 
 export interface AchievementConfig {
@@ -382,4 +388,4 @@ export interface AIChatMessage {
   audio?: string;
   isAudioMessage?: boolean;
   timestamp: number;
-}
+}