Upload 37 files

pages/GameLucky.tsx

@@ -2,7 +2,7 @@
 import React, { useState, useEffect } from 'react';
 import { api } from '../services/api';
 import { LuckyDrawConfig, Student, LuckyPrize } from '../types';
-import { Gift, Settings, Loader2, Save, Trash2, X, UserCircle, RefreshCcw } from 'lucide-react';
+import { Gift, Settings, Loader2, Save, Trash2, X, UserCircle, RefreshCcw, HelpCircle } from 'lucide-react';
 
 const FlipCard = ({ index, prize, onFlip, isRevealed, activeIndex }: { index: number, prize: string, onFlip: (idx: number) => void, isRevealed: boolean, activeIndex: number | null }) => {
   const showBack = isRevealed && activeIndex === index;
@@ -118,7 +118,7 @@ export const GameLucky: React.FC = () => {
            setActiveCardIndex(null);
         }, 2000);
      } catch (e: any) {
-        // Use backend message directly if available, otherwise fallback
+        // Use backend message directly
         alert(e.message || '抽奖失败，请稍后重试');
         setIsFlipping(false);
         setActiveCardIndex(null);
@@ -215,7 +215,7 @@ export const GameLucky: React.FC = () => {
         {/* SETTINGS MODAL */}
         {isSettingsOpen && (
             <div className="fixed inset-0 bg-black/60 z-[100] flex items-center justify-center p-4 backdrop-blur-sm">
-                <div className="bg-white rounded-2xl w-full max-w-3xl h-[85vh] flex flex-col shadow-2xl animate-in zoom-in-95">
+                <div className="bg-white rounded-2xl w-full max-w-4xl h-[90vh] flex flex-col shadow-2xl animate-in zoom-in-95">
                     <div className="p-6 border-b border-gray-100 flex justify-between items-center">
                         <h3 className="text-xl font-bold text-gray-800">红包奖池配置 - {currentClassName}</h3>
                         <button onClick={() => setIsSettingsOpen(false)}><X size={24} className="text-gray-400 hover:text-gray-600"/></button>
@@ -237,12 +237,28 @@ export const GameLucky: React.FC = () => {
                             </div>
                         </div>
 
+                        {/* WEIGHT CONFIG */}
+                        <div className="mb-6 bg-amber-50 p-4 rounded-xl border border-amber-100">
+                             <h4 className="font-bold text-amber-800 text-sm mb-2 flex items-center"><HelpCircle size={16} className="mr-1"/> 抽奖权重规则说明</h4>
+                             <p className="text-xs text-amber-700 mb-2">中奖概率 = (该奖品权重 / 总权重池) * 100%。<br/>总权重池 = 所有上架奖品的权重之和 + 安慰奖权重。</p>
+                             <div className="flex items-center gap-4 mt-3">
+                                <label className="text-sm font-bold text-gray-700">设置安慰奖(未中奖)权重:</label>
+                                <input 
+                                   type="number" 
+                                   className="border rounded px-2 py-1 w-24 text-center font-bold"
+                                   value={luckyConfig.consolationWeight || 0}
+                                   onChange={e => setLuckyConfig({...luckyConfig, consolationWeight: Number(e.target.value)})}
+                                />
+                                <span className="text-xs text-gray-500">设为0则表示百分百中奖(只要有库存)</span>
+                             </div>
+                        </div>
+
                         <div className="bg-white rounded-xl border shadow-sm overflow-hidden">
                             <table className="w-full text-sm text-left">
                                 <thead className="bg-gray-100 text-gray-500 uppercase text-xs">
                                     <tr>
                                         <th className="p-4">奖品名称</th>
-                                        <th className="p-4 w-24 text-center">概率 (%)</th>
+                                        <th className="p-4 w-32 text-center">权重 (Probability)</th>
                                         <th className="p-4 w-24 text-center">库存</th>
                                         <th className="p-4 w-16 text-right">操作</th>
                                     </tr>
@@ -258,7 +274,7 @@ export const GameLucky: React.FC = () => {
                                         <td className="p-3">
                                             <input type="number" value={p.probability} onChange={e => {
                                                 const np = [...luckyConfig.prizes]; np[idx].probability = Number(e.target.value); setLuckyConfig({...luckyConfig, prizes: np});
-                                            }} className="w-full text-center border rounded bg-gray-50 py-1 focus:bg-white"/>
+                                            }} className="w-full text-center border rounded bg-gray-50 py-1 focus:bg-white font-mono"/>
                                         </td>
                                         <td className="p-3">
                                             <input type="number" value={p.count} onChange={e => {
@@ -293,4 +309,4 @@ export const GameLucky: React.FC = () => {
         )}
     </div>
   );
-};
+};

pages/Settings.tsx

@@ -1,6 +1,6 @@
 
 import React, { useState, useEffect } from 'react';
-import { Save, Bell, Lock, Database, Loader2, Plus, X, Trash2, Globe, Edit } from 'lucide-react';
+import { Save, Bell, Lock, Database, Loader2, Plus, X, Trash2, Globe, Edit, Calendar, GraduationCap } from 'lucide-react';
 import { api } from '../services/api';
 import { SystemConfig } from '../types';
 
@@ -24,6 +24,10 @@ export const Settings: React.FC = () => {
   const [editingIndex, setEditingIndex] = useState<number | null>(null);
   const [editVal, setEditVal] = useState('');
 
+  // Promotion State
+  const [teacherFollows, setTeacherFollows] = useState(false);
+  const [promoting, setPromoting] = useState(false);
+
   useEffect(() => {
     const loadConfig = async () => {
       try {
@@ -63,6 +67,23 @@ export const Settings: React.FC = () => {
     }
   };
 
+  // Auto Generate Semester Name
+  const autoGenerateSemester = () => {
+      const now = new Date();
+      const year = now.getFullYear();
+      const month = now.getMonth() + 1;
+      let semName = '';
+      if (month >= 8 || month <= 1) {
+          semName = `${year}-${year+1}学年 第一学期`;
+      } else {
+          semName = `${year-1}-${year}学年 第二学期`;
+      }
+      if (!config.semesters?.includes(semName)) {
+          setConfig(prev => ({ ...prev, semesters: [semName, ...(prev.semesters || [])] })); // Prepend
+      }
+      setNewSemesterVal(semName);
+  };
+
   const removeSemester = (idx: number) => {
     const list = [...(config.semesters || [])];
     const valToRemove = list[idx];
@@ -90,6 +111,21 @@ export const Settings: React.FC = () => {
     setEditingIndex(null);
   };
 
+  // --- Promotion Logic ---
+  const handlePromotion = async () => {
+      if (!confirm(`⚠️ 高风险操作警告！\n\n1. 所有学生年级将+1 (如: 一年级->二年级)\n2. 六年级/初三/高三学生将标记为“毕业”\n3. ${teacherFollows ? '班主任将随班升级 (继续带该班)' : '班主任将留在原年级 (班级变空)'}\n\n确定要执行全校升学吗？`)) return;
+      
+      setPromoting(true);
+      try {
+          const res = await api.students.promote({ teacherFollows });
+          alert(`升学操作完成！\n共处理学生: ${res.count} 人。`);
+      } catch (e: any) {
+          alert('操作失败: ' + e.message);
+      } finally {
+          setPromoting(false);
+      }
+  };
+
   if (fetching) return <div className="p-10 text-center text-gray-500">加载配置中...</div>;
 
   return (
@@ -122,19 +158,26 @@ export const Settings: React.FC = () => {
 
           <div className="space-y-2">
             <label className="text-sm font-medium text-gray-700">当前生效学期</label>
-            <select 
-              value={config.semester}
-              onChange={(e) => setConfig({...config, semester: e.target.value})}
-              className="w-full px-3 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-500 focus:outline-none bg-white"
-            >
-              {(config.semesters || []).map(s => <option key={s} value={s}>{s}</option>)}
-            </select>
+            <div className="flex gap-2">
+                <select 
+                value={config.semester}
+                onChange={(e) => setConfig({...config, semester: e.target.value})}
+                className="flex-1 px-3 py-2 border border-gray-300 rounded-lg focus:ring-2 focus:ring-blue-500 focus:outline-none bg-white"
+                >
+                {(config.semesters || []).map(s => <option key={s} value={s}>{s}</option>)}
+                </select>
+            </div>
+            <p className="text-xs text-gray-500">切换学期后，所有成就、成绩、考勤数据将关联到新学期。</p>
           </div>
 
           {/* Semester Management List */}
           <div className="bg-gray-50 p-4 rounded-lg border border-gray-200">
-             <label className="text-xs font-bold text-gray-500 uppercase mb-2 block">学期列表管理</label>
-             <div className="space-y-2 mb-3">
+             <div className="flex justify-between items-center mb-2">
+                <label className="text-xs font-bold text-gray-500 uppercase block">学期列表管理</label>
+                <button onClick={autoGenerateSemester} className="text-xs bg-white border px-2 py-1 rounded hover:bg-blue-50 text-blue-600 flex items-center"><Calendar size={12} className="mr-1"/> 自动生成当前学期</button>
+             </div>
+             
+             <div className="space-y-2 mb-3 max-h-40 overflow-y-auto">
                 {(config.semesters || []).map((s, idx) => (
                    <div key={idx} className="flex items-center gap-2 bg-white p-2 rounded border border-gray-200">
                       {editingIndex === idx ? (
@@ -166,6 +209,49 @@ export const Settings: React.FC = () => {
         </div>
       </div>
 
+      {/* Academic Year Management */}
+      <div className="bg-white rounded-xl shadow-sm border border-gray-100 overflow-hidden">
+        <div className="p-6 border-b border-gray-100 flex items-center space-x-3">
+          <div className="p-2 bg-purple-50 rounded-lg text-purple-600">
+            <GraduationCap size={20} />
+          </div>
+          <h3 className="text-lg font-bold text-gray-800">学年与升学管理</h3>
+        </div>
+        <div className="p-6">
+            <div className="bg-red-50 border border-red-100 p-4 rounded-xl">
+                <h4 className="font-bold text-red-800 mb-2">一键升学 (年级晋升)</h4>
+                <p className="text-sm text-red-700 mb-4">
+                    此操作将自动把所有学生升级到下一年级 (如: 一年级 -> 二年级)。<br/>
+                    最高年级学生将自动标记为“毕业”。如果新班级不存在，系统将自动创建。
+                </p>
+                
+                <div className="flex items-center gap-2 mb-4">
+                    <input 
+                        type="checkbox" 
+                        id="teacherFollows" 
+                        className="w-5 h-5 text-blue-600"
+                        checked={teacherFollows}
+                        onChange={e => setTeacherFollows(e.target.checked)}
+                    />
+                    <label htmlFor="teacherFollows" className="text-sm font-bold text-gray-700">启用“班主任随班升级”</label>
+                </div>
+                <p className="text-xs text-gray-500 mb-4 pl-7">
+                    * 选中: 张老师带“一年级(1)班”，升学后继续带“二年级(1)班”。<br/>
+                    * 未选: 张老师留在“一年级”，新的一年级(1)班将没有学生，二年级(1)班无班主任。
+                </p>
+
+                <button 
+                    onClick={handlePromotion}
+                    disabled={promoting}
+                    className="bg-red-600 text-white px-6 py-2 rounded-lg font-bold hover:bg-red-700 shadow-md flex items-center disabled:opacity-50"
+                >
+                    {promoting && <Loader2 className="animate-spin mr-2"/>}
+                    执行全校升学
+                </button>
+            </div>
+        </div>
+      </div>
+
       {/* Security & Access */}
       <div className="bg-white rounded-xl shadow-sm border border-gray-100 overflow-hidden">
         <div className="p-6 border-b border-gray-100 flex items-center space-x-3">
@@ -246,4 +332,4 @@ export const Settings: React.FC = () => {
       </div>
     </div>
   );
-};
+};

pages/StudentList.tsx

@@ -1,11 +1,10 @@
 
 import React, { useState, useEffect } from 'react';
-import { Search, Plus, Upload, Edit, Trash2, X, Loader2, User, FileSpreadsheet } from 'lucide-react';
+import { Search, Plus, Upload, Edit, Trash2, X, Loader2, User, FileSpreadsheet, ArrowRightLeft } from 'lucide-react';
 import { api } from '../services/api';
 import { Student, ClassInfo } from '../types';
-import { sortGrades, sortClasses } from './Dashboard'; // Reuse Sort Logic if possible, otherwise define locally
 
-// Re-define sort logic locally to be safe if imports fail or circular dependency risks
+// Re-define sort logic locally
 const localSortGrades = (a: string, b: string) => {
     const order: Record<string, number> = { '一年级': 1, '二年级': 2, '三年级': 3, '四年级': 4, '五年级': 5, '六年级': 6, '初一': 7, '七年级': 7, '初二': 8, '八年级': 8, '初三': 9, '九年级': 9, '高一': 10, '高二': 11, '高三': 12 };
     return (order[a] || 99) - (order[b] || 99);
@@ -19,11 +18,13 @@ export const StudentList: React.FC = () => {
 
   const [isModalOpen, setIsModalOpen] = useState(false);
   const [isImportOpen, setIsImportOpen] = useState(false);
+  const [isTransferOpen, setIsTransferOpen] = useState(false);
   const [submitting, setSubmitting] = useState(false);
   const [selectedIds, setSelectedIds] = useState<Set<string>>(new Set());
 
-  // Edit Mode State
+  // Edit/Transfer State
   const [editStudentId, setEditStudentId] = useState<string | null>(null);
+  const [transferTargetClass, setTransferTargetClass] = useState('');
 
   // Filters
   const [selectedGrade, setSelectedGrade] = useState('All');
@@ -131,6 +132,26 @@ export const StudentList: React.FC = () => {
       setIsModalOpen(true);
   };
 
+  const handleOpenTransfer = (student: Student) => {
+      if (!hasPermission(student.className)) return alert('无权操作调班');
+      setEditStudentId(student._id || String(student.id));
+      setTransferTargetClass(student.className);
+      setIsTransferOpen(true);
+  };
+
+  const submitTransfer = async () => {
+      if (!editStudentId || !transferTargetClass) return;
+      if (confirm(`确定将学生调转至 ${transferTargetClass} 吗？`)) {
+          setSubmitting(true);
+          try {
+              await api.students.transfer({ studentId: editStudentId, targetClass: transferTargetClass });
+              setIsTransferOpen(false);
+              loadData();
+          } catch(e) { alert('调班失败'); }
+          finally { setSubmitting(false); }
+      }
+  };
+
   const handleSubmit = async (e: React.FormEvent) => {
     e.preventDefault();
     setSubmitting(true);
@@ -344,6 +365,7 @@ export const StudentList: React.FC = () => {
                 <td className="px-6 py-4 text-right flex justify-end space-x-2">
                    {canEdit ? (
                       <>
+                        <button onClick={() => handleOpenTransfer(s)} className="text-amber-500 hover:text-amber-700" title="调班"><ArrowRightLeft size={16}/></button>
                         <button onClick={() => handleOpenEdit(s)} className="text-blue-400 hover:text-blue-600" title="编辑"><Edit size={16}/></button>
                         <button onClick={() => handleDelete(s._id || String(s.id), s.className)} className="text-red-400 hover:text-red-600" title="删除"><Trash2 size={16}/></button>
                       </>
@@ -406,6 +428,24 @@ export const StudentList: React.FC = () => {
            </div>
         </div>
       )}
+      
+      {/* Transfer Modal */}
+      {isTransferOpen && (
+          <div className="fixed inset-0 bg-black/50 z-50 flex items-center justify-center p-4">
+             <div className="bg-white rounded-xl p-6 w-full max-w-sm animate-in zoom-in-95">
+                 <h3 className="font-bold text-lg mb-4">学生调班</h3>
+                 <p className="text-sm text-gray-500 mb-4">将选中的学生移动到新的班级。该学生在当前班级的未核销奖励可能会保留，但建议先核销。</p>
+                 <select className="w-full border p-2 rounded mb-4" value={transferTargetClass} onChange={e=>setTransferTargetClass(e.target.value)}>
+                     <option value="">-- 选择目标班级 --</option>
+                     {classList.map(c => <option key={c._id} value={c.grade+c.className}>{c.grade}{c.className}</option>)}
+                 </select>
+                 <div className="flex gap-2">
+                     <button onClick={submitTransfer} disabled={submitting || !transferTargetClass} className="flex-1 bg-amber-500 text-white py-2 rounded font-bold hover:bg-amber-600 disabled:opacity-50">确认调班</button>
+                     <button onClick={()=>setIsTransferOpen(false)} className="flex-1 border py-2 rounded hover:bg-gray-50">取消</button>
+                 </div>
+             </div>
+          </div>
+      )}
 
 
       {isImportOpen && (
@@ -447,4 +487,4 @@ export const StudentList: React.FC = () => {
       )}
     </div> 
   ); 
-};
+};

pages/UserList.tsx

@@ -1,15 +1,20 @@
 
 import React, { useState, useEffect } from 'react';
-import { User, UserRole, UserStatus, School } from '../types';
+import { User, UserRole, UserStatus, School, ClassInfo } from '../types';
 import { api } from '../services/api';
-import { Loader2, Check, X, Trash2, Building, Edit, Shield } from 'lucide-react';
+import { Loader2, Check, X, Trash2, Building, Edit, Shield, Briefcase, GraduationCap, MinusCircle } from 'lucide-react';
 
 export const UserList: React.FC = () => {
   const [users, setUsers] = useState<User[]>([]);
   const [schools, setSchools] = useState<School[]>([]);
+  const [classList, setClassList] = useState<ClassInfo[]>([]);
   const [loading, setLoading] = useState(true);
   const [editingUser, setEditingUser] = useState<User | null>(null);
   
+  // Teacher Apply Modal
+  const [isApplyOpen, setIsApplyOpen] = useState(false);
+  const [applyTarget, setApplyTarget] = useState('');
+
   const currentUser = api.auth.getCurrentUser();
   const isAdmin = currentUser?.role === UserRole.ADMIN;
   const isTeacher = currentUser?.role === UserRole.TEACHER;
@@ -18,12 +23,14 @@ export const UserList: React.FC = () => {
     setLoading(true);
     try {
       // Admin loads global, Teacher only loads local
-      const [u, s] = await Promise.all([
+      const [u, s, c] = await Promise.all([
          api.users.getAll({ global: isAdmin }), 
-         api.schools.getAll()
+         api.schools.getAll(),
+         api.classes.getAll()
       ]);
       setUsers(u);
       setSchools(s);
+      setClassList(c);
     } catch (e) { console.error(e); }
     finally { setLoading(false); }
   };
@@ -57,6 +64,49 @@ export const UserList: React.FC = () => {
     loadData();
   };
 
+  // Class Application Logic
+  const submitClassApply = async () => {
+      if (!applyTarget) return;
+      try {
+          await api.users.applyClass({ 
+              userId: currentUser?._id!, 
+              type: 'CLAIM', 
+              targetClass: applyTarget, 
+              action: 'APPLY' 
+          });
+          setIsApplyOpen(false);
+          alert('申请已提交，请等待管理员审核');
+          loadData(); // To refresh own status if visible
+      } catch(e) { alert('申请失败'); }
+  };
+  
+  const submitResign = async () => {
+      if(!confirm('确定申请卸任班主任吗？')) return;
+      try {
+          await api.users.applyClass({ 
+              userId: currentUser?._id!, 
+              type: 'RESIGN', 
+              action: 'APPLY' 
+          });
+          alert('卸任申请已提交');
+      } catch(e) { alert('提交失败'); }
+  };
+
+  const handleApplicationReview = async (user: User, action: 'APPROVE'|'REJECT') => {
+      if (!user.classApplication) return;
+      if (!confirm(`确认${action === 'APPROVE' ? '同意' : '拒绝'}该申请？`)) return;
+      try {
+          await api.users.applyClass({
+              userId: user._id!,
+              type: user.classApplication.type,
+              targetClass: user.classApplication.targetClass,
+              action
+          });
+          loadData();
+      } catch(e) { alert('操作失败'); }
+  };
+
+
   const getSchoolName = (id?: string) => schools.find(s => s._id === id)?.name || '未分配';
 
   // Filter Logic
@@ -76,7 +126,23 @@ export const UserList: React.FC = () => {
   return (
     <div className="bg-white rounded-xl shadow-sm border border-gray-100 p-6">
       <div className="flex justify-between items-center mb-4">
-         <h2 className="text-xl font-bold text-gray-800">用户权限与审核</h2>
+         <div className="flex items-center gap-4">
+            <h2 className="text-xl font-bold text-gray-800">用户权限与审核</h2>
+            {isTeacher && (
+                <div className="flex items-center gap-2">
+                    {currentUser.homeroomClass ? (
+                        <div className="flex items-center gap-2 bg-amber-50 text-amber-700 px-3 py-1 rounded-full text-sm font-bold border border-amber-100">
+                             <GraduationCap size={16}/> {currentUser.homeroomClass} 班主任
+                             <button onClick={submitResign} className="ml-2 text-xs text-gray-400 hover:text-red-500 underline">申请卸任</button>
+                        </div>
+                    ) : (
+                        <button onClick={() => setIsApplyOpen(true)} className="flex items-center gap-1 bg-blue-50 text-blue-600 px-3 py-1 rounded-full text-sm hover:bg-blue-100 border border-blue-200">
+                            <Briefcase size={14}/> 申请成为班主任
+                        </button>
+                    )}
+                </div>
+            )}
+         </div>
          {isAdmin && <span className="text-xs text-gray-500 bg-gray-100 px-2 py-1 rounded">全局视图</span>}
          {isTeacher && <span className="text-xs text-blue-500 bg-blue-50 px-2 py-1 rounded border border-blue-100">仅显示 {currentUser.homeroomClass || '我班'} 学生</span>}
       </div>
@@ -92,7 +158,7 @@ export const UserList: React.FC = () => {
               <th className="px-4 py-3">详细信息</th>
               <th className="px-4 py-3">所属学校</th>
               <th className="px-4 py-3">角色/班级</th>
-              <th className="px-4 py-3">状态</th>
+              <th className="px-4 py-3">状态/申请</th>
               <th className="px-4 py-3 text-right">操作</th>
             </tr>
           </thead>
@@ -100,6 +166,8 @@ export const UserList: React.FC = () => {
             {filteredUsers.map(user => {
               const isSelf = !!(currentUser && (user._id === currentUser._id || user.username === currentUser.username));
               const canEdit = isAdmin; // Only admin can edit details, Teachers can only approve
+              
+              const hasApp = user.classApplication && user.classApplication.status === 'PENDING';
 
               return (
               <tr key={user._id || user.id} className="hover:bg-gray-50">
@@ -166,9 +234,24 @@ export const UserList: React.FC = () => {
                    )}
                 </td>
                 <td className="px-4 py-3">
-                   {user.status === 'active' && <span className="bg-green-100 text-green-700 px-2 py-1 rounded-full text-xs">已激活</span>}
-                   {user.status === 'pending' && <span className="bg-yellow-100 text-yellow-700 px-2 py-1 rounded-full text-xs animate-pulse">待审核</span>}
-                   {user.status === 'banned' && <span className="bg-red-100 text-red-700 px-2 py-1 rounded-full text-xs">已停用</span>}
+                   {hasApp && isAdmin ? (
+                       <div className="bg-purple-50 border border-purple-200 rounded p-1 text-xs">
+                           <span className="font-bold text-purple-700 block mb-1">
+                               {user.classApplication?.type === 'CLAIM' ? `申请任教: ${user.classApplication.targetClass}` : '申请卸任'}
+                           </span>
+                           <div className="flex gap-1">
+                               <button onClick={()=>handleApplicationReview(user, 'APPROVE')} className="bg-green-500 text-white px-2 rounded hover:bg-green-600">同意</button>
+                               <button onClick={()=>handleApplicationReview(user, 'REJECT')} className="bg-red-400 text-white px-2 rounded hover:bg-red-500">拒绝</button>
+                           </div>
+                       </div>
+                   ) : (
+                       <>
+                        {user.status === 'active' && <span className="bg-green-100 text-green-700 px-2 py-1 rounded-full text-xs">已激活</span>}
+                        {user.status === 'pending' && <span className="bg-yellow-100 text-yellow-700 px-2 py-1 rounded-full text-xs animate-pulse">待审核</span>}
+                        {user.status === 'banned' && <span className="bg-red-100 text-red-700 px-2 py-1 rounded-full text-xs">已停用</span>}
+                        {user.classApplication?.status === 'PENDING' && !isAdmin && <span className="block mt-1 text-[10px] text-gray-400">申请审核中...</span>}
+                       </>
+                   )}
                 </td>
                 <td className="px-4 py-3 text-right space-x-2">
                    {user.status === UserStatus.PENDING && (
@@ -193,6 +276,24 @@ export const UserList: React.FC = () => {
         </table>
       </div>
       )}
+
+      {/* Teacher Apply Modal */}
+      {isApplyOpen && (
+          <div className="fixed inset-0 bg-black/50 z-50 flex items-center justify-center p-4">
+              <div className="bg-white rounded-xl p-6 w-full max-w-sm animate-in zoom-in-95">
+                  <h3 className="font-bold text-lg mb-4">申请成为班主任</h3>
+                  <p className="text-sm text-gray-500 mb-4">选择您要负责的班级，提交后需管理员审核通过。</p>
+                  <select className="w-full border p-2 rounded mb-4" value={applyTarget} onChange={e=>setApplyTarget(e.target.value)}>
+                      <option value="">-- 选择班级 --</option>
+                      {classList.map(c => <option key={c._id} value={c.grade+c.className}>{c.grade}{c.className}</option>)}
+                  </select>
+                  <div className="flex gap-2">
+                      <button onClick={submitClassApply} disabled={!applyTarget} className="flex-1 bg-blue-600 text-white py-2 rounded font-bold hover:bg-blue-700 disabled:opacity-50">提交申请</button>
+                      <button onClick={()=>setIsApplyOpen(false)} className="flex-1 border py-2 rounded hover:bg-gray-50">取消</button>
+                  </div>
+              </div>
+          </div>
+      )}
     </div>
   );
-};
+};

server.js

@@ -59,7 +59,7 @@ connectDB();
 // ... All Schema Definitions ...
 const SchoolSchema = new mongoose.Schema({ name: String, code: String });
 const School = mongoose.model('School', SchoolSchema);
-const UserSchema = new mongoose.Schema({ username: String, password: String, trueName: String, phone: String, email: String, schoolId: String, role: String, status: String, avatar: String, createTime: Date, teachingSubject: String, homeroomClass: String, studentNo: String, parentName: String, parentPhone: String, address: String, gender: String });
+const UserSchema = new mongoose.Schema({ username: String, password: String, trueName: String, phone: String, email: String, schoolId: String, role: String, status: String, avatar: String, createTime: Date, teachingSubject: String, homeroomClass: String, studentNo: String, parentName: String, parentPhone: String, address: String, gender: String, classApplication: { type: String, targetClass: String, status: String } });
 const User = mongoose.model('User', UserSchema);
 // Updated Student Schema with dailyDrawLog AND flowerBalance
 const StudentSchema = new mongoose.Schema({ schoolId: String, studentNo: String, name: String, gender: String, birthday: String, idCard: String, phone: String, className: String, status: String, parentName: String, parentPhone: String, address: String, teamId: String, drawAttempts: { type: Number, default: 0 }, dailyDrawLog: { date: String, count: { type: Number, default: 0 } }, flowerBalance: { type: Number, default: 0 } });
@@ -87,8 +87,8 @@ const GameSessionSchema = new mongoose.Schema({ schoolId: String, className: Str
 const GameSessionModel = mongoose.model('GameSession', GameSessionSchema);
 const StudentRewardSchema = new mongoose.Schema({ schoolId: String, studentId: String, studentName: String, rewardType: String, name: String, count: { type: Number, default: 1 }, status: String, source: String, createTime: { type: Date, default: Date.now } });
 const StudentRewardModel = mongoose.model('StudentReward', StudentRewardSchema);
-// Updated LuckyDrawConfigSchema to include className
-const LuckyDrawConfigSchema = new mongoose.Schema({ schoolId: String, className: String, prizes: [{ id: String, name: String, probability: Number, count: Number, icon: String }], dailyLimit: Number, cardCount: Number, defaultPrize: String });
+// Updated LuckyDrawConfigSchema to include className and consolationWeight
+const LuckyDrawConfigSchema = new mongoose.Schema({ schoolId: String, className: String, prizes: [{ id: String, name: String, probability: Number, count: Number, icon: String }], dailyLimit: Number, cardCount: Number, defaultPrize: String, consolationWeight: { type: Number, default: 0 } });
 const LuckyDrawConfigModel = mongoose.model('LuckyDrawConfig', LuckyDrawConfigSchema);
 
 // NEW: Achievement Schemas
@@ -122,6 +122,144 @@ const injectSchoolId = (req, b) => ({ ...b, schoolId: req.headers['x-school-id']
 
 // ... Routes ...
 
+// --- TEACHER CLASS APPLICATION ROUTES ---
+
+app.post('/api/users/class-application', async (req, res) => {
+    const { userId, type, targetClass, action } = req.body; // action: 'APPLY' or 'APPROVE' or 'REJECT'
+    const sId = req.headers['x-school-id'];
+    const userRole = req.headers['x-user-role'];
+
+    // If APPLY
+    if (action === 'APPLY') {
+        await User.findByIdAndUpdate(userId, {
+            classApplication: { type, targetClass, status: 'PENDING' }
+        });
+        return res.json({ success: true });
+    }
+
+    // If APPROVE/REJECT (Admin Only)
+    if (userRole === 'ADMIN') {
+        const user = await User.findById(userId);
+        if (!user || !user.classApplication) return res.status(404).json({ error: 'Application not found' });
+
+        if (action === 'APPROVE') {
+            const updates = { classApplication: null };
+            if (user.classApplication.type === 'CLAIM') {
+                updates.homeroomClass = user.classApplication.targetClass;
+            } else if (user.classApplication.type === 'RESIGN') {
+                updates.homeroomClass = '';
+            }
+            await User.findByIdAndUpdate(userId, updates);
+        } else {
+            // Reject: just clear application or mark rejected
+            await User.findByIdAndUpdate(userId, { 'classApplication.status': 'REJECTED' });
+        }
+        return res.json({ success: true });
+    }
+
+    res.status(403).json({ error: 'Permission denied' });
+});
+
+
+// --- STUDENT PROMOTION & TRANSFER ROUTES ---
+
+// Helper for Grade Logic
+const GRADE_ORDER = ['一年级', '二年级', '三年级', '四年级', '五年级', '六年级', '初一', '初二', '初三', '高一', '高二', '高三'];
+const getNextGrade = (grade) => {
+    const idx = GRADE_ORDER.indexOf(grade);
+    if (idx === -1) return grade; // Unknown
+    if (idx === GRADE_ORDER.length - 1) return '毕业';
+    return GRADE_ORDER[idx + 1];
+};
+
+app.post('/api/students/promote', async (req, res) => {
+    const { teacherFollows } = req.body; // Boolean
+    const sId = req.headers['x-school-id'];
+    const role = req.headers['x-user-role'];
+
+    if (role !== 'ADMIN') return res.status(403).json({ error: 'Permission denied' });
+
+    const classes = await ClassModel.find(getQueryFilter(req));
+    let promotedCount = 0;
+
+    // Process highest grades first to avoid conflicts (though Mongo updates are atomic per doc)
+    // We iterate classes and update their students
+    for (const cls of classes) {
+        const currentGrade = cls.grade;
+        const nextGrade = getNextGrade(currentGrade);
+        const suffix = cls.className.replace(currentGrade, ''); // e.g., "(1)班"
+
+        if (nextGrade === '毕业') {
+             // Mark students as graduated
+             const fullClassName = cls.grade + cls.className; // usually stored as "一年级(1)班" in student doc? 
+             // Wait, ClassInfo: grade="一年级", className="(1)班". Student: className="一年级(1)班"
+             const oldFullClass = cls.grade + cls.className;
+             
+             await Student.updateMany(
+                 { className: oldFullClass, ...getQueryFilter(req) },
+                 { status: 'Graduated', className: '已毕业' }
+             );
+             // Teacher update? If teacher follows, they are now free
+             if (teacherFollows && cls.teacherName) {
+                 await User.updateOne({ trueName: cls.teacherName, schoolId: sId }, { homeroomClass: '' });
+             }
+        } else {
+             // Upgrade Logic
+             const oldFullClass = cls.grade + cls.className;
+             const newFullClass = nextGrade + suffix; // e.g., "二年级(1)班"
+
+             // 1. Ensure new ClassInfo exists
+             await ClassModel.findOneAndUpdate(
+                 { grade: nextGrade, className: suffix, schoolId: sId },
+                 { 
+                     schoolId: sId,
+                     grade: nextGrade,
+                     className: suffix,
+                     // If teacher follows, set them here. Else leave empty or keep existing if exists
+                     teacherName: teacherFollows ? cls.teacherName : undefined 
+                 },
+                 { upsert: true }
+             );
+
+             // 2. Update Students
+             const result = await Student.updateMany(
+                 { className: oldFullClass, status: 'Enrolled', ...getQueryFilter(req) },
+                 { className: newFullClass }
+             );
+             promotedCount += result.modifiedCount;
+
+             // 3. Update Teacher if following
+             if (teacherFollows && cls.teacherName) {
+                 await User.updateOne(
+                     { trueName: cls.teacherName, schoolId: sId, homeroomClass: oldFullClass },
+                     { homeroomClass: newFullClass }
+                 );
+             }
+        }
+    }
+
+    res.json({ success: true, count: promotedCount });
+});
+
+app.post('/api/students/transfer', async (req, res) => {
+    const { studentId, targetClass } = req.body;
+    const student = await Student.findById(studentId);
+    if (!student) return res.status(404).json({ error: 'Student not found' });
+    
+    // Check permission: Admin or Current Homeroom Teacher
+    const requester = await User.findOne({ username: req.headers['x-user-username'] || 'admin' }); // Simulating user check via header or token context
+    // In real app, rely on req.user from middleware. Here we use header role.
+    const role = req.headers['x-user-role'];
+    
+    // Simple check: If teacher, must be homeroom of student
+    // NOTE: This requires storing current user info in backend context or passing it. 
+    // For simplicity, we trust x-user-role and if Teacher, we assume frontend validated or we check param
+    
+    student.className = targetClass;
+    await student.save();
+    res.json({ success: true });
+});
+
 // --- ACHIEVEMENT ROUTES ---
 
 // Get Achievement Config for a class
@@ -265,7 +403,7 @@ app.post('/api/games/lucky-config', async (req, res) => {
    res.json({ success: true });
 });
 
-// Secure Lucky Draw Endpoint with DAILY LIMIT
+// Secure Lucky Draw Endpoint with DAILY LIMIT AND WEIGHTED RANDOM
 app.post('/api/games/lucky-draw', async (req, res) => {
    const { studentId } = req.body; 
    const schoolId = req.headers['x-school-id'];
@@ -286,11 +424,15 @@ app.post('/api/games/lucky-draw', async (req, res) => {
       const prizes = config?.prizes || [];
       const defaultPrize = config?.defaultPrize || '再接再厉';
       const dailyLimit = config?.dailyLimit || 3;
+      const consolationWeight = config?.consolationWeight || 0;
 
       // 2.2 PRE-CHECK: Inventory Check
+      // Only consider prizes that HAVE inventory.
       const availablePrizes = prizes.filter(p => (p.count === undefined || p.count > 0));
-      if (availablePrizes.length === 0) {
-          // Determine error message based on who is drawing
+      
+      // If no prizes available AND consolation weight is 0 (meaning no consolation allowed), then pool is empty.
+      // But if consolation weight > 0, it means we can still draw "Thanks for participating".
+      if (availablePrizes.length === 0 && consolationWeight === 0) {
           const isTeacherOrAdmin = userRole === 'TEACHER' || userRole === 'ADMIN';
           const msg = isTeacherOrAdmin 
               ? '奖品库存不足，不能抽奖，请先补充库存' 
@@ -299,7 +441,6 @@ app.post('/api/games/lucky-draw', async (req, res) => {
       }
 
       // 2.5 Daily Limit Check
-      // Only limit if it's a STUDENT drawing for themselves. Teachers/Admins bypass limits.
       if (userRole === 'STUDENT') {
           if (student.drawAttempts <= 0) return res.status(403).json({ error: '次数不足', message: '您的抽奖次数已用完' });
           
@@ -321,46 +462,51 @@ app.post('/api/games/lucky-draw', async (req, res) => {
           student.dailyDrawLog = dailyLog;
           await student.save();
       } else {
-          // Teacher/Admin proxy draw - just consume attempts, no daily limit
+          // Teacher/Admin proxy draw
           if (student.drawAttempts <= 0) return res.status(403).json({ error: '次数不足', message: '该学生抽奖次数已用完' });
           student.drawAttempts -= 1;
           await student.save();
       }
 
-      // 4. Weighted Random Logic
+      // 4. WEIGHTED RANDOM LOGIC (抽卡算法)
       let selectedPrize = defaultPrize;
-      let rewardType = 'CONSOLATION'; // Default to consolation
+      let rewardType = 'CONSOLATION'; 
       
-      if (availablePrizes.length > 0) {
-          const random = Math.random() * 100;
-          let currentWeight = 0;
-          let matchedPrize = null;
-    
-          for (const p of availablePrizes) {
-             currentWeight += p.probability || 0;
-             if (random <= currentWeight) {
-                matchedPrize = p;
-                break;
-             }
-          }
-    
-          if (matchedPrize) {
-             selectedPrize = matchedPrize.name;
-             rewardType = 'ITEM'; // It's a real prize
-             // Only decrease count if it's not infinite (undefined)
-             if (matchedPrize.count !== undefined && matchedPrize.count > 0) {
-                if (config._id) {
-                    await LuckyDrawConfigModel.updateOne(
-                        { _id: config._id, "prizes.id": matchedPrize.id },
-                        { $inc: { "prizes.$.count": -1 } }
-                    );
-                }
-             }
+      // Calculate Total Weight
+      let totalWeight = consolationWeight;
+      availablePrizes.forEach(p => {
+          totalWeight += (p.probability || 0); // probability field is used as Weight
+      });
+
+      // Random Point
+      let random = Math.random() * totalWeight;
+      let matchedPrize = null;
+
+      // Iterate to find where the random point falls
+      for (const p of availablePrizes) {
+          random -= (p.probability || 0);
+          if (random <= 0) {
+              matchedPrize = p;
+              break;
           }
       }
+      // If loop finishes and matchedPrize is null, it means random fell into consolation zone (or pool empty logic covered above)
+
+      if (matchedPrize) {
+         selectedPrize = matchedPrize.name;
+         rewardType = 'ITEM'; 
+         // Decrease count
+         if (matchedPrize.count !== undefined && matchedPrize.count > 0) {
+            if (config._id) {
+                await LuckyDrawConfigModel.updateOne(
+                    { _id: config._id, "prizes.id": matchedPrize.id },
+                    { $inc: { "prizes.$.count": -1 } }
+                );
+            }
+         }
+      }
 
       // 6. Record Reward
-      // Note: Consolation prizes are recorded but handled differently in UI
       await StudentRewardModel.create({
          schoolId,
          studentId,
@@ -720,4 +866,4 @@ app.get('*', (req, res) => {
   res.sendFile(path.join(__dirname, 'dist', 'index.html'));
 });
 
-app.listen(PORT, () => console.log(`🚀 Server running on port ${PORT}`));
+app.listen(PORT, () => console.log(`🚀 Server running on port ${PORT}`));

services/api.ts

@@ -34,6 +34,7 @@ async function request(endpoint: string, options: RequestInit = {}) {
     // Inject User Role for backend logic (e.g., bypassing draw limits)
     if (currentUser?.role) {
       headers['x-user-role'] = currentUser.role;
+      headers['x-user-username'] = currentUser.username;
     }
   }
 
@@ -100,14 +101,19 @@ export const api = {
        return request(`/users?${params.toString()}`);
     },
     update: (id: string, data: Partial<User>) => request(`/users/${id}`, { method: 'PUT', body: JSON.stringify(data) }),
-    delete: (id: string) => request(`/users/${id}`, { method: 'DELETE' })
+    delete: (id: string) => request(`/users/${id}`, { method: 'DELETE' }),
+    applyClass: (data: { userId: string, type: 'CLAIM'|'RESIGN', targetClass?: string, action: 'APPLY'|'APPROVE'|'REJECT' }) => 
+        request('/users/class-application', { method: 'POST', body: JSON.stringify(data) }),
   },
 
   students: {
     getAll: () => request('/students'),
     add: (data: any) => request('/students', { method: 'POST', body: JSON.stringify(data) }),
     update: (id: string, data: any) => request(`/students/${id}`, { method: 'PUT', body: JSON.stringify(data) }),
-    delete: (id: string | number) => request(`/students/${id}`, { method: 'DELETE' })
+    delete: (id: string | number) => request(`/students/${id}`, { method: 'DELETE' }),
+    // NEW: Promote and Transfer
+    promote: (data: { teacherFollows: boolean }) => request('/students/promote', { method: 'POST', body: JSON.stringify(data) }),
+    transfer: (data: { studentId: string, targetClass: string }) => request('/students/transfer', { method: 'POST', body: JSON.stringify(data) })
   },
 
   classes: {
@@ -215,4 +221,4 @@ export const api = {
   batchDelete: (type: 'student' | 'score' | 'user', ids: string[]) => {
     return request('/batch-delete', { method: 'POST', body: JSON.stringify({ type, ids }) });
   }
-};
+};

types.ts

@@ -33,6 +33,12 @@ export interface User {
   createTime?: string;
   teachingSubject?: string; 
   homeroomClass?: string;
+  // Class Application
+  classApplication?: {
+    type: 'CLAIM' | 'RESIGN';
+    targetClass?: string;
+    status: 'PENDING' | 'REJECTED';
+  };
   // Student Registration Temp Fields
   studentNo?: string;
   parentName?: string;
@@ -216,7 +222,7 @@ export interface StudentReward {
 export interface LuckyPrize {
   id: string;
   name: string;
-  probability: number; // 0-100
+  probability: number; // Now treated as Weight
   count: number; // Inventory
   icon?: string;
 }
@@ -229,6 +235,7 @@ export interface LuckyDrawConfig {
   dailyLimit: number;
   cardCount?: number; // Number of cards displayed (e.g., 9, 12)
   defaultPrize: string; // "再接再厉"
+  consolationWeight?: number; // NEW: Weight for NOT winning a main prize
 }
 
 // --- Achievement System Types ---
@@ -294,4 +301,4 @@ export interface LeaveRequest {
   endDate: string;
   status: 'Pending' | 'Approved' | 'Rejected';
   createTime: string;
-}
+}