',
@@ -1276,6 +1318,18 @@
return `
`;
}
+ function renderIPv6EnableForm(data) {
+ return [
+ `
开通 IPv6 子账号
`,
+ `
用户: ${escapeHtml(data.email || data.userId)}
`,
+ '
"
+ ].join("");
+ }
+
function setBusy(value) {
state.busy = value;
render();
@@ -1293,9 +1347,14 @@
}
async function adminPost(url, body) {
- const response = await request(url, { method: "POST", body });
- show("操作成功", "success");
- return response;
+ try {
+ const response = await request(url, { method: "POST", body });
+ show("操作成功", "success");
+ return response;
+ } catch (error) {
+ show(error.message || "操作失败", "error");
+ throw error;
+ }
}
async function request(url, options) {
@@ -1382,7 +1441,7 @@
return;
}
- if (["id", "group_id", "transfer_enable", "speed_limit", "balance", "plan_id", "device_limit", "server_port", "value"].includes(key)) {
+ if (["id", "group_id", "transfer_enable", "speed_limit", "balance", "plan_id", "device_limit", "server_port", "value", "user_id"].includes(key)) {
values[key] = rawValue === "" ? null : Number(rawValue);
return;
}
@@ -1492,6 +1551,8 @@
type = "ok";
} else if (/(pending|warn|unverified|eligible|ready)/.test(normalized)) {
type = "warn";
+ } else if (/(disabled)/.test(normalized)) {
+ type = "warn";
}
return `
${escapeHtml(text)}`;
}
diff --git a/frontend/templates/admin_plugin_panel.html b/frontend/templates/admin_plugin_panel.html
index 2f32d56..e074bce 100644
--- a/frontend/templates/admin_plugin_panel.html
+++ b/frontend/templates/admin_plugin_panel.html
@@ -761,10 +761,9 @@
const list = payload.list || [];
document.getElementById("thead").innerHTML = `
- | 主从关系 |
+ 用户 ID |
主账号 |
- IPv6 账号 |
- 套餐 |
+ IPv6 套餐 |
状态 |
操作 |
@@ -772,26 +771,110 @@
document.getElementById("tbody").innerHTML = list.length
? list
.map(
- (item) => `
+ (item) => {
+ const isActive = item.is_active || item.status === "active";
+ const isDisabled = item.status === "disabled";
+ let actionButtons = "";
+ if (isActive) {
+ actionButtons = `
+
+
+ `;
+ } else {
+ actionButtons = `
+
+ `;
+ }
+ if (isDisabled) {
+ actionButtons = `
+
+ ` + actionButtons;
+ }
+ return `
- | ${relationChip(item.id, item.shadow_user_id || "-")} |
+ ${item.id} |
${item.email || "-"} |
- ${item.ipv6_email || "-"} |
${item.plan_name || "-"} |
${statusBadge(item.status_label || item.status)} |
-
-
+ ${actionButtons}
|
-
`,
+ `;
+ },
)
.join("")
- : `
| 暂无数据 |
`;
+ : `
| 暂无数据 |
`;
return payload.pagination || { current: 1, last_page: 1, total: list.length };
}
+ let ipv6Plans = [];
+ async function loadIpv6Plans() {
+ if (ipv6Plans.length > 0) return;
+ try {
+ const data = await request(`${apiBase}/plan/fetch`);
+ ipv6Plans = Array.isArray(data) ? data : (data && data.data ? data.data : []);
+ } catch (e) {
+ ipv6Plans = [];
+ }
+ }
+
+ function ipv6ShowEnableDialog(userId, email) {
+ loadIpv6Plans().then(() => {
+ const options = ipv6Plans.map(p => `
`).join("");
+ const dialogHtml = `
+
+
+
+
开通 IPv6 子账号
+
用户: ${email || userId}
+
+
+
+
+
+
+
+
+
+ `;
+ document.body.insertAdjacentHTML("beforeend", dialogHtml);
+ });
+ }
+
+ function ipv6CloseEnableDialog() {
+ const dialog = document.getElementById("ipv6-enable-dialog");
+ if (dialog) dialog.remove();
+ }
+
+ async function ipv6ConfirmEnable(userId) {
+ const select = document.getElementById("ipv6-plan-select");
+ const planId = select ? Number(select.value) || 0 : 0;
+ ipv6CloseEnableDialog();
+ await request(`${apiBase}/user-add-ipv6-subscription/enable/${userId}`, "POST", { plan_id: planId });
+ await loadData(state.page);
+ }
+
+ async function ipv6Enable(id) {
+ await request(`${apiBase}/user-add-ipv6-subscription/enable/${id}`, "POST", {});
+ await loadData(state.page);
+ }
+
+ async function ipv6Disable(id) {
+ if (!confirm("确认关闭该用户的 IPv6 子账号？（软禁用，可恢复）")) return;
+ await request(`${apiBase}/user-add-ipv6-subscription/disable/${id}`, "POST", {});
+ await loadData(state.page);
+ }
+
+ async function ipv6SyncPassword(id) {
+ await request(`${apiBase}/user-add-ipv6-subscription/sync-password/${id}`, "POST", {});
+ await loadData(state.page);
+ }
+
async function loadData(page = 1) {
const payload = await request(endpoint(page));
const pagination =
@@ -814,16 +897,6 @@
await loadData(state.page);
}
- async function ipv6Enable(id) {
- await request(`${apiBase}/user-add-ipv6-subscription/enable/${id}`, "POST", {});
- await loadData(state.page);
- }
-
- async function ipv6SyncPassword(id) {
- await request(`${apiBase}/user-add-ipv6-subscription/sync-password/${id}`, "POST", {});
- await loadData(state.page);
- }
-
function openMenuDialog() {
document.getElementById("menu-dialog").classList.add("is-open");
document.getElementById("menu-dialog").setAttribute("aria-hidden", "false");
diff --git a/frontend/theme/Nebula/assets/app.js b/frontend/theme/Nebula/assets/app.js
index 81d4430..24c66c0 100644
--- a/frontend/theme/Nebula/assets/app.js
+++ b/frontend/theme/Nebula/assets/app.js
@@ -404,16 +404,6 @@
state.selectedTicket = null;
render();
}
-
- if (action === "enable-ipv6") {
- handleEnableIpv6(actionEl);
- return;
- }
-
- if (action === "sync-ipv6-password") {
- handleSyncIpv6Password(actionEl);
- return;
- }
if (action === "copy-node-info") {
handleCopyNodeInfo(actionEl.getAttribute("data-node-id"));
@@ -916,39 +906,7 @@
}
}
- async function handleEnableIpv6(actionEl) {
- actionEl.disabled = true;
- try {
- var response = await fetchJson("/api/v1/user/user-add-ipv6-subscription/enable", { method: "POST" });
- var payload = unwrap(response) || {};
- if (payload.auth_data) {
- saveIpv6Token(payload.auth_data);
- state.ipv6AuthToken = getStoredIpv6Token();
- }
- showMessage("IPv6 订阅已开启，正在刷新...", "success");
- // Try to login to IPv6 account if possible, or just refresh dashboard
- // Since we don't have the password here (state doesn't keep it),
- // the user might need to sync password first or we assume it was synced during creation.
- await loadDashboard(true);
- render();
- } catch (error) {
- showMessage(error.message || "开启失败", "error");
- } finally {
- actionEl.disabled = false;
- }
- }
- async function handleSyncIpv6Password(actionEl) {
- actionEl.disabled = true;
- try {
- await fetchJson("/api/v1/user/user-add-ipv6-subscription/sync-password", { method: "POST" });
- showMessage("密码已同步到 IPv6 账户", "success");
- } catch (error) {
- showMessage(error.message || "同步失败", "error");
- } finally {
- actionEl.disabled = false;
- }
- }
async function loadUplinkMetric() {
if (state.authToken) {
@@ -1589,17 +1547,28 @@
var resetAction = isIpv6 ? "reset-ipv6-security" : "reset-security";
if (isIpv6 && !state.ipv6AuthToken) {
- // If IPv6 not enabled, we still want to show the section with an "Enable" button
- // But we need to make sure we don't crash on 'sub' or 'user'
+ // IPv6 not enabled - show guidance to submit a ticket
} else if (isIpv6 && !sub) {
return "";
}
+ var ipv6FooterHtml = "";
+ if (isIpv6 && !state.ipv6AuthToken) {
+ var statusText = ipv6Eligibility.status_label || "未开通";
+ var guidanceText = "IPv6 订阅需要通过工单由管理员开通，请提交工单申请。";
+ if (ipv6Eligibility.is_active) {
+ guidanceText = "您的 IPv6 已开通，如有问题请联系管理员。";
+ }
+ ipv6FooterHtml = '';
+ }
+
var html = [
'"
].join("");
- if (isIpv6 && !state.ipv6AuthToken) {
- if (!ipv6Eligibility.allowed) {
- html = html.replace(
- /