From 1277c1fdf393e2ea59a59bb766c35d8548a4521d Mon Sep 17 00:00:00 2001
From: ypsdf1 <nihaoshidifu@gitee.com>
Date: Fri, 3 Jul 2026 19:37:05 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20php=E7=AE=A1=E7=90=86=E9=9D=A2=E6=9D=BF?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7=E7=BB=84=E6=88=90=E5=91=98?=
 =?UTF-8?q?=E6=97=B6=E5=A2=9E=E5=8A=A0=E5=88=B0=E6=9C=9F=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86=20-=20=E7=AE=A1=E7=90=86=E5=91=98?=
 =?UTF-8?q?=E5=8F=AF=E6=89=8B=E5=8A=A8=E8=AE=BE=E7=BD=AEexpiry=5Ftime=20-?=
 =?UTF-8?q?=20=E6=88=90=E5=91=98=E8=A1=A8=E6=A0=BC=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E5=88=B0=E6=9C=9F=E6=97=B6=E9=97=B4=E5=88=97=20-=20=E5=88=B0?=
 =?UTF-8?q?=E6=9C=9F=E4=B8=BA0=E8=A1=A8=E7=A4=BA=E6=8C=89=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=BB=84duration=5Fminutes=E8=87=AA=E5=8A=A8=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin.php | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/admin.php b/admin.php
index 5b1da40..ba3f7f6 100644
--- a/admin.php
+++ b/admin.php
@@ -2886,19 +2886,29 @@ async function showGroupMembers(groupName) {
         html += `</div>`;
 
         // 添加成员
-        html += `<div style="display:flex;gap:8px;margin-bottom:12px">
-            <input id="ugNewMember" placeholder="玩家名" style="flex:1;padding:8px;background:var(--bg);border:1px solid var(--border);border-radius:4px;color:var(--fg)">
+        html += `<div style="display:flex;gap:8px;margin-bottom:12px;flex-wrap:wrap">
+            <input id="ugNewMember" placeholder="玩家名" style="flex:1;min-width:120px;padding:8px;background:var(--bg);border:1px solid var(--border);border-radius:4px;color:var(--fg)">
+            <input id="ugNewMemberExpiry" placeholder="到期时间(Unix)" type="number" value="0" style="width:130px;padding:8px;background:var(--bg);border:1px solid var(--border);border-radius:4px;color:var(--fg)">
             <button onclick="doAddGroupMember('${escAdmHtml(groupName)}')" style="padding:8px 16px;background:var(--accent);color:#fff;border:none;border-radius:4px;cursor:pointer;font-size:12px">添加</button>
-        </div>`;
+        </div>
+        <div style="font-size:11px;color:var(--dim);margin-bottom:8px">到期留0则按用户组设置的duration_minutes自动计算</div>`;
 
         // 成员列表
         if (members.length === 0) {
             html += '<div style="text-align:center;padding:20px;color:var(--dim);font-size:13px">暂无成员</div>';
         } else {
-            html += '<div style="overflow-x:auto"><table class="table"><tr><th>玩家名</th><th>添加者</th><th>操作</th></tr>';
+            html += '<div style="overflow-x:auto"><table class="table"><tr><th>玩家名</th><th>到期时间</th><th>添加者</th><th>操作</th></tr>';
             for (const m of members) {
+                const expiry = m.expiry_time ? parseInt(m.expiry_time) : 0;
+                let expiryStr = '-';
+                if (expiry > 0) {
+                    expiryStr = new Date(expiry * 1000).toLocaleString('zh-CN');
+                } else {
+                    expiryStr = '<span style="color:var(--dim)">按组期限</span>';
+                }
                 html += `<tr>
                     <td><strong>${escAdmHtml(m.player_name)}</strong></td>
+                    <td style="font-size:12px;color:var(--dim)">${expiryStr}</td>
                     <td style="font-size:12px;color:var(--dim)">${escAdmHtml(m.added_by || '-')}</td>
                     <td><button onclick="doRemoveGroupMember('${escAdmHtml(groupName)}','${escAdmHtml(m.player_name)}')" style="padding:2px 8px;background:#f44336;color:#fff;border:none;border-radius:4px;cursor:pointer;font-size:11px">移除</button></td>
                 </tr>`;
@@ -2915,12 +2925,15 @@ async function showGroupMembers(groupName) {
 
 async function doAddGroupMember(groupName) {
     const inputEl = document.getElementById('ugNewMember');
+    const expiryEl = document.getElementById('ugNewMemberExpiry');
     const player = inputEl ? inputEl.value.trim() : '';
     if (!player) { glassAlert('请输入玩家名'); return; }
     if (!/^[a-zA-Z0-9_]{3,16}$/.test(player)) { glassAlert('玩家名格式不正确，仅支持英文字母、数字和下划线（3-16位）'); return; }
 
+    const expiryTime = expiryEl ? (parseInt(expiryEl.value) || 0) : 0;
+
     try {
-        const res = await apiCall('add_group_member', {group: groupName, player}, 'POST');
+        const res = await apiCall('add_group_member', {group: groupName, player, expiry_time: expiryTime}, 'POST');
         if (res.success) {
             // pending=true 是异步验证响应，需要特殊处理
             if (res.pending) {