diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
new file mode 100644
index 0000000..5f46f56
--- /dev/null
+++ b/.gitea/workflows/deploy.yml
@@ -0,0 +1,698 @@
+name: 构建并部署 BYW VoiceHub
+run-name: ${{ github.actor }} 触发部署 · Run ${{ github.run_number }}
+
+on:
+  push:
+    branches: [main, master]
+  workflow_dispatch:
+    inputs:
+      deploy_target:
+        description: 构建完成后是否自动部署到服务器
+        type: boolean
+        default: true
+        required: false
+      skip_build_cache:
+        description: 跳过 BuildKit 分层缓存，强制重新构建（排错用）
+        type: boolean
+        default: false
+        required: false
+
+concurrency:
+  group: deploy-production
+  cancel-in-progress: true
+
+env:
+  GITEA_HOST: gitea.fse-media.group
+  DEPLOY_PATH: /data/opt/byw-voicehub
+  IMAGE_NAME: byw-voicehub
+  GH_PROXY_PREFIX: https://v4.gh-proxy.org/
+  APT_MIRROR_DEBIAN: https://mirrors.tuna.tsinghua.edu.cn/debian
+  APT_MIRROR_DEBIAN_SECURITY: https://mirrors.tuna.tsinghua.edu.cn/debian-security
+  APT_MIRROR_DEBIAN_HTTP: http://mirrors.tuna.tsinghua.edu.cn/debian
+  APT_MIRROR_DEBIAN_SECURITY_HTTP: http://mirrors.tuna.tsinghua.edu.cn/debian-security
+  APT_MIRROR_UBUNTU: https://mirrors.tuna.tsinghua.edu.cn/ubuntu
+  APT_MIRROR_UBUNTU_SECURITY: https://mirrors.tuna.tsinghua.edu.cn/ubuntu-security
+  APT_MIRROR_UBUNTU_HTTP: http://mirrors.tuna.tsinghua.edu.cn/ubuntu
+  APT_MIRROR_UBUNTU_SECURITY_HTTP: http://mirrors.tuna.tsinghua.edu.cn/ubuntu-security
+  HTTP_PROXY_EXAMPLE: ""
+  HTTPS_PROXY_EXAMPLE: ""
+  # ========== Docker 官方镜像国内加速（Runner 拉 node:alpine / buildkit 等最常见卡点） ==========
+  # 注意：如果你知道哪个镜像源在内网最快，可以在仓库 Variables 里覆盖 DOCKER_REGISTRY_MIRROR_1/2/3
+  DOCKER_REGISTRY_MIRROR_1: https://docker.m.daocloud.io
+  DOCKER_REGISTRY_MIRROR_2: https://docker.1panel.live
+  DOCKER_REGISTRY_MIRROR_3: https://docker.1ms.run
+  # Dockerfile 内 FROM 前缀替换（ARG DOCKER_MIRROR=…），避免 buildx build 内部 FROM node:22-alpine 再被 Hub 限速
+  DOCKER_MIRROR_PREFIX: docker.m.daocloud.io/library/
+  NODE_BUILDER_TAG: "22-alpine"
+  NODE_RUNTIME_TAG: "22-alpine"
+
+jobs:
+  preflight:
+    name: Preflight 语法与构建检查
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+    # 关键修复 1：去掉 container.image: node:22-bookworm-slim
+    #   Runner 在 Set up job 阶段会先 docker pull，国内连 Docker Hub 被限速会一直卡转圈。
+    # 关键修复 2：去掉 uses: actions/setup-node@v4
+    #   setup-node 会直连 GitHub Releases (github.com/actions/node-versions/releases/download/...)
+    #   下载 Node 二进制，国内被限速 → 一直卡在 Acquiring node-v*-linux-x64.tar.gz。
+    #   与 build-image job「禁止第三方 uses、全部用代理/国内源」风格完全对齐：
+    #     - Runner 自带 node ≥22 直接用
+    #     - 否则优先 npmmirror 国内镜像下载 Node 22 二进制
+    #     - 最后兜底用 GH_PROXY_PREFIX 代理 GitHub node-versions Releases 直链
+    env:
+      NODE_MAJOR: "22"
+      NODE_VERSION_FALLBACK: "22.13.0"
+      NODE_MIRROR_PRIMARY: "https://registry.npmmirror.com/-/binary/node"
+      NODE_OPTIONS: "--max-old-space-size=10240 --no-warnings --expose-gc"
+      NITRO_PRESET: "node-server"
+      DISABLE_ROLLDOWN: "1"
+      NITRO_MINIFY: "false"
+    steps:
+      - name: 安装基础运行依赖（git/curl/ca-certificates/tar/xz-utils，Runner 自带）
+        run: |
+          set -euxo pipefail
+          command -v git   || (apt-get update -qq && DEBIAN_FRONTEND=noninteractive apt-get install -yqq --no-install-recommends git ca-certificates)
+          command -v curl  || (apt-get update -qq && DEBIAN_FRONTEND=noninteractive apt-get install -yqq --no-install-recommends curl ca-certificates)
+          command -v tar   || (apt-get update -qq && DEBIAN_FRONTEND=noninteractive apt-get install -yqq --no-install-recommends tar)
+          command -v xz    || command -v unxz || (apt-get update -qq && DEBIAN_FRONTEND=noninteractive apt-get install -yqq --no-install-recommends xz-utils) || true
+          # 预先打印 Runner 自带版本，方便排障
+          command -v node  && echo "系统 node: $(node -v)" || echo "系统 node: 未安装"
+          command -v npm   && echo "系统 npm: $(npm -v)"   || echo "系统 npm: 未安装"
+
+      - name: 确保 Node.js 22 可用（npmmirror 优先 / gh-proxy 兜底 / 绝不直连 GitHub）
+        run: |
+          set -euxo pipefail
+          # 先判断：当前系统 node 主版本 ≥ NODE_MAJOR 直接跳过
+          if command -v node >/dev/null 2>&1; then
+            CUR_NODE_MAJOR="$(node -v | tr -d 'v' | cut -d. -f1 || echo 0)"
+            if [ "${CUR_NODE_MAJOR:-0}" -ge "${NODE_MAJOR}" ]; then
+              echo "Runner 已自带 Node $(node -v)（≥ v${NODE_MAJOR}.x），直接复用，不下载"
+              node -v; npm -v
+              exit 0
+            fi
+            echo "Runner 自带 Node v${CUR_NODE_MAJOR} 不足 v${NODE_MAJOR}.x，手动升级"
+          fi
+
+          ARCH="$(uname -m)"
+          case "$ARCH" in
+            x86_64|amd64) PLAT="linux-x64" ;;
+            aarch64|arm64) PLAT="linux-arm64" ;;
+            armv7l)        PLAT="linux-armv7l" ;;
+            *) echo "不支持的架构：$ARCH" >&2; exit 1 ;;
+          esac
+          echo "目标架构：$PLAT"
+
+          INSTALL_DIR="${RUNNER_TEMP:-/tmp}/node-${NODE_MAJOR}"
+          mkdir -p "$INSTALL_DIR"
+
+          # 找 Node 22 最新 patch 版本号：不用 GitHub API，走 npmmirror 的 index.json 解析
+          NODE_VER="${NODE_VERSION_FALLBACK}"
+          if command -v python3 >/dev/null 2>&1; then
+            PY_NODE_B64="aW1wb3J0IGpzb24sIHJlLCBzeXMKdHJ5OgogICAgZGF0YSA9IGpzb24ubG9hZChzeXMuc3RkaW4pCmV4Y2VwdCBFeGNlcHRpb246CiAgICBkYXRhID0gW10KdGFyZ2V0ID0gc3lzLmFyZ3ZbMV0gaWYgbGVuKHN5cy5hcmd2KSA+IDEgZWxzZSAiMjIiCmJlc3RfdHJpcGxlID0gTm9uZQpiZXN0X3YgPSAiIgpmb3IgZCBpbiBkYXRhOgogICAgdiA9IGQuZ2V0KCJ2ZXJzaW9uIiwgIiIpCiAgICBtID0gcmUubWF0Y2gociJedihcZCspXC4oXGQrKVwuKFxkKykiLCB2KQogICAgaWYgbm90IG06IGNvbnRpbnVlCiAgICBtYWpvciwgbWlub3IsIHBhdGNoID0gbS5ncm91cHMoKQogICAgaWYgbWFqb3IgIT0gdGFyZ2V0OiBjb250aW51ZQogICAgdHJpcGxlID0gKGludChtaW5vciksIGludChwYXRjaCkpCiAgICBpZiAoYmVzdF90cmlwbGUgaXMgTm9uZSkgb3IgKHRyaXBsZSA+IGJlc3RfdHJpcGxlKToKICAgICAgICBiZXN0X3RyaXBsZSA9IHRyaXBsZQogICAgICAgIGJlc3RfdiA9IGYie21ham9yfS57bWlub3J9LntwYXRjaH0iCmlmIGJlc3RfdjoKICAgIHByaW50KGJlc3Rfdik="
+            REMOTE_LATEST=""
+            REMOTE_LATEST="$(curl -fsSL --max-time 20 "${NODE_MIRROR_PRIMARY}/index.json" 2>/dev/null \
+              | printf '%s' "$PY_NODE_B64" | base64 -d | python3 - "${NODE_MAJOR}" || true)"
+            if [ -n "$REMOTE_LATEST" ]; then
+              NODE_VER="$REMOTE_LATEST"
+              echo "npmmirror 查得 Node 22 latest: v${NODE_VER}"
+            else
+              echo "npmmirror index 查询失败，使用兜底: v${NODE_VER}"
+            fi
+          else
+            echo "python3 不可用，跳过 npmmirror 最新版本探测，使用兜底: v${NODE_VER}"
+          fi
+          TAR_XZ="node-v${NODE_VER}-${PLAT}.tar.xz"
+          mkdir -p /tmp/node-dl-cache
+
+          # 下载 URL 1：npmmirror 国内二进制镜像（首选，国内最快）
+          URL_1="${NODE_MIRROR_PRIMARY}/v${NODE_VER}/${TAR_XZ}"
+          # 下载 URL 2：nodejs.org 官方直链 + GH_PROXY 前缀兜底（绝不直连 GitHub.com）
+          URL_2="${GH_PROXY_PREFIX}https://nodejs.org/dist/v${NODE_VER}/${TAR_XZ}"
+
+          DL_OK=0
+          for URL in "$URL_1" "$URL_2"; do
+            echo "尝试下载：$URL"
+            if curl -fsSL --max-time 300 --retry 3 --retry-delay 2 -o "/tmp/node-dl-cache/${TAR_XZ}" "$URL"; then
+              echo "下载 OK：$URL"
+              DL_OK=1
+              break
+            fi
+            echo "下载失败，尝试下一个源：$URL"
+          done
+          if [ "$DL_OK" != "1" ]; then
+            echo "所有 Node 下载源均失败（npmmirror + gh-proxy），中止" >&2
+            exit 1
+          fi
+
+          # 解压并加到 PATH，GITHUB_ENV 注入所有后续 step 自动继承
+          tar -xJf "/tmp/node-dl-cache/${TAR_XZ}" -C "$INSTALL_DIR" --strip-components=1
+          if [ -f "$GITHUB_ENV" ]; then
+            echo "PATH=$INSTALL_DIR/bin:$PATH" >> "$GITHUB_ENV"
+          fi
+          export PATH="$INSTALL_DIR/bin:$PATH"
+          hash -r 2>/dev/null || true
+          node -v
+          npm -v
+          # 把 npm 全局前缀也设在这个目录下，避免权限问题
+          npm config set prefix "$INSTALL_DIR/npm-global" 2>/dev/null || true
+
+      - name: 校验 Node + npm + git 可用
+        run: |
+          set -euxo pipefail
+          # 全局 git 代理：任何 git clone/fetch/pull https://github.com/... 自动走 gh-proxy 前缀
+          git config --system url."${GH_PROXY_PREFIX}https://github.com/".insteadOf "https://github.com/" || true
+          # npm registry 走 npmmirror，避免后续 npm ci 也卡
+          npm config set registry https://registry.npmmirror.com >/dev/null 2>&1 || true
+          git --version
+          node -v
+          npm -v
+
+      - name: 检出代码
+        run: |
+          set -euxo pipefail
+          REPO_URL="https://${GITEA_HOST}/${GITHUB_REPOSITORY}.git"
+          BRANCH="${GITHUB_REF_NAME:-main}"
+          echo "Clone from: ${REPO_URL} (${BRANCH})"
+          rm -rf * .[^.]* 2>/dev/null || true
+          git clone --depth 1 -b "${BRANCH}" "${REPO_URL}" .
+          git rev-parse --short HEAD
+
+      - name: 安装依赖（npm ci）
+        run: |
+          set -euxo pipefail
+          npm config set registry https://registry.npmmirror.com || true
+          npm config set fund false
+          npm config set audit false
+          npm ci --legacy-peer-deps
+
+      - name: 检查 package.json 无 pnpm 残留
+        run: |
+          set -euo pipefail
+          if grep -qE '"packageManager"\s*:\s*"pnpm' package.json; then
+            echo "package.json 中发现 pnpm 包管理器声明，与要求冲突，构建中止"
+            exit 1
+          fi
+          echo "package.json 未发现 pnpm 声明"
+
+      - name: 执行 nuxt build
+        run: |
+          set -euxo pipefail
+          echo "=== 构建前系统内存状态 ==="
+          free -h || true
+          sync && echo 3 > /proc/sys/vm/drop_caches 2>/dev/null || true
+          echo "=== 开始执行 nuxt build ==="
+          export NODE_OPTIONS="--max-old-space-size=10240 --no-warnings --expose-gc"
+          export NITRO_PRESET=node-server
+          export NITRO_MINIFY=false
+          export DISABLE_ROLLDOWN=1
+          npm run build
+          echo "=== 构建完成，.output/ 生成结果 ==="
+          ls -la .output/ 2>/dev/null || true
+          du -sh .output 2>/dev/null || true
+          echo "=== 构建后内存状态 ==="
+          free -h || true
+
+  build-image:
+    name: 构建并推送容器镜像
+    needs: preflight
+    runs-on: ubuntu-latest
+    timeout-minutes: 40
+    outputs:
+      image_tag: ${{ steps.meta.outputs.tag }}
+      image_full: ${{ steps.meta.outputs.full }}
+      image_latest: ${{ steps.meta.outputs.latest }}
+    steps:
+      - name: 系统环境准备（Ubuntu 22.04 默认镜像源换清华 + 全局 GitHub gh-proxy）
+        run: |
+          set -euxo pipefail
+          # ========== Step 0：先装 ca-certificates（默认 HTTP archive.ubuntu.com 不需要证书，解鸡生蛋） ==========
+          if command -v apt-get >/dev/null 2>&1; then
+            sudo apt-get update -qq 2>/dev/null || apt-get update -qq 2>/dev/null || true
+            sudo DEBIAN_FRONTEND=noninteractive apt-get install -yqq --no-install-recommends ca-certificates 2>/dev/null || \
+              DEBIAN_FRONTEND=noninteractive apt-get install -yqq --no-install-recommends ca-certificates 2>/dev/null || true
+            sudo update-ca-certificates 2>/dev/null || update-ca-certificates 2>/dev/null || true
+          fi
+
+          # ========== Step 1：有了证书后换 HTTPS 清华源 ==========
+          # Ubuntu 22.04 默认是 http://archive.ubuntu.com/ubuntu 和 http://security.ubuntu.com/ubuntu
+          if command -v apt-get >/dev/null 2>&1 && [ -f /etc/apt/sources.list ]; then
+            sudo sed -i \
+              -e 's|http://archive.ubuntu.com/ubuntu|'"${APT_MIRROR_UBUNTU}"'|g' \
+              -e 's|http://security.ubuntu.com/ubuntu|'"${APT_MIRROR_UBUNTU_SECURITY}"'|g' \
+              -e 's|https://archive.ubuntu.com/ubuntu|'"${APT_MIRROR_UBUNTU}"'|g' \
+              -e 's|https://security.ubuntu.com/ubuntu|'"${APT_MIRROR_UBUNTU_SECURITY}"'|g' \
+              /etc/apt/sources.list
+          fi
+          if command -v apt-get >/dev/null 2>&1 && ls /etc/apt/sources.list.d/*.sources 1>/dev/null 2>&1; then
+            for f in /etc/apt/sources.list.d/*.sources; do
+              sudo sed -i \
+                -e 's|http://archive.ubuntu.com/ubuntu|'"${APT_MIRROR_UBUNTU}"'|g' \
+                -e 's|http://security.ubuntu.com/ubuntu|'"${APT_MIRROR_UBUNTU_SECURITY}"'|g' \
+                -e 's|https://archive.ubuntu.com/ubuntu|'"${APT_MIRROR_UBUNTU}"'|g' \
+                -e 's|https://security.ubuntu.com/ubuntu|'"${APT_MIRROR_UBUNTU_SECURITY}"'|g' \
+                "${f}" 2>/dev/null || true
+            done
+          fi
+          # 全局 git：所有 https://github.com/ 自动走 gh-proxy 前缀
+          sudo git config --system url."${GH_PROXY_PREFIX}https://github.com/".insteadOf "https://github.com/" || true
+          # npm：强制用 npmmirror（与 preflight 对齐）
+          npm config set registry https://registry.npmmirror.com >/dev/null 2>&1 || true
+
+          # ========== 关键修复：宿主机 Docker daemon 先注入国内 registry mirrors ==========
+          # 原因：Runner 任何 docker pull / buildx create（moby/buildkit 拉基础镜像）都要先经过 daemon
+          # 如果直接连 docker.io，国内会被限速到 <200KB/s，导致 Setup / BuildKit 拉镜像一直卡。
+          # 注意：此处用 PY_CODE 字符串 + printf 管道传 Python 代码给 stdin，
+          #   避免 <<'PY' heredoc 结构与 YAML run:| 块标量缩进冲突导致的 could not find expected ':' 报错。
+          DOCKER_DAEMON_CONF="/etc/docker/daemon.json"
+          if command -v docker >/dev/null 2>&1 && command -v sudo >/dev/null 2>&1; then
+            sudo mkdir -p /etc/docker 2>/dev/null || true
+            OLD_MIRRORS_JSON="{}"
+            if [ -f "${DOCKER_DAEMON_CONF}" ]; then
+              OLD_MIRRORS_JSON="$(sudo cat "${DOCKER_DAEMON_CONF}" 2>/dev/null || echo "{}")"
+            fi
+            PY_DAEMON_B64="aW1wb3J0IGpzb24sIHN5cwp0cnk6CiAgICBkYXRhID0ganNvbi5sb2FkcyhzeXMuYXJndlsxXSBvciAie30iKQpleGNlcHQgRXhjZXB0aW9uOgogICAgZGF0YSA9IHt9Cm1pcnJvcnNfZW52cyA9IFttIGZvciBtIGluIHN5cy5hcmd2WzI6NV0gaWYgbV0KZXhpc3RpbmcgPSBkYXRhLmdldCgicmVnaXN0cnktbWlycm9ycyIpIG9yIFtdCmlmIGlzaW5zdGFuY2UoZXhpc3RpbmcsIGxpc3QpOgogICAgY29tYmluZWQgPSBsaXN0KGRpY3QuZnJvbWtleXMoWyptaXJyb3JzX2VudnMsICpleGlzdGluZ10pKQplbHNlOgogICAgY29tYmluZWQgPSBtaXJyb3JzX2VudnMKaWYgY29tYmluZWQ6CiAgICBkYXRhWyJyZWdpc3RyeS1taXJyb3JzIl0gPSBjb21iaW5lZApkYXRhLnNldGRlZmF1bHQoImxvZy1kcml2ZXIiLCAianNvbi1maWxlIikKcHJpbnQoanNvbi5kdW1wcyhkYXRhLCBlbnN1cmVfYXNjaWk9RmFsc2UsIGluZGVudD0yKSk="
+            NEW_DAEMON_JSON="$(printf '%s' "$PY_DAEMON_B64" | base64 -d | python3 - "$OLD_MIRRORS_JSON" \
+              "${DOCKER_REGISTRY_MIRROR_1}" "${DOCKER_REGISTRY_MIRROR_2}" "${DOCKER_REGISTRY_MIRROR_3}")"
+            echo "${NEW_DAEMON_JSON}" | sudo tee "${DOCKER_DAEMON_CONF}" >/dev/null
+            echo "[Docker] daemon.json 已注入 registry-mirrors:"
+            sudo cat "${DOCKER_DAEMON_CONF}" 2>/dev/null || true
+            # 非侵入式重启 docker；runner 没 systemd 时用 service 兜底；失败也跳过（buildkitd.toml 内部仍有 mirrors）
+            sudo systemctl restart docker 2>/dev/null \
+              || sudo service docker restart 2>/dev/null \
+              || echo "[Docker] systemctl/service 重启失败，跳过（后续 buildx builder 内部仍有 registry mirrors）"
+            sleep 3 2>/dev/null || true
+          fi
+
+          echo "环境准备完成"
+          cat /etc/os-release 2>/dev/null | head -4 || true
+          docker --version
+          docker buildx version || echo "buildx 未安装"
+
+      - name: 检出代码
+        run: |
+          set -euxo pipefail
+          REPO_URL="https://${GITEA_HOST}/${GITHUB_REPOSITORY}.git"
+          BRANCH="${GITHUB_REF_NAME:-main}"
+          echo "Clone from: ${REPO_URL} (${BRANCH})"
+          rm -rf * .[^.]* 2>/dev/null || true
+          git clone --depth 1 -b "${BRANCH}" "${REPO_URL}" .
+          git rev-parse --short HEAD
+          docker version
+          docker buildx version || echo "buildx 未安装，将使用 docker build --push"
+
+      - name: 计算镜像标签
+        id: meta
+        run: |
+          set -euo pipefail
+          # Docker Registry 规范：仓库路径、owner、repo name 必须全小写（Henry_Du/BYW-VoiceHub → henry_du/byw-voicehub）
+          REPO_OWNER="${GITHUB_REPOSITORY_OWNER,,}"
+          REPO_NAME="${IMAGE_NAME,,}"
+          SHA="${GITHUB_SHA:-$(git rev-parse HEAD)}"
+          SHORT_SHA="${SHA:0:7}"
+          DATE_TAG="$(date +%Y%m%d)-${SHORT_SHA}"
+          IMG_FULL="${GITEA_HOST}/${REPO_OWNER}/${REPO_NAME}:${DATE_TAG}"
+          IMG_LATEST="${GITEA_HOST}/${REPO_OWNER}/${REPO_NAME}:latest"
+          CACHE_REF_INNER="${GITEA_HOST}/${REPO_OWNER}/${REPO_NAME}:buildcache"
+          echo "tag=${DATE_TAG}"       >> "$GITHUB_OUTPUT"
+          echo "full=${IMG_FULL}"      >> "$GITHUB_OUTPUT"
+          echo "latest=${IMG_LATEST}"  >> "$GITHUB_OUTPUT"
+          echo "cache_ref=${CACHE_REF_INNER}" >> "$GITHUB_OUTPUT"
+          echo "repo_owner=${REPO_OWNER}" >> "$GITHUB_OUTPUT"
+          echo "repo_name=${REPO_NAME}" >> "$GITHUB_OUTPUT"
+          echo "======================================"
+          echo "Image tag    : ${DATE_TAG}"
+          echo "Full image   : ${IMG_FULL}"
+          echo "Latest image : ${IMG_LATEST}"
+          echo "Cache ref    : ${CACHE_REF_INNER}"
+          echo "======================================"
+
+      - name: 初始化 Docker Buildx builder（带国内 registry-mirrors + 内置 Gitea Basic Auth）
+        env:
+          REGISTRY_USER: ${{ secrets.REGISTRY_USER || github.actor }}
+          REGISTRY_TOKEN: ${{ secrets.REGISTRY_TOKEN || github.token }}
+        run: |
+          set -euxo pipefail
+          # 先校验凭据非空（避免 buildkitd.toml 写空用户名/密码导致 push 时 401）
+          if [ -z "${REGISTRY_TOKEN}" ]; then
+            echo "ERROR: REGISTRY_TOKEN 为空。请在 Repository Secrets 中新建 REGISTRY_TOKEN（个人应用令牌，权限 read:package + write:package + read:repository）"
+            exit 1
+          fi
+          REGISTRY_USER="${REGISTRY_USER,,}"
+          BUILDER_NAME="multi"
+          BUILDKIT_IMAGE="moby/buildkit:buildx-stable-1"
+          BKK_CFG="$(mktemp -t buildkitd_XXXXXX.toml)"
+          # 用 printf 逐行写 buildkitd 配置，避免 YAML parser 把 heredoc 内部的 [...] 误判为 YAML key
+          {
+            printf '[worker.oci]\n  max-parallelism = 2\n\n'
+            printf '[registry."docker.io"]\n  mirrors = ["docker.m.daocloud.io","dockerproxy.com","hub-mirror.c.163.com","docker.nju.edu.cn","docker.mirrors.ustc.edu.cn"]\n\n'
+            printf '[registry."ghcr.io"]\n  mirrors = ["ghcr.nju.edu.cn","ghcr.dockerproxy.com"]\n\n'
+            printf '[registry."k8s.gcr.io"]\n  mirrors = ["k8s-gcr.m.daocloud.io","registry.cn-hangzhou.aliyuncs.com/google_containers"]\n\n'
+            # 关键：Gitea Container Registry 直接用 Basic Auth 凭据写死在 buildkitd.toml
+            # 绕开 buildkitd 的 OAuth2 flow（Gitea 1.27.x 有时返回空 token body：authorization server did not include a token）
+            printf '[registry."%s"]\n  username = "%s"\n  password = "%s"\n' "${GITEA_HOST}" "${REGISTRY_USER}" "${REGISTRY_TOKEN}"
+          } > "${BKK_CFG}"
+          # 预拉 buildkitd 基础镜像（优先 5 个国内镜像 fallback，避免 Docker Hub <200KB/s）
+          PULLED=0
+          for MIRROR in \
+            "docker.m.daocloud.io/${BUILDKIT_IMAGE}" \
+            "dockerproxy.com/${BUILDKIT_IMAGE}" \
+            "hub-mirror.c.163.com/${BUILDKIT_IMAGE}" \
+            "docker.nju.edu.cn/${BUILDKIT_IMAGE}" \
+            "docker.mirrors.ustc.edu.cn/${BUILDKIT_IMAGE}" \
+            "${BUILDKIT_IMAGE}"; do
+            if docker pull "${MIRROR}" 2>/dev/null; then
+              if [ "${MIRROR}" != "${BUILDKIT_IMAGE}" ]; then
+                docker tag "${MIRROR}" "${BUILDKIT_IMAGE}" 2>/dev/null || true
+              fi
+              PULLED=1
+              break
+            fi
+          done
+          [ "${PULLED}" = "1" ] || { echo "ERROR: 无法拉取 buildkitd 基础镜像，请检查 Docker registry-mirrors"; exit 1; }
+          # 宿主 Docker daemon 也同步登录（后面镜像体积与层信息 Step 的 docker image inspect / docker history 要用）
+          printf '%s' "${REGISTRY_TOKEN}" | docker login "${GITEA_HOST}" \
+            -u "${REGISTRY_USER}" --password-stdin
+          echo "宿主 Docker 登录成功：${REGISTRY_USER} @ ${GITEA_HOST}"
+          # 立即重建 buildx builder（带凭据 + registry-mirrors）
+          docker buildx rm "${BUILDER_NAME}" 2>/dev/null || true
+          docker buildx create \
+            --name "${BUILDER_NAME}" \
+            --driver docker-container \
+            --use \
+            --config "${BKK_CFG}" \
+            --buildkitd-flags '--allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host' \
+            --driver-opt network=host \
+            --driver-opt "image=${BUILDKIT_IMAGE}"
+          rm -f "${BKK_CFG}"
+          # gh-proxy 环境（全变量显式赋值，避免 bash tracing 边界反引号歧义）
+          GIT_CONFIG_KEY_0="url.${GH_PROXY_PREFIX}https://github.com/.insteadOf"
+          GIT_CONFIG_VALUE_0="https://github.com/"
+          GIT_CONFIG_KEY_1="url.${GH_PROXY_PREFIX}https://gist.github.com/.insteadOf"
+          GIT_CONFIG_VALUE_1="https://gist.github.com/"
+          export GIT_CONFIG_COUNT=2 GIT_CONFIG_KEY_0 GIT_CONFIG_VALUE_0 GIT_CONFIG_KEY_1 GIT_CONFIG_VALUE_1
+          docker buildx inspect --bootstrap
+          echo "Builder 启动成功，buildkitd.toml 已内置 ${GITEA_HOST} Basic Auth 凭据，push 不再走 OAuth2 flow"
+
+      - name: 确认已登录（凭据已注入 buildkitd.toml 与宿主 Docker daemon）
+        run: |
+          set -euo pipefail
+          # 前面「初始化 Docker Buildx builder」Step 已完成两次登录：
+          # 1. 宿主 Docker daemon（镜像体积 Step 要用）；2. buildkitd.toml（buildx push 要用，Basic Auth 不走 OAuth2）
+          # 这里只做一个快速断言，确保宿主登录成功
+          docker info 2>/dev/null | grep -E "Username|Registry" || echo "已存在登录凭据（跳过详细输出）"
+          echo "登录确认完成，REGISTRY_USER=${REGISTRY_USER:-${GITHUB_ACTOR,,}}，GITEA_HOST=${GITEA_HOST}"
+        env:
+          REGISTRY_USER: ${{ secrets.REGISTRY_USER || github.actor }}
+
+      - name: 构建并推送镜像
+        env:
+          SKIP_CACHE: ${{ inputs.skip_build_cache }}
+          IMG_FULL: ${{ steps.meta.outputs.full }}
+          IMG_LATEST: ${{ steps.meta.outputs.latest }}
+          OCS_SOURCE_RAW: ${{ github.server_url }}/${{ github.repository }}
+          OCS_REVISION: ${{ github.sha }}
+          OCS_CREATED_RAW: ${{ github.event.head_commit.timestamp }}
+        run: |
+          set -euxo pipefail
+          # 兜底空值 & 全小写规范
+          OCS_SOURCE="${OCS_SOURCE_RAW,,}"
+          OCS_CREATED="${OCS_CREATED_RAW:-$(date -u -Iseconds)}"
+          # 再次保险：所有镜像标签字符串都确认无大写字母（Registry 硬性规范）
+          IMG_FULL="${IMG_FULL,,}"
+          IMG_LATEST="${IMG_LATEST,,}"
+
+          BUILD_ARGS=(
+            --build-arg BUILDKIT_INLINE_CACHE=1
+            --build-arg NODE_ENV=production
+            --build-arg DOCKER_MIRROR="${DOCKER_MIRROR_PREFIX}"
+            --build-arg NODE_BUILDER_TAG="${NODE_BUILDER_TAG}"
+            --build-arg NODE_RUNTIME_TAG="${NODE_RUNTIME_TAG}"
+          )
+          # 说明：暂时关闭 registry 分层缓存（buildkitd 推 buildcache 也要认证，同样会触发 Gitea 1.27 OAuth2 空 token）
+          # 改为本地 Docker daemon 缓存，已构建的层会自动复用，下次 build 速度几乎相同
+          BUILD_ARGS+=( --no-cache )
+          echo "已启用强制重新构建（跳过 registry 分层缓存，避免 buildkitd 推 cache 层时 OAuth2 认证失败）"
+
+          # ========== 阶段 1：构建到本地 Docker daemon（--load，不用 --push） ==========
+          # 关键：这一步产物在宿主 Docker 的 images 列表里（docker images 能看到），宿主 docker login 过的凭据 100% 可用
+          # 完全绕开 buildkitd 容器内部推镜像走 OAuth2 flow 的坑
+          docker buildx build \
+            --file ./Dockerfile \
+            --platform linux/amd64 \
+            --load \
+            --provenance=false \
+            "${BUILD_ARGS[@]}" \
+            --tag "${IMG_FULL}" \
+            --tag "${IMG_LATEST}" \
+            --label "org.opencontainers.image.source=${OCS_SOURCE}" \
+            --label "org.opencontainers.image.revision=${OCS_REVISION}" \
+            --label "org.opencontainers.image.created=${OCS_CREATED}" \
+            .
+
+          # 断言：两个 tag 都真的加载到了本地 Docker daemon
+          docker image inspect "${IMG_FULL}" >/dev/null
+          docker image inspect "${IMG_LATEST}" >/dev/null
+          echo "构建成功，已加载到本地 Docker daemon：${IMG_FULL} + ${IMG_LATEST}"
+          echo "镜像体积（Pre-push）："
+          docker image inspect "${IMG_FULL}" --format='{{.Size}}' | awk '{printf "  Full image : %.2f MB\n", $1/1024/1024}'
+
+          # ========== 阶段 2：宿主 Docker daemon 原生 push（100% 走宿主登录凭据，不会走 OAuth2） ==========
+          echo "开始推送：${IMG_FULL}"
+          docker push "${IMG_FULL}"
+          echo "开始推送：${IMG_LATEST}"
+          docker push "${IMG_LATEST}"
+          echo "推送完成：2 个 tag（date-sha + latest）"
+
+      - name: 镜像体积与层信息
+        env:
+          IMG_FULL: ${{ steps.meta.outputs.full }}
+        run: |
+          set -euxo pipefail
+          docker pull "${IMG_FULL}" || true
+          docker image inspect "${IMG_FULL}" --format='{{.Size}}' 2>/dev/null \
+            | awk '{printf "Image size: %.2f MB\n", $1/1024/1024}' || true
+          docker history --no-trunc "${IMG_FULL}" 2>/dev/null | head -20 || true
+
+  deploy:
+    name: 部署到生产服务器
+    needs: build-image
+    if: ${{ !cancelled() && !failure() && (github.event_name == 'push' || inputs.deploy_target == true) }}
+    runs-on: ubuntu-latest
+    timeout-minutes: 25
+    environment:
+      name: production
+      url: ${{ secrets.NUXT_PUBLIC_SITE_URL }}
+    steps:
+      - name: 校验部署所需密钥
+        env:
+          DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
+          DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
+          DEPLOY_SSH_KEY: ${{ secrets.DEPLOY_SSH_KEY }}
+        run: |
+          set -euo pipefail
+          MISSING=()
+          [ -n "${DEPLOY_HOST}" ]    || MISSING+=("DEPLOY_HOST")
+          [ -n "${DEPLOY_USER}" ]    || MISSING+=("DEPLOY_USER")
+          [ -n "${DEPLOY_SSH_KEY}" ] || MISSING+=("DEPLOY_SSH_KEY")
+          if [ ${#MISSING[@]} -gt 0 ]; then
+            echo "缺少以下 Repository Secrets：${MISSING[*]}"
+            echo "请在 Gitea 仓库 -> 设置 -> 工作流 -> 密钥 页面添加（注意是 Repository Secrets，不是 Deploy Keys）"
+            exit 1
+          fi
+          echo "部署密钥配置完整（DEPLOY_HOST=${DEPLOY_HOST}，DEPLOY_USER=${DEPLOY_USER}）"
+
+      - name: SSH 滚动部署
+        env:
+          DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
+          DEPLOY_PORT: ${{ secrets.DEPLOY_PORT || 22 }}
+          DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
+          DEPLOY_SSH_KEY: ${{ secrets.DEPLOY_SSH_KEY }}
+          REGISTRY_PULL_USER: ${{ secrets.REGISTRY_PULL_USER }}
+          REGISTRY_PULL_TOKEN: ${{ secrets.REGISTRY_PULL_TOKEN }}
+          NUXT_PUBLIC_SITE_URL: ${{ secrets.NUXT_PUBLIC_SITE_URL }}
+          IMAGE_NEW: ${{ needs.build-image.outputs.image_full }}
+          IMAGE_LATEST: ${{ needs.build-image.outputs.image_latest }}
+          GITHUB_SERVER_URL: ${{ github.server_url }}
+          GITHUB_REPOSITORY: ${{ github.repository }}
+          GITHUB_REF_NAME: ${{ github.ref_name }}
+        run: |
+          set -euo pipefail
+          # 全小写规范（Docker Registry 硬性要求 + Gitea raw URL 路径大小写敏感）
+          IMAGE_NEW="${IMAGE_NEW,,}"
+          IMAGE_LATEST="${IMAGE_LATEST,,}"
+          GITHUB_REPOSITORY="${GITHUB_REPOSITORY,,}"
+          GITHUB_SERVER_URL="${GITHUB_SERVER_URL,,}"
+          GITEA_HOST="${GITEA_HOST,,}"
+          IMAGE_NAME="${IMAGE_NAME,,}"
+
+          # 写私钥到临时文件（避免 stdin 转义问题）
+          SSH_KEY_FILE="$(mktemp -t deploy_ssh_key.XXXXXX)"
+          printf '%s\n' "${DEPLOY_SSH_KEY}" > "${SSH_KEY_FILE}"
+          chmod 600 "${SSH_KEY_FILE}"
+
+          SSH_OPTS=(
+            -i "${SSH_KEY_FILE}"
+            -o StrictHostKeyChecking=no
+            -o UserKnownHostsFile=/dev/null
+            -o ConnectTimeout=10
+            -o ServerAliveInterval=30
+            -o ServerAliveCountMax=8
+            -p "${DEPLOY_PORT}"
+          )
+
+          echo "=============================================="
+          echo "Deploy target: ${DEPLOY_USER}@${DEPLOY_HOST}:${DEPLOY_PORT}"
+          echo "Deploy image : ${IMAGE_NEW}"
+          echo "Deploy dir   : ${DEPLOY_PATH}"
+          echo "=============================================="
+
+          # 本地预检查：ssh 先连上跑 whoami 确认连通，避免 20 分钟后才发现连不上
+          ssh "${SSH_OPTS[@]}" "${DEPLOY_USER}@${DEPLOY_HOST}" "whoami; docker --version; docker compose version"
+
+          # 关键修复：远端 bash 前置 ENV=val 语法在 dash/sh 远端不认，变量全空。
+          # 用 printf + \n 拼接完整 shell 脚本通过 stdin 注入到 ssh 远端 cat，
+          # 不用 heredoc，避免 YAML 冒号/缩进解析误判。
+          ENV_SH="/tmp/deploy_env_$$"
+          ENV_PAYLOAD="$(printf 'export IMAGE_NEW=%q\nexport IMAGE_LATEST=%q\nexport DEPLOY_PATH=%q\nexport GITEA_HOST=%q\nexport GH_PROXY_PREFIX=%q\nexport REGISTRY_PULL_USER=%q\nexport REGISTRY_PULL_TOKEN=%q\nexport IMAGE_NAME=%q\nexport NUXT_PUBLIC_SITE_URL=%q\nexport GITHUB_SERVER_URL=%q\nexport GITHUB_REPOSITORY=%q\nexport GITHUB_REF_NAME=%q\n' \
+            "${IMAGE_NEW}" "${IMAGE_LATEST}" "${DEPLOY_PATH}" "${GITEA_HOST}" "${GH_PROXY_PREFIX}" \
+            "${REGISTRY_PULL_USER}" "${REGISTRY_PULL_TOKEN}" "${IMAGE_NAME}" "${NUXT_PUBLIC_SITE_URL}" \
+            "${GITHUB_SERVER_URL}" "${GITHUB_REPOSITORY}" "${GITHUB_REF_NAME}")"
+          printf '%s' "${ENV_PAYLOAD}" | ssh "${SSH_OPTS[@]}" "${DEPLOY_USER}@${DEPLOY_HOST}" "cat > ${ENV_SH}"
+          echo "[Deploy] env script written to ${ENV_SH} on remote"
+          # 立即回读验证远端文件非空 & IMAGE_NEW 非空，避免后面空跑
+          ssh "${SSH_OPTS[@]}" "${DEPLOY_USER}@${DEPLOY_HOST}" "set -e; ls -la ${ENV_SH}; grep -q IMAGE_NEW ${ENV_SH} && echo '[Deploy] env_sh IMAGE_NEW line OK'"
+
+          # ssh 远端 bash -s 第一个参数传 $ENV_SH 路径，主脚本 source 它并做非空断言
+          ssh "${SSH_OPTS[@]}" "${DEPLOY_USER}@${DEPLOY_HOST}" "bash -s -- '${ENV_SH}'" <<'REMOTE_SCRIPT_MAIN'
+              set -euxo pipefail
+              ENV_SH="$1"
+              if [ -f "$ENV_SH" ]; then
+                # shellcheck disable=SC1090
+                . "$ENV_SH"
+                rm -f "$ENV_SH"
+              fi
+
+              DEPLOY_DIR="${DEPLOY_PATH}"
+              COMPOSE="docker compose"
+
+              echo "=============================================="
+              echo "Executor     : $(whoami)"
+              echo "IMAGE_NEW    : ${IMAGE_NEW:-(empty!)}"
+              echo "DEPLOY_DIR   : ${DEPLOY_DIR:-(empty!)}"
+              echo "=============================================="
+              # 防御性断言：镜像名 / 路径不能为空，否则直接 exit 9 避免起旧容器
+              if [ -z "${IMAGE_NEW}" ] || [ -z "${DEPLOY_DIR}" ]; then
+                echo "ERROR: IMAGE_NEW or DEPLOY_DIR is empty — env variables not propagated correctly."
+                echo "IMAGE_NEW=${IMAGE_NEW}"
+                echo "DEPLOY_DIR=${DEPLOY_DIR}"
+                exit 9
+              fi
+
+              mkdir -p "${DEPLOY_DIR}" 2>/dev/null || sudo mkdir -p "${DEPLOY_DIR}" 2>/dev/null || true
+              cd "${DEPLOY_DIR}"
+
+              # ========== 目录可写性预检查（权限排查友好化） ==========
+              TEST_FILE="${DEPLOY_DIR}/.deploy_writable_test_$$"
+              if ! (touch "${TEST_FILE}" && rm -f "${TEST_FILE}") 2>/dev/null; then
+                echo "================================================================="
+                echo "ERROR：deploy 用户对部署目录 ${DEPLOY_DIR} 没有写权限（Permission denied）"
+                echo "当前用户：$(whoami)"
+                echo "目录归属与权限："
+                ls -ld "${DEPLOY_DIR}" || true
+                echo ""
+                echo "请在服务器上以 root 身份执行下面 3 行命令修复（复制粘贴）："
+                echo "  chown -R deploy:docker '${DEPLOY_DIR}'"
+                echo "  chmod 775 '${DEPLOY_DIR}'"
+                echo "  setfacl -R -m u:deploy:rwx -m g:docker:rwx -m d:u:deploy:rwx -m d:g:docker:rwx '${DEPLOY_DIR}' 2>/dev/null || true"
+                echo "修复后重新触发此 workflow 即可。"
+                echo "================================================================="
+                exit 3
+              fi
+
+              if [ -n "${REGISTRY_PULL_TOKEN}" ] && [ -n "${REGISTRY_PULL_USER}" ]; then
+                echo "使用专用 pull 凭证登录 Gitea Container Registry"
+                printf '%s' "${REGISTRY_PULL_TOKEN}" \
+                  | docker login "${GITEA_HOST}" \
+                      -u "${REGISTRY_PULL_USER}" \
+                      --password-stdin 2>/dev/null || true
+              fi
+
+              echo "Pulling new image ${IMAGE_NEW} ..."
+              docker pull "${IMAGE_NEW}"
+              docker tag  "${IMAGE_NEW}" "${IMAGE_LATEST}"
+              echo "New image pulled and tagged as latest"
+
+              # 用 printf 拼 override.yml，彻底避免 bash heredoc 的三重坑：
+              #   1) 结束分隔符必须行首（否则 bash 不认，把后面整段代码都写进文件）
+              #   2) 内层 <<'XXX' 单引号包裹导致变量不展开（image: ${IMAGE_NEW} 会是字面量）
+              #   3) 外层 .yml parser 把 heredoc 里的 services: 当 YAML mapping key 解析
+              printf 'services:\n  voicehub:\n    image: %s\n' "${IMAGE_NEW}" > docker-compose.override.yml
+              echo "docker-compose.override.yml written, image=${IMAGE_NEW}"
+              echo "--- override.yml content ---"
+              cat docker-compose.override.yml
+              echo "--- override.yml end ---"
+
+              if [ ! -f docker-compose.yml ]; then
+                echo "docker-compose.yml 不存在，自动从仓库模板下载（如访问 GitHub 会自动加 gh-proxy 前缀）"
+                TEMPLATE_URL="${GITHUB_SERVER_URL:-https://${GITEA_HOST}}/${GITHUB_REPOSITORY}/raw/branch/${GITHUB_REF_NAME:-main}/docker-compose.yml"
+                case "${TEMPLATE_URL}" in
+                  *"://github.com/"*) TEMPLATE_URL="${GH_PROXY_PREFIX}${TEMPLATE_URL}" ;;
+                esac
+                echo "URL=${TEMPLATE_URL}"
+                curl -fsSL --max-time 30 "${TEMPLATE_URL}" -o docker-compose.yml \
+                  || echo "自动下载模板失败，请手动上传 docker-compose.yml 和 .env（参考仓库根目录 .env.example）"
+              fi
+
+              if [ ! -f .env ]; then
+                echo "================================================================="
+                echo "WARNING：${DEPLOY_DIR}/.env 不存在"
+                echo "首次部署请在服务器上创建 .env（至少填写 POSTGRES_PASSWORD / JWT_SECRET / NUXT_PUBLIC_SITE_URL + 5 个 cpus 数字兜底：APP_CPUS/APP_CPUS_LIMIT/APP_CPUS_RESERVATION/PG_CPUS/REDIS_CPUS）"
+                echo "参考仓库根目录的 .env.example"
+                echo "================================================================="
+              fi
+
+              echo "Executing docker compose up -d ..."
+              ${COMPOSE} up -d --remove-orphans
+
+              MAX_WAIT=24
+              WAITED=0
+              echo "Waiting for container healthcheck (max 120s)..."
+              while [ ${WAITED} -lt ${MAX_WAIT} ]; do
+                STATUS="$(${COMPOSE} ps --format json 2>/dev/null || true)"
+                if echo "${STATUS}" | grep -q '"Health":"healthy"'; then
+                  echo "voicehub healthcheck passed"
+                  break
+                fi
+                if echo "${STATUS}" | grep -q '"State":"running"'; then
+                  :
+                else
+                  echo "voicehub not running, current status:"
+                  ${COMPOSE} ps || true
+                fi
+                sleep 5
+                WAITED=$((WAITED + 1))
+              done
+              if [ ${WAITED} -ge ${MAX_WAIT} ]; then
+                echo "Healthcheck timeout. Last 120 lines of voicehub logs:"
+                ${COMPOSE} logs --tail=120 voicehub || true
+                exit 1
+              fi
+
+              echo "Pruning images older than 72 hours..."
+              docker image prune -af --filter "until=72h" || true
+              docker builder prune -af || true
+
+              echo ""
+              echo "================================================================="
+              echo "Deploy succeeded. Visit: ${NUXT_PUBLIC_SITE_URL:-请自行查看你的站点 URL}"
+              echo "Rollback instructions (on server):"
+              echo "   cd ${DEPLOY_DIR}"
+              echo "   docker images | grep ${IMAGE_NAME} | head -5"
+              echo "   printf 'services:\\n  voicehub:\\n    image: <OLD_TAG_FROM_ABOVE>\\n' > docker-compose.override.yml"
+              echo "   docker compose up -d"
+              echo "================================================================="
+          REMOTE_SCRIPT_MAIN
+
+          # 清理私钥临时文件
+          rm -f "${SSH_KEY_FILE}"
diff --git a/app/assets/css/lyric-player.module.css b/app/assets/css/lyric-player.module.css
index 9c8d703..6e35018 100644
--- a/app/assets/css/lyric-player.module.css
+++ b/app/assets/css/lyric-player.module.css
@@ -101,8 +101,8 @@
   padding: 1em;
   /* 为主歌词行增加文字阴影，以提升亮色背景下的可读性 */
   text-shadow:
-    0 2px 6px var(--mask-60),
-    0 0 10px var(--mask-50);
+    0 2px 6px rgba(0, 0, 0, 0.6),
+    0 0 10px rgba(0, 0, 0, 0.5);
 
   & span {
     display: inline-block;
@@ -143,7 +143,7 @@
   transition: opacity 0.2s 0.25s;
   opacity: 0.3;
   /* 为副歌词行增加轻度文字阴影，避免白字贴白背景 */
-  text-shadow: 0 1px 3px var(--mask-50);
+  text-shadow: 0 1px 3px rgba(0, 0, 0, 0.5);
 }
 
 .disableSpring > * {
diff --git a/app/assets/css/main.css b/app/assets/css/main.css
index 2b3a7d1..69b6bb1 100644
--- a/app/assets/css/main.css
+++ b/app/assets/css/main.css
@@ -1,34 +1,21 @@
 /* 导入浏览器主题保护样式 */
 @import url('./theme-protection.css');
 
-/* 导入主题变量（亮色覆盖暗色，由 data-theme 控制） */
-@import url('./themes/ClassicDark.css');
-@import url('./themes/ClassicLight.css');
-@import url('./themes/ModernLight.css');
-
-@unocss;
+@tailwind base;
+@tailwind components;
+@tailwind utilities;
 
 /* 防止浏览器自动应用深色主题 */
 :root {
   color-scheme: light dark;
 }
 
-/* 全局控件默认强调色 — 跟随主题主色调，但允许显式 accent-* 类覆盖 */
-input[type="checkbox"]:not([class*="accent-"]),
-input[type="radio"]:not([class*="accent-"]),
-input[type="range"]:not([class*="accent-"]) {
-  accent-color: var(--accent-color);
-}
-
 /* 流体背景与全局样式 */
 
 * {
   margin: 0;
   padding: 0;
   box-sizing: border-box;
-  /* UnoCSS preflight 未重置 border-style，补齐后 utility 边框与加载转圈才能渲染 */
-  border-style: solid;
-  border-width: 0;
 }
 
 /* 字体显示策略优化 */
@@ -95,9 +82,9 @@ body::before {
   width: 100%;
   height: 100%;
   background:
-    radial-gradient(circle at 20% 50%, rgba(var(--color-indigo-rgb), 0.03) 0%, transparent 50%),
-    radial-gradient(circle at 80% 20%, var(--bg-texture-warm-glow) 0%, transparent 50%),
-    radial-gradient(circle at 40% 80%, rgba(var(--color-indigo-rgb), 0.02) 0%, transparent 50%);
+    radial-gradient(circle at 20% 50%, rgba(120, 119, 198, 0.03) 0%, transparent 50%),
+    radial-gradient(circle at 80% 20%, rgba(255, 255, 255, 0.01) 0%, transparent 50%),
+    radial-gradient(circle at 40% 80%, rgba(120, 119, 198, 0.02) 0%, transparent 50%);
   z-index: -1;
   pointer-events: none;
 }
@@ -246,9 +233,9 @@ body::before {
   border-radius: var(--radius-xl);
   padding: var(--spacing-2xl);
   box-shadow:
-    0 4px 6px var(--mask-10),
-    0 1px 3px var(--mask-8),
-    inset 0 1px 0 var(--overlay-5);
+    0 4px 6px rgba(0, 0, 0, 0.1),
+    0 1px 3px rgba(0, 0, 0, 0.08),
+    inset 0 1px 0 rgba(255, 255, 255, 0.05);
   transition: all var(--transition-normal);
   position: relative;
   overflow: hidden;
@@ -261,16 +248,16 @@ body::before {
   left: 0;
   right: 0;
   height: 1px;
-  background: linear-gradient(90deg, transparent, var(--overlay-10), transparent);
+  background: linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.1), transparent);
 }
 
 .card:hover {
   transform: translateY(-4px);
   border-color: var(--card-hover-border);
   box-shadow:
-    0 12px 24px var(--mask-15),
-    0 4px 8px var(--mask-10),
-    inset 0 1px 0 var(--overlay-10);
+    0 12px 24px rgba(0, 0, 0, 0.15),
+    0 4px 8px rgba(0, 0, 0, 0.1),
+    inset 0 1px 0 rgba(255, 255, 255, 0.1);
 }
 
 /* 按钮 */
@@ -289,7 +276,7 @@ body::before {
   font-size: var(--text-sm);
   position: relative;
   overflow: hidden;
-  box-shadow: 0 2px 4px var(--mask-10);
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
 }
 
 .btn::before {
@@ -299,7 +286,7 @@ body::before {
   left: -100%;
   width: 100%;
   height: 100%;
-  background: linear-gradient(90deg, transparent, var(--overlay-10), transparent);
+  background: linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.1), transparent);
   transition: left 0.5s;
 }
 
@@ -316,7 +303,7 @@ body::before {
 .btn-primary:hover {
   background: linear-gradient(135deg, var(--primary-hover) 0%, var(--primary) 100%);
   transform: translateY(-1px);
-  box-shadow: 0 4px 12px var(--btn-primary-shadow);
+  box-shadow: 0 4px 12px rgba(102, 126, 234, 0.3);
 }
 
 .btn-secondary {
@@ -326,10 +313,10 @@ body::before {
 }
 
 .btn-secondary:hover {
-  background: linear-gradient(135deg, var(--bg-quaternary) 0%, var(--btn-secondary-hover) 100%);
+  background: linear-gradient(135deg, var(--bg-quaternary) 0%, #4a4a4a 100%);
   color: var(--text-primary);
   transform: translateY(-1px);
-  box-shadow: 0 4px 12px var(--overlay-10);
+  box-shadow: 0 4px 12px rgba(255, 255, 255, 0.1);
 }
 
 .btn-outline {
@@ -344,7 +331,7 @@ body::before {
   border-color: var(--primary);
   color: var(--primary);
   transform: translateY(-1px);
-  box-shadow: 0 4px 12px var(--primary-20);
+  box-shadow: 0 4px 12px rgba(102, 126, 234, 0.2);
 }
 
 .btn:disabled {
@@ -392,7 +379,7 @@ body::before {
   border-color: var(--input-border-focus);
   box-shadow:
     var(--input-shadow-focus),
-    0 4px 12px var(--primary-10);
+    0 4px 12px rgba(102, 126, 234, 0.1);
   background: var(--bg-secondary);
   transform: translateY(-1px);
 }
@@ -485,8 +472,3 @@ body::before {
     max-width: none !important;
   }
 }
-
-/* 重置 fixed 元素外边距：space-y-* 布局规则会给子元素加 margin-top，导致弹窗遮罩定位偏移 */
-.fixed {
-  margin: 0 !important;
-}
diff --git a/app/assets/css/mobile-admin.css b/app/assets/css/mobile-admin.css
index daaec4a..21b67dd 100644
--- a/app/assets/css/mobile-admin.css
+++ b/app/assets/css/mobile-admin.css
@@ -422,7 +422,7 @@
   .form-textarea:focus,
   .search-input:focus {
     transform: none;
-    box-shadow: 0 0 0 3px var(--primary-20) !important;
+    box-shadow: 0 0 0 3px rgba(102, 126, 234, 0.2) !important;
   }
 }
 
diff --git a/app/assets/css/print-fix.css b/app/assets/css/print-fix.css
index 8aa288d..6ef1703 100644
--- a/app/assets/css/print-fix.css
+++ b/app/assets/css/print-fix.css
@@ -97,18 +97,29 @@
     font-size: 14px !important;
   }
 
-  /* 封面 */
+  /* 封面 - 打印模式下固定尺寸，移除圆角阴影，使用 contain 防止裁切 */
   .schedule-item-print .cover-section {
-    width: 40px !important;
-    height: 40px !important;
+    width: 48px !important;
+    height: 48px !important;
+    aspect-ratio: 1 / 1 !important;
     flex-shrink: 0 !important;
   }
 
-  .schedule-item-print .song-cover,
+  .schedule-item-print .song-cover {
+    width: 100% !important;
+    height: 100% !important;
+    object-fit: contain !important;
+    border-radius: 0 !important;
+    box-shadow: none !important;
+  }
+
   .schedule-item-print .cover-placeholder {
     width: 100% !important;
     height: 100% !important;
-    border-radius: 4px !important;
+    aspect-ratio: 1 / 1 !important;
+    object-fit: contain !important;
+    border-radius: 0 !important;
+    box-shadow: none !important;
   }
 
   /* 歌曲信息 */
@@ -124,11 +135,6 @@
     color: #000 !important;
     margin-bottom: 2px !important;
     white-space: nowrap !important;
-  }
-
-  /* 歌名文本块承载裁剪，flex 容器上的 text-overflow 不生效 */
-  .schedule-item-print .title-text {
-    min-width: 0 !important;
     overflow: hidden !important;
     text-overflow: ellipsis !important;
   }
diff --git a/app/assets/css/theme-protection.css b/app/assets/css/theme-protection.css
index 08d45c0..238230b 100644
--- a/app/assets/css/theme-protection.css
+++ b/app/assets/css/theme-protection.css
@@ -38,12 +38,12 @@ button {
 
 /* 保护选中文本颜色 */
 ::selection {
-  background-color: var(--selection-bg, rgba(79, 70, 229, 0.3));
+  background-color: rgba(79, 70, 229, 0.3);
   color: inherit;
 }
 
 ::-moz-selection {
-  background-color: var(--selection-bg, rgba(79, 70, 229, 0.3));
+  background-color: rgba(79, 70, 229, 0.3);
   color: inherit;
 }
 
diff --git a/app/assets/css/transitions.css b/app/assets/css/transitions.css
index 2fe3a5e..f1f8a85 100644
--- a/app/assets/css/transitions.css
+++ b/app/assets/css/transitions.css
@@ -17,11 +17,8 @@
 }
 
 .page-view {
-  width: 100%;
-  min-width: 0;
   animation: page-view-enter 0.55s cubic-bezier(0.25, 0.46, 0.45, 0.94);
-  /* will-change 声明 transform/filter 会使本元素成为 fixed 定位包含块，导致未 Teleport 的弹窗遮罩错位，仅保留 opacity */
-  will-change: opacity;
+  will-change: transform, opacity, filter;
 }
 
 .page-view[data-route='index'] {
@@ -30,16 +27,6 @@
   animation-name: page-view-index-enter;
 }
 
-/* 强制改密页必须立即稳定居中，避免路由重定向时出现位移。 */
-.page-view[data-route='change-password'] {
-  min-height: 100dvh;
-  animation: none !important;
-  opacity: 1;
-  transform: none !important;
-  filter: none !important;
-  will-change: auto;
-}
-
 @keyframes page-view-enter {
   0% {
     opacity: 0;
@@ -110,7 +97,7 @@
   left: 0;
   right: 0;
   bottom: 0;
-  background: linear-gradient(135deg, var(--bg-primary) 0%, var(--bg-secondary) 100%);
+  background: linear-gradient(135deg, #0a0a0a 0%, #1a1a1a 100%);
   display: flex;
   align-items: center;
   justify-content: center;
@@ -120,8 +107,8 @@
 .loading-spinner {
   width: 60px;
   height: 60px;
-  border: 3px solid var(--overlay-10);
-  border-top: 3px solid var(--color-indigo);
+  border: 3px solid rgba(255, 255, 255, 0.1);
+  border-top: 3px solid #4f46e5;
   border-radius: 50%;
   animation: spin 1s linear infinite;
 }
diff --git a/app/assets/css/variables.css b/app/assets/css/variables.css
index f6a61f7..30dce2a 100644
--- a/app/assets/css/variables.css
+++ b/app/assets/css/variables.css
@@ -1,8 +1,408 @@
-/* 全局样式与媒体查询（设计变量已拆分到 themes/ClassicDark/ 和 themes/ClassicLight/ 子目录） */
-
-/* 品牌色 RGB 值（用于 rgba() 动态组合） */
+/* 全局CSS变量 - 统一配色方案 */
 :root {
-  --color-indigo-rgb: 99 102 241;
+  /* 主色调 */
+  --primary: #3b82f6;
+  --primary-hover: #2563eb;
+  --primary-light: rgba(59, 130, 246, 0.1);
+  --primary-border: rgba(59, 130, 246, 0.2);
+
+  /* 成功色 */
+  --success: #10b981;
+  --success-hover: #059669;
+  --success-light: rgba(16, 185, 129, 0.1);
+  --success-border: rgba(16, 185, 129, 0.2);
+
+  /* 警告色 */
+  --warning: #f59e0b;
+  --warning-hover: #d97706;
+  --warning-light: rgba(245, 158, 11, 0.1);
+  --warning-border: rgba(245, 158, 11, 0.2);
+
+  /* 错误色 */
+  --error: #ef4444;
+  --error-hover: #dc2626;
+  --error-light: rgba(239, 68, 68, 0.1);
+  --error-border: rgba(239, 68, 68, 0.2);
+
+  /* 信息色 */
+  --info: #3b82f6;
+  --info-hover: #2563eb;
+  --info-light: rgba(59, 130, 246, 0.1);
+  --info-border: rgba(59, 130, 246, 0.2);
+
+  /* 背景色 */
+  --bg-primary: #111111;
+  --bg-secondary: #1a1a1a;
+  --bg-tertiary: #2a2a2a;
+  --bg-quaternary: #3a3a3a;
+  --bg-hover: #1f1f1f;
+
+  /* 文字颜色 */
+  --text-primary: #ffffff;
+  --text-secondary: #cccccc;
+  --text-tertiary: #888888;
+  --text-quaternary: #666666;
+  --text-disabled: #444444;
+
+  /* 边框颜色 */
+  --border-primary: #1f1f1f;
+  --border-secondary: #2a2a2a;
+  --border-tertiary: #3a3a3a;
+  --border-quaternary: #4a4a4a;
+
+  /* 阴影 */
+  --shadow-sm: 0 1px 2px rgba(0, 0, 0, 0.05);
+  --shadow-md: 0 4px 6px rgba(0, 0, 0, 0.1);
+  --shadow-lg: 0 10px 15px rgba(0, 0, 0, 0.1);
+  --shadow-xl: 0 20px 25px rgba(0, 0, 0, 0.1);
+
+  /* 圆角 */
+  --radius-sm: 4px;
+  --radius-md: 6px;
+  --radius-lg: 8px;
+  --radius-xl: 12px;
+  --radius-2xl: 16px;
+
+  /* 间距 */
+  --spacing-xs: 4px;
+  --spacing-sm: 8px;
+  --spacing-md: 12px;
+  --spacing-lg: 16px;
+  --spacing-xl: 20px;
+  --spacing-2xl: 24px;
+  --spacing-3xl: 32px;
+
+  /* 字体大小 */
+  --text-xs: 12px;
+  --text-sm: 14px;
+  --text-base: 16px;
+  --text-lg: 18px;
+  --text-xl: 20px;
+  --text-2xl: 24px;
+  --text-3xl: 30px;
+
+  /* 字体粗细 */
+  --font-normal: 400;
+  --font-medium: 500;
+  --font-semibold: 600;
+  --font-bold: 700;
+
+  /* 过渡动画 */
+  --transition-fast: 0.15s ease;
+  --transition-normal: 0.2s ease;
+  --transition-slow: 0.3s ease;
+
+  /* Z-index层级 */
+  --z-dropdown: 100;
+  --z-sticky: 200;
+  --z-fixed: 300;
+  --z-modal-backdrop: 400;
+  --z-modal: 500;
+  --z-popover: 600;
+  --z-tooltip: 700;
+  --z-toast: 800;
+
+  /* 特殊状态颜色 */
+  --status-pending: #fbbf24;
+  --status-pending-light: rgba(251, 191, 36, 0.1);
+  --status-approved: #10b981;
+  --status-approved-light: rgba(16, 185, 129, 0.1);
+  --status-played: #6b7280;
+  --status-played-light: rgba(107, 114, 128, 0.1);
+
+  /* 投票相关颜色 */
+  --vote-heart: #ef4444;
+  --vote-heart-hover: #dc2626;
+  --vote-count: var(--text-tertiary);
+
+  /* 拖拽状态颜色 */
+  --drag-over: var(--primary-light);
+  --drag-over-border: var(--primary);
+  --dragging-opacity: 0.5;
+
+  /* 表格颜色 */
+  --table-header-bg: var(--bg-tertiary);
+  --table-row-hover: var(--bg-hover);
+  --table-border: var(--border-secondary);
+  --table-selected: var(--primary-light);
+
+  /* 卡片颜色 */
+  --card-bg: var(--bg-secondary);
+  --card-border: var(--border-secondary);
+  --card-hover-border: var(--border-tertiary);
+  --card-shadow: var(--shadow-md);
+
+  /* 按钮颜色 */
+  --btn-primary-bg: var(--primary);
+  --btn-primary-hover: var(--primary-hover);
+  --btn-primary-text: var(--text-primary);
+  --btn-primary-border: var(--primary-border);
+
+  --btn-secondary-bg: #3a3a3a;
+  --btn-secondary-hover: #4a4a4a;
+  --btn-secondary-text: var(--text-primary);
+  --btn-secondary-border: #555555;
+
+  --btn-success-bg: var(--success);
+  --btn-success-hover: var(--success-hover);
+  --btn-success-text: var(--text-primary);
+  --btn-success-border: var(--success-border);
+
+  --btn-warning-bg: var(--warning);
+  --btn-warning-hover: var(--warning-hover);
+  --btn-warning-text: var(--text-primary);
+  --btn-warning-border: var(--warning-border);
+
+  --btn-error-bg: var(--error);
+  --btn-error-hover: var(--error-hover);
+  --btn-error-text: var(--text-primary);
+  --btn-error-border: var(--error-border);
+
+  --btn-disabled-bg: var(--bg-tertiary);
+  --btn-disabled-text: var(--text-disabled);
+
+  /* 输入框颜色 */
+  --input-bg: var(--bg-tertiary);
+  --input-border: var(--border-tertiary);
+  --input-border-focus: var(--primary);
+  --input-text: var(--text-primary);
+  --input-placeholder: var(--text-quaternary);
+  --input-shadow-focus: 0 0 0 3px var(--primary-light);
+
+  /* 模态框颜色 */
+  --modal-backdrop: rgba(0, 0, 0, 0.7);
+  --modal-bg: var(--bg-secondary);
+  --modal-border: var(--border-secondary);
+  --modal-header-border: var(--border-secondary);
+  --modal-footer-border: var(--border-secondary);
+
+  /* 通知颜色 */
+  --notification-success-bg: var(--success-light);
+  --notification-success-border: var(--success-border);
+  --notification-success-text: var(--success);
+
+  --notification-warning-bg: var(--warning-light);
+  --notification-warning-border: var(--warning-border);
+  --notification-warning-text: var(--warning);
+
+  --notification-error-bg: var(--error-light);
+  --notification-error-border: var(--error-border);
+  --notification-error-text: var(--error);
+
+  --notification-info-bg: var(--info-light);
+  --notification-info-border: var(--info-border);
+  --notification-info-text: var(--info);
+
+  /* 加载动画颜色 */
+  --spinner-primary: var(--primary);
+  --spinner-secondary: var(--bg-tertiary);
+
+  /* 滚动条颜色 */
+  --scrollbar-track: var(--bg-tertiary);
+  --scrollbar-thumb: var(--bg-quaternary);
+  --scrollbar-thumb-hover: #4a4a4a;
+}
+
+:root[data-theme='light'],
+:root[data-theme='ClassicLight'],
+:root[data-theme='ModernLight'] {
+  --bg-primary: #f8fafc;
+  --bg-secondary: #f1f5f9;
+  --bg-tertiary: #e2e8f0;
+  --bg-quaternary: #cbd5e1;
+  --bg-hover: #e2e8f0;
+
+  --text-primary: #0f172a;
+  --text-secondary: #334155;
+  --text-tertiary: #475569;
+  --text-quaternary: #64748b;
+  --text-disabled: #94a3b8;
+
+  --border-primary: #e2e8f0;
+  --border-secondary: #cbd5e1;
+  --border-tertiary: #94a3b8;
+  --border-quaternary: #64748b;
+
+  --modal-backdrop: rgba(0, 0, 0, 0.4);
+  --scrollbar-thumb-hover: #94a3b8;
+
+  --btn-secondary-bg: #f1f5f9;
+  --btn-secondary-hover: #e2e8f0;
+  --btn-secondary-text: #0f172a;
+  --btn-secondary-border: #cbd5e1;
+
+  --card-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.06);
+}
+
+:root[data-theme='ClassicLight'] {
+  --primary: #1e40af;
+  --primary-hover: #1e3a8a;
+  --primary-light: rgba(30, 64, 175, 0.08);
+  --primary-border: rgba(30, 64, 175, 0.15);
+
+  --bg-primary: #ffffff;
+  --bg-secondary: #f5f7fa;
+  --bg-tertiary: #edf0f5;
+  --bg-quaternary: #d9dee7;
+  --bg-hover: #f0f3f8;
+
+  --success: #059669;
+  --success-hover: #047857;
+  --success-light: rgba(5, 150, 105, 0.08);
+  --success-border: rgba(5, 150, 105, 0.15);
+
+  --warning: #d97706;
+  --warning-hover: #b45309;
+  --warning-light: rgba(217, 119, 6, 0.08);
+  --warning-border: rgba(217, 119, 6, 0.15);
+
+  --error: #dc2626;
+  --error-hover: #b91c1c;
+  --error-light: rgba(220, 38, 38, 0.08);
+  --error-border: rgba(220, 38, 38, 0.15);
+
+  --info: #2563eb;
+  --info-hover: #1d4ed8;
+  --info-light: rgba(37, 99, 235, 0.08);
+  --info-border: rgba(37, 99, 235, 0.15);
+
+  --text-primary: #1a2332;
+  --text-secondary: #4a5568;
+  --text-tertiary: #6b7280;
+  --text-quaternary: #9ca3af;
+  --text-disabled: #c5cbd3;
+
+  --border-primary: #e5e7eb;
+  --border-secondary: #d1d5db;
+  --border-tertiary: #9ca3af;
+  --border-quaternary: #6b7280;
+
+  --input-bg: #ffffff;
+  --input-border: #d1d5db;
+  --input-border-focus: #1e40af;
+  --input-text: #1a2332;
+  --input-placeholder: #9ca3af;
+  --input-shadow-focus: 0 0 0 3px rgba(30, 64, 175, 0.1);
+
+  --card-bg: #ffffff;
+  --card-border: #e5e7eb;
+  --card-hover-border: #d1d5db;
+
+  --table-header-bg: #f5f7fa;
+  --table-row-hover: #f9fafb;
+  --table-border: #e5e7eb;
+  --table-selected: rgba(30, 64, 175, 0.06);
+
+  --scrollbar-track: #f1f5f9;
+  --scrollbar-thumb: #cbd5e1;
+  --scrollbar-thumb-hover: #94a3b8;
+
+  --status-pending: #ca8a04;
+  --status-pending-light: rgba(202, 138, 4, 0.08);
+  --status-approved: #059669;
+  --status-approved-light: rgba(5, 150, 105, 0.08);
+  --status-played: #6b7280;
+  --status-played-light: rgba(107, 114, 128, 0.08);
+
+  --shadow-sm: 0 1px 2px 0 rgba(0, 0, 0, 0.04);
+  --shadow-md: 0 4px 6px -1px rgba(0, 0, 0, 0.06), 0 2px 4px -2px rgba(0, 0, 0, 0.04);
+  --shadow-lg: 0 10px 15px -3px rgba(0, 0, 0, 0.06), 0 4px 6px -4px rgba(0, 0, 0, 0.04);
+  --shadow-xl: 0 20px 25px -5px rgba(0, 0, 0, 0.06), 0 8px 10px -6px rgba(0, 0, 0, 0.04);
+
+  --radius-sm: 3px;
+  --radius-md: 5px;
+  --radius-lg: 6px;
+  --radius-xl: 8px;
+  --radius-2xl: 10px;
+}
+
+:root[data-theme='ModernLight'] {
+  --primary: #4f46e5;
+  --primary-hover: #4338ca;
+  --primary-light: rgba(79, 70, 229, 0.1);
+  --primary-border: rgba(79, 70, 229, 0.2);
+
+  --bg-primary: #fafafa;
+  --bg-secondary: #f4f4f5;
+  --bg-tertiary: #e4e4e7;
+  --bg-quaternary: #d4d4d8;
+  --bg-hover: #eeeeef;
+
+  --success: #16a34a;
+  --success-hover: #15803d;
+  --success-light: rgba(22, 163, 74, 0.1);
+  --success-border: rgba(22, 163, 74, 0.2);
+
+  --warning: #ea580c;
+  --warning-hover: #c2410c;
+  --warning-light: rgba(234, 88, 12, 0.1);
+  --warning-border: rgba(234, 88, 12, 0.2);
+
+  --error: #e11d48;
+  --error-hover: #be123c;
+  --error-light: rgba(225, 29, 72, 0.1);
+  --error-border: rgba(225, 29, 72, 0.2);
+
+  --info: #0ea5e9;
+  --info-hover: #0284c7;
+  --info-light: rgba(14, 165, 233, 0.1);
+  --info-border: rgba(14, 165, 233, 0.2);
+
+  --text-primary: #09090b;
+  --text-secondary: #3f3f46;
+  --text-tertiary: #71717a;
+  --text-quaternary: #a1a1aa;
+  --text-disabled: #d4d4d8;
+
+  --border-primary: #e4e4e7;
+  --border-secondary: #d4d4d8;
+  --border-tertiary: #a1a1aa;
+  --border-quaternary: #71717a;
+
+  --input-bg: #ffffff;
+  --input-border: #e4e4e7;
+  --input-border-focus: #4f46e5;
+  --input-text: #09090b;
+  --input-placeholder: #a1a1aa;
+  --input-shadow-focus: 0 0 0 3px rgba(79, 70, 229, 0.12);
+
+  --card-bg: #ffffff;
+  --card-border: #e4e4e7;
+  --card-hover-border: #d4d4d8;
+
+  --table-header-bg: #f4f4f5;
+  --table-row-hover: #fafafa;
+  --table-border: #e4e4e7;
+  --table-selected: rgba(79, 70, 229, 0.08);
+
+  --scrollbar-track: #f4f4f5;
+  --scrollbar-thumb: #d4d4d8;
+  --scrollbar-thumb-hover: #a1a1aa;
+
+  --status-pending: #eab308;
+  --status-pending-light: rgba(234, 179, 8, 0.12);
+  --status-approved: #22c55e;
+  --status-approved-light: rgba(34, 197, 94, 0.12);
+  --status-played: #71717a;
+  --status-played-light: rgba(113, 113, 122, 0.12);
+
+  --shadow-sm: 0 1px 2px 0 rgba(0, 0, 0, 0.03);
+  --shadow-md: 0 2px 8px -2px rgba(0, 0, 0, 0.05), 0 1px 3px 0 rgba(0, 0, 0, 0.03);
+  --shadow-lg: 0 8px 24px -4px rgba(0, 0, 0, 0.06), 0 2px 8px -4px rgba(0, 0, 0, 0.04);
+  --shadow-xl: 0 16px 40px -8px rgba(0, 0, 0, 0.08), 0 4px 16px -8px rgba(0, 0, 0, 0.05);
+
+  --radius-sm: 4px;
+  --radius-md: 6px;
+  --radius-lg: 8px;
+  --radius-xl: 10px;
+  --radius-2xl: 12px;
+}
+
+/* 深色主题特定调整 */
+@media (prefers-color-scheme: dark) {
+  :root {
+    /* 在深色模式下可以进行微调 */
+  }
 }
 
 /* 高对比度模式支持 */
diff --git a/app/assets/css/year-review.css b/app/assets/css/year-review.css
index 69ce3dc..d8164fa 100644
--- a/app/assets/css/year-review.css
+++ b/app/assets/css/year-review.css
@@ -97,19 +97,19 @@
 
 /* Gradients */
 .bg-gradient-intro {
-  background: linear-gradient(135deg, var(--panel-bg-dark) 0%, var(--bg-primary) 50%, var(--panel-bg-dark) 100%);
+  background: linear-gradient(135deg, #111827 0%, #000000 50%, #111827 100%);
 }
 
 .bg-gradient-text-intro {
-  background-image: linear-gradient(to right, var(--panel-bg), var(--panel-border-light), var(--text-muted));
+  background-image: linear-gradient(to right, #ffffff, #e5e7eb, #6b7280);
 }
 
 .bg-gradient-artist {
-  background: linear-gradient(to bottom right, var(--color-collab-lighter), var(--color-pink), var(--color-orange));
+  background: linear-gradient(to bottom right, #e9d5ff, #f472b6, #fb923c);
 }
 
 .bg-gradient-numbers {
-  background-image: linear-gradient(to bottom, var(--color-accent-light), var(--color-accent-light-hover));
+  background-image: linear-gradient(to bottom, #60a5fa, #1d4ed8);
 }
 
 /* Slide Transitions */
diff --git a/app/components/Admin/AdminDatePicker.vue b/app/components/Admin/AdminDatePicker.vue
new file mode 100644
index 0000000..b063b06
--- /dev/null
+++ b/app/components/Admin/AdminDatePicker.vue
@@ -0,0 +1,215 @@
+<template>
+  <div class="relative bg-zinc-900/50 border border-zinc-800/50 rounded-2xl p-1 overflow-hidden">
+    <div class="flex items-center" @touchstart.stop>
+      <button
+        :disabled="isFirstDateVisible"
+        class="p-2 text-zinc-500 hover:text-zinc-300 disabled:opacity-30 transition-colors"
+        @click="scrollDates('left')"
+      >
+        <svg class="w-5 h-5" fill="none" stroke="currentColor" stroke-width="2" viewBox="0 0 24 24"><polyline points="15,18 9,12 15,6" /></svg>
+      </button>
+
+      <div
+        ref="dateSelector"
+        class="flex-1 flex overflow-x-auto scrollbar-hide gap-2 px-2 py-1 scroll-smooth overscroll-x-contain"
+        style="overscroll-behavior-x: contain; touch-action: pan-x"
+        @wheel="handleWheel"
+        @scroll="handleScroll"
+      >
+        <button
+          v-for="date in availableDates"
+          :key="date.value"
+          :data-date="date.value"
+          :class="[
+            'flex flex-col items-center justify-center min-w-[64px] h-16 rounded-lg transition-all duration-200 border',
+            modelValue === date.value
+              ? 'bg-blue-600 border-blue-500 text-white shadow-lg shadow-blue-900/20'
+              : 'bg-zinc-900 border-zinc-800 text-zinc-500 hover:bg-zinc-800 hover:text-zinc-300 hover:border-zinc-700'
+          ]"
+          @click="selectDate(date.value)"
+        >
+          <span class="text-[10px] font-bold uppercase tracking-wider opacity-80">{{ date.weekday }}</span>
+          <span class="text-lg font-black leading-none my-0.5">{{ date.day }}</span>
+          <span class="text-[9px] font-bold opacity-60">{{ date.month }}月</span>
+        </button>
+      </div>
+
+      <button
+        :disabled="isLastDateVisible"
+        class="p-2 text-zinc-500 hover:text-zinc-300 disabled:opacity-30 transition-colors"
+        @click="scrollDates('right')"
+      >
+        <svg class="w-5 h-5" fill="none" stroke="currentColor" stroke-width="2" viewBox="0 0 24 24"><polyline points="9,18 15,12 9,6" /></svg>
+      </button>
+
+      <!-- 操作按钮组 -->
+      <div class="flex items-center border-l border-zinc-800 ml-1 pl-1">
+        <button class="p-2 text-zinc-500 hover:text-emerald-400 transition-colors" title="跳转到今天" @click="scrollToToday">
+          <CircleDot class="w-5 h-5" />
+        </button>
+        <button class="p-2 text-zinc-500 hover:text-blue-400 transition-colors" title="选择特定日期" @click="openManualDatePicker">
+          <CalendarIcon class="w-5 h-5" />
+        </button>
+      </div>
+    </div>
+
+    <!-- 手动日期选择弹窗 -->
+    <div
+      v-if="showManualDatePicker"
+      class="fixed inset-0 z-50 flex items-center justify-center bg-black/60 backdrop-blur-sm"
+    >
+      <div class="bg-zinc-900 border border-zinc-800 rounded-xl shadow-2xl w-full max-w-sm overflow-hidden" @click.stop>
+        <div class="flex items-center justify-between p-4 border-b border-zinc-800">
+          <h3 class="text-sm font-black text-zinc-100 uppercase tracking-widest">选择日期</h3>
+          <button class="text-zinc-500 hover:text-zinc-300 transition-colors" @click="showManualDatePicker = false">
+            <CloseIcon class="w-5 h-5" />
+          </button>
+        </div>
+        <div class="p-6 space-y-6">
+          <input
+            v-model="manualSelectedDate"
+            class="w-full bg-zinc-950 border border-zinc-800 rounded-xl px-4 py-3 text-zinc-200 focus:outline-none focus:border-blue-500 transition-colors"
+            type="date"
+          >
+          <div class="flex gap-3">
+            <button class="flex-1 py-3 bg-zinc-800 hover:bg-zinc-700 text-zinc-300 text-xs font-bold rounded-xl transition-colors uppercase tracking-wider" @click="showManualDatePicker = false">取消</button>
+            <button class="flex-1 py-3 bg-blue-600 hover:bg-blue-500 text-white text-xs font-bold rounded-xl shadow-lg shadow-blue-900/20 transition-colors uppercase tracking-wider" @click="confirmManualDate">确认</button>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref, computed, onMounted, nextTick, watch } from 'vue'
+import { CircleDot, Calendar as CalendarIcon, X as CloseIcon } from '@lucide/vue'
+
+const props = defineProps({
+  modelValue: {
+    type: String,
+    required: true
+  }
+})
+
+const emit = defineEmits(['update:modelValue', 'change'])
+
+const dateSelector = ref(null)
+const isFirstDateVisible = ref(false)
+const isLastDateVisible = ref(false)
+const dateRange = ref({ start: -15, end: 15 })
+const showManualDatePicker = ref(false)
+const manualSelectedDate = ref('')
+
+const availableDates = computed(() => {
+  const dates = []
+  const today = new Date()
+  for (let i = dateRange.value.start; i <= dateRange.value.end; i++) {
+    const date = new Date(today)
+    date.setDate(today.getDate() + i)
+    const dateStr = date.toISOString().split('T')[0]
+    const weekdays = ['日', '一', '二', '三', '四', '五', '六']
+    dates.push({
+      value: dateStr,
+      day: date.getDate().toString().padStart(2, '0'),
+      month: (date.getMonth() + 1).toString().padStart(2, '0'),
+      weekday: weekdays[date.getDay()],
+      isToday: i === 0
+    })
+  }
+  return dates
+})
+
+const selectDate = (dateValue) => {
+  emit('update:modelValue', dateValue)
+  emit('change', dateValue)
+}
+
+const scrollToDateElement = (behavior = 'smooth') => {
+  if (!dateSelector.value || !props.modelValue) return
+  const el = dateSelector.value.querySelector(`[data-date="${props.modelValue}"]`)
+  if (el) {
+    el.scrollIntoView({ behavior, block: 'nearest', inline: 'center' })
+  }
+}
+
+const handleWheel = (event) => {
+  event.preventDefault()
+  if (!dateSelector.value) return
+  const scrollAmount = 200
+  const currentScroll = dateSelector.value.scrollLeft
+  dateSelector.value.scrollTo({
+    left: event.deltaY > 0 ? currentScroll + scrollAmount : currentScroll - scrollAmount,
+    behavior: 'smooth'
+  })
+}
+
+const scrollDates = (direction) => {
+  if (!dateSelector.value) return
+  const scrollAmount = 200
+  const currentScroll = dateSelector.value.scrollLeft
+  dateSelector.value.scrollTo({
+    left: direction === 'right' ? currentScroll + scrollAmount : currentScroll - scrollAmount,
+    behavior: 'smooth'
+  })
+}
+
+const handleScroll = () => {
+  if (!dateSelector.value) return
+  const { scrollLeft, scrollWidth, clientWidth } = dateSelector.value
+  if (scrollLeft < 50) {
+    const oldScrollWidth = scrollWidth
+    dateRange.value.start -= 7
+    nextTick(() => {
+      const newScrollWidth = dateSelector.value.scrollWidth
+      dateSelector.value.scrollLeft += newScrollWidth - oldScrollWidth
+    })
+  }
+  if (scrollWidth - scrollLeft - clientWidth < 50) {
+    dateRange.value.end += 7
+  }
+}
+
+const scrollToToday = () => {
+  const todayStr = new Date().toISOString().split('T')[0]
+  if (props.modelValue !== todayStr) {
+    selectDate(todayStr)
+  }
+  if (dateRange.value.start > 0 || dateRange.value.end < 0) {
+    dateRange.value.start = -15
+    dateRange.value.end = 15
+  }
+  nextTick(() => scrollToDateElement('smooth'))
+}
+
+const openManualDatePicker = () => {
+  manualSelectedDate.value = props.modelValue
+  showManualDatePicker.value = true
+}
+
+const confirmManualDate = () => {
+  if (manualSelectedDate.value && manualSelectedDate.value !== props.modelValue) {
+    selectDate(manualSelectedDate.value)
+  }
+  showManualDatePicker.value = false
+  nextTick(() => scrollToDateElement('smooth'))
+}
+
+watch(() => props.modelValue, () => {
+  nextTick(() => scrollToDateElement('smooth'))
+})
+
+onMounted(() => {
+  nextTick(() => scrollToDateElement('auto'))
+})
+</script>
+
+<style scoped>
+.scrollbar-hide::-webkit-scrollbar {
+  display: none;
+}
+.scrollbar-hide {
+  -ms-overflow-style: none;
+  scrollbar-width: none;
+}
+</style>
diff --git a/app/components/Admin/AdminMultiDatePicker.vue b/app/components/Admin/AdminMultiDatePicker.vue
new file mode 100644
index 0000000..1f5ca30
--- /dev/null
+++ b/app/components/Admin/AdminMultiDatePicker.vue
@@ -0,0 +1,226 @@
+<template>
+  <div class="relative bg-zinc-900/50 border border-zinc-800/50 rounded-2xl p-1 overflow-hidden">
+    <div class="flex items-center" @touchstart.stop>
+      <button
+        :disabled="isFirstDateVisible"
+        class="p-2 text-zinc-500 hover:text-zinc-300 disabled:opacity-30 transition-colors"
+        @click="scrollDates('left')"
+      >
+        <svg class="w-5 h-5" fill="none" stroke="currentColor" stroke-width="2" viewBox="0 0 24 24"><polyline points="15,18 9,12 15,6" /></svg>
+      </button>
+
+      <div
+        ref="dateSelector"
+        class="flex-1 flex overflow-x-auto scrollbar-hide gap-2 px-2 py-1 scroll-smooth overscroll-x-contain"
+        style="overscroll-behavior-x: contain; touch-action: pan-x"
+        @wheel="handleWheel"
+        @scroll="handleScroll"
+      >
+        <button
+          v-for="date in availableDates"
+          :key="date.value"
+          :data-date="date.value"
+          :class="[
+            'flex flex-col items-center justify-center min-w-[64px] h-16 rounded-lg transition-all duration-200 border',
+            modelValue.includes(date.value)
+              ? 'bg-blue-600 border-blue-500 text-white shadow-lg shadow-blue-900/20'
+              : 'bg-zinc-900 border-zinc-800 text-zinc-500 hover:bg-zinc-800 hover:text-zinc-300 hover:border-zinc-700'
+          ]"
+          @click="toggleDate(date.value)"
+        >
+          <span class="text-[10px] font-bold uppercase tracking-wider opacity-80">{{ date.weekday }}</span>
+          <span class="text-lg font-black leading-none my-0.5">{{ date.day }}</span>
+          <span class="text-[9px] font-bold opacity-60">{{ date.month }}月</span>
+        </button>
+      </div>
+
+      <button
+        :disabled="isLastDateVisible"
+        class="p-2 text-zinc-500 hover:text-zinc-300 disabled:opacity-30 transition-colors"
+        @click="scrollDates('right')"
+      >
+        <svg class="w-5 h-5" fill="none" stroke="currentColor" stroke-width="2" viewBox="0 0 24 24"><polyline points="9,18 15,12 9,6" /></svg>
+      </button>
+
+      <!-- 操作按钮组 -->
+      <div class="flex items-center border-l border-zinc-800 ml-1 pl-1">
+        <button class="p-2 text-zinc-500 hover:text-emerald-400 transition-colors" title="跳转到今天" @click="scrollToToday">
+          <CircleDot class="w-5 h-5" />
+        </button>
+        <button class="p-2 text-zinc-500 hover:text-blue-400 transition-colors" title="选择特定日期" @click="openManualDatePicker">
+          <CalendarIcon class="w-5 h-5" />
+        </button>
+      </div>
+    </div>
+
+    <!-- 手动日期选择弹窗 -->
+    <div
+      v-if="showManualDatePicker"
+      class="fixed inset-0 z-50 flex items-center justify-center bg-black/60 backdrop-blur-sm"
+    >
+      <div class="bg-zinc-900 border border-zinc-800 rounded-xl shadow-2xl w-full max-w-sm overflow-hidden" @click.stop>
+        <div class="flex items-center justify-between p-4 border-b border-zinc-800">
+          <h3 class="text-sm font-black text-zinc-100 uppercase tracking-widest">选择日期</h3>
+          <button class="text-zinc-500 hover:text-zinc-300 transition-colors" @click="showManualDatePicker = false">
+            <CloseIcon class="w-5 h-5" />
+          </button>
+        </div>
+        <div class="p-6 space-y-6">
+          <input
+            v-model="manualSelectedDate"
+            class="w-full bg-zinc-950 border border-zinc-800 rounded-xl px-4 py-3 text-zinc-200 focus:outline-none focus:border-blue-500 transition-colors"
+            type="date"
+          >
+          <div class="flex gap-3">
+            <button class="flex-1 py-3 bg-zinc-800 hover:bg-zinc-700 text-zinc-300 text-xs font-bold rounded-xl transition-colors uppercase tracking-wider" @click="showManualDatePicker = false">取消</button>
+            <button class="flex-1 py-3 bg-blue-600 hover:bg-blue-500 text-white text-xs font-bold rounded-xl shadow-lg shadow-blue-900/20 transition-colors uppercase tracking-wider" @click="confirmManualDate">确认添加</button>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref, computed, onMounted, nextTick } from 'vue'
+import { CircleDot, Calendar as CalendarIcon, X as CloseIcon } from '@lucide/vue'
+
+const props = defineProps({
+  modelValue: {
+    type: Array,
+    default: () => []
+  }
+})
+
+const emit = defineEmits(['update:modelValue', 'change'])
+
+const dateSelector = ref(null)
+const isFirstDateVisible = ref(false)
+const isLastDateVisible = ref(false)
+const dateRange = ref({ start: 0, end: 30 }) // 默认展示今天起30天
+const showManualDatePicker = ref(false)
+const manualSelectedDate = ref('')
+
+const availableDates = computed(() => {
+  const dates = []
+  const today = new Date()
+  for (let i = dateRange.value.start; i <= dateRange.value.end; i++) {
+    const date = new Date(today)
+    date.setDate(today.getDate() + i)
+    const dateStr = date.toISOString().split('T')[0]
+    const weekdays = ['日', '一', '二', '三', '四', '五', '六']
+    dates.push({
+      value: dateStr,
+      day: date.getDate().toString().padStart(2, '0'),
+      month: (date.getMonth() + 1).toString().padStart(2, '0'),
+      weekday: weekdays[date.getDay()],
+      isToday: i === 0
+    })
+  }
+  return dates
+})
+
+const toggleDate = (dateValue) => {
+  const newValue = [...props.modelValue]
+  const index = newValue.indexOf(dateValue)
+  if (index > -1) {
+    newValue.splice(index, 1)
+  } else {
+    newValue.push(dateValue)
+    newValue.sort() // 保持日期顺序
+  }
+  emit('update:modelValue', newValue)
+  emit('change', newValue)
+}
+
+const handleWheel = (event) => {
+  event.preventDefault()
+  if (!dateSelector.value) return
+  const scrollAmount = 200
+  const currentScroll = dateSelector.value.scrollLeft
+  dateSelector.value.scrollTo({
+    left: event.deltaY > 0 ? currentScroll + scrollAmount : currentScroll - scrollAmount,
+    behavior: 'smooth'
+  })
+}
+
+const scrollDates = (direction) => {
+  if (!dateSelector.value) return
+  const scrollAmount = 200
+  const currentScroll = dateSelector.value.scrollLeft
+  dateSelector.value.scrollTo({
+    left: direction === 'right' ? currentScroll + scrollAmount : currentScroll - scrollAmount,
+    behavior: 'smooth'
+  })
+}
+
+const handleScroll = () => {
+  if (!dateSelector.value) return
+  const { scrollLeft, scrollWidth, clientWidth } = dateSelector.value
+  if (scrollLeft < 50) {
+    const oldScrollWidth = scrollWidth
+    dateRange.value.start -= 7
+    nextTick(() => {
+      const newScrollWidth = dateSelector.value.scrollWidth
+      dateSelector.value.scrollLeft += newScrollWidth - oldScrollWidth
+    })
+  }
+  if (scrollWidth - scrollLeft - clientWidth < 50) {
+    dateRange.value.end += 7
+  }
+}
+
+const scrollToToday = () => {
+  if (dateRange.value.start > 0 || dateRange.value.end < 0) {
+    dateRange.value.start = -15
+    dateRange.value.end = 15
+  }
+  nextTick(() => {
+    if (!dateSelector.value) return
+    const todayStr = new Date().toISOString().split('T')[0]
+    const el = dateSelector.value.querySelector(`[data-date="${todayStr}"]`)
+    if (el) {
+      el.scrollIntoView({ behavior: 'smooth', block: 'nearest', inline: 'center' })
+    }
+  })
+}
+
+const openManualDatePicker = () => {
+  manualSelectedDate.value = new Date().toISOString().split('T')[0]
+  showManualDatePicker.value = true
+}
+
+const confirmManualDate = () => {
+  if (manualSelectedDate.value) {
+    const newValue = [...props.modelValue]
+    if (!newValue.includes(manualSelectedDate.value)) {
+      newValue.push(manualSelectedDate.value)
+      newValue.sort()
+      emit('update:modelValue', newValue)
+      emit('change', newValue)
+    }
+  }
+  showManualDatePicker.value = false
+  nextTick(() => {
+    if (!dateSelector.value) return
+    const el = dateSelector.value.querySelector(`[data-date="${manualSelectedDate.value}"]`)
+    if (el) {
+      el.scrollIntoView({ behavior: 'smooth', block: 'nearest', inline: 'center' })
+    }
+  })
+}
+
+onMounted(() => {
+  nextTick(() => scrollToToday())
+})
+</script>
+
+<style scoped>
+.scrollbar-hide::-webkit-scrollbar {
+  display: none;
+}
+.scrollbar-hide {
+  -ms-overflow-style: none;
+  scrollbar-width: none;
+}
+</style>
diff --git a/app/components/Admin/AdminOnboardingTutorial.vue b/app/components/Admin/AdminOnboardingTutorial.vue
new file mode 100644
index 0000000..951a8c1
--- /dev/null
+++ b/app/components/Admin/AdminOnboardingTutorial.vue
@@ -0,0 +1,144 @@
+<template>
+  <Teleport to="body">
+    <div
+      v-if="visible"
+      class="fixed inset-0 z-[70] bg-black/70 backdrop-blur-sm px-4 py-6 flex items-end sm:items-center justify-center"
+    >
+      <div
+        class="w-full max-w-xl rounded-2xl border border-zinc-800 bg-zinc-950 shadow-2xl overflow-hidden"
+      >
+        <div class="px-5 py-4 border-b border-zinc-800 flex items-center justify-between gap-3">
+          <div>
+            <p class="text-[10px] uppercase tracking-[0.2em] text-zinc-500 font-black">后台引导</p>
+            <h3 class="text-lg font-black text-zinc-100 mt-1">{{ currentStep.title }}</h3>
+          </div>
+          <button
+            class="h-9 w-9 rounded-lg border border-zinc-700 text-zinc-400 hover:text-zinc-200 hover:bg-zinc-900 transition-colors"
+            @click="handleClose"
+          >
+            <X :size="16" class="mx-auto" />
+          </button>
+        </div>
+
+        <div class="px-5 py-5 space-y-4">
+          <p class="text-sm leading-relaxed text-zinc-300">{{ currentStep.description }}</p>
+          <div class="rounded-xl border border-blue-500/20 bg-blue-500/5 p-3">
+            <p class="text-xs text-zinc-400">
+              建议操作：
+              <span class="text-zinc-200 font-semibold">{{ currentStep.actionHint }}</span>
+            </p>
+          </div>
+        </div>
+
+        <div
+          class="px-5 py-4 border-t border-zinc-800 flex flex-col sm:flex-row sm:items-center sm:justify-between gap-3"
+        >
+          <p class="text-xs text-zinc-500 font-semibold">{{ stepIndex + 1 }} / {{ steps.length }}</p>
+          <div class="flex items-center gap-2">
+            <button
+              v-if="stepIndex > 0"
+              class="px-3.5 py-2 rounded-lg border border-zinc-700 text-zinc-300 hover:bg-zinc-900 text-sm"
+              @click="prevStep"
+            >
+              上一步
+            </button>
+            <button
+              class="px-3.5 py-2 rounded-lg border border-zinc-700 text-zinc-200 hover:bg-zinc-900 text-sm"
+              @click="goCurrentStep"
+            >
+              前往此功能
+            </button>
+            <button
+              class="px-4 py-2 rounded-lg bg-blue-600 hover:bg-blue-500 text-white text-sm font-bold"
+              @click="nextStep"
+            >
+              {{ stepIndex === steps.length - 1 ? '完成引导' : '下一步' }}
+            </button>
+          </div>
+        </div>
+      </div>
+    </div>
+  </Teleport>
+</template>
+
+<script setup>
+import { computed, ref, watch } from 'vue'
+import { X } from '@lucide/vue'
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+    default: false
+  }
+})
+
+const emit = defineEmits(['navigate', 'close', 'complete'])
+
+const steps = [
+  {
+    tab: 'overview',
+    title: '先看数据概览',
+    description: '这里会显示待处理歌曲、播放数据和系统运行状态，建议每次值班先看这一页。',
+    actionHint: '进入“数据概览”快速确认今日状态。'
+  },
+  {
+    tab: 'songs',
+    title: '处理歌曲审核',
+    description: '在歌曲管理中可试听、拒绝或保留歌曲，确保内容合规后再进入排期流程。',
+    actionHint: '优先处理新提交和被举报的歌曲。'
+  },
+  {
+    tab: 'schedule',
+    title: '安排节目排期',
+    description: '将审核通过的歌曲拖拽到目标日期与时段，调整顺序后发布，用户即可看到最新排期。',
+    actionHint: '排期完成后记得点击发布，避免用户看到旧数据。'
+  },
+  {
+    tab: 'site-config',
+    title: '维护站点配置',
+    description: '可统一修改站点标题、版本号和投稿规则，保存后会对前台页面立即生效。',
+    actionHint: '发布新版本时，建议同步更新“站点版本号”。'
+  },
+  {
+    tab: 'workflow-tutorial',
+    title: '查看完整流程教程',
+    description: '如果需要标准值班流程和FAQ，可在“流程与教程”页面查看详细图文说明。',
+    actionHint: '把该页面作为新人培训材料。'
+  }
+]
+
+const stepIndex = ref(0)
+const currentStep = computed(() => steps[stepIndex.value])
+
+watch(
+  () => props.visible,
+  (visible) => {
+    if (visible) {
+      stepIndex.value = 0
+    }
+  }
+)
+
+const goCurrentStep = () => {
+  emit('navigate', currentStep.value.tab)
+}
+
+const prevStep = () => {
+  if (stepIndex.value > 0) {
+    stepIndex.value -= 1
+  }
+}
+
+const nextStep = () => {
+  goCurrentStep()
+  if (stepIndex.value < steps.length - 1) {
+    stepIndex.value += 1
+    return
+  }
+  emit('complete')
+}
+
+const handleClose = () => {
+  emit('close')
+}
+</script>
diff --git a/app/components/Admin/ApiKeyManager.vue b/app/components/Admin/ApiKeyManager.vue
index 17e5a2e..b20a430 100644
--- a/app/components/Admin/ApiKeyManager.vue
+++ b/app/components/Admin/ApiKeyManager.vue
@@ -3,53 +3,51 @@
     <!-- 头部区域 -->
     <div class="flex flex-col md:flex-row md:items-end justify-between gap-6">
       <div>
-        <h2 class="text-2xl font-black text-text-primary tracking-tight">{{ locale.title }}</h2>
-        <p class="text-xs text-text-tertiary mt-1">{{ locale.desc }}</p>
+        <h2 class="text-2xl font-black text-zinc-100 tracking-tight">API密钥管理</h2>
+        <p class="text-xs text-zinc-500 mt-1">管理开放API的访问密钥，控制第三方应用的访问权限</p>
       </div>
       <button
-        class="flex items-center gap-2 px-4 py-2 bg-primary-hover hover:bg-primary text-text-primary text-xs font-bold rounded-xl transition-all shadow-lg shadow-[var(--primary-glow)] active:scale-95"
+        class="flex items-center gap-2 px-4 py-2 bg-blue-600 hover:bg-blue-500 text-white text-xs font-bold rounded-xl transition-all shadow-lg shadow-blue-900/20 active:scale-95"
         @click="openCreateModal"
       >
-        <Plus :size="14" /> {{ locale.create }}
+        <Plus :size="14" /> 创建API密钥
       </button>
     </div>
 
     <!-- 过滤器栏 -->
     <div
-      class="bg-bg-secondary-40 border border-border-secondary-60 rounded-2xl p-3 flex flex-col lg:flex-row gap-3 items-center"
+      class="bg-zinc-900/40 border border-zinc-800/60 rounded-2xl p-3 flex flex-col lg:flex-row gap-3 items-center"
     >
       <div class="relative flex-1 w-full">
-        <Search class="absolute left-3 top-1/2 -translate-y-1/2 text-text-secondary" :size="16" />
+        <Search class="absolute left-3 top-1/2 -translate-y-1/2 text-zinc-700" :size="16" />
         <input
           v-model="filters.search"
           type="text"
-          :placeholder="locale.searchPlaceholder"
-          class="w-full bg-bg-primary border border-border-secondary-80 rounded-xl pl-10 pr-4 py-2.5 text-xs focus:outline-none focus:border-primary-30 transition-all placeholder:text-text-primary text-text-primary"
+          placeholder="搜索API密钥名称或描述..."
+          class="w-full bg-zinc-950 border border-zinc-800/80 rounded-xl pl-10 pr-4 py-2.5 text-xs focus:outline-none focus:border-blue-500/30 transition-all placeholder:text-zinc-800 text-zinc-200"
           @input="debouncedSearch"
         >
       </div>
       <div class="flex items-center gap-2 w-full lg:w-auto">
         <CustomSelect
-          v-model="filters.status"
-          :label="locale.status"
-          :options="statusFilterOptions"
-          label-key="label"
-          value-key="value"
+          v-model="statusFilterText"
+          label="状态"
+          :options="['全部状态', '活跃', '非活跃', '已过期']"
           class-name="flex-1 lg:w-40"
-          @change="loadApiKeys"
+          @change="handleStatusFilterChange"
         />
         <div class="relative flex-1 lg:w-48">
-          <Search class="absolute left-3 top-1/2 -translate-y-1/2 text-text-secondary" :size="14" />
+          <Search class="absolute left-3 top-1/2 -translate-y-1/2 text-zinc-700" :size="14" />
           <input
             v-model="filters.createdBy"
             type="text"
-            :placeholder="locale.creatorPlaceholder"
-            class="w-full bg-bg-primary border border-border-secondary rounded-xl pl-9 pr-4 py-2.5 text-xs focus:outline-none text-text-tertiary placeholder:text-text-primary"
+            placeholder="创建者用户名"
+            class="w-full bg-zinc-950 border border-zinc-800 rounded-xl pl-9 pr-4 py-2.5 text-xs focus:outline-none text-zinc-400 placeholder:text-zinc-800"
             @input="debouncedSearch"
           >
         </div>
         <button
-          class="p-2.5 bg-bg-primary border border-border-secondary rounded-xl text-text-disabled hover:text-primary transition-all flex items-center justify-center"
+          class="p-2.5 bg-zinc-950 border border-zinc-800 rounded-xl text-zinc-600 hover:text-blue-400 transition-all"
           @click="loadApiKeys"
         >
           <RefreshCw :size="14" :class="{ 'animate-spin': loading }" />
@@ -62,8 +60,8 @@
       v-if="loading && apiKeys.length === 0"
       class="flex flex-col items-center justify-center py-20"
     >
-      <AppSpinner :size="24" class="mb-4" />
-      <p class="text-text-tertiary text-xs">{{ locale.loading }}</p>
+      <div class="loading-spinner mb-4" />
+      <p class="text-zinc-500 text-xs">加载中...</p>
     </div>
 
     <div
@@ -71,19 +69,19 @@
       class="flex flex-col items-center justify-center py-20 px-4 text-center"
     >
       <div
-        class="w-20 h-20 rounded-3xl bg-bg-secondary border border-border-secondary flex items-center justify-center mb-6 text-text-secondary shadow-xl"
+        class="w-20 h-20 rounded-3xl bg-zinc-900 border border-zinc-800 flex items-center justify-center mb-6 text-zinc-700 shadow-xl"
       >
         <Key :size="32" :stroke-width="1.5" />
       </div>
-      <h3 class="text-lg font-bold text-text-primary">{{ locale.emptyTitle }}</h3>
-      <p class="text-xs text-text-tertiary mt-2 max-w-xs leading-relaxed">
-        {{ locale.emptyDesc }}
+      <h3 class="text-lg font-bold text-zinc-200">暂无API密钥</h3>
+      <p class="text-xs text-zinc-500 mt-2 max-w-xs leading-relaxed">
+        您还没有创建任何访问密钥。创建密钥后，您可以安全地将 VoiceHub 集成到第三方应用程序中。
       </p>
       <button
-        class="mt-8 flex items-center gap-2 px-6 py-3 bg-bg-secondary border border-border-secondary hover:border-border-tertiary text-text-secondary text-xs font-bold rounded-2xl transition-all"
+        class="mt-8 flex items-center gap-2 px-6 py-3 bg-zinc-900 border border-zinc-800 hover:border-zinc-700 text-zinc-300 text-xs font-bold rounded-2xl transition-all"
         @click="openCreateModal"
       >
-        <Plus :size="16" /> {{ locale.createFirst }}
+        <Plus :size="16" /> 创建您的第一个密钥
       </button>
     </div>
 
@@ -91,54 +89,49 @@
       <div
         v-for="apiKey in apiKeys"
         :key="apiKey.id"
-        class="bg-bg-secondary-30 border border-border-secondary-60 rounded-2xl p-6 group hover:border-border-tertiary transition-all relative overflow-hidden"
+        class="bg-zinc-900/30 border border-zinc-800/60 rounded-2xl p-6 group hover:border-zinc-700 transition-all relative overflow-hidden"
       >
         <div class="flex items-start justify-between relative z-10">
           <div class="space-y-1">
             <div class="flex items-center gap-3">
-              <h4 class="text-sm font-black text-text-primary uppercase tracking-widest">
+              <h4 class="text-sm font-black text-zinc-100 uppercase tracking-widest">
                 {{ apiKey.name }}
               </h4>
               <span
                 v-if="apiKey.status === 'active'"
-                class="inline-flex items-center gap-1.5 px-2 py-0.5 bg-success-10 text-success text-[10px] font-black rounded uppercase border border-success-20"
-                >{{ locale.active }}</span
+                class="inline-flex items-center gap-1.5 px-2 py-0.5 bg-emerald-500/10 text-emerald-500 text-[10px] font-black rounded uppercase border border-emerald-500/20"
+                >活跃</span
               >
               <span
                 v-else-if="apiKey.status === 'inactive'"
-                class="inline-flex items-center gap-1.5 px-2 py-0.5 bg-bg-tertiary text-text-tertiary text-[10px] font-black rounded uppercase border border-border-tertiary-50"
-                >{{ locale.inactive }}</span
+                class="inline-flex items-center gap-1.5 px-2 py-0.5 bg-zinc-800 text-zinc-500 text-[10px] font-black rounded uppercase border border-zinc-700/50"
+                >非活跃</span
               >
               <span
                 v-else-if="apiKey.status === 'expired'"
-                class="inline-flex items-center gap-1.5 px-2 py-0.5 bg-error-10 text-error text-[10px] font-black rounded uppercase border border-error-20"
-                >{{ locale.expired }}</span
+                class="inline-flex items-center gap-1.5 px-2 py-0.5 bg-red-500/10 text-red-500 text-[10px] font-black rounded uppercase border border-red-500/20"
+                >已过期</span
               >
             </div>
-            <p class="text-xs text-text-tertiary font-medium">{{ apiKey.description || locale.noDescription }}</p>
+            <p class="text-xs text-zinc-500 font-medium">{{ apiKey.description || '暂无描述' }}</p>
           </div>
           <div
             class="flex items-center gap-1 opacity-100 lg:opacity-0 group-hover:opacity-100 transition-all"
           >
             <button
-              class="p-2 text-text-tertiary hover:text-primary transition-colors"
-              :disabled="loadingViewId !== null || loadingEditId !== null"
+              class="p-2 text-zinc-500 hover:text-blue-400 transition-colors"
               @click="viewApiKey(apiKey)"
             >
-              <RefreshCw v-if="loadingViewId === apiKey.id" :size="14" class="animate-spin" />
-              <Eye v-else :size="14" />
+              <Eye :size="14" />
             </button>
             <button
-              class="p-2 text-text-tertiary hover:text-warning transition-colors"
-              :disabled="loadingViewId !== null || loadingEditId !== null"
+              class="p-2 text-zinc-500 hover:text-amber-400 transition-colors"
               @click="editApiKey(apiKey)"
             >
-              <RefreshCw v-if="loadingEditId === apiKey.id" :size="14" class="animate-spin" />
-              <Edit2 v-else :size="14" />
+              <Edit2 :size="14" />
             </button>
             <button
-              class="p-2 text-text-tertiary hover:text-error transition-colors"
-              :disabled="loadingViewId !== null || loadingEditId !== null"
+              class="p-2 text-zinc-500 hover:text-red-400 transition-colors"
               @click="deleteApiKey(apiKey)"
             >
               <Trash2 :size="14" />
@@ -146,30 +139,30 @@
           </div>
         </div>
 
-        <div class="mt-8 grid grid-cols-2 gap-4 border-t border-border-secondary-40 pt-6 relative z-10">
+        <div class="mt-8 grid grid-cols-2 gap-4 border-t border-zinc-800/40 pt-6 relative z-10">
           <div class="space-y-0.5">
-            <span class="text-[9px] font-black text-text-disabled uppercase tracking-widest"
-              >{{ locale.creator }}</span
+            <span class="text-[9px] font-black text-zinc-600 uppercase tracking-widest"
+              >创建者</span
             >
-            <p class="text-xs font-bold text-text-tertiary">{{ apiKey.creatorName || locale.unknown }}</p>
+            <p class="text-xs font-bold text-zinc-400">{{ apiKey.creatorName || '未知' }}</p>
           </div>
           <div class="space-y-0.5">
-            <span class="text-[9px] font-black text-text-disabled uppercase tracking-widest"
-              >{{ locale.createdAt }}</span
+            <span class="text-[9px] font-black text-zinc-600 uppercase tracking-widest"
+              >创建时间</span
             >
-            <p class="text-xs font-bold text-text-tertiary">
+            <p class="text-xs font-bold text-zinc-400">
               {{ formatDate(apiKey.createdAt).split(' ')[0] }}
             </p>
           </div>
           <div class="col-span-2 space-y-1">
-            <span class="text-[9px] font-black text-text-disabled uppercase tracking-widest"
-              >{{ locale.permissions }}</span
+            <span class="text-[9px] font-black text-zinc-600 uppercase tracking-widest"
+              >权限列表</span
             >
             <div class="flex flex-wrap gap-1.5">
               <span
                 v-for="perm in apiKey.permissions"
                 :key="perm"
-                class="text-[9px] font-mono bg-bg-primary px-1.5 py-0.5 rounded text-text-tertiary border border-border-secondary-50"
+                class="text-[9px] font-mono bg-zinc-950 px-1.5 py-0.5 rounded text-zinc-500 border border-zinc-800/50"
               >
                 {{ perm }}
               </span>
@@ -179,7 +172,7 @@
 
         <!-- 背景点缀 -->
         <div
-          class="absolute -right-4 -bottom-4 w-24 h-24 bg-primary-5 blur-3xl rounded-full opacity-0 group-hover:opacity-100 transition-opacity"
+          class="absolute -right-4 -bottom-4 w-24 h-24 bg-blue-500/5 blur-3xl rounded-full opacity-0 group-hover:opacity-100 transition-opacity"
         />
       </div>
     </div>
@@ -189,7 +182,7 @@
       v-model:current-page="pagination.page"
       :total-pages="pagination.totalPages"
       :total-items="pagination.total"
-      :item-name="locale.itemName"
+      item-name="个API密钥"
       @change="loadApiKeys"
     />
 
@@ -199,22 +192,19 @@
         v-if="showCreateModal || showEditModal || showViewModal || showSuccessModal"
         class="fixed inset-0 z-[100] flex items-center justify-center p-4"
       >
-        <div
-          class="absolute inset-0 bg-bg-primary-60 backdrop-blur-sm"
-          @click="handleBackdropClick"
-        />
+        <div class="absolute inset-0 bg-black/60 backdrop-blur-sm" @click="closeModals" />
 
         <!-- 创建/编辑模态框 -->
         <div
           v-if="showCreateModal || showEditModal"
-          class="relative w-full max-w-lg bg-bg-secondary border border-border-secondary rounded-3xl shadow-2xl overflow-hidden animate-in fade-in zoom-in duration-200"
+          class="relative w-full max-w-lg bg-zinc-900 border border-zinc-800 rounded-3xl shadow-2xl overflow-hidden animate-in fade-in zoom-in duration-200"
         >
-          <div class="p-6 border-b border-border-secondary flex items-center justify-between">
-            <h3 class="text-lg font-black text-text-primary uppercase tracking-widest">
-              {{ showCreateModal ? locale.create : locale.edit }}
+          <div class="p-6 border-b border-zinc-800 flex items-center justify-between">
+            <h3 class="text-lg font-black text-zinc-100 uppercase tracking-widest">
+              {{ showCreateModal ? '创建API密钥' : '编辑API密钥' }}
             </h3>
             <button
-              class="text-text-tertiary hover:text-text-primary transition-colors"
+              class="text-zinc-500 hover:text-zinc-200 transition-colors"
               @click="closeModals"
             >
               <X :size="20" />
@@ -223,99 +213,106 @@
 
           <div class="p-6 space-y-5 max-h-[70vh] overflow-y-auto custom-scrollbar">
             <div class="space-y-1.5">
-              <label class="text-[10px] font-black text-text-disabled uppercase tracking-widest px-0.5"
-                >{{ locale.name }}</label
+              <label class="text-[10px] font-black text-zinc-600 uppercase tracking-widest px-0.5"
+                >名称 *</label
               >
               <input
                 v-model="form.name"
                 type="text"
-                :placeholder="locale.namePlaceholder"
-                class="w-full bg-bg-primary border border-border-secondary rounded-xl px-3 py-2.5 text-xs focus:outline-none focus:border-primary-30 text-text-primary placeholder:text-text-primary"
+                placeholder="输入API密钥名称"
+                class="w-full bg-zinc-950 border border-zinc-800 rounded-xl px-3 py-2.5 text-xs focus:outline-none focus:border-blue-500/30 text-zinc-200 placeholder:text-zinc-800"
               >
             </div>
             <div class="space-y-1.5">
-              <label class="text-[10px] font-black text-text-disabled uppercase tracking-widest px-0.5"
-                >{{ locale.description }}</label
+              <label class="text-[10px] font-black text-zinc-600 uppercase tracking-widest px-0.5"
+                >描述</label
               >
               <textarea
                 v-model="form.description"
-                :placeholder="locale.descriptionPlaceholder"
-                class="w-full bg-bg-primary border border-border-secondary rounded-xl px-3 py-2.5 text-xs focus:outline-none focus:border-primary-30 text-text-primary min-h-[80px] resize-none placeholder:text-text-primary"
+                placeholder="输入API密钥描述 (可选)"
+                class="w-full bg-zinc-950 border border-zinc-800 rounded-xl px-3 py-2.5 text-xs focus:outline-none focus:border-blue-500/30 text-zinc-200 min-h-[80px] resize-none placeholder:text-zinc-800"
               />
             </div>
             <div class="space-y-1.5">
-              <label class="text-[10px] font-black text-text-disabled uppercase tracking-widest px-0.5"
-                >{{ locale.expiresAt }}</label
+              <label class="text-[10px] font-black text-zinc-600 uppercase tracking-widest px-0.5"
+                >过期时间</label
               >
               <CustomSelect
                 v-model="expiresAtText"
-                :options="expiresAtOptions"
+                :options="[
+                  '永不过期',
+                  '3天后过期',
+                  '7天后过期',
+                  '30天后过期',
+                  '60天后过期',
+                  '90天后过期'
+                ]"
                 class-name="w-full"
                 @change="handleExpiresAtChange"
               />
             </div>
             <div class="space-y-3">
-              <label class="text-[10px] font-black text-text-disabled uppercase tracking-widest px-0.5"
-                >{{ locale.permissionSettings }}</label
+              <label class="text-[10px] font-black text-zinc-600 uppercase tracking-widest px-0.5"
+                >权限设置 *</label
               >
               <div class="grid grid-cols-2 gap-2">
                 <label
                   v-for="perm in availablePermissions"
                   :key="perm.value"
-                  class="flex items-start gap-3 p-3 bg-bg-primary border border-border-secondary rounded-xl cursor-pointer hover:border-border-tertiary transition-all"
+                  class="flex items-start gap-3 p-3 bg-zinc-950 border border-zinc-800 rounded-xl cursor-pointer hover:border-zinc-600 transition-all"
                   :class="{
-                    'border-primary-30 bg-primary-5': form.permissions.includes(perm.value)
+                    'border-blue-500/30 bg-blue-500/5': form.permissions.includes(perm.value)
                   }"
                 >
                   <input
                     v-model="form.permissions"
                     type="checkbox"
                     :value="perm.value"
-                    class="mt-1 w-3.5 h-3.5 rounded border-border-secondary bg-bg-secondary"
+                    class="mt-1 w-3.5 h-3.5 rounded border-zinc-800 bg-zinc-900 accent-blue-600"
                   >
                   <div>
                     <p
                       class="text-xs font-bold"
                       :class="
-                        form.permissions.includes(perm.value) ? 'text-primary' : 'text-text-secondary'
+                        form.permissions.includes(perm.value) ? 'text-blue-400' : 'text-zinc-300'
                       "
                     >
                       {{ perm.label }}
                     </p>
-                    <p class="text-[9px] text-text-disabled mt-0.5">{{ perm.description }}</p>
+                    <p class="text-[9px] text-zinc-600 mt-0.5">{{ perm.description }}</p>
                   </div>
                 </label>
               </div>
             </div>
             <label
               v-if="showEditModal"
-              class="flex items-center gap-2 p-3 bg-primary-hover-5 border border-primary-10 rounded-xl cursor-pointer group"
+              class="flex items-center gap-2 p-3 bg-blue-600/5 border border-blue-500/10 rounded-xl cursor-pointer group"
             >
               <input
                 v-model="form.isActive"
                 type="checkbox"
-                class="w-3.5 h-3.5 rounded border-border-secondary bg-bg-secondary"
+                class="w-3.5 h-3.5 rounded border-zinc-800 bg-zinc-900 accent-blue-600"
               >
               <span
-                class="text-xs font-bold text-text-secondary group-hover:text-primary transition-colors"
-                >{{ locale.enabled }}</span
+                class="text-xs font-bold text-zinc-300 group-hover:text-blue-400 transition-colors"
+                >启用此API密钥</span
               >
             </label>
           </div>
 
-          <div class="p-6 border-t border-border-secondary flex gap-2 justify-end">
+          <div class="p-6 border-t border-zinc-800 flex gap-2 justify-end">
             <button
-              class="px-4 py-2 text-xs font-bold text-text-tertiary hover:text-text-secondary"
+              class="px-4 py-2 text-xs font-bold text-zinc-500 hover:text-zinc-300"
               @click="closeModals"
             >
-              {{ locale.cancel }}
+              取消
             </button>
             <button
               :disabled="submitting"
-              class="px-6 py-2 bg-primary-hover hover:bg-primary text-text-primary text-xs font-bold rounded-xl shadow-lg shadow-[var(--primary-glow)] disabled:opacity-50 transition-all"
+              class="px-6 py-2 bg-blue-600 hover:bg-blue-500 text-white text-xs font-bold rounded-xl shadow-lg shadow-blue-900/20 disabled:opacity-50 transition-all"
               @click="showCreateModal ? createApiKey() : updateApiKey()"
             >
-              {{ submitting ? locale.saving : showCreateModal ? locale.createKey : locale.saveChanges }}
+              {{ submitting ? '保存中...' : showCreateModal ? '创建密钥' : '保存更改' }}
             </button>
           </div>
         </div>
@@ -323,14 +320,14 @@
         <!-- 成功模态框 -->
         <div
           v-if="showSuccessModal"
-          class="relative w-full max-w-lg bg-bg-secondary border border-border-secondary rounded-3xl shadow-2xl overflow-hidden animate-in fade-in zoom-in duration-200"
+          class="relative w-full max-w-lg bg-zinc-900 border border-zinc-800 rounded-3xl shadow-2xl overflow-hidden animate-in fade-in zoom-in duration-200"
         >
-          <div class="p-6 border-b border-border-secondary flex items-center justify-between">
-            <h3 class="text-lg font-black text-text-primary uppercase tracking-widest">
-              {{ locale.createSuccessTitle }}
+          <div class="p-6 border-b border-zinc-800 flex items-center justify-between">
+            <h3 class="text-lg font-black text-zinc-100 uppercase tracking-widest">
+              API密钥创建成功
             </h3>
             <button
-              class="text-text-tertiary hover:text-text-primary transition-colors"
+              class="text-zinc-500 hover:text-zinc-200 transition-colors"
               @click="closeModals"
             >
               <X :size="20" />
@@ -339,24 +336,24 @@
 
           <div class="p-6 space-y-6">
             <div
-              class="p-6 bg-success-10 border border-success-20 rounded-2xl flex flex-col items-center text-center"
+              class="p-6 bg-emerald-500/10 border border-emerald-500/20 rounded-2xl flex flex-col items-center text-center"
             >
               <div
-                class="w-12 h-12 rounded-full bg-success text-text-primary flex items-center justify-center mb-4 shadow-lg shadow-[var(--success-glow-20)]"
+                class="w-12 h-12 rounded-full bg-emerald-500 text-white flex items-center justify-center mb-4 shadow-lg shadow-emerald-900/20"
               >
                 <Check :size="24" :stroke-width="3" />
               </div>
-              <h4 class="text-lg font-black text-success">{{ locale.createSuccessHeading }}</h4>
-              <p class="text-xs text-text-tertiary mt-2">{{ locale.createSuccessDesc }}</p>
+              <h4 class="text-lg font-black text-emerald-400">API密钥创建成功！</h4>
+              <p class="text-xs text-zinc-500 mt-2">请妥善保管以下API密钥，它只会显示这一次。</p>
             </div>
 
             <div class="space-y-2">
-              <label class="text-[10px] font-black text-text-disabled uppercase tracking-widest px-0.5"
-                >{{ locale.fullKey }}</label
+              <label class="text-[10px] font-black text-zinc-600 uppercase tracking-widest px-0.5"
+                >完整API密钥</label
               >
               <div class="flex items-center gap-2">
                 <div
-                  class="flex-1 bg-bg-primary border border-border-secondary rounded-xl px-4 py-3 font-mono text-xs text-primary break-all select-all"
+                  class="flex-1 bg-zinc-950 border border-zinc-800 rounded-xl px-4 py-3 font-mono text-xs text-blue-400 break-all select-all"
                 >
                   {{ newApiKey?.apiKey }}
                 </div>
@@ -364,8 +361,8 @@
                   class="p-3 rounded-xl transition-all"
                   :class="
                     copied
-                      ? 'bg-success text-text-primary'
-                      : 'bg-bg-tertiary hover:bg-bg-quaternary text-text-secondary'
+                      ? 'bg-emerald-600 text-white'
+                      : 'bg-zinc-800 hover:bg-zinc-700 text-zinc-300'
                   "
                   @click="copyToClipboard(newApiKey?.apiKey)"
                 >
@@ -374,22 +371,22 @@
                 </button>
               </div>
               <div
-                class="flex items-center gap-2 p-3 bg-warning-10 border border-warning-20 rounded-xl text-warning"
+                class="flex items-center gap-2 p-3 bg-amber-500/10 border border-amber-500/20 rounded-xl text-amber-500"
               >
                 <AlertTriangle :size="14" class="shrink-0" />
                 <p class="text-[10px] font-bold">
-                  {{ locale.copyWarning }}
+                  请立即复制并保存此API密钥，关闭此窗口后将无法再次查看完整密钥
                 </p>
               </div>
             </div>
           </div>
 
-          <div class="p-6 border-t border-border-secondary">
+          <div class="p-6 border-t border-zinc-800">
             <button
-              class="w-full py-2.5 bg-bg-primary border border-border-secondary hover:border-border-tertiary text-text-primary text-xs font-black rounded-xl transition-all"
+              class="w-full py-2.5 bg-zinc-950 border border-zinc-800 hover:border-zinc-700 text-zinc-200 text-xs font-black rounded-xl transition-all"
               @click="closeModals"
             >
-              {{ locale.closeSaved }}
+              我已保存，关闭窗口
             </button>
           </div>
         </div>
@@ -397,12 +394,12 @@
         <!-- 详情模态框 -->
         <div
           v-if="showViewModal && selectedApiKey"
-          class="relative w-full max-w-2xl bg-bg-secondary border border-border-secondary rounded-3xl shadow-2xl overflow-hidden animate-in fade-in zoom-in duration-200"
+          class="relative w-full max-w-2xl bg-zinc-900 border border-zinc-800 rounded-3xl shadow-2xl overflow-hidden animate-in fade-in zoom-in duration-200"
         >
-          <div class="p-6 border-b border-border-secondary flex items-center justify-between">
-            <h3 class="text-lg font-black text-text-primary uppercase tracking-widest">{{ locale.details }}</h3>
+          <div class="p-6 border-b border-zinc-800 flex items-center justify-between">
+            <h3 class="text-lg font-black text-zinc-100 uppercase tracking-widest">API密钥详情</h3>
             <button
-              class="text-text-tertiary hover:text-text-primary transition-colors"
+              class="text-zinc-500 hover:text-zinc-200 transition-colors"
               @click="closeModals"
             >
               <X :size="20" />
@@ -412,58 +409,58 @@
           <div class="p-6 space-y-8 max-h-[80vh] overflow-y-auto custom-scrollbar">
             <section class="space-y-4">
               <h5
-                class="text-[10px] font-black text-text-disabled uppercase tracking-widest border-b border-border-secondary pb-2"
+                class="text-[10px] font-black text-zinc-600 uppercase tracking-widest border-b border-zinc-800 pb-2"
               >
-                {{ locale.basicInfo }}
+                基本信息
               </h5>
               <div class="grid grid-cols-2 gap-6">
                 <div class="space-y-1">
-                  <span class="text-[10px] text-text-disabled font-bold">{{ locale.nameField }}</span>
-                  <p class="text-xs font-bold text-text-primary">{{ selectedApiKey.name }}</p>
+                  <span class="text-[10px] text-zinc-600 font-bold">名称:</span>
+                  <p class="text-xs font-bold text-zinc-200">{{ selectedApiKey.name }}</p>
                 </div>
                 <div class="space-y-1">
-                  <span class="text-[10px] text-text-disabled font-bold">{{ locale.statusField }}</span>
+                  <span class="text-[10px] text-zinc-600 font-bold">状态:</span>
                   <div>
                     <span
                       v-if="selectedApiKey.status === 'active'"
-                      class="inline-flex items-center gap-1.5 px-2 py-0.5 bg-success-10 text-success text-[10px] font-black rounded uppercase border border-success-20"
-                      >{{ locale.active }}</span
+                      class="inline-flex items-center gap-1.5 px-2 py-0.5 bg-emerald-500/10 text-emerald-500 text-[10px] font-black rounded uppercase border border-emerald-500/20"
+                      >活跃</span
                     >
                     <span
                       v-else-if="selectedApiKey.status === 'inactive'"
-                      class="inline-flex items-center gap-1.5 px-2 py-0.5 bg-bg-tertiary text-text-tertiary text-[10px] font-black rounded uppercase border border-border-tertiary-50"
-                      >{{ locale.inactive }}</span
+                      class="inline-flex items-center gap-1.5 px-2 py-0.5 bg-zinc-800 text-zinc-500 text-[10px] font-black rounded uppercase border border-zinc-700/50"
+                      >非活跃</span
                     >
                     <span
                       v-else-if="selectedApiKey.status === 'expired'"
-                      class="inline-flex items-center gap-1.5 px-2 py-0.5 bg-error-10 text-error text-[10px] font-black rounded uppercase border border-error-20"
-                      >{{ locale.expired }}</span
+                      class="inline-flex items-center gap-1.5 px-2 py-0.5 bg-red-500/10 text-red-500 text-[10px] font-black rounded uppercase border border-red-500/20"
+                      >已过期</span
                     >
                   </div>
                 </div>
                 <div class="col-span-2 space-y-1">
-                  <span class="text-[10px] text-text-disabled font-bold">{{ locale.descField }}</span>
-                  <p class="text-xs font-bold text-text-tertiary leading-relaxed">
-                    {{ selectedApiKey.description || locale.noDescription }}
+                  <span class="text-[10px] text-zinc-600 font-bold">描述:</span>
+                  <p class="text-xs font-bold text-zinc-400 leading-relaxed">
+                    {{ selectedApiKey.description || '暂无描述' }}
                   </p>
                 </div>
                 <div class="space-y-1">
-                  <span class="text-[10px] text-text-disabled font-bold">{{ locale.creatorField }}</span>
-                  <p class="text-xs font-bold text-text-primary">
-                    {{ selectedApiKey.creatorName || locale.unknown }}
+                  <span class="text-[10px] text-zinc-600 font-bold">创建者:</span>
+                  <p class="text-xs font-bold text-zinc-200">
+                    {{ selectedApiKey.creatorName || '未知' }}
                   </p>
                 </div>
                 <div class="space-y-1">
-                  <span class="text-[10px] text-text-disabled font-bold">{{ locale.createdAtField }}</span>
-                  <p class="text-xs font-bold text-text-primary">
+                  <span class="text-[10px] text-zinc-600 font-bold">创建时间:</span>
+                  <p class="text-xs font-bold text-zinc-200">
                     {{ formatDate(selectedApiKey.createdAt) }}
                   </p>
                 </div>
                 <div v-if="selectedApiKey.expiresAt" class="space-y-1">
-                  <span class="text-[10px] text-text-disabled font-bold">{{ locale.expiresAtField }}</span>
+                  <span class="text-[10px] text-zinc-600 font-bold">过期时间:</span>
                   <p
                     class="text-xs font-bold"
-                    :class="selectedApiKey.isExpired ? 'text-error' : 'text-text-primary'"
+                    :class="selectedApiKey.isExpired ? 'text-red-400' : 'text-zinc-200'"
                   >
                     {{ formatDate(selectedApiKey.expiresAt) }}
                   </p>
@@ -473,45 +470,45 @@
 
             <section class="space-y-4">
               <h5
-                class="text-[10px] font-black text-text-disabled uppercase tracking-widest border-b border-border-secondary pb-2"
+                class="text-[10px] font-black text-zinc-600 uppercase tracking-widest border-b border-zinc-800 pb-2"
               >
-                {{ locale.usageStats }}
+                使用统计
               </h5>
               <div class="grid grid-cols-2 gap-4">
                 <div
-                  class="p-4 bg-bg-primary border border-border-secondary rounded-2xl flex items-center justify-between group hover:border-primary-30 transition-all"
+                  class="p-4 bg-zinc-950 border border-zinc-800 rounded-2xl flex items-center justify-between group hover:border-blue-500/30 transition-all"
                 >
                   <div class="space-y-0.5">
-                    <span class="text-[9px] font-black text-text-disabled uppercase tracking-widest"
-                      >{{ locale.totalCalls }}</span
+                    <span class="text-[9px] font-black text-zinc-600 uppercase tracking-widest"
+                      >总调用次数</span
                     >
-                    <p class="text-xl font-black text-text-primary">
+                    <p class="text-xl font-black text-zinc-100">
                       {{ selectedApiKey.usageCount || 0 }}
                     </p>
                   </div>
                   <div
-                    class="p-2 bg-primary-10 rounded-xl text-primary group-hover:scale-110 transition-transform flex items-center justify-center"
+                    class="p-2 bg-blue-500/10 rounded-xl text-blue-500 group-hover:scale-110 transition-transform"
                   >
                     <BarChart :size="20" />
                   </div>
                 </div>
                 <div
-                  class="p-4 bg-bg-primary border border-border-secondary rounded-2xl flex items-center justify-between group hover:border-warning-30 transition-all"
+                  class="p-4 bg-zinc-950 border border-zinc-800 rounded-2xl flex items-center justify-between group hover:border-amber-500/30 transition-all"
                 >
                   <div class="space-y-0.5">
-                    <span class="text-[9px] font-black text-text-disabled uppercase tracking-widest"
-                      >{{ locale.lastUsedAt }}</span
+                    <span class="text-[9px] font-black text-zinc-600 uppercase tracking-widest"
+                      >最后使用时间</span
                     >
-                    <p class="text-xs font-bold text-text-primary">
+                    <p class="text-xs font-bold text-zinc-100">
                       {{
                         selectedApiKey.lastUsedAt
                           ? formatDate(selectedApiKey.lastUsedAt)
-                          : locale.neverChecked
+                          : '从未核对'
                       }}
                     </p>
                   </div>
                   <div
-                    class="p-2 bg-warning-10 rounded-xl text-warning group-hover:scale-110 transition-transform flex items-center justify-center"
+                    class="p-2 bg-amber-500/10 rounded-xl text-amber-500 group-hover:scale-110 transition-transform"
                   >
                     <Clock :size="20" />
                   </div>
@@ -520,9 +517,9 @@
             </section>
 
             <section class="space-y-4">
-              <div class="flex items-center justify-between border-b border-border-secondary pb-2">
-                <h5 class="text-[10px] font-black text-text-disabled uppercase tracking-widest">
-                  {{ locale.recentLogs }}
+              <div class="flex items-center justify-between border-b border-zinc-800 pb-2">
+                <h5 class="text-[10px] font-black text-zinc-600 uppercase tracking-widest">
+                  最近调用日志
                 </h5>
                 <Pagination
                   v-model:current-page="logsPagination.page"
@@ -534,25 +531,25 @@
               <div class="space-y-2">
                 <div
                   v-if="loadingLogs"
-                  class="flex flex-col items-center justify-center py-10 text-text-disabled gap-2"
+                  class="flex flex-col items-center justify-center py-10 text-zinc-600 gap-2"
                 >
                   <RefreshCw :size="24" class="animate-spin" />
-                  <span class="text-[10px] font-bold">{{ locale.loadingLogs }}</span>
+                  <span class="text-[10px] font-bold">正在加载日志...</span>
                 </div>
                 <div
                   v-else-if="apiLogs.length === 0"
-                  class="flex flex-col items-center justify-center py-10 bg-bg-primary-50 border border-border-secondary-50 rounded-2xl"
+                  class="flex flex-col items-center justify-center py-10 bg-zinc-950/50 border border-zinc-800/50 rounded-2xl"
                 >
-                  <History :size="24" class="text-text-primary mb-2" />
-                  <span class="text-[10px] font-bold text-text-secondary uppercase tracking-widest"
-                    >{{ locale.noLogs }}</span
+                  <History :size="24" class="text-zinc-800 mb-2" />
+                  <span class="text-[10px] font-bold text-zinc-700 uppercase tracking-widest"
+                    >暂无调用记录</span
                   >
                 </div>
                 <div
                   v-for="log in apiLogs"
                   v-else
                   :key="log.id"
-                  class="p-3 bg-bg-primary border border-border-secondary-40 rounded-xl flex items-center justify-between group hover:border-border-tertiary transition-all"
+                  class="p-3 bg-zinc-950 border border-zinc-800/40 rounded-xl flex items-center justify-between group hover:border-zinc-700 transition-all"
                 >
                   <div class="flex items-center gap-4">
                     <div
@@ -562,8 +559,8 @@
                       {{ log.method }}
                     </div>
                     <div class="space-y-0.5">
-                      <p class="text-xs font-mono text-text-tertiary">{{ log.endpoint }}</p>
-                      <div class="flex items-center gap-2 text-[9px] font-bold text-text-disabled">
+                      <p class="text-xs font-mono text-zinc-400">{{ log.endpoint }}</p>
+                      <div class="flex items-center gap-2 text-[9px] font-bold text-zinc-600">
                         <span>{{ formatDate(log.createdAt) }}</span>
                         <span>•</span>
                         <span>{{ log.ipAddress }}</span>
@@ -575,7 +572,7 @@
                       <p class="text-xs font-black" :class="getStatusColorClass(log.statusCode)">
                         {{ log.statusCode }}
                       </p>
-                      <p class="text-[9px] font-bold text-text-disabled">{{ log.responseTimeMs }}ms</p>
+                      <p class="text-[9px] font-bold text-zinc-600">{{ log.responseTimeMs }}ms</p>
                     </div>
                   </div>
                 </div>
@@ -624,24 +621,6 @@ import { useToast } from '~/composables/useToast'
 import ConfirmDialog from '~/components/UI/ConfirmDialog.vue'
 import Pagination from '~/components/UI/Common/Pagination.vue'
 import CustomSelect from '~/components/UI/Common/CustomSelect.vue'
-import { useLocale } from '~/utils/locale'
-import AppSpinner from '~/components/UI/Common/AppSpinner.vue'
-
-const { admin, currentLocale } = useLocale()
-const locale = computed(() => useSafeLocale(admin.value?.apiKeys || {}))
-const { msg: getLocaleText } = useLocaleText(locale)
-const expiresOptionFallbacks = {
-  never: '永不过期',
-  threeDays: '3天后过期',
-  sevenDays: '7天后过期',
-  thirtyDays: '30天后过期',
-  sixtyDays: '60天后过期',
-  ninetyDays: '90天后过期'
-}
-const getExpiresOptionText = (key) =>
-  formatLocaleValue(locale.value?.expiresOptions?.[key]) || expiresOptionFallbacks[key] || key
-const getPermissionOptionText = (key, field) => formatLocaleValue(locale.value?.permissionOptions?.[key]?.[field])
-const getDeleteTitle = (name) => getLocaleText('deleteMessage', name)
 
 // 响应式数据
 const loading = ref(false)
@@ -656,25 +635,10 @@ const newApiKey = ref(null)
 const loadingLogs = ref(false)
 const apiLogs = ref([])
 const copied = ref(false)
-const loadingEditId = ref(null)
-const loadingViewId = ref(null)
 
 // 文本映射
-const expiresAtText = ref('')
-const expiresAtOptions = computed(() => [
-  getExpiresOptionText('never'),
-  getExpiresOptionText('threeDays'),
-  getExpiresOptionText('sevenDays'),
-  getExpiresOptionText('thirtyDays'),
-  getExpiresOptionText('sixtyDays'),
-  getExpiresOptionText('ninetyDays')
-])
-const statusFilterOptions = computed(() => [
-  { label: getLocaleText('allStatus'), value: '' },
-  { label: getLocaleText('active'), value: 'active' },
-  { label: getLocaleText('inactive'), value: 'inactive' },
-  { label: getLocaleText('expired'), value: 'expired' }
-])
+const statusFilterText = ref('全部状态')
+const expiresAtText = ref('永不过期')
 
 const logsPagination = ref({
   page: 1,
@@ -686,11 +650,11 @@ const logsPagination = ref({
 // 确认对话框相关
 const showConfirmDialog = ref(false)
 const confirmDialogConfig = ref({
-  title: getLocaleText('confirmDeleteTitle'),
+  title: '确认删除',
   message: '',
   type: 'danger',
-  confirmText: getLocaleText('delete'),
-  cancelText: getLocaleText('cancel')
+  confirmText: '删除',
+  cancelText: '取消'
 })
 const pendingDeleteApiKey = ref(null)
 
@@ -718,88 +682,38 @@ const form = reactive({
   isActive: true
 })
 
-const formatExpiresAtText = (dateText) => getLocaleText('expiresAtText', dateText)
-
-const getExpiresAtText = () => {
-  if (form.expiresAt === 'keep' && selectedApiKey.value?.expiresAt) {
-    const date = new Date(selectedApiKey.value.expiresAt)
-    return formatExpiresAtText(date.toLocaleDateString(currentLocale.value))
-  }
-
-  const expiresAtTextMap = {
-    '3d': getExpiresOptionText('threeDays'),
-    '7d': getExpiresOptionText('sevenDays'),
-    '30d': getExpiresOptionText('thirtyDays'),
-    '60d': getExpiresOptionText('sixtyDays'),
-    '90d': getExpiresOptionText('ninetyDays')
-  }
-  return expiresAtTextMap[form.expiresAt] || getExpiresOptionText('never')
-}
-
-watch(
-  [locale, () => form.expiresAt],
-  () => {
-    expiresAtText.value = getExpiresAtText()
-  },
-  { immediate: true }
-)
-
 // 可用权限列表
-const availablePermissions = computed(() => [
+const availablePermissions = [
   {
     value: 'schedules:read',
-    label: getPermissionOptionText('scheduleRead', 'label'),
-    description: getPermissionOptionText('scheduleRead', 'description')
+    label: '排期查询',
+    description: '查看排期列表和详情'
   },
   {
     value: 'songs:read',
-    label: getPermissionOptionText('songsRead', 'label'),
-    description: getPermissionOptionText('songsRead', 'description')
-  },
-  {
-    value: 'songs:request',
-    label: getPermissionOptionText('songsRequest', 'label'),
-    description: getPermissionOptionText('songsRequest', 'description')
-  },
-  {
-    value: 'songs:write',
-    label: getPermissionOptionText('songsWrite', 'label'),
-    description: getPermissionOptionText('songsWrite', 'description')
-  },
-  {
-    value: 'card-codes:read',
-    label: getPermissionOptionText('cardCodesRead', 'label'),
-    description: getPermissionOptionText('cardCodesRead', 'description')
-  },
-  {
-    value: 'card-codes:write',
-    label: getPermissionOptionText('cardCodesWrite', 'label'),
-    description: getPermissionOptionText('cardCodesWrite', 'description')
-  },
-  {
-    value: 'card-codes:delete',
-    label: getPermissionOptionText('cardCodesDelete', 'label'),
-    description: getPermissionOptionText('cardCodesDelete', 'description')
-  },
-  {
-    value: 'backup:execute',
-    label: getPermissionOptionText('backupExecute', 'label'),
-    description: getPermissionOptionText('backupExecute', 'description')
+    label: '歌曲查询',
+    description: '查看歌曲列表和详情'
   }
-])
+]
 
 // Toast通知
 const toast = useToast()
 
 // 方法
+const handleStatusFilterChange = (val) => {
+  const statusMap = { 活跃: 'active', 非活跃: 'inactive', 已过期: 'expired' }
+  filters.status = statusMap[val] || ''
+  loadApiKeys()
+}
+
 const handleExpiresAtChange = (val) => {
   const map = {
-    [getExpiresOptionText('never')]: '',
-    [getExpiresOptionText('threeDays')]: '3d',
-    [getExpiresOptionText('sevenDays')]: '7d',
-    [getExpiresOptionText('thirtyDays')]: '30d',
-    [getExpiresOptionText('sixtyDays')]: '60d',
-    [getExpiresOptionText('ninetyDays')]: '90d'
+    永不过期: '',
+    '3天后过期': '3d',
+    '7天后过期': '7d',
+    '30天后过期': '30d',
+    '60天后过期': '60d',
+    '90天后过期': '90d'
   }
   form.expiresAt = map[val] || ''
 }
@@ -833,7 +747,7 @@ const loadApiKeys = async () => {
     }
   } catch (error) {
     console.error('加载API密钥失败:', error)
-    toast.error(getLocaleText('loadFailed'))
+    toast.error('加载API密钥失败')
   } finally {
     loading.value = false
   }
@@ -845,8 +759,8 @@ const openCreateModal = () => {
 }
 
 const createApiKey = async () => {
-  if (!form.name) return toast.error(getLocaleText('nameRequired'))
-  if (form.permissions.length === 0) return toast.error(getLocaleText('permissionRequired'))
+  if (!form.name) return toast.error('请输入密钥名称')
+  if (form.permissions.length === 0) return toast.error('请至少选择一个权限')
 
   submitting.value = true
   try {
@@ -864,7 +778,7 @@ const createApiKey = async () => {
     })
 
     if (response.success) {
-      toast.success(getLocaleText('createSuccessTitle'))
+      toast.success('API密钥创建成功')
       newApiKey.value = response.data
       showCreateModal.value = false
       showSuccessModal.value = true
@@ -873,7 +787,7 @@ const createApiKey = async () => {
     }
   } catch (error) {
     console.error('创建API密钥失败:', error)
-    toast.error(getErrorMessage(error) || getLocaleText('createFailed'))
+    toast.error(error.data?.message || '创建API密钥失败')
   } finally {
     submitting.value = false
   }
@@ -881,8 +795,8 @@ const createApiKey = async () => {
 
 const updateApiKey = async () => {
   if (!selectedApiKey.value) return
-  if (!form.name) return toast.error(getLocaleText('nameRequired'))
-  if (form.permissions.length === 0) return toast.error(getLocaleText('permissionRequired'))
+  if (!form.name) return toast.error('请输入密钥名称')
+  if (form.permissions.length === 0) return toast.error('请至少选择一个权限')
 
   submitting.value = true
   try {
@@ -901,13 +815,13 @@ const updateApiKey = async () => {
     })
 
     if (response.success) {
-      toast.success(getLocaleText('updateSuccess'))
+      toast.success('API密钥更新成功')
       closeModals()
       await loadApiKeys()
     }
   } catch (error) {
     console.error('更新API密钥失败:', error)
-    toast.error(getErrorMessage(error) || getLocaleText('updateFailed'))
+    toast.error(error.data?.message || '更新API密钥失败')
   } finally {
     submitting.value = false
   }
@@ -916,11 +830,11 @@ const updateApiKey = async () => {
 const deleteApiKey = (apiKey) => {
   pendingDeleteApiKey.value = apiKey
   confirmDialogConfig.value = {
-    title: getLocaleText('confirmDeleteTitle'),
-    message: getDeleteTitle(apiKey.name),
+    title: '确认删除',
+    message: `确定要删除API密钥 "${apiKey.name}" 吗？此操作不可撤销。`,
     type: 'danger',
-    confirmText: getLocaleText('delete'),
-    cancelText: getLocaleText('cancel')
+    confirmText: '删除',
+    cancelText: '取消'
   }
   showConfirmDialog.value = true
 }
@@ -934,12 +848,12 @@ const confirmDelete = async () => {
     })
 
     if (response.success) {
-      toast.success(getLocaleText('deleteSuccess'))
+      toast.success('API密钥删除成功')
       await loadApiKeys()
     }
   } catch (error) {
     console.error('删除API密钥失败:', error)
-    toast.error(getErrorMessage(error) || getLocaleText('deleteFailed'))
+    toast.error(error.data?.message || '删除API密钥失败')
   } finally {
     showConfirmDialog.value = false
     pendingDeleteApiKey.value = null
@@ -952,40 +866,37 @@ const cancelDelete = () => {
 }
 
 const viewApiKey = async (apiKey) => {
-  if (loadingViewId.value !== null || loadingEditId.value !== null) return
-  loadingViewId.value = apiKey.id
   try {
     const response = await $fetch(`/api/admin/api-keys/${apiKey.id}`)
     if (response.success) {
       selectedApiKey.value = response.data
       showViewModal.value = true
+      // 加载API使用日志
       await loadApiLogs(1)
     }
   } catch (error) {
     console.error('获取API密钥详情失败:', error)
-    toast.error(getLocaleText('detailFailed'))
-  } finally {
-    loadingViewId.value = null
+    toast.error('获取API密钥详情失败')
   }
 }
 
 const editApiKey = async (apiKey) => {
-  if (loadingEditId.value !== null || loadingViewId.value !== null) return
-  loadingEditId.value = apiKey.id
   try {
     const response = await $fetch(`/api/admin/api-keys/${apiKey.id}`)
     if (response.success) {
       selectedApiKey.value = response.data
 
+      // 填充表单
       form.name = response.data.name
       form.description = response.data.description || ''
 
+      // 处理过期时间显示
       if (response.data.expiresAt) {
         const date = new Date(response.data.expiresAt)
-        expiresAtText.value = formatExpiresAtText(date.toLocaleDateString(currentLocale.value))
-        form.expiresAt = 'keep'
+        expiresAtText.value = `到期: ${date.toLocaleDateString()}`
+        form.expiresAt = 'keep' // 特殊值，表示不修改过期时间
       } else {
-        expiresAtText.value = getExpiresOptionText('never')
+        expiresAtText.value = '永不过期'
         form.expiresAt = ''
       }
 
@@ -996,9 +907,7 @@ const editApiKey = async (apiKey) => {
     }
   } catch (error) {
     console.error('获取API密钥详情失败:', error)
-    toast.error(getLocaleText('detailFailed'))
-  } finally {
-    loadingEditId.value = null
+    toast.error('获取API密钥详情失败')
   }
 }
 
@@ -1029,17 +938,14 @@ const loadApiLogs = async (page = 1) => {
     }
   } catch (error) {
     console.error('获取API使用日志失败:', error)
-    toast.error(getLocaleText('logsFailed'))
+    toast.error('获取API使用日志失败')
     apiLogs.value = []
   } finally {
     loadingLogs.value = false
   }
 }
 
-const changePage = (page) => {
-  pagination.value.page = page
-  loadApiKeys()
-}
+
 
 const closeModals = () => {
   showCreateModal.value = false
@@ -1048,6 +954,7 @@ const closeModals = () => {
   showSuccessModal.value = false
   selectedApiKey.value = null
   newApiKey.value = null
+  // 重置日志相关状态
   apiLogs.value = []
   loadingLogs.value = false
   logsPagination.value = {
@@ -1059,27 +966,18 @@ const closeModals = () => {
   resetForm()
 }
 
-const handleBackdropClick = () => {
-  if (showCreateModal.value || showEditModal.value) {
-    return
-  }
-  closeModals()
-}
-
 const resetForm = () => {
   form.name = ''
   form.description = ''
   form.expiresAt = ''
-  expiresAtText.value = getExpiresOptionText('never')
+  expiresAtText.value = '永不过期'
   form.permissions = []
   form.isActive = true
 }
 
 const formatDate = (dateString) => {
   if (!dateString) return ''
-  const date = new Date(dateString)
-  if (Number.isNaN(date.getTime())) return ''
-  return date.toLocaleString(currentLocale.value, {
+  return new Date(dateString).toLocaleString('zh-CN', {
     year: 'numeric',
     month: '2-digit',
     day: '2-digit',
@@ -1093,28 +991,28 @@ const copyToClipboard = async (text) => {
   try {
     await navigator.clipboard.writeText(text)
     copied.value = true
-    toast.success(getLocaleText('copied'))
+    toast.success('已复制到剪贴板')
     setTimeout(() => (copied.value = false), 2000)
   } catch (error) {
     console.error('复制失败:', error)
-    toast.error(getLocaleText('copyFailed'))
+    toast.error('复制失败')
   }
 }
 
 const getMethodClass = (method) => {
   const map = {
-    GET: 'bg-success-10 text-success border-success-20',
-    POST: 'bg-primary-10 text-primary border-primary-20',
-    PUT: 'bg-warning-10 text-warning border-warning-20',
-    DELETE: 'bg-error-10 text-error border-error-20'
+    GET: 'bg-emerald-500/10 text-emerald-500 border-emerald-500/20',
+    POST: 'bg-blue-500/10 text-blue-500 border-blue-500/20',
+    PUT: 'bg-amber-500/10 text-amber-500 border-amber-500/20',
+    DELETE: 'bg-red-500/10 text-red-500 border-red-500/20'
   }
-  return map[method] || 'bg-bg-quaternary-10 text-text-tertiary border-border-tertiary-20'
+  return map[method] || 'bg-zinc-500/10 text-zinc-500 border-zinc-500/20'
 }
 
 const getStatusColorClass = (code) => {
-  if (code >= 200 && code < 300) return 'text-success'
-  if (code >= 300 && code < 400) return 'text-warning'
-  return 'text-error'
+  if (code >= 200 && code < 300) return 'text-emerald-500'
+  if (code >= 300 && code < 400) return 'text-amber-500'
+  return 'text-red-500'
 }
 
 // 生命周期
@@ -1124,6 +1022,20 @@ onMounted(() => {
 </script>
 
 <style scoped>
+.loading-spinner {
+  width: 24px;
+  height: 24px;
+  border: 2px solid rgba(255, 255, 255, 0.1);
+  border-top-color: var(--border-secondary, #3b82f6);
+  border-radius: 50%;
+  animation: spin 1s linear infinite;
+}
+
+@keyframes spin {
+  to {
+    transform: rotate(360deg);
+  }
+}
 
 .custom-scrollbar::-webkit-scrollbar {
   width: 4px;
@@ -1132,11 +1044,11 @@ onMounted(() => {
   background: transparent;
 }
 .custom-scrollbar::-webkit-scrollbar-thumb {
-  background: var(--panel-bg-alt);
+  background: var(--bg-tertiary, #27272a);
   border-radius: 10px;
 }
 .custom-scrollbar::-webkit-scrollbar-thumb:hover {
-  background: var(--panel-bg-hover);
+  background: #3f3f46;
 }
 
 /* 模态框动画 */
diff --git a/app/components/Admin/BackupManager.vue b/app/components/Admin/BackupManager.vue
index a0ed21b..3d78253 100644
--- a/app/components/Admin/BackupManager.vue
+++ b/app/components/Admin/BackupManager.vue
@@ -2,8 +2,8 @@
   <div class="backup-manager">
     <!-- 标题 -->
     <div class="header">
-      <h3>{{ locale.title }}</h3>
-      <p class="description">{{ locale.desc }}</p>
+      <h3>数据库备份</h3>
+      <p class="description">导出和导入数据库备份</p>
     </div>
 
     <!-- 主要功能区 -->
@@ -17,15 +17,15 @@
           </svg>
         </div>
         <div class="card-content">
-          <h4>{{ locale.exportTitle }}</h4>
-          <p>{{ locale.exportDesc }}</p>
+          <h4>导出备份</h4>
+          <p>创建数据库备份文件</p>
           <button
             :disabled="createLoading"
             class="action-btn primary"
             @click="showCreateModal = true"
           >
-            <span v-if="createLoading">{{ locale.exporting }}</span>
-            <span v-else>{{ locale.startExport }}</span>
+            <span v-if="createLoading">导出中...</span>
+            <span v-else>开始导出</span>
           </button>
         </div>
       </div>
@@ -39,25 +39,25 @@
           </svg>
         </div>
         <div class="card-content">
-          <h4>{{ locale.importTitle }}</h4>
-          <p>{{ locale.importDesc }}</p>
+          <h4>导入备份</h4>
+          <p>从备份文件恢复数据</p>
           <button
             :disabled="uploadLoading"
             class="action-btn secondary"
             @click="showUploadModal = true"
           >
-            <span v-if="uploadLoading">{{ locale.importing }}</span>
-            <span v-else>{{ locale.chooseFile }}</span>
+            <span v-if="uploadLoading">导入中...</span>
+            <span v-else>选择文件</span>
           </button>
         </div>
       </div>
     </div>
 
     <!-- 创建备份模态框 -->
-    <div v-if="showCreateModal" class="backupmanager-modal-overlay" @click="showCreateModal = false">
+    <div v-if="showCreateModal" class="modal-overlay" @click="showCreateModal = false">
       <div class="modal" @click.stop>
         <div class="modal-header">
-          <h3>{{ locale.createTitle }}</h3>
+          <h3>创建数据库备份</h3>
           <button class="close-btn" @click="showCreateModal = false">
             <svg fill="none" stroke="currentColor" stroke-width="2" viewBox="0 0 24 24">
               <line x1="18" x2="6" y1="6" y2="18" />
@@ -67,43 +67,43 @@
         </div>
         <div class="modal-body">
           <div class="form-group">
-            <label>{{ locale.backupType }}</label>
+            <label>备份类型</label>
             <div class="radio-group">
               <label class="radio-option">
                 <input v-model="createForm.tables" type="radio" value="all" >
-                <span>{{ locale.fullBackup }}</span>
-                <small>{{ locale.fullBackupDesc }}</small>
+                <span>完整备份（推荐）</span>
+                <small>备份所有数据表</small>
               </label>
               <label class="radio-option">
                 <input v-model="createForm.tables" type="radio" value="users" >
-                <span>{{ locale.userDataOnly }}</span>
-                <small>{{ locale.userDataOnlyDesc }}</small>
+                <span>仅用户数据</span>
+                <small>只备份用户相关数据</small>
               </label>
             </div>
           </div>
           <div class="form-group">
             <label class="checkbox-option">
               <input v-model="createForm.includeSystemData" type="checkbox" >
-              <span>{{ locale.includeSystemSettings }}</span>
-              <small>{{ locale.includeSystemSettingsDesc }}</small>
+              <span>包含系统设置</span>
+              <small>包含系统配置和设置数据</small>
             </label>
           </div>
         </div>
         <div class="modal-footer">
-          <button class="action-btn secondary" @click="showCreateModal = false">{{ locale.cancel }}</button>
+          <button class="action-btn secondary" @click="showCreateModal = false">取消</button>
           <button :disabled="createLoading" class="action-btn primary" @click="createBackup">
-            <span v-if="createLoading">{{ locale.creating }}</span>
-            <span v-else>{{ locale.createBackup }}</span>
+            <span v-if="createLoading">创建中...</span>
+            <span v-else>创建备份</span>
           </button>
         </div>
       </div>
     </div>
 
     <!-- 导入备份模态框 -->
-    <div v-if="showUploadModal" class="backupmanager-modal-overlay" @click="showUploadModal = false">
+    <div v-if="showUploadModal" class="modal-overlay" @click="showUploadModal = false">
       <div class="modal" @click.stop>
         <div class="modal-header">
-          <h3>{{ locale.importFileTitle }}</h3>
+          <h3>导入备份文件</h3>
           <button class="close-btn" @click="showUploadModal = false">
             <svg fill="none" stroke="currentColor" stroke-width="2" viewBox="0 0 24 24">
               <line x1="18" x2="6" y1="6" y2="18" />
@@ -126,8 +126,8 @@
                 <polyline points="17,8 12,3 7,8" />
                 <line x1="12" x2="12" y1="3" y2="15" />
               </svg>
-              <h4>{{ locale.uploadTitle }}</h4>
-              <p>{{ locale.uploadDesc }}</p>
+              <h4>选择或拖拽备份文件</h4>
+              <p>支持 .json 格式的备份文件，最大 100MB</p>
               <input
                 ref="fileInput"
                 accept=".json,application/json"
@@ -161,17 +161,17 @@
           </div>
 
           <div class="form-group">
-            <label>{{ locale.restoreMode }}</label>
+            <label>恢复模式</label>
             <div class="radio-group">
               <label class="radio-option">
                 <input v-model="restoreForm.mode" type="radio" value="merge" >
-                <span>{{ locale.mergeMode }}</span>
-                <small>{{ locale.mergeModeDesc }}</small>
+                <span>合并模式（推荐）</span>
+                <small>更新现有记录，添加新记录</small>
               </label>
               <label class="radio-option">
                 <input v-model="restoreForm.mode" type="radio" value="replace" >
-                <span>{{ locale.replaceMode }}</span>
-                <small>{{ locale.replaceModeDesc }}</small>
+                <span>替换模式</span>
+                <small>先清空数据，然后导入备份</small>
               </label>
             </div>
           </div>
@@ -179,8 +179,8 @@
           <div v-if="restoreForm.mode === 'replace'" class="form-group">
             <label class="checkbox-option danger">
               <input v-model="restoreForm.clearExisting" type="checkbox" >
-              <span>{{ locale.confirmClear }}</span>
-              <small>{{ locale.confirmClearDesc }}</small>
+              <span>我确认要清空现有数据</span>
+              <small>此操作不可逆，请谨慎操作</small>
             </label>
           </div>
 
@@ -190,8 +190,8 @@
           >
             <label class="checkbox-option">
               <input v-model="restoreForm.overwriteSuperAdmin" type="checkbox" >
-              <span>{{ locale.overwriteSuperAdmin }}</span>
-              <small>{{ locale.overwriteSuperAdminDesc }}</small>
+              <span>覆盖备份中的超级管理员账号数据</span>
+              <small>关闭时将保留当前超级管理员及其第三方绑定、2FA相关数据</small>
             </label>
           </div>
 
@@ -204,13 +204,13 @@
               <line x1="12" x2="12.01" y1="17" y2="17" />
             </svg>
             <div>
-              <h4>{{ locale.warningTitle }}</h4>
-              <p>{{ locale.warningDesc }}</p>
+              <h4>注意</h4>
+              <p>导入备份将会影响现有数据，请确保您了解操作的后果。</p>
             </div>
           </div>
         </div>
         <div class="modal-footer">
-          <button class="action-btn secondary" @click="showUploadModal = false">{{ locale.cancel }}</button>
+          <button class="action-btn secondary" @click="showUploadModal = false">取消</button>
           <button
             :disabled="
               !selectedFile ||
@@ -220,8 +220,8 @@
             class="action-btn primary"
             @click="uploadFile"
           >
-            <span v-if="uploadLoading">{{ locale.importing }}</span>
-            <span v-else>{{ locale.startImport }}</span>
+            <span v-if="uploadLoading">导入中...</span>
+            <span v-else>开始导入</span>
           </button>
         </div>
       </div>
@@ -230,13 +230,8 @@
 </template>
 
 <script setup>
-import { computed, ref } from 'vue'
+import { ref } from 'vue'
 import { useAuth } from '~/composables/useAuth'
-import { useLocale } from '~/utils/locale'
-
-const { admin } = useLocale()
-const locale = computed(() => admin.value?.backupManager || {})
-const { msg: getLocaleText } = useLocaleText(locale)
 
 // 响应式数据
 const createLoading = ref(false)
@@ -310,14 +305,14 @@ const createBackup = async () => {
           // 显示成功消息
           const sizeText = backup.size ? ` (${formatFileSize(backup.size)})` : ''
           if (window.$showNotification) {
-            window.$showNotification(getLocaleText('downloaded', backup.filename, sizeText), 'success')
+            window.$showNotification(`备份文件已下载: ${backup.filename}${sizeText}`, 'success')
           }
 
           console.log('✅ 文件下载成功:', backup.filename)
         } catch (downloadError) {
           console.error('下载失败:', downloadError)
           if (window.$showNotification) {
-            window.$showNotification(getLocaleText('fileDownloadFailed', downloadError.message), 'error')
+            window.$showNotification('文件下载失败: ' + downloadError.message, 'error')
           }
         }
       } else if (backup.downloadMode === 'file' && backup.filename) {
@@ -353,20 +348,20 @@ const createBackup = async () => {
           // 显示成功消息
           const sizeText = backup.size ? ` (${formatFileSize(backup.size)})` : ''
           if (window.$showNotification) {
-            window.$showNotification(getLocaleText('downloaded', backup.filename, sizeText), 'success')
+            window.$showNotification(`备份文件已下载: ${backup.filename}${sizeText}`, 'success')
           }
 
           console.log('✅ 文件下载成功:', backup.filename)
         } catch (downloadError) {
           console.error('文件下载失败:', downloadError)
           if (window.$showNotification) {
-            window.$showNotification(getLocaleText('fileDownloadFailed', downloadError.message), 'error')
+            window.$showNotification('文件下载失败: ' + downloadError.message, 'error')
           }
         }
       } else {
         console.error('无效的下载模式或缺少数据')
         if (window.$showNotification) {
-          window.$showNotification(locale.value?.invalidResponse || '服务器返回了无效响应', 'error')
+          window.$showNotification('备份创建失败：无效的响应格式', 'error')
         }
         showCreateModal.value = false
         return
@@ -374,16 +369,16 @@ const createBackup = async () => {
     } else {
       console.error('服务器响应格式错误:', response)
       if (window.$showNotification) {
-        window.$showNotification(locale.value?.serverResponseInvalid || '服务器响应格式无效', 'error')
+        window.$showNotification('备份创建失败：服务器响应格式错误', 'error')
       }
     }
 
     showCreateModal.value = false
   } catch (error) {
     console.error('创建备份失败:', error)
-    const errorMessage = error.data?.message || error.message || locale.value?.unknownError || '未知错误'
+    const errorMessage = error.data?.message || error.message || '未知错误'
     if (window.$showNotification) {
-      window.$showNotification(getLocaleText('createFailed', errorMessage), 'error')
+      window.$showNotification('创建备份失败: ' + errorMessage, 'error')
     }
   } finally {
     createLoading.value = false
@@ -404,7 +399,7 @@ const parseBackupSuperAdmin = async (file) => {
     hasSuperAdminInBackup.value = false
     restoreForm.value.overwriteSuperAdmin = false
     if (window.$showNotification) {
-      window.$showNotification(locale.value?.parseFailed || '备份文件解析失败', 'error')
+      window.$showNotification('无法解析备份文件，请检查文件格式是否正确。', 'error')
     }
     console.error('解析备份文件失败:', error)
   }
@@ -463,7 +458,7 @@ const uploadFile = async () => {
       // 显示成功通知
       if (window.$showNotification) {
         window.$showNotification(
-          getLocaleText('restoreSuccess', response.details?.tablesProcessed || 0, response.details?.recordsRestored || 0),
+          `备份恢复成功！处理了 ${response.details?.tablesProcessed || 0} 个表，恢复了 ${response.details?.recordsRestored || 0} 条记录`,
           'success'
         )
 
@@ -471,7 +466,7 @@ const uploadFile = async () => {
         if (response.details?.errors && response.details.errors.length > 0) {
           setTimeout(() => {
             window.$showNotification(
-              getLocaleText('restoreWarning', response.details.errors.length),
+              `恢复过程中发生了 ${response.details.errors.length} 个错误`,
               'warning'
             )
           }, 1000)
@@ -479,7 +474,7 @@ const uploadFile = async () => {
 
         // 显示即将重定向的通知
         setTimeout(() => {
-          window.$showNotification(locale.value?.restoreCompleteRedirect || '恢复完成，即将刷新页面', 'info')
+          window.$showNotification('数据库恢复完成，3秒后将返回首页重新登录', 'info')
         }, 2000)
       }
 
@@ -498,13 +493,13 @@ const uploadFile = async () => {
       }, 5000)
     } else {
       if (window.$showNotification) {
-        window.$showNotification(getLocaleText('importFailed', response.message || locale.value.unknownError), 'error')
+        window.$showNotification('备份导入失败: ' + (response.message || '未知错误'), 'error')
       }
     }
   } catch (error) {
     console.error('导入备份失败:', error)
     if (window.$showNotification) {
-      window.$showNotification(getLocaleText('importFailed', error.data?.message || error.message), 'error')
+      window.$showNotification('导入备份失败: ' + (error.data?.message || error.message), 'error')
     }
   } finally {
     uploadLoading.value = false
@@ -525,8 +520,8 @@ const formatFileSize = (bytes) => {
 /* 主容器 */
 .backup-manager {
   min-height: 100vh;
-  background: var(--panel-bg-deep);
-  color: var(--panel-border-light);
+  background: var(--bg-primary, #1a1a1a);
+  color: var(--text-primary, #e5e5e5);
   padding: 2rem;
   position: relative;
 }
@@ -540,13 +535,13 @@ const formatFileSize = (bytes) => {
 .header h3 {
   font-size: 2.5rem;
   font-weight: 700;
-  color: var(--text-primary);
+  color: var(--text-primary, #ffffff);
   margin: 0 0 1rem 0;
 }
 
 .header .description {
   font-size: 1.125rem;
-  color: var(--text-muted-dark);
+  color: var(--text-secondary, #a0a0a0);
   margin: 0;
 }
 
@@ -561,8 +556,8 @@ const formatFileSize = (bytes) => {
 
 /* 操作卡片 */
 .action-card {
-  background: var(--panel-border);
-  border: 1px solid var(--panel-border-dark);
+  background: var(--bg-tertiary, #2a2a2a);
+  border: 1px solid var(--border-secondary, #404040);
   border-radius: 12px;
   padding: 2rem;
   text-align: center;
@@ -570,8 +565,8 @@ const formatFileSize = (bytes) => {
 }
 
 .action-card:hover {
-  border-color: var(--panel-border-dark);
-  background: var(--panel-border-subtle);
+  border-color: #606060;
+  background: var(--bg-tertiary, #2f2f2f);
 }
 
 .action-card .card-content {
@@ -587,12 +582,12 @@ const formatFileSize = (bytes) => {
   width: 4rem;
   height: 4rem;
   margin: 0 auto 1.5rem;
-  background: var(--panel-border-dark);
+  background: #404040;
   border-radius: 12px;
   display: flex;
   align-items: center;
   justify-content: center;
-  color: var(--text-primary);
+  color: var(--text-primary, #ffffff);
 }
 
 .action-icon svg {
@@ -604,12 +599,12 @@ const formatFileSize = (bytes) => {
 .action-card h4 {
   font-size: 1.5rem;
   font-weight: 600;
-  color: var(--text-primary);
+  color: var(--text-primary, #ffffff);
   margin: 0 0 0.75rem 0;
 }
 
 .action-card p {
-  color: var(--text-muted-dark);
+  color: #a0a0a0;
   font-size: 1rem;
   margin: 0 0 2rem 0;
   line-height: 1.6;
@@ -634,24 +629,24 @@ const formatFileSize = (bytes) => {
 }
 
 .action-btn.primary {
-  background: var(--color-accent);
+  background: #4a90e2;
 }
 
 .action-btn.primary:hover {
-  background: var(--color-accent);
+  background: #357abd;
 }
 
 .action-btn.secondary {
-  background: var(--panel-border-dark);
+  background: #606060;
 }
 
 .action-btn.secondary:hover {
-  background: var(--panel-border-dark);
+  background: #505050;
 }
 
 .action-btn:disabled {
-  background: var(--panel-border-dark) !important;
-  color: var(--text-muted) !important;
+  background: #404040 !important;
+  color: #808080 !important;
   cursor: not-allowed;
   opacity: 0.6;
 }
@@ -662,13 +657,13 @@ const formatFileSize = (bytes) => {
 }
 
 /* 模态框样式 */
-.backupmanager-modal-overlay {
+.modal-overlay {
   position: fixed;
   top: 0;
   left: 0;
   right: 0;
   bottom: 0;
-  background: var(--modal-overlay);
+  background: rgba(0, 0, 0, 0.7);
   display: flex;
   align-items: center;
   justify-content: center;
@@ -677,8 +672,8 @@ const formatFileSize = (bytes) => {
 }
 
 .modal {
-  background: var(--panel-border);
-  border: 1px solid var(--panel-border-dark);
+  background: var(--bg-tertiary, #2a2a2a);
+  border: 1px solid var(--border-secondary, #404040);
   border-radius: 12px;
   max-width: 600px;
   width: 100%;
@@ -696,19 +691,19 @@ const formatFileSize = (bytes) => {
 
 .current-status h4 {
   margin: 0 0 15px 0;
-  color: var(--color-accent);
+  color: #4a90e2;
   font-size: 18px;
 }
 
 .progress-stats p {
   margin: 5px 0;
-  color: var(--text-muted-dark);
+  color: #a0a0a0;
 }
 
 .progress-bar {
   width: 100%;
   height: 8px;
-  background: var(--panel-border-dark);
+  background: #404040;
   border-radius: 4px;
   margin: 15px 0;
   overflow: hidden;
@@ -716,7 +711,7 @@ const formatFileSize = (bytes) => {
 
 .progress-fill {
   height: 100%;
-  background: linear-gradient(90deg, var(--color-accent), var(--color-accent));
+  background: linear-gradient(90deg, #4a90e2, #357abd);
   border-radius: 4px;
   transition: width 0.3s ease;
 }
@@ -729,7 +724,7 @@ const formatFileSize = (bytes) => {
 .progress-details h5,
 .progress-errors h5 {
   margin: 0 0 10px 0;
-  color: var(--text-primary);
+  color: var(--text-primary, #ffffff);
   font-size: 14px;
   font-weight: 600;
 }
@@ -738,17 +733,17 @@ const formatFileSize = (bytes) => {
 .errors-list {
   max-height: 150px;
   overflow-y: auto;
-  border: 1px solid var(--panel-border-dark);
+  border: 1px solid #505050;
   border-radius: 6px;
   padding: 10px;
-  background: var(--text-primary);
+  background: var(--bg-quaternary, #333333);
 }
 
 .detail-item {
   padding: 4px 0;
-  color: var(--text-muted-dark);
+  color: #a0a0a0;
   font-size: 13px;
-  border-bottom: 1px solid var(--panel-border-dark);
+  border-bottom: 1px solid var(--border-secondary, #404040);
 }
 
 .detail-item:last-child {
@@ -757,9 +752,9 @@ const formatFileSize = (bytes) => {
 
 .error-item {
   padding: 4px 0;
-  color: var(--color-error-light);
+  color: #ff6b6b;
   font-size: 13px;
-  border-bottom: 1px solid var(--panel-bg-darker);
+  border-bottom: 1px solid var(--border-secondary, #4a2a2a);
 }
 
 .error-item:last-child {
@@ -777,14 +772,14 @@ const formatFileSize = (bytes) => {
 .modal-title {
   font-size: 1.75rem;
   font-weight: 600;
-  color: var(--text-primary);
+  color: var(--text-primary, #ffffff);
   margin: 0;
 }
 
 .close-btn {
-  background: var(--panel-border-dark);
+  background: #404040;
   border: none;
-  color: var(--text-muted-dark);
+  color: #a0a0a0;
   cursor: pointer;
   padding: 0.75rem;
   border-radius: 8px;
@@ -792,8 +787,8 @@ const formatFileSize = (bytes) => {
 }
 
 .close-btn:hover {
-  background: var(--panel-border-dark);
-  color: var(--text-primary);
+  background: #505050;
+  color: var(--text-primary, #ffffff);
 }
 
 .close-btn svg {
@@ -807,11 +802,11 @@ const formatFileSize = (bytes) => {
 
 .modal-footer {
   padding: 1.5rem 2rem;
-  border-top: 1px solid var(--panel-border-dark);
+  border-top: 1px solid var(--border-secondary, #404040);
   display: flex;
   gap: 1rem;
   justify-content: flex-end;
-  background: var(--panel-border-subtle);
+  background: var(--bg-tertiary, #252525);
 }
 
 .modal-footer button {
@@ -827,7 +822,7 @@ const formatFileSize = (bytes) => {
   display: block;
   font-size: 1.125rem;
   font-weight: 600;
-  color: var(--text-primary);
+  color: var(--text-primary, #ffffff);
   margin-bottom: 1rem;
 }
 
@@ -843,8 +838,8 @@ const formatFileSize = (bytes) => {
   align-items: flex-start;
   gap: 1rem;
   padding: 1.25rem;
-  background: var(--text-primary);
-  border: 1px solid var(--panel-border-dark);
+  background: var(--bg-quaternary, #333333);
+  border: 1px solid #505050;
   border-radius: 8px;
   cursor: pointer;
   transition: all 0.2s ease;
@@ -852,8 +847,8 @@ const formatFileSize = (bytes) => {
 
 .radio-option:hover,
 .checkbox-option:hover {
-  border-color: var(--panel-border-dark);
-  background: var(--panel-border-dark);
+  border-color: #606060;
+  background: #383838;
 }
 
 .radio-option input[type='radio'],
@@ -861,7 +856,7 @@ const formatFileSize = (bytes) => {
   width: 1.25rem;
   height: 1.25rem;
   margin: 0;
-  accent-color: var(--color-accent);
+  accent-color: #4a90e2;
   cursor: pointer;
 }
 
@@ -875,7 +870,7 @@ const formatFileSize = (bytes) => {
   display: block;
   font-size: 1rem;
   font-weight: 500;
-  color: var(--text-primary);
+  color: var(--text-primary, #ffffff);
   margin-bottom: 0.25rem;
 }
 
@@ -883,21 +878,21 @@ const formatFileSize = (bytes) => {
 .checkbox-option small {
   display: block;
   font-size: 0.875rem;
-  color: var(--text-muted-dark);
+  color: #a0a0a0;
   line-height: 1.4;
 }
 
 .checkbox-option.danger {
-  border-color: var(--color-error-hover);
-  background: var(--backup-manager-danger-bg);
+  border-color: #d32f2f;
+  background: rgba(211, 47, 47, 0.1);
 }
 
 .checkbox-option.danger span {
-  color: var(--color-error-light);
+  color: #ff6b6b;
 }
 
 .checkbox-option.danger small {
-  color: var(--color-error-light);
+  color: #ff8a80;
 }
 
 /* 文件上传区域 */
@@ -906,37 +901,37 @@ const formatFileSize = (bytes) => {
 }
 
 .upload-area {
-  border: 2px dashed var(--panel-border-dark);
+  border: 2px dashed #505050;
   border-radius: 8px;
   padding: 3rem 2rem;
   text-align: center;
   cursor: pointer;
   transition: all 0.2s ease;
-  background: var(--text-primary);
+  background: var(--bg-quaternary, #333333);
 }
 
 .upload-area:hover,
 .upload-area.drag-over {
-  border-color: var(--color-accent);
-  background: var(--panel-border-dark);
+  border-color: var(--border-secondary, #4a90e2);
+  background: #383838;
 }
 
 .upload-area svg {
   width: 4rem;
   height: 4rem;
-  color: var(--color-accent);
+  color: #4a90e2;
   margin-bottom: 1.5rem;
 }
 
 .upload-area h4 {
   font-size: 1.25rem;
   font-weight: 600;
-  color: var(--text-primary);
+  color: var(--text-primary, #ffffff);
   margin: 0 0 0.5rem 0;
 }
 
 .upload-area p {
-  color: var(--text-muted-dark);
+  color: #a0a0a0;
   font-size: 1rem;
   margin: 0;
 }
@@ -946,8 +941,8 @@ const formatFileSize = (bytes) => {
   align-items: center;
   justify-content: space-between;
   padding: 1.25rem;
-  background: var(--text-primary);
-  border: 1px solid var(--panel-border-dark);
+  background: var(--bg-quaternary, #333333);
+  border: 1px solid #505050;
   border-radius: 8px;
   margin-top: 1rem;
 }
@@ -962,7 +957,7 @@ const formatFileSize = (bytes) => {
 .file-info svg {
   width: 1.5rem;
   height: 1.5rem;
-  color: var(--color-accent);
+  color: #4a90e2;
   flex-shrink: 0;
 }
 
@@ -974,28 +969,28 @@ const formatFileSize = (bytes) => {
   display: block;
   font-size: 1rem;
   font-weight: 500;
-  color: var(--text-primary);
+  color: var(--text-primary, #ffffff);
   margin-bottom: 0.25rem;
 }
 
 .file-size {
   display: block;
   font-size: 0.875rem;
-  color: var(--text-muted-dark);
+  color: #a0a0a0;
 }
 
 .remove-file-btn {
-  background: var(--backup-manager-file-remove-bg);
+  background: rgba(211, 47, 47, 0.2);
   border: none;
   padding: 0.75rem;
   border-radius: 8px;
   cursor: pointer;
   transition: all 0.2s ease;
-  color: var(--color-error-light);
+  color: #ff6b6b;
 }
 
 .remove-file-btn:hover {
-  background: var(--backup-manager-file-remove-bg-hover);
+  background: rgba(211, 47, 47, 0.3);
 }
 
 .remove-file-btn svg {
@@ -1005,8 +1000,8 @@ const formatFileSize = (bytes) => {
 
 /* 警告框 */
 .warning-box {
-  background: var(--backup-manager-warning-box-bg);
-  border: 1px solid var(--color-orange);
+  background: rgba(255, 152, 0, 0.1);
+  border: 1px solid #ff9800;
   border-radius: 8px;
   padding: 1.5rem;
   display: flex;
@@ -1018,7 +1013,7 @@ const formatFileSize = (bytes) => {
 .warning-box svg {
   width: 1.5rem;
   height: 1.5rem;
-  color: var(--color-orange);
+  color: #ff9800;
   flex-shrink: 0;
   margin-top: 0.125rem;
 }
@@ -1028,14 +1023,14 @@ const formatFileSize = (bytes) => {
 }
 
 .warning-box h4 {
-  color: var(--color-orange);
+  color: #ff9800;
   font-weight: 600;
   margin: 0 0 0.5rem 0;
   font-size: 1rem;
 }
 
 .warning-box p {
-  color: var(--color-orange);
+  color: #ffb74d;
   margin: 0;
   font-size: 0.875rem;
   line-height: 1.5;
@@ -1050,7 +1045,7 @@ const formatFileSize = (bytes) => {
   border-radius: 8px;
   color: white;
   font-weight: 500;
-  box-shadow: 0 4px 12px var(--mask-30);
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.3);
   z-index: 1001;
   animation: slideInRight 0.4s cubic-bezier(0.4, 0, 0.2, 1);
   display: flex;
@@ -1061,23 +1056,23 @@ const formatFileSize = (bytes) => {
 }
 
 .notification.success {
-  background: var(--color-success);
-  border: 1px solid var(--color-success);
+  background: var(--bg-tertiary, #2e7d32);
+  border: 1px solid var(--border-secondary, #4caf50);
 }
 
 .notification.error {
-  background: var(--color-error-hover);
-  border: 1px solid var(--color-error);
+  background: #d32f2f;
+  border: 1px solid #f44336;
 }
 
 .notification.warning {
-  background: var(--color-orange);
-  border: 1px solid var(--color-orange);
+  background: #f57c00;
+  border: 1px solid #ff9800;
 }
 
 .notification.info {
-  background: var(--color-accent-hover);
-  border: 1px solid var(--color-accent);
+  background: var(--bg-secondary, #1976d2);
+  border: 1px solid var(--border-secondary, #2196f3);
 }
 
 @keyframes slideInRight {
diff --git a/app/components/Admin/BatchUpdateModal.vue b/app/components/Admin/BatchUpdateModal.vue
index 78fb174..ca23171 100644
--- a/app/components/Admin/BatchUpdateModal.vue
+++ b/app/components/Admin/BatchUpdateModal.vue
@@ -9,30 +9,30 @@
   >
     <div
       v-if="show"
-      class="fixed inset-0 z-[60] flex items-center justify-center p-4 bg-bg-primary-80 backdrop-blur-sm"
+      class="fixed inset-0 z-[60] flex items-center justify-center p-4 bg-black/80 backdrop-blur-sm"
       @click="$emit('close')"
     >
       <div
-        class="bg-bg-secondary border border-border-secondary w-full max-w-2xl rounded-xl overflow-hidden shadow-2xl flex flex-col max-h-[90vh]"
+        class="bg-zinc-900 border border-zinc-800 w-full max-w-2xl rounded-xl overflow-hidden shadow-2xl flex flex-col max-h-[90vh]"
         @click.stop
       >
         <!-- 头部 -->
-        <div class="p-8 pb-4 flex items-center justify-between border-b border-border-secondary-50">
+        <div class="p-8 pb-4 flex items-center justify-between border-b border-zinc-800/50">
           <div>
-            <h3 class="text-xl font-black text-text-primary tracking-tight flex items-center gap-3">
+            <h3 class="text-xl font-black text-zinc-100 tracking-tight flex items-center gap-3">
               <div
-                class="w-10 h-10 rounded-xl bg-info-10 flex items-center justify-center text-info"
+                class="w-10 h-10 rounded-xl bg-purple-600/10 flex items-center justify-center text-purple-500"
               >
                 <Layers :size="20" />
               </div>
-              {{ locale.title }}
+              批量更新学生信息
             </h3>
-            <p class="text-xs text-text-tertiary mt-1 ml-13">
-              {{ locale.desc }}
+            <p class="text-xs text-zinc-500 mt-1 ml-13">
+              快速调整学生年级、班级或通过 Excel 批量修改
             </p>
           </div>
           <button
-            class="p-3 bg-bg-tertiary-50 hover:bg-bg-tertiary text-text-tertiary hover:text-text-primary rounded-xl transition-all"
+            class="p-3 bg-zinc-800/50 hover:bg-zinc-800 text-zinc-500 hover:text-zinc-200 rounded-xl transition-all"
             @click="$emit('close')"
           >
             <X :size="20" />
@@ -41,13 +41,13 @@
 
         <div class="flex-1 overflow-y-auto p-8 pt-6 custom-scrollbar space-y-8">
           <!-- 更新方式选择 -->
-          <div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-4">
+          <div class="grid grid-cols-1 md:grid-cols-3 gap-4">
             <label
               :class="[
                 'relative flex flex-col p-5 rounded-xl border-2 transition-all cursor-pointer group',
                 updateType === 'grade-only'
-                  ? 'bg-info-5 border-info-50 ring-4 ring-color-collab-10'
-                  : 'bg-bg-primary border-border-secondary hover:border-border-tertiary'
+                  ? 'bg-purple-500/5 border-purple-500/50 ring-4 ring-purple-500/10'
+                  : 'bg-zinc-950 border-zinc-800 hover:border-zinc-700'
               ]"
             >
               <input v-model="updateType" type="radio" value="grade-only" class="sr-only" >
@@ -56,24 +56,24 @@
                   :class="[
                     'w-10 h-10 rounded-lg flex items-center justify-center transition-colors',
                     updateType === 'grade-only'
-                      ? 'bg-info text-text-primary'
-                      : 'bg-bg-tertiary text-text-tertiary group-hover:text-text-secondary'
+                      ? 'bg-purple-500 text-white'
+                      : 'bg-zinc-800 text-zinc-500 group-hover:text-zinc-300'
                   ]"
                 >
                   <Calendar :size="18" />
                 </div>
                 <div
                   v-if="updateType === 'grade-only'"
-                  class="w-5 h-5 rounded-full bg-info flex items-center justify-center"
+                  class="w-5 h-5 rounded-full bg-purple-500 flex items-center justify-center"
                 >
-                  <Check :size="12" class="text-text-primary" />
+                  <Check :size="12" class="text-white" />
                 </div>
               </div>
-              <span class="text-sm font-black text-text-primary uppercase tracking-widest"
-                >{{ locale.updateTypes.gradeOnly.title }}</span
+              <span class="text-sm font-black text-zinc-200 uppercase tracking-widest"
+                >仅更新年级</span
               >
-              <span class="text-[10px] text-text-tertiary mt-1 font-medium leading-relaxed"
-                >{{ locale.updateTypes.gradeOnly.desc }}</span
+              <span class="text-[10px] text-zinc-500 mt-1 font-medium leading-relaxed"
+                >批量更新选中学生的年级，保持班级不变</span
               >
             </label>
 
@@ -81,8 +81,8 @@
               :class="[
                 'relative flex flex-col p-5 rounded-xl border-2 transition-all cursor-pointer group',
                 updateType === 'excel-batch'
-                  ? 'bg-success-5 border-success-50 ring-4 ring-success-10'
-                  : 'bg-bg-primary border-border-secondary hover:border-border-tertiary'
+                  ? 'bg-emerald-500/5 border-emerald-500/50 ring-4 ring-emerald-500/10'
+                  : 'bg-zinc-950 border-zinc-800 hover:border-zinc-700'
               ]"
             >
               <input v-model="updateType" type="radio" value="excel-batch" class="sr-only" >
@@ -91,24 +91,24 @@
                   :class="[
                     'w-10 h-10 rounded-lg flex items-center justify-center transition-colors',
                     updateType === 'excel-batch'
-                      ? 'bg-success text-text-primary'
-                      : 'bg-bg-tertiary text-text-tertiary group-hover:text-text-secondary'
+                      ? 'bg-emerald-500 text-white'
+                      : 'bg-zinc-800 text-zinc-500 group-hover:text-zinc-300'
                   ]"
                 >
                   <FileSpreadsheet :size="18" />
                 </div>
                 <div
                   v-if="updateType === 'excel-batch'"
-                  class="w-5 h-5 rounded-full bg-success flex items-center justify-center"
+                  class="w-5 h-5 rounded-full bg-emerald-500 flex items-center justify-center"
                 >
-                  <Check :size="12" class="text-text-primary" />
+                  <Check :size="12" class="text-white" />
                 </div>
               </div>
-              <span class="text-sm font-black text-text-primary uppercase tracking-widest"
-                >{{ locale.updateTypes.excelBatch.title }}</span
+              <span class="text-sm font-black text-zinc-200 uppercase tracking-widest"
+                >Excel 批量更新</span
               >
-              <span class="text-[10px] text-text-tertiary mt-1 font-medium leading-relaxed"
-                >{{ locale.updateTypes.excelBatch.desc }}</span
+              <span class="text-[10px] text-zinc-500 mt-1 font-medium leading-relaxed"
+                >通过 Excel 文件精确匹配并批量修改学生信息</span
               >
             </label>
 
@@ -116,8 +116,8 @@
               :class="[
                 'relative flex flex-col p-5 rounded-xl border-2 transition-all cursor-pointer group',
                 updateType === 'status-batch'
-                  ? 'bg-warning-5 border-warning-50 ring-4 ring-warning-10'
-                  : 'bg-bg-primary border-border-secondary hover:border-border-tertiary'
+                  ? 'bg-amber-500/5 border-amber-500/50 ring-4 ring-amber-500/10'
+                  : 'bg-zinc-950 border-zinc-800 hover:border-zinc-700'
               ]"
             >
               <input v-model="updateType" type="radio" value="status-batch" class="sr-only" >
@@ -126,59 +126,24 @@
                   :class="[
                     'w-10 h-10 rounded-lg flex items-center justify-center transition-colors',
                     updateType === 'status-batch'
-                      ? 'bg-warning text-text-primary'
-                      : 'bg-bg-tertiary text-text-tertiary group-hover:text-text-secondary'
+                      ? 'bg-amber-500 text-white'
+                      : 'bg-zinc-800 text-zinc-500 group-hover:text-zinc-300'
                   ]"
                 >
                   <ShieldAlert :size="18" />
                 </div>
                 <div
                   v-if="updateType === 'status-batch'"
-                  class="w-5 h-5 rounded-full bg-warning flex items-center justify-center"
+                  class="w-5 h-5 rounded-full bg-amber-500 flex items-center justify-center"
                 >
-                  <Check :size="12" class="text-text-primary" />
+                  <Check :size="12" class="text-white" />
                 </div>
               </div>
-              <span class="text-sm font-black text-text-primary uppercase tracking-widest"
-                >{{ locale.updateTypes.statusBatch.title }}</span
+              <span class="text-sm font-black text-zinc-200 uppercase tracking-widest"
+                >设置账户状态</span
               >
-              <span class="text-[10px] text-text-tertiary mt-1 font-medium leading-relaxed"
-                >{{ locale.updateTypes.statusBatch.desc }}</span
-              >
-            </label>
-
-            <label
-              :class="[
-                'relative flex flex-col p-5 rounded-xl border-2 transition-all cursor-pointer group',
-                updateType === 'song-admin-batch'
-                  ? 'bg-primary-5 border-primary-50 ring-4 ring-primary-10'
-                  : 'bg-bg-primary border-border-secondary hover:border-border-tertiary'
-              ]"
-            >
-              <input v-model="updateType" type="radio" value="song-admin-batch" class="sr-only" >
-              <div class="flex items-center justify-between mb-3">
-                <div
-                  :class="[
-                    'w-10 h-10 rounded-lg flex items-center justify-center transition-colors',
-                    updateType === 'song-admin-batch'
-                      ? 'bg-primary text-text-primary'
-                      : 'bg-bg-tertiary text-text-tertiary group-hover:text-text-secondary'
-                  ]"
-                >
-                  <Music :size="18" />
-                </div>
-                <div
-                  v-if="updateType === 'song-admin-batch'"
-                  class="w-5 h-5 rounded-full bg-primary flex items-center justify-center"
-                >
-                  <Check :size="12" class="text-text-primary" />
-                </div>
-              </div>
-              <span class="text-sm font-black text-text-primary uppercase tracking-widest"
-                >{{ locale.updateTypes.songAdminBatch.title }}</span
-              >
-              <span class="text-[10px] text-text-tertiary mt-1 font-medium leading-relaxed"
-                >{{ locale.updateTypes.songAdminBatch.desc }}</span
+              <span class="text-[10px] text-zinc-500 mt-1 font-medium leading-relaxed"
+                >批量设置选中学生的账户状态</span
               >
             </label>
           </div>
@@ -188,38 +153,38 @@
             v-if="['grade-only', 'status-batch'].includes(updateType)"
             class="space-y-6 animate-in fade-in slide-in-from-bottom-2 duration-300"
           >
-            <div class="p-6 bg-bg-primary-50 border border-border-secondary-50 rounded-xl space-y-6">
+            <div class="p-6 bg-zinc-950/50 border border-zinc-800/50 rounded-xl space-y-6">
               <div
-                class="flex items-center gap-2 text-xs font-black text-text-tertiary uppercase tracking-widest"
+                class="flex items-center gap-2 text-xs font-black text-zinc-400 uppercase tracking-widest"
               >
-                <Filter :size="14" class="text-info" />
-                {{ locale.studentFilter.title }}
+                <Filter :size="14" class="text-purple-500" />
+                学生范围筛选
               </div>
 
               <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
                 <div class="space-y-2">
-                  <label class="text-[10px] font-black text-text-tertiary uppercase tracking-widest ml-1"
-                    >{{ locale.studentFilter.currentGrade }}</label
+                  <label class="text-[10px] font-black text-zinc-500 uppercase tracking-widest ml-1"
+                    >当前年级</label
                   >
                   <CustomSelect
                     v-model="gradeFilter"
                     :options="gradeOptions"
                     label-key="label"
                     value-key="value"
-                    :placeholder="locale.studentFilter.allGrades"
+                    placeholder="全部年级"
                     class-name="w-full"
                   />
                 </div>
                 <div class="space-y-2">
-                  <label class="text-[10px] font-black text-text-tertiary uppercase tracking-widest ml-1"
-                    >{{ locale.studentFilter.currentClass }}</label
+                  <label class="text-[10px] font-black text-zinc-500 uppercase tracking-widest ml-1"
+                    >当前班级</label
                   >
                   <CustomSelect
                     v-model="classFilter"
                     :options="classOptions"
                     label-key="label"
                     value-key="value"
-                    :placeholder="locale.studentFilter.allClasses"
+                    placeholder="全部班级"
                     class-name="w-full"
                   />
                 </div>
@@ -227,44 +192,44 @@
 
               <div class="space-y-3">
                 <div class="flex items-center justify-between ml-1">
-                  <label class="text-[10px] font-black text-text-tertiary uppercase tracking-widest"
-                    >{{ getNestedText('studentFilter', 'selectUsers', selectedUserIds?.length || 0, filteredUsers?.length || 0) }}</label
+                  <label class="text-[10px] font-black text-zinc-500 uppercase tracking-widest"
+                    >选择学生 ({{ selectedUserIds.length }}/{{ filteredStudents.length }})</label
                   >
                   <button
-                    class="text-[10px] font-black text-info hover:text-info uppercase tracking-widest transition-colors"
+                    class="text-[10px] font-black text-purple-400 hover:text-purple-300 uppercase tracking-widest transition-colors"
                     @click="toggleSelectAll"
                   >
-                    {{ isAllSelected ? locale.studentFilter.clearSelection : locale.studentFilter.selectAll }}
+                    {{ isAllSelected ? '取消全选' : '选择当前全部' }}
                   </button>
                 </div>
                 <div
-                  class="max-h-48 overflow-y-auto rounded-lg border border-border-secondary bg-bg-primary p-2 custom-scrollbar"
+                  class="max-h-48 overflow-y-auto rounded-lg border border-zinc-800 bg-zinc-950 p-2 custom-scrollbar"
                 >
                   <div
-                    v-if="filteredUsers?.length === 0"
-                    class="py-10 text-center text-xs text-text-disabled font-medium"
+                    v-if="filteredStudents.length === 0"
+                    class="py-10 text-center text-xs text-zinc-600 font-medium"
                   >
-                    {{ locale.studentFilter.noMatchedUsers }}
+                    没有匹配条件的学生
                   </div>
                   <div v-else class="grid grid-cols-1 md:grid-cols-2 gap-1">
                     <label
-                      v-for="user in filteredUsers"
-                      :key="user.id"
-                      class="flex items-center gap-3 p-3 rounded-lg hover:bg-bg-secondary-50 cursor-pointer transition-colors group"
+                      v-for="student in filteredStudents"
+                      :key="student.id"
+                      class="flex items-center gap-3 p-3 rounded-lg hover:bg-zinc-900/50 cursor-pointer transition-colors group"
                     >
                       <input
                         v-model="selectedUserIds"
-                        :value="user.id"
+                        :value="student.id"
                         type="checkbox"
-                        class="w-4 h-4 rounded-md border-border-tertiary bg-bg-primary text-info focus:ring-color-collab-10"
+                        class="w-4 h-4 rounded-md border-zinc-700 bg-zinc-950 text-purple-600 focus:ring-purple-500/20"
                       >
                       <div class="flex flex-col">
                         <span
-                          class="text-xs font-bold text-text-primary group-hover:text-info transition-colors"
-                          >{{ user.name }}</span
+                          class="text-xs font-bold text-zinc-200 group-hover:text-purple-400 transition-colors"
+                          >{{ student.name }}</span
                         >
-                        <span class="text-[10px] text-text-disabled font-mono">{{
-                          user.username
+                        <span class="text-[10px] text-zinc-600 font-mono">{{
+                          student.username
                         }}</span>
                       </div>
                     </label>
@@ -274,82 +239,67 @@
             </div>
 
             <!-- 目标年级设置 -->
-            <div v-if="updateType === 'grade-only'" class="p-6 bg-info-5 border border-info-20 rounded-xl space-y-6">
+            <div v-if="updateType === 'grade-only'" class="p-6 bg-purple-500/5 border border-purple-500/20 rounded-xl space-y-6">
               <div
-                class="flex items-center gap-2 text-xs font-black text-info uppercase tracking-widest"
+                class="flex items-center gap-2 text-xs font-black text-purple-400 uppercase tracking-widest"
               >
                 <Save :size="14" />
-                {{ locale.gradeSettings.title }}
+                目标设置
               </div>
               <div class="grid grid-cols-1 md:grid-cols-2 gap-6 items-end">
                 <div class="space-y-2">
-                  <label class="text-[10px] font-black text-text-tertiary uppercase tracking-widest ml-1"
-                    >{{ locale.gradeSettings.targetGrade }}</label
+                  <label class="text-[10px] font-black text-zinc-500 uppercase tracking-widest ml-1"
+                    >目标年级</label
                   >
-                  <div class="relative group">
-                    <Calendar
-                      class="absolute left-4 top-1/2 -translate-y-1/2 text-text-secondary group-focus-within:text-info transition-colors"
-                      :size="16"
-                    />
-                    <input
-                      v-model="targetGrade"
-                      type="text"
-                      :placeholder="locale.gradeSettings.targetGradePlaceholder"
-                      class="w-full bg-bg-primary border border-border-secondary rounded-lg pl-11 pr-4 py-3 text-xs focus:outline-none focus:border-info-30 transition-all text-text-primary"
-                    >
-                  </div>
+                  <CustomSelect
+                    v-model="targetGrade"
+                    :options="targetGradeOptions"
+                    label-key="label"
+                    value-key="value"
+                    placeholder="请选择目标年级"
+                    class-name="w-full"
+                  />
                 </div>
                 <label
-                  class="flex items-center gap-3 p-3 bg-bg-primary border border-border-secondary rounded-lg cursor-pointer hover:border-border-tertiary transition-all"
+                  class="flex items-center gap-3 p-3 bg-zinc-950 border border-zinc-800 rounded-lg cursor-pointer hover:border-zinc-700 transition-all"
                 >
                   <input
                     v-model="keepClass"
                     type="checkbox"
-                    class="w-5 h-5 rounded-md border-border-tertiary bg-bg-primary text-info focus:ring-color-collab-10"
+                    class="w-5 h-5 rounded-md border-zinc-700 bg-zinc-950 text-purple-600 focus:ring-purple-500/20"
                   >
-                  <span class="text-xs font-bold text-text-secondary">{{ locale.gradeSettings.keepClass }}</span>
+                  <span class="text-xs font-bold text-zinc-300">保持原有班级不变</span>
                 </label>
               </div>
             </div>
 
             <!-- 目标状态设置 -->
-            <div v-if="updateType === 'status-batch'" class="p-6 bg-warning-5 border border-warning-20 rounded-xl space-y-6">
-              <div class="flex items-center gap-2 text-xs font-black text-warning uppercase tracking-widest">
+            <div v-if="updateType === 'status-batch'" class="p-6 bg-amber-500/5 border border-amber-500/20 rounded-xl space-y-6">
+              <div class="flex items-center gap-2 text-xs font-black text-amber-400 uppercase tracking-widest">
                 <Save :size="14" />
-                {{ locale.statusSettings.title }}
+                目标状态设置
               </div>
-              <div class="grid grid-cols-1 md:grid-cols-2 gap-6">
+              <div class="grid grid-cols-1 gap-6">
                 <div class="space-y-2">
-                  <label class="text-[10px] font-black text-text-tertiary uppercase tracking-widest ml-1">{{ locale.statusSettings.sourceStatus }}</label>
-                  <CustomSelect
-                    v-model="sourceStatus"
-                    :options="sourceStatusOptions"
-                    label-key="label"
-                    value-key="value"
-                    :placeholder="locale.statusSettings.sourceStatusPlaceholder"
-                    class-name="w-full"
-                  />
-                </div>
-                <div class="space-y-2">
-                  <label class="text-[10px] font-black text-text-tertiary uppercase tracking-widest ml-1">{{ locale.statusSettings.targetStatus }}</label>
+                  <label class="text-[10px] font-black text-zinc-500 uppercase tracking-widest ml-1">选择账户状态</label>
                   <CustomSelect
                     v-model="targetStatus"
                     :options="statusOptions"
                     label-key="label"
                     value-key="value"
-                    :placeholder="locale.statusSettings.targetStatusPlaceholder"
+                    placeholder="请选择目标状态"
                     class-name="w-full"
                   />
                 </div>
                 <div class="space-y-2">
-                  <label class="text-[10px] font-black text-text-tertiary uppercase tracking-widest ml-1">{{ locale.statusSettings.reason }}</label>
+                  <label class="text-[10px] font-black text-zinc-500 uppercase tracking-widest ml-1">变更原因说明</label>
                   <div class="relative group">
-                    <MessageSquare class="absolute left-4 top-3 text-text-secondary group-focus-within:text-warning transition-colors" :size="16" />
+                    <MessageSquare class="absolute left-4 top-3 text-zinc-700 group-focus-within:text-amber-500 transition-colors" :size="16" />
                     <textarea
                       v-model="statusReason"
                       rows="2"
-                      :placeholder="locale.statusSettings.reasonPlaceholder"
-                      class="w-full bg-bg-primary border border-border-secondary rounded-lg pl-11 pr-4 py-3 text-xs focus:outline-none focus:border-warning-30 transition-all text-text-primary resize-none"
+                      placeholder="例如: 2025届学生统一毕业"
+                      class="w-full bg-zinc-950 border border-zinc-800 rounded-lg pl-11 pr-4 py-3 text-xs focus:outline-none focus:border-amber-500/30 transition-all text-zinc-200 resize-none"
                     ></textarea>
                   </div>
                 </div>
@@ -357,157 +307,6 @@
             </div>
           </div>
 
-          <!-- 歌曲管理员批量更新面板 -->
-          <div
-            v-if="updateType === 'song-admin-batch'"
-            class="space-y-6 animate-in fade-in slide-in-from-bottom-2 duration-300"
-          >
-            <div class="p-6 bg-bg-primary-50 border border-border-secondary-50 rounded-xl space-y-6">
-              <div
-                class="flex items-center gap-2 text-xs font-black text-text-tertiary uppercase tracking-widest"
-              >
-                <Filter :size="14" class="text-primary" />
-                {{ getNestedText('songAdminSettings', 'scope') }}
-              </div>
-
-              <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
-                <div class="space-y-2">
-                  <label class="text-[10px] font-black text-text-tertiary uppercase tracking-widest ml-1"
-                    >{{ getNestedText('songAdminSettings', 'currentGrade') }}</label
-                  >
-                  <CustomSelect
-                    v-model="songAdminGradeFilter"
-                    :options="songAdminGradeOptions"
-                    label-key="label"
-                    value-key="value"
-                    :placeholder="getNestedText('songAdminSettings', 'allGrades')"
-                    class-name="w-full"
-                  />
-                </div>
-                <div class="space-y-2">
-                  <label class="text-[10px] font-black text-text-tertiary uppercase tracking-widest ml-1"
-                    >{{ getNestedText('songAdminSettings', 'currentClass') }}</label
-                  >
-                  <CustomSelect
-                    v-model="songAdminClassFilter"
-                    :options="songAdminClassOptions"
-                    label-key="label"
-                    value-key="value"
-                    :placeholder="getNestedText('songAdminSettings', 'allClasses')"
-                    class-name="w-full"
-                  />
-                </div>
-              </div>
-
-              <div class="space-y-3">
-                <div class="flex items-center justify-between ml-1">
-                  <label class="text-[10px] font-black text-text-tertiary uppercase tracking-widest"
-                    >{{ getNestedText('songAdminSettings', 'selectUsers', songAdminIds?.length || 0, filteredSongAdminUsers?.length || 0) }}</label>
-                  <button
-                    class="text-[10px] font-black text-primary hover:text-info uppercase tracking-widest transition-colors"
-                    @click="toggleSelectAllSongAdmin"
-                  >
-                    {{ isAllSongAdminSelected ? getNestedText('songAdminSettings', 'clearSelection') : getNestedText('songAdminSettings', 'selectAll') }}
-                  </button>
-                </div>
-                <div
-                  class="max-h-48 overflow-y-auto rounded-lg border border-border-secondary bg-bg-primary p-2 custom-scrollbar"
-                >
-                  <div
-                    v-if="filteredSongAdminUsers?.length === 0"
-                    class="py-10 text-center text-xs text-text-disabled font-medium"
-                  >
-                    {{ getNestedText('songAdminSettings', 'noMatchedUsers') }}
-                  </div>
-                  <div v-else class="grid grid-cols-1 md:grid-cols-2 gap-1">
-                    <label
-                      v-for="user in filteredSongAdminUsers"
-                      :key="user.id"
-                      class="flex items-center gap-3 p-3 rounded-lg hover:bg-bg-secondary-50 cursor-pointer transition-colors group"
-                    >
-                      <input
-                        v-model="songAdminIds"
-                        :value="user.id"
-                        type="checkbox"
-                        class="w-4 h-4 rounded-md border-border-tertiary bg-bg-primary text-primary focus:ring-primary-10"
-                      >
-                      <div class="flex flex-col">
-                        <span
-                          class="text-xs font-bold text-text-primary group-hover:text-primary transition-colors"
-                          >{{ user.name }}</span>
-                        <span class="text-[10px] text-text-disabled font-mono">{{
-                          user.username
-                        }}</span>
-                      </div>
-                      <span class="ml-auto text-[10px] font-bold text-text-disabled">
-                        {{ user.grade || '-' }} {{ user.class || '-' }}
-                      </span>
-                    </label>
-                  </div>
-                </div>
-              </div>
-            </div>
-
-            <!-- 歌曲管理员更新目标设置 -->
-            <div class="p-6 bg-primary-5 border border-primary-20 rounded-xl space-y-6">
-              <div
-                class="flex items-center gap-2 text-xs font-black text-primary uppercase tracking-widest"
-              >
-                <Save :size="14" />
-                {{ getNestedText('songAdminSettings', 'targetSettings') }}
-              </div>
-              <p class="text-[10px] text-primary-80 leading-relaxed">
-                {{ getNestedText('songAdminSettings', 'desc') }}
-              </p>
-              <div class="grid grid-cols-1 md:grid-cols-3 gap-4">
-                <div class="space-y-2">
-                  <label class="text-[10px] font-black text-text-tertiary uppercase tracking-widest ml-1"
-                    >{{ getNestedText('songAdminSettings', 'targetGrade') }}</label>
-                  <div class="relative group">
-                    <Calendar
-                      class="absolute left-4 top-1/2 -translate-y-1/2 text-text-secondary group-focus-within:text-primary transition-colors"
-                      :size="16"
-                    />
-                    <input
-                      v-model="songAdminTargetGrade"
-                      type="text"
-                      :placeholder="getNestedText('songAdminSettings', 'targetGradePlaceholder')"
-                      class="w-full bg-bg-primary border border-border-secondary rounded-lg pl-11 pr-4 py-3 text-xs focus:outline-none focus:border-primary-30 transition-all text-text-primary"
-                    >
-                  </div>
-                </div>
-                <div class="space-y-2">
-                  <label class="text-[10px] font-black text-text-tertiary uppercase tracking-widest ml-1"
-                    >{{ getNestedText('songAdminSettings', 'targetClass') }}</label>
-                  <div class="relative group">
-                    <Briefcase
-                      class="absolute left-4 top-1/2 -translate-y-1/2 text-text-secondary group-focus-within:text-primary transition-colors"
-                      :size="16"
-                    />
-                    <input
-                      v-model="songAdminTargetClass"
-                      type="text"
-                      :placeholder="getNestedText('songAdminSettings', 'targetClassPlaceholder')"
-                      class="w-full bg-bg-primary border border-border-secondary rounded-lg pl-11 pr-4 py-3 text-xs focus:outline-none focus:border-primary-30 transition-all text-text-primary"
-                    >
-                  </div>
-                </div>
-                <div class="space-y-2">
-                  <label class="text-[10px] font-black text-text-tertiary uppercase tracking-widest ml-1"
-                    >{{ getNestedText('songAdminSettings', 'targetStatus') }}</label>
-                  <CustomSelect
-                    v-model="songAdminTargetStatus"
-                    :options="statusOptions"
-                    label-key="label"
-                    value-key="value"
-                    :placeholder="getNestedText('songAdminSettings', 'targetStatusPlaceholder')"
-                    class-name="w-full"
-                  />
-                </div>
-              </div>
-            </div>
-          </div>
-
           <!-- Excel 批量更新面板 -->
           <div
             v-if="updateType === 'excel-batch'"
@@ -536,208 +335,107 @@
                 :class="[
                   'w-full py-12 border-2 border-dashed rounded-xl transition-all flex flex-col items-center justify-center gap-4',
                   isDragOver
-                    ? 'border-success bg-success-10'
-                    : 'border-border-secondary hover:border-success-50 hover:bg-success-5'
+                    ? 'border-emerald-500 bg-emerald-500/10'
+                    : 'border-zinc-800 hover:border-emerald-500/50 hover:bg-emerald-500/5'
                 ]"
               >
                 <div
                   :class="[
-                    'w-16 h-16 rounded-lg bg-bg-secondary flex items-center justify-center transition-colors shadow-xl',
-                    isDragOver ? 'text-success' : 'text-text-disabled group-hover:text-success'
+                    'w-16 h-16 rounded-lg bg-zinc-900 flex items-center justify-center transition-colors shadow-xl',
+                    isDragOver ? 'text-emerald-500' : 'text-zinc-600 group-hover:text-emerald-500'
                   ]"
                 >
                   <Upload :size="32" />
                 </div>
                 <div class="text-center">
-                  <p class="text-base font-black text-text-primary tracking-tight">
-                    {{ locale.excelUpload.dragTitle }}
+                  <p class="text-base font-black text-zinc-200 tracking-tight">
+                    拖拽 Excel 文件到此处
                   </p>
-                  <p class="text-xs text-text-tertiary mt-1">
-                    {{ locale.excelUpload.or }} <span class="text-success font-bold">{{ locale.excelUpload.chooseFile }}</span> {{ locale.excelUpload.supportedFormats }}
+                  <p class="text-xs text-zinc-500 mt-1">
+                    或 <span class="text-emerald-500 font-bold">点击选择文件</span> (支持 .xlsx /
+                    .xls)
                   </p>
                 </div>
               </div>
             </div>
 
-            <!-- 匹配方式选择 -->
-            <div class="p-5 bg-bg-primary border border-border-secondary rounded-xl space-y-4">
-              <div
-                class="flex items-center gap-2 text-[10px] font-black text-text-tertiary uppercase tracking-widest"
-              >
-                <Filter :size="12" />
-                {{ locale.matchType.title }}
-              </div>
-              <div class="flex gap-3">
-                <label
-                  :class="[
-                    'flex-1 flex items-center justify-center gap-2 px-4 py-3 rounded-xl border-2 transition-all cursor-pointer text-xs font-black uppercase tracking-widest',
-                    matchType === 'username'
-                      ? 'bg-primary-10 border-primary-50 text-primary ring-4 ring-primary-10'
-                      : 'bg-bg-secondary border-border-secondary text-text-disabled hover:border-border-tertiary hover:text-text-tertiary'
-                  ]"
-                >
-                  <input v-model="matchType" type="radio" value="username" class="sr-only" />
-                  <span v-if="matchType === 'username'" class="w-2 h-2 rounded-full bg-primary" />
-                  {{ locale.matchType.byUsername }}
-                </label>
-                <label
-                  :class="[
-                    'flex-1 flex items-center justify-center gap-2 px-4 py-3 rounded-xl border-2 transition-all cursor-pointer text-xs font-black uppercase tracking-widest',
-                    matchType === 'name'
-                      ? 'bg-success-10 border-success-50 text-success ring-4 ring-success-10'
-                      : 'bg-bg-secondary border-border-secondary text-text-disabled hover:border-border-tertiary hover:text-text-tertiary'
-                  ]"
-                >
-                  <input v-model="matchType" type="radio" value="name" class="sr-only" />
-                  <span v-if="matchType === 'name'" class="w-2 h-2 rounded-full bg-success" />
-                  {{ locale.matchType.byName }}
-                </label>
-              </div>
-              <p class="text-[10px] text-text-disabled leading-relaxed">
-                <template v-if="matchType === 'username'">
-                  {{ locale.matchType.usernamePrefix }}<span class="text-primary font-bold">{{ locale.fields.username }}</span>{{ locale.matchType.usernameSuffix }}
-                </template>
-                <template v-else>
-                  {{ locale.matchType.namePrefix }}<span class="text-success font-bold">{{ locale.fields.realName }}</span>{{ locale.matchType.nameMiddle }}<span class="text-success font-bold">{{ locale.fields.username }}</span>{{ locale.matchType.nameSuffix }}
-                </template>
-              </p>
-            </div>
-
             <!-- 模板与说明 -->
             <div class="grid grid-cols-1 md:grid-cols-3 gap-4">
               <div
-                class="md:col-span-2 p-5 bg-bg-primary border border-border-secondary rounded-xl space-y-3"
+                class="md:col-span-2 p-5 bg-zinc-950 border border-zinc-800 rounded-xl space-y-3"
               >
                 <div
-                  class="flex items-center gap-2 text-[10px] font-black text-text-tertiary uppercase tracking-widest"
+                  class="flex items-center gap-2 text-[10px] font-black text-zinc-500 uppercase tracking-widest"
                 >
                   <Info :size="12" />
-                  {{ locale.fileSpec.title }}
+                  文件格式规范
                 </div>
-                <ul class="text-[10px] text-text-disabled space-y-1.5 font-medium leading-relaxed">
+                <ul class="text-[10px] text-zinc-600 space-y-1.5 font-medium leading-relaxed">
                   <li class="flex items-start gap-2">
-                    <div class="w-1 h-1 rounded-full bg-bg-quaternary mt-1.5" />
-                    {{ locale.fileSpec.headerLine }}
+                    <div class="w-1 h-1 rounded-full bg-zinc-700 mt-1.5" />
+                    第一行为表头：用户名、姓名、年级、班级、新用户名
                   </li>
                   <li class="flex items-start gap-2">
-                    <div class="w-1 h-1 rounded-full bg-bg-quaternary mt-1.5" />
-                    <template v-if="matchType === 'username'">
-                      <span class="text-primary font-bold">{{ locale.fields.username }}</span> {{ locale.fileSpec.usernameColumn }}
-                    </template>
-                    <template v-else>
-                      <span class="text-success font-bold">{{ locale.fields.name }}</span> {{ locale.fileSpec.nameColumn }}
-                    </template>
+                    <div class="w-1 h-1 rounded-full bg-zinc-700 mt-1.5" />
+                    <span class="text-zinc-400 font-bold">用户名</span> 列用于精确匹配现有账户
                   </li>
                   <li class="flex items-start gap-2">
-                    <div class="w-1 h-1 rounded-full bg-bg-quaternary mt-1.5" />
-                    {{ locale.fileSpec.blankKeepsOriginal }}
+                    <div class="w-1 h-1 rounded-full bg-zinc-700 mt-1.5" />
+                    字段留空则保持原值不变，不进行覆盖更新
                   </li>
                 </ul>
               </div>
               <button
-                class="p-5 bg-success-5 border border-success-20 hover:border-success-40 rounded-xl transition-all flex flex-col items-center justify-center gap-2 group"
+                class="p-5 bg-emerald-500/5 border border-emerald-500/20 hover:border-emerald-500/40 rounded-xl transition-all flex flex-col items-center justify-center gap-2 group"
                 @click="downloadTemplate"
               >
                 <div
-                  class="w-10 h-10 rounded-lg bg-success text-text-primary flex items-center justify-center shadow-lg shadow-[var(--success-glow-20)] group-hover:scale-110 transition-transform"
+                  class="w-10 h-10 rounded-lg bg-emerald-500 text-white flex items-center justify-center shadow-lg shadow-emerald-900/20 group-hover:scale-110 transition-transform"
                 >
                   <Download :size="20" />
                 </div>
-                <span class="text-[10px] font-black text-success uppercase tracking-widest"
-                  >{{ locale.fileSpec.downloadTemplate }}</span
+                <span class="text-[10px] font-black text-emerald-500 uppercase tracking-widest"
+                  >获取模板文件</span
                 >
               </button>
             </div>
 
             <!-- 预览表格 -->
             <div v-if="excelPreviewData.length > 0" class="space-y-4">
-
-              <!-- 外部阻断用户提示 -->
-              <div
-                v-if="blockerList.length > 0"
-                class="p-5 bg-warning-5 border border-warning-20 rounded-2xl space-y-3 animate-in fade-in duration-300"
-              >
-                <div class="flex items-center gap-2 text-xs font-black text-warning uppercase tracking-widest">
-                  <AlertCircle :size="16" />
-                  {{ locale.preview.blockersTitle(blockerList.length) }}
-                </div>
-                <p class="text-[10px] text-warning-80 leading-relaxed">
-                  {{ locale.preview.blockersDesc }}
-                </p>
-                <div class="flex flex-wrap gap-2">
-                  <span
-                    v-for="(blocker, i) in blockerList"
-                    :key="i"
-                    class="px-3 py-1.5 bg-warning-10 border border-warning-20 rounded-lg text-xs font-bold text-warning"
-                  >
-                    {{ blocker.name }}({{ blocker.username }})
-                  </span>
-                </div>
-              </div>
               <div class="flex items-center justify-between ml-1">
-                <label class="text-xs font-black text-text-tertiary uppercase tracking-widest"
-                  >{{ locale.preview.dataPreview(previewFilter === 'all' ? excelPreviewData.length : filteredPreviewData.length, excelPreviewData.length) }}</label
+                <label class="text-xs font-black text-zinc-400 uppercase tracking-widest"
+                  >数据预览 ({{ excelPreviewData.length }}条)</label
                 >
                 <div class="flex items-center gap-4">
-                  <button
-                    :class="[
-                      'flex items-center gap-1.5 transition-all',
-                      previewFilter === 'all' || previewFilter === 'pending'
-                        ? 'opacity-100'
-                        : 'opacity-40 hover:opacity-70'
-                    ]"
-                    @click="previewFilter = previewFilter === 'pending' ? 'all' : 'pending'"
-                  >
-                    <div class="w-2 h-2 rounded-full bg-success" />
-                    <span class="text-[10px] text-text-tertiary font-bold">{{ locale.preview.pending(previewCounts.pending) }}</span>
-                  </button>
-                  <button
-                    :class="[
-                      'flex items-center gap-1.5 transition-all',
-                      previewFilter === 'all' || previewFilter === 'noChange'
-                        ? 'opacity-100'
-                        : 'opacity-40 hover:opacity-70'
-                    ]"
-                    @click="previewFilter = previewFilter === 'noChange' ? 'all' : 'noChange'"
-                  >
-                    <div class="w-2 h-2 rounded-full bg-bg-quaternary" />
-                    <span class="text-[10px] text-text-tertiary font-bold">{{ locale.preview.noChangeCount(previewCounts.noChange) }}</span>
-                  </button>
-                  <button
-                    :class="[
-                      'flex items-center gap-1.5 transition-all',
-                      previewFilter === 'all' || previewFilter === 'error'
-                        ? 'opacity-100'
-                        : 'opacity-40 hover:opacity-70'
-                    ]"
-                    @click="previewFilter = previewFilter === 'error' ? 'all' : 'error'"
-                  >
-                    <div class="w-2 h-2 rounded-full bg-error" />
-                    <span class="text-[10px] text-text-tertiary font-bold">{{ locale.preview.errorCount(previewCounts.error) }}</span>
-                  </button>
+                  <div class="flex items-center gap-1.5">
+                    <div class="w-2 h-2 rounded-full bg-emerald-500" />
+                    <span class="text-[10px] text-zinc-500 font-bold">待更新</span>
+                  </div>
+                  <div class="flex items-center gap-1.5">
+                    <div class="w-2 h-2 rounded-full bg-red-500" />
+                    <span class="text-[10px] text-zinc-500 font-bold">错误</span>
+                  </div>
                 </div>
               </div>
-              <div class="rounded-xl border border-border-secondary bg-bg-primary overflow-hidden shadow-xl">
+              <div class="rounded-xl border border-zinc-800 bg-zinc-950 overflow-hidden shadow-xl">
                 <div class="overflow-x-auto custom-scrollbar">
                   <table class="w-full text-left border-collapse">
                     <thead
-                      class="bg-bg-secondary-80 text-[10px] font-black text-text-tertiary uppercase tracking-widest border-b border-border-secondary"
+                      class="bg-zinc-900/80 text-[10px] font-black text-zinc-500 uppercase tracking-widest border-b border-zinc-800"
                     >
                       <tr>
-                        <th class="px-5 py-4 whitespace-nowrap">
-                          {{ matchType === 'username' ? locale.preview.matchUser : locale.preview.matchName }}
-                        </th>
-                        <th class="px-5 py-4 whitespace-nowrap">{{ locale.preview.currentInfo }}</th>
-                        <th class="px-5 py-4 whitespace-nowrap">{{ locale.preview.afterUpdate }}</th>
-                        <th class="px-5 py-4 whitespace-nowrap text-right">{{ locale.preview.matchStatus }}</th>
+                        <th class="px-5 py-4 whitespace-nowrap">匹配用户</th>
+                        <th class="px-5 py-4 whitespace-nowrap">当前信息</th>
+                        <th class="px-5 py-4 whitespace-nowrap">更新后</th>
+                        <th class="px-5 py-4 whitespace-nowrap text-right">匹配状态</th>
                       </tr>
                     </thead>
-                    <tbody class="divide-y divide-panel-bg-deepest">
+                    <tbody class="divide-y divide-zinc-900">
                       <tr
-                        v-for="(row, index) in filteredPreviewData.slice(0, 10)"
+                        v-for="(row, index) in excelPreviewData.slice(0, 10)"
                         :key="index"
                         :class="[
-                          row.error ? 'bg-error-5' : 'hover:bg-bg-secondary-30 transition-colors'
+                          row.error ? 'bg-red-500/5' : 'hover:bg-zinc-900/30 transition-colors'
                         ]"
                       >
                         <td class="px-5 py-4">
@@ -745,63 +443,43 @@
                             <span
                               :class="[
                                 'text-xs font-bold',
-                                row.error ? 'text-error' : 'text-text-primary'
+                                row.error ? 'text-red-400' : 'text-zinc-200'
                               ]"
-                              >{{ matchType === 'username' ? row.username : row.name }}</span
+                              >{{ row.username }}</span
                             >
-                            <span class="text-[10px] text-text-disabled font-medium">{{
-                              matchType === 'username' ? (row.name || '-') : (row.username || '-')
+                            <span class="text-[10px] text-zinc-600 font-medium">{{
+                              row.name || '-'
                             }}</span>
                           </div>
                         </td>
                         <td class="px-5 py-4">
-                          <div class="flex flex-col">
-                            <div class="flex items-center gap-1.5">
-                              <span class="text-xs font-bold text-text-primary">{{ row.currentGrade || '-' }}</span>
-                              <span class="text-[10px] text-text-secondary">/</span>
-                              <span class="text-xs font-bold text-text-primary">{{ row.currentClass || '-' }}</span>
-                            </div>
-                            <span class="text-[10px] text-text-tertiary font-medium mt-0.5">{{ row.username }}</span>
+                          <div class="text-[10px] text-zinc-500 font-medium">
+                            {{ row.currentGrade || '-' }}年级 {{ row.currentClass || '-' }}
                           </div>
                         </td>
                         <td class="px-5 py-4">
-                          <div class="flex flex-col">
-                            <template v-if="row.noChange">
-                              <span class="text-xs font-bold text-text-disabled">-</span>
-                            </template>
-                            <template v-else>
-                              <div class="flex items-center gap-1.5">
-                                <span class="text-xs font-bold text-success">{{ row.newGrade || row.currentGrade || '-' }}</span>
-                                <span class="text-[10px] text-text-secondary">/</span>
-                                <span class="text-xs font-bold text-success">{{ row.newClass || row.currentClass || '-' }}</span>
-                              </div>
-                              <span
-                                :class="[
-                                  'text-[10px] font-medium mt-0.5',
-                                  row.newUsername ? 'text-success' : 'text-text-tertiary'
-                                ]"
-                              >{{ row.newUsername || row.username }}</span>
-                            </template>
+                          <div class="flex items-center gap-2">
+                            <span class="text-xs font-bold text-emerald-400">{{
+                              row.newGrade || row.currentGrade || '-'
+                            }}</span>
+                            <span class="text-[10px] text-zinc-700">/</span>
+                            <span class="text-xs font-bold text-emerald-400">{{
+                              row.newClass || row.currentClass || '-'
+                            }}</span>
                           </div>
                         </td>
                         <td class="px-5 py-4 text-right">
                           <span
                             v-if="row.error"
-                            class="px-2 py-0.5 bg-error-10 text-error text-[10px] font-black rounded uppercase tracking-tighter border border-error-20"
+                            class="px-2 py-0.5 bg-red-500/10 text-red-500 text-[10px] font-black rounded uppercase tracking-tighter border border-red-500/20"
                           >
                             {{ row.error }}
                           </span>
-                          <span
-                            v-else-if="row.noChange"
-                            class="px-2 py-0.5 bg-bg-tertiary text-text-tertiary text-[10px] font-black rounded uppercase tracking-tighter border border-border-tertiary-50"
-                          >
-                            {{ locale.preview.noChange }}
-                          </span>
                           <span
                             v-else
-                            class="px-2 py-0.5 bg-success-10 text-success text-[10px] font-black rounded uppercase tracking-tighter border border-success-20"
+                            class="px-2 py-0.5 bg-emerald-500/10 text-emerald-500 text-[10px] font-black rounded uppercase tracking-tighter border border-emerald-500/20"
                           >
-                            {{ locale.preview.ready }}
+                            已就绪
                           </span>
                         </td>
                       </tr>
@@ -809,10 +487,10 @@
                   </table>
                 </div>
                 <div
-                  v-if="filteredPreviewData.length > 10"
-                  class="p-4 text-center border-t border-border-secondary bg-bg-secondary-20 text-[10px] text-text-disabled font-bold uppercase tracking-widest"
+                  v-if="excelPreviewData.length > 10"
+                  class="p-4 text-center border-t border-zinc-900 bg-zinc-900/20 text-[10px] text-zinc-600 font-bold uppercase tracking-widest"
                 >
-                  {{ locale.preview.moreQueued(filteredPreviewData.length - 10) }}
+                  以及另外 {{ excelPreviewData.length - 10 }} 条记录已在队列中
                 </div>
               </div>
             </div>
@@ -821,55 +499,36 @@
           <!-- 错误提示 -->
           <div
             v-if="error"
-            class="p-4 bg-error-10 border border-error-20 rounded-2xl flex items-center gap-3 text-error text-xs animate-in shake duration-300"
+            class="p-4 bg-red-500/10 border border-red-500/20 rounded-2xl flex items-center gap-3 text-red-400 text-xs animate-in shake duration-300"
           >
             <AlertCircle :size="16" />
             {{ error }}
           </div>
-
-          <!-- 进度条 -->
-          <div
-            v-if="updateType === 'excel-batch' && updateProgressText"
-            class="p-5 bg-success-5 border border-success-20 rounded-2xl space-y-3 animate-in fade-in slide-in-from-bottom-2 duration-300"
-          >
-            <div class="flex items-center justify-between">
-              <span class="text-xs font-black text-success uppercase tracking-widest">{{ updateProgressText }}</span>
-              <span class="text-xs font-black text-success">{{ updateProgress }}%</span>
-            </div>
-            <div class="h-2 bg-bg-secondary rounded-full overflow-hidden">
-              <div
-                class="h-full bg-gradient-to-r from-success to-success-light transition-all duration-300 ease-out rounded-full"
-                :style="{ width: updateProgress + '%' }"
-              />
-            </div>
-          </div>
         </div>
 
         <!-- 底部按钮 -->
-        <div class="p-8 pt-4 border-t border-border-secondary-50 bg-bg-secondary-50 flex gap-3">
+        <div class="p-8 pt-4 border-t border-zinc-800/50 bg-zinc-900/50 flex gap-3">
           <button
-            class="flex-1 px-6 py-4 bg-bg-tertiary hover:bg-bg-quaternary text-text-secondary text-xs font-black rounded-2xl transition-all uppercase tracking-widest"
+            class="flex-1 px-6 py-4 bg-zinc-800 hover:bg-zinc-700 text-zinc-300 text-xs font-black rounded-2xl transition-all uppercase tracking-widest"
             @click="$emit('close')"
           >
-            {{ locale.actions.cancel }}
+            取消操作
           </button>
           <button
             :disabled="loading || !canUpdate"
             :class="[
-              'flex-[2] px-6 py-4 text-text-primary text-xs font-black rounded-2xl transition-all uppercase tracking-widest flex items-center justify-center gap-2 disabled:opacity-50 shadow-lg active:scale-95',
+              'flex-[2] px-6 py-4 text-white text-xs font-black rounded-2xl transition-all uppercase tracking-widest flex items-center justify-center gap-2 disabled:opacity-50 shadow-lg active:scale-95',
               updateType === 'excel-batch'
-                ? 'bg-success hover:bg-success shadow-[var(--success-glow-20)]'
+                ? 'bg-emerald-600 hover:bg-emerald-500 shadow-emerald-900/20'
                 : updateType === 'status-batch'
-                  ? 'bg-warning hover:bg-warning shadow-[var(--warning-glow-20)]'
-                  : updateType === 'song-admin-batch'
-                    ? 'bg-primary hover:bg-primary shadow-[var(--primary-glow)]'
-                    : 'bg-info hover:bg-info shadow-[var(--info-glow-20)]'
+                  ? 'bg-amber-600 hover:bg-amber-500 shadow-amber-900/20'
+                  : 'bg-purple-600 hover:bg-purple-500 shadow-purple-900/20'
             ]"
             @click="performUpdate"
           >
             <RefreshCw v-if="loading" class="animate-spin" :size="16" />
             <Save v-else :size="16" />
-            {{ loading ? locale.actions.submitting : locale.actions.confirm }}
+            {{ loading ? '正在提交更新...' : '确认并开始更新' }}
           </button>
         </div>
       </div>
@@ -878,10 +537,8 @@
 </template>
 
 <script setup>
-import { computed, ref, watch, nextTick } from 'vue'
+import { computed, ref, watch } from 'vue'
 import { useAuth } from '~/composables/useAuth'
-import { useUserFilters } from '~/composables/useUserFilters'
-import { useLocale } from '~/utils/locale'
 import {
   Layers,
   X,
@@ -893,14 +550,12 @@ import {
   Save,
   Upload,
   Download,
-  Briefcase,
   Info,
   AlertCircle,
   RefreshCw,
   CheckCircle2,
   ShieldAlert,
-  MessageSquare,
-  Music
+  MessageSquare
 } from '@lucide/vue'
 
 import CustomSelect from '~/components/UI/Common/CustomSelect.vue'
@@ -925,301 +580,68 @@ const targetGrade = ref('')
 const keepClass = ref(true)
 
 // 状态批量更新相关
-const sourceStatus = ref('')
 const targetStatus = ref('')
 const statusReason = ref('')
 
-// 歌曲管理员批量更新相关
-const songAdminGradeFilter = ref('')
-const songAdminClassFilter = ref('')
-const songAdminIds = ref([])
-const songAdminTargetGrade = ref('')
-const songAdminTargetClass = ref('')
-const songAdminTargetStatus = ref('')
+const statusOptions = [
+  { label: '正常访问', value: 'active' },
+  { label: '限制访问 (毕业生)', value: 'graduate' },
+  { label: '限制访问 (退学)', value: 'withdrawn' }
+]
 
 // Excel批量更新相关
 const isDragOver = ref(false)
 const excelPreviewData = ref([])
 const fileInput = ref(null)
-const matchType = ref('username')
-const rawExcelData = ref(null)
-const blockerList = ref([])
-const previewFilter = ref('all')
-
-// 批量更新进度
-const updateProgress = ref(0)
-const updateProgressText = ref('')
-const updateTotalBatches = ref(0)
-const updateCurrentBatch = ref(0)
 
 // 所有用户的年级班级信息
+const allGrades = ref([])
+const allClasses = ref([])
+// 所有学生用户数据
+const allStudents = ref([])
+
 // 服务
 const auth = useAuth()
-const userFilters = useUserFilters()
-const { admin } = useLocale()
-const locale = computed(() => {
-  const base = admin.value?.userManager?.batchUpdateModal || {}
-  const emptyText = () => ''
-  return useSafeLocale({
-    ...base,
-    updateTypes: {
-      gradeOnly: {},
-      excelBatch: {},
-      statusBatch: {},
-      songAdminBatch: {},
-      ...(base.updateTypes || {})
-    },
-    fields: { ...(base.fields || {}) },
-    studentFilter: {
-      selectUsers: emptyText,
-      ...(base.studentFilter || {})
-    },
-    gradeSettings: { ...(base.gradeSettings || {}) },
-    statusSettings: { ...(base.statusSettings || {}) },
-    statusOptions: { ...(base.statusOptions || {}) },
-    excelUpload: { ...(base.excelUpload || {}) },
-    matchType: { ...(base.matchType || {}) },
-    fileSpec: { ...(base.fileSpec || {}) },
-    preview: {
-      blockersTitle: emptyText,
-      dataPreview: emptyText,
-      pending: emptyText,
-      noChangeCount: emptyText,
-      errorCount: emptyText,
-      moreQueued: emptyText,
-      ...(base.preview || {})
-    },
-    actions: { ...(base.actions || {}) },
-    template: {
-      headers: {},
-      ...(base.template || {})
-    },
-    progress: {
-      processing: emptyText,
-      completed: emptyText,
-      ...(base.progress || {})
-    },
-    messages: {
-      partialGradeSuccess: emptyText,
-      gradeSuccess: emptyText,
-      partialExcelSuccess: emptyText,
-      excelFailed: emptyText,
-      partialStatusSuccess: emptyText,
-      songAdminNoChanges: emptyText,
-      ...(base.messages || {})
-    },
-    errors: {
-      processExcelFailed: emptyText,
-      fieldRequired: emptyText,
-      duplicateTarget: emptyText,
-      usernameOccupied: emptyText,
-      batchUpdateFailed: emptyText,
-      updateFailedWithEtc: emptyText,
-      ...(base.errors || {})
-    }
-  })
-})
-const getNestedText = (section, key, ...args) => {
-  const message = locale.value?.[section]?.[key]
-  if (typeof message === 'function') return message(...args)
-  if (typeof message === 'string') {
-    return message.replace(/{(\d+)}/g, (match, index) =>
-      args[index] !== undefined ? String(args[index]) : match
-    )
-  }
-  return message || key
-}
-const excelColumnKeys = computed(() => ({
-  username: locale.value?.template?.headers?.username,
-  name: locale.value?.template?.headers?.name,
-  grade: locale.value?.template?.headers?.grade,
-  class: locale.value?.template?.headers?.class,
-  newUsername: locale.value?.template?.headers?.newUsername
-}))
-
-const statusOptions = computed(() => [
-  { label: locale.value?.statusOptions?.active || '在校', value: 'active' },
-  { label: locale.value?.statusOptions?.graduate || '已毕业', value: 'graduate' },
-  { label: locale.value?.statusOptions?.withdrawn || '已退学', value: 'withdrawn' }
-])
-const sourceStatusOptions = computed(() => [
-  { label: locale.value?.statusOptions?.all || '全部状态', value: '' },
-  ...statusOptions.value
-])
 
 // 计算属性
-const computedUsers = computed(() => {
-  // 必须优先使用全量数据 allUsers，如果正在加载则等待加载完成。
-  // 只有在尚未触发加载且需要临时展示时才 fallback 到 props.users。
-  return userFilters.isLoaded.value
-    ? userFilters.allUsers.value
-    : props.users || []
+const students = computed(() => {
+  return allStudents.value.length > 0
+    ? allStudents.value
+    : props.users.filter((user) => user.role === 'USER')
 })
 
 const availableGrades = computed(() => {
-  return userFilters.getAvailableGrades(computedUsers.value)
+  return allGrades.value.length > 0
+    ? allGrades.value
+    : [...new Set(students.value.map((s) => s.grade).filter(Boolean))].sort()
 })
 
 const availableClasses = computed(() => {
-  return userFilters.getAvailableClasses(computedUsers.value, gradeFilter.value)
+  return allClasses.value.length > 0
+    ? allClasses.value
+    : [...new Set(students.value.map((s) => s.class).filter(Boolean))].sort()
 })
 
-watch(() => gradeFilter.value, () => {
-  classFilter.value = ''
+const targetGradeOptions = computed(() => {
+  return availableGrades.value.map((g) => ({ label: g, value: g }))
 })
 
 const gradeOptions = computed(() => {
   return [
-    { label: locale.value?.studentFilter?.allGrades || '全部年级', value: '' },
+    { label: '全部年级', value: '' },
     ...availableGrades.value.map((g) => ({ label: g, value: g }))
   ]
 })
 
 const classOptions = computed(() => {
   return [
-    { label: locale.value?.studentFilter?.allClasses || '全部班级', value: '' },
+    { label: '全部班级', value: '' },
     ...availableClasses.value.map((c) => ({ label: c, value: c }))
   ]
 })
 
-const songAdminUsers = computed(() => {
-  return computedUsers.value.filter((u) => u.role === 'SONG_ADMIN')
-})
-
-const songAdminAvailableGrades = computed(() => {
-  const grades = new Set()
-  songAdminUsers.value.forEach((u) => {
-    if (u.grade) grades.add(u.grade)
-  })
-  return Array.from(grades)
-})
-
-const songAdminAvailableClasses = computed(() => {
-  const classes = new Set()
-  let pool = songAdminUsers.value
-  if (songAdminGradeFilter.value) {
-    pool = pool.filter((u) => u.grade === songAdminGradeFilter.value)
-  }
-  pool.forEach((u) => {
-    if (u.class) classes.add(u.class)
-  })
-  return Array.from(classes)
-})
-
-watch(() => songAdminGradeFilter.value, () => {
-  songAdminClassFilter.value = ''
-})
-
-const songAdminGradeOptions = computed(() => {
-  return [
-    { label: getNestedText('songAdminSettings', 'allGrades'), value: '' },
-    ...songAdminAvailableGrades.value.map((g) => ({ label: g, value: g }))
-  ]
-})
-
-const songAdminClassOptions = computed(() => {
-  return [
-    { label: getNestedText('songAdminSettings', 'allClasses'), value: '' },
-    ...songAdminAvailableClasses.value.map((c) => ({ label: c, value: c }))
-  ]
-})
-
-const filteredSongAdminUsers = computed(() => {
-  let filtered = songAdminUsers.value
-
-  if (songAdminGradeFilter.value) {
-    filtered = filtered.filter((u) => u.grade === songAdminGradeFilter.value)
-  }
-
-  if (songAdminClassFilter.value) {
-    filtered = filtered.filter((u) => u.class === songAdminClassFilter.value)
-  }
-
-  return filtered
-})
-
-const isAllSongAdminSelected = computed(() => {
-  if (filteredSongAdminUsers.value.length === 0) return false
-  const selectedSet = new Set(songAdminIds.value)
-  return filteredSongAdminUsers.value.every((u) => selectedSet.has(u.id))
-})
-
-const toggleSelectAllSongAdmin = () => {
-  const filteredIds = filteredSongAdminUsers.value.map((u) => u.id)
-  const filteredSet = new Set(filteredIds)
-  if (isAllSongAdminSelected.value) {
-    songAdminIds.value = songAdminIds.value.filter((id) => !filteredSet.has(id))
-  } else {
-    const newSelections = new Set([...songAdminIds.value, ...filteredIds])
-    songAdminIds.value = Array.from(newSelections)
-  }
-}
-
-const performSongAdminBatchUpdate = async () => {
-  const updates = songAdminIds.value.map((userId) => {
-    const updateData = { userId }
-    if (songAdminTargetGrade.value.trim()) updateData.grade = songAdminTargetGrade.value.trim()
-    if (songAdminTargetClass.value.trim()) updateData.class = songAdminTargetClass.value.trim()
-    if (songAdminTargetStatus.value) updateData.status = songAdminTargetStatus.value
-    return updateData
-  })
-
-  // 后端单次批量更新上限 100 条，超出时分批提交
-  const batchSize = 50
-  let totalUpdated = 0
-  let totalFailed = 0
-  let firstErrorDetail = ''
-
-  for (let i = 0; i < updates.length; i += batchSize) {
-    const batch = updates.slice(i, i + batchSize)
-
-    try {
-      const response = await $fetch('/api/admin/users/batch-update', {
-        method: 'POST',
-        body: { updates: batch },
-        ...auth.getAuthConfig()
-      })
-
-      if (!response?.success) {
-        throw new Error(response?.message || getNestedText('errors', 'songAdminUpdateFailed'))
-      }
-
-      totalUpdated += response.data?.summary?.success || 0
-      totalFailed += response.data?.summary?.failed || 0
-      if (!firstErrorDetail && response.data?.errors?.length > 0) {
-        firstErrorDetail = response.data.errors[0].error
-      }
-    } catch (err) {
-      console.error('歌曲管理员批量更新失败:', err)
-      totalFailed += batch.length
-    }
-  }
-
-  // 目标字段与现状一致等无实际变更场景
-  if (totalUpdated === 0 && totalFailed === 0) {
-    if (window.$showNotification) {
-      window.$showNotification(getNestedText('messages', 'songAdminNoChanges'), 'warning')
-    }
-    return
-  }
-
-  if (totalFailed > 0) {
-    if (totalUpdated > 0) {
-      if (window.$showNotification) {
-        window.$showNotification(getNestedText('messages', 'partialSongAdminSuccess', totalFailed), 'warning')
-      }
-    } else {
-      throw new Error(getNestedText('errors', 'updateFailedWithEtc', firstErrorDetail || getNestedText('errors', 'songAdminUpdateFailed')))
-    }
-  } else {
-    if (window.$showNotification) {
-      window.$showNotification(getNestedText('messages', 'songAdminSuccess', totalUpdated), 'success')
-    }
-  }
-}
-
-const filteredUsers = computed(() => {
-  let filtered = computedUsers.value
+const filteredStudents = computed(() => {
+  let filtered = students.value
 
   if (gradeFilter.value) {
     filtered = filtered.filter((s) => s.grade === gradeFilter.value)
@@ -1233,53 +655,29 @@ const filteredUsers = computed(() => {
 })
 
 const isAllSelected = computed(() => {
-  if (filteredUsers.value.length === 0) return false
-  const selectedSet = new Set(selectedUserIds.value)
-  return filteredUsers.value.every(u => selectedSet.has(u.id))
+  return (
+    filteredStudents.value.length > 0 &&
+    selectedUserIds.value.length === filteredStudents.value.length
+  )
 })
 
 const canUpdate = computed(() => {
   if (updateType.value === 'grade-only') {
     return selectedUserIds.value.length > 0 && targetGrade.value.trim()
   } else if (updateType.value === 'excel-batch') {
-    return excelPreviewData.value.length > 0 && excelPreviewData.value.some((row) => !row.error && !row.noChange)
+    return excelPreviewData.value.length > 0 && excelPreviewData.value.some((row) => !row.error)
   } else if (updateType.value === 'status-batch') {
     return selectedUserIds.value.length > 0 && targetStatus.value && statusReason.value.trim()
-  } else if (updateType.value === 'song-admin-batch') {
-    return (
-      songAdminIds.value.length > 0 &&
-      (songAdminTargetGrade.value.trim() || songAdminTargetClass.value.trim() || songAdminTargetStatus.value)
-    )
   }
   return false
 })
 
-const filteredPreviewData = computed(() => {
-  if (previewFilter.value === 'all') return excelPreviewData.value
-  if (previewFilter.value === 'pending') return excelPreviewData.value.filter((r) => !r.error && !r.noChange)
-  if (previewFilter.value === 'noChange') return excelPreviewData.value.filter((r) => r.noChange)
-  if (previewFilter.value === 'error') return excelPreviewData.value.filter((r) => r.error)
-  return excelPreviewData.value
-})
-
-const previewCounts = computed(() => {
-  const data = excelPreviewData.value
-  return {
-    pending: data.filter((r) => !r.error && !r.noChange).length,
-    noChange: data.filter((r) => r.noChange).length,
-    error: data.filter((r) => r.error).length
-  }
-})
-
 // 方法
 const toggleSelectAll = () => {
-  const filteredIds = filteredUsers.value.map((s) => s.id)
-  const filteredSet = new Set(filteredIds)
   if (isAllSelected.value) {
-    selectedUserIds.value = selectedUserIds.value.filter((id) => !filteredSet.has(id))
+    selectedUserIds.value = []
   } else {
-    const newSelections = new Set([...selectedUserIds.value, ...filteredIds])
-    selectedUserIds.value = Array.from(newSelections)
+    selectedUserIds.value = filteredStudents.value.map((s) => s.id)
   }
 }
 
@@ -1304,10 +702,12 @@ const processExcelFile = async (file) => {
     loading.value = true
     error.value = ''
 
-    // 确保用户数据已加载（强制要求全量数据，防止使用单页 props.users 匹配导致误判）
-    if (!userFilters.isLoaded.value) {
-      await fetchAllUsers()
-      await nextTick()
+    // 确保学生数据已加载
+    if (students.value.length === 0) {
+      console.log('学生数据为空，重新获取数据...')
+      await fetchAllStudents()
+      // 等待一小段时间确保数据更新
+      await new Promise((resolve) => setTimeout(resolve, 100))
     }
 
     // 动态加载XLSX库
@@ -1324,112 +724,65 @@ const processExcelFile = async (file) => {
         const worksheet = workbook.Sheets[sheetName]
         const jsonData = window.XLSX.utils.sheet_to_json(worksheet)
 
-        rawExcelData.value = jsonData
         parseExcelData(jsonData)
       } catch (parseError) {
         console.error('解析Excel文件失败:', parseError)
-        error.value = getNestedText('errors', 'invalidExcelFormat')
+        error.value = 'Excel文件格式错误，请检查文件格式'
         loading.value = false
       }
     }
 
     reader.onerror = () => {
       console.error('读取文件失败')
-      error.value = getNestedText('errors', 'readFileFailed')
+      error.value = '读取文件失败，请重试'
       loading.value = false
     }
 
     reader.readAsArrayBuffer(file)
   } catch (err) {
     console.error('处理Excel文件失败:', err)
-    const errorMessage = err && err.message ? err.message : getNestedText('errors', 'unknownExcelError')
-    error.value = getNestedText('errors', 'processExcelFailed', errorMessage)
+    const errorMessage = err && err.message ? err.message : '未知错误，请检查文件格式或网络连接'
+    error.value = '处理Excel文件失败: ' + errorMessage
     loading.value = false
   }
 }
 
 const parseExcelData = (jsonData) => {
   const previewData = []
-  const userMapByUsername = new Map()
-  const userMapByName = new Map()
+  const userMap = new Map()
 
-  // 创建双向用户映射
-  computedUsers.value.forEach((user) => {
+  // 创建用户映射，同时处理用户名标准化
+  students.value.forEach((user) => {
     if (user.username) {
-      userMapByUsername.set(user.username, user)
-      userMapByUsername.set(user.username.trim().toLowerCase(), user)
-    }
-    if (user.name) {
-      const normalizedName = user.name.trim().toLowerCase()
-      if (userMapByName.has(normalizedName)) {
-        userMapByName.set(normalizedName, 'AMBIGUOUS')
-      } else {
-        userMapByName.set(normalizedName, user)
-      }
+      const normalizedUsername = user.username.trim().toLowerCase()
+      userMap.set(normalizedUsername, user)
+      userMap.set(user.username, user)
     }
   })
 
-  const columnKeys = excelColumnKeys.value
-  const getRowValue = (row, key, fallbacks, defaultValue = '') => {
-    const resolvedKey = typeof key === 'function' ? key() : key
-    if (resolvedKey && row[resolvedKey] !== undefined) return row[resolvedKey]
-    for (const fallback of fallbacks) {
-      if (row[fallback] !== undefined) return row[fallback]
-    }
-    return defaultValue
-  }
-
   jsonData.forEach((row, index) => {
-    if (!row || typeof row !== 'object') return
+    const username = (row['用户名'] || row['username'] || '').toString().trim()
+    const name = row['姓名'] || row['name'] || ''
+    const newGrade = row['年级'] || row['grade'] ? String(row['年级'] || row['grade']).trim() : ''
+    const newClass = row['班级'] || row['class'] ? String(row['班级'] || row['class']).trim() : ''
+    const newUsername = row['新用户名'] || row['new_username'] || ''
 
-    const rawUsername = getRowValue(row, columnKeys.username, ['用户名', 'username'])
-    const rawName = getRowValue(row, columnKeys.name, ['姓名', 'name'])
-    const rawGrade = getRowValue(row, columnKeys.grade, ['年级', 'grade'])
-    const rawClass = getRowValue(row, columnKeys.class, ['班级', 'class'])
-    const rawExplicitNewUsername = getRowValue(row, columnKeys.newUsername, ['新用户名', 'new_username'])
-    const username = rawUsername != null ? String(rawUsername).trim() : ''
-    const name = rawName != null ? String(rawName).trim().toLowerCase() : ''
-    const newGrade = rawGrade != null ? String(rawGrade).trim() : ''
-    const newClass = rawClass != null ? String(rawClass).trim() : ''
-    const explicitNewUsername = rawExplicitNewUsername != null ? String(rawExplicitNewUsername).trim() : ''
-    const newUsername = explicitNewUsername || (matchType.value === 'name' ? username : '')
-
-    const keyValue = matchType.value === 'username' ? username : name
-    const keyLabel = matchType.value === 'username' ? getNestedText('fields', 'username') : getNestedText('fields', 'name')
-
-    if (!keyValue) {
+    if (!username) {
       previewData.push({
-        username: username,
+        username: '',
         name: name,
         newGrade: newGrade,
         newClass: newClass,
         newUsername: newUsername,
-        error: getNestedText('errors', 'fieldRequired', keyLabel)
+        error: '用户名不能为空'
       })
       return
     }
 
-    let existingUser = null
-
-    if (matchType.value === 'username') {
-      existingUser =
-        userMapByUsername.get(username) ||
-        userMapByUsername.get(username.toLowerCase())
-    } else {
-      const match = userMapByName.get(name)
-      if (match === 'AMBIGUOUS') {
-        previewData.push({
-          username: username,
-          name: name,
-          newGrade: newGrade,
-          newClass: newClass,
-          newUsername: newUsername,
-          error: getNestedText('errors', 'duplicateNames')
-        })
-        return
-      }
-      existingUser = match
-    }
+    const existingUser =
+      userMap.get(username) ||
+      userMap.get(username.toLowerCase()) ||
+      userMap.get(username.toUpperCase())
 
     if (!existingUser) {
       previewData.push({
@@ -1438,99 +791,23 @@ const parseExcelData = (jsonData) => {
         newGrade: newGrade,
         newClass: newClass,
         newUsername: newUsername,
-        error: getNestedText('errors', 'userNotFound')
+        error: '用户不存在'
       })
       return
     }
 
-    const finalNewGrade = newGrade || undefined
-    const finalNewClass = newClass || undefined
-    const finalNewUsername = newUsername || undefined
-
-    const hasGradeChange = finalNewGrade !== undefined && finalNewGrade !== (existingUser.grade || '')
-    const hasClassChange = finalNewClass !== undefined && finalNewClass !== (existingUser.class || '')
-    const hasUsernameChange = finalNewUsername !== undefined && finalNewUsername !== existingUser.username
-
-    if (!hasGradeChange && !hasClassChange && !hasUsernameChange) {
-      previewData.push({
-        userId: existingUser.id,
-        username: existingUser.username,
-        name: existingUser.name,
-        currentGrade: existingUser.grade,
-        currentClass: existingUser.class,
-        newGrade: undefined,
-        newClass: undefined,
-        newUsername: undefined,
-        noChange: true
-      })
-      return
-    }
-
-    let usernameConflict = null
-
-    if (hasUsernameChange && finalNewUsername) {
-      const conflictUser =
-        userMapByUsername.get(finalNewUsername) ||
-        userMapByUsername.get(finalNewUsername.toLowerCase())
-      if (conflictUser && conflictUser.id !== existingUser.id) {
-        usernameConflict = { userId: conflictUser.id, name: conflictUser.name }
-      }
-    }
-
     previewData.push({
       userId: existingUser.id,
-      username: existingUser.username,
+      username: username,
       name: existingUser.name,
       currentGrade: existingUser.grade,
       currentClass: existingUser.class,
-      newGrade: finalNewGrade,
-      newClass: finalNewClass,
-      newUsername: finalNewUsername,
-      usernameConflict: usernameConflict
+      newGrade: newGrade,
+      newClass: newClass,
+      newUsername: newUsername
     })
   })
 
-  const externalBlockers = new Map()
-  const requestedUsernames = new Map()
-  const previewMap = new Map(previewData.filter((r) => !r.error).map((r) => [r.userId, r]))
-
-  for (const row of previewData) {
-    if (row.error || row.noChange) continue
-    if (row.newUsername) {
-      const previous = requestedUsernames.get(row.newUsername)
-      if (previous) {
-        const duplicateTargetMessage = getNestedText('errors', 'duplicateTarget', row.newUsername)
-        previous.error = duplicateTargetMessage
-        row.error = duplicateTargetMessage
-        continue
-      }
-      requestedUsernames.set(row.newUsername, row)
-    }
-
-    if (row.usernameConflict) {
-      const conflictRow = previewMap.get(row.usernameConflict.userId)
-      const conflictIsChanging =
-        conflictRow && conflictRow.newUsername && conflictRow.newUsername !== conflictRow.username
-      if (conflictIsChanging) {
-        row.usernameConflict = null
-      } else {
-        externalBlockers.set(row.usernameConflict.userId, {
-          username: row.newUsername,
-          name: row.usernameConflict.name
-        })
-      }
-    }
-  }
-
-  blockerList.value = Array.from(externalBlockers.values())
-
-  for (const row of previewData) {
-    if (row.error || row.noChange) continue
-    if (row.usernameConflict) {
-      row.error = getNestedText('errors', 'usernameOccupied', row.newUsername, row.usernameConflict.name)
-    }
-  }
-
   excelPreviewData.value = previewData
   loading.value = false
 }
@@ -1547,71 +824,24 @@ const loadXLSX = async () => {
     script.onload = resolve
     script.onerror = (error) => {
       console.error('加载XLSX库失败:', error)
-      reject(new Error(getNestedText('errors', 'loadXlsxFailed')))
+      reject(new Error('无法加载Excel处理库，请检查网络连接'))
     }
     document.head.appendChild(script)
   })
 }
 
-const downloadTemplate = async () => {
-  if (typeof window.XLSX === 'undefined') {
-    try {
-      await loadXLSX()
-    } catch (err) {
-      if (window.$showNotification) {
-        window.$showNotification(getNestedText('errors', 'loadXlsxRetry'), 'error')
-      } else {
-        alert(getNestedText('errors', 'loadXlsxRetry'))
-      }
-      return
-    }
-  }
-
-  const templateHeaders = locale.value?.template?.headers || {}
-  const getHeaderText = (value, fallback) => {
-    if (typeof value === 'function') return value() || fallback
-    if (typeof value === 'string') return value || fallback
-    return fallback
-  }
-  const headers = {
-    username: getHeaderText(templateHeaders.username, 'username'),
-    name: getHeaderText(templateHeaders.name, 'name'),
-    grade: getHeaderText(templateHeaders.grade, 'grade'),
-    class: getHeaderText(templateHeaders.class, 'class'),
-    newUsername: getHeaderText(templateHeaders.newUsername, 'new_username')
-  }
+const downloadTemplate = () => {
   const templateData = [
-    {
-      [headers.username]: 'student001',
-      [headers.name]: getNestedText('template', 'sampleName1'),
-      [headers.grade]: '2025',
-      [headers.class]: getNestedText('template', 'sampleClass1'),
-      [headers.newUsername]: 'new_student001'
-    },
-    {
-      [headers.username]: 'student002',
-      [headers.name]: getNestedText('template', 'sampleName2'),
-      [headers.grade]: '2025',
-      [headers.class]: getNestedText('template', 'sampleClass2'),
-      [headers.newUsername]: ''
-    }
+    { 用户名: 'student001', 姓名: '张三', 年级: '2025', 班级: '1班', 新用户名: 'new_student001' },
+    { 用户名: 'student002', 姓名: '李四', 年级: '2025', 班级: '2班', 新用户名: '' }
   ]
 
   const ws = window.XLSX.utils.json_to_sheet(templateData)
   const wb = window.XLSX.utils.book_new()
-  const sheetName = getNestedText('template', 'sheetName')
-  const fileName = getNestedText('template', 'fileName')
-  window.XLSX.utils.book_append_sheet(wb, ws, sheetName && sheetName !== 'sheetName' ? sheetName : 'template')
-  window.XLSX.writeFile(wb, fileName && fileName !== 'fileName' ? fileName : 'batch-update-template.xlsx')
+  window.XLSX.utils.book_append_sheet(wb, ws, '学生信息')
+  window.XLSX.writeFile(wb, '学生信息批量更新模板.xlsx')
 }
 
-// 当匹配方式切换时，重新解析已上传的 Excel 数据
-watch(matchType, () => {
-  if (rawExcelData.value) {
-    parseExcelData(rawExcelData.value)
-  }
-})
-
 const performUpdate = async () => {
   try {
     loading.value = true
@@ -1619,36 +849,17 @@ const performUpdate = async () => {
 
     if (updateType.value === 'grade-only') {
       await performGradeUpdate()
-      emit('update-success')
-      emit('close')
     } else if (updateType.value === 'excel-batch') {
-      const result = await performExcelUpdate()
-      if (result.totalFailed > 0) {
-        error.value = result.message
-        if (window.$showNotification) {
-          window.$showNotification(result.message, 'warning')
-        }
-        return
-      }
-      excelPreviewData.value = []
-      // 等待 3 秒让用户看到进度条完成状态
-      setTimeout(() => {
-        if (updateProgressText.value) {
-          emit('close')
-        }
-      }, 3000)
+      await performExcelUpdate()
     } else if (updateType.value === 'status-batch') {
       await performStatusUpdate()
-      emit('update-success')
-      emit('close')
-    } else if (updateType.value === 'song-admin-batch') {
-      await performSongAdminBatchUpdate()
-      emit('update-success')
-      emit('close')
     }
+
+    emit('update-success')
+    emit('close')
   } catch (err) {
     console.error('批量更新失败:', err)
-    error.value = getNestedText('errors', 'batchUpdateFailed', err?.data?.message || err?.message || err?.statusMessage || getNestedText('errors', 'unknownError'))
+    error.value = '批量更新失败: ' + err.message
   } finally {
     loading.value = false
   }
@@ -1666,54 +877,21 @@ const performGradeUpdate = async () => {
   })
 
   if (!response.success) {
-    throw new Error(response.message || getNestedText('errors', 'batchUpdateGeneric'))
-  }
-
-  if (response.errors && response.errors.length > 0) {
-    if (response.updated === 0) {
-      throw new Error(getNestedText('errors', 'updateFailedWithEtc', response.errors[0].error))
-    } else {
-      if (window.$showNotification) {
-        window.$showNotification(getNestedText('messages', 'partialGradeSuccess', response.failed), 'warning')
-      }
-    }
-  } else {
-    if (window.$showNotification) {
-      window.$showNotification(getNestedText('messages', 'gradeSuccess', response.updated), 'success')
-    }
+    throw new Error(response.message || '批量更新失败')
   }
 }
 
 const performExcelUpdate = async () => {
-  const validUpdates = excelPreviewData.value.filter((row) => !row.error && !row.noChange && row.userId)
+  const validUpdates = excelPreviewData.value.filter((row) => !row.error && row.userId)
 
   if (validUpdates.length === 0) {
-    throw new Error(getNestedText('errors', 'noValidUpdates'))
+    throw new Error('没有有效的更新数据')
   }
 
-  const targetSet = new Set(validUpdates.filter((r) => r.newUsername).map((r) => r.newUsername))
-  validUpdates.sort((a, b) => {
-    const aFreesSlot = targetSet.has(a.username)
-    const bFreesSlot = targetSet.has(b.username)
-    if (aFreesSlot && !bFreesSlot) return -1
-    if (!aFreesSlot && bFreesSlot) return 1
-    return 0
-  })
-
-  updateProgress.value = 0
-  updateTotalBatches.value = Math.ceil(validUpdates.length / 50)
-  updateCurrentBatch.value = 0
-
+  // 分批更新，避免请求过大
   const batchSize = 50
-  let totalUpdated = 0
-  let totalFailed = 0
-
   for (let i = 0; i < validUpdates.length; i += batchSize) {
     const batch = validUpdates.slice(i, i + batchSize)
-    updateCurrentBatch.value = Math.floor(i / batchSize) + 1
-    updateProgressText.value = getNestedText('progress', 'processing', updateCurrentBatch.value, updateTotalBatches.value)
-    updateProgress.value = Math.round((updateCurrentBatch.value / updateTotalBatches.value) * 100)
-
     const updates = batch.map((row) => ({
       userId: row.userId,
       grade: row.newGrade ? String(row.newGrade).trim() : undefined,
@@ -1721,60 +899,11 @@ const performExcelUpdate = async () => {
       username: row.newUsername ? String(row.newUsername).trim() : undefined
     }))
 
-    try {
-      const result = await $fetch('/api/admin/users/batch-update', {
-        method: 'POST',
-        body: { updates },
-        ...auth.getAuthConfig()
-      })
-
-      if (!result?.success) {
-        throw new Error(result?.message || getNestedText('errors', 'batchRequestFailed'))
-      }
-
-      if (result.data?.summary) {
-        totalUpdated += result.data.summary.success || 0
-        totalFailed += result.data.summary.failed || 0
-      } else {
-        throw new Error(getNestedText('errors', 'invalidBatchResponse'))
-      }
-    } catch (err) {
-      console.error(`第 ${updateCurrentBatch.value} 批更新失败:`, err)
-      totalFailed += batch.length
-    }
-  }
-
-  if (totalFailed > 0) {
-    const partialMessage = totalUpdated > 0
-      ? getNestedText('messages', 'partialExcelSuccess', totalUpdated, totalFailed)
-      : getNestedText('messages', 'excelFailed', totalFailed)
-
-    // 如果存在更新成功的数据，仍然需要通知父组件刷新列表
-    if (totalUpdated > 0) {
-      emit('update-success')
-    }
-
-    // 返回结果给外层统一处理提示，而不是抛出异常打断外层流程
-    return {
-      success: false,
-      totalUpdated,
-      totalFailed,
-      message: partialMessage
-    }
-  }
-
-  updateProgressText.value = getNestedText('progress', 'completed', totalUpdated, totalFailed)
-  updateProgress.value = 100
-
-  if (totalUpdated > 0) {
-    emit('update-success')
-  }
-
-  return {
-    success: true,
-    totalUpdated,
-    totalFailed,
-    message: ''
+    await $fetch('/api/admin/users/batch-update', {
+      method: 'POST',
+      body: { updates },
+      ...auth.getAuthConfig()
+    })
   }
 }
 
@@ -1783,7 +912,6 @@ const performStatusUpdate = async () => {
     method: 'PUT',
     body: {
       userIds: selectedUserIds.value,
-      sourceStatus: sourceStatus.value || undefined,
       status: targetStatus.value,
       reason: statusReason.value.trim()
     },
@@ -1791,26 +919,36 @@ const performStatusUpdate = async () => {
   })
 
   if (!response.success) {
-    if (response.errors && response.errors.length > 0) {
-      throw new Error(getNestedText('errors', 'updateFailedWithEtc', response.errors[0].error))
-    }
-    throw new Error(response.message || getNestedText('errors', 'statusUpdateFailed'))
-  }
-
-  if (response.errors && response.errors.length > 0) {
-    if (window.$showNotification) {
-      window.$showNotification(getNestedText('messages', 'partialStatusSuccess', response.errors.length), 'warning')
-    }
-  } else {
-    if (window.$showNotification) {
-      window.$showNotification(response.message || getNestedText('messages', 'statusSuccess'), 'success')
-    }
+    throw new Error(response.message || '批量更新状态失败')
   }
 }
 
-// 获取所有用户数据
-const fetchAllUsers = async () => {
-  await userFilters.fetchAllUsers()
+// 获取所有学生用户数据
+const fetchAllStudents = async () => {
+  try {
+    const response = await $fetch('/api/admin/users', {
+      method: 'GET',
+      query: {
+        page: 1,
+        limit: 10000,
+        role: 'USER'
+      },
+      ...auth.getAuthConfig()
+    })
+
+    if (response.success && response.users) {
+      const users = response.users
+      allStudents.value = users
+
+      const grades = [...new Set(users.map((u) => u.grade).filter(Boolean))].sort()
+      const classes = [...new Set(users.map((u) => u.class).filter(Boolean))].sort()
+
+      allGrades.value = grades
+      allClasses.value = classes
+    }
+  } catch (err) {
+    console.error('获取所有学生数据失败:', err)
+  }
 }
 
 // 监听显示状态
@@ -1818,27 +956,13 @@ watch(
   () => props.show,
   (newVal) => {
     if (newVal) {
-      fetchAllUsers()
+      fetchAllStudents()
       // 重置状态
       selectedUserIds.value = []
       excelPreviewData.value = []
-      matchType.value = 'username'
-      rawExcelData.value = null
-      blockerList.value = []
-      previewFilter.value = 'all'
       targetStatus.value = ''
       statusReason.value = ''
-      songAdminGradeFilter.value = ''
-      songAdminClassFilter.value = ''
-      songAdminIds.value = []
-      songAdminTargetGrade.value = ''
-      songAdminTargetClass.value = ''
-      songAdminTargetStatus.value = ''
       error.value = ''
-      updateProgress.value = 0
-      updateProgressText.value = ''
-      updateTotalBatches.value = 0
-      updateCurrentBatch.value = 0
     }
   }
 )
@@ -1852,10 +976,10 @@ watch(
   background: transparent;
 }
 .custom-scrollbar::-webkit-scrollbar-thumb {
-  background: var(--text-muted);
+  background: #4a5568;
   border-radius: 3px;
 }
 .custom-scrollbar::-webkit-scrollbar-thumb:hover {
-  background: var(--text-muted);
+  background: #718096;
 }
 </style>
diff --git a/app/components/Admin/BlacklistManager.vue b/app/components/Admin/BlacklistManager.vue
index dfc77f3..b5ec8a4 100644
--- a/app/components/Admin/BlacklistManager.vue
+++ b/app/components/Admin/BlacklistManager.vue
@@ -5,104 +5,104 @@
     <!-- 页面标题 -->
     <div class="flex flex-col md:flex-row md:items-end justify-between gap-6">
       <div>
-        <h2 class="text-2xl font-black text-text-primary tracking-tight flex items-center gap-3">
-          {{ locale.title }}
+        <h2 class="text-2xl font-black text-zinc-100 tracking-tight flex items-center gap-3">
+          歌曲黑名单管理
         </h2>
-        <p class="text-xs text-text-tertiary mt-1 font-medium">
-          {{ locale.desc }}
+        <p class="text-xs text-zinc-500 mt-1 font-medium">
+          禁止特定歌曲或包含关键词的歌曲被点播，维护广播内容的健康与合规
         </p>
       </div>
     </div>
 
     <!-- 添加黑名单项表单 -->
-    <section class="bg-bg-secondary-40 border border-border-secondary rounded-xl p-8 shadow-xl">
-      <h3 class="text-[10px] font-black text-text-disabled uppercase tracking-[0.2em] mb-6 px-1">
-        {{ locale.addTitle }}
+    <section class="bg-zinc-900/40 border border-zinc-800 rounded-xl p-8 shadow-xl">
+      <h3 class="text-[10px] font-black text-zinc-600 uppercase tracking-[0.2em] mb-6 px-1">
+        添加黑名单项
       </h3>
       <div class="grid grid-cols-1 xl:grid-cols-12 gap-6 items-end">
-        <div class="xl:col-span-2 space-y-2">
-          <label class="text-[10px] font-black text-text-disabled uppercase tracking-widest px-1"
-            >{{ locale.type }}</label
+        <div class="xl:col-span-3 space-y-2">
+          <label class="text-[10px] font-black text-zinc-600 uppercase tracking-widest px-1"
+            >封禁类型</label
           >
-          <div class="grid grid-cols-2 gap-1 p-1 bg-bg-primary border border-border-secondary rounded-lg">
+          <div class="flex p-1 bg-zinc-950 border border-zinc-800 rounded-lg gap-1">
             <button
-              class="flex items-center justify-center gap-2 py-2 rounded-md text-[11px] font-bold transition-all"
-              :class="newItem.type === 'SONG' ? 'bg-bg-tertiary text-primary' : 'text-text-disabled'"
-              @click="selectType('SONG')"
+              class="flex-1 flex items-center justify-center gap-2 py-2 rounded-md text-[11px] font-bold transition-all"
+              :class="newItem.type === 'SONG' ? 'bg-zinc-800 text-blue-400' : 'text-zinc-600'"
+              @click="newItem.type = 'SONG'"
             >
-              <Music :size="12" /> {{ locale.song }}
+              <Music :size="12" /> 歌曲
             </button>
             <button
-              class="flex items-center justify-center gap-2 py-2 rounded-md text-[11px] font-bold transition-all"
-              :class="newItem.type === 'KEYWORD' ? 'bg-bg-tertiary text-info' : 'text-text-disabled'"
-              @click="selectType('KEYWORD')"
+              class="flex-1 flex items-center justify-center gap-2 py-2 rounded-md text-[11px] font-bold transition-all"
+              :class="newItem.type === 'KEYWORD' ? 'bg-zinc-800 text-purple-400' : 'text-zinc-600'"
+              @click="newItem.type = 'KEYWORD'"
             >
-              <Type :size="12" /> {{ locale.keyword }}
+              <Type :size="12" /> 关键词
             </button>
             <button
-              class="flex items-center justify-center gap-2 py-2 rounded-md text-[11px] font-bold transition-all"
-              :class="newItem.type === 'LANGUAGE' ? 'bg-bg-tertiary text-warning' : 'text-text-disabled'"
-              @click="selectType('LANGUAGE')"
+              class="flex-1 flex items-center justify-center gap-2 py-2 rounded-md text-[11px] font-bold transition-all"
+              :class="newItem.type === 'LANGUAGE' ? 'bg-zinc-800 text-amber-400' : 'text-zinc-600'"
+              @click="newItem.type = 'LANGUAGE'"
             >
-              <Languages :size="12" /> {{ locale.language }}
+              <Languages :size="12" /> 语种
             </button>
             <button
-              class="flex items-center justify-center gap-2 py-2 rounded-md text-[11px] font-bold transition-all"
-              :class="newItem.type === 'GENRE' ? 'bg-bg-tertiary text-success' : 'text-text-disabled'"
-              @click="selectType('GENRE')"
+              class="flex-1 flex items-center justify-center gap-2 py-2 rounded-md text-[11px] font-bold transition-all"
+              :class="newItem.type === 'GENRE' ? 'bg-zinc-800 text-emerald-400' : 'text-zinc-600'"
+              @click="newItem.type = 'GENRE'"
             >
-              <AudioLines :size="12" /> {{ locale.genre }}
+              <Disc3 :size="12" /> 曲风
             </button>
           </div>
         </div>
 
         <div class="xl:col-span-4 space-y-2">
-          <label class="text-[10px] font-black text-text-disabled uppercase tracking-widest px-1">
-            {{ valueLabel }}
+          <label class="text-[10px] font-black text-zinc-600 uppercase tracking-widest px-1">
+            {{ typeValueLabel }}
           </label>
           <input
-            v-if="newItem.type === 'SONG' || newItem.type === 'KEYWORD'"
             v-model="newItem.value"
             type="text"
-            :placeholder="
-              newItem.type === 'SONG' ? locale.songPlaceholder : locale.keywordPlaceholder
-            "
-            class="w-full bg-bg-primary border border-border-secondary rounded-lg px-5 py-3 text-sm text-text-primary focus:outline-none focus:border-primary-30 placeholder:text-text-secondary transition-all"
+            :placeholder="typePlaceholder"
+            class="w-full bg-zinc-950 border border-zinc-800 rounded-lg px-5 py-3 text-sm text-zinc-200 focus:outline-none focus:border-blue-500/30 placeholder:text-zinc-700 transition-all"
           >
-          <CustomSelect
-            v-else
-            v-model="newItem.value"
-            :options="typeValueOptions"
-          />
-          <p
-            v-if="newItem.type === 'LANGUAGE' || newItem.type === 'GENRE'"
-            class="text-[10px] text-text-secondary px-1 leading-relaxed"
-          >
-            {{ newItem.type === 'LANGUAGE' ? locale.languageHint : locale.genreHint }}
+        </div>
+
+        <div v-if="newItem.type === 'LANGUAGE' || newItem.type === 'GENRE'" class="xl:col-span-5 xl:col-start-auto space-y-1">
+          <p class="text-[10px] text-zinc-600 font-bold leading-relaxed px-1">
+            <template v-if="newItem.type === 'LANGUAGE'">
+              💡 支持多语种匹配：中文 / 英文 / 日文 / 韩文 / 俄文 / 阿拉伯文 等，支持逗号分隔，例如：<span class="text-amber-400">日文,韩文</span>
+            </template>
+            <template v-else>
+              💡 支持曲风关键词，可逗号分隔，例如：<span class="text-emerald-400">DJ,摇滚,rap</span>
+            </template>
           </p>
         </div>
 
         <div class="xl:col-span-4 space-y-2">
-          <label class="text-[10px] font-black text-text-disabled uppercase tracking-widest px-1"
-            >{{ locale.reason }}</label
+          <label class="text-[10px] font-black text-zinc-600 uppercase tracking-widest px-1"
+            >封禁原因 (可选)</label
           >
           <input
             v-model="newItem.reason"
             type="text"
-            :placeholder="locale.reasonPlaceholder"
-            class="w-full bg-bg-primary border border-border-secondary rounded-lg px-5 py-3 text-sm text-text-primary focus:outline-none focus:border-primary-30 placeholder:text-text-secondary transition-all"
+            placeholder="简述加入黑名单的原因"
+            class="w-full bg-zinc-950 border border-zinc-800 rounded-lg px-5 py-3 text-sm text-zinc-200 focus:outline-none focus:border-blue-500/30 placeholder:text-zinc-700 transition-all"
           >
         </div>
 
         <div class="xl:col-span-2">
           <button
             :disabled="!newItem.value || loading"
-            class="w-full flex items-center justify-center gap-2 px-6 py-3 bg-primary-hover hover:bg-primary disabled:opacity-50 disabled:cursor-not-allowed text-text-primary text-xs font-black rounded-lg shadow-lg shadow-[var(--primary-glow)] transition-all active:scale-95"
+            class="w-full flex items-center justify-center gap-2 px-6 py-3 bg-blue-600 hover:bg-blue-500 disabled:opacity-50 disabled:cursor-not-allowed text-white text-xs font-black rounded-lg shadow-lg shadow-blue-900/20 transition-all active:scale-95"
             @click="addBlacklistItem"
           >
             <Plus v-if="!loading" :size="16" />
-            <AppSpinner :size="16" />
-            {{ loading ? locale.processing : locale.addButton }}
+            <div
+              v-else
+              class="w-4 h-4 border-2 border-white/30 border-t-white rounded-full animate-spin"
+            />
+            {{ loading ? '处理中...' : '添加到黑名单' }}
           </button>
         </div>
       </div>
@@ -110,30 +110,28 @@
 
     <!-- 筛选和搜索 -->
     <div
-      class="bg-bg-secondary-20 border border-border-secondary rounded-xl p-4 flex flex-col md:flex-row gap-4 items-center"
+      class="bg-zinc-900/20 border border-zinc-800 rounded-xl p-4 flex flex-col md:flex-row gap-4 items-center"
     >
       <div class="flex-1 relative w-full">
-        <Search class="absolute left-4 top-1/2 -translate-y-1/2 text-text-secondary" :size="18" />
+        <Search class="absolute left-4 top-1/2 -translate-y-1/2 text-zinc-700" :size="18" />
         <input
           v-model="filters.search"
           type="text"
-          :placeholder="locale.searchPlaceholder"
-          class="w-full bg-bg-primary-50 border border-border-secondary rounded-lg pl-12 pr-4 py-3 text-sm text-text-primary focus:outline-none focus:border-primary-30 placeholder:text-text-secondary transition-all"
+          placeholder="在黑名单中搜索..."
+          class="w-full bg-zinc-950/50 border border-zinc-800 rounded-lg pl-12 pr-4 py-3 text-sm text-zinc-200 focus:outline-none focus:border-blue-500/30 placeholder:text-zinc-700 transition-all"
           @input="debounceSearch"
         >
       </div>
       <div class="flex gap-3 w-full md:w-auto">
         <CustomSelect
-          :label="locale.typeFilter"
-          v-model="filters.type"
-          :options="typeOptions"
-          label-key="label"
-          value-key="value"
+          label="类型筛选"
+          :value="typeFilterLabel"
+          :options="['全部类型', '具体歌曲', '关键词', '语种', '曲风']"
           class="flex-1 md:w-48"
-          @change="() => { pagination.page = 1; loadBlacklist(); }"
+          @change="handleTypeFilterChange"
         />
         <button
-          class="p-3 bg-bg-primary border border-border-secondary rounded-lg text-text-disabled hover:text-primary transition-all active:scale-95 flex items-center justify-center"
+          class="p-3 bg-zinc-950 border border-zinc-800 rounded-lg text-zinc-600 hover:text-blue-400 transition-all active:scale-95"
           @click="loadBlacklist"
         >
           <Filter :size="18" />
@@ -144,8 +142,8 @@
     <!-- 黑名单列表 -->
     <div class="space-y-4">
       <div class="flex items-center justify-between px-2">
-        <h4 class="text-[10px] font-black text-text-disabled uppercase tracking-widest">
-          {{ locale.listTitle(pagination.total) }}
+        <h4 class="text-[10px] font-black text-zinc-600 uppercase tracking-widest">
+          黑名单列表 ({{ pagination.total }} 项)
         </h4>
       </div>
 
@@ -161,64 +159,67 @@
           <div
             v-for="item in blacklist"
             :key="item.id"
-            class="group flex flex-col lg:flex-row lg:items-center gap-6 p-6 bg-bg-secondary-30 border rounded-xl transition-all hover:border-border-tertiary"
-            :class="[item.isActive ? 'border-border-secondary' : 'border-border-secondary-40 opacity-60']"
+            class="group flex flex-col lg:flex-row lg:items-center gap-6 p-6 bg-zinc-900/30 border rounded-xl transition-all hover:border-zinc-700"
+            :class="[item.isActive ? 'border-zinc-800' : 'border-zinc-800/40 opacity-60']"
           >
             <div class="flex-1 flex items-start gap-5">
               <div
                 class="shrink-0 w-12 h-12 rounded-lg flex items-center justify-center border transition-all"
-                :class="getTypeMeta(item.type).boxClass"
+                :class="getTypeIconClass(item.type)"
               >
-                <component :is="getTypeMeta(item.type).icon" :size="22" />
+                <Music v-if="item.type === 'SONG'" :size="22" />
+                <Type v-else-if="item.type === 'KEYWORD'" :size="22" />
+                <Languages v-else-if="item.type === 'LANGUAGE'" :size="22" />
+                <Disc3 v-else :size="22" />
               </div>
 
               <div class="space-y-1.5 min-w-0">
                 <div class="flex items-center gap-3">
                   <span
                     class="text-[9px] font-black uppercase tracking-widest px-2 py-0.5 rounded border"
-                    :class="getTypeMeta(item.type).badgeClass"
+                    :class="getTypeBadgeClass(item.type)"
                   >
-                    {{ getTypeMeta(item.type).label }}
+                    {{ getTypeLabel(item.type) }}
                   </span>
-                  <h5 class="text-base font-black text-text-primary truncate tracking-tight">
+                  <h5 class="text-base font-black text-zinc-100 truncate tracking-tight">
                     {{ item.value }}
                   </h5>
                 </div>
 
                 <div class="flex flex-wrap items-center gap-4">
-                  <div class="flex items-center gap-2 text-text-tertiary font-bold text-[11px]">
-                    <MessageSquare :size="12" class="text-text-secondary" />
-                    {{ locale.reasonPrefix }} {{ item.reason || locale.noReason }}
+                  <div class="flex items-center gap-2 text-zinc-500 font-bold text-[11px]">
+                    <MessageSquare :size="12" class="text-zinc-700" />
+                    原因: {{ item.reason || '未填写原因' }}
                   </div>
                   <div
-                    class="flex items-center gap-2 text-text-disabled font-bold text-[10px] uppercase tracking-tighter"
+                    class="flex items-center gap-2 text-zinc-600 font-bold text-[10px] uppercase tracking-tighter"
                   >
-                    <Clock :size="11" class="text-text-primary" />
-                    {{ locale.createdAt }} {{ formatDate(item.createdAt) }}
+                    <Clock :size="11" class="text-zinc-800" />
+                    创建时间: {{ formatDate(item.createdAt) }}
                   </div>
                 </div>
               </div>
             </div>
 
             <div
-              class="flex items-center justify-end gap-3 pt-4 lg:pt-0 border-t lg:border-t-0 border-border-secondary-50"
+              class="flex items-center justify-end gap-3 pt-4 lg:pt-0 border-t lg:border-t-0 border-zinc-800/50"
             >
               <button
                 :disabled="loading"
                 class="flex items-center gap-2 px-5 py-2.5 rounded-xl text-[10px] font-black uppercase tracking-widest transition-all"
                 :class="[
                   item.isActive
-                    ? 'bg-bg-tertiary text-text-tertiary hover:text-warning hover:bg-warning-5 hover:border-warning-10 border border-transparent'
-                    : 'bg-success text-text-primary shadow-lg shadow-[var(--success-glow-20)]'
+                    ? 'bg-zinc-800 text-zinc-500 hover:text-amber-500 hover:bg-amber-500/5 hover:border-amber-500/10 border border-transparent'
+                    : 'bg-emerald-600 text-white shadow-lg shadow-emerald-900/20'
                 ]"
                 @click="toggleItemStatus(item)"
               >
                 <Power :size="12" />
-                {{ item.isActive ? locale.disable : locale.enable }}
+                {{ item.isActive ? '禁用' : '启用' }}
               </button>
               <button
                 :disabled="loading"
-                class="p-3 bg-bg-primary border border-border-secondary rounded-xl text-text-secondary hover:text-error hover:border-error-30 transition-all active:scale-95"
+                class="p-3 bg-zinc-950 border border-zinc-800 rounded-xl text-zinc-700 hover:text-red-500 hover:border-red-500/30 transition-all active:scale-95"
                 @click="deleteItem(item)"
               >
                 <Trash2 :size="16" />
@@ -232,24 +233,26 @@
           v-if="loading && blacklist.length === 0"
           class="py-20 flex flex-col items-center justify-center space-y-4"
         >
-          <AppSpinner :size="48" />
-          <p class="text-text-tertiary text-xs font-bold uppercase tracking-widest">{{ locale.loading }}</p>
+          <div
+            class="w-12 h-12 border-4 border-zinc-800 border-t-blue-500 rounded-full animate-spin"
+          />
+          <p class="text-zinc-500 text-xs font-bold uppercase tracking-widest">加载中...</p>
         </div>
 
         <!-- 空状态 -->
         <div
           v-else-if="blacklist.length === 0"
-          class="py-20 flex flex-col items-center justify-center text-center space-y-4 bg-bg-secondary-10 border border-border-secondary-40 border-dashed rounded-xl"
+          class="py-20 flex flex-col items-center justify-center text-center space-y-4 bg-zinc-900/10 border border-zinc-800/40 border-dashed rounded-xl"
         >
           <div
-            class="w-16 h-16 rounded-lg bg-bg-primary border border-border-secondary flex items-center justify-center text-text-primary shadow-xl"
+            class="w-16 h-16 rounded-lg bg-zinc-950 border border-zinc-800 flex items-center justify-center text-zinc-800 shadow-xl"
           >
             <Ban :size="32" />
           </div>
           <div class="space-y-1 px-4">
-            <h6 class="text-sm font-bold text-text-disabled">{{ locale.emptyTitle }}</h6>
-            <p class="text-[10px] text-text-secondary font-bold uppercase tracking-widest">
-              {{ locale.emptyDesc }}
+            <h6 class="text-sm font-bold text-zinc-600">未找到匹配的黑名单项</h6>
+            <p class="text-[10px] text-zinc-700 font-bold uppercase tracking-widest">
+              请尝试调整筛选条件或添加新项目
             </p>
           </div>
         </div>
@@ -259,19 +262,19 @@
       <div v-if="pagination.pages > 1" class="flex items-center justify-center gap-4 mt-8">
         <button
           :disabled="pagination.page <= 1 || loading"
-          class="p-3 bg-bg-primary border border-border-secondary rounded-lg text-text-tertiary hover:text-text-primary disabled:opacity-30 disabled:cursor-not-allowed transition-all active:scale-95 flex items-center justify-center"
+          class="p-3 bg-zinc-950 border border-zinc-800 rounded-lg text-zinc-400 hover:text-zinc-100 disabled:opacity-30 disabled:cursor-not-allowed transition-all active:scale-95"
           @click="changePage(pagination.page - 1)"
         >
           <ChevronLeft :size="20" />
         </button>
         <div
-          class="px-6 py-3 bg-bg-secondary-50 border border-border-secondary rounded-lg text-[11px] font-black text-text-tertiary uppercase tracking-widest"
+          class="px-6 py-3 bg-zinc-900/50 border border-zinc-800 rounded-lg text-[11px] font-black text-zinc-400 uppercase tracking-widest"
         >
-          {{ locale.pagination(pagination.page, pagination.pages) }}
+          第 {{ pagination.page }} 页 / 共 {{ pagination.pages }} 页
         </div>
         <button
           :disabled="pagination.page >= pagination.pages || loading"
-          class="p-3 bg-bg-primary border border-border-secondary rounded-lg text-text-tertiary hover:text-text-primary disabled:opacity-30 disabled:cursor-not-allowed transition-all active:scale-95 flex items-center justify-center"
+          class="p-3 bg-zinc-950 border border-zinc-800 rounded-lg text-zinc-400 hover:text-zinc-100 disabled:opacity-30 disabled:cursor-not-allowed transition-all active:scale-95"
           @click="changePage(pagination.page + 1)"
         >
           <ChevronRight :size="20" />
@@ -290,37 +293,39 @@
     >
       <div
         v-if="showDeleteDialog"
-        class="fixed inset-0 z-[100] flex items-center justify-center p-4 bg-bg-primary-80 backdrop-blur-sm"
+        class="fixed inset-0 z-[100] flex items-center justify-center p-4 bg-zinc-950/80 backdrop-blur-sm"
       >
         <div
-          class="w-full max-w-md bg-bg-secondary border border-border-secondary rounded-xl shadow-2xl overflow-hidden animate-in zoom-in-95 duration-300"
+          class="w-full max-w-md bg-zinc-900 border border-zinc-800 rounded-xl shadow-2xl overflow-hidden animate-in zoom-in-95 duration-300"
           @click.stop
         >
           <div class="flex flex-col items-center py-8 space-y-6 text-center px-8">
             <div
-              class="w-16 h-16 rounded-lg bg-error-10 text-error flex items-center justify-center border border-error-20 shadow-2xl shadow-[var(--error-glow-10)]"
+              class="w-16 h-16 rounded-lg bg-red-600/10 text-red-500 flex items-center justify-center border border-red-500/20 shadow-2xl shadow-red-900/10"
             >
               <Trash2 :size="28" />
             </div>
             <div class="space-y-2">
-              <h4 class="text-lg font-bold text-text-primary">{{ locale.removeTitle }}</h4>
-              <p class="text-xs text-text-tertiary leading-relaxed">
-                {{ locale.removeMessage(deleteTargetItem?.value || '') }}
+              <h4 class="text-lg font-bold text-zinc-100">确认从黑名单移除</h4>
+              <p class="text-xs text-zinc-500 leading-relaxed">
+                确定要移除
+                <span class="text-zinc-300 font-bold">"{{ deleteTargetItem?.value }}"</span>
+                吗？移除后，该项目将恢复为正常状态。
               </p>
             </div>
             <div class="flex gap-3 w-full pt-4">
               <button
-                class="flex-1 px-4 py-4 bg-bg-tertiary hover:bg-bg-quaternary text-text-tertiary text-[10px] font-black rounded-lg transition-all uppercase tracking-widest"
+                class="flex-1 px-4 py-4 bg-zinc-800 hover:bg-zinc-700 text-zinc-400 text-[10px] font-black rounded-lg transition-all uppercase tracking-widest"
                 @click="showDeleteDialog = false"
               >
-                {{ locale.cancel }}
+                取消
               </button>
               <button
                 :disabled="loading"
-                class="flex-1 px-4 py-4 bg-error hover:bg-error text-text-primary text-[10px] font-black rounded-lg shadow-xl shadow-[var(--error-glow-20)] transition-all active:scale-95 uppercase tracking-widest disabled:opacity-50"
+                class="flex-1 px-4 py-4 bg-red-600 hover:bg-red-500 text-white text-[10px] font-black rounded-lg shadow-xl shadow-red-900/20 transition-all active:scale-95 uppercase tracking-widest disabled:opacity-50"
                 @click="confirmDelete"
               >
-                {{ loading ? locale.deleting : locale.confirmRemove }}
+                {{ loading ? '删除中...' : '确认移除' }}
               </button>
             </div>
           </div>
@@ -330,15 +335,12 @@
   </div>
 </template>
 
-<script setup>
+<script setup lang="ts">
 import { onMounted, reactive, ref, computed } from 'vue'
-import AppSpinner from '~/components/UI/Common/AppSpinner.vue'
 import {
   ShieldAlert,
   Music,
   Type,
-  Languages,
-  AudioLines,
   Plus,
   Search,
   Filter,
@@ -349,30 +351,14 @@ import {
   Ban,
   ChevronLeft,
   ChevronRight,
-  ChevronDown
+  ChevronDown,
+  Languages,
+  Disc3
 } from '@lucide/vue'
 import { useToast } from '~/composables/useToast'
 import CustomSelect from '~/components/UI/Common/CustomSelect.vue'
-import {
-  BLACKLIST_LANGUAGE_VALUES,
-  BLACKLIST_GENRE_VALUES,
-  BLACKLIST_LANGUAGE_LABEL_EN,
-  BLACKLIST_GENRE_LABEL_EN
-} from '~/utils/blacklist'
-import { useLocale } from '~/utils/locale'
 
 const { showToast: showNotification } = useToast()
-const { admin, currentLocale } = useLocale()
-const locale = computed(() => {
-  const base = admin.value?.blacklist || {}
-  return {
-    ...base,
-    listTitle: (total) => formatLocaleValue(base.listTitle, total),
-    pagination: (page, pages) => formatLocaleValue(base.pagination, page, pages),
-    removeMessage: (value) => formatLocaleValue(base.removeMessage, value),
-    statusSuccess: (statusText) => formatLocaleValue(base.statusSuccess, statusText)
-  }
-})
 
 const blacklist = ref([])
 const loading = ref(false)
@@ -401,80 +387,66 @@ const pagination = reactive({
   pages: 0
 })
 
-const typeOptions = computed(() => [
-  { label: locale.value?.allTypes || 'All Types', value: '' },
-  { label: locale.value?.song || 'Song', value: 'SONG' },
-  { label: locale.value?.keyword || 'Keyword', value: 'KEYWORD' },
-  { label: locale.value?.language || 'Language', value: 'LANGUAGE' },
-  { label: locale.value?.genre || 'Genre', value: 'GENRE' }
-])
+const typeFilterLabel = computed(() => {
+  if (filters.type === 'SONG') return '具体歌曲'
+  if (filters.type === 'KEYWORD') return '关键词'
+  if (filters.type === 'LANGUAGE') return '语种'
+  if (filters.type === 'GENRE') return '曲风'
+  return '全部类型'
+})
 
-// 类型 → 图标/徽章/文案元数据
-const getTypeMeta = (type) => {
+const typeValueLabel = computed(() => {
+  if (newItem.type === 'SONG') return '歌曲名称 - 艺术家'
+  if (newItem.type === 'KEYWORD') return '关键词内容'
+  if (newItem.type === 'LANGUAGE') return '语种名称'
+  if (newItem.type === 'GENRE') return '曲风名称'
+  return '内容'
+})
+
+const typePlaceholder = computed(() => {
+  if (newItem.type === 'SONG') return '例如: 歌曲名 - 艺术家'
+  if (newItem.type === 'KEYWORD') return '例如: 敏感词、特定风格'
+  if (newItem.type === 'LANGUAGE') return '例如: 日文 或 中文,英文,日文'
+  if (newItem.type === 'GENRE') return '例如: DJ 或 流行,摇滚,rap'
+  return '请输入内容'
+})
+
+const getTypeLabel = (type: string) => {
+  if (type === 'SONG') return '具体歌曲'
+  if (type === 'KEYWORD') return '关键词'
+  if (type === 'LANGUAGE') return '语种'
+  if (type === 'GENRE') return '曲风'
+  return type
+}
+
+const getTypeIconClass = (type: string) => {
   switch (type) {
     case 'SONG':
-      return {
-        icon: Music,
-        label: locale.value?.song || 'Song',
-        boxClass: 'bg-primary-hover-10 text-primary border-primary-20 shadow-lg shadow-[var(--primary-glow-5)]',
-        badgeClass: 'bg-primary-hover-10 text-primary border-primary-20'
-      }
+      return 'bg-blue-600/10 text-blue-500 border-blue-500/20 shadow-lg shadow-blue-900/5'
+    case 'KEYWORD':
+      return 'bg-purple-600/10 text-purple-500 border-purple-500/20 shadow-lg shadow-purple-900/5'
     case 'LANGUAGE':
-      return {
-        icon: Languages,
-        label: locale.value?.language || 'Language',
-        boxClass: 'bg-warning-10 text-warning border-warning-20 shadow-lg shadow-[var(--warning-glow-5)]',
-        badgeClass: 'bg-warning-10 text-warning border-warning-20'
-      }
+      return 'bg-amber-600/10 text-amber-500 border-amber-500/20 shadow-lg shadow-amber-900/5'
     case 'GENRE':
-      return {
-        icon: AudioLines,
-        label: locale.value?.genre || 'Genre',
-        boxClass: 'bg-success-10 text-success border-success-20 shadow-lg shadow-[var(--success-glow-5)]',
-        badgeClass: 'bg-success-10 text-success border-success-20'
-      }
+      return 'bg-emerald-600/10 text-emerald-500 border-emerald-500/20 shadow-lg shadow-emerald-900/5'
     default:
-      return {
-        icon: Type,
-        label: locale.value?.keyword || 'Keyword',
-        boxClass: 'bg-info-10 text-info border-info-20 shadow-lg shadow-[var(--info-glow-5)]',
-        badgeClass: 'bg-info-10 text-info border-info-20'
-      }
+      return 'bg-zinc-600/10 text-zinc-500 border-zinc-500/20'
   }
 }
 
-// 语种/曲风候选值选项（存储值为规范中文标签，英文界面附注显示名）
-const localeValueLabel = (value, enMap) =>
-  currentLocale.value === 'en-US' ? `${enMap[value] || value} (${value})` : value
-
-const typeValueOptions = computed(() => {
-  if (newItem.type === 'LANGUAGE') {
-    return BLACKLIST_LANGUAGE_VALUES.map((value) => ({
-      value,
-      label: localeValueLabel(value, BLACKLIST_LANGUAGE_LABEL_EN)
-    }))
+const getTypeBadgeClass = (type: string) => {
+  switch (type) {
+    case 'SONG':
+      return 'bg-blue-600/10 text-blue-400 border-blue-500/20'
+    case 'KEYWORD':
+      return 'bg-purple-600/10 text-purple-400 border-purple-500/20'
+    case 'LANGUAGE':
+      return 'bg-amber-600/10 text-amber-400 border-amber-500/20'
+    case 'GENRE':
+      return 'bg-emerald-600/10 text-emerald-400 border-emerald-500/20'
+    default:
+      return 'bg-zinc-600/10 text-zinc-400 border-zinc-500/20'
   }
-  if (newItem.type === 'GENRE') {
-    return BLACKLIST_GENRE_VALUES.map((value) => ({
-      value,
-      label: localeValueLabel(value, BLACKLIST_GENRE_LABEL_EN)
-    }))
-  }
-  return []
-})
-
-const valueLabel = computed(() => {
-  if (newItem.type === 'SONG') return locale.value?.songLabel
-  if (newItem.type === 'KEYWORD') return locale.value?.keywordLabel
-  if (newItem.type === 'LANGUAGE') return locale.value?.languageLabel
-  return locale.value?.genreLabel
-})
-
-// 切换类型时清空已选值
-const selectType = (type) => {
-  if (newItem.type === type) return
-  newItem.type = type
-  newItem.value = ''
 }
 
 let searchTimeout = null
@@ -499,16 +471,24 @@ const loadBlacklist = async () => {
     blacklist.value = response.blacklist
     Object.assign(pagination, response.pagination)
   } catch (err) {
-    const fetchFailed = locale.value?.fetchFailed || 'Failed to load blacklist'
-    error.value = fetchFailed
+    error.value = '获取黑名单失败'
     console.error('获取黑名单失败:', err)
-    showNotification(`${fetchFailed}: ${getErrorMessage(err)}`, 'error')
+    showNotification('获取黑名单失败: ' + (err.data?.message || err.message), 'error')
   } finally {
     loading.value = false
   }
 }
 
-// 处理类型筛选变更
+const handleTypeFilterChange = (label) => {
+  if (label === '具体歌曲') filters.type = 'SONG'
+  else if (label === '关键词') filters.type = 'KEYWORD'
+  else if (label === '语种') filters.type = 'LANGUAGE'
+  else if (label === '曲风') filters.type = 'GENRE'
+  else filters.type = ''
+
+  pagination.page = 1
+  loadBlacklist()
+}
 
 // 添加黑名单项
 const addBlacklistItem = async () => {
@@ -529,7 +509,7 @@ const addBlacklistItem = async () => {
       ...useAuth().getAuthConfig()
     })
 
-    showNotification(locale.value.addSuccess, 'success')
+    showNotification('黑名单项添加成功', 'success')
 
     // 重置表单
     newItem.value = ''
@@ -539,9 +519,9 @@ const addBlacklistItem = async () => {
     pagination.page = 1
     await loadBlacklist()
   } catch (err) {
-    error.value = getErrorMessage(err) || locale.value.addFailed
+    error.value = err.data?.message || '添加黑名单项失败'
     console.error('添加黑名单项失败:', err)
-    showNotification(locale.value.addFailedPrefix + error.value, 'error')
+    showNotification('添加失败: ' + error.value, 'error')
   } finally {
     loading.value = false
   }
@@ -562,11 +542,11 @@ const toggleItemStatus = async (item) => {
     })
 
     item.isActive = !item.isActive
-    showNotification(locale.value.statusSuccess(item.isActive ? locale.value.enable : locale.value.disable), 'success')
+    showNotification(`黑名单项已${item.isActive ? '启用' : '禁用'}`, 'success')
   } catch (err) {
-    error.value = locale.value.updateFailed
+    error.value = '更新状态失败'
     console.error('更新状态失败:', err)
-    showNotification(locale.value.updateFailed, 'error')
+    showNotification('更新状态失败', 'error')
   } finally {
     loading.value = false
   }
@@ -591,12 +571,12 @@ const confirmDelete = async () => {
       ...useAuth().getAuthConfig()
     })
 
-    showNotification(locale.value.deleteSuccess, 'success')
+    showNotification('黑名单项删除成功', 'success')
     await loadBlacklist()
   } catch (err) {
-    error.value = locale.value.deleteFailed
+    error.value = '删除失败'
     console.error('删除失败:', err)
-    showNotification(`${locale.value.deleteFailed}: ${getErrorMessage(err)}`, 'error')
+    showNotification('删除失败: ' + err.message, 'error')
   } finally {
     loading.value = false
     showDeleteDialog.value = false
@@ -622,9 +602,7 @@ const changePage = (page) => {
 // 格式化日期
 const formatDate = (dateString) => {
   if (!dateString) return '-'
-  const date = new Date(dateString)
-  if (Number.isNaN(date.getTime())) return '-'
-  return date.toLocaleString(currentLocale.value, {
+  return new Date(dateString).toLocaleString('zh-CN', {
     year: 'numeric',
     month: '2-digit',
     day: '2-digit',
@@ -667,7 +645,7 @@ onMounted(() => {
   background: transparent;
 }
 .custom-scrollbar::-webkit-scrollbar-thumb {
-  background: var(--panel-bg-alt);
+  background: var(--bg-tertiary, #27272a);
   border-radius: 10px;
 }
 </style>
diff --git a/app/components/Admin/ChangelogManager.vue b/app/components/Admin/ChangelogManager.vue
new file mode 100644
index 0000000..c2d8f94
--- /dev/null
+++ b/app/components/Admin/ChangelogManager.vue
@@ -0,0 +1,277 @@
+<template>
+  <div class="max-w-[1200px] mx-auto space-y-6 pb-24 px-2">
+    <div class="flex flex-col md:flex-row md:items-end justify-between gap-4">
+      <div>
+        <h2 class="text-2xl font-black text-zinc-100 tracking-tight">更新日志</h2>
+        <p class="text-xs text-zinc-500 mt-1 font-medium">管理前台“更新日志”页面的发布内容</p>
+      </div>
+      <div class="flex gap-3">
+        <button
+          class="flex items-center gap-2 px-5 py-2 bg-zinc-900 border border-zinc-800 hover:border-zinc-700 text-zinc-400 text-xs font-bold rounded-xl transition-all disabled:opacity-50 disabled:cursor-not-allowed"
+          :disabled="loading"
+          @click="load"
+        >
+          <RefreshCw :size="14" /> 刷新
+        </button>
+        <button
+          class="flex items-center gap-2 px-6 py-2 bg-blue-600 hover:bg-blue-500 text-white text-xs font-black rounded-xl shadow-lg shadow-blue-900/20 transition-all active:scale-95"
+          @click="openCreate"
+        >
+          <Plus :size="14" /> 新建
+        </button>
+      </div>
+    </div>
+
+    <div v-if="loading" class="flex flex-col items-center justify-center py-20">
+      <div class="w-8 h-8 border-4 border-zinc-800 border-t-blue-500 rounded-full animate-spin mb-4" />
+      <p class="text-zinc-500 text-sm">加载中...</p>
+    </div>
+
+    <div v-else class="space-y-3">
+      <div
+        v-for="item in entries"
+        :key="item.id"
+        class="bg-zinc-900/40 border border-zinc-800 rounded-2xl p-5 flex flex-col md:flex-row md:items-center md:justify-between gap-4"
+      >
+        <div class="min-w-0">
+          <div class="flex items-center gap-2 flex-wrap">
+            <span
+              class="px-2.5 py-1 rounded-lg text-[10px] font-black uppercase tracking-widest"
+              :class="item.published ? 'bg-emerald-500/10 text-emerald-300' : 'bg-zinc-800/50 text-zinc-400'"
+            >
+              {{ item.published ? '已发布' : '草稿' }}
+            </span>
+            <span class="px-2.5 py-1 rounded-lg bg-blue-500/10 text-blue-300 text-[10px] font-black">
+              v{{ item.version }}
+            </span>
+            <p class="text-sm font-black text-zinc-100 truncate">{{ item.title }}</p>
+          </div>
+          <p class="text-[10px] text-zinc-500 mt-2">
+            {{ formatDate(item.publishedAt || item.createdAt) }}
+          </p>
+        </div>
+
+        <div class="flex items-center gap-2">
+          <button
+            class="px-3 py-2 rounded-lg border border-zinc-700 text-zinc-300 hover:bg-zinc-900 text-xs font-bold"
+            @click="openEdit(item)"
+          >
+            <Pencil :size="14" class="inline-block mr-1" /> 编辑
+          </button>
+          <button
+            class="px-3 py-2 rounded-lg border border-zinc-700 text-zinc-300 hover:bg-zinc-900 text-xs font-bold"
+            :disabled="savingId === item.id"
+            @click="togglePublish(item)"
+          >
+            <UploadCloud :size="14" class="inline-block mr-1" />
+            {{ item.published ? '取消发布' : '发布' }}
+          </button>
+          <button
+            class="px-3 py-2 rounded-lg border border-red-500/30 text-red-300 hover:bg-red-500/10 text-xs font-bold disabled:opacity-50"
+            :disabled="savingId === item.id"
+            @click="remove(item)"
+          >
+            <Trash2 :size="14" class="inline-block mr-1" /> 删除
+          </button>
+        </div>
+      </div>
+
+      <div v-if="entries.length === 0" class="py-20 text-center text-zinc-500">
+        暂无更新日志
+      </div>
+    </div>
+
+    <Teleport to="body">
+      <div v-if="showModal" class="fixed inset-0 z-[80] bg-black/60 backdrop-blur-sm p-4 flex items-end sm:items-center justify-center">
+        <div class="w-full max-w-2xl bg-zinc-950 border border-zinc-800 rounded-2xl overflow-hidden">
+          <div class="px-5 py-4 border-b border-zinc-800 flex items-center justify-between">
+            <p class="text-sm font-black text-zinc-100">{{ editingId ? '编辑更新日志' : '新建更新日志' }}</p>
+            <button
+              class="h-9 w-9 rounded-lg border border-zinc-700 text-zinc-400 hover:text-zinc-200 hover:bg-zinc-900 transition-colors"
+              @click="closeModal"
+            >
+              <X :size="16" class="mx-auto" />
+            </button>
+          </div>
+
+          <div class="p-5 space-y-4">
+            <div class="grid grid-cols-1 sm:grid-cols-2 gap-3">
+              <div>
+                <label class="text-[10px] font-black text-zinc-600 uppercase tracking-widest px-1 block mb-2">版本号</label>
+                <input v-model="form.version" type="text" class="w-full bg-zinc-900 border border-zinc-800 rounded-xl px-4 py-2.5 text-sm text-zinc-200 focus:outline-none focus:border-blue-500/30 transition-all" placeholder="如：2.4.1" >
+              </div>
+              <div>
+                <label class="text-[10px] font-black text-zinc-600 uppercase tracking-widest px-1 block mb-2">标题</label>
+                <input v-model="form.title" type="text" class="w-full bg-zinc-900 border border-zinc-800 rounded-xl px-4 py-2.5 text-sm text-zinc-200 focus:outline-none focus:border-blue-500/30 transition-all" placeholder="如：投稿体验优化" >
+              </div>
+            </div>
+
+            <div>
+              <label class="text-[10px] font-black text-zinc-600 uppercase tracking-widest px-1 block mb-2">内容</label>
+              <textarea
+                v-model="form.content"
+                :rows="10"
+                class="w-full bg-zinc-900 border border-zinc-800 rounded-xl px-4 py-3 text-sm text-zinc-200 focus:outline-none focus:border-blue-500/30 transition-all font-mono"
+                placeholder="支持纯文本（建议用分点）。"
+              />
+            </div>
+
+            <div class="flex items-center justify-between gap-4 p-3 rounded-xl border border-zinc-800 bg-zinc-900/40">
+              <div>
+                <p class="text-xs font-bold text-zinc-200">立即发布</p>
+                <p class="text-[10px] text-zinc-500 mt-0.5">发布后前台更新日志页面可见</p>
+              </div>
+              <input v-model="form.published" type="checkbox" class="w-5 h-5 rounded border-zinc-800 bg-zinc-900 accent-blue-600 cursor-pointer" >
+            </div>
+          </div>
+
+          <div class="px-5 py-4 border-t border-zinc-800 flex items-center justify-end gap-3">
+            <button
+              class="px-4 py-2 rounded-lg border border-zinc-700 text-zinc-300 hover:bg-zinc-900 text-sm font-bold"
+              @click="closeModal"
+            >
+              取消
+            </button>
+            <button
+              class="px-5 py-2 rounded-lg bg-blue-600 hover:bg-blue-500 text-white text-sm font-black disabled:opacity-50"
+              :disabled="savingModal"
+              @click="save"
+            >
+              {{ savingModal ? '保存中...' : '保存' }}
+            </button>
+          </div>
+        </div>
+      </div>
+    </Teleport>
+  </div>
+</template>
+
+<script setup>
+import { onMounted, ref } from 'vue'
+import { Plus, RefreshCw, Pencil, UploadCloud, Trash2, X } from '@lucide/vue'
+import { useToast } from '~/composables/useToast'
+
+const { showToast } = useToast()
+
+const loading = ref(true)
+const entries = ref([])
+const savingId = ref(null)
+
+const showModal = ref(false)
+const savingModal = ref(false)
+const editingId = ref(null)
+const form = ref({ version: '', title: '', content: '', published: false })
+
+const formatDate = (value) => {
+  if (!value) return ''
+  const d = new Date(value)
+  if (Number.isNaN(d.getTime())) return ''
+  return `${d.getFullYear()}-${String(d.getMonth() + 1).padStart(2, '0')}-${String(d.getDate()).padStart(2, '0')}`
+}
+
+const load = async () => {
+  try {
+    loading.value = true
+    const data = await $fetch('/api/admin/changelog', { credentials: 'include', query: { t: Date.now() } })
+    entries.value = Array.isArray(data) ? data : []
+  } catch (e) {
+    showToast('加载更新日志失败', 'error')
+  } finally {
+    loading.value = false
+  }
+}
+
+const openCreate = () => {
+  editingId.value = null
+  form.value = { version: '', title: '', content: '', published: false }
+  showModal.value = true
+}
+
+const openEdit = (item) => {
+  editingId.value = item.id
+  form.value = {
+    version: item.version || '',
+    title: item.title || '',
+    content: item.content || '',
+    published: !!item.published
+  }
+  showModal.value = true
+}
+
+const closeModal = () => {
+  showModal.value = false
+}
+
+const save = async () => {
+  const payload = {
+    version: (form.value.version || '').trim(),
+    title: (form.value.title || '').trim(),
+    content: (form.value.content || '').trim(),
+    published: !!form.value.published
+  }
+
+  if (!payload.version || !payload.title || !payload.content) {
+    showToast('请填写版本号、标题与内容', 'error')
+    return
+  }
+
+  try {
+    savingModal.value = true
+    if (editingId.value) {
+      await $fetch(`/api/admin/changelog/${editingId.value}`, {
+        method: 'PUT',
+        credentials: 'include',
+        body: payload
+      })
+      showToast('已保存', 'success')
+    } else {
+      await $fetch('/api/admin/changelog', {
+        method: 'POST',
+        credentials: 'include',
+        body: payload
+      })
+      showToast('已创建', 'success')
+    }
+    showModal.value = false
+    await load()
+  } catch (e) {
+    showToast('保存失败', 'error')
+  } finally {
+    savingModal.value = false
+  }
+}
+
+const togglePublish = async (item) => {
+  try {
+    savingId.value = item.id
+    await $fetch(`/api/admin/changelog/${item.id}`, {
+      method: 'PUT',
+      credentials: 'include',
+      body: { published: !item.published }
+    })
+    await load()
+  } catch {
+    showToast('更新发布状态失败', 'error')
+  } finally {
+    savingId.value = null
+  }
+}
+
+const remove = async (item) => {
+  try {
+    savingId.value = item.id
+    await $fetch(`/api/admin/changelog/${item.id}`, {
+      method: 'DELETE',
+      credentials: 'include'
+    })
+    await load()
+    showToast('已删除', 'success')
+  } catch {
+    showToast('删除失败', 'error')
+  } finally {
+    savingId.value = null
+  }
+}
+
+onMounted(load)
+</script>
diff --git a/app/components/Admin/DataAnalysisPanel.vue b/app/components/Admin/DataAnalysisPanel.vue
index 4e5b35c..0fa7fb6 100644
--- a/app/components/Admin/DataAnalysisPanel.vue
+++ b/app/components/Admin/DataAnalysisPanel.vue
@@ -6,19 +6,17 @@
       class="flex flex-col items-center justify-center min-h-[60vh] space-y-6"
     >
       <div class="relative w-24 h-24">
-        <div class="absolute inset-0 border-4 border-primary-20 rounded-full" />
+        <div class="absolute inset-0 border-4 border-blue-500/20 rounded-full" />
+        <div class="absolute inset-0 border-4 border-t-blue-500 rounded-full animate-spin" />
         <div class="absolute inset-0 flex items-center justify-center">
-          <AppSpinner :size="96" />
-        </div>
-        <div class="absolute inset-0 flex items-center justify-center">
-          <Activity class="text-primary animate-pulse" :size="32" />
+          <Activity class="text-blue-500 animate-pulse" :size="32" />
         </div>
       </div>
       <div class="text-center">
-        <h3 class="text-xl font-black text-text-primary tracking-tight">
+        <h3 class="text-xl font-black text-white tracking-tight">
           {{ loadingSteps[currentLoadingStep] }}
         </h3>
-        <p class="text-sm text-text-tertiary mt-2">{{ locale.loadingDesc }}</p>
+        <p class="text-sm text-zinc-500 mt-2">正在获取最新的统计数据...</p>
       </div>
     </div>
 
@@ -27,18 +25,18 @@
       v-else-if="error && !hasInitialData"
       class="flex flex-col items-center justify-center min-h-[60vh] space-y-6"
     >
-      <div class="p-6 bg-error-10 border border-error-20 rounded-3xl">
-        <X class="text-error" :size="48" />
+      <div class="p-6 bg-red-500/10 border border-red-500/20 rounded-3xl">
+        <X class="text-red-500" :size="48" />
       </div>
       <div class="text-center">
-        <h3 class="text-xl font-black text-text-primary tracking-tight">{{ locale.loadFailed }}</h3>
-        <p class="text-sm text-text-tertiary mt-2 max-w-md">{{ error }}</p>
+        <h3 class="text-xl font-black text-white tracking-tight">数据加载失败</h3>
+        <p class="text-sm text-zinc-500 mt-2 max-w-md">{{ error }}</p>
         <button
-          class="mt-6 px-8 py-3 bg-bg-secondary border border-border-secondary rounded-full text-sm font-black text-text-primary hover:bg-bg-tertiary transition-all flex items-center gap-2 mx-auto"
+          class="mt-6 px-8 py-3 bg-zinc-900 border border-zinc-800 rounded-full text-sm font-black text-white hover:bg-zinc-800 transition-all flex items-center gap-2 mx-auto"
           @click="refreshAllData"
         >
           <RefreshCw :size="16" />
-          {{ locale.retryNow }}
+          立即重试
         </button>
       </div>
     </div>
@@ -48,23 +46,23 @@
       <!-- 顶部标题和筛选栏 -->
       <div class="flex flex-col md:flex-row md:items-center justify-between gap-6">
         <div>
-          <h2 class="text-3xl font-black text-text-primary tracking-tight">{{ locale.title }}</h2>
-          <p class="text-sm text-text-tertiary mt-1 font-medium">{{ locale.desc }}</p>
+          <h2 class="text-3xl font-black text-white tracking-tight">数据中心</h2>
+          <p class="text-sm text-zinc-500 mt-1 font-medium">洞察校园声音背后的互动趋势与影响力</p>
         </div>
         <div class="flex items-center gap-3">
           <button
             :disabled="isLoading"
-            class="p-2.5 bg-bg-secondary-50 border border-border-secondary rounded-full text-text-tertiary hover:text-text-primary transition-all group disabled:opacity-50 flex items-center justify-center"
+            class="p-2.5 bg-zinc-900/50 border border-zinc-800 rounded-full text-zinc-400 hover:text-white transition-all group disabled:opacity-50"
             @click="refreshAllData"
           >
             <RefreshCw :size="18" :class="{ 'animate-spin': isLoading }" />
           </button>
           <div
-            class="px-3 py-1.5 bg-primary-10 border border-primary-20 rounded-full flex items-center gap-2"
+            class="px-3 py-1.5 bg-blue-500/10 border border-blue-500/20 rounded-full flex items-center gap-2"
           >
-            <div class="w-2 h-2 bg-primary rounded-full animate-pulse" />
-            <span class="text-[10px] font-black text-primary uppercase tracking-widest"
-              >{{ locale.realtimeMode }}</span
+            <div class="w-2 h-2 bg-blue-500 rounded-full animate-pulse" />
+            <span class="text-[10px] font-black text-blue-400 uppercase tracking-widest"
+              >实时模式</span
             >
           </div>
           <CustomSelect
@@ -72,7 +70,7 @@
             :options="availableSemesterOptions"
             label-key="name"
             value-key="value"
-            :placeholder="locale.selectSemester"
+            placeholder="选择学期"
             class-name="w-48"
             @change="handleSemesterChange"
           />
@@ -84,46 +82,37 @@
         <div
           v-for="(stat, i) in kpiStats"
           :key="i"
-          class="group relative p-6 bg-bg-secondary-40 border border-border-secondary-60 rounded-[2rem] overflow-hidden hover:border-border-tertiary transition-all hover:shadow-2xl hover:shadow-[0_25px_50px_var(--shadow-color-deep)]"
+          class="group relative p-6 bg-zinc-900/40 border border-zinc-800/60 rounded-[2rem] overflow-hidden hover:border-zinc-700 transition-all hover:shadow-2xl hover:shadow-black/40"
         >
           <div class="flex justify-between items-start">
             <div
-              :class="[
-                'p-3 rounded-2xl bg-bg-primary border border-border-secondary text-text-tertiary transition-all group-hover:border-border-tertiary',
-                stat.iconColorHoverClass
-              ]"
+              :class="`p-3 rounded-2xl bg-zinc-950 border border-zinc-800 text-zinc-400 group-hover:text-${stat.color}-400 group-hover:border-${stat.color}-500/30 transition-all`"
             >
               <component :is="stat.icon" :size="20" />
             </div>
             <div
               v-if="stat.trend !== 0"
-              :class="[
-                'flex items-center gap-1 text-[11px] font-black',
-                stat.trendColorClass
-              ]"
+              :class="`flex items-center gap-1 text-[11px] font-black ${stat.trend < 0 ? 'text-red-500' : `text-${stat.color}-500`}`"
             >
               <ArrowDownRight v-if="stat.trend < 0" :size="12" />
               <ArrowUpRight v-else :size="12" />
               {{ Math.abs(stat.trend) }}%
             </div>
-            <div v-else class="text-[11px] font-black text-text-tertiary uppercase tracking-widest">
-              {{ locale.stable }}
+            <div v-else class="text-[11px] font-black text-zinc-500 uppercase tracking-widest">
+              稳定
             </div>
           </div>
           <div class="mt-4">
-            <h4 class="text-3xl font-black text-text-primary tracking-tighter">
+            <h4 class="text-3xl font-black text-zinc-100 tracking-tighter">
               {{ formatNumber(stat.value) }}
             </h4>
-            <p class="text-[10px] font-black text-text-disabled uppercase tracking-[0.2em] mt-1">
+            <p class="text-[10px] font-black text-zinc-600 uppercase tracking-[0.2em] mt-1">
               {{ stat.label }}
             </p>
           </div>
           <!-- 背景装饰 -->
           <div
-            :class="[
-              'absolute -right-4 -bottom-4 w-24 h-24 blur-3xl opacity-0 group-hover:opacity-100 transition-opacity rounded-full pointer-events-none',
-              stat.glowColorClass
-            ]"
+            :class="`absolute -right-4 -bottom-4 w-24 h-24 bg-${stat.color}-500/5 blur-3xl opacity-0 group-hover:opacity-100 transition-opacity`"
           />
         </div>
       </div>
@@ -133,68 +122,68 @@
         <!-- 实时脉冲部分 -->
         <div class="lg:col-span-12 grid grid-cols-1 md:grid-cols-2 gap-6">
           <div
-            class="p-8 bg-bg-secondary-20 border border-border-secondary-40 rounded-3xl flex items-center justify-between relative overflow-hidden group cursor-help"
+            class="p-8 bg-zinc-900/20 border border-zinc-800/40 rounded-3xl flex items-center justify-between relative overflow-hidden group cursor-help"
             @mouseenter="handleMouseEnter"
             @mouseleave="handleMouseLeave"
           >
             <div class="relative z-10">
-              <span class="text-[10px] font-black text-text-disabled uppercase tracking-widest"
-                >{{ locale.currentActiveUsers }}</span
+              <span class="text-[10px] font-black text-zinc-600 uppercase tracking-widest"
+                >当前活跃用户</span
               >
               <div class="flex items-baseline gap-2 mt-1">
-                <h3 class="text-5xl font-black text-text-primary">{{ realtimeStats.activeUsers }}</h3>
-                <span class="text-xs font-bold text-text-tertiary">{{ locale.onlineUnit }}</span>
+                <h3 class="text-5xl font-black text-white">{{ realtimeStats.activeUsers }}</h3>
+                <span class="text-xs font-bold text-zinc-500">人在线</span>
               </div>
             </div>
             <div class="relative z-10 w-24 h-24 flex items-center justify-center">
-              <div class="absolute inset-0 bg-primary-20 rounded-full animate-ping opacity-20" />
-              <div class="absolute inset-4 bg-primary-20 rounded-full animate-pulse opacity-40" />
-              <Activity class="text-primary" :size="32" />
+              <div class="absolute inset-0 bg-blue-500/20 rounded-full animate-ping opacity-20" />
+              <div class="absolute inset-4 bg-blue-500/20 rounded-full animate-pulse opacity-40" />
+              <Activity class="text-blue-500" :size="32" />
             </div>
           </div>
           <div
-            class="p-8 bg-bg-secondary-20 border border-border-secondary-40 rounded-3xl flex items-center justify-between relative overflow-hidden group"
+            class="p-8 bg-zinc-900/20 border border-zinc-800/40 rounded-3xl flex items-center justify-between relative overflow-hidden group"
           >
             <div class="relative z-10">
-              <span class="text-[10px] font-black text-text-disabled uppercase tracking-widest"
-                >{{ locale.todayRequests }}</span
+              <span class="text-[10px] font-black text-zinc-600 uppercase tracking-widest"
+                >今日累计点播</span
               >
               <div class="flex items-baseline gap-2 mt-1">
-                <h3 class="text-5xl font-black text-success">
+                <h3 class="text-5xl font-black text-emerald-500">
                   {{ realtimeStats.todayRequests }}
                 </h3>
-                <span class="text-xs font-bold text-text-tertiary">{{ locale.songUnit }}</span>
+                <span class="text-xs font-bold text-zinc-500">首歌曲</span>
               </div>
             </div>
             <div class="relative z-10 w-24 h-24 flex items-center justify-center">
               <div
-                class="absolute inset-0 bg-success-20 rounded-full animate-ping opacity-10"
+                class="absolute inset-0 bg-emerald-500/20 rounded-full animate-ping opacity-10"
               />
-              <Globe class="text-success" :size="32" />
+              <Globe class="text-emerald-500" :size="32" />
             </div>
           </div>
         </div>
 
         <!-- 趋势分析图表卡片 -->
         <div
-          class="lg:col-span-8 bg-bg-secondary-40 border border-border-secondary rounded-[3rem] p-8 shadow-2xl overflow-hidden flex flex-col min-h-[500px]"
+          class="lg:col-span-8 bg-zinc-900/40 border border-zinc-800 rounded-[3rem] p-8 shadow-2xl overflow-hidden flex flex-col min-h-[500px]"
         >
           <div class="flex items-center justify-between mb-10">
             <div>
-              <h3 class="text-xl font-bold flex items-center gap-3 text-text-primary">
-                <BarChart2 class="text-primary" :size="20" />
-                {{ locale.trendTitle }}
+              <h3 class="text-xl font-bold flex items-center gap-3 text-white">
+                <BarChart2 class="text-blue-500" :size="20" />
+                点歌趋势分析
               </h3>
-              <p class="text-xs text-text-tertiary mt-1">{{ locale.trendDesc }}</p>
+              <p class="text-xs text-zinc-500 mt-1">近 7 日投稿量波动情况</p>
             </div>
             <div class="flex items-center gap-4">
-              <div v-if="panelStates.trends.loading" class="animate-spin text-primary">
+              <div v-if="panelStates.trends.loading" class="animate-spin text-blue-500">
                 <RefreshCw :size="16" />
               </div>
               <button
                 v-if="panelStates.trends.error"
-                class="p-2 text-error hover:text-error transition-colors"
-                :title="locale.retry"
+                class="p-2 text-red-400 hover:text-red-300 transition-colors"
+                title="重试"
                 @click="loadTrends"
               >
                 <RefreshCw :size="16" />
@@ -206,26 +195,28 @@
             v-if="panelStates.trends.loading && trendData.length === 0"
             class="flex-1 flex flex-col items-center justify-center space-y-4"
           >
-            <AppSpinner :size="48" />
-            <p class="text-xs font-black text-text-disabled uppercase tracking-widest">
-              {{ locale.loadingTrends }}
+            <div
+              class="w-12 h-12 border-4 border-blue-500/20 border-t-blue-500 rounded-full animate-spin"
+            />
+            <p class="text-xs font-black text-zinc-600 uppercase tracking-widest">
+              正在加载趋势数据...
             </p>
           </div>
           <div
             v-else-if="panelStates.trends.error && trendData.length === 0"
             class="flex-1 flex flex-col items-center justify-center space-y-4"
           >
-            <div class="p-4 bg-error-10 rounded-2xl">
-              <Activity class="text-error-50" :size="32" />
+            <div class="p-4 bg-red-500/10 rounded-2xl">
+              <Activity class="text-red-500/50" :size="32" />
             </div>
-            <p class="text-xs font-black text-error uppercase tracking-widest">
+            <p class="text-xs font-black text-red-400 uppercase tracking-widest">
               {{ panelStates.trends.error }}
             </p>
             <button
-              class="px-6 py-2 bg-bg-tertiary hover:bg-bg-quaternary text-text-primary text-[10px] font-black uppercase tracking-widest rounded-full transition-all"
+              class="px-6 py-2 bg-zinc-800 hover:bg-zinc-700 text-white text-[10px] font-black uppercase tracking-widest rounded-full transition-all"
               @click="loadTrends"
             >
-              {{ locale.retryNow }}
+              立即重试
             </button>
           </div>
           <div
@@ -242,56 +233,56 @@
                   :style="{
                     height: `${(item.count / Math.max(...trendData.map((d) => d.count), 1)) * 100}%`
                   }"
-                  class="w-full bg-gradient-to-t from-primary-10 to-primary-40 rounded-t-xl group-hover:from-primary-30 group-hover:to-primary-60 transition-all border-x border-t border-primary-20 group-hover:border-primary-40 min-h-[4px]"
+                  class="w-full bg-gradient-to-t from-blue-600/10 to-blue-500/40 rounded-t-xl group-hover:from-blue-600/30 group-hover:to-blue-400 transition-all border-x border-t border-blue-500/20 group-hover:border-blue-500/40 min-h-[4px]"
                 />
                 <div
-                  class="absolute left-1/2 -translate-x-1/2 -translate-y-full mb-2 text-[10px] font-black text-primary opacity-0 group-hover:opacity-100 transition-all whitespace-nowrap pointer-events-none z-10"
+                  class="absolute left-1/2 -translate-x-1/2 -translate-y-full mb-2 text-[10px] font-black text-blue-400 opacity-0 group-hover:opacity-100 transition-all whitespace-nowrap pointer-events-none z-10"
                   :style="{
                     bottom: `${(item.count / Math.max(...trendData.map((d) => d.count), 1)) * 100}%`
                   }"
                 >
-                  {{ locale.countSongs(item.count) }}
+                  {{ item.count }}首
                 </div>
               </div>
               <span
-                class="text-[10px] font-black text-text-disabled group-hover:text-text-tertiary transition-colors uppercase tracking-widest"
+                class="text-[10px] font-black text-zinc-600 group-hover:text-zinc-400 transition-colors uppercase tracking-widest"
               >
                 {{ formatDateShort(item.date) }}
               </span>
             </div>
           </div>
-          <div v-else class="flex-1 flex flex-col items-center justify-center text-text-disabled">
+          <div v-else class="flex-1 flex flex-col items-center justify-center text-zinc-600">
             <BarChart2 :size="48" class="opacity-20" />
-            <p class="text-sm font-medium mt-4">{{ locale.noTrendData }}</p>
+            <p class="text-sm font-medium mt-4">暂无趋势数据</p>
           </div>
         </div>
 
         <!-- 热门歌曲排行榜 -->
         <div
-          class="lg:col-span-4 bg-bg-secondary-40 border border-border-secondary rounded-[3rem] p-8 flex flex-col min-h-[500px]"
+          class="lg:col-span-4 bg-zinc-900/40 border border-zinc-800 rounded-[3rem] p-8 flex flex-col min-h-[500px]"
         >
           <div class="flex items-center justify-between mb-8">
-            <h3 class="text-xl font-bold flex items-center gap-3 text-text-primary">
-              <Trophy class="text-warning" :size="20" />
-              {{ locale.topSongsTitle }}
+            <h3 class="text-xl font-bold flex items-center gap-3 text-white">
+              <Trophy class="text-amber-500" :size="20" />
+              热门歌曲排行
             </h3>
             <div class="flex items-center gap-4">
               <div class="flex gap-2">
                 <button
-                  :class="`text-[10px] font-black uppercase tracking-widest transition-colors ${selectedSortBy === 'vote' ? 'text-primary' : 'text-text-disabled hover:text-text-tertiary'}`"
+                  :class="`text-[10px] font-black uppercase tracking-widest transition-colors ${selectedSortBy === 'vote' ? 'text-blue-500' : 'text-zinc-600 hover:text-zinc-400'}`"
                   @click="handleSortChange('vote')"
                 >
-                  {{ locale.likes }}
+                  点赞
                 </button>
-                <span class="text-text-primary">|</span>
+                <span class="text-zinc-800">|</span>
                 <button
-                  :class="`text-[10px] font-black uppercase tracking-widest transition-colors ${selectedSortBy === 'replay' ? 'text-primary' : 'text-text-disabled hover:text-text-tertiary'}`"
+                  :class="`text-[10px] font-black uppercase tracking-widest transition-colors ${selectedSortBy === 'replay' ? 'text-blue-500' : 'text-zinc-600 hover:text-zinc-400'}`"
                   @click="handleSortChange('replay')"
                 >
-                  {{ locale.replays }}
+                  重播
                 </button>
               </div>
-              <div v-if="panelStates.topSongs.loading" class="animate-spin text-warning">
+              <div v-if="panelStates.topSongs.loading" class="animate-spin text-amber-500">
                 <RefreshCw :size="14" />
               </div>
             </div>
@@ -301,21 +292,21 @@
             v-if="panelStates.topSongs.loading && topSongs.length === 0"
             class="flex-1 space-y-4"
           >
-            <div v-for="i in 5" :key="i" class="h-20 bg-bg-tertiary-20 animate-pulse rounded-2xl" />
+            <div v-for="i in 5" :key="i" class="h-20 bg-zinc-800/20 animate-pulse rounded-2xl" />
           </div>
           <div
             v-else-if="panelStates.topSongs.error && topSongs.length === 0"
             class="flex-1 flex flex-col items-center justify-center space-y-4"
           >
-            <Music :size="32" class="text-error-20" />
-            <p class="text-[10px] font-black text-error uppercase tracking-widest">
+            <Music :size="32" class="text-red-500/20" />
+            <p class="text-[10px] font-black text-red-400 uppercase tracking-widest">
               {{ panelStates.topSongs.error }}
             </p>
             <button
-              class="px-4 py-2 bg-bg-tertiary text-[10px] font-black uppercase rounded-full hover:bg-bg-quaternary text-text-primary transition-colors"
+              class="px-4 py-2 bg-zinc-800 text-[10px] font-black uppercase rounded-full hover:bg-zinc-700 text-white transition-colors"
               @click="loadTopSongs"
             >
-              {{ locale.retry }}
+              重试
             </button>
           </div>
           <div
@@ -325,42 +316,42 @@
             <div
               v-for="(song, i) in topSongs.slice(0, 5)"
               :key="i"
-              class="p-4 bg-bg-primary-50 border border-border-secondary-40 rounded-2xl flex items-center gap-4 group hover:bg-bg-tertiary-30 transition-all"
+              class="p-4 bg-zinc-950/50 border border-zinc-800/40 rounded-2xl flex items-center gap-4 group hover:bg-zinc-800/30 transition-all"
             >
               <div
                 :class="`w-8 h-8 rounded-lg flex items-center justify-center font-black text-xs ${
                   i === 0
-                    ? 'bg-warning text-black shadow-lg shadow-[var(--warning-glow-20)]'
+                    ? 'bg-amber-500 text-black shadow-lg shadow-amber-500/20'
                     : i === 1
-                      ? 'bg-bg-quaternary text-black'
+                      ? 'bg-zinc-300 text-black'
                       : i === 2
-                        ? 'bg-brand-yellow text-text-primary'
-                        : 'text-text-disabled border border-border-secondary'
+                        ? 'bg-amber-800 text-white'
+                        : 'text-zinc-600 border border-zinc-800'
                 }`"
               >
                 {{ i + 1 }}
               </div>
               <div class="flex-1 min-w-0">
                 <h4
-                  class="text-sm font-bold text-text-primary truncate group-hover:text-text-primary transition-colors"
+                  class="text-sm font-bold text-zinc-200 truncate group-hover:text-white transition-colors"
                 >
                   {{ song.title }}
                 </h4>
-                <p class="text-[10px] text-text-disabled font-medium truncate uppercase tracking-widest">
+                <p class="text-[10px] text-zinc-600 font-medium truncate uppercase tracking-widest">
                   {{ song.artist }}
                 </p>
               </div>
               <div class="text-right">
-                <span class="text-xs font-black text-text-tertiary">{{ song.count }}</span>
-                <div class="text-[8px] font-black text-text-secondary uppercase">
-                  {{ selectedSortBy === 'replay' ? locale.times : locale.likes }}
+                <span class="text-xs font-black text-zinc-400">{{ song.count }}</span>
+                <div class="text-[8px] font-black text-zinc-700 uppercase">
+                  {{ selectedSortBy === 'replay' ? '次数' : '点赞' }}
                 </div>
               </div>
             </div>
           </div>
-          <div v-else class="flex-1 flex flex-col items-center justify-center text-text-secondary">
+          <div v-else class="flex-1 flex flex-col items-center justify-center text-zinc-700">
             <Music :size="32" class="opacity-20 mb-2" />
-            <p class="text-xs font-bold uppercase tracking-widest">{{ locale.noData }}</p>
+            <p class="text-xs font-bold uppercase tracking-widest">暂无数据</p>
           </div>
         </div>
       </div>
@@ -369,14 +360,14 @@
       <div class="grid grid-cols-1 lg:grid-cols-2 gap-8">
         <!-- 活跃用户排行榜 -->
         <div
-          class="bg-bg-secondary-40 border border-border-secondary rounded-[3rem] p-8 flex flex-col min-h-[500px]"
+          class="bg-zinc-900/40 border border-zinc-800 rounded-[3rem] p-8 flex flex-col min-h-[500px]"
         >
           <div class="flex items-center justify-between mb-8">
-            <h3 class="text-xl font-bold flex items-center gap-3 text-text-primary">
-              <UserCheck class="text-info" :size="20" />
-              {{ locale.activeUsersTitle }}
+            <h3 class="text-xl font-bold flex items-center gap-3 text-white">
+              <UserCheck class="text-purple-500" :size="20" />
+              活跃用户排行榜
             </h3>
-            <div v-if="panelStates.activeUsers.loading" class="animate-spin text-info">
+            <div v-if="panelStates.activeUsers.loading" class="animate-spin text-purple-500">
               <RefreshCw :size="16" />
             </div>
           </div>
@@ -385,81 +376,91 @@
             v-if="panelStates.activeUsers.loading && activeUsers.length === 0"
             class="flex-1 space-y-4"
           >
-            <div v-for="i in 4" :key="i" class="h-24 bg-bg-tertiary-20 animate-pulse rounded-3xl" />
+            <div v-for="i in 4" :key="i" class="h-24 bg-zinc-800/20 animate-pulse rounded-3xl" />
           </div>
           <div
             v-else-if="panelStates.activeUsers.error && activeUsers.length === 0"
             class="flex-1 flex flex-col items-center justify-center space-y-4"
           >
-            <Users :size="32" class="text-error-20" />
-            <p class="text-[10px] font-black text-error uppercase tracking-widest">
+            <Users :size="32" class="text-red-500/20" />
+            <p class="text-[10px] font-black text-red-400 uppercase tracking-widest">
               {{ panelStates.activeUsers.error }}
             </p>
             <button
-              class="px-4 py-2 bg-bg-tertiary text-[10px] font-black uppercase rounded-full hover:bg-bg-quaternary text-text-primary transition-colors"
+              class="px-4 py-2 bg-zinc-800 text-[10px] font-black uppercase rounded-full hover:bg-zinc-700 text-white transition-colors"
               @click="loadActiveUsers"
             >
-              {{ locale.retry }}
+              重试
             </button>
           </div>
           <div
             v-else-if="activeUsers.length > 0"
-            class="flex-1 space-y-3 overflow-y-auto custom-scrollbar pr-2"
+            class="relative max-h-[400px] overflow-hidden"
           >
-            <div
-              v-for="(user, i) in activeUsers.slice(0, 5)"
-              :key="i"
-              class="relative p-5 bg-bg-primary-30 border border-border-secondary-50 rounded-3xl overflow-hidden group"
-            >
-              <div class="flex items-center gap-4 relative z-10">
-                <div
-                  class="w-12 h-12 rounded-2xl bg-bg-tertiary flex items-center justify-center font-black text-text-tertiary group-hover:text-text-primary transition-colors"
-                >
-                  {{ user.name.charAt(0) }}
-                </div>
-                <div class="flex-1">
-                  <h4 class="text-sm font-bold text-text-primary">{{ user.name }}</h4>
-                  <p class="text-xs text-text-disabled font-medium mt-1">
-                    {{ locale.userActivity(user.contributions, user.likes) }}
-                  </p>
-                </div>
-                <div class="text-right">
-                  <span
-                    class="text-xl font-black text-text-secondary group-hover:text-info transition-colors"
-                    >{{ user.activityScore }}</span
-                  >
-                  <p class="text-[10px] font-black text-text-secondary uppercase tracking-widest">
-                    {{ locale.activity }}
-                  </p>
-                </div>
-              </div>
-              <!-- 进度条指示器 -->
+            <div class="space-y-3 overflow-y-auto custom-scrollbar pr-2 max-h-[400px] pb-6">
               <div
-                class="absolute bottom-0 left-0 h-1 bg-info-20 group-hover:bg-info-40 transition-all"
-                :style="{
-                  width: `${(user.activityScore / Math.max(...activeUsers.map((u) => u.activityScore), 1)) * 100}%`
-                }"
-              />
+                v-for="(user, i) in activeUsers.slice(0, 5)"
+                :key="i"
+                class="relative p-5 bg-zinc-950/30 border border-zinc-800/50 rounded-3xl overflow-hidden group"
+              >
+                <div class="flex items-center gap-4 relative z-10">
+                  <img
+                    v-if="user.avatarUrl && !failedAvatars[user.id]"
+                    :src="user.avatarUrl"
+                    :alt="user.name"
+                    class="w-12 h-12 rounded-2xl object-cover border border-zinc-700/50 shrink-0"
+                    @error="handleAvatarError($event, user)"
+                  >
+                  <div
+                    v-else
+                    class="w-12 h-12 rounded-2xl bg-zinc-800 flex items-center justify-center font-black text-zinc-500 group-hover:text-zinc-200 transition-colors shrink-0"
+                  >
+                    {{ user.name.charAt(0) }}
+                  </div>
+                  <div class="flex-1 min-w-0">
+                    <h4 class="text-sm font-bold text-zinc-100 truncate">{{ user.name }}</h4>
+                    <p class="text-xs text-zinc-600 font-medium mt-1 truncate">
+                      {{ user.contributions }}首投稿 · {{ user.likes }}次点赞
+                    </p>
+                  </div>
+                  <div class="text-right shrink-0">
+                    <span
+                      class="text-xl font-black text-zinc-300 group-hover:text-purple-400 transition-colors"
+                      >{{ user.activityScore }}</span
+                    >
+                    <p class="text-[10px] font-black text-zinc-700 uppercase tracking-widest">
+                      活跃度
+                    </p>
+                  </div>
+                </div>
+                <div
+                  class="absolute bottom-0 left-0 h-1 bg-purple-500/20 group-hover:bg-purple-500/40 transition-all"
+                  :style="{
+                    width: `${(user.activityScore / Math.max(...activeUsers.map((u) => u.activityScore), 1)) * 100}%`
+                  }"
+                />
+              </div>
             </div>
+            <div class="absolute bottom-0 left-0 right-0 h-16 pointer-events-none bg-gradient-to-t from-zinc-900/90 via-zinc-900/40 to-transparent rounded-b-[2rem]" />
           </div>
-          <div v-else class="flex-1 flex flex-col items-center justify-center text-text-secondary">
+          <div v-else class="flex-1 flex flex-col items-center justify-center text-zinc-700">
             <Users :size="32" class="opacity-20 mb-2" />
-            <p class="text-xs font-bold uppercase tracking-widest">{{ locale.noActiveUsers }}</p>
+            <p class="text-xs font-bold uppercase tracking-widest">暂无活跃用户</p>
           </div>
         </div>
 
         <!-- 学期对比分析 -->
         <div
-          class="bg-bg-secondary-40 border border-border-secondary rounded-[3rem] p-8 flex flex-col min-h-[500px]"
+          class="bg-zinc-900/40 border border-zinc-800 rounded-[3rem] p-8 flex flex-col min-h-[500px]"
         >
           <div class="flex items-center justify-between mb-8">
-            <h3 class="text-xl font-bold flex items-center gap-3 text-text-primary">
-              <Globe class="text-success" :size="20" />
-              {{ locale.semesterComparisonTitle }}
+            <h3 class="text-xl font-bold flex items-center gap-3 text-white">
+              <Globe class="text-emerald-500" :size="20" />
+              学期对比分析
             </h3>
             <div
               v-if="panelStates.semesterComparison.loading"
-              class="animate-spin text-success"
+              class="animate-spin text-emerald-500"
             >
               <RefreshCw :size="16" />
             </div>
@@ -469,21 +470,21 @@
             v-if="panelStates.semesterComparison.loading && semesterComparison.length === 0"
             class="flex-1 space-y-4"
           >
-            <div v-for="i in 3" :key="i" class="h-32 bg-bg-tertiary-20 animate-pulse rounded-[2rem]" />
+            <div v-for="i in 3" :key="i" class="h-32 bg-zinc-800/20 animate-pulse rounded-[2rem]" />
           </div>
           <div
             v-else-if="panelStates.semesterComparison.error && semesterComparison.length === 0"
             class="flex-1 flex flex-col items-center justify-center space-y-4"
           >
-            <Globe :size="32" class="text-error-20" />
-            <p class="text-[10px] font-black text-error uppercase tracking-widest">
+            <Globe :size="32" class="text-red-500/20" />
+            <p class="text-[10px] font-black text-red-400 uppercase tracking-widest">
               {{ panelStates.semesterComparison.error }}
             </p>
             <button
-              class="px-4 py-2 bg-bg-tertiary text-[10px] font-black uppercase rounded-full hover:bg-bg-quaternary text-text-primary transition-colors"
+              class="px-4 py-2 bg-zinc-800 text-[10px] font-black uppercase rounded-full hover:bg-zinc-700 text-white transition-colors"
               @click="loadSemesterComparison"
             >
-              {{ locale.retry }}
+              重试
             </button>
           </div>
           <div
@@ -493,44 +494,44 @@
             <div
               v-for="(sem, i) in semesterComparison"
               :key="i"
-              :class="`p-6 border rounded-[2rem] transition-all ${sem.isActive ? 'bg-success-5 border-success-20 shadow-lg shadow-[var(--success-glow-5)]' : 'bg-bg-primary-20 border-border-secondary-60 opacity-60 hover:opacity-100'}`"
+              :class="`p-6 border rounded-[2rem] transition-all ${sem.isActive ? 'bg-emerald-500/5 border-emerald-500/20 shadow-lg shadow-emerald-500/5' : 'bg-zinc-950/20 border-zinc-800/60 opacity-60 hover:opacity-100'}`"
             >
               <div class="flex items-center justify-between mb-4">
-                <span class="text-xs font-black text-text-secondary uppercase tracking-widest">{{
+                <span class="text-xs font-black text-zinc-300 uppercase tracking-widest">{{
                   sem.semester
                 }}</span>
                 <span
                   v-if="sem.isActive"
-                  class="px-2 py-0.5 bg-success-20 text-success rounded text-[8px] font-black uppercase"
-                  >{{ locale.currentSemester }}</span
+                  class="px-2 py-0.5 bg-emerald-500/20 text-emerald-500 rounded text-[8px] font-black uppercase"
+                  >当前学期</span
                 >
-                <span v-else class="text-[10px] font-black text-text-disabled">{{ locale.historyBaseline }}</span>
+                <span v-else class="text-[10px] font-black text-zinc-600">历史基准</span>
               </div>
               <div class="grid grid-cols-3 gap-4">
                 <div>
-                  <h5 class="text-lg font-black text-text-primary">{{ sem.totalSongs }}</h5>
-                  <p class="text-[9px] font-black text-text-disabled uppercase tracking-tighter mt-1">
-                    {{ locale.totalSongs }}
+                  <h5 class="text-lg font-black text-zinc-100">{{ sem.totalSongs }}</h5>
+                  <p class="text-[9px] font-black text-zinc-600 uppercase tracking-tighter mt-1">
+                    歌曲总量
                   </p>
                 </div>
                 <div>
-                  <h5 class="text-lg font-black text-text-primary">{{ sem.totalSchedules }}</h5>
-                  <p class="text-[9px] font-black text-text-disabled uppercase tracking-tighter mt-1">
-                    {{ locale.totalSchedules }}
+                  <h5 class="text-lg font-black text-zinc-100">{{ sem.totalSchedules }}</h5>
+                  <p class="text-[9px] font-black text-zinc-600 uppercase tracking-tighter mt-1">
+                    排期总数
                   </p>
                 </div>
                 <div>
-                  <h5 class="text-lg font-black text-text-primary">{{ sem.totalRequests }}</h5>
-                  <p class="text-[9px] font-black text-text-disabled uppercase tracking-tighter mt-1">
-                    {{ locale.totalLikes }}
+                  <h5 class="text-lg font-black text-zinc-100">{{ sem.totalRequests }}</h5>
+                  <p class="text-[9px] font-black text-zinc-600 uppercase tracking-tighter mt-1">
+                    获赞总数
                   </p>
                 </div>
               </div>
             </div>
           </div>
-          <div v-else class="flex-1 flex flex-col items-center justify-center text-text-secondary">
+          <div v-else class="flex-1 flex flex-col items-center justify-center text-zinc-700">
             <Globe :size="32" class="opacity-20 mb-2" />
-            <p class="text-xs font-bold uppercase tracking-widest">{{ locale.noComparisonData }}</p>
+            <p class="text-xs font-bold uppercase tracking-widest">暂无对比数据</p>
           </div>
         </div>
       </div>
@@ -540,70 +541,75 @@
     <Teleport to="body">
       <div
         v-if="tooltip.show"
-        ref="tooltipEl"
         :style="tooltip.style"
         class="fixed z-[999999] pointer-events-auto"
         @mouseenter="handleTooltipMouseEnter"
         @mouseleave="handleTooltipMouseLeave"
       >
         <div
-          class="bg-bg-secondary border border-border-secondary rounded-3xl shadow-2xl overflow-hidden min-w-[320px] backdrop-blur-xl bg-opacity-90 animate-in fade-in zoom-in duration-200"
+          class="bg-zinc-900 border border-zinc-800 rounded-3xl shadow-2xl overflow-hidden min-w-[320px] max-w-[380px] backdrop-blur-xl bg-opacity-90 animate-in fade-in zoom-in duration-200"
         >
           <div
-            class="p-6 border-b border-border-secondary-50 bg-gradient-to-br from-primary-10 to-transparent"
+            class="p-6 border-b border-zinc-800/50 bg-gradient-to-br from-blue-500/10 to-transparent max-h-[500px] overflow-y-auto custom-scrollbar"
           >
             <div class="flex items-center justify-between mb-4">
-              <h4 class="text-sm font-black text-text-primary uppercase tracking-widest">{{ locale.activeUserDetails }}</h4>
-              <div class="flex items-center gap-2 px-2 py-1 bg-primary-20 rounded-full">
-                <div class="w-1.5 h-1.5 bg-primary rounded-full animate-pulse" />
-                <span class="text-[10px] font-black text-primary"
-                  >{{ locale.onlineCount(realtimeStats.activeUsers) }}</span
+              <h4 class="text-sm font-black text-white uppercase tracking-widest truncate max-h-[20px] overflow-hidden">活跃用户详情</h4>
+              <div class="flex items-center gap-2 px-2 py-1 bg-blue-500/20 rounded-full shrink-0">
+                <div class="w-1.5 h-1.5 bg-blue-500 rounded-full animate-pulse" />
+                <span class="text-[10px] font-black text-blue-400"
+                  >{{ realtimeStats.activeUsers }} 在线</span
                 >
               </div>
             </div>
 
             <div
               v-if="realtimeStats.activeUsersList && realtimeStats.activeUsersList.length > 0"
-              class="space-y-4 max-h-[50vh] overflow-y-auto custom-scrollbar pr-1"
+              class="space-y-3 max-h-[350px] overflow-y-auto custom-scrollbar pr-1"
             >
               <div
-                v-for="user in realtimeStats.activeUsersList"
+                v-for="user in realtimeStats.activeUsersList.slice(0, 5)"
                 :key="user.id"
-                class="flex items-center gap-3 p-3 bg-bg-primary-50 border border-border-secondary-50 rounded-2xl group hover:border-primary-30 transition-all"
+                class="flex items-center gap-3 p-3 bg-zinc-950/50 border border-zinc-800/50 rounded-2xl group hover:border-blue-500/30 transition-all"
               >
                 <img
-                  v-if="user.avatar && !failedAvatars[user.id]"
-                  :src="user.avatar"
-                  class="w-10 h-10 rounded-xl object-cover border border-border-secondary-50"
-                  @error="markAvatarFailed(user.id)"
+                  v-if="user.avatarUrl && !failedAvatars[user.id]"
+                  :src="user.avatarUrl"
+                  :alt="user.name"
+                  class="w-10 h-10 rounded-xl object-cover border border-zinc-700/50 shrink-0"
+                  @error="handleAvatarError($event, user)"
                 >
                 <div
                   v-else
-                  class="w-10 h-10 rounded-xl bg-bg-tertiary flex items-center justify-center font-black text-text-tertiary group-hover:text-primary transition-colors"
+                  class="w-10 h-10 rounded-xl bg-zinc-800 flex items-center justify-center font-black text-zinc-500 group-hover:text-blue-400 transition-colors shrink-0"
                 >
                   {{ user.name.charAt(0) }}
                 </div>
                 <div class="flex-1 min-w-0">
-                  <div class="text-xs font-bold text-text-primary truncate">{{ user.name }}</div>
-                  <div class="text-[10px] text-text-tertiary font-medium truncate">
+                  <div class="text-xs font-bold text-zinc-200 truncate max-h-[16px] overflow-hidden">{{ user.name }}</div>
+                  <div class="text-[10px] text-zinc-500 font-medium truncate max-h-[14px] overflow-hidden">
                     @{{ user.username }}
                   </div>
                 </div>
-                <div class="text-[10px] font-black text-text-disabled bg-bg-secondary px-2 py-1 rounded-lg">
+                <div class="text-[10px] font-black text-zinc-600 bg-zinc-900 px-2 py-1 rounded-lg shrink-0">
                   {{ user.lastActive }}
                 </div>
               </div>
+              <div v-if="realtimeStats.activeUsersList.length > 5" class="text-center py-2">
+                <span class="text-[10px] font-black text-zinc-600 uppercase tracking-widest max-h-[14px] overflow-hidden block"
+                  >及其他 {{ realtimeStats.activeUsersList.length - 5 }} 位用户</span
+                >
+              </div>
             </div>
-            <div v-else class="py-10 flex flex-col items-center justify-center text-text-disabled">
+            <div v-else class="py-10 flex flex-col items-center justify-center text-zinc-600">
               <Users :size="32" class="opacity-20 mb-3" />
-              <p class="text-xs font-black uppercase tracking-widest">{{ locale.noOnlineUsers }}</p>
+              <p class="text-xs font-black uppercase tracking-widest truncate max-h-[16px] overflow-hidden">暂无在线用户</p>
             </div>
           </div>
-          <div class="px-6 py-4 bg-bg-primary-50 flex items-center justify-between">
-            <span class="text-[10px] font-black text-text-disabled uppercase tracking-widest"
-              >{{ locale.syncingRealtime }}</span
+          <div class="px-6 py-4 bg-zinc-950/50 flex items-center justify-between">
+            <span class="text-[10px] font-black text-zinc-600 uppercase tracking-widest truncate max-h-[14px] overflow-hidden"
+              >实时数据同步中</span
             >
-            <Activity :size="12" class="text-primary animate-pulse" />
+            <Activity :size="12" class="text-blue-500 animate-pulse shrink-0" />
           </div>
         </div>
       </div>
@@ -612,8 +618,7 @@
 </template>
 
 <script setup>
-import { onMounted, ref, computed, nextTick } from 'vue'
-import AppSpinner from '~/components/UI/Common/AppSpinner.vue'
+import { onMounted, ref, computed, reactive } from 'vue'
 import {
   TrendingUp,
   Users,
@@ -635,39 +640,9 @@ import {
 } from '@lucide/vue'
 import { useSemesters } from '~/composables/useSemesters'
 import CustomSelect from '~/components/UI/Common/CustomSelect.vue'
-import { useLocale } from '~/utils/locale'
 
 // 使用学期管理 composable
 const { fetchSemesters, semesters: availableSemesters, currentSemester } = useSemesters()
-const { admin } = useLocale()
-const locale = computed(() => {
-  const base = admin.value?.dataAnalysis || {}
-  return useSafeLocale({
-    ...base,
-    countSongs: base.countSongs || ((count) => `${count}首`),
-    userActivity: base.userActivity || ((contributions, likes) => `${contributions}首投稿 · ${likes}次点赞`),
-    andMoreUsers: base.andMoreUsers || ((count) => `及其他 ${count} 位用户`),
-    onlineCount: base.onlineCount || ((count) => `${count} 在线`),
-    messages: {
-      updated: '数据已更新',
-      refreshSuccess: '数据刷新成功',
-      ...(base.messages || {})
-    },
-    errors: {
-      topSongs: '加载热门歌曲失败',
-      loadData: '加载数据失败，请稍后重试',
-      stats: '加载统计数据失败',
-      trends: '加载趋势数据失败',
-      activeUsers: '加载活跃用户失败',
-      userEngagement: '加载用户参与度失败',
-      semesterComparison: '加载学期对比失败',
-      init: '初始化失败，请刷新页面重试',
-      initNotify: '数据初始化失败',
-      retry: '重试失败',
-      ...(base.errors || {})
-    }
-  })
-})
 
 // 响应式数据
 const selectedSemester = ref('all')
@@ -680,11 +655,11 @@ const currentLoadingStep = ref(0)
 // 转换学期列表以适应 CustomSelect
 const availableSemesterOptions = computed(() => {
   const options = (availableSemesters.value || []).map((s) => ({ name: s.name, value: s.name }))
-  return [{ name: locale.value.allSemesters, value: 'all' }, ...options]
+  return [{ name: '全部学期', value: 'all' }, ...options]
 })
 
 // 加载步骤
-const loadingSteps = computed(() => locale.value.loadingSteps || ['获取学期信息', '加载统计数据', '获取图表数据', '加载实时数据'])
+const loadingSteps = ['获取学期信息', '加载统计数据', '获取图表数据', '加载实时数据']
 
 const analysisData = ref({
   totalSongs: 0,
@@ -706,44 +681,32 @@ const analysisData = ref({
 // 计算 KPI 统计数据
 const kpiStats = computed(() => [
   {
-    label: locale.value?.kpi?.totalUsers || 'Total users',
+    label: '注册用户总量',
     value: analysisData.value.totalUsers,
     trend: analysisData.value.usersChange,
     icon: Users,
-    color: 'blue',
-    iconColorHoverClass: 'group-hover:text-primary group-hover:border-primary-30',
-    trendColorClass: 'text-primary',
-    glowColorClass: 'bg-primary-5'
+    color: 'blue'
   },
   {
-    label: locale.value?.kpi?.activeSongs || 'Active songs',
+    label: '活跃歌曲库',
     value: analysisData.value.totalSongs,
     trend: analysisData.value.songsChange,
     icon: Music,
-    color: 'emerald',
-    iconColorHoverClass: 'group-hover:text-success group-hover:border-success-30',
-    trendColorClass: 'text-success',
-    glowColorClass: 'bg-success-5'
+    color: 'emerald'
   },
   {
-    label: locale.value?.kpi?.scheduleDays || 'Schedule days',
+    label: '本学期排期天数',
     value: analysisData.value.totalSchedules,
     trend: analysisData.value.schedulesChange,
     icon: Calendar,
-    color: 'amber',
-    iconColorHoverClass: 'group-hover:text-warning group-hover:border-warning-30',
-    trendColorClass: 'text-warning',
-    glowColorClass: 'bg-warning-5'
+    color: 'amber'
   },
   {
-    label: locale.value?.kpi?.totalRequests || 'Total requests',
+    label: '累计点歌次数',
     value: analysisData.value.totalRequests,
     trend: analysisData.value.requestsChange,
     icon: Heart,
-    color: 'rose',
-    iconColorHoverClass: 'group-hover:text-error group-hover:border-error-30',
-    trendColorClass: 'text-error',
-    glowColorClass: 'bg-error-5'
+    color: 'rose'
   }
 ])
 
@@ -771,12 +734,6 @@ const realtimeStats = ref({
 })
 
 // 全局tooltip状态
-const tooltipEl = ref(null)
-const failedAvatars = ref({})
-const markAvatarFailed = (id) => {
-  if (id == null || failedAvatars.value[id]) return
-  failedAvatars.value = { ...failedAvatars.value, [id]: true }
-}
 const tooltip = ref({
   show: false,
   isHovered: false,
@@ -788,11 +745,21 @@ const tooltip = ref({
   }
 })
 
+// 头像加载失败状态管理
+const failedAvatars = reactive({})
+const handleAvatarError = (event, user) => {
+  if (user && user.id) {
+    failedAvatars[user.id] = true
+  }
+  if (event && event.target) {
+    event.target.style.display = 'none'
+  }
+}
+
 // 鼠标进入事件处理
-const handleMouseEnter = async (event) => {
+const handleMouseEnter = (event) => {
   const rect = event.target.getBoundingClientRect()
   const viewportWidth = window.innerWidth
-  const viewportHeight = window.innerHeight
 
   // 计算tooltip位置
   let left = rect.left + rect.width / 2
@@ -800,7 +767,7 @@ const handleMouseEnter = async (event) => {
 
   // 确保tooltip不超出视口边界
   const tooltipWidth = 320 // 预估tooltip宽度
-  const tooltipHeight = 480 // 预估tooltip高度（列表区已限高50vh）
+  const tooltipHeight = 300 // 预估tooltip高度
 
   if (left + tooltipWidth / 2 > viewportWidth) {
     left = viewportWidth - tooltipWidth / 2 - 10
@@ -811,32 +778,11 @@ const handleMouseEnter = async (event) => {
   if (top - tooltipHeight < 0) {
     top = rect.bottom + 10
   }
-  // 以视口高度为界，限制不超出底部
-  if (top + tooltipHeight > viewportHeight - 10) {
-    top = viewportHeight - tooltipHeight - 10
-  }
-  if (top < 10) {
-    top = 10
-  }
 
   tooltip.value.style.left = `${left}px`
   tooltip.value.style.top = `${top}px`
   tooltip.value.style.transform = 'translateX(-50%)'
   tooltip.value.show = true
-
-  // 渲染后按实际高度二次校正，确保完整显示在视口内
-  await nextTick()
-  const el = tooltipEl.value
-  if (!el) return
-  const actualHeight = el.offsetHeight
-  let actualTop = parseFloat(el.style.top) || 0
-  if (actualTop + actualHeight > viewportHeight - 10) {
-    actualTop = viewportHeight - actualHeight - 10
-  }
-  if (actualTop < 10) {
-    actualTop = 10
-  }
-  el.style.top = `${actualTop}px`
 }
 
 // 鼠标离开事件处理
@@ -865,7 +811,7 @@ const handleSemesterChange = async () => {
   await Promise.all([loadAnalysisData(), loadChartData(), loadRealtimeStats()])
 
   if (window.$showNotification) {
-    window.$showNotification(locale.value.messages.updated, 'success')
+    window.$showNotification('数据已更新', 'success')
   }
 }
 
@@ -892,10 +838,10 @@ const handleSortChange = async (sortBy) => {
     panelStates.value.topSongs.error = null
   } catch (err) {
     console.warn('获取热门歌曲数据失败:', err)
-    panelStates.value.topSongs.error = locale.value.errors.topSongs
+    panelStates.value.topSongs.error = '加载热门歌曲失败'
     topSongs.value = []
     if (window.$showNotification) {
-      window.$showNotification(locale.value.errors.topSongs, 'error')
+      window.$showNotification('加载热门歌曲失败', 'error')
     }
   } finally {
     panelStates.value.topSongs.loading = false
@@ -939,9 +885,9 @@ const loadAnalysisData = async () => {
     }
   } catch (err) {
     console.error('加载分析数据失败:', err)
-    error.value = locale.value.errors.loadData
+    error.value = '加载数据失败，请稍后重试'
     if (window.$showNotification) {
-      window.$showNotification(locale.value.errors.stats, 'error')
+      window.$showNotification('加载统计数据失败', 'error')
     }
   } finally {
     isLoading.value = false
@@ -994,7 +940,7 @@ const loadChartData = async () => {
       panelStates.value.trends.error = null
     } catch (err) {
       console.warn('获取趋势数据失败:', err)
-      panelStates.value.trends.error = locale.value.errors.trends
+      panelStates.value.trends.error = '加载趋势数据失败'
       trendData.value = []
     } finally {
       panelStates.value.trends.loading = false
@@ -1014,7 +960,7 @@ const loadChartData = async () => {
       panelStates.value.topSongs.error = null
     } catch (err) {
       console.warn('获取热门歌曲数据失败:', err)
-      panelStates.value.topSongs.error = locale.value.errors.topSongs
+      panelStates.value.topSongs.error = '加载热门歌曲失败'
       topSongs.value = []
     } finally {
       panelStates.value.topSongs.loading = false
@@ -1034,7 +980,7 @@ const loadChartData = async () => {
       panelStates.value.activeUsers.error = null
     } catch (err) {
       console.warn('获取活跃用户数据失败:', err)
-      panelStates.value.activeUsers.error = locale.value.errors.activeUsers
+      panelStates.value.activeUsers.error = '加载活跃用户失败'
       activeUsers.value = []
     } finally {
       panelStates.value.activeUsers.loading = false
@@ -1051,7 +997,7 @@ const loadChartData = async () => {
       panelStates.value.userEngagement.error = null
     } catch (err) {
       console.warn('获取用户参与度数据失败:', err)
-      panelStates.value.userEngagement.error = locale.value.errors.userEngagement
+      panelStates.value.userEngagement.error = '加载用户参与度失败'
       userEngagement.value = {}
     } finally {
       panelStates.value.userEngagement.loading = false
@@ -1068,7 +1014,7 @@ const loadChartData = async () => {
       panelStates.value.semesterComparison.error = null
     } catch (err) {
       console.warn('获取学期对比数据失败:', err)
-      panelStates.value.semesterComparison.error = locale.value.errors.semesterComparison
+      panelStates.value.semesterComparison.error = '加载学期对比失败'
       semesterComparison.value = []
     } finally {
       panelStates.value.semesterComparison.loading = false
@@ -1108,9 +1054,9 @@ onMounted(async () => {
     }, 30000)
   } catch (err) {
     console.error('初始化数据分析面板失败:', err)
-    error.value = locale.value.errors.init
+    error.value = '初始化失败，请刷新页面重试'
     if (window.$showNotification) {
-      window.$showNotification(locale.value.errors.initNotify, 'error')
+      window.$showNotification('数据初始化失败', 'error')
     }
   }
 })
@@ -1122,7 +1068,7 @@ const refreshAllData = async () => {
   await Promise.all([loadAnalysisData(), loadChartData(), loadRealtimeStats()])
 
   if (window.$showNotification) {
-    window.$showNotification(locale.value.messages.refreshSuccess, 'success')
+    window.$showNotification('数据刷新成功', 'success')
   }
 }
 
@@ -1147,10 +1093,10 @@ const loadActiveUsers = async () => {
     panelStates.value.activeUsers.error = null
   } catch (err) {
     console.warn('重新获取活跃用户数据失败:', err)
-    panelStates.value.activeUsers.error = locale.value.errors.activeUsers
+    panelStates.value.activeUsers.error = '加载活跃用户失败'
     activeUsers.value = []
     if (window.$showNotification) {
-      window.$showNotification(locale.value.errors.retry, 'error')
+      window.$showNotification('重试失败', 'error')
     }
   } finally {
     panelStates.value.activeUsers.loading = false
@@ -1167,9 +1113,9 @@ const loadSemesterComparison = async () => {
     semesterComparison.value = comparison || []
   } catch (err) {
     console.warn('获取学期对比数据失败:', err)
-    panelStates.value.semesterComparison.error = locale.value.errors.semesterComparison
+    panelStates.value.semesterComparison.error = '加载学期对比失败'
     if (window.$showNotification) {
-      window.$showNotification(locale.value.errors.retry, 'error')
+      window.$showNotification('重试失败', 'error')
     }
   } finally {
     panelStates.value.semesterComparison.loading = false
@@ -1201,15 +1147,15 @@ const formatDateShort = (dateStr) => {
   width: 6px;
 }
 .custom-scrollbar::-webkit-scrollbar-track {
-  background: var(--overlay-5);
+  background: rgba(255, 255, 255, 0.05);
   border-radius: 3px;
 }
 .custom-scrollbar::-webkit-scrollbar-thumb {
-  background: var(--data-analysis-scroll-thumb);
+  background: rgba(79, 70, 229, 0.3);
   border-radius: 3px;
   transition: background 0.3s ease;
 }
 .custom-scrollbar::-webkit-scrollbar-thumb:hover {
-  background: var(--data-analysis-scroll-thumb-hover);
+  background: rgba(79, 70, 229, 0.5);
 }
 </style>
diff --git a/app/components/Admin/DatabaseManager.vue b/app/components/Admin/DatabaseManager.vue
index 83c7640..d56a4c8 100644
--- a/app/components/Admin/DatabaseManager.vue
+++ b/app/components/Admin/DatabaseManager.vue
@@ -2,9 +2,9 @@
   <div class="max-w-[1200px] mx-auto space-y-8 pb-20 px-2">
     <!-- 页面标题 -->
     <div class="space-y-1">
-      <h2 class="text-2xl font-black text-text-primary tracking-tight">{{ locale.title }}</h2>
-      <p class="text-xs text-text-tertiary font-medium">
-        {{ locale.desc }}
+      <h2 class="text-2xl font-black text-zinc-100 tracking-tight">数据库操作</h2>
+      <p class="text-xs text-zinc-500 font-medium">
+        执行系统底层维护任务，包括备份、恢复及全局数据重置
       </p>
     </div>
 
@@ -14,53 +14,49 @@
         v-for="card in cards"
         :key="card.id"
         :class="[
-          'group relative bg-bg-secondary-40 border border-border-secondary rounded-2xl p-8 transition-all hover:border-border-tertiary hover:shadow-2xl hover:shadow-[0_25px_50px_var(--shadow-color-deep)]',
-          card.isDanger ? 'hover:border-error-20' : ''
+          'group relative bg-zinc-900/40 border border-zinc-800 rounded-2xl p-8 transition-all hover:border-zinc-700 hover:shadow-2xl hover:shadow-black/40',
+          card.isDanger ? 'hover:border-rose-500/20' : ''
         ]"
       >
         <div class="flex flex-col h-full space-y-6">
           <div class="flex items-center justify-between">
             <div
               :class="[
-                'p-3.5 rounded-2xl bg-bg-primary border border-border-secondary transition-all flex items-center justify-center',
+                'p-3.5 rounded-2xl bg-zinc-950 border border-zinc-800 transition-all',
                 card.isDanger
-                  ? 'text-error border-error-10'
-                  : card.colorClass === 'primary'
-                    ? 'text-primary border-primary-20'
-                    : card.colorClass === 'warning'
-                      ? 'text-warning border-warning-20'
-                      : 'text-success border-success-20'
+                  ? 'text-rose-500 border-rose-500/10'
+                  : `text-${card.color}-500 border-${card.color}-500/10 shadow-lg`
               ]"
             >
               <component :is="card.icon" class="w-6 h-6" />
             </div>
             <span
               v-if="card.isDanger"
-              class="px-2 py-0.5 bg-error-10 text-error text-[9px] font-black uppercase tracking-widest border border-error-20 rounded"
-              >{{ locale.highRisk }}</span
+              class="px-2 py-0.5 bg-rose-500/10 text-rose-500 text-[9px] font-black uppercase tracking-widest border border-rose-500/20 rounded"
+              >高风险操作</span
             >
           </div>
 
           <div class="flex-1 space-y-2">
-            <h3 class="text-lg font-bold text-text-primary group-hover:text-primary transition-colors">
+            <h3 class="text-lg font-bold text-zinc-100 group-hover:text-blue-400 transition-colors">
               {{ card.title }}
             </h3>
-            <p class="text-xs text-text-tertiary leading-relaxed font-medium">
+            <p class="text-xs text-zinc-500 leading-relaxed font-medium">
               {{ card.desc }}
             </p>
           </div>
 
           <button
             :disabled="isLoading(card.id)"
-            class="w-full py-3 rounded-xl text-xs font-black uppercase tracking-widest transition-all active:scale-95 bg-bg-primary border border-border-secondary text-text-tertiary hover:bg-bg-tertiary hover:text-text-primary hover:border-border-tertiary"
+            class="w-full py-3 rounded-xl text-xs font-black uppercase tracking-widest transition-all active:scale-95 bg-zinc-950 border border-zinc-800 text-zinc-400 hover:bg-zinc-800 hover:text-zinc-100 hover:border-zinc-700"
             :class="
               card.isDanger
-                ? 'bg-bg-primary border border-error-30 text-error hover:bg-error hover:text-text-primary hover:border-error shadow-lg shadow-[var(--error-glow-5)]'
+                ? 'bg-zinc-950 border border-rose-900/30 text-rose-500 hover:bg-rose-600 hover:text-white hover:border-rose-600 shadow-lg shadow-rose-900/5'
                 : ''
             "
             @click="openModal(card.id)"
           >
-            <span v-if="isLoading(card.id)">{{ locale.executing }}</span>
+            <span v-if="isLoading(card.id)">执行中...</span>
             <span v-else>{{ card.btnText }}</span>
           </button>
         </div>
@@ -69,19 +65,19 @@
         <div
           :class="[
             'absolute -right-4 -bottom-4 w-32 h-32 blur-3xl opacity-0 group-hover:opacity-100 transition-opacity rounded-full pointer-events-none',
-            card.isDanger ? 'bg-error-5' : card.colorClass === 'primary' ? 'bg-primary-5' : card.colorClass === 'warning' ? 'bg-warning-5' : 'bg-success-5'
+            card.isDanger ? 'bg-rose-500/5' : `bg-${card.color}-500/5`
           ]"
         />
       </div>
     </div>
 
     <!-- 维护建议 -->
-    <div class="bg-primary-hover-5 border border-primary-10 rounded-xl p-5 flex items-start gap-4">
-      <AlertCircle class="text-primary shrink-0 mt-0.5 w-[18px] h-[18px]" />
+    <div class="bg-blue-600/5 border border-blue-500/10 rounded-xl p-5 flex items-start gap-4">
+      <AlertCircle class="text-blue-500 shrink-0 mt-0.5 w-[18px] h-[18px]" />
       <div class="space-y-1">
-        <p class="text-[11px] font-bold text-text-secondary">{{ locale.maintenanceTitle }}</p>
-        <p class="text-[10px] text-text-tertiary leading-relaxed">
-          {{ locale.maintenanceDesc }}
+        <p class="text-[11px] font-bold text-zinc-300">数据库维护建议</p>
+        <p class="text-[10px] text-zinc-500 leading-relaxed">
+          建议每周进行一次全量备份。在执行“恢复备份”或“重置数据库”前，请务必先创建一份当前的数据备份，以免误操作造成不可挽回的损失。
         </p>
       </div>
     </div>
@@ -91,14 +87,14 @@
       v-if="activeModal === 'backup'"
       class="fixed inset-0 z-[100] flex items-center justify-center p-4"
     >
-      <div class="absolute inset-0 bg-bg-primary-80 backdrop-blur-sm" @click="activeModal = 'none'" />
+      <div class="absolute inset-0 bg-black/80 backdrop-blur-sm" @click="activeModal = 'none'" />
       <div
-        class="relative bg-bg-secondary border border-border-secondary rounded-3xl w-full max-w-lg overflow-hidden shadow-2xl animate-in fade-in zoom-in duration-200"
+        class="relative bg-zinc-900 border border-zinc-800 rounded-3xl w-full max-w-lg overflow-hidden shadow-2xl animate-in fade-in zoom-in duration-200"
       >
-        <div class="px-8 py-6 border-b border-border-secondary flex items-center justify-between">
-          <h3 class="text-xl font-black text-text-primary tracking-tight">{{ locale.backupTitle }}</h3>
+        <div class="px-8 py-6 border-b border-zinc-800 flex items-center justify-between">
+          <h3 class="text-xl font-black text-zinc-100 tracking-tight">创建数据库备份</h3>
           <button
-            class="p-2 hover:bg-bg-tertiary rounded-xl transition-colors text-text-tertiary hover:text-text-primary"
+            class="p-2 hover:bg-zinc-800 rounded-xl transition-colors text-zinc-500 hover:text-zinc-200"
             @click="activeModal = 'none'"
           >
             <X class="w-5 h-5" />
@@ -106,52 +102,52 @@
         </div>
         <div class="p-8 space-y-6">
           <div class="space-y-2">
-            <p class="text-[10px] font-black text-text-disabled uppercase tracking-widest px-1">
-              {{ locale.selectContent }}
+            <p class="text-[10px] font-black text-zinc-600 uppercase tracking-widest px-1">
+              选择包含的内容
             </p>
             <div class="space-y-2">
               <label
                 v-for="(item, i) in backupOptions"
                 :key="i"
-                class="flex items-start gap-4 p-4 bg-bg-primary-50 border border-border-secondary rounded-xl cursor-pointer hover:border-border-tertiary transition-all group"
+                class="flex items-start gap-4 p-4 bg-zinc-950/50 border border-zinc-800 rounded-xl cursor-pointer hover:border-zinc-700 transition-all group"
               >
                 <div class="shrink-0 mt-0.5">
                   <input
                     v-model="createForm[item.key]"
                     type="checkbox"
-                    class="w-4 h-4 rounded border-border-secondary bg-bg-secondary"
+                    class="w-4 h-4 rounded border-zinc-800 bg-zinc-900 accent-blue-600"
                   >
                 </div>
                 <div>
                   <p
-                    class="text-xs font-bold text-text-primary group-hover:text-primary transition-colors"
+                    class="text-xs font-bold text-zinc-200 group-hover:text-blue-400 transition-colors"
                   >
                     {{ item.label }}
                   </p>
-                  <p class="text-[10px] text-text-disabled font-medium mt-0.5">{{ item.desc }}</p>
+                  <p class="text-[10px] text-zinc-600 font-medium mt-0.5">{{ item.desc }}</p>
                 </div>
               </label>
             </div>
           </div>
-          <div class="p-3 bg-primary-5 border border-primary-10 rounded-xl">
-            <p class="text-[10px] text-text-tertiary text-center italic">
-              {{ locale.backupHint }}
+          <div class="p-3 bg-blue-500/5 border border-blue-500/10 rounded-xl">
+            <p class="text-[10px] text-zinc-500 text-center italic">
+              备份文件将以 .json 格式生成并自动下载
             </p>
           </div>
         </div>
-        <div class="px-8 py-6 bg-bg-primary-50 border-t border-border-secondary flex gap-3 justify-end">
+        <div class="px-8 py-6 bg-zinc-950/50 border-t border-zinc-800 flex gap-3 justify-end">
           <button
-            class="px-4 py-2 text-xs font-bold text-text-tertiary hover:text-text-secondary transition-colors uppercase tracking-widest"
+            class="px-4 py-2 text-xs font-bold text-zinc-500 hover:text-zinc-300 transition-colors uppercase tracking-widest"
             @click="activeModal = 'none'"
           >
-            {{ locale.cancel }}
+            取消
           </button>
           <button
             :disabled="createLoading"
-            class="px-8 py-2 bg-primary-hover hover:bg-primary text-text-primary text-xs font-black rounded-xl shadow-lg transition-all active:scale-95 uppercase tracking-widest disabled:opacity-50 disabled:cursor-not-allowed"
+            class="px-8 py-2 bg-blue-600 hover:bg-blue-500 text-white text-xs font-black rounded-xl shadow-lg transition-all active:scale-95 uppercase tracking-widest disabled:opacity-50 disabled:cursor-not-allowed"
             @click="createBackup"
           >
-            {{ createLoading ? locale.exporting : locale.startExport }}
+            {{ createLoading ? '正在导出...' : '开始导出' }}
           </button>
         </div>
       </div>
@@ -162,14 +158,14 @@
       v-if="activeModal === 'restore'"
       class="fixed inset-0 z-[100] flex items-center justify-center p-4"
     >
-      <div class="absolute inset-0 bg-bg-primary-80 backdrop-blur-sm" @click="activeModal = 'none'" />
+      <div class="absolute inset-0 bg-black/80 backdrop-blur-sm" @click="activeModal = 'none'" />
       <div
-        class="relative bg-bg-secondary border border-border-secondary rounded-3xl w-full max-w-lg overflow-hidden shadow-2xl animate-in fade-in zoom-in duration-200"
+        class="relative bg-zinc-900 border border-zinc-800 rounded-3xl w-full max-w-lg overflow-hidden shadow-2xl animate-in fade-in zoom-in duration-200"
       >
-        <div class="px-8 py-6 border-b border-border-secondary flex items-center justify-between">
-          <h3 class="text-xl font-black text-text-primary tracking-tight">{{ locale.restoreTitle }}</h3>
+        <div class="px-8 py-6 border-b border-zinc-800 flex items-center justify-between">
+          <h3 class="text-xl font-black text-zinc-100 tracking-tight">恢复数据库备份</h3>
           <button
-            class="p-2 hover:bg-bg-tertiary rounded-xl transition-colors text-text-tertiary hover:text-text-primary"
+            class="p-2 hover:bg-zinc-800 rounded-xl transition-colors text-zinc-500 hover:text-zinc-200"
             @click="activeModal = 'none'"
           >
             <X class="w-5 h-5" />
@@ -177,19 +173,19 @@
         </div>
         <div class="p-8 space-y-6">
           <div
-            class="border-2 border-dashed border-border-secondary rounded-2xl p-10 flex flex-col items-center justify-center text-center group hover:border-success-50 hover:bg-success-5 transition-all cursor-pointer"
+            class="border-2 border-dashed border-zinc-800 rounded-2xl p-10 flex flex-col items-center justify-center text-center group hover:border-emerald-500/50 hover:bg-emerald-500/5 transition-all cursor-pointer"
             @click="$refs.fileInput.click()"
             @dragover.prevent
             @drop.prevent="handleFileDrop"
           >
             <Upload
-              class="w-8 h-8 text-text-secondary mb-4 group-hover:text-success transition-colors"
+              class="w-8 h-8 text-zinc-700 mb-4 group-hover:text-emerald-500 transition-colors"
             />
-            <h5 class="text-sm font-bold text-text-secondary">
-              {{ selectedFile ? selectedFile.name : locale.selectFile }}
+            <h5 class="text-sm font-bold text-zinc-300">
+              {{ selectedFile ? selectedFile.name : '点击选择或拖拽备份文件' }}
             </h5>
-            <p class="text-[10px] text-text-disabled font-bold uppercase mt-1 tracking-widest">
-              {{ locale.fileHint }}
+            <p class="text-[10px] text-zinc-600 font-bold uppercase mt-1 tracking-widest">
+              仅支持 VoiceHub 导出的 .json 格式
             </p>
             <input
               ref="fileInput"
@@ -201,54 +197,54 @@
           </div>
 
           <div class="space-y-3">
-            <label class="text-[10px] font-black text-text-disabled uppercase tracking-widest px-1"
-              >{{ locale.restoreMode }}</label
+            <label class="text-[10px] font-black text-zinc-600 uppercase tracking-widest px-1"
+              >恢复模式</label
             >
             <div class="grid grid-cols-2 gap-3">
               <button
                 :class="[
                   'p-4 border rounded-xl text-left transition-all',
                   restoreForm.mode === 'merge'
-                    ? 'bg-bg-primary border-success-30'
-                    : 'bg-bg-primary border-border-secondary hover:border-border-tertiary'
+                    ? 'bg-zinc-950 border-emerald-500/30'
+                    : 'bg-zinc-950 border-zinc-800 hover:border-zinc-700'
                 ]"
                 @click="restoreForm.mode = 'merge'"
               >
                 <h6
                   :class="[
                     'text-xs font-bold',
-                    restoreForm.mode === 'merge' ? 'text-success' : 'text-text-tertiary'
+                    restoreForm.mode === 'merge' ? 'text-emerald-400' : 'text-zinc-500'
                   ]"
                 >
-                  {{ locale.restoreModes?.merge?.title ?? '合并恢复' }}
+                  增量模式
                 </h6>
-                <p class="text-[9px] text-text-disabled uppercase mt-0.5">{{ locale.restoreModes?.merge?.desc ?? '保留现有数据并合并备份内容' }}</p>
+                <p class="text-[9px] text-zinc-600 uppercase mt-0.5">仅导入不重复的新记录</p>
               </button>
               <button
                 :class="[
                   'p-4 border rounded-xl text-left transition-all',
                   restoreForm.mode === 'replace'
-                    ? 'bg-bg-primary border-success-30'
-                    : 'bg-bg-primary border-border-secondary hover:border-border-tertiary'
+                    ? 'bg-zinc-950 border-emerald-500/30'
+                    : 'bg-zinc-950 border-zinc-800 hover:border-zinc-700'
                 ]"
                 @click="restoreForm.mode = 'replace'"
               >
                 <h6
                   :class="[
                     'text-xs font-bold',
-                    restoreForm.mode === 'replace' ? 'text-success' : 'text-text-tertiary'
+                    restoreForm.mode === 'replace' ? 'text-emerald-400' : 'text-zinc-500'
                   ]"
                 >
-                  {{ locale.restoreModes?.replace?.title ?? '覆盖恢复' }}
+                  覆盖模式
                 </h6>
-                <p class="text-[9px] text-text-disabled uppercase mt-0.5">{{ locale.restoreModes?.replace?.desc ?? '清除现有数据后恢复备份内容' }}</p>
+                <p class="text-[9px] text-zinc-600 uppercase mt-0.5">清空现有表后完整恢复</p>
               </button>
             </div>
           </div>
 
           <div
             v-if="restoreForm.mode === 'replace' && hasSuperAdminInBackup"
-            class="p-4 bg-bg-primary border border-border-secondary rounded-xl"
+            class="p-4 bg-zinc-950 border border-zinc-800 rounded-xl"
           >
             <label class="flex items-start gap-3 cursor-pointer">
               <input
@@ -257,36 +253,36 @@
                 class="mt-0.5 accent-emerald-500"
               >
               <div>
-                <p class="text-xs font-bold text-text-primary">{{ locale.overwriteSuperAdmin }}</p>
-                <p class="text-[10px] text-text-tertiary mt-1">
-                  {{ locale.overwriteSuperAdminDesc }}
+                <p class="text-xs font-bold text-zinc-200">覆盖备份中的超级管理员账号数据</p>
+                <p class="text-[10px] text-zinc-500 mt-1">
+                  关闭时将保留当前超级管理员账号及其第三方绑定、2FA等关联数据
                 </p>
               </div>
             </label>
           </div>
 
           <div
-            class="p-4 bg-warning-5 border border-warning-10 rounded-xl flex items-start gap-3"
+            class="p-4 bg-amber-500/5 border border-amber-500/10 rounded-xl flex items-start gap-3"
           >
-            <AlertCircle class="text-warning shrink-0 mt-0.5 w-4 h-4" />
-            <p class="text-[10px] text-text-tertiary leading-normal font-medium">
-              {{ locale.replaceWarning }}
+            <AlertCircle class="text-amber-500 shrink-0 mt-0.5 w-4 h-4" />
+            <p class="text-[10px] text-zinc-500 leading-normal font-medium">
+              注意：覆盖模式将永久清空当前数据库中对应的表内容。此操作将导致现有会话中断。
             </p>
           </div>
         </div>
-        <div class="px-8 py-6 bg-bg-primary-50 border-t border-border-secondary flex gap-3 justify-end">
+        <div class="px-8 py-6 bg-zinc-950/50 border-t border-zinc-800 flex gap-3 justify-end">
           <button
-            class="px-4 py-2 text-xs font-bold text-text-tertiary hover:text-text-secondary transition-colors uppercase tracking-widest"
+            class="px-4 py-2 text-xs font-bold text-zinc-500 hover:text-zinc-300 transition-colors uppercase tracking-widest"
             @click="activeModal = 'none'"
           >
-            {{ locale.cancel }}
+            取消
           </button>
           <button
             :disabled="uploadLoading || !selectedFile"
-            class="px-8 py-2 bg-success hover:bg-success text-text-primary text-xs font-black rounded-xl shadow-lg transition-all active:scale-95 uppercase tracking-widest disabled:opacity-50 disabled:cursor-not-allowed"
+            class="px-8 py-2 bg-emerald-600 hover:bg-emerald-500 text-white text-xs font-black rounded-xl shadow-lg transition-all active:scale-95 uppercase tracking-widest disabled:opacity-50 disabled:cursor-not-allowed"
             @click="restoreBackup"
           >
-            {{ uploadLoading ? restoreProgress || locale.restoring : locale.confirmRestore }}
+            {{ uploadLoading ? restoreProgress || '正在恢复...' : '确认并开始恢复' }}
           </button>
         </div>
       </div>
@@ -297,14 +293,14 @@
       v-if="activeModal === 'reset-seq'"
       class="fixed inset-0 z-[100] flex items-center justify-center p-4"
     >
-      <div class="absolute inset-0 bg-bg-primary-80 backdrop-blur-sm" @click="activeModal = 'none'" />
+      <div class="absolute inset-0 bg-black/80 backdrop-blur-sm" @click="activeModal = 'none'" />
       <div
-        class="relative bg-bg-secondary border border-border-secondary rounded-3xl w-full max-w-lg overflow-hidden shadow-2xl animate-in fade-in zoom-in duration-200"
+        class="relative bg-zinc-900 border border-zinc-800 rounded-3xl w-full max-w-lg overflow-hidden shadow-2xl animate-in fade-in zoom-in duration-200"
       >
-        <div class="px-8 py-6 border-b border-border-secondary flex items-center justify-between">
-          <h3 class="text-xl font-black text-text-primary tracking-tight">{{ locale.resetSequenceTitle }}</h3>
+        <div class="px-8 py-6 border-b border-zinc-800 flex items-center justify-between">
+          <h3 class="text-xl font-black text-zinc-100 tracking-tight">重置数据表序列</h3>
           <button
-            class="p-2 hover:bg-bg-tertiary rounded-xl transition-colors text-text-tertiary hover:text-text-primary"
+            class="p-2 hover:bg-zinc-800 rounded-xl transition-colors text-zinc-500 hover:text-zinc-200"
             @click="activeModal = 'none'"
           >
             <X class="w-5 h-5" />
@@ -312,47 +308,47 @@
         </div>
         <div class="p-8 space-y-6">
           <div class="space-y-2">
-            <label class="text-[10px] font-black text-text-disabled uppercase tracking-widest px-1"
-              >{{ locale.selectTargetTable }}</label
+            <label class="text-[10px] font-black text-zinc-600 uppercase tracking-widest px-1"
+              >选择目标表</label
             >
             <CustomSelect
               v-model="sequenceForm.table"
-              :options="locale.tableOptions || defaultTableOptions"
-              label-key="label"
-              value-key="value"
+              :options="tableOptions"
               class="w-full"
             />
           </div>
 
-          <div class="p-6 bg-bg-primary-50 border border-border-secondary rounded-2xl space-y-4">
+          <div class="p-6 bg-zinc-950/50 border border-zinc-800 rounded-2xl space-y-4">
             <div class="flex items-center gap-3">
               <div
-                class="w-8 h-8 rounded-lg bg-warning-10 text-warning flex items-center justify-center"
+                class="w-8 h-8 rounded-lg bg-amber-500/10 text-amber-500 flex items-center justify-center"
               >
                 <AlertCircle class="w-4 h-4" />
               </div>
-              <h6 class="text-xs font-bold text-text-secondary uppercase tracking-widest">
-                {{ locale.sequenceHelpTitle }}
+              <h6 class="text-xs font-bold text-zinc-300 uppercase tracking-widest">
+                什么是重置序列？
               </h6>
             </div>
-            <p class="text-[11px] text-text-tertiary leading-relaxed font-medium">
-              {{ locale.sequenceHelpDesc }}
+            <p class="text-[11px] text-zinc-500 leading-relaxed font-medium">
+              如果您的数据表 ID
+              出现了断档或在手动操作数据库后无法自增，重置序列可以将数据库底层的计数器更新为当前 ID
+              最大值 +1，从而解决 ID 冲突导致的写入失败问题。此操作不会修改任何现有数据。
             </p>
           </div>
         </div>
-        <div class="px-8 py-6 bg-bg-primary-50 border-t border-border-secondary flex gap-3 justify-end">
+        <div class="px-8 py-6 bg-zinc-950/50 border-t border-zinc-800 flex gap-3 justify-end">
           <button
-            class="px-4 py-2 text-xs font-bold text-text-tertiary hover:text-text-secondary transition-colors uppercase tracking-widest"
+            class="px-4 py-2 text-xs font-bold text-zinc-500 hover:text-zinc-300 transition-colors uppercase tracking-widest"
             @click="activeModal = 'none'"
           >
-            {{ locale.cancel }}
+            取消
           </button>
           <button
             :disabled="sequenceLoading || !sequenceForm.table"
-            class="px-8 py-2 bg-warning hover:bg-warning text-text-primary text-xs font-black rounded-xl shadow-lg transition-all active:scale-95 uppercase tracking-widest disabled:opacity-50 disabled:cursor-not-allowed"
+            class="px-8 py-2 bg-amber-600 hover:bg-amber-500 text-white text-xs font-black rounded-xl shadow-lg transition-all active:scale-95 uppercase tracking-widest disabled:opacity-50 disabled:cursor-not-allowed"
             @click="resetSequence"
           >
-            {{ sequenceLoading ? locale.resetting : locale.executeReset }}
+            {{ sequenceLoading ? '正在重置...' : '执行重置' }}
           </button>
         </div>
       </div>
@@ -363,14 +359,14 @@
       v-if="activeModal === 'reset-db'"
       class="fixed inset-0 z-[100] flex items-center justify-center p-4"
     >
-      <div class="absolute inset-0 bg-bg-primary-80 backdrop-blur-sm" @click="activeModal = 'none'" />
+      <div class="absolute inset-0 bg-black/80 backdrop-blur-sm" @click="activeModal = 'none'" />
       <div
-        class="relative bg-bg-secondary border border-border-secondary rounded-3xl w-full max-w-lg overflow-hidden shadow-2xl animate-in fade-in zoom-in duration-200"
+        class="relative bg-zinc-900 border border-zinc-800 rounded-3xl w-full max-w-lg overflow-hidden shadow-2xl animate-in fade-in zoom-in duration-200"
       >
-        <div class="px-8 py-6 border-b border-border-secondary flex items-center justify-between">
-          <h3 class="text-xl font-black text-error tracking-tight">{{ locale.dangerResetTitle }}</h3>
+        <div class="px-8 py-6 border-b border-zinc-800 flex items-center justify-between">
+          <h3 class="text-xl font-black text-rose-500 tracking-tight">危险操作：重置数据库</h3>
           <button
-            class="p-2 hover:bg-bg-tertiary rounded-xl transition-colors text-text-tertiary hover:text-text-primary"
+            class="p-2 hover:bg-zinc-800 rounded-xl transition-colors text-zinc-500 hover:text-zinc-200"
             @click="activeModal = 'none'"
           >
             <X class="w-5 h-5" />
@@ -378,120 +374,74 @@
         </div>
         <div class="p-8 space-y-6">
           <div
-            class="p-6 bg-error-10 border border-error-20 rounded-2xl flex flex-col items-center text-center"
+            class="p-6 bg-rose-600/10 border border-rose-500/20 rounded-2xl flex flex-col items-center text-center"
           >
-            <Trash2 class="text-error mb-4 w-12 h-12" />
-            <h4 class="text-lg font-black text-error tracking-tight">
-              {{ locale.dangerResetHeading }}
+            <Trash2 class="text-rose-500 mb-4 w-12 h-12" />
+            <h4 class="text-lg font-black text-rose-500 tracking-tight">
+              您正在执行极其危险的操作！
             </h4>
-            <p class="text-xs text-text-tertiary mt-2 font-medium leading-relaxed">
-              {{ locale.dangerResetPrefix }}
-              <span class="text-text-secondary font-bold"
-                >{{ locale.dangerResetScope }}</span
+            <p class="text-xs text-zinc-500 mt-2 font-medium leading-relaxed">
+              重置操作将永久删除系统中的所有
+              <span class="text-zinc-300 font-bold"
+                >歌曲、投稿记录、排期文件、通知、日志及除您以外的用户账号</span
               >。
             </p>
           </div>
 
           <div class="space-y-3">
             <label
-              class="text-[11px] font-black text-error-80 uppercase tracking-widest px-1 flex items-center justify-center gap-2"
+              class="text-[11px] font-black text-rose-500/80 uppercase tracking-widest px-1 flex items-center justify-center gap-2"
             >
-              {{ locale.confirmCodeLabel }}
+              请输入以下代码以确认操作
             </label>
             <div
-              class="bg-bg-primary border border-error-30 rounded-xl px-4 py-3 font-mono text-[10px] text-error text-center select-all"
+              class="bg-zinc-950 border border-rose-900/30 rounded-xl px-4 py-3 font-mono text-[10px] text-rose-400 text-center select-all"
             >
               {{ CONFIRM_CODE }}
             </div>
             <input
               v-model="resetConfirmText"
               type="text"
-              :placeholder="locale.confirmCodePlaceholder"
-              class="w-full bg-bg-primary border border-border-secondary rounded-xl px-4 py-3 text-sm text-text-primary focus:outline-none focus:border-error-40 text-center font-mono placeholder:text-text-secondary"
+              placeholder="在此输入上述代码..."
+              class="w-full bg-zinc-950 border border-zinc-800 rounded-xl px-4 py-3 text-sm text-zinc-200 focus:outline-none focus:border-rose-500/40 text-center font-mono placeholder:text-zinc-700"
             >
           </div>
 
           <div class="grid grid-cols-2 gap-3 pt-2">
             <button
-              class="py-3 bg-bg-secondary hover:bg-bg-tertiary text-text-tertiary text-xs font-black rounded-xl transition-all uppercase tracking-widest"
+              class="py-3 bg-zinc-900 hover:bg-zinc-800 text-zinc-500 text-xs font-black rounded-xl transition-all uppercase tracking-widest"
               @click="activeModal = 'none'"
             >
-              {{ locale.cancel }}
+              取消
             </button>
             <button
               :disabled="resetConfirmText !== CONFIRM_CODE || resetLoading"
-              class="py-3 rounded-xl text-xs font-black uppercase tracking-widest transition-all shadow-lg disabled:bg-bg-tertiary disabled:text-text-disabled disabled:cursor-not-allowed disabled:border-border-tertiary"
+              class="py-3 rounded-xl text-xs font-black uppercase tracking-widest transition-all shadow-lg disabled:bg-zinc-800 disabled:text-zinc-600 disabled:cursor-not-allowed disabled:border-zinc-700"
               :class="
                 resetConfirmText === CONFIRM_CODE
-                  ? 'bg-error hover:bg-error text-text-primary shadow-[var(--error-glow-20)] active:scale-95'
+                  ? 'bg-rose-600 hover:bg-rose-500 text-white shadow-rose-900/20 active:scale-95'
                   : ''
               "
               @click="resetDatabase"
             >
-              {{ resetLoading ? locale.resetting : locale.confirmResetDatabase }}
+              {{ resetLoading ? '正在重置...' : '确认彻底重置' }}
             </button>
           </div>
         </div>
       </div>
     </div>
-
-    <!-- 自动备份设置 -->
-    <BackupAutoSettings
-      :visible="activeModal === 'auto-backup'"
-      @close="activeModal = 'none'"
-    />
   </div>
 </template>
 
 <script setup>
-import { computed, ref } from 'vue'
-import { Download, Upload, RotateCw, Trash2, AlertCircle, CloudUpload, X } from '@lucide/vue'
+import { ref } from 'vue'
+import { Download, Upload, RotateCw, Trash2, AlertCircle, X } from '@lucide/vue'
 import CustomSelect from '~/components/UI/Common/CustomSelect.vue'
-import BackupAutoSettings from '~/components/Admin/BackupAutoSettings.vue'
 import { useToast } from '~/composables/useToast'
 import { useAuth } from '~/composables/useAuth'
-import { useLocale } from '~/utils/locale'
 
 const { showToast: showNotification } = useToast()
 const auth = useAuth()
-const { admin } = useLocale()
-const locale = computed(() => admin.value?.databaseManager || {})
-const defaultTableOptions = [
-  { label: '重置所有表', value: 'all' },
-  { label: '歌曲表', value: 'Song' },
-  { label: '用户表', value: 'User' },
-  { label: '用户身份表', value: 'UserIdentity' },
-  { label: '用户状态日志表', value: 'UserStatusLog' },
-  { label: '投票表', value: 'Vote' },
-  { label: '排期表', value: 'Schedule' },
-  { label: '通知表', value: 'Notification' },
-  { label: '通知设置表', value: 'NotificationSettings' },
-  { label: '播放时段表', value: 'PlayTime' },
-  { label: '学期表', value: 'Semester' },
-  { label: '系统设置表', value: 'SystemSettings' },
-  { label: '歌曲黑名单表', value: 'SongBlacklist' },
-  { label: '歌曲重播申请表', value: 'SongReplayRequest' },
-  { label: '投稿时段表', value: 'RequestTime' },
-  { label: '邮件模板表', value: 'EmailTemplate' }
-]
-const getMessage = (key) => locale.value?.messages?.[key] ?? `数据库操作：${key}`
-const getLogMessage = (key) => locale.value?.logs?.[key] || key
-const formatString = (value, args) => {
-  if (typeof value !== 'string') return value
-  return value.replace(/{(\d+)}/g, (match, index) =>
-    args[index] !== undefined ? String(args[index]) : match
-  )
-}
-const getErrorMessage = (key, ...args) => {
-  const message = locale.value?.errors?.[key]
-  if (typeof message === 'function') return message(...args)
-  return formatString(message, args) || args.find(Boolean) || key
-}
-const getProgressMessage = (key, ...args) => {
-  const message = locale.value?.progress?.[key]
-  if (typeof message === 'function') return message(...args)
-  return formatString(message, args) || `数据库操作进行中：${key}`
-}
 
 // 状态
 const activeModal = ref('none')
@@ -506,68 +456,60 @@ const hasSuperAdminInBackup = ref(false)
 const CONFIRM_CODE = 'CONFIRM-DATABASE-RESET-OPERATION'
 
 // 卡片配置
-const cards = computed(() => [
+const cards = [
   {
     id: 'backup',
-    title: locale.value?.cards?.backup?.title ?? '备份数据库',
-    desc: locale.value?.cards?.backup?.desc ?? '导出系统数据备份文件',
+    title: '创建备份',
+    desc: '导出当前数据库的所有数据到文件，用于安全备份或迁移。',
     icon: Download,
-    colorClass: 'primary',
-    btnText: locale.value?.cards?.backup?.button ?? '创建备份'
+    color: 'blue',
+    btnText: '创建备份文件'
   },
   {
     id: 'restore',
-    title: locale.value?.cards?.restore?.title ?? '恢复数据库',
-    desc: locale.value?.cards?.restore?.desc ?? '从备份文件恢复系统数据',
+    title: '恢复备份',
+    desc: '从之前导出的备份文件中恢复系统数据。',
     icon: Upload,
-    colorClass: 'success',
-    btnText: locale.value?.cards?.restore?.button ?? '恢复备份'
+    color: 'emerald',
+    btnText: '选择备份文件'
   },
   {
     id: 'reset-seq',
-    title: locale.value?.cards?.resetSeq?.title ?? '修复数据序列',
-    desc: locale.value?.cards?.resetSeq?.desc ?? '修复数据表自增序列',
+    title: '重置序列',
+    desc: '修复数据表的自增ID序列，确保新记录的ID从正确值开始。',
     icon: RotateCw,
-    colorClass: 'warning',
-    btnText: locale.value?.cards?.resetSeq?.button ?? '修复序列'
+    color: 'amber',
+    btnText: '开始重置序列'
   },
   {
     id: 'reset-db',
-    title: locale.value?.cards?.resetDb?.title ?? '重置数据库',
-    desc: locale.value?.cards?.resetDb?.desc ?? '清空除管理员外的系统数据',
+    title: '重置数据库',
+    desc: '清空除管理员账号外的所有系统数据。此操作不可撤销。',
     icon: Trash2,
-    colorClass: 'error',
-    btnText: locale.value?.cards?.resetDb?.button ?? '重置数据库',
+    color: 'rose',
+    btnText: '立即重置数据库',
     isDanger: true
-  },
-  {
-    id: 'auto-backup',
-    title: locale.value?.cards?.autoBackup?.title ?? '自动备份',
-    desc: locale.value?.cards?.autoBackup?.desc ?? '配置多种备份方式，通过外部触发实现定时自动备份',
-    icon: CloudUpload,
-    colorClass: 'success',
-    btnText: locale.value?.cards?.autoBackup?.button ?? '配置自动备份'
   }
-])
+]
 
 // 备份选项
-const backupOptions = computed(() => [
+const backupOptions = [
   {
     key: 'includeSongs',
-    label: locale.value?.backupOptions?.songs?.label ?? '歌曲与排期数据',
-    desc: locale.value?.backupOptions?.songs?.desc ?? '包含歌曲、投稿及排期数据'
+    label: '歌曲与排期数据',
+    desc: '包含所有歌曲库、用户投稿记录及历史播音排期'
   },
   {
     key: 'includeSystemData',
-    label: locale.value?.backupOptions?.system?.label ?? '系统配置',
-    desc: locale.value?.backupOptions?.system?.desc ?? '包含站点设置和全局参数'
+    label: '系统配置信息',
+    desc: '包含站点设置、黑名单、播出时段等全局参数'
   },
   {
     key: 'includeUsers',
-    label: locale.value?.backupOptions?.users?.label ?? '用户账户',
-    desc: locale.value?.backupOptions?.users?.desc ?? '包含用户账户和权限数据'
+    label: '用户账户数据',
+    desc: '包含所有注册用户的权限、偏好设置（不含管理员敏感信息）'
   }
-])
+]
 
 // 表单数据
 const createForm = ref({
@@ -582,9 +524,37 @@ const restoreForm = ref({
 })
 
 const sequenceForm = ref({
-  table: 'all'
+  table: '重置所有表 (All)'
 })
 
+const tableOptions = [
+  '重置所有表 (All)',
+  '歌曲表 (Song)',
+  '用户表 (User)',
+  '投票表 (Vote)',
+  '排期表 (Schedule)',
+  '通知表 (Notification)',
+  '通知设置表 (NotificationSettings)',
+  '播放时段表 (PlayTime)',
+  '学期表 (Semester)',
+  '系统设置表 (SystemSettings)',
+  '歌曲黑名单表 (SongBlacklist)'
+]
+
+const labelToValueMap = {
+  '重置所有表 (All)': 'all',
+  '歌曲表 (Song)': 'Song',
+  '用户表 (User)': 'User',
+  '投票表 (Vote)': 'Vote',
+  '排期表 (Schedule)': 'Schedule',
+  '通知表 (Notification)': 'Notification',
+  '通知设置表 (NotificationSettings)': 'NotificationSettings',
+  '播放时段表 (PlayTime)': 'PlayTime',
+  '学期表 (Semester)': 'Semester',
+  '系统设置表 (SystemSettings)': 'SystemSettings',
+  '歌曲黑名单表 (SongBlacklist)': 'SongBlacklist'
+}
+
 // 辅助函数
 const isLoading = (id) => {
   if (id === 'backup') return createLoading.value
@@ -614,8 +584,8 @@ const parseBackupSuperAdmin = async (file) => {
   } catch (error) {
     hasSuperAdminInBackup.value = false
     restoreForm.value.overwriteSuperAdmin = false
-    showNotification(getMessage('parseBackupFailed'), 'error')
-    console.error(getLogMessage('parseBackupFailed'), error)
+    showNotification('无法解析备份文件，请检查文件格式是否正确。', 'error')
+    console.error('解析备份文件失败:', error)
   }
 }
 
@@ -625,7 +595,7 @@ const handleFileSelect = async (event) => {
     selectedFile.value = file
     await parseBackupSuperAdmin(file)
   } else {
-    showNotification(getMessage('invalidJsonFile'), 'error')
+    showNotification('请选择有效的JSON备份文件', 'error')
   }
 }
 
@@ -635,7 +605,7 @@ const handleFileDrop = async (event) => {
     selectedFile.value = file
     await parseBackupSuperAdmin(file)
   } else {
-    showNotification(getMessage('invalidJsonFile'), 'error')
+    showNotification('请选择有效的JSON备份文件', 'error')
   }
 }
 
@@ -649,11 +619,11 @@ const createBackup = async () => {
     } else if (createForm.value.includeUsers) {
       tables = 'users'
     } else if (createForm.value.includeSongs) {
-      tables = ['songs', 'scheduleSongPool']
+      tables = 'songs'
     } else if (createForm.value.includeSystemData) {
       tables = ['systemSettings']
     } else {
-      throw new Error(getErrorMessage('noBackupContent'))
+      throw new Error('请至少选择一项备份内容')
     }
 
     const response = await $fetch('/api/admin/backup/export', {
@@ -677,7 +647,7 @@ const createBackup = async () => {
         a.click()
         document.body.removeChild(a)
         URL.revokeObjectURL(url)
-        showNotification(getMessage('backupDownloaded'), 'success')
+        showNotification('备份文件已下载', 'success')
         activeModal.value = 'none'
       } else if (response.backup.downloadMode === 'file' && response.backup.filename) {
         const downloadUrl = `/api/admin/backup/download/${response.backup.filename}`
@@ -685,7 +655,7 @@ const createBackup = async () => {
           method: 'GET',
           credentials: 'include'
         })
-        if (!downloadResponse.ok) throw new Error(getErrorMessage('downloadFailed', downloadResponse.status))
+        if (!downloadResponse.ok) throw new Error(`下载失败: ${downloadResponse.status}`)
         const blob = await downloadResponse.blob()
         const url = URL.createObjectURL(blob)
         const a = document.createElement('a')
@@ -695,25 +665,25 @@ const createBackup = async () => {
         a.click()
         document.body.removeChild(a)
         URL.revokeObjectURL(url)
-        showNotification(getMessage('backupDownloaded'), 'success')
+        showNotification('备份文件已下载', 'success')
         activeModal.value = 'none'
       }
     } else {
-      throw new Error(response.message || getErrorMessage('createBackupFailed'))
+      throw new Error(response.message || '备份创建失败')
     }
   } catch (error) {
-    console.error(getLogMessage('createBackupFailed'), error)
-    showNotification(getErrorMessage('createBackupFailedWithMessage', error?.message), 'error')
+    console.error('创建备份失败:', error)
+    showNotification('创建备份失败: ' + error.message, 'error')
   } finally {
     createLoading.value = false
   }
 }
 
 const restoreBackup = async () => {
-  if (!selectedFile.value) return showNotification(getMessage('selectBackupFile'), 'error')
+  if (!selectedFile.value) return showNotification('请选择备份文件', 'error')
 
   uploadLoading.value = true
-  restoreProgress.value = getProgressMessage('readingFile')
+  restoreProgress.value = '正在读取文件...'
 
   try {
     const fileContent = await selectedFile.value.text()
@@ -721,10 +691,10 @@ const restoreBackup = async () => {
     try {
       backupData = JSON.parse(fileContent)
     } catch {
-      throw new Error(getErrorMessage('invalidBackupFormat'))
+      throw new Error('无法解析备份文件，文件格式不正确')
     }
 
-    if (!backupData.data) throw new Error(getErrorMessage('missingBackupData'))
+    if (!backupData.data) throw new Error('备份文件缺少数据部分')
     const fileHasSuperAdmin = hasSuperAdminInBackup.value
     if (!fileHasSuperAdmin) {
       restoreForm.value.overwriteSuperAdmin = false
@@ -734,7 +704,7 @@ const restoreBackup = async () => {
     let temporaryPreservedUserId = null
 
     if (restoreForm.value.mode === 'replace') {
-      restoreProgress.value = getProgressMessage('clearingData')
+      restoreProgress.value = '正在清空现有数据...'
       const clearResult = await $fetch('/api/admin/backup/clear', {
         method: 'POST',
         body: {
@@ -742,7 +712,7 @@ const restoreBackup = async () => {
           hasSuperAdminInBackup: fileHasSuperAdmin
         }
       })
-      if (!clearResult.success) throw new Error(clearResult.message || getErrorMessage('clearDataFailed'))
+      if (!clearResult.success) throw new Error(clearResult.message || '清空数据失败')
       preservedSuperAdminIds = clearResult.preservedSuperAdminIds || []
       temporaryPreservedUserId = clearResult.temporaryPreservedUserId || null
     }
@@ -754,7 +724,6 @@ const restoreBackup = async () => {
       'semesters',
       'playTimes',
       'songs',
-      'scheduleSongPool',
       'votes',
       'schedules',
       'notificationSettings',
@@ -788,14 +757,7 @@ const restoreBackup = async () => {
       for (let i = 0; i < records.length; i += CHUNK_SIZE) {
         const chunk = records.slice(i, i + CHUNK_SIZE)
         const progressPercent = Math.round((totalProcessed / totalRecords) * 100)
-        restoreProgress.value = getProgressMessage(
-          'restoringTable',
-          tableName,
-          i + 1,
-          Math.min(i + CHUNK_SIZE, records.length),
-          records.length,
-          progressPercent
-        )
+        restoreProgress.value = `正在恢复 ${tableName} (${i + 1}-${Math.min(i + CHUNK_SIZE, records.length)}/${records.length}) ${progressPercent}%`
 
         const response = await $fetch('/api/admin/backup/restore-chunk', {
           method: 'POST',
@@ -809,7 +771,7 @@ const restoreBackup = async () => {
           }
         })
 
-        if (!response.success) throw new Error(response.message || getErrorMessage('restoreTableFailed', tableName))
+        if (!response.success) throw new Error(response.message || `恢复表 ${tableName} 失败`)
         if (response.newMappings) {
           if (response.newMappings.users) Object.assign(mappings.users, response.newMappings.users)
           if (response.newMappings.songs) Object.assign(mappings.songs, response.newMappings.songs)
@@ -818,21 +780,21 @@ const restoreBackup = async () => {
       }
     }
 
-    restoreProgress.value = getProgressMessage('fixingSequence')
+    restoreProgress.value = '正在修复数据表序列...'
     const sequenceResult = await $fetch('/api/admin/fix-sequence', {
       method: 'POST',
       body: { table: 'all' }
     })
     if (!sequenceResult.success) {
-      throw new Error(sequenceResult.message || sequenceResult.error || getErrorMessage('fixSequenceFailed'))
+      throw new Error(sequenceResult.message || sequenceResult.error || '序列修复失败')
     }
 
-    restoreProgress.value = getProgressMessage('reloadingSmtp')
+    restoreProgress.value = '正在重载SMTP配置...'
     const smtpReloadResult = await $fetch('/api/admin/smtp/reload', {
       method: 'POST'
     })
     if (!smtpReloadResult.success) {
-      throw new Error(smtpReloadResult.message || getErrorMessage('smtpReloadFailed'))
+      throw new Error(smtpReloadResult.message || 'SMTP配置重载失败')
     }
 
     const shouldFinalizeTempUser =
@@ -844,7 +806,7 @@ const restoreBackup = async () => {
     if (shouldFinalizeTempUser) {
       const restoredUserIds = Object.values(mappings.users).map((id) => Number(id))
       if (!restoredUserIds.includes(Number(temporaryPreservedUserId))) {
-        restoreProgress.value = getProgressMessage('finalizingAdmin')
+        restoreProgress.value = '正在完成管理员替换...'
         await $fetch('/api/admin/backup/clear', {
           method: 'POST',
           body: {
@@ -852,7 +814,7 @@ const restoreBackup = async () => {
           }
         })
       }
-      showNotification(getMessage('restoreSuccessRelogin'), 'success')
+      showNotification('数据库恢复成功，正在重新登录', 'success')
       activeModal.value = 'none'
       setTimeout(() => {
         if (auth.logout) {
@@ -865,11 +827,11 @@ const restoreBackup = async () => {
       return
     }
 
-    showNotification(getMessage('restoreSuccess'), 'success')
+    showNotification('数据库恢复成功', 'success')
     activeModal.value = 'none'
   } catch (error) {
-    console.error(getLogMessage('restoreBackupFailed'), error)
-    showNotification(getErrorMessage('restoreBackupFailedWithMessage', error?.message), 'error')
+    console.error('恢复备份失败:', error)
+    showNotification('恢复备份失败: ' + error.message, 'error')
   } finally {
     uploadLoading.value = false
     restoreProgress.value = ''
@@ -880,19 +842,20 @@ const resetSequence = async () => {
   if (!sequenceForm.value.table) return
   sequenceLoading.value = true
   try {
+    const tableValue = labelToValueMap[sequenceForm.value.table] || sequenceForm.value.table
     const response = await $fetch('/api/admin/fix-sequence', {
       method: 'POST',
-      body: { table: sequenceForm.value.table }
+      body: { table: tableValue }
     })
     if (response.success) {
-      showNotification(response.message || getMessage('sequenceResetSuccess'), 'success')
+      showNotification(response.message || '序列重置成功', 'success')
       activeModal.value = 'none'
     } else {
-      throw new Error(response.error || response.message || getErrorMessage('resetFailed'))
+      throw new Error(response.error || response.message || '重置失败')
     }
   } catch (error) {
-    console.error(getLogMessage('resetSequenceFailed'), error)
-    showNotification(getErrorMessage('resetSequenceFailedWithMessage', error?.message), 'error')
+    console.error('重置序列失败:', error)
+    showNotification('重置序列失败: ' + error.message, 'error')
   } finally {
     sequenceLoading.value = false
   }
@@ -904,15 +867,15 @@ const resetDatabase = async () => {
   try {
     const response = await $fetch('/api/admin/database/reset', { method: 'POST' })
     if (response.success) {
-      showNotification(getMessage('databaseResetSuccess'), 'success')
+      showNotification('数据库已成功重置', 'success')
       activeModal.value = 'none'
       setTimeout(() => window.location.reload(), 1500)
     } else {
-      throw new Error(response.message || getErrorMessage('resetFailed'))
+      throw new Error(response.message || '重置失败')
     }
   } catch (error) {
-    console.error(getLogMessage('resetDatabaseFailed'), error)
-    showNotification(getErrorMessage('resetDatabaseFailedWithMessage', error?.message), 'error')
+    console.error('重置数据库失败:', error)
+    showNotification('重置数据库失败: ' + error.message, 'error')
   } finally {
     resetLoading.value = false
   }
diff --git a/app/components/Admin/EmailTemplateManager.vue b/app/components/Admin/EmailTemplateManager.vue
index f4b8d5a..a995f31 100644
--- a/app/components/Admin/EmailTemplateManager.vue
+++ b/app/components/Admin/EmailTemplateManager.vue
@@ -1,48 +1,48 @@
 <template>
-  <div class="bg-bg-secondary-30 border border-border-secondary rounded-[2rem] overflow-hidden">
+  <div class="bg-zinc-900/30 border border-zinc-800 rounded-[2rem] overflow-hidden">
     <!-- 头部 -->
-    <div class="flex items-center justify-between p-6 border-b border-border-secondary bg-bg-secondary-20">
+    <div class="flex items-center justify-between p-6 border-b border-zinc-800 bg-zinc-900/20">
       <div class="flex items-center gap-3">
         <div
-          class="w-10 h-10 rounded-2xl bg-primary-hover-10 flex items-center justify-center border border-primary-20"
+          class="w-10 h-10 rounded-2xl bg-blue-600/10 flex items-center justify-center border border-blue-500/20"
         >
-          <Mail :size="20" class="text-primary" />
+          <Mail :size="20" class="text-blue-500" />
         </div>
         <div>
-          <h3 class="text-sm font-black text-text-primary uppercase tracking-widest">{{ locale.title }}</h3>
-          <p class="text-[10px] text-text-tertiary mt-0.5">{{ locale.desc }}</p>
+          <h3 class="text-sm font-black text-zinc-100 uppercase tracking-widest">邮件模板管理</h3>
+          <p class="text-[10px] text-zinc-500 mt-0.5">自定义系统邮件的主题与内容，支持变量替换</p>
         </div>
       </div>
       <div class="flex items-center gap-3">
         <button
           v-if="selected"
-          class="flex items-center gap-2 px-4 py-2 bg-bg-secondary border border-border-secondary hover:border-border-tertiary text-text-tertiary text-[11px] font-bold rounded-xl transition-all"
+          class="flex items-center gap-2 px-4 py-2 bg-zinc-900 border border-zinc-800 hover:border-zinc-700 text-zinc-400 text-[11px] font-bold rounded-xl transition-all"
           :disabled="saving"
           @click="doPreview"
         >
-          <Eye :size="14" /> {{ previewHtml ? locale.refreshPreview : locale.livePreview }}
+          <Eye :size="14" /> {{ previewHtml ? '刷新预览' : '实时预览' }}
         </button>
         <button
           v-if="selected"
-          class="flex items-center gap-2 px-6 py-2 bg-primary-hover hover:bg-primary text-text-primary text-[11px] font-bold rounded-xl shadow-lg shadow-[var(--primary-glow)] transition-all active:scale-95"
+          class="flex items-center gap-2 px-6 py-2 bg-blue-600 hover:bg-blue-500 text-white text-[11px] font-bold rounded-xl shadow-lg shadow-blue-900/20 transition-all active:scale-95"
           :disabled="saving"
           @click="save"
         >
-          <Save :size="14" /> {{ saving ? locale.saving : locale.updateTemplate }}
+          <Save :size="14" /> {{ saving ? '保存中...' : '更新模板' }}
         </button>
       </div>
     </div>
 
     <div class="grid grid-cols-1 lg:grid-cols-12 min-h-[650px]">
       <!-- 左侧：模板列表 -->
-      <div class="lg:col-span-3 border-r border-border-secondary bg-bg-secondary-10 flex flex-col">
-        <div class="p-4 border-b border-border-secondary-50">
+      <div class="lg:col-span-3 border-r border-zinc-800 bg-zinc-900/10 flex flex-col">
+        <div class="p-4 border-b border-zinc-800/50">
           <div class="relative">
-            <Search :size="14" class="absolute left-3 top-1/2 -translate-y-1/2 text-text-disabled" />
+            <Search :size="14" class="absolute left-3 top-1/2 -translate-y-1/2 text-zinc-600" />
             <input
               type="text"
-              :placeholder="locale.searchPlaceholder"
-              class="w-full bg-bg-primary border border-border-secondary rounded-lg pl-9 pr-3 py-2 text-[10px] text-text-tertiary focus:outline-none focus:border-primary-30"
+              placeholder="搜索模板..."
+              class="w-full bg-zinc-950 border border-zinc-800 rounded-lg pl-9 pr-3 py-2 text-[10px] text-zinc-400 focus:outline-none focus:border-blue-500/30"
             >
           </div>
         </div>
@@ -53,8 +53,8 @@
             class="w-full group flex flex-col gap-1 p-3 rounded-2xl transition-all text-left border"
             :class="[
               selectedKey === t.key
-                ? 'bg-primary-hover-10 border-primary-20'
-                : 'bg-transparent border-transparent hover:bg-bg-tertiary-40'
+                ? 'bg-blue-600/10 border-blue-500/20'
+                : 'bg-transparent border-transparent hover:bg-zinc-800/40'
             ]"
             @click="select(t)"
           >
@@ -63,8 +63,8 @@
                 class="text-[11px] font-black tracking-tight transition-colors"
                 :class="
                   selectedKey === t.key
-                    ? 'text-primary'
-                    : 'text-text-secondary group-hover:text-text-primary'
+                    ? 'text-blue-400'
+                    : 'text-zinc-300 group-hover:text-zinc-100'
                 "
               >
                 {{ t.name }}
@@ -72,69 +72,67 @@
               <div class="flex gap-1">
                 <span
                   v-if="t.isBuiltin && !t.isOverridden"
-                  class="px-1.5 py-0.5 rounded-md bg-bg-tertiary text-[8px] font-black text-text-tertiary uppercase tracking-tighter"
+                  class="px-1.5 py-0.5 rounded-md bg-zinc-800 text-[8px] font-black text-zinc-500 uppercase tracking-tighter"
                 >
-                  {{ locale.builtin }}
+                  内置
                 </span>
                 <span
                   v-if="t.isOverridden"
-                  class="px-1.5 py-0.5 rounded-md bg-success-10 text-[8px] font-black text-success uppercase tracking-tighter"
+                  class="px-1.5 py-0.5 rounded-md bg-emerald-500/10 text-[8px] font-black text-emerald-500 uppercase tracking-tighter"
                 >
-                  {{ locale.custom }}
+                  自定义
                 </span>
               </div>
             </div>
-            <span class="text-[9px] font-bold text-text-disabled font-mono">{{ t.key }}</span>
+            <span class="text-[9px] font-bold text-zinc-600 font-mono">{{ t.key }}</span>
           </button>
         </div>
       </div>
 
       <!-- 右侧：编辑器区域 -->
-      <div class="lg:col-span-9 flex flex-col bg-bg-primary-20 overflow-hidden">
+      <div class="lg:col-span-9 flex flex-col bg-zinc-950/20 overflow-hidden">
         <div v-if="selected" class="flex-1 overflow-y-auto custom-scrollbar p-8">
           <div class="max-w-4xl mx-auto space-y-8">
             <!-- 基础信息与主题 -->
             <div class="grid grid-cols-1 md:grid-cols-2 gap-6">
               <div class="space-y-2">
-                <div class="flex items-center justify-between px-1">
-                  <label class="text-[10px] font-black text-text-disabled uppercase tracking-widest"
-                    >{{ locale.templateName }}</label
-                  >
-                </div>
+                <label class="text-[10px] font-black text-zinc-600 uppercase tracking-widest px-1"
+                  >模板名称</label
+                >
                 <input
                   v-model="form.name"
                   type="text"
-                  class="h-11 w-full bg-bg-primary border border-border-secondary rounded-xl px-4 py-3 text-xs text-text-primary focus:outline-none focus:border-primary-30"
+                  class="w-full bg-zinc-950 border border-zinc-800 rounded-xl px-4 py-3 text-xs text-zinc-200 focus:outline-none focus:border-blue-500/30"
                 >
               </div>
               <div class="space-y-2">
                 <div class="flex items-center justify-between px-1">
-                  <label class="text-[10px] font-black text-text-disabled uppercase tracking-widest"
-                    >{{ locale.emailSubject }}</label
+                  <label class="text-[10px] font-black text-zinc-600 uppercase tracking-widest"
+                    >邮件主题</label
                   >
-                  <span class="text-[9px] text-text-tertiary font-bold uppercase">{{ locale.supportsVariables }}</span>
+                  <span class="text-[9px] text-zinc-500 font-bold uppercase">支持变量</span>
                 </div>
                 <input
                   v-model="form.subject"
                   type="text"
-                  :placeholder="locale.subjectPlaceholder"
-                  class="h-11 w-full bg-bg-primary border border-border-secondary rounded-xl px-4 py-3 text-xs text-text-primary focus:outline-none focus:border-primary-30"
+                  placeholder="请输入邮件主题..."
+                  class="w-full bg-zinc-950 border border-zinc-800 rounded-xl px-4 py-3 text-xs text-zinc-200 focus:outline-none focus:border-blue-500/30"
                 >
               </div>
             </div>
 
             <!-- 变量提示 -->
-            <div class="bg-primary-hover-5 border border-primary-10 rounded-2xl p-4 flex gap-4">
+            <div class="bg-blue-600/5 border border-blue-500/10 rounded-2xl p-4 flex gap-4">
               <div
-                class="w-8 h-8 rounded-xl bg-primary-10 flex items-center justify-center shrink-0"
+                class="w-8 h-8 rounded-xl bg-blue-500/10 flex items-center justify-center shrink-0"
               >
-                <Info :size="16" class="text-primary" />
+                <Info :size="16" class="text-blue-500" />
               </div>
               <div class="space-y-1">
-                <h4 class="text-[10px] font-black text-primary uppercase tracking-widest">
-                  {{ locale.availableVariables }}
+                <h4 class="text-[10px] font-black text-blue-400 uppercase tracking-widest">
+                  可用变量
                 </h4>
-                <p class="text-[11px] text-text-tertiary leading-relaxed font-mono">
+                <p class="text-[11px] text-zinc-500 leading-relaxed font-mono">
                   <template v-if="selected.key === 'verification.code'">
                     <span v-pre>{{ name }}, {{ email }}, {{ code }}, {{ expiresInMinutes }}</span>
                   </template>
@@ -149,32 +147,32 @@
             <div class="space-y-3">
               <div class="flex items-center justify-between px-1">
                 <div class="flex items-center gap-2">
-                  <label class="text-[10px] font-black text-text-disabled uppercase tracking-widest"
-                    >{{ locale.htmlContent }}</label
+                  <label class="text-[10px] font-black text-zinc-600 uppercase tracking-widest"
+                    >HTML 内容</label
                   >
                   <span
-                    class="px-2 py-0.5 rounded-md bg-bg-secondary text-[8px] font-black text-text-tertiary uppercase"
+                    class="px-2 py-0.5 rounded-md bg-zinc-900 text-[8px] font-black text-zinc-500 uppercase"
                     >Handlebars</span
                   >
                 </div>
                 <button
                   v-if="selected.isOverridden"
-                  class="flex items-center gap-1.5 text-[10px] font-bold text-error hover:text-error transition-colors"
+                  class="flex items-center gap-1.5 text-[10px] font-bold text-rose-500 hover:text-rose-400 transition-colors"
                   @click="restore"
                 >
-                  <RotateCcw :size="12" /> {{ locale.restoreDefault }}
+                  <RotateCcw :size="12" /> 恢复默认配置
                 </button>
               </div>
               <div class="relative group">
                 <div
-                  class="absolute right-4 top-4 p-2 rounded-lg bg-bg-secondary-50 border border-border-secondary opacity-0 group-hover:opacity-100 transition-opacity flex items-center justify-center"
+                  class="absolute right-4 top-4 p-2 rounded-lg bg-zinc-900/50 border border-zinc-800 opacity-0 group-hover:opacity-100 transition-opacity"
                 >
-                  <Code :size="14" class="text-text-tertiary" />
+                  <Code :size="14" class="text-zinc-500" />
                 </div>
                 <textarea
                   v-model="form.html"
                   rows="16"
-                  class="w-full bg-bg-primary border border-border-secondary rounded-2xl p-6 text-[11px] text-text-secondary font-mono leading-relaxed focus:outline-none focus:border-primary-30 custom-scrollbar"
+                  class="w-full bg-zinc-950 border border-zinc-800 rounded-2xl p-6 text-[11px] text-zinc-300 font-mono leading-relaxed focus:outline-none focus:border-blue-500/30 custom-scrollbar"
                   placeholder="<html>..."
                 />
               </div>
@@ -186,22 +184,22 @@
               enter-from-class="transform translate-y-4 opacity-0"
               enter-to-class="transform translate-y-0 opacity-100"
             >
-              <div v-if="previewHtml" class="space-y-4 pt-4 border-t border-border-secondary">
+              <div v-if="previewHtml" class="space-y-4 pt-4 border-t border-zinc-800">
                 <div class="flex items-center justify-between px-1">
                   <label
-                    class="text-[10px] font-black text-text-disabled uppercase tracking-widest flex items-center gap-2"
+                    class="text-[10px] font-black text-zinc-600 uppercase tracking-widest flex items-center gap-2"
                   >
-                    <Eye :size="14" /> {{ locale.livePreviewLabel }}
-                    <span class="text-text-tertiary font-normal normal-case">{{ previewSubject }}</span>
+                    <Eye :size="14" /> 实时预览:
+                    <span class="text-zinc-400 font-normal normal-case">{{ previewSubject }}</span>
                   </label>
                   <button
-                    class="text-[10px] font-bold text-text-tertiary hover:text-text-secondary"
+                    class="text-[10px] font-bold text-zinc-500 hover:text-zinc-300"
                     @click="previewHtml = ''"
                   >
-                    {{ locale.hidePreview }}
+                    隐藏预览
                   </button>
                 </div>
-                <div class="rounded-2xl overflow-hidden border border-border-secondary bg-bg-secondary shadow-2xl">
+                <div class="rounded-2xl overflow-hidden border border-zinc-800 bg-white shadow-2xl">
                   <iframe :srcdoc="previewHtml" class="w-full h-[500px] border-none" />
                 </div>
               </div>
@@ -212,14 +210,14 @@
         <!-- 空状态 -->
         <div
           v-else
-          class="flex-1 flex flex-col items-center justify-center text-text-secondary space-y-4"
+          class="flex-1 flex flex-col items-center justify-center text-zinc-700 space-y-4"
         >
           <div
-            class="w-16 h-16 rounded-3xl bg-bg-secondary-50 flex items-center justify-center border border-border-secondary-50"
+            class="w-16 h-16 rounded-3xl bg-zinc-900/50 flex items-center justify-center border border-zinc-800/50"
           >
-            <Mail :size="32" class="text-text-primary" />
+            <Mail :size="32" class="text-zinc-800" />
           </div>
-          <p class="text-xs font-bold tracking-widest uppercase">{{ locale.emptySelectTemplate }}</p>
+          <p class="text-xs font-bold tracking-widest uppercase">请在左侧选择一个邮件模板</p>
         </div>
       </div>
     </div>
@@ -229,7 +227,6 @@
 <script lang="ts" setup>
 import { computed, onMounted, ref } from 'vue'
 import { useToast } from '~/composables/useToast'
-import { useLocale } from '~/utils/locale'
 import { Mail, Info, Save, RotateCcw, Eye, Code, Search, ChevronRight } from '@lucide/vue'
 
 type TemplateItem = {
@@ -242,18 +239,6 @@ type TemplateItem = {
 }
 
 const { success, error } = useToast()
-const { admin } = useLocale()
-const locale = computed(() => {
-  const base = admin.value?.emailTemplateManager || {}
-  return {
-    ...base,
-    messages: { ...(base.messages || {}) },
-    errors: { ...(base.errors || {}) }
-  }
-})
-const getLocaleText = (section: string, key: string, fallback = '') => {
-  return locale.value?.[section]?.[key] || fallback
-}
 const templates = ref<TemplateItem[]>([])
 const selectedKey = ref<string>('')
 const form = ref<{ key: string; name: string; subject: string; html: string }>({
@@ -293,10 +278,10 @@ async function save() {
   try {
     saving.value = true
     await $fetch('/api/admin/email-templates', { method: 'POST', body: form.value })
-    success(getLocaleText('messages', 'saved', '模板已保存'))
+    success('模板已保存')
     await loadList()
   } catch (e: any) {
-    error(e?.data?.message || getLocaleText('errors', 'saveFailed', '保存失败'))
+    error(e?.data?.message || '保存失败')
   } finally {
     saving.value = false
   }
@@ -308,10 +293,10 @@ async function restore() {
     await $fetch(`/api/admin/email-templates?key=${encodeURIComponent(form.value.key)}`, {
       method: 'DELETE'
     })
-    success(getLocaleText('messages', 'restored', '已恢复默认模板'))
+    success('已恢复默认模板')
     await loadList()
   } catch (e: any) {
-    error(e?.data?.message || getLocaleText('errors', 'restoreFailed', '恢复失败'))
+    error(e?.data?.message || '恢复失败')
   } finally {
     saving.value = false
   }
@@ -321,15 +306,10 @@ async function doPreview() {
   try {
     const defaultData =
       form.value.key === 'verification.code'
-        ? {
-            name: locale.value?.previewData?.name || 'Example User',
-            email: 'example@school.edu',
-            code: '123456',
-            expiresInMinutes: 5
-          }
+        ? { name: '张三', email: 'example@school.edu', code: '123456', expiresInMinutes: 5 }
         : {
-            title: locale.value?.previewData?.title || 'System Notification',
-            message: locale.value?.previewData?.message || 'This is preview content.\nLine breaks and links are supported.',
+            title: '系统通知',
+            message: '这是一条预览内容\n支持换行与链接',
             actionUrl: 'https://example.com'
           }
     const res = await $fetch('/api/admin/email-templates/preview', {
@@ -339,7 +319,7 @@ async function doPreview() {
     previewHtml.value = res.html
     previewSubject.value = res.subject
   } catch (e: any) {
-    error(e?.data?.message || getLocaleText('errors', 'previewFailed', '预览失败'))
+    error(e?.data?.message || '预览失败')
   }
 }
 
@@ -356,10 +336,10 @@ onMounted(() => {
   background: transparent;
 }
 .custom-scrollbar::-webkit-scrollbar-thumb {
-  background: var(--panel-bg-alt);
+  background: var(--bg-tertiary, #27272a);
   border-radius: 10px;
 }
 .custom-scrollbar::-webkit-scrollbar-thumb:hover {
-  background: var(--panel-bg-hover);
+  background: #3f3f46;
 }
 </style>
diff --git a/app/components/Admin/ExpectedPlayDates.vue b/app/components/Admin/ExpectedPlayDates.vue
new file mode 100644
index 0000000..301398c
--- /dev/null
+++ b/app/components/Admin/ExpectedPlayDates.vue
@@ -0,0 +1,540 @@
+<template>
+  <div class="space-y-6">
+    <div class="flex justify-between items-center">
+      <h3 class="text-lg font-bold text-zinc-100 flex items-center gap-2">
+        <CalendarDays class="w-5 h-5 text-blue-400" />
+        期望播出时段设置
+      </h3>
+      <button
+        class="px-4 py-2 bg-blue-600 hover:bg-blue-500 text-white rounded-lg text-sm font-bold transition-colors"
+        @click="openAddModal"
+      >
+        新增开放日期
+      </button>
+    </div>
+
+    <div v-if="loading" class="text-center py-10">
+      <Loader2 class="w-6 h-6 animate-spin mx-auto text-zinc-500" />
+    </div>
+
+    <div v-else-if="dates.length === 0" class="text-center py-10 text-zinc-500 bg-zinc-900/50 rounded-xl border border-zinc-800">
+      暂未设置任何开放日期
+    </div>
+
+    <div v-else class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
+      <div v-for="date in dates" :key="date.id" class="bg-zinc-900 border border-zinc-800 rounded-xl p-4 flex flex-col gap-3">
+          <div class="flex justify-between items-start">
+          <div class="font-bold text-zinc-100 flex items-center gap-2">
+            {{ date.date }}
+            <span class="text-xs font-normal text-zinc-500 bg-zinc-800 px-2 py-0.5 rounded">{{ date.weekday }}</span>
+          </div>
+          <button @click="openDeleteDialog(date)" class="text-red-400 hover:text-red-300 p-1 transition-colors" title="删除">
+            <Trash2 class="w-4 h-4" />
+          </button>
+        </div>
+        
+        <div class="flex flex-col gap-2.5 bg-zinc-950/50 p-3 rounded-lg border border-zinc-800/50">
+          <div class="flex items-center justify-between">
+            <div class="text-xs text-zinc-500">开放范围</div>
+            <div class="text-xs font-mono text-blue-400 font-medium break-all text-right ml-4">{{ formatSequences(date.availableSequences) }}</div>
+          </div>
+          
+          <div class="flex items-center justify-between">
+            <div class="text-xs text-zinc-500">序号状态</div>
+            <div class="text-xs flex gap-2">
+              <span class="text-emerald-500 bg-emerald-500/10 px-1.5 py-0.5 rounded border border-emerald-500/20">空闲 {{ getAvailableCount(date) }}</span>
+              <span class="text-zinc-400 bg-zinc-800 px-1.5 py-0.5 rounded border border-zinc-700">共 {{ getTotalCount(date) }}</span>
+            </div>
+          </div>
+        </div>
+        
+        <!-- 新增详细占用情况列表 -->
+        <div v-if="date.takenSequences && date.takenSequences.length > 0" class="mt-1 pt-3 border-t border-zinc-800">
+          <div class="text-xs font-bold text-zinc-500 mb-2 flex items-center justify-between">
+            <span>已占用明细</span>
+            <span class="text-red-400">{{ date.takenSequences.length }} 个</span>
+          </div>
+          <div class="space-y-1.5 max-h-32 overflow-y-auto pr-1 custom-scrollbar">
+            <div 
+              v-for="seq in date.takenSequences" 
+              :key="seq"
+              class="flex items-center gap-2 text-[11px]"
+            >
+              <span class="w-5 h-5 rounded flex items-center justify-center bg-red-500/10 text-red-500 font-bold border border-red-500/20 shrink-0">{{ seq }}</span>
+              <span class="text-zinc-300 truncate" :title="date.takenDetails?.[seq]?.title">{{ date.takenDetails?.[seq]?.title || '未知歌曲' }}</span>
+              <span class="text-zinc-500 truncate" :title="date.takenDetails?.[seq]?.artist">- {{ date.takenDetails?.[seq]?.artist || '未知歌手' }}</span>
+            </div>
+          </div>
+        </div>
+        <div v-else class="mt-2 pt-3 border-t border-zinc-800 text-xs text-emerald-500/70 font-bold">
+          所有序号目前空闲
+        </div>
+      </div>
+    </div>
+
+    <!-- 新增/编辑弹窗 -->
+    <div v-if="showModal" class="fixed inset-0 z-50 flex items-center justify-center bg-black/60 backdrop-blur-sm">
+      <div class="bg-zinc-900 border border-zinc-800 rounded-xl shadow-2xl w-full max-w-lg p-6">
+        <div class="flex justify-between items-center mb-6">
+          <h3 class="text-lg font-bold text-zinc-100">新增开放日期</h3>
+        </div>
+
+        <!-- Tabs -->
+        <div class="flex p-1 bg-zinc-950 rounded-lg mb-6">
+          <button 
+            @click="activeTab = 'auto'"
+            :class="['flex-1 py-2 text-xs font-bold rounded-md transition-colors', activeTab === 'auto' ? 'bg-blue-600 text-white' : 'text-zinc-500 hover:text-zinc-300']"
+          >
+            批量自动分配
+          </button>
+          <button 
+            @click="activeTab = 'manual'; nextTick(() => { setTimeout(() => { setStartSeq(manualFormData.startSeq); setEndSeq(manualFormData.endSeq) }, 100) })"
+            :class="['flex-1 py-2 text-xs font-bold rounded-md transition-colors', activeTab === 'manual' ? 'bg-blue-600 text-white' : 'text-zinc-500 hover:text-zinc-300']"
+          >
+            手动配置单日
+          </button>
+        </div>
+
+        <!-- 自动分配表单 -->
+        <div v-if="activeTab === 'auto'" class="space-y-4">
+          <div>
+            <label class="block text-xs font-bold text-zinc-500 mb-2">选择播出日期 (可多选)</label>
+            <AdminMultiDatePicker v-model="autoFormData.dates" />
+            <p class="text-[10px] text-zinc-600 mt-1">已选择 {{ autoFormData.dates.length }} 天</p>
+          </div>
+          <div>
+            <label class="block text-xs font-bold text-zinc-500 mb-1">总序号数量</label>
+            <input type="number" min="1" v-model="autoFormData.totalSequences" class="w-full bg-zinc-950 border border-zinc-800 rounded-lg px-3 py-2 text-zinc-200">
+            <div class="flex items-center gap-2 mt-2">
+              <button @click="autoFormData.totalSequences = 21" class="text-[10px] px-2 py-1 bg-zinc-800 hover:bg-zinc-700 text-zinc-300 rounded transition-colors">21</button>
+              <button @click="autoFormData.totalSequences = 28" class="text-[10px] px-2 py-1 bg-zinc-800 hover:bg-zinc-700 text-zinc-300 rounded transition-colors">28</button>
+              <button @click="autoFormData.totalSequences = 35" class="text-[10px] px-2 py-1 bg-zinc-800 hover:bg-zinc-700 text-zinc-300 rounded transition-colors">35</button>
+            </div>
+          </div>
+          <div class="p-3 bg-blue-500/10 border border-blue-500/20 rounded-lg">
+            <p class="text-xs text-blue-400 font-bold mb-1">自动分配预览：</p>
+            <p class="text-[10px] text-blue-300/80">
+              <span v-if="autoFormData.dates.length === 0">请先选择日期</span>
+              <span v-else>将会把 1 - {{ autoFormData.totalSequences }} 号平均分配到选中的 {{ autoFormData.dates.length }} 天中。每天约 {{ Math.ceil(autoFormData.totalSequences / autoFormData.dates.length) }} 个序号。</span>
+            </p>
+          </div>
+          <div class="flex gap-3 pt-4">
+            <button @click="showModal = false" class="flex-1 py-2 bg-zinc-800 text-zinc-300 rounded-lg text-sm font-bold">取消</button>
+            <button @click="saveAuto" :disabled="saving || autoFormData.dates.length === 0" class="flex-1 py-2 bg-blue-600 text-white rounded-lg text-sm font-bold disabled:opacity-50">批量保存</button>
+          </div>
+        </div>
+
+        <!-- 手动配置表单 -->
+        <div v-else class="space-y-4">
+          <div>
+            <label class="block text-xs font-bold text-zinc-500 mb-2">选择日期 (单选)</label>
+            <AdminDatePicker v-model="manualFormData.date" />
+          </div>
+          <div>
+            <label class="block text-xs font-bold text-zinc-500 mb-1">开放的空闲序号</label>
+            
+            <div class="flex flex-col items-center bg-zinc-950 border border-zinc-800 rounded-xl p-4">
+              <!-- 模拟 iOS 滚轮 (这里用简化的网格选择代替复杂的滚轮组件以保证稳定性和易用性) -->
+              <div class="text-sm font-bold text-zinc-400 mb-3 w-full flex justify-between items-center">
+                <span>选择开放范围</span>
+                <span class="text-blue-400">{{ manualFormData.startSeq }} - {{ manualFormData.endSeq }}</span>
+              </div>
+              
+              <div class="flex gap-4 items-center w-full justify-center py-4">
+                <div class="flex flex-col items-center flex-1">
+                  <span class="text-[10px] text-zinc-500 mb-2">起始序号</span>
+                  <div ref="startScrollRef" class="relative w-full h-32 bg-zinc-900 border border-zinc-700 rounded-lg overflow-hidden snap-y snap-mandatory hide-scrollbar" style="scroll-behavior: smooth;" @scroll="handleStartScroll">
+                    <div class="absolute top-1/2 left-0 right-0 h-10 -mt-5 bg-blue-500/10 border-y border-blue-500/30 pointer-events-none z-10"></div>
+                    <div class="h-[44px]"></div> <!-- Padding top -->
+                    <div 
+                      v-for="n in 100" 
+                      :key="'start-'+n" 
+                      class="h-10 flex items-center justify-center text-lg font-bold snap-center cursor-pointer transition-colors"
+                      :class="manualFormData.startSeq === n ? 'text-blue-400' : 'text-zinc-500 hover:text-zinc-300'"
+                      @click="setStartSeq(n)"
+                      :data-val="n"
+                    >
+                      {{ n }}
+                    </div>
+                    <div class="h-[44px]"></div> <!-- Padding bottom -->
+                  </div>
+                </div>
+                
+                <span class="text-zinc-500 font-bold">至</span>
+                
+                <div class="flex flex-col items-center flex-1">
+                  <span class="text-[10px] text-zinc-500 mb-2">结束序号</span>
+                  <div ref="endScrollRef" class="relative w-full h-32 bg-zinc-900 border border-zinc-700 rounded-lg overflow-hidden snap-y snap-mandatory hide-scrollbar" style="scroll-behavior: smooth;" @scroll="handleEndScroll">
+                    <div class="absolute top-1/2 left-0 right-0 h-10 -mt-5 bg-blue-500/10 border-y border-blue-500/30 pointer-events-none z-10"></div>
+                    <div class="h-[44px]"></div> <!-- Padding top -->
+                    <div 
+                      v-for="n in 100" 
+                      :key="'end-'+n" 
+                      class="h-10 flex items-center justify-center text-lg font-bold snap-center cursor-pointer transition-colors"
+                      :class="manualFormData.endSeq === n ? 'text-blue-400' : 'text-zinc-500 hover:text-zinc-300'"
+                      @click="setEndSeq(n)"
+                      :data-val="n"
+                    >
+                      {{ n }}
+                    </div>
+                    <div class="h-[44px]"></div> <!-- Padding bottom -->
+                  </div>
+                </div>
+              </div>
+
+              <!-- 如果有特定跳过的序号，保留文本框以供进阶编辑 -->
+              <div class="w-full mt-4">
+                <div 
+                  class="flex justify-between items-center text-[10px] text-zinc-500 cursor-pointer py-2 hover:text-zinc-300 transition-colors"
+                  @click="showAdvancedManual = !showAdvancedManual"
+                >
+                  <span>进阶：自定义跳过某些序号</span>
+                  <span :class="{'rotate-180': showAdvancedManual}" class="transition-transform">▼</span>
+                </div>
+                
+                <div v-if="showAdvancedManual" class="mt-2">
+                  <textarea v-model="manualFormData.sequences" rows="2" placeholder="例如: 1,2,3,5 (跳过了4)" class="w-full bg-zinc-900 border border-zinc-800 rounded-lg px-3 py-2 text-xs text-zinc-300 resize-none focus:outline-none focus:border-blue-500"></textarea>
+                  <p class="text-[10px] text-zinc-600 mt-1">手动编辑后将以此处文本框内容为准</p>
+                </div>
+              </div>
+            </div>
+            
+            <p class="text-[10px] text-zinc-600 mt-2">注意：手动配置会覆盖该日期原有的设置</p>
+          </div>
+          <div class="flex gap-3 pt-4">
+            <button @click="showModal = false" class="flex-1 py-2 bg-zinc-800 text-zinc-300 rounded-lg text-sm font-bold">取消</button>
+            <button @click="saveManual" :disabled="saving || !manualFormData.date" class="flex-1 py-2 bg-blue-600 text-white rounded-lg text-sm font-bold disabled:opacity-50">保存</button>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <ConfirmDialog
+      :show="showDeleteDialog"
+      title="确认删除"
+      :message="deleteDialogMessage"
+      type="danger"
+      confirm-text="确认删除"
+      cancel-text="取消"
+      :loading="deleting"
+      @confirm="confirmDelete"
+      @update:show="showDeleteDialog = $event"
+    />
+  </div>
+</template>
+
+<script setup>
+import { ref, onMounted, nextTick, computed } from 'vue'
+import { CalendarDays, Trash2, Loader2 } from '@lucide/vue'
+import AdminMultiDatePicker from './AdminMultiDatePicker.vue'
+import AdminDatePicker from './AdminDatePicker.vue'
+import ConfirmDialog from '~/components/UI/ConfirmDialog.vue'
+
+import { useAuth } from '~/composables/useAuth'
+
+const auth = useAuth()
+const dates = ref([])
+const loading = ref(true)
+const showModal = ref(false)
+const saving = ref(false)
+const activeTab = ref('auto')
+const showAdvancedManual = ref(false)
+const showDeleteDialog = ref(false)
+const deleteTarget = ref(null)
+const deleting = ref(false)
+
+const deleteDialogMessage = computed(() => {
+  if (!deleteTarget.value) return '确定要删除该开放日期吗？此操作不可撤销。'
+  const dateStr = deleteTarget.value.date || ''
+  return `确定要删除开放日期 ${dateStr} 吗？此操作不可撤销。`
+})
+
+const formatSequences = (seqStr) => {
+  if (!seqStr) return '无'
+  const seqs = seqStr.split(',').map(Number).filter(n => !isNaN(n)).sort((a, b) => a - b)
+  if (seqs.length === 0) return '无'
+  
+  const ranges = []
+  let start = seqs[0]
+  let prev = seqs[0]
+  
+  for (let i = 1; i < seqs.length; i++) {
+    if (seqs[i] === prev + 1) {
+      prev = seqs[i]
+    } else {
+      ranges.push(start === prev ? `${start}` : `${start}-${prev}`)
+      start = seqs[i]
+      prev = seqs[i]
+    }
+  }
+  ranges.push(start === prev ? `${start}` : `${start}-${prev}`)
+  
+  return ranges.join(', ')
+}
+
+const getTotalCount = (date) => {
+  return date.availableSequences ? date.availableSequences.split(',').filter(Boolean).length : 0
+}
+
+const getTakenCount = (date) => {
+  return date.takenSequences ? date.takenSequences.length : 0
+}
+
+const getAvailableCount = (date) => {
+  return Math.max(0, getTotalCount(date) - getTakenCount(date))
+}
+
+const startScrollRef = ref(null)
+const endScrollRef = ref(null)
+let scrollTimeoutStart = null
+let scrollTimeoutEnd = null
+
+const autoFormData = ref({
+  dates: [],
+  totalSequences: 28
+})
+
+const manualFormData = ref({
+  date: new Date().toISOString().split('T')[0],
+  startSeq: 1,
+  endSeq: 28,
+  sequences: ''
+})
+
+const fetchDates = async () => {
+  loading.value = true
+  try {
+    const res = await $fetch('/api/admin/expected-play-dates', {
+      ...auth.getAuthConfig(),
+      query: { t: Date.now() }
+    })
+    dates.value = res
+  } catch (e) {
+    console.error(e)
+  } finally {
+    loading.value = false
+  }
+}
+
+const setStartSeq = (val) => {
+  manualFormData.value.startSeq = val
+  if (startScrollRef.value) {
+    const el = startScrollRef.value.querySelector(`[data-val="${val}"]`)
+    if (el) el.scrollIntoView({ behavior: 'smooth', block: 'center' })
+  }
+}
+
+const setEndSeq = (val) => {
+  manualFormData.value.endSeq = val
+  if (endScrollRef.value) {
+    const el = endScrollRef.value.querySelector(`[data-val="${val}"]`)
+    if (el) el.scrollIntoView({ behavior: 'smooth', block: 'center' })
+  }
+}
+
+const handleStartScroll = (e) => {
+  clearTimeout(scrollTimeoutStart)
+  scrollTimeoutStart = setTimeout(() => {
+    if (!startScrollRef.value) return
+    const container = startScrollRef.value
+    const center = container.scrollTop + container.clientHeight / 2
+    const items = Array.from(container.querySelectorAll('[data-val]'))
+    let closest = items[0]
+    let minDiff = Infinity
+    
+    items.forEach(item => {
+      const itemCenter = item.offsetTop + item.clientHeight / 2
+      const diff = Math.abs(center - itemCenter)
+      if (diff < minDiff) {
+        minDiff = diff
+        closest = item
+      }
+    })
+    
+    if (closest) {
+      const val = parseInt(closest.getAttribute('data-val'))
+      manualFormData.value.startSeq = val
+    }
+  }, 150)
+}
+
+const handleEndScroll = (e) => {
+  clearTimeout(scrollTimeoutEnd)
+  scrollTimeoutEnd = setTimeout(() => {
+    if (!endScrollRef.value) return
+    const container = endScrollRef.value
+    const center = container.scrollTop + container.clientHeight / 2
+    const items = Array.from(container.querySelectorAll('[data-val]'))
+    let closest = items[0]
+    let minDiff = Infinity
+    
+    items.forEach(item => {
+      const itemCenter = item.offsetTop + item.clientHeight / 2
+      const diff = Math.abs(center - itemCenter)
+      if (diff < minDiff) {
+        minDiff = diff
+        closest = item
+      }
+    })
+    
+    if (closest) {
+      const val = parseInt(closest.getAttribute('data-val'))
+      manualFormData.value.endSeq = val
+    }
+  }, 150)
+}
+
+const openAddModal = () => {
+  activeTab.value = 'auto'
+  autoFormData.value = { dates: [], totalSequences: 28 }
+  manualFormData.value = { date: new Date().toISOString().split('T')[0], startSeq: 1, endSeq: 28, sequences: '' }
+  showAdvancedManual.value = false
+  showModal.value = true
+  
+  // 延时滚动到对应位置
+  nextTick(() => {
+    setTimeout(() => {
+      setStartSeq(manualFormData.value.startSeq)
+      setEndSeq(manualFormData.value.endSeq)
+    }, 100)
+  })
+}
+
+const saveAuto = async () => {
+  if (autoFormData.value.dates.length === 0 || !autoFormData.value.totalSequences) return
+  saving.value = true
+  
+  const selectedDates = [...autoFormData.value.dates].sort()
+  const totalDays = selectedDates.length
+  const maxSeq = parseInt(autoFormData.value.totalSequences)
+  const seqsPerDay = Math.ceil(maxSeq / totalDays)
+  
+  try {
+    for (let i = 0; i < selectedDates.length; i++) {
+      const date = selectedDates[i]
+      const startSeq = i * seqsPerDay + 1
+      const endSeq = Math.min((i + 1) * seqsPerDay, maxSeq)
+      
+      const seqs = []
+      for (let j = startSeq; j <= endSeq; j++) {
+        seqs.push(j)
+      }
+      
+      if (seqs.length > 0) {
+        await $fetch('/api/admin/expected-play-dates', {
+          method: 'POST',
+          body: {
+            date: date,
+            availableSequences: seqs.join(',')
+          },
+          ...auth.getAuthConfig()
+        })
+      }
+    }
+    
+    showModal.value = false
+    fetchDates()
+    if (window.$showNotification) {
+      window.$showNotification('批量自动分配成功', 'success')
+    }
+  } catch (e) {
+    if (window.$showNotification) {
+      window.$showNotification(e.data?.message || '保存失败', 'error')
+    }
+  } finally {
+    saving.value = false
+  }
+}
+
+const saveManual = async () => {
+  let finalSequences = manualFormData.value.sequences
+  if (!showAdvancedManual.value || !finalSequences) {
+    const start = Math.min(manualFormData.value.startSeq, manualFormData.value.endSeq)
+    const end = Math.max(manualFormData.value.startSeq, manualFormData.value.endSeq)
+    finalSequences = Array.from({ length: end - start + 1 }, (_, i) => start + i).join(',')
+  }
+
+  if (!manualFormData.value.date || !finalSequences) return
+  saving.value = true
+  try {
+    await $fetch('/api/admin/expected-play-dates', {
+      method: 'POST',
+      body: {
+        date: manualFormData.value.date,
+        availableSequences: finalSequences
+      },
+      ...auth.getAuthConfig()
+    })
+    showModal.value = false
+    fetchDates()
+    if (window.$showNotification) {
+      window.$showNotification('手动配置成功', 'success')
+    }
+  } catch (e) {
+    if (window.$showNotification) {
+      window.$showNotification(e.data?.message || '保存失败', 'error')
+    }
+  } finally {
+    saving.value = false
+  }
+}
+
+
+
+const deleteDate = async (id) => {
+  try {
+    await $fetch(`/api/admin/expected-play-dates/${id}`, { 
+      method: 'DELETE',
+      ...auth.getAuthConfig()
+    })
+    fetchDates()
+    if (window.$showNotification) {
+      window.$showNotification('删除成功', 'success')
+    }
+  } catch (e) {
+    console.error(e)
+    if (window.$showNotification) {
+      window.$showNotification(e.data?.message || '删除失败', 'error')
+    }
+  }
+}
+
+const openDeleteDialog = (date) => {
+  deleteTarget.value = date
+  showDeleteDialog.value = true
+}
+
+const confirmDelete = async () => {
+  if (!deleteTarget.value?.id) return
+  deleting.value = true
+  try {
+    await deleteDate(deleteTarget.value.id)
+    showDeleteDialog.value = false
+    deleteTarget.value = null
+  } finally {
+    deleting.value = false
+  }
+}
+
+onMounted(fetchDates)
+</script>
+
+<style scoped>
+/* 自定义滚动条样式 */
+.custom-scrollbar::-webkit-scrollbar {
+  width: 6px;
+}
+
+.custom-scrollbar::-webkit-scrollbar-track {
+  background: transparent;
+}
+
+.custom-scrollbar::-webkit-scrollbar-thumb {
+  background: #4a5568;
+  border-radius: 3px;
+}
+
+.custom-scrollbar::-webkit-scrollbar-thumb:hover {
+  background: #718096;
+}
+</style>
diff --git a/app/components/Admin/NotificationSender.vue b/app/components/Admin/NotificationSender.vue
index 6572371..23bd005 100644
--- a/app/components/Admin/NotificationSender.vue
+++ b/app/components/Admin/NotificationSender.vue
@@ -2,82 +2,45 @@
   <div class="max-w-[1400px] mx-auto space-y-8 pb-20">
     <div class="flex flex-col md:flex-row md:items-end justify-between gap-6">
       <div>
-        <h2 class="text-2xl font-black text-text-primary tracking-tight">{{ locale.title }}</h2>
-        <p class="text-xs text-text-tertiary mt-1">{{ locale.desc }}</p>
+        <h2 class="text-2xl font-black text-zinc-100 tracking-tight">向用户发送通知</h2>
+        <p class="text-xs text-zinc-500 mt-1">即时推送系统公告、活动信息或重要提醒至指定群体</p>
       </div>
     </div>
 
     <div class="grid grid-cols-1 lg:grid-cols-12 gap-8 items-start">
       <!-- 左侧：编辑区 -->
       <div class="lg:col-span-7 space-y-6">
-        <div class="bg-bg-secondary-30 border border-border-secondary rounded-[2rem] p-8 shadow-xl">
+        <div class="bg-zinc-900/30 border border-zinc-800 rounded-[2rem] p-8 shadow-xl">
           <div class="space-y-6">
             <!-- 标题 -->
             <div class="space-y-2">
-              <label class="text-[10px] font-black text-text-disabled uppercase tracking-[0.2em] px-1"
-                >{{ locale.notificationTitle }}</label
+              <label class="text-[10px] font-black text-zinc-600 uppercase tracking-[0.2em] px-1"
+                >通知标题</label
               >
               <input
                 v-model="form.title"
                 type="text"
-                :placeholder="locale.titlePlaceholder"
-                class="w-full bg-bg-primary border border-border-secondary rounded-2xl px-5 py-3.5 text-sm focus:outline-none focus:border-primary-30 transition-all text-text-primary placeholder:text-text-primary"
+                placeholder="请输入通知标题"
+                class="w-full bg-zinc-950 border border-zinc-800 rounded-2xl px-5 py-3.5 text-sm focus:outline-none focus:border-blue-500/30 transition-all text-zinc-200 placeholder:text-zinc-800"
               >
             </div>
 
             <!-- 内容 -->
             <div class="space-y-2">
-              <label class="text-[10px] font-black text-text-disabled uppercase tracking-[0.2em] px-1"
-                >{{ locale.notificationContent }}</label
+              <label class="text-[10px] font-black text-zinc-600 uppercase tracking-[0.2em] px-1"
+                >通知内容</label
               >
               <textarea
                 v-model="form.content"
-                :placeholder="locale.contentPlaceholder"
-                class="w-full bg-bg-primary border border-border-secondary rounded-2xl px-5 py-4 text-sm focus:outline-none focus:border-primary-30 transition-all text-text-primary placeholder:text-text-primary min-h-[160px] resize-none"
+                placeholder="请输入通知详情内容..."
+                class="w-full bg-zinc-950 border border-zinc-800 rounded-2xl px-5 py-4 text-sm focus:outline-none focus:border-blue-500/30 transition-all text-zinc-200 placeholder:text-zinc-800 min-h-[160px] resize-none"
               />
-              <p class="px-1 text-[10px] font-medium text-text-disabled">
-                {{ locale.markdownHint }}
-              </p>
             </div>
 
-            <!-- 重要通知开关 -->
-            <label
-              class="flex cursor-pointer items-start gap-4 rounded-2xl border p-4 shadow-sm transition-colors"
-              :class="
-                form.important
-                  ? 'border-primary-300 bg-primary-10'
-                  : 'border-border-tertiary bg-bg-primary hover:border-border-quaternary hover:bg-bg-secondary'
-              "
-            >
-              <span
-                class="relative mt-0.5 inline-block h-6 w-11 shrink-0"
-              >
-                <input v-model="form.important" type="checkbox" class="peer sr-only">
-                <span
-                  class="absolute inset-0 rounded-full bg-border-tertiary transition-colors peer-checked:bg-primary peer-focus-visible:ring-2 peer-focus-visible:ring-primary-300"
-                />
-                <span
-                  class="absolute left-1 top-1 h-4 w-4 rounded-full bg-white shadow-sm transition-transform peer-checked:translate-x-5"
-                />
-              </span>
-              <span class="min-w-0">
-                <span class="flex items-center gap-2 text-sm font-black text-text-primary">
-                  <AlertTriangle
-                    :size="16"
-                    :class="form.important ? 'text-primary' : 'text-text-tertiary'"
-                  />
-                  {{ locale.importantToggleTitle }}
-                </span>
-                <span class="mt-1 block text-xs leading-relaxed text-text-secondary">
-                  {{ locale.importantToggleDescription }}
-                </span>
-              </span>
-            </label>
-
             <!-- 范围选择 -->
-            <div class="space-y-3 pt-4 border-t border-border-secondary-50">
-              <label class="text-[10px] font-black text-text-disabled uppercase tracking-[0.2em] px-1"
-                >{{ locale.scope }}</label
+            <div class="space-y-3 pt-4 border-t border-zinc-800/50">
+              <label class="text-[10px] font-black text-zinc-600 uppercase tracking-[0.2em] px-1"
+                >通知范围</label
               >
               <div class="flex flex-wrap gap-2">
                 <button
@@ -86,8 +49,8 @@
                   :class="[
                     'flex items-center gap-2 px-4 py-2.5 rounded-xl text-[11px] font-black transition-all border',
                     form.scope === opt.id
-                      ? 'bg-primary-hover border-primary text-text-primary shadow-lg shadow-[var(--primary-glow)]'
-                      : 'bg-bg-primary border-border-secondary text-text-tertiary hover:border-border-tertiary hover:text-text-secondary'
+                      ? 'bg-blue-600 border-blue-500 text-white shadow-lg shadow-blue-900/20'
+                      : 'bg-zinc-950 border-zinc-800 text-zinc-500 hover:border-zinc-700 hover:text-zinc-300'
                   ]"
                   @click="form.scope = opt.id"
                 >
@@ -103,26 +66,24 @@
                 <div
                   v-if="form.scope === 'ALL'"
                   key="all"
-                  class="p-4 bg-primary-5 border border-primary-10 rounded-2xl flex items-center gap-4"
+                  class="p-4 bg-blue-500/5 border border-blue-500/10 rounded-2xl flex items-center gap-4"
                 >
-                  <Info class="text-primary shrink-0" :size="18" />
-                  <p class="text-[11px] font-bold text-text-tertiary">
-                    {{ locale.allUsersHint }}
+                  <Info class="text-blue-500 shrink-0" :size="18" />
+                  <p class="text-[11px] font-bold text-zinc-400">
+                    将向系统中所有已注册的活跃用户发送此通知。
                   </p>
                 </div>
 
                 <div v-else-if="form.scope === 'GRADE'" key="grade" class="space-y-4">
                   <div class="space-y-1.5">
-                    <span class="text-[9px] font-black text-text-disabled uppercase tracking-widest px-1"
-                      >{{ locale.selectGrade }}</span
+                    <span class="text-[9px] font-black text-zinc-600 uppercase tracking-widest px-1"
+                      >选择年级</span
                     >
                     <CustomSelect
                       v-model="form.grade"
-                      :options="gradeOptions"
-                      label-key="label"
-                      value-key="value"
-                      :placeholder="locale.selectGradePlaceholder"
-                      class-name="w-full md:w-64"
+                      :options="['高一', '高二', '高三', '教师']"
+                      placeholder="请选择年级"
+                      class="w-full md:w-64"
                     />
                   </div>
                 </div>
@@ -133,61 +94,55 @@
                   class="grid grid-cols-1 md:grid-cols-2 gap-4"
                 >
                   <div class="space-y-1.5">
-                    <span class="text-[9px] font-black text-text-disabled uppercase tracking-widest px-1"
-                      >{{ locale.grade }}</span
+                    <span class="text-[9px] font-black text-zinc-600 uppercase tracking-widest px-1"
+                      >年级</span
                     >
                     <CustomSelect
                       v-model="form.classGrade"
-                      :options="gradeOptions"
-                      label-key="label"
-                      value-key="value"
-                      :placeholder="locale.selectGradePlaceholder"
-                      class-name="w-full"
+                      :options="['高一', '高二', '高三', '教师']"
+                      placeholder="请选择年级"
+                      class="w-full"
                     />
                   </div>
                   <div class="space-y-1.5">
-                    <span class="text-[9px] font-black text-text-disabled uppercase tracking-widest px-1"
-                      >{{ locale.className }}</span
+                    <span class="text-[9px] font-black text-zinc-600 uppercase tracking-widest px-1"
+                      >班级</span
                     >
                     <CustomSelect
                       v-model="form.className"
-                      :options="classOptionsForClassScope"
+                      :options="classNumberOptions"
                       label-key="label"
                       value-key="value"
-                      :placeholder="locale.selectClassPlaceholder"
+                      placeholder="请选择班级"
                       class-name="w-full"
-                      :disabled="!form.classGrade"
                     />
                   </div>
                 </div>
 
                 <div v-else-if="form.scope === 'MULTI_CLASS'" key="multi" class="space-y-4">
-                  <div class="p-6 bg-bg-primary-50 border border-border-secondary border-dashed rounded-2xl">
+                  <div class="p-6 bg-zinc-950/50 border border-zinc-800 border-dashed rounded-2xl">
                     <div class="grid grid-cols-1 md:grid-cols-2 gap-3 mb-4">
                       <CustomSelect
                         v-model="multiClassForm.grade"
-                        :options="gradeOptions"
-                        label-key="label"
-                        value-key="value"
-                          :placeholder="locale.selectGradePlaceholder"
-                        class-name="w-full"
+                        :options="['高一', '高二', '高三', '教师']"
+                        placeholder="请选择年级"
+                        class="w-full"
                       />
                       <div class="flex gap-2">
                         <CustomSelect
                           v-model="multiClassForm.class"
-                          :options="classOptionsForMultiClassScope"
+                          :options="classNumberOptions"
                           label-key="label"
                           value-key="value"
-                          :placeholder="locale.selectClassPlaceholder"
+                          placeholder="请选择班级"
                           class-name="flex-1"
-                          :disabled="!multiClassForm.grade"
                         />
                         <button
                           :disabled="!canAddClass"
-                          class="px-4 bg-bg-tertiary hover:bg-bg-quaternary disabled:opacity-50 disabled:cursor-not-allowed text-text-tertiary font-bold rounded-xl text-xs transition-all"
+                          class="px-4 bg-zinc-800 hover:bg-zinc-700 disabled:opacity-50 disabled:cursor-not-allowed text-zinc-400 font-bold rounded-xl text-xs transition-all"
                           @click="addClassToSelection"
                         >
-                          {{ locale.add }}
+                          添加
                         </button>
                       </div>
                     </div>
@@ -196,13 +151,13 @@
                       <div
                         v-for="(cls, index) in form.selectedClasses"
                         :key="index"
-                        class="flex items-center gap-2 px-3 py-1.5 bg-bg-secondary border border-border-secondary rounded-lg group"
+                        class="flex items-center gap-2 px-3 py-1.5 bg-zinc-900 border border-zinc-800 rounded-lg group"
                       >
-                        <span class="text-[10px] font-bold text-text-tertiary"
+                        <span class="text-[10px] font-bold text-zinc-400"
                           >{{ cls.grade }} {{ cls.class }}</span
                         >
                         <button
-                          class="text-text-disabled hover:text-error transition-colors"
+                          class="text-zinc-600 hover:text-red-400 transition-colors"
                           @click="removeClassFromSelection(index)"
                         >
                           <X :size="12" />
@@ -210,8 +165,8 @@
                       </div>
                     </div>
                     <div v-else class="text-center py-4">
-                      <p class="text-[10px] font-black text-text-secondary uppercase tracking-widest">
-                        {{ locale.noClassSelected }}
+                      <p class="text-[10px] font-black text-zinc-700 uppercase tracking-widest">
+                        未选择任何班级
                       </p>
                     </div>
                   </div>
@@ -221,19 +176,19 @@
                   <div class="relative flex items-center">
                     <Search
                       v-if="!userSearchLoading"
-                      class="absolute left-4 text-text-secondary pointer-events-none"
+                      class="absolute left-4 text-zinc-700 pointer-events-none"
                       :size="16"
                     />
                     <Loader2
                       v-else
-                      class="absolute left-4 text-primary animate-spin pointer-events-none"
+                      class="absolute left-4 text-blue-500 animate-spin pointer-events-none"
                       :size="16"
                     />
                     <input
                       v-model="userSearchQuery"
                       type="text"
-                      :placeholder="locale.userSearchPlaceholder"
-                      class="w-full bg-bg-primary border border-border-secondary rounded-2xl pl-12 pr-4 py-3 text-sm focus:outline-none focus:border-primary-30 transition-all text-text-primary"
+                      placeholder="搜索并选择用户 (姓名、用户名或ID)..."
+                      class="w-full bg-zinc-950 border border-zinc-800 rounded-2xl pl-12 pr-4 py-3 text-sm focus:outline-none focus:border-blue-500/30 transition-all text-zinc-200"
                       @input="onUserSearchInput"
                     >
                   </div>
@@ -241,42 +196,42 @@
                   <!-- 搜索结果 -->
                   <div
                     v-if="showUserSearchResults && userSearchResults.length > 0"
-                    class="bg-bg-primary border border-border-secondary rounded-2xl overflow-hidden max-h-[300px] overflow-y-auto custom-scrollbar"
+                    class="bg-zinc-950 border border-zinc-800 rounded-2xl overflow-hidden max-h-[300px] overflow-y-auto custom-scrollbar"
                   >
-                    <div class="px-4 py-2 border-b border-border-secondary-60 bg-bg-secondary-40">
-                      <span class="text-[9px] font-black text-text-disabled uppercase tracking-widest"
-                        >{{ getLocaleMessage('searchResults', userSearchResults.length) }}</span
+                    <div class="px-4 py-2 border-b border-zinc-800/60 bg-zinc-900/40">
+                      <span class="text-[9px] font-black text-zinc-600 uppercase tracking-widest"
+                        >搜索结果 ({{ userSearchResults.length }})</span
                       >
                     </div>
                     <div
                       v-for="user in userSearchResults"
                       :key="user.id"
-                      class="flex items-center justify-between p-4 border-b border-border-secondary-30 last:border-0 hover:bg-bg-tertiary-30 transition-all"
+                      class="flex items-center justify-between p-4 border-b border-zinc-800/30 last:border-0 hover:bg-zinc-800/30 transition-all"
                     >
                       <div>
-                        <h5 class="text-sm font-bold text-text-primary">
+                        <h5 class="text-sm font-bold text-zinc-200">
                           {{ user.name || user.username }}
                         </h5>
                         <div class="flex items-center gap-2 mt-0.5">
-                          <span class="text-[10px] text-primary font-black"
+                          <span class="text-[10px] text-blue-500 font-black"
                             >@{{ user.username }}</span
                           >
                           <span
                             v-if="user.grade && user.class"
-                            class="text-[10px] text-text-disabled font-bold uppercase tracking-widest"
+                            class="text-[10px] text-zinc-600 font-bold uppercase tracking-widest"
                             >{{ user.grade }} {{ user.class }}</span
                           >
-                          <span class="text-[10px] text-text-secondary font-black">{{
+                          <span class="text-[10px] text-zinc-700 font-black">{{
                             getRoleText(user.role)
                           }}</span>
                         </div>
                       </div>
                       <button
                         :disabled="isUserSelected(user.id)"
-                        class="px-3 py-1.5 bg-bg-tertiary hover:bg-primary-hover hover:text-text-primary disabled:opacity-50 disabled:cursor-not-allowed text-text-tertiary text-[10px] font-black rounded-lg transition-all uppercase"
+                        class="px-3 py-1.5 bg-zinc-800 hover:bg-blue-600 hover:text-white disabled:opacity-50 disabled:cursor-not-allowed text-zinc-400 text-[10px] font-black rounded-lg transition-all uppercase"
                         @click="addUserToSelection(user)"
                       >
-                        {{ isUserSelected(user.id) ? locale.selected : locale.select }}
+                        {{ isUserSelected(user.id) ? '已选择' : '选择' }}
                       </button>
                     </div>
                   </div>
@@ -284,30 +239,30 @@
                   <!-- 已选择的用户 -->
                   <div v-if="form.selectedUsers.length > 0" class="space-y-3">
                     <div class="flex items-center justify-between px-1">
-                      <span class="text-[9px] font-black text-text-disabled uppercase tracking-widest"
-                        >{{ getLocaleMessage('selectedUsers', form.selectedUsers.length) }}</span
+                      <span class="text-[9px] font-black text-zinc-600 uppercase tracking-widest"
+                        >已选择用户 ({{ form.selectedUsers.length }})</span
                       >
                       <button
-                        class="text-[9px] font-black text-error-70 hover:text-error uppercase tracking-widest transition-colors"
+                        class="text-[9px] font-black text-red-500/70 hover:text-red-500 uppercase tracking-widest transition-colors"
                         @click="clearAllSelectedUsers"
                       >
-                        {{ locale.clearAll }}
+                        清空全部
                       </button>
                     </div>
                     <div class="flex flex-wrap gap-2">
                       <div
                         v-for="(user, index) in form.selectedUsers"
                         :key="user.id"
-                        class="flex items-center gap-2 px-3 py-1.5 bg-bg-secondary border border-border-secondary rounded-lg group"
+                        class="flex items-center gap-2 px-3 py-1.5 bg-zinc-900 border border-zinc-800 rounded-lg group"
                       >
                         <div class="flex flex-col">
-                          <span class="text-[10px] font-bold text-text-secondary leading-none">{{
+                          <span class="text-[10px] font-bold text-zinc-300 leading-none">{{
                             user.name || user.username
                           }}</span>
-                          <span class="text-[8px] text-text-disabled">@{{ user.username }}</span>
+                          <span class="text-[8px] text-zinc-600">@{{ user.username }}</span>
                         </div>
                         <button
-                          class="text-text-disabled hover:text-error transition-colors"
+                          class="text-zinc-600 hover:text-red-400 transition-colors"
                           @click="removeUserFromSelection(index)"
                         >
                           <X :size="12" />
@@ -316,8 +271,8 @@
                     </div>
                   </div>
                   <div v-else class="text-center py-4">
-                    <p class="text-[10px] font-black text-text-secondary uppercase tracking-widest">
-                      {{ locale.noUsersSelected }}
+                    <p class="text-[10px] font-black text-zinc-700 uppercase tracking-widest">
+                      未选择任何用户
                     </p>
                   </div>
                 </div>
@@ -329,17 +284,17 @@
           <div v-if="error || success" class="mt-6">
             <div
               v-if="error"
-              class="p-4 bg-error-5 border border-error-10 rounded-2xl flex items-center gap-3"
+              class="p-4 bg-red-500/5 border border-red-500/10 rounded-2xl flex items-center gap-3"
             >
-              <AlertCircle class="text-error shrink-0" :size="18" />
-              <p class="text-xs font-bold text-error">{{ error }}</p>
+              <AlertCircle class="text-red-500 shrink-0" :size="18" />
+              <p class="text-xs font-bold text-red-400">{{ error }}</p>
             </div>
             <div
               v-if="success"
-              class="p-4 bg-success-5 border border-success-10 rounded-2xl flex items-center gap-3"
+              class="p-4 bg-green-500/5 border border-green-500/10 rounded-2xl flex items-center gap-3"
             >
-              <Check class="text-success shrink-0" :size="18" />
-              <p class="text-xs font-bold text-success">{{ success }}</p>
+              <Check class="text-green-500 shrink-0" :size="18" />
+              <p class="text-xs font-bold text-green-400">{{ success }}</p>
             </div>
           </div>
 
@@ -347,16 +302,16 @@
             <button
               :disabled="loading || !isFormValid"
               :class="[
-                'flex items-center gap-2 px-10 py-4 bg-bg-primary border border-border-secondary text-xs font-black rounded-2xl transition-all uppercase tracking-[0.2em] shadow-lg',
+                'flex items-center gap-2 px-10 py-4 bg-zinc-950 border border-zinc-800 text-xs font-black rounded-2xl transition-all uppercase tracking-[0.2em] shadow-lg',
                 loading || !isFormValid
-                  ? 'text-text-primary cursor-not-allowed'
-                  : 'text-text-tertiary hover:text-text-primary hover:border-border-tertiary hover:bg-bg-secondary'
+                  ? 'text-zinc-800 cursor-not-allowed'
+                  : 'text-zinc-400 hover:text-zinc-100 hover:border-zinc-600 hover:bg-zinc-900'
               ]"
               @click="sendNotification"
             >
               <Loader2 v-if="loading" class="animate-spin" :size="16" />
               <Send v-else :size="16" />
-              {{ loading ? locale.sending : locale.send }}
+              {{ loading ? '发送中...' : '发送通知' }}
             </button>
           </div>
         </div>
@@ -365,130 +320,97 @@
       <!-- 右侧：预览区 -->
       <div class="lg:col-span-5 space-y-6 lg:sticky lg:top-8">
         <div
-          class="bg-bg-secondary-30 border border-border-secondary rounded-[2rem] p-8 shadow-xl flex flex-col h-full"
+          class="bg-zinc-900/30 border border-zinc-800 rounded-[2rem] p-8 shadow-xl flex flex-col h-full"
         >
           <h3
-            class="text-sm font-black text-text-primary uppercase tracking-widest mb-6 flex items-center gap-2"
+            class="text-sm font-black text-zinc-100 uppercase tracking-widest mb-6 flex items-center gap-2"
           >
-            <Eye :size="16" class="text-primary" /> {{ locale.previewTitle }}
+            <Eye :size="16" class="text-blue-500" /> 通知预览
           </h3>
 
-          <div class="flex flex-1 flex-col items-center justify-center p-1 sm:p-4">
-            <!-- 重要通知预览 -->
-            <section
-              v-if="form.important"
-              class="w-full max-w-[320px] overflow-hidden rounded-2xl border border-primary-300 bg-bg-primary shadow-2xl"
-            >
-              <div class="h-1.5 w-full bg-warning" />
-              <div class="p-5 space-y-5">
-                <header class="flex items-start gap-3">
-                  <div
-                    class="flex h-9 w-9 shrink-0 items-center justify-center rounded-lg border border-warning-300 bg-warning-10 text-warning"
-                    aria-hidden="true"
-                  >
-                    <Icon name="bell-ring" :size="17" />
-                  </div>
-                  <div class="min-w-0 flex-1">
-                    <h4
-                      class="break-words text-sm font-black"
-                      :class="form.title ? 'text-text-primary' : 'italic text-text-disabled'"
-                    >
-                      {{ form.title || locale.previewTitlePlaceholder }}
-                    </h4>
-                    <p class="mt-1 truncate text-[11px] font-black text-text-disabled">
-                      {{ locale.senderLabel }}：{{ previewSenderName }}
-                    </p>
-                  </div>
-                </header>
-
-                <div
-                  v-if="form.content"
-                  class="markdown-body max-h-64 overflow-y-auto text-sm leading-relaxed text-text-tertiary"
-                  v-html="previewContent"
-                />
-                <p v-else class="text-sm italic leading-relaxed text-text-disabled">
-                  {{ locale.previewContentPlaceholder }}
-                </p>
-
-                <footer class="flex items-center justify-between gap-4 border-t border-border-secondary-50 pt-4">
-                  <div class="flex min-w-0 items-center gap-1.5 text-text-secondary">
-                    <Users :size="13" class="shrink-0" aria-hidden="true" />
-                    <span class="truncate text-[10px] font-black text-text-disabled">
-                      {{ getLocaleMessage('previewScope', scopeDescription) }}
-                    </span>
-                  </div>
-                  <MessageSquare :size="17" class="shrink-0 text-warning" aria-hidden="true" />
-                </footer>
-              </div>
-            </section>
-
-            <!-- 普通通知预览 -->
-            <article
-              v-else
-              class="w-full max-w-[320px] overflow-hidden rounded-2xl border border-border-secondary bg-bg-primary shadow-2xl"
-            >
-              <div class="h-1.5 w-full bg-primary" />
-              <div class="p-5 space-y-5">
-                <header class="flex items-start gap-3">
-                  <div
-                    class="flex h-9 w-9 shrink-0 items-center justify-center rounded-lg border border-primary-20 bg-primary-hover-10 text-primary"
-                    aria-hidden="true"
-                  >
-                    <Icon name="bell" :size="17" />
-                  </div>
-                  <div class="min-w-0 flex-1">
-                    <h4
-                      class="break-words text-sm font-black"
-                      :class="form.title ? 'text-text-primary' : 'italic text-text-disabled'"
-                    >
-                      {{ form.title || locale.previewTitlePlaceholder }}
-                    </h4>
-                    <p class="mt-1 truncate text-[11px] font-black text-text-disabled">
-                      {{ locale.senderLabel }}：{{ previewSenderName }}
-                    </p>
-                  </div>
-                </header>
-
-                <div
-                  v-if="form.content"
-                  class="markdown-body max-h-64 overflow-y-auto text-sm leading-relaxed text-text-tertiary"
-                  v-html="previewContent"
-                />
-                <p v-else class="text-sm italic leading-relaxed text-text-disabled">
-                  {{ locale.previewContentPlaceholder }}
-                </p>
-
-                <footer class="flex items-center justify-between gap-4 border-t border-border-secondary-50 pt-4">
-                  <div class="flex min-w-0 items-center gap-1.5 text-text-secondary">
-                    <Users :size="13" class="shrink-0" aria-hidden="true" />
-                    <span class="truncate text-[10px] font-black text-text-disabled">
-                      {{ getLocaleMessage('previewScope', scopeDescription) }}
-                    </span>
-                  </div>
-                  <MessageSquare :size="17" class="shrink-0 text-primary" aria-hidden="true" />
-                </footer>
-              </div>
-            </article>
-
+          <div class="flex-1 flex flex-col items-center justify-center p-4">
             <div
-              class="mt-6 flex w-full max-w-[320px] items-start gap-3 rounded-lg border border-warning-10 bg-warning-5 p-3"
+              class="w-full max-w-[320px] bg-[#0c0c0e] border border-zinc-800 rounded-3xl overflow-hidden shadow-2xl relative"
             >
-              <AlertCircle :size="14" class="mt-0.5 shrink-0 text-warning" />
-              <p class="text-[10px] font-black text-text-tertiary leading-normal">
-                {{ locale.previewHint }}
-              </p>
+              <!-- 顶部装饰 -->
+              <div class="h-1.5 bg-blue-600 w-full" />
+
+              <div class="p-6 space-y-4">
+                <div class="flex items-center justify-between">
+                  <div class="flex items-center gap-2">
+                    <div
+                      class="w-8 h-8 rounded-xl bg-blue-600/10 text-blue-500 flex items-center justify-center border border-blue-500/20"
+                    >
+                      <Bell :size="14" />
+                    </div>
+                    <span class="text-[10px] font-black text-zinc-600 uppercase tracking-widest"
+                      >VoiceHub 系统</span
+                    >
+                  </div>
+                  <span class="text-[9px] text-zinc-700 font-bold uppercase tracking-wider"
+                    >刚刚</span
+                  >
+                </div>
+
+                <div class="space-y-2">
+                  <h4
+                    :class="[
+                      'text-sm font-black transition-colors',
+                      form.title ? 'text-zinc-100' : 'text-zinc-800 italic'
+                    ]"
+                  >
+                    {{ form.title || '通知标题' }}
+                  </h4>
+                  <p
+                    :class="[
+                      'text-[11px] leading-relaxed transition-colors',
+                      form.content ? 'text-zinc-400' : 'text-zinc-800 italic line-clamp-3'
+                    ]"
+                  >
+                    {{ form.content || '这里将显示通知的详细内容预览...' }}
+                  </p>
+                </div>
+
+                <div class="pt-4 border-t border-zinc-800/50 flex items-center justify-between">
+                  <div class="flex items-center gap-1.5">
+                    <Users :size="12" class="text-zinc-700" />
+                    <span class="text-[9px] font-black text-zinc-600 uppercase tracking-wider">
+                      发送范围: {{ scopeDescription }}
+                    </span>
+                  </div>
+                  <button
+                    class="p-1.5 text-blue-500 hover:bg-blue-600/10 rounded-lg transition-all"
+                  >
+                    <MessageSquare :size="14" />
+                  </button>
+                </div>
+              </div>
+
+              <!-- 背景光晕 -->
+              <div
+                class="absolute top-0 right-0 w-32 h-32 bg-blue-600/5 blur-[50px] -z-10 rounded-full"
+              />
+            </div>
+
+            <div class="mt-8 space-y-3 w-full max-w-[320px]">
+              <div
+                class="flex items-start gap-3 p-3 bg-amber-500/5 border border-amber-500/10 rounded-2xl"
+              >
+                <AlertCircle class="text-amber-500 shrink-0 mt-0.5" :size="14" />
+                <p class="text-[10px] font-bold text-zinc-500 leading-normal">
+                  预览图仅供参考布局，实际发送效果可能会根据用户设备显示语言和屏幕尺寸有所不同。
+                </p>
+              </div>
             </div>
           </div>
         </div>
       </div>
     </div>
-
-    <NotificationHistory :refresh-key="historyRefreshKey" />
   </div>
 </template>
 
 <script setup>
-import { computed, ref, onUnmounted, onMounted, watch } from 'vue'
+import { computed, ref, onUnmounted } from 'vue'
 import {
   Send,
   Users,
@@ -496,51 +418,27 @@ import {
   LayoutGrid,
   User,
   Search,
+  Bell,
   Info,
   X,
   Check,
   Plus,
   AlertCircle,
-  AlertTriangle,
   Eye,
   MessageSquare,
   Loader2
 } from '@lucide/vue'
 import CustomSelect from '~/components/UI/Common/CustomSelect.vue'
-import Icon from '~/components/UI/Icon.vue'
-import NotificationHistory from '~/components/Admin/NotificationHistory.vue'
 import { useAuth } from '~/composables/useAuth'
 import { useAdmin } from '~/composables/useAdmin'
-import { useUserFilters } from '~/composables/useUserFilters'
-import { useLocale } from '~/utils/locale'
-import { renderMarkdown } from '~/utils/markdown'
 
-const { user: authUser, isAdmin, getAuthConfig } = useAuth()
+const { isAdmin } = useAuth()
 const { sendAdminNotification } = useAdmin()
-const userFilters = useUserFilters()
-const { admin } = useLocale()
-const locale = computed(() => admin.value?.notificationSender || {})
-const { msg: getLocaleMessage, nested: getNestedMessage } = useLocaleText(locale)
-const previewSenderName = computed(
-  () =>
-    authUser.value?.name?.trim() ||
-    authUser.value?.username?.trim() ||
-    locale.value.previewSender
-)
-
-onMounted(() => {
-  userFilters.fetchOptions()
-})
-
-const gradeOptions = computed(() => {
-  return userFilters.getAvailableGrades().map(g => ({ label: g, value: g }))
-})
 
 // 表单数据
 const form = ref({
   title: '',
   content: '',
-  important: false,
   scope: 'ALL', // 'ALL', 'GRADE', 'CLASS', 'MULTI_CLASS', 'SPECIFIC_USERS'
   grade: '',
   classGrade: '',
@@ -555,29 +453,9 @@ const multiClassForm = ref({
   class: ''
 })
 
-const classOptionsForClassScope = computed(() => {
-  const classes = userFilters.getAvailableClasses(undefined, form.value.classGrade)
-  return classes.map(c => ({ label: c, value: c }))
-})
-
-const classOptionsForMultiClassScope = computed(() => {
-  const classes = userFilters.getAvailableClasses(undefined, multiClassForm.value.grade)
-  return classes.map(c => ({ label: c, value: c }))
-})
-
-watch(() => form.value.classGrade, () => {
-  form.value.className = ''
-})
-
-watch(() => multiClassForm.value.grade, () => {
-  multiClassForm.value.class = ''
-})
-
 const loading = ref(false)
 const error = ref('')
 const success = ref('')
-const historyRefreshKey = ref(0)
-const previewContent = computed(() => renderMarkdown(form.value.content))
 
 // 用户搜索相关
 const userSearchQuery = ref('')
@@ -586,13 +464,18 @@ const showUserSearchResults = ref(false)
 const userSearchLoading = ref(false)
 let userSearchTimeout = null
 
-const targetOptions = computed(() => [
-  { id: 'ALL', label: getNestedMessage('targets', 'all'), icon: Users },
-  { id: 'GRADE', label: getNestedMessage('targets', 'grade'), icon: GraduationCap },
-  { id: 'CLASS', label: getNestedMessage('targets', 'class'), icon: LayoutGrid },
-  { id: 'MULTI_CLASS', label: getNestedMessage('targets', 'multiClass'), icon: Plus },
-  { id: 'SPECIFIC_USERS', label: getNestedMessage('targets', 'specificUsers'), icon: User }
-])
+const targetOptions = [
+  { id: 'ALL', label: '全体用户', icon: Users },
+  { id: 'GRADE', label: '按年级选择', icon: GraduationCap },
+  { id: 'CLASS', label: '按班级选择', icon: LayoutGrid },
+  { id: 'MULTI_CLASS', label: '多班级选择', icon: Plus },
+  { id: 'SPECIFIC_USERS', label: '指定用户', icon: User }
+]
+
+const classNumberOptions = Array.from({ length: 16 }, (_, i) => ({
+  label: `${i + 1}班`,
+  value: (i + 1).toString()
+}))
 
 // 判断是否可以添加班级
 const canAddClass = computed(() => {
@@ -650,8 +533,7 @@ const searchUsers = async (query) => {
       query: {
         search: query,
         limit: 20
-      },
-      ...getAuthConfig()
+      }
     })
 
     if (response.success) {
@@ -704,9 +586,9 @@ const clearAllSelectedUsers = () => {
 // 获取角色文本
 const getRoleText = (role) => {
   const roleMap = {
-    admin: getNestedMessage('roles', 'admin'),
-    teacher: getNestedMessage('roles', 'teacher'),
-    student: getNestedMessage('roles', 'student')
+    admin: '管理员',
+    teacher: '教师',
+    student: '学生'
   }
   return roleMap[role] || role
 }
@@ -740,23 +622,21 @@ const isFormValid = computed(() => {
 const scopeDescription = computed(() => {
   switch (form.value.scope) {
     case 'ALL':
-      return getNestedMessage('scopeDescriptions', 'all')
+      return '全体用户'
     case 'GRADE':
-      return form.value.grade
-        ? getNestedMessage('scopeDescriptions', 'grade', form.value.grade)
-        : getNestedMessage('scopeDescriptions', 'selectGrade')
+      return form.value.grade ? `${form.value.grade}年级` : '请选择年级'
     case 'CLASS':
       return form.value.classGrade && form.value.className
-        ? getNestedMessage('scopeDescriptions', 'class', form.value.classGrade, form.value.className)
-        : getNestedMessage('scopeDescriptions', 'selectClass')
+        ? `${form.value.classGrade}年级${form.value.className}班`
+        : '请选择班级'
     case 'MULTI_CLASS':
       return form.value.selectedClasses.length > 0
-        ? getNestedMessage('scopeDescriptions', 'multiClass', form.value.selectedClasses.length)
-        : getNestedMessage('scopeDescriptions', 'selectClass')
+        ? `${form.value.selectedClasses.length}个班级`
+        : '请选择班级'
     case 'SPECIFIC_USERS':
       return form.value.selectedUsers.length > 0
-        ? getNestedMessage('scopeDescriptions', 'specificUsers', form.value.selectedUsers.length)
-        : getNestedMessage('scopeDescriptions', 'selectUsers')
+        ? `已选择${form.value.selectedUsers.length}个用户`
+        : '请选择用户'
     default:
       return ''
   }
@@ -765,12 +645,12 @@ const scopeDescription = computed(() => {
 // 发送通知
 const sendNotification = async () => {
   if (!isAdmin.value) {
-    error.value = getNestedMessage('errors', 'adminOnly')
+    error.value = '只有管理员可以发送系统通知'
     return
   }
 
   if (!isFormValid.value) {
-    error.value = getNestedMessage('errors', 'incomplete')
+    error.value = '请填写完整信息'
     return
   }
 
@@ -783,7 +663,6 @@ const sendNotification = async () => {
     const notificationData = {
       title: form.value.title,
       content: form.value.content,
-      important: form.value.important,
       scope: form.value.scope,
       filter: {}
     }
@@ -804,8 +683,7 @@ const sendNotification = async () => {
     const result = await sendAdminNotification(notificationData)
 
     if (result && result.success) {
-      success.value = getNestedMessage('messages', 'sendSuccess', result.sentCount)
-      historyRefreshKey.value += 1
+      success.value = `成功发送通知给 ${result.sentCount} 名用户`
 
       // 3秒后自动隐藏成功提示
       setTimeout(() => {
@@ -816,7 +694,6 @@ const sendNotification = async () => {
       form.value = {
         title: '',
         content: '',
-        important: false,
         scope: 'ALL',
         grade: '',
         classGrade: '',
@@ -835,10 +712,10 @@ const sendNotification = async () => {
       userSearchLoading.value = false
       clearTimeout(userSearchTimeout)
     } else {
-      throw new Error(result?.message || getNestedMessage('errors', 'sendFailed'))
+      throw new Error(result?.message || '发送通知失败')
     }
   } catch (err) {
-    error.value = err.message || getNestedMessage('errors', 'sendError')
+    error.value = err.message || '发送通知时发生错误'
     console.error('发送通知错误:', err)
 
     // 3秒后自动隐藏错误提示
@@ -865,11 +742,11 @@ onUnmounted(() => {
   background: transparent;
 }
 .custom-scrollbar::-webkit-scrollbar-thumb {
-  background: var(--panel-bg-alt);
+  background: var(--bg-tertiary, #27272a);
   border-radius: 10px;
 }
 .custom-scrollbar::-webkit-scrollbar-thumb:hover {
-  background: var(--panel-bg-hover);
+  background: #3f3f46;
 }
 
 .fade-enter-active,
diff --git a/app/components/Admin/OverviewDashboard.vue b/app/components/Admin/OverviewDashboard.vue
index f8dec96..148318c 100644
--- a/app/components/Admin/OverviewDashboard.vue
+++ b/app/components/Admin/OverviewDashboard.vue
@@ -5,21 +5,19 @@
       <div
         v-for="(stat, i) in statCards"
         :key="i"
-        class="bg-bg-secondary-40 border border-border-secondary rounded-2xl p-6 relative overflow-hidden group hover:border-border-tertiary transition-all shadow-lg shadow-[0_10px_15px_var(--shadow-color)]"
+        class="bg-zinc-900/40 border border-zinc-800 rounded-2xl p-6 relative overflow-hidden group hover:border-zinc-700 transition-all shadow-lg shadow-black/20"
       >
         <div class="flex justify-between items-start mb-4">
           <div
             :class="[
-              'p-3 rounded-xl border flex items-center justify-center',
+              'p-3 rounded-xl border',
               stat.color === 'blue'
-                ? 'bg-primary-10 text-primary border-primary-20'
+                ? 'bg-blue-500/10 text-blue-500 border-blue-500/20'
                 : stat.color === 'emerald'
-                  ? 'bg-success-10 text-success border-success-20'
+                  ? 'bg-emerald-500/10 text-emerald-500 border-emerald-500/20'
                   : stat.color === 'pink'
-                    ? 'bg-color-pink-alpha-10 text-color-pink border-color-pink-alpha-10'
-                    : stat.color === 'warning'
-                      ? 'bg-warning-10 text-warning border-warning-20'
-                      : 'bg-bg-quaternary-10 text-text-tertiary border-border-tertiary-20'
+                    ? 'bg-pink-500/10 text-pink-500 border-pink-500/20'
+                    : 'bg-zinc-500/10 text-zinc-500 border-zinc-500/20'
             ]"
           >
             <component :is="stat.icon" :size="24" />
@@ -28,7 +26,7 @@
             v-if="stat.trend"
             :class="[
               'flex items-center gap-1 text-[11px] font-bold',
-              stat.trendDown ? 'text-error' : 'text-success'
+              stat.trendDown ? 'text-red-400' : 'text-emerald-400'
             ]"
           >
             <TrendingDown v-if="stat.trendDown" :size="12" />
@@ -37,8 +35,8 @@
           </div>
         </div>
         <div>
-          <p class="text-text-tertiary text-sm font-medium">{{ stat.label }}</p>
-          <h4 class="text-3xl font-bold tracking-tight text-text-primary">{{ stat.value }}</h4>
+          <p class="text-zinc-500 text-sm font-medium">{{ stat.label }}</p>
+          <h4 class="text-3xl font-bold tracking-tight text-zinc-100">{{ stat.value }}</h4>
         </div>
       </div>
     </div>
@@ -46,19 +44,18 @@
     <div class="grid grid-cols-1 lg:grid-cols-12 gap-8">
       <!-- 最近活动 -->
       <div
-        class="lg:col-span-5 bg-bg-secondary-40 border border-border-secondary rounded-3xl overflow-hidden flex flex-col shadow-lg shadow-[0_10px_15px_var(--shadow-color)]"
+        class="lg:col-span-5 bg-zinc-900/40 border border-zinc-800 rounded-3xl overflow-hidden flex flex-col shadow-lg shadow-black/20"
       >
-        <div class="px-6 py-5 border-b border-border-secondary flex items-center justify-between">
+        <div class="px-6 py-5 border-b border-zinc-800 flex items-center justify-between">
           <h3 class="text-lg font-bold flex items-center gap-2">
-            <Activity :size="18" class="text-primary" /> {{ locale.recentActivities }}
+            <Activity :size="18" class="text-blue-500" /> 最近活动
           </h3>
           <button
-            class="p-2 text-text-tertiary hover:text-text-secondary transition-colors"
-            :disabled="loadingActivities"
+            class="p-2 text-zinc-500 hover:text-zinc-300 transition-colors"
+            :class="{ 'animate-spin': loadingActivities }"
             @click="refreshActivities"
           >
-            <RefreshCw v-if="!loadingActivities" :size="16" />
-            <Loader2 v-else :size="16" class="animate-spin" />
+            <RefreshCw :size="16" />
           </button>
         </div>
         <div
@@ -66,23 +63,23 @@
         >
           <div
             v-if="loadingActivities && recentActivities.length === 0"
-            class="flex flex-col items-center justify-center h-full text-text-tertiary gap-3 py-20"
+            class="flex flex-col items-center justify-center h-full text-zinc-500 gap-3 py-20"
           >
-            <Loader2 :size="24" class="animate-spin" />
-            <span class="text-sm">{{ locale.loading }}</span>
+            <RefreshCw :size="24" class="animate-spin" />
+            <span class="text-sm">加载中...</span>
           </div>
           <div
             v-else-if="recentActivities.length === 0"
-            class="flex flex-col items-center justify-center h-full text-text-tertiary gap-3 py-20"
+            class="flex flex-col items-center justify-center h-full text-zinc-500 gap-3 py-20"
           >
             <Inbox :size="24" />
-            <span class="text-sm">{{ locale.noActivities }}</span>
+            <span class="text-sm">暂无活动记录</span>
           </div>
           <template v-else>
             <div
               v-for="(activity, idx) in recentActivities"
               :key="idx"
-              class="flex items-start gap-4 p-4 rounded-2xl hover:bg-bg-tertiary-40 transition-all cursor-pointer group"
+              class="flex items-start gap-4 p-4 rounded-2xl hover:bg-zinc-800/40 transition-all cursor-pointer group"
             >
               <div
                 :class="[
@@ -94,14 +91,14 @@
               </div>
               <div class="flex-1 min-w-0">
                 <h5
-                  class="font-bold text-sm text-text-primary group-hover:text-primary transition-colors"
+                  class="font-bold text-sm text-zinc-200 group-hover:text-blue-400 transition-colors"
                 >
                   {{ activity.title }}
                 </h5>
-                <p class="text-xs text-text-tertiary truncate mt-1">{{ activity.description }}</p>
+                <p class="text-xs text-zinc-500 truncate mt-1">{{ activity.description }}</p>
                 <div class="flex items-center gap-1.5 mt-2">
-                  <Clock :size="10" class="text-text-disabled" />
-                  <span class="text-[10px] text-text-disabled font-medium uppercase tracking-wider">{{
+                  <Clock :size="10" class="text-zinc-600" />
+                  <span class="text-[10px] text-zinc-600 font-medium uppercase tracking-wider">{{
                     formatTime(activity.createdAt)
                   }}</span>
                 </div>
@@ -113,21 +110,21 @@
 
       <!-- 系统状态 -->
       <div
-        class="lg:col-span-4 bg-bg-secondary-40 border border-border-secondary rounded-xl overflow-hidden flex flex-col shadow-lg shadow-[0_10px_15px_var(--shadow-color)]"
+        class="lg:col-span-4 bg-zinc-900/40 border border-zinc-800 rounded-xl overflow-hidden flex flex-col shadow-lg shadow-black/20"
       >
-        <div class="px-6 py-5 border-b border-border-secondary flex items-center justify-between">
+        <div class="px-6 py-5 border-b border-zinc-800 flex items-center justify-between">
           <h3 class="text-lg font-bold flex items-center gap-2">
-            <ShieldCheck :size="18" class="text-success" /> {{ locale.systemStatus }}
+            <ShieldCheck :size="18" class="text-emerald-500" /> 系统状态
           </h3>
           <span
             :class="[
               'px-3 py-1 text-[10px] font-black uppercase rounded-full border',
               systemStatus.online
-                ? 'bg-success-10 text-success border-success-20'
-                : 'bg-error-10 text-error border-error-20'
+                ? 'bg-emerald-500/10 text-emerald-500 border-emerald-500/20'
+                : 'bg-red-500/10 text-red-500 border-red-500/20'
             ]"
           >
-            {{ systemStatus.online ? locale.online : locale.offline }}
+            {{ systemStatus.online ? '在线' : '离线' }}
           </span>
         </div>
         <div class="p-6 space-y-6">
@@ -141,38 +138,24 @@
                 :class="[
                   'w-1.5 h-1.5 rounded-full',
                   status.active
-                    ? 'bg-success shadow-[0_0_10px_var(--success-70)]'
-                    : 'bg-bg-quaternary'
+                    ? 'bg-emerald-500 shadow-[0_0_10px_rgba(16,185,129,0.7)]'
+                    : 'bg-zinc-600'
                 ]"
               />
-              <span class="text-xs font-semibold text-text-tertiary">{{ status.label }}</span>
+              <span class="text-xs font-semibold text-zinc-400">{{ status.label }}</span>
             </div>
-            <span class="text-xs font-bold text-text-primary">{{ status.value }}</span>
+            <span class="text-xs font-bold text-zinc-200">{{ status.value }}</span>
           </div>
         </div>
-        <div class="mt-auto border-t border-border-secondary px-6 py-4 flex flex-col items-center justify-center gap-1 text-center">
-          <span class="text-[10px] font-medium uppercase tracking-[0.3em] text-text-disabled">
-            {{ locale.instanceId }}
-          </span>
-          <button
-            type="button"
-            class="max-w-full text-xs text-text-tertiary hover:text-text-secondary transition-colors break-all leading-relaxed"
-            :title="instanceId || locale.noInstanceId"
-            :disabled="!instanceId"
-            @click="copyInstanceId"
-          >
-            {{ instanceId || locale.noInstanceId }}
-          </button>
-        </div>
       </div>
 
       <!-- 快速操作 -->
       <div
-        class="lg:col-span-3 bg-bg-secondary-40 border border-border-secondary rounded-3xl overflow-hidden flex flex-col shadow-lg shadow-[0_10px_15px_var(--shadow-color)]"
+        class="lg:col-span-3 bg-zinc-900/40 border border-zinc-800 rounded-3xl overflow-hidden flex flex-col shadow-lg shadow-black/20"
       >
-        <div class="px-6 py-5 border-b border-border-secondary">
+        <div class="px-6 py-5 border-b border-zinc-800">
           <h3 class="text-lg font-bold flex items-center gap-2">
-            <Zap :size="18" class="text-warning" /> {{ locale.quickActions }}
+            <Zap :size="18" class="text-yellow-500" /> 快速操作
           </h3>
         </div>
         <div class="p-6 space-y-3">
@@ -182,8 +165,8 @@
             :class="[
               'w-full flex items-center gap-3 px-5 py-4 rounded-lg border font-bold text-sm transition-all text-left group',
               action.primary
-                ? 'bg-primary-hover border-primary text-text-primary shadow-xl shadow-[var(--primary-glow)] hover:bg-primary'
-                : 'bg-bg-primary-40 border-border-secondary text-text-tertiary hover:border-border-tertiary hover:text-text-primary'
+                ? 'bg-blue-600 border-blue-500 text-white shadow-xl shadow-blue-900/20 hover:bg-blue-500'
+                : 'bg-zinc-950/40 border-zinc-800 text-zinc-400 hover:border-zinc-600 hover:text-zinc-200'
             ]"
             @click="navigateTo(action.id)"
           >
@@ -198,36 +181,31 @@
 </template>
 
 <script setup>
-import { computed, onMounted, ref } from 'vue'
+import { onMounted, ref, computed } from 'vue'
 import {
-  Activity,
-  Ban,
-  Bell,
-  Calendar,
-  Clock,
-  ExternalLink,
-  Heart,
-  Inbox,
-  Loader2,
   Music,
-  RefreshCw,
-  ShieldCheck,
+  Users,
+  Calendar,
+  Heart,
   TrendingDown,
   TrendingUp,
-  Users,
-  Zap
+  Activity,
+  ShieldCheck,
+  RefreshCw,
+  Clock,
+  Zap,
+  Bell,
+  Ban,
+  ExternalLink,
+  Inbox
 } from '@lucide/vue'
 import packageJson from '~~/package.json'
-import { useToast } from '~/composables/useToast'
-import { useLocale } from '~/utils/locale'
 
 const emit = defineEmits(['navigate'])
-const { success: showSuccess, error: showError } = useToast()
-const { admin } = useLocale()
-const locale = computed(() => useSafeLocale(admin.value?.overview || {}))
-const { format: formatLocaleValue } = useLocaleText(locale)
 
 const systemVersion = ref(packageJson.version)
+const { siteTitle } = useSiteConfig()
+const displayName = computed(() => siteTitle.value || '站点')
 const stats = ref({
   totalSongs: 0,
   totalUsers: 0,
@@ -243,7 +221,6 @@ const stats = ref({
 
 const recentActivities = ref([])
 const loadingActivities = ref(false)
-const instanceId = ref('')
 
 const systemStatus = ref({
   online: true,
@@ -254,7 +231,7 @@ const systemStatus = ref({
 // 统计卡片数据
 const statCards = computed(() => [
   {
-    label: locale.value.statCards?.totalSongs || '总歌曲数',
+    label: '总歌曲数',
     value: formatNumber(stats.value.totalSongs),
     icon: Music,
     color: 'blue',
@@ -262,19 +239,19 @@ const statCards = computed(() => [
     trendDown: stats.value.songsChange < 0
   },
   {
-    label: locale.value.statCards?.registeredUsers || '注册用户',
+    label: '注册用户',
     value: formatNumber(stats.value.totalUsers),
     icon: Users,
     color: 'emerald'
   },
   {
-    label: locale.value.statCards?.todaySchedules || '今日排班',
+    label: '今日排期',
     value: formatNumber(stats.value.todaySchedules),
     icon: Calendar,
-    color: 'warning'
+    color: 'zinc'
   },
   {
-    label: locale.value.statCards?.weeklyRequests || '本周点歌',
+    label: '本周点歌',
     value: formatNumber(stats.value.weeklyRequests),
     icon: Heart,
     color: 'pink',
@@ -286,49 +263,48 @@ const statCards = computed(() => [
 // 系统状态项
 const statusItems = computed(() => [
   {
-    label: locale.value.statusItems?.database || '数据库',
-    value: systemStatus.value.database ? locale.value.normal || '正常' : locale.value.abnormal || '异常',
+    label: '数据库连接',
+    value: systemStatus.value.database ? '正常' : '异常',
     active: systemStatus.value.database
   },
   {
-    label: locale.value.statusItems?.api || 'API',
-    value: systemStatus.value.api ? locale.value.normal || '正常' : locale.value.abnormal || '异常',
+    label: 'API服务',
+    value: systemStatus.value.api ? '正常' : '异常',
     active: systemStatus.value.api
   },
   {
-    label: locale.value.statusItems?.semester || '当前学期',
-    value: stats.value.currentSemester || locale.value.unset || '未设置',
+    label: '当前学期',
+    value: stats.value.currentSemester || '未设置',
     active: !!stats.value.currentSemester
   },
   {
-    label: locale.value.statusItems?.blacklist || '黑名单',
-    value: formatLocaleValue(locale.value.itemUnit, String(stats.value.blacklistCount), stats.value.blacklistCount),
+    label: '黑名单项目',
+    value: `${stats.value.blacklistCount} 项`,
     active: stats.value.blacklistCount >= 0
   },
-  { label: locale.value.statusItems?.version || '版本', value: `v${systemVersion.value}`, active: true }
+  { label: '站点版本', value: `${displayName.value} v${systemVersion.value}`, active: true }
 ])
 
 // 快速操作
-const quickActions = computed(() => [
-  { label: locale.value.actions?.schedule || '排班管理', icon: Calendar, id: 'schedule', primary: true },
-  { label: locale.value.actions?.users || '用户管理', icon: Users, id: 'users' },
-  { label: locale.value.actions?.notifications || '通知管理', icon: Bell, id: 'notifications' },
-  { label: locale.value.actions?.blacklist || '黑名单', icon: Ban, id: 'blacklist' }
-])
+const quickActions = [
+  { label: '管理排期', icon: Calendar, id: 'schedule', primary: true },
+  { label: '用户管理', icon: Users, id: 'users' },
+  { label: '发送通知', icon: Bell, id: 'notifications' },
+  { label: '黑名单管理', icon: Ban, id: 'blacklist' }
+]
 
 const formatNumber = (num) => {
-  if (num >= 1000) return `${(num / 1000).toFixed(1)}K`
+  if (num >= 1000) return (num / 1000).toFixed(1) + 'K'
   return num.toString()
 }
 
 const getActivityStyle = (type) => {
   const styles = {
-    song: { icon: Music, bg: 'bg-info-10 text-info border-info-20' },
-    user: { icon: Users, bg: 'bg-color-pink-alpha-10 text-color-pink border-color-pink-alpha-20' },
-    schedule: { icon: Calendar, bg: 'bg-primary-10 text-primary border-primary-20' }
+    song: { icon: Music, bg: 'bg-purple-500/10 text-purple-500 border-purple-500/20' },
+    user: { icon: Users, bg: 'bg-pink-500/10 text-pink-500 border-pink-500/20' },
+    schedule: { icon: Calendar, bg: 'bg-blue-500/10 text-blue-500 border-blue-500/20' }
   }
-
-  return styles[type] || { icon: Activity, bg: 'bg-bg-quaternary-10 text-text-tertiary border-border-tertiary-20' }
+  return styles[type] || { icon: Activity, bg: 'bg-zinc-500/10 text-zinc-500 border-zinc-500/20' }
 }
 
 const loadStats = async () => {
@@ -342,60 +318,6 @@ const loadStats = async () => {
   }
 }
 
-const loadSystemStatus = async () => {
-  try {
-    const response = await $fetch('/api/system/status')
-    systemStatus.value.online = response?.status === 'ok'
-    systemStatus.value.database = !!response?.database?.connected
-    systemStatus.value.api = response?.status === 'ok'
-    instanceId.value = response?.instance?.instanceId || ''
-  } catch (error) {
-    console.error('加载系统状态失败:', error)
-    systemStatus.value.online = false
-    systemStatus.value.database = false
-    systemStatus.value.api = false
-    instanceId.value = ''
-  }
-}
-
-const copyToClipboard = async (text) => {
-  if (navigator.clipboard?.writeText) {
-    await navigator.clipboard.writeText(text)
-    return true
-  }
-
-  const textarea = document.createElement('textarea')
-  textarea.value = text
-  textarea.setAttribute('readonly', 'true')
-  textarea.style.position = 'fixed'
-  textarea.style.opacity = '0'
-  document.body.appendChild(textarea)
-  textarea.select()
-
-  const copied = document.execCommand('copy')
-  document.body.removeChild(textarea)
-  return copied
-}
-
-const copyInstanceId = async () => {
-  if (!instanceId.value) {
-    showError(locale.value.noInstanceId || '暂无实例 ID')
-    return
-  }
-
-  try {
-    const copied = await copyToClipboard(instanceId.value)
-    if (copied) {
-      showSuccess(locale.value.copied || '已复制')
-    } else {
-      showError(locale.value.copyFailed || '复制失败')
-    }
-  } catch (error) {
-    console.error('复制实例 ID 失败:', error)
-    showError(locale.value.copyFailed || '复制失败')
-  }
-}
-
 const loadRecentActivities = async () => {
   loadingActivities.value = true
   try {
@@ -417,20 +339,13 @@ const refreshActivities = () => {
 
 const formatTime = (dateString) => {
   const date = new Date(dateString)
-  const now = getSyncedDate()
+  const now = new Date()
   const diff = now - date
 
-  if (diff < 60000) return locale.value?.justNow || '刚刚'
-  if (diff < 3600000) {
-    const minutes = Math.floor(diff / 60000)
-    return formatLocaleValue(locale.value?.minutesAgo, `${minutes}分钟前`, minutes)
-  }
-  if (diff < 86400000) {
-    const hours = Math.floor(diff / 3600000)
-    return formatLocaleValue(locale.value?.hoursAgo, `${hours}小时前`, hours)
-  }
-  const days = Math.floor(diff / 86400000)
-  return formatLocaleValue(locale.value?.daysAgo, `${days}天前`, days)
+  if (diff < 60000) return '刚刚'
+  if (diff < 3600000) return `${Math.floor(diff / 60000)}分钟前`
+  if (diff < 86400000) return `${Math.floor(diff / 3600000)}小时前`
+  return `${Math.floor(diff / 86400000)}天前`
 }
 
 const navigateTo = (tab) => {
@@ -439,7 +354,6 @@ const navigateTo = (tab) => {
 
 onMounted(() => {
   loadStats()
-  loadSystemStatus()
   loadRecentActivities()
 })
 </script>
@@ -452,10 +366,10 @@ onMounted(() => {
   background: transparent;
 }
 .custom-scrollbar::-webkit-scrollbar-thumb {
-  background: var(--panel-bg-alt);
+  background: var(--bg-tertiary, #27272a);
   border-radius: 10px;
 }
 .custom-scrollbar::-webkit-scrollbar-thumb:hover {
-  background: var(--panel-bg-hover);
+  background: #3f3f46;
 }
 </style>
diff --git a/app/components/Admin/PlayTimeManager.vue b/app/components/Admin/PlayTimeManager.vue
index e6a453d..7315f1d 100644
--- a/app/components/Admin/PlayTimeManager.vue
+++ b/app/components/Admin/PlayTimeManager.vue
@@ -3,49 +3,49 @@
     <!-- 页面标题 -->
     <div class="flex flex-col md:flex-row md:items-end justify-between gap-6">
       <div>
-        <h2 class="text-2xl font-black text-text-primary tracking-tight">{{ locale.title }}</h2>
-        <p class="text-xs text-text-tertiary mt-1">
-          {{ locale.desc }}
+        <h2 class="text-2xl font-black text-zinc-100 tracking-tight">播出时段管理</h2>
+        <p class="text-xs text-zinc-500 mt-1">
+          定义校园广播的常规播放窗口，用户仅可在这些时间段内进行点歌或查看排期
         </p>
       </div>
       <div class="flex items-center gap-3">
         <div
-          class="bg-bg-secondary-40 border border-border-secondary rounded-xl px-4 py-2 flex items-center gap-3"
+          class="bg-zinc-900/40 border border-zinc-800 rounded-xl px-4 py-2 flex items-center gap-3"
         >
-          <span class="text-[10px] font-black text-text-tertiary uppercase tracking-widest"
-            >{{ locale.enableSelection }}</span
+          <span class="text-[10px] font-black text-zinc-500 uppercase tracking-widest"
+            >启用播出时段选择</span
           >
           <button
             :class="[
               'relative w-10 h-5 rounded-full transition-colors',
-              enablePlayTimeSelection ? 'bg-primary-hover' : 'bg-bg-tertiary'
+              enablePlayTimeSelection ? 'bg-blue-600' : 'bg-zinc-800'
             ]"
             @click="toggleGlobalEnabled"
           >
             <div
               :class="[
-                'absolute top-1 w-3 h-3 bg-bg-secondary rounded-full transition-all',
+                'absolute top-1 w-3 h-3 bg-white rounded-full transition-all',
                 enablePlayTimeSelection ? 'left-6' : 'left-1'
               ]"
             />
           </button>
         </div>
         <button
-          class="flex items-center gap-2 px-6 py-2.5 bg-primary-hover hover:bg-primary text-text-primary text-xs font-black rounded-lg shadow-lg shadow-[var(--primary-glow)] transition-all active:scale-95"
+          class="flex items-center gap-2 px-6 py-2.5 bg-blue-600 hover:bg-blue-500 text-white text-xs font-black rounded-lg shadow-lg shadow-blue-900/20 transition-all active:scale-95"
           @click="openAddForm"
         >
-          <Plus :size="14" /> {{ locale.add }}
+          <Plus :size="14" /> 添加播出时段
         </button>
       </div>
     </div>
 
     <!-- 信息卡片 -->
-    <div class="bg-primary-hover-5 border border-primary-10 rounded-xl p-5 flex items-start gap-4">
-      <Info class="text-primary shrink-0 mt-0.5" :size="18" />
+    <div class="bg-blue-600/5 border border-blue-500/10 rounded-xl p-5 flex items-start gap-4">
+      <Info class="text-blue-500 shrink-0 mt-0.5" :size="18" />
       <div class="space-y-1">
-        <p class="text-xs font-bold text-text-secondary">{{ locale.aboutTitle }}</p>
-        <p class="text-[11px] text-text-tertiary leading-relaxed">
-          {{ locale.aboutDesc }}
+        <p class="text-xs font-bold text-zinc-300">关于时段限制</p>
+        <p class="text-[11px] text-zinc-500 leading-relaxed">
+          启用全局时段选择后，系统将仅在定义的时段内开放点歌功能。如果未设置开始或结束时间，系统将视为该边界不设限。
         </p>
       </div>
     </div>
@@ -53,35 +53,37 @@
     <!-- 加载状态 -->
     <div
       v-if="loading"
-      class="flex flex-col items-center justify-center py-20 space-y-4 bg-bg-secondary-20 border border-border-secondary-50 rounded-xl"
+      class="flex flex-col items-center justify-center py-20 space-y-4 bg-zinc-900/20 border border-zinc-800/50 rounded-xl"
     >
-      <AppSpinner :size="40" />
-      <p class="text-xs font-black text-text-tertiary uppercase tracking-widest">{{ locale.loading }}</p>
+      <div
+        class="w-10 h-10 border-4 border-blue-600/20 border-t-blue-600 rounded-full animate-spin"
+      />
+      <p class="text-xs font-black text-zinc-500 uppercase tracking-widest">加载中...</p>
     </div>
 
     <!-- 错误状态 -->
     <div
       v-else-if="error"
-      class="bg-error-5 border border-error-10 rounded-xl p-5 flex items-start gap-4"
+      class="bg-red-500/5 border border-red-500/10 rounded-xl p-5 flex items-start gap-4"
     >
-      <AlertCircle class="text-error shrink-0 mt-0.5" :size="18" />
+      <AlertCircle class="text-red-500 shrink-0 mt-0.5" :size="18" />
       <div class="space-y-1">
-        <p class="text-xs font-bold text-text-secondary">{{ locale.fetchFailed }}</p>
-        <p class="text-[11px] text-text-tertiary leading-relaxed">{{ error }}</p>
+        <p class="text-xs font-bold text-zinc-300">获取数据失败</p>
+        <p class="text-[11px] text-zinc-500 leading-relaxed">{{ error }}</p>
       </div>
     </div>
 
     <!-- 空状态 -->
     <div
       v-else-if="playTimes.length === 0"
-      class="flex flex-col items-center justify-center py-20 space-y-6 bg-bg-secondary-20 border border-border-secondary-50 rounded-xl"
+      class="flex flex-col items-center justify-center py-20 space-y-6 bg-zinc-900/20 border border-zinc-800/50 rounded-xl"
     >
-      <div class="p-6 rounded-xl bg-bg-primary border border-border-secondary text-text-secondary">
+      <div class="p-6 rounded-xl bg-zinc-950 border border-zinc-800 text-zinc-700">
         <Clock :size="48" />
       </div>
       <div class="text-center space-y-2">
-        <h3 class="text-lg font-bold text-text-primary">{{ locale.emptyTitle }}</h3>
-        <p class="text-xs text-text-tertiary">{{ locale.emptyDesc }}</p>
+        <h3 class="text-lg font-bold text-zinc-100">暂无播出时段</h3>
+        <p class="text-xs text-zinc-500">点击“添加播出时段”按钮创建第一个播出时段</p>
       </div>
     </div>
 
@@ -92,15 +94,15 @@
           v-for="playTime in playTimes"
           :key="playTime.id"
           :class="[
-            'group relative bg-bg-secondary-30 border rounded-xl p-8 transition-all hover:shadow-2xl hover:shadow-[0_25px_50px_var(--shadow-color-deep)]',
-            playTime.enabled ? 'border-border-secondary-80' : 'border-border-secondary-40 opacity-60'
+            'group relative bg-zinc-900/30 border rounded-xl p-8 transition-all hover:shadow-2xl hover:shadow-black/40',
+            playTime.enabled ? 'border-zinc-800/80' : 'border-zinc-800/40 opacity-60'
           ]"
         >
           <div class="flex items-start justify-between mb-6">
             <div
               :class="[
-                'p-3 rounded-xl bg-bg-primary border border-border-secondary transition-all flex items-center justify-center',
-                playTime.enabled ? 'text-primary border-primary-20' : 'text-text-secondary'
+                'p-3 rounded-xl bg-zinc-950 border border-zinc-800 transition-all',
+                playTime.enabled ? 'text-blue-500 border-blue-500/20' : 'text-zinc-700'
               ]"
             >
               <Clock :size="20" />
@@ -110,13 +112,13 @@
                 :class="[
                   'px-2 py-0.5 rounded text-[9px] font-black uppercase tracking-widest border transition-all',
                   playTime.enabled
-                    ? 'bg-success-10 text-success border-success-20'
-                    : 'bg-bg-tertiary-50 text-text-disabled border-border-tertiary-50'
+                    ? 'bg-emerald-500/10 text-emerald-500 border-emerald-500/20'
+                    : 'bg-zinc-800/50 text-zinc-600 border-zinc-700/50'
                 ]"
               >
-                {{ playTime.enabled ? locale.enabled : locale.disabled }}
+                {{ playTime.enabled ? '已启用' : '已禁用' }}
               </span>
-              <button class="p-1.5 text-text-secondary hover:text-text-tertiary">
+              <button class="p-1.5 text-zinc-700 hover:text-zinc-400">
                 <MoreVertical :size="14" />
               </button>
             </div>
@@ -125,34 +127,34 @@
           <div class="space-y-4">
             <div>
               <h4
-                class="text-lg font-black text-text-primary group-hover:text-primary transition-colors"
+                class="text-lg font-black text-zinc-100 group-hover:text-blue-400 transition-colors"
               >
                 {{ playTime.name }}
               </h4>
               <div
-                class="flex items-center gap-2 mt-1.5 text-primary-80 font-black tracking-tighter"
+                class="flex items-center gap-2 mt-1.5 text-blue-500/80 font-black tracking-tighter"
               >
-                <span class="text-xl">{{ playTime.startTime || locale.unlimited }}</span>
-                <div class="w-4 h-[2px] bg-bg-tertiary" />
-                <span class="text-xl">{{ playTime.endTime || locale.unlimited }}</span>
+                <span class="text-xl">{{ playTime.startTime || '不限' }}</span>
+                <div class="w-4 h-[2px] bg-zinc-800" />
+                <span class="text-xl">{{ playTime.endTime || '不限' }}</span>
               </div>
             </div>
 
-            <p class="text-xs text-text-tertiary font-medium leading-relaxed min-h-[32px] line-clamp-2">
-              {{ playTime.description || locale.noDescription }}
+            <p class="text-xs text-zinc-500 font-medium leading-relaxed min-h-[32px] line-clamp-2">
+              {{ playTime.description || '暂无详细描述...' }}
             </p>
           </div>
 
-          <div class="mt-8 pt-6 border-t border-border-secondary-50 flex items-center justify-between">
+          <div class="mt-8 pt-6 border-t border-zinc-800/50 flex items-center justify-between">
             <div class="flex gap-2">
               <button
-                class="p-2.5 bg-bg-primary border border-border-secondary rounded-lg text-text-tertiary hover:text-primary hover:border-primary-30 transition-all"
+                class="p-2.5 bg-zinc-950 border border-zinc-800 rounded-lg text-zinc-500 hover:text-blue-400 hover:border-blue-500/30 transition-all"
                 @click="editPlayTime(playTime)"
               >
                 <Edit2 :size="14" />
               </button>
               <button
-                class="p-2.5 bg-bg-primary border border-border-secondary rounded-lg text-text-tertiary hover:text-error hover:border-error-30 transition-all"
+                class="p-2.5 bg-zinc-950 border border-zinc-800 rounded-lg text-zinc-500 hover:text-red-400 hover:border-red-500/30 transition-all"
                 @click="confirmDelete(playTime)"
               >
                 <Trash2 :size="14" />
@@ -162,13 +164,13 @@
               :class="[
                 'flex items-center gap-2 px-4 py-2 rounded-lg text-[10px] font-black uppercase tracking-widest transition-all',
                 playTime.enabled
-                  ? 'bg-bg-tertiary text-text-tertiary hover:text-text-primary'
-                  : 'bg-success text-text-primary shadow-lg shadow-[var(--success-glow-20)]'
+                  ? 'bg-zinc-800 text-zinc-400 hover:text-zinc-200'
+                  : 'bg-emerald-600 text-white shadow-lg shadow-emerald-900/20'
               ]"
               @click="togglePlayTimeStatus(playTime)"
             >
               <Power :size="12" />
-              {{ playTime.enabled ? locale.disable : locale.enable }}
+              {{ playTime.enabled ? '禁用' : '启用' }}
             </button>
           </div>
         </div>
@@ -181,17 +183,17 @@
         v-if="showAddForm || editingPlayTime"
         class="fixed inset-0 z-50 flex items-center justify-center p-4"
       >
-        <div class="absolute inset-0 bg-bg-primary-80 backdrop-blur-sm" @click="cancelForm" />
+        <div class="absolute inset-0 bg-black/80 backdrop-blur-sm" @click="cancelForm" />
         <div
-          class="relative w-full max-w-lg bg-bg-secondary border border-border-secondary rounded-xl shadow-2xl overflow-hidden"
+          class="relative w-full max-w-lg bg-zinc-900 border border-zinc-800 rounded-xl shadow-2xl overflow-hidden"
         >
           <div class="p-8">
             <div class="flex items-center justify-between mb-8">
-              <h3 class="text-xl font-black text-text-primary tracking-tight">
-                {{ editingPlayTime ? locale.editTitle : locale.addTitle }}
+              <h3 class="text-xl font-black text-zinc-100 tracking-tight">
+                {{ editingPlayTime ? '编辑播出时段' : '添加播出时段' }}
               </h3>
               <button
-                class="p-2 text-text-tertiary hover:text-text-primary transition-colors"
+                class="p-2 text-zinc-500 hover:text-zinc-200 transition-colors"
                 @click="cancelForm"
               >
                 <X :size="20" />
@@ -200,64 +202,64 @@
 
             <div class="space-y-6">
               <div class="space-y-2">
-                <label class="text-[10px] font-black text-text-disabled uppercase tracking-widest px-1"
-                  >{{ locale.name }}</label
+                <label class="text-[10px] font-black text-zinc-600 uppercase tracking-widest px-1"
+                  >时段名称</label
                 >
                 <input
                   v-model="formData.name"
                   type="text"
-                  :placeholder="locale.namePlaceholder"
-                  class="w-full bg-bg-primary border border-border-secondary rounded-lg px-5 py-3.5 text-sm text-text-primary focus:outline-none focus:border-primary-30"
+                  placeholder="例如: 午间广播"
+                  class="w-full bg-zinc-950 border border-zinc-800 rounded-lg px-5 py-3.5 text-sm text-zinc-200 focus:outline-none focus:border-blue-500/30"
                 >
               </div>
 
               <div class="grid grid-cols-2 gap-6">
                 <div class="space-y-2">
-                  <label class="text-[10px] font-black text-text-disabled uppercase tracking-widest px-1"
-                    >{{ locale.startTimeOptional }}</label
+                  <label class="text-[10px] font-black text-zinc-600 uppercase tracking-widest px-1"
+                    >开始时间 (可选)</label
                   >
                   <div class="relative">
                     <input
                       v-model="formData.startTime"
                       type="time"
-                      class="w-full bg-bg-primary border border-border-secondary rounded-lg px-5 py-3.5 text-sm text-text-primary focus:outline-none focus:border-primary-30 appearance-none"
+                      class="w-full bg-zinc-950 border border-zinc-800 rounded-lg px-5 py-3.5 text-sm text-zinc-200 focus:outline-none focus:border-blue-500/30 appearance-none"
                     >
                     <Clock
-                      class="absolute right-4 top-1/2 -translate-y-1/2 text-text-secondary pointer-events-none"
+                      class="absolute right-4 top-1/2 -translate-y-1/2 text-zinc-700 pointer-events-none"
                       :size="14"
                     />
                   </div>
-                  <p class="text-[9px] text-text-disabled px-1">{{ locale.startTimeHint }}</p>
+                  <p class="text-[9px] text-zinc-600 px-1">留空表示不限制开始时间</p>
                 </div>
                 <div class="space-y-2">
-                  <label class="text-[10px] font-black text-text-disabled uppercase tracking-widest px-1"
-                    >{{ locale.endTimeOptional }}</label
+                  <label class="text-[10px] font-black text-zinc-600 uppercase tracking-widest px-1"
+                    >结束时间 (可选)</label
                   >
                   <div class="relative">
                     <input
                       v-model="formData.endTime"
                       type="time"
-                      class="w-full bg-bg-primary border border-border-secondary rounded-lg px-5 py-3.5 text-sm text-text-primary focus:outline-none focus:border-primary-30 appearance-none"
+                      class="w-full bg-zinc-950 border border-zinc-800 rounded-lg px-5 py-3.5 text-sm text-zinc-200 focus:outline-none focus:border-blue-500/30 appearance-none"
                     >
                     <Clock
-                      class="absolute right-4 top-1/2 -translate-y-1/2 text-text-secondary pointer-events-none"
+                      class="absolute right-4 top-1/2 -translate-y-1/2 text-zinc-700 pointer-events-none"
                       :size="14"
                     />
                   </div>
-                  <p class="text-[9px] text-text-disabled px-1">{{ locale.endTimeHint }}</p>
+                  <p class="text-[9px] text-zinc-600 px-1">留空表示不限制结束时间</p>
                 </div>
               </div>
 
               <div class="space-y-2">
                 <label
-                  class="text-[10px] font-black text-text-disabled uppercase tracking-widest px-1 flex items-center gap-2"
+                  class="text-[10px] font-black text-zinc-600 uppercase tracking-widest px-1 flex items-center gap-2"
                 >
-                  <AlignLeft :size="10" /> {{ locale.descriptionOptional }}
+                  <AlignLeft :size="10" /> 描述 (可选)
                 </label>
                 <textarea
                   v-model="formData.description"
-                  :placeholder="locale.descriptionPlaceholder"
-                  class="w-full bg-bg-primary border border-border-secondary rounded-lg px-5 py-4 text-sm text-text-primary focus:outline-none focus:border-primary-30 min-h-[100px] resize-none"
+                  placeholder="请输入时段描述信息..."
+                  class="w-full bg-zinc-950 border border-zinc-800 rounded-lg px-5 py-4 text-sm text-zinc-200 focus:outline-none focus:border-blue-500/30 min-h-[100px] resize-none"
                 />
               </div>
 
@@ -265,36 +267,36 @@
                 <input
                   v-model="formData.enabled"
                   type="checkbox"
-                  class="w-4 h-4 rounded border-border-secondary bg-bg-primary"
+                  class="w-4 h-4 rounded border-zinc-800 bg-zinc-950 accent-blue-600"
                 >
                 <span
-                  class="text-xs font-bold text-text-secondary group-hover:text-primary transition-colors"
-                  >{{ locale.enableThisPlayTime }}</span
+                  class="text-xs font-bold text-zinc-300 group-hover:text-blue-400 transition-colors"
+                  >启用此播出时段</span
                 >
               </label>
 
               <div
                 v-if="formError"
-                class="bg-error-10 border border-error-20 rounded-lg p-3 text-[11px] text-error"
+                class="bg-red-500/10 border border-red-500/20 rounded-lg p-3 text-[11px] text-red-400"
               >
                 {{ formError }}
               </div>
             </div>
           </div>
 
-          <div class="px-8 py-6 bg-bg-primary-50 border-t border-border-secondary flex justify-end gap-3">
+          <div class="px-8 py-6 bg-zinc-950/50 border-t border-zinc-800 flex justify-end gap-3">
             <button
-              class="px-6 py-2.5 text-xs font-bold text-text-tertiary hover:text-text-secondary"
+              class="px-6 py-2.5 text-xs font-bold text-zinc-500 hover:text-zinc-300"
               @click="cancelForm"
             >
-              {{ locale.cancel }}
+              取消
             </button>
             <button
               :disabled="formSubmitting"
-              class="px-8 py-2.5 bg-primary-hover hover:bg-primary disabled:opacity-50 disabled:cursor-not-allowed text-text-primary text-xs font-black rounded-lg shadow-lg transition-all active:scale-95"
+              class="px-8 py-2.5 bg-blue-600 hover:bg-blue-500 disabled:opacity-50 disabled:cursor-not-allowed text-white text-xs font-black rounded-lg shadow-lg transition-all active:scale-95"
               @click="savePlayTime"
             >
-              {{ formSubmitting ? locale.saving : locale.saveSettings }}
+              {{ formSubmitting ? '保存中...' : '保存设置' }}
             </button>
           </div>
         </div>
@@ -305,40 +307,40 @@
     <Transition name="modal">
       <div v-if="showDeleteConfirm" class="fixed inset-0 z-50 flex items-center justify-center p-4">
         <div
-          class="absolute inset-0 bg-bg-primary-80 backdrop-blur-sm"
+          class="absolute inset-0 bg-black/80 backdrop-blur-sm"
           @click="showDeleteConfirm = false"
         />
         <div
-          class="relative w-full max-w-sm bg-bg-secondary border border-border-secondary rounded-xl shadow-2xl overflow-hidden"
+          class="relative w-full max-w-sm bg-zinc-900 border border-zinc-800 rounded-xl shadow-2xl overflow-hidden"
         >
           <div class="p-8">
             <div class="flex flex-col items-center py-4 space-y-6">
               <div
-                class="w-16 h-16 rounded-xl bg-error-10 text-error flex items-center justify-center border border-error-10 shadow-xl shadow-[var(--error-glow-5)]"
+                class="w-16 h-16 rounded-xl bg-red-600/10 text-red-500 flex items-center justify-center border border-red-500/10 shadow-xl shadow-red-900/5"
               >
                 <AlertCircle :size="32" />
               </div>
               <div class="text-center space-y-2 px-4">
-                <h4 class="text-lg font-bold text-text-primary">
-                  {{ deleteConfirmTitleText }}
+                <h4 class="text-lg font-bold text-zinc-100">
+                  确定要删除播出时段 "{{ playTimeToDelete?.name }}" 吗？
                 </h4>
-                <p class="text-xs text-text-tertiary leading-relaxed">
-                  {{ locale.deleteConfirmDesc }}
+                <p class="text-xs text-zinc-500 leading-relaxed">
+                  此操作不可恢复，相关的歌曲点播和排期的时段设置将受影响或被清除。
                 </p>
               </div>
               <div class="flex gap-3 w-full pt-4">
                 <button
-                  class="flex-1 px-4 py-3 bg-bg-primary border border-border-secondary text-text-tertiary text-xs font-black rounded-lg transition-all hover:bg-bg-tertiary"
+                  class="flex-1 px-4 py-3 bg-zinc-950 border border-zinc-800 text-zinc-500 text-xs font-black rounded-lg transition-all hover:bg-zinc-800"
                   @click="showDeleteConfirm = false"
                 >
-                  {{ locale.cancel }}
+                  取消
                 </button>
                 <button
                   :disabled="deleteInProgress"
-                  class="flex-1 px-4 py-3 bg-error hover:bg-error disabled:opacity-50 disabled:cursor-not-allowed text-text-primary text-xs font-black rounded-lg shadow-xl shadow-[var(--error-glow-20)] transition-all active:scale-95"
+                  class="flex-1 px-4 py-3 bg-red-600 hover:bg-red-500 disabled:opacity-50 disabled:cursor-not-allowed text-white text-xs font-black rounded-lg shadow-xl shadow-red-900/20 transition-all active:scale-95"
                   @click="deletePlayTime"
                 >
-                  {{ deleteInProgress ? locale.deleting : locale.confirmDelete }}
+                  {{ deleteInProgress ? '删除中...' : '确认删除' }}
                 </button>
               </div>
             </div>
@@ -350,12 +352,10 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, onMounted, reactive, ref } from 'vue'
+import { onMounted, reactive, ref } from 'vue'
 import { useAuth } from '~/composables/useAuth'
 import { useToast } from '~/composables/useToast'
-import { useLocale } from '~/utils/locale'
-import type { PlayTime } from '~/types'
-import AppSpinner from '~/components/UI/Common/AppSpinner.vue'
+import type { PlayTime } from '~~/types'
 import {
   Plus,
   Clock,
@@ -371,17 +371,6 @@ import {
 
 const { getAuthConfig, isAdmin } = useAuth()
 const { showToast: showNotification } = useToast()
-const { admin } = useLocale()
-const locale = computed(() => {
-  const base = admin.value?.playTimeManager || {}
-  const emptyText = () => ''
-  return useSafeLocale({
-    ...base,
-    errors: { ...(base.errors || {}) },
-    messages: { ...(base.messages || {}) },
-    deleteConfirmTitle: base.deleteConfirmTitle || emptyText
-  })
-})
 
 const playTimes = ref<PlayTime[]>([])
 const loading = ref(false)
@@ -394,12 +383,6 @@ const formSubmitting = ref(false)
 const deleteInProgress = ref(false)
 const formError = ref('')
 const enablePlayTimeSelection = ref(false)
-const deleteConfirmTitleText = computed(() => {
-  const title = locale.value.deleteConfirmTitle
-  const name = playTimeToDelete.value?.name || ''
-  if (typeof title === 'function') return title(name)
-  return (title || '').replace('{0}', name)
-})
 
 // 表单数据
 const formData = reactive({
@@ -420,7 +403,7 @@ onMounted(async () => {
 // 获取播出时段列表
 const fetchPlayTimes = async () => {
   if (!isAdmin.value) {
-    error.value = locale.value.errors.adminOnly
+    error.value = '只有管理员才能管理播出时段'
     return
   }
 
@@ -428,10 +411,11 @@ const fetchPlayTimes = async () => {
   error.value = ''
 
   try {
-    const authConfig = getAuthConfig()
-    const data = await $fetch('/api/admin/play-times', {
-      ...authConfig
-    })
+      const authConfig = getAuthConfig()
+      const data = await $fetch('/api/admin/play-times', {
+        ...authConfig,
+        query: { t: Date.now() }
+      })
 
     // 自定义排序：先按启用状态排序，然后有时间的排在前面，没有时间的排在后面
     playTimes.value = data.sort((a: PlayTime, b: PlayTime) => {
@@ -463,7 +447,7 @@ const fetchPlayTimes = async () => {
       return a.name.localeCompare(b.name)
     })
   } catch (err: any) {
-    error.value = getErrorMessage(err) || locale.value.errors.fetchPlayTimesFailed
+    error.value = err.message || '获取播出时段失败'
   } finally {
     loading.value = false
   }
@@ -480,7 +464,7 @@ const fetchSystemSettings = async () => {
     })
     enablePlayTimeSelection.value = data.enablePlayTimeSelection
   } catch (err: any) {
-    console.error('获取系统设置失败:', getErrorMessage(err))
+    console.error('获取系统设置失败:', err.message)
   }
 }
 
@@ -504,9 +488,9 @@ const updateSystemSettings = async () => {
       ...authConfig
     })
 
-    showNotification(locale.value.messages.systemSettingsUpdated, 'success')
+    showNotification('系统设置已更新', 'success')
   } catch (err: any) {
-    error.value = getErrorMessage(err) || locale.value.errors.updateSystemSettingsFailed
+    error.value = err.message || '更新系统设置失败'
     showNotification(error.value, 'error')
     // 如果失败，恢复状态
     enablePlayTimeSelection.value = !enablePlayTimeSelection.value
@@ -555,14 +539,9 @@ const togglePlayTimeStatus = async (playTime: PlayTime) => {
 
     // 更新本地数据
     await fetchPlayTimes()
-    showNotification(
-      playTime.enabled
-        ? (locale.value?.messages?.playTimeDisabled || 'Play time disabled')
-        : (locale.value?.messages?.playTimeEnabled || 'Play time enabled'),
-      'success'
-    )
+    showNotification(playTime.enabled ? '播出时段已禁用' : '播出时段已启用', 'success')
   } catch (err: any) {
-    error.value = getErrorMessage(err) || locale.value.errors.updatePlayTimeStatusFailed
+    error.value = err.message || '更新播出时段状态失败'
     showNotification(error.value, 'error')
   }
 }
@@ -590,9 +569,9 @@ const deletePlayTime = async () => {
     await fetchPlayTimes()
     showDeleteConfirm.value = false
     playTimeToDelete.value = null
-    showNotification(locale.value?.messages?.playTimeDeleted || 'Play time deleted', 'success')
+    showNotification('播出时段已删除', 'success')
   } catch (err: any) {
-    error.value = getErrorMessage(err) || locale.value.errors.deletePlayTimeFailed
+    error.value = err.message || '删除播出时段失败'
     showNotification(error.value, 'error')
   } finally {
     deleteInProgress.value = false
@@ -605,13 +584,13 @@ const savePlayTime = async () => {
 
   // 时间验证（仅当两个时间都有填写时才进行比较）
   if (formData.startTime && formData.endTime && formData.startTime >= formData.endTime) {
-    formError.value = locale.value.errors.startBeforeEnd
+    formError.value = '开始时间必须早于结束时间'
     return
   }
 
   // 至少要有名称
   if (!formData.name.trim()) {
-    formError.value = locale.value.errors.nameRequired
+    formError.value = '时段名称不能为空'
     return
   }
 
@@ -624,7 +603,7 @@ const savePlayTime = async () => {
   )
 
   if (nameExists) {
-    formError.value = locale.value.errors.nameExists
+    formError.value = '播出时段名称已存在，请使用其他名称'
     return
   }
 
@@ -648,14 +627,9 @@ const savePlayTime = async () => {
     // 更新本地数据
     await fetchPlayTimes()
     cancelForm()
-    showNotification(
-      isUpdate
-        ? (locale.value?.messages?.playTimeUpdated || 'Play time updated')
-        : (locale.value?.messages?.playTimeCreated || 'Play time created'),
-      'success'
-    )
+    showNotification(isUpdate ? '播出时段已更新' : '播出时段已创建', 'success')
   } catch (err: any) {
-    formError.value = getErrorMessage(err) || locale.value.errors.savePlayTimeFailed
+    formError.value = err.message || '保存播出时段失败'
     showNotification(formError.value, 'error')
   } finally {
     formSubmitting.value = false
diff --git a/app/components/Admin/PlaylistCardGenerator.vue b/app/components/Admin/PlaylistCardGenerator.vue
new file mode 100644
index 0000000..f612fd6
--- /dev/null
+++ b/app/components/Admin/PlaylistCardGenerator.vue
@@ -0,0 +1,246 @@
+<template>
+  <Transition name="fade">
+    <div
+      v-if="show"
+      class="fixed inset-0 z-50 flex items-center justify-center bg-black/60 backdrop-blur-sm"
+      @click="$emit('close')"
+    >
+      <Transition name="scale">
+        <div
+          v-if="show"
+          class="bg-zinc-900 border border-zinc-800 rounded-2xl shadow-2xl w-full max-w-sm overflow-hidden flex flex-col"
+          @click.stop
+        >
+          <div class="flex items-center justify-between p-4 border-b border-zinc-800">
+            <h3 class="text-sm font-black text-zinc-100 uppercase tracking-widest">生成歌单卡片</h3>
+            <button
+              class="text-zinc-500 hover:text-zinc-300 transition-colors"
+              @click="$emit('close')"
+            >
+              <svg class="w-5 h-5" fill="none" stroke="currentColor" stroke-width="2" viewBox="0 0 24 24"><path d="M18 6L6 18M6 6l12 12"/></svg>
+            </button>
+          </div>
+
+          <div class="p-6 flex flex-col items-center gap-4">
+            <!-- 标题输入 -->
+            <div class="w-full space-y-2">
+              <label class="text-[11px] font-black uppercase text-zinc-600 tracking-wider">歌单标题</label>
+              <input
+                v-model="cardTitle"
+                type="text"
+                placeholder="例如: 2026-03-21 校园午间广播"
+                class="w-full bg-zinc-950 border border-zinc-800 rounded-lg px-3 py-2 text-sm text-zinc-300 focus:outline-none focus:border-blue-500/50 transition-colors"
+                @input="drawCanvas"
+              >
+            </div>
+
+            <!-- Canvas 预览 -->
+            <div class="relative w-full aspect-[2/3] max-w-[280px] bg-zinc-950 rounded-xl overflow-hidden border border-zinc-800 shadow-inner flex items-center justify-center">
+              <canvas ref="canvasRef" width="400" :height="canvasHeight" class="w-full h-full object-contain bg-white"></canvas>
+            </div>
+            
+            <p class="text-[10px] text-zinc-500 text-center">宽度 400 像素，高度自适应，适合在手机端查看和分享</p>
+          </div>
+
+          <div class="p-4 border-t border-zinc-800 bg-zinc-900/50 flex gap-3">
+            <button
+              class="flex-1 py-2.5 bg-zinc-800 hover:bg-zinc-700 text-zinc-300 text-xs font-bold rounded-xl transition-colors uppercase tracking-wider"
+              @click="$emit('close')"
+            >
+              取消
+            </button>
+            <button
+              class="flex-1 py-2.5 bg-blue-600 hover:bg-blue-500 text-white text-xs font-bold rounded-xl shadow-lg shadow-blue-900/20 transition-colors uppercase tracking-wider"
+              @click="downloadCard"
+            >
+              下载图片
+            </button>
+          </div>
+        </div>
+      </Transition>
+    </div>
+  </Transition>
+</template>
+
+<script setup>
+import { ref, onMounted, watch, nextTick, computed } from 'vue'
+
+const props = defineProps({
+  show: Boolean,
+  songs: {
+    type: Array,
+    default: () => []
+  },
+  defaultTitle: {
+    type: String,
+    default: '校园广播歌单'
+  }
+})
+
+const emit = defineEmits(['close'])
+
+const canvasRef = ref(null)
+const cardTitle = ref(props.defaultTitle)
+
+const aiPrompt = ref('anime style school campus sunset beautiful sky highly detailed')
+const isGeneratingAi = ref(false)
+const bgImageObj = ref(null)
+
+const maxDisplaySongs = 35
+
+const canvasHeight = computed(() => {
+  const count = Math.min(props.songs.length, maxDisplaySongs)
+  if (count <= 10) return 600
+  // 每多一首增加 40px 高度
+  return 600 + (count - 10) * 40
+})
+
+
+
+const drawCanvas = () => {
+  if (!canvasRef.value) return
+  const canvas = canvasRef.value
+  const ctx = canvas.getContext('2d')
+  if (!ctx) return
+  
+  const height = canvasHeight.value
+  
+  // 清空画布
+  if (bgImageObj.value) {
+    ctx.drawImage(bgImageObj.value, 0, 0, 400, height)
+    // 增加一层半透明黑色遮罩，确保文字和列表框可见
+    ctx.fillStyle = 'rgba(0, 0, 0, 0.15)'
+    ctx.fillRect(0, 0, 400, height)
+  } else {
+    ctx.fillStyle = '#F8FAFC' // Background color
+    ctx.fillRect(0, 0, 400, height)
+  }
+
+  // 绘制渐变头部
+  const gradient = ctx.createLinearGradient(0, 0, 400, 0)
+  if (bgImageObj.value) {
+    gradient.addColorStop(0, 'rgba(0, 0, 0, 0.7)')
+    gradient.addColorStop(1, 'rgba(0, 0, 0, 0.4)')
+  } else {
+    gradient.addColorStop(0, '#2563eb') // Primary Blue
+    gradient.addColorStop(1, '#3b82f6')
+  }
+  ctx.fillStyle = gradient
+  ctx.fillRect(0, 0, 400, 100)
+
+  // 绘制标题
+  ctx.fillStyle = '#FFFFFF'
+  ctx.font = 'bold 24px "Inter", "system-ui", sans-serif'
+  ctx.textAlign = 'center'
+  ctx.fillText(cardTitle.value || '校园广播歌单', 200, 50)
+  
+  // 绘制副标题(日期)
+  ctx.font = '14px "Inter", "system-ui", sans-serif'
+  ctx.fillStyle = 'rgba(255, 255, 255, 0.8)'
+  ctx.fillText(new Date().toLocaleDateString('zh-CN'), 200, 80)
+
+  // 绘制列表背景
+  if (bgImageObj.value) {
+    ctx.fillStyle = 'rgba(255, 255, 255, 0.85)' // 半透明白色背景
+  } else {
+    ctx.fillStyle = '#FFFFFF'
+  }
+  ctx.shadowColor = 'rgba(0,0,0,0.05)'
+  ctx.shadowBlur = 10
+  ctx.shadowOffsetY = 4
+  ctx.beginPath()
+  ctx.roundRect(20, 120, 360, height - 180, 12)
+  ctx.fill()
+  ctx.shadowColor = 'transparent'
+
+  // 绘制歌曲列表
+  ctx.textAlign = 'left'
+  let y = 160
+  
+  const displaySongs = props.songs.slice(0, maxDisplaySongs) // 最多显示 35 首
+  displaySongs.forEach((schedule, index) => {
+    const song = schedule.song || schedule
+    
+    // 序号
+    ctx.fillStyle = '#2563eb'
+    ctx.font = 'bold 16px "Inter", "system-ui", sans-serif'
+    ctx.fillText(`${index + 1}.`, 40, y)
+    
+    // 歌名
+    ctx.fillStyle = '#0F172A' // Neutral Dark
+    ctx.font = 'bold 16px "Inter", "system-ui", sans-serif'
+    // 限制歌名长度
+    let title = song.title || '未知歌曲'
+    if (title.length > 12) title = title.substring(0, 12) + '...'
+    ctx.fillText(title, 70, y)
+    
+    // 歌手
+    ctx.fillStyle = '#64748B'
+    ctx.font = '14px "Inter", "system-ui", sans-serif'
+    let artist = song.artist || '未知歌手'
+    if (artist.length > 10) artist = artist.substring(0, 10) + '...'
+    ctx.fillText(`- ${artist}`, 240, y)
+    
+    y += 40
+  })
+  
+  if (props.songs.length > maxDisplaySongs) {
+    ctx.fillStyle = '#94A3B8'
+    ctx.font = '14px "Inter", "system-ui", sans-serif'
+    ctx.textAlign = 'center'
+    ctx.fillText(`...及其他 ${props.songs.length - maxDisplaySongs} 首歌曲`, 200, y + 10)
+  }
+
+  // 绘制底部水印
+  if (bgImageObj.value) {
+    ctx.fillStyle = 'rgba(255, 255, 255, 0.6)'
+  } else {
+    ctx.fillStyle = '#CBD5E1'
+  }
+  ctx.font = '12px "Inter", "system-ui", sans-serif'
+  ctx.textAlign = 'center'
+  ctx.fillText('Generated by VoiceHub', 200, height - 20)
+}
+
+const downloadCard = () => {
+  if (!canvasRef.value) return
+  const dataUrl = canvasRef.value.toDataURL('image/png')
+  const link = document.createElement('a')
+  link.download = `歌单卡片_${new Date().toISOString().split('T')[0]}.png`
+  link.href = dataUrl
+  link.click()
+  
+  if (window.$showNotification) {
+    window.$showNotification('图片导出成功', 'success')
+  }
+}
+
+watch(() => props.show, (newVal) => {
+  if (newVal) {
+    cardTitle.value = props.defaultTitle
+    nextTick(() => {
+      drawCanvas()
+    })
+  }
+})
+</script>
+
+<style scoped>
+.fade-enter-active,
+.fade-leave-active {
+  transition: opacity 0.2s ease;
+}
+.fade-enter-from,
+.fade-leave-to {
+  opacity: 0;
+}
+.scale-enter-active,
+.scale-leave-active {
+  transition: transform 0.2s ease, opacity 0.2s ease;
+}
+.scale-enter-from,
+.scale-leave-to {
+  transform: scale(0.95);
+  opacity: 0;
+}
+</style>
diff --git a/app/components/Admin/PlaylistCardPage.vue b/app/components/Admin/PlaylistCardPage.vue
new file mode 100644
index 0000000..fb82f60
--- /dev/null
+++ b/app/components/Admin/PlaylistCardPage.vue
@@ -0,0 +1,114 @@
+<template>
+  <div class="flex flex-col space-y-8 pb-12 lg:pb-20 animate-in fade-in slide-in-from-bottom-4 duration-500">
+    <div class="flex flex-col space-y-2">
+      <h2 class="text-2xl font-bold tracking-tight text-zinc-100">图片歌单</h2>
+      <p class="text-sm text-zinc-500">选择日期生成广播排期卡片并分享</p>
+    </div>
+    
+    <div class="flex flex-col gap-8">
+      <!-- 设置面板 -->
+      <div class="w-full flex flex-col gap-6">
+        <div class="bg-zinc-900/40 border border-zinc-800 rounded-xl p-6 space-y-6 shadow-lg">
+          <h3 class="text-lg font-bold flex items-center gap-2 text-zinc-100 shrink-0">
+            <Layout class="w-4 h-4 text-blue-500" /> 卡片设置
+          </h3>
+
+          <div class="flex flex-col gap-5 items-end">
+            <!-- 日期选择 -->
+            <div class="space-y-2 flex-1 w-full">
+              <label class="text-[11px] font-black uppercase text-zinc-600 tracking-wider">排期日期</label>
+              
+              <!-- 类似排期管理的日期选择器 -->
+              <AdminDatePicker
+                :modelValue="selectedDate"
+                @update:modelValue="selectedDate = $event"
+                @change="fetchSchedules"
+              />
+            </div>
+            
+            <button
+              :disabled="loading || schedules.length === 0"
+              class="w-full py-3 h-[54px] bg-blue-600 hover:bg-blue-500 text-white text-xs font-bold rounded-xl shadow-lg shadow-blue-900/20 transition-colors uppercase tracking-wider disabled:opacity-50 disabled:cursor-not-allowed flex items-center justify-center gap-2 shrink-0"
+              @click="showModal = true"
+            >
+              <ImageIcon class="w-4 h-4" />
+              {{ loading ? '加载中...' : (schedules.length === 0 ? '该日期无排期' : '生成卡片') }}
+            </button>
+          </div>
+        </div>
+      </div>
+      
+      <!-- 预览区 -->
+      <div class="w-full flex flex-col gap-4">
+        <div v-if="schedules.length > 0" class="bg-zinc-900/40 border border-zinc-800 rounded-xl p-6 shadow-lg">
+          <h3 class="text-lg font-bold text-zinc-100 mb-4">排期预览 ({{ schedules.length }} 首)</h3>
+          <div class="space-y-3">
+            <div v-for="(schedule, index) in schedules" :key="schedule.id" class="flex items-center gap-3 p-3 bg-zinc-950/50 border border-zinc-800/50 rounded-lg">
+              <span class="text-blue-500 font-bold w-6">{{ index + 1 }}.</span>
+              <div class="flex-1 overflow-hidden">
+                <p class="text-sm text-zinc-200 font-medium truncate">{{ schedule.song?.title || schedule.title }}</p>
+                <p class="text-xs text-zinc-500 truncate">{{ schedule.song?.artist || schedule.artist }}</p>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div v-else-if="!loading" class="flex flex-col items-center justify-center py-20 bg-zinc-900/20 border border-zinc-800/50 rounded-xl border-dashed">
+          <CalendarDays class="w-12 h-12 text-zinc-700 mb-4" />
+          <p class="text-zinc-500">该日期没有排期的歌曲</p>
+        </div>
+      </div>
+    </div>
+    
+    <AdminPlaylistCardGenerator
+      :show="showModal"
+      :songs="schedules"
+      :default-title="`${selectedDate} 校园广播歌单`"
+      @close="showModal = false"
+    />
+  </div>
+</template>
+
+<script setup>
+import { ref, onMounted } from 'vue'
+import { Layout, Image as ImageIcon, CalendarDays } from '@lucide/vue'
+  import AdminDatePicker from './AdminDatePicker.vue'
+  import AdminPlaylistCardGenerator from './PlaylistCardGenerator.vue'
+  import { useAuth } from '~/composables/useAuth'
+
+  const auth = useAuth()
+  
+  const selectedDate = ref(new Date().toISOString().split('T')[0])
+const schedules = ref([])
+const loading = ref(false)
+const showModal = ref(false)
+
+const fetchSchedules = async () => {
+    loading.value = true
+    try {
+      const response = await $fetch('/api/admin/schedule/full', {
+        ...auth.getAuthConfig(),
+        query: {
+          date: selectedDate.value,
+          includeDrafts: 'true'
+        }
+      })
+      if (response.success && response.data && response.data.schedules) {
+        schedules.value = response.data.schedules
+      } else {
+        schedules.value = []
+      }
+    } catch (error) {
+    console.error('Failed to fetch schedules:', error)
+    if (window.$showNotification) {
+      window.$showNotification('获取排期失败', 'error')
+    }
+  } finally {
+    loading.value = false
+  }
+}
+
+onMounted(() => {
+  fetchSchedules()
+})
+
+</script>
diff --git a/app/components/Admin/RequestTimeManager.vue b/app/components/Admin/RequestTimeManager.vue
index 6e47005..762281f 100644
--- a/app/components/Admin/RequestTimeManager.vue
+++ b/app/components/Admin/RequestTimeManager.vue
@@ -3,118 +3,88 @@
     <!-- 顶部标题和全局开关 -->
     <div class="flex flex-col xl:flex-row xl:items-end justify-between gap-6">
       <div class="space-y-1">
-        <h2 class="text-2xl font-black text-text-primary tracking-tight">{{ locale.title }}</h2>
-        <p class="text-xs text-text-tertiary">{{ locale.desc }}</p>
+        <h2 class="text-2xl font-black text-zinc-100 tracking-tight">投稿开放管理</h2>
+        <p class="text-xs text-zinc-500">管理全校师生点歌投稿的开放时间、限制数量及全局状态控制</p>
       </div>
 
       <div
-        class="flex flex-wrap items-center gap-4 bg-bg-secondary-40 border border-border-secondary p-2 rounded-3xl"
+        class="flex flex-wrap items-center gap-4 bg-zinc-900/40 border border-zinc-800 p-2 rounded-3xl"
       >
-        <div class="flex items-center gap-3 px-3 border-r border-border-secondary-50 mr-1">
-          <span class="text-[10px] font-black text-text-tertiary uppercase tracking-widest"
-            >{{ locale.currentStatus }}</span
+        <div class="flex items-center gap-3 px-3 border-r border-zinc-800/50 mr-1">
+          <span class="text-[10px] font-black text-zinc-500 uppercase tracking-widest"
+            >当前状态</span
           >
           <span
             :class="[
               'px-2 py-0.5 rounded text-[10px] font-black uppercase transition-all',
-              hitRequestTime ? 'bg-success-10 text-success' : 'bg-error-10 text-error'
+              hitRequestTime ? 'bg-emerald-500/10 text-emerald-500' : 'bg-red-500/10 text-red-500'
             ]"
           >
-            {{ hitRequestTime ? locale.open : locale.closed }}
+            {{ hitRequestTime ? '已开放' : '已关闭' }}
           </span>
         </div>
 
         <div class="flex items-center gap-3 px-2">
-          <span class="text-[10px] font-black text-text-tertiary uppercase tracking-widest"
-            >{{ locale.enableRequest }}</span
+          <span class="text-[10px] font-black text-zinc-400 uppercase tracking-widest"
+            >启用投稿</span
           >
           <button
             :class="[
               'relative w-10 h-5 rounded-full transition-colors',
-              enableRequest ? 'bg-primary-hover' : 'bg-bg-tertiary'
+              enableRequest ? 'bg-blue-600' : 'bg-zinc-800'
             ]"
             @click="toggleGlobalRequest"
           >
             <div
               :class="[
-                'absolute top-1 w-3 h-3 bg-bg-secondary rounded-full transition-all',
+                'absolute top-1 w-3 h-3 bg-white rounded-full transition-all',
                 enableRequest ? 'left-6' : 'left-1'
               ]"
             />
           </button>
         </div>
 
-        <div class="flex items-center gap-3 px-2 border-l border-border-secondary-50">
-          <span class="text-[10px] font-black text-text-tertiary uppercase tracking-widest"
-            >{{ locale.enableTimeLimit }}</span
+        <div class="flex items-center gap-3 px-2 border-l border-zinc-800/50">
+          <span class="text-[10px] font-black text-zinc-400 uppercase tracking-widest"
+            >启用时段限制</span
           >
           <button
             :class="[
               'relative w-10 h-5 rounded-full transition-colors',
-              enableRequestTimeLimitation ? 'bg-primary-hover' : 'bg-bg-tertiary'
+              enableRequestTimeLimitation ? 'bg-purple-600' : 'bg-zinc-800'
             ]"
             @click="toggleTimeLimitation"
           >
             <div
               :class="[
-                'absolute top-1 w-3 h-3 bg-bg-secondary rounded-full transition-all',
+                'absolute top-1 w-3 h-3 bg-white rounded-full transition-all',
                 enableRequestTimeLimitation ? 'left-6' : 'left-1'
               ]"
             />
           </button>
         </div>
-        <div class="flex items-center gap-3 px-2 border-l border-border-secondary-50">
-          <span class="text-[10px] font-black text-text-tertiary uppercase tracking-widest"
-            >{{ locale.enableRestriction }}</span
-          >
-          <button
-            :disabled="restrictionSaving"
-            :class="[
-              'relative w-10 h-5 rounded-full transition-colors',
-              enableSubmissionRestriction ? 'bg-primary-hover' : 'bg-bg-tertiary',
-              'disabled:opacity-50 disabled:cursor-not-allowed'
-            ]"
-            @click="toggleRestriction"
-          >
-            <div
-              :class="[
-                'absolute top-1 w-3 h-3 bg-bg-secondary rounded-full transition-all',
-                enableSubmissionRestriction ? 'left-6' : 'left-1'
-              ]"
-            />
-          </button>
-        </div>
       </div>
     </div>
 
-    <!-- 全局错误提示 -->
-    <div
-      v-if="error"
-      class="p-4 bg-error-10 border border-error-20 rounded-2xl flex items-center gap-3 text-error text-xs font-bold"
-    >
-      <AlertCircle :size="16" />
-      <span @click="error = ''" class="cursor-pointer hover:underline">{{ error }}</span>
-    </div>
-
     <!-- 主要内容区域 -->
     <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
       <!-- 添加时段按钮卡片 -->
       <button
-        class="group relative h-full min-h-[220px] bg-bg-secondary-20 border-2 border-dashed border-border-secondary rounded-3xl flex flex-col items-center justify-center gap-4 hover:bg-primary-hover-5 hover:border-primary-40 transition-all active:scale-95"
+        class="group relative h-full min-h-[220px] bg-zinc-900/20 border-2 border-dashed border-zinc-800 rounded-3xl flex flex-col items-center justify-center gap-4 hover:bg-blue-600/5 hover:border-blue-500/40 transition-all active:scale-95"
         @click="showAddForm = true"
       >
         <div
-          class="w-14 h-14 rounded-full bg-bg-secondary border border-border-secondary flex items-center justify-center text-text-tertiary group-hover:text-primary group-hover:bg-primary-hover-10 group-hover:border-primary-20 transition-all"
+          class="w-14 h-14 rounded-full bg-zinc-900 border border-zinc-800 flex items-center justify-center text-zinc-500 group-hover:text-blue-500 group-hover:bg-blue-600/10 group-hover:border-blue-500/20 transition-all"
         >
           <Plus :size="28" />
         </div>
         <div class="text-center">
           <h4
-            class="text-sm font-black text-text-tertiary group-hover:text-primary transition-colors uppercase tracking-widest"
+            class="text-sm font-black text-zinc-400 group-hover:text-blue-400 transition-colors uppercase tracking-widest"
           >
-            {{ locale.addTime }}
+            添加投稿时段
           </h4>
-          <p class="text-[10px] text-text-disabled mt-1">{{ locale.addTimeDesc }}</p>
+          <p class="text-[10px] text-zinc-600 mt-1">创建一个新的投稿开放周期</p>
         </div>
       </button>
 
@@ -131,16 +101,16 @@
           v-for="slot in requestTimes"
           :key="slot.id"
           :class="[
-            'group bg-bg-secondary-40 border rounded-3xl p-8 space-y-6 transition-all hover:shadow-2xl hover:shadow-[0_25px_50px_var(--shadow-color-deep)]',
-            slot.enabled && !slot.past ? 'border-border-secondary' : 'border-border-secondary-40 opacity-60'
+            'group bg-zinc-900/40 border rounded-3xl p-8 space-y-6 transition-all hover:shadow-2xl hover:shadow-black/40',
+            slot.enabled && !slot.past ? 'border-zinc-800' : 'border-zinc-800/40 opacity-60'
           ]"
         >
           <div class="flex items-start justify-between">
             <div
               :class="[
-                'p-3.5 rounded-2xl bg-bg-primary border border-border-secondary text-text-tertiary transition-colors flex items-center justify-center',
+                'p-3.5 rounded-2xl bg-zinc-950 border border-zinc-800 text-zinc-400 transition-colors',
                 slot.enabled && !slot.past
-                  ? 'text-primary border-primary-20 shadow-lg shadow-[var(--primary-glow-10)]'
+                  ? 'text-blue-500 border-blue-500/20 shadow-lg shadow-blue-900/10'
                   : ''
               ]"
             >
@@ -151,13 +121,13 @@
                 :class="[
                   'px-2 py-0.5 rounded text-[9px] font-black uppercase tracking-widest border transition-all',
                   slot.past
-                    ? 'bg-error-10 text-error border-error-20'
+                    ? 'bg-red-500/10 text-red-500 border-red-500/20'
                     : slot.enabled
-                      ? 'bg-success-10 text-success border-success-20'
-                      : 'bg-bg-tertiary-50 text-text-disabled border-border-tertiary-50'
+                      ? 'bg-emerald-500/10 text-emerald-500 border-emerald-500/20'
+                      : 'bg-zinc-800/50 text-zinc-600 border-zinc-700/50'
                 ]"
               >
-                {{ slot.past ? locale.expired : slot.enabled ? locale.enabled : locale.disabled }}
+                {{ slot.past ? '已过期' : slot.enabled ? '已启用' : '已禁用' }}
               </span>
             </div>
           </div>
@@ -165,41 +135,41 @@
           <div class="space-y-4">
             <div>
               <h4
-                class="text-lg font-black text-text-primary flex items-baseline gap-2 group-hover:text-primary transition-colors"
+                class="text-lg font-black text-zinc-100 flex items-baseline gap-2 group-hover:text-blue-400 transition-colors"
               >
                 {{ slot.name }}
-                <span class="text-xs font-bold text-text-disabled tracking-tight"
+                <span class="text-xs font-bold text-zinc-600 tracking-tight"
                   >({{ slot.accepted }}/{{ slot.expected || '∞' }})</span
                 >
               </h4>
               <div class="mt-3 space-y-2">
-                <div class="flex items-center gap-2 text-text-tertiary font-bold">
-                  <Clock :size="12" class="text-text-secondary" />
+                <div class="flex items-center gap-2 text-zinc-500 font-bold">
+                  <Clock :size="12" class="text-zinc-700" />
                   <span class="text-[10px] uppercase tracking-tighter truncate">{{
-                    slot.startTime || locale.unlimited
+                    slot.startTime || '不限'
                   }}</span>
                 </div>
-                <div class="flex items-center gap-2 text-text-tertiary font-bold">
-                  <div class="w-3 h-[2px] bg-bg-tertiary ml-1.5" />
+                <div class="flex items-center gap-2 text-zinc-500 font-bold">
+                  <div class="w-3 h-[2px] bg-zinc-800 ml-1.5" />
                   <span class="text-[10px] uppercase tracking-tighter truncate">{{
-                    slot.endTime || locale.unlimited
+                    slot.endTime || '不限'
                   }}</span>
                 </div>
               </div>
             </div>
 
             <p
-              class="text-xs text-text-tertiary font-medium leading-relaxed min-h-[32px] line-clamp-2 italic"
+              class="text-xs text-zinc-500 font-medium leading-relaxed min-h-[32px] line-clamp-2 italic"
             >
-              {{ slot.description || locale.noDescription }}
+              {{ slot.description || '暂无详细描述...' }}
             </p>
 
             <!-- 投稿进度条 -->
             <div class="space-y-1.5">
               <div
-                class="flex justify-between text-[9px] font-black text-text-disabled uppercase tracking-widest px-0.5"
+                class="flex justify-between text-[9px] font-black text-zinc-600 uppercase tracking-widest px-0.5"
               >
-                <span>{{ locale.progress }}</span>
+                <span>投稿进度</span>
                 <span
                   >{{
                     slot.expected > 0
@@ -209,7 +179,7 @@
                 >
               </div>
               <div
-                class="h-1.5 w-full bg-bg-primary rounded-full overflow-hidden border border-border-secondary-50"
+                class="h-1.5 w-full bg-zinc-950 rounded-full overflow-hidden border border-zinc-800/50"
               >
                 <div
                   class="h-full transition-all duration-500"
@@ -218,25 +188,25 @@
                   }"
                   :class="
                     slot.expected > 0 && slot.accepted >= slot.expected
-                      ? 'bg-error'
-                      : 'bg-primary'
+                      ? 'bg-rose-500'
+                      : 'bg-blue-500'
                   "
                 />
               </div>
             </div>
           </div>
 
-          <div class="pt-6 border-t border-border-secondary-50 flex items-center justify-between">
+          <div class="pt-6 border-t border-zinc-800/50 flex items-center justify-between">
             <div class="flex gap-2">
               <button
                 v-show="!slot.past"
-                class="p-2.5 bg-bg-primary border border-border-secondary rounded-xl text-text-tertiary hover:text-primary hover:border-primary-30 transition-all"
+                class="p-2.5 bg-zinc-950 border border-zinc-800 rounded-xl text-zinc-500 hover:text-blue-400 hover:border-blue-500/30 transition-all"
                 @click="editRequestTime(slot)"
               >
                 <Edit2 :size="14" />
               </button>
               <button
-                class="p-2.5 bg-bg-primary border border-border-secondary rounded-xl text-text-tertiary hover:text-error hover:border-error-30 transition-all"
+                class="p-2.5 bg-zinc-950 border border-zinc-800 rounded-xl text-zinc-500 hover:text-red-400 hover:border-red-500/30 transition-all"
                 @click="confirmDelete(slot)"
               >
                 <Trash2 :size="14" />
@@ -247,13 +217,13 @@
               :class="[
                 'flex items-center gap-2 px-5 py-2.5 rounded-xl text-[10px] font-black uppercase tracking-widest transition-all',
                 slot.enabled
-                  ? 'bg-bg-tertiary text-text-tertiary hover:text-text-primary'
-                  : 'bg-success text-text-primary shadow-lg shadow-[var(--success-glow-20)]'
+                  ? 'bg-zinc-800 text-zinc-400 hover:text-zinc-200'
+                  : 'bg-emerald-600 text-white shadow-lg shadow-emerald-900/20'
               ]"
               @click="toggleRequestTimeStatus(slot)"
             >
               <Power :size="12" />
-              {{ slot.enabled ? locale.disable : locale.enable }}
+              {{ slot.enabled ? '禁用' : '启用' }}
             </button>
           </div>
         </div>
@@ -262,136 +232,22 @@
 
     <!-- 统计概览 -->
     <div
-      class="bg-bg-secondary-20 border border-border-secondary rounded-3xl p-8 grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-8"
+      class="bg-zinc-900/20 border border-zinc-800 rounded-3xl p-8 grid grid-cols-1 md:grid-cols-2 lg:grid-cols-4 gap-8"
     >
       <div v-for="(stat, i) in stats" :key="i" class="flex items-center gap-4 group">
         <div
           :class="[
-            'w-12 h-12 rounded-2xl bg-bg-primary border border-border-secondary flex items-center justify-center text-text-tertiary transition-colors',
-            stat.color === 'blue'
-              ? 'group-hover:text-primary'
-              : stat.color === 'emerald'
-                ? 'group-hover:text-success'
-                : stat.color === 'amber'
-                  ? 'group-hover:text-warning'
-                  : 'group-hover:text-info'
+            'w-12 h-12 rounded-2xl bg-zinc-950 border border-zinc-800 flex items-center justify-center text-zinc-500 transition-colors',
+            `group-hover:text-${stat.color}-500`
           ]"
         >
           <component :is="stat.icon" :size="20" />
         </div>
         <div>
-          <p class="text-[10px] font-black text-text-disabled uppercase tracking-widest">
+          <p class="text-[10px] font-black text-zinc-600 uppercase tracking-widest">
             {{ stat.label }}
           </p>
-          <h5 class="text-xl font-black text-text-primary">{{ stat.value }}</h5>
-        </div>
-      </div>
-    </div>
-
-    <!-- 重复投稿限制面板 -->
-    <div
-      v-if="isAdmin"
-      class="bg-bg-secondary-20 border border-border-secondary rounded-3xl p-8 space-y-6"
-    >
-      <div class="flex items-center justify-between border-b border-border-secondary-50 pb-4">
-        <div class="flex items-center gap-3">
-          <div class="w-10 h-10 rounded-2xl bg-warning-10 border border-warning-20 flex items-center justify-center text-warning">
-            <Ban :size="20" />
-          </div>
-          <div>
-            <h4 class="text-sm font-black text-text-primary uppercase tracking-widest">
-              {{ locale.restrictionPanelTitle }}
-            </h4>
-            <p class="text-[10px] text-text-tertiary mt-0.5">{{ locale.restrictionPanelDesc }}</p>
-          </div>
-        </div>
-        <button
-          :disabled="restrictionSaving"
-          class="flex items-center gap-2 px-5 py-2 bg-primary-hover hover:bg-primary text-text-primary text-xs font-black rounded-xl shadow-lg transition-all active:scale-95 disabled:opacity-50 disabled:cursor-not-allowed"
-          @click="saveRestrictionSettings"
-        >
-          <Save :size="14" />
-          {{ locale.saveSettings }}
-        </button>
-      </div>
-
-      <div class="grid grid-cols-1 lg:grid-cols-3 gap-6">
-        <div class="lg:col-span-1 space-y-4">
-          <label :class="['text-[10px] font-black text-text-disabled uppercase tracking-widest px-1 block mb-2']">
-            {{ locale.restrictionScope }}
-          </label>
-          <p class="text-[10px] text-text-tertiary px-1">{{ locale.restrictionScopeDesc }}</p>
-          <div class="flex gap-2 p-1 bg-bg-primary border border-border-secondary rounded-xl">
-            <button
-              :class="[
-                'flex-1 py-2 rounded-lg text-[10px] font-black uppercase tracking-widest transition-all',
-                submissionRestrictionScope === 'self'
-                  ? 'bg-bg-tertiary text-primary shadow-sm'
-                  : 'text-text-disabled hover:text-text-tertiary'
-              ]"
-              @click="submissionRestrictionScope = 'self'"
-            >
-              {{ locale.restrictionScopeSelf }}
-            </button>
-            <button
-              :class="[
-                'flex-1 py-2 rounded-lg text-[10px] font-black uppercase tracking-widest transition-all',
-                submissionRestrictionScope === 'all'
-                  ? 'bg-bg-tertiary text-primary shadow-sm'
-                  : 'text-text-disabled hover:text-text-tertiary'
-              ]"
-              @click="submissionRestrictionScope = 'all'"
-            >
-              {{ locale.restrictionScopeAll }}
-            </button>
-          </div>
-          <p class="text-[10px] text-text-disabled px-1 italic">{{ locale.restrictionPanelHint }}</p>
-        </div>
-
-        <div class="space-y-4">
-          <label :class="['text-[10px] font-black text-text-disabled uppercase tracking-widest px-1 block mb-2']">
-            {{ locale.sameSongRestrictionHours }}
-          </label>
-          <p class="text-[10px] text-text-tertiary px-1">{{ locale.sameSongRestrictionHoursDesc }}</p>
-          <div class="relative">
-            <input
-              :value="sameSongRestrictionHours ?? ''"
-              @input="sameSongRestrictionHours = $event.target.value === '' ? null : Number($event.target.value)"
-              @blur="normalizeRestrictionHours('sameSong')"
-              type="number"
-              min="1"
-              max="720"
-              step="1"
-              placeholder="-"
-              class="w-56 bg-bg-primary border border-border-secondary rounded-2xl px-5 py-3 text-sm text-text-primary pr-16 focus:outline-none focus:border-primary-30"
-            />
-            <span
-              class="absolute right-5 top-1/2 -translate-y-1/2 text-[10px] font-black text-text-secondary uppercase"
-              >{{ locale.restrictionUnit }}</span>
-          </div>
-        </div>
-
-        <div class="space-y-4">
-          <label :class="['text-[10px] font-black text-text-disabled uppercase tracking-widest px-1 block mb-2']">
-            {{ locale.sameArtistRestrictionHours }}
-          </label>
-          <p class="text-[10px] text-text-tertiary px-1">{{ locale.sameArtistRestrictionHoursDesc }}</p>
-          <div class="relative">
-            <input
-              :value="sameArtistRestrictionHours ?? ''"
-              @input="sameArtistRestrictionHours = $event.target.value === '' ? null : Number($event.target.value)"
-              @blur="normalizeRestrictionHours('sameArtist')"
-              type="number"
-              min="1"
-              max="720"
-              step="1"
-              placeholder="-"
-              class="w-56 bg-bg-primary border border-border-secondary rounded-2xl px-5 py-3 text-sm text-text-primary pr-16 focus:outline-none focus:border-primary-30"
-            />
-            <span
-              class="absolute right-5 top-1/2 -translate-y-1/2 text-[10px] font-black text-text-secondary uppercase"
-              >{{ locale.restrictionUnit }}</span>
-          </div>
+          <h5 class="text-xl font-black text-zinc-200">{{ stat.value }}</h5>
         </div>
       </div>
     </div>
@@ -407,90 +263,91 @@
     >
       <div
         v-if="showAddForm || editingRequestTime"
-        class="fixed inset-0 z-50 flex items-center justify-center p-4 bg-bg-primary-80 backdrop-blur-sm"
+        class="fixed inset-0 z-50 flex items-center justify-center p-4 bg-zinc-950/80 backdrop-blur-sm"
+        @click.self="cancelForm"
       >
         <div
-          class="w-full max-w-2xl bg-bg-secondary border border-border-secondary rounded-3xl shadow-2xl overflow-hidden"
+          class="w-full max-w-2xl bg-zinc-900 border border-zinc-800 rounded-3xl shadow-2xl overflow-hidden"
         >
-          <div class="px-8 py-6 border-b border-border-secondary-50 flex items-center justify-between">
-            <h3 class="text-xl font-black text-text-primary">
-              {{ editingRequestTime ? locale.editTitle : locale.addTitle }}
+          <div class="px-8 py-6 border-b border-zinc-800/50 flex items-center justify-between">
+            <h3 class="text-xl font-black text-zinc-100">
+              {{ editingRequestTime ? '编辑投稿开放时段' : '添加投稿开放时段' }}
             </h3>
-            <button class="text-text-tertiary hover:text-text-secondary transition-colors" @click="cancelForm">
+            <button class="text-zinc-500 hover:text-zinc-300 transition-colors" @click="cancelForm">
               <X :size="20" />
             </button>
           </div>
 
           <div class="p-8 space-y-6 max-h-[70vh] overflow-y-auto">
             <div class="space-y-2">
-              <label class="text-[10px] font-black text-text-disabled uppercase tracking-widest px-1"
-                >{{ locale.name }}</label
+              <label class="text-[10px] font-black text-zinc-600 uppercase tracking-widest px-1"
+                >时段名称</label
               >
               <input
                 v-model="formData.name"
                 type="text"
-                :placeholder="locale.namePlaceholder"
-                class="w-full bg-bg-primary border border-border-secondary rounded-2xl px-5 py-3.5 text-sm text-text-primary focus:outline-none focus:border-primary-30"
+                placeholder="例如: 2025冬季常规点歌"
+                class="w-full bg-zinc-950 border border-zinc-800 rounded-2xl px-5 py-3.5 text-sm text-zinc-200 focus:outline-none focus:border-blue-500/30"
               >
             </div>
 
             <div class="grid grid-cols-1 md:grid-cols-2 gap-6">
               <div class="space-y-2">
-                <label class="text-[10px] font-black text-text-disabled uppercase tracking-widest px-1"
-                  >{{ locale.startDateTime }}</label
+                <label class="text-[10px] font-black text-zinc-600 uppercase tracking-widest px-1"
+                  >开始日期时间</label
                 >
                 <input
                   v-model="formData.startTime"
                   type="datetime-local"
-                  class="w-full bg-bg-primary border border-border-secondary rounded-2xl px-5 py-3.5 text-sm text-text-primary focus:outline-none focus:border-primary-30"
+                  class="w-full bg-zinc-950 border border-zinc-800 rounded-2xl px-5 py-3.5 text-sm text-zinc-200 focus:outline-none focus:border-blue-500/30"
                 >
               </div>
               <div class="space-y-2">
-                <label class="text-[10px] font-black text-text-disabled uppercase tracking-widest px-1"
-                  >{{ locale.endDateTime }}</label
+                <label class="text-[10px] font-black text-zinc-600 uppercase tracking-widest px-1"
+                  >结束日期时间</label
                 >
                 <input
                   v-model="formData.endTime"
                   type="datetime-local"
-                  class="w-full bg-bg-primary border border-border-secondary rounded-2xl px-5 py-3.5 text-sm text-text-primary focus:outline-none focus:border-primary-30"
+                  class="w-full bg-zinc-950 border border-zinc-800 rounded-2xl px-5 py-3.5 text-sm text-zinc-200 focus:outline-none focus:border-blue-500/30"
                 >
               </div>
             </div>
 
             <div class="grid grid-cols-1 md:grid-cols-2 gap-6">
               <div class="space-y-2">
-                <label class="text-[10px] font-black text-text-disabled uppercase tracking-widest px-1"
-                  >{{ locale.expectedCount }}</label
+                <label class="text-[10px] font-black text-zinc-600 uppercase tracking-widest px-1"
+                  >计划投稿数</label
                 >
                 <div class="relative group">
                   <input
                     v-model="formData.expected"
                     type="number"
-                    class="w-full bg-bg-primary border border-border-secondary rounded-2xl px-5 py-3.5 text-sm text-text-primary focus:outline-none focus:border-primary-30"
+                    class="w-full bg-zinc-950 border border-zinc-800 rounded-2xl px-5 py-3.5 text-sm text-zinc-200 focus:outline-none focus:border-blue-500/30"
                   >
                   <div
-                    class="absolute right-4 top-1/2 -translate-y-1/2 flex items-center gap-1.5 text-text-disabled font-bold text-[10px]"
+                    class="absolute right-4 top-1/2 -translate-y-1/2 flex items-center gap-1.5 text-zinc-600 font-bold text-[10px]"
                   >
                     <Hash :size="12" />
-                    {{ locale.songUnit }}
+                    首歌曲
                   </div>
                 </div>
-                <p class="text-[9px] text-text-disabled px-1">{{ locale.expectedHint }}</p>
+                <p class="text-[9px] text-zinc-600 px-1">填 0 表示不限制投稿总数</p>
               </div>
               <div class="space-y-2 flex flex-col justify-center pt-2">
                 <label class="flex items-center gap-3 cursor-pointer group px-1">
                   <input
                     v-model="formData.enabled"
                     type="checkbox"
-                    class="w-4.5 h-4.5 rounded-lg border-border-secondary bg-bg-primary"
+                    class="w-4.5 h-4.5 rounded-lg border-zinc-800 bg-zinc-950 accent-blue-600"
                   >
                   <div>
                     <span
-                      class="text-xs font-bold text-text-secondary group-hover:text-primary transition-colors"
-                      >{{ locale.enableThisRequestTime }}</span
+                      class="text-xs font-bold text-zinc-300 group-hover:text-blue-400 transition-colors"
+                      >启用此投稿时段</span
                     >
-                    <p class="text-[9px] text-text-disabled font-medium">
-                      {{ locale.enableThisRequestTimeHint }}
+                    <p class="text-[9px] text-zinc-600 font-medium">
+                      只有启用的时段才会根据时间限制生效
                     </p>
                   </div>
                 </label>
@@ -498,38 +355,38 @@
             </div>
 
             <div class="space-y-2">
-              <label class="text-[10px] font-black text-text-disabled uppercase tracking-widest px-1"
-                >{{ locale.descriptionOptional }}</label
+              <label class="text-[10px] font-black text-zinc-600 uppercase tracking-widest px-1"
+                >时段描述 (可选)</label
               >
               <textarea
                 v-model="formData.description"
-                :placeholder="locale.descriptionPlaceholder"
-                class="w-full bg-bg-primary border border-border-secondary rounded-2xl px-5 py-4 text-sm text-text-primary focus:outline-none focus:border-primary-30 min-h-[100px] resize-none"
+                placeholder="请输入针对此开放周期的特殊规则或介绍信息..."
+                class="w-full bg-zinc-950 border border-zinc-800 rounded-2xl px-5 py-4 text-sm text-zinc-200 focus:outline-none focus:border-blue-500/30 min-h-[100px] resize-none"
               />
             </div>
 
             <div
               v-if="formError"
-              class="p-4 bg-error-10 border border-error-20 rounded-2xl flex items-center gap-3 text-error text-xs font-bold"
+              class="p-4 bg-red-500/10 border border-red-500/20 rounded-2xl flex items-center gap-3 text-red-500 text-xs font-bold"
             >
               <AlertCircle :size="16" />
               {{ formError }}
             </div>
           </div>
 
-          <div class="px-8 py-6 bg-bg-secondary-50 border-t border-border-secondary-50 flex gap-3 justify-end">
+          <div class="px-8 py-6 bg-zinc-900/50 border-t border-zinc-800/50 flex gap-3 justify-end">
             <button
-              class="px-6 py-2.5 text-xs font-bold text-text-tertiary hover:text-text-secondary"
+              class="px-6 py-2.5 text-xs font-bold text-zinc-500 hover:text-zinc-300"
               @click="cancelForm"
             >
-              {{ locale.cancel }}
+              取消
             </button>
             <button
               :disabled="formSubmitting"
-              class="px-10 py-2.5 bg-primary-hover hover:bg-primary text-text-primary text-xs font-black rounded-xl shadow-lg transition-all active:scale-95 disabled:opacity-50"
+              class="px-10 py-2.5 bg-blue-600 hover:bg-blue-500 text-white text-xs font-black rounded-xl shadow-lg transition-all active:scale-95 disabled:opacity-50"
               @click="saveRequestTime"
             >
-              {{ formSubmitting ? locale.saving : locale.saveSettings }}
+              {{ formSubmitting ? '保存中...' : '保存设置' }}
             </button>
           </div>
         </div>
@@ -547,40 +404,40 @@
     >
       <div
         v-if="showDeleteConfirm"
-        class="fixed inset-0 z-50 flex items-center justify-center p-4 bg-bg-primary-80 backdrop-blur-sm"
+        class="fixed inset-0 z-50 flex items-center justify-center p-4 bg-zinc-950/80 backdrop-blur-sm"
         @click.self="showDeleteConfirm = false"
       >
         <div
-          class="w-full max-w-md bg-bg-secondary border border-border-secondary rounded-3xl shadow-2xl overflow-hidden p-8"
+          class="w-full max-w-md bg-zinc-900 border border-zinc-800 rounded-3xl shadow-2xl overflow-hidden p-8"
         >
           <div class="flex flex-col items-center space-y-6">
             <div
-              class="w-16 h-16 rounded-[2rem] bg-error-10 text-error flex items-center justify-center border border-error-20 shadow-xl shadow-[var(--error-glow-10)]"
+              class="w-16 h-16 rounded-[2rem] bg-red-600/10 text-red-500 flex items-center justify-center border border-red-500/20 shadow-xl shadow-red-900/10"
             >
               <Trash2 :size="28" />
             </div>
             <div class="text-center space-y-2 px-4">
-              <h4 class="text-lg font-bold text-text-primary">
-                {{ deleteConfirmTitleText }}
+              <h4 class="text-lg font-bold text-zinc-100">
+                确定要彻底移除 "{{ RequestTimeToDelete?.name }}" 吗？
               </h4>
-              <p class="text-xs text-text-tertiary leading-relaxed">
-                {{ locale.deleteConfirmPrefix }}
-                <span class="text-text-secondary font-bold">{{ locale.disable }}</span> {{ locale.deleteConfirmSuffix }}
+              <p class="text-xs text-zinc-500 leading-relaxed">
+                删除时段后，原本属于此周期的投稿关联记录可能失效。建议先尝试
+                <span class="text-zinc-300 font-bold">禁用</span> 该时段。
               </p>
             </div>
             <div class="flex gap-3 w-full pt-4">
               <button
-                class="flex-1 px-4 py-3 bg-bg-secondary hover:bg-bg-tertiary text-text-tertiary text-xs font-black rounded-2xl transition-all"
+                class="flex-1 px-4 py-3 bg-zinc-900 hover:bg-zinc-800 text-zinc-500 text-xs font-black rounded-2xl transition-all"
                 @click="showDeleteConfirm = false"
               >
-                {{ locale.keepTime }}
+                保留时段
               </button>
               <button
                 :disabled="deleteInProgress"
-                class="flex-1 px-4 py-3 bg-error hover:bg-error text-text-primary text-xs font-black rounded-2xl shadow-xl shadow-[var(--error-glow-20)] transition-all active:scale-95 disabled:opacity-50"
+                class="flex-1 px-4 py-3 bg-red-600 hover:bg-red-500 text-white text-xs font-black rounded-2xl shadow-xl shadow-red-900/20 transition-all active:scale-95 disabled:opacity-50"
                 @click="deleteRequestTime"
               >
-                {{ deleteInProgress ? locale.deleting : locale.confirmDelete }}
+                {{ deleteInProgress ? '删除中...' : '确认删除' }}
               </button>
             </div>
           </div>
@@ -590,53 +447,53 @@
 
     <!-- 说明部分 -->
     <div class="flex flex-col md:flex-row gap-6">
-      <div class="flex-1 bg-bg-secondary-30 border border-border-secondary rounded-[2rem] p-6 space-y-4">
+      <div class="flex-1 bg-zinc-900/30 border border-zinc-800 rounded-[2rem] p-6 space-y-4">
         <h4
-          class="text-xs font-black text-text-primary uppercase tracking-widest flex items-center gap-2"
+          class="text-xs font-black text-zinc-100 uppercase tracking-widest flex items-center gap-2"
         >
-          <CheckCircle2 :size="14" class="text-success" /> {{ locale.priorityTitle }}
+          <CheckCircle2 :size="14" class="text-emerald-500" /> 逻辑优先级说明
         </h4>
-        <ul class="text-[11px] text-text-tertiary space-y-2 font-medium">
+        <ul class="text-[11px] text-zinc-500 space-y-2 font-medium">
           <li class="flex gap-2">
-            <span class="text-text-secondary font-black">1.</span>
+            <span class="text-zinc-700 font-black">1.</span>
             <span
-              ><span class="text-text-secondary">{{ locale.globalSwitch }}</span>
-              {{ locale.priorityGlobal }}</span
+              ><span class="text-zinc-300">全局开关</span>
+              具有最高优先级，关闭后所有投稿均不可用。</span
             >
           </li>
           <li class="flex gap-2">
-            <span class="text-text-secondary font-black">2.</span>
+            <span class="text-zinc-700 font-black">2.</span>
             <span
-              >{{ locale.priorityTimeLimitPrefix }} <span class="text-text-secondary">{{ locale.timeLimit }}</span> {{ locale.priorityTimeLimitMiddle }}
-              <span class="text-text-secondary">{{ locale.enabled }}</span> {{ locale.priorityTimeLimitAnd }}
-              <span class="text-text-secondary">{{ locale.expectedCountShort }}</span> {{ locale.priorityTimeLimitSuffix }}</span
+              >开启 <span class="text-zinc-300">时段限制</span> 后，系统会检查当前时间是否处于任一
+              <span class="text-zinc-300">已启用</span> 且未达到
+              <span class="text-zinc-300">计划数</span> 的时段内。</span
             >
           </li>
           <li class="flex gap-2">
-            <span class="text-text-secondary font-black">3.</span>
-            <span>{{ locale.priorityNoLimit }}</span>
+            <span class="text-zinc-700 font-black">3.</span>
+            <span>若关闭时段限制，则全天候均可投稿（只要全局开关开启）。</span>
           </li>
         </ul>
       </div>
 
-      <div class="flex-1 bg-bg-secondary-30 border border-border-secondary rounded-[2rem] p-6 space-y-4">
+      <div class="flex-1 bg-zinc-900/30 border border-zinc-800 rounded-[2rem] p-6 space-y-4">
         <h4
-          class="text-xs font-black text-text-primary uppercase tracking-widest flex items-center gap-2"
+          class="text-xs font-black text-zinc-100 uppercase tracking-widest flex items-center gap-2"
         >
-          <XCircle :size="14" class="text-error" /> {{ locale.noticeTitle }}
+          <XCircle :size="14" class="text-rose-500" /> 注意事项
         </h4>
-        <ul class="text-[11px] text-text-tertiary space-y-2 font-medium">
+        <ul class="text-[11px] text-zinc-500 space-y-2 font-medium">
           <li class="flex gap-2">
-            <span class="text-text-secondary font-black">•</span>
-            <span>{{ locale.noticeOverlap }}</span>
+            <span class="text-zinc-700 font-black">•</span>
+            <span>时段重叠时，系统将合并开放范围。</span>
           </li>
           <li class="flex gap-2">
-            <span class="text-text-secondary font-black">•</span>
-            <span>{{ locale.noticeUnlimited }}</span>
+            <span class="text-zinc-700 font-black">•</span>
+            <span>计划投稿数设置为 0 时，系统将忽略数量上限检查。</span>
           </li>
           <li class="flex gap-2">
-            <span class="text-text-secondary font-black">•</span>
-            <span>{{ locale.noticeExpired }}</span>
+            <span class="text-zinc-700 font-black">•</span>
+            <span>过期的时段将自动显示为“已过期”，不可编辑或重新启用。</span>
           </li>
         </ul>
       </div>
@@ -647,9 +504,7 @@
 <script lang="ts" setup>
 import { onMounted, onUnmounted, reactive, ref, computed } from 'vue'
 import { useAuth } from '~/composables/useAuth'
-import { useToast } from '~/composables/useToast'
-import { useLocale } from '~/utils/locale'
-import type { RequestTime } from '~/types'
+import type { RequestTime } from '~~/types'
 import {
   Plus,
   Calendar,
@@ -659,8 +514,6 @@ import {
   Power,
   AlertCircle,
   Hash,
-  Save,
-  Ban,
   CheckCircle2,
   XCircle,
   X,
@@ -669,19 +522,6 @@ import {
 } from '@lucide/vue'
 
 const { getAuthConfig, isAdmin } = useAuth()
-const toast = useToast()
-const { admin } = useLocale()
-const locale = computed(() => {
-  const base = admin.value?.requestTimeManager || {}
-  const emptyText = () => ''
-  return useSafeLocale({
-    ...base,
-    errors: { ...(base.errors || {}) },
-    stats: { ...(base.stats || {}) },
-    deleteConfirmTitle: base.deleteConfirmTitle || emptyText
-  })
-})
-const getErrorMessage = (key, ...args) => formatLocale(locale.value?.errors?.[key], ...args)
 
 const requestTimes = ref<RequestTime[]>([])
 const loading = ref(false)
@@ -693,17 +533,9 @@ const showDeleteConfirm = ref(false)
 const formSubmitting = ref(false)
 const deleteInProgress = ref(false)
 const formError = ref('')
-const deleteConfirmTitleText = computed(() =>
-  formatLocale(locale.value?.deleteConfirmTitle, RequestTimeToDelete.value?.name || '')
-)
 const enableRequestTimeLimitation = ref(false)
 const hitRequestTime = ref(false)
 const enableRequest = ref(true)
-const enableSubmissionRestriction = ref(false)
-const submissionRestrictionScope = ref('all')
-const sameSongRestrictionHours = ref<number | null>(null)
-const sameArtistRestrictionHours = ref<number | null>(null)
-const restrictionSaving = ref(false)
 
 let refreshInterval: any = null
 
@@ -718,52 +550,36 @@ const formData = reactive({
 })
 
 // 统计数据
-const stats = computed(() => {
-  const activeSlots = requestTimes.value.filter((s) => s.enabled && !s.past)
-  
-  // 检查是否有不限容量的活跃时段
-  const hasUnlimitedActiveSlot = activeSlots.some((s) => !s.expected || s.expected === 0)
-  
-  const totalExpectedActive = activeSlots.reduce((acc, s) => acc + (s.expected || 0), 0)
-  const totalAcceptedActive = activeSlots.reduce((acc, s) => acc + s.accepted, 0)
-  
-  // 累计已接收可以统计所有的（包括过去的），也可以只统计活跃的。通常累计是历史总计，但也可以分历史和当前。
-  // 原逻辑是统计所有 requestTimes 的 accepted。保持原逻辑。
-  const totalAcceptedAll = requestTimes.value.reduce((acc, s) => acc + s.accepted, 0)
-
-  return [
-    {
-      label: locale.value?.stats?.activeSlots || 'Active slots',
-      value: activeSlots.length.toString(),
-      icon: Clock,
-      color: 'blue'
-    },
-    {
-      label: locale.value?.stats?.totalAccepted || 'Total accepted',
-      value: totalAcceptedAll.toString(),
-      icon: BarChart3,
-      color: 'emerald'
-    },
-    {
-      label: locale.value?.stats?.totalCapacity || 'Total capacity',
-      value: activeSlots.length === 0
-        ? (locale.value?.none || 'None')
-        : (hasUnlimitedActiveSlot ? (locale.value?.unlimited || 'Unlimited') : totalExpectedActive.toString()),
-      icon: Hash,
-      color: 'purple'
-    },
-    {
-      label: locale.value?.stats?.remainingCapacity || 'Remaining capacity',
-      value: activeSlots.length === 0 
-        ? (locale.value?.none || 'None')
-        : (hasUnlimitedActiveSlot 
-            ? (locale.value?.unlimited || 'Unlimited')
-            : Math.max(0, totalExpectedActive - totalAcceptedActive).toString()),
-      icon: Filter,
-      color: 'amber'
-    }
-  ]
-})
+const stats = computed(() => [
+  {
+    label: '活跃时段',
+    value: requestTimes.value.filter((s) => s.enabled && !s.past).length.toString(),
+    icon: Clock,
+    color: 'blue'
+  },
+  {
+    label: '累计已接收',
+    value: requestTimes.value.reduce((acc, s) => acc + s.accepted, 0).toString(),
+    icon: BarChart3,
+    color: 'emerald'
+  },
+  {
+    label: '计划总容量',
+    value: requestTimes.value.reduce((acc, s) => acc + (s.expected || 0), 0) || '不限',
+    icon: Hash,
+    color: 'purple'
+  },
+  {
+    label: '剩余总名额',
+    value: (() => {
+      const totalExpected = requestTimes.value.reduce((acc, s) => acc + (s.expected || 0), 0)
+      const totalAccepted = requestTimes.value.reduce((acc, s) => acc + s.accepted, 0)
+      return totalExpected > 0 ? Math.max(0, totalExpected - totalAccepted).toString() : '不限'
+    })(),
+    icon: Filter,
+    color: 'amber'
+  }
+])
 
 onMounted(async () => {
   await fetchRequestTimes()
@@ -780,7 +596,7 @@ onUnmounted(() => {
 
 const fetchRequestTimes = async () => {
   if (!isAdmin.value) {
-    error.value = locale.value.errors.adminOnly
+    error.value = '只有管理员才能管理投稿开放时段'
     return
   }
 
@@ -789,20 +605,11 @@ const fetchRequestTimes = async () => {
 
   try {
     const authConfig = getAuthConfig()
-    const response = await fetch('/api/admin/request-times', {
-      headers: {
-        'Content-Type': 'application/json'
-      },
-      ...authConfig
+    const data = await $fetch('/api/admin/request-times', {
+      ...authConfig,
+      query: { t: Date.now() }
     })
 
-    if (!response.ok) {
-      const errorData = await response.json().catch(() => ({}))
-      throw new Error(errorData.message || getErrorMessage('fetchFailedWithStatus', response.status))
-    }
-
-    const data = await response.json()
-
     requestTimes.value = data.sort((a: RequestTime, b: RequestTime) => {
       if (a.past !== b.past) return a.past ? 1 : -1
       if (a.enabled !== b.enabled) return a.enabled ? -1 : 1
@@ -817,7 +624,7 @@ const fetchRequestTimes = async () => {
       return a.name.localeCompare(b.name)
     })
   } catch (err: any) {
-    error.value = getThrownMessage(err) || locale.value.errors.fetchFailed
+    error.value = err.message || '获取投稿开放时段失败'
   } finally {
     loading.value = false
   }
@@ -827,7 +634,7 @@ const fetchSystemSettings = async () => {
   if (!isAdmin.value) return
   try {
     const authConfig = getAuthConfig()
-    const response = await fetch('/api/admin/system-settings', {
+    const response = await fetch(`/api/admin/system-settings?t=${Date.now()}`, {
       headers: { 'Content-Type': 'application/json' },
       ...authConfig
     })
@@ -835,12 +642,8 @@ const fetchSystemSettings = async () => {
     const data = await response.json()
     enableRequestTimeLimitation.value = data.enableRequestTimeLimitation
     enableRequest.value = !data.forceBlockAllRequests
-    enableSubmissionRestriction.value = !!data.enableSubmissionRestriction
-    submissionRestrictionScope.value = data.submissionRestrictionScope || 'all'
-    sameSongRestrictionHours.value = data.sameSongRestrictionHours ?? null
-    sameArtistRestrictionHours.value = data.sameArtistRestrictionHours ?? null
   } catch (err: any) {
-    console.error('获取系统设置失败:', getThrownMessage(err))
+    console.error('获取系统设置失败:', err.message)
   }
 }
 
@@ -848,7 +651,7 @@ const fetchRequestTimeHit = async () => {
   if (!isAdmin.value) return
   try {
     const authConfig = getAuthConfig()
-    const response = await fetch('/api/request-times', {
+    const response = await fetch(`/api/request-times?t=${Date.now()}`, {
       headers: { 'Content-Type': 'application/json' },
       ...authConfig
     })
@@ -856,7 +659,7 @@ const fetchRequestTimeHit = async () => {
     const data = await response.json()
     hitRequestTime.value = data.hit
   } catch (err: any) {
-    console.error('获取投稿开放状态失败:', getThrownMessage(err))
+    console.error('获取投稿开放状态失败:', err.message)
   }
 }
 
@@ -887,76 +690,13 @@ const updateSystemSettings = async () => {
     })
     if (!response.ok) {
       const errorData = await response.json().catch(() => ({}))
-      throw new Error(errorData.message || getErrorMessage('updateSystemSettingsFailedWithStatus', response.status))
+      const errMsg = errorData.message || `更新系统设置失败: ${response.status}`
+      if (window.$showNotification) window.$showNotification(errMsg, 'error')
+      throw new Error(errMsg)
     }
   } catch (err: any) {
-    error.value = getThrownMessage(err) || locale.value.errors.updateSystemSettingsFailed
-  }
-}
-
-const normalizeRestrictionHours = (key: 'sameSong' | 'sameArtist') => {
-  const target = key === 'sameSong' ? sameSongRestrictionHours : sameArtistRestrictionHours
-  if (typeof target.value === 'number' && (Number.isNaN(target.value) || target.value < 1 || target.value > 720 || !Number.isInteger(target.value))) {
-    target.value = null
-  }
-}
-
-const toggleRestriction = async () => {
-  enableSubmissionRestriction.value = !enableSubmissionRestriction.value
-  // 关闭时清空时长，与服务端交叉校验保持一致
-  if (!enableSubmissionRestriction.value) {
-    sameSongRestrictionHours.value = null
-    sameArtistRestrictionHours.value = null
-  }
-  // 顶部开关立即保存，开启后无需再点面板保存按钮
-  await saveRestrictionSettings()
-}
-
-const saveRestrictionSettings = async () => {
-  normalizeRestrictionHours('sameSong')
-  normalizeRestrictionHours('sameArtist')
-
-  const enabled = enableSubmissionRestriction.value
-  const songHours = sameSongRestrictionHours.value
-  const artistHours = sameArtistRestrictionHours.value
-
-  try {
-    await submitRestrictionSettings({
-      enableSubmissionRestriction: enabled,
-      submissionRestrictionScope: submissionRestrictionScope.value,
-      sameSongRestrictionHours: enabled ? songHours : null,
-      sameArtistRestrictionHours: enabled ? artistHours : null
-    })
-  } catch {
-    error.value = locale.value.restrictionSaveFailed
-  }
-}
-
-const submitRestrictionSettings = async (body: any) => {
-  if (!isAdmin.value) return
-  restrictionSaving.value = true
-  try {
-    const authConfig = getAuthConfig()
-    const response = await fetch('/api/admin/system-settings', {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify(body),
-      ...authConfig
-    })
-    if (!response.ok) {
-      const errorData = await response.json().catch(() => ({}))
-      throw new Error(errorData.message || locale.value.restrictionSaveFailed)
-    }
-    await fetchSystemSettings()
-    error.value = ''
-    toast.success(locale.value.restrictionSaveSuccess)
-  } catch (err) {
-    try {
-      await fetchSystemSettings()
-    } catch {}
-    throw err
-  } finally {
-    restrictionSaving.value = false
+    error.value = err.message || '更新系统设置失败'
+    if (window.$showNotification) window.$showNotification(error.value, 'error')
   }
 }
 
@@ -985,12 +725,12 @@ const toggleRequestTimeStatus = async (RequestTime: RequestTime) => {
     })
     if (!response.ok) {
       const errorData = await response.json().catch(() => ({}))
-      throw new Error(errorData.message || getErrorMessage('updateStatusFailedWithStatus', response.status))
+      throw new Error(errorData.message || `更新投稿开放时段状态失败: ${response.status}`)
     }
     await fetchRequestTimes()
     await fetchRequestTimeHit()
   } catch (err: any) {
-    error.value = getThrownMessage(err) || locale.value.errors.updateStatusFailed
+    error.value = err.message || '更新投稿开放时段状态失败'
   }
 }
 
@@ -1010,14 +750,14 @@ const deleteRequestTime = async () => {
     })
     if (!response.ok) {
       const errorData = await response.json().catch(() => ({}))
-      throw new Error(errorData.message || getErrorMessage('deleteFailedWithStatus', response.status))
+      throw new Error(errorData.message || `删除投稿开放时段失败: ${response.status}`)
     }
     await fetchRequestTimes()
     await fetchRequestTimeHit()
     showDeleteConfirm.value = false
     RequestTimeToDelete.value = null
   } catch (err: any) {
-    error.value = getThrownMessage(err) || locale.value.errors.deleteFailed
+    error.value = err.message || '删除投稿开放时段失败'
   } finally {
     deleteInProgress.value = false
   }
@@ -1026,11 +766,11 @@ const deleteRequestTime = async () => {
 const saveRequestTime = async () => {
   formError.value = ''
   if (formData.startTime && formData.endTime && formData.startTime >= formData.endTime) {
-    formError.value = locale.value.errors.startBeforeEnd
+    formError.value = '开始时间必须早于结束时间'
     return
   }
   if (!formData.name.trim()) {
-    formError.value = locale.value.errors.nameRequired
+    formError.value = '时段名称不能为空'
     return
   }
   const isUpdate = !!editingRequestTime.value
@@ -1040,7 +780,7 @@ const saveRequestTime = async () => {
       (!isUpdate || pt.id !== formData.id)
   )
   if (nameExists) {
-    formError.value = locale.value.errors.nameExists
+    formError.value = '投稿开放时段名称已存在，请使用其他名称'
     return
   }
   formSubmitting.value = true
@@ -1065,14 +805,14 @@ const saveRequestTime = async () => {
     if (!response.ok) {
       const errorData = await response.json().catch(() => ({}))
       throw new Error(
-        errorData.message || getErrorMessage('saveFailedWithStatus', isUpdate, response.status)
+        errorData.message || `${isUpdate ? '更新' : '创建'}投稿开放时段失败: ${response.status}`
       )
     }
     await fetchRequestTimes()
     await fetchRequestTimeHit()
     cancelForm()
   } catch (err: any) {
-    formError.value = getThrownMessage(err) || locale.value.errors.saveFailed
+    formError.value = err.message || '保存投稿开放时段失败'
   } finally {
     formSubmitting.value = false
   }
@@ -1102,10 +842,10 @@ const cancelForm = () => {
   background: transparent;
 }
 ::-webkit-scrollbar-thumb {
-  background: var(--panel-bg-alt);
+  background: var(--bg-tertiary, #27272a);
   border-radius: 10px;
 }
 ::-webkit-scrollbar-thumb:hover {
-  background: var(--panel-bg-hover);
+  background: #3f3f46;
 }
 </style>
diff --git a/app/components/Admin/RolesManager.vue b/app/components/Admin/RolesManager.vue
new file mode 100644
index 0000000..c741685
--- /dev/null
+++ b/app/components/Admin/RolesManager.vue
@@ -0,0 +1,293 @@
+<template>
+  <div class="roles-manager">
+    <div class="admin-section-header">
+      <div>
+        <h2 class="text-xl font-black text-zinc-100 flex items-center gap-2">
+          <Shield class="w-6 h-6 text-indigo-400" />
+          权限组管理
+        </h2>
+        <p class="text-sm text-zinc-500 mt-1">管理各角色可以访问的后台页面功能</p>
+      </div>
+      <div class="flex items-center gap-3">
+        <button
+          class="px-4 py-2 bg-indigo-500/10 hover:bg-indigo-500/20 text-indigo-400 rounded-xl font-bold transition-all disabled:opacity-50 flex items-center gap-2"
+          :disabled="loading || saving"
+          @click="saveRoles"
+        >
+          <Save v-if="!saving" class="w-4 h-4" />
+          <Loader2 v-else class="w-4 h-4 animate-spin" />
+          {{ saving ? '保存中...' : '保存配置' }}
+        </button>
+      </div>
+    </div>
+
+    <div v-if="loading" class="py-12 flex flex-col items-center justify-center text-zinc-500">
+      <Loader2 class="w-8 h-8 animate-spin mb-4" />
+      <p>正在加载权限配置...</p>
+    </div>
+
+    <div v-else-if="error" class="py-12 text-center text-red-400">
+      {{ error }}
+      <button class="mt-4 px-4 py-2 bg-zinc-800 rounded-lg hover:bg-zinc-700" @click="fetchRoles">
+        重试
+      </button>
+    </div>
+
+    <div v-else class="grid grid-cols-1 lg:grid-cols-2 gap-6 mt-6">
+      <div
+        v-for="(roleConfig, roleKey) in roles"
+        :key="roleKey"
+        class="role-card p-6 bg-zinc-900/50 border border-zinc-800 rounded-2xl"
+      >
+        <div class="flex items-center justify-between mb-4">
+          <div class="flex items-center gap-3">
+            <div class="w-10 h-10 rounded-xl bg-zinc-800 flex items-center justify-center text-zinc-400">
+              <Shield class="w-5 h-5" />
+            </div>
+            <div>
+              <h3 class="font-bold text-zinc-200">{{ roleConfig.displayName }}</h3>
+              <p class="text-xs text-zinc-500 font-mono mt-0.5">{{ roleKey }}</p>
+            </div>
+          </div>
+          <label class="flex items-center gap-2 cursor-pointer">
+            <input 
+              v-model="roleConfig.canAccessAdmin" 
+              type="checkbox" 
+              class="hidden"
+              :disabled="roleKey === 'SUPER_ADMIN'"
+            />
+            <div class="w-10 h-6 bg-zinc-800 rounded-full relative transition-colors" :class="{ 'bg-indigo-500': roleConfig.canAccessAdmin }">
+              <div class="absolute w-4 h-4 bg-white rounded-full top-1 transition-transform" :class="roleConfig.canAccessAdmin ? 'left-5' : 'left-1'" />
+            </div>
+            <span class="text-xs font-bold text-zinc-400">允许进后台</span>
+          </label>
+        </div>
+
+        <div v-if="roleConfig.canAccessAdmin" class="mt-6">
+          <div class="flex items-center justify-between mb-4">
+            <div class="flex items-center gap-2">
+              <h4 class="text-xs font-bold text-zinc-500 uppercase tracking-wider">可访问页面</h4>
+              <span class="text-[10px] font-black px-2 py-0.5 rounded-md bg-zinc-800/60 text-zinc-400 border border-zinc-800">
+                已启用 {{ roleConfig.pages.length }} 项
+              </span>
+            </div>
+            <div class="flex items-center gap-2">
+              <button
+                class="px-3 py-1.5 text-[11px] font-black rounded-lg bg-zinc-800/60 border border-zinc-800 text-zinc-300 hover:bg-zinc-800 transition-colors"
+                :disabled="roleKey === 'SUPER_ADMIN'"
+                @click="selectAll(roleKey)"
+              >
+                全选
+              </button>
+              <button
+                class="px-3 py-1.5 text-[11px] font-black rounded-lg bg-zinc-800/60 border border-zinc-800 text-zinc-300 hover:bg-zinc-800 transition-colors"
+                :disabled="roleKey === 'SUPER_ADMIN'"
+                @click="clearAll(roleKey)"
+              >
+                清空
+              </button>
+            </div>
+          </div>
+
+          <div class="space-y-5">
+            <div v-for="section in pageSections" :key="section.title" class="space-y-2">
+              <div class="flex items-center justify-between">
+                <div class="text-[10px] font-black text-zinc-600 uppercase tracking-[0.2em]">
+                  {{ section.title }}
+                </div>
+                <button
+                  class="text-[10px] font-black text-indigo-400 hover:text-indigo-300 transition-colors"
+                  :disabled="roleKey === 'SUPER_ADMIN'"
+                  @click="toggleSection(roleKey, section)"
+                >
+                  {{ isSectionAllSelected(roleKey, section) ? '取消全选' : '本组全选' }}
+                </button>
+              </div>
+
+              <div class="grid grid-cols-2 gap-2">
+                <label
+                  v-for="page in section.pages"
+                  :key="page.id"
+                  class="flex items-center gap-2 p-2 rounded-xl border cursor-pointer transition-all"
+                  :class="roleConfig.pages.includes(page.id) ? 'bg-indigo-500/10 border-indigo-500/30 text-indigo-200 shadow-[0_0_0_1px_rgba(99,102,241,0.15)]' : 'bg-zinc-800/30 border-zinc-800 text-zinc-500 hover:bg-zinc-800/70'"
+                >
+                  <input
+                    v-model="roleConfig.pages"
+                    type="checkbox"
+                    :value="page.id"
+                    class="hidden"
+                    :disabled="roleKey === 'SUPER_ADMIN' && isRequiredForSuperAdmin(page.id)"
+                  />
+                  <component :is="page.icon" class="w-4 h-4" />
+                  <span class="text-xs font-bold">{{ page.label }}</span>
+                </label>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div v-else class="mt-6 py-8 text-center border border-dashed border-zinc-800 rounded-xl">
+          <p class="text-sm text-zinc-600">该角色不允许进入后台</p>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref, onMounted } from 'vue'
+import {
+  Shield,
+  Save,
+  Loader2,
+  Calendar,
+  Music,
+  Users,
+  Bell,
+  Clock,
+  BookOpen,
+  Database,
+  Settings,
+  Ban,
+  Key,
+  BarChart,
+  FileEdit,
+  Mail
+} from '@lucide/vue'
+
+const roles = ref({})
+const loading = ref(true)
+const saving = ref(false)
+const error = ref('')
+
+const pageSections = [
+  {
+    title: '数据中心',
+    pages: [
+      { id: 'overview', label: '数据概览', icon: BarChart },
+      { id: 'workflow-tutorial', label: '流程与教程', icon: BookOpen },
+      { id: 'data-analysis', label: '数据分析', icon: BarChart }
+    ]
+  },
+  {
+    title: '播音管理',
+    pages: [
+      { id: 'songs', label: '歌曲管理', icon: Music },
+      { id: 'schedule', label: '排期管理', icon: Calendar },
+      { id: 'print', label: '打印排期', icon: BookOpen }
+    ]
+  },
+  {
+    title: '业务设置',
+    pages: [
+      { id: 'settings', label: '选曲日期', icon: Calendar },
+      { id: 'request-times', label: '投稿管理', icon: FileEdit },
+      { id: 'semesters', label: '学期管理', icon: BookOpen },
+      { id: 'playtimes', label: '播出时段', icon: Clock }
+    ]
+  },
+  {
+    title: '用户与权限',
+    pages: [
+      { id: 'users', label: '用户管理', icon: Users },
+      { id: 'roles', label: '权限组管理', icon: Shield },
+      { id: 'blacklist', label: '黑名单管理', icon: Ban },
+      { id: 'api-keys', label: 'API密钥管理', icon: Key }
+    ]
+  },
+  {
+    title: '系统运维',
+    pages: [
+      { id: 'site-config', label: '站点配置', icon: Settings },
+      { id: 'notifications', label: '通知管理', icon: Bell },
+      { id: 'smtp-config', label: '邮件配置', icon: Mail },
+      { id: 'database', label: '数据库操作', icon: Database }
+    ]
+  }
+]
+
+const allPages = pageSections.flatMap((s) => s.pages)
+
+const isRequiredForSuperAdmin = (pageId) => {
+  return ['roles', 'users', 'site-config'].includes(pageId)
+}
+
+const selectAll = (roleKey) => {
+  const role = roles.value?.[roleKey]
+  if (!role || roleKey === 'SUPER_ADMIN') return
+  role.pages = Array.from(new Set(allPages.map((p) => p.id)))
+}
+
+const clearAll = (roleKey) => {
+  const role = roles.value?.[roleKey]
+  if (!role || roleKey === 'SUPER_ADMIN') return
+  role.pages = []
+}
+
+const isSectionAllSelected = (roleKey, section) => {
+  const role = roles.value?.[roleKey]
+  if (!role) return false
+  return section.pages.every((p) => role.pages.includes(p.id))
+}
+
+const toggleSection = (roleKey, section) => {
+  const role = roles.value?.[roleKey]
+  if (!role || roleKey === 'SUPER_ADMIN') return
+
+  const allSelected = section.pages.every((p) => role.pages.includes(p.id))
+  if (allSelected) {
+    role.pages = role.pages.filter((id) => !section.pages.some((p) => p.id === id))
+    return
+  }
+
+  role.pages = Array.from(new Set([...role.pages, ...section.pages.map((p) => p.id)]))
+}
+
+const fetchRoles = async () => {
+  loading.value = true
+  error.value = ''
+  try {
+    const data = await $fetch('/api/admin/roles')
+    roles.value = JSON.parse(JSON.stringify(data))
+  } catch (err) {
+    console.error('Failed to fetch roles:', err)
+    error.value = '加载权限配置失败'
+  } finally {
+    loading.value = false
+  }
+}
+
+const saveRoles = async () => {
+  saving.value = true
+  try {
+    await $fetch('/api/admin/roles', {
+      method: 'PUT',
+      body: roles.value
+    })
+    
+    if (window.$showNotification) {
+      window.$showNotification('权限配置已保存', 'success')
+    }
+  } catch (err) {
+    console.error('Failed to save roles:', err)
+    if (window.$showNotification) {
+      window.$showNotification('保存失败: ' + (err.message || '未知错误'), 'error')
+    }
+  } finally {
+    saving.value = false
+  }
+}
+
+onMounted(() => {
+  fetchRoles()
+})
+</script>
+
+<style scoped>
+.role-card {
+  transition: all 0.3s ease;
+}
+.role-card:hover {
+  border-color: rgba(99, 102, 241, 0.3);
+  box-shadow: 0 4px 20px rgba(0, 0, 0, 0.2);
+}
+</style>
diff --git a/app/components/Admin/ScheduleForm.vue b/app/components/Admin/ScheduleForm.vue
index 3f78d9b..a1050e8 100644
--- a/app/components/Admin/ScheduleForm.vue
+++ b/app/components/Admin/ScheduleForm.vue
@@ -1,18 +1,18 @@
 <template>
   <div
-    class="backdrop-blur-md p-6 rounded-xl border border-primary-10 bg-bg-tertiary-70 shadow-2xl max-w-[400px] mx-auto text-text-primary transition-transform duration-200 hover:-translate-y-0.5 hover:shadow-[0_15px_30px_var(--modal-hover-shadow)]"
+    class="backdrop-blur-md p-6 rounded-xl border border-white/10 bg-slate-800/70 shadow-2xl max-w-[400px] mx-auto text-zinc-100 transition-transform duration-200 hover:-translate-y-0.5 hover:shadow-[0_15px_30px_rgba(0,0,0,0.2)]"
   >
-    <h3 class="mb-6 pb-2 border-b border-primary-10 text-text-primary font-bold text-lg">
-      {{ scheduleTitle }}
+    <h3 class="mb-6 pb-2 border-b border-white/10 text-zinc-100 font-bold text-lg">
+      为歌曲 "{{ song?.title }}" 创建排期
     </h3>
 
     <form @submit.prevent="handleSubmit">
       <div class="mb-4">
-        <label class="block mb-2 font-medium text-text-primary" for="playDate">{{ locale.playDate }}</label>
+        <label class="block mb-2 font-medium text-zinc-100" for="playDate">播放日期</label>
         <input
           id="playDate"
           v-model="playDate"
-          class="w-full p-3 border border-primary-10 rounded-lg text-base bg-bg-tertiary-50 text-text-primary outline-none transition-colors duration-150 focus:border-primary focus:shadow-[0_0_0_2px_var(--primary-light)]"
+          class="w-full p-3 border border-white/10 rounded-lg text-base bg-[#0f172a99] text-zinc-100 outline-none transition-colors duration-150 focus:border-indigo-500 focus:shadow-[0_0_0_2px_rgba(99,102,241,0.25)]"
           required
           type="date"
         >
@@ -23,19 +23,19 @@
         <CustomSelect
           v-model="playTimeId"
           :options="playTimeOptions"
-          :label="locale.playTime"
-          :placeholder="locale.unspecified"
+          label="播出时段"
+          placeholder="未指定"
           class-name="w-full"
         />
 
         <div
           v-if="song?.preferredPlayTime"
-          class="mt-3 p-3 bg-bg-secondary-5 rounded-lg text-sm flex items-start gap-2"
+          class="mt-3 p-3 bg-white/5 rounded-lg text-sm flex items-start gap-2"
         >
-          <div class="text-base">💡</div>
+          <Icon class="text-base text-yellow-400" name="lightbulb" size="16" />
           <div>
-            {{ locale.preferredPlayTime }}
-            <span class="font-medium text-info">
+            用户期望的播出时段:
+            <span class="font-medium text-indigo-300">
               {{ song.preferredPlayTime.name }}
               <template v-if="song.preferredPlayTime.startTime || song.preferredPlayTime.endTime">
                 ({{ formatPlayTimeRange(song.preferredPlayTime) }})
@@ -45,24 +45,24 @@
         </div>
       </div>
 
-      <div v-if="error" class="p-3 mt-4 bg-error-10 text-error rounded-lg">
+      <div v-if="error" class="p-3 mt-4 bg-red-500/10 text-red-300 rounded-lg">
         {{ error }}
       </div>
 
       <div class="flex justify-between gap-4 mt-6">
         <button
-          class="flex-1 p-3 border border-primary-10 rounded-lg text-base cursor-pointer transition-all duration-200 bg-bg-secondary-10 text-text-primary hover:bg-bg-secondary-15"
+          class="flex-1 p-3 border border-white/10 rounded-lg text-base cursor-pointer transition-all duration-200 bg-white/10 text-zinc-100 hover:bg-white/15"
           type="button"
           @click="$emit('cancel')"
         >
-          {{ commonLocale.cancel }}
+          取消
         </button>
         <button
           :disabled="loading"
-          class="flex-1 p-3 border-none rounded-lg text-base cursor-pointer transition-all duration-200 bg-info text-text-primary hover:bg-info hover:-translate-y-px disabled:bg-info-50 disabled:cursor-not-allowed disabled:transform-none"
+          class="flex-1 p-3 border-none rounded-lg text-base cursor-pointer transition-all duration-200 bg-indigo-600 text-white hover:bg-indigo-700 hover:-translate-y-px disabled:bg-indigo-500/50 disabled:cursor-not-allowed disabled:transform-none"
           type="submit"
         >
-          {{ loading ? locale.creating : locale.create }}
+          {{ loading ? '创建中...' : '创建排期' }}
         </button>
       </div>
     </form>
@@ -73,7 +73,6 @@
 import { onMounted, ref, computed } from 'vue'
 import { useSongs } from '~/composables/useSongs'
 import CustomSelect from '~/components/UI/Common/CustomSelect.vue'
-import { useLocale } from '~/utils/locale'
 
 const props = defineProps({
   song: {
@@ -93,19 +92,10 @@ const playTimeId = ref('')
 const error = ref('')
 const playTimes = ref([])
 const { playTimeEnabled } = useSongs()
-const { common } = useLocale()
-const commonLocale = computed(() => common.value || {})
-const locale = computed(() => useSafeLocale(common.value?.scheduleForm || {}))
-const scheduleTitle = computed(() => {
-  const title = locale.value?.title
-  if (typeof title === 'string') return title.replace(/{0}/g, props.song?.title || '')
-  if (typeof title === 'function') return title(props.song?.title || '')
-  return ''
-})
 
 // 转换播出时段为 CustomSelect 选项格式
 const playTimeOptions = computed(() => {
-  const options = [{ label: locale.value.unspecified, value: '' }]
+  const options = [{ label: '未指定', value: '' }]
 
   if (playTimes.value && playTimes.value.length > 0) {
     playTimes.value.forEach((pt) => {
@@ -152,19 +142,19 @@ const formatPlayTimeRange = (playTime) => {
   if (playTime.startTime && playTime.endTime) {
     return `${playTime.startTime} - ${playTime.endTime}`
   } else if (playTime.startTime) {
-    return formatLocale(locale.value.startAt, playTime.startTime) || playTime.startTime
+    return `${playTime.startTime} 开始`
   } else if (playTime.endTime) {
-    return formatLocale(locale.value.endAt, playTime.endTime) || playTime.endTime
+    return `${playTime.endTime} 结束`
   }
 
-  return locale.value.unlimited
+  return '不限时间'
 }
 
 const handleSubmit = () => {
   error.value = ''
 
   if (!playDate.value) {
-    error.value = locale.value.dateRequired
+    error.value = '请选择播放日期'
     return
   }
 
diff --git a/app/components/Admin/ScheduleItemPrint.vue b/app/components/Admin/ScheduleItemPrint.vue
index 5d77a87..703e42a 100644
--- a/app/components/Admin/ScheduleItemPrint.vue
+++ b/app/components/Admin/ScheduleItemPrint.vue
@@ -1,79 +1,64 @@
 <template>
-  <div class="schedule-item-print" :class="{ 'is-narrow': narrow }">
+  <div class="schedule-item-print">
     <div class="item-content">
-      <div v-if="settings.showSequence || settings.showCover" class="item-leading">
-        <!-- 序号 -->
-        <div v-if="settings.showSequence" class="sequence-number">
-          {{ schedule.sequence || 1 }}
-        </div>
+      <!-- 序号 -->
+      <div v-if="settings.showSequence" class="sequence-number">
+        {{ schedule.sequence || 1 }}
+      </div>
 
-        <!-- 歌曲封面 -->
-        <div v-if="settings.showCover" class="cover-section">
-          <img
-            v-if="schedule.song.cover"
-            :alt="schedule.song.title"
-            :data-original-src="convertToHttps(schedule.song.cover)"
-            :src="convertToHttps(schedule.song.cover)"
-            class="song-cover"
-            referrerpolicy="no-referrer"
-            @error="handleImageError"
-          >
-          <div class="cover-placeholder" :class="{ show: !schedule.song.cover }">
-            <svg fill="none" stroke="currentColor" stroke-width="2" viewBox="0 0 24 24">
-              <circle cx="12" cy="12" r="3" />
-              <path d="M12 1v6m0 6v6" />
-              <path d="m21 12-6-3-6 3-6-3" />
-            </svg>
-          </div>
+      <!-- 歌曲封面 -->
+      <div v-if="settings.showCover" class="cover-section aspect-square">
+        <img
+          v-if="schedule.song.cover"
+          :alt="schedule.song.title"
+          :src="convertToHttps(schedule.song.cover)"
+          class="song-cover object-cover"
+          referrerpolicy="no-referrer"
+          @error="handleImageError"
+        >
+        <div class="cover-placeholder object-contain" :class="{ 'show': !schedule.song.cover }">
+          <svg fill="none" stroke="currentColor" stroke-width="2" viewBox="0 0 24 24">
+            <circle cx="12" cy="12" r="3" />
+            <path d="M12 1v6m0 6v6" />
+            <path d="m21 12-6-3-6 3-6-3" />
+          </svg>
         </div>
       </div>
 
       <!-- 歌曲信息 -->
       <div class="song-info">
         <div v-if="settings.showTitle" class="song-title">
-          <span class="title-text">{{ schedule.song.title }}</span>
+          {{ schedule.song.title }}
           <!-- 重播标识 -->
-          <span v-if="schedule.replayRequestId != null" class="replay-badge-print"> {{ locale.replay }} </span>
-          <!-- 跨学期标识 -->
-          <span
-            v-if="
-              settings.currentSemester &&
-              schedule.song.semester &&
-              schedule.song.semester !== settings.currentSemester
-            "
-            class="cross-semester-badge-print"
-          >
-            {{ locale.crossSemester }}
-          </span>
+          <span v-if="schedule.song.replayRequestCount > 0" class="replay-badge-print"> 重播 </span>
         </div>
         <div v-if="settings.showArtist" class="song-artist">
           {{ schedule.song.artist }}
         </div>
       </div>
 
-      <div v-if="settings.showRequester || settings.showVotes" class="item-trailing">
-        <!-- 投稿人信息（重播歌曲不显示申请人，只显示原投稿人） -->
-        <div v-if="settings.showRequester" class="requester-info">
-          <span class="label">{{ locale.requesterPrefix }}</span>
-          <span class="value">
-            {{ schedule.song.requester }}
-            <span v-if="schedule.song.collaborators && schedule.song.collaborators.length > 0">
-              & {{ schedule.song.collaborators.map((c) => c.displayName || c.name).join(' & ') }}
-            </span>
+      <!-- 投稿人信息（重播歌曲不显示申请人，只显示原投稿人） -->
+      <div v-if="settings.showRequester" class="requester-info">
+        <span class="label">投稿人：</span>
+        <span class="value">
+          {{ schedule.song.requester }}
+          <span v-if="schedule.song.collaborators && schedule.song.collaborators.length > 0">
+            & {{ schedule.song.collaborators.map((c) => c.displayName || c.name).join(' & ') }}
           </span>
-        </div>
-
-        <!-- 人数信息 -->
-        <div v-if="settings.showVotes" class="votes-info">
-          <span v-if="schedule.replayRequestId != null" class="label">{{ locale.replayRequestsPrefix }}</span>
-          <span v-else class="label">{{ locale.popularityPrefix }}</span>
-          <span class="value">{{
-            schedule.replayRequestId != null
-              ? locale.replayCount(schedule.song.replayRequestCount)
-              : schedule.song.voteCount || 0
-          }}</span>
-        </div>
+        </span>
       </div>
+
+      <!-- 人数信息 -->
+      <div v-if="settings.showVotes" class="votes-info">
+        <span v-if="schedule.song.replayRequestCount > 0" class="label">申请重播：</span>
+        <span v-else class="label">热度：</span>
+        <span class="value">{{
+          schedule.song.replayRequestCount > 0
+            ? schedule.song.replayRequestCount + '人'
+            : schedule.song.voteCount || 0
+        }}</span>
+      </div>
+
     </div>
   </div>
 </template>
@@ -81,9 +66,6 @@
 <script setup>
 import { defineProps } from 'vue'
 import { convertToHttps } from '~/utils/url'
-import { useLocale } from '~/utils/locale'
-const { admin } = useLocale()
-const locale = computed(() => admin.value.schedulePrinter)
 
 // 定义props
 defineProps({
@@ -94,10 +76,6 @@ defineProps({
   settings: {
     type: Object,
     required: true
-  },
-  narrow: {
-    type: Boolean,
-    default: false
   }
 })
 
@@ -113,9 +91,8 @@ const handleImageError = (event) => {
   display: flex;
   align-items: center;
   padding: 8px 0;
-  border-bottom: 1px solid #d1d5db;
+  border-bottom: 1px solid #e5e5e5;
   page-break-inside: avoid;
-  break-inside: avoid;
 }
 
 .item-content {
@@ -123,21 +100,6 @@ const handleImageError = (event) => {
   align-items: center;
   width: 100%;
   gap: 12px;
-  min-width: 0;
-}
-
-.item-leading {
-  display: flex;
-  align-items: center;
-  gap: 12px;
-  flex-shrink: 0;
-}
-
-.item-trailing {
-  display: flex;
-  align-items: center;
-  gap: 12px;
-  min-width: 0;
 }
 
 .sequence-number {
@@ -150,13 +112,14 @@ const handleImageError = (event) => {
   justify-content: center;
   font-weight: bold;
   font-size: 14px;
-  color: #1a1a1a;
+  color: var(--text-quaternary, #333333);
   flex-shrink: 0;
 }
 
 .cover-section {
   width: 40px;
   height: 40px;
+  aspect-ratio: 1 / 1;
   flex-shrink: 0;
 }
 
@@ -165,17 +128,20 @@ const handleImageError = (event) => {
   height: 100%;
   object-fit: cover;
   border-radius: 4px;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
 }
 
 .cover-placeholder {
   width: 100%;
   height: 100%;
+  aspect-ratio: 1 / 1;
+  object-fit: contain;
   background: #f5f5f5;
   border-radius: 4px;
   display: none;
   align-items: center;
   justify-content: center;
-  color: #6c757d;
+  color: var(--text-tertiary, #999999);
 }
 
 .cover-placeholder.show {
@@ -195,53 +161,32 @@ const handleImageError = (event) => {
 .song-title {
   font-weight: bold;
   font-size: 16px;
-  color: #1a1a1a;
+  color: var(--text-quaternary, #333333);
   margin-bottom: 2px;
   white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
   display: flex;
   align-items: center;
   gap: 4px;
-  min-width: 0;
-}
-
-/* 歌名文本块：text-overflow 只能作用在块容器上，故单独承载裁剪 */
-.title-text {
-  min-width: 0;
-  overflow: hidden;
-  text-overflow: ellipsis;
 }
 
 /* 打印用重播标识 */
 .replay-badge-print {
   display: inline-block;
   padding: 1px 4px;
-  background: #f8f9fa;
-  border: 1px solid #0b5afe;
+  background: #e3f2fd;
+  border: 1px solid var(--border-secondary, #2196f3);
   border-radius: 3px;
-  color: #2563eb;
+  color: #1976d2;
   font-size: 10px;
   font-weight: bold;
   flex-shrink: 0;
 }
 
-/* 跨学期标识 */
-.cross-semester-badge-print {
-  display: inline-block;
-  padding: 1px 4px;
-  background: #f5f5f5;
-  border: 1px solid #d1d5db;
-  color: #636366;
-  font-size: 10px;
-  border-radius: 2px;
-  font-weight: normal;
-  margin-left: 4px;
-  vertical-align: middle;
-  flex-shrink: 0;
-}
-
 .song-artist {
   font-size: 14px;
-  color: #636366;
+  color: var(--text-quaternary, #666666);
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
@@ -252,91 +197,24 @@ const handleImageError = (event) => {
   display: flex;
   align-items: center;
   font-size: 12px;
-  color: #636366;
+  color: var(--text-quaternary, #666666);
   white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  min-width: 0;
 }
 
 .label {
   font-weight: 500;
   margin-right: 4px;
-  flex-shrink: 0;
 }
 
 .value {
-  color: #1a1a1a;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-
-/* 两列窄版排布 */
-.schedule-item-print.is-narrow {
-  padding: 6px 0;
-}
-
-.is-narrow .item-content,
-.is-narrow .item-leading {
-  gap: 8px;
-}
-
-.is-narrow .sequence-number {
-  width: 22px;
-  height: 22px;
-  font-size: 12px;
-}
-
-.is-narrow .cover-section {
-  width: 32px;
-  height: 32px;
-}
-
-.is-narrow .cover-placeholder svg {
-  width: 16px;
-  height: 16px;
-}
-
-.is-narrow .song-title {
-  font-size: 13px;
-  gap: 3px;
-}
-
-.is-narrow .song-artist {
-  font-size: 11px;
-}
-
-.is-narrow .replay-badge-print,
-.is-narrow .cross-semester-badge-print {
-  font-size: 9px;
-  padding: 0 3px;
-}
-
-/* 人数与歌名同行、投稿人与歌手同行 */
-.is-narrow .item-trailing {
-  flex-direction: column;
-  align-items: flex-end;
-  gap: 0;
-  min-width: 0;
-  max-width: 45%;
-}
-
-.is-narrow .votes-info {
-  order: -1;
-}
-
-.is-narrow .requester-info,
-.is-narrow .votes-info {
-  font-size: 11px;
-  justify-content: flex-end;
-  max-width: 100%;
+  color: var(--text-quaternary, #333333);
 }
 
 /* 打印样式 */
 @media print {
   .schedule-item-print {
-    color: #1a1a1a !important;
-    background: #ffffff !important;
+    color: var(--text-primary, #000) !important;
+    background: var(--card-bg, #fff) !important;
     width: 100% !important;
     max-width: none !important;
     box-sizing: border-box !important;
@@ -352,30 +230,43 @@ const handleImageError = (event) => {
 
   .sequence-number {
     background: #f0f0f0 !important;
-    color: #1a1a1a !important;
+    color: var(--text-primary, #000) !important;
     width: 30px !important;
     height: 30px !important;
     flex-shrink: 0 !important;
   }
 
   .cover-section {
-    width: 40px !important;
-    height: 40px !important;
+    width: 48px !important;
+    height: 48px !important;
+    aspect-ratio: 1 / 1 !important;
     flex-shrink: 0 !important;
   }
 
+  .song-cover {
+    width: 100% !important;
+    height: 100% !important;
+    object-fit: contain !important;
+    border-radius: 0 !important;
+    box-shadow: none !important;
+  }
+
+  .cover-placeholder {
+    width: 100% !important;
+    height: 100% !important;
+    object-fit: contain !important;
+    border-radius: 0 !important;
+  }
+
   .song-info {
     flex: 1 !important;
     min-width: 0 !important;
   }
 
   .song-title {
-    color: #1a1a1a !important;
+    color: var(--text-primary, #000) !important;
     font-size: 16px !important;
     white-space: nowrap !important;
-  }
-
-  .title-text {
     overflow: hidden !important;
     text-overflow: ellipsis !important;
   }
@@ -383,11 +274,11 @@ const handleImageError = (event) => {
   .song-artist,
   .label,
   .value {
-    color: #3a3a3c !important;
+    color: var(--text-quaternary, #333333) !important;
   }
 
   .time-range {
-    color: #636366 !important;
+    color: var(--text-quaternary, #666666) !important;
   }
 
   .requester-info,
diff --git a/app/components/Admin/ScheduleManager.vue b/app/components/Admin/ScheduleManager.vue
index 24bf79f..b293fbc 100644
--- a/app/components/Admin/ScheduleManager.vue
+++ b/app/components/Admin/ScheduleManager.vue
@@ -1,164 +1,57 @@
 <template>
-  <div class="space-y-6 pb-24 md:pb-8">
-    <!-- 日期选择器 -->
-    <div class="relative bg-bg-secondary-50 border border-border-secondary-50 rounded-2xl p-1 overflow-hidden">
-      <div class="flex items-center" @touchstart.stop>
-        <button
-          :disabled="isFirstDateVisible"
-          class="p-2 text-text-tertiary hover:text-text-secondary disabled:opacity-30 transition-colors"
-          @click="scrollDates('left')"
-        >
-          <svg
-            class="w-5 h-5"
-            fill="none"
-            stroke="currentColor"
-            stroke-width="2"
-            viewBox="0 0 24 24"
-          >
-            <polyline points="15,18 9,12 15,6" />
-          </svg>
-        </button>
-
-        <div
-          ref="dateSelector"
-          class="flex-1 flex overflow-x-auto scrollbar-hide gap-2 px-2 py-1 overscroll-x-contain"
-          style="overscroll-behavior-x: contain; touch-action: pan-x"
-        >
-          <button
-            v-for="date in availableDates"
-            :key="date.value"
-            :data-date="date.value"
-            :class="[
-              'flex flex-col items-center justify-center min-w-[64px] h-16 rounded-lg transition-all duration-200 border',
-              selectedDate === date.value
-                ? 'bg-primary-hover border-primary text-text-primary shadow-lg shadow-[var(--primary-glow)]'
-                : 'bg-bg-secondary border-border-secondary text-text-tertiary hover:bg-bg-tertiary hover:text-text-secondary hover:border-border-tertiary'
-            ]"
-            @click="handleDateSelect(date.value)"
-          >
-            <span class="text-[10px] font-bold uppercase tracking-wider opacity-80">{{
-              date.weekday
-            }}</span>
-            <span class="text-lg font-black leading-none my-0.5">{{ date.day }}</span>
-                  <span class="text-[9px] font-bold opacity-60">{{ callLocale('monthLabel', `${date.month}月`, date.month) }}</span>
-          </button>
-        </div>
-
-        <button
-          :disabled="isLastDateVisible"
-          class="p-2 text-text-tertiary hover:text-text-secondary disabled:opacity-30 transition-colors"
-          @click="scrollDates('right')"
-        >
-          <svg
-            class="w-5 h-5"
-            fill="none"
-            stroke="currentColor"
-            stroke-width="2"
-            viewBox="0 0 24 24"
-          >
-            <polyline points="9,18 15,12 9,6" />
-          </svg>
-        </button>
-
-        <!-- 操作按钮组 -->
-        <div class="flex items-center border-l border-border-secondary ml-1 pl-1">
-          <!-- 定位到今天 -->
-          <button
-            class="p-2 text-text-tertiary hover:text-success transition-colors"
-            :title="locale.jumpToday"
-            @click="scrollToToday"
-          >
-            <CircleDot class="w-5 h-5" />
-          </button>
-
-          <!-- 手动日期选择按钮 -->
-          <button
-            class="p-2 text-text-tertiary hover:text-primary transition-colors"
-            :title="locale.selectSpecificDate"
-            @click="openManualDatePicker"
-          >
-            <CalendarIcon class="w-5 h-5" />
-          </button>
-        </div>
-      </div>
-    </div>
-
-    <!-- 手动日期选择弹窗 -->
-    <div
-      v-if="showManualDatePicker"
-      class="fixed inset-0 z-50 flex items-center justify-center bg-bg-primary-60 backdrop-blur-sm"
-    >
-      <div
-        class="bg-bg-secondary border border-border-secondary rounded-xl shadow-2xl w-full max-w-sm overflow-hidden"
-        @click.stop
-      >
-        <div class="flex items-center justify-between p-4 border-b border-border-secondary">
-          <h3 class="text-sm font-black text-text-primary uppercase tracking-widest">{{ locale.selectDate }}</h3>
-          <button
-            class="text-text-tertiary hover:text-text-secondary transition-colors"
-            @click="showManualDatePicker = false"
-          >
-            <CloseIcon class="w-5 h-5" />
-          </button>
-        </div>
-        <div class="p-6 space-y-6">
-          <input
-            v-model="manualSelectedDate"
-            class="w-full bg-bg-primary border border-border-secondary rounded-xl px-4 py-3 text-text-primary focus:outline-none focus:border-primary transition-colors"
-            type="date"
-          />
-          <div class="flex gap-3">
-            <button
-              class="flex-1 py-3 bg-bg-tertiary hover:bg-bg-quaternary text-text-secondary text-xs font-bold rounded-xl transition-colors uppercase tracking-wider"
-              @click="showManualDatePicker = false"
-            >
-              {{ locale.cancel }}
-            </button>
-            <button
-              class="flex-1 py-3 bg-primary-hover hover:bg-primary text-text-primary text-xs font-bold rounded-xl shadow-lg shadow-[var(--primary-glow)] transition-colors uppercase tracking-wider"
-              @click="confirmManualDate"
-            >
-              {{ locale.confirm }}
-            </button>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <!-- 播出时段选择器 (如果启用) -->
-    <div
-      v-if="playTimeEnabled"
-      class="flex items-center gap-3 bg-bg-secondary-30 border border-border-secondary rounded-lg p-3"
-    >
-      <CustomSelect
-        :model-value="selectedPlayTime"
-        :label="locale.playTime"
-        :options="playTimeOptions"
-        class-name="w-full"
-        @update:model-value="handlePlayTimeSelect"
+  <div class="space-y-5 pb-24 md:pb-6">
+    <!-- 日期与排期配置区 -->
+    <div class="space-y-3">
+      <AdminDatePicker
+        :modelValue="selectedDate"
+        @update:modelValue="handleDateSelect"
       />
+
+      <!-- 播出时段与自动排期配置 -->
+      <div
+        class="grid grid-cols-1 md:grid-cols-2 gap-3 bg-zinc-900/30 border border-zinc-800 rounded-xl p-3 md:p-4"
+      >
+        <div v-if="playTimeEnabled">
+          <CustomSelect
+            :model-value="selectedPlayTime"
+            label="播出时段"
+            :options="playTimeOptions"
+            class-name="w-full"
+            @update:model-value="handlePlayTimeSelect"
+          />
+        </div>
+        <div :class="playTimeEnabled ? '' : 'md:col-span-2'">
+          <CustomSelect
+            :model-value="autoScheduleStrategy"
+            label="自动排期策略"
+            :options="scheduleStrategyOptions"
+            class-name="w-full"
+            @update:model-value="handleStrategyChange"
+          />
+        </div>
+      </div>
     </div>
 
     <!-- 加载状态 -->
     <div v-if="loading" class="flex flex-col items-center justify-center py-20 min-h-[60vh]">
-      <LoadingState :title="locale.loadingTitle" :message="locale.loadingMessage" />
+      <LoadingState title="正在加载排期数据" message="请稍候..." />
     </div>
 
     <div v-else>
       <div
-        class="lg:hidden sticky -top-4 -mx-4 -mt-4 z-20 flex p-1 bg-bg-primary-90 backdrop-blur-md border-b border-border-secondary shadow-xl mb-4 pt-4"
+        class="lg:hidden sticky -top-4 -mx-4 -mt-4 z-20 flex gap-2 p-2 bg-zinc-950/90 backdrop-blur-md border-b border-zinc-800 shadow-xl mb-4 pt-4 min-h-[64px]"
       >
         <button
           :class="[
             'flex-1 flex items-center justify-center gap-2 py-2.5 rounded-lg text-sm font-black uppercase tracking-widest transition-all',
-            mobileTab === 'pending' ? 'bg-primary-hover text-text-primary shadow-lg' : 'text-text-tertiary'
+            mobileTab === 'pending' ? 'bg-blue-600 text-white shadow-lg' : 'text-zinc-500'
           ]"
           @click="mobileTab = 'pending'"
         >
           <ListMusic class="w-4 h-4" />
           <span class="flex items-center gap-1.5"
-            >{{ locale.pendingSongs }}
-            <span class="px-1.5 py-0.5 bg-bg-tertiary text-[10px] rounded text-text-tertiary">{{
+            >待排歌曲
+            <span class="px-1.5 py-0.5 bg-zinc-800 text-[10px] rounded text-zinc-400">{{
               filteredUnscheduledSongs.length
             }}</span></span
           >
@@ -166,105 +59,72 @@
         <button
           :class="[
             'flex-1 flex items-center justify-center gap-2 py-2.5 rounded-lg text-sm font-black uppercase tracking-widest transition-all',
-            mobileTab === 'scheduled' ? 'bg-primary-hover text-text-primary shadow-lg' : 'text-text-tertiary'
+            mobileTab === 'scheduled' ? 'bg-blue-600 text-white shadow-lg' : 'text-zinc-500'
           ]"
           @click="mobileTab = 'scheduled'"
         >
           <PlaySquare class="w-4 h-4" />
           <span class="flex items-center gap-1.5"
-            >{{ locale.playlist }}
-            <span class="px-1.5 py-0.5 bg-bg-tertiary text-[10px] rounded text-text-tertiary">{{
+            >播放列表
+            <span class="px-1.5 py-0.5 bg-zinc-800 text-[10px] rounded text-zinc-400">{{
               localScheduledSongs.length
             }}</span></span
           >
         </button>
       </div>
 
-      <div class="grid grid-cols-1 lg:grid-cols-12 gap-6 min-h-0">
+      <div class="grid grid-cols-1 lg:grid-cols-12 gap-4 md:gap-5 min-h-0">
         <!-- 左侧：待排歌曲（待排库） -->
         <div
           v-show="mobileTab === 'pending' || isDesktop"
           :class="[
-            'lg:col-span-4 flex flex-col space-y-2',
+            'lg:col-span-4 flex flex-col gap-2 md:gap-3',
             mobileTab === 'scheduled' ? 'hidden lg:flex' : 'flex'
           ]"
           @dragover.prevent="handleDraggableDragOver"
           @dragleave="handleDraggableDragLeave"
           @drop.stop.prevent="handleReturnToDraggable"
         >
-          <div class="flex flex-wrap items-center justify-between gap-y-2 px-1">
-            <h3
-              class="hidden lg:block text-lg font-black tracking-tight text-text-primary uppercase whitespace-nowrap shrink-0"
-            >
-              {{ activeTab === 'pool' ? locale.poolList : locale.pendingSongs }}
+          <div class="flex flex-col lg:flex-row lg:items-center lg:justify-between gap-2 md:gap-3 px-1 min-h-[52px]">
+            <h3 class="hidden lg:block text-lg font-black tracking-tight text-zinc-100 uppercase">
+              待排歌曲
             </h3>
-            <div class="flex items-center gap-2 w-full lg:w-auto">
-              <div
-                class="flex flex-1 lg:flex-none flex-wrap gap-1 p-1 bg-bg-secondary-50 rounded-xl border border-border-secondary"
-              >
-                <button
-                  v-for="tab in scheduleTabs"
-                  :key="tab.id"
-                  :class="[
-                    'flex-1 lg:flex-none px-2.5 py-1.5 rounded-lg text-[10px] font-black uppercase tracking-widest transition-all',
-                    activeTab === tab.id
-                      ? 'bg-bg-tertiary text-primary shadow-md border border-primary-20'
-                      : 'text-text-disabled hover:text-text-tertiary'
-                  ]"
-                  @click="activeTab = tab.id"
-                >
-                  {{ tab.label }}
-                </button>
-              </div>
+            <div
+              class="flex w-full lg:w-auto gap-2 p-1.5 bg-zinc-900/50 rounded-xl border border-zinc-800"
+            >
               <button
-                class="hidden lg:flex p-1.5 bg-bg-secondary-50 rounded-lg border border-border-secondary text-text-tertiary hover:text-info hover:border-info-30 transition-all group relative disabled:opacity-50 disabled:cursor-not-allowed"
-                v-if="activeTab === 'normal' || activeTab === 'all' || activeTab === 'replay'"
-                :disabled="filteredUnscheduledSongs.filter((song) => !poolSongIds.has(song.id)).length === 0"
-                :title="locale.addCurrentPage"
-                @click="moveAllToPool"
+                v-for="tab in [
+                  { id: 'normal', label: '普通投稿' },
+                  { id: 'replay', label: '重播申请' },
+                  { id: 'all', label: '所有' }
+                ]"
+                :key="tab.id"
+                :class="[
+                  'flex-1 lg:flex-none px-3 md:px-4 py-2 rounded-lg text-[10px] md:text-xs font-black uppercase tracking-widest transition-all',
+                  activeTab === tab.id
+                    ? 'bg-zinc-800 text-blue-400 shadow-md border border-blue-500/20'
+                    : 'text-zinc-600 hover:text-zinc-400'
+                ]"
+                @click="activeTab = tab.id"
               >
-                <FolderPlus class="w-3.5 h-3.5" />
-              </button>
-              <button
-                class="hidden lg:flex items-center justify-center gap-1 p-1.5 bg-bg-secondary-50 rounded-lg border border-border-secondary text-text-tertiary hover:text-primary hover:border-primary-30 transition-all group relative overflow-hidden disabled:opacity-70 disabled:cursor-not-allowed"
-                :disabled="refreshingAllDurations.running"
-                :title="refreshingAllDurations.running ? `${locale.refreshPageDurations} (${refreshingAllDurations.progress})` : locale.refreshPageDurations"
-                @click="refreshAllDurations"
-              >
-                <RefreshCcw
-                  class="w-3.5 h-3.5"
-                  :class="{ 'animate-spin': refreshingAllDurations.running }"
-                />
-                <span
-                  v-if="refreshingAllDurations.running"
-                  class="text-[9px] font-bold tabular-nums whitespace-nowrap"
-                >{{ refreshingAllDurations.done }}/{{ refreshingAllDurations.total }}</span>
-                <span
-                  v-if="refreshingAllDurations.running"
-                  class="absolute inset-x-0 bottom-0 h-0.5 bg-bg-tertiary"
-                >
-                  <span
-                    class="block h-full bg-primary transition-[width] duration-300"
-                    :style="{ width: `${refreshingAllDurations.total > 0 ? Math.round((refreshingAllDurations.done / refreshingAllDurations.total) * 100) : 0}%` }"
-                  />
-                </span>
+                {{ tab.label }}
               </button>
             </div>
           </div>
 
           <!-- 筛选区 - 移动端折叠 -->
-          <div class="bg-bg-secondary-40 border border-border-secondary rounded-2xl shadow-xl">
+          <div class="bg-zinc-900/40 border border-zinc-800 rounded-2xl shadow-xl">
             <div
-              class="p-4 flex items-center justify-between lg:hidden border-b border-border-secondary-50 rounded-t-2xl"
+              class="p-3 md:p-4 flex items-center justify-between lg:hidden border-b border-zinc-800/50 rounded-t-2xl"
               @click="mobileFiltersOpen = !mobileFiltersOpen"
             >
-              <div class="flex items-center gap-2 text-text-tertiary">
+              <div class="flex items-center gap-2 text-zinc-400">
                 <Filter class="w-3.5 h-3.5" />
-                <span class="text-[11px] font-black uppercase tracking-widest">{{ locale.searchAndFilter }}</span>
+                <span class="text-[11px] font-black uppercase tracking-widest">检索与筛选</span>
               </div>
               <ChevronRight
                 :class="[
-                  'w-3.5 h-3.5 text-text-secondary transition-transform duration-300',
+                  'w-3.5 h-3.5 text-zinc-700 transition-transform duration-300',
                   mobileFiltersOpen ? 'rotate-90' : ''
                 ]"
               />
@@ -272,21 +132,21 @@
 
             <div
               v-show="mobileFiltersOpen || isDesktop"
-              class="p-3 space-y-2 transition-all duration-300 ease-in-out rounded-b-2xl"
+              class="p-3 md:p-4 space-y-2 md:space-y-3 transition-all duration-300 ease-in-out rounded-b-2xl"
             >
               <div class="relative">
                 <Search
-                  class="absolute left-3 top-1/2 -translate-y-1/2 text-text-secondary w-3.5 h-3.5"
+                  class="absolute left-3 top-1/2 -translate-y-1/2 text-zinc-700 w-3.5 h-3.5"
                 />
                 <input
                   v-model="searchQuery"
                   type="text"
-                  :placeholder="locale.searchPlaceholder"
-                  class="w-full pl-9 pr-4 py-2 bg-bg-primary border border-border-secondary rounded-xl text-xs focus:outline-none focus:border-primary-30 transition-all text-text-primary"
-                />
+                  placeholder="搜索歌曲、艺术家..."
+                  class="w-full pl-9 pr-4 py-2 bg-zinc-950 border border-zinc-800 rounded-xl text-xs focus:outline-none focus:border-blue-500/30 transition-all text-zinc-200"
+                >
                 <button
                   v-if="searchQuery"
-                  class="absolute right-3 top-1/2 -translate-y-1/2 text-text-disabled hover:text-text-tertiary"
+                  class="absolute right-3 top-1/2 -translate-y-1/2 text-zinc-600 hover:text-zinc-400"
                   @click="searchQuery = ''"
                 >
                   <CloseIcon class="w-3.5 h-3.5" />
@@ -295,40 +155,16 @@
               <div class="grid grid-cols-1 gap-2">
                 <CustomSelect
                   :model-value="selectedSemester"
-                  :label="locale.currentSemester"
+                  label="当前学期"
                   :options="availableSemesters"
                   label-key="name"
-                  value-key="id"
+                  value-key="name"
                   @update:model-value="handleSemesterSelect"
                 />
-                <CustomSelect
-                  v-if="playTimeEnabled"
-                  v-model="selectedFilterPlayTime"
-                  :label="locale.preferredTime"
-                  :options="filterPlayTimeOptions"
-                  label-key="label"
-                  value-key="value"
-                />
                 <div class="grid grid-cols-2 gap-2">
-                  <CustomSelect
-                    v-model="selectedGrade"
-                    :label="locale.grade"
-                    :options="availableGrades"
-                    label-key="label"
-                    value-key="value"
-                  />
-                  <CustomSelect v-model="songSortOption" :label="locale.sort" :options="sortOptions" />
+                  <CustomSelect v-model="selectedGrade" label="年级" :options="availableGrades" />
+                  <CustomSelect v-model="songSortOption" label="排序" :options="sortOptions" />
                 </div>
-                <button
-                  class="flex items-center justify-center gap-2 w-full px-4 py-2 bg-bg-primary border border-border-secondary hover:border-primary-30 hover:text-primary rounded-xl text-xs focus:outline-none transition-all text-text-secondary"
-                  :class="{
-                    'border-primary-50 text-primary bg-primary-10': isPlaylistFilterActive
-                  }"
-                  @click="showPlaylistFilterModal = true"
-                >
-                  <ListMusic class="w-3.5 h-3.5" />
-                  <span>{{ isPlaylistFilterActive ? locale.playlistFilterApplied : locale.playlistFilter }}</span>
-                </button>
               </div>
             </div>
           </div>
@@ -337,21 +173,16 @@
             :class="[
               'draggable-songs flex-1 border-2 border-dashed rounded-[2rem] p-2 md:p-3 min-h-[400px] transition-colors duration-200',
               isDraggableOver
-                ? 'border-primary bg-primary-5'
-                : 'border-border-secondary-80 bg-bg-secondary-20'
+                ? 'border-blue-500 bg-blue-500/5'
+                : 'border-zinc-800/80 bg-zinc-900/20'
             ]"
           >
             <div class="space-y-2">
               <div
                 v-for="song in filteredUnscheduledSongs"
                 :key="song.id"
-                :class="[
-                  'draggable-song relative group rounded-xl p-3 transition-all select-none',
-                  song.cardCodeId
-                    ? 'bg-warning-5 border border-warning-30'
-                    : 'bg-bg-secondary border border-border-secondary-50 hover:border-border-tertiary'
-                ]"
-                :draggable="true"
+                class="draggable-song relative group bg-zinc-900 border border-zinc-800/50 rounded-xl p-3 hover:border-zinc-700 transition-all select-none"
+                draggable="true"
                 @dragend="dragEnd"
                 @dragstart="dragStart($event, song)"
                 @touchend="handleTouchEnd"
@@ -362,7 +193,7 @@
                 <div class="flex items-center gap-3">
                   <!-- 封面图片 -->
                   <div
-                    class="relative w-12 h-12 rounded-lg overflow-hidden bg-bg-tertiary flex-shrink-0 border border-border-tertiary-50 cursor-pointer hover:opacity-80 transition-opacity"
+                    class="relative w-12 h-12 rounded-lg overflow-hidden bg-zinc-800 flex-shrink-0 border border-zinc-700/50 cursor-pointer hover:opacity-80 transition-opacity"
                     @click.stop="playSong(song)"
                   >
                     <img
@@ -372,118 +203,57 @@
                       referrerpolicy="no-referrer"
                       loading="lazy"
                       alt=""
-                    />
+                    >
                     <div
                       v-else
-                      class="w-full h-full flex items-center justify-center text-text-disabled"
+                      class="w-full h-full flex items-center justify-center text-zinc-600"
                     >
                       <Music2 class="w-6 h-6 opacity-50" />
                     </div>
                   </div>
 
                   <div class="flex-1 min-w-0 flex flex-col gap-0.5">
-                    <div class="flex items-center gap-2 min-w-0">
-                      <h4
-                        class="font-bold text-text-primary text-sm truncate flex items-center gap-2 min-w-0"
-                      >
+                    <div class="flex items-center gap-2">
+                      <h4 class="font-bold text-zinc-100 text-sm truncate">
                         <span
-                          v-if="isBilibiliSong(song)"
-                          class="text-text-primary flex items-center gap-1 text-left truncate"
+                          v-if="false"
+                          class="text-zinc-100 flex items-center gap-1 w-full text-left"
                         >
                           <span class="truncate">{{ song.title }}</span>
                         </span>
-                        <span v-else class="truncate">{{ song.title }}</span>
-
-                        <!-- 歌单来源标签 -->
-                        <span
-                          v-if="isPlaylistFilterActive && playlistNamesMap[song.musicId]"
-                          class="flex items-center gap-1 flex-shrink-0"
-                        >
-                          <span
-                            v-for="(playlistName, idx) in playlistNamesMap[song.musicId]"
-                            :key="idx"
-                            class="px-1.5 py-[2px] bg-primary-10 text-primary rounded text-[9px] border border-primary-20 truncate max-w-[100px] font-normal leading-none"
-                            :title="playlistName"
-                          >
-                            {{ playlistName }}
-                          </span>
-                        </span>
+                        <span v-else>{{ song.title }}</span>
                       </h4>
                       <button
                         v-if="song.hasSubmissionNote && song.submissionNote"
-                        class="inline-flex items-center justify-center w-5 h-5 rounded-full border border-primary-30 bg-primary-10 text-primary hover:bg-primary-20 transition-all flex-shrink-0"
-                        :title="locale.viewRemark"
+                        class="inline-flex items-center justify-center w-5 h-5 rounded-full border border-blue-500/30 bg-blue-500/10 text-blue-400 hover:bg-blue-500/20 transition-all flex-shrink-0"
+                        title="查看备注留言"
                         @click.stop="openSubmissionRemark(song)"
                       >
                         <MessageSquare :size="12" />
                       </button>
-                      <span
-                        v-if="song.cardCodeId"
-                        class="inline-flex items-center rounded-md border border-warning-20 bg-warning-10 px-1.5 py-0.5 text-[9px] font-bold text-warning whitespace-nowrap flex-shrink-0"
-                        :title="locale.cardPending"
-                      >
-                        {{ locale.cardPending }}
-                      </span>
-                      <span
-                        v-if="song.hasSubmissionNote && song.submissionNote"
-                        class="text-xs text-primary-80 truncate max-w-[150px] cursor-pointer hover:text-primary transition-colors"
-                        :title="locale.viewRemark"
-                        @click.stop="openSubmissionRemark(song)"
-                      >
-                        {{
-                          song.submissionNote.length > 25
-                            ? song.submissionNote.substring(0, 25) + '...'
-                            : song.submissionNote
-                        }}
-                      </span>
                     </div>
-                    <div class="text-xs text-text-tertiary truncate flex items-center gap-1.5">
-                      <span>{{ song.artist }}</span>
-                      <!-- 时长显示 / 行内编辑 -->
-                      <span
-                        v-if="song.durationSeconds && !editingDuration[song.id]"
-                        :class="[
-                          'shrink-0 px-1 rounded transition-colors cursor-pointer',
-                          durationRefreshStatus[song.id] === 'success'
-                            ? 'text-success bg-success-10'
-                            : durationRefreshStatus[song.id] === 'error'
-                              ? 'text-error bg-error-10'
-                              : 'text-text-disabled hover:text-text-secondary hover:bg-bg-quaternary'
-                        ]"
-                        :title="locale.messages?.editDuration || '点击编辑时长'"
-                        @click.stop="startEditDuration(song)"
-                      >{{ formatDuration(song.durationSeconds) }}</span>
-                      <input
-                        v-else-if="editingDuration[song.id]"
-                        ref="editingDurationInput"
-                        v-model="editingDurationValue"
-                        type="text"
-                        inputmode="text"
-                        pattern="[0-9:]*"
-                        class="w-20 text-[11px] font-mono text-center bg-bg-primary border border-primary rounded px-1 py-0.5 text-text-primary focus:outline-none focus:border-primary shrink-0"
-                        :placeholder="locale.messages?.durationInputPlaceholder || '分:秒'"
-                        @focusout="saveDurationEdit(song)"
-                        @keydown="handleDurationKeydown($event, song)"
-                      >
-                    </div>
-                    <div class="text-[10px] text-text-tertiary truncate flex items-center gap-1">
+                    <div class="text-xs text-zinc-400 truncate">{{ song.artist }}</div>
+                    <div class="text-[10px] text-zinc-500 truncate flex items-center gap-1">
                       <span>{{ song.requester }}</span>
-                      <span v-if="song.requesterGrade || song.grade" class="text-text-disabled">|</span>
-                      <span v-if="song.requesterGrade || song.grade">
-                        {{ song.requesterGrade || song.grade }}
-                        {{ song.requesterClass || song.class }}
-                      </span>
                       <span
                         v-if="song.preferredPlayTimeId"
-                        class="ml-1 px-1.5 py-0.5 bg-info-10 text-info rounded text-[9px] border border-info-20 whitespace-nowrap"
+                        class="ml-1 px-1.5 py-0.5 bg-indigo-500/10 text-indigo-400 rounded text-[9px] border border-indigo-500/20 whitespace-nowrap"
                       >
-                        {{ callLocale('preferredPlayTime', `期望: ${getPlayTimeName(song.preferredPlayTimeId)}`, getPlayTimeName(song.preferredPlayTimeId)) }}
+                        期望: {{ getPlayTimeName(song.preferredPlayTimeId) }}
                       </span>
                       <span
-                        v-if="activeTab === 'pool' && song.addedByName"
-                        class="ml-1 px-1.5 py-0.5 bg-primary-10 text-primary rounded text-[9px] border border-primary-20 whitespace-nowrap"
+                        v-if="song.expectedPlayDate"
+                        class="ml-1 px-1.5 py-0.5 bg-yellow-500/10 text-yellow-500 rounded text-[9px] border border-yellow-500/20 whitespace-nowrap flex items-center gap-1"
                       >
-                        {{ locale.addedBy }} {{ song.addedByName }}
+                        <CalendarDays class="w-2.5 h-2.5" />
+                        日期: {{ song.expectedPlayDate }}
+                      </span>
+                      <span
+                        v-if="song.expectedPlaySequence !== null && song.expectedPlaySequence !== undefined"
+                        class="ml-1 px-1.5 py-0.5 bg-emerald-500/10 text-emerald-500 rounded text-[9px] border border-emerald-500/20 whitespace-nowrap flex items-center gap-1"
+                      >
+                        <ListMusic class="w-2.5 h-2.5" />
+                        序号: {{ song.expectedPlaySequence }}
                       </span>
                     </div>
                   </div>
@@ -492,111 +262,45 @@
                     <!-- 普通模式：投票数 -->
                     <div
                       v-if="activeTab !== 'replay'"
-                      class="flex items-center gap-1 text-[10px] font-bold text-text-tertiary bg-bg-primary-50 px-2 py-1 rounded-md border border-border-secondary-50"
+                      class="flex items-center gap-1 text-[10px] font-bold text-zinc-500 bg-zinc-950/50 px-2 py-1 rounded-md border border-zinc-800/50"
                     >
-                      <Heart class="w-3 h-3 text-error-50" />
+                      <Heart class="w-3 h-3 text-red-500/50" />
                       {{ song.voteCount || 0 }}
                     </div>
 
                     <!-- 重播模式：查看按钮 -->
                     <button
                       v-if="activeTab === 'replay'"
-                      class="px-3 py-1.5 rounded-lg bg-primary-10 hover:bg-primary-20 text-primary border border-primary-20 text-[10px] font-bold transition-colors"
+                      class="px-3 py-1.5 rounded-lg bg-blue-500/10 hover:bg-blue-500/20 text-blue-400 border border-blue-500/20 text-[10px] font-bold transition-colors"
                       @click.stop="openReplayModal(song)"
                     >
-                      {{ locale.view }}
+                      查看
                     </button>
 
                     <!-- 重播模式：拒绝按钮（仅移动端） -->
                     <button
                       v-if="activeTab === 'replay'"
-                      class="lg:hidden p-1.5 rounded-lg bg-error-10 hover:bg-error-20 text-error border border-error-20 transition-colors flex items-center justify-center"
-                      :title="locale.rejectRequest"
+                      class="lg:hidden p-1.5 rounded-lg bg-red-500/10 hover:bg-red-500/20 text-red-500 border border-red-500/20 transition-colors"
+                      title="拒绝申请"
                       @click.stop="rejectReplayRequest(song.id)"
                     >
                       <CloseIcon class="w-3.5 h-3.5" />
                     </button>
 
-                    <!-- 待排库：加入备选池按钮 -->
+                    <!-- 移动端添加按钮 -->
                     <button
-                      v-if="activeTab === 'normal' || activeTab === 'all' || activeTab === 'replay'"
-                      class="hidden lg:flex p-1.5 rounded-lg bg-info-10 border border-info-20 text-info hover:bg-info-20 transition-colors disabled:opacity-40 disabled:cursor-not-allowed disabled:hover:bg-info-10"
-                      :disabled="poolSongIds.has(song.id)"
-                      :title="poolSongIds.has(song.id) ? locale.alreadyInPool : locale.addSingleToPool"
-                      @click.stop="addSingleToPool(song.id)"
-                    >
-                      <FolderPlus class="w-3.5 h-3.5" />
-                    </button>
-
-                    <!-- 备选池：移除按钮（桌面） -->
-                    <button
-                      v-if="activeTab === 'pool'"
-                      class="hidden lg:flex p-1.5 rounded-lg bg-error-10 border border-error-20 text-error hover:bg-error-20 transition-colors"
-                      :title="locale.removeFromPool"
-                      @click.stop="removeFromPool(song.songId)"
-                    >
-                      <Trash2 class="w-3.5 h-3.5" />
-                    </button>
-
-                    <!-- 移动端加入备选池按钮 -->
-                    <button
-                      class="flex items-center justify-center lg:hidden p-2 rounded-full bg-info-10 text-info hover:bg-info-20 active:scale-95 transition-all flex-shrink-0 disabled:opacity-40 disabled:cursor-not-allowed"
-                      v-if="activeTab === 'normal' || activeTab === 'all' || activeTab === 'replay'"
-                      :disabled="poolSongIds.has(song.id)"
-                      :title="poolSongIds.has(song.id) ? locale.alreadyInPool : locale.addSingleToPool"
-                      @click.stop="addSingleToPool(song.id)"
-                    >
-                      <FolderPlus class="w-5 h-5" />
-                    </button>
-
-                    <!-- 备选池：加入排期按钮 -->
-                    <button
-                      class="flex items-center justify-center lg:hidden p-2 rounded-full bg-primary-hover-20 text-primary hover:bg-primary-hover-30 active:scale-95 transition-all flex-shrink-0"
-                      v-if="activeTab === 'pool'"
-                      :title="locale.addToSchedule"
+                      class="lg:hidden p-2 rounded-full bg-blue-600/20 text-blue-400 hover:bg-blue-600/30 active:scale-95 transition-all flex-shrink-0"
                       @click.stop="addSongToSchedule(song)"
                     >
                       <Plus class="w-5 h-5" />
                     </button>
 
-                    <!-- 备选池：移除按钮（移动端） -->
-                    <button
-                      class="flex items-center justify-center lg:hidden p-2 rounded-full bg-error-20 text-error hover:bg-error-30 active:scale-95 transition-all flex-shrink-0"
-                      v-if="activeTab === 'pool'"
-                      :title="locale.removeFromPool"
-                      @click.stop="removeFromPool(song.songId)"
-                    >
-                      <Trash2 class="w-5 h-5" />
-                    </button>
-
-                    <!-- 非备选池：加入排期按钮（移动端） -->
-                    <button
-                      class="flex items-center justify-center lg:hidden p-2 rounded-full bg-primary-hover-20 text-primary hover:bg-primary-hover-30 active:scale-95 transition-all flex-shrink-0"
-                      v-if="activeTab !== 'pool'"
-                      :title="locale.addToSchedule"
-                      @click.stop="addSongToSchedule(song)"
-                    >
-                      <Plus class="w-5 h-5" />
-                    </button>
-
-                    <!-- 刷新时长按钮 -->
-                    <button
-                      class="p-1.5 rounded-lg bg-bg-primary border border-border-secondary text-text-disabled hover:text-primary transition-colors"
-                      :title="locale.refreshDuration"
-                      :disabled="refreshingDuration[song.id]"
-                      @click.stop="refreshDuration(song)"
-                    >
-                      <RefreshCcw class="w-3.5 h-3.5" :class="{ 'animate-spin': refreshingDuration[song.id] }" />
-                    </button>
-
                     <!-- 菜单按钮 -->
-                    <button
-                      type="button"
-                      class="p-1.5 rounded-lg bg-bg-primary border border-border-secondary text-text-disabled hover:text-text-tertiary transition-colors"
-                      @click="openContextMenu($event, 'left', song)"
+                    <div
+                      class="p-1.5 rounded-lg bg-zinc-950 border border-zinc-800 text-zinc-600 cursor-grab active:cursor-grabbing hover:text-zinc-400 transition-colors"
                     >
                       <MoreVertical class="w-4 h-4" />
-                    </button>
+                    </div>
                   </div>
                 </div>
               </div>
@@ -604,19 +308,15 @@
               <!-- 空状态 -->
               <div
                 v-if="filteredUnscheduledSongs.length === 0"
-                class="h-[300px] flex flex-col items-center justify-center text-text-primary"
+                class="h-[300px] flex flex-col items-center justify-center text-zinc-800"
               >
                 <div v-if="searchQuery" class="flex flex-col items-center">
                   <Search class="w-8 h-8 mb-2 opacity-20" />
-                  <p class="text-[10px] font-black uppercase tracking-widest">{{ locale.emptySearch }}</p>
-                </div>
-                <div v-else-if="activeTab === 'pool'" class="flex flex-col items-center">
-                  <FolderPlus class="w-8 h-8 mb-2 opacity-20" />
-                  <p class="text-[10px] font-black uppercase tracking-widest">{{ locale.poolEmptyHint }}</p>
+                  <p class="text-[10px] font-black uppercase tracking-widest">未找到匹配的歌曲</p>
                 </div>
                 <div v-else class="flex flex-col items-center">
                   <ListMusic class="w-8 h-8 mb-2 opacity-20" />
-                  <p class="text-[10px] font-black uppercase tracking-widest">{{ locale.emptySongs }}</p>
+                  <p class="text-[10px] font-black uppercase tracking-widest">暂无歌曲记录</p>
                 </div>
               </div>
             </div>
@@ -626,7 +326,7 @@
               v-model:current-page="currentPage"
               :total-pages="totalPages"
               :total-items="allUnscheduledSongs.length"
-              :item-name="activeTab === 'pool' ? locale.poolItemName : locale.pendingSongItemName"
+              item-name="首待排歌曲"
             />
           </div>
         </div>
@@ -635,134 +335,108 @@
         <div
           v-show="mobileTab === 'scheduled' || isDesktop"
           :class="[
-            'lg:col-span-8 flex flex-col space-y-4',
+            'lg:col-span-8 flex flex-col gap-3 md:gap-4',
             mobileTab === 'pending' ? 'hidden lg:flex' : 'flex'
           ]"
         >
           <div
-            class="hidden lg:flex flex-col xl:flex-row xl:items-center justify-between gap-4 px-1"
+            class="hidden lg:flex flex-col xl:flex-row xl:items-center justify-between gap-3 md:gap-4 px-1 min-h-[56px]"
           >
-            <div class="flex items-baseline gap-3">
-              <h3 class="text-lg font-black tracking-tight text-text-primary uppercase">{{ locale.playOrder }}</h3>
-              <span v-show="scheduledTotalDuration > 0" class="flex items-baseline gap-1.5 text-[11px] font-bold text-text-tertiary uppercase tracking-wider">
-                {{ locale.expectedTotalDuration }}
-                <span class="text-sm font-black text-primary">{{ formatDuration(scheduledTotalDuration) }}</span>
-              </span>
-            </div>
+            <h3 class="text-lg font-black tracking-tight text-zinc-100 uppercase">播放顺序</h3>
             <div
-              class="flex flex-wrap items-center gap-2 p-1.5 bg-bg-secondary-50 border border-border-secondary-50 rounded-2xl"
+              class="flex flex-wrap items-center gap-1.5 md:gap-2 p-1.5 bg-zinc-900/50 border border-zinc-800/50 rounded-2xl"
             >
-              <div class="flex gap-1">
+              <div class="flex gap-1 md:gap-1.5">
                 <button
                   :disabled="
                     !hasChanges && localScheduledSongs.length === 0 && !hasUnpublishedDrafts
                   "
-                  class="flex items-center justify-center p-2 bg-bg-primary border border-border-secondary hover:bg-bg-tertiary text-text-tertiary hover:text-text-primary rounded-xl transition-all group relative disabled:opacity-50 disabled:cursor-not-allowed"
+                  class="p-2 bg-zinc-950 border border-zinc-800 hover:bg-zinc-800 text-zinc-500 hover:text-zinc-200 rounded-xl transition-all group relative disabled:opacity-50 disabled:cursor-not-allowed"
                   @click="saveDraft"
                 >
                   <Save class="w-3.5 h-3.5" />
                   <span
-                    class="absolute -top-10 left-1/2 -translate-x-1/2 px-2 py-1 bg-bg-tertiary text-[9px] text-text-secondary rounded opacity-0 group-hover:opacity-100 transition-opacity pointer-events-none whitespace-nowrap border border-border-tertiary"
-                    >{{ locale.saveDraft }}</span
+                    class="absolute -top-10 left-1/2 -translate-x-1/2 px-2 py-1 bg-zinc-800 text-[9px] text-zinc-300 rounded opacity-0 group-hover:opacity-100 transition-opacity pointer-events-none whitespace-nowrap border border-zinc-700"
+                    >保存草稿</span
                   >
                 </button>
                 <button
                   :disabled="localScheduledSongs.length === 0"
-                  class="flex items-center justify-center p-2 bg-bg-primary border border-border-secondary hover:bg-bg-tertiary text-text-tertiary hover:text-text-primary rounded-xl transition-all group relative disabled:opacity-50 disabled:cursor-not-allowed"
+                  class="p-2 bg-zinc-950 border border-zinc-800 hover:bg-zinc-800 text-zinc-500 hover:text-zinc-200 rounded-xl transition-all group relative disabled:opacity-50 disabled:cursor-not-allowed"
                   @click="openDownloadDialog"
                 >
                   <Download class="w-3.5 h-3.5" />
                   <span
-                    class="absolute -top-10 left-1/2 -translate-x-1/2 px-2 py-1 bg-bg-tertiary text-[9px] text-text-secondary rounded opacity-0 group-hover:opacity-100 transition-opacity pointer-events-none whitespace-nowrap border border-border-tertiary"
-                    >{{ locale.downloadSongs }}</span
+                    class="absolute -top-10 left-1/2 -translate-x-1/2 px-2 py-1 bg-zinc-800 text-[9px] text-zinc-300 rounded opacity-0 group-hover:opacity-100 transition-opacity pointer-events-none whitespace-nowrap border border-zinc-700"
+                    >下载歌曲</span
                   >
                 </button>
                 <button
                   :disabled="localScheduledSongs.length === 0"
-                  class="flex items-center justify-center p-2 bg-bg-primary border border-border-secondary hover:bg-bg-tertiary text-text-tertiary hover:text-success rounded-xl transition-all group relative disabled:opacity-50 disabled:cursor-not-allowed"
+                  class="p-2 bg-zinc-950 border border-zinc-800 hover:bg-zinc-800 text-zinc-500 hover:text-blue-400 rounded-xl transition-all group relative disabled:opacity-50 disabled:cursor-not-allowed"
+                  @click="showCardGenerator = true"
+                >
+                  <ImageIcon class="w-3.5 h-3.5" />
+                  <span
+                    class="absolute -top-10 left-1/2 -translate-x-1/2 px-2 py-1 bg-zinc-800 text-[9px] text-zinc-300 rounded opacity-0 group-hover:opacity-100 transition-opacity pointer-events-none whitespace-nowrap border border-zinc-700"
+                    >生成图片</span
+                  >
+                </button>
+                <button
+                  :disabled="localScheduledSongs.length === 0"
+                  class="p-2 bg-zinc-950 border border-zinc-800 hover:bg-zinc-800 text-zinc-500 hover:text-emerald-500 rounded-xl transition-all group relative disabled:opacity-50 disabled:cursor-not-allowed"
                   @click="markAllAsPlayed"
                 >
                   <CheckCircle2 class="w-3.5 h-3.5" />
                   <span
-                    class="absolute -top-10 left-1/2 -translate-x-1/2 px-2 py-1 bg-bg-tertiary text-[9px] text-text-secondary rounded opacity-0 group-hover:opacity-100 transition-opacity pointer-events-none whitespace-nowrap border border-border-tertiary"
-                    >{{ locale.markAllPlayed }}</span
-                  >
-                </button>
-                <button
-                  :disabled="refreshingAllDurations.running"
-                  class="flex items-center justify-center p-2 bg-bg-primary border border-border-secondary hover:bg-bg-tertiary text-text-tertiary hover:text-primary rounded-xl transition-all group relative disabled:opacity-50 disabled:cursor-not-allowed"
-                  @click="refreshAllDurations('scheduled')"
-                >
-                  <RefreshCcw
-                    class="w-3.5 h-3.5"
-                    :class="{ 'animate-spin': refreshingAllDurations.running }"
-                  />
-                  <span
-                    class="absolute -top-10 left-1/2 -translate-x-1/2 px-2 py-1 bg-bg-tertiary text-[9px] text-text-secondary rounded opacity-0 group-hover:opacity-100 transition-opacity pointer-events-none whitespace-nowrap border border-border-tertiary"
-                    >{{ locale.refreshPageDurations }}{{
-                      refreshingAllDurations.running
-                        ? ` (${refreshingAllDurations.progress})`
-                        : ''
-                    }}</span
-                  >
-                </button>
-                <button
-                  :disabled="autoScheduleCandidates.length === 0"
-                  class="flex items-center justify-center p-2 bg-bg-primary border border-border-secondary hover:bg-bg-tertiary text-text-tertiary hover:text-primary rounded-xl transition-all group relative disabled:opacity-50 disabled:cursor-not-allowed"
-                  @click="openAutoScheduleDialog"
-                >
-                  <Sparkles class="w-3.5 h-3.5" />
-                  <span
-                    class="absolute -top-10 left-1/2 -translate-x-1/2 px-2 py-1 bg-bg-tertiary text-[9px] text-text-secondary rounded opacity-0 group-hover:opacity-100 transition-opacity pointer-events-none whitespace-nowrap border border-border-tertiary"
-                    >{{ locale.autoSchedule }}</span
-                  >
-                </button>
-                <button
-                  class="flex items-center justify-center p-2 bg-bg-primary border border-border-secondary hover:bg-bg-tertiary text-text-tertiary hover:text-info rounded-xl transition-all group relative"
-                  @click="openMoveDateDialog"
-                >
-                  <ArrowRight class="w-3.5 h-3.5" />
-                  <span
-                    class="absolute -top-10 left-1/2 -translate-x-1/2 px-2 py-1 bg-bg-tertiary text-[9px] text-text-secondary rounded opacity-0 group-hover:opacity-100 transition-opacity pointer-events-none whitespace-nowrap border border-border-tertiary"
-                    >{{ locale.moveDate }}</span
-                  >
-                </button>
-                <button
-                  class="flex items-center justify-center p-2 bg-bg-primary border border-border-secondary hover:bg-bg-tertiary text-text-tertiary hover:text-primary rounded-xl transition-all group relative"
-                  @click="openCopyDateDialog"
-                >
-                  <Copy class="w-3.5 h-3.5" />
-                  <span
-                    class="absolute -top-10 left-1/2 -translate-x-1/2 px-2 py-1 bg-bg-tertiary text-[9px] text-text-secondary rounded opacity-0 group-hover:opacity-100 transition-opacity pointer-events-none whitespace-nowrap border border-border-tertiary"
-                    >{{ locale.copyDate }}</span
+                    class="absolute -top-10 left-1/2 -translate-x-1/2 px-2 py-1 bg-zinc-800 text-[9px] text-zinc-300 rounded opacity-0 group-hover:opacity-100 transition-opacity pointer-events-none whitespace-nowrap border border-zinc-700"
+                    >全部已播放</span
                   >
                 </button>
                 <button
                   :disabled="localScheduledSongs.length === 0"
-                  class="flex items-center justify-center p-2 bg-bg-primary border border-border-secondary hover:bg-bg-tertiary text-text-tertiary hover:text-error rounded-xl transition-all group relative disabled:opacity-50 disabled:cursor-not-allowed"
-                  @click="clearScheduleList"
+                  class="p-2 bg-zinc-950 border border-zinc-800 hover:bg-zinc-800 text-zinc-500 hover:text-cyan-400 rounded-xl transition-all group relative disabled:opacity-50 disabled:cursor-not-allowed"
+                  title="构建播放队列"
+                  @click="confirmBuildPlayQueue"
                 >
-                  <Trash2 class="w-3.5 h-3.5" />
+                  <Music2 class="w-3.5 h-3.5" />
                   <span
-                    class="absolute -top-10 left-1/2 -translate-x-1/2 px-2 py-1 bg-bg-tertiary text-[9px] text-text-secondary rounded opacity-0 group-hover:opacity-100 transition-opacity pointer-events-none whitespace-nowrap border border-border-tertiary"
-                    >{{ locale.clearList }}</span
+                    class="absolute -top-10 left-1/2 -translate-x-1/2 px-2 py-1 bg-zinc-800 text-[9px] text-zinc-300 rounded opacity-0 group-hover:opacity-100 transition-opacity pointer-events-none whitespace-nowrap border border-zinc-700"
+                    >构建播放队列</span
+                  >
+                </button>
+                <button
+                  class="p-2 bg-zinc-950 border border-zinc-800 hover:bg-zinc-800 text-zinc-500 hover:text-purple-400 rounded-xl transition-all group relative"
+                  @click="openMoveDateDialog"
+                >
+                  <ArrowRight class="w-3.5 h-3.5" />
+                  <span
+                    class="absolute -top-10 left-1/2 -translate-x-1/2 px-2 py-1 bg-zinc-800 text-[9px] text-zinc-300 rounded opacity-0 group-hover:opacity-100 transition-opacity pointer-events-none whitespace-nowrap border border-zinc-700"
+                    >迁移日期</span
                   >
                 </button>
               </div>
-              <div class="h-6 w-[1px] bg-bg-tertiary mx-1" />
+              <div class="h-6 w-[1px] bg-zinc-800 mx-1" />
+              <button
+                class="flex items-center gap-1.5 px-3 md:px-4 py-2 bg-yellow-500/10 hover:bg-yellow-500/20 text-yellow-500 text-[10px] md:text-xs font-black rounded-xl border border-yellow-500/20 transition-all uppercase tracking-widest active:scale-95 disabled:opacity-50"
+                title="一键将当前待排歌曲自动排入"
+                @click="autoScheduleExpected"
+              >
+                <CalendarDays class="w-3 h-3" /> 自动排入
+              </button>
               <button
                 :disabled="!canPublish"
-                class="flex items-center gap-2 px-4 py-2 bg-success-10 hover:bg-success-20 text-success text-[10px] font-black rounded-xl border border-success-20 transition-all uppercase tracking-widest active:scale-95 disabled:opacity-50 disabled:cursor-not-allowed disabled:active:scale-100"
+                class="flex items-center gap-2 px-4 py-2 bg-emerald-500/10 hover:bg-emerald-500/20 text-emerald-500 text-[10px] md:text-xs font-black rounded-xl border border-emerald-500/20 transition-all uppercase tracking-widest active:scale-95 disabled:opacity-50 disabled:cursor-not-allowed disabled:active:scale-100"
                 @click="publishSchedule"
               >
-                <Send class="w-3 h-3" /> {{ locale.publishSchedule }}
+                <Send class="w-3 h-3" /> 发布排期
               </button>
               <button
                 :disabled="!hasChanges"
-                class="flex items-center gap-2 px-5 py-2 bg-primary-hover hover:bg-primary text-text-primary text-[10px] font-black rounded-xl shadow-lg shadow-[var(--primary-glow)] transition-all uppercase tracking-widest active:scale-95 disabled:opacity-50 disabled:cursor-not-allowed disabled:active:scale-100"
+                class="flex items-center gap-2 px-5 py-2 bg-blue-600 hover:bg-blue-500 text-white text-[10px] md:text-xs font-black rounded-xl shadow-lg shadow-blue-900/20 transition-all uppercase tracking-widest active:scale-95 disabled:opacity-50 disabled:cursor-not-allowed disabled:active:scale-100"
                 @click="saveSequence"
               >
-                <FileBadge class="w-3.5 h-3.5" /> {{ locale.saveAndPublish }}
+                <FileBadge class="w-3.5 h-3.5" /> 保存并发布
               </button>
             </div>
           </div>
@@ -771,7 +445,7 @@
             ref="sequenceList"
             :class="[
               'sequence-list flex-1 border-2 border-dashed rounded-[2rem] p-2 md:p-3 min-h-[400px] transition-colors duration-200',
-              isSequenceOver ? 'border-primary bg-primary-5' : 'border-border-secondary-80 bg-bg-secondary-20'
+              isSequenceOver ? 'border-blue-500 bg-blue-500/5' : 'border-zinc-800/80 bg-zinc-900/20'
             ]"
             @dragleave="handleSequenceDragLeave"
             @dragover.prevent="handleDragOver"
@@ -780,10 +454,10 @@
           >
             <div
               v-if="localScheduledSongs.length === 0"
-              class="flex flex-col items-center justify-center h-full py-12 text-text-primary"
+              class="flex flex-col items-center justify-center h-full py-12 text-zinc-800"
             >
               <PlaySquare class="w-8 h-8 mb-4 opacity-20" />
-              <p class="text-[10px] font-black uppercase tracking-widest">{{ locale.addSongsHint }}</p>
+              <p class="text-[10px] font-black uppercase tracking-widest">请从待排库中添加歌曲</p>
             </div>
 
             <TransitionGroup class="space-y-2" name="schedule-list" tag="div">
@@ -791,15 +465,12 @@
                 v-for="(schedule, index) in localScheduledSongs"
                 :key="schedule.id"
                 :class="[
-                  'scheduled-song relative group bg-bg-secondary border border-border-secondary-50 rounded-xl p-3 hover:border-border-tertiary transition-all select-none',
-                  dragOverIndex === index ? 'border-t-2 border-t-primary' : '',
-                  schedule.isDraft ? 'border-warning-30 bg-warning-5' : '',
-                  schedule.song && (schedule.song.cardCodeId || schedule.song.usedCardCode)
-                    ? 'border-warning-30 bg-warning-5'
-                    : ''
+                  'scheduled-song relative group bg-zinc-900 border border-zinc-800/50 rounded-xl p-3 hover:border-zinc-700 transition-all select-none',
+                  dragOverIndex === index ? 'border-t-2 border-t-blue-500' : '',
+                  schedule.isDraft ? 'border-amber-500/30 bg-amber-500/5' : ''
                 ]"
                 :data-schedule-id="schedule.id"
-                :draggable="true"
+                draggable="true"
                 @dragend="dragEnd"
                 @dragleave="handleDragLeave"
                 @dragstart="dragScheduleStart($event, schedule)"
@@ -812,17 +483,17 @@
               >
                 <div class="flex items-center gap-3">
                   <div
-                    class="flex flex-col items-center justify-center w-10 h-10 rounded-lg bg-bg-primary-50 border border-border-secondary text-text-tertiary font-black text-xs flex-shrink-0"
+                    class="flex flex-col items-center justify-center w-10 h-10 rounded-lg bg-zinc-950/50 border border-zinc-800 text-zinc-500 font-black text-xs flex-shrink-0"
                   >
-                    <span class="text-[8px] text-text-disabled uppercase leading-none mb-0.5">{{ locale.positionShort }}</span>
-                    <span class="text-sm text-text-secondary leading-none">{{
+                    <span class="text-[8px] text-zinc-600 uppercase leading-none mb-0.5">POS</span>
+                    <span class="text-sm text-zinc-300 leading-none">{{
                       index + 1 < 10 ? '0' + (index + 1) : index + 1
                     }}</span>
                   </div>
 
                   <!-- 封面图片 -->
                   <div
-                    class="relative w-10 h-10 rounded-lg overflow-hidden bg-bg-tertiary flex-shrink-0 border border-border-tertiary-50 cursor-pointer hover:opacity-80 transition-opacity"
+                    class="relative w-10 h-10 rounded-lg overflow-hidden bg-zinc-800 flex-shrink-0 border border-zinc-700/50 cursor-pointer hover:opacity-80 transition-opacity"
                     @click.stop="playSong(schedule.song)"
                   >
                     <img
@@ -832,115 +503,71 @@
                       referrerpolicy="no-referrer"
                       loading="lazy"
                       alt=""
-                    />
+                    >
                     <div
                       v-else
-                      class="w-full h-full flex items-center justify-center text-text-disabled"
+                      class="w-full h-full flex items-center justify-center text-zinc-600"
                     >
                       <Music2 class="w-5 h-5 opacity-50" />
                     </div>
                   </div>
 
                   <div class="flex-1 min-w-0 flex flex-col gap-0.5">
-                    <div class="flex items-center gap-2 min-w-0">
-                      <h4 class="font-bold text-text-primary text-sm truncate min-w-0">
+                    <div class="flex items-center gap-2">
+                      <h4 class="font-bold text-zinc-200 text-sm truncate">
                         {{ schedule.song.title }}
                       </h4>
                       <button
                         v-if="schedule.song.hasSubmissionNote && schedule.song.submissionNote"
-                        class="inline-flex items-center justify-center w-5 h-5 rounded-full border border-primary-30 bg-primary-10 text-primary hover:bg-primary-20 transition-all flex-shrink-0"
-                        :title="locale.viewRemark"
-                        @click.stop="openSubmissionRemark(schedule.song, schedule.replayRequestId)"
+                        class="inline-flex items-center justify-center w-5 h-5 rounded-full border border-blue-500/30 bg-blue-500/10 text-blue-400 hover:bg-blue-500/20 transition-all flex-shrink-0"
+                        title="查看备注留言"
+                        @click.stop="openSubmissionRemark(schedule.song)"
                       >
                         <MessageSquare :size="12" />
                       </button>
-                      <span
-                        v-if="schedule.song.hasSubmissionNote && schedule.song.submissionNote"
-                        class="text-xs text-primary-80 truncate max-w-[150px] cursor-pointer hover:text-primary transition-colors"
-                        :title="locale.viewRemark"
-                        @click.stop="openSubmissionRemark(schedule.song, schedule.replayRequestId)"
-                      >
-                        {{
-                          schedule.song.submissionNote.length > 25
-                            ? schedule.song.submissionNote.substring(0, 25) + '...'
-                            : schedule.song.submissionNote
-                        }}
-                      </span>
                       <!-- 重播标识 -->
                       <span
-                        v-if="schedule.replayRequestId != null"
-                        class="px-1.5 py-0.5 rounded text-[9px] font-bold bg-primary-10 text-primary border border-primary-20 uppercase tracking-wider whitespace-nowrap flex-shrink-0 flex items-center gap-1"
-                        :title="locale.replaySong"
+                        v-if="schedule.song.replayRequestCount > 0"
+                        class="px-1.5 py-0.5 rounded text-[9px] font-bold bg-blue-500/10 text-blue-500 border border-blue-500/20 uppercase tracking-wider flex items-center gap-1"
+                        title="重播歌曲"
                       >
-                        <Icon name="repeat" :size="10" class-name="flex-shrink-0" />{{ locale.replay }}
+                        <Icon name="repeat" :size="10" />
+                        重播
                       </span>
                       <span
                         v-if="schedule.isDraft"
-                        class="px-1.5 py-0.5 rounded text-[9px] font-bold bg-warning-10 text-warning border border-warning-20 uppercase tracking-wider whitespace-nowrap flex-shrink-0"
-                        >{{ locale.draft }}</span
-                      >
-                      <!-- 点歌券徽章（已使用点歌券投稿的歌曲在排期中高亮显示） -->
-                      <span
-                        v-if="schedule.song.cardCodeId || schedule.song.usedCardCode"
-                        class="px-1.5 py-0.5 rounded text-[9px] font-bold bg-warning-10 text-warning border border-warning-20 uppercase tracking-wider whitespace-nowrap flex-shrink-0"
-                        :title="locale.cardPending"
-                      >
-                        {{ locale.cardCode }}
-                      </span>
-                    </div>
-                    <div class="text-xs text-text-tertiary truncate flex items-center gap-1.5">
-                      <span>{{ schedule.song.artist }}</span>
-                      <span
-                        v-if="schedule.song.durationSeconds && !editingDuration[schedule.song.id]"
-                        :class="[
-                          'shrink-0 px-1 rounded transition-colors cursor-pointer',
-                          durationRefreshStatus[schedule.song.id] === 'success'
-                            ? 'text-success bg-success-10'
-                            : durationRefreshStatus[schedule.song.id] === 'error'
-                              ? 'text-error bg-error-10'
-                              : 'text-text-disabled hover:text-text-secondary hover:bg-bg-quaternary'
-                        ]"
-                        :title="locale.messages?.editDuration || '点击编辑时长'"
-                        @click.stop="startEditDuration(schedule.song)"
-                      >{{ formatDuration(schedule.song.durationSeconds) }}</span>
-                      <input
-                        v-else-if="editingDuration[schedule.song.id]"
-                        ref="editingDurationInput"
-                        v-model="editingDurationValue"
-                        type="text"
-                        inputmode="text"
-                        pattern="[0-9:]*"
-                        class="w-20 text-[11px] font-mono text-center bg-bg-primary border border-primary rounded px-1 py-0.5 text-text-primary focus:outline-none focus:border-primary shrink-0"
-                        :placeholder="locale.messages?.durationInputPlaceholder || '分:秒'"
-                        @focusout="saveDurationEdit(schedule.song)"
-                        @keydown="handleDurationKeydown($event, schedule.song)"
+                        class="px-1.5 py-0.5 rounded text-[9px] font-bold bg-amber-500/10 text-amber-500 border border-amber-500/20 uppercase tracking-wider"
+                        >草稿</span
                       >
                     </div>
-                    <div class="text-[10px] text-text-tertiary truncate flex items-center gap-1">
+                    <div class="text-xs text-zinc-500 truncate">{{ schedule.song.artist }}</div>
+                    <div class="text-[10px] text-zinc-600 truncate flex items-center gap-1">
+                      <!-- 显示申请人或投稿人 -->
                       <span
-                        v-if="schedule.replayRequestId != null"
+                        v-if="schedule.song.replayRequestCount > 0"
                         :title="
-                          (locale.replayApplicants || '重播申请人：') +
+                          '重播申请人：' +
                           (schedule.song.replayRequesters || [])
                             .map((r) => r.displayName || r.name)
                             .join('、')
                         "
                       >
-                        {{ locale.applicant }}{{
+                        申请人:
+                        {{
                           (schedule.song.replayRequesters || [])
                             .slice(0, 2)
                             .map((r) => r.displayName || r.name)
                             .join('、')
                         }}{{
                           schedule.song.replayRequestCount > 2
-                            ? locale.andMoreApplicants(schedule.song.replayRequestCount)
+                            ? ' 等' + schedule.song.replayRequestCount + '人'
                             : ''
                         }}
                       </span>
                       <span v-else>{{ schedule.song.requester }}</span>
                       <span
                         v-if="schedule.song.requesterGrade || schedule.song.grade"
-                        class="text-text-disabled"
+                        class="text-zinc-700"
                         >|</span
                       >
                       <span v-if="schedule.song.requesterGrade || schedule.song.grade">
@@ -949,9 +576,9 @@
                       </span>
                       <span
                         v-if="schedule.song.preferredPlayTimeId"
-                        class="ml-1 px-1.5 py-0.5 bg-info-10 text-info rounded text-[9px] border border-info-20 whitespace-nowrap"
+                        class="ml-1 px-1.5 py-0.5 bg-indigo-500/10 text-indigo-400 rounded text-[9px] border border-indigo-500/20 whitespace-nowrap"
                       >
-                        {{ callLocale('preferredPlayTime', `期望: ${getPlayTimeName(schedule.song.preferredPlayTimeId)}`, getPlayTimeName(schedule.song.preferredPlayTimeId)) }}
+                        期望: {{ getPlayTimeName(schedule.song.preferredPlayTimeId) }}
                       </span>
                     </div>
                   </div>
@@ -959,8 +586,8 @@
                   <div class="flex items-center gap-2">
                     <button
                       v-if="schedule.isDraft"
-                      class="p-1.5 rounded-lg bg-success-10 hover:bg-success-20 text-success border border-success-20 transition-colors"
-                      :title="locale.publishThisDraft"
+                      class="p-1.5 rounded-lg bg-emerald-500/10 hover:bg-emerald-500/20 text-emerald-500 border border-emerald-500/20 transition-colors"
+                      title="发布此草稿"
                       @click="publishSingleDraft(schedule)"
                     >
                       <Send class="w-3.5 h-3.5" />
@@ -968,32 +595,17 @@
 
                     <!-- 移动端删除按钮 -->
                     <button
-                      class="lg:hidden p-2 rounded-full bg-error-20 text-error hover:bg-error-30 active:scale-95 transition-all flex-shrink-0 flex items-center justify-center"
+                      class="lg:hidden p-2 rounded-full bg-red-500/20 text-red-500 hover:bg-red-500/30 active:scale-95 transition-all flex-shrink-0"
                       @click.stop="removeSongFromSchedule(schedule)"
                     >
                       <Minus class="w-5 h-5" />
                     </button>
 
-                    <!-- 刷新时长按钮 -->
-                    <button
-                      class="p-1.5 rounded-lg bg-bg-primary border border-border-secondary text-text-disabled hover:text-primary hover:border-primary-30 transition-all duration-200"
-                      :class="{
-                        'bg-primary-10 border-primary-30 text-primary shadow-[0_0_0_3px_var(--primary-glow)]': refreshingDuration[schedule.song.id]
-                      }"
-                      :title="locale.refreshDuration"
-                      :disabled="refreshingDuration[schedule.song.id]"
-                      @click.stop="refreshDuration(schedule.song)"
-                    >
-                      <RefreshCcw class="w-3.5 h-3.5" :class="{ 'animate-spin': refreshingDuration[schedule.song.id] }" />
-                    </button>
-
-                    <button
-                      type="button"
-                      class="p-1.5 rounded-lg bg-bg-primary border border-border-secondary text-text-disabled hover:text-text-tertiary transition-colors"
-                      @click="openContextMenu($event, 'right', schedule)"
+                    <div
+                      class="p-1.5 rounded-lg bg-zinc-950 border border-zinc-800 text-zinc-600 cursor-grab active:cursor-grabbing hover:text-zinc-400 transition-colors"
                     >
                       <MoreVertical class="w-4 h-4" />
-                    </button>
+                    </div>
                   </div>
                 </div>
               </div>
@@ -1004,94 +616,70 @@
 
       <!-- 移动端底部操作栏 -->
       <div
-        class="lg:hidden fixed bottom-0 left-0 right-0 z-40 p-3 bg-bg-primary-90 backdrop-blur-xl border-t border-border-secondary flex items-center gap-3 pb-6"
+        class="lg:hidden fixed bottom-0 left-0 right-0 z-40 p-3 bg-zinc-950/90 backdrop-blur-xl border-t border-zinc-800 flex items-center gap-3 pb-6"
       >
-        <div class="w-[148px] overflow-x-auto scrollbar-hide">
+        <div class="w-[240px] overflow-x-auto scrollbar-hide">
           <div class="flex items-center gap-2 w-max">
             <button
-              class="w-11 h-11 shrink-0 bg-bg-secondary border border-border-secondary text-text-tertiary rounded-xl flex items-center justify-center active:scale-95 transition-all"
+              class="w-11 h-11 shrink-0 bg-zinc-900 border border-zinc-800 text-zinc-400 rounded-xl flex items-center justify-center active:scale-95 transition-all"
               @click="openDownloadDialog"
             >
               <Download class="w-5 h-5" />
             </button>
             <button
-              class="w-11 h-11 shrink-0 bg-bg-secondary border border-border-secondary text-text-tertiary rounded-xl flex items-center justify-center active:scale-95 transition-all"
+              class="w-11 h-11 shrink-0 bg-zinc-900 border border-zinc-800 text-zinc-400 rounded-xl flex items-center justify-center active:scale-95 transition-all"
+              @click="showCardGenerator = true"
+            >
+              <ImageIcon class="w-5 h-5" />
+            </button>
+            <button
+              class="w-11 h-11 shrink-0 bg-zinc-900 border border-zinc-800 text-zinc-400 rounded-xl flex items-center justify-center active:scale-95 transition-all"
               @click="saveDraft"
             >
               <Save class="w-5 h-5" />
             </button>
             <button
-              class="w-11 h-11 shrink-0 bg-bg-secondary border border-border-secondary text-success rounded-xl flex items-center justify-center active:scale-95 transition-all"
+              class="w-11 h-11 shrink-0 bg-zinc-900 border border-zinc-800 text-emerald-500 rounded-xl flex items-center justify-center active:scale-95 transition-all"
               @click="markAllAsPlayed"
             >
               <CheckCircle2 class="w-5 h-5" />
             </button>
             <button
-              class="w-11 h-11 shrink-0 bg-bg-secondary border border-border-secondary text-info rounded-xl flex items-center justify-center active:scale-95 transition-all"
+              class="w-11 h-11 shrink-0 bg-zinc-900 border border-zinc-800 text-purple-400 rounded-xl flex items-center justify-center active:scale-95 transition-all"
               @click="openMoveDateDialog"
             >
               <ArrowRight class="w-5 h-5" />
             </button>
             <button
-              class="w-11 h-11 shrink-0 bg-bg-secondary border border-border-secondary text-primary rounded-xl flex items-center justify-center active:scale-95 transition-all"
-              @click="openCopyDateDialog"
-            >
-              <Copy class="w-5 h-5" />
-            </button>
-            <button
-              class="w-11 h-11 shrink-0 bg-bg-secondary border border-border-secondary text-error rounded-xl flex items-center justify-center active:scale-95 transition-all disabled:opacity-50 disabled:cursor-not-allowed"
-              :disabled="localScheduledSongs.length === 0"
-              @click="clearScheduleList"
-            >
-              <Trash2 class="w-5 h-5" />
-            </button>
-            <button
-              class="w-11 h-11 shrink-0 bg-bg-secondary border border-border-secondary text-info rounded-xl flex items-center justify-center active:scale-95 transition-all disabled:opacity-40 disabled:cursor-not-allowed"
-              v-if="activeTab === 'normal' || activeTab === 'all' || activeTab === 'replay'"
-              :disabled="filteredUnscheduledSongs.filter((song) => !poolSongIds.has(song.id)).length === 0"
-              :title="locale.addCurrentPage"
-              @click="moveAllToPool"
-            >
-              <FolderPlus class="w-5 h-5" />
-            </button>
-            <button
-              class="w-11 h-11 shrink-0 bg-bg-secondary border border-border-secondary text-primary rounded-xl flex items-center justify-center active:scale-95 transition-all disabled:opacity-50 disabled:cursor-not-allowed"
-              :disabled="!canPublish"
-              :title="locale.publishOnly"
+              class="w-11 h-11 shrink-0 bg-zinc-900 border border-zinc-800 text-blue-500 rounded-xl flex items-center justify-center active:scale-95 transition-all"
+              title="仅发布排期"
               @click="publishSchedule"
             >
               <Send class="w-5 h-5" />
             </button>
-            <button
-              class="w-11 h-11 shrink-0 bg-bg-secondary border border-border-secondary text-primary rounded-xl flex items-center justify-center active:scale-95 transition-all disabled:opacity-50 disabled:cursor-not-allowed"
-              :disabled="refreshingAllDurations.running"
-              :title="refreshingAllDurations.running ? `${locale.refreshPageDurations} (${refreshingAllDurations.progress})` : locale.refreshPageDurations"
-              @click="refreshAllDurations"
-            >
-              <RefreshCcw class="w-5 h-5" :class="{ 'animate-spin': refreshingAllDurations.running }" />
-            </button>
-            <button
-              class="w-11 h-11 shrink-0 bg-bg-secondary border border-border-secondary text-primary rounded-xl flex items-center justify-center active:scale-95 transition-all"
-              :title="locale.autoSchedule"
-              @click="openAutoScheduleDialog"
-            >
-              <Sparkles class="w-5 h-5" />
-            </button>
           </div>
         </div>
 
         <!-- 主要操作 -->
         <button
           :disabled="!hasChanges"
-          class="flex-1 py-3 bg-primary-hover hover:bg-primary text-text-primary text-xs font-black uppercase tracking-widest rounded-xl shadow-lg shadow-[var(--primary-glow)] transition-all active:scale-95 disabled:opacity-50 disabled:cursor-not-allowed flex items-center justify-center gap-2"
+          class="flex-1 py-3 bg-blue-600 hover:bg-blue-500 text-white text-xs font-black uppercase tracking-widest rounded-xl shadow-lg shadow-blue-900/20 transition-all active:scale-95 disabled:opacity-50 disabled:cursor-not-allowed flex items-center justify-center gap-2"
           @click="saveSequence"
         >
-          <FileBadge class="w-4 h-4" /> {{ locale.saveAndPublish }}
+          <FileBadge class="w-4 h-4" /> 保存并发布
         </button>
       </div>
     </div>
   </div>
 
+  <!-- 歌单图片生成器 -->
+  <PlaylistCardGenerator
+    :show="showCardGenerator"
+    :songs="localScheduledSongs"
+    :default-title="selectedDate + ' 校园广播歌单'"
+    @close="showCardGenerator = false"
+  />
+
   <!-- 确认对话框 -->
   <ConfirmDialog
     :confirm-text="confirmDialogConfirmText"
@@ -1100,7 +688,7 @@
     :show="showConfirmDialog"
     :title="confirmDialogTitle"
     :type="confirmDialogType"
-    :cancel-text="locale.cancel"
+    cancel-text="取消"
     @close="showConfirmDialog = false"
     @confirm="handleConfirm"
   />
@@ -1114,175 +702,40 @@
 
   <div
     v-if="showMoveDateDialog"
-    class="fixed inset-0 z-50 flex items-center justify-center bg-bg-primary-60 backdrop-blur-sm"
+    class="fixed inset-0 z-50 flex items-center justify-center bg-black/60 backdrop-blur-sm"
   >
     <div
-      class="bg-bg-secondary border border-border-secondary rounded-xl shadow-2xl w-full max-w-sm overflow-hidden"
+      class="bg-zinc-900 border border-zinc-800 rounded-xl shadow-2xl w-full max-w-sm overflow-hidden"
       @click.stop
     >
-      <div class="flex items-center justify-between p-4 border-b border-border-secondary">
-        <h3 class="text-sm font-black text-text-primary uppercase tracking-widest">{{ locale.moveDateTitle }}</h3>
+      <div class="flex items-center justify-between p-4 border-b border-zinc-800">
+        <h3 class="text-sm font-black text-zinc-100 uppercase tracking-widest">迁移排期日期</h3>
         <button
-          class="text-text-tertiary hover:text-text-secondary transition-colors"
+          class="text-zinc-500 hover:text-zinc-300 transition-colors"
           @click="showMoveDateDialog = false"
         >
           <CloseIcon class="w-5 h-5" />
         </button>
       </div>
       <div class="p-6 space-y-4">
-          <div class="text-xs text-text-tertiary">{{ locale.currentDate(selectedDate) }}</div>
+        <div class="text-xs text-zinc-500">当前日期：{{ selectedDate }}</div>
         <input
           v-model="moveTargetDate"
-          class="w-full bg-bg-primary border border-border-secondary rounded-xl px-4 py-3 text-text-primary focus:outline-none focus:border-info transition-colors"
+          class="w-full bg-zinc-950 border border-zinc-800 rounded-xl px-4 py-3 text-zinc-200 focus:outline-none focus:border-purple-500 transition-colors"
           type="date"
-        />
+        >
         <div class="flex gap-3">
           <button
-            class="flex-1 py-3 bg-bg-tertiary hover:bg-bg-quaternary text-text-secondary text-xs font-bold rounded-xl transition-colors uppercase tracking-wider"
+            class="flex-1 py-3 bg-zinc-800 hover:bg-zinc-700 text-zinc-300 text-xs font-bold rounded-xl transition-colors uppercase tracking-wider"
             @click="showMoveDateDialog = false"
           >
-          {{ locale.cancel }}
+            取消
           </button>
           <button
-            class="flex-1 py-3 bg-info hover:bg-info text-text-primary text-xs font-bold rounded-xl shadow-lg shadow-[var(--info-glow-20)] transition-colors uppercase tracking-wider"
+            class="flex-1 py-3 bg-purple-600 hover:bg-purple-500 text-white text-xs font-bold rounded-xl shadow-lg shadow-purple-900/20 transition-colors uppercase tracking-wider"
             @click="confirmMoveDate"
           >
-          {{ locale.nextStep }}
-          </button>
-        </div>
-      </div>
-    </div>
-  </div>
-
-  <div
-    v-if="showCopyDateDialog"
-    class="fixed inset-0 z-50 flex items-center justify-center bg-bg-primary-60 backdrop-blur-sm"
-  >
-    <div
-      class="bg-bg-secondary border border-border-secondary rounded-xl shadow-2xl w-full max-w-sm overflow-hidden"
-      @click.stop
-    >
-      <div class="flex items-center justify-between p-4 border-b border-border-secondary">
-        <h3 class="text-sm font-black text-text-primary uppercase tracking-widest">{{ locale.copyDateTitle }}</h3>
-        <button
-          class="text-text-tertiary hover:text-text-secondary transition-colors"
-          @click="showCopyDateDialog = false"
-        >
-          <CloseIcon class="w-5 h-5" />
-        </button>
-      </div>
-      <div class="p-4 space-y-3">
-        <!-- 复制方式选择器 -->
-        <div class="flex items-center gap-2 p-1 bg-bg-primary border border-border-secondary rounded-xl">
-          <button
-            :class="[
-              'flex-1 py-2 rounded-lg text-[11px] font-black uppercase tracking-widest transition-all border',
-              copyMode === 'single'
-                ? 'bg-primary-hover border-primary text-text-primary shadow-md shadow-[var(--primary-glow)]'
-                : 'border-transparent text-text-tertiary hover:text-text-secondary'
-            ]"
-            @click="switchCopyMode('single')"
-          >
-            {{ locale.singleDayCopy }}
-          </button>
-          <button
-            :class="[
-              'flex-1 py-2 rounded-lg text-[11px] font-black uppercase tracking-widest transition-all border',
-              copyMode === 'cycle'
-                ? 'bg-primary-hover border-primary text-text-primary shadow-md shadow-[var(--primary-glow)]'
-                : 'border-transparent text-text-tertiary hover:text-text-secondary'
-            ]"
-            @click="switchCopyMode('cycle')"
-          >
-            {{ locale.cycleCopy }}
-          </button>
-        </div>
-
-        <!-- 源日期 -->
-        <div>
-          <div class="text-[10px] font-bold uppercase tracking-widest text-text-secondary mb-2">
-            {{ copyMode === 'single' ? locale.cycleCopySourceDate : locale.copyDateSourceRange }}
-          </div>
-          <!-- 单天模式：只显示一个源日期 -->
-          <div v-if="copyMode === 'single'" class="space-y-1.5">
-            <div class="gap-3 flex items-center">
-              <span class="text-[9px] text-text-disabled w-16 shrink-0 uppercase tracking-wider">{{ locale.copyDateRangeStart }}</span>
-              <input
-                v-model="copyFromStart"
-                class="flex-1 bg-bg-primary border border-border-secondary rounded-xl px-3 py-2.5 text-text-primary focus:outline-none focus:border-primary transition-colors"
-                type="date"
-              />
-            </div>
-          </div>
-          <!-- 周期模式：显示源日期范围 -->
-          <div v-else class="space-y-1.5">
-            <div class="gap-3 flex items-center">
-              <span class="text-[9px] text-text-disabled w-16 shrink-0 uppercase tracking-wider">{{ locale.copyDateRangeStart }}</span>
-              <input
-                v-model="copyFromStart"
-                class="flex-1 bg-bg-primary border border-border-secondary rounded-xl px-3 py-2.5 text-text-primary focus:outline-none focus:border-primary transition-colors"
-                type="date"
-              />
-            </div>
-            <div class="gap-3 flex items-center">
-              <span class="text-[9px] text-text-disabled w-16 shrink-0 uppercase tracking-wider">{{ locale.copyDateRangeEnd }}</span>
-              <input
-                v-model="copyFromEnd"
-                class="flex-1 bg-bg-primary border border-border-secondary rounded-xl px-3 py-2.5 text-text-primary focus:outline-none focus:border-primary transition-colors"
-                type="date"
-              />
-            </div>
-          </div>
-        </div>
-
-        <!-- 目标日期 -->
-        <div>
-          <div class="text-[10px] font-bold uppercase tracking-widest text-text-secondary mb-2">
-            {{ locale.copyDateTargetRange }}
-          </div>
-          <!-- 单天模式：只显示一个目标日期 -->
-          <div v-if="copyMode === 'single'" class="space-y-1.5">
-            <div class="gap-3 flex items-center">
-              <span class="text-[9px] text-text-disabled w-16 shrink-0 uppercase tracking-wider">{{ locale.cycleCopyTargetSingleDate }}</span>
-              <input
-                v-model="copySingleTargetDate"
-                class="flex-1 bg-bg-primary border border-border-secondary rounded-xl px-3 py-2.5 text-text-primary focus:outline-none focus:border-primary transition-colors"
-                type="date"
-              />
-            </div>
-          </div>
-          <!-- 周期模式：显示目标日期范围 -->
-          <div v-else class="space-y-1.5">
-            <div class="gap-3 flex items-center">
-              <span class="text-[9px] text-text-disabled w-16 shrink-0 uppercase tracking-wider">{{ locale.cycleCopyTargetStart }}</span>
-              <input
-                v-model="copyToStart"
-                class="flex-1 bg-bg-primary border border-border-secondary rounded-xl px-3 py-2.5 text-text-primary focus:outline-none focus:border-primary transition-colors"
-                type="date"
-              />
-            </div>
-            <div class="gap-3 flex items-center">
-              <span class="text-[9px] text-text-disabled w-16 shrink-0 uppercase tracking-wider">{{ locale.cycleCopyTargetEnd }}</span>
-              <input
-                v-model="copyToEnd"
-                class="flex-1 bg-bg-primary border border-border-secondary rounded-xl px-3 py-2.5 text-text-primary focus:outline-none focus:border-primary transition-colors"
-                type="date"
-              />
-            </div>
-          </div>
-        </div>
-        <div class="flex gap-3">
-          <button
-            class="flex-1 py-3 bg-bg-tertiary hover:bg-bg-quaternary text-text-secondary text-xs font-bold rounded-xl transition-colors uppercase tracking-wider"
-            @click="showCopyDateDialog = false"
-          >
-            {{ locale.cancel }}
-          </button>
-          <button
-            class="flex-1 py-3 bg-primary-hover hover:bg-primary text-text-primary text-xs font-bold rounded-xl shadow-lg shadow-[var(--primary-glow)] transition-colors uppercase tracking-wider"
-            @click="confirmCopyDate"
-          >
-            {{ locale.nextStep }}
+            下一步
           </button>
         </div>
       </div>
@@ -1292,26 +745,29 @@
   <!-- 重播申请详情弹窗 -->
   <div
     v-if="showReplayModal"
-    class="fixed inset-0 z-50 flex items-center justify-center bg-bg-primary-60 backdrop-blur-sm"
+    class="fixed inset-0 z-50 flex items-center justify-center bg-black/60 backdrop-blur-sm"
     @click="closeReplayModal"
   >
     <div
-      class="bg-bg-secondary border border-border-secondary rounded-2xl shadow-2xl w-full max-w-md overflow-hidden"
+      class="bg-zinc-900 border border-zinc-800 rounded-2xl shadow-2xl w-full max-w-md overflow-hidden"
       @click.stop
     >
-      <div class="flex items-center justify-between p-4 border-b border-border-secondary">
-        <h3 class="text-sm font-black text-text-primary uppercase tracking-widest">
-        {{ locale.replayDetailTitle(replayModalTitle) }}
+      <div class="flex items-center justify-between p-4 border-b border-zinc-800">
+        <h3 class="text-sm font-black text-zinc-100 uppercase tracking-widest">
+          {{ replayModalTitle }} - 重播申请详情
         </h3>
         <div class="flex items-center gap-3">
           <button
-            class="px-3 py-1.5 bg-error-10 hover:bg-error-20 text-error border border-error-20 rounded-lg text-xs font-bold transition-colors"
-            @click="(rejectReplayRequest(replayModalSongId), closeReplayModal())"
+            class="px-3 py-1.5 bg-red-500/10 hover:bg-red-500/20 text-red-500 border border-red-500/20 rounded-lg text-xs font-bold transition-colors"
+            @click="
+              rejectReplayRequest(replayModalSongId);
+              closeReplayModal()
+            "
           >
-          {{ locale.rejectRequest }}
+            拒绝申请
           </button>
           <button
-            class="text-text-tertiary hover:text-text-secondary transition-colors"
+            class="text-zinc-500 hover:text-zinc-300 transition-colors"
             @click="closeReplayModal"
           >
             <CloseIcon class="w-5 h-5" />
@@ -1319,7 +775,7 @@
         </div>
       </div>
       <div class="p-0 overflow-y-auto max-h-[60vh]">
-        <div class="divide-y divide-panel-bg-dark-50">
+        <div class="divide-y divide-zinc-800/50">
           <div
             v-for="(req, idx) in replayModalRequests"
             :key="idx"
@@ -1327,27 +783,27 @@
           >
             <div class="flex items-center gap-3">
               <div
-                class="w-8 h-8 rounded-lg bg-bg-secondary border border-border-secondary flex items-center justify-center text-text-tertiary group-hover:text-primary transition-colors"
+                class="w-8 h-8 rounded-lg bg-zinc-900 border border-zinc-800 flex items-center justify-center text-zinc-500 group-hover:text-blue-400 transition-colors"
               >
                 <User class="w-3.5 h-3.5" />
               </div>
               <div class="flex flex-col">
-                <span class="text-sm font-bold text-text-primary">{{ req.name }}</span>
-                <span v-if="req.grade" class="text-[10px] text-text-tertiary"
+                <span class="text-sm font-bold text-zinc-200">{{ req.name }}</span>
+                <span v-if="req.grade" class="text-[10px] text-zinc-500"
                   >{{ req.grade }}{{ req.class ? ` ${req.class}` : '' }}</span
                 >
               </div>
             </div>
             <div
-              class="flex items-center gap-1.5 text-[10px] font-black text-text-disabled uppercase tracking-widest"
+              class="flex items-center gap-1.5 text-[10px] font-black text-zinc-600 uppercase tracking-widest"
             >
               <Clock class="w-2.5 h-2.5" />
               {{ formatDate(req.createdAt) }}
             </div>
           </div>
-          <div v-if="replayModalRequests.length === 0" class="py-10 text-center text-text-secondary">
+          <div v-if="replayModalRequests.length === 0" class="py-10 text-center text-zinc-700">
             <Info class="w-6 h-6 mx-auto mb-2 opacity-20" />
-        <p class="text-xs font-bold uppercase tracking-widest">{{ locale.noReplayDetails }}</p>
+            <p class="text-xs font-bold uppercase tracking-widest">暂无详细申请记录</p>
           </div>
         </div>
       </div>
@@ -1359,457 +815,11 @@
     :song-title="submissionRemarkDialog.songTitle"
     :content="submissionRemarkDialog.content"
     :is-public="submissionRemarkDialog.isPublic"
-    :is-updating-public="submissionRemarkDialog.isUpdatingPublic"
-    :note-status="submissionRemarkDialog.status"
     @close="submissionRemarkDialog.show = false"
-    @update:is-public="updateSubmissionNotePublic"
-    @approve="updateSubmissionNotePublicStatus('approved')"
-    @reject="updateSubmissionNotePublicStatus('rejected')"
   />
-
-  <SchedulePlaylistFilterModal
-    :show="showPlaylistFilterModal"
-    @update:show="showPlaylistFilterModal = $event"
-    @apply="handlePlaylistFilterApply"
-  />
-
-  <!-- 自动排期弹窗 -->
-  <div
-    v-if="showAutoScheduleDialog"
-    class="fixed inset-0 z-50 flex items-center justify-center bg-bg-primary-60 backdrop-blur-sm"
-  >
-    <div
-      class="bg-bg-secondary border border-border-secondary rounded-2xl shadow-2xl w-full max-w-lg overflow-hidden mx-4"
-      @click.stop
-    >
-      <div class="flex items-center justify-between p-4 border-b border-border-secondary">
-        <h3 class="text-sm font-black text-text-primary uppercase tracking-widest">{{ locale.autoScheduleTitle }}</h3>
-        <button
-          class="text-text-tertiary hover:text-text-secondary transition-colors"
-          @click="closeAutoScheduleDialog"
-        >
-          <CloseIcon class="w-5 h-5" />
-        </button>
-      </div>
-
-      <div class="p-5 space-y-4">
-        <!-- 输入区 -->
-        <div v-if="!autoScheduleResult.songs.length" class="space-y-4">
-          <div>
-            <label class="block text-xs font-bold text-text-secondary uppercase tracking-wider mb-1.5">{{ locale.targetDuration }}</label>
-            <div class="flex gap-2">
-              <input
-                v-model.number="autoScheduleTargetMinutes"
-                type="number"
-                min="1"
-                :placeholder="locale.targetDurationPlaceholder"
-                class="flex-1 bg-bg-primary border border-border-secondary rounded-xl px-4 py-2.5 text-text-primary focus:outline-none focus:border-primary transition-colors"
-                @keydown.enter="runAutoSchedule"
-              />
-              <span class="flex items-center text-xs text-text-disabled px-1">min</span>
-            </div>
-          </div>
-
-          <div>
-            <label class="block text-xs font-bold text-text-secondary uppercase tracking-wider mb-1.5">{{ locale.targetSongCount }}</label>
-            <div class="flex gap-2">
-              <input
-                v-model.number="autoScheduleTargetSongCount"
-                type="number"
-                min="1"
-                step="1"
-                :placeholder="locale.targetSongCountPlaceholder"
-                class="flex-1 bg-bg-primary border border-border-secondary rounded-xl px-4 py-2.5 text-text-primary focus:outline-none focus:border-primary transition-colors"
-                @keydown.enter="runAutoSchedule"
-              />
-              <span class="flex items-center text-xs text-text-disabled px-1">{{ locale.songCountUnit }}</span>
-            </div>
-          </div>
-
-          <div>
-            <label class="block text-xs font-bold text-text-secondary uppercase tracking-wider mb-1.5">{{ locale.targetRequesterCount }}</label>
-            <div class="flex gap-2">
-              <input
-                v-model.number="autoScheduleTargetRequesterCount"
-                type="number"
-                min="1"
-                step="1"
-                :placeholder="locale.targetRequesterCountPlaceholder"
-                class="flex-1 bg-bg-primary border border-border-secondary rounded-xl px-4 py-2.5 text-text-primary focus:outline-none focus:border-primary transition-colors"
-                @keydown.enter="runAutoSchedule"
-              />
-              <span class="flex items-center text-xs text-text-disabled px-1">{{ locale.requesterCountUnit }}</span>
-            </div>
-          </div>
-
-          <!-- 工具栏 -->
-          <div class="flex items-center gap-2 p-2 bg-bg-secondary-50 border border-border-secondary rounded-xl">
-            <div class="flex items-center gap-2 flex-1">
-              <Lock class="w-3.5 h-3.5 text-text-tertiary shrink-0" />
-              <span class="text-[10px] font-bold text-text-secondary uppercase tracking-wider shrink-0">
-                {{ locale.fixExistingSelected }}
-              </span>
-              <button
-                class="relative inline-flex items-center w-10 h-6 rounded-full transition-colors shrink-0"
-                :class="autoScheduleFixExisting ? 'bg-primary' : 'bg-bg-tertiary'"
-                @click="autoScheduleFixExisting = !autoScheduleFixExisting"
-              >
-                <span
-                  class="absolute top-0.5 w-5 h-5 bg-white rounded-full shadow transition-transform"
-                  :class="autoScheduleFixExisting ? 'translate-x-4' : 'translate-x-0.5'"
-                />
-              </button>
-              <span
-                v-if="autoScheduleFixExisting && autoScheduleScheduledSeconds > 0"
-                class="text-[10px] font-bold text-primary"
-              >
-                {{ locale.fixExistingCount(localScheduledSongs.length) }} ·
-                {{ locale.fixExistingRemaining(autoScheduleTargetMinutes || 0, autoScheduleScheduledSeconds) }}
-              </span>
-              <span v-else-if="autoScheduleFixExisting && localScheduledSongs.length === 0" class="text-[10px] text-text-disabled">
-                {{ locale.fixExistingNone }}
-              </span>
-            </div>
-            <button
-              :disabled="refreshingAutoCandidates.running"
-              class="inline-flex items-center justify-center gap-1.5 px-3 py-1.5 text-[10px] font-bold border border-border-secondary text-text-tertiary hover:text-primary hover:border-primary-30 rounded-lg transition-all uppercase tracking-wider disabled:opacity-50 disabled:cursor-not-allowed shrink-0"
-              :title="locale.refreshCandidateDurations"
-              @click="refreshAutoCandidateDurations"
-            >
-              <RefreshCcw class="w-3.5 h-3.5" :class="{ 'animate-spin': refreshingAutoCandidates.running }" />
-              {{ locale.refreshCandidateDurations }}
-              <span v-if="refreshingAutoCandidates.running" class="text-text-disabled ml-1">
-                {{ refreshingAutoCandidates.progress }}
-              </span>
-            </button>
-          </div>
-
-          <div>
-            <label class="block text-xs font-bold text-text-secondary uppercase tracking-wider mb-1.5">{{ locale.scheduleDirection }}</label>
-            <div class="flex gap-2">
-              <button
-                :class="[
-                  'flex-1 py-2.5 rounded-xl text-xs font-bold border transition-all uppercase tracking-wider',
-                  autoScheduleDirection === 'under'
-                    ? 'bg-primary-10 border-primary-30 text-primary'
-                    : 'bg-bg-primary border-border-secondary text-text-secondary hover:border-border-tertiary'
-                ]"
-                @click="autoScheduleDirection = 'under'"
-              >
-                {{ locale.directionUnder }}
-              </button>
-              <button
-                :class="[
-                  'flex-1 py-2.5 rounded-xl text-xs font-bold border transition-all uppercase tracking-wider',
-                  autoScheduleDirection === 'middle'
-                    ? 'bg-primary-10 border-primary-30 text-primary'
-                    : 'bg-bg-primary border-border-secondary text-text-secondary hover:border-border-tertiary'
-                ]"
-                @click="autoScheduleDirection = 'middle'"
-              >
-                {{ locale.directionMiddle }}
-              </button>
-              <button
-                :class="[
-                  'flex-1 py-2.5 rounded-xl text-xs font-bold border transition-all uppercase tracking-wider',
-                  autoScheduleDirection === 'over'
-                    ? 'bg-primary-10 border-primary-30 text-primary'
-                    : 'bg-bg-primary border-border-secondary text-text-secondary hover:border-border-tertiary'
-                ]"
-                @click="autoScheduleDirection = 'over'"
-              >
-                {{ locale.directionOver }}
-              </button>
-            </div>
-          </div>
-
-          <div>
-            <label class="block text-xs font-bold text-text-secondary uppercase tracking-wider mb-1.5">{{ locale.scheduleAlgorithm }}</label>
-            <div class="flex gap-2">
-              <button
-                :class="[
-                  'flex-1 py-2.5 rounded-xl text-xs font-bold border transition-all uppercase tracking-wider',
-                  autoScheduleAlgorithm === 'auto'
-                    ? 'bg-primary-10 border-primary-30 text-primary'
-                    : 'bg-bg-primary border-border-secondary text-text-secondary hover:border-border-tertiary'
-                ]"
-                @click="autoScheduleAlgorithm = 'auto'"
-              >
-                {{ locale.algorithmAuto }}
-              </button>
-              <button
-                :class="[
-                  'flex-1 py-2.5 rounded-xl text-xs font-bold border transition-all uppercase tracking-wider',
-                  autoScheduleAlgorithm === 'greedy'
-                    ? 'bg-primary-10 border-primary-30 text-primary'
-                    : 'bg-bg-primary border-border-secondary text-text-secondary hover:border-border-tertiary'
-                ]"
-                @click="autoScheduleAlgorithm = 'greedy'"
-              >
-                {{ locale.algorithmGreedy }}
-              </button>
-              <button
-                :class="[
-                  'flex-1 py-2.5 rounded-xl text-xs font-bold border transition-all uppercase tracking-wider',
-                  autoScheduleAlgorithm === 'exhaustive'
-                    ? 'bg-primary-10 border-primary-30 text-primary'
-                    : 'bg-bg-primary border-border-secondary text-text-secondary hover:border-border-tertiary'
-                ]"
-                @click="autoScheduleAlgorithm = 'exhaustive'"
-              >
-                {{ locale.algorithmExhaustive }}
-              </button>
-            </div>
-          </div>
-
-          <div class="text-[11px] text-text-disabled">
-            {{ locale.availableCount(autoScheduleCandidates.length) }}
-          </div>
-
-          <div class="flex gap-2">
-            <button
-              class="flex-1 py-3 bg-bg-tertiary hover:bg-bg-quaternary text-text-secondary text-xs font-bold rounded-xl transition-colors uppercase tracking-wider"
-              @click="closeAutoScheduleDialog"
-            >
-              {{ locale.cancel }}
-            </button>
-            <button
-              :disabled="!autoScheduleTargetMinutes || autoScheduleTargetMinutes <= 0 || autoScheduleCandidates.length === 0"
-              class="flex-1 py-3 bg-primary-hover hover:bg-primary text-text-primary text-xs font-black rounded-xl shadow-lg shadow-[var(--primary-glow)] transition-all uppercase tracking-widest disabled:opacity-50 disabled:cursor-not-allowed flex items-center justify-center gap-2"
-              @click="runAutoSchedule"
-            >
-              <Sparkles class="w-3.5 h-3.5" />
-              {{ locale.autoScheduleRun }}
-            </button>
-          </div>
-        </div>
-
-        <!-- 结果区 -->
-        <div v-else class="space-y-3">
-          <div class="flex items-center justify-between px-1">
-            <div class="flex items-center gap-2">
-              <Sparkles class="w-4 h-4 text-primary" />
-              <span class="text-xs font-bold text-text-primary">{{ locale.resultTitle }}</span>
-            </div>
-            <div class="flex items-center gap-3">
-              <span class="text-[11px] text-text-tertiary">
-                {{ locale.totalDuration }}
-              </span>
-              <span class="text-sm font-black text-primary">
-                {{ formatDuration(autoScheduleResult.totalDuration) }}
-              </span>
-            </div>
-          </div>
-
-          <div
-            :class="[
-              'px-3 py-2 rounded-lg text-[11px] font-bold border',
-              autoScheduleResult.diff <= 0
-                ? 'bg-info-10 border-info-20 text-info'
-                : 'bg-warning-10 border-warning-20 text-warning'
-            ]"
-          >
-            {{ autoScheduleResult.diff <= 0
-              ? locale.resultUnderTarget(autoScheduleResult.absDiff)
-              : locale.resultOverTarget(autoScheduleResult.absDiff)
-            }}
-          </div>
-
-          <div class="space-y-2 max-h-[36vh] overflow-y-auto scrollbar-hide">
-            <div
-              v-for="(song, idx) in autoScheduleResult.songs"
-              :key="song.id"
-              class="flex items-center gap-3 p-2.5 bg-bg-primary border border-border-secondary-50 rounded-lg"
-            >
-              <span class="text-[10px] font-bold text-text-disabled w-5 shrink-0">{{ idx + 1 < 10 ? '0' + (idx + 1) : idx + 1 }}</span>
-              <div
-                class="relative w-10 h-10 rounded-lg overflow-hidden bg-bg-tertiary flex-shrink-0 border border-border-tertiary-50"
-              >
-                <img
-                  v-if="song.cover"
-                  :src="convertToHttps(song.cover)"
-                  class="w-full h-full object-cover"
-                  referrerpolicy="no-referrer"
-                  loading="lazy"
-                  alt=""
-                />
-                <div
-                  v-else
-                  class="w-full h-full flex items-center justify-center text-text-disabled"
-                >
-                  <Music2 class="w-5 h-5 opacity-50" />
-                </div>
-              </div>
-              <div class="flex-1 min-w-0 flex flex-col gap-0.5">
-                <span class="text-sm font-bold text-text-primary truncate flex items-center gap-1.5">
-                  <span>{{ song.title }}</span>
-                  <span
-                    v-if="song.isFixed"
-                    class="inline-flex items-center gap-0.5 px-1 py-0.5 bg-primary-10 text-primary rounded text-[9px] font-bold border border-primary-20 shrink-0"
-                  >
-                    <Lock class="w-2.5 h-2.5" />
-                    固定
-                  </span>
-                </span>
-                <span class="text-xs text-text-tertiary truncate flex items-center gap-1.5">
-                  <span>{{ song.artist }}</span>
-                  <span
-                    v-if="song.durationSeconds && !editingDuration[song.id]"
-                    class="text-text-disabled hover:text-text-secondary hover:bg-bg-quaternary cursor-pointer shrink-0 px-1 rounded transition-colors"
-                    :title="locale.messages?.editDuration || '点击编辑时长'"
-                    @click.stop="startEditDuration(song)"
-                  >{{ formatDuration(song.durationSeconds) }}</span>
-                  <input
-                    v-else-if="editingDuration[song.id]"
-                    ref="editingDurationInput"
-                    v-model="editingDurationValue"
-                    type="text"
-                    inputmode="text"
-                    pattern="[0-9:]*"
-                    class="w-20 text-[11px] font-mono text-center bg-bg-primary border border-primary rounded px-1 py-0.5 text-text-primary focus:outline-none focus:border-primary shrink-0"
-                    :placeholder="locale.messages?.durationInputPlaceholder || '分:秒'"
-                    @focusout="saveDurationEdit(song)"
-                    @keydown="handleDurationKeydown($event, song)"
-                  >
-                  <span v-if="song.requester" class="text-text-disabled">|</span>
-                  <span v-if="song.requester" class="text-text-tertiary truncate">{{ song.requester }}</span>
-                  <span v-if="song.voteCount != null" class="ml-auto flex items-center gap-1 text-[10px] font-bold text-text-tertiary bg-bg-primary-50 px-1.5 py-0.5 rounded-md border border-border-secondary-50 shrink-0">
-                    <Heart class="w-3 h-3 text-error-50" />
-                    {{ song.voteCount }}
-                  </span>
-                </span>
-              </div>
-            </div>
-          </div>
-
-          <!-- 方案导航 -->
-          <div class="flex items-center gap-2 pt-1">
-            <button
-              :disabled="currentPlanIndex <= 0 || generatingNewPlan"
-              class="flex-1 py-2.5 bg-bg-tertiary hover:bg-bg-quaternary text-text-secondary text-xs font-bold rounded-xl transition-colors uppercase tracking-wider disabled:opacity-50 disabled:cursor-not-allowed flex items-center justify-center gap-1.5"
-              @click="goToPreviousPlan"
-            >
-              <ChevronLeft class="w-3.5 h-3.5" />
-              {{ locale.previousPlan }}
-            </button>
-            <span class="text-[10px] font-bold text-text-tertiary whitespace-nowrap">
-              {{ locale.planIndicator(currentPlanIndex + 1, autoSchedulePlans.length) }}
-            </span>
-            <button
-              :disabled="generatingNewPlan"
-              class="flex-1 py-2.5 bg-bg-tertiary hover:bg-bg-quaternary text-text-secondary text-xs font-bold rounded-xl transition-colors uppercase tracking-wider disabled:opacity-50 disabled:cursor-not-allowed flex items-center justify-center gap-1.5"
-              @click="goToNextPlan"
-            >
-              <Loader2 v-if="generatingNewPlan" class="w-3.5 h-3.5 animate-spin" />
-              <span v-else-if="currentPlanIndex < autoSchedulePlans.length - 1">
-                {{ locale.nextPlan }}
-                <ChevronRight class="w-3.5 h-3.5" />
-              </span>
-              <span v-else-if="actualExhaustive" class="flex items-center gap-1.5">
-                <Plus class="w-3.5 h-3.5" />
-                {{ locale.newPlan }}
-              </span>
-              <span v-else class="opacity-30">
-                {{ locale.nextPlan }}
-                <ChevronRight class="w-3.5 h-3.5" />
-              </span>
-            </button>
-          </div>
-
-          <div class="flex gap-2">
-            <button
-              class="flex-1 py-2.5 bg-bg-tertiary hover:bg-bg-quaternary text-text-secondary text-xs font-bold rounded-xl transition-colors uppercase tracking-wider"
-              @click="resetAutoSchedule"
-            >
-              {{ locale.tryAgain }}
-            </button>
-            <button
-              class="flex-1 py-2.5 bg-primary-hover hover:bg-primary text-text-primary text-xs font-bold rounded-xl shadow-lg shadow-[var(--primary-glow)] transition-colors uppercase tracking-wider"
-              @click="confirmAutoSchedule"
-            >
-              {{ locale.confirmApply }}
-            </button>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-
-  <!-- 上下文菜单 -->
-  <div
-    v-if="contextMenuOpen"
-    class="fixed inset-0 z-50"
-    @click="contextMenuOpen = false"
-  >
-    <div
-      class="absolute bg-bg-secondary border border-border-secondary rounded-xl shadow-2xl p-1 min-w-[130px]"
-      :style="contextMenuPos"
-      @click.stop
-    >
-      <button
-        class="flex items-center gap-2 w-full px-3 py-1.5 rounded-lg text-[11px] font-bold text-text-primary hover:bg-bg-primary transition-colors"
-        @click="playSong(contextMenuSong); contextMenuOpen = false"
-      >
-        <Play class="w-3 h-3" />
-        <span>{{ locale.playSong }}</span>
-      </button>
-      <template v-if="contextMenuSide === 'left'">
-        <button
-          v-if="activeTab === 'normal' || activeTab === 'all'"
-          class="flex items-center gap-2 w-full px-3 py-1.5 rounded-lg text-[11px] font-bold text-text-primary hover:bg-bg-primary transition-colors disabled:opacity-40 disabled:cursor-not-allowed disabled:hover:bg-transparent"
-          :disabled="poolSongIds.has(contextMenuSong.id)"
-          @click="addSingleToPool(contextMenuSong.id); contextMenuOpen = false"
-        >
-          <FolderPlus class="w-3 h-3" />
-          <span>{{ locale.addSingleToPool }}</span>
-        </button>
-        <button
-          v-if="activeTab === 'normal' || activeTab === 'all' || activeTab === 'replay'"
-          class="flex items-center gap-2 w-full px-3 py-1.5 rounded-lg text-[11px] font-bold text-text-primary hover:bg-bg-primary transition-colors"
-          @click="addSongToSchedule(contextMenuSong); contextMenuOpen = false"
-        >
-          <PlaySquare class="w-3 h-3" />
-          <span>{{ locale.addToSchedule }}</span>
-        </button>
-        <button
-          v-if="activeTab === 'pool'"
-          class="flex items-center gap-2 w-full px-3 py-1.5 rounded-lg text-[11px] font-bold text-text-primary hover:bg-bg-primary transition-colors"
-          @click="addSongToSchedule(contextMenuSong); contextMenuOpen = false"
-        >
-          <PlaySquare class="w-3 h-3" />
-          <span>{{ locale.addToSchedule }}</span>
-        </button>
-        <button
-          v-if="activeTab === 'pool'"
-          class="flex items-center gap-2 w-full px-3 py-1.5 rounded-lg text-[11px] font-bold text-error hover:bg-error-10 transition-colors"
-          @click="removeFromPool(contextMenuSong.songId || contextMenuSong.id); contextMenuOpen = false"
-        >
-          <Trash2 class="w-3 h-3" />
-          <span>{{ locale.removeFromPool }}</span>
-        </button>
-      </template>
-      <template v-if="contextMenuSide === 'right'">
-        <button
-          class="flex items-center gap-2 w-full px-3 py-1.5 rounded-lg text-[11px] font-bold text-error hover:bg-error-10 transition-colors"
-          @click="removeSongFromSchedule(contextMenuSong); contextMenuOpen = false"
-        >
-          <Trash2 class="w-3 h-3" />
-          <span>{{ locale.removeFromSchedule }}</span>
-        </button>
-        <button
-          v-if="contextMenuSong.isDraft"
-          class="flex items-center gap-2 w-full px-3 py-1.5 rounded-lg text-[11px] font-bold text-success hover:bg-success-10 transition-colors"
-          @click="publishSingleDraft(contextMenuSong); contextMenuOpen = false"
-        >
-          <Send class="w-3 h-3" />
-          <span>{{ locale.publishThisDraft }}</span>
-        </button>
-      </template>
-    </div>
-  </div>
 </template>
 
-<script setup>
+<script setup lang="ts">
 import { computed, nextTick, onMounted, onUnmounted, reactive, ref, watch, inject } from 'vue'
 import {
   Search,
@@ -1819,7 +829,6 @@ import {
   Download,
   FileBadge,
   PlaySquare,
-  Play,
   ChevronDown,
   ListMusic,
   Filter,
@@ -1829,7 +838,6 @@ import {
   AlertTriangle,
   X as CloseIcon,
   ChevronRight,
-  ChevronLeft,
   MoreVertical,
   Calendar as CalendarIcon,
   ArrowLeft,
@@ -1841,246 +849,76 @@ import {
   CircleDot,
   ExternalLink,
   MessageSquare,
-  Trash2,
-  Copy,
-  RefreshCcw,
-  Loader2,
-  Sparkles,
-  FolderPlus,
-  Lock
+  Image,
+  CalendarDays,
+  Image as ImageIcon
 } from '@lucide/vue'
+import AdminDatePicker from './AdminDatePicker.vue'
+import PlaylistCardGenerator from './PlaylistCardGenerator.vue'
 import SongDownloadDialog from './SongDownloadDialog.vue'
 import SubmissionRemarkDialog from './SubmissionRemarkDialog.vue'
 import ConfirmDialog from '../UI/ConfirmDialog.vue'
-import Icon from '~/components/UI/Icon.vue'
 import Pagination from '~/components/UI/Common/Pagination.vue'
 import CustomSelect from '~/components/UI/Common/CustomSelect.vue'
 import LoadingState from '~/components/UI/Common/LoadingState.vue'
 import { useSongPlayer } from '~/composables/useSongPlayer'
-import { isBilibiliSong } from '~/utils/bilibiliSource'
-import { convertToHttps, getNeteaseCookie } from '~/utils/url'
-import { useLocale } from '~/utils/locale'
-import { useServerErrors } from '~/composables/useLocaleText'
-import { formatDuration, addDaysToString, getDaysBetween } from '~/utils/timeUtils'
-import { autoSchedule, autoScheduleExhaustive, poolCandidateFromItem } from '~/utils/autoSchedule'
-import { getMusicUrlResult, isKnownInvalidQqAudioUrl } from '~/utils/musicUrl'
+import { useAudioPlayer, type PlayableSong } from '~/composables/useAudioPlayer'
+import { useToast } from '~/composables/useToast'
+import { convertToHttps } from '~/utils/url'
 
-import SchedulePlaylistFilterModal from './SchedulePlaylistFilterModal.vue'
-import { getPlaylistDetail } from '~/utils/neteaseApi'
+const STORAGE_KEY = 'voicehub:schedule:auto-config'
 
-const { admin } = useLocale()
-const { localize: localizeServerError } = useServerErrors()
-const locale = computed(() => {
-  const base = admin.value?.scheduleManager || {}
-  return useSafeLocale({
-    ...base,
-    messages: {
-      confirmAutoScheduleApplied: (count, duration) => `已自动排期 ${count} 首歌曲，合计 ${duration}`,
-      ...(base.messages || {})
-    },
-    errors: {
-      rejectReplayFailed: (message) => `拒绝申请失败: ${message || '未知错误'}`,
-      saveDraftFailed: (message) => `保存草稿失败: ${message || '未知错误'}`,
-      publishScheduleFailed: (message) => `发布排期失败: ${message || '未知错误'}`,
-      publishDraftFailed: (message) => `发布草稿失败: ${message || '未知错误'}`,
-      moveDateFailed: (message) => `迁移失败: ${message || '未知错误'}`,
-      ...(base.errors || {})
-    },
-    confirmations: {
-      moveDateMessage: (sourceDate, count, targetDate) =>
-        `确定将 ${sourceDate} 的所有 ${count} 首歌曲迁移到 ${targetDate} 吗？歌曲顺序与内容将保持不变。`,
-      publishDraftMessage: (title) =>
-        `确定要发布草稿《${title}》吗？发布后将立即公示并发送通知。`,
-      ...(base.confirmations || {})
-    },
-    andMoreApplicants: base.andMoreApplicants || ((count) => ` 等${count}人`),
-    currentDate: base.currentDate || ((date) => `当前日期：${date}`),
-    replayDetailTitle: base.replayDetailTitle || ((title) => `${title} - 重播申请详情`),
-    timeAgo: {
-      ...(base.timeAgo || {}),
-      never: base.timeAgo?.never || base.unknown || '从未',
-      justNow: base.timeAgo?.justNow || '刚刚',
-      minutes: (value) => formatLocaleValue(base.timeAgo?.minutes, value) || `${value} 分钟前`,
-      hours: (value) => formatLocaleValue(base.timeAgo?.hours, value) || `${value} 小时前`,
-      days: (value) => formatLocaleValue(base.timeAgo?.days, value) || `${value} 天前`
-    }
-  })
-})
-const { t: callLocale, nested: getNestedMessage } = useLocaleText(locale)
+type AutoScheduleStrategy = 'default' | 'contributor-count'
 
-// 通知文案：优先 i18n 分区取值（section.key），异常时回退硬编码（防止异步回调作用域问题导致报错）
-const safeMessage = (section, key, fallback) => {
-  try {
-    const text = getNestedMessage(section, key)
-    return text || fallback
-  } catch {
-    return fallback
-  }
+interface AutoConfig {
+  strategy: AutoScheduleStrategy
+  selectedPlayTime: string
+  selectedGrade: string
+  songSortOption: string
+  activeTab: string
+  searchQuery: string
+  selectedSemester: string
 }
 
-const getTodayDateValue = () => getBeijingTimeISOString().slice(0, 10)
-
-// 日期选择器只关心日历日期，避免 UTC 转换让北京时间凌晨落到前一天
-const parseDateValue = (dateValue) => {
-  const match = /^(\d{4})-(\d{2})-(\d{2})$/.exec(dateValue)
-  if (!match) return null
-
-  const year = Number(match[1])
-  const month = Number(match[2])
-  const day = Number(match[3])
-  const date = new Date(Date.UTC(year, month - 1, day))
-
-  if (
-    !Number.isFinite(year) ||
-    !Number.isFinite(month) ||
-    !Number.isFinite(day) ||
-    date.getUTCFullYear() !== year ||
-    date.getUTCMonth() !== month - 1 ||
-    date.getUTCDate() !== day
-  ) {
-    return null
-  }
-
-  return { year, month, day }
-}
-
-const formatUtcDateValue = (date) => {
-  const year = date.getUTCFullYear()
-  const month = String(date.getUTCMonth() + 1).padStart(2, '0')
-  const day = String(date.getUTCDate()).padStart(2, '0')
-  return `${year}-${month}-${day}`
-}
-
-const addDaysToDateValue = (dateValue, days) => {
-  const parsed = parseDateValue(dateValue)
-  if (!parsed) return dateValue
-
-  const date = new Date(Date.UTC(parsed.year, parsed.month - 1, parsed.day + days))
-  return formatUtcDateValue(date)
-}
-
-const getScheduleDateValue = (playDate) => {
-  if (!playDate) return ''
-
-  if (typeof playDate === 'string') {
-    const dateValue = playDate.slice(0, 10)
-    if (parseDateValue(dateValue)) return dateValue
-  }
-
-  const date = new Date(playDate)
-  if (Number.isNaN(date.getTime())) return ''
-  return formatUtcDateValue(date)
+const defaultAutoConfig: AutoConfig = {
+  strategy: 'default',
+  selectedPlayTime: '',
+  selectedGrade: '全部',
+  songSortOption: 'votes-desc',
+  activeTab: 'normal',
+  searchQuery: '',
+  selectedSemester: ''
 }
 
 // 响应式数据
-const selectedDate = useState('adminSelectedDate', getTodayDateValue)
+const showCardGenerator = ref(false)
+const selectedDate = ref(new Date().toISOString().split('T')[0])
 const loading = ref(false)
-const songSortOption = ref('votes-desc')
+const songSortOption = ref<AutoConfig['songSortOption']>('votes-desc')
 const hasChanges = ref(false)
 const searchQuery = ref('')
-const selectedGrade = ref('')
-const activeTab = ref('normal')
+const selectedGrade = ref('全部')
+const activeTab = ref<AutoConfig['activeTab']>('normal')
 const mobileTab = ref('pending')
 const mobileFiltersOpen = ref(false)
-const scheduleTabs = computed(() => [
-  { id: 'normal', label: locale.value?.tabs?.normal || '普通投稿' },
-  { id: 'replay', label: locale.value?.tabs?.replay || '重播申请' },
-  { id: 'all', label: locale.value?.tabs?.all || '所有' },
-  { id: 'pool', label: locale.value?.tabs?.pool || locale.value?.poolList || '备选池' }
-])
 
-// 歌单过滤状态
-const showPlaylistFilterModal = ref(false)
-const isPlaylistFilterActive = ref(false)
-const playlistFilterTrackIds = ref(new Set())
-const playlistNamesMap = ref({})
+const autoScheduleStrategy = ref<AutoScheduleStrategy>('default')
+const scheduleStrategyOptions = [
+  { label: '默认策略（按期望序号）', value: 'default' },
+  { label: '按投稿人数优先覆盖', value: 'contributor-count' }
+]
 
-const handlePlaylistFilterApply = async (playlistIds, playlistTracks = {}, playlistNames = {}) => {
-  if (!playlistIds || playlistIds.length === 0) {
-    isPlaylistFilterActive.value = false
-    playlistFilterTrackIds.value = new Set()
-    playlistNamesMap.value = {}
-    return
-  }
-
-  isPlaylistFilterActive.value = true
-  const newTrackIds = new Set()
-  const newNamesMap = {}
-  const cookie = getNeteaseCookie()
-
-  const fetchPromises = playlistIds.map(async (id) => {
-  const playlistName = playlistNames[id] || callLocale('playlistName', `Playlist ${id}`, id)
-    let trackIds = []
-
-    // 优先使用从组件中传来的已经缓存的 trackIds
-    if (playlistTracks && playlistTracks[id]) {
-      trackIds = playlistTracks[id]
-    } else {
-      // 缓存中没有则重新请求
-      try {
-        const res = await getPlaylistDetail(id, cookie)
-        if (
-          res &&
-          res.code === 200 &&
-          res.body &&
-          res.body.playlist &&
-          res.body.playlist.trackIds
-        ) {
-          trackIds = res.body.playlist.trackIds.map((t) => t.id.toString())
-        }
-      } catch (err) {
-        console.error(`获取歌单 ${id} 失败:`, err)
-      }
-    }
-
-    // 存入集合并建立映射关系
-    trackIds.forEach((t) => {
-      newTrackIds.add(t)
-      if (!newNamesMap[t]) {
-        newNamesMap[t] = new Set()
-      }
-      newNamesMap[t].add(playlistName)
-    })
-  })
-
-  await Promise.all(fetchPromises)
-
-  playlistFilterTrackIds.value = newTrackIds
-  playlistNamesMap.value = {}
-  Object.keys(newNamesMap).forEach((key) => {
-    playlistNamesMap.value[key] = Array.from(newNamesMap[key])
-  })
-}
-
-// 音频播放器
-const { playSong: playSongWithQueue } = useSongPlayer()
-
-// 播放歌曲：以歌曲所在列表（播放顺序/待排歌曲）作为播放队列，支持上下切歌与循环模式
-const playSong = (songOrSchedule) => {
-  // 兼容右键菜单传入的排期项（含 .song 字段）
-  const song = songOrSchedule && songOrSchedule.song ? songOrSchedule.song : songOrSchedule
-  if (!song) return
-  // 播放顺序列表中的歌曲，以播放顺序为队列
-  if (
-    localScheduledSongs.value.some((s) => s.song && String(s.song.id) === String(song.id))
-  ) {
-    playSongWithQueue(song, localScheduledSongs.value.map((s) => s.song))
-    return
-  }
-  // 待排歌曲列表中的歌曲，以当前待排列表为队列
-  if (filteredUnscheduledSongs.value.some((s) => String(s.id) === String(song.id))) {
-    playSongWithQueue(song, filteredUnscheduledSongs.value)
-    return
-  }
-  playSongWithQueue(song)
-}
+// 音频播放器与 Toast
+const { playSong } = useSongPlayer()
+const audioPlayer = useAudioPlayer()
+const { showToast } = useToast()
 
 // 确认对话框相关
 const showConfirmDialog = ref(false)
 const confirmDialogTitle = ref('')
 const confirmDialogMessage = ref('')
 const confirmDialogType = ref('warning')
-const confirmDialogConfirmText = ref('')
+const confirmDialogConfirmText = ref('确认')
 const confirmAction = ref(null)
 
 // 下载相关
@@ -2094,296 +932,13 @@ const showReplayModal = ref(false)
 const replayModalTitle = ref('')
 const replayModalRequests = ref([])
 const replayModalSongId = ref(null)
-// 刷新时长状态（每首歌独立追踪）
-const refreshingDuration = ref({})
-// 时长刷新结果状态（用于颜色标记：'success' | 'error' | null）
-const durationRefreshStatus = ref({})
-// 批量刷新时长状态
-const refreshingAllDurations = ref({ running: false, progress: '', done: 0, total: 0 })
-const refreshingAutoCandidates = ref({ running: false, progress: '', success: 0, fail: 0 })
-// 行内编辑歌曲时长状态
-const editingDuration = ref({})
-const editingDurationValue = ref('')
-const editingDurationInput = ref(null)
-const durationSaveInFlight = new Set()
-
-const formatDurationInput = (seconds) => {
-  const total = Number(seconds)
-  if (!Number.isInteger(total) || total < 0) return ''
-  const hours = Math.floor(total / 3600)
-  const minutes = Math.floor((total % 3600) / 60)
-  const remainingSeconds = total % 60
-  const paddedSeconds = String(remainingSeconds).padStart(2, '0')
-  return hours > 0
-    ? `${hours}:${String(minutes).padStart(2, '0')}:${paddedSeconds}`
-    : `${minutes}:${paddedSeconds}`
-}
-
-const parseDurationInput = (value) => {
-  const parts = value.split(':')
-  if (parts.length !== 2 && parts.length !== 3) return null
-  if (parts.some((part) => !/^\d+$/.test(part))) return null
-
-  const values = parts.map(Number)
-  const hours = parts.length === 3 ? values[0] : 0
-  const minutes = parts.length === 3 ? values[1] : values[0]
-  const seconds = parts.length === 3 ? values[2] : values[1]
-  if (minutes > 59 || seconds > 59) return null
-
-  const total = hours * 3600 + minutes * 60 + seconds
-  return total <= 7200 ? total : null
-}
-
-// 开始编辑歌曲时长
-const startEditDuration = (song) => {
-  if (editingDuration.value[song.id]) return
-  editingDuration.value[song.id] = true
-  editingDurationValue.value = song.durationSeconds == null
-    ? ''
-    : formatDurationInput(song.durationSeconds)
-  nextTick(() => {
-    const input = Array.isArray(editingDurationInput.value)
-      ? editingDurationInput.value[0]
-      : editingDurationInput.value
-    if (input) {
-      input.focus()
-      input.select()
-    }
-  })
-}
-
-// 保存编辑的歌曲时长
-const saveDurationEdit = async (song) => {
-  if (!editingDuration.value[song.id] || durationSaveInFlight.has(song.id)) return
-  durationSaveInFlight.add(song.id)
-
-  try {
-    const raw = editingDurationValue.value.trim()
-    if (raw === '') {
-      if (song.durationSeconds == null) {
-        cancelEditDuration(song.id)
-        return
-      }
-      // 清空时长
-      const updated = await updateSongDuration(song.id, null)
-      if (!updated) return
-      delete editingDuration.value[song.id]
-      editingDurationValue.value = ''
-      return
-    }
-
-    const seconds = parseDurationInput(raw)
-    if (seconds == null) {
-      if (window.$showNotification) {
-        window.$showNotification(locale.value.messages?.durationInvalid || '时长格式无效，请输入 分:秒 或 时:分:秒', 'error')
-      }
-      return
-    }
-
-    if (seconds === Number(song.durationSeconds)) {
-      cancelEditDuration(song.id)
-      return
-    }
-
-    const updated = await updateSongDuration(song.id, seconds)
-    if (!updated) return
-    delete editingDuration.value[song.id]
-    editingDurationValue.value = ''
-  } finally {
-    durationSaveInFlight.delete(song.id)
-  }
-}
-
-// 通用：更新歌曲时长并同步所有列表
-const updateSongDuration = async (songId, durationSeconds) => {
-  try {
-    await $fetch('/api/admin/songs/duration', {
-      method: 'POST',
-      body: { songId, durationSeconds },
-      ...(auth ? auth.getAuthConfig?.() : {})
-    })
-
-    const normalized = durationSeconds ?? null
-    // 更新待排歌曲列表
-    const pendingIdx = songs.value.findIndex((s) => s.id === songId)
-    if (pendingIdx !== -1) {
-      songs.value[pendingIdx].durationSeconds = normalized
-    }
-    // 更新已排歌曲列表
-    for (const schedule of localScheduledSongs.value) {
-      if (schedule.song && schedule.song.id === songId) {
-        schedule.song.durationSeconds = normalized
-        break
-      }
-    }
-    // 更新备选池
-    for (const p of songPool.value) {
-      if (p.songId === songId) { p.durationSeconds = normalized; break }
-    }
-    // 更新重播申请
-    for (const r of replayRequests.value) {
-      if (r.id === songId) { r.durationSeconds = normalized; break }
-    }
-    // 更新自动排期候选
-    if (autoScheduleCandidates.value) {
-      const cand = autoScheduleCandidates.value.find((c) => c.id === songId)
-      if (cand) cand.durationSeconds = normalized
-    }
-
-    if (window.$showNotification) {
-      window.$showNotification(locale.value.messages?.durationUpdated || '时长已更新', 'success')
-    }
-    return true
-  } catch (err) {
-    console.error('更新时长失败:', err)
-    if (window.$showNotification) {
-      window.$showNotification(localizeServerError(err), 'error')
-    }
-    return false
-  }
-}
-
-// 取消编辑
-const cancelEditDuration = (songId) => {
-  delete editingDuration.value[songId]
-  editingDurationValue.value = ''
-}
-
-// 键盘事件处理
-const handleDurationKeydown = (event, song) => {
-  if (event.key === 'Enter') {
-    event.preventDefault()
-    saveDurationEdit(song)
-  } else if (event.key === 'Escape') {
-    event.preventDefault()
-    cancelEditDuration(song.id)
-  }
-}
-// 自动排期状态
-const showAutoScheduleDialog = ref(false)
-const contextMenuOpen = ref(false)
-const contextMenuSide = ref('left')
-const contextMenuSong = ref(null)
-const contextMenuPos = ref({ top: '50%', left: '50%' })
-const openContextMenu = (e, side, song) => {
-  e.stopPropagation()
-  const rect = e.currentTarget.getBoundingClientRect()
-  const menuW = 150
-  const menuH = 120
-  contextMenuSide.value = side
-  contextMenuSong.value = song
-  const vW = window.innerWidth
-  let left = rect.right + 8
-  if (left + menuW > vW) {
-    left = rect.left - menuW - 8
-  }
-  if (left < 8) left = vW - menuW - 8
-  const top = rect.bottom + 8
-  const adjustedTop = top + menuH > window.innerHeight ? top - menuH : top
-  contextMenuPos.value = {
-    top: `${adjustedTop}px`,
-    left: `${left}px`
-  }
-  contextMenuOpen.value = true
-}
-const closeContextMenu = () => { contextMenuOpen.value = false }
-const autoScheduleTargetMinutes = ref(null)
-const autoScheduleTargetSongCount = ref(null)
-const autoScheduleTargetRequesterCount = ref(null)
-const autoScheduleDirection = ref('under')
-const autoScheduleFixExisting = ref(false)
-const autoScheduleResult = ref({ songs: [], totalDuration: 0, diff: 0, absDiff: 0 })
-const autoSchedulePlans = ref([])
-const currentPlanIndex = ref(0)
-const autoScheduleAlgorithm = ref('greedy')
-
-// 自动排期设置记忆（localStorage 持久化，下次打开弹窗沿用上次配置）
-const AUTO_SCHEDULE_SETTINGS_KEY = 'voicehub_auto_schedule_settings'
-const AUTO_SCHEDULE_DIRECTIONS = ['under', 'middle', 'over']
-const AUTO_SCHEDULE_ALGORITHMS = ['auto', 'greedy', 'exhaustive']
-const loadAutoScheduleSettings = () => {
-  if (!import.meta.client) return
-  try {
-    const saved = JSON.parse(localStorage.getItem(AUTO_SCHEDULE_SETTINGS_KEY) || 'null')
-    if (!saved || typeof saved !== 'object') return
-    if (Number.isFinite(saved.targetMinutes) && saved.targetMinutes > 0) autoScheduleTargetMinutes.value = saved.targetMinutes
-    if (Number.isFinite(saved.targetSongCount) && saved.targetSongCount > 0) autoScheduleTargetSongCount.value = Math.floor(saved.targetSongCount)
-    if (Number.isFinite(saved.targetRequesterCount) && saved.targetRequesterCount > 0) autoScheduleTargetRequesterCount.value = Math.floor(saved.targetRequesterCount)
-    if (AUTO_SCHEDULE_DIRECTIONS.includes(saved.direction)) autoScheduleDirection.value = saved.direction
-    if (AUTO_SCHEDULE_ALGORITHMS.includes(saved.algorithm)) autoScheduleAlgorithm.value = saved.algorithm
-    autoScheduleFixExisting.value = !!saved.fixExisting
-  } catch {
-    // 非法数据忽略，回退默认
-  }
-}
-const saveAutoScheduleSettings = () => {
-  if (!import.meta.client) return
-  try {
-    localStorage.setItem(AUTO_SCHEDULE_SETTINGS_KEY, JSON.stringify({
-      targetMinutes: autoScheduleTargetMinutes.value,
-      targetSongCount: autoScheduleTargetSongCount.value,
-      targetRequesterCount: autoScheduleTargetRequesterCount.value,
-      direction: autoScheduleDirection.value,
-      algorithm: autoScheduleAlgorithm.value,
-      fixExisting: autoScheduleFixExisting.value
-    }))
-  } catch {
-    // 存储失败忽略
-  }
-}
-watch(
-  [autoScheduleTargetMinutes, autoScheduleTargetSongCount, autoScheduleTargetRequesterCount, autoScheduleDirection, autoScheduleAlgorithm, autoScheduleFixExisting],
-  saveAutoScheduleSettings
-)
-loadAutoScheduleSettings()
-
-const autoScheduleScheduledSeconds = computed(() => {
-  if (!autoScheduleFixExisting.value) return 0
-  return localScheduledSongs.value.reduce((sum, s) => {
-    const dur = s.song && typeof s.song.durationSeconds === 'number' ? s.song.durationSeconds : 0
-    return sum + dur
-  }, 0)
-})
-
-const actualExhaustive = computed(() => {
-  return autoScheduleAlgorithm.value === 'exhaustive' ||
-    (autoScheduleAlgorithm.value === 'auto' && autoScheduleCandidates.value.length < 20)
-})
-const generatingNewPlan = ref(false)
-// 备选池
-const songPool = ref([])
-const poolLoading = ref(false)
-// 备选池已包含的歌曲 ID 集合，用于禁用重复加入按钮
-const poolSongIds = computed(() => new Set(songPool.value.map((p) => p.songId)))
-// 备选池统一过滤：已播放或已在任意日期排期（含草稿）/已加入当前播放顺序的歌曲不再是候选
-const filteredPoolSongs = computed(() => {
-  const scheduledIds = new Set(localScheduledSongs.value.map((s) => s.song && s.song.id).filter(Boolean))
-  return songPool.value.filter((item) => {
-    if (item.played) return false
-    if (scheduledSongIds.value.has(item.songId) || scheduledIds.has(item.songId)) return false
-    return true
-  })
-})
 const showMoveDateDialog = ref(false)
 const moveTargetDate = ref('')
-const showCopyDateDialog = ref(false)
-const copyMode = ref('single')
-const copyFromStart = ref('')
-const copyFromEnd = ref('')
-const copyToStart = ref('')
-const copyToEnd = ref('')
-const copySingleTargetDate = ref('')
 const submissionRemarkDialog = ref({
   show: false,
-  songId: null,
-  replayRequestId: null,
-  title: '',
-  artist: '',
   songTitle: '',
   content: '',
-  isPublic: true,
-  isUpdatingPublic: false,
-  status: null
+  isPublic: true
 })
 
 const openReplayModal = (song) => {
@@ -2400,143 +955,13 @@ const closeReplayModal = () => {
   replayModalSongId.value = null
 }
 
-const openSubmissionRemark = (song, scheduleReplayRequestId = null) => {
+const openSubmissionRemark = (song) => {
   if (!song?.submissionNote) return
   submissionRemarkDialog.value = {
     show: true,
-    songId: song.id,
-    // 排期卡片的 replayRequestId 在排期顶层而非 song 子对象，优先使用显式传入的绑定
-    replayRequestId: scheduleReplayRequestId || song.replayRequestId || null,
-    title: song.title,
-    artist: song.artist,
     songTitle: `${song.title} - ${song.artist}`,
     content: song.submissionNote,
-    isPublic: song.submissionNotePublic === true,
-    status: song.submissionNotePublicStatus || null
-  }
-}
-
-const updateSubmissionNotePublicStatus = async (status) => {
-  const dialogData = submissionRemarkDialog.value
-  if (!dialogData.songId || dialogData.isUpdatingPublic) return
-
-  dialogData.isUpdatingPublic = true
-
-  try {
-    const updatePayload = {
-      title: dialogData.title,
-      artist: dialogData.artist,
-      submissionNotePublicStatus: status
-    }
-    if (dialogData.replayRequestId) {
-      updatePayload.replayRequestId = dialogData.replayRequestId
-    }
-
-    await adminService.updateSong(dialogData.songId, updatePayload)
-
-    const applyLocal = (song) => {
-      song.submissionNotePublicStatus = status
-      if (status === 'approved') song.submissionNotePublic = true
-    }
-    if (songsService && songsService.songs && songsService.songs.value) {
-      const songIndex = songsService.songs.value.findIndex((s) => s.id === dialogData.songId)
-      if (songIndex !== -1) applyLocal(songsService.songs.value[songIndex])
-    }
-    for (const scheduleList of [localScheduledSongs.value, publicSchedules.value]) {
-      const scheduleIndex = scheduleList.findIndex(
-        (s) => s.song && s.song.id === dialogData.songId
-      )
-      if (scheduleIndex !== -1) applyLocal(scheduleList[scheduleIndex].song)
-    }
-    const replayIndex = replayRequests.value.findIndex((s) => s.id === dialogData.songId)
-    if (replayIndex !== -1) applyLocal(replayRequests.value[replayIndex])
-
-    dialogData.status = status
-    if (status === 'approved') dialogData.isPublic = true
-
-    if (window.$showNotification) {
-      try {
-        window.$showNotification(
-          safeMessage('messages', status === 'rejected' ? 'remarkRejected' : 'remarkApproved', '备注留言审核状态已更新'),
-          'success'
-        )
-      } catch (notifyErr) {
-        // 静默失败，不影响主流程
-      }
-    }
-  } catch (error) {
-    console.error('更新备注审核状态失败:', error)
-    if (window.$showNotification) {
-      try {
-        window.$showNotification(safeMessage('errors', 'remarkUpdateFailed', '备注留言审核状态更新失败'), 'error')
-      } catch (notifyErr) {
-        // 静默失败，不影响主流程
-      }
-    }
-  } finally {
-    dialogData.isUpdatingPublic = false
-  }
-}
-
-const updateSubmissionNotePublic = async (isPublic) => {
-  const dialogData = submissionRemarkDialog.value
-  if (!dialogData.songId || dialogData.isUpdatingPublic) return
-
-  dialogData.isUpdatingPublic = true
-  dialogData.isPublic = isPublic
-
-  try {
-    const updatePayload = {
-      title: dialogData.title,
-      artist: dialogData.artist,
-      submissionNotePublic: isPublic
-    }
-    // 如果是重播申请，传入 replayRequestId 以更新重播申请的备注可见性
-    if (dialogData.replayRequestId) {
-      updatePayload.replayRequestId = dialogData.replayRequestId
-    }
-
-    await adminService.updateSong(dialogData.songId, updatePayload)
-
-    const applyNotePublic = (song) => {
-      song.submissionNotePublic = isPublic
-      song.submissionNotePublicStatus = isPublic ? 'approved' : null
-    }
-    if (songsService && songsService.songs && songsService.songs.value) {
-      const songIndex = songsService.songs.value.findIndex((s) => s.id === dialogData.songId)
-      if (songIndex !== -1) {
-        applyNotePublic(songsService.songs.value[songIndex])
-      }
-    }
-
-    // 更新排期列表中的重播申请备注可见性
-    for (const scheduleList of [localScheduledSongs.value, publicSchedules.value]) {
-      const scheduleIndex = scheduleList.findIndex(
-        (s) => s.song && s.song.id === dialogData.songId
-      )
-      if (scheduleIndex !== -1) {
-        applyNotePublic(scheduleList[scheduleIndex].song)
-      }
-    }
-
-    // 更新重播请求列表中的备注可见性
-    const replayIndex = replayRequests.value.findIndex((s) => s.id === dialogData.songId)
-    if (replayIndex !== -1) {
-      applyNotePublic(replayRequests.value[replayIndex])
-    }
-    dialogData.status = isPublic ? 'approved' : null
-
-    if (window.$showNotification) {
-      window.$showNotification(locale.value.messages.remarkVisibilityUpdated, 'success')
-    }
-  } catch (error) {
-    console.error('更新备注可见性失败:', error)
-    if (window.$showNotification) {
-      window.$showNotification(locale.value.errors.remarkVisibilityUpdateFailed, 'error')
-    }
-    dialogData.isPublic = !isPublic
-  } finally {
-    dialogData.isUpdatingPublic = false
+    isPublic: song.submissionNotePublic === true
   }
 }
 
@@ -2565,13 +990,8 @@ const TOUCH_CONFIG = {
 }
 
 // DOM引用
-const dateSelector = ref(null)
 const sequenceList = ref(null)
 
-// 滚动状态
-const isFirstDateVisible = ref(true)
-const isLastDateVisible = ref(true)
-
 // 数据
 const songs = ref([])
 const publicSchedules = ref([])
@@ -2579,14 +999,6 @@ const localScheduledSongs = ref([])
 const replayRequests = ref([])
 const scheduledSongIds = ref(new Set())
 
-// 已排期歌曲的总时长（秒）
-const scheduledTotalDuration = computed(() => {
-  return localScheduledSongs.value.reduce((sum, s) => {
-    const dur = s.song && typeof s.song.durationSeconds === 'number' ? s.song.durationSeconds : 0
-    return sum + dur
-  }, 0)
-})
-
 // 计算是否有未发布的草稿
 const hasUnpublishedDrafts = computed(() => {
   return localScheduledSongs.value.some((schedule) => schedule.isDraft)
@@ -2605,29 +1017,10 @@ const isDraftMode = ref(false)
 const playTimes = ref([])
 const playTimeEnabled = ref(false)
 const selectedPlayTime = ref('')
-const selectedFilterPlayTime = ref('all')
-
-// 待排歌曲的播出时段筛选选项
-const filterPlayTimeOptions = computed(() => {
-  const options = [
-    { label: locale.value.allPlayTimes, value: 'all' },
-    { label: locale.value.unspecifiedPlayTime, value: 'none' }
-  ]
-  if (playTimes.value) {
-    playTimes.value.forEach((pt) => {
-      let label = pt.name
-      if (pt.startTime || pt.endTime) {
-        label += ` (${formatPlayTimeRange(pt)})`
-      }
-      options.push({ label, value: pt.id })
-    })
-  }
-  return options
-})
 
 // 播出时段选项
 const playTimeOptions = computed(() => {
-  const options = [{ label: locale.value.noPlayTimeAllDay, value: '' }]
+  const options = [{ label: '未选择时段 (全天)', value: '' }]
   if (playTimes.value) {
     playTimes.value.forEach((pt) => {
       let label = pt.name
@@ -2641,37 +1034,83 @@ const playTimeOptions = computed(() => {
 })
 
 // 排序选项
-const sortOptions = computed(() => [
-  { label: locale.value?.sortOptions?.newest || 'Newest', value: 'time-desc' },
-  { label: locale.value?.sortOptions?.oldest || 'Oldest', value: 'time-asc' },
-  { label: locale.value?.sortOptions?.hotDesc || 'Most votes', value: 'votes-desc' },
-  { label: locale.value?.sortOptions?.hotAsc || 'Fewest votes', value: 'votes-asc' }
-])
+const sortOptions = [
+  { label: '最新投稿', value: 'time-desc' },
+  { label: '最早投稿', value: 'time-asc' },
+  { label: '热度最高', value: 'votes-desc' },
+  { label: '热度最低', value: 'votes-asc' }
+]
+
+// 策略变更处理
+const handleStrategyChange = (value: string) => {
+  autoScheduleStrategy.value = value as AutoScheduleStrategy
+}
+
+// 本地存储工具
+const loadAutoConfig = (): AutoConfig => {
+  if (typeof window === 'undefined') return { ...defaultAutoConfig }
+  try {
+    const raw = window.localStorage.getItem(STORAGE_KEY)
+    if (!raw) return { ...defaultAutoConfig }
+    const parsed = JSON.parse(raw) as Partial<AutoConfig>
+    return { ...defaultAutoConfig, ...parsed }
+  } catch (err) {
+    console.warn('[ScheduleConfig] 解析本地配置失败，使用默认值', err)
+    return { ...defaultAutoConfig }
+  }
+}
+
+const saveAutoConfig = () => {
+  if (typeof window === 'undefined') return
+  try {
+    const config: AutoConfig = {
+      strategy: autoScheduleStrategy.value,
+      selectedPlayTime: selectedPlayTime.value,
+      selectedGrade: selectedGrade.value,
+      songSortOption: songSortOption.value,
+      activeTab: activeTab.value,
+      searchQuery: searchQuery.value,
+      selectedSemester: selectedSemester.value
+    }
+    window.localStorage.setItem(STORAGE_KEY, JSON.stringify(config))
+  } catch (err) {
+    console.warn('[ScheduleConfig] 保存本地配置失败', err)
+  }
+}
+
+// Debounce 工具
+let configSaveTimer: ReturnType<typeof setTimeout> | null = null
+const debounceSaveAutoConfig = () => {
+  if (configSaveTimer) clearTimeout(configSaveTimer)
+  configSaveTimer = setTimeout(() => {
+    saveAutoConfig()
+    configSaveTimer = null
+  }, 500)
+}
+
+// 投稿人联合数计算（requesterId + collaborators ACCEPTED）
+const getSongContributorCount = (song: any): number => {
+  let count = 1
+  if (song.collaborators && Array.isArray(song.collaborators)) {
+    count += song.collaborators.length
+  }
+  return count
+}
 
 // 学期相关
 const availableSemesters = ref([])
 const selectedSemester = ref('')
 
-// 日期范围（用于无限滚动）
-const dateRange = ref({ start: -30, end: 30 })
-
 // 手动日期选择
-const showManualDatePicker = ref(false)
-const manualSelectedDate = ref('')
 
 // 分页相关
 const pageStates = reactive({
   normal: 1,
   replay: 1,
-  all: 1,
-  pool: 1
+  all: 1
 })
 const currentPage = computed({
-  get: () => {
-    const page = pageStates[activeTab.value] || 1
-    // 页码不超过总页数，避免最后一页歌曲被移出后显示空页
-    return Math.min(page, Math.max(1, totalPages.value))
-  },
+  get: () => pageStates[activeTab.value] || 1,
   set: (val) => {
     if (pageStates[activeTab.value] !== undefined) {
       pageStates[activeTab.value] = val
@@ -2686,36 +1125,9 @@ let adminService = null
 let auth = null
 let semesterService = null
 
-// 生成日期列表（无限滚动模式）
-const availableDates = computed(() => {
-  const dates = []
-  const todayValue = getTodayDateValue()
-
-  // 根据当前范围生成日期
-  for (let i = dateRange.value.start; i <= dateRange.value.end; i++) {
-    const dateStr = addDaysToDateValue(todayValue, i)
-    const parsedDate = parseDateValue(dateStr)
-    if (!parsedDate) continue
-
-    const isToday = i === 0
-    const weekdays = locale.value?.weekdays || ['日', '一', '二', '三', '四', '五', '六']
-    const weekday = weekdays[new Date(Date.UTC(parsedDate.year, parsedDate.month - 1, parsedDate.day)).getUTCDay()]
-
-    dates.push({
-      value: dateStr,
-      day: String(parsedDate.day).padStart(2, '0'),
-      month: String(parsedDate.month).padStart(2, '0'),
-      weekday,
-      isToday
-    })
-  }
-
-  return dates
-})
-
 // 获取所有可选年级
 const availableGrades = computed(() => {
-  if (!songs.value) return [{ label: locale.value.allGrades, value: '' }]
+  if (!songs.value) return ['全部']
 
   const grades = new Set()
   songs.value.forEach((song) => {
@@ -2726,43 +1138,11 @@ const availableGrades = computed(() => {
 
   // 对年级进行简单排序
   const sortedGrades = Array.from(grades).sort()
-  return [
-    { label: locale.value.allGrades, value: '' },
-    ...sortedGrades.map((grade) => ({ label: grade, value: grade }))
-  ]
+  return ['全部', ...sortedGrades]
 })
 
 // 过滤未排期歌曲（所有）
 const allUnscheduledSongs = computed(() => {
-  // 备选池模式
-  if (activeTab.value === 'pool') {
-    let poolSongs = filteredPoolSongs.value
-    if (searchQuery.value) {
-      const query = searchQuery.value.toLowerCase()
-      poolSongs = poolSongs.filter((song) => {
-        const title = (song.title || '').toLowerCase()
-        const artist = (song.artist || '').toLowerCase()
-        const requester = (song.requester || '').toLowerCase()
-        return title.includes(query) || artist.includes(query) || requester.includes(query)
-      })
-    }
-    // 补充默认字段，保持与歌曲卡片渲染一致
-    return poolSongs.map((item) => ({
-      ...item,
-      id: item.songId,
-      voteCount: item.voteCount || 0,
-      cardCodeId: item.cardCodeId || null,
-      usedCardCode: item.usedCardCode || false,
-      hasSubmissionNote: item.hasSubmissionNote || false,
-      submissionNote: item.submissionNote || null,
-      preferredPlayTimeId: item.preferredPlayTimeId || null,
-      musicId: item.musicId || null,
-      musicPlatform: item.musicPlatform || null,
-      requesterGrade: item.requesterGrade || null,
-      requesterClass: item.requesterClass || null
-    }))
-  }
-
   const sourceData = activeTab.value === 'replay' ? replayRequests.value : songs.value
   if (!sourceData) return []
 
@@ -2779,8 +1159,7 @@ const allUnscheduledSongs = computed(() => {
       return true
     } else {
       // 普通投稿需未播放，且未在任何日期的排期中
-      const isAlreadyScheduled = song.scheduled || scheduledSongIds.value.has(song.id)
-      return !song.played && !isAlreadyScheduled
+      return !song.played && !scheduledSongIds.value.has(song.id)
     }
   })
 
@@ -2799,39 +1178,14 @@ const allUnscheduledSongs = computed(() => {
   // 年级过滤 (针对普通投稿和所有歌曲)
   if (
     (activeTab.value === 'normal' || activeTab.value === 'all') &&
-    selectedGrade.value
+    selectedGrade.value !== '全部'
   ) {
     unscheduledSongs = unscheduledSongs.filter(
       (song) => song.requesterGrade === selectedGrade.value
     )
   }
 
-  // 播出时段过滤
-  if (selectedFilterPlayTime.value !== 'all') {
-    unscheduledSongs = unscheduledSongs.filter((song) => {
-      if (selectedFilterPlayTime.value === 'none') {
-        return !song.preferredPlayTimeId
-      }
-      return song.preferredPlayTimeId === selectedFilterPlayTime.value
-    })
-  }
-
-  // 歌单查重过滤
-  if (isPlaylistFilterActive.value && playlistFilterTrackIds.value.size > 0) {
-    unscheduledSongs = unscheduledSongs.filter((song) => {
-      // 仅在歌曲为网易云平台且其 ID 存在于过滤列表中时才保留
-      if (song.musicId && (song.musicPlatform === 'netease' || !song.musicPlatform)) {
-        return playlistFilterTrackIds.value.has(song.musicId.toString())
-      }
-      // 如果不是网易云歌曲，则在启用了网易云歌单过滤时直接排除（因为查重只查网易云）
-      return false
-    })
-  }
-
   return [...unscheduledSongs].sort((a, b) => {
-    if (activeTab.value === 'pool') {
-      return new Date(b.createdAt || 0) - new Date(a.createdAt || 0)
-    }
     // 重播申请默认按申请数量降序排列，如果数量相同则按时间
     if (activeTab.value === 'replay') {
       if ((b.requestCount || 0) !== (a.requestCount || 0)) {
@@ -2871,16 +1225,14 @@ const isDesktop = ref(true)
 
 // 方法
 const formatDate = (dateString) => {
-  if (!dateString) return locale.value?.timeAgo?.never || '从未'
   const date = new Date(dateString)
-  if (Number.isNaN(date.getTime())) return locale.value?.timeAgo?.never || '从未'
-  const now = getSyncedDate()
+  const now = new Date()
   const diff = now - date
 
-  if (diff < 60000) return locale.value.timeAgo.justNow
-  if (diff < 3600000) return locale.value.timeAgo.minutes(Math.floor(diff / 60000))
-  if (diff < 86400000) return locale.value.timeAgo.hours(Math.floor(diff / 3600000))
-  return locale.value.timeAgo.days(Math.floor(diff / 86400000))
+  if (diff < 60000) return '刚刚'
+  if (diff < 3600000) return `${Math.floor(diff / 60000)}分钟前`
+  if (diff < 86400000) return `${Math.floor(diff / 3600000)}小时前`
+  return `${Math.floor(diff / 86400000)}天前`
 }
 
 // 检查窗口大小
@@ -2888,144 +1240,6 @@ const checkWindowSize = () => {
   isDesktop.value = window.innerWidth >= 1024
 }
 
-let targetScrollLeft = null
-let animationFrameId = null
-
-// 自定义平滑滚动动画
-const smoothScrollTo = (element, target, duration = 300) => {
-  if (!element) return
-
-  const start = element.scrollLeft
-  const distance = target - start
-  let startTime = null
-
-  if (animationFrameId) {
-    cancelAnimationFrame(animationFrameId)
-  }
-
-  const easeOutCubic = (t) => 1 - Math.pow(1 - t, 3)
-
-  const animation = (currentTime) => {
-    if (!startTime) startTime = currentTime
-    const timeElapsed = currentTime - startTime
-    const progress = Math.min(timeElapsed / duration, 1)
-
-    element.scrollLeft = start + distance * easeOutCubic(progress)
-
-    if (timeElapsed < duration) {
-      animationFrameId = requestAnimationFrame(animation)
-    } else {
-      targetScrollLeft = null
-      animationFrameId = null
-    }
-  }
-
-  animationFrameId = requestAnimationFrame(animation)
-}
-
-// 处理日期选择器滚轮事件
-const handleDateSelectorWheel = (event) => {
-  if (Math.abs(event.deltaX) > Math.abs(event.deltaY)) {
-    return
-  }
-
-  event.preventDefault()
-
-  const isTouchpad = Math.abs(event.deltaY) < 50
-
-  if (isTouchpad) {
-    if (animationFrameId) {
-      cancelAnimationFrame(animationFrameId)
-      animationFrameId = null
-      targetScrollLeft = null
-    }
-    dateSelector.value.scrollLeft += event.deltaY
-  } else {
-    if (targetScrollLeft === null) {
-      targetScrollLeft = dateSelector.value.scrollLeft
-    }
-
-    const scrollAmount = event.deltaY > 0 ? 150 : -150
-    targetScrollLeft += scrollAmount
-
-    const maxScroll = dateSelector.value.scrollWidth - dateSelector.value.clientWidth
-    targetScrollLeft = Math.max(0, Math.min(targetScrollLeft, maxScroll))
-
-    smoothScrollTo(dateSelector.value, targetScrollLeft)
-  }
-}
-
-// 滚动日期选择器
-const scrollDates = (direction) => {
-  if (!dateSelector.value) return
-
-  const scrollAmount = 200
-  const currentScroll = dateSelector.value.scrollLeft
-
-  if (targetScrollLeft === null) {
-    targetScrollLeft = currentScroll
-  }
-
-  targetScrollLeft =
-    direction === 'right' ? targetScrollLeft + scrollAmount : targetScrollLeft - scrollAmount
-
-  const maxScroll = dateSelector.value.scrollWidth - dateSelector.value.clientWidth
-  targetScrollLeft = Math.max(0, Math.min(targetScrollLeft, maxScroll))
-
-  smoothScrollTo(dateSelector.value, targetScrollLeft, 400)
-}
-
-let scrollTimeout = null
-
-// 更新滚动按钮状态并加载更多日期
-const updateScrollButtonState = () => {
-  if (!dateSelector.value) return
-
-  isFirstDateVisible.value = false
-  isLastDateVisible.value = false
-
-  const { scrollLeft, scrollWidth, clientWidth } = dateSelector.value
-
-  if (scrollLeft >= 50 && scrollWidth - scrollLeft - clientWidth >= 50) {
-    if (scrollTimeout) {
-      clearTimeout(scrollTimeout)
-      scrollTimeout = null
-    }
-    return
-  }
-
-  if (scrollTimeout) {
-    clearTimeout(scrollTimeout)
-  }
-
-  scrollTimeout = setTimeout(async () => {
-    if (!dateSelector.value) return
-
-    const currentScrollLeft = dateSelector.value.scrollLeft
-    const currentScrollWidth = dateSelector.value.scrollWidth
-    const currentClientWidth = dateSelector.value.clientWidth
-
-    if (currentScrollLeft < 50) {
-      const oldScrollWidth = currentScrollWidth
-      dateRange.value.start -= 14
-
-      await nextTick()
-
-      const newScrollWidth = dateSelector.value.scrollWidth
-
-      const delta = newScrollWidth - oldScrollWidth
-      dateSelector.value.scrollLeft = currentScrollLeft + delta
-
-      // 补偿正在进行的平滑滚动动画目标，避免跳跃或回弹
-      if (targetScrollLeft !== null) {
-        targetScrollLeft += delta
-      }
-    } else if (currentScrollWidth - currentScrollLeft - currentClientWidth < 50) {
-      dateRange.value.end += 14
-    }
-  }, 150)
-}
-
 // 确认对话框处理
 const handleConfirm = async () => {
   if (confirmAction.value) {
@@ -3047,7 +1261,7 @@ const handleBeforeUnload = (e) => {
 // 监听路由离开事件
 onBeforeRouteLeave((to, from, next) => {
   if (hasChanges.value) {
-    const answer = window.confirm(locale.value.confirmations.leaveUnsaved)
+    const answer = window.confirm('您有未保存的排期修改，确定要离开吗？')
     if (answer) {
       next()
     } else {
@@ -3063,7 +1277,7 @@ const handleDateSelect = (dateValue) => {
   if (selectedDate.value === dateValue) return
 
   if (hasChanges.value) {
-    if (!window.confirm(locale.value.confirmations.switchDateUnsaved)) {
+    if (!window.confirm('您有未保存的排期修改，切换日期将丢失这些修改，确定要继续吗？')) {
       return
     }
   }
@@ -3075,7 +1289,7 @@ const handlePlayTimeSelect = (value) => {
   if (selectedPlayTime.value === value) return
 
   if (hasChanges.value) {
-    if (!window.confirm(locale.value.confirmations.switchPlayTimeUnsaved)) {
+    if (!window.confirm('您有未保存的排期修改，切换时段将丢失这些修改，确定要继续吗？')) {
       return
     }
   }
@@ -3087,7 +1301,7 @@ const handleSemesterSelect = async (value) => {
   if (selectedSemester.value === value) return
 
   if (hasChanges.value) {
-    if (!window.confirm(locale.value.confirmations.switchSemesterUnsaved)) {
+    if (!window.confirm('您有未保存的排期修改，切换学期将丢失这些修改，确定要继续吗？')) {
       return
     }
   }
@@ -3098,7 +1312,8 @@ const handleSemesterSelect = async (value) => {
 // 初始化
 let unregisterBeforeNavigate = null
 const registerBeforeNavigate = inject('registerBeforeNavigate', null)
-let suppressSelectedDateLoad = false
+
+let refreshInterval = null
 
 onMounted(async () => {
   window.addEventListener('beforeunload', handleBeforeUnload)
@@ -3106,7 +1321,7 @@ onMounted(async () => {
   if (registerBeforeNavigate) {
     unregisterBeforeNavigate = registerBeforeNavigate(() => {
       if (hasChanges.value) {
-        return window.confirm(locale.value.confirmations.switchPageUnsaved)
+        return window.confirm('您有未保存的排期修改，切换页面将丢失这些修改，确定要继续吗？')
       }
       return true
     })
@@ -3117,67 +1332,33 @@ onMounted(async () => {
   auth = useAuth()
   semesterService = useSemesters()
 
-  await useSyncedTime().syncTime()
-  suppressSelectedDateLoad = true
-  selectedDate.value = getTodayDateValue()
-  await nextTick()
-  suppressSelectedDateLoad = false
-
-  // 初始化窗口大小检测
   checkWindowSize()
   window.addEventListener('resize', checkWindowSize)
 
-  // 立即滚动到当前日期，避免等待数据加载
-  nextTick(() => {
-    scrollToDateElement('auto')
-  })
+  const savedConfig = loadAutoConfig()
+  autoScheduleStrategy.value = savedConfig.strategy
+  selectedPlayTime.value = savedConfig.selectedPlayTime
+  selectedGrade.value = savedConfig.selectedGrade
+  songSortOption.value = savedConfig.songSortOption
+  activeTab.value = savedConfig.activeTab
+  searchQuery.value = savedConfig.searchQuery
+  if (savedConfig.selectedSemester) {
+    selectedSemester.value = savedConfig.selectedSemester
+  }
 
-  // 先加载学期数据，然后加载其他数据
   await loadSemesters()
+  if (savedConfig.selectedSemester && !selectedSemester.value) {
+    selectedSemester.value = savedConfig.selectedSemester
+  }
   await loadData()
 
-  // 添加事件监听器
-  nextTick(() => {
-    if (dateSelector.value) {
-      dateSelector.value.addEventListener('wheel', handleDateSelectorWheel, { passive: false })
-      dateSelector.value.addEventListener('scroll', updateScrollButtonState)
+  refreshInterval = setInterval(() => {
+    if (!hasChanges.value && !loading.value) {
+      loadData(true)
     }
-    updateScrollButtonState()
-
-    // 再次确认滚动位置（防止布局偏移）
-    scrollToDateElement('auto')
-  })
-
-  // 自动排期弹窗 Esc 关闭
-  window.addEventListener('keydown', handleAutoScheduleEscape)
+  }, 10000)
 })
 
-// 滚动到指定日期元素
-const scrollToDateElement = (behavior = 'smooth') => {
-  if (!dateSelector.value || !selectedDate.value) return
-
-  const el = dateSelector.value.querySelector(`[data-date="${selectedDate.value}"]`)
-  if (el) {
-    if (behavior === 'smooth') {
-      const listRect = dateSelector.value.getBoundingClientRect()
-      const elRect = el.getBoundingClientRect()
-      const scrollLeft = dateSelector.value.scrollLeft
-
-      let target =
-        scrollLeft + (elRect.left - listRect.left) - listRect.width / 2 + elRect.width / 2
-
-      const maxScroll = dateSelector.value.scrollWidth - dateSelector.value.clientWidth
-      target = Math.max(0, Math.min(target, maxScroll))
-
-      targetScrollLeft = target
-      smoothScrollTo(dateSelector.value, target, 400)
-    } else {
-      el.scrollIntoView({ behavior: 'auto', block: 'nearest', inline: 'center' })
-    }
-  }
-}
-
-// 清理事件监听器
 onUnmounted(() => {
   window.removeEventListener('beforeunload', handleBeforeUnload)
 
@@ -3185,92 +1366,37 @@ onUnmounted(() => {
     unregisterBeforeNavigate()
   }
 
-  // 组件卸载时中止批量刷新进行中的请求
-  if (refreshAllAbortController) {
-    refreshAllAbortController.abort()
-    refreshAllAbortController = null
-  }
-  if (refreshAutoCandidatesAbortController) {
-    refreshAutoCandidatesAbortController.abort()
-    refreshAutoCandidatesAbortController = null
-  }
-
-  if (dateSelector.value) {
-    dateSelector.value.removeEventListener('wheel', handleDateSelectorWheel)
-    dateSelector.value.removeEventListener('scroll', updateScrollButtonState)
-  }
   window.removeEventListener('resize', checkWindowSize)
-
-  // 清理自动排期弹窗 Esc 监听
-  window.removeEventListener('keydown', handleAutoScheduleEscape)
-
-  if (animationFrameId) {
-    cancelAnimationFrame(animationFrameId)
-    animationFrameId = null
+  if (autoSaveTimer) {
+    clearTimeout(autoSaveTimer)
+    autoSaveTimer = null
   }
-
-  if (scrollTimeout) {
-    clearTimeout(scrollTimeout)
-    scrollTimeout = null
+  if (refreshInterval) {
+    clearInterval(refreshInterval)
+  }
+  if (configSaveTimer) {
+    clearTimeout(configSaveTimer)
+    configSaveTimer = null
   }
 })
 
-// 打开手动日期选择器
-const openManualDatePicker = () => {
-  manualSelectedDate.value = selectedDate.value
-  showManualDatePicker.value = true
-}
-
-// 确认手动日期选择
-const confirmManualDate = () => {
-  if (manualSelectedDate.value) {
-    if (selectedDate.value === manualSelectedDate.value) {
-      showManualDatePicker.value = false
-      return
-    }
-
-    if (hasChanges.value) {
-      if (!window.confirm(locale.value.confirmations.switchDateUnsaved)) {
-        return
-      }
-    }
-
-    selectedDate.value = manualSelectedDate.value
-    showManualDatePicker.value = false
-
-    // 选中日期后，如果是手动选择的日期可能在当前列表外，滚动到该日期
-    nextTick(() => {
-      scrollToDateElement('smooth')
-    })
+watch(
+  [
+    autoScheduleStrategy,
+    selectedPlayTime,
+    selectedGrade,
+    songSortOption,
+    activeTab,
+    searchQuery,
+    selectedSemester
+  ],
+  () => {
+    debounceSaveAutoConfig()
   }
-}
-
-// 定位到今天
-const scrollToToday = () => {
-  const todayStr = getTodayDateValue()
-  const isAlreadyToday = selectedDate.value === todayStr
-
-  if (!isAlreadyToday) {
-    if (hasChanges.value && !window.confirm(locale.value.confirmations.switchDateUnsaved)) {
-      return
-    }
-    selectedDate.value = todayStr
-  }
-
-  // 确保今天在范围内
-  if (dateRange.value.start > 0 || dateRange.value.end < 0) {
-    dateRange.value.start = -15
-    dateRange.value.end = 15
-  }
-
-  nextTick(() => {
-    scrollToDateElement('smooth')
-  })
-}
+)
 
 // 监听日期变化
 watch(selectedDate, async () => {
-  if (suppressSelectedDateLoad) return
   await loadData()
 })
 
@@ -3279,7 +1405,6 @@ const resetAllPages = () => {
   pageStates.normal = 1
   pageStates.replay = 1
   pageStates.all = 1
-  pageStates.pool = 1
 }
 
 // 监听排序选项变化，重置分页
@@ -3297,20 +1422,12 @@ watch(selectedGrade, () => {
   resetAllPages()
 })
 
-// 监听期望时段筛选变化，重置分页
-watch(selectedFilterPlayTime, () => {
-  resetAllPages()
-})
-
 // 加载重播申请
 const fetchReplayRequests = async () => {
   try {
-    // 与歌曲列表一致，按当前选中学期过滤；选择"全部"时不传学期参数
-    const selectedSemesterOption = availableSemesters.value.find((item) => String(item.id) === String(selectedSemester.value))
-    const semester = selectedSemester.value === 'all' ? undefined : selectedSemesterOption?.name
     const data = await $fetch('/api/admin/replay-requests', {
       ...auth.getAuthConfig(),
-      query: { status: 'PENDING', ...(semester ? { semester } : {}) }
+      query: { status: 'PENDING', t: Date.now() }
     })
     replayRequests.value = data || []
   } catch (err) {
@@ -3319,132 +1436,12 @@ const fetchReplayRequests = async () => {
   }
 }
 
-// 加载备选池
-const fetchSongPool = async () => {
-  poolLoading.value = true
-  try {
-    const data = await $fetch('/api/admin/schedule/song-pool', {
-      ...auth.getAuthConfig()
-    })
-    songPool.value = data?.pool || []
-  } catch (err) {
-    console.error('加载备选池失败:', err)
-    songPool.value = []
-  } finally {
-    poolLoading.value = false
-  }
-}
-
-// 从待排库批量移入备选池
-const moveAllToPool = async () => {
-  const pageSongs = filteredUnscheduledSongs.value.filter((song) => !poolSongIds.value.has(song.id))
-  const pendingSongIds = pageSongs.map((s) => s.id)
-  if (pendingSongIds.length === 0) return
-
-  confirmDialogTitle.value = locale.value.addCurrentPageConfirmTitle
-  confirmDialogMessage.value = locale.value.addCurrentPageConfirmMessage(pendingSongIds.length, currentPage.value)
-  confirmDialogType.value = 'warning'
-  confirmDialogConfirmText.value = locale.value.confirm
-
-  confirmAction.value = async () => {
-    try {
-      const songDurations = (await Promise.all(
-        pageSongs
-          .filter((song) => !song.durationSeconds && song.musicPlatform && song.musicId)
-          .map(async (song) => {
-            const durationSeconds = await resolveClientAudioDuration(song)
-            return durationSeconds ? { songId: song.id, durationSeconds } : null
-          })
-      )).filter(Boolean)
-      const result = await $fetch('/api/admin/schedule/song-pool', {
-        method: 'POST',
-        ...auth.getAuthConfig(),
-        body: { songIds: pendingSongIds, songDurations }
-      })
-      await fetchSongPool()
-      const added = result.added || []
-      const skipped = result.skipped || []
-      if (added.length > 0) {
-        window.$showNotification && window.$showNotification(
-          `${locale.value.addCurrentPageSuccess(added.length)}`,
-          'success'
-        )
-      }
-      if (skipped.length > 0) {
-        const reasons = skipped.map((s) => s.reason).join('、')
-        window.$showNotification && window.$showNotification(
-          `${locale.value.addAllPendingSkipped(skipped.length)}（${reasons}）`,
-          'warning'
-        )
-      }
-    } catch (err) {
-      console.error('移入备选池失败:', err)
-      window.$showNotification && window.$showNotification(
-        locale.value.addAllPendingFailed,
-        'error'
-      )
-    }
-  }
-
-  showConfirmDialog.value = true
-}
-
-// 单首加入备选池
-const addSingleToPool = async (songId) => {
-  try {
-    const result = await $fetch('/api/admin/schedule/song-pool', {
-      method: 'POST',
-      ...auth.getAuthConfig(),
-      body: { songIds: [songId] }
-    })
-    await fetchSongPool()
-    const added = result.added || []
-    const skipped = result.skipped || []
-    if (added.length > 0) {
-      window.$showNotification && window.$showNotification(
-        locale.value.addSingleToPoolSuccess,
-        'success'
-      )
-    } else if (skipped.length > 0) {
-      const reason = skipped[0]?.reason || ''
-      window.$showNotification && window.$showNotification(
-        `${locale.value.addSingleToPoolSkipped}（${reason}）`,
-        'warning'
-      )
-    }
-  } catch (err) {
-    console.error('加入备选池失败:', err)
-  }
-}
-
-// 从备选池移除
-const removeFromPool = async (songId) => {
-  try {
-    await $fetch('/api/admin/schedule/song-pool', {
-      method: 'DELETE',
-      ...auth.getAuthConfig(),
-      query: { songIds: songId }
-    })
-    await fetchSongPool()
-    window.$showNotification && window.$showNotification(
-      locale.value.removeFromPoolSuccess,
-      'success'
-    )
-  } catch (err) {
-    console.error('从备选池移除失败:', err)
-    window.$showNotification && window.$showNotification(
-      locale.value.removeFromPoolFailed,
-      'error'
-    )
-  }
-}
-
 // 拒绝重播申请
 const rejectReplayRequest = async (songId) => {
-  confirmDialogTitle.value = locale.value.confirmations.rejectReplayTitle
-  confirmDialogMessage.value = locale.value.confirmations.rejectReplayMessage
+  confirmDialogTitle.value = '拒绝重播申请'
+  confirmDialogMessage.value = '确定要拒绝该重播申请吗？'
   confirmDialogType.value = 'warning'
-  confirmDialogConfirmText.value = locale.value.rejectRequest
+  confirmDialogConfirmText.value = '拒绝申请'
 
   confirmAction.value = async () => {
     try {
@@ -3457,16 +1454,12 @@ const rejectReplayRequest = async (songId) => {
       // 刷新申请列表
       await fetchReplayRequests()
       if (window.$showNotification) {
-        window.$showNotification(locale.value.messages.replayRejected, 'success')
+        window.$showNotification('重播申请已拒绝', 'success')
       }
     } catch (err) {
       console.error('拒绝申请失败', err)
       if (window.$showNotification) {
-        const message = getThrownMessage(err) || '未知错误'
-        window.$showNotification(
-          callLocale('errors.rejectReplayFailed', `拒绝申请失败: ${message}`, message),
-          'error'
-        )
+        window.$showNotification('拒绝申请失败: ' + (err.data?.message || err.message), 'error')
       }
     }
   }
@@ -3475,19 +1468,19 @@ const rejectReplayRequest = async (songId) => {
 }
 
 // 加载数据
-const loadData = async () => {
-  loading.value = true
+const loadData = async (silent = false) => {
+  if (!silent) loading.value = true
   try {
     // 使用选中的学期过滤歌曲，如果选择"全部"则不传递学期参数
-    const selectedSemesterOption = availableSemesters.value.find((item) => String(item.id) === String(selectedSemester.value))
-    const semester = selectedSemester.value === 'all' ? undefined : selectedSemesterOption?.name
+    const semester = selectedSemester.value === '全部' ? undefined : selectedSemester.value
+
+    // 播放列表应该始终显示当前学期的歌曲（或者全部，如果未设置当前学期），不受待排歌曲学期选择的影响
+    const playlistSemester = semesterService?.currentSemester?.value?.name
 
-    // 播放列表应该显示所有学期的排期，不受待排歌曲学期选择的影响
-    // 因为在界面上我们是按日期（selectedDate）来过滤显示排期的
     // 并行加载数据
     await Promise.all([
-      songsService.fetchSongs(false, semester, true),
-      songsService.fetchPublicSchedules(false, undefined, true),
+      songsService.fetchSongs(false, semester, true, true),
+      songsService.fetchPublicSchedules(false, playlistSemester, true, true),
       loadPlayTimes(),
       loadDrafts(), // 加载草稿列表
       fetchReplayRequests() // 加载重播申请
@@ -3498,20 +1491,21 @@ const loadData = async () => {
 
     // 在草稿加载完成后再更新本地排期数据
     updateLocalScheduledSongs()
-    hasChanges.value = false
-    // 加载备选池
-    await fetchSongPool()
+    if (!silent) hasChanges.value = false
+    lastSavedDraftSignature.value = buildDraftSignature()
   } catch (error) {
     console.error('加载数据失败:', error)
   } finally {
-    loading.value = false
+    if (!silent) loading.value = false
   }
 }
 
 // 加载播出时段
 const loadPlayTimes = async () => {
   try {
-    const response = await $fetch('/api/play-times')
+    const response = await $fetch('/api/play-times', {
+      query: { t: Date.now() }
+    })
     playTimeEnabled.value = response.enabled
     playTimes.value = response.playTimes || []
   } catch (error) {
@@ -3521,686 +1515,6 @@ const loadPlayTimes = async () => {
   }
 }
 
-const readClientAudioDuration = (song, signal, sourceUrl = song?.playUrl) => {
-  if (!import.meta.client || !sourceUrl) return Promise.resolve(null)
-
-  return new Promise((resolve) => {
-    const audio = new Audio()
-    let settled = false
-    const timeoutId = window.setTimeout(() => finish(null), 8000)
-
-    const cleanup = () => {
-      window.clearTimeout(timeoutId)
-      audio.onloadedmetadata = null
-      audio.onerror = null
-      audio.src = ''
-      audio.load()
-      signal?.removeEventListener('abort', abort)
-    }
-    const finish = (duration) => {
-      if (settled) return
-      settled = true
-      cleanup()
-      resolve(Number.isFinite(duration) && duration >= 30 && duration <= 3600 ? Math.floor(duration) : null)
-    }
-    const abort = () => finish(null)
-
-    if (signal?.aborted) {
-      finish(null)
-      return
-    }
-    signal?.addEventListener('abort', abort, { once: true })
-    audio.preload = 'metadata'
-    audio.onloadedmetadata = () => finish(audio.duration)
-    audio.onerror = () => finish(null)
-    audio.src = convertToHttps(sourceUrl)
-  })
-}
-
-// 按播放器相同的音源解析顺序读取时长，失败后切换到其他音源。
-const resolveClientAudioDuration = async (song, signal) => {
-  if (!import.meta.client || !song?.musicPlatform || !song?.musicId) return null
-
-  const excludeSources = []
-  const hasPlayUrl = Boolean(song.playUrl && String(song.playUrl).trim())
-  let ignoreProvidedUrl = !hasPlayUrl
-  const isPodcast =
-    song.musicPlatform === 'netease-podcast' ||
-    song.sourceInfo?.type === 'voice' ||
-    (song.sourceInfo?.source === 'netease-backup' && song.sourceInfo?.type === 'voice')
-  const mediaId = song.sourceInfo?.strMediaMid || song.sourceInfo?.mediaId || song.sourceInfo?.mediaMid
-
-  for (let attempt = 0; attempt < 3; attempt++) {
-    if (signal?.aborted) return null
-
-    let candidate
-    try {
-      candidate = await getMusicUrlResult(
-        song.musicPlatform,
-        song.musicId,
-        song.playUrl,
-        {
-          unblock: isPodcast ? false : undefined,
-          mediaId,
-          ignoreProvidedUrl,
-          excludeSources,
-          musicInfo: {
-            name: song.title,
-            artist: song.artist,
-            album: song.album || undefined
-          }
-        }
-      )
-    } catch {
-      if (!ignoreProvidedUrl && hasPlayUrl) {
-        ignoreProvidedUrl = true
-        continue
-      }
-      return null
-    }
-
-    const sourceUrl = candidate?.url
-    if (!sourceUrl || (song.musicPlatform === 'tencent' && isKnownInvalidQqAudioUrl(sourceUrl))) {
-      if (candidate?.source === 'play-url') {
-        ignoreProvidedUrl = true
-      } else if (candidate?.source && !excludeSources.includes(candidate.source)) {
-        excludeSources.push(candidate.source)
-      }
-      continue
-    }
-
-    const duration = await readClientAudioDuration(song, signal, sourceUrl)
-    if (signal?.aborted) return null
-    const isNetease = song.musicPlatform === 'netease' || song.musicPlatform === 'netease-podcast'
-    if (duration != null && !(isNetease && duration === 30)) {
-      return duration
-    }
-
-    if (candidate.source === 'play-url') {
-      ignoreProvidedUrl = true
-    } else if (candidate.source && !excludeSources.includes(candidate.source)) {
-      excludeSources.push(candidate.source)
-    } else {
-      ignoreProvidedUrl = true
-    }
-  }
-
-  return null
-}
-
-/**
- * 并发执行任务列表，限制同时进行数。
- * @param {Array<{fn:(signal)=>Promise, signal:AbortSignal}>} items
- * @param {number} concurrency 并发数，默认 3
- * @param {(done:number,total:number)=>void} [onProgress] 进度回调
- * @returns {Promise<Array<{ok:boolean,result:any}>>} 保持原始顺序
- */
-const runConcurrent = async (items, concurrency = 3, onProgress, onItemComplete) => {
-  const results = new Array(items.length)
-  let nextIndex = 0
-  let completed = 0
-  let aborted = false
-
-  const worker = async () => {
-    while (nextIndex < items.length && !aborted) {
-      const idx = nextIndex++
-      const item = items[idx]
-      let entry
-      try {
-        if (item.signal?.aborted) {
-          aborted = true
-          entry = { ok: false, result: null }
-        } else {
-          const res = await item.fn(item.signal)
-          entry = { ok: true, result: res }
-        }
-      } catch (err) {
-        entry = { ok: false, result: err }
-      }
-      results[idx] = entry
-      completed++
-      onProgress?.(completed, items.length)
-      onItemComplete?.(idx, entry)
-    }
-  }
-
-  const workers = []
-  for (let i = 0; i < Math.min(concurrency, items.length); i++) {
-    workers.push(worker())
-  }
-
-  await Promise.all(workers)
-  return results
-}
-
-const requestSongDuration = async (song, signal) => {
-  const clientDuration = await resolveClientAudioDuration(song, signal)
-  if (clientDuration != null) {
-    return await $fetch('/api/admin/songs/duration', {
-      method: 'POST',
-      body: { songId: song.id, durationSeconds: clientDuration },
-      signal,
-      ...auth.getAuthConfig()
-    })
-  }
-
-  return await $fetch('/api/admin/songs/duration', {
-    method: 'POST',
-    body: { songId: song.id },
-    signal,
-    ...auth.getAuthConfig()
-  })
-}
-
-// 刷新歌曲时长
-const refreshDuration = async (song) => {
-  const songId = song.id
-  if (!song.musicPlatform || !song.musicId) {
-    if (window.$showNotification) {
-      window.$showNotification(locale.value.messages.durationNoPlatform, 'warning')
-    }
-    return
-  }
-
-  // 清除上次刷新状态
-  delete durationRefreshStatus.value[songId]
-  refreshingDuration.value[songId] = true
-  try {
-    const result = await requestSongDuration(song)
-
-    if (result.success && result.durationSeconds) {
-      // 更新待排歌曲列表
-      const songIndex = songs.value.findIndex((s) => s.id === songId)
-      if (songIndex !== -1) {
-        songs.value[songIndex].durationSeconds = result.durationSeconds
-      }
-      // 更新已排歌曲列表
-      for (const schedule of localScheduledSongs.value) {
-        if (schedule.song && schedule.song.id === songId) {
-          schedule.song.durationSeconds = result.durationSeconds
-          break
-        }
-      }
-      // 更新备选池
-      for (const p of songPool.value) {
-        if (p.songId === songId) { p.durationSeconds = result.durationSeconds; break }
-      }
-      // 更新重播申请
-      for (const r of replayRequests.value) {
-        if (r.id === songId) { r.durationSeconds = result.durationSeconds; break }
-      }
-      // 标记成功，3 秒后清除颜色标记
-      durationRefreshStatus.value[songId] = 'success'
-      setTimeout(() => {
-        if (durationRefreshStatus.value[songId] === 'success') {
-          delete durationRefreshStatus.value[songId]
-        }
-      }, 3000)
-      if (window.$showNotification) {
-        window.$showNotification(locale.value.messages.durationUpdated, 'success')
-      }
-    } else {
-      // 标记失败
-      durationRefreshStatus.value[songId] = 'error'
-      setTimeout(() => {
-        if (durationRefreshStatus.value[songId] === 'error') {
-          delete durationRefreshStatus.value[songId]
-        }
-      }, 3000)
-      if (window.$showNotification) {
-        window.$showNotification(locale.value.messages.durationFailed, 'error')
-      }
-    }
-  } catch (err) {
-    console.error('刷新时长失败:', err)
-    // 标记失败
-    durationRefreshStatus.value[songId] = 'error'
-    setTimeout(() => {
-      if (durationRefreshStatus.value[songId] === 'error') {
-        delete durationRefreshStatus.value[songId]
-      }
-    }, 3000)
-    if (window.$showNotification) {
-      window.$showNotification(localizeServerError(err), 'error')
-    }
-  } finally {
-    delete refreshingDuration.value[songId]
-  }
-}
-
-// 批量刷新时长 AbortController
-let refreshAllAbortController = null
-let refreshAutoCandidatesAbortController = null
-
-// 批量刷新歌曲时长
-// source: 'pending' = 待排库（默认），'scheduled' = 播放顺序
-const refreshAllDurations = async (source = 'pending') => {
-  // 中止上次未完成的批量刷新
-  refreshAllAbortController?.abort()
-  refreshAllAbortController = new AbortController()
-  const { signal } = refreshAllAbortController
-
-  // 根据 source 确定目标歌曲列表
-  const targets = []
-  if (source === 'scheduled') {
-    const seen = new Set()
-    for (const schedule of localScheduledSongs.value) {
-      const song = schedule.song
-      if (song?.musicPlatform && song?.musicId && !seen.has(song.id)) {
-        seen.add(song.id)
-        targets.push(song)
-      }
-    }
-  } else {
-    const seen = new Set()
-    for (const song of filteredUnscheduledSongs.value) {
-      if (song.musicPlatform && song.musicId && !seen.has(song.id)) {
-        seen.add(song.id)
-        targets.push(song)
-      }
-    }
-  }
-
-  if (targets.length === 0) {
-    if (window.$showNotification) {
-      window.$showNotification(callLocale('allDurationsSkipped', '当前无可刷新时长的歌曲'), 'info')
-    }
-    return
-  }
-
-  const toRefresh = targets
-
-  refreshingAllDurations.value = {
-    running: true,
-    progress: callLocale('allDurationsProgressTotal', `${toRefresh.length} 首歌`, toRefresh.length),
-    done: 0,
-    total: toRefresh.length
-  }
-  let successCount = 0
-  let failCount = 0
-
-  // 将单首歌结果写入 UI 状态（先获取到的先显示）
-  const applyRefreshResult = (song, result) => {
-    if (result.success && result.durationSeconds) {
-      const dur = result.durationSeconds
-      // 更新已排歌曲列表
-      for (const schedule of localScheduledSongs.value) {
-        if (schedule.song && schedule.song.id === song.id) {
-          schedule.song.durationSeconds = dur
-          break
-        }
-      }
-      // 更新待排歌曲列表
-      const songIndex = songs.value.findIndex((s) => s.id === song.id)
-      if (songIndex !== -1) {
-        songs.value[songIndex].durationSeconds = dur
-      }
-      for (const poolItem of songPool.value) {
-        if (poolItem.songId === song.id) poolItem.durationSeconds = dur
-      }
-      // 标记成功（颜色统一在全部完成后清除）
-      durationRefreshStatus.value[song.id] = 'success'
-      successCount++
-    } else {
-      // 标记失败
-      durationRefreshStatus.value[song.id] = 'error'
-      failCount++
-    }
-  }
-
-  const resultsPromise = runConcurrent(
-    toRefresh.map((song) => ({
-      fn: async (sig) => {
-        if (sig.aborted) return { songId: song.id, aborted: true }
-        const r = await requestSongDuration(song, sig)
-        return { songId: song.id, ...r }
-      },
-      signal
-    })),
-    3,
-    (completed) => {
-      refreshingAllDurations.value.done = completed
-    },
-    (idx, entry) => {
-      const song = toRefresh[idx]
-      if (!song || !entry || entry.aborted) return
-      applyRefreshResult(song, entry.result)
-      // 同时更新完成数和进度提示
-      refreshingAllDurations.value.done = successCount + failCount
-      refreshingAllDurations.value.progress = callLocale(
-        'allDurationsProgressWithCount',
-        `${successCount + failCount}/${toRefresh.length}（成功${successCount} 失败${failCount}）`,
-        `${successCount + failCount}`, `${toRefresh.length}`, `${successCount}`, `${failCount}`
-      )
-    }
-  )
-
-  try {
-    // 等所有歌曲处理完
-    await resultsPromise
-  } finally {
-    // 等待 2 秒后统一清除颜色标记
-    await new Promise((r) => setTimeout(r, 2000))
-    for (const song of toRefresh) {
-      delete durationRefreshStatus.value[song.id]
-    }
-    refreshAllAbortController = null
-    refreshingAllDurations.value = { running: false, progress: '', done: 0, total: 0 }
-  }
-
-  if (window.$showNotification) {
-    if (successCount > 0 && failCount === 0) {
-      window.$showNotification(locale.value.messages.allDurationsUpdated(successCount), 'success')
-    } else if (successCount > 0 && failCount > 0) {
-      window.$showNotification(locale.value.messages.allDurationsPartial(successCount, failCount), 'warning')
-    } else {
-      window.$showNotification(locale.value.messages.allDurationsFailed, 'error')
-    }
-  }
-}
-
-// 刷新自动排期候选歌曲的时长
-const refreshAutoCandidateDurations = async () => {
-  // 中止上次未完成的刷新
-  refreshAutoCandidatesAbortController?.abort()
-  refreshAutoCandidatesAbortController = new AbortController()
-  const { signal } = refreshAutoCandidatesAbortController
-
-  const candidates = autoScheduleCandidates.value
-  if (candidates.length === 0) {
-    if (window.$showNotification) {
-      window.$showNotification(locale.value.messages.candidateDurationsSkipped, 'info')
-    }
-    return
-  }
-
-  const toRefresh = candidates.filter((s) => s.musicPlatform && s.musicId)
-  if (toRefresh.length === 0) {
-    if (window.$showNotification) {
-      window.$showNotification(locale.value.messages.candidateDurationsSkipped, 'info')
-    }
-    return
-  }
-
-  refreshingAutoCandidates.value = {
-    running: true,
-    progress: callLocale('candidateDurationsProgressTotal', `${toRefresh.length} 首歌`, `${toRefresh.length} songs`),
-    success: 0,
-    fail: 0
-  }
-  let successCount = 0
-  let failCount = 0
-
-  // 将单首歌结果写入 UI 状态（先获取到的先显示）
-  const applyRefreshResult = (song, result) => {
-    if (result.success && result.durationSeconds) {
-      const dur = result.durationSeconds
-      const songIdx = songs.value.findIndex((s) => s.id === song.id)
-      if (songIdx !== -1) songs.value[songIdx].durationSeconds = dur
-      for (const r of replayRequests.value) {
-        if (r.id === song.id) { r.durationSeconds = dur; break }
-      }
-      for (const p of songPool.value) {
-        if (p.songId === song.id) { p.durationSeconds = dur; break }
-      }
-      durationRefreshStatus.value[song.id] = 'success'
-      successCount++
-    } else {
-      durationRefreshStatus.value[song.id] = 'error'
-      failCount++
-    }
-  }
-
-  const resultsPromise = runConcurrent(
-    toRefresh.map((song) => ({
-      fn: async (sig) => {
-        if (sig.aborted) return { songId: song.id, aborted: true }
-        const r = await requestSongDuration(song, sig)
-        return { songId: song.id, ...r }
-      },
-      signal
-    })),
-    3,
-    (completed) => {
-      refreshingAutoCandidates.value.success = completed - failCount
-      refreshingAutoCandidates.value.fail = failCount
-      refreshingAutoCandidates.value.progress = `${completed} / ${toRefresh.length}`
-    },
-    (idx, entry) => {
-      const song = toRefresh[idx]
-      if (!song || !entry || entry.aborted) return
-      applyRefreshResult(song, entry.result)
-      refreshingAutoCandidates.value.success = successCount
-      refreshingAutoCandidates.value.fail = failCount
-      refreshingAutoCandidates.value.progress = `${successCount + failCount} / ${toRefresh.length}`
-    }
-  )
-
-  try {
-    // 等所有歌曲处理完
-    await resultsPromise
-  } finally {
-    // 等待 2 秒后统一清除颜色标记
-    await new Promise((r) => setTimeout(r, 2000))
-    for (const song of toRefresh) {
-      delete durationRefreshStatus.value[song.id]
-    }
-    refreshAutoCandidatesAbortController = null
-    refreshingAutoCandidates.value = { running: false, progress: '' }
-  }
-
-  if (window.$showNotification) {
-    if (successCount > 0 && failCount === 0) {
-      window.$showNotification(locale.value.messages.candidateDurationsUpdated(successCount), 'success')
-    } else if (successCount > 0 && failCount > 0) {
-      window.$showNotification(locale.value.messages.candidateDurationsPartial(successCount, failCount), 'warning')
-    } else {
-      window.$showNotification(locale.value.messages.candidateDurationsFailed, 'error')
-    }
-  }
-}
-
-// ===== 自动排期 =====
-// 自动排期弹窗 Esc 关闭
-const handleAutoScheduleEscape = (e) => {
-  if (e.key === 'Escape' && showAutoScheduleDialog.value) {
-    closeAutoScheduleDialog()
-  }
-}
-
-// 打开/关闭/重置时保留用户上次的排期配置（由 localStorage 记忆）
-const openAutoScheduleDialog = () => {
-  autoScheduleResult.value = { songs: [], totalDuration: 0, diff: 0, absDiff: 0 }
-  autoSchedulePlans.value = []
-  currentPlanIndex.value = 0
-  showAutoScheduleDialog.value = true
-}
-const closeAutoScheduleDialog = () => {
-  showAutoScheduleDialog.value = false
-  autoScheduleResult.value = { songs: [], totalDuration: 0, diff: 0, absDiff: 0 }
-  autoSchedulePlans.value = []
-  currentPlanIndex.value = 0
-}
-const resetAutoSchedule = () => {
-  autoScheduleResult.value = { songs: [], totalDuration: 0, diff: 0, absDiff: 0 }
-  autoSchedulePlans.value = []
-  currentPlanIndex.value = 0
-}
-
-const autoScheduleCandidates = computed(() => {
-  const scheduledIds = new Set(localScheduledSongs.value.map((s) => s.song && s.song.id).filter(Boolean))
-
-  // 已加入其他日期草稿的歌曲，排除出自动排期范围
-  const otherDateDraftIds = new Set(
-    drafts.value
-      .filter((d) => d.song && d.song.id && d.playDate && getScheduleDateValue(d.playDate) !== selectedDate.value)
-      .map((d) => d.song.id)
-  )
-  const excludeIds = new Set([...scheduledIds, ...otherDateDraftIds])
-
-  // 备选池模式：复用备选池统一过滤（排除已排期/已播放），与备选池展示口径一致
-  if (activeTab.value === 'pool') {
-    return filteredPoolSongs.value
-      .filter((item) => !excludeIds.has(item.songId))
-      .map(poolCandidateFromItem)
-  }
-
-  // 待排库/重播/所有：复用 allUnscheduledSongs 的过滤逻辑，再排除已排期歌曲
-  const base = allUnscheduledSongs.value.filter((s) => !excludeIds.has(s.id))
-  if (activeTab.value === 'all') {
-    // 「所有」额外纳入备选池未排期且未播放的歌曲
-    const poolCandidates = filteredPoolSongs.value
-      .filter((item) => !excludeIds.has(item.songId))
-      .map(poolCandidateFromItem)
-    const baseIds = new Set(base.map((s) => s.id))
-    return [...base, ...poolCandidates.filter((p) => !baseIds.has(p.songId))]
-  }
-  return base
-})
-
-const buildPreSelected = () => {
-  return autoScheduleFixExisting.value ? localScheduledSongs.value.filter(
-    (s) => typeof s.song.durationSeconds === 'number' && s.song.durationSeconds > 0
-  ).map((s) => ({
-    id: s.song.id,
-    songId: s.song.id,
-    title: s.song.title,
-    artist: s.song.artist,
-    durationSeconds: s.song.durationSeconds || 0,
-    replayRequestId: s.replayRequestId || null,
-    musicId: s.song.musicId || null,
-    musicPlatform: s.song.musicPlatform || null,
-    requester: s.song.requester || null,
-    cover: s.song.cover || null,
-    createdAt: s.song.createdAt || null
-  })) : []
-}
-
-const runAutoSchedule = () => {
-  const candidates = autoScheduleCandidates.value
-  const candidateIds = new Set(candidates.map((s) => s.id))
-  const preSelected = buildPreSelected()
-  const fn = autoScheduleAlgorithm.value === 'auto'
-    ? (autoScheduleCandidates.value.length < 20 ? autoScheduleExhaustive : autoSchedule)
-    : (autoScheduleAlgorithm.value === 'exhaustive' ? autoScheduleExhaustive : autoSchedule)
-  const targetSongCount = Number.isFinite(autoScheduleTargetSongCount.value) && autoScheduleTargetSongCount.value > 0
-    ? Math.floor(autoScheduleTargetSongCount.value)
-    : null
-  const targetRequesterCount = Number.isFinite(autoScheduleTargetRequesterCount.value) && autoScheduleTargetRequesterCount.value > 0
-    ? Math.floor(autoScheduleTargetRequesterCount.value)
-    : null
-  const results = fn(autoScheduleDirection.value, autoScheduleTargetMinutes.value, candidates, preSelected, 10, targetSongCount, targetRequesterCount)
-  const plansArray = Array.isArray(results) ? results : [results]
-  const first = plansArray[0]
-  if (!first || first.songs.length === 0) {
-    if (window.$showNotification) {
-      window.$showNotification(callLocale('messages.autoScheduleNoResult', '未能找到满足条件的歌曲组合'), 'warning')
-    }
-    return
-  }
-  autoSchedulePlans.value = plansArray.map((p) => ({ ...p, candidateIds }))
-  currentPlanIndex.value = 0
-  autoScheduleResult.value = autoSchedulePlans.value[0]
-}
-
-const generateMorePlans = async () => {
-  if (generatingNewPlan.value) return
-  generatingNewPlan.value = true
-  const candidates = autoScheduleCandidates.value
-  const candidateIds = new Set(candidates.map((s) => s.id))
-  const preSelected = buildPreSelected()
-
-  // 动态 plansCount：已有方案数 + 10，确保新增返回新的解
-  const requestCount = autoSchedulePlans.value.length + 10
-  const fn = autoScheduleAlgorithm.value === 'auto'
-    ? (autoScheduleCandidates.value.length < 20 ? autoScheduleExhaustive : autoSchedule)
-    : (autoScheduleAlgorithm.value === 'exhaustive' ? autoScheduleExhaustive : autoSchedule)
-  const targetSongCount = Number.isFinite(autoScheduleTargetSongCount.value) && autoScheduleTargetSongCount.value > 0
-    ? Math.floor(autoScheduleTargetSongCount.value)
-    : null
-  const targetRequesterCount = Number.isFinite(autoScheduleTargetRequesterCount.value) && autoScheduleTargetRequesterCount.value > 0
-    ? Math.floor(autoScheduleTargetRequesterCount.value)
-    : null
-  const results = fn(autoScheduleDirection.value, autoScheduleTargetMinutes.value, candidates, preSelected, requestCount, targetSongCount, targetRequesterCount)
-  const plansArray = Array.isArray(results) ? results : [results]
-  const existingKeys = new Set(autoSchedulePlans.value.map((p) => p.songs.map((s) => s.id).sort().join(',')))
-  let addedCount = 0
-  let firstNewIndex = 0
-  for (const plan of plansArray) {
-    const key = plan.songs.map((s) => s.id).sort().join(',')
-    if (!existingKeys.has(key) && plan.songs.length > 0) {
-      autoSchedulePlans.value.push({ ...plan, candidateIds })
-      existingKeys.add(key)
-      if (addedCount === 0) firstNewIndex = autoSchedulePlans.value.length - 1
-      addedCount++
-    }
-  }
-  if (addedCount > 0) {
-    // 跳到第一个新增方案，不跳末尾
-    currentPlanIndex.value = firstNewIndex
-    autoScheduleResult.value = autoSchedulePlans.value[currentPlanIndex.value]
-  } else if (window.$showNotification) {
-    window.$showNotification(callLocale('messages.autoScheduleNoMorePlans', '已无更多不同方案'), 'warning')
-  }
-  generatingNewPlan.value = false
-}
-
-// 切换到上一个方案
-const goToPreviousPlan = () => {
-  if (currentPlanIndex.value > 0) {
-    currentPlanIndex.value--
-    autoScheduleResult.value = autoSchedulePlans.value[currentPlanIndex.value]
-  }
-}
-
-// 切换到下一个方案；穷举模式下到末尾则新增方案
-const goToNextPlan = () => {
-  if (currentPlanIndex.value < autoSchedulePlans.value.length - 1) {
-    currentPlanIndex.value++
-    autoScheduleResult.value = autoSchedulePlans.value[currentPlanIndex.value]
-  } else if (actualExhaustive.value) {
-    generateMorePlans()
-  }
-}
-
-const confirmAutoSchedule = () => {
-  const candidateIds = autoScheduleResult.value.candidateIds || new Set()
-  const confirmed = autoScheduleResult.value.songs.filter((song) =>
-    candidateIds.has(song.id)
-  )
-  const baseId = Date.now()
-  let appliedCount = 0
-  let appliedTotalSec = 0
-  for (let i = 0; i < confirmed.length; i++) {
-    const song = confirmed[i]
-    const existingIndex = localScheduledSongs.value.findIndex((s) => s.song.id === song.id)
-    if (existingIndex !== -1) continue
-
-    const newSchedule = {
-      id: baseId + i,
-      replayRequestId: song.replayRequestId || null,
-      song,
-      playDate: selectedDate.value,
-      sequence: localScheduledSongs.value.length + 1,
-      isNew: true,
-      isLocalOnly: true
-    }
-    scheduledSongIds.value.add(song.id)
-    setSongScheduledFlag(song.id, true)
-    localScheduledSongs.value.push(newSchedule)
-    hasChanges.value = true
-    appliedCount++
-    appliedTotalSec += song.durationSeconds
-  }
-  if (appliedCount > 0 && window.$showNotification) {
-    window.$showNotification(
-      locale.value.messages.confirmAutoScheduleApplied(appliedCount, formatDuration(appliedTotalSec)),
-      'success'
-    )
-  }
-  closeAutoScheduleDialog()
-}
-
 // 格式化播出时段时间范围
 const formatPlayTimeRange = (playTime) => {
   if (!playTime) return ''
@@ -4211,25 +1525,19 @@ const formatPlayTimeRange = (playTime) => {
   if (playTime.startTime && playTime.endTime) {
     return `${start} - ${end}`
   } else if (playTime.startTime) {
-    return callLocale('playTimeStart', `${start} 开始`, start)
+    return `${start} 开始`
   } else if (playTime.endTime) {
-    return callLocale('playTimeEnd', `${end} 结束`, end)
+    return `${end} 结束`
   }
 
-  return locale.value.allDay
+  return '全天'
 }
 
 // 获取播出时段名称
 const getPlayTimeName = (playTimeId) => {
   if (!playTimeId || !playTimes.value) return ''
   const playTime = playTimes.value.find((pt) => pt.id === playTimeId)
-  if (!playTime) return ''
-
-  let label = playTime.name
-  if (playTime.startTime || playTime.endTime) {
-    label += ` (${formatPlayTimeRange(playTime)})`
-  }
-  return label
+  return playTime ? playTime.name : ''
 }
 
 // 加载学期列表
@@ -4239,7 +1547,7 @@ const loadSemesters = async () => {
     await semesterService.fetchCurrentSemester()
 
     // 构建学期列表，包含"全部"选项和各个学期
-  const semesterList = [{ id: 'all', name: locale.value.allSemesters, isCurrent: false }]
+    const semesterList = [{ id: 'all', name: '全部', isCurrent: false }]
 
     // 添加当前学期（如果存在）
     if (semesterService.currentSemester.value) {
@@ -4270,9 +1578,9 @@ const loadSemesters = async () => {
 
     // 默认选择当前学期（如果存在），否则选择"全部"
     if (semesterService.currentSemester.value) {
-      selectedSemester.value = semesterService.currentSemester.value.id || 'current'
+      selectedSemester.value = semesterService.currentSemester.value.name
     } else if (semesterList.length > 0) {
-      selectedSemester.value = semesterList[0].id
+      selectedSemester.value = semesterList[0].name
     }
   } catch (error) {
     console.error('获取学期列表失败:', error)
@@ -4294,14 +1602,14 @@ const updateLocalScheduledSongs = () => {
   // 获取已发布的排期
   const todaySchedules = publicSchedules.value.filter((s) => {
     if (!s.playDate) return false
-    const scheduleDateStr = getScheduleDateValue(s.playDate)
+    const scheduleDateStr = new Date(s.playDate).toISOString().split('T')[0]
     return scheduleDateStr === selectedDate.value
   })
 
   // 获取草稿排期
   const todayDrafts = drafts.value.filter((draft) => {
     if (!draft.playDate) return false
-    const draftDateStr = getScheduleDateValue(draft.playDate)
+    const draftDateStr = new Date(draft.playDate).toISOString().split('T')[0]
     return draftDateStr === selectedDate.value
   })
 
@@ -4342,8 +1650,7 @@ const dragStart = (event, song) => {
     'text/plain',
     JSON.stringify({
       type: 'add-to-schedule',
-      songId: song.id,
-      replayRequestId: song.replayRequestId || null
+      songId: song.id
     })
   )
 
@@ -4419,7 +1726,30 @@ const dropToSequence = async (event) => {
     const dragData = JSON.parse(data)
 
     if (dragData.type === 'add-to-schedule') {
-      addSongToScheduleFromDrag(event)
+      const songId = parseInt(dragData.songId)
+      // 尝试在普通歌曲列表和重播申请列表中查找
+      let song = songs.value.find((s) => s.id === songId)
+      if (!song) {
+        song = replayRequests.value.find((s) => s.id === songId)
+      }
+
+      if (!song) return
+
+      const existingIndex = localScheduledSongs.value.findIndex((s) => s.song.id === songId)
+      if (existingIndex !== -1) return
+
+      const newSchedule = {
+        id: Date.now(),
+        song: song,
+        playDate: selectedDate.value, // 直接使用日期字符串
+        sequence: localScheduledSongs.value.length + 1,
+        isNew: true,
+        isLocalOnly: true
+      }
+
+      scheduledSongIds.value.add(songId)
+      localScheduledSongs.value.push(newSchedule)
+      hasChanges.value = true
     }
   } catch (err) {
     console.error('处理拖放失败:', err)
@@ -4433,6 +1763,7 @@ const dropReorder = async (event, dropIndex) => {
   try {
     const data = event.dataTransfer.getData('text/plain')
     if (!data) return
+
     const dragData = JSON.parse(data)
 
     if (dragData.type === 'reorder-schedule' && draggedSchedule.value) {
@@ -4452,7 +1783,38 @@ const dropReorder = async (event, dropIndex) => {
       localScheduledSongs.value = newOrder
       hasChanges.value = true
     } else if (dragData.type === 'add-to-schedule') {
-      insertSongToScheduleAt(event, dropIndex)
+      // 处理从左侧拖到特定位置
+      const songId = parseInt(dragData.songId)
+      // 尝试在普通歌曲列表和重播申请列表中查找
+      let song = songs.value.find((s) => s.id === songId)
+      if (!song) {
+        song = replayRequests.value.find((s) => s.id === songId)
+      }
+
+      if (!song) return
+
+      const existingIndex = localScheduledSongs.value.findIndex((s) => s.song.id === songId)
+      if (existingIndex !== -1) return
+
+      const newSchedule = {
+        id: Date.now(),
+        song: song,
+        playDate: selectedDate.value, // 直接使用日期字符串
+        sequence: dropIndex + 1,
+        isNew: true
+      }
+
+      scheduledSongIds.value.add(songId)
+
+      const newOrder = [...localScheduledSongs.value]
+      newOrder.splice(dropIndex, 0, newSchedule)
+
+      newOrder.forEach((item, index) => {
+        item.sequence = index + 1
+      })
+
+      localScheduledSongs.value = newOrder
+      hasChanges.value = true
     }
   } catch (err) {
     console.error('处理重排序失败:', err)
@@ -4461,109 +1823,6 @@ const dropReorder = async (event, dropIndex) => {
   draggedSchedule.value = null
 }
 
-// 同步歌曲列表中对应歌曲的已排期标记（排期与歌曲列表中的歌曲是不同引用）
-const setSongScheduledFlag = (songId, scheduled) => {
-  const songInList = songs.value.find((s) => s.id === songId)
-  if (songInList) songInList.scheduled = scheduled
-}
-
-// 从拖拽数据中查找歌曲（优先查 songs/replayRequests，再回退到 pool）
-const findSongFromDragData = (dragData) => {
-  const songId = parseInt(dragData.songId)
-  const isReplayRequest = dragData.replayRequestId != null
-  let song = isReplayRequest
-    ? replayRequests.value.find((s) => s.replayRequestId === dragData.replayRequestId)
-    : songs.value.find((s) => s.id === songId)
-  if (!song) {
-    song = replayRequests.value.find((s) => s.id === songId)
-  }
-  if (!song) {
-    const poolItem = songPool.value.find((p) => p.songId === songId)
-    if (poolItem) {
-      song = {
-        id: poolItem.songId,
-        title: poolItem.title,
-        artist: poolItem.artist,
-        durationSeconds: poolItem.durationSeconds || null,
-        cover: poolItem.cover || null,
-        musicId: poolItem.musicId || null,
-        musicPlatform: poolItem.musicPlatform || null,
-        requester: poolItem.requester || null,
-        requesterId: poolItem.requesterId || null,
-        requesterGrade: poolItem.requesterGrade || null,
-        requesterClass: poolItem.requesterClass || null,
-        grade: poolItem.grade || null,
-        class: poolItem["class"] || null,
-        voteCount: poolItem.voteCount || 0,
-        cardCodeId: poolItem.cardCodeId || null,
-        usedCardCode: poolItem.usedCardCode || false,
-        hasSubmissionNote: poolItem.hasSubmissionNote || false,
-        submissionNote: poolItem.submissionNote || null,
-        preferredPlayTimeId: poolItem.preferredPlayTimeId || null,
-        semester: poolItem.semester || null
-      }
-    }
-  }
-  return { song, songId }
-}
-
-// 从拖拽数据中提取歌曲并添加到排期列表末尾（共享逻辑）
-const addSongToScheduleFromDrag = (event) => {
-  const { song, songId } = findSongFromDragData(JSON.parse(event.dataTransfer.getData('text/plain')) || {})
-  if (!song) return
-
-  const existingIndex = localScheduledSongs.value.findIndex((s) => s.song.id === songId)
-  if (existingIndex !== -1) return
-
-  const insertIndex = localScheduledSongs.value.length
-
-  const newSchedule = {
-    id: Date.now(),
-    replayRequestId: song.replayRequestId || null,
-    song: song,
-    playDate: selectedDate.value,
-    sequence: insertIndex + 1,
-    isNew: true,
-    isLocalOnly: true
-  }
-
-  scheduledSongIds.value.add(songId)
-  setSongScheduledFlag(songId, true)
-  localScheduledSongs.value.push(newSchedule)
-  hasChanges.value = true
-}
-
-// 从拖拽数据中提取歌曲并插入到指定位置（共享逻辑）
-const insertSongToScheduleAt = (event, dropIndex) => {
-  const dragData = JSON.parse(event.dataTransfer.getData('text/plain'))
-  const { song, songId } = findSongFromDragData(dragData)
-  if (!song) return
-
-  const existingIndex = localScheduledSongs.value.findIndex((s) => s.song.id === songId)
-  if (existingIndex !== -1) return
-
-  const newSchedule = {
-    id: Date.now(),
-    replayRequestId: song.replayRequestId || null,
-    song: song,
-    playDate: selectedDate.value,
-    sequence: dropIndex + 1,
-    isNew: true
-  }
-
-  scheduledSongIds.value.add(songId)
-  setSongScheduledFlag(songId, true)
-
-  const newOrder = [...localScheduledSongs.value]
-  newOrder.splice(dropIndex, 0, newSchedule)
-  newOrder.forEach((item, index) => {
-    item.sequence = index + 1
-  })
-
-  localScheduledSongs.value = newOrder
-  hasChanges.value = true
-}
-
 // 添加歌曲到排期（点击方式）
 const addSongToSchedule = (song) => {
   const existingIndex = localScheduledSongs.value.findIndex((s) => s.song.id === song.id)
@@ -4571,7 +1830,6 @@ const addSongToSchedule = (song) => {
 
   const newSchedule = {
     id: Date.now(),
-    replayRequestId: song.replayRequestId || null,
     song: song,
     playDate: selectedDate.value,
     sequence: localScheduledSongs.value.length + 1,
@@ -4580,7 +1838,6 @@ const addSongToSchedule = (song) => {
   }
 
   scheduledSongIds.value.add(song.id)
-  setSongScheduledFlag(song.id, true)
   localScheduledSongs.value.push(newSchedule)
   hasChanges.value = true
 
@@ -4596,7 +1853,6 @@ const removeSongFromSchedule = (schedule) => {
 
     if (removed.song) {
       scheduledSongIds.value.delete(removed.song.id)
-      setSongScheduledFlag(removed.song.id, false)
     }
 
     // 重新排序
@@ -4628,8 +1884,6 @@ const handleReturnToDraggable = async (event) => {
         // 如果是本地新增的，直接移除；如果是已存在的，需要记录删除操作（这里简化为本地移除，保存时处理）
         if (removed.song) {
           scheduledSongIds.value.delete(removed.song.id)
-          // 同步清除歌曲列表中的已排期标记，否则已发布歌曲移出后会从待排列表中消失
-          setSongScheduledFlag(removed.song.id, false)
         }
 
         // 重新排序
@@ -4651,10 +1905,10 @@ const handleReturnToDraggable = async (event) => {
 const markAllAsPlayed = async () => {
   if (localScheduledSongs.value.length === 0) return
 
-  confirmDialogTitle.value = locale.value.confirmations.markAllPlayedTitle
-  confirmDialogMessage.value = locale.value.confirmations.markAllPlayedMessage
+  confirmDialogTitle.value = '标记全部已播'
+  confirmDialogMessage.value = '确定要将列表中的所有歌曲标记为已播放吗？'
   confirmDialogType.value = 'info'
-  confirmDialogConfirmText.value = locale.value.confirmations.markAllPlayedConfirm
+  confirmDialogConfirmText.value = '确认标记'
 
   confirmAction.value = async () => {
     loading.value = true
@@ -4668,7 +1922,7 @@ const markAllAsPlayed = async () => {
       })
 
       if (window.$showNotification) {
-        window.$showNotification(locale.value.messages.allMarkedPlayed, 'success')
+        window.$showNotification('所有歌曲已标记为播放', 'success')
       }
 
       // 重新加载数据
@@ -4676,7 +1930,7 @@ const markAllAsPlayed = async () => {
     } catch (err) {
       console.error('标记播放失败:', err)
       if (window.$showNotification) {
-        window.$showNotification(locale.value.errors.operationFailed, 'error')
+        window.$showNotification('操作失败', 'error')
       }
     } finally {
       loading.value = false
@@ -4686,31 +1940,6 @@ const markAllAsPlayed = async () => {
   showConfirmDialog.value = true
 }
 
-// 清空排期列表
-const clearScheduleList = () => {
-  if (localScheduledSongs.value.length === 0) return
-
-  confirmDialogTitle.value = locale.value.confirmations.clearListTitle
-  confirmDialogMessage.value = locale.value.confirmations.clearListMessage
-  confirmDialogType.value = 'danger'
-  confirmDialogConfirmText.value = locale.value.confirmations.clearListConfirm
-
-  confirmAction.value = () => {
-    localScheduledSongs.value.forEach((schedule) => {
-      if (schedule.song) {
-        scheduledSongIds.value.delete(schedule.song.id)
-      }
-    })
-    localScheduledSongs.value = []
-    hasChanges.value = true
-    if (window.$showNotification) {
-      window.$showNotification(locale.value.messages.playlistCleared, 'success')
-    }
-  }
-
-  showConfirmDialog.value = true
-}
-
 // 保存并发布
 const saveSequence = async () => {
   try {
@@ -4720,10 +1949,139 @@ const saveSequence = async () => {
   }
 }
 
+// 一键自动排入期望播出的歌曲
+const autoScheduleExpected = () => {
+  let count = 0
+  const expectedSongs = [...filteredUnscheduledSongs.value]
+
+  if (expectedSongs.length === 0) {
+    showToast('当前没有待排期的歌曲', 'info')
+    return
+  }
+
+  if (autoScheduleStrategy.value === 'contributor-count') {
+    expectedSongs.sort((a, b) => {
+      const diffA = getSongContributorCount(b) - getSongContributorCount(a)
+      if (diffA !== 0) return diffA
+      const seqDiff = (a.expectedPlaySequence || 9999) - (b.expectedPlaySequence || 9999)
+      if (seqDiff !== 0) return seqDiff
+      return (b.voteCount || 0) - (a.voteCount || 0)
+    })
+  } else {
+    expectedSongs.sort((a, b) => (a.expectedPlaySequence || 9999) - (b.expectedPlaySequence || 9999))
+  }
+
+  const baseId = Date.now()
+  expectedSongs.forEach((song, idx) => {
+    const existingIndex = localScheduledSongs.value.findIndex((s) => s.song?.id === song.id)
+    if (existingIndex !== -1) return
+
+    const playTimeId = selectedPlayTime.value ? parseInt(selectedPlayTime.value) : null
+    const newSchedule = {
+      id: baseId + idx,
+      song: song,
+      playDate: selectedDate.value,
+      sequence: localScheduledSongs.value.length + 1,
+      playTimeId,
+      isNew: true,
+      isLocalOnly: true
+    }
+    scheduledSongIds.value.add(song.id)
+    localScheduledSongs.value.push(newSchedule)
+    count++
+  })
+
+  localScheduledSongs.value.forEach((item, idx) => {
+    item.sequence = idx + 1
+  })
+
+  hasChanges.value = true
+  const strategyLabel =
+    autoScheduleStrategy.value === 'contributor-count' ? '（按投稿人数优先）' : ''
+  showToast(`已自动排入 ${count} 首待排歌曲${strategyLabel}，请注意调整顺序后保存`, 'success')
+}
+
+// 构建播放队列
+const confirmBuildPlayQueue = () => {
+  if (localScheduledSongs.value.length === 0) {
+    showToast('当前播放列表为空，无法构建播放队列', 'warning')
+    return
+  }
+
+  confirmDialogTitle.value = '构建播放队列'
+  confirmDialogMessage.value = `确定要将当前播放列表中 ${localScheduledSongs.value.length} 首歌曲按顺序加载到播放器吗？这将覆盖现有播放队列。`
+  confirmDialogType.value = 'info'
+  confirmDialogConfirmText.value = '确认构建'
+  confirmAction.value = async () => {
+    await buildPlayQueue()
+  }
+  showConfirmDialog.value = true
+}
+
+const buildPlayQueue = async () => {
+  try {
+    loading.value = true
+
+    const sorted = [...localScheduledSongs.value].sort((a, b) => {
+      const dateA = new Date(a.playDate || 0).getTime()
+      const dateB = new Date(b.playDate || 0).getTime()
+      if (dateA !== dateB) return dateA - dateB
+      const ptA = a.playTimeId || 0
+      const ptB = b.playTimeId || 0
+      if (ptA !== ptB) return ptA - ptB
+      return (a.sequence || 0) - (b.sequence || 0)
+    })
+
+    const playlist: PlayableSong[] = sorted
+      .map((s) => s.song)
+      .filter((song) => song && song.id)
+      .map((song) => ({
+        id: song.id,
+        title: song.title,
+        artist: song.artist,
+        cover: song.cover || null,
+        musicPlatform: song.musicPlatform || null,
+        musicId: song.musicId || null,
+        playUrl: song.playUrl || null,
+        musicUrl: null
+      }))
+
+    if (playlist.length === 0) {
+      showToast('没有可用的歌曲信息', 'warning')
+      return
+    }
+
+    if (playlist[0].musicUrl) {
+      audioPlayer.playSong(playlist[0], playlist, 0)
+    } else {
+      try {
+        const { getMusicUrl } = await import('~/utils/musicUrl')
+        const first = playlist[0]
+        if (first.playUrl && first.playUrl.trim()) {
+          first.musicUrl = first.playUrl.trim()
+        } else if (first.musicPlatform && first.musicId) {
+          const url = await getMusicUrl(first.musicPlatform, first.musicId, first.playUrl)
+          first.musicUrl = url || null
+        }
+        audioPlayer.playSong(first, playlist, 0)
+      } catch (e) {
+        audioPlayer.playSong(playlist[0], playlist, 0)
+      }
+    }
+
+    showToast(`已成功构建播放队列，共 ${playlist.length} 首歌曲`, 'success')
+  } catch (err) {
+    console.error('构建播放队列失败:', err)
+    showToast('构建播放队列失败: ' + (err as Error).message, 'error')
+  } finally {
+    loading.value = false
+  }
+}
+
 const openMoveDateDialog = () => {
   if (hasChanges.value) {
     if (window.$showNotification) {
-      window.$showNotification(locale.value.messages.saveBeforeMove, 'warning')
+      window.$showNotification('请先保存当前未发布修改后再执行迁移', 'warning')
     }
     return
   }
@@ -4732,45 +2090,23 @@ const openMoveDateDialog = () => {
   showMoveDateDialog.value = true
 }
 
-const openCopyDateDialog = () => {
-  if (hasChanges.value) {
-    if (window.$showNotification) {
-      window.$showNotification(locale.value.messages.saveBeforeCopy, 'warning')
-    }
-    return
-  }
-
-  const baseDate = selectedDate.value
-  const nextWeek = addDaysToString(baseDate, 7)
-  copyMode.value = 'single'
-  copyFromStart.value = baseDate
-  copyFromEnd.value = baseDate
-  copyToStart.value = nextWeek
-  copyToEnd.value = nextWeek
-  copySingleTargetDate.value = nextWeek
-  showCopyDateDialog.value = true
-}
-
-const switchCopyMode = (mode) => {
-  copyMode.value = mode
-}
-
 const confirmMoveDate = async () => {
   const targetDate = moveTargetDate.value.trim()
 
-  if (!parseDateValue(targetDate)) {
+  const targetDateTime = new Date(`${targetDate}T00:00:00.000Z`)
+  if (
+    Number.isNaN(targetDateTime.getTime()) ||
+    targetDateTime.toISOString().split('T')[0] !== targetDate
+  ) {
     if (window.$showNotification) {
-      window.$showNotification(
-        callLocale('errors.invalidTargetDate', '目标日期无效，请使用 YYYY-MM-DD 格式并确保日期有效'),
-        'error'
-      )
+      window.$showNotification('目标日期无效，请使用 YYYY-MM-DD 格式并确保日期有效', 'error')
     }
     return
   }
 
   if (targetDate === selectedDate.value) {
     if (window.$showNotification) {
-      window.$showNotification(locale.value.errors.sameTargetDate, 'warning')
+      window.$showNotification('目标日期不能与当前日期相同', 'warning')
     }
     return
   }
@@ -4778,26 +2114,20 @@ const confirmMoveDate = async () => {
   const sourceDate = selectedDate.value
   const sourceSchedules = [...publicSchedules.value, ...drafts.value].filter((schedule) => {
     if (!schedule.playDate) return false
-    return getScheduleDateValue(schedule.playDate) === sourceDate
+    return new Date(schedule.playDate).toISOString().split('T')[0] === sourceDate
   })
 
   if (sourceSchedules.length === 0) {
     if (window.$showNotification) {
-      window.$showNotification(locale.value.errors.noMovableSongs, 'warning')
+      window.$showNotification('当前日期没有可迁移的歌曲', 'warning')
     }
     return
   }
 
-  confirmDialogTitle.value = locale.value.moveDateTitle
-  confirmDialogMessage.value = callLocale(
-    'confirmations.moveDateMessage',
-    `确定将 ${sourceDate} 的所有 ${sourceSchedules.length} 首歌曲迁移到 ${targetDate} 吗？歌曲顺序与内容将保持不变。`,
-    sourceDate,
-    sourceSchedules.length,
-    targetDate
-  )
+  confirmDialogTitle.value = '迁移排期日期'
+  confirmDialogMessage.value = `确定将 ${sourceDate} 的所有 ${sourceSchedules.length} 首歌曲迁移到 ${targetDate} 吗？歌曲顺序与内容将保持不变。`
   confirmDialogType.value = 'warning'
-  confirmDialogConfirmText.value = locale.value.confirmations.moveDateConfirm
+  confirmDialogConfirmText.value = '确认迁移'
   showMoveDateDialog.value = false
 
   confirmAction.value = async () => {
@@ -4818,309 +2148,17 @@ const confirmMoveDate = async () => {
       if (window.$showNotification) {
         window.$showNotification(
           result?.movedCount > 0
-            ? callLocale(
-                'messages.moveDateSuccess',
-                `已迁移 ${result.movedCount} 首歌曲到 ${targetDate}`,
-                result.movedCount,
-                targetDate
-              )
-            : locale.value.errors.noMovableSongs,
+            ? `已迁移 ${result.movedCount} 首歌曲到 ${targetDate}`
+            : '当前日期没有可迁移的歌曲',
           result?.movedCount > 0 ? 'success' : 'warning'
         )
       }
     } catch (error) {
       console.error('迁移排期日期失败:', error)
       if (window.$showNotification) {
-        const backendMessage =
-          getThrownMessage(error) || formatLocaleValue(locale.value?.unknown) || '未知错误'
+        const backendMessage = error.data?.message || error.data?.statusMessage || error.message
         window.$showNotification(
-          callLocale('errors.moveDateFailed', `迁移失败: ${backendMessage}`, backendMessage),
-          'error'
-        )
-      }
-    } finally {
-      loading.value = false
-    }
-  }
-
-  showConfirmDialog.value = true
-}
-
-const confirmCopyDate = async () => {
-  if (copyMode.value === 'single') {
-    const sourceDate = copyFromStart.value.trim()
-    const targetDate = copySingleTargetDate.value.trim()
-
-    if (!parseDateValue(sourceDate) || !parseDateValue(targetDate)) {
-      if (window.$showNotification) {
-        window.$showNotification(
-          callLocale('errors.invalidTargetDate', '日期无效，请使用 YYYY-MM-DD 格式并确保日期有效'),
-          'error'
-        )
-      }
-      return
-    }
-
-    if (sourceDate === targetDate) {
-      if (window.$showNotification) {
-        window.$showNotification(locale.value.errors.sameTargetDate, 'warning')
-      }
-      return
-    }
-
-    // API 会检查目标日期是否已有排期，此处不需要重复检测
-
-    // 检查源日期是否有可复制的排期
-    const sourceSchedules = [...publicSchedules.value, ...drafts.value].filter((schedule) => {
-      if (!schedule.playDate) return false
-      return getScheduleDateValue(schedule.playDate) === sourceDate
-    })
-
-    // 检查目标日期是否有草稿
-    const targetDateDrafts = drafts.value.filter((d) => d.playDate && getScheduleDateValue(d.playDate) === targetDate)
-    if (targetDateDrafts.length > 0) {
-      confirmDialogTitle.value = locale.value.copyDateTitle
-      confirmDialogMessage.value = callLocale('confirmations.copyDateOverwriteDraftConfirm', '目标日期有草稿将被覆盖，确定继续？', targetDateDrafts.length)
-      confirmDialogType.value = 'warning'
-      confirmDialogConfirmText.value = locale.value.confirmations.copyDateSingleConfirm
-      showCopyDateDialog.value = false
-      confirmAction.value = async () => {
-        loading.value = true
-        try {
-          let totalCopied = 0
-          if (sourceSchedules.length > 0) {
-            const result = await $fetch('/api/admin/schedule/copy', {
-              method: 'POST',
-              body: { fromDate: sourceDate, toDate: targetDate, overwriteDrafts: true },
-              ...auth.getAuthConfig()
-            })
-            totalCopied = result?.copiedCount || 0
-          }
-          await loadData()
-          updateLocalScheduledSongs()
-          if (window.$showNotification) {
-            window.$showNotification(
-              totalCopied > 0
-                ? callLocale('messages.copyDateSuccess', `已复制 ${totalCopied} 首歌曲到 ${targetDate}`, totalCopied, targetDate, targetDate)
-                : locale.value.errors.noCopyableSongs,
-              totalCopied > 0 ? 'success' : 'warning'
-            )
-          }
-        } catch (error) {
-          console.error('复制排期日期失败:', error)
-          if (window.$showNotification) {
-            const backendMessage = getThrownMessage(error) || formatLocaleValue(locale.value?.unknown) || '未知错误'
-            window.$showNotification(callLocale('errors.copyDateFailed', `复制失败: ${backendMessage}`, backendMessage), 'error')
-          }
-        } finally {
-          loading.value = false
-        }
-      }
-      showConfirmDialog.value = true
-      return
-    }
-
-    confirmDialogTitle.value = locale.value.copyDateTitle
-    confirmDialogMessage.value = callLocale(
-      'confirmations.copyDateSingleMessage',
-      `确定将 ${sourceDate} 的排期复制到 ${targetDate} 吗？`,
-      sourceDate,
-      targetDate
-    )
-    confirmDialogType.value = 'warning'
-    confirmDialogConfirmText.value = locale.value.confirmations.copyDateConfirm
-    showCopyDateDialog.value = false
-
-    confirmAction.value = async () => {
-      loading.value = true
-      try {
-        let totalCopied = 0
-
-        if (sourceSchedules.length > 0) {
-          // 源日期有排期，调用API复制
-          const result = await $fetch('/api/admin/schedule/copy', {
-            method: 'POST',
-            body: { fromDate: sourceDate, toDate: targetDate, overwriteDrafts: true },
-            ...auth.getAuthConfig()
-          })
-          totalCopied = result?.copiedCount || 0
-        }
-
-        await loadData()
-        updateLocalScheduledSongs()
-
-        if (window.$showNotification) {
-          window.$showNotification(
-            totalCopied > 0
-              ? callLocale(
-                  'messages.copyDateSuccess',
-                  `已复制 ${totalCopied} 首歌曲到 ${targetDate}`,
-                  totalCopied,
-                  targetDate,
-                  targetDate
-                )
-              : locale.value.errors.noCopyableSongs,
-            totalCopied > 0 ? 'success' : 'warning'
-          )
-        }
-      } catch (error) {
-        console.error('复制排期日期失败:', error)
-        if (window.$showNotification) {
-          const backendMessage =
-            getThrownMessage(error) || formatLocaleValue(locale.value?.unknown) || '未知错误'
-          window.$showNotification(
-            callLocale('errors.copyDateFailed', `复制失败: ${backendMessage}`, backendMessage),
-            'error'
-          )
-        }
-      } finally {
-        loading.value = false
-      }
-    }
-
-    showConfirmDialog.value = true
-    return
-  }
-
-  // --- 周期模式（原有逻辑） ---
-  const fromStart = copyFromStart.value.trim()
-  const fromEnd = copyFromEnd.value.trim()
-  const toStart = copyToStart.value.trim()
-  const toEnd = copyToEnd.value.trim()
-
-  if (!parseDateValue(fromStart) || !parseDateValue(fromEnd) || !parseDateValue(toStart) || !parseDateValue(toEnd)) {
-    if (window.$showNotification) {
-      window.$showNotification(
-        callLocale('errors.invalidTargetDate', '日期无效，请使用 YYYY-MM-DD 格式并确保日期有效'),
-        'error'
-      )
-    }
-    return
-  }
-
-  const sourceSpan = getDaysBetween(fromStart, fromEnd)
-  const targetSpan = getDaysBetween(toStart, toEnd)
-
-  if (sourceSpan < 0 || targetSpan < 0) {
-    if (window.$showNotification) {
-      window.$showNotification(locale.value.errors.invalidDateRange, 'error')
-    }
-    return
-  }
-
-  const sourceDays = sourceSpan + 1
-  const targetDays = targetSpan + 1
-
-  // 检查源区间与目标区间是否有交集（整体范围检测，防止级联写入）
-  if (toStart <= fromEnd && fromStart <= toEnd) {
-    if (window.$showNotification) {
-      window.$showNotification(locale.value.errors.targetDateConflicts, 'warning')
-    }
-    return
-  }
-
-  // 检查目标日期是否有草稿
-  const draftTargetDates = []
-  for (let i = 0; i < targetDays; i++) {
-    const tgtDate = addDaysToString(toStart, i)
-    const tgtDrafts = drafts.value.filter((d) => d.playDate && getScheduleDateValue(d.playDate) === tgtDate)
-    if (tgtDrafts.length > 0) {
-      draftTargetDates.push(tgtDate)
-    }
-  }
-
-  const hasDraftOverlap = draftTargetDates.length > 0
-  confirmDialogTitle.value = locale.value.copyDateTitle
-  confirmDialogMessage.value = hasDraftOverlap
-    ? callLocale(
-        'confirmations.copyDateOverwriteMessage',
-        `确定将 ${fromStart} 至 ${fromEnd} 共 ${sourceDays} 天的排期复制到 ${toStart} 至 ${toEnd} 共 ${targetDays} 天吗？${draftTargetDates.length} 个目标日期有草稿将被覆盖。源排期将循环复用至填满目标区间。`,
-        fromStart,
-        fromEnd,
-        sourceDays,
-        toStart,
-        toEnd,
-        targetDays,
-        draftTargetDates.length
-      )
-    : callLocale(
-        'confirmations.copyDateMessage',
-        `确定将 ${fromStart} 至 ${fromEnd} 共 ${sourceDays} 天的排期复制到 ${toStart} 至 ${toEnd} 共 ${targetDays} 天吗？源排期将循环复用至填满目标区间。`,
-        fromStart,
-        fromEnd,
-        sourceDays,
-        toStart,
-        toEnd,
-        targetDays
-      )
-  confirmDialogType.value = hasDraftOverlap ? 'warning' : 'warning'
-  confirmDialogConfirmText.value = locale.value.confirmations.copyDateConfirm
-  showCopyDateDialog.value = false
-
-  confirmAction.value = async () => {
-    loading.value = true
-    try {
-      let totalCopied = 0
-      let succeededScheduleIds = []
-      let replacedDrafts = []
-
-      for (let i = 0; i < targetDays; i++) {
-        const srcDay = i % sourceDays
-        const srcDate = addDaysToString(fromStart, srcDay)
-        const tgtDate = addDaysToString(toStart, i)
-        const overwriteDrafts = draftTargetDates.includes(tgtDate)
-
-        const result = await $fetch('/api/admin/schedule/copy', {
-          method: 'POST',
-          body: {
-            fromDate: srcDate,
-            toDate: tgtDate,
-            overwriteDrafts
-          },
-          ...auth.getAuthConfig()
-        })
-
-        totalCopied += result?.copiedCount || 0
-        succeededScheduleIds.push(...(result?.createdScheduleIds || []))
-        replacedDrafts.push(...(result?.replacedDrafts || []))
-      }
-
-      await loadData()
-      updateLocalScheduledSongs()
-
-      if (window.$showNotification) {
-        window.$showNotification(
-          totalCopied > 0
-            ? callLocale(
-                'messages.copyDateSuccess',
-                `已逐日复制 ${totalCopied} 首歌曲至 ${toStart} ~ ${toEnd}`,
-                totalCopied,
-                toStart,
-                toEnd
-              )
-            : locale.value.errors.noCopyableSongs,
-          totalCopied > 0 ? 'success' : 'warning'
-        )
-      }
-    } catch (error) {
-      // 只回滚本批创建的排期，并恢复本批覆盖的草稿，避免误删并发变更
-      if (succeededScheduleIds.length > 0 || replacedDrafts.length > 0) {
-        try {
-          await $fetch('/api/admin/schedule/remove-all-date', {
-            method: 'POST',
-            body: { scheduleIds: succeededScheduleIds, restoreSchedules: replacedDrafts },
-            ...auth.getAuthConfig()
-          })
-        } catch (rollbackError) {
-          console.error('回滚已复制的排期失败:', rollbackError)
-        }
-      }
-      console.error('复制排期日期失败:', error)
-      if (window.$showNotification) {
-        const backendMessage =
-          getThrownMessage(error) || formatLocaleValue(locale.value?.unknown) || '未知错误'
-        window.$showNotification(
-          callLocale('errors.copyDateFailed', `复制失败: ${backendMessage}`, backendMessage),
+          '迁移失败: ' + (backendMessage || '未知错误'),
           'error'
         )
       }
@@ -5140,7 +2178,8 @@ const loadDrafts = async () => {
     const response = await $fetch('/api/admin/schedule/full', {
       ...auth.getAuthConfig(),
       query: {
-        includeDrafts: 'only' // 只获取草稿
+        includeDrafts: 'only', // 只获取草稿
+        t: Date.now()
       }
     })
 
@@ -5154,123 +2193,105 @@ const loadDrafts = async () => {
 }
 
 // 刷新草稿列表
-const refreshDrafts = async () => {
-  await loadDrafts()
-  updateLocalScheduledSongs() // 更新播放顺序列表
+
+
+const buildDraftSignature = () => {
+  const songIds = localScheduledSongs.value.map((s) => s.song?.id).filter(Boolean)
+  return JSON.stringify({
+    date: selectedDate.value,
+    playTimeId: selectedPlayTime.value ? parseInt(selectedPlayTime.value) : null,
+    songIds
+  })
 }
 
+const lastSavedDraftSignature = ref('')
+let autoSaveTimer = null
+
 // 保存草稿（无需确认）
-// 流程：先写入全部草稿，全部成功后再删除旧排期，避免中间失败导致数据丢失
-const saveDraft = async () => {
+const saveDraft = async (silent = false) => {
   loading.value = true
 
   try {
-    // 收集当天指定播出时段的所有现有排期和草稿 ID
-    const existingScheduleIds = [...publicSchedules.value, ...drafts.value]
-      .filter((s) => {
-        if (!s.playDate) return false
-        const scheduleDateStr = getScheduleDateValue(s.playDate)
-        const isTargetDate = scheduleDateStr === selectedDate.value
-        if (selectedPlayTime.value) {
-          return isTargetDate && s.playTimeId === parseInt(selectedPlayTime.value)
-        }
-        return isTargetDate
-      })
-      .map((s) => s.id)
+    const playTimeId = selectedPlayTime.value ? parseInt(selectedPlayTime.value) : null
+    const songIds = localScheduledSongs.value.map((s) => s.song?.id).filter(Boolean)
 
-    // 先写入全部草稿，全部成功后再删除旧排期
-    const newDraftIds = []
-    for (let i = 0; i < localScheduledSongs.value.length; i++) {
-      const song = localScheduledSongs.value[i]
-
-      try {
-        const created = await $fetch('/api/admin/schedule/draft', {
-          method: 'POST',
-          body: {
-            songId: song.song.id,
-            playDate: selectedDate.value,
-            sequence: i + 1,
-            playTimeId: selectedPlayTime.value ? parseInt(selectedPlayTime.value) : null,
-            replayRequestId: song.replayRequestId || song.song?.replayRequestId || null
-          },
-          ...auth.getAuthConfig()
-        })
-        if (created?.id) {
-          newDraftIds.push(created.id)
-        }
-      } catch (error) {
-        console.error(`创建草稿排期失败 (歌曲: ${song.song.title}):`, error)
-        throw error
-      }
-    }
-
-    // 全部写入成功后，删除旧排期和草稿
-    try {
-      for (const scheduleId of existingScheduleIds) {
-        await $fetch(`/api/admin/schedule/remove`, {
-          method: 'POST',
-          body: { scheduleId },
-          ...auth.getAuthConfig()
-        })
-      }
-    } catch (deleteError) {
-      console.error('删除旧排期失败:', deleteError)
-      // 删除失败时回滚新建草稿
-      for (const draftId of newDraftIds) {
-        try {
-          await $fetch('/api/admin/schedule/remove', {
-            method: 'POST',
-            body: { scheduleId: draftId },
-            ...auth.getAuthConfig()
-          })
-        } catch (rollbackErr) {
-          console.error('回滚新建草稿失败:', rollbackErr)
-        }
-      }
-      throw deleteError
-    }
+    await $fetch('/api/admin/schedule/draft-bulk', {
+      method: 'POST',
+      body: {
+        playDate: selectedDate.value,
+        ...(playTimeId ? { playTimeId } : {}),
+        songIds
+      },
+      ...auth.getAuthConfig()
+    })
 
     hasChanges.value = false
+    lastSavedDraftSignature.value = buildDraftSignature()
     await loadData() // 重新加载数据
 
     // 确保草稿显示在播放顺序中
     updateLocalScheduledSongs()
 
-    if (window.$showNotification) {
+    if (!silent && window.$showNotification) {
       if (localScheduledSongs.value.length > 0) {
-        window.$showNotification(locale.value.messages.draftSaved, 'success')
+        window.$showNotification('排期草稿保存成功！', 'success')
       } else {
-        window.$showNotification(locale.value.messages.allDraftsDeleted, 'success')
+        window.$showNotification('所有草稿已删除！', 'success')
       }
     }
   } catch (error) {
     console.error('保存草稿失败:', error)
     if (window.$showNotification) {
-      const message = getThrownMessage(error) || '未知错误'
-      window.$showNotification(
-        callLocale('errors.saveDraftFailed', `保存草稿失败: ${message}`, message),
-        'error'
-      )
+      window.$showNotification('保存草稿失败: ' + (error.data?.message || error.message), 'error')
     }
   } finally {
     loading.value = false
   }
 }
 
+const draftStateKey = computed(() => buildDraftSignature())
+
+watch(
+  draftStateKey,
+  (newVal, oldVal) => {
+    if (!oldVal) return
+    if (loading.value) return
+    if (newVal === lastSavedDraftSignature.value) return
+
+    hasChanges.value = true
+
+    if (autoSaveTimer) {
+      clearTimeout(autoSaveTimer)
+      autoSaveTimer = null
+    }
+
+    autoSaveTimer = setTimeout(async () => {
+      if (loading.value) return
+      if (!hasChanges.value) return
+      if (buildDraftSignature() === lastSavedDraftSignature.value) {
+        hasChanges.value = false
+        return
+      }
+      await saveDraft(true)
+    }, 2000)
+  },
+  { flush: 'post' }
+)
+
 // 发布排期（需要确认）
 const publishSchedule = async () => {
   try {
     // 如果列表为空，提示删除排期
     if (localScheduledSongs.value.length === 0) {
-      confirmDialogTitle.value = locale.value.confirmations.deleteScheduleTitle
-      confirmDialogMessage.value = locale.value.confirmations.deleteScheduleMessage
+      confirmDialogTitle.value = '删除排期'
+      confirmDialogMessage.value = '确定要删除当天的所有排期吗？此操作不可恢复。'
       confirmDialogType.value = 'danger'
-      confirmDialogConfirmText.value = locale.value.confirmations.deleteScheduleConfirm
+      confirmDialogConfirmText.value = '确认删除'
     } else {
-      confirmDialogTitle.value = locale.value.confirmations.publishScheduleTitle
-      confirmDialogMessage.value = locale.value.confirmations.publishScheduleMessage
+      confirmDialogTitle.value = '发布排期'
+      confirmDialogMessage.value = '确定要发布当前排期吗？发布后将立即公示并发送通知。'
       confirmDialogType.value = 'warning'
-      confirmDialogConfirmText.value = locale.value.publishSchedule
+      confirmDialogConfirmText.value = '发布排期'
     }
 
     confirmAction.value = async () => {
@@ -5287,11 +2308,10 @@ const publishScheduleConfirmed = async () => {
   loading.value = true
 
   try {
-    // 构建发布数据，携带拖拽时显式选择的重播申请绑定
+    // 构建发布数据
     const songsToPublish = localScheduledSongs.value.map((item, index) => ({
       songId: item.song.id,
-      sequence: index + 1,
-      replayRequestId: item.replayRequestId || item.song?.replayRequestId || null
+      sequence: index + 1
     }))
 
     // 调用批量发布API
@@ -5313,19 +2333,15 @@ const publishScheduleConfirmed = async () => {
 
     if (window.$showNotification) {
       if (songsToPublish.length === 0) {
-        window.$showNotification(locale.value.messages.scheduleDeleted, 'success')
+        window.$showNotification('排期已删除！', 'success')
       } else {
-        window.$showNotification(locale.value.messages.schedulePublished, 'success')
+        window.$showNotification('排期发布成功，通知已发送！', 'success')
       }
     }
   } catch (error) {
     console.error('发布排期失败:', error)
     if (window.$showNotification) {
-      const message = getThrownMessage(error) || '未知错误'
-      window.$showNotification(
-        callLocale('errors.publishScheduleFailed', `发布排期失败: ${message}`, message),
-        'error'
-      )
+      window.$showNotification('发布排期失败: ' + (error.data?.message || error.message), 'error')
     }
   } finally {
     loading.value = false
@@ -5335,14 +2351,10 @@ const publishScheduleConfirmed = async () => {
 // 发布单个草稿（需要确认）
 const publishSingleDraft = async (draft) => {
   try {
-    confirmDialogTitle.value = locale.value.confirmations.publishDraftTitle
-    confirmDialogMessage.value = callLocale(
-      'confirmations.publishDraftMessage',
-      `确定要发布草稿《${draft.song.title}》吗？发布后将立即公示并发送通知。`,
-      draft.song.title
-    )
+    confirmDialogTitle.value = '发布草稿'
+    confirmDialogMessage.value = `确定要发布草稿《${draft.song.title}》吗？发布后将立即公示并发送通知。`
     confirmDialogType.value = 'warning'
-    confirmDialogConfirmText.value = locale.value.publish
+    confirmDialogConfirmText.value = '发布'
     confirmAction.value = async () => {
       await publishSingleDraftConfirmed(draft)
     }
@@ -5369,23 +2381,12 @@ const publishSingleDraftConfirmed = async (draft) => {
     updateLocalScheduledSongs()
 
     if (window.$showNotification) {
-      window.$showNotification(
-        callLocale(
-          'messages.draftPublished',
-          `草稿《${draft.song.title}》发布成功，通知已发送！`,
-          draft.song.title
-        ),
-        'success'
-      )
+      window.$showNotification(`草稿《${draft.song.title}》发布成功，通知已发送！`, 'success')
     }
   } catch (error) {
     console.error('发布单个草稿失败:', error)
     if (window.$showNotification) {
-      const message = getThrownMessage(error) || '未知错误'
-      window.$showNotification(
-        callLocale('errors.publishDraftFailed', `发布草稿失败: ${message}`, message),
-        'error'
-      )
+      window.$showNotification('发布草稿失败: ' + (error.data?.message || error.message), 'error')
     }
   } finally {
     loading.value = false
@@ -5497,10 +2498,10 @@ const updateDragPosition = (x, y) => {
   if (!elementBelow) return
 
   // 清除之前的高亮
-  document.querySelectorAll('.border-primary').forEach((el) => {
+  document.querySelectorAll('.border-blue-500').forEach((el) => {
     // 仅移除通过拖拽添加的高亮，避免移除原本的样式
     if (el.dataset.dragHighlight) {
-      el.classList.remove('border-primary', 'bg-primary-10')
+      el.classList.remove('border-blue-500', 'bg-blue-500/10')
       delete el.dataset.dragHighlight
     }
   })
@@ -5514,19 +2515,19 @@ const updateDragPosition = (x, y) => {
   if (touchDragData.value?.type === 'song') {
     // 拖拽待排歌曲时，高亮播放列表区域
     if (sequenceList) {
-      sequenceList.classList.add('border-primary', 'bg-primary-10')
+      sequenceList.classList.add('border-blue-500', 'bg-blue-500/10')
       sequenceList.dataset.dragHighlight = 'true'
     } else if (scheduledSong) {
-      scheduledSong.classList.add('border-primary', 'bg-primary-10')
+      scheduledSong.classList.add('border-blue-500', 'bg-blue-500/10')
       scheduledSong.dataset.dragHighlight = 'true'
     }
   } else if (touchDragData.value?.type === 'schedule') {
     // 拖拽已排歌曲时，高亮待排区域或其他已排歌曲
     if (draggableSongs) {
-      draggableSongs.classList.add('border-primary', 'bg-primary-10')
+      draggableSongs.classList.add('border-blue-500', 'bg-blue-500/10')
       draggableSongs.dataset.dragHighlight = 'true'
     } else if (scheduledSong) {
-      scheduledSong.classList.add('border-primary', 'bg-primary-10')
+      scheduledSong.classList.add('border-blue-500', 'bg-blue-500/10')
       scheduledSong.dataset.dragHighlight = 'true'
     }
   }
@@ -5534,9 +2535,9 @@ const updateDragPosition = (x, y) => {
 
 // 清除拖拽位置指示
 const clearDragPosition = () => {
-  document.querySelectorAll('.border-primary').forEach((el) => {
+  document.querySelectorAll('.border-blue-500').forEach((el) => {
     if (el.dataset.dragHighlight) {
-      el.classList.remove('border-primary', 'bg-primary-10')
+      el.classList.remove('border-blue-500', 'bg-blue-500/10')
       delete el.dataset.dragHighlight
     }
   })
@@ -5627,7 +2628,6 @@ const handleTouchDropToSequence = async (targetElement) => {
   // 直接添加到本地列表，不发送请求
   const newSchedule = {
     id: Date.now(),
-    replayRequestId: song.replayRequestId || null,
     song: song,
     playDate: selectedDate.value,
     sequence: insertIndex + 1,
@@ -5636,7 +2636,6 @@ const handleTouchDropToSequence = async (targetElement) => {
   }
 
   scheduledSongIds.value.add(song.id)
-  setSongScheduledFlag(song.id, true)
   localScheduledSongs.value.splice(insertIndex, 0, newSchedule)
 
   // 更新序列号
@@ -5676,7 +2675,6 @@ const handleTouchReturnToDraggable = async () => {
 
     if (removed.song) {
       scheduledSongIds.value.delete(removed.song.id)
-      setSongScheduledFlag(removed.song.id, false)
     }
 
     // 重新排序
@@ -5690,7 +2688,6 @@ const handleTouchReturnToDraggable = async () => {
 </script>
 
 <style scoped>
-/* 隐藏滚动条但保留功能 */
 .scrollbar-hide::-webkit-scrollbar {
   display: none;
 }
@@ -5699,7 +2696,6 @@ const handleTouchReturnToDraggable = async () => {
   scrollbar-width: none;
 }
 
-/* 列表过渡动画 */
 .schedule-list-move,
 .schedule-list-enter-active,
 .schedule-list-leave-active {
@@ -5716,4 +2712,17 @@ const handleTouchReturnToDraggable = async () => {
   position: absolute;
   width: 100%;
 }
+
+@media (max-width: 640px) {
+  :deep(.tab-panel-content) {
+    padding: 12px !important;
+    gap: 10px !important;
+  }
+  :deep(.section-padding) {
+    padding: 12px !important;
+  }
+  :deep(.toolbar-gap) {
+    gap: 6px !important;
+  }
+}
 </style>
diff --git a/app/components/Admin/SchedulePrinter.vue b/app/components/Admin/SchedulePrinter.vue
index 8bd76ad..9b26695 100644
--- a/app/components/Admin/SchedulePrinter.vue
+++ b/app/components/Admin/SchedulePrinter.vue
@@ -3,17 +3,17 @@
     class="flex flex-col space-y-8 pb-12 lg:pb-20 animate-in fade-in slide-in-from-bottom-4 duration-500"
   >
     <div class="flex flex-col space-y-2">
-      <h2 class="text-2xl font-bold tracking-tight text-text-primary">{{ locale.title }}</h2>
-      <p class="text-sm text-text-tertiary">{{ locale.desc }}</p>
+      <h2 class="text-2xl font-bold tracking-tight text-zinc-100">打印排期</h2>
+      <p class="text-sm text-zinc-500">自定义打印设置，预览并导出排期表</p>
     </div>
 
     <!-- 权限检查 -->
     <div
       v-if="!canPrintSchedule"
-      class="flex flex-col items-center justify-center py-20 bg-bg-secondary-50 rounded-xl border border-border-secondary"
+      class="flex flex-col items-center justify-center py-20 bg-zinc-900/50 rounded-xl border border-zinc-800"
     >
       <div
-        class="w-16 h-16 bg-error-10 rounded-full flex items-center justify-center text-error mb-4"
+        class="w-16 h-16 bg-red-500/10 rounded-full flex items-center justify-center text-red-500 mb-4"
       >
         <svg class="w-8 h-8" fill="none" stroke="currentColor" stroke-width="2" viewBox="0 0 24 24">
           <circle cx="12" cy="12" r="10" />
@@ -21,156 +21,89 @@
           <path d="m9 9 6 6" />
         </svg>
       </div>
-      <h3 class="text-lg font-bold text-text-primary">{{ locale.noPermissionTitle }}</h3>
-      <p class="text-text-tertiary mt-2">{{ locale.noPermissionDesc }}</p>
+      <h3 class="text-lg font-bold text-zinc-100">权限不足</h3>
+      <p class="text-zinc-500 mt-2">您没有打印排期的权限，请联系管理员获取相应权限。</p>
     </div>
 
     <div v-else class="grid grid-cols-1 lg:grid-cols-12 gap-8 h-auto">
       <!-- 设置面板 -->
       <div class="lg:col-span-4 flex flex-col gap-6 h-auto">
         <div
-          class="bg-bg-secondary-40 border border-border-secondary rounded-xl p-6 space-y-6 shadow-lg flex flex-col h-auto"
+          class="bg-zinc-900/40 border border-zinc-800 rounded-xl p-6 space-y-6 shadow-lg flex flex-col h-auto"
         >
-          <h3 class="text-lg font-bold flex items-center gap-2 text-text-primary shrink-0">
-            <Layout class="w-4 h-4 text-primary" /> {{ locale.settingsTitle }}
+          <h3 class="text-lg font-bold flex items-center gap-2 text-zinc-100 shrink-0">
+            <Layout class="w-4 h-4 text-blue-500" /> 打印设置
           </h3>
 
           <div class="space-y-5 pr-2">
             <!-- 纸张大小 -->
             <div class="space-y-2">
-              <label class="text-[11px] font-black uppercase text-text-disabled tracking-wider"
-                >{{ locale.paperSize }}</label
+              <label class="text-[11px] font-black uppercase text-zinc-600 tracking-wider"
+                >纸张大小</label
               >
               <CustomSelect
                 v-model="settings.paperSize"
                 :options="paperSizeOptions"
-                :placeholder="locale.selectPaperSize"
+                placeholder="选择纸张大小"
                 class-name="w-full"
               />
             </div>
 
             <!-- 页面方向 -->
             <div class="space-y-2">
-              <label class="text-[11px] font-black uppercase text-text-disabled tracking-wider"
-                >{{ locale.orientation }}</label
+              <label class="text-[11px] font-black uppercase text-zinc-600 tracking-wider"
+                >页面方向</label
               >
               <div class="grid grid-cols-2 gap-2">
                 <button
                   :class="[
                     'py-2.5 rounded-lg text-sm font-bold transition-all',
                     settings.orientation === 'portrait'
-                      ? 'border border-primary-30 bg-primary-hover-10 text-primary shadow-sm'
-                      : 'border border-border-secondary bg-bg-primary text-text-tertiary hover:text-text-secondary'
+                      ? 'border border-blue-500/30 bg-blue-600/10 text-blue-400 shadow-sm'
+                      : 'border border-zinc-800 bg-zinc-950 text-zinc-500 hover:text-zinc-300'
                   ]"
                   @click="settings.orientation = 'portrait'"
                 >
-                  {{ locale.portrait }}
+                  纵向
                 </button>
                 <button
                   :class="[
                     'py-2.5 rounded-lg text-sm font-bold transition-all',
                     settings.orientation === 'landscape'
-                      ? 'border border-primary-30 bg-primary-hover-10 text-primary shadow-sm'
-                      : 'border border-border-secondary bg-bg-primary text-text-tertiary hover:text-text-secondary'
+                      ? 'border border-blue-500/30 bg-blue-600/10 text-blue-400 shadow-sm'
+                      : 'border border-zinc-800 bg-zinc-950 text-zinc-500 hover:text-zinc-300'
                   ]"
                   @click="settings.orientation = 'landscape'"
                 >
-                  {{ locale.landscape }}
-                </button>
-              </div>
-            </div>
-
-            <!-- 排版样式 -->
-            <div class="space-y-2">
-              <label class="text-[11px] font-black uppercase text-text-disabled tracking-wider"
-                >{{ locale.layoutStyle }}</label
-              >
-              <div class="grid grid-cols-2 gap-2">
-                <button
-                  :class="[
-                    'py-2 rounded-lg text-sm font-bold transition-all',
-                    settings.layoutStyle === 'classic'
-                      ? 'border border-primary-30 bg-primary-hover-10 text-primary shadow-sm'
-                      : 'border border-border-secondary bg-bg-primary text-text-tertiary hover:text-text-secondary'
-                  ]"
-                  @click="selectClassicLayout"
-                >
-                  {{ locale.classicList }}
-                </button>
-                <button
-                  :class="[
-                    'py-2 rounded-lg text-sm font-bold transition-all',
-                    settings.layoutStyle === 'table'
-                      ? 'border border-primary-30 bg-primary-hover-10 text-primary shadow-sm'
-                      : 'border border-border-secondary bg-bg-primary text-text-tertiary hover:text-text-secondary'
-                  ]"
-                  @click="selectTableLayout"
-                >
-                  {{ locale.tableLayout }}
-                </button>
-              </div>
-            </div>
-
-            <!-- 列表分栏（仅纵向经典列表） -->
-            <div v-if="showListColumns" class="space-y-2">
-              <label class="text-[11px] font-black uppercase text-text-disabled tracking-wider"
-                >{{ locale.listColumns }}</label
-              >
-              <div class="grid grid-cols-2 gap-2">
-                <button
-                  :class="[
-                    'py-2 rounded-lg text-sm font-bold transition-all',
-                    settings.listColumns === 1
-                      ? 'border border-primary-30 bg-primary-hover-10 text-primary shadow-sm'
-                      : 'border border-border-secondary bg-bg-primary text-text-tertiary hover:text-text-secondary'
-                  ]"
-                  @click="settings.listColumns = 1"
-                >
-                  {{ locale.oneColumn }}
-                </button>
-                <button
-                  :class="[
-                    'py-2 rounded-lg text-sm font-bold transition-all',
-                    settings.listColumns === 2
-                      ? 'border border-primary-30 bg-primary-hover-10 text-primary shadow-sm'
-                      : 'border border-border-secondary bg-bg-primary text-text-tertiary hover:text-text-secondary'
-                  ]"
-                  @click="settings.listColumns = 2"
-                >
-                  {{ locale.twoColumns }}
+                  横向
                 </button>
               </div>
             </div>
 
             <!-- 日期范围 -->
             <div class="space-y-2">
-              <label class="text-[11px] font-black uppercase text-text-disabled tracking-wider"
-                >{{ locale.dateRange }}</label
+              <label class="text-[11px] font-black uppercase text-zinc-600 tracking-wider"
+                >日期范围</label
               >
               <div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
                 <input
                   v-model="settings.startDate"
                   type="date"
-                  class="bg-bg-primary border border-border-secondary rounded-lg px-3 py-2 text-sm text-text-secondary focus:outline-none focus:border-primary-50 transition-colors"
+                  class="bg-zinc-950 border border-zinc-800 rounded-lg px-3 py-2 text-sm text-zinc-300 focus:outline-none focus:border-blue-500/50 transition-colors"
                   max="9999-12-31"
-                />
+                >
                 <input
                   v-model="settings.endDate"
                   type="date"
-                  class="bg-bg-primary border border-border-secondary rounded-lg px-3 py-2 text-sm text-text-secondary focus:outline-none focus:border-primary-50 transition-colors"
+                  class="bg-zinc-950 border border-zinc-800 rounded-lg px-3 py-2 text-sm text-zinc-300 focus:outline-none focus:border-blue-500/50 transition-colors"
                   max="9999-12-31"
-                />
+                >
               </div>
               <div class="flex gap-2 flex-wrap">
                 <button
                   v-for="range in dateRanges"
                   :key="range.value"
-                  :class="[
-                    'px-2 py-1 text-[10px] rounded-md transition-colors border',
-                    settings.dateRangePreset === range.value
-                      ? 'bg-primary-hover-20 border-primary-50 text-primary'
-                      : 'bg-bg-tertiary-50 border-border-secondary text-text-tertiary hover:bg-bg-tertiary'
-                  ]"
+                  class="px-2 py-1 bg-zinc-800/50 hover:bg-zinc-800 text-[10px] text-zinc-400 rounded-md transition-colors border border-zinc-800"
                   @click="setDateRange(range.value)"
                 >
                   {{ range.label }}
@@ -180,8 +113,8 @@
 
             <!-- 显示内容 -->
             <div class="space-y-3">
-              <label class="text-[11px] font-black uppercase text-text-disabled tracking-wider"
-                >{{ locale.displayContent }}</label
+              <label class="text-[11px] font-black uppercase text-zinc-600 tracking-wider"
+                >显示内容</label
               >
               <div class="grid grid-cols-1 gap-2.5">
                 <label
@@ -193,47 +126,47 @@
                     :class="[
                       'w-5 h-5 rounded flex items-center justify-center border transition-all',
                       settings[option.key]
-                        ? 'bg-primary-hover border-primary'
-                        : 'bg-bg-primary border-border-secondary group-hover:border-border-tertiary'
+                        ? 'bg-blue-600 border-blue-600'
+                        : 'bg-zinc-950 border-zinc-800 group-hover:border-zinc-700'
                     ]"
                   >
-                    <CheckCircle2 v-if="settings[option.key]" class="w-3 h-3 text-text-primary" />
+                    <CheckCircle2 v-if="settings[option.key]" class="w-3 h-3 text-white" />
                   </div>
-                  <input v-model="settings[option.key]" type="checkbox" class="hidden" />
+                  <input v-model="settings[option.key]" type="checkbox" class="hidden" >
                   <span
                     :class="[
                       'text-sm font-medium transition-colors',
                       settings[option.key]
-                        ? 'text-text-primary'
-                        : 'text-text-tertiary group-hover:text-text-tertiary'
+                        ? 'text-zinc-200'
+                        : 'text-zinc-500 group-hover:text-zinc-400'
                     ]"
                     >{{ option.label }}</span
                   >
                 </label>
 
                 <label
-                  v-if="schoolLogoPrintDisplayUrl"
+                  v-if="schoolLogoPrintUrl"
                   class="flex items-center gap-3 cursor-pointer group select-none"
                 >
                   <div
                     :class="[
                       'w-5 h-5 rounded flex items-center justify-center border transition-all',
                       settings.showSchoolLogo
-                        ? 'bg-primary-hover border-primary'
-                        : 'bg-bg-primary border-border-secondary group-hover:border-border-tertiary'
+                        ? 'bg-blue-600 border-blue-600'
+                        : 'bg-zinc-950 border-zinc-800 group-hover:border-zinc-700'
                     ]"
                   >
-                    <CheckCircle2 v-if="settings.showSchoolLogo" class="w-3 h-3 text-text-primary" />
+                    <CheckCircle2 v-if="settings.showSchoolLogo" class="w-3 h-3 text-white" />
                   </div>
-                  <input v-model="settings.showSchoolLogo" type="checkbox" class="hidden" />
+                  <input v-model="settings.showSchoolLogo" type="checkbox" class="hidden" >
                   <span
                     :class="[
                       'text-sm font-medium transition-colors',
                       settings.showSchoolLogo
-                        ? 'text-text-primary'
-                        : 'text-text-tertiary group-hover:text-text-tertiary'
+                        ? 'text-zinc-200'
+                        : 'text-zinc-500 group-hover:text-zinc-400'
                     ]"
-                    >{{ locale.schoolLogo }}</span
+                    >学校Logo</span
                   >
                 </label>
               </div>
@@ -241,46 +174,46 @@
 
             <!-- 备注 -->
             <div class="space-y-2">
-              <label class="text-[11px] font-black uppercase text-text-disabled tracking-wider"
-                >{{ locale.remark }}</label
+              <label class="text-[11px] font-black uppercase text-zinc-600 tracking-wider"
+                >备注</label
               >
               <textarea
                 v-model="settings.remark"
-                :placeholder="locale.remarkPlaceholder"
-                class="w-full bg-bg-primary border border-border-secondary rounded-lg px-4 py-3 text-sm focus:outline-none text-text-secondary min-h-[80px] resize-none focus:border-primary-50 transition-colors"
+                placeholder="请输入备注信息（可选）"
+                class="w-full bg-zinc-950 border border-zinc-800 rounded-lg px-4 py-3 text-sm focus:outline-none text-zinc-300 min-h-[80px] resize-none focus:border-blue-500/50 transition-colors"
               />
             </div>
           </div>
 
           <!-- 操作按钮 -->
-          <div class="space-y-2 pt-4 border-t border-border-secondary shrink-0">
+          <div class="space-y-2 pt-4 border-t border-zinc-800 shrink-0">
             <button
-              class="w-full flex items-center justify-center gap-2 py-3 bg-bg-tertiary-80 hover:bg-bg-quaternary text-text-secondary text-sm font-bold rounded-lg border border-border-tertiary transition-all"
+              class="w-full flex items-center justify-center gap-2 py-3 bg-zinc-800/80 hover:bg-zinc-700 text-zinc-300 text-sm font-bold rounded-lg border border-zinc-700 transition-all"
               @click="refreshPreview"
             >
-              <RefreshCw class="w-4 h-4" /> {{ locale.refreshPreview }}
+              <RefreshCw class="w-4 h-4" /> 刷新预览
             </button>
             <button
               :disabled="isPrinting"
-              class="w-full flex items-center justify-center gap-2 py-3 bg-primary-hover hover:bg-primary disabled:opacity-50 disabled:cursor-not-allowed text-text-primary text-sm font-bold rounded-lg shadow-lg shadow-[var(--primary-glow)] transition-all"
+              class="w-full flex items-center justify-center gap-2 py-3 bg-blue-600 hover:bg-blue-500 disabled:opacity-50 disabled:cursor-not-allowed text-white text-sm font-bold rounded-lg shadow-lg shadow-blue-900/20 transition-all"
               @click="printSchedule"
             >
-              <Printer class="w-4 h-4" /> {{ isPrinting ? locale.printing : locale.print }}
+              <Printer class="w-4 h-4" /> {{ isPrinting ? '打印中...' : '打印' }}
             </button>
             <div class="grid grid-cols-2 gap-2">
               <button
                 :disabled="isExporting"
-                class="flex items-center justify-center gap-2 py-2.5 bg-success-10 text-success hover:bg-success-20 disabled:opacity-50 disabled:cursor-not-allowed text-xs font-bold rounded-lg border border-success-20 transition-all"
+                class="flex items-center justify-center gap-2 py-2.5 bg-emerald-600/10 text-emerald-500 hover:bg-emerald-600/20 disabled:opacity-50 disabled:cursor-not-allowed text-xs font-bold rounded-lg border border-emerald-500/20 transition-all"
                 @click="exportPDF"
               >
-                <FileText class="w-3.5 h-3.5" /> {{ isExporting ? locale.exporting : locale.exportPdf }}
+                <FileText class="w-3.5 h-3.5" /> {{ isExporting ? '导出中...' : '导出PDF' }}
               </button>
               <button
                 :disabled="isExportingImage"
-                class="flex items-center justify-center gap-2 py-2.5 bg-warning-10 text-warning hover:bg-warning-20 disabled:opacity-50 disabled:cursor-not-allowed text-xs font-bold rounded-lg border border-warning-20 transition-all"
+                class="flex items-center justify-center gap-2 py-2.5 bg-amber-500/10 text-amber-500 hover:bg-amber-500/20 disabled:opacity-50 disabled:cursor-not-allowed text-xs font-bold rounded-lg border border-amber-500/20 transition-all"
                 @click="exportImage"
               >
-                <ImageIcon class="w-3.5 h-3.5" /> {{ isExportingImage ? locale.exporting : locale.exportImage }}
+                <ImageIcon class="w-3.5 h-3.5" /> {{ isExportingImage ? '导出中...' : '导出长图' }}
               </button>
             </div>
           </div>
@@ -290,29 +223,29 @@
       <!-- 预览区域 -->
       <div class="lg:col-span-8 flex flex-col gap-4 h-[700px] lg:h-0 lg:min-h-full mb-8 lg:mb-0">
         <div
-          class="bg-bg-secondary-40 border border-border-secondary rounded-xl overflow-hidden flex flex-col h-full shadow-lg"
+          class="bg-zinc-900/40 border border-zinc-800 rounded-xl overflow-hidden flex flex-col h-full shadow-lg"
         >
-          <div class="px-6 py-5 border-b border-border-secondary flex items-center justify-between">
-            <h3 class="text-lg font-bold flex items-center gap-2 text-text-primary">
-              <AlignLeft class="w-4.5 h-4.5 text-text-tertiary" /> {{ locale.previewArea }}
+          <div class="px-6 py-5 border-b border-zinc-800 flex items-center justify-between">
+            <h3 class="text-lg font-bold flex items-center gap-2 text-zinc-100">
+              <AlignLeft class="w-4.5 h-4.5 text-zinc-500" /> 预览区域
             </h3>
             <div class="flex items-center gap-2 text-xs font-bold">
-              <span class="text-text-tertiary">{{ formatLocale(locale.songCount, '', filteredSchedules.length) }}</span>
+              <span class="text-zinc-400">{{ filteredSchedules.length }} 首歌曲</span>
               <span
                 v-if="schedules.length === 0"
-                class="px-2 py-0.5 rounded bg-error-10 text-error border border-error-20"
-                >{{ locale.noData }}</span
+                class="px-2 py-0.5 rounded bg-red-500/10 text-red-500 border border-red-500/20"
+                >无数据</span
               >
               <span
                 v-else-if="filteredSchedules.length === 0"
-                class="px-2 py-0.5 rounded bg-warning-10 text-warning border border-warning-20"
-                >{{ locale.filtered }}</span
+                class="px-2 py-0.5 rounded bg-amber-500/10 text-amber-500 border border-amber-500/20"
+                >被过滤</span
               >
             </div>
           </div>
 
           <div
-            class="flex-1 bg-bg-primary-50 p-6 md:p-12 overflow-auto custom-scrollbar flex items-start"
+            class="flex-1 bg-zinc-950/50 p-6 md:p-12 overflow-auto custom-scrollbar flex items-start"
           >
             <!-- 纸张预览 -->
             <div
@@ -327,20 +260,19 @@
                 <!-- 页面头部 -->
                 <div class="page-header">
                   <div class="logo-section">
-                    <img src="/assets/logo.png" alt="VoiceHub Logo" class="logo" />
+                    <img :src="logoUrl" alt="VoiceHub Logo" class="logo" >
                     <!-- 竖线分割 -->
                     <div class="logo-divider" />
                     <!-- 学校logo -->
                     <img
-                      v-if="settings.showSchoolLogo && schoolLogoPrintDisplayUrl"
-                      :src="schoolLogoPrintDisplayUrl"
-                      :data-original-src="schoolLogoPrintUrl"
-                      :alt="locale.schoolLogo"
+                      v-if="settings.showSchoolLogo && schoolLogoPrintUrl"
+                      :src="schoolLogoPrintUrl"
+                      alt="学校Logo"
                       class="school-logo-print"
-                    />
+                    >
                     <div class="title-section">
                       <h1>{{ siteTitle }}</h1>
-                      <h2>{{ locale.printTitle }}</h2>
+                      <h2>广播排期表</h2>
                     </div>
                   </div>
                   <div class="date-info">
@@ -349,7 +281,7 @@
                 </div>
 
                 <!-- 排期内容 -->
-                <div :class="scheduleContentClass">
+                <div class="schedule-content">
                   <!-- 无数据提示 -->
                   <div v-if="filteredSchedules.length === 0" class="no-data-message">
                     <div class="no-data-icon">
@@ -360,13 +292,12 @@
                         <line x1="3" x2="21" y1="10" y2="10" />
                       </svg>
                     </div>
-                    <h3>{{ locale.emptyTitle }}</h3>
-                    <p v-if="schedules.length === 0">{{ locale.emptyNoSchedules }}</p>
-                    <p v-else>{{ locale.emptyFiltered }}</p>
+                    <h3>暂无排期数据</h3>
+                    <p v-if="schedules.length === 0">请先在"排期管理"中添加排期，然后再来打印。</p>
+                    <p v-else>当前日期范围内没有排期数据，请调整日期范围或检查排期设置。</p>
                   </div>
 
-                  <!-- 只有在非表格排布时才按日期分组 -->
-                  <div v-if="settings.layoutStyle !== 'table'" class="grouped-content">
+                  <div class="grouped-content">
                     <div
                       v-for="(dateGroup, date) in groupedSchedules"
                       :key="date"
@@ -375,7 +306,7 @@
                     >
                       <h3 class="group-title">
                         {{ formatDate(date) }}
-                        <span class="group-count">({{ formatLocale(locale.countOnly, '', dateGroup.allSchedules.length) }})</span>
+                        <span class="group-count">({{ dateGroup.allSchedules.length }}首)</span>
                       </h3>
 
                       <!-- 检查是否需要显示时段分组 -->
@@ -388,18 +319,16 @@
                           <h4 class="playtime-title">
                             {{ playTime }}
                             <span class="playtime-count"
-                              >({{ formatLocale(locale.countOnly, '', playTimeData.schedules.length) }})</span
+                              >({{ playTimeData.schedules.length }}首)</span
                             >
                           </h4>
-
-                          <!-- 经典排布 -->
                           <div class="schedule-list">
                             <div
                               v-for="schedule in playTimeData.schedules"
                               :key="schedule.id"
                               class="schedule-item"
                             >
-                              <ScheduleItemPrint :schedule="schedule" :settings="settings" :narrow="isTwoColumnList" />
+                              <ScheduleItemPrint :schedule="schedule" :settings="settings" />
                             </div>
                           </div>
                         </div>
@@ -412,29 +341,22 @@
                           :key="schedule.id"
                           class="schedule-item"
                         >
-                          <ScheduleItemPrint :schedule="schedule" :settings="settings" :narrow="isTwoColumnList" />
+                          <ScheduleItemPrint :schedule="schedule" :settings="settings" />
                         </div>
                       </div>
                     </div>
                   </div>
-                  <!-- 如果是表格排布，显示单一的大表格 -->
-                  <div v-else-if="filteredSchedules.length > 0" class="schedule-table-wrapper">
-                    <ScheduleTablePrint
-                      :grouped-schedules="groupedSchedules"
-                      :settings="settings"
-                    />
-                  </div>
                 </div>
 
                 <!-- 页面底部 -->
                 <div class="page-footer">
                   <div class="footer-left">
-                    <span>{{ generatedAtText }}</span>
-                    <span v-if="settings.remark" class="remark-text">
-                      {{ remarkText }}
-                    </span>
+                    <span>生成时间：{{ new Date().toLocaleString() }}</span>
+                    <span v-if="settings.remark" class="remark-text"
+                      >备注：{{ settings.remark }}</span
+                    >
                   </div>
-                  <span class="footer-right">{{ locale.footer }}</span>
+                  <span class="footer-right">Generated by VoiceHub | 广播管理系统</span>
                 </div>
               </div>
             </div>
@@ -451,6 +373,7 @@ import { useRuntimeConfig } from '#app'
 import { usePermissions } from '~/composables/usePermissions'
 import { useSiteConfig } from '~/composables/useSiteConfig'
 import { useAuth } from '~/composables/useAuth'
+import { convertToHttps } from '~/utils/url'
 import { toPng, toBlob } from 'html-to-image'
 import { jsPDF } from 'jspdf'
 import {
@@ -464,26 +387,10 @@ import {
   RefreshCw
 } from '@lucide/vue'
 import CustomSelect from '~/components/UI/Common/CustomSelect.vue'
-import { useLocale } from '~/utils/locale'
 
 // 导入子组件
 import ScheduleItemPrint from './ScheduleItemPrint.vue'
-import ScheduleTablePrint from './ScheduleTablePrint.vue'
-
-// 学期管理
-import { useSemesters } from '~/composables/useSemesters'
-const { currentSemester, fetchCurrentSemester } = useSemesters()
-const { admin, currentLocale } = useLocale()
-const locale = computed(() => admin.value?.schedulePrinter || {})
-const { format: formatLocale } = useLocaleText(locale)
-const generatedAtText = computed(() => {
-  const nowText = new Date().toLocaleString(currentLocale.value)
-  return formatLocale(locale.value?.generatedAt, nowText, nowText)
-})
-const remarkText = computed(() => {
-  const remark = settings.remark || ''
-  return formatLocale(locale.value?.remarkPrefix, remark, remark)
-})
+import logoPng from '~~/public/images/logo.png'
 
 // 权限检查
 const { canPrintSchedule } = usePermissions()
@@ -492,12 +399,13 @@ const { canPrintSchedule } = usePermissions()
 const { getAuthConfig } = useAuth()
 
 // 站点配置
-const { siteTitle, schoolLogoPrintUrl, schoolLogoPrintDisplayUrl, initSiteConfig } = useSiteConfig()
+const { siteTitle, schoolLogoPrintUrl, initSiteConfig } = useSiteConfig()
 
 // 配置
 const config = useRuntimeConfig()
 
-
+// Logo URL处理
+const logoUrl = computed(() => logoPng)
 
 // 响应式数据
 const schedules = ref([])
@@ -511,11 +419,8 @@ const previewContent = ref(null)
 const settings = ref({
   paperSize: 'A4',
   orientation: 'portrait',
-  layoutStyle: 'classic',
-  listColumns: 1,
   startDate: '',
   endDate: '',
-  dateRangePreset: '',
   showCover: false,
   showTitle: true,
   showArtist: true,
@@ -524,8 +429,7 @@ const settings = ref({
   showSequence: true,
   showSchoolLogo: false,
   showPlayTime: true,
-  remark: '',
-  currentSemester: ''
+  remark: ''
 })
 
 const paperSizeOptions = [
@@ -535,33 +439,21 @@ const paperSizeOptions = [
   { label: 'Legal (216×356mm)', value: 'Legal' }
 ]
 
-const dateRanges = computed(() => [
-  { label: locale.value?.dateRanges?.today || 'Today', value: 'today' },
-  { label: locale.value?.dateRanges?.tomorrow || 'Tomorrow', value: 'tomorrow' },
-  { label: locale.value?.dateRanges?.thisWeek || 'This week', value: 'thisWeek' },
-  { label: locale.value?.dateRanges?.nextWeek || 'Next week', value: 'nextWeek' }
-])
+const dateRanges = [
+  { label: '今天', value: 'today' },
+  { label: '明天', value: 'tomorrow' },
+  { label: '本周', value: 'thisWeek' },
+  { label: '下周', value: 'nextWeek' }
+]
 
-const contentOptions = computed(() => [
-  { key: 'showCover', label: locale.value?.contentOptions?.cover || 'Cover' },
-  { key: 'showTitle', label: locale.value?.contentOptions?.title || 'Title' },
-  { key: 'showArtist', label: locale.value?.contentOptions?.artist || 'Artist' },
-  { key: 'showRequester', label: locale.value?.contentOptions?.requester || 'Requester' },
-  { key: 'showVotes', label: locale.value?.contentOptions?.votes || 'Votes' },
-  { key: 'showSequence', label: locale.value?.contentOptions?.sequence || 'Sequence' },
-  { key: 'showPlayTime', label: locale.value?.contentOptions?.playTime || 'Play time' }
-])
-
-const paperWidths = {
-  A4: { portrait: 800, landscape: 1132 },
-  A3: { portrait: 1132, landscape: 1600 },
-  Letter: { portrait: 800, landscape: 1034 },
-  Legal: { portrait: 800, landscape: 1318 }
-}
-
-const getPaperWidth = (paperSize, orientation) => {
-  return paperWidths[paperSize]?.[orientation] || paperWidths.A4.portrait
-}
+const contentOptions = [
+  { key: 'showCover', label: '歌曲封面' },
+  { key: 'showTitle', label: '歌曲名' },
+  { key: 'showArtist', label: '歌手' },
+  { key: 'showRequester', label: '投稿人' },
+  { key: 'showVotes', label: '热度' },
+  { key: 'showSequence', label: '播放顺序' }
+]
 
 // 计算属性
 const itemsPerPage = computed(() => {
@@ -607,7 +499,7 @@ const formatDate = (dateStr) => {
       ? new Date(dateStr.replace(/-/g, '/'))
       : new Date(dateStr)
 
-  return date.toLocaleDateString(currentLocale.value, {
+  return date.toLocaleDateString('zh-CN', {
     year: 'numeric',
     month: 'long',
     day: 'numeric',
@@ -617,7 +509,7 @@ const formatDate = (dateStr) => {
 
 const formatDateRange = () => {
   if (!settings.value.startDate && !settings.value.endDate) {
-    return locale.value.allSchedules
+    return '全部排期'
   }
 
   // 如果开始和结束日期相同，只显示一个日期
@@ -629,21 +521,21 @@ const formatDateRange = () => {
     return formatDate(settings.value.startDate)
   }
 
-  const start = settings.value.startDate ? formatDate(settings.value.startDate) : locale.value.rangeStart
-  const end = settings.value.endDate ? formatDate(settings.value.endDate) : locale.value.rangeEnd
+  const start = settings.value.startDate ? formatDate(settings.value.startDate) : '开始'
+  const end = settings.value.endDate ? formatDate(settings.value.endDate) : '结束'
 
   // 如果日期范围较长，使用双行显示
   const fullRange = `${start} - ${end}`
   if (fullRange.length > 20) {
-    return locale.value.rangeTo(start, end)
+    return `${start}\n至 ${end}`
   }
 
   return fullRange
 }
 
-// 根据预设类型计算日期范围
-const calculateDateRange = (type) => {
-  const today = getSyncedDate()
+// 设置日期范围
+const setDateRange = (type) => {
+  const today = new Date()
   const start = new Date(today)
   const end = new Date(today)
 
@@ -653,19 +545,25 @@ const calculateDateRange = (type) => {
     start.setDate(today.getDate() + 1)
     end.setDate(today.getDate() + 1)
   } else if (type === 'thisWeek') {
-    const day = today.getDay()
+    const day = today.getDay() // Sunday is 0, Monday is 1...
+    // 假设周一为一周的开始
     const diffToMon = day === 0 ? 6 : day - 1
     start.setDate(today.getDate() - diffToMon)
+
+    // 重新创建一个日期对象来计算结束日期，避免引用问题
     end.setTime(start.getTime())
     end.setDate(start.getDate() + 6)
   } else if (type === 'nextWeek') {
     const day = today.getDay()
     const diffToMon = day === 0 ? 6 : day - 1
     start.setDate(today.getDate() - diffToMon + 7)
+
+    // 重新创建一个日期对象来计算结束日期
     end.setTime(start.getTime())
     end.setDate(start.getDate() + 6)
   }
 
+  // 转换为本地日期的 YYYY-MM-DD 格式，避免时区导致的日期偏差
   const formatDateStr = (date) => {
     const year = date.getFullYear()
     const month = String(date.getMonth() + 1).padStart(2, '0')
@@ -673,23 +571,13 @@ const calculateDateRange = (type) => {
     return `${year}-${month}-${day}`
   }
 
-  return {
-    startDate: formatDateStr(start),
-    endDate: formatDateStr(end)
-  }
-}
-
-// 设置日期范围
-const setDateRange = (type) => {
-  const { startDate, endDate } = calculateDateRange(type)
-  settings.value.startDate = startDate
-  settings.value.endDate = endDate
-  settings.value.dateRangePreset = type
+  settings.value.startDate = formatDateStr(start)
+  settings.value.endDate = formatDateStr(end)
 }
 
 // 格式化播出时段显示文本
 const formatPlayTimeDisplay = (playTime) => {
-  if (!playTime) return locale.value.unspecifiedPlayTime
+  if (!playTime) return '未指定时段'
 
   let displayText = playTime.name
 
@@ -697,42 +585,14 @@ const formatPlayTimeDisplay = (playTime) => {
   if (playTime.startTime && playTime.endTime) {
     displayText += ` (${playTime.startTime}-${playTime.endTime})`
   } else if (playTime.startTime) {
-    displayText = locale.value.playTimeStarts(displayText, playTime.startTime)
+    displayText += ` (${playTime.startTime}开始)`
   } else if (playTime.endTime) {
-    displayText = locale.value.playTimeEnds(displayText, playTime.endTime)
+    displayText += ` (${playTime.endTime}结束)`
   }
 
   return displayText
 }
 
-// 选择经典排版时自动切换为纵向
-const selectClassicLayout = () => {
-  settings.value.layoutStyle = 'classic'
-  settings.value.orientation = 'portrait'
-}
-
-// 选择表格排版时自动切换为横向
-const selectTableLayout = () => {
-  settings.value.layoutStyle = 'table'
-  settings.value.orientation = 'landscape'
-}
-
-// 纵向经典列表才提供分栏设置
-const showListColumns = computed(() => {
-  const s = settings.value
-  return s.layoutStyle === 'classic' && s.orientation === 'portrait'
-})
-
-// 两列时排期项改用窄版两行排版
-const isTwoColumnList = computed(() => showListColumns.value && settings.value.listColumns === 2)
-
-// 排期内容容器 class（预览与两条导出路径共用）
-const scheduleContentClass = computed(
-  () =>
-    `schedule-content layout-${settings.value.layoutStyle}` +
-    (isTwoColumnList.value ? ' is-two-column' : '')
-)
-
 // 获取播出时段的排序权重
 const getPlayTimeSortWeight = (playTime) => {
   if (!playTime || !playTime.startTime) return 9999 // 未指定时段排在最后
@@ -820,12 +680,11 @@ const groupedSchedules = computed(() => {
 
 // 判断是否需要显示时段分组
 const hasMultiplePlayTimes = (dateGroup) => {
-  if (!settings.value.showPlayTime) return false
   const playTimeKeys = Object.keys(dateGroup.playTimes)
   // 如果有多个时段，显示分组
   if (playTimeKeys.length > 1) return true
   // 如果只有一个时段且不是"未指定时段"，显示分组
-  if (playTimeKeys.length === 1 && playTimeKeys[0] !== locale.value.unspecifiedPlayTime) return true
+  if (playTimeKeys.length === 1 && playTimeKeys[0] !== '未指定时段') return true
   // 其他情况不显示分组
   return false
 }
@@ -834,7 +693,8 @@ const hasMultiplePlayTimes = (dateGroup) => {
 const loadSchedules = async () => {
   loading.value = true
   try {
-    const data = await $fetch('/api/songs/public', {
+    // 添加 bypass_cache=true 参数，确保获取最新的排期数据
+    const data = await $fetch('/api/songs/public?bypass_cache=true', {
       ...getAuthConfig()
     })
     // API直接返回排期数组，不是包装在schedules属性中
@@ -843,13 +703,13 @@ const loadSchedules = async () => {
     // 如果没有数据，显示提示
     if (schedules.value.length === 0) {
       if (window.$showNotification) {
-        window.$showNotification(locale.value.noSchedulesNotice, 'info')
+        window.$showNotification('当前没有排期数据，请先在排期管理中添加排期', 'info')
       }
     }
   } catch (error) {
     console.error('加载排期失败:', error)
     if (window.$showNotification) {
-      window.$showNotification(locale.value.loadFailed(error.message), 'error')
+      window.$showNotification('加载排期失败: ' + error.message, 'error')
     }
   } finally {
     loading.value = false
@@ -859,7 +719,7 @@ const loadSchedules = async () => {
 const refreshPreview = async () => {
   await loadSchedules()
   if (window.$showNotification) {
-    window.$showNotification(locale.value.previewRefreshed, 'success')
+    window.$showNotification('预览已刷新', 'success')
   }
 }
 
@@ -869,16 +729,16 @@ const printSchedule = async () => {
   isPrinting.value = true
   try {
     if (window.$showNotification) {
-      window.$showNotification(locale.value.preparingPrint, 'info')
+      window.$showNotification('正在准备打印...', 'info')
     }
 
     // 复用PDF导出逻辑，但用于打印
     await exportPDFForPrint()
   } catch (error) {
     console.error('打印失败:', error)
-    const errorMsg = error?.message || (typeof error === 'string' ? error : locale.value.unknownError)
+    const errorMsg = error?.message || (typeof error === 'string' ? error : '未知错误')
     if (window.$showNotification) {
-      window.$showNotification(locale.value.printFailed(errorMsg), 'error')
+      window.$showNotification('打印失败: ' + errorMsg, 'error')
     }
   } finally {
     // 延迟重置状态，给用户足够的时间看到"打印中"状态
@@ -891,7 +751,7 @@ const printSchedule = async () => {
 // 统一的PDF生成函数（支持打印和下载）
 // 采用DOM分页策略，避免长图渲染导致的内存溢出和卡死
 const exportPDFForPrint = async (action = 'print') => {
-  if (!previewContent.value) throw new Error(locale.value.previewNotFound)
+  if (!previewContent.value) throw new Error('预览内容未找到')
 
   const originalPrintPage = previewContent.value.querySelector('.print-page')
   if (!originalPrintPage) throw new Error('打印页面元素未找到')
@@ -906,17 +766,18 @@ const exportPDFForPrint = async (action = 'print') => {
   const pdfWidth = pdf.internal.pageSize.getWidth()
   const pdfHeight = pdf.internal.pageSize.getHeight()
 
-  // 计算容器尺寸，与 generateAndDownloadImage 保持一致
-  const s = settings.value
-  const containerWidth = getPaperWidth(s.paperSize, s.orientation)
-
+  // 计算容器尺寸 (使用 A4 纸比例的像素值，确保清晰度)
+  // A4 @ 96dpi approx 794x1123. Use 2x for better quality?
+  // No, let's match standard pixel width for A4 usually used in web (794px).
+  // The scale factor will be handled by toPng pixelRatio.
+  const containerWidth = settings.value.paperSize === 'A4' ? 794 : 1123
   // 保持宽高比
   const ratio = pdfHeight / pdfWidth
   const containerHeight = Math.floor(containerWidth * ratio)
 
   // 创建分页容器（模拟单页纸张）
   const pageContainer = document.createElement('div')
-  pageContainer.className = `print-page orientation-${settings.value.orientation}`
+  pageContainer.className = 'print-page' // 复用样式类
   pageContainer.style.cssText = `
     position: fixed;
     left: 0;
@@ -925,7 +786,7 @@ const exportPDFForPrint = async (action = 'print') => {
     height: ${containerHeight}px;
     background: white;
     color: black;
-    padding: 40px;
+    padding: 40px; 
     box-sizing: border-box;
     z-index: -9999;
     overflow: hidden;
@@ -950,60 +811,8 @@ const exportPDFForPrint = async (action = 'print') => {
       throw new Error('排期内容结构不符合分页要求')
     }
 
-    const scopeAttributeNames = originalPrintPage
-      .getAttributeNames()
-      .filter((name) => name.startsWith('data-v-'))
-
-    const applyScopeAttributes = (el) => {
-      scopeAttributeNames.forEach((name) => {
-        el.setAttribute(name, '')
-      })
-      return el
-    }
-
-    applyScopeAttributes(pageContainer)
-
     // 辅助：渲染当前页并添加到PDF
     const renderPage = async (isFirst) => {
-      // 在渲染前，清理页面中因为分页产生的空容器（如：没有子项的日期组、没有子项的表格），避免出现只有表头没有内容的孤立节点
-      const contentWrapper = pageContainer.querySelector('.schedule-content')
-      if (contentWrapper) {
-        const dGroups = contentWrapper.querySelectorAll('.date-group')
-        dGroups.forEach((dg) => {
-          if (dg.querySelectorAll('.schedule-item').length === 0) {
-            dg.remove()
-          } else {
-            const ptGroups = dg.querySelectorAll('.playtime-group')
-            ptGroups.forEach((ptg) => {
-              if (ptg.querySelectorAll('.schedule-item').length === 0) {
-                ptg.remove()
-              }
-            })
-            const ptWrappers = dg.querySelectorAll('.playtime-groups')
-            ptWrappers.forEach((ptw) => {
-              if (ptw.children.length === 0) ptw.remove()
-            })
-          }
-        })
-
-        const tableWrappers = contentWrapper.querySelectorAll('.schedule-table-wrapper')
-        tableWrappers.forEach((wrapper) => {
-          const table = wrapper.querySelector('.schedule-timetable')
-          if (table) {
-            // 移除没有歌曲项的 tbody (播放时间组)
-            table.querySelectorAll('tbody').forEach((tbody) => {
-              if (tbody.querySelectorAll('.song-item').length === 0) {
-                tbody.remove()
-              }
-            })
-            // 如果整个表格都没有歌曲项了，移除整个包装器
-            if (table.querySelectorAll('.song-item').length === 0) {
-              wrapper.remove()
-            }
-          }
-        })
-      }
-
       applyForceStyles(pageContainer)
 
       // 预处理当前页面的图片
@@ -1032,7 +841,6 @@ const exportPDFForPrint = async (action = 'print') => {
 
     // 辅助：重置页面容器（添加页眉页脚）
     let currentContentWrapper = null
-    let currentGroupedContent = null
 
     const resetPageContainer = () => {
       pageContainer.innerHTML = ''
@@ -1045,24 +853,13 @@ const exportPDFForPrint = async (action = 'print') => {
       }
 
       // 创建内容区域
-      const cw = applyScopeAttributes(document.createElement('div'))
-      cw.className = scheduleContentClass.value
-
+      const cw = document.createElement('div')
+      cw.className = 'schedule-content'
       cw.style.margin = '0'
       cw.style.padding = '0'
       pageContainer.appendChild(cw)
       currentContentWrapper = cw
 
-      const sourceGrouped = sourceContent?.querySelector('.grouped-content')
-      if (sourceGrouped) {
-        const gw = applyScopeAttributes(document.createElement('div'))
-        gw.className = sourceGrouped.className
-        cw.appendChild(gw)
-        currentGroupedContent = gw
-      } else {
-        currentGroupedContent = cw
-      }
-
       // 添加 Footer (绝对定位到底部)
       if (sourceFooter) {
         const f = sourceFooter.cloneNode(true)
@@ -1090,171 +887,115 @@ const exportPDFForPrint = async (action = 'print') => {
     // 递归处理节点
     // 策略：我们手动遍历主要结构，因为结构是已知的
     const dateGroups = sourceContent.querySelectorAll('.date-group')
-    const directTableWrapper = sourceContent.querySelector('.schedule-table-wrapper')
 
-    if (dateGroups.length > 0) {
-      for (const group of dateGroups) {
-        // 1. 克隆 Date Group 容器和标题
-        const groupClone = group.cloneNode(false) // shallow
-        const groupTitle = group.querySelector('.group-title').cloneNode(true)
-        groupClone.appendChild(groupTitle)
+    for (const group of dateGroups) {
+      // 1. 克隆 Date Group 容器和标题
+      const groupClone = group.cloneNode(false) // shallow
+      const groupTitle = group.querySelector('.group-title').cloneNode(true)
+      groupClone.appendChild(groupTitle)
 
-        currentGroupedContent.appendChild(groupClone)
+      currentContentWrapper.appendChild(groupClone)
 
-        // 检查标题是否溢出（极少见）
-        if (checkOverflow()) {
-          currentGroupedContent.removeChild(groupClone)
-          await renderPage(isFirstPage)
-          isFirstPage = false
-          resetPageContainer()
-          currentGroupedContent.appendChild(groupClone)
-        }
+      // 检查标题是否溢出（极少见）
+      if (checkOverflow()) {
+        currentContentWrapper.removeChild(groupClone)
+        await renderPage(isFirstPage)
+        isFirstPage = false
+        resetPageContainer()
+        currentContentWrapper.appendChild(groupClone)
+      }
 
-        // 2. 遍历 Date Group 的子元素 (Playtime Groups 或 Schedule List)
-        const children = Array.from(group.children).filter(
-          (el) => !el.classList.contains('group-title')
-        )
+      // 2. 遍历 Date Group 的子元素 (Playtime Groups 或 Schedule List)
+      const children = Array.from(group.children).filter(
+        (el) => !el.classList.contains('group-title')
+      )
 
-        for (const child of children) {
-          if (child.classList.contains('playtime-groups')) {
-            // 处理时段组
-            const ptWrapper = applyScopeAttributes(document.createElement('div'))
-            ptWrapper.className = 'playtime-groups'
-            groupClone.appendChild(ptWrapper)
+      for (const child of children) {
+        if (child.classList.contains('playtime-groups')) {
+          // 处理时段组
+          const ptWrapper = document.createElement('div')
+          ptWrapper.className = 'playtime-groups'
+          groupClone.appendChild(ptWrapper)
 
-            const ptGroups = child.querySelectorAll('.playtime-group')
-            for (const ptGroup of ptGroups) {
-              const ptGroupClone = ptGroup.cloneNode(false)
-              const ptTitle = ptGroup.querySelector('.playtime-title').cloneNode(true)
-              ptGroupClone.appendChild(ptTitle)
-              ptWrapper.appendChild(ptGroupClone)
+          const ptGroups = child.querySelectorAll('.playtime-group')
+          for (const ptGroup of ptGroups) {
+            const ptGroupClone = ptGroup.cloneNode(false)
+            const ptTitle = ptGroup.querySelector('.playtime-title').cloneNode(true)
+            ptGroupClone.appendChild(ptTitle)
+            ptWrapper.appendChild(ptGroupClone)
 
-              const sourceList = ptGroup.querySelector('.schedule-list')
-
-              if (sourceList) {
-                const listWrapper = applyScopeAttributes(document.createElement('div'))
-                listWrapper.className = 'schedule-list'
-                ptGroupClone.appendChild(listWrapper)
-
-                let currentPtListWrapper = listWrapper
-
-                // 遍历排期项
-                const items = sourceList.querySelectorAll('.schedule-item')
-                for (const item of items) {
-                  const itemClone = item.cloneNode(true)
-                  currentPtListWrapper.appendChild(itemClone)
-
-                  if (checkOverflow()) {
-                    currentPtListWrapper.removeChild(itemClone)
-                    await renderPage(isFirstPage)
-                    isFirstPage = false
-                    resetPageContainer()
-
-                    // 在新页面重建路径
-                    const newGroup = group.cloneNode(false)
-                    newGroup.appendChild(group.querySelector('.group-title').cloneNode(true))
-                    currentGroupedContent.appendChild(newGroup)
-
-                    const newPtWrapper = applyScopeAttributes(document.createElement('div'))
-                    newPtWrapper.className = 'playtime-groups'
-                    newGroup.appendChild(newPtWrapper)
-
-                    const newPtGroup = ptGroup.cloneNode(false)
-                    newPtGroup.appendChild(ptGroup.querySelector('.playtime-title').cloneNode(true))
-                    newPtWrapper.appendChild(newPtGroup)
-
-                    const newListWrapper = applyScopeAttributes(document.createElement('div'))
-                    newListWrapper.className = 'schedule-list'
-                    newPtGroup.appendChild(newListWrapper)
-
-                    // 添加项
-                    newListWrapper.appendChild(itemClone)
-                    currentPtListWrapper = newListWrapper
-                  }
-                }
-              }
-            }
-          } else if (child.classList.contains('schedule-list')) {
-            // 处理直接列表
-            const listWrapper = applyScopeAttributes(document.createElement('div'))
+            const listWrapper = document.createElement('div')
             listWrapper.className = 'schedule-list'
-            groupClone.appendChild(listWrapper)
+            ptGroupClone.appendChild(listWrapper)
 
-            // 我们需要一个可变的引用
-            let currentListWrapper = listWrapper
+            let currentPtListWrapper = listWrapper
 
-            const items = child.querySelectorAll('.schedule-item')
+            // 遍历排期项
+            const items = ptGroup.querySelectorAll('.schedule-item')
             for (const item of items) {
               const itemClone = item.cloneNode(true)
-              currentListWrapper.appendChild(itemClone)
+              currentPtListWrapper.appendChild(itemClone)
 
               if (checkOverflow()) {
-                currentListWrapper.removeChild(itemClone)
+                currentPtListWrapper.removeChild(itemClone)
                 await renderPage(isFirstPage)
                 isFirstPage = false
                 resetPageContainer()
 
-                // 重建路径
+                // 在新页面重建路径
                 const newGroup = group.cloneNode(false)
                 newGroup.appendChild(group.querySelector('.group-title').cloneNode(true))
-                currentGroupedContent.appendChild(newGroup)
+                currentContentWrapper.appendChild(newGroup)
 
-                const newListWrapper = applyScopeAttributes(document.createElement('div'))
+                const newPtWrapper = document.createElement('div')
+                newPtWrapper.className = 'playtime-groups'
+                newGroup.appendChild(newPtWrapper)
+
+                const newPtGroup = ptGroup.cloneNode(false)
+                newPtGroup.appendChild(ptGroup.querySelector('.playtime-title').cloneNode(true))
+                newPtWrapper.appendChild(newPtGroup)
+
+                const newListWrapper = document.createElement('div')
                 newListWrapper.className = 'schedule-list'
-                newGroup.appendChild(newListWrapper)
+                newPtGroup.appendChild(newListWrapper)
 
+                // 添加项
                 newListWrapper.appendChild(itemClone)
-                currentListWrapper = newListWrapper
+                currentPtListWrapper = newListWrapper
               }
             }
           }
-        }
-      }
-    } else if (directTableWrapper) {
-      // 处理顶层表格（timetable）
-      const tableWrapper = applyScopeAttributes(document.createElement('div'))
-      tableWrapper.className = 'schedule-table-wrapper'
-      currentContentWrapper.appendChild(tableWrapper)
+        } else if (child.classList.contains('schedule-list')) {
+          // 处理直接列表
+          const listWrapper = document.createElement('div')
+          listWrapper.className = 'schedule-list'
+          groupClone.appendChild(listWrapper)
 
-      const sourceTable = directTableWrapper.querySelector('.schedule-timetable')
-      if (sourceTable) {
-        const tableClone = sourceTable.cloneNode(false)
-        tableWrapper.appendChild(tableClone)
+          // 我们需要一个可变的引用
+          let currentListWrapper = listWrapper
 
-        const thead = sourceTable.querySelector('thead')
-        if (thead) tableClone.appendChild(thead.cloneNode(true))
-
-        const tbodies = sourceTable.querySelectorAll('tbody')
-        for (const sourceTbody of tbodies) {
-          const tbodyClone = applyScopeAttributes(document.createElement('tbody'))
-          tableClone.appendChild(tbodyClone)
-          let currentTbody = tbodyClone
-
-          const rows = sourceTbody.querySelectorAll('tr')
-          for (const row of rows) {
-            const rowClone = row.cloneNode(true)
-            currentTbody.appendChild(rowClone)
+          const items = child.querySelectorAll('.schedule-item')
+          for (const item of items) {
+            const itemClone = item.cloneNode(true)
+            currentListWrapper.appendChild(itemClone)
 
             if (checkOverflow()) {
-              currentTbody.removeChild(rowClone)
+              currentListWrapper.removeChild(itemClone)
               await renderPage(isFirstPage)
               isFirstPage = false
               resetPageContainer()
 
               // 重建路径
-              const newTableWrapper = applyScopeAttributes(document.createElement('div'))
-              newTableWrapper.className = 'schedule-table-wrapper'
-              currentContentWrapper.appendChild(newTableWrapper)
+              const newGroup = group.cloneNode(false)
+              newGroup.appendChild(group.querySelector('.group-title').cloneNode(true))
+              currentContentWrapper.appendChild(newGroup)
 
-              const newTable = sourceTable.cloneNode(false)
-              newTableWrapper.appendChild(newTable)
-              if (thead) newTable.appendChild(thead.cloneNode(true))
+              const newListWrapper = document.createElement('div')
+              newListWrapper.className = 'schedule-list'
+              newGroup.appendChild(newListWrapper)
 
-              const newTbody = applyScopeAttributes(document.createElement('tbody'))
-              newTable.appendChild(newTbody)
-
-              newTbody.appendChild(rowClone)
-              currentTbody = newTbody
+              newListWrapper.appendChild(itemClone)
+              currentListWrapper = newListWrapper
             }
           }
         }
@@ -1266,43 +1007,12 @@ const exportPDFForPrint = async (action = 'print') => {
 
     if (action === 'print') {
       pdf.autoPrint()
-      const blobUrl = pdf.output('bloburl')
-
-      const iframe = document.createElement('iframe')
-      iframe.style.position = 'fixed'
-      iframe.style.right = '0'
-      iframe.style.bottom = '0'
-      iframe.style.width = '1px'
-      iframe.style.height = '1px'
-      iframe.style.opacity = '0.01'
-      iframe.style.border = 'none'
-
-      iframe.onload = () => {
-        setTimeout(() => {
-          try {
-            iframe.contentWindow?.focus()
-            iframe.contentWindow?.print()
-          } catch (e) {
-            console.warn('iframe 显式打印失败，依赖 autoPrint 或降级', e)
-          }
-        }, 500)
-      }
-
-      iframe.src = blobUrl
-      document.body.appendChild(iframe)
-
-      // 清理资源
-      setTimeout(() => {
-        if (document.body.contains(iframe)) {
-          document.body.removeChild(iframe)
-        }
-        URL.revokeObjectURL(blobUrl)
-      }, 300000)
+      window.open(pdf.output('bloburl'), '_blank')
     } else {
       const filename = `广播排期表_${formatDateRange().replace(/\n/g, '_')}_${new Date().toISOString().split('T')[0]}.pdf`
       pdf.save(filename)
       if (window.$showNotification) {
-        window.$showNotification(locale.value.pdfExported, 'success')
+        window.$showNotification('PDF导出成功', 'success')
       }
     }
   } finally {
@@ -1312,73 +1022,16 @@ const exportPDFForPrint = async (action = 'print') => {
   }
 }
 
-const isPrivateIPv4 = (hostname) => {
-  const parts = hostname.split('.').map(Number)
-  if (parts.length !== 4 || parts.some((part) => Number.isNaN(part))) return false
-  const [first, second] = parts
-  return (
-    first === 10 ||
-    first === 127 ||
-    (first === 169 && second === 254) ||
-    (first === 172 && second >= 16 && second <= 31) ||
-    (first === 192 && second === 168)
-  )
-}
-
-const isPrivateIPv6 = (hostname) => {
-  const normalizedHost = hostname.toLowerCase()
-  return (
-    normalizedHost === '::1' ||
-    normalizedHost.startsWith('fc') ||
-    normalizedHost.startsWith('fd') ||
-    normalizedHost.startsWith('fe8') ||
-    normalizedHost.startsWith('fe9') ||
-    normalizedHost.startsWith('fea') ||
-    normalizedHost.startsWith('feb')
-  )
-}
-
-const shouldFetchImageDirectly = (url) => {
-  try {
-    const parsedUrl = new URL(url, window.location.origin)
-    const hostname = parsedUrl.hostname.toLowerCase().replace(/^\[(.*)\]$/, '$1')
-    return (
-      parsedUrl.origin === window.location.origin ||
-      hostname === 'localhost' ||
-      hostname.endsWith('.localhost') ||
-      hostname.endsWith('.local') ||
-      hostname.endsWith('.lan') ||
-      hostname.endsWith('.internal') ||
-      isPrivateIPv4(hostname) ||
-      isPrivateIPv6(hostname)
-    )
-  } catch {
-    return true
-  }
-}
-
-const fetchImageBlob = async (url, useProxy) => {
-  const targetUrl = useProxy ? `/api/proxy/image?url=${encodeURIComponent(url)}` : url
-  const response = await fetch(targetUrl)
-  if (!response.ok) {
-    throw new Error(useProxy ? '图片代理下载失败' : '图片直连下载失败')
-  }
-  return response.blob()
-}
-
 // 预下载图片并转换为base64
 const downloadImageAsBase64 = async (url) => {
   try {
-    const directFirst = shouldFetchImageDirectly(url)
-    let blob
-    try {
-      blob = await fetchImageBlob(url, !directFirst)
-    } catch (error) {
-      if (directFirst) throw error
-      // 代理拒绝内网解析时，交给浏览器按用户网络环境直连
-      blob = await fetchImageBlob(url, false)
-    }
+    // 使用代理API获取图片
+    const proxyUrl = `/api/proxy/image?url=${encodeURIComponent(url)}`
+    const response = await fetch(proxyUrl)
 
+    if (!response.ok) throw new Error('图片代理下载失败')
+
+    const blob = await response.blob()
     return new Promise((resolve, reject) => {
       const reader = new FileReader()
       reader.onload = () => resolve(reader.result)
@@ -1399,7 +1052,7 @@ const preprocessImages = async (element) => {
   const imagePromises = Array.from(images).map(async (img) => {
     if (img.src && !img.src.startsWith('data:')) {
       try {
-        const base64 = await downloadImageAsBase64(img.dataset.originalSrc || img.src)
+        const base64 = await downloadImageAsBase64(img.src)
         if (base64) {
           img.src = base64
         } else {
@@ -1439,15 +1092,9 @@ const preprocessImages = async (element) => {
       img.style.setProperty('object-fit', 'contain', 'important')
       img.style.setProperty('border-radius', '4px', 'important')
     } else if (img.classList.contains('song-cover')) {
-      // 仅经典样式封面跟随 .cover-section 容器尺寸（硬写 40px 会被全局 img max-width 夹窄导致非正方形）；
-      // 表格样式封面无容器包装，必须保持固定尺寸，100% 会占满单元格挤掉文字
-      if (img.closest('.cover-section')) {
-        img.style.setProperty('width', '100%', 'important')
-        img.style.setProperty('height', '100%', 'important')
-      } else {
-        img.style.setProperty('width', '36px', 'important')
-        img.style.setProperty('height', '36px', 'important')
-      }
+      // 歌曲封面保持固定尺寸
+      img.style.setProperty('width', '40px', 'important')
+      img.style.setProperty('height', '40px', 'important')
       img.style.setProperty('object-fit', 'cover', 'important')
       img.style.setProperty('border-radius', '4px', 'important')
     }
@@ -1460,8 +1107,18 @@ const preprocessImages = async (element) => {
 
 const generateAndDownloadImage = async (sourceElement, filename, preProcessCallback = null) => {
   // 根据设置计算固定宽度，而不是依赖 offsetWidth (在移动端可能受屏幕宽度限制而不准确)
+  let targetWidth = 800 // 默认为 A4 Portrait 宽度
   const s = settings.value
-  const targetWidth = getPaperWidth(s.paperSize, s.orientation)
+
+  if (s.paperSize === 'A4') {
+    targetWidth = s.orientation === 'landscape' ? 1132 : 800
+  } else if (s.paperSize === 'A3') {
+    targetWidth = s.orientation === 'landscape' ? 1600 : 1132
+  } else if (s.paperSize === 'Letter') {
+    targetWidth = s.orientation === 'landscape' ? 1034 : 800
+  } else if (s.paperSize === 'Legal') {
+    targetWidth = s.orientation === 'landscape' ? 1318 : 800
+  }
 
   const imageContainer = document.createElement('div')
   imageContainer.style.cssText = `
@@ -1470,25 +1127,17 @@ const generateAndDownloadImage = async (sourceElement, filename, preProcessCallb
       top: 0;
       z-index: -9999;
       opacity: 0;
-      background: #ffffff;
-      color: #1a1a1a;
+      background: white;
+      color: black;
       width: ${targetWidth}px;
       padding: 40px;
       box-sizing: border-box;
-      height: auto;
+      height: auto; 
       pointer-events: none;
     `
 
   const clonedPage = sourceElement.cloneNode(true)
 
-  // 强制应用当前的横竖排样式，防止因为源节点（可能是响应式的）没有这个类名
-  clonedPage.classList.add(`orientation-${s.orientation}`)
-
-  const scheduleContent = clonedPage.querySelector('.schedule-content')
-  if (scheduleContent) {
-    scheduleContent.className = scheduleContentClass.value
-  }
-
   // 使用 setProperty 避免覆盖其他重要样式
   clonedPage.style.setProperty('background', 'white', 'important')
   clonedPage.style.setProperty('color', 'black', 'important')
@@ -1510,9 +1159,9 @@ const generateAndDownloadImage = async (sourceElement, filename, preProcessCallb
   const allElements = clonedPage.querySelectorAll('*')
   allElements.forEach((el) => {
     if (el.style) {
-      el.style.color = '#1a1a1a !important'
-      el.style.background = '#ffffff !important'
-      el.style.backgroundColor = '#ffffff !important'
+      el.style.color = 'black !important'
+      el.style.background = 'white !important'
+      el.style.backgroundColor = 'white !important'
     }
 
     if (
@@ -1522,8 +1171,8 @@ const generateAndDownloadImage = async (sourceElement, filename, preProcessCallb
         el.classList.contains('page-footer') ||
         el.classList.contains('schedule-content'))
     ) {
-      el.style.setProperty('background', '#ffffff', 'important')
-      el.style.setProperty('background-color', '#ffffff', 'important')
+      el.style.setProperty('background', 'white', 'important')
+      el.style.setProperty('background-color', 'white', 'important')
     }
   })
 
@@ -1627,7 +1276,7 @@ const exportSplitImages = async (printPage) => {
   }
 
   if (window.$showNotification) {
-    window.$showNotification(locale.value.segmentedExport(sortedMonths.length), 'success')
+    window.$showNotification(`已完成分段导出，共 ${sortedMonths.length} 张图片`, 'success')
   }
 }
 
@@ -1637,7 +1286,7 @@ const exportPDF = async () => {
   isExporting.value = true
   try {
     if (window.$showNotification) {
-      window.$showNotification(locale.value.preparingPdf, 'info')
+      window.$showNotification('正在准备PDF...', 'info')
     }
 
     // 复用 DOM 分页逻辑导出 PDF，避免长图导致内存溢出
@@ -1645,7 +1294,7 @@ const exportPDF = async () => {
   } catch (error) {
     console.error('导出PDF失败:', error)
     if (window.$showNotification) {
-      window.$showNotification(locale.value.pdfExportFailed(error.message), 'error')
+      window.$showNotification('导出PDF失败: ' + error.message, 'error')
     }
   } finally {
     isExporting.value = false
@@ -1657,7 +1306,7 @@ const exportImage = async () => {
 
   if (!previewContent.value) {
     if (window.$showNotification) {
-      window.$showNotification(locale.value.previewNotFound, 'error')
+      window.$showNotification('预览内容未找到', 'error')
     }
     return
   }
@@ -1692,7 +1341,7 @@ const exportImage = async () => {
 
     if (fullHeight > MAX_HEIGHT) {
       if (window.$showNotification) {
-        window.$showNotification(locale.value.autoSegmenting, 'info')
+        window.$showNotification('排期内容过长，将自动分段导出', 'info')
       }
       await exportSplitImages(printPage)
     } else {
@@ -1703,99 +1352,28 @@ const exportImage = async () => {
     }
 
     if (window.$showNotification) {
-      window.$showNotification(locale.value.imageExported, 'success')
+      window.$showNotification('图片导出成功', 'success')
     }
   } catch (error) {
     console.error('导出长图失败:', error)
     if (window.$showNotification) {
-      window.$showNotification(locale.value.imageExportFailed(error.message), 'error')
+      window.$showNotification('导出长图失败: ' + error.message, 'error')
     }
   } finally {
     isExportingImage.value = false
   }
 }
 
-// localStorage 键名
-const SETTINGS_STORAGE_KEY = 'voicehub_print_settings'
-
-// 排除不保存的字段
-const EXCLUDED_FIELDS = ['startDate', 'endDate', 'remark', 'currentSemester']
-
-// 防抖保存设置（500ms 延迟，避免频繁写入）
-const debouncedSaveSettings = debounce(() => {
-  saveSettings()
-}, 500)
-
-// 从 localStorage 加载保存的设置
-const loadSavedSettings = () => {
-  try {
-    const savedSettings = localStorage.getItem(SETTINGS_STORAGE_KEY)
-    if (savedSettings) {
-      const parsed = JSON.parse(savedSettings)
-      if (parsed && typeof parsed === 'object') {
-        Object.keys(parsed).forEach((key) => {
-          if (key in settings.value && !EXCLUDED_FIELDS.includes(key)) {
-            // 类型校验：只在存储的值与默认值类型相同时才赋值
-            if (typeof parsed[key] === typeof settings.value[key]) {
-              settings.value[key] = parsed[key]
-            }
-          }
-        })
-      }
-    }
-  } catch (error) {
-    console.warn('加载保存的打印设置失败:', error)
-  }
-}
-
-// 将设置保存到 localStorage
-const saveSettings = () => {
-  try {
-    const settingsToSave = {}
-    Object.keys(settings.value).forEach((key) => {
-      if (!EXCLUDED_FIELDS.includes(key)) {
-        settingsToSave[key] = settings.value[key]
-      }
-    })
-    localStorage.setItem(SETTINGS_STORAGE_KEY, JSON.stringify(settingsToSave))
-  } catch (error) {
-    console.warn('保存打印设置失败:', error)
-  }
-}
-
 // 生命周期
-onMounted(async () => {
-  await fetchCurrentSemester()
-  settings.value.currentSemester = currentSemester.value?.name
-  loadSavedSettings()
-  if (settings.value.dateRangePreset) {
-    const { startDate, endDate } = calculateDateRange(settings.value.dateRangePreset)
-    settings.value.startDate = startDate
-    settings.value.endDate = endDate
-  } else {
-    setDateRange('today')
-  }
+onMounted(() => {
   loadSchedules()
 })
 
-// 监听设置变化，自动保存到 localStorage
-watch(
-  () => [settings.value.startDate, settings.value.endDate],
-  ([newStart, newEnd]) => {
-    // 如果日期与当前预设不匹配，则清除预设状态
-    if (settings.value.dateRangePreset) {
-      const { startDate, endDate } = calculateDateRange(settings.value.dateRangePreset)
-      if (newStart !== startDate || newEnd !== endDate) {
-        settings.value.dateRangePreset = ''
-      }
-    }
-  }
-)
-
+// 监听设置变化，自动保存或刷新（如果需要）
 watch(
   settings,
   () => {
-    debouncedSaveSettings()
+    // 可以保存设置到 localStorage
   },
   { deep: true }
 )
@@ -1805,15 +1383,15 @@ watch(
 /* 预览区域和打印样式的核心CSS - 保持原生CSS以确保精确控制 */
 
 .preview-content {
-  background: #ffffff;
+  background: var(--card-bg, #ffffff);
   padding: 0;
   position: relative;
 }
 
 /* 打印页面样式 */
 .print-page {
-  background: #ffffff;
-  color: #1a1a1a;
+  background: var(--card-bg, #ffffff);
+  color: var(--text-primary, #000000);
   width: 100%;
   margin: 0 auto;
   padding: 30px;
@@ -1829,7 +1407,7 @@ watch(
   align-items: flex-start;
   margin-bottom: 32px;
   padding-bottom: 16px;
-  border-bottom: 2px solid #d1d5db;
+  border-bottom: 2px solid #e5e5e5;
 }
 
 .logo-section {
@@ -1848,7 +1426,7 @@ watch(
 .logo-divider {
   width: 2px;
   height: 60px;
-  background: linear-gradient(to bottom, #d1d5db, #636366, #d1d5db);
+  background: linear-gradient(to bottom, var(--border-secondary, #dddddd), #999, #ddd);
   border-radius: 1px;
   margin: 0 4px;
 }
@@ -1867,19 +1445,19 @@ watch(
   font-size: 24px;
   font-weight: normal;
   margin: 0 0 4px 0;
-  color: #1a1a1a;
+  color: var(--text-primary, #000);
 }
 
 .title-section h2 {
   font-size: 18px;
   font-weight: 500;
   margin: 0;
-  color: #636366;
+  color: var(--text-quaternary, #666666);
 }
 
 .date-info {
   font-size: 14px;
-  color: #636366;
+  color: var(--text-quaternary, #666666);
   text-align: right;
   display: flex;
   align-items: flex-start;
@@ -1899,15 +1477,14 @@ watch(
 .no-data-message {
   text-align: center;
   padding: 60px 20px;
-  color: #636366;
-  column-span: all;
+  color: var(--text-quaternary, #666666);
 }
 
 .no-data-icon {
   width: 64px;
   height: 64px;
   margin: 0 auto 20px;
-  color: #d1d5db;
+  color: var(--text-secondary, #cccccc);
 }
 
 .no-data-icon svg {
@@ -1919,7 +1496,7 @@ watch(
   font-size: 18px;
   font-weight: 500;
   margin: 0 0 12px 0;
-  color: #1a1a1a;
+  color: var(--text-quaternary, #333333);
 }
 
 .no-data-message p {
@@ -1930,37 +1507,33 @@ watch(
   margin: 0 auto;
 }
 
-.date-group {
-  margin-bottom: 24px;
-}
-
 .group-title {
   font-size: 16px;
   font-weight: bold;
-  margin: 0 0 12px 0;
+  margin: 24px 0 12px 0;
   padding: 8px 12px;
-  border-bottom: 2px solid #d1d5db;
-  background: #f3f4f6;
-  color: #1a1a1a;
+  border-bottom: 2px solid var(--border-secondary, #ddd);
+  background: #f8f9fa;
+  color: var(--text-quaternary, #333333);
   border-radius: 4px 4px 0 0;
 }
 
 .playtime-group .group-title {
-  background: #f8f9fa;
-  border-bottom-color: #0b5afe;
-  color: #2563eb;
+  background: #e3f2fd;
+  border-bottom-color: var(--border-secondary, #2196f3);
+  color: #1565c0;
 }
 
 .date-group .group-title {
-  background: #f8f9fa;
-  border-bottom-color: #8b5cf6;
-  color: #7c3aed;
+  background: #f3e5f5;
+  border-bottom-color: #9c27b0;
+  color: #7b1fa2;
 }
 
 .group-count {
   font-size: 14px;
   font-weight: normal;
-  color: #636366;
+  color: var(--text-quaternary, #666666);
   margin-left: 8px;
 }
 
@@ -1968,25 +1541,21 @@ watch(
   margin-left: 20px;
 }
 
-.playtime-group {
-  margin-bottom: 16px;
-}
-
 .playtime-title {
   font-size: 14px;
   font-weight: bold;
-  margin: 0 0 8px 0;
+  margin: 16px 0 8px 0;
   padding: 6px 10px;
-  background: #f8f9fa;
-  border-left: 3px solid #0b5afe;
-  color: #2563eb;
+  background: #f0f8ff;
+  border-left: 3px solid var(--border-secondary, #2196f3);
+  color: #1565c0;
   border-radius: 0 4px 4px 0;
 }
 
 .playtime-count {
   font-size: 12px;
   font-weight: normal;
-  color: #636366;
+  color: var(--text-quaternary, #666666);
   margin-left: 6px;
 }
 
@@ -1994,18 +1563,14 @@ watch(
   margin-bottom: 24px;
 }
 
-.schedule-table-wrapper {
-  margin-bottom: 24px;
-}
-
 .page-footer {
   display: flex;
   justify-content: space-between;
   align-items: flex-start;
   padding-top: 16px;
-  border-top: 1px solid #d1d5db;
+  border-top: 1px solid #e5e5e5;
   font-size: 12px;
-  color: #636366;
+  color: var(--text-quaternary, #666666);
 }
 
 .footer-left {
@@ -2020,7 +1585,7 @@ watch(
 
 .remark-text {
   font-size: 11px;
-  color: #636366;
+  color: #555;
   max-width: 400px;
   word-wrap: break-word;
   line-height: 1.3;
@@ -2078,7 +1643,7 @@ watch(
   justify-content: space-between;
 }
 
-.orientation-landscape .schedule-content.layout-classic {
+.orientation-landscape .schedule-content {
   columns: 2;
   column-gap: 32px;
 }
@@ -2089,26 +1654,6 @@ watch(
   margin-bottom: 20px;
 }
 
-/* 纵向经典列表两列分栏：相邻序号左右成对 */
-.schedule-content.layout-classic.is-two-column .schedule-list {
-  display: grid;
-  grid-template-columns: repeat(2, minmax(0, 1fr));
-  column-gap: 28px;
-}
-
-.schedule-content.layout-classic.is-two-column .schedule-item {
-  display: flex;
-}
-
-.schedule-content.layout-classic.is-two-column .schedule-item > .schedule-item-print {
-  flex: 1;
-  min-width: 0;
-}
-
-.schedule-content.layout-classic.is-two-column .playtime-groups {
-  margin-left: 12px;
-}
-
 /* 打印样式 */
 @media print {
   .settings-panel {
diff --git a/app/components/Admin/SemesterManager.vue b/app/components/Admin/SemesterManager.vue
index 0114553..b1db0f8 100644
--- a/app/components/Admin/SemesterManager.vue
+++ b/app/components/Admin/SemesterManager.vue
@@ -3,14 +3,14 @@
     <!-- 顶部标题栏 -->
     <div class="flex flex-col md:flex-row md:items-end justify-between gap-6">
       <div>
-        <h2 class="text-2xl font-black text-text-primary tracking-tight">{{ locale.title }}</h2>
-        <p class="text-xs text-text-tertiary mt-1">
-          {{ locale.desc }}
+        <h2 class="text-2xl font-black text-zinc-100 tracking-tight">学期管理</h2>
+        <p class="text-xs text-zinc-500 mt-1">
+          定义系统的教学周期，点歌、排期及统计数据将基于当前活跃学期进行归档
         </p>
       </div>
       <button
-        class="flex items-center gap-2 px-6 py-2.5 bg-primary-hover hover:bg-primary text-text-primary text-xs font-black rounded-xl shadow-lg shadow-[var(--primary-glow)] transition-all active:scale-95"
-        @click="openModal"
+        class="flex items-center gap-2 px-6 py-2.5 bg-blue-600 hover:bg-blue-500 text-white text-xs font-black rounded-xl shadow-lg shadow-blue-900/20 transition-all active:scale-95"
+        @click="openAddModal"
       >
         <svg
           xmlns="http://www.w3.org/2000/svg"
@@ -26,7 +26,7 @@
           <line x1="12" y1="5" x2="12" y2="19" />
           <line x1="5" y1="12" x2="19" y2="12" />
         </svg>
-        {{ locale.add }}
+        添加新学期
       </button>
     </div>
 
@@ -44,24 +44,24 @@
             stroke-width="2"
             stroke-linecap="round"
             stroke-linejoin="round"
-            class="text-warning fill-warning"
+            class="text-amber-500 fill-amber-500"
           >
             <polygon
               points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"
             />
           </svg>
-          <h3 class="text-[10px] font-black text-text-disabled uppercase tracking-[0.2em]">
-            {{ locale.currentActive }}
+          <h3 class="text-[10px] font-black text-zinc-600 uppercase tracking-[0.2em]">
+            当前活跃学期
           </h3>
         </div>
 
         <div
           v-if="currentSemester"
-          class="relative bg-gradient-to-br from-primary to-primary-hover rounded-3xl p-10 shadow-2xl shadow-[var(--primary-glow)] overflow-hidden group"
+          class="relative bg-gradient-to-br from-blue-600 to-blue-700 rounded-3xl p-10 shadow-2xl shadow-blue-900/20 overflow-hidden group"
         >
           <div class="relative z-10 space-y-6">
             <div
-              class="w-16 h-16 rounded-3xl bg-bg-secondary-10 backdrop-blur-md flex items-center justify-center text-text-primary border border-primary-20"
+              class="w-16 h-16 rounded-3xl bg-white/10 backdrop-blur-md flex items-center justify-center text-white border border-white/20"
             >
               <svg
                 xmlns="http://www.w3.org/2000/svg"
@@ -79,10 +79,10 @@
               </svg>
             </div>
             <div class="space-y-2">
-              <h4 class="text-3xl font-black text-text-primary tracking-tight leading-tight">
+              <h4 class="text-3xl font-black text-white tracking-tight leading-tight">
                 {{ currentSemester.name }}
               </h4>
-              <div class="flex items-center gap-2 text-text-primary-80 font-bold text-xs">
+              <div class="flex items-center gap-2 text-blue-100/60 font-bold text-xs">
                 <svg
                   xmlns="http://www.w3.org/2000/svg"
                   width="12"
@@ -99,20 +99,20 @@
                   <line x1="8" y1="2" x2="8" y2="6" />
                   <line x1="3" y1="10" x2="21" y2="10" />
                 </svg>
-                {{ getLocaleMessage('createdAt', formatDate(currentSemester.createdAt)) }}
+                创建于 {{ formatDate(currentSemester.createdAt) }}
               </div>
             </div>
             <div class="pt-4">
               <span
-                class="px-4 py-2 bg-bg-secondary-20 text-text-primary text-[10px] font-black uppercase tracking-widest rounded-xl shadow-lg"
+                class="px-4 py-2 bg-white text-blue-600 text-[10px] font-black uppercase tracking-widest rounded-xl shadow-lg"
               >
-                {{ locale.inProgress }}
+                正在进行中
               </span>
             </div>
           </div>
 
           <!-- 装饰性背景元素 -->
-          <div class="absolute -right-10 -bottom-10 w-64 h-64 bg-bg-secondary-5 blur-3xl rounded-full" />
+          <div class="absolute -right-10 -bottom-10 w-64 h-64 bg-white/5 blur-3xl rounded-full" />
           <div class="absolute top-10 right-10 opacity-10">
             <svg
               xmlns="http://www.w3.org/2000/svg"
@@ -124,7 +124,7 @@
               stroke-width="2"
               stroke-linecap="round"
               stroke-linejoin="round"
-              class="text-text-primary"
+              class="text-white"
             >
               <path d="M4 19.5A2.5 2.5 0 0 1 6.5 17H20" />
               <path d="M6.5 2H20v20H6.5A2.5 2.5 0 0 1 4 19.5v-15A2.5 2.5 0 0 1 6.5 2z" />
@@ -134,7 +134,7 @@
 
         <div
           v-else
-          class="bg-bg-secondary-30 border border-border-secondary border-dashed rounded-3xl p-20 flex flex-col items-center justify-center text-center gap-4"
+          class="bg-zinc-900/30 border border-zinc-800 border-dashed rounded-3xl p-20 flex flex-col items-center justify-center text-center gap-4"
         >
           <svg
             xmlns="http://www.w3.org/2000/svg"
@@ -146,19 +146,19 @@
             stroke-width="2"
             stroke-linecap="round"
             stroke-linejoin="round"
-            class="text-text-secondary"
+            class="text-zinc-700"
           >
             <circle cx="12" cy="12" r="10" />
             <line x1="12" y1="8" x2="12" y2="12" />
             <line x1="12" y1="16" x2="12.01" y2="16" />
           </svg>
-          <p class="text-sm font-bold text-text-disabled">{{ locale.noCurrent }}</p>
-          <button class="text-xs text-primary font-black hover:underline" @click="openModal">
-            {{ locale.createNow }}
+          <p class="text-sm font-bold text-zinc-600">未设置当前活跃学期</p>
+          <button class="text-xs text-blue-500 font-black hover:underline" @click="openAddModal">
+            立即创建
           </button>
         </div>
 
-        <div class="p-6 bg-bg-secondary-20 border border-border-secondary rounded-3xl flex items-start gap-4">
+        <div class="p-6 bg-zinc-900/20 border border-zinc-800 rounded-3xl flex items-start gap-4">
           <svg
             xmlns="http://www.w3.org/2000/svg"
             width="18"
@@ -169,16 +169,16 @@
             stroke-width="2"
             stroke-linecap="round"
             stroke-linejoin="round"
-            class="text-text-tertiary shrink-0 mt-0.5"
+            class="text-zinc-500 shrink-0 mt-0.5"
           >
             <circle cx="12" cy="12" r="10" />
             <line x1="12" y1="16" x2="12" y2="12" />
             <line x1="12" y1="8" x2="12.01" y2="8" />
           </svg>
           <div class="space-y-1">
-            <p class="text-xs font-bold text-text-tertiary">{{ locale.switchTitle }}</p>
-            <p class="text-[11px] text-text-disabled leading-relaxed">
-              {{ locale.switchDesc }}
+            <p class="text-xs font-bold text-zinc-400">学期切换说明</p>
+            <p class="text-[11px] text-zinc-600 leading-relaxed">
+              切换学期后，前端点歌界面将清空旧排期。所有历史数据会自动归档至对应学期下，您仍可在数据中心进行查看。
             </p>
           </div>
         </div>
@@ -198,25 +198,25 @@
               stroke-width="2"
               stroke-linecap="round"
               stroke-linejoin="round"
-              class="text-text-disabled"
+              class="text-zinc-600"
             >
               <path d="M3 12a9 9 0 1 0 9-9 9.75 9.75 0 0 0-6.74 2.74L3 8" />
               <path d="M3 3v5h5" />
               <path d="M12 7v5l4 2" />
             </svg>
-            <h3 class="text-[10px] font-black text-text-disabled uppercase tracking-[0.2em]">
-              {{ locale.historyTitle }}
+            <h3 class="text-[10px] font-black text-zinc-600 uppercase tracking-[0.2em]">
+              学期历史记录
             </h3>
           </div>
-          <span class="text-[10px] font-black text-text-secondary">{{ getLocaleMessage('historyCount', semesters.length) }}</span>
+          <span class="text-[10px] font-black text-zinc-700">共 {{ semesters.length }} 条</span>
         </div>
 
         <div class="space-y-4">
           <div
             v-if="loading && semesters.length === 0"
-            class="text-center py-20 bg-bg-secondary-10 border border-border-secondary border-dashed rounded-[2rem]"
+            class="text-center py-20 bg-zinc-900/10 border border-zinc-800 border-dashed rounded-[2rem]"
           >
-            <p class="text-xs font-bold text-text-disabled">{{ locale.loading }}</p>
+            <p class="text-xs font-bold text-zinc-600">加载中...</p>
           </div>
 
           <div
@@ -225,8 +225,8 @@
             class="group flex items-center justify-between p-6 rounded-[2rem] border transition-all"
             :class="
               sem.isActive
-                ? 'bg-primary-hover-5 border-primary-30'
-                : 'bg-bg-secondary-40 border-border-secondary hover:border-border-tertiary'
+                ? 'bg-blue-600/5 border-blue-500/30'
+                : 'bg-zinc-900/40 border-zinc-800 hover:border-zinc-700'
             "
           >
             <div class="flex items-center gap-5">
@@ -234,8 +234,8 @@
                 class="w-12 h-12 rounded-2xl flex items-center justify-center transition-all"
                 :class="
                   sem.isActive
-                    ? 'bg-primary-hover text-text-primary shadow-lg shadow-[var(--primary-glow)]'
-                    : 'bg-bg-tertiary text-text-disabled border border-border-tertiary'
+                    ? 'bg-blue-600 text-white shadow-lg shadow-blue-900/20'
+                    : 'bg-zinc-800 text-zinc-600 border border-zinc-700'
                 "
               >
                 <svg
@@ -258,13 +258,13 @@
                 <h5
                   class="font-bold transition-colors"
                   :class="
-                    sem.isActive ? 'text-primary' : 'text-text-primary group-hover:text-primary'
+                    sem.isActive ? 'text-blue-400' : 'text-zinc-200 group-hover:text-blue-400'
                   "
                 >
                   {{ sem.name }}
                 </h5>
-                <p class="text-[10px] text-text-disabled font-medium uppercase tracking-widest mt-0.5">
-                  {{ getLocaleMessage('createdAt', formatDate(sem.createdAt)) }}
+                <p class="text-[10px] text-zinc-600 font-medium uppercase tracking-widest mt-0.5">
+                  创建于 {{ formatDate(sem.createdAt) }}
                 </p>
               </div>
             </div>
@@ -272,7 +272,7 @@
             <div class="flex items-center gap-2">
               <div
                 v-if="sem.isActive"
-                class="flex items-center gap-2 px-4 py-2 bg-success-10 text-success rounded-xl border border-success-20"
+                class="flex items-center gap-2 px-4 py-2 bg-emerald-500/10 text-emerald-500 rounded-xl border border-emerald-500/20"
               >
                 <svg
                   xmlns="http://www.w3.org/2000/svg"
@@ -288,108 +288,83 @@
                   <path d="M22 11.08V12a10 10 0 1 1-5.93-9.14" />
                   <polyline points="22 4 12 14.01 9 11.01" />
                 </svg>
-                <span class="text-[10px] font-black uppercase tracking-widest">{{ locale.currentSemester }}</span>
+                <span class="text-[10px] font-black uppercase tracking-widest">当前学期</span>
               </div>
-              <button
-                v-else
-                :disabled="loading"
-                class="flex items-center gap-2 px-4 py-2 bg-bg-tertiary hover:bg-bg-quaternary text-text-tertiary hover:text-text-primary text-[10px] font-black rounded-xl border border-border-tertiary transition-all uppercase tracking-widest disabled:opacity-50 disabled:cursor-not-allowed"
-                @click="setActive(sem.id)"
-              >
-                <svg
-                  xmlns="http://www.w3.org/2000/svg"
-                  width="12"
-                  height="12"
-                  viewBox="0 0 24 24"
-                  fill="none"
-                  stroke="currentColor"
-                  stroke-width="2"
-                  stroke-linecap="round"
-                  stroke-linejoin="round"
+              <template v-else>
+                <button
+                  :disabled="loading"
+                  class="flex items-center gap-2 px-4 py-2 bg-zinc-800 hover:bg-zinc-700 text-zinc-400 hover:text-white text-[10px] font-black rounded-xl border border-zinc-700 transition-all uppercase tracking-widest disabled:opacity-50 disabled:cursor-not-allowed"
+                  @click="setActive(sem.id)"
                 >
-                  <line x1="5" y1="12" x2="19" y2="12" />
-                  <polyline points="12 5 19 12 12 19" />
-                </svg>
-                {{ locale.setCurrent }}
-              </button>
-
-              <button
-                :disabled="loading"
-                class="p-2.5 text-text-secondary hover:text-primary hover:bg-primary-10 rounded-xl transition-all disabled:opacity-50 disabled:cursor-not-allowed"
-                :title="locale.editSemester"
-                @click="openEditModal(sem)"
-              >
-                <svg
-                  xmlns="http://www.w3.org/2000/svg"
-                  width="14"
-                  height="14"
-                  viewBox="0 0 24 24"
-                  fill="none"
-                  stroke="currentColor"
-                  stroke-width="2"
-                  stroke-linecap="round"
-                  stroke-linejoin="round"
+                  <svg
+                    xmlns="http://www.w3.org/2000/svg"
+                    width="12"
+                    height="12"
+                    viewBox="0 0 24 24"
+                    fill="none"
+                    stroke="currentColor"
+                    stroke-width="2"
+                    stroke-linecap="round"
+                    stroke-linejoin="round"
+                  >
+                    <line x1="5" y1="12" x2="19" y2="12" />
+                    <polyline points="12 5 19 12 12 19" />
+                  </svg>
+                  设为当前
+                </button>
+                <button
+                  :disabled="loading"
+                  class="p-2.5 text-zinc-700 hover:text-red-500 hover:bg-red-500/10 rounded-xl transition-all disabled:opacity-50 disabled:cursor-not-allowed"
+                  @click="deleteSemester(sem.id)"
                 >
-                  <path d="M17 3a2.828 2.828 0 1 1 4 4L7.5 20.5 2 22l1.5-5.5L17 3z" />
-                </svg>
-              </button>
-
-              <button
-                v-if="!sem.isActive"
-                :disabled="loading"
-                class="p-2.5 text-text-secondary hover:text-error hover:bg-error-10 rounded-xl transition-all disabled:opacity-50 disabled:cursor-not-allowed"
-                :title="locale.deleteSemester"
-                @click="deleteSemester(sem.id)"
-              >
-                <svg
-                  xmlns="http://www.w3.org/2000/svg"
-                  width="14"
-                  height="14"
-                  viewBox="0 0 24 24"
-                  fill="none"
-                  stroke="currentColor"
-                  stroke-width="2"
-                  stroke-linecap="round"
-                  stroke-linejoin="round"
-                >
-                  <polyline points="3 6 5 6 21 6" />
-                  <path
-                    d="M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6m3 0V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2"
-                  />
-                  <line x1="10" y1="11" x2="10" y2="17" />
-                  <line x1="14" y1="11" x2="14" y2="17" />
-                </svg>
-              </button>
+                  <svg
+                    xmlns="http://www.w3.org/2000/svg"
+                    width="14"
+                    height="14"
+                    viewBox="0 0 24 24"
+                    fill="none"
+                    stroke="currentColor"
+                    stroke-width="2"
+                    stroke-linecap="round"
+                    stroke-linejoin="round"
+                  >
+                    <polyline points="3 6 5 6 21 6" />
+                    <path
+                      d="M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6m3 0V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2"
+                    />
+                    <line x1="10" y1="11" x2="10" y2="17" />
+                    <line x1="14" y1="11" x2="14" y2="17" />
+                  </svg>
+                </button>
+              </template>
             </div>
           </div>
 
           <div
             v-if="semesters.length === 0 && !loading"
-            class="text-center py-20 bg-bg-secondary-10 border border-border-secondary border-dashed rounded-[2rem]"
+            class="text-center py-20 bg-zinc-900/10 border border-zinc-800 border-dashed rounded-[2rem]"
           >
-            <p class="text-xs font-bold text-text-disabled">{{ locale.empty }}</p>
+            <p class="text-xs font-bold text-zinc-600">暂无学期数据</p>
           </div>
         </div>
       </div>
     </div>
 
-    <!-- 添加/修改学期弹窗 -->
+    <!-- 添加学期弹窗 -->
     <div
-      v-if="showModal"
-      class="fixed inset-0 z-50 flex items-center justify-center p-4 bg-bg-primary-60 backdrop-blur-sm"
+      v-if="showAddModal"
+      class="fixed inset-0 z-50 flex items-center justify-center p-4 bg-black/60 backdrop-blur-sm"
     >
       <div
-        class="w-full max-w-md bg-bg-secondary rounded-3xl border border-border-secondary shadow-2xl overflow-hidden"
+        class="w-full max-w-md bg-zinc-900 rounded-3xl border border-zinc-800 shadow-2xl overflow-hidden"
         @click.stop
       >
         <div class="p-8 space-y-6">
           <div class="flex items-center justify-between">
-            <h3 class="text-xl font-black text-text-primary tracking-tight">
-              {{ isEditing ? locale.editSemester : locale.add }}
-            </h3>
+            <h3 class="text-xl font-black text-white tracking-tight">添加新学期</h3>
             <button
-              class="p-2 text-text-tertiary hover:text-text-primary transition-colors"
-              @click="closeModal"
+              class="p-2 text-zinc-500 hover:text-white transition-colors"
+              @click="closeAddModal"
             >
               <svg
                 xmlns="http://www.w3.org/2000/svg"
@@ -410,35 +385,35 @@
 
           <div class="space-y-6">
             <div class="space-y-2">
-              <label class="text-[10px] font-black text-text-disabled uppercase tracking-widest px-1"
-                >{{ locale.semesterName }}</label
+              <label class="text-[10px] font-black text-zinc-600 uppercase tracking-widest px-1"
+                >学期名称</label
               >
               <input
-                v-model="semesterForm.name"
+                v-model="newSemester.name"
                 type="text"
-                :placeholder="locale.namePlaceholder"
-                class="w-full bg-bg-primary border border-border-secondary rounded-2xl px-5 py-4 text-sm text-text-primary focus:outline-none focus:border-primary-30 font-bold transition-all"
+                placeholder="例如: 2025学年第一学期"
+                class="w-full bg-zinc-950 border border-zinc-800 rounded-2xl px-5 py-4 text-sm text-zinc-200 focus:outline-none focus:border-blue-500/30 font-bold transition-all"
               >
             </div>
 
-            <label v-if="!isEditing" class="flex items-center gap-3 cursor-pointer group px-1">
+            <label class="flex items-center gap-3 cursor-pointer group px-1">
               <input
-                v-model="semesterForm.isActive"
+                v-model="newSemester.isActive"
                 type="checkbox"
-                class="w-4.5 h-4.5 rounded-lg border-border-secondary bg-bg-primary transition-all"
+                class="w-4.5 h-4.5 rounded-lg border-zinc-800 bg-zinc-950 accent-blue-600 transition-all"
               >
               <div>
                 <span
-                  class="text-xs font-bold text-text-secondary group-hover:text-primary transition-colors"
-                  >{{ locale.setAsActive }}</span
+                  class="text-xs font-bold text-zinc-300 group-hover:text-blue-400 transition-colors"
+                  >设为当前活跃学期</span
                 >
-                <p class="text-[10px] text-text-disabled font-medium">
-                  {{ locale.setAsActiveHint }}
+                <p class="text-[10px] text-zinc-600 font-medium">
+                  创建后将立即激活此学期，原学期将变为历史状态
                 </p>
               </div>
             </label>
 
-            <div class="p-4 bg-bg-primary border border-border-secondary rounded-2xl flex items-start gap-3">
+            <div class="p-4 bg-zinc-950 border border-zinc-800 rounded-2xl flex items-start gap-3">
               <svg
                 xmlns="http://www.w3.org/2000/svg"
                 width="14"
@@ -449,32 +424,32 @@
                 stroke-width="2"
                 stroke-linecap="round"
                 stroke-linejoin="round"
-                class="text-warning shrink-0 mt-0.5"
+                class="text-amber-500 shrink-0 mt-0.5"
               >
                 <circle cx="12" cy="12" r="10" />
                 <line x1="12" y1="8" x2="12" y2="12" />
                 <line x1="12" y1="16" x2="12.01" y2="16" />
               </svg>
-              <p class="text-[10px] text-text-tertiary leading-normal">
-                {{ locale.namingTip }}
+              <p class="text-[10px] text-zinc-500 leading-normal">
+                提示：请按照统一的命名规范设置学期名称，这有助于数据归档后的检索与分析。
               </p>
             </div>
           </div>
         </div>
 
-        <div class="p-6 bg-bg-tertiary-50 border-t border-border-secondary flex gap-3 justify-end">
+        <div class="p-6 bg-zinc-800/50 border-t border-zinc-800 flex gap-3 justify-end">
           <button
-            class="px-6 py-2.5 text-xs font-bold text-text-tertiary hover:text-text-secondary transition-colors"
-            @click="closeModal"
+            class="px-6 py-2.5 text-xs font-bold text-zinc-500 hover:text-zinc-300 transition-colors"
+            @click="closeAddModal"
           >
-            {{ locale.cancel }}
+            取消
           </button>
           <button
-            :disabled="submitting || !semesterForm.name.trim()"
-            class="px-8 py-2.5 bg-primary-hover hover:bg-primary disabled:bg-primary-hover disabled:opacity-50 text-text-primary text-xs font-black rounded-xl shadow-lg transition-all active:scale-95"
-            @click="handleSubmit"
+            :disabled="submitting || !newSemester.name.trim()"
+            class="px-8 py-2.5 bg-blue-600 hover:bg-blue-500 disabled:bg-blue-800 disabled:opacity-50 text-white text-xs font-black rounded-xl shadow-lg transition-all active:scale-95"
+            @click="handleAddSemester"
           >
-            {{ submitting ? (isEditing ? locale.saving : locale.creating) : (isEditing ? locale.saveChanges : locale.createSemester) }}
+            {{ submitting ? '创建中...' : '创建学期' }}
           </button>
         </div>
       </div>
@@ -484,10 +459,10 @@
     <ConfirmDialog
       :loading="loading"
       :show="showDeleteDialog"
-      :cancel-text="locale.cancel"
-      :confirm-text="locale.confirmDelete"
+      cancel-text="取消"
+      confirm-text="确认删除"
       :message="deleteMessage"
-      :title="locale.deleteDialogTitle"
+      title="确认删除学期"
       type="danger"
       @close="showDeleteDialog = false"
       @confirm="confirmDelete"
@@ -499,12 +474,8 @@
 import { onMounted, ref, computed } from 'vue'
 import ConfirmDialog from '~/components/UI/ConfirmDialog.vue'
 import { useToast } from '~/composables/useToast'
-import { useLocale } from '~/utils/locale'
 
 const { showToast: showNotification } = useToast()
-const { admin } = useLocale()
-const locale = computed(() => admin.value?.semesterManager || {})
-const { msg: getLocaleMessage, nested: getNestedMessage } = useLocaleText(locale)
 
 const {
   semesters,
@@ -515,20 +486,15 @@ const {
   fetchCurrentSemester,
   createSemester,
   setActiveSemester,
-  updateSemester,
   deleteSemester: deleteSemesterAPI
 } = useSemesters()
 
-const showModal = ref(false)
-const isEditing = ref(false)
-const editSemesterId = ref(null)
-const originalSemesterName = ref('')
-
+const showAddModal = ref(false)
 const showDeleteDialog = ref(false)
 const deleteTargetId = ref(null)
 const deleteTargetName = ref('')
 const submitting = ref(false)
-const semesterForm = ref({
+const newSemester = ref({
   name: '',
   isActive: false
 })
@@ -542,7 +508,7 @@ const sortedSemesters = computed(() => {
 
 // 删除确认信息
 const deleteMessage = computed(() => {
-  return getLocaleMessage('deleteMessage', deleteTargetName.value)
+  return `确定要彻底删除 "${deleteTargetName.value}" 吗？此操作将同步清除该学期下的所有点歌记录、排期数据和统计信息。数据一旦删除将无法找回。`
 })
 
 // 格式化日期
@@ -563,13 +529,13 @@ const setActive = async (semesterId) => {
     // 注意：这里需要重新获取error，因为useSemesters内部可能没有正确更新error的响应式引用
     // 或者直接依据success返回值判断
     if (success) {
-      showNotification(getNestedMessage('messages', 'activeSet'), 'success')
+      showNotification('活跃学期设置成功！', 'success')
     } else {
       // 如果setActiveSemester返回false，尝试直接显示一个通用错误，因为error可能为空
-      showNotification(error.value || getNestedMessage('errors', 'setActiveFailedRetry'), 'error')
+      showNotification(error.value || '设置活跃学期失败，请稍后重试', 'error')
     }
   } catch (err) {
-    showNotification(err.message || getNestedMessage('errors', 'setFailed'), 'error')
+    showNotification(err.message || '设置失败', 'error')
   }
 }
 
@@ -590,12 +556,12 @@ const confirmDelete = async () => {
   try {
     const success = await deleteSemesterAPI(deleteTargetId.value)
     if (success) {
-      showNotification(getNestedMessage('messages', 'deleted'), 'success')
+      showNotification('学期删除成功！', 'success')
     } else {
-      showNotification(error.value || getNestedMessage('errors', 'deleteFailed'), 'error')
+      showNotification(error.value || '删除学期失败', 'error')
     }
   } catch (err) {
-    showNotification(err.message || getNestedMessage('errors', 'deleteFailedShort'), 'error')
+    showNotification(err.message || '删除失败', 'error')
   }
 
   showDeleteDialog.value = false
@@ -603,103 +569,64 @@ const confirmDelete = async () => {
   deleteTargetName.value = ''
 }
 
-// 处理表单提交
-const handleSubmit = async () => {
-  const normalizedName = semesterForm.value.name.trim()
-  if (!normalizedName) return
-
-  if (isEditing.value && normalizedName === originalSemesterName.value) {
-    showNotification(getNestedMessage('messages', 'nameUnchanged'), 'info')
-    closeModal()
-    return
-  }
+// 处理添加学期
+const handleAddSemester = async () => {
+  if (!newSemester.value.name.trim()) return
 
   submitting.value = true
   try {
-    if (isEditing.value && editSemesterId.value) {
-      // 修改学期
-      const success = await updateSemester(editSemesterId.value, {
-        name: normalizedName
-      })
-      if (success) {
-        showNotification(getNestedMessage('messages', 'updated'), 'success')
-        closeModal()
-      } else {
-        showNotification(error.value || getNestedMessage('errors', 'updateFailed'), 'error')
-      }
+    const result = await createSemester({
+      name: newSemester.value.name,
+      isActive: newSemester.value.isActive
+    })
+    if (result) {
+      showNotification('学期创建成功！', 'success')
+      closeAddModal()
     } else {
-      // 创建学期
-      const result = await createSemester({
-        name: normalizedName,
-        isActive: semesterForm.value.isActive
-      })
-      if (result) {
-        showNotification(getNestedMessage('messages', 'created'), 'success')
-        closeModal()
-      } else {
-        showNotification(error.value || getNestedMessage('errors', 'createFailed'), 'error')
-      }
+      showNotification(error.value || '创建学期失败', 'error')
     }
   } catch (err) {
-    console.error(isEditing.value ? '修改学期失败:' : '创建学期失败:', err)
-    showNotification(
-      err.message || (isEditing.value ? getNestedMessage('errors', 'updateFailed') : getNestedMessage('errors', 'createFailed')),
-      'error'
-    )
+    console.error('创建学期失败:', err)
+    showNotification(err.message || '创建学期失败', 'error')
   } finally {
     submitting.value = false
   }
 }
 
-// 关闭弹窗
-const closeModal = () => {
-  showModal.value = false
-  isEditing.value = false
-  editSemesterId.value = null
-  originalSemesterName.value = ''
-  semesterForm.value = {
+// 关闭添加弹窗
+const closeAddModal = () => {
+  showAddModal.value = false
+  newSemester.value = {
     name: '',
     isActive: false
   }
 }
 
 const getRecommendedName = () => {
-  const now = getSyncedDate()
+  const now = new Date()
   const year = now.getFullYear()
   const month = now.getMonth() + 1
 
   let academicYear = year
-  let term = locale.value?.terms?.first || '第一学期'
+  let term = '第一学期'
 
   if (month >= 3 && month <= 8) {
     academicYear = year - 1
-    term = locale.value?.terms?.second || '第二学期'
+    term = '第二学期'
   } else if (month <= 2) {
     academicYear = year - 1
-    term = locale.value?.terms?.first || '第一学期'
+    term = '第一学期'
   } else {
     academicYear = year
-    term = locale.value?.terms?.first || '第一学期'
+    term = '第一学期'
   }
 
-  return getLocaleMessage('recommendedName', academicYear, term)
+  return `${academicYear}学年${term}`
 }
 
-const openModal = () => {
-  isEditing.value = false
-  editSemesterId.value = null
-  semesterForm.value.name = getRecommendedName()
-  semesterForm.value.isActive = false
-  showModal.value = true
-}
-
-const openEditModal = (sem) => {
-  isEditing.value = true
-  editSemesterId.value = sem.id
-  originalSemesterName.value = sem.name
-  semesterForm.value.name = sem.name
-  semesterForm.value.isActive = sem.isActive
-  showModal.value = true
+const openAddModal = () => {
+  newSemester.value.name = getRecommendedName()
+  showAddModal.value = true
 }
 
 // 组件挂载时获取数据
diff --git a/app/components/Admin/Sidebar.vue b/app/components/Admin/Sidebar.vue
index 5feb683..369f26c 100644
--- a/app/components/Admin/Sidebar.vue
+++ b/app/components/Admin/Sidebar.vue
@@ -2,7 +2,7 @@
 <template>
   <aside
     :class="[
-      'fixed inset-y-0 left-0 z-50 w-64 bg-bg-primary border-r border-border-secondary transform transition-transform duration-300 ease-in-out lg:translate-x-0',
+      'fixed inset-y-0 left-0 z-50 w-64 bg-[#09090b] border-r border-zinc-800 transform transition-transform duration-300 ease-in-out lg:translate-x-0',
       isOpen ? 'translate-x-0' : '-translate-x-full'
     ]"
   >
@@ -12,26 +12,34 @@
         <NuxtLink to="/" class="flex items-center gap-2.5 group">
           <!-- Logo 图标 -->
           <div class="flex-shrink-0 group-hover:scale-110 transition-all duration-300">
-            <img src="/assets/logo.png" alt="VoiceHub Logo" class="w-8 h-8 object-contain" >
+            <img
+              :src="logo"
+              alt="VoiceHub Logo"
+              class="w-8 h-8 object-contain"
+              width="32"
+              height="32"
+              decoding="async"
+              loading="lazy"
+            >
           </div>
           <!-- 品牌文字 -->
           <div class="flex flex-col justify-center">
-            <h1 class="font-bold text-lg text-text-primary leading-none tracking-tight">VoiceHub</h1>
+            <h1 class="font-bold text-lg text-zinc-100 leading-none tracking-tight">VoiceHub</h1>
             <p
-              class="text-[10px] text-text-tertiary mt-1.5 uppercase tracking-widest font-bold leading-none"
+              class="text-[10px] text-zinc-500 mt-1.5 uppercase tracking-widest font-bold leading-none"
             >
-              {{ locale.console }}
+              管理控制台
             </p>
           </div>
         </NuxtLink>
       </div>
 
       <!-- 导航菜单区域 -->
-      <nav class="flex-1 space-y-6 overflow-y-auto pr-2 custom-scrollbar">
+      <nav class="admin-sidebar-nav flex-1 space-y-6 overflow-y-auto pr-2 custom-scrollbar">
         <div v-for="(group, idx) in menuGroups" :key="idx" class="space-y-1">
           <template v-if="shouldShowGroup(group)">
             <!-- 分组标题 -->
-            <h3 class="px-3 text-[10px] font-bold text-text-disabled uppercase tracking-[0.2em] mb-2">
+            <h3 class="px-3 text-[10px] font-bold text-zinc-600 uppercase tracking-[0.2em] mb-2">
               {{ group.section }}
             </h3>
             <!-- 菜单项列表 -->
@@ -39,10 +47,11 @@
               <button
                 v-if="permissions.canAccessPage(item.permissionId || item.id)"
                 :class="[
-                  'w-full flex items-center gap-3 px-3 py-2.5 rounded-lg text-[13px] font-bold transition-all group border focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-primary-10 focus-visible:ring-inset',
+                  'w-full flex items-center gap-3 px-3 py-2.5 rounded-lg text-[13px] font-bold transition-all group border focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-blue-500/80 focus-visible:ring-inset',
                   activeTab === item.id
-                    ? 'bg-primary-hover-10 text-primary border-primary-20'
-                    : 'text-text-tertiary hover:text-text-primary hover:bg-bg-tertiary-40 border-transparent'
+                    ? 'bg-blue-600/10 text-blue-400 border-blue-500/20'
+                    : 'text-zinc-500 hover:text-zinc-200 hover:bg-zinc-800/40 border-transparent',
+                  getTourClass(item.id)
                 ]"
                 @click="onNavigate(item.id)"
               >
@@ -52,15 +61,15 @@
                   :size="18"
                   :class="
                     activeTab === item.id
-                      ? 'text-primary'
-                      : 'text-text-tertiary group-hover:text-text-secondary'
+                      ? 'text-blue-400'
+                      : 'text-zinc-500 group-hover:text-zinc-300'
                   "
                 />
                 <span class="truncate">{{ item.label }}</span>
                 <!-- 选中状态指示器 -->
                 <div
                   v-if="activeTab === item.id"
-                  class="ml-auto w-1 h-1 bg-primary rounded-full shadow-[0_0_8px_var(--primary-60)]"
+                  class="ml-auto w-1 h-1 bg-blue-400 rounded-full shadow-[0_0_8px_rgba(96,165,250,0.6)]"
                 />
               </button>
             </template>
@@ -69,38 +78,38 @@
       </nav>
 
       <!-- 用户信息及退出登录 -->
-      <div class="mt-4 pt-4 border-t border-border-secondary">
+      <div class="mt-4 pt-4 border-t border-zinc-800">
         <div
-          class="flex items-center gap-3 p-3 rounded-lg bg-bg-secondary-50 border border-border-secondary-50 hover:bg-bg-tertiary-30 transition-colors"
+          class="flex items-center gap-3 p-3 rounded-lg bg-zinc-900/50 border border-zinc-800/50 hover:bg-zinc-800/30 transition-colors"
         >
           <!-- 用户头像/首字母 -->
           <img
             v-if="currentUser?.avatar && !avatarError"
             :src="currentUser.avatar"
-            class="w-10 h-10 rounded-lg object-cover border border-border-tertiary shrink-0"
+            class="w-10 h-10 rounded-lg object-cover border border-zinc-700 shrink-0"
             @error="avatarError = true"
           >
           <div
             v-else
-            class="w-10 h-10 rounded-lg bg-bg-tertiary flex items-center justify-center text-text-tertiary font-bold border border-border-tertiary shrink-0"
+            class="w-10 h-10 rounded-lg bg-zinc-800 flex items-center justify-center text-zinc-400 font-bold border border-zinc-700 shrink-0"
           >
-            {{ (currentUser?.name || locale.avatarFallback || '管').charAt(0) }}
+            {{ (currentUser?.name || '管').charAt(0) }}
           </div>
           <!-- 用户详细信息 -->
           <div class="flex-1 min-w-0">
-            <p class="text-xs font-black truncate text-text-primary">
-              {{ currentUser?.name || locale.adminFallback }}
+            <p class="text-xs font-black truncate text-zinc-100">
+              {{ currentUser?.name || '管理员' }}
             </p>
             <p
-              class="text-[10px] text-text-tertiary truncate uppercase tracking-wider font-medium mt-0.5"
+              class="text-[10px] text-zinc-500 truncate uppercase tracking-wider font-medium mt-0.5"
             >
-              {{ getRoleDisplayName(currentUser?.role || 'ADMIN') }}
+              {{ currentUser?.role?.replace('_', ' ') || 'ADMIN' }}
             </p>
           </div>
           <!-- 退出按钮 -->
           <button
-            class="p-2 text-text-disabled hover:text-error hover:bg-error-10 rounded-lg transition-all"
-            :title="locale.logout"
+            class="p-2 text-zinc-600 hover:text-red-400 hover:bg-red-400/10 rounded-lg transition-all"
+            title="退出登录"
             @click="$emit('logout')"
           >
             <LogOut :size="16" />
@@ -128,20 +137,20 @@ import {
   LogOut,
   Clock,
   FileEdit,
+  ListChecks,
   BookOpen,
   Ban,
-  ListMusic,
   Globe,
+  Image as ImageIcon,
+  ScrollText,
   Database,
   Lock,
-  Ticket,
-  GraduationCap
+  Shield
 } from '@lucide/vue'
-import { useLocale } from '~/utils/locale'
+import logo from '~~/public/images/logo.png'
+import { rolesConfig } from '~/composables/usePermissions'
 
 const avatarError = ref(false)
-const { admin } = useLocale()
-const locale = computed(() => admin.value?.sidebar || {})
 
 const props = defineProps({
   // 侧边栏是否打开（移动端）
@@ -166,56 +175,57 @@ watch(
 const emit = defineEmits(['navigate', 'close', 'logout'])
 
 // 菜单分组配置
-const menuGroups = computed(() => [
+const menuGroups = [
   {
-    section: locale.value.sections?.overview || '概览',
-    items: [{ icon: LayoutDashboard, label: locale.value.menu?.overview || '数据概览', id: 'overview' }]
-  },
-  {
-    section: locale.value.sections?.content || '内容管理',
+    section: '数据中心',
     items: [
-      { icon: CalendarDays, label: locale.value.menu?.schedule || '排班管理', id: 'schedule' },
-      { icon: Printer, label: locale.value.menu?.print || '打印管理', id: 'print' },
-      { icon: Music2, label: locale.value.menu?.songs || '点歌管理', id: 'songs' },
-      {
-        icon: BarChart3,
-        label: locale.value.menu?.dataAnalysis || '数据分析',
-        id: 'data-analysis',
-        permissionId: 'data-analysis'
-      }
+      { icon: LayoutDashboard, label: '数据概览', id: 'overview' },
+      { icon: BookOpen, label: '流程与教程', id: 'workflow-tutorial' },
+      { icon: BarChart3, label: '数据分析', id: 'data-analysis', permissionId: 'data-analysis' }
     ]
   },
   {
-    section: locale.value.sections?.users || '用户管理',
+    section: '播音管理',
     items: [
-      { icon: Users, label: locale.value.menu?.users || '用户管理', id: 'users' },
-      { icon: GraduationCap, label: locale.value.menu?.gradeClass || '年级班级', id: 'grade-class' }
+      { icon: Music2, label: '歌曲管理', id: 'songs' },
+      { icon: CalendarDays, label: '排期管理', id: 'schedule' },
+      { icon: Printer, label: '打印排期', id: 'print' },
+      { icon: ImageIcon, label: '图片歌单', id: 'playlist-card' }
     ]
   },
   {
-    section: locale.value.sections?.api || 'API',
-    items: [{ icon: Key, label: locale.value.menu?.apiKeys || 'API 密钥', id: 'api-keys' }]
-  },
-  {
-    section: locale.value.sections?.system || '系统设置',
+    section: '业务设置',
     items: [
-      { icon: Bell, label: locale.value.menu?.notifications || '通知管理', id: 'notifications' },
-      { icon: Mail, label: locale.value.menu?.smtpConfig || 'SMTP 配置', id: 'smtp-config' },
-      { icon: Clock, label: locale.value.menu?.playtimes || '播放时段', id: 'playtimes' },
-      { icon: FileEdit, label: locale.value.menu?.requestTimes || '点歌时段', id: 'request-times' },
-      { icon: BookOpen, label: locale.value.menu?.semesters || '学期管理', id: 'semesters' },
-      { icon: Ban, label: locale.value.menu?.blacklist || '黑名单', id: 'blacklist' },
-      { icon: Ticket, label: locale.value.menu?.cardCodes || '卡密管理', id: 'card-codes' },
-      { icon: ListMusic, label: locale.value.menu?.musicSource || '音源控制', id: 'music-source' },
-      { icon: Globe, label: locale.value.menu?.siteConfig || '站点配置', id: 'site-config' },
-      { icon: Database, label: locale.value.menu?.database || '数据库', id: 'database' }
+      { icon: CalendarDays, label: '选曲日期', id: 'expected-play-dates', permissionId: 'settings' },
+      { icon: FileEdit, label: '投稿管理', id: 'request-times' },
+      { icon: BookOpen, label: '学期管理', id: 'semesters' },
+      { icon: Clock, label: '播出时段', id: 'playtimes' }
     ]
   },
   {
-    section: locale.value.sections?.account || '账户',
-    items: [{ icon: Lock, label: locale.value.menu?.password || '修改密码', id: 'password' }]
+    section: '用户与权限',
+    items: [
+      { icon: Users, label: '用户管理', id: 'users' },
+      { icon: Shield, label: '权限组管理', id: 'roles', permissionId: 'roles' },
+      { icon: Ban, label: '黑名单管理', id: 'blacklist' },
+      { icon: Key, label: 'API密钥管理', id: 'api-keys' }
+    ]
+  },
+  {
+    section: '系统运维',
+    items: [
+      { icon: Globe, label: '站点配置', id: 'site-config' },
+      { icon: ScrollText, label: '更新日志', id: 'changelog' },
+      { icon: Bell, label: '通知管理', id: 'notifications' },
+      { icon: Mail, label: '邮件配置', id: 'smtp-config' },
+      { icon: Database, label: '数据库操作', id: 'database' }
+    ]
+  },
+  {
+    section: '账户管理',
+    items: [{ icon: Lock, label: '修改密码', id: 'password' }]
   }
-])
+]
 
 /**
  * 判断是否应该显示该菜单组
@@ -238,12 +248,25 @@ const onNavigate = (id) => {
   emit('navigate', id)
 }
 
+const getTourClass = (id) => `tour-nav-${id}`
+
 /**
  * 获取角色显示名称
  * @param {string} role 角色标识
  */
 const getRoleDisplayName = (role) => {
-  return locale.value.roles?.[role] || role
+  if (rolesConfig.value && rolesConfig.value[role]?.displayName) {
+    return rolesConfig.value[role].displayName
+  }
+  const roleNames = {
+    USER: '学生（普通用户）',
+    SONG_ADMIN: '工作人员',
+    VICE_MINISTER: '副部',
+    ADMIN: '部长',
+    RESIDENT: '常驻',
+    SUPER_ADMIN: '技术运维'
+  }
+  return roleNames[role] || role
 }
 </script>
 
@@ -256,10 +279,10 @@ const getRoleDisplayName = (role) => {
   background: transparent;
 }
 .custom-scrollbar::-webkit-scrollbar-thumb {
-  background: var(--panel-bg-alt);
+  background: var(--bg-tertiary, #27272a);
   border-radius: 10px;
 }
 .custom-scrollbar::-webkit-scrollbar-thumb:hover {
-  background: var(--panel-bg-hover);
+  background: #3f3f46;
 }
 </style>
diff --git a/app/components/Admin/SiteConfigManager.vue b/app/components/Admin/SiteConfigManager.vue
index 17b3c69..862da88 100644
--- a/app/components/Admin/SiteConfigManager.vue
+++ b/app/components/Admin/SiteConfigManager.vue
@@ -3,124 +3,96 @@
     <!-- 顶部标题栏 -->
     <div class="flex flex-col md:flex-row md:items-end justify-between gap-4">
       <div>
-        <h2 class="text-2xl font-black text-text-primary tracking-tight">{{ locale.pageTitle }}</h2>
-        <p class="text-xs text-text-tertiary mt-1 font-medium">
-          {{ locale.pageDescription }}
+        <h2 class="text-2xl font-black text-zinc-100 tracking-tight">站点配置</h2>
+        <p class="text-xs text-zinc-500 mt-1 font-medium">
+          管理站点全局属性、视觉识别、点歌逻辑及系统安全策略
         </p>
       </div>
       <div class="flex gap-3">
         <button
           :disabled="loading || saving"
-          class="flex items-center gap-2 px-5 py-2 bg-bg-secondary border border-border-secondary hover:border-border-tertiary text-text-tertiary text-xs font-bold rounded-xl transition-all disabled:opacity-50 disabled:cursor-not-allowed"
+          class="flex items-center gap-2 px-5 py-2 bg-zinc-900 border border-zinc-800 hover:border-zinc-700 text-zinc-400 text-xs font-bold rounded-xl transition-all disabled:opacity-50 disabled:cursor-not-allowed"
           @click="resetForm"
         >
-          <RotateCcw :size="14" /> {{ locale.reset }}
+          <RotateCcw :size="14" /> 重置
         </button>
         <button
           :disabled="loading || saving"
-          class="flex items-center gap-2 px-8 py-2 bg-primary-hover hover:bg-primary text-text-primary text-xs font-black rounded-xl shadow-lg shadow-[var(--primary-glow)] transition-all active:scale-95 disabled:opacity-50 disabled:cursor-not-allowed"
+          class="flex items-center gap-2 px-8 py-2 bg-blue-600 hover:bg-blue-500 text-white text-xs font-black rounded-xl shadow-lg shadow-blue-900/20 transition-all active:scale-95 disabled:opacity-50 disabled:cursor-not-allowed"
           @click="saveConfig"
         >
           <template v-if="saving">
-            <AppSpinner :size="14" />
-            {{ locale.saving }}
+            <div
+              class="w-3.5 h-3.5 border-2 border-white/30 border-t-white rounded-full animate-spin"
+            />
+            保存中...
           </template>
-          <template v-else-if="saveSuccess"> <CheckCircle2 :size="14" /> {{ locale.saved }} </template>
-          <template v-else> <Save :size="14" /> {{ locale.saveConfig }} </template>
+          <template v-else-if="saveSuccess"> <CheckCircle2 :size="14" /> 已保存 </template>
+          <template v-else> <Save :size="14" /> 保存配置 </template>
         </button>
       </div>
     </div>
 
     <div v-if="loading" class="flex flex-col items-center justify-center py-20">
-      <AppSpinner :size="32" class="mb-4" />
-      <p class="text-text-tertiary text-sm">{{ locale.loading }}</p>
+      <div
+        class="w-8 h-8 border-4 border-zinc-800 border-t-blue-500 rounded-full animate-spin mb-4"
+      />
+      <p class="text-zinc-500 text-sm">加载配置中...</p>
     </div>
 
     <div v-else class="grid grid-cols-1 lg:grid-cols-2 gap-6">
       <!-- 基础信息 -->
       <section :class="cardClass">
         <h3
-          class="text-sm font-black text-text-primary uppercase tracking-widest flex items-center gap-2 border-b border-border-secondary pb-4"
+          class="text-sm font-black text-zinc-100 uppercase tracking-widest flex items-center gap-2 border-b border-zinc-800 pb-4"
         >
-          <Globe :size="16" class="text-primary" /> {{ locale.basicInfo }}
+          <Globe :size="16" class="text-blue-500" /> 基础信息
         </h3>
         <div class="space-y-4">
           <div>
-            <label :class="labelClass">{{ locale.siteTitle }}</label>
+            <label :class="labelClass">站点标题</label>
             <input
               v-model="formData.siteTitle"
               type="text"
-              :placeholder="locale.siteTitlePlaceholder"
+              placeholder="请输入站点标题"
               :class="inputClass"
-            />
+            >
           </div>
           <div>
-            <label :class="labelClass">{{ locale.icpNumber }}</label>
+            <label :class="labelClass">备案号 (ICP)</label>
             <input
               v-model="formData.icpNumber"
               type="text"
-              :placeholder="locale.icpPlaceholder"
+              placeholder="请输入备案号"
               :class="inputClass"
-            />
+            >
           </div>
           <div>
-            <label :class="labelClass">{{ locale.gonganNumber }}</label>
+            <label :class="labelClass">公安联网备案号</label>
             <input
               v-model="formData.gonganNumber"
               type="text"
-              :placeholder="locale.gonganPlaceholder"
+              placeholder="请输入公安备案号 (如：陕公网安备61011302001964号)"
               :class="inputClass"
-            />
-          </div>
-          <div class="pt-2">
-            <div
-              class="flex items-center justify-between p-3 bg-bg-primary-50 border border-border-secondary rounded-xl"
             >
-              <div>
-                <p class="text-xs font-bold text-text-primary">{{ locale.showBeianIcon }}</p>
-                <p class="text-[10px] text-text-tertiary mt-0.5">{{ locale.showBeianIconDesc }}</p>
-              </div>
-              <input
-                v-model="formData.showBeianIcon"
-                type="checkbox"
-                class="w-5 h-5 rounded border-border-secondary bg-bg-secondary cursor-pointer"
-              />
-            </div>
           </div>
           <div>
-            <label :class="labelClass">{{ locale.siteDescription }}</label>
+            <label :class="labelClass">站点描述</label>
             <textarea
               v-model="formData.siteDescription"
               :rows="3"
-              :placeholder="locale.siteDescriptionPlaceholder"
+              placeholder="请输入站点描述"
               :class="[inputClass, 'resize-none']"
             />
           </div>
-          <div class="pt-2">
-            <div
-              class="flex items-center justify-between p-3 bg-bg-primary-50 border border-border-secondary rounded-xl"
-            >
-              <div>
-                <p class="text-xs font-bold text-text-primary">{{ locale.statisticsCodeEnabled }}</p>
-                <p class="text-[10px] text-text-tertiary mt-0.5">{{ locale.statisticsCodeEnabledDesc }}</p>
-              </div>
-              <input
-                v-model="formData.statisticsCodeEnabled"
-                type="checkbox"
-                class="w-5 h-5 rounded border-border-secondary bg-bg-secondary cursor-pointer"
-              />
-            </div>
-          </div>
           <div>
-            <label :class="labelClass">{{ locale.statisticsCode }}</label>
-            <textarea
-              v-model="formData.statisticsCode"
-              :rows="5"
-              :placeholder="locale.statisticsCodePlaceholder"
-              :class="[inputClass, 'font-mono text-xs resize-y']"
-              :disabled="!formData.statisticsCodeEnabled"
-            />
-            <p class="text-[10px] text-text-tertiary mt-1 leading-relaxed">{{ locale.statisticsCodeHint }}</p>
+            <label :class="labelClass">站点版本号</label>
+            <input
+              v-model="formData.siteVersion"
+              type="text"
+              placeholder="如：v2.4.1 或 2026.04"
+              :class="inputClass"
+            >
           </div>
         </div>
       </section>
@@ -128,378 +100,177 @@
       <!-- 视觉识别 -->
       <section :class="cardClass">
         <h3
-          class="text-sm font-black text-text-primary uppercase tracking-widest flex items-center gap-2 border-b border-border-secondary pb-4"
+          class="text-sm font-black text-zinc-100 uppercase tracking-widest flex items-center gap-2 border-b border-zinc-800 pb-4"
         >
-          <ImageIcon :size="16" class="text-info" /> {{ locale.visualIdentity }}
+          <ImageIcon :size="16" class="text-purple-500" /> 视觉识别
         </h3>
         <div class="space-y-4">
           <div>
-            <label :class="labelClass">{{ locale.siteLogoUrl }}</label>
+            <label :class="labelClass">站点 Logo URL</label>
             <input
               v-model="formData.siteLogoUrl"
               type="text"
-              :placeholder="locale.siteLogoPlaceholder"
+              placeholder="请输入Logo图片URL"
               :class="inputClass"
-            />
+            >
           </div>
           <div>
-            <label :class="labelClass">{{ locale.schoolLogoHome }}</label>
+            <label :class="labelClass">首页学校 Logo URL (大尺寸)</label>
             <input
-              v-model="formData.schoolLogoHomeDarkUrl"
+              v-model="formData.schoolLogoHomeUrl"
               type="text"
-              :placeholder="locale.schoolLogoHomePlaceholder"
+              placeholder="请输入首页学校Logo URL"
               :class="inputClass"
-            />
+            >
           </div>
           <div>
-            <label :class="labelClass">{{ locale.schoolLogoHomeLight }}</label>
-            <input
-              v-model="formData.schoolLogoHomeLightUrl"
-              type="text"
-              :disabled="!String(formData.schoolLogoHomeDarkUrl || '').trim()"
-              :placeholder="locale.schoolLogoHomeLightPlaceholder"
-              :class="[inputClass, 'disabled:cursor-not-allowed disabled:opacity-50']"
-            />
-          </div>
-          <div>
-            <label :class="labelClass">{{ locale.schoolLogoPrint }}</label>
+            <label :class="labelClass">打印排期 Logo URL (小尺寸)</label>
             <input
               v-model="formData.schoolLogoPrintUrl"
               type="text"
-              :placeholder="locale.schoolLogoPrintPlaceholder"
+              placeholder="请输入打印页学校Logo URL"
               :class="inputClass"
-            />
+            >
           </div>
         </div>
       </section>
 
-      <!-- 主题设置 -->
-      <section v-if="isSuperAdmin" :class="cardClass">
-        <h3 class="text-sm font-black text-text-primary uppercase tracking-widest flex items-center gap-2 border-b border-border-secondary pb-4">
-          <Palette :size="16" class="text-primary" /> {{ locale.themeSettings }}
+      <!-- 投稿须知 -->
+      <section
+        class="lg:col-span-2 bg-zinc-900/40 border border-zinc-800 rounded-2xl p-6 space-y-6"
+      >
+        <h3
+          class="text-sm font-black text-zinc-100 uppercase tracking-widest flex items-center gap-2 border-b border-zinc-800 pb-4"
+        >
+          <FileText :size="16" class="text-emerald-500" /> 投稿须知
         </h3>
-        <div class="space-y-3">
-          <p class="text-[10px] text-text-tertiary">{{ locale.themeSettingsDesc }}</p>
-          <div
-            v-for="option in themeOptions"
-            :key="option.value"
-            class="flex items-center gap-3 rounded-xl border border-border-secondary bg-bg-primary-50 p-3"
-          >
-            <div class="min-w-0 flex-1">
-              <p class="truncate text-xs font-bold text-text-primary">{{ option.label }}</p>
-              <p v-if="option.value === 'System'" class="mt-0.5 text-[10px] text-text-tertiary">
-                {{ locale.systemThemeHint }}
-              </p>
-            </div>
-            <button
-              type="button"
-              class="flex h-8 w-8 shrink-0 items-center justify-center rounded-lg border transition-colors"
-              :class="formData.defaultTheme === option.value
-                ? 'border-warning bg-warning-10 text-warning'
-                : 'border-border-secondary text-text-disabled hover:border-warning-30 hover:text-warning'"
-              :aria-label="locale.setDefaultTheme"
-              :aria-pressed="formData.defaultTheme === option.value"
-              @click="setDefaultTheme(option.value)"
-            >
-              <Star :size="15" :fill="formData.defaultTheme === option.value ? 'currentColor' : 'none'" />
-            </button>
-            <button
-              type="button"
-              class="relative h-6 w-12 shrink-0 rounded-full transition-colors"
-              :class="themeToggleClass(option.value)"
-              :aria-label="formData.enabledThemes.includes(option.value) ? locale.disableTheme : locale.enableTheme"
-              :aria-pressed="formData.enabledThemes.includes(option.value)"
-              :disabled="isThemeToggleLocked(option.value)"
-              @click="toggleTheme(option.value)"
-            >
-              <span
-                class="absolute left-1 top-1 h-4 w-4 rounded-full bg-white shadow transition-transform"
-                :class="formData.enabledThemes.includes(option.value) ? 'translate-x-6' : 'translate-x-0'"
-              />
-            </button>
-          </div>
-          <p class="text-[10px] text-text-tertiary">{{ locale.defaultThemeDesc }}</p>
-        </div>
+        <textarea
+          v-model="formData.submissionGuidelines"
+          :rows="6"
+          placeholder="请输入投稿须知内容"
+          :class="[inputClass, 'font-mono text-xs leading-relaxed min-h-[150px]']"
+        />
       </section>
 
       <!-- 投稿逻辑设置 -->
       <section :class="cardClass">
         <h3
-          class="text-sm font-black text-text-primary uppercase tracking-widest flex items-center gap-2 border-b border-border-secondary pb-4"
+          class="text-sm font-black text-zinc-100 uppercase tracking-widest flex items-center gap-2 border-b border-zinc-800 pb-4"
         >
-          <Settings2 :size="16" class="text-warning" /> {{ locale.submissionLogic }}
+          <Settings2 :size="16" class="text-amber-500" /> 投稿逻辑设置
         </h3>
         <div class="space-y-6">
           <div
-            class="flex items-center justify-between p-3 bg-bg-primary-50 border border-border-secondary rounded-xl"
+            class="flex items-center justify-between p-3 bg-zinc-950/50 border border-zinc-800 rounded-xl"
           >
             <div>
-              <p class="text-xs font-bold text-text-primary">{{ locale.enableCollaborative }}</p>
-              <p class="text-[10px] text-text-tertiary mt-0.5">{{ locale.enableCollaborativeDesc }}</p>
+              <p class="text-xs font-bold text-zinc-200">启用联合投稿</p>
+              <p class="text-[10px] text-zinc-500 mt-0.5">允许用户添加联合投稿人并发起协作投稿</p>
             </div>
             <input
               v-model="formData.enableCollaborativeSubmission"
               type="checkbox"
-              class="w-5 h-5 rounded border-border-secondary bg-bg-secondary cursor-pointer"
-            />
-          </div>
-
-          <div class="rounded-xl border border-border-secondary bg-bg-primary-50">
-            <div class="flex items-center justify-between p-3">
-              <div class="pr-4">
-                <p class="text-xs font-bold text-text-primary">{{ locale.enableRemarks }}</p>
-                <p class="text-[10px] text-text-tertiary mt-0.5">{{ locale.enableRemarksDesc }}</p>
-              </div>
-              <input
-                v-model="formData.enableSubmissionRemarks"
-                type="checkbox"
-                class="w-5 h-5 rounded border-border-secondary bg-bg-secondary cursor-pointer"
-              />
-            </div>
-
-            <div
-              v-if="formData.enableSubmissionRemarks"
-              class="ml-4 mr-2 mb-2 pl-4 border-l border-border-secondary space-y-2 transition-opacity"
+              class="w-5 h-5 rounded border-zinc-800 bg-zinc-900 accent-blue-600 cursor-pointer"
             >
-              <div
-                class="flex items-center justify-between p-3 bg-bg-primary border border-border-secondary rounded-xl"
-              >
-                <div class="pr-4">
-                  <p class="text-xs font-bold text-text-primary">{{ locale.submissionNoteRequiresApproval }}</p>
-                  <p class="text-[10px] text-text-tertiary mt-0.5">{{ locale.submissionNoteRequiresApprovalDesc }}</p>
-                </div>
-                <input
-                  v-model="formData.submissionNoteRequiresApproval"
-                  type="checkbox"
-                  :disabled="!formData.enableSubmissionRemarks"
-                  class="w-5 h-5 rounded border-border-secondary bg-bg-secondary cursor-pointer disabled:cursor-not-allowed"
-                />
-              </div>
-            </div>
-          </div>
-
-          <div class="rounded-xl border border-border-secondary bg-bg-primary-50">
-            <div class="flex items-center justify-between p-3">
-              <div class="pr-4">
-                <p class="text-xs font-bold text-text-primary">{{ locale.enableCardCodeRequests }}</p>
-                <p class="text-[10px] text-text-tertiary mt-0.5">{{ locale.enableCardCodeRequestsDesc }}</p>
-              </div>
-              <input
-                v-model="formData.enableCardCodeRequests"
-                type="checkbox"
-                class="w-5 h-5 rounded border-border-secondary bg-bg-secondary cursor-pointer"
-              />
-            </div>
-
-            <div
-              v-if="formData.enableCardCodeRequests"
-              class="ml-4 mr-2 mb-2 pl-4 border-l border-border-secondary space-y-2 transition-opacity"
-            >
-              <div
-                class="flex items-center justify-between p-3 bg-bg-primary border border-border-secondary rounded-xl"
-              >
-                <div class="pr-4">
-                  <p class="text-xs font-bold text-text-primary">{{ locale.requireCardCodeForRequests }}</p>
-                  <p class="text-[10px] text-text-tertiary mt-0.5">{{ locale.requireCardCodeForRequestsDesc }}</p>
-                </div>
-                <input
-                  v-model="formData.requireCardCodeForRequests"
-                  type="checkbox"
-                  :disabled="!formData.enableCardCodeRequests"
-                  class="w-5 h-5 rounded border-border-secondary bg-bg-secondary cursor-pointer disabled:cursor-not-allowed"
-                />
-              </div>
-
-              <div
-                v-if="formData.enableSubmissionLimit"
-                class="flex items-center justify-between p-3 bg-bg-primary border border-border-secondary rounded-xl transition-opacity"
-              >
-                <div class="pr-4">
-                  <p class="text-xs font-bold text-text-primary">{{ locale.enableCardCodeLimitBypass }}</p>
-                  <p class="text-[10px] text-text-tertiary mt-0.5">
-                    {{ locale.enableCardCodeLimitBypassDesc }}
-                  </p>
-                </div>
-                <input
-                  v-model="formData.enableCardCodeLimitBypass"
-                  type="checkbox"
-                  :disabled="!formData.enableCardCodeRequests || !formData.enableSubmissionLimit"
-                  class="w-5 h-5 rounded border-border-secondary bg-bg-secondary cursor-pointer disabled:cursor-not-allowed"
-                />
-              </div>
-            </div>
           </div>
 
           <div
-            class="flex items-center justify-between p-3 bg-bg-primary-50 border border-border-secondary rounded-xl"
+            class="flex items-center justify-between p-3 bg-zinc-950/50 border border-zinc-800 rounded-xl"
           >
             <div>
-              <p class="text-xs font-bold text-text-primary">{{ locale.enableReplay }}</p>
-              <p class="text-[10px] text-text-tertiary mt-0.5">{{ locale.enableReplayDesc }}</p>
+              <p class="text-xs font-bold text-zinc-200">启用投稿备注留言</p>
+              <p class="text-[10px] text-zinc-500 mt-0.5">允许用户在投稿时附加公开或仅管理员可见的备注</p>
+            </div>
+            <input
+              v-model="formData.enableSubmissionRemarks"
+              type="checkbox"
+              class="w-5 h-5 rounded border-zinc-800 bg-zinc-900 accent-blue-600 cursor-pointer"
+            >
+          </div>
+
+          <div
+            class="flex items-center justify-between p-3 bg-zinc-950/50 border border-zinc-800 rounded-xl"
+          >
+            <div>
+              <p class="text-xs font-bold text-zinc-200">启用重播申请</p>
+              <p class="text-[10px] text-zinc-500 mt-0.5">允许用户对本学期已播放过的歌曲再次申请</p>
             </div>
             <input
               v-model="formData.enableReplayRequests"
               type="checkbox"
-              class="w-5 h-5 rounded border-border-secondary bg-bg-secondary cursor-pointer"
-            />
+              class="w-5 h-5 rounded border-zinc-800 bg-zinc-900 accent-blue-600 cursor-pointer"
+            >
           </div>
 
-          <div class="rounded-xl border border-border-secondary bg-bg-primary-50">
+          <div class="space-y-4">
             <div
-              class="flex items-center justify-between p-3"
+              class="flex items-center justify-between p-3 bg-zinc-950/50 border border-zinc-800 rounded-xl"
             >
-              <div class="pr-4">
-                <p class="text-xs font-bold text-text-primary">{{ locale.enableLimit }}</p>
-                <p class="text-[10px] text-text-tertiary mt-0.5">{{ locale.enableLimitDesc }}</p>
+              <div>
+                <p class="text-xs font-bold text-zinc-200">启用投稿限额</p>
+                <p class="text-[10px] text-zinc-500 mt-0.5">限制单个用户的点歌频率</p>
               </div>
               <input
                 v-model="formData.enableSubmissionLimit"
                 type="checkbox"
-                class="w-5 h-5 rounded border-border-secondary bg-bg-secondary cursor-pointer"
-              />
+                class="w-5 h-5 rounded border-zinc-800 bg-zinc-900 accent-blue-600 cursor-pointer"
+              >
             </div>
 
-            <div
-              v-if="formData.enableSubmissionLimit"
-              class="ml-4 mr-2 mb-2 pl-4 border-l border-border-secondary space-y-2 transition-opacity"
-            >
-              <div class="grid grid-cols-3 gap-2 p-1 bg-bg-primary border border-border-secondary rounded-xl">
+            <div v-if="formData.enableSubmissionLimit" class="space-y-4">
+              <div class="grid grid-cols-3 gap-2 p-1 bg-zinc-950 border border-zinc-800 rounded-xl">
                 <button
                   :class="[
                     'py-2 rounded-lg text-[10px] font-black uppercase tracking-widest transition-all',
-                    activeLimitTab === 'daily'
-                      ? 'bg-bg-tertiary text-primary shadow-sm'
-                      : 'text-text-disabled hover:text-text-tertiary'
+                    currentLimitType === 'daily'
+                      ? 'bg-zinc-800 text-blue-400 shadow-sm'
+                      : 'text-zinc-600 hover:text-zinc-400'
                   ]"
-                  :disabled="!formData.enableSubmissionLimit"
                   @click="handleLimitTypeChange('daily')"
                 >
-                  {{ locale.dailyLimit }}
+                  每日限额
                 </button>
                 <button
                   :class="[
                     'py-2 rounded-lg text-[10px] font-black uppercase tracking-widest transition-all',
-                    activeLimitTab === 'weekly'
-                      ? 'bg-bg-tertiary text-primary shadow-sm'
-                      : 'text-text-disabled hover:text-text-tertiary'
+                    currentLimitType === 'weekly'
+                      ? 'bg-zinc-800 text-blue-400 shadow-sm'
+                      : 'text-zinc-600 hover:text-zinc-400'
                   ]"
-                  :disabled="!formData.enableSubmissionLimit"
                   @click="handleLimitTypeChange('weekly')"
                 >
-                  {{ locale.weeklyLimit }}
+                  每周限额
                 </button>
                 <button
                   :class="[
                     'py-2 rounded-lg text-[10px] font-black uppercase tracking-widest transition-all',
-                    activeLimitTab === 'monthly'
-                      ? 'bg-bg-tertiary text-primary shadow-sm'
-                      : 'text-text-disabled hover:text-text-tertiary'
+                    currentLimitType === 'monthly'
+                      ? 'bg-zinc-800 text-blue-400 shadow-sm'
+                      : 'text-zinc-600 hover:text-zinc-400'
                   ]"
-                  :disabled="!formData.enableSubmissionLimit"
                   @click="handleLimitTypeChange('monthly')"
                 >
-                  {{ locale.monthlyLimit }}
+                  每月限额
                 </button>
               </div>
 
               <div>
-                <label :class="labelClass">{{ currentLimitLabel }}</label>
+                <label :class="labelClass"
+                  >{{ currentLimitType === 'daily' ? '单日' : (currentLimitType === 'weekly' ? '单周' : '单月') }}投稿上限</label
+                >
                 <div class="relative">
                   <input
                     v-model.number="currentLimitValue"
                     type="number"
                     min="0"
-                    :disabled="!formData.enableSubmissionLimit"
-                    :class="[inputClass, 'disabled:cursor-not-allowed disabled:opacity-50']"
-                  />
-                  <span
-                    class="absolute right-4 top-1/2 -translate-y-1/2 text-[10px] font-black text-text-secondary uppercase"
-                    >{{ locale.limitUnit }}</span
-                  >
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </section>
-
-      <!-- 排期可见范围设置 -->
-      <section :class="cardClass">
-        <h3
-          class="text-sm font-black text-text-primary uppercase tracking-widest flex items-center gap-2 border-b border-border-secondary pb-4"
-        >
-          <CalendarRange :size="16" class="text-warning" /> {{ locale.scheduleVisibility }}
-        </h3>
-        <div class="space-y-4">
-          <div class="p-4 bg-bg-primary-50 border border-border-secondary rounded-xl space-y-4">
-            <p class="text-[10px] text-text-tertiary leading-relaxed">
-              {{ locale.scheduleVisibilityDesc }}
-            </p>
-
-            <div class="space-y-3">
-              <div class="flex items-center gap-3 p-3 bg-bg-primary border border-border-secondary rounded-xl">
-                <label class="flex items-center gap-2 shrink-0 cursor-pointer">
-                  <span class="text-xs font-bold text-text-primary">{{ locale.daysBeforeEnabled }}</span>
-                  <span
-                    :class="[
-                      'relative inline-flex h-5 w-10 items-center rounded-full transition-colors',
-                      formData.scheduleDaysBeforeEnabled ? 'bg-primary' : 'bg-bg-tertiary'
-                    ]"
-                  >
-                    <input v-model="formData.scheduleDaysBeforeEnabled" type="checkbox" class="sr-only" />
-                    <span
-                      :class="[
-                        'absolute top-1 h-3 w-3 rounded-full bg-bg-secondary transition-all',
-                        formData.scheduleDaysBeforeEnabled ? 'left-6' : 'left-1'
-                      ]"
-                    />
-                  </span>
-                </label>
-                <div class="relative flex-1">
-                  <input
-                    v-model.number="formData.scheduleDaysBefore"
-                    :disabled="!formData.scheduleDaysBeforeEnabled"
-                    type="number"
-                    min="1"
-                    max="730"
                     :class="inputClass"
-                  />
-                  <span class="absolute right-4 top-1/2 -translate-y-1/2 text-[10px] font-black text-text-secondary uppercase">{{ locale.daysUnit }}</span>
-                </div>
-              </div>
-              <p class="text-[10px] text-text-tertiary px-1">{{ locale.daysBeforeEnabledDesc }}</p>
-
-              <div class="flex items-center gap-3 p-3 bg-bg-primary border border-border-secondary rounded-xl">
-                <label class="flex items-center gap-2 shrink-0 cursor-pointer">
-                  <span class="text-xs font-bold text-text-primary">{{ locale.daysAfterEnabled }}</span>
-                  <span
-                    :class="[
-                      'relative inline-flex h-5 w-10 items-center rounded-full transition-colors',
-                      formData.scheduleDaysAfterEnabled ? 'bg-primary' : 'bg-bg-tertiary'
-                    ]"
                   >
-                    <input v-model="formData.scheduleDaysAfterEnabled" type="checkbox" class="sr-only" />
-                    <span
-                      :class="[
-                        'absolute top-1 h-3 w-3 rounded-full bg-bg-secondary transition-all',
-                        formData.scheduleDaysAfterEnabled ? 'left-6' : 'left-1'
-                      ]"
-                    />
-                  </span>
-                </label>
-                <div class="relative flex-1">
-                  <input
-                    v-model.number="formData.scheduleDaysAfter"
-                    :disabled="!formData.scheduleDaysAfterEnabled"
-                    type="number"
-                    min="1"
-                    max="730"
-                    :class="inputClass"
-                  />
-                  <span class="absolute right-4 top-1/2 -translate-y-1/2 text-[10px] font-black text-text-secondary uppercase">{{ locale.daysUnit }}</span>
+                  <span
+                    class="absolute right-4 top-1/2 -translate-y-1/2 text-[10px] font-black text-zinc-700 uppercase"
+                    >首 / 人</span
+                  >
                 </div>
               </div>
-              <p class="text-[10px] text-text-tertiary px-1">{{ locale.daysAfterEnabledDesc }}</p>
             </div>
           </div>
         </div>
@@ -508,286 +279,59 @@
       <!-- 安全与隐私设置 -->
       <section :class="cardClass">
         <h3
-          class="text-sm font-black text-text-primary uppercase tracking-widest flex items-center gap-2 border-b border-border-secondary pb-4"
+          class="text-sm font-black text-zinc-100 uppercase tracking-widest flex items-center gap-2 border-b border-zinc-800 pb-4"
         >
-          <Shield :size="16" class="text-error" /> {{ locale.securityPrivacy }}
+          <Shield :size="16" class="text-rose-500" /> 安全与隐私设置
         </h3>
         <div class="space-y-4">
-          <div class="rounded-xl border border-border-secondary bg-bg-primary-50">
-            <div class="flex items-center justify-between p-3">
-              <div class="pr-4">
-                <p class="text-xs font-bold text-text-primary">{{ locale.captchaEnabled }}</p>
-                <p class="text-[10px] text-text-tertiary mt-0.5 leading-relaxed">{{ locale.captchaEnabledDesc }}</p>
-              </div>
-              <input
-                id="captcha-enabled"
-                v-model="formData.captchaEnabled"
-                type="checkbox"
-                class="w-5 h-5 rounded border-border-secondary bg-bg-secondary cursor-pointer"
-              />
-            </div>
-
-            <div
-              v-if="formData.captchaEnabled"
-              class="ml-4 mr-2 mb-2 pl-4 border-l border-border-secondary space-y-2 transition-opacity"
-            >
-              <div class="p-3 bg-bg-primary border border-border-secondary rounded-xl space-y-3">
-                <!-- 验证码类型选择 -->
-                <div>
-                  <label class="block text-xs font-bold text-text-tertiary mb-2">{{ locale.captchaType }}</label>
-                  <div class="flex gap-4">
-                    <label class="flex items-center gap-2 cursor-pointer">
-                      <input
-                        v-model="formData.captchaProvider"
-                        type="radio"
-                        value="graphic"
-                        :disabled="!formData.captchaEnabled"
-                        class="w-4 h-4 rounded-full border-border-secondary bg-bg-secondary cursor-pointer disabled:cursor-not-allowed"
-                      />
-                      <span class="text-sm text-text-secondary">{{ locale.captchaGraphic }}</span>
-                    </label>
-                    <label class="flex items-center gap-2 cursor-pointer">
-                      <input
-                        v-model="formData.captchaProvider"
-                        type="radio"
-                        value="turnstile"
-                        :disabled="!formData.captchaEnabled"
-                        class="w-4 h-4 rounded-full border-border-secondary bg-bg-secondary cursor-pointer disabled:cursor-not-allowed"
-                      />
-                      <span class="text-sm text-text-secondary">{{ locale.captchaTurnstile }}</span>
-                    </label>
-                  </div>
-                </div>
-
-                <!-- 图形验证码配置 -->
-                <div v-if="formData.captchaProvider === 'graphic'">
-                  <label class="block text-xs font-bold text-text-tertiary mb-2">{{ locale.captchaMaxFailures }}</label>
-                  <input
-                    v-model.number="formData.captchaMaxFailures"
-                    type="number"
-                    min="1"
-                    :disabled="!formData.captchaEnabled"
-                    :placeholder="locale.captchaMaxFailuresPlaceholder"
-                    class="w-full max-w-[200px] bg-bg-secondary border border-border-secondary rounded-lg px-3 py-2 text-sm text-text-primary placeholder-text-disabled focus:outline-none focus:border-primary focus:ring-1 focus:ring-primary transition-all disabled:cursor-not-allowed disabled:opacity-50"
-                  />
-                  <p class="text-[10px] text-text-tertiary mt-1">
-                    {{ locale.captchaMaxFailuresDesc }}
-                  </p>
-                </div>
-
-                <!-- Turnstile 配置 -->
-                <div v-if="formData.captchaProvider === 'turnstile'" class="space-y-3">
-                  <div>
-                    <label class="block text-xs font-bold text-text-tertiary mb-2">{{ locale.turnstileSiteKey }}</label>
-                    <input
-                      v-model="formData.turnstileSiteKey"
-                      type="text"
-                      :disabled="!formData.captchaEnabled"
-                      :placeholder="locale.turnstileSiteKeyPlaceholder"
-                      class="w-full bg-bg-secondary border border-border-secondary rounded-lg px-3 py-2 text-sm text-text-primary placeholder-text-disabled focus:outline-none focus:border-primary focus:ring-1 focus:ring-primary transition-all disabled:cursor-not-allowed disabled:opacity-50"
-                    />
-                  </div>
-                  <div>
-                    <label class="block text-xs font-bold text-text-tertiary mb-2">{{ locale.turnstileSecretKey }}</label>
-                    <input
-                      v-model="formData.turnstileSecretKey"
-                      type="password"
-                      :disabled="!formData.captchaEnabled"
-                      :placeholder="locale.turnstileSecretKeyPlaceholder"
-                      class="w-full bg-bg-secondary border border-border-secondary rounded-lg px-3 py-2 text-sm text-text-primary placeholder-text-disabled focus:outline-none focus:border-primary focus:ring-1 focus:ring-primary transition-all disabled:cursor-not-allowed disabled:opacity-50"
-                    />
-                    <p class="text-[10px] text-text-tertiary mt-1">
-                      {{ locale.turnstileSecretKeyDesc }}
-                    </p>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-
-          <div class="flex items-center justify-between p-3 bg-bg-primary-50 border border-border-secondary rounded-xl">
-            <div class="pr-4">
-              <p class="text-xs font-bold text-text-primary">{{ locale.forcePasswordChangeOnFirstLogin }}</p>
-              <p class="text-[10px] text-text-tertiary mt-0.5 leading-relaxed">{{ locale.forcePasswordChangeOnFirstLoginDesc }}</p>
-            </div>
-            <input
-              id="force-password-change-first-login"
-              v-model="formData.forcePasswordChangeOnFirstLogin"
-              type="checkbox"
-              class="w-5 h-5 rounded border-border-secondary bg-bg-secondary cursor-pointer"
-            />
-          </div>
-
-          <!-- 允许注册开关 -->
-          <div class="rounded-xl border border-border-secondary bg-bg-primary-50">
-            <div class="flex items-center justify-between p-3">
-              <div class="pr-4">
-                <p class="text-xs font-bold text-text-primary">{{ locale.allowRegister }}</p>
-                <p class="text-[10px] text-text-tertiary mt-0.5 leading-relaxed">{{ locale.allowRegisterDesc }}</p>
-              </div>
-              <input
-                id="allow-register"
-                v-model="formData.allowRegister"
-                type="checkbox"
-                class="w-5 h-5 rounded border-border-secondary bg-bg-secondary cursor-pointer"
-              />
-            </div>
-
-            <div
-              v-if="formData.allowRegister || formData.allowOAuthRegistration"
-              class="ml-4 mr-2 mb-2 pl-4 border-l border-border-secondary space-y-2 transition-opacity"
-            >
-              <div
-                v-if="formData.allowRegister"
-                class="flex items-center justify-between p-3 bg-bg-primary border border-border-secondary rounded-xl"
-              >
-                <div class="pr-4">
-                  <p class="text-xs font-bold text-text-primary">{{ locale.registerRequiresApproval }}</p>
-                  <p class="text-[10px] text-text-tertiary mt-0.5 leading-relaxed">{{ locale.registerRequiresApprovalDesc }}</p>
-                </div>
+          <div class="p-4 bg-zinc-950/50 border border-zinc-800 rounded-xl space-y-4">
+            <div class="flex items-start gap-4">
+              <div class="shrink-0 pt-0.5">
                 <input
-                  id="register-requires-approval"
-                  v-model="formData.registerRequiresApproval"
+                  id="show-keywords"
+                  v-model="formData.showBlacklistKeywords"
                   type="checkbox"
-                  :disabled="!formData.allowRegister"
-                  class="w-5 h-5 rounded border-border-secondary bg-bg-secondary cursor-pointer disabled:cursor-not-allowed"
-                />
+                  class="w-4 h-4 rounded border-zinc-800 bg-zinc-900 accent-blue-600 cursor-pointer"
+                >
               </div>
+              <label for="show-keywords" class="cursor-pointer">
+                <p class="text-xs font-bold text-zinc-200">显示黑名单具体关键词</p>
+                <p class="text-[10px] text-zinc-500 mt-1 leading-relaxed">
+                  开启后，在投稿命中黑名单时将明确提示冲突关键词；关闭则仅提示“包含关键词”。
+                </p>
+              </label>
+            </div>
+          </div>
 
-              <div class="flex items-center justify-between p-3 bg-bg-primary border border-border-secondary rounded-xl">
-                <div class="pr-4">
-                  <p class="text-xs font-bold text-text-primary">{{ locale.registerEmailRequired }}</p>
-                  <p class="text-[10px] text-text-tertiary mt-0.5 leading-relaxed">{{ locale.registerEmailRequiredDesc }}</p>
-                  <p v-if="!formData.smtpEnabled" class="text-[10px] text-warning mt-1 leading-relaxed">{{ locale.registerEmailSmtpRequired }}</p>
-                </div>
+          <div class="p-4 bg-zinc-950/50 border border-zinc-800 rounded-xl space-y-4">
+            <div class="flex items-start gap-4">
+              <div class="shrink-0 pt-0.5">
                 <input
-                  id="register-email-required"
-                  v-model="formData.registerEmailRequired"
+                  id="hide-students"
+                  v-model="formData.hideStudentInfo"
                   type="checkbox"
-                  :disabled="(!formData.allowRegister && !formData.allowOAuthRegistration) || !formData.smtpEnabled"
-                  class="w-5 h-5 rounded border-border-secondary bg-bg-secondary cursor-pointer disabled:cursor-not-allowed"
-                />
-              </div>
-
-              <div class="flex items-center justify-between p-3 bg-bg-primary border border-border-secondary rounded-xl">
-                <div class="pr-4">
-                  <p class="text-xs font-bold text-text-primary">{{ locale.registerRequiresGradeClass }}</p>
-                  <p class="text-[10px] text-text-tertiary mt-0.5 leading-relaxed">{{ locale.registerRequiresGradeClassDesc }}</p>
-                </div>
-                <input
-                  id="register-requires-grade-class"
-                  v-model="formData.registerRequiresGradeClass"
-                  type="checkbox"
-                  :disabled="!formData.allowRegister && !formData.allowOAuthRegistration"
-                  class="w-5 h-5 rounded border-border-secondary bg-bg-secondary cursor-pointer disabled:cursor-not-allowed"
-                />
+                  class="w-4 h-4 rounded border-zinc-800 bg-zinc-900 accent-blue-600 cursor-pointer"
+                >
               </div>
+              <label for="hide-students" class="cursor-pointer">
+                <p class="text-xs font-bold text-zinc-200">隐藏学生详细信息</p>
+                <p class="text-[10px] text-zinc-500 mt-1 leading-relaxed">
+                  开启后，非管理员用户在前端点歌列表、排期预览中将无法查看投稿学生的完整学号与真实姓名。
+                </p>
+              </label>
             </div>
           </div>
 
-          <div class="flex items-center justify-between p-3 bg-bg-primary-50 border border-border-secondary rounded-xl">
-            <div class="pr-4">
-              <p class="text-xs font-bold text-text-primary">{{ locale.showBlacklistKeywords }}</p>
-              <p class="text-[10px] text-text-tertiary mt-0.5 leading-relaxed">{{ locale.showBlacklistKeywordsDesc }}</p>
-            </div>
-            <input
-              id="show-keywords"
-              v-model="formData.showBlacklistKeywords"
-              type="checkbox"
-              class="w-5 h-5 rounded border-border-secondary bg-bg-secondary cursor-pointer"
-            />
-          </div>
-
-          <div class="flex items-center justify-between p-3 bg-bg-primary-50 border border-border-secondary rounded-xl">
-            <div class="pr-4">
-              <p class="text-xs font-bold text-text-primary">{{ locale.hideStudentInfo }}</p>
-              <p class="text-[10px] text-text-tertiary mt-0.5 leading-relaxed">{{ locale.hideStudentInfoDesc }}</p>
-            </div>
-            <input
-              id="hide-students"
-              v-model="formData.hideStudentInfo"
-              type="checkbox"
-              class="w-5 h-5 rounded border-border-secondary bg-bg-secondary cursor-pointer"
-            />
-          </div>
-
-          <div class="flex items-center justify-between p-3 bg-bg-primary-50 border border-border-secondary rounded-xl">
-            <div class="pr-4">
-              <p class="text-xs font-bold text-text-primary">{{ locale.telemetryEnabled }}</p>
-              <p class="text-[10px] text-text-tertiary mt-0.5 leading-relaxed">
-                {{ locale.telemetryEnabledDesc }} <strong class="text-text-tertiary">{{ locale.telemetryPrivacy }}</strong>
-              </p>
-            </div>
-            <input
-              id="telemetry-enabled"
-              v-model="formData.telemetryEnabled"
-              type="checkbox"
-              class="w-5 h-5 shrink-0 rounded border-border-secondary bg-bg-secondary cursor-pointer"
-            />
-          </div>
-
           <div
-            class="p-4 bg-primary-5 border border-primary-10 rounded-xl flex items-start gap-3"
+            class="p-4 bg-blue-500/5 border border-blue-500/10 rounded-xl flex items-start gap-3"
           >
-            <AlertCircle class="text-primary shrink-0 mt-0.5" :size="14" />
-            <p class="text-[10px] text-text-tertiary leading-normal">
-              {{ locale.configWarning }}
+            <AlertCircle class="text-blue-500 shrink-0 mt-0.5" :size="14" />
+            <p class="text-[10px] text-zinc-500 leading-normal">
+              站点基础配置在保存后将立即对所有终端生效。请在修改关键业务逻辑（如投稿限额）前确保已知晓对现有用户的影响。
             </p>
           </div>
         </div>
       </section>
-
-      <!-- 投稿须知 -->
-      <section
-        class="lg:col-span-2 bg-bg-secondary-40 border border-border-secondary rounded-2xl p-6 space-y-6"
-      >
-        <div class="flex items-center justify-between border-b border-border-secondary pb-4">
-          <h3
-            class="text-sm font-black text-text-primary uppercase tracking-widest flex items-center gap-2"
-          >
-            <FileText :size="16" class="text-success" /> {{ locale.submissionGuidelines }}
-          </h3>
-          <div class="flex gap-1 bg-bg-primary rounded-lg p-1">
-            <button
-              :class="[
-                'px-3 py-1.5 text-[10px] font-bold rounded-md transition-all uppercase tracking-wider',
-                editMode === 'edit'
-                  ? 'bg-primary-hover text-text-primary shadow-sm'
-                  : 'text-text-tertiary hover:text-text-secondary'
-              ]"
-              @click="editMode = 'edit'"
-            >
-              {{ locale.guidelinesEdit }}
-            </button>
-            <button
-              :class="[
-                'px-3 py-1.5 text-[10px] font-bold rounded-md transition-all uppercase tracking-wider',
-                editMode === 'preview'
-                  ? 'bg-primary-hover text-text-primary shadow-sm'
-                  : 'text-text-tertiary hover:text-text-secondary'
-              ]"
-              @click="editMode = 'preview'"
-            >
-              {{ locale.guidelinesPreview }}
-            </button>
-          </div>
-        </div>
-        <textarea
-          v-if="editMode === 'edit'"
-          v-model="formData.submissionGuidelines"
-          :rows="6"
-          :placeholder="locale.guidelinesPlaceholder"
-          :class="[inputClass, 'font-mono text-xs leading-relaxed min-h-[150px]']"
-        />
-        <div
-          v-else
-          class="guidelines-preview markdown-body w-full bg-bg-primary border border-border-secondary rounded-xl px-4 py-3 text-sm text-text-secondary leading-relaxed min-h-[150px] max-h-[400px] overflow-y-auto"
-          v-html="renderedPreview"
-        />
-      </section>
-
-      <!-- OAuth 第三方登录配置 -->
-      <OAuthConfigManager v-model="formData" class="lg:col-span-2" />
     </div>
   </div>
 </template>
@@ -803,210 +347,71 @@ import {
   Save,
   RotateCcw,
   CheckCircle2,
-  AlertCircle,
-  Palette,
-  Star,
-  CalendarRange
+  AlertCircle
 } from '@lucide/vue'
-import AppSpinner from '~/components/UI/Common/AppSpinner.vue'
 import { useToast } from '~/composables/useToast'
-import { joinThemeLogoUrl, splitThemeLogoUrl, useSiteConfig } from '~/composables/useSiteConfig'
-import { useLocale } from '~/utils/locale'
-import { useServerErrors } from '~/composables/useLocaleText'
-import { renderMarkdown } from '~/utils/markdown'
-import { getAggregateOAuthLoginTypesOrDefault } from '~/utils/oauth'
-import { usePermissions } from '~/composables/usePermissions'
-import { THEMES } from '~/composables/useTheme'
-import OAuthConfigManager from './OAuthConfigManager.vue'
 
 const { showToast: showNotification } = useToast()
-const { refreshSiteConfig } = useSiteConfig()
-const { siteConfig: locale, theme: themeLocale } = useLocale()
-const { isSuperAdmin } = usePermissions()
-const { localize: localizeServerError } = useServerErrors()
-const themeOptions = computed(() => THEMES.map((value) => ({ value, label: themeLocale.value?.[value] || value })))
-
-const setDefaultTheme = (theme) => {
-  formData.value.defaultTheme = theme
-  const enabled = new Set(formData.value.enabledThemes)
-  enabled.add(theme)
-  formData.value.enabledThemes = THEMES.filter((item) => enabled.has(item))
-  if (theme === 'System') {
-    const enabled = new Set(formData.value.enabledThemes)
-    enabled.add('System')
-    enabled.add('ClassicDark')
-    enabled.add('ClassicLight')
-    formData.value.enabledThemes = THEMES.filter((item) => enabled.has(item))
-    showNotification(locale.value?.systemThemeAutoEnabled || '跟随系统需要经典深色和经典浅色，已自动启用', 'info')
-  }
-}
-
-const isThemeToggleLocked = (theme) => {
-  if (formData.value.defaultTheme === theme) return true
-  if (formData.value.enabledThemes.length <= 1 && formData.value.enabledThemes.includes(theme)) return true
-  return (theme === 'ClassicDark' || theme === 'ClassicLight') && formData.value.enabledThemes.includes('System')
-}
-
-const themeToggleClass = (theme) => {
-  if (isThemeToggleLocked(theme)) return 'bg-primary-80 opacity-50 cursor-not-allowed'
-  return formData.value.enabledThemes.includes(theme) ? 'bg-primary' : 'bg-bg-quaternary'
-}
-
-const toggleTheme = (theme) => {
-  if (isThemeToggleLocked(theme)) return
-  const enabled = new Set(formData.value.enabledThemes)
-  if (enabled.has(theme)) {
-    if (enabled.size <= 1 || formData.value.defaultTheme === theme) return
-    if (theme === 'ClassicDark' || theme === 'ClassicLight') {
-      if (enabled.has('System')) {
-        showNotification(locale.value?.systemThemeRequiresBothClassic || '启用跟随系统时，经典深色和经典浅色必须同时启用', 'info')
-        return
-      }
-    }
-    enabled.delete(theme)
-  } else {
-    enabled.add(theme)
-  }
-  formData.value.enabledThemes = THEMES.filter((item) => enabled.has(item))
-}
-const parseJsonArray = (value, fallback) => {
-  try {
-    const parsed = typeof value === 'string' ? JSON.parse(value) : value
-    if (!Array.isArray(parsed) || parsed.length === 0) return fallback
-    let themes = parsed.filter((item) => THEMES.includes(item))
-    // 脏数据防御：跟随系统依赖经典深色/浅色同时启用，缺失时剔除 System
-    if (themes.includes('System') && (!themes.includes('ClassicDark') || !themes.includes('ClassicLight'))) {
-      themes = themes.filter((item) => item !== 'System')
-    }
-    return themes.length > 0 ? themes : fallback
-  } catch {
-    return fallback
-  }
-}
 
 const loading = ref(true)
 const saving = ref(false)
 const saveSuccess = ref(false)
-const editMode = ref('edit') // 投稿须知编辑/预览模式
-
-// 投稿须知 Markdown 预览
-const renderedPreview = computed(() => renderMarkdown(formData.value.submissionGuidelines))
 
 // 样式类常量
 const inputClass =
-  'w-full bg-bg-primary border border-border-secondary rounded-xl px-4 py-2.5 text-sm text-text-primary focus:outline-none focus:border-primary-30 transition-all placeholder:text-text-primary'
-const labelClass = 'text-[10px] font-black text-text-disabled uppercase tracking-widest px-1 block mb-2'
-const cardClass = 'bg-bg-secondary-40 border border-border-secondary rounded-2xl p-6 shadow-xl space-y-6'
+  'w-full bg-zinc-950 border border-zinc-800 rounded-xl px-4 py-2.5 text-sm text-zinc-200 focus:outline-none focus:border-blue-500/30 transition-all placeholder:text-zinc-800'
+const labelClass = 'text-[10px] font-black text-zinc-600 uppercase tracking-widest px-1 block mb-2'
+const cardClass = 'bg-zinc-900/40 border border-zinc-800 rounded-2xl p-6 shadow-xl space-y-6'
 
-const defaultSubmissionGuidelines = computed(() => locale.value?.defaultSubmissionGuidelines || '请遵守校园广播站投稿规范。')
+const defaultSubmissionGuidelines = `1. 投稿时无需加入书名号
+2. 除DJ外，其他类型歌曲均接收（包括小语种）
+3. 禁止投递含有违规内容的歌曲
+4. 点播的歌曲将由管理员进行审核
+5. 审核通过后将安排在播放时段播出
+6. 提交即表明我已阅读投稿须知并已知该歌曲有概率无法播出
+7. 本系统仅提供音乐搜索和播放管理功能，不存储任何音乐文件。所有音乐内容均来自第三方音乐平台，版权归原平台及版权方所有。用户点歌时请确保遵守相关音乐平台的服务条款，尊重音乐作品版权。我们鼓励用户支持正版音乐，在官方平台购买和收听喜爱的音乐作品。
+8. 最终解释权归广播站所有`
 
 const formData = ref({
   siteTitle: '',
   siteLogoUrl: '',
-  schoolLogoHomeDarkUrl: '',
-  schoolLogoHomeLightUrl: '',
+  schoolLogoHomeUrl: '',
   schoolLogoPrintUrl: '',
   siteDescription: '',
+  siteVersion: '',
   submissionGuidelines: '',
   icpNumber: '',
   gonganNumber: '',
-  statisticsCode: '',
-  statisticsCodeEnabled: false,
-  showBeianIcon: false,
   enableCollaborativeSubmission: true,
   enableSubmissionRemarks: false,
-  submissionNoteRequiresApproval: false,
   enableReplayRequests: false,
   enableSubmissionLimit: false,
-  // 点歌券点歌设置
-  enableCardCodeRequests: false,
-  requireCardCodeForRequests: false,
-  enableCardCodeLimitBypass: false,
   dailySubmissionLimit: 5,
   weeklySubmissionLimit: null,
   monthlySubmissionLimit: null,
-  scheduleDaysBeforeEnabled: false,
-  scheduleDaysBefore: 1,
-  scheduleDaysAfterEnabled: false,
-  scheduleDaysAfter: 1,
   showBlacklistKeywords: false,
-  hideStudentInfo: true,
-  forcePasswordChangeOnFirstLogin: false,
-  telemetryEnabled: true,
-  captchaEnabled: false,
-  captchaProvider: 'graphic',
-  turnstileSiteKey: '',
-  turnstileSecretKey: '',
-  captchaMaxFailures: 3,
-  allowRegister: false,
-  registerRequiresApproval: true,
-  oauthRegisterRequiresApproval: true,
-  registerEmailRequired: false,
-  registerRequiresGradeClass: false,
-  smtpEnabled: false,
-  allowOAuthRegistration: false,
-  oauthRedirectUri: '',
-  oauthStateSecret: '',
-  githubOAuthEnabled: false,
-  githubClientId: '',
-  githubClientSecret: '',
-  casdoorOAuthEnabled: false,
-  casdoorServerUrl: '',
-  casdoorClientId: '',
-  casdoorClientSecret: '',
-  casdoorOrganizationName: '',
-  googleOAuthEnabled: false,
-  googleClientId: '',
-  googleClientSecret: '',
-  aggregateOAuthEnabled: false,
-  aggregateOAuthAppId: '',
-  aggregateOAuthAppKey: '',
-  aggregateOAuthLoginType: ['qq'],
-  aggregateOAuthEndpoint: '',
-  customOAuthEnabled: false,
-  customOAuthDisplayName: '',
-  customOAuthAuthorizeUrl: '',
-  customOAuthTokenUrl: '',
-  customOAuthUserInfoUrl: '',
-  customOAuthScope: '',
-  customOAuthClientId: '',
-  customOAuthClientSecret: '',
-  customOAuthUserIdField: '',
-  customOAuthUsernameField: '',
-  customOAuthNameField: '',
-  customOAuthEmailField: '',
-  customOAuthAvatarField: '',
-  defaultTheme: 'System',
-  enabledThemes: [...THEMES]
+  hideStudentInfo: true
 })
 
 const originalData = ref({})
 
 // 当前限额类型和值的快捷访问
-const activeLimitTab = ref('daily')
-
-// 根据数据中的限额值同步当前激活的标签页
-const syncActiveLimitTab = (data) => {
-  if (data.monthlySubmissionLimit != null) {
-    activeLimitTab.value = 'monthly'
-  } else if (data.weeklySubmissionLimit != null) {
-    activeLimitTab.value = 'weekly'
-  } else {
-    activeLimitTab.value = 'daily'
-  }
-}
+const currentLimitType = computed(() => {
+  if (formData.value.monthlySubmissionLimit !== null) return 'monthly'
+  return formData.value.weeklySubmissionLimit !== null ? 'weekly' : 'daily'
+})
 
 const currentLimitValue = computed({
   get: () => {
-    if (activeLimitTab.value === 'monthly') return formData.value.monthlySubmissionLimit
-    return activeLimitTab.value === 'daily'
+    if (currentLimitType.value === 'monthly') return formData.value.monthlySubmissionLimit
+    return currentLimitType.value === 'daily'
       ? formData.value.dailySubmissionLimit
       : formData.value.weeklySubmissionLimit
   },
   set: (val) => {
-    if (activeLimitTab.value === 'monthly') {
+    if (currentLimitType.value === 'monthly') {
       formData.value.monthlySubmissionLimit = val
-    } else if (activeLimitTab.value === 'daily') {
+    } else if (currentLimitType.value === 'daily') {
       formData.value.dailySubmissionLimit = val
     } else {
       formData.value.weeklySubmissionLimit = val
@@ -1014,17 +419,6 @@ const currentLimitValue = computed({
   }
 })
 
-const currentLimitLabel = computed(() => {
-  const limitTypeLabel =
-    activeLimitTab.value === 'daily'
-      ? locale.value?.dailyLimitLabel
-      : activeLimitTab.value === 'weekly'
-        ? locale.value?.weeklyLimitLabel
-        : locale.value?.monthlyLimitLabel
-
-  return `${locale.value?.limitLabelPrefix || '当前启用：'}${limitTypeLabel || '未设置限额'}${locale.value?.limitLabelSuffix || '投稿限制'}`
-})
-
 // 加载配置
 const loadConfig = async () => {
   try {
@@ -1033,97 +427,35 @@ const loadConfig = async () => {
       credentials: 'include'
     })
 
-    if (!response.ok) throw new Error(locale.value?.fetchFailed || 'Failed to load site config')
+    if (!response.ok) throw new Error('获取配置失败')
 
     const data = await response.json()
 
-    syncActiveLimitTab(data)
-
-    const schoolLogoHome = splitThemeLogoUrl(data.schoolLogoHomeUrl)
     formData.value = {
       siteTitle: data.siteTitle || '',
       siteLogoUrl: data.siteLogoUrl || '',
-      schoolLogoHomeDarkUrl: schoolLogoHome.dark,
-      schoolLogoHomeLightUrl: schoolLogoHome.light,
+      schoolLogoHomeUrl: data.schoolLogoHomeUrl || '',
       schoolLogoPrintUrl: data.schoolLogoPrintUrl || '',
       siteDescription: data.siteDescription || '',
-      submissionGuidelines: data.submissionGuidelines || defaultSubmissionGuidelines.value,
+      siteVersion: data.siteVersion || '',
+      submissionGuidelines: data.submissionGuidelines || defaultSubmissionGuidelines,
       icpNumber: data.icpNumber || '',
       gonganNumber: data.gonganNumber || '',
-      statisticsCode: data.statisticsCode || '',
-      statisticsCodeEnabled: !!data.statisticsCodeEnabled,
-      showBeianIcon: !!data.showBeianIcon,
       enableCollaborativeSubmission: data.enableCollaborativeSubmission !== false,
       enableSubmissionRemarks: !!data.enableSubmissionRemarks,
-      submissionNoteRequiresApproval: !!data.submissionNoteRequiresApproval,
       enableReplayRequests: !!data.enableReplayRequests,
       enableSubmissionLimit: !!data.enableSubmissionLimit,
-      // 点歌券点歌设置
-      enableCardCodeRequests: !!data.enableCardCodeRequests,
-      requireCardCodeForRequests: !!data.requireCardCodeForRequests,
-      enableCardCodeLimitBypass: !!data.enableCardCodeLimitBypass,
       dailySubmissionLimit: data.dailySubmissionLimit ?? 5,
       weeklySubmissionLimit: data.weeklySubmissionLimit ?? null,
       monthlySubmissionLimit: data.monthlySubmissionLimit ?? null,
-      scheduleDaysBeforeEnabled: data.scheduleDaysBeforeEnabled === true,
-      scheduleDaysBefore: data.scheduleDaysBefore ?? 1,
-      scheduleDaysAfterEnabled: data.scheduleDaysAfterEnabled === true,
-      scheduleDaysAfter: data.scheduleDaysAfter ?? 1,
       showBlacklistKeywords: !!data.showBlacklistKeywords,
-      hideStudentInfo: data.hideStudentInfo ?? true,
-      forcePasswordChangeOnFirstLogin: data.forcePasswordChangeOnFirstLogin === true,
-      telemetryEnabled: !!data.telemetryEnabled,
-      captchaEnabled: !!data.captchaEnabled,
-      captchaProvider: data.captchaProvider || 'graphic',
-      turnstileSiteKey: data.turnstileSiteKey || '',
-      turnstileSecretKey: undefined,
-      captchaMaxFailures: data.captchaMaxFailures ?? 3,
-      allowOAuthRegistration: !!data.allowOAuthRegistration,
-      allowRegister: !!data.allowRegister,
-      registerRequiresApproval: data.registerRequiresApproval !== false,
-      oauthRegisterRequiresApproval: data.oauthRegisterRequiresApproval !== false,
-      registerEmailRequired: data.registerEmailRequired === true,
-      registerRequiresGradeClass: data.registerRequiresGradeClass === true,
-      smtpEnabled: !!data.smtpEnabled,
-      oauthRedirectUri: data.oauthRedirectUri || '',
-      oauthStateSecret: data.oauthStateSecret || '',
-      githubOAuthEnabled: !!data.githubOAuthEnabled,
-      githubClientId: data.githubClientId || '',
-      githubClientSecret: data.githubClientSecret || '',
-      casdoorOAuthEnabled: !!data.casdoorOAuthEnabled,
-      casdoorServerUrl: data.casdoorServerUrl || '',
-      casdoorClientId: data.casdoorClientId || '',
-      casdoorClientSecret: data.casdoorClientSecret || '',
-      casdoorOrganizationName: data.casdoorOrganizationName || '',
-      googleOAuthEnabled: !!data.googleOAuthEnabled,
-      googleClientId: data.googleClientId || '',
-      googleClientSecret: data.googleClientSecret || '',
-      aggregateOAuthEnabled: !!data.aggregateOAuthEnabled,
-      aggregateOAuthAppId: data.aggregateOAuthAppId || '',
-      aggregateOAuthAppKey: data.aggregateOAuthAppKey || '',
-      aggregateOAuthLoginType: getAggregateOAuthLoginTypesOrDefault(data.aggregateOAuthLoginType),
-      aggregateOAuthEndpoint: data.aggregateOAuthEndpoint || 'https://a.idcfx.net/connect.php',
-      customOAuthEnabled: !!data.customOAuthEnabled,
-      customOAuthDisplayName: data.customOAuthDisplayName || '',
-      customOAuthAuthorizeUrl: data.customOAuthAuthorizeUrl || '',
-      customOAuthTokenUrl: data.customOAuthTokenUrl || '',
-      customOAuthUserInfoUrl: data.customOAuthUserInfoUrl || '',
-      customOAuthScope: data.customOAuthScope || '',
-      customOAuthClientId: data.customOAuthClientId || '',
-      customOAuthClientSecret: data.customOAuthClientSecret || '',
-      customOAuthUserIdField: data.customOAuthUserIdField || '',
-      customOAuthUsernameField: data.customOAuthUsernameField || '',
-      customOAuthNameField: data.customOAuthNameField || '',
-      customOAuthEmailField: data.customOAuthEmailField || '',
-      customOAuthAvatarField: data.customOAuthAvatarField || '',
-      defaultTheme: data.defaultTheme || 'System',
-      enabledThemes: parseJsonArray(data.enabledThemes, [...THEMES])
+      hideStudentInfo: data.hideStudentInfo ?? true
     }
 
     originalData.value = JSON.parse(JSON.stringify(formData.value))
   } catch (error) {
-    console.error('Failed to load site config:', error)
-    showNotification(locale.value?.loadFailed || '系统设置加载失败', 'error')
+    console.error('加载配置失败:', error)
+    showNotification('加载配置失败', 'error')
   } finally {
     loading.value = false
   }
@@ -1132,51 +464,22 @@ const loadConfig = async () => {
 // 保存配置
 const saveConfig = async () => {
   try {
-    if (isSuperAdmin.value) {
-      if (!formData.value.enabledThemes.includes(formData.value.defaultTheme)) {
-        showNotification(locale.value?.defaultThemeMustBeEnabled || '默认主题必须处于启用状态', 'error')
-        return
-      }
-      if (formData.value.enabledThemes.includes('System') && (!formData.value.enabledThemes.includes('ClassicDark') || !formData.value.enabledThemes.includes('ClassicLight'))) {
-        showNotification(locale.value?.systemThemeRequiresBothClassic || '启用跟随系统时，经典深色和经典浅色必须同时启用', 'error')
-        return
-      }
-    }
     saving.value = true
-    const schoolLogoHomeDarkUrl = (formData.value.schoolLogoHomeDarkUrl || '').trim()
-    const schoolLogoHomeLightUrl = schoolLogoHomeDarkUrl
-      ? (formData.value.schoolLogoHomeLightUrl || '').trim()
-      : ''
     const configToSave = {
       ...formData.value,
-      schoolLogoHomeUrl: joinThemeLogoUrl(
-        schoolLogoHomeDarkUrl,
-        schoolLogoHomeLightUrl
-      ),
-      siteTitle: (formData.value.siteTitle || '').trim() || locale.value?.defaultSiteTitle || 'VoiceHub',
-      siteLogoUrl: (formData.value.siteLogoUrl || '').trim() || '/favicon.ico',
+      siteTitle: (formData.value.siteTitle || '').trim() || '校园广播站点歌系统',
+      siteLogoUrl: (formData.value.siteLogoUrl || '').trim() || '/images/site-logo.png',
+      siteVersion: (formData.value.siteVersion || '').trim() || null,
       submissionGuidelines:
-        (formData.value.submissionGuidelines || '').trim() || defaultSubmissionGuidelines.value,
+        (formData.value.submissionGuidelines || '').trim() || defaultSubmissionGuidelines,
       // 确保根据限额类型处理空值
       dailySubmissionLimit:
-        activeLimitTab.value === 'daily' ? formData.value.dailySubmissionLimit : null,
+        currentLimitType.value === 'daily' ? formData.value.dailySubmissionLimit : null,
       weeklySubmissionLimit:
-        activeLimitTab.value === 'weekly' ? formData.value.weeklySubmissionLimit : null,
+        currentLimitType.value === 'weekly' ? formData.value.weeklySubmissionLimit : null,
       monthlySubmissionLimit:
-        activeLimitTab.value === 'monthly' ? formData.value.monthlySubmissionLimit : null,
-      ...(isSuperAdmin.value
-        ? {
-            defaultTheme: formData.value.defaultTheme,
-            enabledThemes: JSON.stringify(formData.value.enabledThemes)
-          }
-        : {})
+        currentLimitType.value === 'monthly' ? formData.value.monthlySubmissionLimit : null
     }
-    if (!isSuperAdmin.value) {
-      delete configToSave.defaultTheme
-      delete configToSave.enabledThemes
-    }
-    delete configToSave.schoolLogoHomeDarkUrl
-    delete configToSave.schoolLogoHomeLightUrl
 
     const response = await fetch('/api/admin/system-settings', {
       method: 'POST',
@@ -1185,41 +488,18 @@ const saveConfig = async () => {
       body: JSON.stringify(configToSave)
     })
 
-    if (!response.ok) {
-      let message = locale.value?.saveFailed || '系统设置保存失败'
-      try {
-        const errorData = await response.json()
-        console.error('Site config API error response:', errorData)
-
-        message = localizeServerError(errorData, locale.value?.saveFailed || '系统设置保存失败')
-      } catch (parseError) {
-        console.error('Failed to parse site config API error:', parseError)
-      }
-      throw new Error(message)
-    }
+    if (!response.ok) throw new Error('保存配置失败')
 
     saveSuccess.value = true
-    formData.value = {
-      ...formData.value,
-      siteTitle: configToSave.siteTitle,
-      siteLogoUrl: configToSave.siteLogoUrl
-    }
     originalData.value = JSON.parse(JSON.stringify(formData.value))
-    localStorage.setItem('voicehub.telemetryEnabled', configToSave.telemetryEnabled ? 'true' : 'false')
-    // 刷新前端模块级缓存，避免首页等页面继续使用旧配置
-    await refreshSiteConfig()
-    showNotification(locale.value?.saveSuccess || '系统设置已保存', 'success')
+    showNotification('配置保存成功！', 'success')
 
     setTimeout(() => {
       saveSuccess.value = false
     }, 3000)
   } catch (error) {
-    console.error('Failed to save site config:', error)
-    let message = locale.value?.saveFailedRetry || '系统设置保存失败，请稍后重试'
-    if (error?.message) {
-      message = localizeServerError(error, error.message)
-    }
-    showNotification(message, 'error')
+    console.error('保存配置失败:', error)
+    showNotification('保存配置失败，请重试', 'error')
   } finally {
     saving.value = false
   }
@@ -1227,13 +507,19 @@ const saveConfig = async () => {
 
 // 处理限额类型变化
 const handleLimitTypeChange = (type) => {
-  activeLimitTab.value = type
   const limits = {
     daily: { key: 'dailySubmissionLimit', default: 5 },
     weekly: { key: 'weeklySubmissionLimit', default: 20 },
     monthly: { key: 'monthlySubmissionLimit', default: 50 }
   }
 
+  // 将非当前类型的限额设为 null
+  Object.keys(limits).forEach((limitType) => {
+    if (limitType !== type) {
+      formData.value[limits[limitType].key] = null
+    }
+  })
+
   // 如果当前类型的限额为 null，则设置默认值
   const targetLimit = limits[type]
   if (formData.value[targetLimit.key] === null) {
@@ -1244,7 +530,6 @@ const handleLimitTypeChange = (type) => {
 // 重置表单
 const resetForm = () => {
   formData.value = JSON.parse(JSON.stringify(originalData.value))
-  syncActiveLimitTab(formData.value)
 }
 
 onMounted(loadConfig)
diff --git a/app/components/Admin/SmtpManager.vue b/app/components/Admin/SmtpManager.vue
index 400379e..9a28dcb 100644
--- a/app/components/Admin/SmtpManager.vue
+++ b/app/components/Admin/SmtpManager.vue
@@ -3,26 +3,26 @@
     <!-- 头部区域 -->
     <div class="flex flex-col md:flex-row md:items-end justify-between gap-6">
       <div>
-        <h2 class="text-2xl font-black text-text-primary tracking-tight">{{ locale.title }}</h2>
-        <p class="text-xs text-text-tertiary mt-1">
-          {{ locale.desc }}
+        <h2 class="text-2xl font-black text-zinc-100 tracking-tight">邮件服务配置</h2>
+        <p class="text-xs text-zinc-500 mt-1">
+          配置 SMTP 服务以发送系统验证码、投稿通知及其他重要提醒
         </p>
       </div>
       <div class="flex items-center gap-3">
         <button
-          class="flex items-center gap-2 px-6 py-2 bg-bg-secondary border border-border-secondary hover:border-border-tertiary text-text-secondary text-xs font-bold rounded-xl transition-all active:scale-95 disabled:opacity-50"
+          class="flex items-center gap-2 px-6 py-2 bg-zinc-900 border border-zinc-800 hover:border-zinc-700 text-zinc-300 text-xs font-bold rounded-xl transition-all active:scale-95 disabled:opacity-50"
           :disabled="reloading"
           @click="reloadSmtpConfig"
         >
           <RotateCw :size="14" :class="reloading ? 'animate-spin' : ''" />
-          {{ reloading ? locale.reloading : locale.reload }}
+          {{ reloading ? '重载中...' : '重载SMTP' }}
         </button>
         <button
-          class="flex items-center gap-2 px-6 py-2 bg-primary-hover hover:bg-primary text-text-primary text-xs font-bold rounded-xl shadow-lg shadow-[var(--primary-glow)] transition-all active:scale-95"
+          class="flex items-center gap-2 px-6 py-2 bg-blue-600 hover:bg-blue-500 text-white text-xs font-bold rounded-xl shadow-lg shadow-blue-900/20 transition-all active:scale-95"
           :disabled="saving"
           @click="saveConfig"
         >
-          <Save :size="14" /> {{ saving ? locale.saving : locale.save }}
+          <Save :size="14" /> {{ saving ? '保存中...' : '保存配置' }}
         </button>
       </div>
     </div>
@@ -31,20 +31,20 @@
       <!-- 左侧栏：SMTP 设置与测试 -->
       <div class="xl:col-span-4 space-y-8">
         <!-- SMTP 核心设置 -->
-        <section class="bg-bg-secondary-30 border border-border-secondary rounded-[2rem] p-6 space-y-6">
+        <section class="bg-zinc-900/30 border border-zinc-800 rounded-[2rem] p-6 space-y-6">
           <div class="flex items-center justify-between">
             <h3
-              class="text-sm font-black text-text-primary uppercase tracking-widest flex items-center gap-2"
+              class="text-sm font-black text-zinc-100 uppercase tracking-widest flex items-center gap-2"
             >
-              <Server :size="16" class="text-primary" /> {{ locale.serviceConfig }}
+              <Server :size="16" class="text-blue-500" /> 服务配置
             </h3>
             <button
               class="relative w-10 h-5 rounded-full transition-colors"
-              :class="config.smtpEnabled ? 'bg-primary-hover' : 'bg-bg-tertiary'"
+              :class="config.smtpEnabled ? 'bg-blue-600' : 'bg-zinc-800'"
               @click="config.smtpEnabled = !config.smtpEnabled"
             >
               <div
-                class="absolute top-1 w-3 h-3 bg-bg-secondary rounded-full transition-all"
+                class="absolute top-1 w-3 h-3 bg-white rounded-full transition-all"
                 :class="config.smtpEnabled ? 'left-6' : 'left-1'"
               />
             </button>
@@ -52,118 +52,118 @@
 
           <div class="space-y-4">
             <div class="space-y-1.5">
-              <label class="text-[10px] font-black text-text-disabled uppercase tracking-widest px-1"
-                >{{ locale.smtpHost }}</label
+              <label class="text-[10px] font-black text-zinc-600 uppercase tracking-widest px-1"
+                >SMTP 服务器</label
               >
               <input
                 v-model="config.smtpHost"
                 type="text"
                 placeholder="smtp.example.com"
-                class="w-full bg-bg-primary border border-border-secondary rounded-xl px-4 py-2.5 text-xs text-text-primary focus:outline-none focus:border-primary-30"
+                class="w-full bg-zinc-950 border border-zinc-800 rounded-xl px-4 py-2.5 text-xs text-zinc-200 focus:outline-none focus:border-blue-500/30"
               >
             </div>
             <div class="grid grid-cols-2 gap-3">
               <div class="space-y-1.5">
-                <label class="text-[10px] font-black text-text-disabled uppercase tracking-widest px-1"
-                  >{{ locale.port }}</label
+                <label class="text-[10px] font-black text-zinc-600 uppercase tracking-widest px-1"
+                  >端口</label
                 >
                 <input
                   v-model.number="config.smtpPort"
                   type="number"
                   placeholder="587"
-                  class="w-full bg-bg-primary border border-border-secondary rounded-xl px-4 py-2.5 text-xs text-text-primary focus:outline-none focus:border-primary-30"
+                  class="w-full bg-zinc-950 border border-zinc-800 rounded-xl px-4 py-2.5 text-xs text-zinc-200 focus:outline-none focus:border-blue-500/30"
                 >
               </div>
               <div class="space-y-1.5">
-                <label class="text-[10px] font-black text-text-disabled uppercase tracking-widest px-1"
-                  >{{ locale.secure }}</label
+                <label class="text-[10px] font-black text-zinc-600 uppercase tracking-widest px-1"
+                  >加密方式</label
                 >
                 <CustomSelect
-                  :model-value="config.smtpSecure ? secureOptionLabels.ssl : secureOptionLabels.none"
-                  :options="[secureOptionLabels.ssl, secureOptionLabels.none]"
+                  :model-value="config.smtpSecure ? 'SSL/TLS' : '无'"
+                  :options="['SSL/TLS', '无']"
                   class="w-full"
-                  @update:model-value="(val) => (config.smtpSecure = val === secureOptionLabels.ssl)"
+                  @update:model-value="(val) => (config.smtpSecure = val === 'SSL/TLS')"
                 />
               </div>
             </div>
             <div class="space-y-1.5">
-              <label class="text-[10px] font-black text-text-disabled uppercase tracking-widest px-1"
-                >{{ locale.username }}</label
+              <label class="text-[10px] font-black text-zinc-600 uppercase tracking-widest px-1"
+                >发件人账号</label
               >
               <input
                 v-model="config.smtpUsername"
                 type="text"
                 placeholder="your-email@example.com"
-                class="w-full bg-bg-primary border border-border-secondary rounded-xl px-4 py-2.5 text-xs text-text-primary focus:outline-none focus:border-primary-30"
+                class="w-full bg-zinc-950 border border-zinc-800 rounded-xl px-4 py-2.5 text-xs text-zinc-200 focus:outline-none focus:border-blue-500/30"
               >
             </div>
             <div class="space-y-1.5">
-              <label class="text-[10px] font-black text-text-disabled uppercase tracking-widest px-1"
-                >{{ locale.fromEmail }}</label
+              <label class="text-[10px] font-black text-zinc-600 uppercase tracking-widest px-1"
+                >发件人邮箱 (From Email)</label
               >
               <input
                 v-model="config.smtpFromEmail"
                 type="text"
                 :placeholder="config.smtpUsername || 'your-email@example.com'"
-                class="w-full bg-bg-primary border border-border-secondary rounded-xl px-4 py-2.5 text-xs text-text-primary focus:outline-none focus:border-primary-30"
+                class="w-full bg-zinc-950 border border-zinc-800 rounded-xl px-4 py-2.5 text-xs text-zinc-200 focus:outline-none focus:border-blue-500/30"
               >
-              <p class="text-[9px] text-text-tertiary px-1 italic">
-                {{ locale.fromEmailHint }}
+              <p class="text-[9px] text-zinc-500 px-1 italic">
+                通常与发件人账号一致，部分服务商强制要求一致。
               </p>
             </div>
             <div class="space-y-1.5">
-              <label class="text-[10px] font-black text-text-disabled uppercase tracking-widest px-1"
-                >{{ locale.password }}</label
+              <label class="text-[10px] font-black text-zinc-600 uppercase tracking-widest px-1"
+                >授权码 / 密码</label
               >
               <input
                 v-model="config.smtpPassword"
                 type="password"
                 placeholder="••••••••••••"
-                class="w-full bg-bg-primary border border-border-secondary rounded-xl px-4 py-2.5 text-xs text-text-primary focus:outline-none focus:border-primary-30"
+                class="w-full bg-zinc-950 border border-zinc-800 rounded-xl px-4 py-2.5 text-xs text-zinc-200 focus:outline-none focus:border-blue-500/30"
               >
             </div>
             <div class="space-y-1.5">
-              <label class="text-[10px] font-black text-text-disabled uppercase tracking-widest px-1"
-                >{{ locale.fromName }}</label
+              <label class="text-[10px] font-black text-zinc-600 uppercase tracking-widest px-1"
+                >发件人姓名</label
               >
               <input
                 v-model="config.smtpFromName"
                 type="text"
-                :placeholder="locale.defaultFromName"
-                class="w-full bg-bg-primary border border-border-secondary rounded-xl px-4 py-2.5 text-xs text-text-primary focus:outline-none focus:border-primary-30"
+                placeholder="校园广播站"
+                class="w-full bg-zinc-950 border border-zinc-800 rounded-xl px-4 py-2.5 text-xs text-zinc-200 focus:outline-none focus:border-blue-500/30"
               >
             </div>
           </div>
         </section>
 
         <!-- SMTP 测试模块 -->
-        <section class="bg-bg-secondary-30 border border-border-secondary rounded-[2rem] p-6 space-y-6">
+        <section class="bg-zinc-900/30 border border-zinc-800 rounded-[2rem] p-6 space-y-6">
           <h3
-            class="text-sm font-black text-text-primary uppercase tracking-widest flex items-center gap-2"
+            class="text-sm font-black text-zinc-100 uppercase tracking-widest flex items-center gap-2"
           >
-            <Send :size="16" class="text-success" /> {{ locale.serviceTest }}
+            <Send :size="16" class="text-emerald-500" /> 服务测试
           </h3>
 
           <div class="space-y-4">
             <div class="space-y-1.5">
-              <label class="text-[10px] font-black text-text-disabled uppercase tracking-widest px-1"
-                >{{ locale.testEmail }}</label
+              <label class="text-[10px] font-black text-zinc-600 uppercase tracking-widest px-1"
+                >测试接收邮箱</label
               >
               <div class="flex gap-2">
                 <input
                   v-model="testEmail"
                   type="email"
-                  :placeholder="locale.testEmailPlaceholder"
-                  class="flex-1 bg-bg-primary border border-border-secondary rounded-xl px-4 py-2.5 text-xs text-text-primary focus:outline-none focus:border-primary-30"
+                  placeholder="输入测试邮箱地址"
+                  class="flex-1 bg-zinc-950 border border-zinc-800 rounded-xl px-4 py-2.5 text-xs text-zinc-200 focus:outline-none focus:border-blue-500/30"
                 >
                 <button
-                  class="flex items-center gap-2 px-4 py-2 bg-bg-secondary border border-border-secondary hover:border-border-tertiary text-text-tertiary text-xs font-bold rounded-xl transition-all disabled:opacity-50"
+                  class="flex items-center gap-2 px-4 py-2 bg-zinc-900 border border-zinc-800 hover:border-zinc-700 text-zinc-400 text-xs font-bold rounded-xl transition-all disabled:opacity-50"
                   :disabled="testing || !testEmail || !config.smtpEnabled"
                   @click="sendTestEmail"
                 >
-                  <Check v-if="testResult?.success" :size="14" class="text-success" />
+                  <Check v-if="testResult?.success" :size="14" class="text-emerald-500" />
                   <Send v-else :size="14" />
-                  {{ testing ? locale.sending : testResult?.success ? locale.sent : locale.send }}
+                  {{ testing ? '发送中' : testResult?.success ? '已发送' : '发送' }}
                 </button>
               </div>
             </div>
@@ -173,8 +173,8 @@
                 class="flex items-center gap-2 p-3 rounded-xl text-xs"
                 :class="
                   testResult.success
-                    ? 'bg-success-10 text-success border border-success-20'
-                    : 'bg-error-10 text-error border border-error-20'
+                    ? 'bg-emerald-500/10 text-emerald-500 border border-emerald-500/20'
+                    : 'bg-red-500/10 text-red-500 border border-red-500/20'
                 "
               >
                 <CheckCircle v-if="testResult.success" :size="14" />
@@ -200,26 +200,13 @@
 </template>
 
 <script setup>
-import { computed, onMounted, ref } from 'vue'
+import { onMounted, ref } from 'vue'
 import { useToast } from '~/composables/useToast'
-import { useLocale } from '~/utils/locale'
 import EmailTemplateManager from '~/components/Admin/EmailTemplateManager.vue'
 import CustomSelect from '~/components/UI/Common/CustomSelect.vue'
 import { Server, Save, Check, Send, CheckCircle, XCircle, RotateCw } from '@lucide/vue'
 
 const { showToast: showNotification } = useToast()
-const { admin } = useLocale()
-const locale = computed(() => admin.value?.smtpManager || {})
-const getLocaleMessage = (key) => locale.value?.[key] || `SMTP 配置：${key}`
-const getOptionText = (value, fallback) => {
-  if (typeof value === 'function') return value() || fallback
-  if (typeof value === 'string') return value || fallback
-  return fallback
-}
-const secureOptionLabels = computed(() => ({
-  ssl: getOptionText(locale.value?.secureOptions?.ssl, 'SSL/TLS'),
-  none: getOptionText(locale.value?.secureOptions?.none, 'None')
-}))
 
 // 响应式数据
 const config = ref({
@@ -230,7 +217,7 @@ const config = ref({
   smtpUsername: '',
   smtpPassword: '',
   smtpFromEmail: '',
-  smtpFromName: getLocaleMessage('defaultFromName')
+  smtpFromName: '校园广播站'
 })
 
 const testEmail = ref('')
@@ -240,30 +227,6 @@ const reloading = ref(false)
 const testResult = ref(null)
 const originalConfig = ref({})
 
-// 将服务端返回的固定文案映射为当前语言，避免后端中文穿透到前端界面。
-const getLocalizedServerMessage = (message) => {
-  if (!message) {
-    return ''
-  }
-
-  const serverMessages = locale.value?.serverMessages
-  if (!serverMessages) return message
-
-  const rawMessages = serverMessages.raw
-  if (rawMessages) {
-    const key = Object.keys(rawMessages).find((item) => rawMessages[item] === message)
-    return key ? serverMessages[key] : message
-  }
-
-  const matchedEntry = Object.values(serverMessages).find((entry) => entry?.raw === message)
-  return matchedEntry?.text || message
-}
-
-const localizeSmtpResult = (response) => ({
-  ...response,
-  message: getLocalizedServerMessage(response?.message) || response?.message
-})
-
 // 加载配置
 const loadConfig = async () => {
   try {
@@ -277,14 +240,14 @@ const loadConfig = async () => {
       smtpUsername: response.smtpUsername || '',
       smtpPassword: response.smtpPassword || '',
       smtpFromEmail: response.smtpFromEmail || '',
-      smtpFromName: response.smtpFromName || getLocaleMessage('defaultFromName')
+      smtpFromName: response.smtpFromName || '校园广播站'
     }
 
     // 保存原始配置用于重置
     originalConfig.value = { ...config.value }
   } catch (error) {
     console.error('加载SMTP配置失败:', error)
-    showNotification(getLocaleMessage('loadFailed'), 'error')
+    showNotification('加载配置失败', 'error')
   }
 }
 
@@ -293,7 +256,7 @@ const saveConfig = async () => {
   if (config.value.smtpEnabled) {
     // 验证必填字段
     if (!config.value.smtpHost || !config.value.smtpUsername || !config.value.smtpPassword) {
-      showNotification(getLocaleMessage('incompleteConfig'), 'error')
+      showNotification('请填写完整的SMTP配置信息', 'error')
       return
     }
   }
@@ -306,21 +269,17 @@ const saveConfig = async () => {
     })
 
     originalConfig.value = { ...config.value }
-    showNotification(getLocaleMessage('saveSuccess'), 'success')
+    showNotification('SMTP配置保存成功', 'success')
   } catch (error) {
     console.error('保存SMTP配置失败:', error)
-    showNotification(getLocalizedServerMessage(error.data?.message) || getLocaleMessage('saveFailed'), 'error')
+    showNotification(error.data?.message || '保存配置失败', 'error')
   } finally {
     saving.value = false
   }
 }
 
 // 重置配置
-const resetConfig = () => {
-  config.value = { ...originalConfig.value }
-  testResult.value = null
-  showNotification(getLocaleMessage('resetSuccess'), 'info')
-}
+
 
 const reloadSmtpConfig = async () => {
   reloading.value = true
@@ -329,53 +288,24 @@ const reloadSmtpConfig = async () => {
       method: 'POST'
     })
     if (!response.success) {
-      throw new Error(getLocalizedServerMessage(response.message) || getLocaleMessage('reloadFailed'))
+      throw new Error(response.message || 'SMTP重载失败')
     }
-    showNotification(getLocalizedServerMessage(response.message) || getLocaleMessage('reloadSuccess'), 'success')
+    showNotification(response.message || 'SMTP配置已重载', 'success')
   } catch (error) {
     console.error('重载SMTP配置失败:', error)
-    showNotification(
-      getLocalizedServerMessage(error.data?.message || error.message) || getLocaleMessage('reloadFailed'),
-      'error'
-    )
+    showNotification(error.data?.message || error.message || '重载SMTP配置失败', 'error')
   } finally {
     reloading.value = false
   }
 }
 
 // 测试连接
-const testConnection = async () => {
-  if (!config.value.smtpEnabled || !config.value.smtpHost) {
-    showNotification(getLocaleMessage('serverRequired'), 'error')
-    return
-  }
 
-  testing.value = true
-  testResult.value = null
-
-  try {
-    const response = await $fetch('/api/admin/smtp/test-connection', {
-      method: 'POST',
-      body: config.value
-    })
-
-    testResult.value = localizeSmtpResult(response)
-  } catch (error) {
-    console.error('测试连接失败:', error)
-    testResult.value = {
-      success: false,
-      message:
-        getLocalizedServerMessage(error.data?.message) || getLocaleMessage('testConnectionFailed')
-    }
-  } finally {
-    testing.value = false
-  }
-}
 
 // 发送测试邮件
 const sendTestEmail = async () => {
   if (!testEmail.value) {
-    showNotification(getLocaleMessage('testEmailRequired'), 'error')
+    showNotification('请输入测试邮箱地址', 'error')
     return
   }
 
@@ -391,9 +321,9 @@ const sendTestEmail = async () => {
       }
     })
 
-    testResult.value = localizeSmtpResult(response)
+    testResult.value = response
     if (response.success) {
-      showNotification(getLocaleMessage('testEmailSuccess'), 'success')
+      showNotification('测试邮件发送成功', 'success')
       setTimeout(() => {
         testResult.value = null
       }, 5000)
@@ -402,7 +332,7 @@ const sendTestEmail = async () => {
     console.error('发送测试邮件失败:', error)
     testResult.value = {
       success: false,
-      message: getLocalizedServerMessage(error.data?.message) || getLocaleMessage('testEmailFailed')
+      message: error.data?.message || '发送测试邮件失败'
     }
   } finally {
     testing.value = false
diff --git a/app/components/Admin/SongAudit.vue b/app/components/Admin/SongAudit.vue
new file mode 100644
index 0000000..020d083
--- /dev/null
+++ b/app/components/Admin/SongAudit.vue
@@ -0,0 +1,204 @@
+<template>
+  <div class="space-y-10 max-w-[1600px] mx-auto pb-20">
+    <div class="space-y-6">
+      <div class="flex flex-col md:flex-row md:items-end justify-between gap-6 px-1">
+        <div class="space-y-1">
+          <h2 class="text-3xl font-black text-zinc-100 tracking-tight">歌曲审核</h2>
+          <div class="flex items-center gap-6 mt-4">
+            <div class="flex items-center gap-2">
+              <span class="text-[10px] font-black text-zinc-600 uppercase tracking-widest">待审核</span>
+              <span class="text-sm font-bold text-amber-500">{{ pendingAuditSongs.length }}</span>
+            </div>
+          </div>
+        </div>
+
+        <div class="flex items-center gap-3">
+          <button
+            :disabled="loading"
+            class="flex items-center gap-2 px-5 py-2.5 bg-blue-600/10 hover:bg-blue-600/20 text-blue-400 text-xs font-bold rounded-lg border border-blue-500/20 transition-all disabled:opacity-50"
+            @click="refreshSongs(true)"
+          >
+            <RotateCcw :size="16" :class="{ 'animate-spin': loading }" /> 刷新
+          </button>
+        </div>
+      </div>
+    </div>
+
+    <!-- 歌曲表格 -->
+    <div class="bg-zinc-900/10 border border-zinc-800/40 rounded-xl overflow-hidden shadow-2xl relative">
+      <div v-if="loading" class="absolute inset-0 bg-zinc-950/40 backdrop-blur-sm z-10 flex items-center justify-center">
+        <div class="flex flex-col items-center gap-3">
+          <div class="w-8 h-8 border-2 border-blue-500/20 border-t-blue-500 rounded-full animate-spin" />
+          <span class="text-xs font-bold text-zinc-400 tracking-widest uppercase">正在加载...</span>
+        </div>
+      </div>
+
+      <div class="hidden lg:grid grid-cols-12 gap-4 px-8 py-5 border-b border-zinc-800/60 bg-zinc-900/40">
+        <div class="col-span-4 text-[10px] font-black text-zinc-600 uppercase tracking-widest">歌曲信息</div>
+        <div class="col-span-2 text-[10px] font-black text-zinc-600 uppercase tracking-widest">投稿人</div>
+        <div class="col-span-3 text-[10px] font-black text-zinc-600 uppercase tracking-widest">期望排期</div>
+        <div class="col-span-3 text-[10px] font-black text-zinc-600 uppercase tracking-widest text-right pr-4">操作</div>
+      </div>
+
+      <div v-if="pendingAuditSongs.length === 0 && !loading" class="py-20 flex flex-col items-center justify-center text-zinc-500">
+        <Music :size="48" class="text-zinc-800 mb-4" />
+        <p class="text-sm font-bold">暂无待审核歌曲</p>
+      </div>
+
+      <div v-else class="divide-y divide-zinc-800/40">
+        <div
+          v-for="song in pendingAuditSongs"
+          :key="song.id"
+          class="grid grid-cols-1 lg:grid-cols-12 gap-4 px-6 lg:px-8 py-5 transition-all items-center hover:bg-zinc-800/20 group relative"
+        >
+          <div class="col-span-12 lg:col-span-4 flex items-center gap-4">
+            <div class="w-12 h-12 rounded-xl flex items-center justify-center shrink-0 border transition-all overflow-hidden bg-zinc-800/40 border-zinc-700/30 cursor-pointer hover:opacity-80" @click.stop="playSong(song)">
+              <img v-if="song.cover" :src="convertToHttps(song.cover)" class="w-full h-full object-cover" referrerpolicy="no-referrer">
+              <Music v-else :size="20" class="text-zinc-600" />
+            </div>
+            <div class="min-w-0">
+              <h4 class="font-bold transition-colors flex items-center text-zinc-100 group-hover:text-blue-400">
+                <span class="truncate">{{ song.title }}</span>
+                <button v-if="song.hasSubmissionNote && song.submissionNote" class="ml-2 inline-flex items-center justify-center w-5 h-5 rounded-full border border-blue-500/30 bg-blue-500/10 text-blue-400 hover:bg-blue-500/20 transition-all" title="查看备注留言" @click.stop="openSubmissionRemark(song)">
+                  <MessageSquare :size="12" />
+                </button>
+              </h4>
+              <p class="text-xs text-zinc-500 font-medium truncate mt-0.5">{{ song.artist }}</p>
+            </div>
+          </div>
+
+          <div class="col-span-6 lg:col-span-2 flex flex-col lg:items-start">
+            <span class="text-xs font-bold text-zinc-400">{{ song.requester || '未知' }}</span>
+            <span v-if="song.user" class="text-[10px] font-bold text-zinc-600">@{{ song.user.username }}</span>
+          </div>
+
+          <div class="col-span-6 lg:col-span-3 flex flex-col">
+            <span v-if="song.expectedPlayDate" class="text-xs font-bold text-amber-500">
+              {{ song.expectedPlayDate }} 序号: {{ song.expectedPlaySequence }}
+            </span>
+            <span v-else class="text-xs font-bold text-zinc-500">未指定日期</span>
+          </div>
+
+          <div class="col-span-12 lg:col-span-3 flex items-center justify-end gap-2">
+            <button class="px-4 py-2 bg-emerald-600/10 hover:bg-emerald-600/20 text-emerald-500 hover:text-emerald-400 text-xs font-bold rounded-lg border border-emerald-500/20 transition-all" @click="auditSong(song.id, 'approved')">
+              通过
+            </button>
+            <button class="px-4 py-2 bg-red-600/10 hover:bg-red-600/20 text-red-500 hover:text-red-400 text-xs font-bold rounded-lg border border-red-500/20 transition-all" @click="rejectSong(song.id)">
+              未过审 (释放排期)
+            </button>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <!-- 驳回歌曲对话框 -->
+    <Transition enter-active-class="transition duration-300 ease-out" enter-from-class="opacity-0" enter-to-class="opacity-100" leave-active-class="transition duration-200 ease-in" leave-from-class="opacity-100" leave-to-class="opacity-0">
+      <div v-if="showRejectDialog" class="fixed inset-0 z-50 flex items-center justify-center p-4 bg-zinc-950/80 backdrop-blur-sm">
+        <div class="w-full max-w-lg bg-zinc-900 border border-zinc-800 rounded-xl shadow-2xl overflow-hidden" @click.stop>
+          <div class="px-8 py-6 border-b border-zinc-800/50 flex items-center justify-between">
+            <h3 class="text-xl font-black text-zinc-100">未过审处理</h3>
+            <button class="text-zinc-500 hover:text-zinc-300 transition-colors" @click="showRejectDialog = false"><X :size="20" /></button>
+          </div>
+          <div class="p-8 space-y-6">
+            <div class="p-5 bg-zinc-950 border border-zinc-800 rounded-lg">
+              <p class="text-xs text-zinc-400 mb-2">此操作会将歌曲标记为未过审，并<span class="text-red-400 font-bold">立即释放其占用的排期序号</span>，供其他同学选择。歌曲不会被删除。</p>
+              <textarea v-model="rejectReason" placeholder="请输入未过审原因 (可选)，将通知投稿人..." class="w-full bg-zinc-900 border border-zinc-800 rounded-lg px-4 py-3 text-sm text-zinc-200 focus:outline-none focus:border-red-500/30 min-h-[100px] resize-none transition-all" />
+            </div>
+          </div>
+          <div class="px-8 py-6 bg-zinc-900/50 border-t border-zinc-800/50 flex gap-3 justify-end">
+            <button class="px-6 py-2.5 text-xs font-bold text-zinc-500 hover:text-zinc-300" @click="showRejectDialog = false">取消</button>
+            <button :disabled="auditLoading" class="px-8 py-2.5 bg-red-600 hover:bg-red-500 text-white text-xs font-black rounded-lg transition-all disabled:opacity-50" @click="confirmReject">
+              {{ auditLoading ? '处理中...' : '确认释放排期' }}
+            </button>
+          </div>
+        </div>
+      </div>
+    </Transition>
+
+    <SubmissionRemarkDialog :show="submissionRemarkDialog.show" :song-title="submissionRemarkDialog.songTitle" :content="submissionRemarkDialog.content" :is-public="submissionRemarkDialog.isPublic" @close="submissionRemarkDialog.show = false" />
+  </div>
+</template>
+
+<script setup>
+import { ref, computed, onMounted } from 'vue'
+import SubmissionRemarkDialog from '~/components/Admin/SubmissionRemarkDialog.vue'
+import { RotateCcw, X, Music, MessageSquare } from '@lucide/vue'
+import { useSongs } from '~/composables/useSongs'
+import { useSongPlayer } from '~/composables/useSongPlayer'
+import { useToast } from '~/composables/useToast'
+import { convertToHttps } from '~/utils/url'
+
+const { showToast } = useToast()
+const { playSong } = useSongPlayer()
+const loading = ref(false)
+const auditLoading = ref(false)
+const songs = ref([])
+
+const showRejectDialog = ref(false)
+const rejectReason = ref('')
+const currentAuditId = ref(null)
+const submissionRemarkDialog = ref({ show: false, songTitle: '', content: '', isPublic: false })
+
+let songsService = null
+
+const pendingAuditSongs = computed(() => {
+  return songs.value.filter(s => 
+    !s.played && 
+    !s.scheduled &&
+    (!s.submissionNote || (!s.submissionNote.includes('[审核未通过]') && !s.submissionNote.includes('[审核已通过]')))
+  )
+})
+
+const openSubmissionRemark = (song) => {
+  if (!song?.submissionNote) return
+  submissionRemarkDialog.value = {
+    show: true,
+    songTitle: `${song.title} - ${song.artist}`,
+    content: song.submissionNote,
+    isPublic: song.submissionNotePublic === true
+  }
+}
+
+const refreshSongs = async (bypassCache = false) => {
+  loading.value = true
+  try {
+    await songsService.fetchSongs(false, undefined, true, bypassCache)
+    songs.value = songsService.songs.value || []
+  } catch (error) {
+    console.error('刷新歌曲失败:', error)
+  } finally {
+    loading.value = false
+  }
+}
+
+const auditSong = async (id, status, reason = '') => {
+  try {
+    await $fetch('/api/admin/songs/audit', {
+      method: 'POST',
+      body: { songId: id, status, reason }
+    })
+    showToast(status === 'approved' ? '审核已通过' : '已驳回并释放排期', 'success')
+    await refreshSongs(true)
+  } catch (err) {
+    showToast('操作失败: ' + (err.data?.message || err.message), 'error')
+  }
+}
+
+const rejectSong = (id) => {
+  currentAuditId.value = id
+  rejectReason.value = ''
+  showRejectDialog.value = true
+}
+
+const confirmReject = async () => {
+  auditLoading.value = true
+  await auditSong(currentAuditId.value, 'rejected', rejectReason.value)
+  showRejectDialog.value = false
+  auditLoading.value = false
+}
+
+onMounted(async () => {
+  songsService = useSongs()
+  await refreshSongs()
+})
+</script>
\ No newline at end of file
diff --git a/app/components/Admin/SongDownloadDialog.vue b/app/components/Admin/SongDownloadDialog.vue
index 6af4837..9268c5a 100644
--- a/app/components/Admin/SongDownloadDialog.vue
+++ b/app/components/Admin/SongDownloadDialog.vue
@@ -2,20 +2,20 @@
   <Transition name="fade">
     <div
       v-if="show"
-      class="fixed inset-0 z-50 flex items-center justify-center bg-bg-primary-60 backdrop-blur-sm"
+      class="fixed inset-0 z-50 flex items-center justify-center bg-black/60 backdrop-blur-sm"
       @click="closeDialog"
     >
       <Transition name="scale">
         <div
           v-if="show"
-          class="bg-bg-secondary border border-border-secondary rounded-2xl shadow-2xl w-full max-w-lg overflow-hidden flex flex-col max-h-[90vh]"
+          class="bg-zinc-900 border border-zinc-800 rounded-2xl shadow-2xl w-full max-w-lg overflow-hidden flex flex-col max-h-[90vh]"
           @click.stop
         >
           <!-- 头部 -->
-          <div class="flex items-center justify-between p-4 border-b border-border-secondary shrink-0">
-            <h3 class="text-sm font-black text-text-primary uppercase tracking-widest">{{ locale.title }}</h3>
+          <div class="flex items-center justify-between p-4 border-b border-zinc-800 shrink-0">
+            <h3 class="text-sm font-black text-zinc-100 uppercase tracking-widest">下载歌曲</h3>
             <button
-              class="text-text-tertiary hover:text-text-secondary transition-colors"
+              class="text-zinc-500 hover:text-zinc-300 transition-colors"
               @click="closeDialog"
             >
               <CloseIcon class="w-5 h-5" />
@@ -26,8 +26,8 @@
           <div class="flex-1 overflow-y-auto p-6 space-y-8 custom-scrollbar">
             <!-- 音质选择 -->
             <section class="space-y-3">
-              <label class="text-[10px] font-black uppercase text-text-disabled tracking-[0.2em] px-1"
-                >{{ locale.quality }}</label
+              <label class="text-[10px] font-black uppercase text-zinc-600 tracking-[0.2em] px-1"
+                >选择音质</label
               >
               <div class="grid grid-cols-2 gap-2">
                 <button
@@ -36,23 +36,23 @@
                   class="flex flex-col p-4 rounded-2xl border text-left transition-all relative overflow-hidden group"
                   :class="[
                     selectedQuality === option.value
-                      ? 'bg-primary-hover-10 border-primary shadow-sm'
-                      : 'bg-bg-primary border-border-secondary hover:border-border-tertiary'
+                      ? 'bg-blue-600/10 border-blue-500 shadow-sm'
+                      : 'bg-zinc-950 border-zinc-800 hover:border-zinc-700'
                   ]"
                   @click="selectedQuality = option.value"
                 >
                   <div class="flex items-center justify-between mb-1 relative z-10">
                     <span
                       class="text-xs font-bold transition-colors"
-                      :class="selectedQuality === option.value ? 'text-primary' : 'text-text-primary'"
+                      :class="selectedQuality === option.value ? 'text-blue-400' : 'text-zinc-200'"
                       >{{ option.label }}</span
                     >
                     <div
                       v-if="selectedQuality === option.value"
-                      class="w-1.5 h-1.5 bg-primary rounded-full shadow-[0_0_8px_var(--primary-50)]"
+                      class="w-1.5 h-1.5 bg-blue-500 rounded-full shadow-[0_0_8px_rgba(59,130,246,0.5)]"
                     />
                   </div>
-                  <span class="text-[10px] text-text-tertiary relative z-10">{{
+                  <span class="text-[10px] text-zinc-500 relative z-10">{{
                     option.description
                   }}</span>
                 </button>
@@ -61,214 +61,187 @@
 
             <!-- 高级选项 -->
             <Transition name="expand">
-              <section v-if="selectedSongs.size > 0" class="space-y-3 overflow-hidden">
+              <section v-if="selectedSongs.size > 1" class="space-y-3 overflow-hidden">
                 <div class="flex items-center gap-2 px-1">
-                  <Settings2 class="w-3 h-3 text-text-tertiary" />
-                  <label class="text-[10px] font-black uppercase text-text-disabled tracking-[0.2em]"
-                    >{{ locale.advancedOptions }}</label
+                  <Settings2 class="w-3 h-3 text-zinc-500" />
+                  <label class="text-[10px] font-black uppercase text-zinc-600 tracking-[0.2em]"
+                    >高级选项</label
                   >
                 </div>
 
-                <div class="bg-bg-primary border border-border-secondary rounded-2xl p-4 space-y-4">
+                <div class="bg-zinc-950 border border-zinc-800 rounded-2xl p-4 space-y-4">
                   <!-- 合并开关 -->
-                  <div v-if="selectedSongs.size > 1" class="flex items-center justify-between">
+                  <div class="flex items-center justify-between">
                     <div class="flex flex-col">
-                      <span class="text-xs font-bold text-text-primary">{{ locale.mergeIntoOne }}</span>
-                      <span class="text-[10px] text-text-tertiary">{{ locale.mergeDesc }}</span>
+                      <span class="text-xs font-bold text-zinc-200">合并为一个文件</span>
+                      <span class="text-[10px] text-zinc-500">将选中歌曲按顺序合并为单个音频</span>
                     </div>
                     <button
                       class="w-10 h-6 rounded-full transition-colors relative"
-                      :class="mergeSongs ? 'bg-primary-hover' : 'bg-bg-quaternary'"
+                      :class="mergeSongs ? 'bg-blue-600' : 'bg-zinc-700'"
                       @click="mergeSongs = !mergeSongs"
                     >
                       <div
-                        class="absolute top-1 left-1 w-4 h-4 bg-bg-secondary rounded-full transition-transform"
+                        class="absolute top-1 left-1 w-4 h-4 bg-white rounded-full transition-transform"
                         :class="mergeSongs ? 'translate-x-4' : 'translate-x-0'"
                       />
                     </button>
                   </div>
 
-                  <!-- 标准化选项 -->
-                  <div
-                    class="flex items-center justify-between"
-                    :class="selectedSongs.size > 1 ? 'pt-3 border-t border-border-secondary-50' : ''"
-                  >
-                    <div class="flex flex-col">
-                      <div class="flex items-center gap-2">
-                        <span class="text-xs font-bold text-text-primary">{{ locale.normalizeAudio }}</span>
-                        <span
-                          v-if="normalizeAudio"
-                          class="text-[10px] bg-primary-10 text-primary px-1.5 py-0.5 rounded border border-primary-20"
-                          >Peak {{ targetDb }}dB</span
-                        >
-                      </div>
-                      <span class="text-[10px] text-text-tertiary"
-                        >{{ locale.normalizeDesc }}</span
-                      >
-                    </div>
-                    <div class="flex items-center gap-3">
-                      <button
-                        class="text-[10px] text-primary hover:text-primary transition-colors flex items-center gap-1"
-                        :title="locale.saveDbPresetTitle"
-                        @click="saveDbPreset"
-                      >
-                        <Save class="w-3 h-3" />
-                        {{ showDbPresetSaved ? locale.saved : locale.savePreset }}
-                      </button>
-                      <button
-                        class="w-10 h-6 rounded-full transition-colors relative"
-                        :class="normalizeAudio ? 'bg-primary-hover' : 'bg-bg-quaternary'"
-                        @click="normalizeAudio = !normalizeAudio"
-                      >
-                        <div
-                          class="absolute top-1 left-1 w-4 h-4 bg-bg-secondary rounded-full transition-transform"
-                          :class="normalizeAudio ? 'translate-x-4' : 'translate-x-0'"
-                        />
-                      </button>
-                    </div>
-                  </div>
-
-                  <!-- 目标分贝设置 -->
+                  <!-- 合并设置区域 -->
                   <Transition name="expand">
-                    <div v-if="normalizeAudio" class="pt-2">
-                      <div class="flex items-center gap-3">
-                        <Volume2 class="w-4 h-4 text-text-tertiary" />
-                        <input
-                          v-model.number="targetDb"
-                          type="range"
-                          min="-10"
-                          max="0"
-                          step="0.5"
-                          class="flex-1 h-1.5 bg-bg-tertiary rounded-lg appearance-none cursor-pointer [&::-webkit-slider-thumb]:appearance-none [&::-webkit-slider-thumb]:w-3 [&::-webkit-slider-thumb]:h-3 [&::-webkit-slider-thumb]:rounded-full [&::-webkit-slider-thumb]:bg-primary"
-                        >
-                        <span class="text-xs font-mono text-text-secondary w-12 text-right"
-                          >{{ targetDb }} dB</span
-                        >
+                    <div v-if="mergeSongs" class="space-y-4 pt-4 border-t border-zinc-800/50">
+                      <!-- 导出格式选择 -->
+                      <div class="space-y-2">
+                        <div class="flex items-center gap-2">
+                          <Music class="w-3 h-3 text-zinc-500" />
+                          <span class="text-xs font-bold text-zinc-200">导出格式</span>
+                        </div>
+                        <div class="flex gap-2">
+                          <button
+                            class="flex-1 py-1.5 px-3 rounded-lg border text-[10px] font-bold transition-all"
+                            :class="
+                              exportFormat === 'mp3'
+                                ? 'bg-blue-600/10 border-blue-500 text-blue-400'
+                                : 'bg-zinc-900 border-zinc-800 text-zinc-400 hover:border-zinc-700'
+                            "
+                            @click="exportFormat = 'mp3'"
+                          >
+                            MP3
+                          </button>
+                          <button
+                            class="flex-1 py-1.5 px-3 rounded-lg border text-[10px] font-bold transition-all"
+                            :class="
+                              exportFormat === 'wav'
+                                ? 'bg-blue-600/10 border-blue-500 text-blue-400'
+                                : 'bg-zinc-900 border-zinc-800 text-zinc-400 hover:border-zinc-700'
+                            "
+                            @click="exportFormat = 'wav'"
+                          >
+                            WAV
+                          </button>
+                        </div>
                       </div>
+
+                      <!-- 自定义文件名 -->
+                      <div class="space-y-2">
+                        <div class="flex items-center justify-between">
+                          <div class="flex items-center gap-2">
+                            <Edit3 class="w-3 h-3 text-zinc-500" />
+                            <span class="text-xs font-bold text-zinc-200">自定义文件名</span>
+                          </div>
+                          <button
+                            class="text-[10px] text-blue-400 hover:text-blue-300 transition-colors flex items-center gap-1"
+                            :class="{ 'opacity-50 cursor-not-allowed': !customFilename }"
+                            title="保存为默认预设"
+                            @click="saveFilenamePreset"
+                          >
+                            <Save class="w-3 h-3" />
+                            {{ showPresetSaved ? '已保存!' : '保存预设' }}
+                          </button>
+                        </div>
+                        <div class="relative">
+                          <input
+                            v-model="customFilename"
+                            type="text"
+                            placeholder="例如: 第XX期 - {songs}"
+                            class="w-full bg-zinc-900 border border-zinc-800 rounded-xl px-3 py-2 text-xs text-zinc-200 focus:outline-none focus:border-blue-500/50 transition-colors pr-8"
+                          >
+                          <!-- 快速插入占位符按钮 -->
+                          <div class="absolute right-2 top-1/2 -translate-y-1/2 flex gap-1">
+                            <button
+                              class="px-1.5 py-0.5 rounded bg-zinc-800 text-[9px] text-zinc-400 hover:text-zinc-200 hover:bg-zinc-700 transition-colors"
+                              title="插入所有歌名"
+                              @click="insertPlaceholder('{songs}')"
+                            >
+                              {songs}
+                            </button>
+                            <button
+                              class="px-1.5 py-0.5 rounded bg-zinc-800 text-[9px] text-zinc-400 hover:text-zinc-200 hover:bg-zinc-700 transition-colors"
+                              title="插入当前日期"
+                              @click="insertPlaceholder('{date}')"
+                            >
+                              {date}
+                            </button>
+                          </div>
+                        </div>
+                        <p class="text-[9px] text-zinc-600">
+                          可用占位符:
+                          <code
+                            class="bg-zinc-800 px-1 rounded text-zinc-400 cursor-pointer hover:text-blue-400"
+                            @click="insertPlaceholder('{songs}')"
+                            >{songs}</code
+                          >
+                          (所有歌名),
+                          <code
+                            class="bg-zinc-800 px-1 rounded text-zinc-400 cursor-pointer hover:text-blue-400"
+                            @click="insertPlaceholder('{date}')"
+                            >{date}</code
+                          >
+                          (日期)
+                        </p>
+                      </div>
+
+                      <!-- 标准化选项 (仅在合并模式或需要时显示，这里允许单独使用) -->
+                      <div
+                        class="flex items-center justify-between pt-3 border-t border-zinc-800/50"
+                      >
+                        <div class="flex flex-col">
+                          <div class="flex items-center gap-2">
+                            <span class="text-xs font-bold text-zinc-200">统一音量 (标准化)</span>
+                            <span
+                              v-if="normalizeAudio"
+                              class="text-[10px] bg-blue-500/10 text-blue-400 px-1.5 py-0.5 rounded border border-blue-500/20"
+                              >Peak {{ targetDb }}dB</span
+                            >
+                          </div>
+                          <span class="text-[10px] text-zinc-500"
+                            >将所有音频峰值调整至统一标准</span
+                          >
+                        </div>
+                        <div class="flex items-center gap-3">
+                          <button
+                            class="text-[10px] text-blue-400 hover:text-blue-300 transition-colors flex items-center gap-1"
+                            title="保存当前音量设置(包括开启状态)为默认"
+                            @click="saveDbPreset"
+                          >
+                            <Save class="w-3 h-3" />
+                            {{ showDbPresetSaved ? '已保存!' : '保存预设' }}
+                          </button>
+                          <button
+                            class="w-10 h-6 rounded-full transition-colors relative"
+                            :class="normalizeAudio ? 'bg-blue-600' : 'bg-zinc-700'"
+                            @click="normalizeAudio = !normalizeAudio"
+                          >
+                            <div
+                              class="absolute top-1 left-1 w-4 h-4 bg-white rounded-full transition-transform"
+                              :class="normalizeAudio ? 'translate-x-4' : 'translate-x-0'"
+                            />
+                          </button>
+                        </div>
+                      </div>
+
+                      <!-- 目标分贝设置 -->
+                      <Transition name="expand">
+                        <div v-if="normalizeAudio" class="pt-2">
+                          <div class="flex items-center gap-3">
+                            <Volume2 class="w-4 h-4 text-zinc-500" />
+                            <input
+                              v-model.number="targetDb"
+                              type="range"
+                              min="-10"
+                              max="0"
+                              step="0.5"
+                              class="flex-1 h-1.5 bg-zinc-800 rounded-lg appearance-none cursor-pointer [&::-webkit-slider-thumb]:appearance-none [&::-webkit-slider-thumb]:w-3 [&::-webkit-slider-thumb]:h-3 [&::-webkit-slider-thumb]:rounded-full [&::-webkit-slider-thumb]:bg-blue-500"
+                            >
+                            <span class="text-xs font-mono text-zinc-300 w-12 text-right"
+                              >{{ targetDb }} dB</span
+                            >
+                          </div>
+                        </div>
+                      </Transition>
                     </div>
                   </Transition>
-
-                  <!-- 导出格式设置 -->
-                  <div class="space-y-4 pt-4 border-t border-border-secondary-50">
-                    <div class="flex items-center justify-between">
-                      <div class="flex flex-col">
-                        <span class="text-xs font-bold text-text-primary">{{ locale.exportFormat }}</span>
-                        <span class="text-[10px] text-text-tertiary">
-                          {{
-                            shouldMergeSongs
-                              ? locale.mergeNeedsFormat
-                              : locale.transcodeSingle
-                          }}
-                        </span>
-                      </div>
-                      <button
-                        v-if="!shouldMergeSongs"
-                        class="w-10 h-6 rounded-full transition-colors relative"
-                        :class="convertAudioFormat ? 'bg-primary-hover' : 'bg-bg-quaternary'"
-                        @click="convertAudioFormat = !convertAudioFormat"
-                      >
-                        <div
-                          class="absolute top-1 left-1 w-4 h-4 bg-bg-secondary rounded-full transition-transform"
-                          :class="convertAudioFormat ? 'translate-x-4' : 'translate-x-0'"
-                        />
-                      </button>
-                    </div>
-
-                    <!-- 导出格式选择 -->
-                    <div class="space-y-2">
-                      <div class="flex items-center gap-2">
-                        <Music class="w-3 h-3 text-text-tertiary" />
-                        <span class="text-xs font-bold text-text-primary">{{ locale.format }}</span>
-                      </div>
-                      <div class="flex gap-2">
-                        <button
-                          :disabled="!shouldUseExportFormat"
-                          class="flex-1 py-1.5 px-3 rounded-lg border text-[10px] font-bold transition-all"
-                          :class="[
-                            exportFormat === 'mp3'
-                              ? 'bg-primary-hover-10 border-primary text-primary'
-                              : 'bg-bg-secondary border-border-secondary text-text-tertiary hover:border-border-tertiary',
-                            !shouldUseExportFormat ? 'opacity-50 cursor-not-allowed' : ''
-                          ]"
-                          @click="exportFormat = 'mp3'"
-                        >
-                          MP3
-                        </button>
-                        <button
-                          :disabled="!shouldUseExportFormat"
-                          class="flex-1 py-1.5 px-3 rounded-lg border text-[10px] font-bold transition-all"
-                          :class="[
-                            exportFormat === 'wav'
-                              ? 'bg-primary-hover-10 border-primary text-primary'
-                              : 'bg-bg-secondary border-border-secondary text-text-tertiary hover:border-border-tertiary',
-                            !shouldUseExportFormat ? 'opacity-50 cursor-not-allowed' : ''
-                          ]"
-                          @click="exportFormat = 'wav'"
-                        >
-                          WAV
-                        </button>
-                      </div>
-                    </div>
-
-                    <!-- 自定义文件名 -->
-                    <div v-if="shouldMergeSongs" class="space-y-2">
-                      <div class="flex items-center justify-between">
-                        <div class="flex items-center gap-2">
-                          <Edit3 class="w-3 h-3 text-text-tertiary" />
-                          <span class="text-xs font-bold text-text-primary">{{ locale.customFilename }}</span>
-                        </div>
-                        <button
-                          class="text-[10px] text-primary hover:text-primary transition-colors flex items-center gap-1"
-                          :class="{ 'opacity-50 cursor-not-allowed': !customFilename }"
-                          :title="locale.saveAsDefaultPreset"
-                          @click="saveFilenamePreset"
-                        >
-                          <Save class="w-3 h-3" />
-                          {{ showPresetSaved ? locale.saved : locale.savePreset }}
-                        </button>
-                      </div>
-                      <div class="relative">
-                        <input
-                          v-model="customFilename"
-                          type="text"
-                          :placeholder="locale.filenamePlaceholder"
-                          class="w-full bg-bg-secondary border border-border-secondary rounded-xl px-3 py-2 text-xs text-text-primary focus:outline-none focus:border-primary-50 transition-colors pr-8"
-                        >
-                        <!-- 快速插入占位符按钮 -->
-                        <div class="absolute right-2 top-1/2 -translate-y-1/2 flex gap-1">
-                          <button
-                            class="px-1.5 py-0.5 rounded bg-bg-tertiary text-[9px] text-text-tertiary hover:text-text-primary hover:bg-bg-quaternary transition-colors"
-                            :title="locale.insertAllSongs"
-                            @click="insertPlaceholder('{songs}')"
-                          >
-                            {songs}
-                          </button>
-                          <button
-                            class="px-1.5 py-0.5 rounded bg-bg-tertiary text-[9px] text-text-tertiary hover:text-text-primary hover:bg-bg-quaternary transition-colors"
-                            :title="locale.insertDate"
-                            @click="insertPlaceholder('{date}')"
-                          >
-                            {date}
-                          </button>
-                        </div>
-                      </div>
-                      <p class="text-[9px] text-text-disabled">
-                        {{ locale.placeholders }}
-                        <code
-                          class="bg-bg-tertiary px-1 rounded text-text-tertiary cursor-pointer hover:text-primary"
-                          @click="insertPlaceholder('{songs}')"
-                          >{songs}</code
-                        >
-                        ({{ locale.allSongs }}),
-                        <code
-                          class="bg-bg-tertiary px-1 rounded text-text-tertiary cursor-pointer hover:text-primary"
-                          @click="insertPlaceholder('{date}')"
-                          >{date}</code
-                        >
-                        ({{ locale.date }})
-                      </p>
-                    </div>
-                  </div>
                 </div>
               </section>
             </Transition>
@@ -277,70 +250,57 @@
             <section class="space-y-3">
               <div class="flex items-center justify-between px-1">
                 <div class="flex items-center gap-3">
-                  <label class="text-[10px] font-black uppercase text-text-disabled tracking-[0.2em]"
-                    >{{ locale.songList }}</label
+                  <label class="text-[10px] font-black uppercase text-zinc-600 tracking-[0.2em]"
+                    >歌曲列表</label
                   >
                   <div
                     v-if="estimatedTotalDuration.count > 0"
-                    class="flex items-center gap-1.5 text-[10px] text-primary font-bold bg-primary-10 px-2 py-0.5 rounded-full border border-primary-20"
+                    class="flex items-center gap-1.5 text-[10px] text-blue-400 font-bold bg-blue-500/10 px-2 py-0.5 rounded-full border border-blue-500/20"
                   >
                     <Clock class="w-3 h-3" />
-                    <span>{{ getLocaleText('estimatedDuration', '', formatDuration(estimatedTotalDuration.total)) }}</span>
+                    <span>预估总时长: {{ formatDuration(estimatedTotalDuration.total) }}</span>
                   </div>
                 </div>
                 <div class="flex items-center gap-2">
                   <button
                     v-if="selectedSongs.size > 0"
-                    class="text-[10px] font-bold text-info hover:text-info transition-colors flex items-center gap-1"
-                    :disabled="estimatingDuration"
-                    :title="locale.estimateSelectedTitle"
-                    @click="estimateSelectedDurations"
-                  >
-                    <Clock class="w-3 h-3" />
-                    <span v-if="estimatingDuration">{{ locale.estimatingDuration }}</span>
-                    <span v-else>{{ locale.estimateDuration }}</span>
-                  </button>
-                  <button
-                    v-if="selectedSongs.size > 0"
-                    class="text-[10px] font-bold text-text-tertiary hover:text-text-secondary transition-colors flex items-center gap-1"
-                    :title="locale.preloadSelectedTitle"
+                    class="text-[10px] font-bold text-zinc-500 hover:text-zinc-300 transition-colors flex items-center gap-1"
+                    title="预下载选中歌曲到浏览器缓存"
                     @click="preloadSelectedSongs"
                   >
                     <DownloadCloud class="w-3 h-3" />
-                    {{ locale.preloadSelected }}
+                    预下载选中
                   </button>
                   <button
-                    class="text-[10px] font-bold text-primary-80 hover:text-primary transition-colors"
+                    class="text-[10px] font-bold text-blue-500/80 hover:text-blue-400 transition-colors"
                     @click="toggleSelectAll"
                   >
-                    {{ isAllSelected ? locale.deselectAll : locale.selectAll }}
+                    {{ isAllSelected ? '取消全选' : '全选' }}
                   </button>
                 </div>
               </div>
 
               <div
-                class="bg-bg-primary-50 border border-border-secondary-50 rounded-2xl overflow-hidden max-h-[300px] overflow-y-auto custom-scrollbar"
+                class="bg-zinc-950/50 border border-zinc-800/50 rounded-2xl overflow-hidden max-h-[300px] overflow-y-auto custom-scrollbar"
               >
                 <div
                   v-for="song in songs"
                   :key="song.id"
-                  class="w-full flex items-center gap-3 p-3.5 hover:bg-bg-tertiary-30 transition-all text-left border-b border-border-secondary-30 last:border-0 group relative"
+                  class="w-full flex items-center gap-3 p-3.5 hover:bg-zinc-800/30 transition-all text-left border-b border-zinc-800/30 last:border-0 group relative"
                 >
                   <!-- 预下载进度条背景 -->
                   <div
                     v-if="
-                      (preloadedSongs.has(song.song.id) &&
-                        preloadedSongs.get(song.song.id).loading) ||
+                      (preloadedSongs.has(song.song.id) && preloadedSongs.get(song.song.id).loading) ||
                       activeDownloads.has(song.song.id)
                     "
-                    class="absolute bottom-0 left-0 h-0.5 bg-primary-50 transition-all duration-300 ease-out"
+                    class="absolute bottom-0 left-0 h-0.5 bg-blue-500/50 transition-all duration-300 ease-out"
                     :style="{
                       width: `${
-                        (typeof activeDownloads.get(song.song.id) === 'number'
-                          ? activeDownloads.get(song.song.id)
-                          : activeDownloads.get(song.song.id)?.progress) ||
-                        preloadedSongs.get(song.song.id)?.progress ||
-                        0
+                        (typeof activeDownloads.get(song.song.id) === 'number' 
+                          ? activeDownloads.get(song.song.id) 
+                          : activeDownloads.get(song.song.id)?.progress) || 
+                        (preloadedSongs.get(song.song.id)?.progress || 0)
                       }%`
                     }"
                   />
@@ -349,14 +309,14 @@
                     class="flex items-center justify-center shrink-0 w-4 h-4 rounded border transition-all"
                     :class="[
                       selectedSongs.has(song.song.id)
-                        ? 'bg-primary-hover border-primary shadow-sm'
-                        : 'bg-bg-secondary border-border-secondary group-hover:border-border-tertiary'
+                        ? 'bg-blue-600 border-blue-600 shadow-sm'
+                        : 'bg-zinc-900 border-zinc-800 group-hover:border-zinc-700'
                     ]"
                     @click="toggleSongSelection(song.song.id)"
                   >
                     <Check
                       v-if="selectedSongs.has(song.song.id)"
-                      class="w-2.5 h-2.5 text-text-primary font-bold"
+                      class="w-2.5 h-2.5 text-white font-bold"
                       stroke-width="3"
                     />
                   </button>
@@ -366,58 +326,42 @@
                     @click="toggleSongSelection(song.song.id)"
                   >
                     <div class="flex items-center gap-2">
-                      <p class="text-xs font-bold text-text-secondary truncate">{{ song.song.title }}</p>
-                      <!-- 预下载标记（精确时长） -->
+                      <p class="text-xs font-bold text-zinc-300 truncate">{{ song.song.title }}</p>
+                      <!-- 预下载标记 -->
                       <div
-                        v-if="getUsablePreload(song.song.id, selectedQuality)"
-                        class="flex items-center gap-1 px-1.5 py-0.5 rounded bg-success-10 border border-success-20"
+                        v-if="
+                          preloadedSongs.has(song.song.id) &&
+                          !preloadedSongs.get(song.song.id).loading
+                        "
+                        class="flex items-center gap-1 px-1.5 py-0.5 rounded bg-green-500/10 border border-green-500/20"
                       >
-                        <Check class="w-2 h-2 text-success" />
-                        <span class="text-[9px] font-mono text-success">{{
-                          formatDuration(getUsablePreload(song.song.id, selectedQuality).duration)
-                        }}</span>
-                      </div>
-                      <!-- 数据库时长标记 -->
-                      <div
-                        v-else-if="song.song.durationSeconds > 0"
-                        class="flex items-center gap-1 px-1.5 py-0.5 rounded bg-bg-tertiary border border-border-secondary"
-                      >
-                        <span class="text-[9px] font-mono text-text-secondary">{{
-                          formatDuration(song.song.durationSeconds)
-                        }}</span>
-                      </div>
-                      <!-- API 预估标记 -->
-                      <div
-                        v-else-if="estimatedDurations.has(song.song.id)"
-                        class="flex items-center gap-1 px-1.5 py-0.5 rounded bg-info-10 border border-info-20"
-                      >
-                        <Clock class="w-2 h-2 text-info" />
-                        <span class="text-[9px] font-mono text-info">{{
-                          formatDuration(estimatedDurations.get(song.song.id).durationSeconds)
+                        <Check class="w-2 h-2 text-green-400" />
+                        <span class="text-[9px] font-mono text-green-400">{{
+                          formatDuration(preloadedSongs.get(song.song.id).duration)
                         }}</span>
                       </div>
                     </div>
-                    <p class="text-[10px] text-text-tertiary truncate">{{ song.song.artist }}</p>
+                    <p class="text-[10px] text-zinc-500 truncate">{{ song.song.artist }}</p>
                   </div>
 
                   <div class="flex items-center gap-3">
-                    <div class="text-[9px] font-mono text-text-disabled uppercase">
-                      {{ getPlatformShortName(getSongPlatform(song.song)) }}
+                    <div class="text-[9px] font-mono text-zinc-600 uppercase">
+                      {{ getPlatformShortName(song.song.musicPlatform) }}
                     </div>
 
                     <!-- 单个预下载/删除按钮 -->
                     <button
-                      v-if="getUsablePreload(song.song.id, selectedQuality)"
-                      class="p-1.5 rounded-lg hover:bg-error-10 text-text-disabled hover:text-error transition-colors"
-                      :title="locale.deleteCache"
+                      v-if="preloadedSongs.has(song.song.id)"
+                      class="p-1.5 rounded-lg hover:bg-red-500/10 text-zinc-600 hover:text-red-400 transition-colors"
+                      title="删除缓存"
                       @click.stop="removePreloaded(song.song.id)"
                     >
                       <Trash2 class="w-3.5 h-3.5" />
                     </button>
                     <button
                       v-else
-                      class="p-1.5 rounded-lg hover:bg-primary-10 text-text-disabled hover:text-primary transition-colors"
-                      :title="locale.preloadSong"
+                      class="p-1.5 rounded-lg hover:bg-blue-500/10 text-zinc-600 hover:text-blue-400 transition-colors"
+                      title="预下载此歌曲"
                       @click.stop="preloadSong(song.song)"
                     >
                       <DownloadCloud class="w-3.5 h-3.5" />
@@ -425,8 +369,8 @@
                   </div>
                 </div>
 
-                <div v-if="songs.length === 0" class="p-8 text-center text-text-disabled text-[10px]">
-                  {{ locale.emptySongs }}
+                <div v-if="songs.length === 0" class="p-8 text-center text-zinc-600 text-[10px]">
+                  暂无歌曲
                 </div>
               </div>
             </section>
@@ -434,58 +378,56 @@
             <!-- 进度条 -->
             <section
               v-if="downloading || downloadedCount > 0"
-              class="space-y-3 pt-4 border-t border-border-secondary-50"
+              class="space-y-3 pt-4 border-t border-zinc-800/50"
             >
               <div
                 class="flex items-center justify-between text-[10px] font-bold uppercase tracking-wider"
               >
-                <span class="text-text-tertiary">{{
-                  currentTaskType === 'merge' ? locale.processProgress : locale.downloadProgress
-                }}</span>
-                <span class="text-primary">{{ downloadedCount }} / {{ totalCount }}</span>
+                <span class="text-zinc-400">{{ mergeSongs ? '处理进度' : '下载进度' }}</span>
+                <span class="text-blue-400">{{ downloadedCount }} / {{ totalCount }}</span>
               </div>
               <div
-                class="h-2 bg-bg-primary rounded-full overflow-hidden border border-border-secondary-50 relative"
+                class="h-2 bg-zinc-950 rounded-full overflow-hidden border border-zinc-800/50 relative"
               >
                 <div
-                  class="h-full bg-gradient-to-r from-primary to-primary-hover transition-all duration-300 ease-out relative overflow-hidden"
+                  class="h-full bg-gradient-to-r from-blue-600 to-indigo-500 transition-all duration-300 ease-out relative overflow-hidden"
                   :style="{
                     width: `${totalCount > 0 ? (downloadedCount / totalCount) * 100 : 0}%`
                   }"
                 >
                   <div
-                    class="absolute inset-0 bg-bg-secondary-20 animate-[shimmer_2s_infinite] -skew-x-12"
+                    class="absolute inset-0 bg-white/20 animate-[shimmer_2s_infinite] -skew-x-12"
                   />
                 </div>
               </div>
-              <div class="text-[10px] text-text-tertiary truncate">
+              <div class="text-[10px] text-zinc-500 truncate">
                 <template v-if="downloading">
-                  <span v-if="processingStatus" class="text-primary animate-pulse">{{
+                  <span v-if="processingStatus" class="text-blue-400 animate-pulse">{{
                     processingStatus
                   }}</span>
                   <span v-else>{{
-                    currentDownloadSong ? getLocaleText('downloadingSong', '', currentDownloadSong) : locale.preparing
+                    currentDownloadSong ? `正在下载: ${currentDownloadSong}` : '准备中...'
                   }}</span>
                 </template>
                 <template v-else>
-                  {{ downloadErrors.length > 0 ? locale.completeWithErrors : locale.complete }}
+                  {{ downloadErrors.length > 0 ? '下载完成，部分失败' : '下载完成' }}
                 </template>
               </div>
 
               <!-- 错误信息 -->
               <div
                 v-if="downloadErrors.length > 0"
-                class="bg-error-5 border border-error-10 rounded-xl p-3 space-y-2"
+                class="bg-red-500/5 border border-red-500/10 rounded-xl p-3 space-y-2"
               >
-                <div class="text-[10px] font-bold text-error flex items-center gap-2">
+                <div class="text-[10px] font-bold text-red-400 flex items-center gap-2">
                   <AlertTriangle class="w-3 h-3" />
-                  {{ getLocaleText('downloadFailedCount', '', downloadErrors.length) }}
+                  下载失败 ({{ downloadErrors.length }})
                 </div>
                 <div class="max-h-[60px] overflow-y-auto custom-scrollbar space-y-1">
                   <div
                     v-for="error in downloadErrors"
                     :key="error.id"
-                    class="text-[9px] text-error-70 truncate"
+                    class="text-[9px] text-red-500/70 truncate"
                   >
                     {{ error.title }} - {{ error.error }}
                   </div>
@@ -496,42 +438,45 @@
 
           <!-- 底部按钮 -->
           <div
-            class="p-4 border-t border-border-secondary bg-bg-secondary-50 flex items-center justify-between shrink-0"
+            class="p-4 border-t border-zinc-800 bg-zinc-900/50 flex items-center justify-between shrink-0"
           >
-            <div class="text-[11px] font-black text-text-tertiary uppercase tracking-widest">
-              {{ getLocaleText('selectedSongsCount', '', selectedSongs.size) }}
+            <div class="text-[11px] font-black text-zinc-500 uppercase tracking-widest">
+              已选择 <span class="text-blue-400">{{ selectedSongs.size }}</span> 首歌曲
             </div>
             <div class="flex items-center gap-2">
               <button
-                class="px-4 py-2 text-xs font-bold text-text-tertiary hover:text-text-secondary transition-colors uppercase tracking-wider"
+                class="px-4 py-2 text-xs font-bold text-zinc-500 hover:text-zinc-300 transition-colors uppercase tracking-wider"
                 :disabled="downloading"
                 @click="closeDialog"
               >
-                {{ locale.cancel }}
+                取消
               </button>
               <button
                 v-if="!downloading && downloadedCount > 0"
-                class="px-6 py-2.5 bg-bg-tertiary hover:bg-bg-quaternary text-text-primary text-xs font-bold rounded-xl border border-border-tertiary transition-all uppercase tracking-wider"
+                class="px-6 py-2.5 bg-zinc-800 hover:bg-zinc-700 text-zinc-200 text-xs font-bold rounded-xl border border-zinc-700 transition-all uppercase tracking-wider"
                 @click="closeDialog"
               >
-                {{ locale.close }}
+                关闭
               </button>
               <button
                 v-else
                 :disabled="selectedSongs.size === 0 || downloading"
-                class="px-6 py-2.5 bg-primary-hover hover:bg-primary disabled:opacity-50 disabled:cursor-not-allowed text-text-primary text-xs font-bold rounded-xl shadow-lg shadow-[var(--primary-glow)] transition-all uppercase tracking-wider flex items-center gap-2"
+                class="px-6 py-2.5 bg-blue-600 hover:bg-blue-500 disabled:opacity-50 disabled:cursor-not-allowed text-white text-xs font-bold rounded-xl shadow-lg shadow-blue-900/20 transition-all uppercase tracking-wider flex items-center gap-2"
                 @click="startDownload"
               >
                 <Download v-if="!downloading" class="w-3.5 h-3.5" />
-                <AppSpinner :size="14" />
+                <span
+                  v-else
+                  class="w-3.5 h-3.5 border-2 border-white/30 border-t-white rounded-full animate-spin"
+                />
                 {{
                   downloading
-                    ? currentTaskType === 'merge'
-                      ? locale.processing
-                      : locale.downloading
-                    : shouldMergeSongs
-                      ? locale.startProcessing
-                      : locale.startDownload
+                    ? mergeSongs
+                      ? '处理中...'
+                      : '下载中...'
+                    : mergeSongs
+                      ? '开始处理'
+                      : '开始下载'
                 }}
               </button>
             </div>
@@ -545,9 +490,7 @@
 <script setup>
 import { computed, ref, watch, reactive, onUnmounted } from 'vue'
 import { useAudioQuality } from '~/composables/useAudioQuality'
-import { getMusicUrlResult } from '~/utils/musicUrl'
-import { useLocale } from '~/utils/locale'
-import AppSpinner from '~/components/UI/Common/AppSpinner.vue'
+import { getMusicUrl } from '~/utils/musicUrl'
 import {
   X as CloseIcon,
   Check,
@@ -577,23 +520,8 @@ const props = defineProps({
 const emit = defineEmits(['close'])
 
 const { getQualityOptions, getQuality } = useAudioQuality()
-const { admin } = useLocale()
-const locale = computed(() => {
-  const base = admin.value?.songManagement?.songDownloadDialog || {}
-  const emptyText = () => ''
-  return useSafeLocale({
-    ...base,
-    estimatedDuration: base.estimatedDuration || emptyText,
-    downloadingSong: base.downloadingSong || emptyText,
-    downloadFailedCount: base.downloadFailedCount || emptyText,
-    selectedSongsCount: base.selectedSongsCount || emptyText
-  })
-})
-const { format: formatLocale } = useLocaleText(locale)
-const getLocaleText = (key, fallback = '', ...args) => formatLocale(locale.value?.[key], fallback, ...args)
 
 const mergeSongs = ref(false)
-const convertAudioFormat = ref(false)
 const normalizeAudio = ref(false)
 const targetDb = ref(-1.0)
 const processingStatus = ref('')
@@ -603,13 +531,13 @@ const showDbPresetSaved = ref(false)
 const exportFormat = ref('mp3')
 // const saveIntermediateWav = ref(false) // 已移除
 
-const neteaseQualityLevelMap = {
-  2: 'standard',
-  3: 'higher',
-  4: 'exhigh',
-  5: 'lossless',
-  6: 'hires',
-  9: 'jymaster'
+const qualityDescriptions = {
+  2: '节省流量',
+  3: '高品质体验',
+  4: '极高音质',
+  5: '无损音质',
+  6: 'Hi-Res无损',
+  9: '超清母带'
 }
 
 // 生成带描述的音质选项
@@ -617,7 +545,7 @@ const extendedQualityOptions = computed(() => {
   const options = getQualityOptions('netease')
   return options.map((opt) => ({
     ...opt,
-    description: locale.value.qualityDescriptions?.[opt.value] || locale.value.qualityDescriptions?.default || '标准音质'
+    description: qualityDescriptions[opt.value] || '标准音质'
   }))
 })
 
@@ -629,14 +557,6 @@ const isAllSelected = computed(() => {
   return props.songs.length > 0 && selectedSongs.value.size === props.songs.length
 })
 
-const shouldMergeSongs = computed(() => {
-  return mergeSongs.value && selectedSongs.value.size > 1
-})
-
-const shouldUseExportFormat = computed(() => {
-  return shouldMergeSongs.value || convertAudioFormat.value || normalizeAudio.value
-})
-
 const downloading = ref(false)
 const downloadedCount = ref(0)
 const totalCount = ref(0)
@@ -649,20 +569,6 @@ const activeDownloads = reactive(new Map())
 const activeEncoderWorker = ref(null)
 const DOWNLOAD_CONCURRENCY = 3
 const MERGE_DECODE_CONCURRENCY = 3
-const ESTIMATE_DURATION_CONCURRENCY = 3
-const DOWNLOAD_URL_RETRY_LIMIT = 3
-const AUDIO_METADATA_TIMEOUT_MS = 10000
-const NETEASE_PREVIEW_DURATION_SECONDS = 30
-const PCM_BYTES_PER_SECOND = 44100 * 2 * 4
-const FAST_MERGE_MIN_BUDGET_BYTES = 96 * 1024 * 1024
-const FAST_MERGE_MEMORY_RATIO = 0.04
-
-// 当前正在执行的任务类型 ('merge' | 'download' | '')
-const currentTaskType = ref('')
-
-// 预估时长状态
-const estimatingDuration = ref(false)
-const estimatedDurations = reactive(new Map())
 
 const getPlatformShortName = (platform) => {
   switch (platform) {
@@ -679,185 +585,6 @@ const getPlatformShortName = (platform) => {
   }
 }
 
-const getSongPlatform = (song) => {
-  return (
-    song?.actualMusicPlatform ||
-    song?.musicPlatform ||
-    song?.sourceInfo?.actualMusicPlatform ||
-    song?.sourceInfo?.musicPlatform ||
-    ''
-  )
-}
-
-const isNeteaseSong = (song) => {
-  const platform = getSongPlatform(song)
-  return platform === 'netease' || platform === 'netease-podcast'
-}
-
-const getNeteaseCookie = () => {
-  if (!import.meta.client) return ''
-
-  try {
-    return localStorage.getItem('netease_cookie') || ''
-  } catch {
-    return ''
-  }
-}
-
-const getDownloadResolveOptions = (song, quality, excludeSources = [], ignoreProvidedUrl = false) => {
-  const platform = getSongPlatform(song)
-  const isPodcast =
-    platform === 'netease-podcast' ||
-    song?.sourceInfo?.type === 'voice' ||
-    (song?.sourceInfo?.source === 'netease-backup' && song?.sourceInfo?.type === 'voice')
-
-  return {
-    unblock: isPodcast ? false : undefined,
-    quality,
-    mediaId:
-      song?.sourceInfo?.strMediaMid ||
-      song?.sourceInfo?.mediaId ||
-      song?.sourceInfo?.mediaMid,
-    excludeSources,
-    ignoreProvidedUrl,
-    musicInfo: {
-      name: song?.title,
-      artist: song?.artist,
-      album: song?.album || undefined
-    }
-  }
-}
-
-// VIP 标记由点歌表单校验写入；后台页未挂载点歌表单，有 Cookie 但缺标记时补一次校验
-let qqVipCheckPromise = null
-const ensureQqVipFlag = async () => {
-  if (!import.meta.client) return
-  const cookie = localStorage.getItem('qq_music_cookie')
-  if (!cookie || localStorage.getItem('qq_music_vip') !== null) return
-
-  if (!qqVipCheckPromise) {
-    qqVipCheckPromise = (async () => {
-      try {
-        const res = await $fetch('/api/native-api/qq/check-cookie', {
-          method: 'POST',
-          body: { cookie }
-        })
-        const data = res?.data || {}
-        if (data.valid && typeof data.isVip === 'boolean') {
-          localStorage.setItem('qq_music_vip', data.isVip ? '1' : '0')
-        }
-      } catch (e) {
-        console.warn('[SongDownloadDialog] QQ VIP 状态校验失败:', e)
-      } finally {
-        qqVipCheckPromise = null
-      }
-    })()
-  }
-  await qqVipCheckPromise
-}
-
-const isRetryableDownloadError = (error) => {
-  const message = String(error?.message || error || '')
-  return /404|not found|failed to fetch|networkerror|http( error|\s+\d+)|疑似试听时长|无法从播放链接获取时长|无法获取音乐播放链接/i.test(
-    message
-  )
-}
-
-const requestMusicUrlCandidate = async (song, quality, excludeSources, ignoreProvidedUrl) => {
-  const platform = getSongPlatform(song)
-  if (platform === 'tencent') {
-    await ensureQqVipFlag()
-  }
-  const result = await getMusicUrlResult(
-    platform,
-    song?.musicId,
-    song?.playUrl,
-    getDownloadResolveOptions(song, quality, excludeSources, ignoreProvidedUrl)
-  )
-
-  if (!result?.url) {
-    throw new Error(locale.value.musicUrlMissing)
-  }
-
-  return result
-}
-
-// 音源解析串行化：批量下载时逐首解析链接，避免并发集中请求触发音源风控；音频拉流不受影响
-let urlResolveQueue = Promise.resolve()
-const resolveDownloadAudioCandidate = (
-  song,
-  quality,
-  excludeSources = [],
-  ignoreProvidedUrl = false
-) => {
-  const task = urlResolveQueue.then(() =>
-    requestMusicUrlCandidate(song, quality, excludeSources, ignoreProvidedUrl)
-  )
-  // 链尾吞掉结果与错误，保证后续排队任务不被单个解析失败阻断
-  urlResolveQueue = task.then(
-    () => undefined,
-    () => undefined
-  )
-  return task
-}
-
-const withDownloadSourceFallback = async (song, quality, executor) => {
-  let excludeSources = []
-  const hasPlayUrl = !!(song?.playUrl && song.playUrl.trim())
-  let ignoreProvidedUrl = !hasPlayUrl
-  let lastError = null
-
-  for (let attempt = 0; attempt < DOWNLOAD_URL_RETRY_LIMIT; attempt++) {
-    let candidate
-
-    try {
-      candidate = await resolveDownloadAudioCandidate(
-        song,
-        quality,
-        excludeSources,
-        ignoreProvidedUrl
-      )
-    } catch (resolveError) {
-      lastError = resolveError
-
-      if (!isRetryableDownloadError(resolveError)) {
-        throw resolveError
-      }
-
-      ignoreProvidedUrl = true
-      continue
-    }
-
-    try {
-      return await executor(candidate)
-    } catch (error) {
-      lastError = error
-
-      if (!isRetryableDownloadError(error)) {
-        throw error
-      }
-
-      if (candidate.source === 'play-url') {
-        ignoreProvidedUrl = true
-        continue
-      }
-
-      if (candidate.source && !excludeSources.includes(candidate.source)) {
-        excludeSources = [...excludeSources, candidate.source]
-        continue
-      }
-
-      if (ignoreProvidedUrl) {
-        throw error
-      }
-
-      ignoreProvidedUrl = true
-    }
-  }
-
-  throw lastError || new Error(locale.value.musicUrlMissing)
-}
-
 // 格式化时长
 const formatDuration = (seconds) => {
   if (!seconds) return '00:00'
@@ -866,113 +593,66 @@ const formatDuration = (seconds) => {
   return `${m.toString().padStart(2, '0')}:${s.toString().padStart(2, '0')}`
 }
 
-const readAudioMetadataDuration = (src, options = {}) => {
-  if (!src) return Promise.resolve(0)
-
-  const timeoutMs = options.timeoutMs || AUDIO_METADATA_TIMEOUT_MS
-  const revokeObjectUrl = options.revokeObjectUrl || false
-
-  return new Promise((resolve) => {
-    const audio = new Audio()
-    let settled = false
-    let timeoutId = null
-
-    const cleanup = () => {
-      audio.onloadedmetadata = null
-      audio.onerror = null
-      audio.src = ''
-      audio.load()
-      if (revokeObjectUrl) {
-        URL.revokeObjectURL(src)
-      }
-    }
-
-    const finish = (duration = 0) => {
-      if (settled) return
-      settled = true
-      if (timeoutId) {
-        clearTimeout(timeoutId)
-      }
-      cleanup()
-      resolve(duration)
-    }
-
-    timeoutId = setTimeout(() => finish(0), timeoutMs)
-    audio.preload = 'metadata'
-    audio.onloadedmetadata = () => finish(audio.duration)
-    audio.onerror = () => finish(0)
-    audio.src = src
-  })
-}
-
-const getUsablePreload = (songId, quality) => {
-  const cached = preloadedSongs.get(songId)
-  if (!cached || cached.loading || !cached.blob) return null
-  if (cached.quality !== undefined && cached.quality !== quality) return null
-  return cached
-}
-
 // 预下载单首歌曲
 const preloadSong = async (song) => {
-  if (getUsablePreload(song.id, selectedQuality.value)) return
+  if (preloadedSongs.has(song.id) && !preloadedSongs.get(song.id).loading) return
 
   preloadedSongs.set(song.id, { loading: true, progress: 0 })
 
   try {
-    const result = await withDownloadSourceFallback(song, selectedQuality.value, async (candidate) => {
-      const response = await fetch(candidate.url)
-      if (!response.ok) throw new Error(`HTTP error! status: ${response.status}`)
+    const url = await getMusicUrlForDownload(song, selectedQuality.value)
 
-      const contentLength = response.headers.get('content-length')
-      const total = contentLength ? parseInt(contentLength, 10) : 0
-      let loaded = 0
+    // 使用 fetch 获取并追踪下载进度
+    const response = await fetch(url)
+    if (!response.ok) throw new Error(`HTTP error! status: ${response.status}`)
 
-      const reader = response.body.getReader()
-      const chunks = []
+    const contentLength = response.headers.get('content-length')
+    const total = contentLength ? parseInt(contentLength, 10) : 0
+    let loaded = 0
 
-      while (true) {
-        const { done, value } = await reader.read()
-        if (done) break
+    const reader = response.body.getReader()
+    const chunks = []
 
-        chunks.push(value)
-        loaded += value.length
+    while (true) {
+      const { done, value } = await reader.read()
+      if (done) break
 
-        if (total) {
-          const progress = (loaded / total) * 100
-          const current = preloadedSongs.get(song.id)
-          if (current) {
-            current.progress = progress
-          }
+      chunks.push(value)
+      loaded += value.length
+
+      if (total) {
+        const progress = (loaded / total) * 100
+        const current = preloadedSongs.get(song.id)
+        if (current) {
+          current.progress = progress
         }
       }
+    }
 
-      const contentType = response.headers.get('content-type') || 'audio/mpeg'
-      const blob = new Blob(chunks, { type: contentType })
-      const objectUrl = URL.createObjectURL(blob)
-      const duration = await readAudioMetadataDuration(objectUrl, { revokeObjectUrl: true })
+    const contentType = response.headers.get('content-type') || 'audio/mpeg'
+    const blob = new Blob(chunks, { type: contentType })
 
-      return {
-        blob,
-        duration,
-        url: candidate.url,
-        contentType
+    // 解析音频时长
+    const duration = await new Promise((resolve) => {
+      const audio = new Audio(URL.createObjectURL(blob))
+      audio.onloadedmetadata = () => {
+        resolve(audio.duration)
+        URL.revokeObjectURL(audio.src)
       }
+      audio.onerror = () => resolve(0)
     })
 
     preloadedSongs.set(song.id, {
-      blob: result.blob,
-      duration: result.duration,
+      blob,
+      duration,
       loading: false,
-      progress: 100,
-      quality: selectedQuality.value,
-      url: result.url,
-      contentType: result.contentType
+      progress: 100
     })
   } catch (error) {
     console.error('预下载失败:', error)
     preloadedSongs.delete(song.id)
     if (window.$showNotification) {
-      window.$showNotification(getLocaleText('preloadFailed', '', song.title), 'error')
+      window.$showNotification(`预下载失败: ${song.title}`, 'error')
     }
   }
 }
@@ -982,13 +662,7 @@ const preloadSelectedSongs = async () => {
   if (selectedSongs.value.size === 0) return
 
   const songsToLoad = props.songs.filter(
-    (s) => {
-      const songId = s.song?.id
-      if (!songId || !selectedSongs.value.has(songId)) return false
-      const cached = preloadedSongs.get(songId)
-      if (cached && cached.loading) return false
-      return !getUsablePreload(songId, selectedQuality.value)
-    }
+    (s) => selectedSongs.value.has(s.song.id) && !preloadedSongs.has(s.song.id)
   )
 
   // 并发限制: 3
@@ -1014,262 +688,20 @@ const removePreloaded = (songId) => {
   preloadedSongs.delete(songId)
 }
 
-// 预估选中歌曲的时长
-const estimateSelectedDurations = async () => {
-  if (selectedSongs.value.size === 0 || estimatingDuration.value) return
-
-  estimatingDuration.value = true
-
-  try {
-    const level = neteaseQualityLevelMap[selectedQuality.value] || 'exhigh'
-    const neteaseCookie = getNeteaseCookie()
-    
-    const songsToEstimate = []
-    
-    // 筛选需要预估的歌曲
-    props.songs.forEach((songItem) => {
-      const songId = songItem.song?.id
-      if (!songId || !selectedSongs.value.has(songId)) return
-      
-      // 已有数据库时长、缓存、API 预估时，无需再次请求网络。
-      if (getKnownSongDuration(songItem) > 0) return
-      
-      songsToEstimate.push(songItem)
-    })
-
-    console.log(`[预估时长] 需要预估的歌曲数量: ${songsToEstimate.length}`)
-
-    if (songsToEstimate.length === 0) {
-      if (window.$showNotification) {
-        window.$showNotification(locale.value.allSelectedHaveDuration, 'info')
-      }
-      estimatingDuration.value = false
-      return
-    }
-
-    let successCount = 0
-    let failCount = 0
-    
-    const estimateSongDuration = async (songItem) => {
-      try {
-        console.log('[预估时长] 正在获取歌曲时长:', songItem.song.title)
-        
-        if (isNeteaseSong(songItem.song)) {
-          try {
-            const apiResponse = await $fetch('/api/api-enhanced/netease/song/url/v1', {
-              params: {
-                id: songItem.song.musicId,
-                level: level,
-                cookie: neteaseCookie || undefined,
-                unblock: neteaseCookie ? false : true
-              },
-              timeout: 5000
-            })
-            
-            if (apiResponse?.code === 200 && Array.isArray(apiResponse.data) && apiResponse.data.length > 0) {
-              const songData = apiResponse.data[0]
-              const durationMs = songData.time
-              
-              if (durationMs && durationMs > 0) {
-                const durationSeconds = Math.floor(durationMs / 1000)
-                if (durationSeconds !== NETEASE_PREVIEW_DURATION_SECONDS) {
-                  estimatedDurations.set(songItem.song.id, {
-                    durationSeconds,
-                    durationMs: durationMs,
-                    source: 'netease-api'
-                  })
-                  console.log('[预估时长] 成功获取时长:', songItem.song.title, durationSeconds + '秒')
-                  successCount++
-                  return
-                }
-                console.warn('[预估时长] 网易API返回疑似试听时长，尝试第三方音源:', songItem.song.title)
-              }
-            }
-          } catch (apiError) {
-            console.warn('[预估时长] 网易API调用失败，尝试从播放链接获取:', songItem.song.title, apiError)
-          }
-        }
-        
-        // 非网易音源、网易 API 失败或返回试听片段时，复用预下载的音源解析逻辑读取元数据。
-        try {
-          const durationResult = await withDownloadSourceFallback(
-            songItem.song,
-            selectedQuality.value,
-            async (candidate) => {
-              const duration = await readAudioMetadataDuration(candidate.url)
-
-              if (!duration || duration <= 0) {
-                throw new Error(locale.value.durationFromPlaybackUrlFailed)
-              }
-
-              const durationSeconds = Math.floor(duration)
-              if (
-                isNeteaseSong(songItem.song) &&
-                durationSeconds === NETEASE_PREVIEW_DURATION_SECONDS
-              ) {
-                throw new Error(locale.value.previewDurationDetected)
-              }
-
-              return {
-                durationSeconds,
-                durationMs: Math.floor(duration * 1000),
-                source: 'audio-metadata'
-              }
-            }
-          )
-
-          estimatedDurations.set(songItem.song.id, durationResult)
-          console.log(
-            '[预估时长] 从播放链接获取时长:',
-            songItem.song.title,
-            durationResult.durationSeconds + '秒'
-          )
-          successCount++
-        } catch (audioError) {
-          console.error('[预估时长] 播放链接获取时长失败:', songItem.song.title, audioError)
-          failCount++
-        }
-      } catch (error) {
-        console.error('[预估时长] 处理歌曲失败:', songItem.song.title, error)
-        failCount++
-      }
-    }
-
-    const queue = [...songsToEstimate]
-    const workers = []
-    const worker = async () => {
-      while (queue.length > 0) {
-        const songItem = queue.shift()
-        if (songItem) {
-          await estimateSongDuration(songItem)
-        }
-      }
-    }
-
-    for (let i = 0; i < Math.min(ESTIMATE_DURATION_CONCURRENCY, songsToEstimate.length); i++) {
-      workers.push(worker())
-    }
-
-    await Promise.all(workers)
-
-    console.log(`[预估时长] 完成 - 成功: ${successCount}, 失败: ${failCount}`)
-
-    if (successCount > 0 && window.$showNotification) {
-      window.$showNotification(getLocaleText('estimateSuccess', '', successCount), 'success')
-    }
-    
-    if (failCount > 0 && window.$showNotification) {
-      window.$showNotification(getLocaleText('estimateFailedCount', '', failCount), 'warning')
-    }
-  } catch (error) {
-    console.error('[预估时长] 总体失败:', error)
-    if (window.$showNotification) {
-      window.$showNotification(locale.value.estimateFailed, 'error')
-    }
-  } finally {
-    estimatingDuration.value = false
-  }
-}
-
 // 计算预估总时长
 const estimatedTotalDuration = computed(() => {
   let total = 0
   let count = 0
-  const songMap = new Map(props.songs.map((item) => [item.song?.id, item]))
   selectedSongs.value.forEach((id) => {
-    const songItem = songMap.get(id)
-    if (!songItem) return
-
-    const duration = getKnownSongDuration(songItem)
-    if (duration > 0) {
-      total += duration
+    const data = preloadedSongs.get(id)
+    if (data && data.duration) {
+      total += data.duration
       count++
     }
   })
   return { total, count }
 })
 
-const getKnownSongDuration = (songItem) => {
-  const song = songItem.song
-  // 优先使用数据库记录的时长
-  if (typeof song.durationSeconds === 'number' && song.durationSeconds > 0) {
-    return song.durationSeconds
-  }
-
-  // 其次使用预下载的精确时长
-  const cached = getUsablePreload(song.id, selectedQuality.value)
-  if (cached?.duration) return cached.duration
-
-  // 最后使用 API 预估时长
-  const estimated = estimatedDurations.get(song.id)
-  if (estimated?.durationSeconds) return estimated.durationSeconds
-
-  return 0
-}
-
-const getBrowserMergeMemoryBudget = () => {
-  const deviceMemoryGb = Number(navigator.deviceMemory)
-  if (Number.isFinite(deviceMemoryGb) && deviceMemoryGb > 0) {
-    return Math.max(
-      FAST_MERGE_MIN_BUDGET_BYTES,
-      deviceMemoryGb * 1024 * 1024 * 1024 * FAST_MERGE_MEMORY_RATIO
-    )
-  }
-
-  const heapLimit = performance?.memory?.jsHeapSizeLimit
-  if (Number.isFinite(heapLimit) && heapLimit > 0) {
-    return Math.max(FAST_MERGE_MIN_BUDGET_BYTES, heapLimit * 0.12)
-  }
-
-  return null
-}
-
-const shouldUseFastMergeMode = (selectedSongsList) => {
-  const deviceMemoryGb = Number(navigator.deviceMemory)
-  let knownDurationCount = 0
-  let totalDuration = 0
-
-  for (const songItem of selectedSongsList) {
-    const duration = getKnownSongDuration(songItem)
-    if (duration > 0) {
-      knownDurationCount++
-      totalDuration += duration
-    }
-  }
-
-  const estimatedPcmBytes = totalDuration * PCM_BYTES_PER_SECOND
-  const memoryBudget = getBrowserMergeMemoryBudget()
-
-  if (memoryBudget && estimatedPcmBytes > memoryBudget) {
-    return false
-  }
-
-  if (knownDurationCount === selectedSongsList.length && memoryBudget) {
-    return estimatedPcmBytes <= memoryBudget
-  }
-
-  if (Number.isFinite(deviceMemoryGb)) {
-    if (deviceMemoryGb <= 4) return selectedSongsList.length <= 2 && estimatedPcmBytes <= 64 * 1024 * 1024
-    if (deviceMemoryGb >= 8) return selectedSongsList.length <= 10
-  }
-
-  return selectedSongsList.length <= 3 && estimatedPcmBytes <= FAST_MERGE_MIN_BUDGET_BYTES
-}
-
-const isLikelyMemoryError = (error) => {
-  const message = String(error?.message || error || '')
-  return /memory|allocation|array buffer|out of memory|内存/i.test(message)
-}
-
-const pushMergeError = (error) => {
-  downloadErrors.value.push({
-    id: 'merge_error',
-    title: locale.value.mergeTitle,
-    artist: '',
-    error: error?.message || String(error || locale.value.mergeFailed)
-  })
-}
-
 const toggleSelectAll = () => {
   if (isAllSelected.value) {
     selectedSongs.value = new Set()
@@ -1291,6 +723,38 @@ const closeDialog = () => {
   emit('close')
 }
 
+// 获取下载链接
+const getMusicUrlForDownload = async (song, quality, retryCount = 0) => {
+  try {
+    // 播客内容特殊处理
+    const isPodcast =
+      song.musicPlatform === 'netease-podcast' ||
+      song.sourceInfo?.type === 'voice' ||
+      (song.sourceInfo?.source === 'netease-backup' && song.sourceInfo?.type === 'voice')
+    const options = {
+      unblock: isPodcast ? false : undefined,
+      quality: quality
+    }
+
+    const url = await getMusicUrl(song.musicPlatform, song.musicId, song.playUrl, options)
+    if (!url) {
+      throw new Error('无法获取音乐播放链接')
+    }
+    return url
+  } catch (error) {
+    console.error('获取音乐播放链接失败:', error)
+
+    // 失败自动重试一次
+    if (retryCount === 0 && song.musicPlatform && song.musicId) {
+      console.log(`正在重试获取音乐链接: ${song.musicPlatform}, ${song.musicId}`)
+      await new Promise((resolve) => setTimeout(resolve, 1000))
+      return getMusicUrlForDownload(song, quality, 1)
+    }
+
+    throw new Error('获取音乐播放链接失败: ' + error.message)
+  }
+}
+
 // 通用的音频下载函数
 const fetchAudioWithProgress = async (audioUrl, songId, songTitle) => {
   const response = await fetch(audioUrl)
@@ -1310,7 +774,7 @@ const fetchAudioWithProgress = async (audioUrl, songId, songTitle) => {
 
     if (total) {
       const percent = Math.round((loaded / total) * 100)
-      processingStatus.value = getLocaleText('downloadingProgress', '', songTitle, percent)
+      processingStatus.value = `正在下载: ${songTitle} (${percent}%)`
       activeDownloads.set(songId, percent)
     }
   }
@@ -1319,28 +783,8 @@ const fetchAudioWithProgress = async (audioUrl, songId, songTitle) => {
   return new Blob(chunks, { type: contentType })
 }
 
-const getAudioBlobForSong = async (song, quality) => {
-  const cached = getUsablePreload(song.id, quality)
-  if (cached) {
-    processingStatus.value = getLocaleText('usingPreloadCache', '', song.title)
-    activeDownloads.set(song.id, 100)
-    return {
-      blob: cached.blob,
-      sourceUrl: cached.url || '',
-      fromCache: true
-    }
-  }
+// 获取 Blob 数据
 
-  return await withDownloadSourceFallback(song, quality, async (candidate) => {
-    processingStatus.value = getLocaleText('downloadingTitle', '', song.title)
-    const blob = await fetchAudioWithProgress(candidate.url, song.id, song.title)
-    return {
-      blob,
-      sourceUrl: candidate.url,
-      fromCache: false
-    }
-  })
-}
 
 // 触发浏览器下载
 const saveFile = (blob, filename) => {
@@ -1361,19 +805,10 @@ const terminateActiveEncoderWorker = () => {
   }
 }
 
-const createDownloadAudioContext = () => {
-  const AudioContextClass = window.AudioContext || window.webkitAudioContext
-  try {
-    return new AudioContextClass({ sampleRate: 44100 })
-  } catch {
-    return new AudioContextClass()
-  }
-}
-
-const buildMergedFilename = (selectedSongsList, ext, customFilenameValue) => {
+const buildMergedFilename = (selectedSongsList, ext) => {
   let filename
-  if (customFilenameValue && customFilenameValue.trim()) {
-    filename = customFilenameValue.trim()
+  if (customFilename.value && customFilename.value.trim()) {
+    filename = customFilename.value.trim()
     const dateStr = new Date().toLocaleDateString('sv-SE')
     const allSongsStr = selectedSongsList.map((item) => item.song.title).join(' ')
     filename = filename.replace(/{date}/g, dateStr)
@@ -1390,30 +825,24 @@ const buildMergedFilename = (selectedSongsList, ext, customFilenameValue) => {
     }
   } else {
     const dateStr = new Date().toLocaleDateString('sv-SE')
-    filename = getLocaleText('mergedFilename', `排期合并_${dateStr}_${selectedSongsList.length}首.${ext}`, dateStr, selectedSongsList.length, ext)
+    filename = `排期合并_${dateStr}_${selectedSongsList.length}首.${ext}`
   }
   return filename
 }
 
-const formatWorkerProgress = (stage, value, format) => {
+const formatWorkerProgress = (stage, value) => {
   if (stage === 'prepare') {
-    processingStatus.value = getLocaleText('preprocessingAudio', '', value)
+    processingStatus.value = `正在预处理音频: ${value}%`
     return
   }
   if (stage === 'merge') {
-    processingStatus.value = getLocaleText('mergingAudio', '', value)
+    processingStatus.value = `正在合并音频: ${value}%`
     return
   }
-  processingStatus.value = getLocaleText('encodingAudio', '', format.toUpperCase(), value)
+  processingStatus.value = `正在编码 ${exportFormat.value.toUpperCase()}: ${value}%`
 }
 
-const getTrackTransferables = (track) => {
-  return track.left.buffer === track.right.buffer
-    ? [track.left.buffer]
-    : [track.left.buffer, track.right.buffer]
-}
-
-const encodeWithWorker = async (tracks, format, config) => {
+const encodeWithWorker = async (tracks, format) => {
   terminateActiveEncoderWorker()
   const worker = new Worker(new URL('../../workers/audioEncoderWorker.js', import.meta.url), {
     type: 'module'
@@ -1423,12 +852,12 @@ const encodeWithWorker = async (tracks, format, config) => {
     worker.onmessage = (event) => {
       const { type, stage, value, blob, message } = event.data || {}
       if (type === 'progress') {
-        formatWorkerProgress(stage, value, format)
+        formatWorkerProgress(stage, value)
         return
       }
       if (type === 'error') {
         terminateActiveEncoderWorker()
-        reject(new Error(message || locale.value.encodingFailed))
+        reject(new Error(message || '编码失败'))
         return
       }
       if (type === 'done') {
@@ -1438,11 +867,11 @@ const encodeWithWorker = async (tracks, format, config) => {
     }
     worker.onerror = (event) => {
       terminateActiveEncoderWorker()
-      reject(new Error(event.message || locale.value.encoderWorkerFailed))
+      reject(new Error(event.message || '编码 Worker 运行失败'))
     }
     const transferables = []
     const payloadTracks = tracks.map((track) => {
-      transferables.push(...getTrackTransferables(track))
+      transferables.push(track.left.buffer, track.right.buffer)
       return {
         id: track.id,
         title: track.title,
@@ -1456,147 +885,33 @@ const encodeWithWorker = async (tracks, format, config) => {
         cmd: 'encode',
         tracks: payloadTracks,
         format,
-        normalize: config.normalizeAudio,
-        targetDb: config.targetDb
+        normalize: normalizeAudio.value,
+        targetDb: targetDb.value
       },
       transferables
     )
   })
 }
 
-const createStreamingEncoderSession = async (format, config, sampleRate) => {
-  terminateActiveEncoderWorker()
-  const worker = new Worker(new URL('../../workers/audioEncoderWorker.js', import.meta.url), {
-    type: 'module'
-  })
-  activeEncoderWorker.value = worker
-  let requestId = 0
-  const pendingRequests = new Map()
-  let isAborted = false
-
-  const terminateSessionWorker = () => {
-    worker.terminate()
-    if (activeEncoderWorker.value === worker) {
-      activeEncoderWorker.value = null
-    }
+const decodeSongTrack = async (song, audioContext) => {
+  let arrayBuffer
+  if (preloadedSongs.has(song.id) && !preloadedSongs.get(song.id).loading) {
+    const cached = preloadedSongs.get(song.id)
+    arrayBuffer = await cached.blob.arrayBuffer()
+    activeDownloads.set(song.id, 100)
+  } else {
+    const audioUrl = await getMusicUrlForDownload(song, selectedQuality.value)
+    const blob = await fetchAudioWithProgress(audioUrl, song.id, song.title)
+    arrayBuffer = await blob.arrayBuffer()
+    activeDownloads.set(song.id, 100)
   }
-
-  const rejectPendingRequests = (error) => {
-    pendingRequests.forEach(({ reject }) => reject(error))
-    pendingRequests.clear()
-  }
-
-  const abortSession = (error) => {
-    if (isAborted) return
-    isAborted = true
-    rejectPendingRequests(error)
-    terminateSessionWorker()
-  }
-
-  worker.onmessage = (event) => {
-    const { type, stage, value, blob, message, requestId: responseRequestId } = event.data || {}
-    if (type === 'progress') {
-      formatWorkerProgress(stage, value, format)
-      return
-    }
-
-    if (type === 'error') {
-      const error = new Error(message || locale.value.encodingFailed)
-      const pending = pendingRequests.get(responseRequestId)
-      if (pending) {
-        pendingRequests.delete(responseRequestId)
-        pending.reject(error)
-      }
-      abortSession(error)
-      return
-    }
-
-    const pending = pendingRequests.get(responseRequestId)
-    if (!pending) return
-
-    if (pending.expectedTypes.includes(type)) {
-      pendingRequests.delete(responseRequestId)
-      pending.resolve({ type, blob })
-    }
-  }
-
-  worker.onerror = (event) => {
-    const error = new Error(event.message || locale.value.encoderWorkerFailed)
-    abortSession(error)
-  }
-
-  const sendCommand = (payload, transferables = [], expectedTypes = []) => {
-    if (isAborted) {
-      return Promise.reject(new Error(locale.value.encoderWorkerTerminated))
-    }
-
-    const nextRequestId = ++requestId
-    return new Promise((resolve, reject) => {
-      pendingRequests.set(nextRequestId, { resolve, reject, expectedTypes })
-      try {
-        worker.postMessage({ ...payload, requestId: nextRequestId }, transferables)
-      } catch (error) {
-        pendingRequests.delete(nextRequestId)
-        isAborted = true
-        reject(error)
-        rejectPendingRequests(error)
-        terminateSessionWorker()
-      }
-    })
-  }
-
-  await sendCommand(
-    {
-      cmd: 'startStream',
-      format,
-      normalize: config.normalizeAudio,
-      targetDb: config.targetDb,
-      sampleRate
-    },
-    [],
-    ['ready']
-  )
-
-  return {
-    appendTrack: async (track) => {
-      await sendCommand(
-        {
-          cmd: 'appendTrack',
-          track: {
-            id: track.id,
-            title: track.title,
-            sampleRate: track.sampleRate,
-            left: track.left.buffer,
-            right: track.right.buffer
-          }
-        },
-        getTrackTransferables(track),
-        ['trackDone']
-      )
-    },
-    finish: async () => {
-      const result = await sendCommand({ cmd: 'finishStream' }, [], ['done'])
-      terminateSessionWorker()
-      return result.blob
-    },
-    cancel: () => {
-      if (isAborted) return
-      isAborted = true
-      rejectPendingRequests(new Error(locale.value.encodingCanceled))
-      terminateSessionWorker()
-    }
-  }
-}
-
-const decodeAudioBlobToTrack = async (song, blob, audioContext) => {
-  const arrayBuffer = await blob.arrayBuffer()
-  processingStatus.value = getLocaleText('decoding', '', song.title)
+  processingStatus.value = `正在解码: ${song.title}`
   const decoded = await audioContext.decodeAudioData(arrayBuffer)
   const left = new Float32Array(decoded.getChannelData(0))
   const right =
     decoded.numberOfChannels > 1
       ? new Float32Array(decoded.getChannelData(1))
-      : left
+      : new Float32Array(decoded.getChannelData(0))
   return {
     id: song.id,
     title: song.title,
@@ -1606,43 +921,14 @@ const decodeAudioBlobToTrack = async (song, blob, audioContext) => {
   }
 }
 
-const decodeSongTrack = async (song, audioContext, quality, options = {}) => {
-  const { blob, fromCache } = await getAudioBlobForSong(song, quality)
-  const track = await decodeAudioBlobToTrack(song, blob, audioContext)
-  if (fromCache && options.releasePreload) {
-    preloadedSongs.delete(song.id)
+const processAndMergeAudio = async (selectedSongsList) => {
+  const AudioContextClass = window.AudioContext || window.webkitAudioContext
+  let audioContext
+  try {
+    audioContext = new AudioContextClass({ sampleRate: 44100 })
+  } catch (e) {
+    audioContext = new AudioContextClass()
   }
-  activeDownloads.set(song.id, 100)
-  return track
-}
-
-const inferAudioExtension = (blob, sourceUrl) => {
-  const contentType = blob.type || ''
-  const url = sourceUrl || ''
-  if (contentType.includes('m4a') || url.includes('.m4a')) return 'm4a'
-  if (contentType.includes('mp4') || url.includes('.m4s')) return 'm4a'
-  if (contentType.includes('flac') || url.includes('.flac')) return 'flac'
-  if (contentType.includes('wav') || url.includes('.wav')) return 'wav'
-  if (contentType.includes('ogg') || url.includes('.ogg')) return 'ogg'
-  return 'mp3'
-}
-
-const buildSingleFilename = (song, extension) => {
-  return `${song.artist} - ${song.title}.${extension}`.replace(/[<>:"/\\|?*]/g, '_')
-}
-
-const encodeSingleSong = async (song, audioContext, config) => {
-  const track = await decodeSongTrack(song, audioContext, config.quality)
-  const extension = config.exportFormat === 'wav' ? 'wav' : 'mp3'
-  processingStatus.value = config.normalizeAudio
-    ? getLocaleText('normalizing', '', song.title)
-    : getLocaleText('converting', '', song.title)
-  const blob = await encodeWithWorker([track], extension, config)
-  return { blob, extension }
-}
-
-const processAndMergeAudioFast = async (selectedSongsList, config) => {
-  const audioContext = createDownloadAudioContext()
 
   try {
     const concurrency = MERGE_DECODE_CONCURRENCY
@@ -1656,10 +942,10 @@ const processAndMergeAudioFast = async (selectedSongsList, config) => {
         const song = songItem.song
 
         currentDownloadSong.value = `${song.artist} - ${song.title}`
-        processingStatus.value = getLocaleText('fastPreparing', '', song.title)
+        processingStatus.value = `正在准备: ${song.title}`
 
         try {
-          results[index] = await decodeSongTrack(song, audioContext, config.quality)
+          results[index] = await decodeSongTrack(song, audioContext)
         } catch (error) {
           console.error(`处理失败: ${song.title}`, error)
           downloadErrors.value.push({
@@ -1682,19 +968,24 @@ const processAndMergeAudioFast = async (selectedSongsList, config) => {
 
     const tracks = results.filter(Boolean)
 
-    if (tracks.length === 0) throw new Error(locale.value.noProcessedAudio)
+    if (tracks.length === 0) throw new Error('没有成功处理的音频')
 
-    processingStatus.value = locale.value.fastMerging
+    processingStatus.value = '正在准备编码...'
     await new Promise((resolve) => setTimeout(resolve, 50))
 
-    const extension = config.exportFormat === 'wav' ? 'wav' : 'mp3'
-    const resultBlob = await encodeWithWorker(tracks, extension, config)
+    const extension = exportFormat.value === 'wav' ? 'wav' : 'mp3'
+    const resultBlob = await encodeWithWorker(tracks, extension)
     downloadedCount.value = totalCount.value
-    const filename = buildMergedFilename(selectedSongsList, extension, config.customFilename)
+    const filename = buildMergedFilename(selectedSongsList, extension)
 
     saveFile(resultBlob, filename)
-    processingStatus.value = getLocaleText('completedFile', '', filename)
+    processingStatus.value = `处理完成: ${filename}`
     currentDownloadSong.value = ''
+  } catch (error) {
+    console.error('合并过程出错:', error)
+    if (window.$showNotification) {
+      window.$showNotification('合并失败: ' + error.message, 'error')
+    }
   } finally {
     terminateActiveEncoderWorker()
     audioContext.close()
@@ -1702,117 +993,6 @@ const processAndMergeAudioFast = async (selectedSongsList, config) => {
   }
 }
 
-const processAndMergeAudioStreaming = async (selectedSongsList, config) => {
-  const audioContext = createDownloadAudioContext()
-  const extension = config.exportFormat === 'wav' ? 'wav' : 'mp3'
-  let streamSession = null
-
-  try {
-    streamSession = await createStreamingEncoderSession(
-      extension,
-      config,
-      audioContext.sampleRate || 44100
-    )
-    let successCount = 0
-
-    for (let i = 0; i < selectedSongsList.length; i++) {
-      const song = selectedSongsList[i].song
-      currentDownloadSong.value = `${song.artist} - ${song.title}`
-      processingStatus.value = getLocaleText('preparingSong', '', song.title)
-
-      let track = null
-      try {
-        // 老设备内存更容易被多首 PCM 同时占满，因此合并时始终逐首解码和编码。
-        track = await decodeSongTrack(song, audioContext, config.quality, {
-          releasePreload: true
-        })
-      } catch (error) {
-        console.error(`解码失败: ${song.title}`, error)
-        downloadErrors.value.push({
-          id: song.id,
-          title: song.title,
-          artist: song.artist,
-          error: getLocaleText('decodeFailed', error.message, error.message)
-        })
-        activeDownloads.delete(song.id)
-        downloadedCount.value++
-        continue
-      }
-
-      try {
-        processingStatus.value = getLocaleText('writingMergedFile', '', song.title)
-        await streamSession.appendTrack(track)
-        successCount++
-      } catch (error) {
-        console.error(`写入合并文件失败: ${song.title}`, error)
-        const errorText = getErrorMessage(error)
-        throw new Error(getLocaleText('writeMergedFileFailed', errorText, errorText))
-      } finally {
-        activeDownloads.delete(song.id)
-        downloadedCount.value++
-      }
-    }
-
-    if (successCount === 0) throw new Error(locale.value.noProcessedAudio)
-
-    processingStatus.value = locale.value.finishingMergedFile
-    const resultBlob = await streamSession.finish()
-    streamSession = null
-    downloadedCount.value = totalCount.value
-    const filename = buildMergedFilename(selectedSongsList, extension, config.customFilename)
-
-    saveFile(resultBlob, filename)
-    processingStatus.value = getLocaleText('completedFile', '', filename)
-    currentDownloadSong.value = ''
-  } catch (error) {
-    console.error('合并过程出错:', error)
-    pushMergeError(error)
-    if (window.$showNotification) {
-      window.$showNotification(`${getLocaleText('mergeFailed')}: ${getErrorMessage(error)}`, 'error')
-    }
-  } finally {
-    if (streamSession) {
-      streamSession.cancel()
-    }
-    terminateActiveEncoderWorker()
-    audioContext.close()
-    processingStatus.value = ''
-  }
-}
-
-const processAndMergeAudio = async (selectedSongsList, config) => {
-  const useFastMergeMode = shouldUseFastMergeMode(selectedSongsList)
-
-  if (!useFastMergeMode) {
-    processingStatus.value = locale.value.compatibleMerge
-    await processAndMergeAudioStreaming(selectedSongsList, config)
-    return
-  }
-
-  try {
-    processingStatus.value = locale.value.fastMerge
-    await processAndMergeAudioFast(selectedSongsList, config)
-  } catch (error) {
-    if (isLikelyMemoryError(error)) {
-      console.warn('快速合并内存不足，切换到兼容模式:', error)
-      downloadedCount.value = 0
-      downloadErrors.value = []
-      activeDownloads.clear()
-      if (window.$showNotification) {
-        window.$showNotification(locale.value.fastMergeMemoryFallback, 'warning')
-      }
-      await processAndMergeAudioStreaming(selectedSongsList, config)
-      return
-    }
-
-    console.error('合并过程出错:', error)
-    pushMergeError(error)
-    if (window.$showNotification) {
-      window.$showNotification(`${getLocaleText('mergeFailed')}: ${getErrorMessage(error)}`, 'error')
-    }
-  }
-}
-
 // 开始下载任务
 const startDownload = async () => {
   if (selectedSongs.value.size === 0) return
@@ -1824,23 +1004,12 @@ const startDownload = async () => {
   downloadedCount.value = 0
   downloadErrors.value = []
   processingStatus.value = ''
-  currentTaskType.value = shouldMergeSongs.value ? 'merge' : 'download'
-
-  // 快照当前配置，防止下载过程中用户修改配置影响当前任务
-  const taskConfig = {
-    quality: selectedQuality.value,
-    exportFormat: exportFormat.value,
-    customFilename: customFilename.value,
-    convertAudioFormat: convertAudioFormat.value,
-    normalizeAudio: normalizeAudio.value,
-    targetDb: targetDb.value
-  }
 
   const selectedSongsList = props.songs.filter((song) => selectedSongs.value.has(song.song.id))
   // 合并模式分支
-  if (currentTaskType.value === 'merge') {
+  if (mergeSongs.value) {
     totalCount.value = selectedSongsList.length + 1
-    await processAndMergeAudio(selectedSongsList, taskConfig)
+    await processAndMergeAudio(selectedSongsList)
 
     // 合并完成处理
     if (downloadErrors.value.length === 0) {
@@ -1849,49 +1018,48 @@ const startDownload = async () => {
 
       setTimeout(() => {
         downloading.value = false
-        currentTaskType.value = ''
         closeDialog()
       }, 2000)
     } else {
       downloading.value = false
-      currentTaskType.value = ''
     }
     return
   }
   totalCount.value = selectedSongsList.length
 
-  const shouldEncodeDownloads = taskConfig.convertAudioFormat || taskConfig.normalizeAudio
-  // 普通批量下载模式。重编码会占用单个编码 Worker，逐首处理更稳。
-  const concurrency = shouldEncodeDownloads ? 1 : DOWNLOAD_CONCURRENCY
+  // 普通批量下载模式
+  const concurrency = DOWNLOAD_CONCURRENCY
   const queue = [...selectedSongsList]
   const workers = []
   let activeWorkers = 0
-  const audioContext = shouldEncodeDownloads ? createDownloadAudioContext() : null
 
   const worker = async () => {
     while (queue.length > 0) {
       const songItem = queue.shift()
       if (!songItem) break
-
+      
       const song = songItem.song
       activeWorkers++
-      currentDownloadSong.value = getLocaleText('activeWorkers', '', `${song.artist} - ${song.title}`, activeWorkers, concurrency)
+      currentDownloadSong.value = `${song.artist} - ${song.title} (${activeWorkers}/${concurrency} 活动)`
 
       try {
-        let blob
-        let extension
+        // 1. 获取音频 URL
+        const audioUrl = await getMusicUrlForDownload(song, selectedQuality.value)
 
-        if (shouldEncodeDownloads) {
-          const result = await encodeSingleSong(song, audioContext, taskConfig)
-          blob = result.blob
-          extension = result.extension
-        } else {
-          const result = await getAudioBlobForSong(song, taskConfig.quality)
-          blob = result.blob
-          extension = inferAudioExtension(blob, result.sourceUrl)
-        }
+        // 2. 下载音频（使用公共函数）
+        processingStatus.value = `下载中: ${song.title}`
+        const blob = await fetchAudioWithProgress(audioUrl, song.id, song.title)
 
-        const filename = buildSingleFilename(song, extension)
+        // 3. 确定文件扩展名
+        let extension = 'mp3'
+        const contentType = blob.type
+        if (contentType.includes('m4a') || audioUrl.includes('.m4a')) extension = 'm4a'
+        else if (contentType.includes('flac') || audioUrl.includes('.flac')) extension = 'flac'
+        else if (contentType.includes('wav') || audioUrl.includes('.wav')) extension = 'wav'
+        else if (contentType.includes('ogg') || audioUrl.includes('.ogg')) extension = 'ogg'
+
+        // 4. 保存文件（保留原始格式）
+        const filename = `${song.artist} - ${song.title}.${extension}`.replace(/[<>:"/\\|?*]/g, '_')
         saveFile(blob, filename)
 
         activeDownloads.delete(song.id)
@@ -1907,7 +1075,9 @@ const startDownload = async () => {
       } finally {
         activeWorkers--
         downloadedCount.value++
-        currentDownloadSong.value = queue.length > 0 ? getLocaleText('remainingSongs', '', queue.length) : locale.value.processComplete
+        currentDownloadSong.value = queue.length > 0 
+          ? `剩余 ${queue.length} 首` 
+          : '处理完成'
       }
     }
   }
@@ -1917,14 +1087,7 @@ const startDownload = async () => {
     workers.push(worker())
   }
 
-  try {
-    await Promise.all(workers)
-  } finally {
-    terminateActiveEncoderWorker()
-    if (audioContext) {
-      audioContext.close()
-    }
-  }
+  await Promise.all(workers)
 
   currentDownloadSong.value = ''
   processingStatus.value = ''
@@ -1933,10 +1096,10 @@ const startDownload = async () => {
   if (window.$showNotification) {
     const successCount = downloadedCount.value - downloadErrors.value.length
     if (downloadErrors.value.length === 0) {
-      window.$showNotification(getLocaleText('downloadSuccess', '', successCount), 'success')
+      window.$showNotification(`成功下载 ${successCount} 首歌曲`, 'success')
     } else {
       window.$showNotification(
-        getLocaleText('downloadCompleteWithCount', '', successCount, downloadErrors.value.length),
+        `下载完成，成功 ${successCount} 首，失败 ${downloadErrors.value.length} 首`,
         'warning'
       )
     }
@@ -1946,12 +1109,10 @@ const startDownload = async () => {
   if (downloadErrors.value.length === 0) {
     setTimeout(() => {
       downloading.value = false
-      currentTaskType.value = ''
       closeDialog()
     }, 2000)
   } else {
     downloading.value = false
-    currentTaskType.value = ''
   }
 }
 
@@ -1974,9 +1135,7 @@ watch(
       if (savedQuality) {
         const qualityNum = Number(savedQuality)
         // 检查保存的音质是否在当前可用选项中
-        const isQualityAvailable = extendedQualityOptions.value.some(
-          (opt) => opt.value === qualityNum
-        )
+        const isQualityAvailable = extendedQualityOptions.value.some(opt => opt.value === qualityNum)
         if (isQualityAvailable) {
           selectedQuality.value = qualityNum
         } else {
@@ -2006,13 +1165,13 @@ watch(
             // 可能是旧格式的单个数值，或者是其他异常数据
             throw new Error('Invalid format')
           }
-        } catch {
+        } catch (e) {
           // 解析失败，说明是旧版纯数值格式
           const val = parseFloat(savedDbPreset)
           if (!isNaN(val)) {
             targetDb.value = val
             normalizeAudio.value = true // 旧版默认开启
-
+            
             // 顺便更新为新格式
             const newPreset = {
               enabled: true,
@@ -2069,11 +1228,11 @@ onUnmounted(() => {
   background: transparent;
 }
 .custom-scrollbar::-webkit-scrollbar-thumb {
-  background: var(--panel-bg-alt);
+  background: var(--bg-tertiary, #27272a);
   border-radius: 10px;
 }
 .custom-scrollbar::-webkit-scrollbar-thumb:hover {
-  background: var(--panel-bg-hover);
+  background: #3f3f46;
 }
 
 .fade-enter-active,
diff --git a/app/components/Admin/SongManagement.vue b/app/components/Admin/SongManagement.vue
index 58a1750..a630cc2 100644
--- a/app/components/Admin/SongManagement.vue
+++ b/app/components/Admin/SongManagement.vue
@@ -4,31 +4,31 @@
     <div class="space-y-6">
       <div class="flex flex-col md:flex-row md:items-end justify-between gap-6 px-1">
         <div class="space-y-1">
-          <h2 class="text-3xl font-black text-text-primary tracking-tight">{{ locale.title }}</h2>
+          <h2 class="text-3xl font-black text-zinc-100 tracking-tight">歌曲管理</h2>
           <div class="flex items-center gap-6 mt-4">
             <div class="flex items-center gap-2">
-              <span class="text-[10px] font-black text-text-disabled uppercase tracking-widest"
-                >{{ locale.stats.total }}</span
+              <span class="text-[10px] font-black text-zinc-600 uppercase tracking-widest"
+                >总计</span
               >
-              <span class="text-sm font-bold text-text-secondary">{{ baseFilteredSongs.length }}</span>
+              <span class="text-sm font-bold text-zinc-300">{{ filteredSongs.length }}</span>
             </div>
             <div class="flex items-center gap-2">
-              <span class="text-[10px] font-black text-text-disabled uppercase tracking-widest"
-                >{{ locale.stats.played }}</span
+              <span class="text-[10px] font-black text-zinc-600 uppercase tracking-widest"
+                >已播放</span
               >
-              <span class="text-sm font-bold text-success">{{ playedCount }}</span>
+              <span class="text-sm font-bold text-emerald-500">{{ playedCount }}</span>
             </div>
             <div class="flex items-center gap-2">
-              <span class="text-[10px] font-black text-text-disabled uppercase tracking-widest"
-                >{{ locale.stats.pending }}</span
+              <span class="text-[10px] font-black text-zinc-600 uppercase tracking-widest"
+                >待播放</span
               >
-              <span class="text-sm font-bold text-primary">{{ pendingCount }}</span>
+              <span class="text-sm font-bold text-blue-500">{{ pendingCount }}</span>
             </div>
           </div>
         </div>
 
-        <div class="flex flex-wrap items-center gap-3">
-          <!-- 桌面端批量操作 -->
+        <div class="flex items-center gap-3">
+          <!-- 批量操作 -->
           <Transition
             enter-active-class="transition duration-200 ease-out"
             enter-from-class="opacity-0 scale-95 translate-x-10"
@@ -39,88 +39,97 @@
           >
             <div
               v-if="selectedSongs.length > 0"
-              class="hidden sm:flex flex-row items-center gap-2 p-1.5 bg-bg-secondary-90 border border-border-secondary rounded-lg backdrop-blur-xl shadow-2xl"
+              class="flex items-center gap-2 p-1.5 bg-zinc-900/90 border border-zinc-800 rounded-lg backdrop-blur-xl shadow-2xl"
             >
               <button
-                class="flex items-center justify-center gap-2 px-4 py-2 bg-bg-tertiary hover:bg-bg-quaternary text-success text-[11px] font-black rounded-lg border border-border-tertiary-50 transition-all active:scale-95 uppercase tracking-widest"
+                class="flex items-center gap-2 px-4 py-2 bg-zinc-800 hover:bg-zinc-700 text-emerald-400 text-[11px] font-black rounded-lg border border-zinc-700/50 transition-all active:scale-95 uppercase tracking-widest"
                 @click="openDownloadDialog"
               >
-                <Download :size="14" class="text-success-70" /> {{ locale.actions.download }} ({{
+                <Download :size="14" class="text-emerald-500/70" /> 下载 ({{
                   selectedSongs.length
                 }})
               </button>
               <button
-                class="flex items-center justify-center gap-2 px-4 py-2 bg-bg-tertiary hover:bg-bg-quaternary text-error text-[11px] font-black rounded-lg border border-border-tertiary-50 transition-all active:scale-95 uppercase tracking-widest"
+                class="flex items-center gap-2 px-4 py-2 bg-zinc-800 hover:bg-zinc-700 text-emerald-400 text-[11px] font-black rounded-lg border border-zinc-700/50 transition-all active:scale-95 uppercase tracking-widest"
+                @click="batchMarkPlayed"
+              >
+                <Check :size="14" class="text-emerald-500/70" /> 已播放 ({{ selectedSongs.length }})
+              </button>
+              <button
+                class="flex items-center gap-2 px-4 py-2 bg-zinc-800 hover:bg-zinc-700 text-blue-400 text-[11px] font-black rounded-lg border border-zinc-700/50 transition-all active:scale-95 uppercase tracking-widest"
+                @click="batchMarkUnplayed"
+              >
+                <RotateCcw :size="14" class="text-blue-500/70" /> 未播放 ({{ selectedSongs.length }})
+              </button>
+              <button
+                class="flex items-center gap-2 px-4 py-2 bg-zinc-800 hover:bg-zinc-700 text-amber-400 text-[11px] font-black rounded-lg border border-zinc-700/50 transition-all active:scale-95 uppercase tracking-widest"
+                @click="batchReject"
+              >
+                <X :size="14" class="text-amber-500/70" /> 驳回 ({{ selectedSongs.length }})
+              </button>
+              <button
+                class="flex items-center gap-2 px-4 py-2 bg-zinc-800 hover:bg-zinc-700 text-red-400 text-[11px] font-black rounded-lg border border-zinc-700/50 transition-all active:scale-95 uppercase tracking-widest"
                 @click="batchDelete"
               >
-                <Trash2 :size="14" class="text-error-70" /> {{ locale.actions.delete }} ({{ selectedSongs.length }})
+                <Trash2 :size="14" class="text-red-500/70" /> 删除 ({{ selectedSongs.length }})
               </button>
             </div>
           </Transition>
 
           <button
-            class="flex items-center gap-2 px-5 py-2.5 bg-bg-secondary border border-border-secondary hover:border-border-tertiary text-text-secondary text-xs font-bold rounded-lg transition-all active:scale-95"
+            class="flex items-center gap-2 px-5 py-2.5 bg-zinc-900 border border-zinc-800 hover:border-zinc-700 text-zinc-300 text-xs font-bold rounded-lg transition-all active:scale-95"
             @click="openAddSongModal"
           >
-            <Plus :size="16" /> {{ locale.actions.addManual }}
+            <Plus :size="16" /> 手动添加
           </button>
           <button
             :disabled="loading"
-            class="flex items-center gap-2 px-5 py-2.5 bg-primary-hover-10 hover:bg-primary-hover-20 text-primary text-xs font-bold rounded-lg border border-primary-20 transition-all disabled:opacity-50"
+            class="flex items-center gap-2 px-5 py-2.5 bg-blue-600/10 hover:bg-blue-600/20 text-blue-400 text-xs font-bold rounded-lg border border-blue-500/20 transition-all disabled:opacity-50"
             @click="refreshSongs(true)"
           >
-            <RotateCcw :size="16" :class="{ 'animate-spin': loading }" /> {{ locale.actions.refresh }}
+            <RotateCcw :size="16" :class="{ 'animate-spin': loading }" /> 刷新
           </button>
         </div>
       </div>
 
       <!-- 过滤器栏 -->
       <div
-        class="bg-bg-secondary-30 border border-border-secondary-60 rounded-xl p-4 flex flex-col lg:flex-row gap-4 items-stretch lg:items-center"
+        class="bg-zinc-900/30 border border-zinc-800/60 rounded-xl p-4 flex flex-col lg:flex-row gap-4 items-stretch lg:items-center"
       >
         <div class="relative flex-1 group w-full lg:w-auto">
           <Search
-            class="absolute left-4 top-1/2 -translate-y-1/2 text-text-secondary group-focus-within:text-primary transition-colors"
+            class="absolute left-4 top-1/2 -translate-y-1/2 text-zinc-700 group-focus-within:text-blue-500 transition-colors"
             :size="18"
           />
           <input
             v-model="searchQuery"
             type="text"
-            :placeholder="locale.searchPlaceholder"
-            class="w-full bg-bg-primary-50 border border-border-secondary-80 rounded-lg pl-12 pr-4 py-3 text-sm focus:outline-none focus:border-primary-30 transition-all placeholder:text-text-primary text-text-primary"
-          />
+            placeholder="搜索歌曲标题、艺术家或投稿人..."
+            class="w-full bg-zinc-950/50 border border-zinc-800/80 rounded-lg pl-12 pr-4 py-3 text-sm focus:outline-none focus:border-blue-500/30 transition-all placeholder:text-zinc-800 text-zinc-200"
+          >
         </div>
-        <div class="grid grid-cols-2 md:grid-cols-4 lg:flex lg:items-center gap-3 w-full lg:w-auto">
+        <div class="grid grid-cols-2 md:grid-cols-3 lg:flex lg:items-center gap-3 w-full lg:w-auto">
           <CustomSelect
             v-model="selectedSemester"
-            :label="locale.filters.semester"
+            label="学期"
             :options="availableSemesters"
             label-key="name"
-            value-key="id"
-            :placeholder="locale.filters.selectSemester"
-            class-name="w-full lg:w-40"
-          />
-          <CustomSelect
-            v-model="selectedPlayTime"
-            :label="locale.filters.playTime"
-            :options="availablePlayTimes"
-            label-key="name"
-            value-key="id"
-            :placeholder="locale.filters.selectPlayTime"
+            value-key="name"
+            placeholder="选择学期"
             class-name="w-full lg:w-40"
           />
           <CustomSelect
             v-model="statusFilter"
-            :label="locale.filters.status"
+            label="状态"
             :options="statusOptions"
-            :placeholder="locale.filters.selectStatus"
+            placeholder="选择状态"
             class-name="w-full lg:w-32"
           />
           <CustomSelect
             v-model="sortOption"
-            :label="locale.filters.sort"
+            label="排序"
             :options="sortOptions"
-            :placeholder="locale.filters.selectSort"
+            placeholder="选择排序"
             class-name="w-full lg:w-36 col-span-2 md:col-span-1"
           />
         </div>
@@ -129,114 +138,89 @@
 
     <!-- 歌曲表格 -->
     <div
-      class="bg-bg-secondary-10 border border-border-secondary-40 rounded-xl overflow-hidden shadow-2xl relative"
+      class="bg-zinc-900/10 border border-zinc-800/40 rounded-xl overflow-hidden shadow-2xl relative"
     >
       <!-- 加载遮罩 -->
       <div
         v-if="loading"
-        class="absolute inset-0 bg-bg-primary-40 backdrop-blur-sm z-10 flex items-center justify-center"
+        class="absolute inset-0 bg-zinc-950/40 backdrop-blur-sm z-10 flex items-center justify-center"
       >
         <div class="flex flex-col items-center gap-3">
-          <AppSpinner :size="32" />
-          <span class="text-xs font-bold text-text-tertiary tracking-widest uppercase">{{ locale.loading }}</span>
+          <div
+            class="w-8 h-8 border-2 border-blue-500/20 border-t-blue-500 rounded-full animate-spin"
+          />
+          <span class="text-xs font-bold text-zinc-400 tracking-widest uppercase">正在加载...</span>
         </div>
       </div>
 
       <!-- 表头 -->
       <div
-        class="hidden lg:grid grid-cols-12 gap-4 px-8 py-5 border-b border-border-secondary-60 bg-bg-secondary-40"
+        class="hidden lg:grid grid-cols-12 gap-4 px-8 py-5 border-b border-zinc-800/60 bg-zinc-900/40"
       >
         <div class="col-span-1 flex items-center">
           <input
             type="checkbox"
             :checked="isAllSelected"
-            class="w-5 h-5 rounded-lg border-2 border-border-secondary bg-bg-primary transition-all cursor-pointer"
-            @change="toggleSelectAll"
-          />
-        </div>
-        <div class="col-span-4 text-[10px] font-black text-text-disabled uppercase tracking-widest">
-          {{ locale.table.songInfo }}
-        </div>
-        <div class="col-span-2 text-[10px] font-black text-text-disabled uppercase tracking-widest">
-          {{ locale.table.requester }}
-        </div>
-        <div
-          class="col-span-1 text-[10px] font-black text-text-disabled uppercase tracking-widest text-center"
-        >
-          {{ locale.table.stats }}
-        </div>
-        <div
-          class="col-span-2 text-[10px] font-black text-text-disabled uppercase tracking-widest text-center"
-        >
-          {{ locale.table.status }}
-        </div>
-        <div
-          class="col-span-2 text-[10px] font-black text-text-disabled uppercase tracking-widest text-right pr-4"
-        >
-          {{ locale.table.actions }}
-        </div>
-      </div>
-
-      <!-- 移动端批量操作栏 -->
-      <div
-        v-if="filteredSongs.length > 0"
-        class="lg:hidden flex items-center justify-between px-6 py-3 border-b border-border-secondary-60 bg-bg-secondary-40"
-      >
-        <label class="flex items-center gap-2 text-xs font-bold text-text-secondary cursor-pointer py-1">
-          <input
-            type="checkbox"
-            :checked="isAllSelected"
-            class="w-5 h-5 rounded-lg border-2 border-border-secondary bg-bg-primary transition-all cursor-pointer"
+            class="w-5 h-5 rounded-lg border-2 border-zinc-800 bg-zinc-950 accent-blue-600 transition-all cursor-pointer"
             @change="toggleSelectAll"
           >
-          {{ locale.table.selectPage }}
-        </label>
-        <span v-if="selectedSongs.length > 0" class="text-xs text-primary font-bold">{{ getLocaleMessage('selectedItems', selectedSongs.length) }}</span>
+        </div>
+        <div class="col-span-4 text-[10px] font-black text-zinc-600 uppercase tracking-widest">
+          歌曲信息
+        </div>
+        <div class="col-span-2 text-[10px] font-black text-zinc-600 uppercase tracking-widest">
+          投稿人
+        </div>
+        <div
+          class="col-span-1 text-[10px] font-black text-zinc-600 uppercase tracking-widest text-center"
+        >
+          统计
+        </div>
+        <div
+          class="col-span-2 text-[10px] font-black text-zinc-600 uppercase tracking-widest text-center"
+        >
+          状态
+        </div>
+        <div
+          class="col-span-2 text-[10px] font-black text-zinc-600 uppercase tracking-widest text-right pr-4"
+        >
+          操作
+        </div>
       </div>
 
       <!-- 空状态 -->
       <div
         v-if="filteredSongs.length === 0 && !loading"
-        class="py-20 flex flex-col items-center justify-center text-text-tertiary"
+        class="py-20 flex flex-col items-center justify-center text-zinc-500"
       >
-        <Music :size="48" class="text-text-primary mb-4" />
-        <p class="text-sm font-bold">{{ searchQuery ? locale.empty.search : locale.empty.default }}</p>
+        <Music :size="48" class="text-zinc-800 mb-4" />
+        <p class="text-sm font-bold">{{ searchQuery ? '没有找到匹配的歌曲' : '暂无歌曲数据' }}</p>
       </div>
 
       <!-- 列表内容 -->
-      <div v-else class="divide-y divide-panel-bg-dark-40">
+      <div v-else class="divide-y divide-zinc-800/40">
         <div
           v-for="song in paginatedSongs"
           :key="song.id"
           :class="[
-            'flex flex-col lg:grid lg:grid-cols-12 gap-4 px-6 lg:px-8 py-5 transition-all lg:items-center group relative',
-            selectedSongs.includes(song.id) ? 'bg-primary-hover-5' : 'hover:bg-bg-tertiary-20'
+            'grid grid-cols-1 lg:grid-cols-12 gap-4 px-6 lg:px-8 py-5 transition-all items-center group relative',
+            selectedSongs.includes(song.id) ? 'bg-blue-600/5' : 'hover:bg-zinc-800/20'
           ]"
         >
           <div class="hidden lg:flex col-span-1 items-center">
             <input
               type="checkbox"
               :checked="selectedSongs.includes(song.id)"
-              class="w-5 h-5 rounded-lg border-2 border-border-secondary bg-bg-primary transition-all cursor-pointer"
+              class="w-5 h-5 rounded-lg border-2 border-zinc-800 bg-zinc-950 accent-blue-600 transition-all cursor-pointer"
               @change="toggleSelectSong(song.id)"
-            />
+            >
           </div>
 
-          <div class="col-span-12 lg:col-span-4 flex items-center gap-3 lg:gap-4 w-full">
-            <label
-              class="lg:hidden flex items-center justify-center p-2 -ml-2 shrink-0 cursor-pointer"
-            >
-              <input
-                type="checkbox"
-                :checked="selectedSongs.includes(song.id)"
-                class="w-5 h-5 rounded-lg border-2 border-border-secondary bg-bg-primary transition-all cursor-pointer"
-                @change="toggleSelectSong(song.id)"
-              />
-            </label>
+          <div class="col-span-12 lg:col-span-4 flex items-center gap-4">
             <div
               :class="[
-                'w-12 h-12 rounded-xl flex items-center justify-center shrink-0 border transition-all overflow-hidden bg-bg-tertiary-40 border-border-tertiary-30 group-hover:border-border-tertiary cursor-pointer hover:opacity-80',
-                selectedSongs.includes(song.id) ? 'border-primary-50' : ''
+                'w-12 h-12 rounded-xl flex items-center justify-center shrink-0 border transition-all overflow-hidden bg-zinc-800/40 border-zinc-700/30 group-hover:border-zinc-600 cursor-pointer hover:opacity-80',
+                selectedSongs.includes(song.id) ? 'border-blue-500/50' : ''
               ]"
               @click.stop="playSong(song)"
             >
@@ -245,20 +229,20 @@
                 :src="convertToHttps(song.cover)"
                 class="w-full h-full object-cover"
                 referrerpolicy="no-referrer"
-              />
-              <Music v-else :size="20" class="text-text-disabled" />
+              >
+              <Music v-else :size="20" class="text-zinc-600" />
             </div>
             <div class="min-w-0">
               <h4
                 :class="[
                   'font-bold transition-colors flex items-center',
                   selectedSongs.includes(song.id)
-                    ? 'text-primary'
-                    : 'text-text-primary group-hover:text-primary'
+                    ? 'text-blue-400'
+                    : 'text-zinc-100 group-hover:text-blue-400'
                 ]"
               >
                 <span
-                  v-if="isBilibiliSong(song)"
+                  v-if="false"
                   class="truncate flex items-center gap-1 text-left"
                 >
                   {{ song.title }}
@@ -266,135 +250,117 @@
                 <span v-else class="truncate">{{ song.title }}</span>
                 <button
                   v-if="song.hasSubmissionNote && song.submissionNote"
-                  class="ml-2 inline-flex items-center justify-center w-5 h-5 rounded-full border border-primary-30 bg-primary-10 text-primary hover:bg-primary-20 transition-all"
-                  :title="locale.actions.viewRemark"
+                  class="ml-2 inline-flex items-center justify-center w-5 h-5 rounded-full border border-blue-500/30 bg-blue-500/10 text-blue-400 hover:bg-blue-500/20 transition-all"
+                  title="查看备注留言"
                   @click.stop="openSubmissionRemark(song)"
                 >
                   <MessageSquare :size="12" />
                 </button>
-                <span
-                  v-if="song.hasSubmissionNote && song.submissionNote"
-                  class="ml-2 text-xs text-primary-80 truncate max-w-[200px] cursor-pointer hover:text-primary transition-colors font-normal"
-                  :title="locale.actions.viewRemark"
-                  @click.stop="openSubmissionRemark(song)"
-                >
-                  {{
-                    song.submissionNote.length > 25
-                      ? song.submissionNote.substring(0, 25) + '...'
-                      : song.submissionNote
-                  }}
-                </span>
               </h4>
-              <p class="text-xs text-text-tertiary font-medium truncate mt-0.5 flex items-center gap-1.5">
-                <span>{{ song.artist }}</span>
-                <span
-                  v-if="song.durationSeconds"
-                  class="text-text-disabled shrink-0"
-                >{{ formatDuration(song.durationSeconds) }}</span>
-              </p>
+              <p class="text-xs text-zinc-500 font-medium truncate mt-0.5">{{ song.artist }}</p>
+              
+              <!-- 期望播出日期标签 -->
+              <div v-if="song.expectedPlayDate" class="mt-1 flex items-center">
+                <span class="inline-flex items-center gap-1 px-1.5 py-0.5 bg-blue-500/10 text-blue-400 rounded border border-blue-500/20 text-[10px] font-medium">
+                  <CalendarDays :size="10" />
+                  期望: {{ song.expectedPlayDate }}
+                  <template v-if="song.expectedPlaySequence">
+                    第 {{ song.expectedPlaySequence }} 首
+                  </template>
+                </span>
+              </div>
+
               <span
-                class="lg:hidden text-[9px] font-black text-text-secondary uppercase tracking-wider mt-1 inline-block"
+                class="lg:hidden text-[9px] font-black text-zinc-700 uppercase tracking-wider mt-1 inline-block"
                 >{{ formatDate(song.createdAt) }}</span
               >
             </div>
           </div>
 
-          <!-- Mobile Bottom Section -->
-          <div
-            class="flex flex-wrap items-center justify-between gap-3 w-full lg:contents mt-1 lg:mt-0"
-          >
-            <!-- Left side: Requester, Votes, Status -->
-            <div class="flex items-center gap-3 lg:contents">
-              <div class="col-span-6 lg:col-span-2 flex flex-col lg:items-start min-w-[60px]">
-                <span class="text-xs font-bold text-text-tertiary truncate max-w-[100px]">{{ song.requester || locale.unknown }}</span>
-                <span v-if="song.user" class="text-[10px] font-bold text-text-disabled truncate max-w-[100px]"
-                  >@{{ song.user.username }}</span
-                >
-                <span v-if="song.preferredPlayTimeId" class="text-[10px] font-bold text-primary mt-1">
-                  {{ getLocaleMessage('preferredPlayTime', getPlayTimeName(song.preferredPlayTimeId)) }}
-                </span>
-                <span
-                  class="hidden lg:inline text-[9px] font-black text-text-secondary uppercase tracking-widest mt-1 opacity-60"
-                  >{{ formatDate(song.createdAt) }}</span
-                >
-              </div>
-
-              <div class="col-span-3 lg:col-span-1 text-center shrink-0">
-                <button
-                  :disabled="!(song.voteCount > 0)"
-                  :class="[
-                    'inline-flex items-center gap-1.5 text-xs font-bold px-2 py-1 rounded-lg transition-all',
-                    song.voteCount > 0
-                      ? 'bg-color-pink-alpha-10 text-color-pink hover:bg-color-pink-alpha-10 cursor-pointer'
-                      : 'bg-bg-primary-30 text-text-secondary cursor-default'
-                  ]"
-                  @click="showVoters(song.id)"
-                >
-                  <Heart :size="12" :class="song.voteCount > 0 ? 'fill-color-pink-alpha-20' : ''" />
-                  {{ song.voteCount || 0 }}
-                </button>
-              </div>
-
-              <div class="col-span-3 lg:col-span-2 text-center shrink-0">
-                <span
-                  :class="[
-                    'px-2 py-0.5 text-[10px] font-black rounded-md uppercase tracking-wider',
-                    song.played
-                      ? 'bg-success-10 text-success'
-                      : song.scheduled
-                        ? 'bg-primary-10 text-primary'
-                        : 'bg-bg-tertiary text-text-tertiary'
-                  ]"
-                >
-                  {{ getStatusText(song) }}
-                </span>
-              </div>
-            </div>
-
-            <!-- Right side: Actions -->
-            <div
-              class="col-span-12 lg:col-span-2 flex items-center justify-end gap-1 lg:gap-2 opacity-100 lg:opacity-0 group-hover:opacity-100 transition-all shrink-0 ml-auto"
+          <div class="col-span-6 lg:col-span-2 flex flex-col lg:items-start">
+            <span class="text-xs font-bold text-zinc-400">{{ song.requester || '未知' }}</span>
+            <span v-if="song.user" class="text-[10px] font-bold text-zinc-600"
+              >@{{ song.user.username }}</span
             >
-              <button
-                class="p-2 bg-bg-tertiary-50 text-primary hover:bg-primary-hover hover:text-text-primary rounded-xl transition-all border border-border-tertiary-30"
-                :title="locale.actions.edit"
-                @click="editSong(song)"
-              >
-                <Edit2 :size="14" />
-              </button>
+            <span
+              class="hidden lg:inline text-[9px] font-black text-zinc-700 uppercase tracking-widest mt-1 opacity-60"
+              >{{ formatDate(song.createdAt) }}</span
+            >
+          </div>
 
-              <button
-                v-if="!song.played"
-                class="p-2 bg-bg-tertiary-50 text-success hover:bg-success hover:text-text-primary rounded-xl transition-all border border-border-tertiary-30"
-                :title="locale.actions.markPlayed"
-                @click="markAsPlayed(song.id)"
-              >
-                <Check :size="14" />
-              </button>
-              <button
-                v-else
-                class="p-2 bg-bg-tertiary-50 text-text-tertiary hover:bg-bg-quaternary hover:text-text-primary rounded-xl transition-all border border-border-tertiary-30"
-                :title="locale.actions.markUnplayed"
-                @click="markAsUnplayed(song.id)"
-              >
-                <RotateCcw :size="14" />
-              </button>
+          <div class="col-span-3 lg:col-span-1 text-center">
+            <button
+              :disabled="!(song.voteCount > 0)"
+              :class="[
+                'inline-flex items-center gap-1.5 text-xs font-bold px-2 py-1 rounded-lg transition-all',
+                song.voteCount > 0
+                  ? 'bg-pink-500/10 text-pink-500 hover:bg-pink-500/20 cursor-pointer'
+                  : 'bg-zinc-950/30 text-zinc-700 cursor-default'
+              ]"
+              @click="showVoters(song.id)"
+            >
+              <Heart :size="12" :class="song.voteCount > 0 ? 'fill-pink-500/20' : ''" />
+              {{ song.voteCount || 0 }}
+            </button>
+          </div>
 
-              <button
-                class="p-2 bg-bg-tertiary-50 text-warning hover:bg-warning hover:text-text-primary rounded-xl transition-all border border-border-tertiary-30"
-                :title="locale.actions.reject"
-                @click="rejectSong(song.id)"
-              >
-                <X :size="14" />
-              </button>
-              <button
-                class="p-2 bg-bg-tertiary-50 text-error hover:bg-error hover:text-text-primary rounded-xl transition-all border border-border-tertiary-30"
-                :title="locale.actions.deleteSong"
-                @click="deleteSong(song.id)"
-              >
-                <Trash2 :size="14" />
-              </button>
-            </div>
+          <div class="col-span-3 lg:col-span-2 text-center">
+            <span
+              :class="[
+                'px-2 py-0.5 text-[10px] font-black rounded-md uppercase tracking-wider',
+                song.played
+                  ? 'bg-emerald-500/10 text-emerald-500'
+                  : song.scheduled
+                    ? 'bg-blue-500/10 text-blue-500'
+                    : 'bg-zinc-800 text-zinc-500'
+              ]"
+            >
+              {{ getStatusText(song) }}
+            </span>
+          </div>
+
+          <div
+            class="col-span-12 lg:col-span-2 flex items-center justify-end gap-2 opacity-100 lg:opacity-0 group-hover:opacity-100 transition-all"
+          >
+            <button
+              class="p-2 bg-zinc-800/50 text-blue-400 hover:bg-blue-600 hover:text-white rounded-xl transition-all border border-zinc-700/30"
+              title="编辑歌曲"
+              @click="editSong(song)"
+            >
+              <Edit2 :size="14" />
+            </button>
+
+            <button
+              v-if="!song.played"
+              class="p-2 bg-zinc-800/50 text-emerald-400 hover:bg-emerald-600 hover:text-white rounded-xl transition-all border border-zinc-700/30"
+              title="标记为已播放"
+              @click="markAsPlayed(song.id)"
+            >
+              <Check :size="14" />
+            </button>
+            <button
+              v-else
+              class="p-2 bg-zinc-800/50 text-zinc-400 hover:bg-zinc-600 hover:text-white rounded-xl transition-all border border-zinc-700/30"
+              title="标记为未播放"
+              @click="markAsUnplayed(song.id)"
+            >
+              <RotateCcw :size="14" />
+            </button>
+
+            <button
+              class="p-2 bg-zinc-800/50 text-amber-500 hover:bg-amber-600 hover:text-white rounded-xl transition-all border border-zinc-700/30"
+              title="驳回歌曲"
+              @click="rejectSong(song.id)"
+            >
+              <X :size="14" />
+            </button>
+            <button
+              class="p-2 bg-zinc-800/50 text-red-400 hover:bg-red-600 hover:text-white rounded-xl transition-all border border-zinc-700/30"
+              title="删除歌曲"
+              @click="deleteSong(song.id)"
+            >
+              <Trash2 :size="14" />
+            </button>
           </div>
         </div>
       </div>
@@ -405,45 +371,9 @@
       v-model:current-page="currentPage"
       :total-pages="totalPages"
       :total-items="filteredSongs.length"
-      :item-name="locale.paginationItemName"
+      item-name="首歌曲"
     />
 
-    <!-- 移动端悬浮批量操作栏 -->
-    <Transition
-      enter-active-class="transition duration-300 ease-out"
-      enter-from-class="opacity-0 translate-y-full"
-      enter-to-class="opacity-100 translate-y-0"
-      leave-active-class="transition duration-200 ease-in"
-      leave-from-class="opacity-100 translate-y-0"
-      leave-to-class="opacity-0 translate-y-full"
-    >
-      <div
-        v-if="selectedSongs.length > 0"
-        class="sm:hidden fixed bottom-[70px] left-4 right-4 z-40 bg-bg-secondary-95 border border-border-secondary rounded-2xl p-2 shadow-[0_8px_30px_var(--mobile-table-shadow)] backdrop-blur-xl flex items-center justify-between"
-      >
-        <div class="px-3 flex flex-col">
-          <span class="text-[10px] font-black text-text-tertiary uppercase tracking-widest">{{ locale.selected }}</span>
-          <span class="text-sm font-bold text-primary">{{ getLocaleMessage('selectedSongs', selectedSongs.length) }}</span>
-        </div>
-        <div class="flex items-center gap-2">
-          <button
-            class="flex flex-col items-center justify-center w-14 h-12 bg-bg-tertiary hover:bg-bg-quaternary text-success rounded-xl border border-border-tertiary-50 transition-all active:scale-95"
-            @click="openDownloadDialog"
-          >
-            <Download :size="16" class="mb-1" />
-            <span class="text-[9px] font-bold">{{ locale.actions.download }}</span>
-          </button>
-          <button
-            class="flex flex-col items-center justify-center w-14 h-12 bg-bg-tertiary hover:bg-bg-quaternary text-error rounded-xl border border-border-tertiary-50 transition-all active:scale-95"
-            @click="batchDelete"
-          >
-            <Trash2 :size="16" class="mb-1" />
-            <span class="text-[9px] font-bold">{{ locale.actions.delete }}</span>
-          </button>
-        </div>
-      </div>
-    </Transition>
-
     <!-- Modals (模态框) -->
     <!-- 确认删除对话框 -->
     <ConfirmDialog
@@ -452,8 +382,8 @@
       :message="deleteDialogMessage"
       :loading="loading"
       type="danger"
-      :confirm-text="locale.dialog.confirmDelete"
-      :cancel-text="locale.dialog.cancel"
+      confirm-text="确认删除"
+      cancel-text="取消"
       @confirm="confirmDelete"
       @close="showDeleteDialog = false"
     />
@@ -463,12 +393,7 @@
       :song-title="submissionRemarkDialog.songTitle"
       :content="submissionRemarkDialog.content"
       :is-public="submissionRemarkDialog.isPublic"
-      :is-updating-public="submissionRemarkDialog.isUpdatingPublic"
-      :note-status="submissionRemarkDialog.status"
       @close="submissionRemarkDialog.show = false"
-      @update:is-public="updateSubmissionNotePublic"
-      @approve="updateSubmissionNotePublicStatus('approved')"
-      @reject="updateSubmissionNotePublicStatus('rejected')"
     />
 
     <!-- 驳回歌曲对话框 -->
@@ -482,16 +407,16 @@
     >
       <div
         v-if="showRejectDialog"
-        class="fixed inset-0 z-50 flex items-center justify-center p-4 bg-bg-primary-80 backdrop-blur-sm"
+        class="fixed inset-0 z-50 flex items-center justify-center p-4 bg-zinc-950/80 backdrop-blur-sm"
       >
         <div
-          class="w-full max-w-lg bg-bg-secondary border border-border-secondary rounded-xl shadow-2xl overflow-hidden"
+          class="w-full max-w-lg bg-zinc-900 border border-zinc-800 rounded-xl shadow-2xl overflow-hidden"
           @click.stop
         >
-          <div class="px-8 py-6 border-b border-border-secondary-50 flex items-center justify-between">
-            <h3 class="text-xl font-black text-text-primary">{{ locale.rejectDialog.title }}</h3>
+          <div class="px-8 py-6 border-b border-zinc-800/50 flex items-center justify-between">
+            <h3 class="text-xl font-black text-zinc-100">{{ isBatchReject ? `批量驳回歌曲 (${selectedSongs.length} 首)` : '驳回歌曲' }}</h3>
             <button
-              class="text-text-tertiary hover:text-text-secondary transition-colors"
+              class="text-zinc-500 hover:text-zinc-300 transition-colors"
               @click="cancelReject"
             >
               <X :size="20" />
@@ -499,26 +424,37 @@
           </div>
 
           <div class="p-8 space-y-6">
-            <div class="p-5 bg-bg-primary border border-border-secondary rounded-lg flex items-center gap-4">
+            <div v-if="!isBatchReject" class="p-5 bg-zinc-950 border border-zinc-800 rounded-lg flex items-center gap-4">
               <div
-                class="w-10 h-10 rounded-lg bg-error-10 text-error flex items-center justify-center border border-error-10"
+                class="w-10 h-10 rounded-lg bg-red-500/10 text-red-500 flex items-center justify-center border border-red-500/10"
               >
                 <Music :size="18" />
               </div>
               <div>
-                <h4 class="font-bold text-text-primary text-sm">{{ rejectSongInfo.title }}</h4>
-                <p class="text-xs text-text-tertiary">{{ locale.rejectDialog.requester(rejectSongInfo.requester) }}</p>
+                <h4 class="font-bold text-zinc-100 text-sm">{{ rejectSongInfo.title }}</h4>
+                <p class="text-xs text-zinc-500">投稿人: {{ rejectSongInfo.requester }}</p>
+              </div>
+            </div>
+            <div v-else class="p-5 bg-zinc-950 border border-zinc-800 rounded-lg flex items-center gap-4">
+              <div
+                class="w-10 h-10 rounded-lg bg-amber-500/10 text-amber-500 flex items-center justify-center border border-amber-500/10"
+              >
+                <ListMusic :size="18" />
+              </div>
+              <div>
+                <h4 class="font-bold text-zinc-100 text-sm">即将批量驳回 {{ selectedSongs.length }} 首歌曲</h4>
+                <p class="text-xs text-zinc-500">驳回后将一并清理投票、排期记录并发送通知给对应投稿人</p>
               </div>
             </div>
 
             <div class="space-y-2">
-              <label class="text-[10px] font-black text-text-disabled uppercase tracking-widest px-1"
-                >{{ locale.rejectDialog.reason }}</label
+              <label class="text-[10px] font-black text-zinc-600 uppercase tracking-widest px-1"
+                >驳回原因</label
               >
               <textarea
                 v-model="rejectReason"
-                :placeholder="locale.rejectDialog.reasonPlaceholder"
-                class="w-full bg-bg-primary border border-border-secondary rounded-lg px-4 py-4 text-sm text-text-primary focus:outline-none focus:border-error-30 min-h-[120px] resize-none transition-all"
+                placeholder="请输入驳回原因，将通过系统通知发送给投稿人..."
+                class="w-full bg-zinc-950 border border-zinc-800 rounded-lg px-4 py-4 text-sm text-zinc-200 focus:outline-none focus:border-red-500/30 min-h-[120px] resize-none transition-all"
               />
             </div>
 
@@ -526,33 +462,33 @@
               <input
                 v-model="addToBlacklist"
                 type="checkbox"
-                class="w-4 h-4 rounded border-border-secondary bg-bg-primary accent-red-600"
-              />
+                class="w-4 h-4 rounded border-zinc-800 bg-zinc-950 accent-red-600"
+              >
               <div>
                 <span
-                  class="text-xs font-bold text-text-secondary group-hover:text-error transition-colors"
-                  >{{ locale.rejectDialog.addToBlacklist }}</span
+                  class="text-xs font-bold text-zinc-300 group-hover:text-red-400 transition-colors"
+                  >同时将此歌曲加入黑名单</span
                 >
-                <p class="text-[10px] text-text-disabled font-medium">
-                  {{ locale.rejectDialog.blacklistHint }}
+                <p class="text-[10px] text-zinc-600 font-medium">
+                  加入黑名单后，该歌曲将无法再次被投稿
                 </p>
               </div>
             </label>
           </div>
 
-          <div class="px-8 py-6 bg-bg-secondary-50 border-t border-border-secondary-50 flex gap-3 justify-end">
+          <div class="px-8 py-6 bg-zinc-900/50 border-t border-zinc-800/50 flex gap-3 justify-end">
             <button
-              class="px-6 py-2.5 text-xs font-bold text-text-tertiary hover:text-text-secondary"
+              class="px-6 py-2.5 text-xs font-bold text-zinc-500 hover:text-zinc-300"
               @click="cancelReject"
             >
-              {{ locale.dialog.cancel }}
+              取消
             </button>
             <button
               :disabled="rejectLoading"
-              class="px-8 py-2.5 bg-error hover:bg-error text-text-primary text-xs font-black rounded-lg transition-all disabled:opacity-50"
+              class="px-8 py-2.5 bg-red-600 hover:bg-red-500 text-white text-xs font-black rounded-lg transition-all disabled:opacity-50"
               @click="confirmReject"
             >
-              {{ rejectLoading ? locale.rejectDialog.processing : locale.rejectDialog.confirm }}
+              {{ rejectLoading ? '处理中...' : '确认驳回' }}
             </button>
           </div>
         </div>
@@ -580,18 +516,18 @@
     >
       <div
         v-if="showEditModal || showAddSongModal"
-        class="fixed inset-0 z-50 flex items-center justify-center p-4 bg-bg-primary-80 backdrop-blur-sm overflow-y-auto"
+        class="fixed inset-0 z-50 flex items-center justify-center p-4 bg-zinc-950/80 backdrop-blur-sm overflow-y-auto"
       >
         <div
-          class="w-full max-w-2xl bg-bg-secondary border border-border-secondary rounded-xl shadow-2xl overflow-hidden my-auto"
+          class="w-full max-w-2xl bg-zinc-900 border border-zinc-800 rounded-xl shadow-2xl overflow-hidden my-auto"
           @click.stop
         >
-          <div class="px-8 py-6 border-b border-border-secondary-50 flex items-center justify-between">
-            <h3 class="text-xl font-black text-text-primary">
-              {{ showEditModal ? locale.editModal.editTitle : locale.editModal.addTitle }}
+          <div class="px-8 py-6 border-b border-zinc-800/50 flex items-center justify-between">
+            <h3 class="text-xl font-black text-zinc-100">
+              {{ showEditModal ? '编辑歌曲' : '手动添加歌曲' }}
             </h3>
             <button
-              class="text-text-tertiary hover:text-text-secondary transition-colors"
+              class="text-zinc-500 hover:text-zinc-300 transition-colors"
               @click="showEditModal ? cancelEditSong() : cancelAddSong()"
             >
               <X :size="20" />
@@ -601,48 +537,48 @@
           <div class="p-8 space-y-6 max-h-[70vh] overflow-y-auto custom-scrollbar">
             <div class="grid grid-cols-1 md:grid-cols-2 gap-5">
               <div class="space-y-2">
-                <label class="text-[10px] font-black text-text-disabled uppercase tracking-widest px-1"
-                  >{{ locale.editModal.titleLabel }}</label
+                <label class="text-[10px] font-black text-zinc-600 uppercase tracking-widest px-1"
+                  >歌曲名称</label
                 >
                 <input
                   v-if="showEditModal"
                   v-model="editForm.title"
                   type="text"
-                  :placeholder="locale.editModal.titlePlaceholder"
-                  class="w-full bg-bg-primary border border-border-secondary rounded-lg px-4 py-3 text-sm text-text-primary focus:outline-none focus:border-primary-30 transition-all"
-                />
+                  placeholder="输入歌曲标题"
+                  class="w-full bg-zinc-950 border border-zinc-800 rounded-lg px-4 py-3 text-sm text-zinc-200 focus:outline-none focus:border-blue-500/30 transition-all"
+                >
                 <input
                   v-else
                   v-model="addForm.title"
                   type="text"
-                  :placeholder="locale.editModal.titlePlaceholder"
-                  class="w-full bg-bg-primary border border-border-secondary rounded-lg px-4 py-3 text-sm text-text-primary focus:outline-none focus:border-primary-30 transition-all"
-                />
+                  placeholder="输入歌曲标题"
+                  class="w-full bg-zinc-950 border border-zinc-800 rounded-lg px-4 py-3 text-sm text-zinc-200 focus:outline-none focus:border-blue-500/30 transition-all"
+                >
               </div>
               <div class="space-y-2">
-                <label class="text-[10px] font-black text-text-disabled uppercase tracking-widest px-1"
-                  >{{ locale.editModal.artistLabel }}</label
+                <label class="text-[10px] font-black text-zinc-600 uppercase tracking-widest px-1"
+                  >歌手</label
                 >
                 <input
                   v-if="showEditModal"
                   v-model="editForm.artist"
                   type="text"
-                  :placeholder="locale.editModal.artistPlaceholder"
-                  class="w-full bg-bg-primary border border-border-secondary rounded-lg px-4 py-3 text-sm text-text-primary focus:outline-none focus:border-primary-30 transition-all"
-                />
+                  placeholder="输入歌手姓名"
+                  class="w-full bg-zinc-950 border border-zinc-800 rounded-lg px-4 py-3 text-sm text-zinc-200 focus:outline-none focus:border-blue-500/30 transition-all"
+                >
                 <input
                   v-else
                   v-model="addForm.artist"
                   type="text"
-                  :placeholder="locale.editModal.artistPlaceholder"
-                  class="w-full bg-bg-primary border border-border-secondary rounded-lg px-4 py-3 text-sm text-text-primary focus:outline-none focus:border-primary-30 transition-all"
-                />
+                  placeholder="输入歌手姓名"
+                  class="w-full bg-zinc-950 border border-zinc-800 rounded-lg px-4 py-3 text-sm text-zinc-200 focus:outline-none focus:border-blue-500/30 transition-all"
+                >
               </div>
             </div>
 
             <div class="space-y-2">
-              <label class="text-[10px] font-black text-text-disabled uppercase tracking-widest px-1"
-                >{{ locale.editModal.requester }}</label
+              <label class="text-[10px] font-black text-zinc-600 uppercase tracking-widest px-1"
+                >投稿人</label
               >
               <div class="relative user-search-container">
                 <div class="relative">
@@ -650,25 +586,27 @@
                     v-if="showEditModal"
                     v-model="editUserSearchQuery"
                     type="text"
-                    :placeholder="locale.editModal.userSearchPlaceholder"
-                    class="w-full bg-bg-primary border border-border-secondary rounded-lg px-4 py-3 text-sm text-text-primary focus:outline-none focus:border-primary-30 transition-all"
+                    placeholder="搜索用户姓名或用户名"
+                    class="w-full bg-zinc-950 border border-zinc-800 rounded-lg px-4 py-3 text-sm text-zinc-200 focus:outline-none focus:border-blue-500/30 transition-all"
                     @focus="showEditUserDropdown = true"
                     @input="searchEditUsers()"
-                  />
+                  >
                   <input
                     v-else
                     v-model="userSearchQuery"
                     type="text"
-                    :placeholder="locale.editModal.userSearchPlaceholder"
-                    class="w-full bg-bg-primary border border-border-secondary rounded-lg px-4 py-3 text-sm text-text-primary focus:outline-none focus:border-primary-30 transition-all"
+                    placeholder="搜索用户姓名或用户名"
+                    class="w-full bg-zinc-950 border border-zinc-800 rounded-lg px-4 py-3 text-sm text-zinc-200 focus:outline-none focus:border-blue-500/30 transition-all"
                     @focus="showUserDropdown = true"
                     @input="searchUsers()"
-                  />
+                  >
                   <div
                     v-if="showEditModal ? editUserSearchLoading : userSearchLoading"
                     class="absolute right-4 top-1/2 -translate-y-1/2"
                   >
-                    <AppSpinner :size="16" />
+                    <div
+                      class="w-4 h-4 border-2 border-blue-500/20 border-t-blue-500 rounded-full animate-spin"
+                    />
                   </div>
                 </div>
 
@@ -679,19 +617,19 @@
                       ? showEditUserDropdown && filteredEditUsers.length > 0
                       : showUserDropdown && filteredUsers.length > 0
                   "
-                  class="absolute z-10 w-full mt-2 bg-bg-secondary border border-border-secondary rounded-lg shadow-2xl overflow-hidden max-h-48 overflow-y-auto"
+                  class="absolute z-10 w-full mt-2 bg-zinc-900 border border-zinc-800 rounded-lg shadow-2xl overflow-hidden max-h-48 overflow-y-auto"
                 >
                   <div
                     v-for="user in showEditModal
                       ? filteredEditUsers.slice(0, 10)
                       : filteredUsers.slice(0, 10)"
                     :key="user.id"
-                    class="px-4 py-3 hover:bg-bg-tertiary cursor-pointer transition-colors flex items-center justify-between group"
+                    class="px-4 py-3 hover:bg-zinc-800 cursor-pointer transition-colors flex items-center justify-between group"
                     @click="showEditModal ? selectEditUser(user) : selectUser(user)"
                   >
                     <div class="flex flex-col">
-                      <span class="text-sm font-bold text-text-primary">{{ user.name }}</span>
-                      <span class="text-[10px] text-text-tertiary">@{{ user.username }}</span>
+                      <span class="text-sm font-bold text-zinc-200">{{ user.name }}</span>
+                      <span class="text-[10px] text-zinc-500">@{{ user.username }}</span>
                     </div>
                     <Check
                       v-if="
@@ -700,7 +638,7 @@
                           : selectedUser?.id === user.id
                       "
                       :size="14"
-                      class="text-primary"
+                      class="text-blue-500"
                     />
                   </div>
                 </div>
@@ -709,14 +647,14 @@
                 v-if="showEditModal ? selectedEditUser : selectedUser"
                 class="flex items-center gap-2 mt-2 px-1"
               >
-                <span class="text-[10px] font-bold text-primary"
-                  >{{ locale.editModal.selectedUser((showEditModal ? selectedEditUser : selectedUser).name) }}
+                <span class="text-[10px] font-bold text-blue-500"
+                  >已选择: {{ (showEditModal ? selectedEditUser : selectedUser).name }}
                   <template v-if="(showEditModal ? selectedEditUser : selectedUser).username">
                     (@{{ (showEditModal ? selectedEditUser : selectedUser).username }})
                   </template></span
                 >
                 <button
-                  class="text-text-disabled hover:text-text-tertiary"
+                  class="text-zinc-600 hover:text-zinc-400"
                   @click="showEditModal ? clearSelectedEditUser() : clearSelectedUser()"
                 >
                   <X :size="12" />
@@ -725,19 +663,22 @@
             </div>
 
             <div v-if="showEditModal" class="space-y-2">
-              <label class="text-[10px] font-black text-text-disabled uppercase tracking-widest px-1"
-                >{{ locale.editModal.collaborators }}</label
+              <label class="text-[10px] font-black text-zinc-600 uppercase tracking-widest px-1"
+                >联合投稿人</label
               >
               <div class="space-y-3 user-search-container">
-                <div v-if="selectedEditCollaborators.length > 0" class="flex flex-wrap gap-2">
+                <div
+                  v-if="selectedEditCollaborators.length > 0"
+                  class="flex flex-wrap gap-2"
+                >
                   <span
                     v-for="collaborator in selectedEditCollaborators"
                     :key="collaborator.id"
-                    class="inline-flex items-center gap-2 px-3 py-1.5 rounded-lg bg-bg-primary border border-border-secondary text-xs text-text-secondary"
+                    class="inline-flex items-center gap-2 px-3 py-1.5 rounded-lg bg-zinc-950 border border-zinc-800 text-xs text-zinc-300"
                   >
                     {{ getCollaboratorDisplayName(collaborator) }}
                     <button
-                      class="text-text-tertiary hover:text-error transition-colors"
+                      class="text-zinc-500 hover:text-red-400 transition-colors"
                       @click="removeEditCollaborator(collaborator.id)"
                     >
                       <X :size="12" />
@@ -748,98 +689,78 @@
                   <input
                     v-model="editCollaboratorSearchQuery"
                     type="text"
-                    :placeholder="locale.editModal.collaboratorSearchPlaceholder"
-                    class="w-full bg-bg-primary border border-border-secondary rounded-lg px-4 py-3 text-sm text-text-primary focus:outline-none focus:border-primary-30 transition-all"
+                    placeholder="搜索并添加联合投稿人"
+                    class="w-full bg-zinc-950 border border-zinc-800 rounded-lg px-4 py-3 text-sm text-zinc-200 focus:outline-none focus:border-blue-500/30 transition-all"
                     @focus="showEditCollaboratorDropdown = true"
                     @input="searchEditCollaborators()"
-                  />
+                  >
                   <div
                     v-if="editCollaboratorSearchLoading"
                     class="absolute right-4 top-1/2 -translate-y-1/2"
                   >
-                    <AppSpinner :size="16" />
+                    <div
+                      class="w-4 h-4 border-2 border-blue-500/20 border-t-blue-500 rounded-full animate-spin"
+                    />
                   </div>
                   <div
                     v-if="showEditCollaboratorDropdown && filteredEditCollaborators.length > 0"
-                    class="absolute z-10 w-full mt-2 bg-bg-secondary border border-border-secondary rounded-lg shadow-2xl overflow-hidden max-h-48 overflow-y-auto"
+                    class="absolute z-10 w-full mt-2 bg-zinc-900 border border-zinc-800 rounded-lg shadow-2xl overflow-hidden max-h-48 overflow-y-auto"
                   >
                     <div
                       v-for="user in filteredEditCollaborators.slice(0, 10)"
                       :key="user.id"
-                      class="px-4 py-3 hover:bg-bg-tertiary cursor-pointer transition-colors flex items-center justify-between group"
+                      class="px-4 py-3 hover:bg-zinc-800 cursor-pointer transition-colors flex items-center justify-between group"
                       @click="selectEditCollaborator(user)"
                     >
                       <div class="flex flex-col">
-                        <span class="text-sm font-bold text-text-primary">{{ user.name }}</span>
-                        <span class="text-[10px] text-text-tertiary">@{{ user.username }}</span>
+                        <span class="text-sm font-bold text-zinc-200">{{ user.name }}</span>
+                        <span class="text-[10px] text-zinc-500">@{{ user.username }}</span>
                       </div>
-                      <Plus :size="14" class="text-primary opacity-70 group-hover:opacity-100" />
+                      <Plus :size="14" class="text-blue-500 opacity-70 group-hover:opacity-100" />
                     </div>
                   </div>
                 </div>
-                <p class="text-[10px] text-text-disabled font-medium px-1">
-                  {{ locale.editModal.collaboratorHint }}
+                <p class="text-[10px] text-zinc-600 font-medium px-1">
+                  支持添加多个联合投稿人，保存后立即生效
                 </p>
               </div>
             </div>
 
-            <div class="grid grid-cols-1 md:grid-cols-2 gap-5">
-              <div class="space-y-2">
-                <label class="text-[10px] font-black text-text-disabled uppercase tracking-widest px-1"
-                  >{{ locale.filters.semester }}</label
-                >
-                <CustomSelect
-                  v-if="showEditModal"
-                  v-model="editForm.semester"
-                  :options="availableSemesters"
-                  label-key="name"
-                  value-key="name"
-                  :placeholder="locale.filters.selectSemester"
-                />
-                <CustomSelect
-                  v-else
-                  v-model="addForm.semester"
-                  :options="availableSemesters"
-                  label-key="name"
-                  value-key="name"
-                  :placeholder="locale.filters.selectSemester"
-                />
-              </div>
-              <div class="space-y-2">
-                <label class="text-[10px] font-black text-text-disabled uppercase tracking-widest px-1"
-                  >{{ locale.editModal.preferredPlayTime }}</label
-                >
-                <CustomSelect
-                  v-if="showEditModal"
-                  v-model="editForm.preferredPlayTimeId"
-                  :options="availablePlayTimes.filter((p) => p.id !== 'all')"
-                  label-key="name"
-                  value-key="id"
-                  :placeholder="locale.editModal.selectPreferredPlayTime"
-                />
-                <CustomSelect
-                  v-else
-                  v-model="addForm.preferredPlayTimeId"
-                  :options="availablePlayTimes.filter((p) => p.id !== 'all')"
-                  label-key="name"
-                  value-key="id"
-                  :placeholder="locale.editModal.selectPreferredPlayTime"
-                />
-              </div>
+            <div class="space-y-2">
+              <label class="text-[10px] font-black text-zinc-600 uppercase tracking-widest px-1"
+                >学期</label
+              >
+              <CustomSelect
+                v-if="showEditModal"
+                v-model="editForm.semester"
+                :options="availableSemesters"
+                label-key="name"
+                value-key="name"
+                placeholder="选择学期"
+              />
+              <CustomSelect
+                v-else
+                v-model="addForm.semester"
+                :options="availableSemesters"
+                label-key="name"
+                value-key="name"
+                placeholder="选择学期"
+              />
             </div>
 
+
             <div v-if="showEditModal" class="space-y-3">
               <div class="flex items-center justify-between gap-3 px-1">
-                <label class="text-[10px] font-black text-text-disabled uppercase tracking-widest"
-                  >{{ locale.editModal.submissionNote }}</label
+                <label class="text-[10px] font-black text-zinc-600 uppercase tracking-widest"
+                  >歌曲备注</label
                 >
                 <button
                   :disabled="!canClearEditSubmissionNote && !submissionNoteClearRequested"
                   class="inline-flex items-center gap-2 px-3 py-1.5 rounded-lg border text-[10px] font-black tracking-widest uppercase transition-all disabled:opacity-40 disabled:cursor-not-allowed"
                   :class="
                     submissionNoteClearRequested
-                      ? 'border-border-tertiary bg-bg-primary text-text-secondary hover:border-border-tertiary'
-                      : 'border-warning-20 bg-warning-10 text-warning hover:bg-warning-20'
+                      ? 'border-zinc-700 bg-zinc-950 text-zinc-300 hover:border-zinc-600'
+                      : 'border-amber-500/20 bg-amber-500/10 text-amber-400 hover:bg-amber-500/20'
                   "
                   @click="
                     submissionNoteClearRequested
@@ -847,193 +768,124 @@
                       : requestClearSubmissionNote()
                   "
                 >
-                  {{ submissionNoteClearRequested ? locale.editModal.cancelClearNote : locale.editModal.clearNote }}
+                  {{ submissionNoteClearRequested ? '撤销清空' : '清空备注' }}
                 </button>
               </div>
               <textarea
                 v-model="editForm.submissionNote"
                 :disabled="submissionNoteClearRequested"
-                :placeholder="locale.editModal.submissionNotePlaceholder"
-                class="w-full bg-bg-primary border border-border-secondary rounded-lg px-4 py-4 text-sm text-text-primary focus:outline-none focus:border-primary-30 min-h-[120px] resize-none transition-all disabled:opacity-50 disabled:cursor-not-allowed"
+                placeholder="填写歌曲备注"
+                class="w-full bg-zinc-950 border border-zinc-800 rounded-lg px-4 py-4 text-sm text-zinc-200 focus:outline-none focus:border-blue-500/30 min-h-[120px] resize-none transition-all disabled:opacity-50 disabled:cursor-not-allowed"
               />
-              <label
-                class="flex items-center gap-3 px-1 transition-opacity"
-                :class="
-                  submissionNoteClearRequested
-                    ? 'opacity-50 cursor-not-allowed'
-                    : 'cursor-pointer group'
-                "
-              >
-                <input
-                  v-model="editForm.submissionNotePublic"
-                  :disabled="submissionNoteClearRequested"
-                  type="checkbox"
-                  class="w-4 h-4 rounded border-border-secondary bg-bg-primary"
-                />
-                <div>
-                  <span
-                    class="text-xs font-bold transition-colors"
-                    :class="submissionNoteClearRequested ? 'text-text-tertiary' : 'text-text-secondary group-hover:text-primary'"
-                    >{{ locale.editModal.publicNote }}</span
-                  >
-                  <p class="text-[10px] text-text-disabled font-medium">
-                    {{ locale.editModal.publicNoteHint }}
-                  </p>
-                </div>
-              </label>
               <div
                 v-if="submissionNoteClearRequested"
-                class="space-y-3 rounded-xl border border-warning-20 bg-warning-5 p-4"
+                class="space-y-3 rounded-xl border border-amber-500/20 bg-amber-500/5 p-4"
               >
-                <div class="text-xs font-bold text-warning">
-                  {{ locale.editModal.clearNoteHint }}
+                <div class="text-xs font-bold text-amber-300">
+                  保存后将清空当前备注，可填写理由并发送通知
                 </div>
                 <textarea
                   v-model="submissionNoteClearReason"
-                  :placeholder="locale.editModal.clearNoteReasonPlaceholder"
-                  class="w-full bg-bg-primary border border-border-secondary rounded-lg px-4 py-3 text-sm text-text-primary focus:outline-none focus:border-warning-30 min-h-[96px] resize-none transition-all"
+                  placeholder="可选：请输入清空备注的理由，例如：备注内容违规"
+                  class="w-full bg-zinc-950 border border-zinc-800 rounded-lg px-4 py-3 text-sm text-zinc-200 focus:outline-none focus:border-amber-500/30 min-h-[96px] resize-none transition-all"
                 />
                 <label class="flex items-center gap-3 cursor-pointer group">
                   <input
                     v-model="notifyOnSubmissionNoteClear"
                     type="checkbox"
-                    class="w-4 h-4 rounded border-border-secondary bg-bg-primary accent-amber-500"
-                  />
+                    class="w-4 h-4 rounded border-zinc-800 bg-zinc-950 accent-amber-500"
+                  >
                   <div>
-                    <span class="text-xs font-bold text-text-secondary group-hover:text-warning transition-colors"
-                      >{{ locale.editModal.notifyAfterClear }}</span
+                    <span class="text-xs font-bold text-zinc-300 group-hover:text-amber-300 transition-colors"
+                      >清空后发送通知</span
                     >
-                    <p class="text-[10px] text-text-disabled font-medium">
-                      {{ locale.editModal.notifyAfterClearHint }}
+                    <p class="text-[10px] text-zinc-600 font-medium">
+                      将通知主投稿人和当前联合投稿人
                     </p>
                   </div>
                 </label>
               </div>
             </div>
-            <div class="grid grid-cols-1 md:grid-cols-2 gap-5 pt-4 border-t border-border-secondary-50">
+            <div class="grid grid-cols-1 md:grid-cols-2 gap-5 pt-4 border-t border-zinc-800/50">
               <div class="space-y-2">
-                <label class="text-[10px] font-black text-text-disabled uppercase tracking-widest px-1"
-                  >{{ locale.editModal.musicPlatform }}</label
+                <label class="text-[10px] font-black text-zinc-600 uppercase tracking-widest px-1"
+                  >音乐平台 (可选)</label
                 >
                 <CustomSelect
                   v-if="showEditModal"
                   v-model="editForm.musicPlatform"
                   :options="[
-                    { label: locale.platforms.netease, value: 'netease' },
-                    { label: locale.platforms.tencent, value: 'tencent' },
-                    { label: locale.platforms.bilibili, value: 'bilibili' }
+                    { label: '网易云音乐', value: 'netease' },
+                    { label: 'QQ音乐', value: 'tencent' },
+                    { label: '哔哩哔哩', value: 'bilibili' }
                   ]"
-                  :placeholder="locale.editModal.selectPlatform"
+                  placeholder="选择平台"
                 />
                 <CustomSelect
                   v-else
                   v-model="addForm.musicPlatform"
                   :options="[
-                    { label: locale.platforms.netease, value: 'netease' },
-                    { label: locale.platforms.tencent, value: 'tencent' },
-                    { label: locale.platforms.bilibili, value: 'bilibili' }
+                    { label: '网易云音乐', value: 'netease' },
+                    { label: 'QQ音乐', value: 'tencent' },
+                    { label: '哔哩哔哩', value: 'bilibili' }
                   ]"
-                  :placeholder="locale.editModal.selectPlatform"
+                  placeholder="选择平台"
                 />
               </div>
               <div class="space-y-2">
-                <label class="text-[10px] font-black text-text-disabled uppercase tracking-widest px-1"
-                  >{{ locale.editModal.musicId }}</label
+                <label class="text-[10px] font-black text-zinc-600 uppercase tracking-widest px-1"
+                  >音乐ID (可选)</label
                 >
                 <input
                   v-if="showEditModal"
                   v-model="editForm.musicId"
                   type="text"
-                  :placeholder="locale.editModal.musicIdPlaceholder"
-                  class="w-full bg-bg-primary border border-border-secondary rounded-lg px-4 py-3 text-sm text-text-primary focus:outline-none transition-all"
-                />
+                  placeholder="输入平台唯一标识符"
+                  class="w-full bg-zinc-950 border border-zinc-800 rounded-lg px-4 py-3 text-sm text-zinc-200 focus:outline-none transition-all"
+                >
                 <input
                   v-else
                   v-model="addForm.musicId"
                   type="text"
-                  :placeholder="locale.editModal.musicIdPlaceholder"
-                  class="w-full bg-bg-primary border border-border-secondary rounded-lg px-4 py-3 text-sm text-text-primary focus:outline-none transition-all"
-                />
-              </div>
-            </div>
-
-            <div class="space-y-2">
-              <label class="text-[10px] font-black text-text-disabled uppercase tracking-widest px-1"
-                >{{ locale.editModal.duration }}</label
-              >
-              <div class="flex gap-2">
-                <input
-                  v-if="showEditModal"
-                  v-model="editForm.durationSeconds"
-                  type="number"
-                  min="0"
-                  max="7200"
-                  :placeholder="locale.editModal.durationPlaceholder"
-                  class="w-full bg-bg-primary border border-border-secondary rounded-lg px-4 py-3 text-sm text-text-primary focus:outline-none transition-all"
-                />
-                <input
-                  v-else
-                  v-model="addForm.durationSeconds"
-                  type="number"
-                  min="0"
-                  max="7200"
-                  :placeholder="locale.editModal.durationPlaceholder"
-                  class="w-full bg-bg-primary border border-border-secondary rounded-lg px-4 py-3 text-sm text-text-primary focus:outline-none transition-all"
-                />
-                <button
-                  type="button"
-                  :disabled="
-                    refreshDurationLoading ||
-                    (showEditModal
-                      ? !editForm.musicPlatform || !editForm.musicId
-                      : !addForm.musicPlatform || !addForm.musicId)
-                  "
-                  class="px-4 py-3 bg-bg-tertiary-50 hover:bg-bg-quaternary text-text-secondary text-xs font-bold rounded-lg transition-all border border-border-tertiary-30 disabled:opacity-50 disabled:cursor-not-allowed shrink-0 flex items-center gap-1.5"
-                  :title="locale.editModal.refreshDuration"
-                  @click="refreshDurationInModal"
+                  placeholder="输入平台唯一标识符"
+                  class="w-full bg-zinc-950 border border-zinc-800 rounded-lg px-4 py-3 text-sm text-zinc-200 focus:outline-none transition-all"
                 >
-                  <RotateCcw :size="14" :class="{ 'animate-spin': refreshDurationLoading }" />
-                  {{ locale.editModal.refreshDuration }}
-                </button>
               </div>
-              <p class="text-[10px] text-text-disabled font-medium px-1">
-                {{ locale.editModal.durationHint }}
-              </p>
             </div>
 
             <div class="space-y-2">
-              <label class="text-[10px] font-black text-text-disabled uppercase tracking-widest px-1"
-                >{{ locale.editModal.coverUrl }}</label
+              <label class="text-[10px] font-black text-zinc-600 uppercase tracking-widest px-1"
+                >封面URL (可选)</label
               >
               <input
                 v-if="showEditModal"
                 v-model="editForm.cover"
                 type="text"
                 placeholder="http://..."
-                class="w-full bg-bg-primary border border-border-secondary rounded-lg px-4 py-3 text-sm text-text-primary focus:outline-none transition-all"
-              />
+                class="w-full bg-zinc-950 border border-zinc-800 rounded-lg px-4 py-3 text-sm text-zinc-200 focus:outline-none transition-all"
+              >
               <input
                 v-else
                 v-model="addForm.cover"
                 type="text"
                 placeholder="http://..."
-                class="w-full bg-bg-primary border border-border-secondary rounded-lg px-4 py-3 text-sm text-text-primary focus:outline-none transition-all"
-              />
+                class="w-full bg-zinc-950 border border-zinc-800 rounded-lg px-4 py-3 text-sm text-zinc-200 focus:outline-none transition-all"
+              >
               <p
                 v-if="
                   (showEditModal ? editCoverValidation.valid : addCoverValidation.valid) &&
                   (showEditModal ? editForm.cover : addForm.cover)
                 "
-                class="text-[10px] text-success-80 font-bold px-1 flex items-center gap-1"
+                class="text-[10px] text-emerald-500/80 font-bold px-1 flex items-center gap-1"
               >
-                <Check :size="10" /> {{ locale.editModal.validUrl }}
+                <Check :size="10" /> URL有效
               </p>
               <p
                 v-if="
                   !(showEditModal ? editCoverValidation.valid : addCoverValidation.valid) &&
                   (showEditModal ? editForm.cover : addForm.cover)
                 "
-                class="text-[10px] text-error-80 font-bold px-1 flex items-center gap-1"
+                class="text-[10px] text-red-500/80 font-bold px-1 flex items-center gap-1"
               >
                 <X :size="10" />
                 {{ showEditModal ? editCoverValidation.error : addCoverValidation.error }}
@@ -1041,38 +893,38 @@
             </div>
 
             <div class="space-y-2">
-              <label class="text-[10px] font-black text-text-disabled uppercase tracking-widest px-1"
-                >{{ locale.editModal.playUrl }}</label
+              <label class="text-[10px] font-black text-zinc-600 uppercase tracking-widest px-1"
+                >播放地址URL (可选)</label
               >
               <input
                 v-if="showEditModal"
                 v-model="editForm.playUrl"
                 type="text"
                 placeholder="http://..."
-                class="w-full bg-bg-primary border border-border-secondary rounded-lg px-4 py-3 text-sm text-text-primary focus:outline-none transition-all"
-              />
+                class="w-full bg-zinc-950 border border-zinc-800 rounded-lg px-4 py-3 text-sm text-zinc-200 focus:outline-none transition-all"
+              >
               <input
                 v-else
                 v-model="addForm.playUrl"
                 type="text"
                 placeholder="http://..."
-                class="w-full bg-bg-primary border border-border-secondary rounded-lg px-4 py-3 text-sm text-text-primary focus:outline-none transition-all"
-              />
+                class="w-full bg-zinc-950 border border-zinc-800 rounded-lg px-4 py-3 text-sm text-zinc-200 focus:outline-none transition-all"
+              >
               <p
                 v-if="
                   (showEditModal ? editPlayUrlValidation.valid : addPlayUrlValidation.valid) &&
                   (showEditModal ? editForm.playUrl : addForm.playUrl)
                 "
-                class="text-[10px] text-success-80 font-bold px-1 flex items-center gap-1"
+                class="text-[10px] text-emerald-500/80 font-bold px-1 flex items-center gap-1"
               >
-                <Check :size="10" /> {{ locale.editModal.validUrl }}
+                <Check :size="10" /> URL有效
               </p>
               <p
                 v-if="
                   !(showEditModal ? editPlayUrlValidation.valid : addPlayUrlValidation.valid) &&
                   (showEditModal ? editForm.playUrl : addForm.playUrl)
                 "
-                class="text-[10px] text-error-80 font-bold px-1 flex items-center gap-1"
+                class="text-[10px] text-red-500/80 font-bold px-1 flex items-center gap-1"
               >
                 <X :size="10" />
                 {{ showEditModal ? editPlayUrlValidation.error : addPlayUrlValidation.error }}
@@ -1080,26 +932,26 @@
             </div>
           </div>
 
-          <div class="px-8 py-6 bg-bg-secondary-50 border-t border-border-secondary-50 flex gap-3 justify-end">
+          <div class="px-8 py-6 bg-zinc-900/50 border-t border-zinc-800/50 flex gap-3 justify-end">
             <button
-              class="px-6 py-2.5 text-xs font-bold text-text-tertiary hover:text-text-secondary"
+              class="px-6 py-2.5 text-xs font-bold text-zinc-500 hover:text-zinc-300"
               @click="showEditModal ? cancelEditSong() : cancelAddSong()"
             >
-              {{ locale.dialog.cancel }}
+              取消
             </button>
             <button
               :disabled="showEditModal ? editLoading : !canSubmitAddForm || addLoading"
-              class="px-8 py-2.5 bg-primary-hover hover:bg-primary text-text-primary text-xs font-black rounded-lg transition-all disabled:opacity-50"
+              class="px-8 py-2.5 bg-blue-600 hover:bg-blue-500 text-white text-xs font-black rounded-lg transition-all disabled:opacity-50"
               @click="showEditModal ? saveEditSong() : saveAddSong()"
             >
               {{
                 showEditModal
                   ? editLoading
-                    ? locale.editModal.saving
-                    : locale.editModal.saveChanges
+                    ? '保存中...'
+                    : '保存更改'
                   : addLoading
-                    ? locale.editModal.adding
-                    : locale.editModal.addSong
+                    ? '添加中...'
+                    : '添加歌曲'
               }}
             </button>
           </div>
@@ -1109,7 +961,7 @@
   </div>
 </template>
 
-<script setup>
+<script setup lang="ts">
 import { computed, onMounted, ref, watch, onUnmounted } from 'vue'
 import ConfirmDialog from '~/components/UI/ConfirmDialog.vue'
 import VotersModal from '~/components/Admin/VotersModal.vue'
@@ -1117,7 +969,6 @@ import SongDownloadDialog from '~/components/Admin/SongDownloadDialog.vue'
 import SubmissionRemarkDialog from '~/components/Admin/SubmissionRemarkDialog.vue'
 import Pagination from '~/components/UI/Common/Pagination.vue'
 import CustomSelect from '~/components/UI/Common/CustomSelect.vue'
-import AppSpinner from '~/components/UI/Common/AppSpinner.vue'
 import {
   Search,
   Plus,
@@ -1127,6 +978,7 @@ import {
   X,
   Trash2,
   Music,
+  ListMusic,
   Heart,
   Download,
   ChevronDown,
@@ -1135,7 +987,8 @@ import {
   ChevronsLeft,
   ChevronsRight,
   ExternalLink,
-  MessageSquare
+  MessageSquare,
+  CalendarDays
 } from '@lucide/vue'
 import { useSongs } from '~/composables/useSongs'
 import { useAdmin } from '~/composables/useAdmin'
@@ -1143,46 +996,10 @@ import { useAuth } from '~/composables/useAuth'
 import { useToast } from '~/composables/useToast'
 import { useSemesters } from '~/composables/useSemesters'
 import { useSongPlayer } from '~/composables/useSongPlayer'
-import { useLocale } from '~/utils/locale'
-import { isBilibiliSong } from '~/utils/bilibiliSource'
 import { validateUrl, convertToHttps } from '~/utils/url'
-import { formatDuration } from '~/utils/timeUtils'
-import dayjs from 'dayjs'
-import customParseFormat from 'dayjs/plugin/customParseFormat'
-
-dayjs.extend(customParseFormat)
 
 // 响应式数据
 const { showToast: showNotification } = useToast()
-const { admin } = useLocale()
-const locale = computed(() => {
-  const base = admin.value?.songManagement || {}
-  const emptyText = () => ''
-  return useSafeLocale({
-    ...base,
-    stats: { ...(base.stats || {}) },
-    actions: { ...(base.actions || {}) },
-    filters: { ...(base.filters || {}) },
-    table: { ...(base.table || {}) },
-    empty: { ...(base.empty || {}) },
-    dialog: { ...(base.dialog || {}) },
-    rejectDialog: {
-      requester: emptyText,
-      ...(base.rejectDialog || {})
-    },
-    editModal: {
-      selectedUser: emptyText,
-      ...(base.editModal || {})
-    },
-    timeAgo: {
-      ...(base.timeAgo || {}),
-      minutes: (value) => formatLocaleValue(base.timeAgo?.minutes, value) || '',
-      hours: (value) => formatLocaleValue(base.timeAgo?.hours, value) || '',
-      days: (value) => formatLocaleValue(base.timeAgo?.days, value) || ''
-    }
-  })
-})
-const { msg: getLocaleMessage, nested: getNestedMessage } = useLocaleText(locale)
 const loading = ref(false)
 const searchQuery = ref('')
 const statusFilter = ref('all')
@@ -1197,32 +1014,24 @@ const { playSong } = useSongPlayer()
 // 学期相关
 const selectedSemester = ref('all')
 const availableSemesters = ref([])
-const selectedSemesterName = computed(() => {
-  if (!selectedSemester.value || selectedSemester.value === 'all') return ''
-  return availableSemesters.value.find((semester) => String(semester.id) === String(selectedSemester.value))?.name || ''
-})
-
-// 时段相关
-const selectedPlayTime = ref('all')
-const availablePlayTimes = ref([])
 
 // 选项配置
-const statusOptions = computed(() => [
-  { label: getNestedMessage('options', 'allStatus'), value: 'all' },
-  { label: getNestedMessage('options', 'pending'), value: 'pending' },
-  { label: getNestedMessage('options', 'scheduled'), value: 'scheduled' },
-  { label: getNestedMessage('options', 'played'), value: 'played' },
-  { label: getNestedMessage('options', 'hasNote'), value: 'has-note' }
-])
+const statusOptions = [
+  { label: '全部状态', value: 'all' },
+  { label: '待排期', value: 'pending' },
+  { label: '已排期', value: 'scheduled' },
+  { label: '已播放', value: 'played' },
+  { label: '有备注', value: 'has-note' }
+]
 
-const sortOptions = computed(() => [
-  { label: getNestedMessage('options', 'newest'), value: 'time-desc' },
-  { label: getNestedMessage('options', 'oldest'), value: 'time-asc' },
-  { label: getNestedMessage('options', 'hotDesc'), value: 'votes-desc' },
-  { label: getNestedMessage('options', 'hotAsc'), value: 'votes-asc' },
-  { label: getNestedMessage('options', 'titleAsc'), value: 'title-asc' },
-  { label: getNestedMessage('options', 'titleDesc'), value: 'title-desc' }
-])
+const sortOptions = [
+  { label: '最新投稿', value: 'time-desc' },
+  { label: '最早投稿', value: 'time-asc' },
+  { label: '热度最高', value: 'votes-desc' },
+  { label: '热度最低', value: 'votes-asc' },
+  { label: '标题 A-Z', value: 'title-asc' },
+  { label: '标题 Z-A', value: 'title-desc' }
+]
 
 // 删除对话框相关
 const showDeleteDialog = ref(false)
@@ -1239,15 +1048,9 @@ const showDownloadDialog = ref(false)
 const selectedSongsForDownload = ref([])
 const submissionRemarkDialog = ref({
   show: false,
-  songId: null,
-  replayRequestId: null,
-  title: '',
-  artist: '',
   songTitle: '',
   content: '',
-  isPublic: false,
-  isUpdatingPublic: false,
-  status: null
+  isPublic: false
 })
 
 // 驳回歌曲相关
@@ -1255,6 +1058,7 @@ const showRejectDialog = ref(false)
 const rejectLoading = ref(false)
 const rejectReason = ref('')
 const addToBlacklist = ref(false)
+const isBatchReject = ref(false)
 const rejectSongInfo = ref({
   id: null,
   title: '',
@@ -1265,21 +1069,17 @@ const rejectSongInfo = ref({
 // 编辑歌曲相关
 const showEditModal = ref(false)
 const editLoading = ref(false)
-const refreshDurationLoading = ref(false)
 const editForm = ref({
   id: null,
   title: '',
   artist: '',
   requester: '',
   semester: '',
-  preferredPlayTimeId: 'none',
   submissionNote: '',
-  submissionNotePublic: false,
   musicPlatform: '',
   musicId: '',
   cover: '',
-  playUrl: '',
-  durationSeconds: ''
+  playUrl: ''
 })
 const originalEditSubmissionNote = ref('')
 const submissionNoteClearRequested = ref(false)
@@ -1295,12 +1095,10 @@ const addForm = ref({
   artist: '',
   requester: '',
   semester: '',
-  preferredPlayTimeId: 'none',
   musicPlatform: '',
   musicId: '',
   cover: '',
-  playUrl: '',
-  durationSeconds: ''
+  playUrl: ''
 })
 
 // URL验证状态
@@ -1338,10 +1136,9 @@ const songs = ref([])
 let songsService = null
 let adminService = null
 let auth = null
-let formatPlayTimeDisplay = (pt) => pt?.name || ''
 
 // 计算属性
-const baseFilteredSongs = computed(() => {
+const filteredSongs = computed(() => {
   if (!songs.value) return []
 
   let filtered = [...songs.value]
@@ -1359,25 +1156,9 @@ const baseFilteredSongs = computed(() => {
 
   // 学期过滤
   if (selectedSemester.value && selectedSemester.value !== 'all') {
-    filtered = filtered.filter((song) => song.semester === selectedSemesterName.value)
+    filtered = filtered.filter((song) => song.semester === selectedSemester.value)
   }
 
-  // 时段过滤
-  if (selectedPlayTime.value && selectedPlayTime.value !== 'all') {
-    filtered = filtered.filter((song) => {
-      if (selectedPlayTime.value === 'none') {
-        return !song.preferredPlayTimeId
-      }
-      return song.preferredPlayTimeId === selectedPlayTime.value
-    })
-  }
-
-  return filtered
-})
-
-const filteredSongs = computed(() => {
-  let filtered = [...baseFilteredSongs.value]
-
   // 状态过滤
   if (statusFilter.value !== 'all') {
     filtered = filtered.filter((song) => {
@@ -1434,11 +1215,11 @@ const totalPages = computed(() => {
 
 // 显示的分页按钮
 const playedCount = computed(() => {
-  return baseFilteredSongs.value.filter((song) => song.played).length
+  return songs.value.filter((song) => song.played).length
 })
 
 const pendingCount = computed(() => {
-  return baseFilteredSongs.value.filter((song) => !song.played).length
+  return songs.value.filter((song) => !song.played).length
 })
 
 const isAllSelected = computed(() => {
@@ -1485,172 +1266,32 @@ const canClearEditSubmissionNote = computed(() => {
 // 方法
 const formatDate = (dateString) => {
   const date = new Date(dateString)
-  const now = getSyncedDate()
+  const now = new Date()
   const diff = now - date
 
-  if (diff < 60000) return getNestedMessage('timeAgo', 'justNow')
-  if (diff < 3600000) return getNestedMessage('timeAgo', 'minutes', Math.floor(diff / 60000))
-  if (diff < 86400000) return getNestedMessage('timeAgo', 'hours', Math.floor(diff / 3600000))
-  return getNestedMessage('timeAgo', 'days', Math.floor(diff / 86400000))
-}
-
-const getPlayTimeName = (playTimeId) => {
-  if (!playTimeId || !availablePlayTimes.value) return ''
-  const playTime = availablePlayTimes.value.find((pt) => pt.id === playTimeId)
-  if (!playTime) return ''
-
-  return formatPlayTimeDisplay(playTime)
+  if (diff < 60000) return '刚刚'
+  if (diff < 3600000) return `${Math.floor(diff / 60000)}分钟前`
+  if (diff < 86400000) return `${Math.floor(diff / 3600000)}小时前`
+  return `${Math.floor(diff / 86400000)}天前`
 }
 
 const getStatusText = (song) => {
-  if (song.played) return getNestedMessage('options', 'played')
-  if (song.scheduled) {
-    // 如果有排期日期，在待播放后显示排期日期（月/日）
-    if (song.scheduleDate) {
-      // API返回的日期格式为 "YYYY/M/D H:mm:ss"（如 "2024/1/15 14:30:00"）
-      const date = dayjs(song.scheduleDate, 'YYYY/M/D H:mm:ss')
-      if (date.isValid()) {
-        return getLocaleMessage('scheduledWithDate', date.format('M/D'))
-      }
-    }
-    return getNestedMessage('options', 'scheduled')
-  }
-  return getNestedMessage('options', 'pending')
-}
-
-const updateSubmissionNotePublicStatus = async (status) => {
-  const dialogData = submissionRemarkDialog.value
-  if (!dialogData.songId || dialogData.isUpdatingPublic) return
-
-  // 兜底文案：避免异步回调里 getNestedMessage 因代码分割/作用域问题抛 ReferenceError
-  // 完全不调用 getNestedMessage 也能正常显示通知（避免任何作用域/死代码消除风险）
-  const fallbackText = {
-    success: status === 'approved' ? '已通过审核' : '已拒绝审核',
-    failure: '更新审核状态失败'
-  }
-  const safeMessage = (section, key, fallback) => {
-    try {
-      const text = getNestedMessage(section, key)
-      return text || fallback
-    } catch {
-      return fallback
-    }
-  }
-
-  dialogData.isUpdatingPublic = true
-
-  try {
-    const updatePayload = {
-      title: dialogData.title,
-      artist: dialogData.artist,
-      submissionNotePublicStatus: status
-    }
-    if (dialogData.replayRequestId) {
-      updatePayload.replayRequestId = dialogData.replayRequestId
-    }
-
-    await adminService.updateSong(dialogData.songId, updatePayload)
-
-    const songIndex = songs.value.findIndex((s) => s.id === dialogData.songId)
-    if (songIndex !== -1) {
-      songs.value[songIndex].submissionNotePublicStatus = status
-      if (status === 'approved') {
-        songs.value[songIndex].submissionNotePublic = true
-      }
-    }
-    dialogData.status = status
-    if (status === 'approved') {
-      dialogData.isPublic = true
-    }
-
-    if (window.$showNotification) {
-      try {
-        const successKey = status === 'rejected' ? 'remarkRejected' : 'remarkApproved'
-        window.$showNotification(safeMessage('messages', successKey, fallbackText.success), 'success')
-      } catch (notifyErr) {
-        // 静默失败，不影响主流程
-      }
-    }
-  } catch (error) {
-    console.error('更新备注审核状态失败:', error)
-    if (window.$showNotification) {
-      try {
-        window.$showNotification(safeMessage('errors', 'remarkUpdateFailed', fallbackText.failure), 'error')
-      } catch (notifyErr) {
-        // 静默失败
-      }
-    }
-  } finally {
-    dialogData.isUpdatingPublic = false
-  }
+  if (song.played) return '已播放'
+  if (song.scheduled) return '待播放'
+  return '未排期'
 }
 
 const getCollaboratorDisplayName = (user) => {
-  return user?.displayName || user?.name || user?.username || getLocaleMessage('unknownUser')
+  return user?.displayName || user?.name || user?.username || '未知用户'
 }
 
 const openSubmissionRemark = (song) => {
   if (!song?.submissionNote) return
   submissionRemarkDialog.value = {
     show: true,
-    songId: song.id,
-    // 歌曲列表审核针对歌曲自身备注；重播备注审核从排期/重播列表发起（避免被 replayRequestId 劫持）
-    replayRequestId: null,
-    title: song.title,
-    artist: song.artist,
     songTitle: `${song.title} - ${song.artist}`,
     content: song.submissionNote,
-    isPublic: song.submissionNotePublic === true,
-    status: song.submissionNotePublicStatus || null
-  }
-}
-
-const updateSubmissionNotePublic = async (isPublic) => {
-  const dialogData = submissionRemarkDialog.value
-  if (!dialogData.songId || dialogData.isUpdatingPublic) return
-
-  dialogData.isUpdatingPublic = true
-  dialogData.isPublic = isPublic
-
-  try {
-    const updatePayload = {
-      title: dialogData.title,
-      artist: dialogData.artist,
-      submissionNotePublic: isPublic
-    }
-    // 如果是重播申请，传入 replayRequestId 以更新重播申请的备注可见性
-    if (dialogData.replayRequestId) {
-      updatePayload.replayRequestId = dialogData.replayRequestId
-    }
-
-    await adminService.updateSong(dialogData.songId, updatePayload)
-
-    const songIndex = songs.value.findIndex((s) => s.id === dialogData.songId)
-    if (songIndex !== -1) {
-      songs.value[songIndex].submissionNotePublic = isPublic
-      songs.value[songIndex].submissionNotePublicStatus = isPublic ? 'approved' : null
-    }
-    dialogData.status = isPublic ? 'approved' : null
-
-    if (window.$showNotification) {
-      try {
-        window.$showNotification(safeMessage('messages', 'remarkVisibilityUpdated', '备注留言可见性已更新'), 'success')
-      } catch (notifyErr) {
-        // 静默失败，不影响主流程
-      }
-    }
-  } catch (error) {
-    console.error('更新备注可见性失败:', error)
-    if (window.$showNotification) {
-      try {
-        window.$showNotification(safeMessage('errors', 'remarkVisibilityUpdateFailed', '备注留言可见性更新失败'), 'error')
-      } catch (notifyErr) {
-        // 静默失败，不影响主流程
-      }
-    }
-    dialogData.isPublic = !isPublic
-  } finally {
-    dialogData.isUpdatingPublic = false
+    isPublic: song.submissionNotePublic === true
   }
 }
 
@@ -1676,16 +1317,16 @@ const toggleSelectSong = (songId) => {
   }
 }
 
-const refreshSongs = async (forceRefresh = false) => {
-  loading.value = true
+const refreshSongs = async (bypassCache = false, silent = false) => {
+  if (!silent) loading.value = true
   try {
-    await songsService.fetchSongs(false, undefined, forceRefresh)
+    await songsService.fetchSongs(false, undefined, true, bypassCache)
     songs.value = songsService.songs.value || []
-    selectedSongs.value = []
+    if (!silent) selectedSongs.value = []
   } catch (error) {
     console.error('刷新歌曲失败:', error)
   } finally {
-    loading.value = false
+    if (!silent) loading.value = false
   }
 }
 
@@ -1694,9 +1335,9 @@ const markAsPlayed = async (songId) => {
     await songsService.markPlayed(songId)
     await refreshSongs()
   } catch (error) {
-      console.error('标记已播放失败:', error)
-      showNotification(getNestedMessage('errors', 'markFailed', error?.data?.message || error?.message || error?.statusMessage || getLocaleMessage('unknownError')), 'error')
-    }
+    console.error('标记已播放失败:', error)
+    showNotification('标记失败: ' + error.message, 'error')
+  }
 }
 
 const markAsUnplayed = async (songId) => {
@@ -1704,17 +1345,57 @@ const markAsUnplayed = async (songId) => {
     await songsService.unmarkPlayed(songId)
     await refreshSongs()
   } catch (error) {
-      console.error('标记未播放失败:', error)
-      showNotification(getNestedMessage('errors', 'markFailed', error?.data?.message || error?.message || error?.statusMessage || getLocaleMessage('unknownError')), 'error')
-    }
+    console.error('标记未播放失败:', error)
+    showNotification('标记失败: ' + error.message, 'error')
+  }
+}
+
+const batchMarkPlayed = async () => {
+  if (selectedSongs.value.length === 0) return
+  try {
+    loading.value = true
+    await $fetch('/api/admin/songs/mark-played', {
+      method: 'POST',
+      body: { songIds: selectedSongs.value },
+      ...auth.getAuthConfig()
+    })
+    await refreshSongs()
+    selectedSongs.value = []
+    showNotification('批量标记已播放成功', 'success')
+  } catch (error) {
+    console.error('批量标记已播放失败:', error)
+    showNotification('批量标记失败: ' + (error.data?.message || error.message), 'error')
+  } finally {
+    loading.value = false
+  }
+}
+
+const batchMarkUnplayed = async () => {
+  if (selectedSongs.value.length === 0) return
+  try {
+    loading.value = true
+    await $fetch('/api/admin/songs/mark-played', {
+      method: 'POST',
+      body: { songIds: selectedSongs.value, unmark: true },
+      ...auth.getAuthConfig()
+    })
+    await refreshSongs()
+    selectedSongs.value = []
+    showNotification('批量撤回已播放成功', 'success')
+  } catch (error) {
+    console.error('批量撤回已播放失败:', error)
+    showNotification('批量撤回失败: ' + (error.data?.message || error.message), 'error')
+  } finally {
+    loading.value = false
+  }
 }
 
 const deleteSong = async (songId) => {
   const song = songs.value.find((s) => s.id === songId)
   if (!song) return
 
-  deleteDialogTitle.value = getNestedMessage('dialog', 'deleteSongTitle')
-  deleteDialogMessage.value = getNestedMessage('dialog', 'deleteSongMessage', song.title)
+  deleteDialogTitle.value = '删除歌曲'
+  deleteDialogMessage.value = `确定要删除歌曲 "${song.title}" 吗？此操作不可撤销。`
   deleteAction.value = async () => {
     try {
       await adminService.deleteSong(songId)
@@ -1725,11 +1406,11 @@ const deleteSong = async (songId) => {
         selectedSongs.value.splice(index, 1)
       }
 
-      showNotification(getNestedMessage('messages', 'deleteSuccess'), 'success')
+      showNotification('歌曲删除成功', 'success')
     } catch (error) {
-        console.error('删除歌曲失败:', error)
-        showNotification(getNestedMessage('errors', 'deleteFailed', error?.data?.message || error?.message || error?.statusMessage || getLocaleMessage('unknownError')), 'error')
-      }
+      console.error('删除歌曲失败:', error)
+      showNotification('删除失败: ' + error.message, 'error')
+    }
   }
   showDeleteDialog.value = true
 }
@@ -1737,8 +1418,8 @@ const deleteSong = async (songId) => {
 const batchDelete = async () => {
   if (selectedSongs.value.length === 0) return
 
-  deleteDialogTitle.value = getNestedMessage('dialog', 'batchDeleteTitle')
-  deleteDialogMessage.value = getNestedMessage('dialog', 'batchDeleteMessage', selectedSongs.value.length)
+  deleteDialogTitle.value = '批量删除歌曲'
+  deleteDialogMessage.value = `确定要删除选中的 ${selectedSongs.value.length} 首歌曲吗？此操作不可撤销。`
   deleteAction.value = async () => {
     try {
       loading.value = true
@@ -1750,11 +1431,11 @@ const batchDelete = async () => {
       await refreshSongs()
       selectedSongs.value = []
 
-      showNotification(getNestedMessage('messages', 'batchDeleteSuccess'), 'success')
+      showNotification('批量删除成功', 'success')
     } catch (error) {
-        console.error('批量删除失败:', error)
-        showNotification(getNestedMessage('errors', 'batchDeleteFailed', error?.data?.message || error?.message || error?.statusMessage || getLocaleMessage('unknownError')), 'error')
-      } finally {
+      console.error('批量删除失败:', error)
+      showNotification('批量删除失败: ' + error.message, 'error')
+    } finally {
       loading.value = false
     }
   }
@@ -1784,7 +1465,7 @@ const openDownloadDialog = () => {
         title: song.title,
         artist: song.artist,
         musicPlatform: song.musicPlatform || 'unknown',
-        requester: song.requester || getLocaleMessage('unknown'),
+        requester: song.requester || '未知',
         musicId: song.musicId,
         playUrl: song.playUrl
       }
@@ -1813,11 +1494,12 @@ const rejectSong = (songId) => {
   const song = songs.value.find((s) => s.id === songId)
   if (!song) return
 
+  isBatchReject.value = false
   rejectSongInfo.value = {
     id: song.id,
     title: song.title || '',
     artist: song.artist || '',
-    requester: song.requester || song.requester_name || getLocaleMessage('unknown')
+    requester: song.requester || song.requester_name || '未知'
   }
 
   rejectReason.value = ''
@@ -1825,37 +1507,67 @@ const rejectSong = (songId) => {
   showRejectDialog.value = true
 }
 
+// 批量驳回歌曲
+const batchReject = () => {
+  if (selectedSongs.value.length === 0) return
+
+  isBatchReject.value = true
+  rejectSongInfo.value = {
+    id: null,
+    title: '',
+    artist: '',
+    requester: ''
+  }
+  rejectReason.value = ''
+  addToBlacklist.value = false
+  showRejectDialog.value = true
+}
+
 // 确认驳回
 const confirmReject = async () => {
   if (!rejectReason.value.trim()) {
-    showNotification(getNestedMessage('errors', 'rejectReasonRequired'), 'error')
+    showNotification('请填写驳回原因', 'error')
     return
   }
 
   rejectLoading.value = true
   try {
-    await $fetch('/api/admin/songs/reject', {
-      method: 'POST',
-      body: {
-        songId: rejectSongInfo.value.id,
-        reason: rejectReason.value.trim(),
-        addToBlacklist: addToBlacklist.value
+    if (isBatchReject.value) {
+      await $fetch('/api/admin/songs/batch-reject', {
+        method: 'POST',
+        body: {
+          songIds: selectedSongs.value,
+          reason: rejectReason.value.trim(),
+          addToBlacklist: addToBlacklist.value
+        }
+      })
+      await refreshSongs(true)
+      selectedSongs.value = []
+      showNotification(`批量驳回成功，共处理 ${selectedSongs.value.length} 首歌曲`, 'success')
+    } else {
+      await $fetch('/api/admin/songs/reject', {
+        method: 'POST',
+        body: {
+          songId: rejectSongInfo.value.id,
+          reason: rejectReason.value.trim(),
+          addToBlacklist: addToBlacklist.value
+        }
+      })
+
+      await refreshSongs(true)
+
+      const index = selectedSongs.value.indexOf(rejectSongInfo.value.id)
+      if (index > -1) {
+        selectedSongs.value.splice(index, 1)
       }
-    })
 
-    await refreshSongs(true)
-
-    const index = selectedSongs.value.indexOf(rejectSongInfo.value.id)
-    if (index > -1) {
-      selectedSongs.value.splice(index, 1)
+      showNotification('歌曲驳回成功，已通知投稿人', 'success')
     }
 
     showRejectDialog.value = false
-
-    showNotification(getNestedMessage('messages', 'rejectSuccess'), 'success')
-  } catch (error) {
+  } catch (error: any) {
     console.error('驳回歌曲失败:', error)
-    showNotification(getNestedMessage('errors', 'rejectFailed', getErrorMessage(error)), 'error')
+    showNotification('驳回失败: ' + (error.data?.message || error.message), 'error')
   } finally {
     rejectLoading.value = false
   }
@@ -1866,6 +1578,7 @@ const cancelReject = () => {
   showRejectDialog.value = false
   rejectReason.value = ''
   addToBlacklist.value = false
+  isBatchReject.value = false
   rejectSongInfo.value = {
     id: null,
     title: '',
@@ -1882,14 +1595,11 @@ const editSong = (song) => {
     artist: song.artist || '',
     requester: song.requesterId || song.requester_id || song.requester || '',
     semester: song.semester || '',
-    preferredPlayTimeId: song.preferredPlayTimeId || 'none',
     submissionNote: song.submissionNote || '',
-    submissionNotePublic: song.submissionNotePublic === true,
     musicPlatform: song.musicPlatform || '',
     musicId: song.musicId || '',
     cover: song.cover || '',
-    playUrl: song.playUrl || '',
-    durationSeconds: song.durationSeconds || ''
+    playUrl: song.playUrl || ''
   }
   originalEditSubmissionNote.value = song.submissionNote || ''
   submissionNoteClearRequested.value = false
@@ -1899,7 +1609,7 @@ const editSong = (song) => {
   if (song.requesterId || song.requester_id || song.requester_name || song.requester) {
     selectedEditUser.value = {
       id: song.requesterId || song.requester_id || song.requester,
-      name: song.requester_name || song.requester || locale.value.unknown,
+      name: song.requester_name || song.requester || '未知',
       username: song.requester_username || song.user?.username || song.requester?.username || ''
     }
     editUserSearchQuery.value = song.requester_name || song.requester || ''
@@ -1918,35 +1628,25 @@ const editSong = (song) => {
 
 const saveEditSong = async () => {
   if (!editForm.value.title || !editForm.value.artist) {
-    showNotification(getNestedMessage('errors', 'songInfoRequired'), 'error')
+    showNotification('请填写歌曲名称和歌手', 'error')
     return
   }
 
   if (editForm.value.cover && !editCoverValidation.value.valid) {
-    showNotification(getNestedMessage('errors', 'coverUrlInvalidOrPending'), 'error')
+    showNotification('请等待封面URL验证完成或修正无效的URL', 'error')
     return
   }
 
   if (editForm.value.playUrl && !editPlayUrlValidation.value.valid) {
-    showNotification(getNestedMessage('errors', 'playUrlInvalidOrPending'), 'error')
+    showNotification('请等待播放URL验证完成或修正无效的URL', 'error')
     return
   }
 
   if (editCoverValidation.value.validating || editPlayUrlValidation.value.validating) {
-    showNotification(getNestedMessage('messages', 'validatingUrl'), 'warning')
+    showNotification('正在验证URL，请稍候...', 'warning')
     return
   }
 
-  // 校验时长范围（30秒~1小时）
-  const editDuration = editForm.value.durationSeconds
-  if (editDuration !== '' && editDuration != null) {
-    const d = Number(editDuration)
-    if (!Number.isFinite(d) || d < 30 || d > 3600) {
-      showNotification(getNestedMessage('errors', 'durationInvalidRange'), 'error')
-      return
-    }
-  }
-
   editLoading.value = true
   try {
     const { updateSong } = adminService
@@ -1956,78 +1656,34 @@ const saveEditSong = async () => {
       requester: editForm.value.requester,
       collaborators: selectedEditCollaborators.value.map((u) => u.id),
       semester: editForm.value.semester,
-      preferredPlayTimeId:
-        editForm.value.preferredPlayTimeId === 'none'
-          ? null
-          : editForm.value.preferredPlayTimeId || null,
       submissionNote: submissionNoteClearRequested.value ? null : editForm.value.submissionNote,
-      submissionNotePublic: submissionNoteClearRequested.value
-        ? false
-        : editForm.value.submissionNotePublic,
       clearSubmissionNote: submissionNoteClearRequested.value,
       submissionNoteClearReason: submissionNoteClearReason.value.trim(),
-      notifyOnSubmissionNoteClear:
-        submissionNoteClearRequested.value && notifyOnSubmissionNoteClear.value,
+      notifyOnSubmissionNoteClear: submissionNoteClearRequested.value && notifyOnSubmissionNoteClear.value,
       musicPlatform: editForm.value.musicPlatform || null,
       musicId: editForm.value.musicId || null,
       cover: editForm.value.cover || null,
-      playUrl: editForm.value.playUrl || null,
-      durationSeconds:
-        editForm.value.durationSeconds === '' || editForm.value.durationSeconds == null
-          ? null
-          : Number(editForm.value.durationSeconds)
+      playUrl: editForm.value.playUrl || null
     })
 
     await refreshSongs()
     showEditModal.value = false
 
-    showNotification(getNestedMessage('messages', 'updateSuccess'), 'success')
+    showNotification('歌曲信息更新成功', 'success')
   } catch (error) {
     console.error('更新歌曲失败:', error)
-    let errorMessage = getNestedMessage('errors', 'updateFailed')
-    errorMessage = getErrorMessage(error) || errorMessage
+    let errorMessage = '更新失败'
+    if (error.data && error.data.message) {
+      errorMessage = error.data.message
+    } else if (error.message) {
+      errorMessage = error.message
+    }
     showNotification(errorMessage, 'error')
   } finally {
     editLoading.value = false
   }
 }
 
-// 弹窗内刷新歌曲时长（编辑模式按 songId，新增模式按平台+音乐ID）
-const refreshDurationInModal = async () => {
-  const isEdit = showEditModal.value
-  const form = isEdit ? editForm.value : addForm.value
-  if (!form.musicPlatform || !form.musicId) {
-    showNotification(getNestedMessage('errors', 'durationPlatformRequired'), 'warning')
-    return
-  }
-
-  refreshDurationLoading.value = true
-  try {
-    const body = isEdit
-      ? { songId: editForm.value.id }
-      : { platform: addForm.value.musicPlatform, musicId: addForm.value.musicId }
-    const result = await $fetch('/api/admin/songs/duration', {
-      method: 'POST',
-      body
-    })
-    if (result.success && result.durationSeconds) {
-      if (isEdit) {
-        editForm.value.durationSeconds = result.durationSeconds
-      } else {
-        addForm.value.durationSeconds = result.durationSeconds
-      }
-      showNotification(getNestedMessage('messages', 'durationRefreshed'), 'success')
-    } else {
-      showNotification(getNestedMessage('errors', 'durationRefreshFailed', result?.message), 'error')
-    }
-  } catch (error) {
-    console.error('刷新歌曲时长失败:', error)
-    showNotification(getNestedMessage('errors', 'durationRefreshFailed', getErrorMessage(error)), 'error')
-  } finally {
-    refreshDurationLoading.value = false
-  }
-}
-
 const cancelEditSong = () => {
   showEditModal.value = false
   editForm.value = {
@@ -2036,14 +1692,11 @@ const cancelEditSong = () => {
     artist: '',
     requester: '',
     semester: '',
-    preferredPlayTimeId: 'none',
     submissionNote: '',
-    submissionNotePublic: false,
     musicPlatform: '',
     musicId: '',
     cover: '',
-    playUrl: '',
-    durationSeconds: ''
+    playUrl: ''
   }
   originalEditSubmissionNote.value = ''
   submissionNoteClearRequested.value = false
@@ -2077,61 +1730,48 @@ const openAddSongModal = () => {
     title: '',
     artist: '',
     requester: '',
-    semester: selectedSemesterName.value,
-    preferredPlayTimeId: selectedPlayTime.value !== 'all' && selectedPlayTime.value !== 'none' ? selectedPlayTime.value : 'none',
+    semester: selectedSemester.value !== 'all' ? selectedSemester.value : '',
     musicPlatform: '',
     musicId: '',
-    cover: '',
-    playUrl: '',
-    durationSeconds: ''
+    cover: ''
   }
   showAddSongModal.value = true
 }
 
 const saveAddSong = async () => {
   if (!addForm.value.title || !addForm.value.artist) {
-    showNotification(getNestedMessage('errors', 'songInfoRequired'), 'error')
+    showNotification('请填写歌曲名称和歌手', 'error')
     return
   }
 
   if (!selectedUser.value || !addForm.value.requester) {
-    showNotification(getNestedMessage('errors', 'requesterRequired'), 'error')
+    showNotification('请选择投稿人', 'error')
     return
   }
 
   if (!addForm.value.semester) {
-    showNotification(getNestedMessage('errors', 'semesterRequired'), 'error')
+    showNotification('请选择学期', 'error')
     return
   }
 
   if (addForm.value.cover) {
     if (!addCoverValidation.value.valid) {
-      showNotification(getNestedMessage('errors', 'coverUrlInvalid'), 'error')
+      showNotification('歌曲封面URL无效，请检查后重试', 'error')
       return
     }
     if (addCoverValidation.value.validating) {
-      showNotification(getNestedMessage('messages', 'validatingCoverUrl'), 'warning')
+      showNotification('正在验证封面URL，请稍候...', 'warning')
       return
     }
   }
 
   if (addForm.value.playUrl) {
     if (!addPlayUrlValidation.value.valid) {
-      showNotification(getNestedMessage('errors', 'playUrlInvalid'), 'error')
+      showNotification('播放地址URL无效，请检查后重试', 'error')
       return
     }
     if (addPlayUrlValidation.value.validating) {
-      showNotification(getNestedMessage('messages', 'validatingPlayUrl'), 'warning')
-      return
-    }
-  }
-
-  // 校验时长范围（30秒~1小时）
-  const addDuration = addForm.value.durationSeconds
-  if (addDuration !== '' && addDuration != null) {
-    const d = Number(addDuration)
-    if (!Number.isFinite(d) || d < 30 || d > 3600) {
-      showNotification(getNestedMessage('errors', 'durationInvalidRange'), 'error')
+      showNotification('正在验证播放地址URL，请稍候...', 'warning')
       return
     }
   }
@@ -2144,18 +1784,10 @@ const saveAddSong = async () => {
       artist: addForm.value.artist,
       requester: addForm.value.requester,
       semester: addForm.value.semester,
-      preferredPlayTimeId:
-        addForm.value.preferredPlayTimeId === 'none'
-          ? null
-          : addForm.value.preferredPlayTimeId || null,
       musicPlatform: addForm.value.musicPlatform || null,
       musicId: addForm.value.musicId || null,
       cover: addForm.value.cover || null,
-      playUrl: addForm.value.playUrl || null,
-      durationSeconds:
-        addForm.value.durationSeconds === '' || addForm.value.durationSeconds == null
-          ? null
-          : Number(addForm.value.durationSeconds)
+      playUrl: addForm.value.playUrl || null
     })
 
     await refreshSongs()
@@ -2166,20 +1798,22 @@ const saveAddSong = async () => {
       artist: '',
       requester: '',
       semester: '',
-      preferredPlayTimeId: 'none',
       musicPlatform: '',
       musicId: '',
       cover: '',
-      playUrl: '',
-      durationSeconds: ''
+      playUrl: ''
     }
     clearSelectedUser()
 
-    showNotification(getNestedMessage('messages', 'addSuccess'), 'success')
+    showNotification('歌曲添加成功', 'success')
   } catch (error) {
     console.error('添加歌曲失败:', error)
-    let errorMessage = getNestedMessage('errors', 'addFailed')
-    errorMessage = getErrorMessage(error) || errorMessage
+    let errorMessage = '添加失败'
+    if (error.data && error.data.message) {
+      errorMessage = error.data.message
+    } else if (error.message) {
+      errorMessage = error.message
+    }
     showNotification(errorMessage, 'error')
   } finally {
     addLoading.value = false
@@ -2193,12 +1827,10 @@ const cancelAddSong = () => {
     artist: '',
     requester: '',
     semester: '',
-    preferredPlayTimeId: 'none',
     musicPlatform: '',
     musicId: '',
     cover: '',
-    playUrl: '',
-    durationSeconds: ''
+    playUrl: ''
   }
   addCoverValidation.value = { valid: true, error: '', validating: false }
   addPlayUrlValidation.value = { valid: true, error: '', validating: false }
@@ -2370,8 +2002,9 @@ const handleClickOutside = (event) => {
   }
 }
 
+
 // 监听器
-watch([searchQuery, statusFilter, sortOption, selectedSemester, selectedPlayTime], () => {
+watch([searchQuery, statusFilter, sortOption, selectedSemester], () => {
   currentPage.value = 1
 })
 
@@ -2380,9 +2013,11 @@ const { semesters, fetchSemesters, semesterUpdateEvent } = useSemesters()
 
 watch(semesterUpdateEvent, async () => {
   await fetchSemesters()
-  availableSemesters.value = [{ id: 'all', name: locale.value.allSemesters }, ...(semesters.value || [])]
+  availableSemesters.value = semesters.value || []
 })
 
+let refreshInterval
+
 onMounted(async () => {
   songsService = useSongs()
   adminService = useAdmin()
@@ -2392,22 +2027,25 @@ onMounted(async () => {
   await fetchSemesters()
   await fetchCurrentSemester()
 
-  availableSemesters.value = [{ id: 'all', name: locale.value.allSemesters }, ...(semesters.value || [])]
+  availableSemesters.value = semesters.value || []
+  availableSemesters.value.unshift({ id: 'all', name: '全部学期' })
 
   if (currentSemester.value) {
-    selectedSemester.value = currentSemester.value.id
+    selectedSemester.value = currentSemester.value.name
   }
 
-  const { fetchPlayTimes, playTimes, formatPlayTimeDisplay: formatter } = songsService
-  formatPlayTimeDisplay = formatter
-  await fetchPlayTimes()
-  availablePlayTimes.value = [...(playTimes.value || [])]
-  availablePlayTimes.value.unshift({ id: 'none', name: locale.value.unspecifiedPlayTime })
-  availablePlayTimes.value.unshift({ id: 'all', name: locale.value.allPlayTimes })
-
   document.addEventListener('click', handleClickOutside)
 
   await refreshSongs()
+
+  refreshInterval = setInterval(() => {
+    refreshSongs(false, true)
+  }, 10000)
+})
+
+onUnmounted(() => {
+  document.removeEventListener('click', handleClickOutside)
+  if (refreshInterval) clearInterval(refreshInterval)
 })
 
 // URL验证函数
@@ -2541,10 +2179,10 @@ onUnmounted(() => {
   background: transparent;
 }
 .custom-scrollbar::-webkit-scrollbar-thumb {
-  background: var(--panel-bg-alt);
+  background: var(--bg-tertiary, #27272a);
   border-radius: 10px;
 }
 .custom-scrollbar::-webkit-scrollbar-thumb:hover {
-  background: var(--panel-bg-hover);
+  background: #3f3f46;
 }
 </style>
diff --git a/app/components/Admin/SubmissionRemarkDialog.vue b/app/components/Admin/SubmissionRemarkDialog.vue
index 1d8334b..136aba9 100644
--- a/app/components/Admin/SubmissionRemarkDialog.vue
+++ b/app/components/Admin/SubmissionRemarkDialog.vue
@@ -9,87 +9,38 @@
   >
     <div
       v-if="show"
-      class="fixed inset-0 z-50 flex items-center justify-center p-4 bg-bg-primary-80 backdrop-blur-sm"
+      class="fixed inset-0 z-50 flex items-center justify-center p-4 bg-zinc-950/80 backdrop-blur-sm"
       @click="close"
     >
       <div
-        class="w-full max-w-lg bg-bg-secondary border border-border-secondary rounded-xl shadow-2xl overflow-hidden"
+        class="w-full max-w-lg bg-zinc-900 border border-zinc-800 rounded-xl shadow-2xl overflow-hidden"
         @click.stop
       >
-        <div class="px-8 py-6 border-b border-border-secondary-50 flex items-center justify-between">
-          <h3 class="text-xl font-black text-text-primary">{{ locale.title }}</h3>
-          <button class="text-text-tertiary hover:text-text-secondary transition-colors" @click="close">
+        <div class="px-8 py-6 border-b border-zinc-800/50 flex items-center justify-between">
+          <h3 class="text-xl font-black text-zinc-100">投稿备注留言</h3>
+          <button class="text-zinc-500 hover:text-zinc-300 transition-colors" @click="close">
             <X :size="20" />
           </button>
         </div>
         <div class="p-8 space-y-4">
           <div class="flex items-center gap-3">
-            <p class="text-xs text-text-tertiary font-medium">{{ songTitle }}</p>
+            <p class="text-xs text-zinc-500 font-medium">{{ songTitle }}</p>
             <span
-              v-if="noteStatus === 'pending'"
-              class="px-2 py-0.5 rounded text-[10px] font-bold uppercase tracking-wider border bg-warning-10 text-warning border-warning-20"
+              :class="[
+                'px-2 py-0.5 rounded text-[10px] font-bold uppercase tracking-wider border',
+                isPublic
+                  ? 'bg-blue-500/10 text-blue-400 border-blue-500/20'
+                  : 'bg-amber-500/10 text-amber-500 border-amber-500/20'
+              ]"
             >
-              {{ locale.statusPending }}
+              {{ isPublic ? '公开备注' : '仅管理员可见' }}
             </span>
-            <span
-              v-else-if="noteStatus === 'rejected'"
-              class="px-2 py-0.5 rounded text-[10px] font-bold uppercase tracking-wider border bg-error-10 text-error border-error-20"
-            >
-              {{ locale.statusRejected }}
-            </span>
-            <label
-              v-else
-              for="is-public-checkbox"
-              class="flex items-center gap-2 cursor-pointer group"
-              :class="{ 'opacity-50': isUpdatingPublic }"
-            >
-              <input
-                id="is-public-checkbox"
-                type="checkbox"
-                :checked="isPublic"
-                :disabled="isUpdatingPublic"
-                @change="$emit('update:isPublic', $event.target.checked)"
-                class="w-4 h-4 rounded border-border-secondary bg-bg-primary cursor-pointer disabled:cursor-not-allowed"
-              />
-              <span
-                :class="[
-                  'px-2 py-0.5 rounded text-[10px] font-bold uppercase tracking-wider border transition-colors',
-                  isPublic
-                    ? 'bg-primary-10 text-primary border-primary-20 group-hover:bg-primary-20'
-                    : 'bg-warning-10 text-warning border-warning-20 group-hover:bg-warning-20'
-                ]"
-              >
-                {{ isPublic ? locale.publicRemark : locale.adminOnly }}
-              </span>
-              <span v-if="isUpdatingPublic" class="text-[10px] text-text-tertiary animate-pulse">{{ locale.updating }}</span>
-            </label>
           </div>
-          <div class="bg-bg-primary-50 border border-border-secondary-50 rounded-xl p-4">
-            <p class="text-sm text-text-primary leading-relaxed whitespace-pre-wrap">
+          <div class="bg-zinc-950/50 border border-zinc-800/50 rounded-xl p-4">
+            <p class="text-sm text-zinc-200 leading-relaxed whitespace-pre-wrap">
               {{ content }}
             </p>
           </div>
-
-          <!-- 审核操作：待审可通过/拒绝；已拒绝可重新通过 -->
-          <div v-if="noteStatus === 'pending' || noteStatus === 'rejected'" class="flex justify-end gap-2 pt-2">
-            <button
-              v-if="noteStatus === 'pending'"
-              type="button"
-              :disabled="isUpdatingPublic"
-              class="px-4 py-2 rounded-lg bg-error-10 text-error border border-error-20 hover:bg-error-20 transition-colors text-xs font-black uppercase tracking-widest disabled:opacity-40"
-              @click="$emit('reject')"
-            >
-              {{ locale.rejectButton }}
-            </button>
-            <button
-              type="button"
-              :disabled="isUpdatingPublic"
-              class="px-4 py-2 rounded-lg bg-primary text-white hover:opacity-90 transition-opacity text-xs font-black uppercase tracking-widest disabled:opacity-40"
-              @click="$emit('approve')"
-            >
-              {{ locale.approveButton }}
-            </button>
-          </div>
         </div>
       </div>
     </div>
@@ -97,9 +48,7 @@
 </template>
 
 <script setup>
-import { computed } from 'vue'
 import { X } from '@lucide/vue'
-import { useLocale } from '~/utils/locale'
 
 defineProps({
   show: {
@@ -117,22 +66,12 @@ defineProps({
   isPublic: {
     type: Boolean,
     default: true
-  },
-  isUpdatingPublic: {
-    type: Boolean,
-    default: false
-  },
-  noteStatus: {
-    type: String,
-    default: null
   }
 })
 
-const emit = defineEmits(['close', 'update:isPublic', 'approve', 'reject'])
-const { admin } = useLocale()
-const locale = computed(() => admin.value?.scheduleManager?.remarkDialog || {})
+const emit = defineEmits(['close'])
 
 const close = () => {
   emit('close')
 }
-</script>
+</script>
\ No newline at end of file
diff --git a/app/components/Admin/UserManager.vue b/app/components/Admin/UserManager.vue
index 564b1df..7af836d 100644
--- a/app/components/Admin/UserManager.vue
+++ b/app/components/Admin/UserManager.vue
@@ -3,49 +3,47 @@
     <!-- Header -->
     <div class="flex flex-col md:flex-row md:items-end justify-between gap-6 mt-4">
       <div>
-        <h2 class="text-2xl font-black text-text-primary tracking-tight">{{ locale.title }}</h2>
-        <p class="text-xs text-text-tertiary mt-1">
-          {{ showArchived ? formatMessage(locale.archivedSubtitle, archivedCount) : formatMessage(locale.subtitle, totalUsers) }}
-        </p>
+        <h2 class="text-2xl font-black text-zinc-100 tracking-tight">用户管理</h2>
+        <p class="text-xs text-zinc-500 mt-1">系统共有 {{ totalUsers }} 位成员 · 权限与账户管理</p>
       </div>
       <div class="flex flex-wrap items-center gap-2">
         <button
-          class="flex-1 md:flex-none flex items-center justify-center gap-2 px-4 py-2.5 bg-primary-hover hover:bg-primary text-text-primary text-xs font-black rounded-lg transition-all uppercase tracking-widest active:scale-95 shadow-lg shadow-[var(--primary-glow)]"
+          class="flex-1 md:flex-none flex items-center justify-center gap-2 px-4 py-2.5 bg-blue-600 hover:bg-blue-500 text-white text-xs font-black rounded-lg transition-all uppercase tracking-widest active:scale-95 shadow-lg shadow-blue-900/20"
           @click="showAddModal = true"
         >
           <UserPlus :size="14" />
-          {{ locale.add }}
+          添加
         </button>
         <button
-          class="flex-1 md:flex-none flex items-center justify-center gap-2 px-4 py-2.5 bg-bg-secondary border border-border-secondary text-text-secondary text-xs font-black rounded-lg transition-all uppercase tracking-widest"
+          class="flex-1 md:flex-none flex items-center justify-center gap-2 px-4 py-2.5 bg-zinc-900 border border-zinc-800 text-zinc-300 text-xs font-black rounded-lg transition-all uppercase tracking-widest"
           @click="showImportModal = true"
         >
-          <FileSpreadsheet class="text-success" :size="14" />
-          {{ locale.import }}
+          <FileSpreadsheet class="text-emerald-500" :size="14" />
+          导入
         </button>
         <button
-          class="flex-1 md:flex-none flex items-center justify-center gap-2 px-4 py-2.5 bg-bg-secondary border border-border-secondary text-text-secondary text-xs font-black rounded-lg transition-all uppercase tracking-widest"
+          class="flex-1 md:flex-none flex items-center justify-center gap-2 px-4 py-2.5 bg-zinc-900 border border-zinc-800 text-zinc-300 text-xs font-black rounded-lg transition-all uppercase tracking-widest"
           @click="showBatchUpdateModal = true"
         >
-          <Layers class="text-info" :size="14" />
-          {{ locale.update }}
+          <Layers class="text-purple-500" :size="14" />
+          更新
         </button>
       </div>
     </div>
 
     <!-- Filter Bar -->
     <div
-      class="bg-bg-secondary-40 border border-border-secondary-60 rounded-xl p-3 flex flex-col lg:flex-row gap-3 items-center"
+      class="bg-zinc-900/40 border border-zinc-800/60 rounded-xl p-3 flex flex-col lg:flex-row gap-3 items-center"
     >
       <div class="relative flex-1 w-full group">
         <Search
-          class="absolute left-4 top-1/2 -translate-y-1/2 text-text-secondary group-focus-within:text-primary transition-colors"
+          class="absolute left-4 top-1/2 -translate-y-1/2 text-zinc-700 group-focus-within:text-blue-500 transition-colors"
           :size="16"
         />
         <input
           v-model="searchQuery"
-          class="w-full bg-bg-primary border border-border-secondary-80 rounded-lg pl-11 pr-4 py-2.5 text-xs focus:outline-none focus:border-primary-30 transition-all text-text-primary"
-          :placeholder="locale.searchPlaceholder"
+          class="w-full bg-zinc-950 border border-zinc-800/80 rounded-lg pl-11 pr-4 py-2.5 text-xs focus:outline-none focus:border-blue-500/30 transition-all text-zinc-200"
+          placeholder="通过姓名或学号搜索..."
           type="text"
         >
       </div>
@@ -56,8 +54,8 @@
         <CustomSelect
           v-model="roleFilter"
           :options="roleFilterOptions"
-          :label="locale.role"
-          :placeholder="locale.allRoles"
+          label="角色"
+          placeholder="全部角色"
           label-key="displayName"
           value-key="name"
           class-name="flex-1 lg:w-40 min-w-[120px]"
@@ -67,8 +65,8 @@
         <CustomSelect
           v-model="statusFilter"
           :options="statusFilterOptions"
-          :label="locale.status"
-          :placeholder="locale.allStatus"
+          label="状态"
+          placeholder="全部状态"
           label-key="label"
           value-key="value"
           class-name="flex-1 lg:w-32 min-w-[100px]"
@@ -78,15 +76,15 @@
         <CustomSelect
           v-model="currentSort"
           :options="sortOptions"
-          :label="locale.sort"
-          :placeholder="locale.sortPlaceholder"
+          label="排序"
+          placeholder="排序方式"
           label-key="label"
           value-key="value"
           class-name="flex-1 lg:w-40 min-w-[140px]"
         />
 
         <button
-          class="p-3 bg-bg-primary border border-border-secondary rounded-lg text-text-disabled hover:text-primary transition-all shadow-sm flex items-center justify-center"
+          class="p-3 bg-zinc-950 border border-zinc-800 rounded-lg text-zinc-600 hover:text-blue-400 transition-all shadow-sm"
           @click="loadUsers(1)"
         >
           <RefreshCw :size="14" />
@@ -94,179 +92,52 @@
       </div>
     </div>
 
-    <div class="grid grid-cols-1 xl:grid-cols-[360px_minmax(0,1fr)] gap-4 items-start">
-      <section
-        class="bg-bg-secondary-30 border border-border-secondary-60 rounded-xl overflow-hidden shadow-lg min-w-0"
-      >
-        <div class="p-4 border-b border-border-secondary-60 flex items-center justify-between gap-3">
-          <div>
-            <h3 class="text-sm font-black text-text-primary tracking-tight">{{ locale.organization.title }}</h3>
-            <p class="text-[10px] text-text-disabled mt-1">
-              {{ formatMessage(locale.organization.subtitle, treeUsers.length) }}
-            </p>
-          </div>
-          <button
-            class="p-2 bg-bg-primary border border-border-secondary rounded-lg text-text-disabled hover:text-primary transition-all flex items-center justify-center"
-            :title="locale.organization.refresh"
-            @click="loadUserTree"
-          >
-            <RefreshCw :size="14" :class="{ 'animate-spin': treeLoading }" />
-          </button>
-        </div>
-
+    <!-- 用户表格 -->
+    <div class="space-y-4">
+      <div v-if="loading" class="flex flex-col items-center justify-center py-20 text-zinc-500">
         <div
-          v-if="activeOrgFilterLabel"
-          class="mx-4 mt-4 p-3 bg-primary-10 border border-primary-20 rounded-lg flex items-center justify-between gap-3"
-        >
-          <div class="min-w-0">
-            <p class="text-[10px] font-black text-primary uppercase tracking-widest">{{ locale.organization.currentScope }}</p>
-            <p class="text-xs font-bold text-text-primary truncate">{{ activeOrgFilterLabel }}</p>
-          </div>
-          <button
-            class="text-[10px] font-black text-primary hover:text-text-primary transition-colors shrink-0"
-            @click="clearTreeFilter"
-          >
-            {{ locale.organization.clear }}
-          </button>
-        </div>
-
-        <div v-if="treeLoading" class="py-12 flex flex-col items-center justify-center text-text-disabled">
-          <RefreshCw :size="22" class="animate-spin mb-3" />
-          <span class="text-[10px] font-black uppercase tracking-widest">{{ locale.organization.loading }}</span>
-        </div>
-
-        <div
-          v-else-if="treeError"
-          class="m-4 p-4 bg-error-10 border border-error-20 rounded-lg text-xs text-error leading-relaxed"
-        >
-          {{ treeError }}
-        </div>
-
-        <div v-else-if="userTree.length === 0" class="py-12 text-center text-xs text-text-disabled">
-          {{ locale.organization.empty }}
-        </div>
-
-        <div v-else class="p-3 max-h-[680px] overflow-y-auto custom-scrollbar">
-          <div v-for="stage in userTree" :key="stage.key" class="tree-group">
-            <div class="flex items-center gap-1">
-              <button class="tree-toggle" @click="toggleTreeNode(stage.key)">
-                <ChevronDown v-if="isTreeNodeExpanded(stage.key)" :size="13" />
-                <ChevronRight v-else :size="13" />
-              </button>
-              <button
-                class="tree-label font-black text-text-primary"
-                :class="isStageFilterActive(stage.label) ? 'tree-label-active' : ''"
-                @click="handleStageClick(stage)"
-              >
-                <span class="truncate">{{ stage.label }}</span>
-                <span class="tree-count">{{ formatMessage(locale.organization.count, stage.count) }}</span>
-              </button>
-            </div>
-
-            <div v-if="isTreeNodeExpanded(stage.key)" class="tree-branch">
-              <div v-for="grade in stage.grades" :key="grade.key" class="tree-group">
-                <div class="flex items-center gap-1">
-                  <button class="tree-toggle" @click="toggleTreeNode(grade.key)">
-                    <ChevronDown v-if="isTreeNodeExpanded(grade.key)" :size="13" />
-                    <ChevronRight v-else :size="13" />
-                  </button>
-                  <button
-                    class="tree-label"
-                    :class="
-                      isTreeFilterActive(stage.label, grade.label, '') ? 'tree-label-active' : ''
-                    "
-                    @click="applyTreeFilter(grade.label, '', stage.label)"
-                  >
-                    <span class="truncate">{{ grade.label }}</span>
-                    <span class="tree-count">{{ formatMessage(locale.organization.count, grade.count) }}</span>
-                  </button>
-                </div>
-
-                <div v-if="isTreeNodeExpanded(grade.key)" class="tree-branch">
-                  <div v-for="classNode in grade.classes" :key="classNode.key" class="tree-group">
-                    <div class="flex items-center gap-1">
-                      <button class="tree-toggle" @click="toggleTreeNode(classNode.key)">
-                        <ChevronDown v-if="isTreeNodeExpanded(classNode.key)" :size="13" />
-                        <ChevronRight v-else :size="13" />
-                      </button>
-                      <button
-                        class="tree-label"
-                        :class="
-                          isTreeFilterActive(stage.label, grade.label, classNode.label)
-                            ? 'tree-label-active'
-                            : ''
-                        "
-                        @click="applyTreeFilter(grade.label, classNode.label, stage.label)"
-                      >
-                        <span class="truncate">{{ classNode.label }}</span>
-                        <span class="tree-count">{{ formatMessage(locale.organization.count, classNode.count) }}</span>
-                      </button>
-                    </div>
-
-                    <div v-if="isTreeNodeExpanded(classNode.key)" class="tree-users">
-                      <button
-                        v-for="treeUser in classNode.users"
-                        :key="treeUser.id"
-                        class="tree-user"
-                        @click="openTreeUser(treeUser)"
-                      >
-                        <User :size="12" class="text-text-disabled shrink-0" />
-                        <span class="truncate text-text-secondary">{{ getUserDisplayName(treeUser) }}</span>
-                        <span class="truncate text-text-disabled font-mono">@{{ treeUser.username }}</span>
-                      </button>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </section>
-
-      <!-- 用户表格 -->
-      <div class="space-y-4 min-w-0">
-      <div v-if="loading" class="flex flex-col items-center justify-center py-20 text-text-tertiary">
-        <AppSpinner :size="32" class="mb-4" />
-        <div class="text-xs font-black uppercase tracking-widest">{{ locale.loading }}</div>
+          class="w-8 h-8 border-2 border-blue-500/20 border-t-blue-500 rounded-full animate-spin mb-4"
+        />
+        <div class="text-xs font-black uppercase tracking-widest">正在加载用户...</div>
       </div>
 
       <div
         v-else-if="users.length === 0"
-        class="flex flex-col items-center justify-center py-20 bg-bg-secondary-20 border border-border-secondary-50 rounded-xl"
+        class="flex flex-col items-center justify-center py-20 bg-zinc-900/20 border border-zinc-800/50 rounded-xl"
       >
         <div
-          class="w-16 h-16 rounded-lg bg-bg-tertiary-50 flex items-center justify-center text-text-disabled mb-4"
+          class="w-16 h-16 rounded-lg bg-zinc-800/50 flex items-center justify-center text-zinc-600 mb-4"
         >
           <Search :size="32" />
         </div>
-        <div class="text-sm font-black text-text-tertiary uppercase tracking-widest">
-          {{ searchQuery ? locale.emptySearch : locale.empty }}
+        <div class="text-sm font-black text-zinc-500 uppercase tracking-widest">
+          {{ searchQuery ? '没有找到匹配的用户' : '暂无用户数据' }}
         </div>
       </div>
 
       <template v-else>
         <!-- 桌面端表格 -->
         <div
-          class="hidden lg:block bg-bg-secondary-20 border border-border-secondary-50 rounded-xl overflow-hidden shadow-lg custom-scrollbar"
+          class="hidden lg:block bg-zinc-900/20 border border-zinc-800/50 rounded-xl overflow-hidden shadow-lg custom-scrollbar"
         >
           <table class="w-full">
             <thead>
               <tr
-                class="bg-bg-secondary-60 border-b border-border-secondary text-[10px] font-black text-text-disabled uppercase tracking-widest"
+                class="bg-zinc-900/60 border-b border-zinc-800 text-[10px] font-black text-zinc-600 uppercase tracking-widest"
               >
-                <th class="px-6 py-5 text-left">{{ locale.table.userDetails }}</th>
-                <th class="px-6 py-5 text-left">{{ locale.table.role }}</th>
-                <th class="px-6 py-5 text-left">{{ locale.table.status }}</th>
-                <th class="px-6 py-5 text-center">{{ locale.table.class }}</th>
-                <th class="px-6 py-5 text-left">{{ locale.table.lastActivity }}</th>
-                <th class="px-6 py-5 text-right pr-10">{{ locale.table.actions }}</th>
+                <th class="px-6 py-5 text-left">用户详情</th>
+                <th class="px-6 py-5 text-left">角色权限</th>
+                <th class="px-6 py-5 text-left">账户状态</th>
+                <th class="px-6 py-5 text-center">所在班级</th>
+                <th class="px-6 py-5 text-left">最后交互</th>
+                <th class="px-6 py-5 text-right pr-10">操作</th>
               </tr>
             </thead>
-            <tbody class="divide-y divide-panel-bg-dark-40">
+            <tbody class="divide-y divide-zinc-800/40">
               <tr
                 v-for="user in users"
                 :key="user.id"
-                class="group hover:bg-bg-tertiary-30 transition-all text-xs cursor-pointer"
+                class="group hover:bg-zinc-800/30 transition-all text-xs cursor-pointer"
                 @click="showUserDetail(user, $event)"
               >
                 <td class="px-6 py-5">
@@ -274,18 +145,18 @@
                     <img
                       v-if="user.avatar && !failedImages[user.id]"
                       :src="user.avatar"
-                      class="w-10 h-10 rounded-xl object-cover border border-border-tertiary-50"
+                      class="w-10 h-10 rounded-xl object-cover border border-zinc-700/50"
                       @error="handleImageError(user.id)"
                     >
                     <div
                       v-else
-                      class="w-10 h-10 rounded-xl bg-bg-tertiary flex items-center justify-center font-black text-text-tertiary group-hover:text-text-secondary transition-colors border border-border-tertiary-50"
+                      class="w-10 h-10 rounded-xl bg-zinc-800 flex items-center justify-center font-black text-zinc-500 group-hover:text-zinc-300 transition-colors border border-zinc-700/50"
                     >
-                      {{ getUserInitial(user) }}
+                      {{ (user.name || user.username || '?').charAt(0).toUpperCase() }}
                     </div>
                     <div>
-                      <p class="font-black text-text-primary">{{ getUserDisplayName(user) }}</p>
-                      <p class="text-[10px] text-text-disabled font-mono mt-0.5">
+                      <p class="font-black text-zinc-100">{{ user.name || user.username }}</p>
+                      <p class="text-[10px] text-zinc-600 font-mono mt-0.5">
                         ID: {{ user.username }}
                       </p>
                     </div>
@@ -293,73 +164,55 @@
                 </td>
                 <td class="px-6 py-5">
                   <span
-                    v-if="user.role === 'SUPER_ADMIN'"
-                    class="px-2 py-0.5 bg-warning-10 text-warning text-[10px] font-black rounded border border-warning-20 uppercase tracking-widest"
-                    >{{ getRoleName('SUPER_ADMIN') }}</span
-                  >
-                  <span
-                    v-else-if="user.role === 'ADMIN'"
-                    class="px-2 py-0.5 bg-primary-10 text-primary text-[10px] font-black rounded border border-primary-20 uppercase tracking-widest"
-                    >{{ getRoleName('ADMIN') }}</span
-                  >
-                  <span
-                    v-else-if="user.role === 'SONG_ADMIN'"
-                    class="px-2 py-0.5 bg-info-10 text-info text-[10px] font-black rounded border border-info-20 uppercase tracking-widest"
-                    >{{ getRoleName('SONG_ADMIN') }}</span
-                  >
-                  <span
-                    v-else
-                    class="px-2 py-0.5 bg-bg-tertiary text-text-tertiary text-[10px] font-black rounded border border-border-tertiary-50 uppercase tracking-widest"
-                    >{{ getRoleName('USER') }}</span
+                    class="px-2 py-0.5 text-[10px] font-black rounded border uppercase tracking-widest"
+                    :class="{
+                      'bg-orange-500/10 text-orange-400 border-orange-500/20': user.role?.toUpperCase() === 'SUPER_ADMIN',
+                      'bg-blue-500/10 text-blue-400 border-blue-500/20': user.role?.toUpperCase() === 'ADMIN' || user.role?.toUpperCase() === 'MINISTER',
+                      'bg-purple-500/10 text-purple-400 border-purple-500/20': user.role?.toUpperCase() === 'SONG_ADMIN' || user.role?.toUpperCase() === 'STAFF' || user.role?.toUpperCase() === 'VICE_MINISTER',
+                      'bg-zinc-800 text-zinc-500 border-zinc-700/50': !['SUPER_ADMIN', 'ADMIN', 'MINISTER', 'SONG_ADMIN', 'STAFF', 'VICE_MINISTER'].includes(user.role?.toUpperCase())
+                    }"
                   >
+                    {{ getRoleDisplayName(user.role?.toUpperCase()) }}
+                  </span>
                 </td>
                 <td class="px-6 py-5">
                   <div
                     v-if="user.status === 'active'"
-                    class="flex items-center gap-1.5 text-success font-black uppercase text-[10px] tracking-widest"
+                    class="flex items-center gap-1.5 text-emerald-500 font-black uppercase text-[10px] tracking-widest"
                   >
                     <div
-                      class="w-1.5 h-1.5 rounded-full bg-success shadow-[0_0_8px_var(--success-50)]"
+                      class="w-1.5 h-1.5 rounded-full bg-emerald-500 shadow-[0_0_8px_rgba(16,185,129,0.5)]"
                     />
-                    {{ getStatusName('active') }}
-                  </div>
-                  <div
-                    v-else-if="user.status === 'pending'"
-                    class="flex items-center gap-1.5 text-info font-black uppercase text-[10px] tracking-widest"
-                  >
-                    <div
-                      class="w-1.5 h-1.5 rounded-full bg-info shadow-[0_0_8px_var(--info-50)]"
-                    />
-                    {{ getStatusName('pending') }}
+                    正常
                   </div>
                   <div
                     v-else-if="user.status === 'withdrawn'"
-                    class="flex items-center gap-1.5 text-error font-black uppercase text-[10px] tracking-widest"
+                    class="flex items-center gap-1.5 text-red-500 font-black uppercase text-[10px] tracking-widest"
                   >
-                    <div class="w-1.5 h-1.5 rounded-full bg-error" />
-                    {{ getStatusName('withdrawn') }}
+                    <div class="w-1.5 h-1.5 rounded-full bg-red-500" />
+                    退学
                   </div>
                   <div
                     v-else-if="user.status === 'graduate'"
-                    class="flex items-center gap-1.5 text-warning font-black uppercase text-[10px] tracking-widest"
+                    class="flex items-center gap-1.5 text-amber-500 font-black uppercase text-[10px] tracking-widest"
                   >
-                    <div class="w-1.5 h-1.5 rounded-full bg-warning" />
-                    {{ getStatusName('graduate') }}
+                    <div class="w-1.5 h-1.5 rounded-full bg-amber-500" />
+                    毕业
                   </div>
                   <div
                     v-else
-                    class="flex items-center gap-1.5 text-text-tertiary font-black uppercase text-[10px] tracking-widest"
+                    class="flex items-center gap-1.5 text-zinc-500 font-black uppercase text-[10px] tracking-widest"
                   >
-                    <div class="w-1.5 h-1.5 rounded-full bg-bg-quaternary" />
-                    {{ getStatusName('disabled') }}
+                    <div class="w-1.5 h-1.5 rounded-full bg-zinc-500" />
+                    禁用
                   </div>
                 </td>
-                <td class="px-6 py-5 text-center font-bold text-text-tertiary">
+                <td class="px-6 py-5 text-center font-bold text-zinc-500">
                   {{ user.grade || '-' }} {{ user.class || '-' }}
                 </td>
                 <td class="px-6 py-5">
-                  <p class="text-text-tertiary font-bold">{{ formatDate(user.lastLogin) }}</p>
-                  <p class="text-[11px] text-text-secondary font-mono mt-1 flex items-center gap-1">
+                  <p class="text-zinc-400 font-bold">{{ formatDate(user.lastLogin) }}</p>
+                  <p class="text-[11px] text-zinc-700 font-mono mt-1 flex items-center gap-1">
                     <MapPin :size="10" /> {{ user.lastLoginIp || '-' }}
                   </p>
                 </td>
@@ -368,40 +221,32 @@
                     class="flex items-center justify-end gap-1.5 opacity-0 group-hover:opacity-100 transition-all action-buttons"
                   >
                     <button
-                      :disabled="!canManageUser(user)"
-                      class="p-2 bg-bg-primary border border-border-secondary rounded-xl text-text-tertiary hover:text-primary transition-colors disabled:opacity-20 disabled:cursor-not-allowed action-btn"
-                      :title="locale.actions.editUser"
+                      :disabled="isSelf(user) || !canManageTargetUser(user)"
+                      class="p-2 bg-zinc-950 border border-zinc-800 rounded-xl text-zinc-500 hover:text-blue-400 transition-colors disabled:opacity-20 disabled:cursor-not-allowed action-btn"
+                      :title="!canManageTargetUser(user) ? '权限不足：无法编辑该用户' : '编辑用户'"
                       @click="editUser(user)"
                     >
                       <Edit2 :size="13" />
                     </button>
                     <button
-                      v-if="user.status === 'pending'"
-                      class="p-2 bg-bg-primary border border-border-secondary rounded-xl text-text-tertiary hover:text-info transition-colors action-btn flex items-center justify-center"
-                      :title="locale.actions.approve"
-                      @click="openApproval(user)"
-                    >
-                      <ClipboardCheck :size="13" />
-                    </button>
-                    <button
-                      class="p-2 bg-bg-primary border border-border-secondary rounded-xl text-text-tertiary hover:text-info transition-colors action-btn flex items-center justify-center"
-                      :title="locale.actions.viewSongs"
+                      class="p-2 bg-zinc-950 border border-zinc-800 rounded-xl text-zinc-500 hover:text-purple-400 transition-colors action-btn"
+                      title="查看歌曲"
                       @click="viewUserSongs(user)"
                     >
                       <Music :size="13" />
                     </button>
                     <button
-                      :disabled="!canManageUser(user)"
-                      class="p-2 bg-bg-primary border border-border-secondary rounded-xl text-text-tertiary hover:text-warning transition-colors disabled:opacity-20 disabled:cursor-not-allowed action-btn flex items-center justify-center"
-                      :title="locale.actions.resetPassword"
+                      :disabled="isSelf(user) || !canResetPasswordFor(user)"
+                      class="p-2 bg-zinc-950 border border-zinc-800 rounded-xl text-zinc-500 hover:text-amber-400 transition-colors disabled:opacity-20 disabled:cursor-not-allowed action-btn"
+                      :title="!canResetPasswordFor(user) ? '权限不足：无法重置该用户的密码' : '重置密码'"
                       @click="resetPassword(user)"
                     >
                       <Lock :size="13" />
                     </button>
                     <button
-                      :disabled="!canManageUser(user)"
-                      class="p-2 bg-bg-primary border border-border-secondary rounded-xl text-text-tertiary hover:text-error transition-colors disabled:opacity-20 disabled:cursor-not-allowed action-btn"
-                      :title="locale.actions.deleteUser"
+                      :disabled="isSelf(user) || !canManageTargetUser(user)"
+                      class="p-2 bg-zinc-950 border border-zinc-800 rounded-xl text-zinc-500 hover:text-red-400 transition-colors disabled:opacity-20 disabled:cursor-not-allowed action-btn"
+                      :title="!canManageTargetUser(user) ? '权限不足：无法删除该用户' : '删除用户'"
                       @click="confirmDeleteUser(user)"
                     >
                       <Trash2 :size="13" />
@@ -418,7 +263,7 @@
           <div
             v-for="user in users"
             :key="user.id"
-            class="bg-bg-secondary-40 border border-border-secondary rounded-xl p-5 space-y-5 shadow-lg shadow-[0_10px_15px_var(--shadow-color)]"
+            class="bg-zinc-900/40 border border-zinc-800 rounded-xl p-5 space-y-5 shadow-lg shadow-black/20"
             @click="showUserDetail(user, $event)"
           >
             <div class="flex items-start justify-between">
@@ -426,143 +271,123 @@
                 <img
                   v-if="user.avatar && !failedImages[user.id]"
                   :src="user.avatar"
-                  class="w-12 h-12 rounded-lg object-cover border border-border-tertiary"
+                  class="w-12 h-12 rounded-lg object-cover border border-zinc-700"
                   @error="handleImageError(user.id)"
                 >
                 <div
                   v-else
-                  class="w-12 h-12 rounded-lg bg-bg-tertiary flex items-center justify-center font-black text-lg text-text-tertiary border border-border-tertiary"
+                  class="w-12 h-12 rounded-lg bg-zinc-800 flex items-center justify-center font-black text-lg text-zinc-500 border border-zinc-700"
                 >
-                  {{ getUserInitial(user) }}
+                  {{ (user.name || user.username || '?').charAt(0).toUpperCase() }}
                 </div>
                 <div>
-                  <h4 class="text-base font-black text-text-primary">{{ getUserDisplayName(user) }}</h4>
-                  <p class="text-xs text-text-tertiary font-mono">@{{ user.username }}</p>
+                  <h4 class="text-base font-black text-zinc-100">{{ user.name || user.username }}</h4>
+                  <p class="text-xs text-zinc-500 font-mono">@{{ user.username }}</p>
                 </div>
               </div>
               <div class="text-right">
                 <div
                   v-if="user.status === 'active'"
-                  class="flex items-center gap-1.5 text-success font-black uppercase text-[10px] tracking-widest"
+                  class="flex items-center gap-1.5 text-emerald-500 font-black uppercase text-[10px] tracking-widest"
                 >
                   <div
-                    class="w-1.5 h-1.5 rounded-full bg-success shadow-[0_0_8px_var(--success-50)]"
+                    class="w-1.5 h-1.5 rounded-full bg-emerald-500 shadow-[0_0_8px_rgba(16,185,129,0.5)]"
                   />
-                  {{ getStatusName('active') }}
-                </div>
-                <div
-                  v-else-if="user.status === 'pending'"
-                  class="flex items-center gap-1.5 text-info font-black uppercase text-[10px] tracking-widest"
-                >
-                  <div class="w-1.5 h-1.5 rounded-full bg-info" />
-                  {{ getStatusName('pending') }}
+                  正常
                 </div>
                 <div
                   v-else-if="user.status === 'withdrawn'"
-                  class="flex items-center gap-1.5 text-error font-black uppercase text-[10px] tracking-widest"
+                  class="flex items-center gap-1.5 text-red-500 font-black uppercase text-[10px] tracking-widest"
                 >
-                  <div class="w-1.5 h-1.5 rounded-full bg-error" />
-                  {{ getStatusName('withdrawn') }}
+                  <div class="w-1.5 h-1.5 rounded-full bg-red-500" />
+                  退学
                 </div>
                 <div
                   v-else-if="user.status === 'graduate'"
-                  class="flex items-center gap-1.5 text-warning font-black uppercase text-[10px] tracking-widest"
+                  class="flex items-center gap-1.5 text-amber-500 font-black uppercase text-[10px] tracking-widest"
                 >
-                  <div class="w-1.5 h-1.5 rounded-full bg-warning" />
-                  {{ getStatusName('graduate') }}
+                  <div class="w-1.5 h-1.5 rounded-full bg-amber-500" />
+                  毕业
                 </div>
                 <div
                   v-else
-                  class="flex items-center gap-1.5 text-text-tertiary font-black uppercase text-[10px] tracking-widest"
+                  class="flex items-center gap-1.5 text-zinc-500 font-black uppercase text-[10px] tracking-widest"
                 >
-                  <div class="w-1.5 h-1.5 rounded-full bg-bg-quaternary" />
-                  {{ getStatusName('disabled') }}
+                  <div class="w-1.5 h-1.5 rounded-full bg-zinc-500" />
+                  禁用
                 </div>
-                <p class="text-[10px] font-black text-text-secondary uppercase mt-1">{{ locale.mobile.accountStatus }}</p>
+                <p class="text-[10px] font-black text-zinc-700 uppercase mt-1">账户状态</p>
               </div>
             </div>
 
-            <div class="grid grid-cols-2 gap-4 py-4 border-y border-border-secondary-50">
+            <div class="grid grid-cols-2 gap-4 py-4 border-y border-zinc-800/50">
               <div class="space-y-1">
-                <p class="text-[9px] font-black text-text-disabled uppercase tracking-widest">
-                  {{ locale.mobile.roleLevel }}
+                <p class="text-[9px] font-black text-zinc-600 uppercase tracking-widest">
+                  角色/等级
                 </p>
                 <div>
                   <span
-                    v-if="user.role === 'SUPER_ADMIN'"
-                    class="px-2 py-0.5 bg-warning-10 text-warning text-[10px] font-black rounded border border-warning-20 uppercase tracking-widest"
-                    >{{ getRoleName('SUPER_ADMIN') }}</span
-                  >
-                  <span
-                    v-else-if="user.role === 'ADMIN'"
-                    class="px-2 py-0.5 bg-primary-10 text-primary text-[10px] font-black rounded border border-primary-20 uppercase tracking-widest"
-                    >{{ getRoleName('ADMIN') }}</span
-                  >
-                  <span
-                    v-else-if="user.role === 'SONG_ADMIN'"
-                    class="px-2 py-0.5 bg-info-10 text-info text-[10px] font-black rounded border border-info-20 uppercase tracking-widest"
-                    >{{ getRoleName('SONG_ADMIN') }}</span
-                  >
-                  <span
-                    v-else
-                    class="px-2 py-0.5 bg-bg-tertiary text-text-tertiary text-[10px] font-black rounded border border-border-tertiary-50 uppercase tracking-widest"
-                    >{{ getRoleName('USER') }}</span
+                    class="px-2 py-0.5 text-[10px] font-black rounded border uppercase tracking-widest"
+                    :class="{
+                      'bg-orange-500/10 text-orange-400 border-orange-500/20': user.role?.toUpperCase() === 'SUPER_ADMIN',
+                      'bg-blue-500/10 text-blue-400 border-blue-500/20': user.role?.toUpperCase() === 'ADMIN' || user.role?.toUpperCase() === 'MINISTER',
+                      'bg-purple-500/10 text-purple-400 border-purple-500/20': user.role?.toUpperCase() === 'SONG_ADMIN' || user.role?.toUpperCase() === 'STAFF' || user.role?.toUpperCase() === 'VICE_MINISTER',
+                      'bg-zinc-800 text-zinc-500 border-zinc-700/50': !['SUPER_ADMIN', 'ADMIN', 'MINISTER', 'SONG_ADMIN', 'STAFF', 'VICE_MINISTER'].includes(user.role?.toUpperCase())
+                    }"
                   >
+                    {{ getRoleDisplayName(user.role?.toUpperCase()) }}
+                  </span>
                 </div>
               </div>
               <div class="space-y-1 text-right">
-                <p class="text-[9px] font-black text-text-disabled uppercase tracking-widest">
-                  {{ locale.mobile.class }}
+                <p class="text-[9px] font-black text-zinc-600 uppercase tracking-widest">
+                  所在班级
                 </p>
-                <p class="text-xs font-bold text-text-secondary">
+                <p class="text-xs font-bold text-zinc-300">
                   {{ user.grade || '-' }} {{ user.class || '-' }}
                 </p>
               </div>
               <div class="space-y-1">
-                <p class="text-[9px] font-black text-text-disabled uppercase tracking-widest">
-                  {{ locale.mobile.recentActivity }}
+                <p class="text-[9px] font-black text-zinc-600 uppercase tracking-widest">
+                  最近活动
                 </p>
-                <p class="text-xs font-bold text-text-tertiary">{{ formatDate(user.lastLogin) }}</p>
+                <p class="text-xs font-bold text-zinc-400">{{ formatDate(user.lastLogin) }}</p>
               </div>
               <div class="space-y-1 text-right">
-                <p class="text-[9px] font-black text-text-disabled uppercase tracking-widest">
-                  {{ locale.mobile.lastLoginIp }}
+                <p class="text-[9px] font-black text-zinc-600 uppercase tracking-widest">
+                  最后登录IP
                 </p>
-                <p class="text-[11px] font-mono text-text-disabled">{{ user.lastLoginIp || '-' }}</p>
+                <p class="text-[11px] font-mono text-zinc-600">{{ user.lastLoginIp || '-' }}</p>
               </div>
             </div>
 
             <div class="flex gap-2 action-buttons">
               <button
-                :disabled="!canManageUser(user)"
-                class="flex-1 py-2.5 bg-bg-primary border border-border-secondary rounded-lg text-text-tertiary flex items-center justify-center gap-2 text-[10px] font-black uppercase tracking-widest active:bg-primary-hover active:text-text-primary transition-colors disabled:opacity-20 action-btn"
+                :disabled="isSelf(user) || !canManageTargetUser(user)"
+                class="flex-1 py-2.5 bg-zinc-950 border border-zinc-800 rounded-lg text-zinc-400 flex items-center justify-center gap-2 text-[10px] font-black uppercase tracking-widest active:bg-blue-600 active:text-white transition-colors disabled:opacity-20 action-btn"
+                :title="!canManageTargetUser(user) ? '权限不足：无法编辑该用户' : '编辑用户'"
                 @click="editUser(user)"
               >
-                <Edit2 :size="12" /> {{ locale.actions.edit }}
+                <Edit2 :size="12" /> 编辑
               </button>
               <button
-                v-if="user.status === 'pending'"
-                class="flex-1 py-2.5 bg-bg-primary border border-border-secondary rounded-lg text-text-tertiary flex items-center justify-center gap-2 text-[10px] font-black uppercase tracking-widest active:bg-info active:text-text-primary transition-colors action-btn"
-                @click="openApproval(user)"
-              >
-                <ClipboardCheck :size="12" /> {{ locale.actions.approve }}
-              </button>
-              <button
-                class="flex-1 py-2.5 bg-bg-primary border border-border-secondary rounded-lg text-text-tertiary flex items-center justify-center gap-2 text-[10px] font-black uppercase tracking-widest active:bg-info active:text-text-primary transition-colors action-btn"
+                class="flex-1 py-2.5 bg-zinc-950 border border-zinc-800 rounded-lg text-zinc-400 flex items-center justify-center gap-2 text-[10px] font-black uppercase tracking-widest active:bg-purple-600 active:text-white transition-colors action-btn"
                 @click="viewUserSongs(user)"
               >
-                <Music :size="12" /> {{ locale.actions.records }}
+                <Music :size="12" /> 记录
               </button>
               <button
-                :disabled="!canManageUser(user)"
-                class="flex-1 py-2.5 bg-bg-primary border border-border-secondary rounded-lg text-text-tertiary flex items-center justify-center gap-2 text-[10px] font-black uppercase tracking-widest active:bg-warning active:text-text-primary transition-colors disabled:opacity-20 action-btn"
+                :disabled="isSelf(user) || !canResetPasswordFor(user)"
+                class="flex-1 py-2.5 bg-zinc-950 border border-zinc-800 rounded-lg text-zinc-400 flex items-center justify-center gap-2 text-[10px] font-black uppercase tracking-widest active:bg-amber-600 active:text-white transition-colors disabled:opacity-20 action-btn"
+                :title="!canResetPasswordFor(user) ? '权限不足：无法重置该用户的密码' : '重置密码'"
                 @click="resetPassword(user)"
               >
-                <Lock :size="12" /> {{ locale.actions.reset }}
+                <Lock :size="12" /> 重置
               </button>
               <button
-                :disabled="!canManageUser(user)"
-                class="px-3 py-2.5 bg-bg-primary border border-border-secondary rounded-lg text-text-tertiary active:bg-error active:text-text-primary transition-colors disabled:opacity-20 action-btn"
+                :disabled="isSelf(user) || !canManageTargetUser(user)"
+                class="px-3 py-2.5 bg-zinc-950 border border-zinc-800 rounded-lg text-zinc-400 active:bg-red-600 active:text-white transition-colors disabled:opacity-20 action-btn"
+                :title="!canManageTargetUser(user) ? '权限不足：无法删除该用户' : '删除用户'"
                 @click="confirmDeleteUser(user)"
               >
                 <Trash2 :size="14" />
@@ -571,16 +396,17 @@
           </div>
         </div>
       </template>
-      <!-- 分页 -->
-      <Pagination
-        v-model:current-page="currentPage"
-        :total-pages="totalPages"
-        :total-items="totalUsers"
-        :item-name="locale.itemName"
-      />
-      </div>
     </div>
 
+    <!-- 分页 -->
+    <Pagination
+      v-model:current-page="currentPage"
+      :total-pages="totalPages"
+      :total-items="totalUsers"
+      item-name="个用户"
+      @change="loadUsers"
+    />
+
     <!-- 添加/编辑用户模态框 -->
     <Transition
       enter-active-class="transition duration-300 ease-out"
@@ -592,28 +418,29 @@
     >
       <div
         v-if="showAddModal || editingUser"
-        class="fixed inset-0 z-50 flex items-center justify-center p-4 bg-bg-primary-80 backdrop-blur-sm"
+        class="fixed inset-0 z-50 flex items-center justify-center p-4 bg-black/80 backdrop-blur-sm"
+        @click="closeModal"
       >
         <div
-          class="bg-bg-secondary border border-border-secondary w-full max-w-lg rounded-3xl overflow-hidden shadow-2xl"
+          class="bg-zinc-900 border border-zinc-800 w-full max-w-lg rounded-3xl overflow-hidden shadow-2xl"
           @click.stop
         >
           <div class="p-8">
             <div class="flex items-center justify-between mb-8">
               <div>
-                <h3 class="text-xl font-black text-text-primary tracking-tight flex items-center gap-3">
+                <h3 class="text-xl font-black text-zinc-100 tracking-tight flex items-center gap-3">
                   <div
-                    class="w-10 h-10 rounded-2xl bg-primary-hover-10 flex items-center justify-center text-primary"
+                    class="w-10 h-10 rounded-2xl bg-blue-600/10 flex items-center justify-center text-blue-500"
                   >
                     <UserPlus v-if="!editingUser" :size="20" />
                     <Edit2 v-else :size="20" />
                   </div>
-                  {{ editingUser ? locale.form.editTitle : locale.form.createTitle }}
+                  {{ editingUser ? '编辑用户信息' : '创建新用户' }}
                 </h3>
-                <p class="text-xs text-text-tertiary mt-1 ml-13">{{ locale.form.desc }}</p>
+                <p class="text-xs text-zinc-500 mt-1 ml-13">请填写以下账户详细信息以继续</p>
               </div>
               <button
-                class="p-3 bg-bg-tertiary-50 hover:bg-bg-tertiary text-text-tertiary hover:text-text-primary rounded-2xl transition-all"
+                class="p-3 bg-zinc-800/50 hover:bg-zinc-800 text-zinc-500 hover:text-zinc-200 rounded-2xl transition-all"
                 @click="closeModal"
               >
                 <X :size="20" />
@@ -623,35 +450,36 @@
             <div class="space-y-5">
               <div class="grid grid-cols-2 gap-4">
                 <div class="space-y-2">
-                  <label class="text-[10px] font-black text-text-tertiary uppercase tracking-widest ml-1"
-                    >{{ locale.form.name }}</label
+                  <label class="text-[10px] font-black text-zinc-500 uppercase tracking-widest ml-1"
+                    >姓名</label
                   >
                   <div class="relative group">
                     <User
-                      class="absolute left-4 top-1/2 -translate-y-1/2 text-text-secondary group-focus-within:text-primary transition-colors"
+                      class="absolute left-4 top-1/2 -translate-y-1/2 text-zinc-700 group-focus-within:text-blue-500 transition-colors"
                       :size="16"
                     />
                     <input
                       v-model="userForm.name"
-                      class="w-full bg-bg-primary border border-border-secondary rounded-2xl pl-11 pr-4 py-3 text-xs focus:outline-none focus:border-primary-30 transition-all text-text-primary"
-                      :placeholder="locale.form.namePlaceholder"
+                      class="w-full bg-zinc-950 border border-zinc-800 rounded-2xl pl-11 pr-4 py-3 text-xs focus:outline-none focus:border-blue-500/30 transition-all text-zinc-200"
+                      placeholder="请输入真实姓名"
                       type="text"
                     >
                   </div>
                 </div>
                 <div class="space-y-2">
-                  <label class="text-[10px] font-black text-text-tertiary uppercase tracking-widest ml-1"
-                    >{{ locale.form.username }}</label
+                  <label class="text-[10px] font-black text-zinc-500 uppercase tracking-widest ml-1"
+                    >用户名/学号</label
                   >
                   <div class="relative group">
                     <AtSign
-                      class="absolute left-4 top-1/2 -translate-y-1/2 text-text-secondary group-focus-within:text-primary transition-colors"
+                      class="absolute left-4 top-1/2 -translate-y-1/2 text-zinc-700 group-focus-within:text-blue-500 transition-colors"
                       :size="16"
                     />
                     <input
                       v-model="userForm.username"
-                      class="w-full bg-bg-primary border border-border-secondary rounded-2xl pl-11 pr-4 py-3 text-xs focus:outline-none focus:border-primary-30 transition-all text-text-primary"
-                      :placeholder="locale.form.usernamePlaceholder"
+                      :disabled="!!editingUser"
+                      class="w-full bg-zinc-950 border border-zinc-800 rounded-2xl pl-11 pr-4 py-3 text-xs focus:outline-none focus:border-blue-500/30 transition-all text-zinc-200 disabled:opacity-50"
+                      placeholder="登录唯一标识"
                       type="text"
                     >
                   </div>
@@ -659,18 +487,18 @@
               </div>
 
               <div class="space-y-2">
-                <label class="text-[10px] font-black text-text-tertiary uppercase tracking-widest ml-1">
-                  {{ editingUser ? locale.form.newPassword : locale.form.initialPassword }}
+                <label class="text-[10px] font-black text-zinc-500 uppercase tracking-widest ml-1">
+                  {{ editingUser ? '新密码 (留空则不修改)' : '初始密码' }}
                 </label>
                 <div class="relative group">
                   <Lock
-                    class="absolute left-4 top-1/2 -translate-y-1/2 text-text-secondary group-focus-within:text-primary transition-colors"
+                    class="absolute left-4 top-1/2 -translate-y-1/2 text-zinc-700 group-focus-within:text-blue-500 transition-colors"
                     :size="16"
                   />
                   <input
                     v-model="userForm.password"
-                    class="w-full bg-bg-primary border border-border-secondary rounded-2xl pl-11 pr-4 py-3 text-xs focus:outline-none focus:border-primary-30 transition-all text-text-primary"
-                    :placeholder="locale.form.passwordPlaceholder"
+                    class="w-full bg-zinc-950 border border-zinc-800 rounded-2xl pl-11 pr-4 py-3 text-xs focus:outline-none focus:border-blue-500/30 transition-all text-zinc-200"
+                    placeholder="设置安全访问密码"
                     type="password"
                   >
                 </div>
@@ -678,71 +506,63 @@
 
               <div class="grid grid-cols-2 gap-4">
                 <div class="space-y-2">
-                  <label class="text-[10px] font-black text-text-tertiary uppercase tracking-widest ml-1"
-                    >{{ locale.form.role }}</label
+                  <label class="text-[10px] font-black text-zinc-500 uppercase tracking-widest ml-1"
+                    >角色权限</label
                   >
                   <CustomSelect
                     v-model="userForm.role"
                     :options="availableRoles"
                     label-key="displayName"
                     value-key="name"
-                    :placeholder="locale.form.rolePlaceholder"
+                    placeholder="请选择角色"
                   />
                 </div>
                 <div class="space-y-2">
-                  <label class="text-[10px] font-black text-text-tertiary uppercase tracking-widest ml-1"
-                    >{{ locale.form.status }}</label
+                  <label class="text-[10px] font-black text-zinc-500 uppercase tracking-widest ml-1"
+                    >账户状态</label
                   >
                   <CustomSelect
                     v-model="userForm.status"
                     :options="userStatusOptions"
                     label-key="label"
                     value-key="value"
-                    :placeholder="locale.form.statusPlaceholder"
+                    placeholder="请选择状态"
                   />
                 </div>
               </div>
 
               <div class="grid grid-cols-2 gap-4">
                 <div class="space-y-2">
-                  <label class="text-[10px] font-black text-text-tertiary uppercase tracking-widest ml-1"
-                    >{{ locale.form.grade }}</label
+                  <label class="text-[10px] font-black text-zinc-500 uppercase tracking-widest ml-1"
+                    >年级</label
                   >
-                  <div class="relative group">
-                    <Calendar
-                      class="absolute left-4 top-1/2 -translate-y-1/2 text-text-secondary group-focus-within:text-primary transition-colors"
-                      :size="16"
-                    />
-                    <input
-                      v-model="userForm.grade"
-                      class="w-full bg-bg-primary border border-border-secondary rounded-2xl pl-11 pr-4 py-3 text-xs focus:outline-none focus:border-primary-30 transition-all text-text-primary"
-                      :placeholder="locale.form.gradePlaceholder"
-                      type="text"
-                    >
-                  </div>
+                  <CustomSelect
+                    v-model="userForm.grade"
+                    :options="gradeOptions"
+                    label-key="label"
+                    value-key="value"
+                    placeholder="请选择年级"
+                    class-name="w-full"
+                  />
                 </div>
                 <div class="space-y-2">
-                  <label class="text-[10px] font-black text-text-tertiary uppercase tracking-widest ml-1"
-                    >{{ locale.form.class }}</label
+                  <label class="text-[10px] font-black text-zinc-500 uppercase tracking-widest ml-1"
+                    >班级</label
                   >
-                  <div class="relative group">
-                    <Briefcase
-                      class="absolute left-4 top-1/2 -translate-y-1/2 text-text-secondary group-focus-within:text-primary transition-colors"
-                      :size="16"
-                    />
-                    <input
-                      v-model="userForm.class"
-                      class="w-full bg-bg-primary border border-border-secondary rounded-2xl pl-11 pr-4 py-3 text-xs focus:outline-none focus:border-primary-30 transition-all text-text-primary"
-                      :placeholder="locale.form.classPlaceholder"
-                      type="text"
-                    >
-                  </div>
+                  <CustomSelect
+                    v-model="userForm.class"
+                    :options="classOptions"
+                    label-key="label"
+                    value-key="value"
+                    placeholder="请选择班级"
+                    class-name="w-full"
+                  />
                 </div>
               </div>
 
               <div
                 v-if="formError"
-                class="p-4 bg-error-10 border border-error-20 rounded-2xl flex items-center gap-3 text-error text-xs"
+                class="p-4 bg-red-500/10 border border-red-500/20 rounded-2xl flex items-center gap-3 text-red-400 text-xs"
               >
                 <AlertCircle :size="16" />
                 {{ formError }}
@@ -751,19 +571,19 @@
 
             <div class="flex gap-3 mt-10">
               <button
-                class="flex-1 px-6 py-4 bg-bg-tertiary hover:bg-bg-quaternary text-text-secondary text-xs font-black rounded-2xl transition-all uppercase tracking-widest"
+                class="flex-1 px-6 py-4 bg-zinc-800 hover:bg-zinc-700 text-zinc-300 text-xs font-black rounded-2xl transition-all uppercase tracking-widest"
                 @click="closeModal"
               >
-                {{ locale.form.cancel }}
+                取消操作
               </button>
               <button
                 :disabled="saving"
-                class="flex-[2] px-6 py-4 bg-primary-hover hover:bg-primary text-text-primary text-xs font-black rounded-2xl transition-all uppercase tracking-widest flex items-center justify-center gap-2 disabled:opacity-50 shadow-lg shadow-[var(--primary-glow)] active:scale-95"
+                class="flex-[2] px-6 py-4 bg-blue-600 hover:bg-blue-500 text-white text-xs font-black rounded-2xl transition-all uppercase tracking-widest flex items-center justify-center gap-2 disabled:opacity-50 shadow-lg shadow-blue-900/20 active:scale-95"
                 @click="saveUser"
               >
                 <Save v-if="!saving" :size="16" />
                 <RefreshCw v-else class="animate-spin" :size="16" />
-                {{ saving ? locale.form.saving : editingUser ? locale.form.update : locale.form.create }}
+                {{ saving ? '正在保存...' : editingUser ? '更新用户信息' : '确认创建用户' }}
               </button>
             </div>
           </div>
@@ -782,56 +602,56 @@
     >
       <div
         v-if="resetPasswordUser"
-        class="fixed inset-0 z-50 flex items-center justify-center p-4 bg-bg-primary-80 backdrop-blur-sm"
+        class="fixed inset-0 z-50 flex items-center justify-center p-4 bg-black/80 backdrop-blur-sm"
+        @click="closeResetPassword"
       >
         <div
-          class="bg-bg-secondary border border-border-secondary w-full max-w-md rounded-3xl overflow-hidden shadow-2xl"
+          class="bg-zinc-900 border border-zinc-800 w-full max-w-md rounded-3xl overflow-hidden shadow-2xl"
           @click.stop
         >
           <div class="p-8 text-center">
             <div
-              class="w-20 h-20 bg-warning-10 rounded-[2rem] flex items-center justify-center text-warning mx-auto mb-6"
+              class="w-20 h-20 bg-amber-500/10 rounded-[2rem] flex items-center justify-center text-amber-500 mx-auto mb-6"
             >
               <Lock :size="32" />
             </div>
-            <h3 class="text-xl font-black text-text-primary tracking-tight">{{ locale.resetPasswordModal.title }}</h3>
-            <p class="text-xs text-text-tertiary mt-2 mb-8">
-              {{ locale.resetPasswordModal.descPrefix }}
-              <span class="text-text-primary font-bold">{{ resetPasswordUser.name }}</span>
-              {{ locale.resetPasswordModal.descSuffix }}
+            <h3 class="text-xl font-black text-zinc-100 tracking-tight">重置访问密码</h3>
+            <p class="text-xs text-zinc-500 mt-2 mb-8">
+              正在为
+              <span class="text-zinc-200 font-bold">{{ resetPasswordUser.name }}</span> 修改登录凭据
             </p>
 
             <div class="space-y-4 text-left">
               <div class="space-y-2">
-                <label class="text-[10px] font-black text-text-tertiary uppercase tracking-widest ml-1"
-                  >{{ locale.resetPasswordModal.newPassword }}</label
+                <label class="text-[10px] font-black text-zinc-500 uppercase tracking-widest ml-1"
+                  >新密码</label
                 >
                 <div class="relative group">
                   <Key
-                    class="absolute left-4 top-1/2 -translate-y-1/2 text-text-secondary group-focus-within:text-warning transition-colors"
+                    class="absolute left-4 top-1/2 -translate-y-1/2 text-zinc-700 group-focus-within:text-amber-500 transition-colors"
                     :size="16"
                   />
                   <input
                     v-model="passwordForm.password"
-                    class="w-full bg-bg-primary border border-border-secondary rounded-2xl pl-11 pr-4 py-3 text-xs focus:outline-none focus:border-warning-30 transition-all text-text-primary"
-                    :placeholder="locale.resetPasswordModal.newPasswordPlaceholder"
+                    class="w-full bg-zinc-950 border border-zinc-800 rounded-2xl pl-11 pr-4 py-3 text-xs focus:outline-none focus:border-amber-500/30 transition-all text-zinc-200"
+                    placeholder="设置高强度新密码"
                     type="password"
                   >
                 </div>
               </div>
               <div class="space-y-2">
-                <label class="text-[10px] font-black text-text-tertiary uppercase tracking-widest ml-1"
-                  >{{ locale.resetPasswordModal.confirmPassword }}</label
+                <label class="text-[10px] font-black text-zinc-500 uppercase tracking-widest ml-1"
+                  >确认新密码</label
                 >
                 <div class="relative group">
                   <Key
-                    class="absolute left-4 top-1/2 -translate-y-1/2 text-text-secondary group-focus-within:text-warning transition-colors"
+                    class="absolute left-4 top-1/2 -translate-y-1/2 text-zinc-700 group-focus-within:text-amber-500 transition-colors"
                     :size="16"
                   />
                   <input
                     v-model="passwordForm.confirmPassword"
-                    class="w-full bg-bg-primary border border-border-secondary rounded-2xl pl-11 pr-4 py-3 text-xs focus:outline-none focus:border-warning-30 transition-all text-text-primary"
-                    :placeholder="locale.resetPasswordModal.confirmPasswordPlaceholder"
+                    class="w-full bg-zinc-950 border border-zinc-800 rounded-2xl pl-11 pr-4 py-3 text-xs focus:outline-none focus:border-amber-500/30 transition-all text-zinc-200"
+                    placeholder="请再次输入以确认"
                     type="password"
                   >
                 </div>
@@ -839,7 +659,7 @@
 
               <div
                 v-if="passwordError"
-                class="p-4 bg-error-10 border border-error-20 rounded-2xl flex items-center gap-3 text-error text-xs"
+                class="p-4 bg-red-500/10 border border-red-500/20 rounded-2xl flex items-center gap-3 text-red-400 text-xs"
               >
                 <AlertCircle :size="16" />
                 {{ passwordError }}
@@ -848,19 +668,19 @@
 
             <div class="flex gap-3 mt-8">
               <button
-                class="flex-1 px-6 py-4 bg-bg-tertiary hover:bg-bg-quaternary text-text-secondary text-xs font-black rounded-2xl transition-all uppercase tracking-widest"
+                class="flex-1 px-6 py-4 bg-zinc-800 hover:bg-zinc-700 text-zinc-300 text-xs font-black rounded-2xl transition-all uppercase tracking-widest"
                 @click="closeResetPassword"
               >
-                {{ locale.resetPasswordModal.cancel }}
+                取消
               </button>
               <button
                 :disabled="resetting"
-                class="flex-[2] px-6 py-4 bg-warning hover:bg-warning text-text-primary text-xs font-black rounded-2xl transition-all uppercase tracking-widest flex items-center justify-center gap-2 disabled:opacity-50 shadow-lg shadow-[var(--warning-glow-20)] active:scale-95"
+                class="flex-[2] px-6 py-4 bg-amber-600 hover:bg-amber-500 text-white text-xs font-black rounded-2xl transition-all uppercase tracking-widest flex items-center justify-center gap-2 disabled:opacity-50 shadow-lg shadow-amber-900/20 active:scale-95"
                 @click="confirmResetPassword"
               >
                 <Save v-if="!resetting" :size="16" />
                 <RefreshCw v-else class="animate-spin" :size="16" />
-                {{ resetting ? locale.resetPasswordModal.resetting : locale.resetPasswordModal.confirm }}
+                {{ resetting ? '正在重置...' : '确认重置密码' }}
               </button>
             </div>
           </div>
@@ -879,29 +699,30 @@
     >
       <div
         v-if="showImportModal"
-        class="fixed inset-0 z-50 flex items-center justify-center p-4 bg-bg-primary-80 backdrop-blur-sm"
+        class="fixed inset-0 z-50 flex items-center justify-center p-4 bg-black/80 backdrop-blur-sm"
+        @click="closeImportModal"
       >
         <div
-          class="bg-bg-secondary border border-border-secondary w-full max-w-2xl rounded-3xl overflow-hidden shadow-2xl"
+          class="bg-zinc-900 border border-zinc-800 w-full max-w-2xl rounded-3xl overflow-hidden shadow-2xl"
           @click.stop
         >
           <div class="p-8">
             <div class="flex items-center justify-between mb-8">
               <div>
-                <h3 class="text-xl font-black text-text-primary tracking-tight flex items-center gap-3">
+                <h3 class="text-xl font-black text-zinc-100 tracking-tight flex items-center gap-3">
                   <div
-                    class="w-10 h-10 rounded-2xl bg-success-10 flex items-center justify-center text-success"
+                    class="w-10 h-10 rounded-2xl bg-emerald-600/10 flex items-center justify-center text-emerald-500"
                   >
                     <FileSpreadsheet :size="20" />
                   </div>
-                  {{ locale.importModal.title }}
+                  批量导入用户
                 </h3>
-                <p class="text-xs text-text-tertiary mt-1 ml-13">
-                  {{ locale.importModal.desc }}
+                <p class="text-xs text-zinc-500 mt-1 ml-13">
+                  支持 .xlsx 格式文件，请按模板要求上传
                 </p>
               </div>
               <button
-                class="p-3 bg-bg-tertiary-50 hover:bg-bg-tertiary text-text-tertiary hover:text-text-primary rounded-2xl transition-all"
+                class="p-3 bg-zinc-800/50 hover:bg-zinc-800 text-zinc-500 hover:text-zinc-200 rounded-2xl transition-all"
                 @click="closeImportModal"
               >
                 <X :size="20" />
@@ -909,36 +730,36 @@
             </div>
 
             <div class="space-y-6 max-h-[60vh] overflow-y-auto pr-2 custom-scrollbar">
-              <div class="p-5 bg-bg-primary-50 border border-border-secondary-50 rounded-3xl space-y-4">
-                <div class="flex items-center gap-2 text-text-secondary font-bold text-sm mb-2">
-                  <Info :size="16" class="text-primary" />
-                  {{ locale.importModal.instructionsTitle }}
+              <div class="p-5 bg-zinc-950/50 border border-zinc-800/50 rounded-3xl space-y-4">
+                <div class="flex items-center gap-2 text-zinc-300 font-bold text-sm mb-2">
+                  <Info :size="16" class="text-blue-400" />
+                  导入说明
                 </div>
-                <p class="text-xs text-text-tertiary leading-relaxed">
-                  {{ locale.importModal.instructionsLine1 }}
-                  {{ locale.importModal.instructionsLine2 }}
+                <p class="text-xs text-zinc-500 leading-relaxed">
+                  请上传Excel格式文件 (.xlsx)，系统会自动解析数据。
+                  注意：第一行可以是标题行（会自动跳过），角色字段必须匹配系统定义的角色。
                 </p>
 
-                <div class="overflow-hidden rounded-2xl border border-border-secondary-80">
+                <div class="overflow-hidden rounded-2xl border border-zinc-800/80">
                   <table class="w-full text-[10px] text-left">
-                    <thead class="bg-bg-secondary text-text-tertiary uppercase tracking-tighter">
+                    <thead class="bg-zinc-900 text-zinc-400 uppercase tracking-tighter">
                       <tr>
-                        <th class="px-3 py-2 border-b border-border-secondary">{{ locale.importModal.sampleHeaders.name }}</th>
-                        <th class="px-3 py-2 border-b border-border-secondary">{{ locale.importModal.sampleHeaders.username }}</th>
-                        <th class="px-3 py-2 border-b border-border-secondary">{{ locale.importModal.sampleHeaders.password }}</th>
-                        <th class="px-3 py-2 border-b border-border-secondary">{{ locale.importModal.sampleHeaders.role }}</th>
-                        <th class="px-3 py-2 border-b border-border-secondary">{{ locale.importModal.sampleHeaders.grade }}</th>
-                        <th class="px-3 py-2 border-b border-border-secondary">{{ locale.importModal.sampleHeaders.class }}</th>
+                        <th class="px-3 py-2 border-b border-zinc-800">姓名</th>
+                        <th class="px-3 py-2 border-b border-zinc-800">账号名</th>
+                        <th class="px-3 py-2 border-b border-zinc-800">密码</th>
+                        <th class="px-3 py-2 border-b border-zinc-800">角色</th>
+                        <th class="px-3 py-2 border-b border-zinc-800">年级</th>
+                        <th class="px-3 py-2 border-b border-zinc-800">班级</th>
                       </tr>
                     </thead>
-                    <tbody class="text-text-tertiary">
-                      <tr class="border-b border-border-secondary-50">
-                        <td class="px-3 py-2">{{ locale.importModal.sampleName }}</td>
-                        <td class="px-3 py-2">zhangsan</td>
+                    <tbody class="text-zinc-500">
+                      <tr class="border-b border-zinc-900/50">
+                        <td class="px-3 py-2">张三</td>
+                        <td class="px-3 py-2">张三</td>
                         <td class="px-3 py-2">******</td>
                         <td class="px-3 py-2">USER</td>
-                        <td class="px-3 py-2">{{ locale.importModal.sampleGrade }}</td>
-                        <td class="px-3 py-2">{{ locale.importModal.sampleClass }}</td>
+                        <td class="px-3 py-2">高一</td>
+                        <td class="px-3 py-2">1班</td>
                       </tr>
                     </tbody>
                   </table>
@@ -946,32 +767,32 @@
 
                 <div class="flex items-center justify-between gap-4">
                   <div
-                    class="p-3 bg-primary-5 border border-primary-10 rounded-2xl text-[10px] text-primary-80 leading-relaxed flex-1"
+                    class="p-3 bg-blue-500/5 border border-blue-500/10 rounded-2xl text-[10px] text-blue-400/80 leading-relaxed flex-1"
                   >
-                    <strong>{{ locale.importModal.supportedRoles }}</strong>
+                    <strong>支持的角色：</strong>
                     <span v-if="isSuperAdmin"
-                      >{{ locale.importModal.supportedRolesFull }}</span
+                      >USER（普通用户）、ADMIN（管理员）、SONG_ADMIN（歌曲管理员）、SUPER_ADMIN（超级管理员）</span
                     >
-                    <span v-else>{{ locale.importModal.supportedRolesLimited }}</span>
+                    <span v-else>USER（普通用户）、SONG_ADMIN（歌曲管理员）</span>
                   </div>
                   <button
-                    class="px-4 py-3 bg-success-10 border border-success-20 hover:border-success-40 rounded-xl transition-all flex items-center gap-2 group shrink-0"
+                    class="px-4 py-3 bg-emerald-500/10 border border-emerald-500/20 hover:border-emerald-500/40 rounded-xl transition-all flex items-center gap-2 group shrink-0"
                     @click="downloadImportTemplate"
                   >
                     <Download
                       :size="16"
-                      class="text-success group-hover:scale-110 transition-transform"
+                      class="text-emerald-500 group-hover:scale-110 transition-transform"
                     />
-                    <span class="text-[10px] font-black text-success uppercase tracking-widest"
-                      >{{ locale.importModal.downloadTemplate }}</span
+                    <span class="text-[10px] font-black text-emerald-500 uppercase tracking-widest"
+                      >下载模板</span
                     >
                   </button>
                 </div>
               </div>
 
               <div class="space-y-3">
-                <label class="block text-xs font-black text-text-tertiary uppercase tracking-widest ml-1"
-                  >{{ locale.importModal.chooseFile }}</label
+                <label class="block text-xs font-black text-zinc-400 uppercase tracking-widest ml-1"
+                  >选择数据文件</label
                 >
                 <div class="relative group cursor-pointer" @click="$refs.fileInput.click()">
                   <input
@@ -983,16 +804,16 @@
                     @change="handleFileUpload"
                   >
                   <div
-                    class="w-full py-10 border-2 border-dashed border-border-secondary group-hover:border-success-50 group-hover:bg-success-5 rounded-3xl transition-all flex flex-col items-center justify-center gap-3"
+                    class="w-full py-10 border-2 border-dashed border-zinc-800 group-hover:border-emerald-500/50 group-hover:bg-emerald-500/5 rounded-3xl transition-all flex flex-col items-center justify-center gap-3"
                   >
                     <div
-                      class="w-12 h-12 rounded-2xl bg-bg-secondary flex items-center justify-center text-text-disabled group-hover:text-success transition-colors"
+                      class="w-12 h-12 rounded-2xl bg-zinc-900 flex items-center justify-center text-zinc-600 group-hover:text-emerald-500 transition-colors"
                     >
                       <Upload :size="24" />
                     </div>
                     <div class="text-center">
-                      <p class="text-sm font-bold text-text-secondary">{{ locale.importModal.uploadTitle }}</p>
-                      <p class="text-xs text-text-tertiary mt-1">{{ locale.importModal.uploadHint }}</p>
+                      <p class="text-sm font-bold text-zinc-300">点击或拖拽上传 Excel 文件</p>
+                      <p class="text-xs text-zinc-500 mt-1">仅支持 .xlsx 格式</p>
                     </div>
                   </div>
                 </div>
@@ -1000,60 +821,51 @@
 
               <div
                 v-if="importError"
-                class="p-4 bg-error-10 border border-error-20 rounded-2xl flex gap-3 text-error text-xs items-start"
+                class="p-4 bg-red-500/10 border border-red-500/20 rounded-2xl flex items-center gap-3 text-red-400 text-xs"
               >
-                <AlertCircle :size="16" class="mt-0.5 shrink-0" />
-                <div class="whitespace-pre-wrap leading-relaxed">{{ importError }}</div>
+                <AlertCircle :size="16" />
+                {{ importError }}
               </div>
 
-              <!-- 进度条 -->
               <div
-                v-if="importProgressText"
-                class="p-5 bg-success-5 border border-success-20 rounded-2xl space-y-3 animate-in fade-in slide-in-from-bottom-2 duration-300"
+                v-if="importSuccess"
+                class="p-4 bg-emerald-500/10 border border-emerald-500/20 rounded-2xl flex items-center gap-3 text-emerald-400 text-xs"
               >
-                <div class="flex items-center justify-between">
-                  <span class="text-xs font-black text-success uppercase tracking-widest">{{ importProgressText }}</span>
-                  <span class="text-xs font-black text-success">{{ importProgress }}%</span>
-                </div>
-                <div class="h-2 bg-bg-secondary rounded-full overflow-hidden">
-                  <div
-                    class="h-full bg-gradient-to-r from-success to-success-light transition-all duration-300 ease-out rounded-full"
-                    :style="{ width: importProgress + '%' }"
-                  />
-                </div>
+                <CheckCircle2 :size="16" />
+                {{ importSuccess }}
               </div>
 
               <div v-if="previewData.length > 0" class="space-y-3">
                 <div class="flex items-center justify-between ml-1">
-                  <label class="text-xs font-black text-text-tertiary uppercase tracking-widest"
-                    >{{ formatMessage(locale.importModal.previewData, previewData.length) }}</label
+                  <label class="text-xs font-black text-zinc-400 uppercase tracking-widest"
+                    >预览数据 ({{ previewData.length }}条记录)</label
                   >
                 </div>
-                <div class="overflow-hidden rounded-3xl border border-border-secondary bg-bg-primary-30">
+                <div class="overflow-hidden rounded-3xl border border-zinc-800 bg-zinc-950/30">
                   <table class="w-full text-xs text-left">
-                    <thead class="bg-bg-secondary-50 text-text-tertiary">
+                    <thead class="bg-zinc-900/50 text-zinc-500">
                       <tr>
-                        <th class="px-4 py-3 font-medium">{{ locale.importModal.sampleHeaders.name }}</th>
-                        <th class="px-4 py-3 font-medium">{{ locale.importModal.account }}</th>
-                        <th class="px-4 py-3 font-medium">{{ locale.importModal.sampleHeaders.role }}</th>
-                        <th class="px-4 py-3 font-medium">{{ locale.importModal.gradeClass }}</th>
+                        <th class="px-4 py-3 font-medium">姓名</th>
+                        <th class="px-4 py-3 font-medium">账号</th>
+                        <th class="px-4 py-3 font-medium">角色</th>
+                        <th class="px-4 py-3 font-medium">年级/班级</th>
                       </tr>
                     </thead>
-                    <tbody class="divide-y divide-panel-bg-deepest">
+                    <tbody class="divide-y divide-zinc-900">
                       <tr
                         v-for="(row, index) in previewData.slice(0, 5)"
                         :key="index"
-                        class="text-text-secondary"
+                        class="text-zinc-300"
                       >
                         <td class="px-4 py-3">{{ row.name }}</td>
                         <td class="px-4 py-3">{{ row.username }}</td>
                         <td class="px-4 py-3">
                           <span
-                            class="px-2 py-0.5 bg-bg-tertiary rounded-md text-[10px] text-text-tertiary uppercase"
+                            class="px-2 py-0.5 bg-zinc-800 rounded-md text-[10px] text-zinc-400 uppercase"
                             >{{ row.role }}</span
                           >
                         </td>
-                        <td class="px-4 py-3 text-text-tertiary">
+                        <td class="px-4 py-3 text-zinc-500">
                           {{ row.grade || '-' }} / {{ row.class || '-' }}
                         </td>
                       </tr>
@@ -1061,9 +873,9 @@
                   </table>
                   <div
                     v-if="previewData.length > 5"
-                    class="p-3 text-center border-t border-border-secondary text-[10px] text-text-tertiary font-medium"
+                    class="p-3 text-center border-t border-zinc-900 text-[10px] text-zinc-500 font-medium"
                   >
-                    {{ formatMessage(locale.importModal.moreRecords, previewData.length - 5) }}
+                    以及另外 {{ previewData.length - 5 }} 条记录...
                   </div>
                 </div>
               </div>
@@ -1071,19 +883,19 @@
 
             <div class="flex gap-3 mt-8">
               <button
-                class="flex-1 px-6 py-4 bg-bg-tertiary hover:bg-bg-quaternary text-text-secondary text-xs font-black rounded-2xl transition-all uppercase tracking-widest"
+                class="flex-1 px-6 py-4 bg-zinc-800 hover:bg-zinc-700 text-zinc-300 text-xs font-black rounded-2xl transition-all uppercase tracking-widest"
                 @click="closeImportModal"
               >
-                {{ locale.importModal.cancel }}
+                取消
               </button>
               <button
                 :disabled="importLoading || previewData.length === 0"
-                class="flex-[2] px-6 py-4 bg-success hover:bg-success text-text-primary text-xs font-black rounded-2xl transition-all uppercase tracking-widest flex items-center justify-center gap-2 disabled:opacity-50 shadow-lg shadow-[var(--success-glow-20)] active:scale-95"
+                class="flex-[2] px-6 py-4 bg-emerald-600 hover:bg-emerald-500 text-white text-xs font-black rounded-2xl transition-all uppercase tracking-widest flex items-center justify-center gap-2 disabled:opacity-50 shadow-lg shadow-emerald-900/20 active:scale-95"
                 @click="importUsers"
               >
                 <Save v-if="!importLoading" :size="16" />
                 <RefreshCw v-else class="animate-spin" :size="16" />
-                {{ importLoading ? locale.importModal.importing : locale.importModal.confirm }}
+                {{ importLoading ? '正在导入...' : '确认开始导入' }}
               </button>
             </div>
           </div>
@@ -1094,10 +906,10 @@
     <!-- 删除确认对话框 -->
     <ConfirmDialog
       :show="showDeleteModal"
-      :title="locale.deleteDialog.title"
-      :message="formatMessage(locale.deleteDialog.message, deletingUser?.name || '')"
+      title="确认删除用户"
+      :message="`确定要删除用户 &quot;${deletingUser?.name}&quot; 吗？此操作将永久移除该账户，不可撤销。`"
       type="danger"
-      :confirm-text="locale.deleteDialog.confirm"
+      confirm-text="确认删除"
       :loading="deleting"
       @confirm="confirmDelete"
       @close="closeDeleteModal"
@@ -1118,21 +930,6 @@
       @close="closeUserSongsModal"
     />
 
-<!-- 用户注册审核模态框 -->
-    <UserApprovalModal
-      :show="showApprovalModal"
-      :user="userToApprove"
-      @close="showApprovalModal = false"
-      @success="handleApprovalSuccess"
-    />
-
-    <!-- OAuth 绑定详情模态框 -->
-    <OAuthBindingsModal
-      :show="showOAuthBindingsModal"
-      :identities="selectedUserDetail?.identities || []"
-      @close="closeOAuthBindingsModal"
-    />
-
     <!-- 用户详细信息模态框 -->
     <Transition
       enter-active-class="transition duration-300 ease-out"
@@ -1144,28 +941,28 @@
     >
       <div
         v-if="showUserDetailModal"
-        class="fixed inset-0 z-50 flex items-center justify-center p-4 bg-bg-primary-80 backdrop-blur-sm"
+        class="fixed inset-0 z-50 flex items-center justify-center p-4 bg-black/80 backdrop-blur-sm"
         @click="closeUserDetailModal"
       >
         <div
-          class="bg-bg-secondary border border-border-secondary w-full max-w-3xl rounded-3xl overflow-hidden shadow-2xl"
+          class="bg-zinc-900 border border-zinc-800 w-full max-w-3xl rounded-3xl overflow-hidden shadow-2xl"
           @click.stop
         >
           <div class="p-8">
             <div class="flex items-center justify-between mb-8">
               <div>
-                <h3 class="text-xl font-black text-text-primary tracking-tight flex items-center gap-3">
+                <h3 class="text-xl font-black text-zinc-100 tracking-tight flex items-center gap-3">
                   <div
-                    class="w-10 h-10 rounded-2xl bg-primary-hover-10 flex items-center justify-center text-primary"
+                    class="w-10 h-10 rounded-2xl bg-blue-600/10 flex items-center justify-center text-blue-500"
                   >
                     <User :size="20" />
                   </div>
-                  {{ locale.detail.title }}
+                  用户详细信息
                 </h3>
-                <p class="text-xs text-text-tertiary mt-1 ml-13">{{ locale.detail.desc }}</p>
+                <p class="text-xs text-zinc-500 mt-1 ml-13">查看完整的账户资料与操作记录</p>
               </div>
               <button
-                class="p-3 bg-bg-tertiary-50 hover:bg-bg-tertiary text-text-tertiary hover:text-text-primary rounded-2xl transition-all"
+                class="p-3 bg-zinc-800/50 hover:bg-zinc-800 text-zinc-500 hover:text-zinc-200 rounded-2xl transition-all"
                 @click="closeUserDetailModal"
               >
                 <X :size="20" />
@@ -1179,35 +976,35 @@
               <!-- 基本信息 -->
               <div class="space-y-4">
                 <div
-                  class="flex items-center gap-2 text-xs font-black text-text-tertiary uppercase tracking-widest ml-1"
+                  class="flex items-center gap-2 text-xs font-black text-zinc-400 uppercase tracking-widest ml-1"
                 >
-                  <Info :size="14" class="text-primary" />
-                  {{ locale.detail.basicInfo }}
+                  <Info :size="14" class="text-blue-500" />
+                  基本信息
                 </div>
                 <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
-                  <div class="p-4 bg-bg-primary-50 border border-border-secondary-50 rounded-2xl space-y-1">
-                    <div class="text-[10px] font-black text-text-disabled uppercase tracking-tighter">
-                      {{ locale.detail.userId }}
+                  <div class="p-4 bg-zinc-950/50 border border-zinc-800/50 rounded-2xl space-y-1">
+                    <div class="text-[10px] font-black text-zinc-600 uppercase tracking-tighter">
+                      用户 ID
                     </div>
-                    <div class="text-sm font-bold text-text-secondary">{{ selectedUserDetail.id }}</div>
+                    <div class="text-sm font-bold text-zinc-300">{{ selectedUserDetail.id }}</div>
                   </div>
-                  <div class="p-4 bg-bg-primary-50 border border-border-secondary-50 rounded-2xl space-y-1">
-                    <div class="text-[10px] font-black text-text-disabled uppercase tracking-tighter">
-                      {{ locale.detail.name }}
+                  <div class="p-4 bg-zinc-950/50 border border-zinc-800/50 rounded-2xl space-y-1">
+                    <div class="text-[10px] font-black text-zinc-600 uppercase tracking-tighter">
+                      姓名
                     </div>
-                    <div class="text-sm font-bold text-text-secondary">{{ selectedUserDetail.name }}</div>
+                    <div class="text-sm font-bold text-zinc-300">{{ selectedUserDetail.name }}</div>
                   </div>
-                  <div class="p-4 bg-bg-primary-50 border border-border-secondary-50 rounded-2xl space-y-1">
-                    <div class="text-[10px] font-black text-text-disabled uppercase tracking-tighter">
-                      {{ locale.detail.username }}
+                  <div class="p-4 bg-zinc-950/50 border border-zinc-800/50 rounded-2xl space-y-1">
+                    <div class="text-[10px] font-black text-zinc-600 uppercase tracking-tighter">
+                      用户名
                     </div>
-                    <div class="text-sm font-bold text-text-secondary">
+                    <div class="text-sm font-bold text-zinc-300">
                       {{ selectedUserDetail.username }}
                     </div>
                   </div>
-                  <div class="p-4 bg-bg-primary-50 border border-border-secondary-50 rounded-2xl space-y-1">
-                    <div class="text-[10px] font-black text-text-disabled uppercase tracking-tighter">
-                      {{ locale.detail.role }}
+                  <div class="p-4 bg-zinc-950/50 border border-zinc-800/50 rounded-2xl space-y-1">
+                    <div class="text-[10px] font-black text-zinc-600 uppercase tracking-tighter">
+                      角色权限
                     </div>
                     <div>
                       <span
@@ -1220,20 +1017,20 @@
                       </span>
                     </div>
                   </div>
-                  <div class="p-4 bg-bg-primary-50 border border-border-secondary-50 rounded-2xl space-y-1">
-                    <div class="text-[10px] font-black text-text-disabled uppercase tracking-tighter">
-                      {{ locale.detail.grade }}
+                  <div class="p-4 bg-zinc-950/50 border border-zinc-800/50 rounded-2xl space-y-1">
+                    <div class="text-[10px] font-black text-zinc-600 uppercase tracking-tighter">
+                      年级
                     </div>
-                    <div class="text-sm font-bold text-text-secondary">
-                      {{ selectedUserDetail.grade || locale.detail.unset }}
+                    <div class="text-sm font-bold text-zinc-300">
+                      {{ selectedUserDetail.grade || '未设置' }}
                     </div>
                   </div>
-                  <div class="p-4 bg-bg-primary-50 border border-border-secondary-50 rounded-2xl space-y-1">
-                    <div class="text-[10px] font-black text-text-disabled uppercase tracking-tighter">
-                      {{ locale.detail.class }}
+                  <div class="p-4 bg-zinc-950/50 border border-zinc-800/50 rounded-2xl space-y-1">
+                    <div class="text-[10px] font-black text-zinc-600 uppercase tracking-tighter">
+                      班级
                     </div>
-                    <div class="text-sm font-bold text-text-secondary">
-                      {{ selectedUserDetail.class || locale.detail.unset }}
+                    <div class="text-sm font-bold text-zinc-300">
+                      {{ selectedUserDetail.class || '未设置' }}
                     </div>
                   </div>
                 </div>
@@ -1242,43 +1039,43 @@
               <!-- 账户状态 -->
               <div class="space-y-4">
                 <div
-                  class="flex items-center gap-2 text-xs font-black text-text-tertiary uppercase tracking-widest ml-1"
+                  class="flex items-center gap-2 text-xs font-black text-zinc-400 uppercase tracking-widest ml-1"
                 >
-                  <Shield :size="14" class="text-success" />
-                  {{ locale.detail.status }}
+                  <Shield :size="14" class="text-emerald-500" />
+                  账户状态
                 </div>
                 <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
                   <div
-                    class="p-4 bg-bg-primary-50 border border-border-secondary-50 rounded-2xl flex items-center justify-between"
+                    class="p-4 bg-zinc-950/50 border border-zinc-800/50 rounded-2xl flex items-center justify-between"
                   >
-                    <div class="space-y-1 overflow-hidden pr-2">
-                      <div class="text-[10px] font-black text-text-disabled uppercase tracking-tighter">
-                        {{ locale.detail.passwordStatus }}
+                    <div class="space-y-1">
+                      <div class="text-[10px] font-black text-zinc-600 uppercase tracking-tighter">
+                        密码状态
                       </div>
                       <div
-                        class="text-sm font-bold truncate"
+                        class="text-sm font-bold"
                         :class="
                           !selectedUserDetail.forcePasswordChange &&
                           selectedUserDetail.passwordChangedAt
-                            ? 'text-success'
-                            : 'text-warning'
+                            ? 'text-emerald-500'
+                            : 'text-amber-500'
                         "
                       >
                         {{
                           !selectedUserDetail.forcePasswordChange &&
                           selectedUserDetail.passwordChangedAt
-                            ? locale.detail.passwordChanged
-                            : locale.detail.requirePasswordChange
+                            ? '密码已修改'
+                            : '需要修改密码'
                         }}
                       </div>
                     </div>
                     <div
                       :class="[
-                        'w-8 h-8 rounded-xl flex items-center justify-center shrink-0',
+                        'w-8 h-8 rounded-xl flex items-center justify-center',
                         !selectedUserDetail.forcePasswordChange &&
                         selectedUserDetail.passwordChangedAt
-                          ? 'bg-success-10 text-success'
-                          : 'bg-warning-10 text-warning'
+                          ? 'bg-emerald-500/10 text-emerald-500'
+                          : 'bg-amber-500/10 text-amber-500'
                       ]"
                     >
                       <CheckCircle2
@@ -1292,120 +1089,36 @@
                     </div>
                   </div>
                   <div
-                    class="p-4 bg-bg-primary-50 border border-border-secondary-50 rounded-2xl flex items-center justify-between"
+                    class="p-4 bg-zinc-950/50 border border-zinc-800/50 rounded-2xl flex items-center justify-between"
                   >
-                    <div class="space-y-1 overflow-hidden pr-2">
-                      <div class="text-[10px] font-black text-text-disabled uppercase tracking-tighter">
-                        {{ locale.detail.meowBinding }}
+                    <div class="space-y-1">
+                      <div class="text-[10px] font-black text-zinc-600 uppercase tracking-tighter">
+                        MeoW 账号绑定
                       </div>
                       <div
-                        class="text-sm font-bold truncate"
+                        class="text-sm font-bold"
                         :class="
-                          selectedUserDetail.meowNickname ? 'text-success' : 'text-text-tertiary'
+                          selectedUserDetail.meowNickname ? 'text-emerald-500' : 'text-zinc-500'
                         "
-                        :title="selectedUserDetail.meowNickname ? formatMessage(locale.detail.bound, selectedUserDetail.meowNickname) : locale.detail.unbound"
                       >
                         {{
                           selectedUserDetail.meowNickname
-                            ? formatMessage(locale.detail.bound, selectedUserDetail.meowNickname)
-                            : locale.detail.unbound
+                            ? `已绑定: ${selectedUserDetail.meowNickname}`
+                            : '未绑定'
                         }}
                       </div>
                     </div>
                     <div
                       :class="[
-                        'w-8 h-8 rounded-xl flex items-center justify-center shrink-0',
+                        'w-8 h-8 rounded-xl flex items-center justify-center',
                         selectedUserDetail.meowNickname
-                          ? 'bg-success-10 text-success'
-                          : 'bg-bg-tertiary text-text-disabled'
+                          ? 'bg-emerald-500/10 text-emerald-500'
+                          : 'bg-zinc-800 text-zinc-600'
                       ]"
                     >
                       <AtSign :size="16" />
                     </div>
                   </div>
-
-                  <!-- 邮箱绑定 -->
-                  <div
-                    class="p-4 bg-bg-primary-50 border border-border-secondary-50 rounded-2xl flex items-center justify-between"
-                  >
-                    <div class="space-y-1 overflow-hidden pr-2">
-                      <div class="text-[10px] font-black text-text-disabled uppercase tracking-tighter">
-                        {{ locale.detail.emailBinding }}
-                      </div>
-                      <div
-                        class="text-sm font-bold truncate"
-                        :class="
-                          selectedUserDetail.email ? (selectedUserDetail.emailVerified ? 'text-success' : 'text-warning') : 'text-text-tertiary'
-                        "
-                        :title="selectedUserDetail.email ? `${selectedUserDetail.email} (${selectedUserDetail.emailVerified ? locale.detail.verified : locale.detail.unverified})` : locale.detail.unbound"
-                      >
-                        {{
-                          selectedUserDetail.email
-                            ? `${selectedUserDetail.email} (${selectedUserDetail.emailVerified ? locale.detail.verified : locale.detail.unverified})`
-                            : locale.detail.unbound
-                        }}
-                      </div>
-                    </div>
-                    <div
-                      :class="[
-                        'w-8 h-8 rounded-xl flex items-center justify-center shrink-0',
-                        selectedUserDetail.email
-                          ? (selectedUserDetail.emailVerified ? 'bg-success-10 text-success' : 'bg-warning-10 text-warning')
-                          : 'bg-bg-tertiary text-text-disabled'
-                      ]"
-                    >
-                      <Mail :size="16" />
-                    </div>
-                  </div>
-
-                  <!-- OAuth 账号绑定 -->
-                  <button
-                    type="button"
-                    class="p-4 bg-bg-primary-50 border border-border-secondary-50 rounded-2xl flex items-center justify-between w-full text-left transition-all disabled:opacity-60 disabled:cursor-not-allowed"
-                    :class="
-                      selectedUserDetail.identities?.length > 0
-                        ? 'cursor-pointer hover:bg-bg-primary hover:border-border-tertiary group'
-                        : ''
-                    "
-                    :disabled="!selectedUserDetail.identities?.length"
-                    @click="openOAuthBindingsModal"
-                  >
-                    <div class="space-y-1 overflow-hidden pr-2">
-                      <div class="text-[10px] font-black text-text-disabled uppercase tracking-tighter">
-                        {{ locale.detail.oauthBinding }}
-                      </div>
-                      <div
-                        class="text-sm font-bold truncate capitalize"
-                        :class="
-                          selectedUserDetail.identities?.length > 0 ? 'text-success' : 'text-text-tertiary'
-                        "
-                        :title="selectedUserDetail.identities?.length > 0 ? formatMessage(locale.detail.bound, selectedUserDetail.identities.map(id => getOAuthProviderName(id.provider)).join(', ')) : locale.detail.unbound"
-                      >
-                        {{
-                          selectedUserDetail.identities?.length > 0
-                            ? formatMessage(locale.detail.bound, selectedUserDetail.identities.map(id => getOAuthProviderName(id.provider)).join(', '))
-                            : locale.detail.unbound
-                        }}
-                      </div>
-                    </div>
-                    <div class="flex items-center gap-1.5 shrink-0">
-                      <div
-                        :class="[
-                          'w-8 h-8 rounded-xl flex items-center justify-center',
-                          selectedUserDetail.identities?.length > 0
-                            ? 'bg-success-10 text-success'
-                            : 'bg-bg-tertiary text-text-disabled'
-                        ]"
-                      >
-                        <Link :size="16" />
-                      </div>
-                      <ChevronRight
-                        v-if="selectedUserDetail.identities?.length > 0"
-                        :size="16"
-                        class="text-text-disabled transition-transform group-hover:translate-x-0.5"
-                      />
-                    </div>
-                  </button>
                 </div>
               </div>
 
@@ -1413,51 +1126,51 @@
               <div class="grid grid-cols-1 md:grid-cols-2 gap-8">
                 <div class="space-y-4">
                   <div
-                    class="flex items-center gap-2 text-xs font-black text-text-tertiary uppercase tracking-widest ml-1"
+                    class="flex items-center gap-2 text-xs font-black text-zinc-400 uppercase tracking-widest ml-1"
                   >
-                    <Clock :size="14" class="text-info" />
-                    {{ locale.detail.loginInfo }}
+                    <Clock :size="14" class="text-purple-500" />
+                    登录信息
                   </div>
                   <div class="space-y-3">
                     <div
-                      class="flex items-center justify-between text-xs p-3 bg-bg-primary-30 rounded-xl border border-border-secondary-30"
+                      class="flex items-center justify-between text-xs p-3 bg-zinc-950/30 rounded-xl border border-zinc-800/30"
                     >
-                      <span class="text-text-tertiary">{{ locale.detail.lastLogin }}</span>
-                      <span class="text-text-secondary font-medium">{{
+                      <span class="text-zinc-500">最后登录</span>
+                      <span class="text-zinc-300 font-medium">{{
                         formatDate(selectedUserDetail.lastLogin)
                       }}</span>
                     </div>
                     <div
-                      class="flex items-center justify-between text-xs p-3 bg-bg-primary-30 rounded-xl border border-border-secondary-30"
+                      class="flex items-center justify-between text-xs p-3 bg-zinc-950/30 rounded-xl border border-zinc-800/30"
                     >
-                      <span class="text-text-tertiary">{{ locale.detail.loginIp }}</span>
-                      <span class="text-text-secondary font-medium">{{
-                        selectedUserDetail.lastLoginIp || locale.detail.unknown
+                      <span class="text-zinc-500">登录 IP</span>
+                      <span class="text-zinc-300 font-medium">{{
+                        selectedUserDetail.lastLoginIp || '未知'
                       }}</span>
                     </div>
                   </div>
                 </div>
                 <div class="space-y-4">
                   <div
-                    class="flex items-center gap-2 text-xs font-black text-text-tertiary uppercase tracking-widest ml-1"
+                    class="flex items-center gap-2 text-xs font-black text-zinc-400 uppercase tracking-widest ml-1"
                   >
-                    <Calendar :size="14" class="text-warning" />
-                    {{ locale.detail.timeRecords }}
+                    <Calendar :size="14" class="text-amber-500" />
+                    时间记录
                   </div>
                   <div class="space-y-3">
                     <div
-                      class="flex items-center justify-between text-xs p-3 bg-bg-primary-30 rounded-xl border border-border-secondary-30"
+                      class="flex items-center justify-between text-xs p-3 bg-zinc-950/30 rounded-xl border border-zinc-800/30"
                     >
-                      <span class="text-text-tertiary">{{ locale.detail.createdAt }}</span>
-                      <span class="text-text-secondary font-medium">{{
+                      <span class="text-zinc-500">创建时间</span>
+                      <span class="text-zinc-300 font-medium">{{
                         formatDate(selectedUserDetail.createdAt)
                       }}</span>
                     </div>
                     <div
-                      class="flex items-center justify-between text-xs p-3 bg-bg-primary-30 rounded-xl border border-border-secondary-30"
+                      class="flex items-center justify-between text-xs p-3 bg-zinc-950/30 rounded-xl border border-zinc-800/30"
                     >
-                      <span class="text-text-tertiary">{{ locale.detail.updatedAt }}</span>
-                      <span class="text-text-secondary font-medium">{{
+                      <span class="text-zinc-500">最近更新</span>
+                      <span class="text-zinc-300 font-medium">{{
                         formatDate(selectedUserDetail.updatedAt)
                       }}</span>
                     </div>
@@ -1469,40 +1182,40 @@
               <div class="space-y-4">
                 <div class="flex items-center justify-between ml-1">
                   <div
-                    class="flex items-center gap-2 text-xs font-black text-text-tertiary uppercase tracking-widest"
+                    class="flex items-center gap-2 text-xs font-black text-zinc-400 uppercase tracking-widest"
                   >
-                    <History :size="14" class="text-success" />
-                    {{ locale.detail.statusLogs }}
+                    <History :size="14" class="text-emerald-500" />
+                    状态变更日志
                   </div>
                 </div>
 
                 <div
                   v-if="statusLogsLoading"
-                  class="py-12 flex flex-col items-center justify-center text-text-disabled gap-3"
+                  class="py-12 flex flex-col items-center justify-center text-zinc-600 gap-3"
                 >
                   <RefreshCw :size="24" class="animate-spin" />
                   <span class="text-[10px] font-black uppercase tracking-widest"
-                    >{{ locale.detail.loadingLogs }}</span
+                    >正在加载记录...</span
                   >
                 </div>
 
                 <div
                   v-else-if="statusLogs.length === 0"
-                  class="py-12 text-center bg-bg-primary-30 border border-border-secondary-50 rounded-3xl"
+                  class="py-12 text-center bg-zinc-950/30 border border-zinc-800/50 rounded-3xl"
                 >
-                  <p class="text-xs text-text-disabled">{{ locale.detail.noLogs }}</p>
+                  <p class="text-xs text-zinc-600">暂无状态变更记录</p>
                 </div>
 
                 <div v-else class="space-y-4">
                   <div
-                    class="relative pl-6 space-y-6 before:absolute before:left-[11px] before:top-2 before:bottom-2 before:w-0.5 before:bg-bg-tertiary"
+                    class="relative pl-6 space-y-6 before:absolute before:left-[11px] before:top-2 before:bottom-2 before:w-0.5 before:bg-zinc-800"
                   >
                     <div v-for="log in statusLogs" :key="log.id" class="relative">
                       <div
-                        class="absolute -left-[23px] top-1.5 w-3 h-3 rounded-full bg-bg-secondary border-2 border-border-tertiary ring-4 ring-panel-bg-deepest"
+                        class="absolute -left-[23px] top-1.5 w-3 h-3 rounded-full bg-zinc-900 border-2 border-zinc-700 ring-4 ring-zinc-900"
                       />
                       <div
-                        class="p-4 bg-bg-primary-50 border border-border-secondary-50 rounded-2xl space-y-3"
+                        class="p-4 bg-zinc-950/50 border border-zinc-800/50 rounded-2xl space-y-3"
                       >
                         <div class="flex items-center justify-between">
                           <div class="flex items-center gap-2">
@@ -1512,9 +1225,9 @@
                                 getStatusClass(log.oldStatus)
                               ]"
                             >
-                              {{ log.oldStatusDisplay || locale.detail.initial }}
+                              {{ log.oldStatusDisplay || '初始' }}
                             </span>
-                            <ArrowRight :size="12" class="text-text-secondary" />
+                            <ArrowRight :size="12" class="text-zinc-700" />
                             <span
                               :class="[
                                 'px-2 py-0.5 rounded-md text-[10px] font-black uppercase tracking-tighter',
@@ -1524,28 +1237,28 @@
                               {{ log.newStatusDisplay }}
                             </span>
                           </div>
-                          <span class="text-[10px] text-text-disabled font-medium">{{
+                          <span class="text-[10px] text-zinc-600 font-medium">{{
                             formatStatusLogDate(log.createdAt)
                           }}</span>
                         </div>
 
                         <div
                           v-if="log.reason"
-                          class="text-xs text-text-tertiary bg-bg-secondary-50 p-2.5 rounded-xl border border-border-secondary-30 leading-relaxed"
+                          class="text-xs text-zinc-400 bg-zinc-900/50 p-2.5 rounded-xl border border-zinc-800/30 leading-relaxed"
                         >
-                          <span class="text-text-disabled font-bold mr-1">{{ locale.detail.reason }}</span>
+                          <span class="text-zinc-600 font-bold mr-1">原因:</span>
                           {{ log.reason }}
                         </div>
 
                         <div class="flex items-center gap-2 text-[10px]">
                           <div
-                            class="w-4 h-4 rounded-full bg-bg-tertiary flex items-center justify-center text-text-tertiary"
+                            class="w-4 h-4 rounded-full bg-zinc-800 flex items-center justify-center text-zinc-500"
                           >
                             <User :size="8" />
                           </div>
-                          <span class="text-text-tertiary">{{ locale.detail.operator }}</span>
-                          <span class="text-text-secondary font-bold">{{
-                            log.operator?.name || locale.detail.system
+                          <span class="text-zinc-500">操作者:</span>
+                          <span class="text-zinc-300 font-bold">{{
+                            log.operator?.name || '系统'
                           }}</span>
                         </div>
                       </div>
@@ -1564,10 +1277,10 @@
 
             <div class="mt-8">
               <button
-                class="w-full px-6 py-4 bg-bg-tertiary hover:bg-bg-quaternary text-text-secondary text-xs font-black rounded-2xl transition-all uppercase tracking-widest"
+                class="w-full px-6 py-4 bg-zinc-800 hover:bg-zinc-700 text-zinc-300 text-xs font-black rounded-2xl transition-all uppercase tracking-widest"
                 @click="closeUserDetailModal"
               >
-                {{ locale.actions.close }}
+                关闭窗口
               </button>
             </div>
           </div>
@@ -1578,9 +1291,9 @@
 </template>
 
 <script setup>
-import { computed, onBeforeUnmount, onMounted, reactive, ref, watch } from 'vue'
+import { computed, onMounted, ref, watch } from 'vue'
 import { useAuth } from '~/composables/useAuth'
-import AppSpinner from '~/components/UI/Common/AppSpinner.vue'
+import { usePermissions, rolesConfig, fetchRolesConfig } from '~/composables/usePermissions'
 import {
   Check,
   UserPlus,
@@ -1616,6 +1329,7 @@ import {
   LogOut,
   Mail,
   Plus,
+  ArrowLeft,
   Filter,
   Download,
   Upload,
@@ -1625,79 +1339,36 @@ import {
   Clock3,
   Hash,
   AtSign,
-  Briefcase,
-  Link,
-  ClipboardCheck
+  Briefcase
 } from '@lucide/vue'
 import CustomSelect from '~/components/UI/Common/CustomSelect.vue'
 import Pagination from '~/components/UI/Common/Pagination.vue'
 import UserSongsModal from '~/components/Admin/UserSongsModal.vue'
-import OAuthBindingsModal from '~/components/Admin/OAuthBindingsModal.vue'
 import BatchUpdateModal from '~/components/Admin/BatchUpdateModal.vue'
-import UserApprovalModal from '~/components/Admin/UserApprovalModal.vue'
 import ConfirmDialog from '~/components/UI/ConfirmDialog.vue'
-import { useLocale } from '~/utils/locale'
-import { useServerErrors } from '~/composables/useLocaleText'
-import { getOAuthProviderName, getAggregateOAuthLoginTypeName, getProviderDisplayName } from '~/utils/oauth'
-import { GRADE_ORDER } from '~/utils/gradeClassWeights'
-import { isArchivedStatus } from '~/utils/user-archive'
-
-const { admin, currentLocale } = useLocale()
-const locale = computed(() => admin.value?.userManager || {})
-const formatMessage = (value, ...args) => {
-  if (typeof value === 'function') return value(...args)
-  if (typeof value === 'string') {
-    return value.replace(/{(\d+)}/g, (match, index) =>
-      args[index] !== undefined ? String(args[index]) : match
-    )
-  }
-  return ''
-}
-const getRoleName = (role) => {
-  const aliases = { USER: 'user', SONG_ADMIN: 'songAdmin', ADMIN: 'admin', SUPER_ADMIN: 'superAdmin' }
-  return locale.value?.roles?.[aliases[role]] || role
-}
-const getStatusName = (status) => locale.value?.statuses?.[status] || status
-const getErrorDetail = (error) =>
-  error?.data?.message || error?.message || error?.statusMessage || locale.value?.detail?.unknown || '未知错误'
 
 // 响应式数据
 const loading = ref(false)
 const users = ref([])
-const showApprovalModal = ref(false)
-const userToApprove = ref(null)
 const searchQuery = ref('')
 const roleFilter = ref('')
 const statusFilter = ref('')
-const gradeFilter = ref('')
-const classFilter = ref('')
-// 归档视图：graduate/withdrawn 状态账号不在默认列表直接展示，经组织树底部归档节点进入
-const showArchived = ref(false)
-const archivedCount = ref(0)
 const sortBy = ref('id')
 const sortOrder = ref('asc')
 const currentPage = ref(1)
 const pageSize = ref(50)
 const totalUsers = ref(0)
 const totalPages = ref(1)
-const treeUsers = ref([])
-const treeLoading = ref(false)
-const treeError = ref('')
-const expandedTreeNodes = ref(new Set())
-const treeFilterLabel = ref('')
-const UNSET_FILTER_VALUE = '__UNSET__'
-const unsetGradeLabel = computed(() => locale.value?.organization?.unsetGrade || '未设置年级')
-const unsetClassLabel = computed(() => locale.value?.organization?.unsetClass || '未设置班级')
 
-const sortOptions = computed(() => [
-  { label: locale.value?.sortOptions?.default || '默认排序', value: 'id-asc' },
-  { label: locale.value?.sortOptions?.nameAsc || '姓名升序', value: 'name-asc' },
-  { label: locale.value?.sortOptions?.nameDesc || '姓名降序', value: 'name-desc' },
-  { label: locale.value?.sortOptions?.lastLoginDesc || '最近登录优先', value: 'lastLogin-desc' },
-  { label: locale.value?.sortOptions?.lastLoginAsc || '最早登录优先', value: 'lastLogin-asc' },
-  { label: locale.value?.sortOptions?.createdAtDesc || '最新创建优先', value: 'createdAt-desc' },
-  { label: locale.value?.sortOptions?.createdAtAsc || '最早创建优先', value: 'createdAt-asc' }
-])
+const sortOptions = [
+  { label: '默认排序 (ID)', value: 'id-asc' },
+  { label: '名称 (A-Z)', value: 'name-asc' },
+  { label: '名称 (Z-A)', value: 'name-desc' },
+  { label: '最近登录', value: 'lastLogin-desc' },
+  { label: '最早登录', value: 'lastLogin-asc' },
+  { label: '最近注册', value: 'createdAt-desc' },
+  { label: '最早注册', value: 'createdAt-asc' }
+]
 
 const currentSort = computed({
   get: () => `${sortBy.value}-${sortOrder.value}`,
@@ -1708,39 +1379,49 @@ const currentSort = computed({
   }
 })
 
-// 硬编码角色定义
-const allRoles = computed(() => [
-  { name: 'USER', displayName: getRoleName('USER') },
-  { name: 'SONG_ADMIN', displayName: getRoleName('SONG_ADMIN') },
-  { name: 'ADMIN', displayName: getRoleName('ADMIN') },
-  { name: 'SUPER_ADMIN', displayName: getRoleName('SUPER_ADMIN') }
-])
-
-// 筛选选项
-const roleFilterOptions = computed(() => [{ name: '', displayName: locale.value?.allRoles || '全部角色' }, ...allRoles.value])
-
-// 状态筛选：普通视图不提供 graduate/withdrawn 选项（已归档账号默认隐藏）；归档视图仅这两类
-const statusFilterOptions = computed(() => {
-  const options = [{ label: locale.value?.allStatus || '全部状态', value: '' }]
-  if (showArchived.value) {
-    options.push(
-      { label: getStatusName('graduate'), value: 'graduate' },
-      { label: getStatusName('withdrawn'), value: 'withdrawn' }
-    )
-  } else {
-    options.push(
-      { label: getStatusName('active'), value: 'active' },
-      { label: getStatusName('pending'), value: 'pending' }
-    )
+// 动态角色定义
+const allRoles = computed(() => {
+  if (!rolesConfig.value) {
+    return [
+      { name: 'USER', displayName: '普通用户' },
+      { name: 'TEACHER', displayName: '教师' },
+      { name: 'SONG_ADMIN', displayName: '歌曲管理员' },
+      { name: 'ADMIN', displayName: '管理员' },
+      { name: 'SUPER_ADMIN', displayName: '超级管理员' }
+    ]
   }
-  return options
+  return Object.keys(rolesConfig.value).map(key => ({
+    name: key,
+    displayName: rolesConfig.value[key].displayName || key
+  }))
 })
 
-const userStatusOptions = computed(() => [
-  { label: getStatusName('activeAccess'), value: 'active' },
-  { label: getStatusName('withdrawnAccess'), value: 'withdrawn' },
-  { label: getStatusName('graduateAccess'), value: 'graduate' }
-])
+// 筛选选项
+const roleFilterOptions = computed(() => [{ name: '', displayName: '全部角色' }, ...allRoles.value])
+
+const statusFilterOptions = [
+  { label: '全部状态', value: '' },
+  { label: '正常', value: 'active' },
+  { label: '退学', value: 'withdrawn' },
+  { label: '毕业生', value: 'graduate' }
+]
+
+const userStatusOptions = [
+  { label: '正常访问', value: 'active' },
+  { label: '限制访问 (退学)', value: 'withdrawn' },
+  { label: '限制访问 (毕业生)', value: 'graduate' }
+]
+
+const gradeOptions = [
+  { label: '高一', value: '高一' },
+  { label: '高二', value: '高二' },
+  { label: '高三', value: '高三' }
+]
+
+const classOptions = Array.from({ length: 16 }, (_, i) => ({
+  label: `${i + 1}班`,
+  value: (i + 1).toString()
+}))
 
 // 模态框状态
 const showAddModal = ref(false)
@@ -1757,11 +1438,9 @@ const passwordError = ref('')
 const showImportModal = ref(false)
 const importLoading = ref(false)
 const importError = ref('')
+const importSuccess = ref('')
 const previewData = ref([])
 const xlsxLoaded = ref(false)
-const importStartRow = ref(0)
-const importProgress = ref(0)
-const importProgressText = ref('')
 
 // 批量更新状态
 const showBatchUpdateModal = ref(false)
@@ -1785,9 +1464,6 @@ const handleImageError = (userId) => {
 const showUserDetailModal = ref(false)
 const selectedUserDetail = ref(null)
 
-// OAuth 绑定详情模态框状态
-const showOAuthBindingsModal = ref(false)
-
 // 状态变更日志模态框状态
 
 const statusLogs = ref([])
@@ -1818,7 +1494,26 @@ const passwordForm = ref({
 
 // 服务
 const auth = useAuth()
-const { localize } = useServerErrors()
+const permissions = usePermissions()
+
+// 前端侧角色级别映射（与 server/utils/permissions.js 的 ROLE_LEVELS 保持一致）
+const ROLE_LEVELS = {
+  SUPER_ADMIN: 100,
+  ADMIN: 80,
+  MINISTER: 80,
+  VICE_MINISTER: 70,
+  SONG_ADMIN: 60,
+  STAFF: 60,
+  RESIDENT: 50,
+  TEACHER: 40,
+  USER: 10
+}
+
+const getRoleLevel = (roleName) => {
+  if (!roleName) return 0
+  const name = String(roleName).toUpperCase()
+  return ROLE_LEVELS[name] ?? 0
+}
 
 // 判断是否为当前登录用户
 const isSelf = (user) => {
@@ -1830,245 +1525,72 @@ const isSuperAdmin = computed(() => {
   return auth.user.value?.role === 'SUPER_ADMIN'
 })
 
-// 普通管理员身份
-const isAdmin = computed(() => {
-  return auth.user.value?.role === 'ADMIN'
+const currentUserRoleLevel = computed(() => getRoleLevel(auth.user.value?.role))
+
+// 是否为普通管理员（ADMIN/MINISTER 级别，非 SUPER）
+const isAdminOnly = computed(() => {
+  return !isSuperAdmin.value && currentUserRoleLevel.value >= 80
 })
 
-// 是否允许对目标用户执行管理操作（编辑/重置密码/删除），与后端越级保护一致
-const canManageUser = (user) => {
-  if (!user || isSelf(user)) return false
-  // 普通管理员不能操作超级管理员
-  return isSuperAdmin.value || user.role !== 'SUPER_ADMIN'
+// 操作者能否对目标用户执行管理操作（目标级别必须严格低于操作者，且目标不是 ID=1）
+const canManageTargetUser = (targetUser) => {
+  if (!targetUser) return false
+  if (isSelf(targetUser)) return false
+  if (String(targetUser.id) === '1') return false
+  if (isSuperAdmin.value) return true
+  const targetLevel = getRoleLevel(targetUser.role)
+  return currentUserRoleLevel.value > targetLevel
+}
+
+// 操作者能否重置目标用户的密码（ADMIN 仅可重置 USER 及以下）
+const canResetPasswordFor = (targetUser) => {
+  if (!canManageTargetUser(targetUser)) return false
+  if (isSuperAdmin.value) return true
+  // 普通 ADMIN 只能重置级别 <= USER(10) 的用户
+  const targetLevel = getRoleLevel(targetUser.role)
+  return targetLevel <= ROLE_LEVELS.USER
+}
+
+// 操作者能否将角色改为指定 newRole
+const canAssignRole = (newRole) => {
+  if (!newRole) return false
+  if (isSuperAdmin.value) {
+    return String(newRole).toUpperCase() !== 'SUPER_ADMIN'
+  }
+  const targetLevel = getRoleLevel(newRole)
+  return currentUserRoleLevel.value > targetLevel
 }
 
 const availableRoles = computed(() => {
-  let roles
   if (isSuperAdmin.value) {
     // 超级管理员可以分配除自己以外的所有角色
-    roles = allRoles.value.filter((role) => role.name !== 'SUPER_ADMIN')
-  } else if (isAdmin.value) {
-    // 管理员只能分配用户和歌曲管理员角色（与后端用户接口的角色限制一致）
-    roles = allRoles.value.filter((role) => ['USER', 'SONG_ADMIN'].includes(role.name))
-  } else {
-    // 其他角色不能分配角色，返回空数组
-    return []
+    return allRoles.value.filter((role) => role.name !== 'SUPER_ADMIN')
   }
-  // 保留目标用户当前角色，避免当前值不在选项中时下拉显示裸值
-  const currentRole = editingUser.value?.role
-  if (currentRole && !roles.some((role) => role.name === currentRole)) {
-    roles = [...roles, ...allRoles.value.filter((role) => role.name === currentRole)]
-  }
-  return roles
+  // 普通 ADMIN/MINISTER 等只能分配级别严格低于自己的角色（SUPER_ADMIN 已在上层排除）
+  return allRoles.value.filter(
+    (role) =>
+      role.name !== 'SUPER_ADMIN' &&
+      getRoleLevel(role.name) < currentUserRoleLevel.value
+  )
 })
 
-const getUserDisplayName = (user) => {
-  return user?.name || user?.username || locale.value?.organization?.unnamedUser || '未命名用户'
-}
-
-const getUserInitial = (user) => {
-  return getUserDisplayName(user).charAt(0)
-}
-
-const normalizeTreeValue = (value, fallback) => {
-  const normalized = value?.toString().trim()
-  return normalized || fallback
-}
-
-const getStageLabel = (user) => {
-  const stages = locale.value?.organization?.stages || {}
-  if (user.status === 'graduate') return stages.graduate || ''
-  if (user.status === 'withdrawn') return stages.withdrawn || ''
-
-  const grade = normalizeTreeValue(user.grade, unsetGradeLabel.value)
-  if (grade.startsWith('高')) return stages.senior || ''
-  if (grade.startsWith('初')) return stages.junior || ''
-  if (grade.startsWith('大')) return stages.university || ''
-  if (['教师', '教职工'].includes(grade)) return stages.staff || ''
-  return stages.other || ''
-}
-
-const gradeSortWeight = (grade) => {
-  const order = {
-    ...GRADE_ORDER,
-    [unsetGradeLabel.value]: 100
-  }
-
-  return order[grade] ?? 50
-}
-
-const sortTreeLabels = (a, b) => {
-  const weightA = gradeSortWeight(a.label)
-  const weightB = gradeSortWeight(b.label)
-
-  if (weightA !== weightB) return weightA - weightB
-  return a.label.localeCompare(b.label, 'zh-CN', { numeric: true })
-}
-
-const sortByLabel = (a, b) => {
-  return a.label.localeCompare(b.label, 'zh-CN', { numeric: true })
-}
-
-const toUserFilterQuery = (value, unsetLabel) => {
-  if (!value) return undefined
-  return value === unsetLabel ? UNSET_FILTER_VALUE : value
-}
-
-// 按年级/班级将用户归组为树节点（学段与归档目录共用）
-const buildGradeNodes = (users, stageKey) => {
-  const gradeMap = new Map()
-
-  for (const user of users) {
-    const gradeLabel = normalizeTreeValue(user.grade, unsetGradeLabel.value)
-    const classLabel = normalizeTreeValue(user.class, unsetClassLabel.value)
-    const gradeKey = `${stageKey}:grade:${gradeLabel}`
-    const classKey = `${gradeKey}:class:${classLabel}`
-
-    if (!gradeMap.has(gradeKey)) {
-      gradeMap.set(gradeKey, {
-        key: gradeKey,
-        label: gradeLabel,
-        count: 0,
-        classes: new Map()
-      })
-    }
-
-    const grade = gradeMap.get(gradeKey)
-    grade.count += 1
-
-    if (!grade.classes.has(classKey)) {
-      grade.classes.set(classKey, {
-        key: classKey,
-        label: classLabel,
-        count: 0,
-        users: []
-      })
-    }
-
-    const classNode = grade.classes.get(classKey)
-    classNode.count += 1
-    classNode.users.push(user)
-  }
-
-  return Array.from(gradeMap.values())
-    .map((grade) => ({
-      ...grade,
-      classes: Array.from(grade.classes.values())
-        .map((classNode) => ({
-          ...classNode,
-          users: classNode.users.sort((a, b) =>
-            getUserDisplayName(a).localeCompare(getUserDisplayName(b), 'zh-CN', {
-              numeric: true
-            })
-          )
-        }))
-        .sort(sortByLabel)
-    }))
-    .sort(sortTreeLabels)
-}
-
-const buildStageNodes = (users) => {
-  const stageMap = new Map()
-
-  for (const user of users) {
-    const stageLabel = getStageLabel(user)
-    const stageKey = `stage:${stageLabel}`
-
-    if (!stageMap.has(stageKey)) {
-      stageMap.set(stageKey, {
-        key: stageKey,
-        label: stageLabel,
-        count: 0,
-        users: []
-      })
-    }
-
-    const stage = stageMap.get(stageKey)
-    stage.count += 1
-    stage.users.push(user)
-  }
-
-  return Array.from(stageMap.values())
-    .map((stage) => ({
-      key: stage.key,
-      label: stage.label,
-      count: stage.count,
-      grades: buildGradeNodes(stage.users, stage.key)
-    }))
-    .sort((a, b) => {
-      const stages = locale.value?.organization?.stages || {}
-      const stageOrder = [stages.junior, stages.senior, stages.university, stages.staff, stages.other]
-      const indexA = stageOrder.indexOf(a.label)
-      const indexB = stageOrder.indexOf(b.label)
-      const weightA = indexA === -1 ? 50 : indexA
-      const weightB = indexB === -1 ? 50 : indexB
-
-      if (weightA !== weightB) return weightA - weightB
-      return a.label.localeCompare(b.label, 'zh-CN', { numeric: true })
-    })
-}
-
-const archiveStageLabel = computed(() => locale.value?.archivedUsers || '已归档用户')
-
-const userTree = computed(() => {
-  const stages = buildStageNodes(treeUsers.value.filter((user) => !isArchivedStatus(user.status)))
-  const archivedUsers = treeUsers.value.filter((user) => isArchivedStatus(user.status))
-  const stageKey = `stage:${archiveStageLabel.value}`
-
-  // 归档目录固定挂在树末尾，不在学段中直接展示；点击节点名进入归档视图
-  stages.push({
-    key: stageKey,
-    label: archiveStageLabel.value,
-    count: archivedUsers.length,
-    grades: buildGradeNodes(archivedUsers, stageKey)
-  })
-
-  return stages
+// 由于使用服务器端分页，这些计算属性简化了
+const filteredUsers = computed(() => {
+  return users.value
 })
 
-const activeOrgFilterLabel = computed(() => {
-  const scopeParts = []
-
-  if (treeFilterLabel.value) {
-    scopeParts.push(treeFilterLabel.value)
-  }
-
-  if (gradeFilter.value) {
-    scopeParts.push(gradeFilter.value)
-  }
-
-  if (gradeFilter.value && classFilter.value) {
-    scopeParts.push(classFilter.value)
-  }
-
-  return scopeParts.join(' / ')
+const paginatedUsers = computed(() => {
+  return users.value
 })
 
-let loadUsersDebounceTimer = null
-// 视图切换重置筛选后由切换逻辑统一重载列表，置位抑制监听器的重复加载
-let suppressNextFilterReload = false
-
 // 监听搜索和过滤条件变化
 watch(
-  [searchQuery, roleFilter, statusFilter, gradeFilter, classFilter, sortBy, sortOrder],
+  [searchQuery, roleFilter, statusFilter, sortBy, sortOrder],
   () => {
-    if (loadUsersDebounceTimer) {
-      clearTimeout(loadUsersDebounceTimer)
-    }
-
-    if (suppressNextFilterReload) {
-      suppressNextFilterReload = false
-      return
-    }
-
-    loadUsersDebounceTimer = setTimeout(() => {
-      if (currentPage.value !== 1) {
-        currentPage.value = 1
-      } else {
-        loadUsers(1, pageSize.value)
-      }
-    }, 300)
-  }
+    currentPage.value = 1
+    loadUsers(1, pageSize.value)
+  },
+  { debounce: 300 }
 )
 
 // 监听页码变化
@@ -2078,18 +1600,17 @@ watch(currentPage, (newPage) => {
 
 // 方法
 const formatDate = (dateString) => {
-  const timeLocale = locale.value?.time || {}
-  if (!dateString) return timeLocale.never || ''
+  if (!dateString) return '从未登录'
   const date = new Date(dateString)
-  const now = getSyncedDate()
+  const now = new Date()
   const diff = now - date
 
-  if (diff < 60000) return timeLocale.justNow || ''
-  if (diff < 3600000) return formatMessage(timeLocale.minutesAgo, Math.floor(diff / 60000))
-  if (diff < 86400000) return formatMessage(timeLocale.hoursAgo, Math.floor(diff / 3600000))
-  if (diff < 86400000 * 7) return formatMessage(timeLocale.daysAgo, Math.floor(diff / 86400000))
+  if (diff < 60000) return '刚刚'
+  if (diff < 3600000) return `${Math.floor(diff / 60000)}分钟前`
+  if (diff < 86400000) return `${Math.floor(diff / 3600000)}小时前`
+  if (diff < 86400000 * 7) return `${Math.floor(diff / 86400000)}天前`
 
-  return date.toLocaleDateString(currentLocale.value)
+  return date.toLocaleDateString('zh-CN')
 }
 
 const getRoleClass = (role) => {
@@ -2099,11 +1620,20 @@ const getRoleClass = (role) => {
     SONG_ADMIN: 'song-admin',
     SUPER_ADMIN: 'super-admin'
   }
-  return classes[role] || 'user'
+  return classes[role] || 'admin'
 }
 
 const getRoleDisplayName = (role) => {
-  return getRoleName(role)
+  if (rolesConfig.value && rolesConfig.value[role]) {
+    return rolesConfig.value[role].displayName
+  }
+  const names = {
+    USER: '普通用户',
+    ADMIN: '管理员',
+    SONG_ADMIN: '歌曲管理员',
+    SUPER_ADMIN: '超级管理员'
+  }
+  return names[role] || role
 }
 
 const getStatusClass = (status) => {
@@ -2116,14 +1646,24 @@ const getStatusClass = (status) => {
 }
 
 const getStatusDisplayName = (status) => {
-  return getStatusName(status) || getStatusName('active')
+  const names = {
+    active: '正常',
+    withdrawn: '退学',
+    graduate: '毕业生'
+  }
+  return names[status] || '正常'
 }
 
 const editUser = (user) => {
-  // 禁止编辑自身
   if (isSelf(user)) {
     if (window.$showNotification) {
-      window.$showNotification(locale.value.notifications.selfEditForbidden, 'warning')
+      window.$showNotification('禁止在用户管理中修改自己的账户', 'warning')
+    }
+    return
+  }
+  if (!canManageTargetUser(user)) {
+    if (window.$showNotification) {
+      window.$showNotification('权限不足：无法编辑该用户', 'warning')
     }
     return
   }
@@ -2139,27 +1679,16 @@ const editUser = (user) => {
   }
 }
 
-const openApproval = (user) => {
-  userToApprove.value = user
-  showApprovalModal.value = true
-}
-
-const handleApprovalSuccess = (result) => {
-  void loadUsers(currentPage.value, pageSize.value)
-  if (window.$showNotification) {
-    const message =
-      result?.action === 'approve'
-        ? locale.value.approval?.approveSuccess
-        : locale.value.approval?.rejectSuccess
-    window.$showNotification(message, 'success')
-  }
-}
-
 const resetPassword = (user) => {
-  // 禁止重置自身密码
   if (isSelf(user)) {
     if (window.$showNotification) {
-      window.$showNotification(locale.value.notifications.selfResetForbidden, 'warning')
+      window.$showNotification('禁止在用户管理中重置自己的密码', 'warning')
+    }
+    return
+  }
+  if (!canResetPasswordFor(user)) {
+    if (window.$showNotification) {
+      window.$showNotification('权限不足：无法重置该用户的密码', 'warning')
     }
     return
   }
@@ -2171,10 +1700,15 @@ const resetPassword = (user) => {
 }
 
 const confirmDeleteUser = (user) => {
-  // 禁止删除自身
   if (isSelf(user)) {
     if (window.$showNotification) {
-      window.$showNotification(locale.value.notifications.selfDeleteForbidden, 'warning')
+      window.$showNotification('不能删除自己的账户', 'warning')
+    }
+    return
+  }
+  if (!canManageTargetUser(user)) {
+    if (window.$showNotification) {
+      window.$showNotification('权限不足：无法删除该用户', 'warning')
     }
     return
   }
@@ -2208,16 +1742,6 @@ const showUserDetail = (user, event) => {
 const closeUserDetailModal = () => {
   showUserDetailModal.value = false
   selectedUserDetail.value = null
-  showOAuthBindingsModal.value = false
-}
-
-const openOAuthBindingsModal = () => {
-  if (!selectedUserDetail.value?.identities?.length) return
-  showOAuthBindingsModal.value = true
-}
-
-const closeOAuthBindingsModal = () => {
-  showOAuthBindingsModal.value = false
 }
 
 const closeBatchUpdateModal = () => {
@@ -2225,7 +1749,10 @@ const closeBatchUpdateModal = () => {
 }
 
 const handleBatchUpdateSuccess = async () => {
-  await Promise.all([loadUserTree(), loadUsers()])
+  await loadUsers()
+  if (window.$showNotification) {
+    window.$showNotification('批量更新成功', 'success')
+  }
 }
 
 const closeDeleteModal = () => {
@@ -2236,6 +1763,20 @@ const closeDeleteModal = () => {
 
 const confirmDelete = async () => {
   if (!deletingUser.value) return
+  if (isSelf(deletingUser.value)) {
+    if (window.$showNotification) {
+      window.$showNotification('不能删除自己的账户', 'warning')
+    }
+    closeDeleteModal()
+    return
+  }
+  if (!canManageTargetUser(deletingUser.value)) {
+    if (window.$showNotification) {
+      window.$showNotification('权限不足：无法删除该用户', 'warning')
+    }
+    closeDeleteModal()
+    return
+  }
 
   deleting.value = true
 
@@ -2245,18 +1786,18 @@ const confirmDelete = async () => {
       ...auth.getAuthConfig()
     })
 
-    await Promise.all([loadUserTree(), loadUsers()])
+    await loadUsers()
     closeDeleteModal()
 
     if (window.$showNotification) {
-      window.$showNotification(locale.value.notifications.deleteSuccess, 'success')
+      window.$showNotification('用户删除成功', 'success')
     }
   } catch (error) {
-      console.error('删除用户失败:', error)
-      if (window.$showNotification) {
-        window.$showNotification(formatMessage(locale.value.notifications.deleteFailed, getErrorDetail(error)), 'error')
-      }
-    } finally {
+    console.error('删除用户失败:', error)
+    if (window.$showNotification) {
+      window.$showNotification('删除用户失败: ' + error.message, 'error')
+    }
+  } finally {
     deleting.value = false
   }
 }
@@ -2285,148 +1826,36 @@ const closeResetPassword = () => {
   }
 }
 
-const isTreeNodeExpanded = (key) => {
-  return expandedTreeNodes.value.has(key)
-}
-
-const toggleTreeNode = (key) => {
-  const next = new Set(expandedTreeNodes.value)
-
-  if (next.has(key)) {
-    next.delete(key)
-  } else {
-    next.add(key)
-  }
-
-  expandedTreeNodes.value = next
-}
-
-const expandDefaultTreeNodes = () => {
-  const next = new Set(expandedTreeNodes.value)
-
-  userTree.value.forEach((stage) => {
-    // 归档节点默认折叠，点击节点名进入归档视图，手动展开查看目录
-    if (stage.label === archiveStageLabel.value) return
-    next.add(stage.key)
-    stage.grades.forEach((grade) => {
-      next.add(grade.key)
-    })
-  })
-
-  expandedTreeNodes.value = next
-}
-
-const isTreeFilterActive = (stageLabel, grade, className) => {
-  return (
-    treeFilterLabel.value === stageLabel &&
-    gradeFilter.value === grade &&
-    classFilter.value === className
-  )
-}
-
-const isStageFilterActive = (stageLabel) => {
-  return treeFilterLabel.value === stageLabel && !gradeFilter.value && !classFilter.value
-}
-
-const handleStageClick = (stage) => {
-  // 归档节点点击进入归档视图，其余学段仅展开/折叠
-  if (stage.label === archiveStageLabel.value) {
-    applyUserScope(true, { stageLabel: stage.label })
-    return
-  }
-
-  toggleTreeNode(stage.key)
-}
-
-const applyTreeFilter = (grade, className = '', stageLabel = '') => {
-  // 归档目录下的年级/班级点击进入归档视图并定位范围
-  applyUserScope(stageLabel === archiveStageLabel.value, { grade, className, stageLabel })
-}
-
-const clearTreeFilter = () => {
-  if (showArchived.value) {
-    applyUserScope(false, { stageLabel: '' })
-    return
-  }
-  gradeFilter.value = ''
-  classFilter.value = ''
-  if (treeFilterLabel.value) {
-    statusFilter.value = ''
-  }
-  treeFilterLabel.value = ''
-}
-
-// 统一设置用户视图与树范围：重置筛选与分页，并保证列表恰好重载一次
-const applyUserScope = (archived, { grade = '', className = '', stageLabel = '' } = {}) => {
-  const viewChanged = showArchived.value !== archived
-  const filtersChanged =
-    searchQuery.value !== '' ||
-    gradeFilter.value !== grade ||
-    classFilter.value !== className ||
-    (viewChanged && (roleFilter.value !== '' || statusFilter.value !== ''))
-  const scopeChanged = treeFilterLabel.value !== stageLabel
-
-  if (!viewChanged && !filtersChanged && !scopeChanged && currentPage.value === 1) {
-    return
-  }
-
-  // 有筛选值将被重置时筛选监听器必触发一次，置位抑制避免重复请求
-  if (filtersChanged) {
-    if (loadUsersDebounceTimer) {
-      clearTimeout(loadUsersDebounceTimer)
-      loadUsersDebounceTimer = null
-    }
-    suppressNextFilterReload = true
-  }
-
-  // 页码保持 1 时页码监听器不触发，需显式重载；否则交给页码监听器
-  const reloadNow = currentPage.value === 1
-  showArchived.value = archived
-  searchQuery.value = ''
-  if (viewChanged) {
-    // 两个视图的状态筛选选项不同，切换视图时一并重置
-    roleFilter.value = ''
-    statusFilter.value = ''
-  }
-  gradeFilter.value = grade
-  classFilter.value = className
-  treeFilterLabel.value = stageLabel
-  currentPage.value = 1
-  if (reloadNow) {
-    void loadUsers(1, pageSize.value)
-  }
-}
-
-const openTreeUser = async (treeUser) => {
-  try {
-    const detail = await $fetch(`/api/admin/users/${treeUser.id}`, {
-      ...auth.getAuthConfig()
-    })
-
-    selectedUserDetail.value = detail
-    showUserDetailModal.value = true
-    loadStatusLogsPage(1)
-  } catch (error) {
-    console.error('加载用户详情失败:', error)
-    if (window.$showNotification) {
-      window.$showNotification(formatMessage(locale.value.notifications.detailLoadFailed, getErrorDetail(error)), 'error')
-    }
-  }
-}
-
 const saveUser = async () => {
-  // 保护：禁止保存针对自身的更改
   if (editingUser.value && isSelf(editingUser.value)) {
-    formError.value = locale.value.notifications.selfEditForbidden
+    formError.value = '禁止在用户管理中修改自己的账户'
+    return
+  }
+  if (editingUser.value && !canManageTargetUser(editingUser.value)) {
+    formError.value = '权限不足：无法编辑该用户'
+    return
+  }
+  if (userForm.value.role && !canAssignRole(userForm.value.role)) {
+    formError.value = `权限不足：无法分配角色 ${userForm.value.role}`
+    return
+  }
+  if (userForm.value.password && editingUser.value && !canResetPasswordFor(editingUser.value)) {
+    formError.value = '权限不足：无法重置该用户的密码'
     return
   }
   if (!userForm.value.name || !userForm.value.username) {
-    formError.value = locale.value.errors.requiredInfo
+    formError.value = '请填写必要信息'
+    return
+  }
+
+  const chineseRegex = /^[\u4e00-\u9fa5]+$/
+  if (!chineseRegex.test(userForm.value.name) || !chineseRegex.test(userForm.value.username)) {
+    formError.value = '姓名和用户名只能包含汉字'
     return
   }
 
   if (!editingUser.value && !userForm.value.password) {
-    formError.value = locale.value.errors.passwordRequired
+    formError.value = '请输入密码'
     return
   }
 
@@ -2447,6 +1876,11 @@ const saveUser = async () => {
       userData.password = userForm.value.password
     }
 
+    // 检查是否是权限更新
+    const isRoleUpdate = editingUser.value && editingUser.value.role !== userForm.value.role
+    const oldRole = editingUser.value?.role
+    const newRole = userForm.value.role
+
     if (editingUser.value) {
       await $fetch(`/api/admin/users/${editingUser.value.id}`, {
         method: 'PUT',
@@ -2461,22 +1895,44 @@ const saveUser = async () => {
       })
     }
 
-    // 先缓存是否编辑态：closeModal 会清空 editingUser，通知文案需在清空前判定
-    const wasEditing = Boolean(editingUser.value)
+    // 如果是权限更新且当前用户是超级管理员，发送通知
+    if (isRoleUpdate && permissions.isSuperAdmin) {
+      try {
+        const roleNames = {
+          USER: '普通用户',
+          SONG_ADMIN: '歌曲管理员',
+          ADMIN: '管理员',
+          SUPER_ADMIN: '超级管理员'
+        }
 
-    await Promise.all([loadUserTree(), loadUsers()])
+        const notificationMessage = `您的账户权限已由超级管理员更新：${roleNames[oldRole]} → ${roleNames[newRole]}`
+
+        await $fetch('/api/admin/notifications/send', {
+          method: 'POST',
+          body: {
+            userId: editingUser.value.id,
+            title: '权限变更通知',
+            message: notificationMessage,
+            type: 'system'
+          },
+          ...auth.getAuthConfig()
+        })
+      } catch (notificationError) {
+        console.error('发送权限变更通知失败:', notificationError)
+        // 不影响主要操作，只记录错误
+      }
+    }
+
+    await loadUsers()
     closeModal()
 
     if (window.$showNotification) {
-      window.$showNotification(
-        wasEditing ? locale.value.notifications.updateSuccess : locale.value.notifications.createSuccess,
-        'success'
-      )
+      window.$showNotification(editingUser.value ? '用户更新成功' : '用户创建成功', 'success')
     }
   } catch (error) {
-      console.error('保存用户失败:', error)
-      formError.value = localize(error, locale.value.errors.saveFailed)
-    } finally {
+    console.error('保存用户失败:', error)
+    formError.value = error.message || '保存失败'
+  } finally {
     saving.value = false
   }
 }
@@ -2484,16 +1940,16 @@ const saveUser = async () => {
 const confirmResetPassword = async () => {
   // 保护：禁止重置自身密码
   if (resetPasswordUser.value && isSelf(resetPasswordUser.value)) {
-    passwordError.value = locale.value.notifications.selfResetForbidden
+    passwordError.value = '禁止在用户管理中重置自己的密码'
     return
   }
   if (!passwordForm.value.password) {
-    passwordError.value = locale.value.errors.newPasswordRequired
+    passwordError.value = '请输入新密码'
     return
   }
 
   if (passwordForm.value.password !== passwordForm.value.confirmPassword) {
-    passwordError.value = locale.value.errors.passwordMismatch
+    passwordError.value = '两次输入的密码不一致'
     return
   }
 
@@ -2512,12 +1968,12 @@ const confirmResetPassword = async () => {
     closeResetPassword()
 
     if (window.$showNotification) {
-      window.$showNotification(locale.value.notifications.resetSuccess, 'success')
+      window.$showNotification('密码重置成功', 'success')
     }
   } catch (error) {
-      console.error('重置密码失败:', error)
-      passwordError.value = getErrorDetail(error) || locale.value.errors.resetFailed
-    } finally {
+    console.error('重置密码失败:', error)
+    passwordError.value = error.message || '重置失败'
+  } finally {
     resetting.value = false
   }
 }
@@ -2532,11 +1988,9 @@ const loadUsers = async (page = 1, limit = 100) => {
         search: searchQuery.value || undefined,
         role: roleFilter.value || undefined,
         status: statusFilter.value || undefined,
-        grade: toUserFilterQuery(gradeFilter.value, unsetGradeLabel.value),
-        class: toUserFilterQuery(classFilter.value, unsetClassLabel.value),
         sortBy: sortBy.value,
         sortOrder: sortOrder.value,
-        archived: showArchived.value ? '1' : '0'
+        t: Date.now()
       },
       ...auth.getAuthConfig()
     })
@@ -2556,32 +2010,12 @@ const loadUsers = async (page = 1, limit = 100) => {
       console.warn('响应中没有用户数据')
     }
   } catch (error) {
-      console.error('加载用户失败:', error)
-      if (window.$showNotification) {
-        window.$showNotification(formatMessage(locale.value.notifications.loadFailed, getErrorDetail(error)), 'error')
-      }
-    } finally {
-    loading.value = false
-  }
-}
-
-const loadUserTree = async () => {
-  treeLoading.value = true
-  treeError.value = ''
-
-  try {
-    const response = await $fetch('/api/admin/users/options', {
-      ...auth.getAuthConfig()
-    })
-
-    treeUsers.value = response.treeUsers || []
-    archivedCount.value = response.archivedCount || 0
-    expandDefaultTreeNodes()
-  } catch (error) {
-    console.error('加载组织结构失败:', error)
-    treeError.value = getErrorDetail(error) || locale.value.organization.loadFailed
+    console.error('加载用户失败:', error)
+    if (window.$showNotification) {
+      window.$showNotification('加载用户失败: ' + error.message, 'error')
+    }
   } finally {
-    treeLoading.value = false
+    loading.value = false
   }
 }
 
@@ -2589,8 +2023,7 @@ const loadUserTree = async () => {
 const closeImportModal = () => {
   showImportModal.value = false
   importError.value = ''
-  importProgress.value = 0
-  importProgressText.value = ''
+  importSuccess.value = ''
   previewData.value = []
   // 清空文件输入
   const fileInput = document.getElementById('file-upload')
@@ -2641,7 +2074,7 @@ const loadXLSX = async () => {
       }
 
       if (!loaded) {
-        throw new Error(locale.value.errors.xlsxLoadFailed)
+        throw new Error('所有XLSX库源加载失败')
       }
     } catch (err) {
       console.error('加载XLSX库失败:', err)
@@ -2655,8 +2088,7 @@ const handleFileUpload = async (event) => {
   if (!file) return
 
   importError.value = ''
-  importProgressText.value = ''
-  importProgress.value = 0
+  importSuccess.value = ''
   previewData.value = []
 
   // 确保XLSX库已加载
@@ -2664,7 +2096,7 @@ const handleFileUpload = async (event) => {
     await loadXLSX()
 
     if (!window.XLSX) {
-      importError.value = locale.value.errors.xlsxLoadFailed
+      importError.value = '无法加载Excel处理库，请刷新页面重试'
       return
     }
   }
@@ -2699,8 +2131,7 @@ const handleFileUpload = async (event) => {
             'password',
             'role',
             'grade',
-            'class',
-            ...Object.values(locale.value.importModal.sampleHeaders || {})
+            'class'
           ]
           const isHeaderRow = firstRow.some(
             (cell) =>
@@ -2717,8 +2148,6 @@ const handleFileUpload = async (event) => {
             console.log('未检测到标题行，从第一行开始解析')
           }
         }
-        
-        importStartRow.value = startRow
 
         const userData = []
 
@@ -2730,21 +2159,31 @@ const handleFileUpload = async (event) => {
 
           // 根据当前用户权限过滤角色
           if (!isSuperAdmin.value) {
-            // 普通管理员只能导入 USER 和 SONG_ADMIN 角色
-            if (role !== 'USER' && role !== 'SONG_ADMIN') {
+            // 普通管理员只能导入 USER / TEACHER / SONG_ADMIN 角色
+            if (role !== 'USER' && role !== 'TEACHER' && role !== 'SONG_ADMIN') {
               role = 'USER' // 默认设为普通用户
             }
           }
 
           // 确保角色有效
-          const validRoles = ['USER', 'ADMIN', 'SONG_ADMIN', 'SUPER_ADMIN']
+          const validRoles = rolesConfig.value ? Object.keys(rolesConfig.value) : ['USER', 'TEACHER', 'ADMIN', 'SONG_ADMIN', 'SUPER_ADMIN']
           if (!validRoles.includes(role)) {
             role = 'USER'
           }
 
+          const name = row[0]?.toString() || ''
+          const username = row[1]?.toString() || ''
+
+          const chineseRegex = /^[\u4e00-\u9fa5]+$/
+          if (!chineseRegex.test(name) || !chineseRegex.test(username)) {
+            importError.value = `第 ${i + 1} 行数据无效: 姓名和账号名只能包含汉字`
+            previewData.value = []
+            return
+          }
+
           userData.push({
-            name: row[0]?.toString() || '',
-            username: row[1]?.toString() || '',
+            name: name,
+            username: username,
             password: row[2]?.toString() || '',
             role: role,
             grade: row[4]?.toString() || '',
@@ -2753,25 +2192,25 @@ const handleFileUpload = async (event) => {
         }
 
         if (userData.length === 0) {
-          importError.value = locale.value.errors.noValidData
+          importError.value = '未找到有效数据'
           return
         }
 
         previewData.value = userData
       } catch (err) {
         console.error('解析Excel出错:', err)
-        importError.value = formatMessage(locale.value.errors.parseExcelFailed, getErrorDetail(err))
+        importError.value = '解析Excel文件失败: ' + (err.message || '未知错误')
       }
     }
 
     reader.onerror = () => {
-      importError.value = locale.value.errors.readFileFailed
+      importError.value = '读取文件失败'
     }
 
     reader.readAsArrayBuffer(file)
   } catch (err) {
     console.error('处理Excel文件错误:', err)
-    importError.value = formatMessage(locale.value.errors.processExcelFailed, getErrorDetail(err))
+    importError.value = '处理Excel文件失败: ' + (err.message || '未知错误')
   }
 }
 
@@ -2781,36 +2220,21 @@ const downloadImportTemplate = async () => {
     await loadXLSX()
     if (!window.XLSX) {
       if (window.$showNotification) {
-        window.$showNotification(locale.value.notifications.excelLoadFailed, 'error')
+        window.$showNotification('Excel处理库加载失败，请刷新页面后重试', 'error')
       }
       return
     }
   }
 
-  const headers = locale.value.importModal.sampleHeaders
   const templateData = [
-    {
-      [headers.name]: locale.value.importModal.sampleName,
-      [headers.username]: 'zhangsan',
-      [headers.password]: '123456',
-      [headers.role]: 'USER',
-      [headers.grade]: locale.value.importModal.sampleGrade,
-      [headers.class]: locale.value.importModal.sampleClass
-    }
+    { 姓名: '张三', 账号名: 'zhangsan', 密码: '123456', 角色: 'USER', 年级: '高一', 班级: '1班' },
+    { 姓名: '李四', 账号名: 'lisi', 密码: '123456', 角色: 'USER', 年级: '高一', 班级: '2班' }
   ]
 
   const ws = window.XLSX.utils.json_to_sheet(templateData)
   const wb = window.XLSX.utils.book_new()
-  window.XLSX.utils.book_append_sheet(wb, ws, locale.value.importModal.templateSheetName)
-  window.XLSX.writeFile(wb, locale.value.importModal.templateFileName)
-}
-
-// 格式化导入错误的辅助函数
-const formatImportErrors = (errors) => {
-  return errors.map(e => {
-    const namePart = e.name || e.username ? ` (${e.name || e.username})` : ''
-    return formatMessage(locale.value.importProgress.rowError, e.rowNum || '?', namePart, e.reason)
-  }).join('\n')
+  window.XLSX.utils.book_append_sheet(wb, ws, '用户导入模板')
+  window.XLSX.writeFile(wb, '用户批量导入模板.xlsx')
 }
 
 // 批量导入用户
@@ -2819,23 +2243,20 @@ const importUsers = async () => {
 
   importLoading.value = true
   importError.value = ''
-  importProgress.value = 0
-  importProgressText.value = ''
+  importSuccess.value = ''
 
   const dataToImport = [...previewData.value]
   const batchSize = 50
   const totalBatches = Math.ceil(dataToImport.length / batchSize)
   let totalCreated = 0
   let totalFailed = 0
-  const allErrors = []
 
   try {
     for (let i = 0; i < dataToImport.length; i += batchSize) {
       const batch = dataToImport.slice(i, i + batchSize)
       const currentBatch = Math.floor(i / batchSize) + 1
 
-      importProgressText.value = formatMessage(locale.value.importProgress.processingBatch, currentBatch, totalBatches)
-      importProgress.value = Math.round((currentBatch / totalBatches) * 100)
+      importSuccess.value = `正在导入：正在处理第 ${currentBatch} / ${totalBatches} 批数据...`
 
       try {
         const result = await $fetch('/api/admin/users/batch', {
@@ -2848,44 +2269,30 @@ const importUsers = async () => {
 
         totalCreated += result.created || 0
         totalFailed += result.failed || 0
-        
-        if (result.errors && result.errors.length > 0) {
-          const batchErrors = result.errors.map(e => ({
-            ...e,
-            rowNum: i + e.index + importStartRow.value + 1 // 正确计算行号
-          }))
-          allErrors.push(...batchErrors)
-        }
       } catch (batchErr) {
         console.error(`第 ${currentBatch} 批导入失败:`, batchErr)
         totalFailed += batch.length
-        allErrors.push({ reason: formatMessage(locale.value.importProgress.batchFailed, currentBatch, getErrorDetail(batchErr)) })
       }
     }
 
-    await Promise.all([loadUserTree(), loadUsers()])
+    await loadUsers()
 
     if (totalCreated > 0 || totalFailed === 0) {
-      importProgressText.value = formatMessage(locale.value.importProgress.complete, totalCreated, totalFailed)
-      importProgress.value = 100
-      
-      if (allErrors.length > 0) {
-        importError.value = formatMessage(locale.value.errors.partialImportFailed, formatImportErrors(allErrors))
-      }
+      importSuccess.value = `成功导入 ${totalCreated} 个用户，${totalFailed} 个用户导入失败`
       previewData.value = []
 
       setTimeout(() => {
-        if (importProgressText.value && allErrors.length === 0) {
+        if (importSuccess.value) {
           closeImportModal()
         }
       }, 3000)
     } else {
-      importError.value = formatMessage(locale.value.errors.importFailedWithReasons, formatImportErrors(allErrors))
-      importProgressText.value = ''
+      importError.value = '导入失败，请检查数据格式后重试'
+      importSuccess.value = ''
     }
   } catch (err) {
-    importError.value = formatMessage(locale.value.errors.importRuntimeFailed, totalCreated, getErrorDetail(err))
-    importProgressText.value = ''
+    importError.value = `导入过程中发生错误 (已成功导入 ${totalCreated} 个): ${err.message || '未知错误'}`
+    importSuccess.value = ''
     console.error('导入用户出错:', err)
   } finally {
     importLoading.value = false
@@ -2902,12 +2309,13 @@ const loadStatusLogsPage = async (page) => {
 
   try {
     const response = await $fetch(`/api/admin/users/${selectedUserDetail.value.id}/status-logs`, {
-      query: {
-        page: page.toString(),
-        limit: '10'
-      },
-      ...auth.getAuthConfig()
-    })
+        query: {
+          page: page.toString(),
+          limit: '10',
+          t: Date.now()
+        },
+        ...auth.getAuthConfig()
+      })
 
     statusLogs.value = response.logs || []
     statusLogsPagination.value = response.pagination || {
@@ -2917,15 +2325,15 @@ const loadStatusLogsPage = async (page) => {
       hasPrevPage: false
     }
   } catch (error) {
-      console.error('加载状态日志失败:', error)
-      statusLogsError.value = getErrorDetail(error) || locale.value.errors.statusLogsFailed
-    } finally {
+    console.error('加载状态日志失败:', error)
+    statusLogsError.value = error.message || '加载状态日志失败'
+  } finally {
     statusLogsLoading.value = false
   }
 }
 
 const formatStatusLogDate = (dateString) => {
-  if (!dateString) return locale.value.time.unknown
+  if (!dateString) return '未知时间'
   const date = new Date(dateString)
   return date.toLocaleString('zh-CN')
 }
@@ -2933,16 +2341,10 @@ const formatStatusLogDate = (dateString) => {
 // 生命周期
 onMounted(async () => {
   console.log('UserManager 组件挂载')
-  await Promise.all([loadUserTree(), loadUsers(1, pageSize.value)])
+  await loadUsers(1, pageSize.value)
   // 预加载XLSX库
   loadXLSX()
 })
-
-onBeforeUnmount(() => {
-  if (loadUsersDebounceTimer) {
-    clearTimeout(loadUsersDebounceTimer)
-  }
-})
 </script>
 
 <style scoped>
@@ -2951,121 +2353,21 @@ onBeforeUnmount(() => {
   width: 6px;
 }
 
-/* 行内操作按钮：保证 flex 布局稳定，不被表格列宽挤压换行 */
-.action-buttons {
-  display: inline-flex;
-  align-items: center;
-  white-space: nowrap;
-}
-
-.action-btn {
-  flex-shrink: 0;
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-}
-
 .custom-scrollbar::-webkit-scrollbar-track {
   background: transparent;
 }
 
 .custom-scrollbar::-webkit-scrollbar-thumb {
-  background: var(--text-muted);
+  background: #4a5568;
   border-radius: 3px;
 }
 
 .custom-scrollbar::-webkit-scrollbar-thumb:hover {
-  background: var(--text-muted);
+  background: #718096;
 }
 
 /* 确保模态框中的表格在移动端可以滚动 */
 .overflow-x-auto {
   -webkit-overflow-scrolling: touch;
 }
-
-.tree-group + .tree-group {
-  margin-top: 0.25rem;
-}
-
-.tree-branch {
-  margin-left: 1rem;
-  padding-left: 0.75rem;
-  border-left: 1px solid var(--user-manager-tree-line);
-}
-
-.tree-toggle {
-  width: 1.5rem;
-  height: 1.5rem;
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  flex-shrink: 0;
-  color: var(--text-muted);
-  border-radius: 0.375rem;
-  transition: color 0.2s ease, background-color 0.2s ease;
-}
-
-.tree-toggle:hover {
-  color: var(--color-accent-light);
-  background: var(--panel-bg-deep);
-}
-
-.tree-label {
-  min-width: 0;
-  width: 100%;
-  height: 1.75rem;
-  padding: 0 0.5rem;
-  display: flex;
-  align-items: center;
-  gap: 0.375rem;
-  border-radius: 0.5rem;
-  color: var(--text-muted-light);
-  font-size: 0.75rem;
-  font-weight: 700;
-  text-align: left;
-  transition: color 0.2s ease, background-color 0.2s ease;
-}
-
-.tree-label:hover {
-  color: var(--text-primary-lighter);
-  background: var(--panel-bg-deep);
-}
-
-.tree-label-active {
-  color: var(--color-accent-light);
-  background: var(--user-manager-tree-active-bg);
-}
-
-.tree-count {
-  flex-shrink: 0;
-  color: var(--panel-bg-hover);
-  font-size: 0.6875rem;
-  font-weight: 900;
-}
-
-.tree-users {
-  margin-left: 1.75rem;
-  padding: 0.25rem 0 0.35rem;
-  display: grid;
-  gap: 0.125rem;
-}
-
-.tree-user {
-  min-width: 0;
-  width: 100%;
-  height: 1.75rem;
-  padding: 0 0.5rem;
-  display: grid;
-  grid-template-columns: auto minmax(0, 0.9fr) minmax(0, 1.1fr);
-  align-items: center;
-  gap: 0.375rem;
-  border-radius: 0.5rem;
-  font-size: 0.75rem;
-  text-align: left;
-  transition: background-color 0.2s ease;
-}
-
-.tree-user:hover {
-  background: var(--panel-bg-deep);
-}
 </style>
diff --git a/app/components/Admin/UserSongsModal.vue b/app/components/Admin/UserSongsModal.vue
index f9c549c..663c846 100644
--- a/app/components/Admin/UserSongsModal.vue
+++ b/app/components/Admin/UserSongsModal.vue
@@ -13,7 +13,7 @@
       @click="handleOverlayClick"
     >
       <!-- 遮罩层 -->
-      <div class="absolute inset-0 bg-bg-primary-60 backdrop-blur-sm" />
+      <div class="absolute inset-0 bg-black/60 backdrop-blur-sm" />
 
       <!-- 模态框面板 -->
       <transition
@@ -26,58 +26,71 @@
       >
         <div
           v-if="show"
-          class="relative w-full max-w-4xl max-h-[85vh] flex flex-col bg-bg-secondary border border-border-secondary rounded-xl shadow-2xl overflow-hidden"
+          class="relative w-full max-w-4xl max-h-[85vh] flex flex-col bg-zinc-900 border border-zinc-800 rounded-xl shadow-2xl overflow-hidden"
           @click.stop
         >
           <!-- 头部 -->
           <div
-            class="flex items-center justify-between px-6 py-4 border-b border-border-secondary bg-bg-secondary"
+            class="flex items-center justify-between px-6 py-4 border-b border-zinc-800 bg-zinc-900/50 backdrop-blur-sm"
           >
-            <h3 class="text-lg font-semibold text-text-primary">{{ locale.title }}</h3>
+            <h3 class="text-lg font-semibold text-white">用户歌曲信息</h3>
             <button
-              class="p-2 text-text-tertiary hover:text-text-primary hover:bg-bg-tertiary rounded-lg transition-colors"
+              class="p-2 text-zinc-400 hover:text-white hover:bg-zinc-800 rounded-lg transition-colors"
               @click="$emit('close')"
             >
-              <Icon name="x" :size="20" />
+              <svg
+                xmlns="http://www.w3.org/2000/svg"
+                width="20"
+                height="20"
+                viewBox="0 0 24 24"
+                fill="none"
+                stroke="currentColor"
+                stroke-width="2"
+                stroke-linecap="round"
+                stroke-linejoin="round"
+              >
+                <path d="M18 6 6 18" />
+                <path d="m6 6 18 12" />
+              </svg>
             </button>
           </div>
 
           <!-- 主体内容 -->
-          <div class="flex-1 flex flex-col min-h-0 overflow-hidden bg-bg-secondary">
+          <div class="flex-1 flex flex-col min-h-0 overflow-hidden bg-zinc-900">
             <!-- 加载状态 -->
             <div v-if="loading" class="flex-1 flex flex-col items-center justify-center">
-              <LoadingState :message="locale.loading" spinner-type="circle" />
+              <LoadingState message="加载数据中..." spinner-type="circle" />
             </div>
 
             <!-- 错误状态 -->
             <div
               v-else-if="error"
-              class="flex-1 flex flex-col items-center justify-center text-text-tertiary gap-4"
+              class="flex-1 flex flex-col items-center justify-center text-zinc-400 gap-4"
             >
-              <div class="text-4xl">⚠️</div>
+              <Icon class="text-4xl text-yellow-500" name="alert-triangle" size="48" />
               <p>{{ error }}</p>
               <button
-                class="px-4 py-2 bg-primary-hover hover:bg-primary text-text-primary rounded-lg transition-colors text-sm font-medium"
+                class="px-4 py-2 bg-blue-600 hover:bg-blue-500 text-white rounded-lg transition-colors text-sm font-medium"
                 @click="retryFetch"
               >
-                {{ commonLocale.retry }}
+                重试
               </button>
             </div>
 
             <!-- 内容 -->
             <div v-else-if="userSongs" class="flex-1 flex flex-col min-h-0">
               <!-- 用户信息头部 -->
-              <div class="px-6 py-4 bg-bg-secondary border-b border-border-secondary">
+              <div class="px-6 py-4 bg-zinc-900 border-b border-zinc-800">
                 <div class="flex flex-col gap-1">
                   <div class="flex items-center gap-3">
-                    <h4 class="text-base font-medium text-text-primary">{{ userSongs.user.name }}</h4>
-                    <span class="text-sm text-text-tertiary font-mono">{{
+                    <h4 class="text-base font-medium text-white">{{ userSongs.user.name }}</h4>
+                    <span class="text-sm text-zinc-500 font-mono">{{
                       userSongs.user.username
                     }}</span>
                   </div>
                   <p
                     v-if="userSongs.user.grade || userSongs.user.class"
-                    class="text-sm text-text-tertiary"
+                    class="text-sm text-zinc-400"
                   >
                     {{ userSongs.user.grade || '' }} {{ userSongs.user.class || '' }}
                   </p>
@@ -86,7 +99,7 @@
 
               <!-- 工具栏 (标签页 + 过滤) -->
               <div
-                class="flex flex-col sm:flex-row items-center justify-between border-b border-border-secondary bg-bg-secondary-50"
+                class="flex flex-col sm:flex-row items-center justify-between border-b border-zinc-800 bg-zinc-900/50"
               >
                 <!-- 标签页 -->
                 <div class="flex w-full sm:w-auto overflow-x-auto no-scrollbar">
@@ -96,8 +109,8 @@
                     class="relative px-6 py-3 text-sm font-medium transition-colors whitespace-nowrap flex-shrink-0"
                     :class="
                       activeTab === tab.id
-                        ? 'text-primary'
-                        : 'text-text-tertiary hover:text-text-primary hover:bg-bg-tertiary-50'
+                        ? 'text-blue-500'
+                        : 'text-zinc-400 hover:text-white hover:bg-zinc-800/50'
                     "
                     @click="activeTab = tab.id"
                   >
@@ -106,8 +119,8 @@
                       class="ml-1.5 text-xs px-1.5 py-0.5 rounded-full"
                       :class="
                         activeTab === tab.id
-                          ? 'bg-primary-10 text-primary'
-                          : 'bg-bg-tertiary text-text-tertiary'
+                          ? 'bg-blue-500/10 text-blue-500'
+                          : 'bg-zinc-800 text-zinc-500'
                       "
                     >
                       {{ getTabCount(tab.id) }}
@@ -115,20 +128,20 @@
                     <!-- 激活指示器 -->
                     <div
                       v-if="activeTab === tab.id"
-                      class="absolute bottom-0 left-0 right-0 h-0.5 bg-primary"
+                      class="absolute bottom-0 left-0 right-0 h-0.5 bg-blue-500"
                     />
                   </button>
                 </div>
 
                 <!-- 学期过滤器 -->
                 <div
-                  class="w-full sm:w-auto px-4 py-2 border-t sm:border-t-0 sm:border-l border-border-secondary flex items-center gap-3 bg-bg-secondary-30"
+                  class="w-full sm:w-auto px-4 py-2 border-t sm:border-t-0 sm:border-l border-zinc-800 flex items-center gap-3 bg-zinc-900/30"
                 >
                   <CustomSelect
                     v-model="selectedSemester"
-                    :options="[{ label: locale.allSemesters, value: null }, ...semesterOptions]"
-                    :label="locale.semesterFilter"
-                    :placeholder="locale.allSemesters"
+                    :options="[{ label: '全部学期', value: null }, ...semesterOptions]"
+                    label="学期过滤"
+                    placeholder="全部学期"
                     class-name="w-full sm:w-48"
                   />
                 </div>
@@ -138,38 +151,38 @@
               <div class="flex-1 overflow-y-auto p-4 sm:p-6 space-y-3 custom-scrollbar">
                 <div
                   v-if="filteredSongs.length === 0"
-                  class="flex flex-col items-center justify-center py-20 text-text-tertiary"
+                  class="flex flex-col items-center justify-center py-20 text-zinc-500"
                 >
-                  <div class="text-5xl mb-4 opacity-50">{{ activeTabIcon }}</div>
-                  <p>{{ locale.empty }}</p>
+                  <Icon class="text-5xl mb-4 opacity-50" :name="activeTabIcon" size="48" />
+                  <p>没有找到相关记录</p>
                 </div>
 
                 <div
                   v-for="song in filteredSongs"
                   :key="song.id"
-                  class="group flex flex-col sm:flex-row sm:items-center justify-between gap-4 p-4 rounded-lg border border-border-secondary bg-bg-tertiary-20 hover:bg-bg-tertiary-50 hover:border-border-tertiary transition-all duration-200"
+                  class="group flex flex-col sm:flex-row sm:items-center justify-between gap-4 p-4 rounded-lg border border-zinc-800 bg-zinc-800/20 hover:bg-zinc-800/50 hover:border-zinc-700 transition-all duration-200"
                 >
                   <!-- 歌曲信息 -->
                   <div class="flex-1 min-w-0">
                     <div class="flex items-center gap-2 mb-1">
-                      <h5 class="text-sm font-medium text-text-primary truncate">{{ song.title }}</h5>
+                      <h5 class="text-sm font-medium text-white truncate">{{ song.title }}</h5>
                       <span
                         v-if="song.semester"
-                        class="px-1.5 py-0.5 rounded text-[10px] font-medium bg-bg-tertiary text-text-tertiary border border-border-tertiary"
+                        class="px-1.5 py-0.5 rounded text-[10px] font-medium bg-zinc-800 text-zinc-400 border border-zinc-700"
                       >
                         {{ song.semester }}
                       </span>
                     </div>
-                    <div class="text-sm text-text-tertiary truncate">{{ song.artist }}</div>
+                    <div class="text-sm text-zinc-400 truncate">{{ song.artist }}</div>
 
                     <!-- Meta Info (Mobile) -->
                     <div
-                      class="flex flex-wrap items-center gap-3 mt-3 sm:hidden text-xs text-text-tertiary"
+                      class="flex flex-wrap items-center gap-3 mt-3 sm:hidden text-xs text-zinc-500"
                     >
                       <span>{{ getMetaTime(song) }}</span>
-                      <span v-if="song.voteCount !== undefined">{{ formatLocale(locale.votes, song.voteCount) }}</span>
+                      <span v-if="song.voteCount !== undefined">{{ song.voteCount }} 票</span>
                       <span v-if="song.requestCount !== undefined"
-                        >{{ formatLocale(locale.requests, song.requestCount) }}</span
+                        >{{ song.requestCount }} 人申请</span
                       >
                     </div>
                   </div>
@@ -188,21 +201,21 @@
 
                     <!-- Meta Info (Desktop) -->
                     <div class="hidden sm:flex flex-col items-end gap-0.5 min-w-[100px]">
-                      <span class="text-xs text-text-tertiary">{{ getMetaTime(song) }}</span>
+                      <span class="text-xs text-zinc-400">{{ getMetaTime(song) }}</span>
                       <div class="flex items-center gap-2">
-                        <span v-if="song.voteCount !== undefined" class="text-xs text-text-tertiary"
-                          >{{ formatLocale(locale.votes, song.voteCount) }}</span
+                        <span v-if="song.voteCount !== undefined" class="text-xs text-zinc-500"
+                          >{{ song.voteCount }} 票</span
                         >
-                        <span v-if="song.requestCount !== undefined" class="text-xs text-text-tertiary"
-                          >{{ formatLocale(locale.requests, song.requestCount) }}</span
+                        <span v-if="song.requestCount !== undefined" class="text-xs text-zinc-500"
+                          >{{ song.requestCount }} 人申请</span
                         >
                       </div>
                     </div>
 
                     <!-- Submitter Info (if available) -->
                     <div v-if="song.requester" class="hidden sm:block text-right min-w-[80px]">
-                      <div class="text-xs text-text-secondary">{{ song.requester.name }}</div>
-                      <div class="text-[10px] text-text-tertiary">
+                      <div class="text-xs text-zinc-300">{{ song.requester.name }}</div>
+                      <div class="text-[10px] text-zinc-500">
                         {{ song.requester.grade }}{{ song.requester.class }}
                       </div>
                     </div>
@@ -211,12 +224,12 @@
                   <!-- 投稿人信息 (移动端) -->
                   <div
                     v-if="song.requester"
-                    class="sm:hidden pt-3 mt-1 border-t border-border-secondary-50 flex justify-between items-center text-xs"
+                    class="sm:hidden pt-3 mt-1 border-t border-zinc-800/50 flex justify-between items-center text-xs"
                   >
-                    <span class="text-text-tertiary">{{ locale.requester }}</span>
-                    <span class="text-text-secondary">
+                    <span class="text-zinc-500">投稿人:</span>
+                    <span class="text-zinc-300">
                       {{ song.requester.name }}
-                      <span class="text-text-tertiary ml-1">
+                      <span class="text-zinc-500 ml-1">
                         {{ song.requester.grade }}{{ song.requester.class }}
                       </span>
                     </span>
@@ -235,9 +248,7 @@
 import { ref, computed, watch } from 'vue'
 import { useSemesters } from '~/composables/useSemesters'
 import CustomSelect from '~/components/UI/Common/CustomSelect.vue'
-import Icon from '~/components/UI/Icon.vue'
 import LoadingState from '~/components/UI/Common/LoadingState.vue'
-import { useLocale } from '~/utils/locale'
 
 const props = defineProps({
   show: {
@@ -261,16 +272,6 @@ const selectedSemester = ref(null)
 
 // Composables
 const { semesters, fetchSemesterOptions } = useSemesters()
-const { common, currentLocale } = useLocale()
-const commonLocale = computed(() => common.value || {})
-const locale = computed(() => {
-  const base = common.value?.userSongsModal || {}
-  return {
-    ...base,
-    tabs: { ...(base.tabs || {}) },
-    statuses: { ...(base.statuses || {}) }
-  }
-})
 
 // Computed
 const semesterOptions = computed(() => {
@@ -280,22 +281,22 @@ const semesterOptions = computed(() => {
   }))
 })
 
-const tabs = computed(() => [
-  { id: 'submitted', label: locale.value.tabs.submitted },
-  { id: 'voted', label: locale.value.tabs.voted },
-  { id: 'replay', label: locale.value.tabs.replay }
-])
+const tabs = [
+  { id: 'submitted', label: '投稿歌曲' },
+  { id: 'voted', label: '投票歌曲' },
+  { id: 'replay', label: '重播申请' }
+]
 
 const activeTabIcon = computed(() => {
   switch (activeTab.value) {
     case 'submitted':
-      return '🎵'
+      return 'music'
     case 'voted':
-      return '❤️'
+      return 'heart'
     case 'replay':
-      return '🔁'
+      return 'repeat'
     default:
-      return '📄'
+      return 'file-text'
   }
 })
 
@@ -370,7 +371,7 @@ const fetchUserSongs = async () => {
     userSongs.value = songsResponse
   } catch (err) {
     console.error('获取用户歌曲信息失败:', err)
-    error.value = err.data?.message || locale.value.fetchFailed
+    error.value = err.data?.message || '获取用户歌曲信息失败'
   } finally {
     loading.value = false
   }
@@ -385,25 +386,18 @@ const handleOverlayClick = () => {
 }
 
 // Helpers
-const formatTimeAgo = (key, value) => {
-  const message = commonLocale.value?.time?.[key]
-  if (typeof message === 'function') return message(value)
-  if (typeof message === 'string') return message.replace(/{(\d+)}/g, (match, index) => index === '0' ? String(value) : match)
-  return ''
-}
-
 const formatDate = (dateString) => {
   if (!dateString) return ''
   const date = new Date(dateString)
-  const now = getSyncedDate()
+  const now = new Date()
   const diff = now - date
 
-  if (diff < 60000) return commonLocale.value?.time?.justNow || ''
-  if (diff < 3600000) return formatTimeAgo('minutesAgo', Math.floor(diff / 60000))
-  if (diff < 86400000) return formatTimeAgo('hoursAgo', Math.floor(diff / 3600000))
-  if (diff < 86400000 * 7) return formatTimeAgo('daysAgo', Math.floor(diff / 86400000))
+  if (diff < 60000) return '刚刚'
+  if (diff < 3600000) return `${Math.floor(diff / 60000)}分钟前`
+  if (diff < 86400000) return `${Math.floor(diff / 3600000)}小时前`
+  if (diff < 86400000 * 7) return `${Math.floor(diff / 86400000)}天前`
 
-  return date.toLocaleDateString(currentLocale.value, {
+  return date.toLocaleDateString('zh-CN', {
     year: 'numeric',
     month: 'short',
     day: 'numeric'
@@ -412,25 +406,25 @@ const formatDate = (dateString) => {
 
 const getMetaTime = (song) => {
   if (activeTab.value === 'submitted') return formatDate(song.createdAt)
-  if (activeTab.value === 'voted') return `${formatDate(song.votedAt)} ${locale.value.voted}`
-  if (activeTab.value === 'replay') return `${formatDate(song.requestedAt)} ${locale.value.requested}`
+  if (activeTab.value === 'voted') return `${formatDate(song.votedAt)} 投票`
+  if (activeTab.value === 'replay') return `${formatDate(song.requestedAt)} 申请`
   return ''
 }
 
 const getStatusText = (song) => {
-  if (song.played) return locale.value.statuses.played
-  if (song.scheduled) return locale.value.statuses.scheduled
-  return locale.value.statuses.pending
+  if (song.played) return '已播放'
+  if (song.scheduled) return '已排期'
+  return '待排期'
 }
 
 const getStatusClasses = (song) => {
   if (song.played) {
-    return 'bg-success-10 text-success border-success-20'
+    return 'bg-emerald-500/10 text-emerald-500 border-emerald-500/20'
   }
   if (song.scheduled) {
-    return 'bg-primary-10 text-primary border-primary-20'
+    return 'bg-blue-500/10 text-blue-500 border-blue-500/20'
   }
-  return 'bg-warning-10 text-warning border-warning-20'
+  return 'bg-amber-500/10 text-amber-500 border-amber-500/20'
 }
 
 // 监听器
@@ -470,12 +464,12 @@ watch(
 }
 
 .custom-scrollbar::-webkit-scrollbar-thumb {
-  background-color: var(--usersongs-scroll-thumb);
+  background-color: rgba(113, 113, 122, 0.3); /* zinc-500/30 */
   border-radius: 3px;
 }
 
 .custom-scrollbar::-webkit-scrollbar-thumb:hover {
-  background-color: var(--usersongs-scroll-thumb-hover);
+  background-color: rgba(113, 113, 122, 0.5);
 }
 
 /* 标签页隐藏滚动条 */
diff --git a/app/components/Admin/VotersModal.vue b/app/components/Admin/VotersModal.vue
index 16d2b2e..52fe766 100644
--- a/app/components/Admin/VotersModal.vue
+++ b/app/components/Admin/VotersModal.vue
@@ -1,175 +1,101 @@
 <template>
-  <Teleport to="body">
-    <Transition
-      enter-active-class="transition duration-300 ease-out"
-      enter-from-class="opacity-0 scale-95"
-      enter-to-class="opacity-100 scale-100"
-      leave-active-class="transition duration-200 ease-in"
-      leave-from-class="opacity-100 scale-100"
-      leave-to-class="opacity-0 scale-95"
-    >
-      <div
-        v-if="show"
-        class="fixed inset-0 z-[90] flex items-center justify-center p-4 bg-bg-primary-80 backdrop-blur-sm"
-        @click.self="closeModal"
-      >
-        <div
-          class="bg-bg-secondary border border-border-secondary w-full max-w-xl rounded-2xl overflow-hidden shadow-2xl flex flex-col max-h-[90vh]"
-        >
-          <!-- 头部 -->
-          <div
-            class="p-6 pb-4 flex items-center justify-between border-b border-border-secondary-50"
-          >
-            <div class="min-w-0">
-              <h3
-                class="text-xl font-black text-text-primary tracking-tight flex items-center gap-3"
-              >
-                <div
-                  class="w-10 h-10 rounded-xl bg-primary-hover-10 flex items-center justify-center text-primary shrink-0"
-                >
-                  <Icon name="users" :size="20" />
-                </div>
-                {{ locale.title }}
-              </h3>
-              <p v-if="songInfo" class="text-xs text-text-tertiary mt-1 ml-13 truncate">
-                {{ songInfo.title }}
-              </p>
-            </div>
-            <button
-              class="p-3 bg-bg-tertiary-50 hover:bg-bg-tertiary text-text-tertiary hover:text-text-primary rounded-xl transition-all shrink-0"
-              @click="closeModal"
-            >
-              <Icon name="x" :size="20" />
-            </button>
-          </div>
+  <div v-if="show" class="modal-overlay" @click="closeModal">
+    <div class="modal-content" @click.stop>
+      <div class="modal-header">
+        <h3 class="modal-title">投票人员列表</h3>
+        <button class="close-btn" @click="closeModal">
+          <svg fill="none" stroke="currentColor" stroke-width="2" viewBox="0 0 24 24">
+            <line x1="18" x2="6" y1="6" y2="18" />
+            <line x1="6" x2="18" y1="6" y2="18" />
+          </svg>
+        </button>
+      </div>
 
-          <!-- 主体 -->
-          <div class="flex-1 overflow-y-auto p-6 custom-scrollbar">
-            <!-- 歌曲信息 -->
-            <div
-              v-if="songInfo"
-              class="mb-5 p-5 bg-bg-primary-50 border border-border-secondary-50 rounded-xl"
-            >
-              <div class="flex items-start gap-4">
-                <div
-                  class="w-11 h-11 rounded-xl bg-error-10 flex items-center justify-center text-error shrink-0"
-                >
-                  <Icon name="music" :size="20" />
-                </div>
-                <div class="flex-1 min-w-0">
-                  <h4 class="text-base font-black text-text-primary truncate">
-                    {{ songInfo.title }}
-                  </h4>
-                  <p class="text-xs text-text-tertiary mt-1 truncate">{{ songInfo.artist }}</p>
-                </div>
-                <div
-                  class="flex items-center gap-1.5 px-3 py-1.5 bg-error-10 border border-error-20 rounded-full text-error shrink-0"
-                >
-                  <Icon name="heart" :size="12" class="fill-current" />
-                  <span class="text-xs font-black">{{
-                    formatLocale(locale.votes, totalVotes)
-                  }}</span>
-                </div>
-              </div>
-            </div>
-
-            <!-- 加载状态 -->
-            <LoadingState v-if="loading" :message="locale.loading" spinner-type="circle" />
-
-            <!-- 错误状态 -->
-            <div
-              v-else-if="error"
-              class="flex flex-col items-center justify-center py-16 text-center px-8"
-            >
-              <div
-                class="w-16 h-16 rounded-2xl bg-error-10 flex items-center justify-center text-error mb-4"
-              >
-                <Icon name="alert-triangle" :size="32" />
-              </div>
-              <p class="text-sm text-text-tertiary mb-6">{{ error }}</p>
-              <button
-                class="px-6 py-3 bg-bg-tertiary hover:bg-bg-quaternary text-text-primary text-xs font-black rounded-xl transition-all uppercase tracking-widest"
-                @click="fetchVoters"
-              >
-                {{ commonLocale.retry }}
-              </button>
-            </div>
-
-            <!-- 投票人员列表 -->
-            <div v-else-if="voters.length > 0">
-              <div class="flex items-center justify-between mb-3 px-1">
-                <div
-                  class="flex items-center gap-2 text-[10px] font-black text-text-tertiary uppercase tracking-widest"
-                >
-                  <Icon name="users" :size="12" class="text-primary" />
-                  {{ formatLocale(locale.voters, voters.length) }}
-                </div>
-                <div class="text-[10px] font-black text-text-disabled uppercase tracking-widest">
-                  {{ formatLocale(locale.votes, totalVotes) }}
-                </div>
-              </div>
-
-              <div class="space-y-2 max-h-[45vh] overflow-y-auto custom-scrollbar pr-1">
-                <div
-                  v-for="(voter, index) in voters"
-                  :key="voter.id"
-                  class="flex items-center gap-4 p-3 rounded-xl border border-transparent hover:bg-bg-tertiary-50 hover:border-border-secondary transition-all"
-                >
-                  <div
-                    class="w-10 h-10 rounded-xl bg-bg-tertiary border border-border-secondary flex items-center justify-center text-text-secondary text-sm font-black shrink-0"
-                  >
-                    {{ getAvatarText(voter.name) }}
-                  </div>
-                  <div class="flex-1 min-w-0">
-                    <div class="text-sm font-black text-text-primary truncate">
-                      {{ voter.name }}
-                    </div>
-                    <div
-                      class="flex items-center gap-1.5 text-[10px] text-text-disabled mt-0.5 font-medium"
-                    >
-                      <Icon name="clock" :size="11" />
-                      {{ formatVoteTime(voter.votedAt) }}
-                    </div>
-                  </div>
-                  <div
-                    class="text-[10px] font-black text-text-disabled px-2 py-1 bg-bg-tertiary rounded-lg shrink-0"
-                  >
-                    #{{ index + 1 }}
-                  </div>
-                </div>
-              </div>
-            </div>
-
-            <!-- 无投票状态 -->
-            <div v-else class="flex flex-col items-center justify-center py-16 text-text-disabled">
-              <Icon name="heart" :size="48" class="mb-4 opacity-20" />
-              <p class="text-sm font-bold">{{ locale.empty }}</p>
-            </div>
-          </div>
-
-          <!-- 底部 -->
-          <div
-            class="p-6 border-t border-border-secondary-50 bg-bg-secondary-50 flex items-center justify-end"
-          >
-            <button
-              class="px-6 py-3 bg-bg-tertiary hover:bg-bg-quaternary text-text-secondary text-xs font-black rounded-xl transition-all uppercase tracking-widest"
-              @click="closeModal"
-            >
-              {{ commonLocale.close }}
-            </button>
+      <div class="modal-body">
+        <!-- 歌曲信息 -->
+        <div v-if="songInfo" class="song-info">
+          <h4 class="song-title">{{ songInfo.title }}</h4>
+          <p class="song-artist">{{ songInfo.artist }}</p>
+          <div class="vote-summary">
+            <svg class="heart-icon" fill="currentColor" viewBox="0 0 24 24">
+              <path
+                d="M20.84 4.61a5.5 5.5 0 0 0-7.78 0L12 5.67l-1.06-1.06a5.5 5.5 0 0 0-7.78 7.78l1.06 1.06L12 21.23l7.78-7.78 1.06-1.06a5.5 5.5 0 0 0 0-7.78z"
+              />
+            </svg>
+            <span class="vote-count">{{ totalVotes }} 票</span>
           </div>
         </div>
+
+        <!-- 加载状态 -->
+        <div v-if="loading" class="loading-container">
+          <div class="spinner" />
+          <p>正在加载投票人员...</p>
+        </div>
+
+        <!-- 错误状态 -->
+        <div v-else-if="error" class="error-container">
+          <svg
+            class="error-icon"
+            fill="none"
+            stroke="currentColor"
+            stroke-width="2"
+            viewBox="0 0 24 24"
+          >
+            <circle cx="12" cy="12" r="10" />
+            <line x1="15" x2="9" y1="9" y2="15" />
+            <line x1="9" x2="15" y1="9" y2="15" />
+          </svg>
+          <p class="error-message">{{ error }}</p>
+          <button class="retry-btn" @click="fetchVoters">重试</button>
+        </div>
+
+        <!-- 投票人员列表 -->
+        <div v-else-if="voters.length > 0" class="voters-list">
+          <div class="voters-header">
+            <span class="voters-title">投票人员 ({{ voters.length }})</span>
+          </div>
+          <div class="voters-container">
+            <div v-for="(voter, index) in voters" :key="voter.id" class="voter-item">
+              <div class="voter-info">
+                <div class="voter-avatar">
+                  {{ getAvatarText(voter.name) }}
+                </div>
+                <div class="voter-details">
+                  <span class="voter-name">{{ voter.name }}</span>
+                  <span class="vote-time">{{ formatVoteTime(voter.votedAt) }}</span>
+                </div>
+              </div>
+              <div class="voter-number">#{{ index + 1 }}</div>
+            </div>
+          </div>
+        </div>
+
+        <!-- 无投票状态 -->
+        <div v-else class="empty-state">
+          <svg
+            class="empty-icon"
+            fill="none"
+            stroke="currentColor"
+            stroke-width="2"
+            viewBox="0 0 24 24"
+          >
+            <path
+              d="M20.84 4.61a5.5 5.5 0 0 0-7.78 0L12 5.67l-1.06-1.06a5.5 5.5 0 0 0-7.78 7.78l1.06 1.06L12 21.23l7.78-7.78 1.06-1.06a5.5 5.5 0 0 0 0-7.78z"
+            />
+          </svg>
+          <p>暂无投票</p>
+        </div>
       </div>
-    </Transition>
-  </Teleport>
+
+      <div class="modal-footer">
+        <button class="close-button" @click="closeModal">关闭</button>
+      </div>
+    </div>
+  </div>
 </template>
 
 <script setup>
-import { computed, ref, watch } from 'vue'
-import Icon from '~/components/UI/Icon.vue'
-import LoadingState from '~/components/UI/Common/LoadingState.vue'
-import { useLocale } from '~/utils/locale'
-import { useServerErrors } from '~/composables/useLocaleText'
+import { ref, watch } from 'vue'
 
 // Props
 const props = defineProps({
@@ -192,10 +118,6 @@ const error = ref('')
 const songInfo = ref(null)
 const voters = ref([])
 const totalVotes = ref(0)
-const { common, currentLocale } = useLocale()
-const commonLocale = computed(() => common.value || {})
-const locale = computed(() => common.value?.votersModal || {})
-const { localize: localizeServerError } = useServerErrors()
 
 // 方法
 const closeModal = () => {
@@ -216,7 +138,7 @@ const fetchVoters = async () => {
     totalVotes.value = response.totalVotes || 0
   } catch (err) {
     console.error('获取投票人员失败:', err)
-    error.value = localizeServerError(err, locale.value.fetchFailed)
+    error.value = err.data?.message || '获取投票人员失败'
   } finally {
     loading.value = false
   }
@@ -229,25 +151,17 @@ const getAvatarText = (name) => {
   return cleanName.slice(-1).toUpperCase()
 }
 
-const formatTimeAgo = (key, value) => {
-  const message = commonLocale.value?.time?.[key]
-  if (typeof message === 'function') return message(value)
-  if (typeof message === 'string')
-    return message.replace(/{(\d+)}/g, (match, index) => (index === '0' ? String(value) : match))
-  return ''
-}
-
 const formatVoteTime = (dateString) => {
   const date = new Date(dateString)
-  const now = getSyncedDate()
+  const now = new Date()
   const diff = now - date
 
-  if (diff < 60000) return commonLocale.value?.time?.justNow || ''
-  if (diff < 3600000) return formatTimeAgo('minutesAgo', Math.floor(diff / 60000))
-  if (diff < 86400000) return formatTimeAgo('hoursAgo', Math.floor(diff / 3600000))
-  if (diff < 604800000) return formatTimeAgo('daysAgo', Math.floor(diff / 86400000))
+  if (diff < 60000) return '刚刚'
+  if (diff < 3600000) return `${Math.floor(diff / 60000)}分钟前`
+  if (diff < 86400000) return `${Math.floor(diff / 3600000)}小时前`
+  if (diff < 604800000) return `${Math.floor(diff / 86400000)}天前`
 
-  return date.toLocaleDateString(currentLocale.value, {
+  return date.toLocaleDateString('zh-CN', {
     month: 'short',
     day: 'numeric',
     hour: '2-digit',
@@ -273,21 +187,347 @@ watch(
 </script>
 
 <style scoped>
-/* 列表自定义滚动条 */
-.custom-scrollbar::-webkit-scrollbar {
+.modal-overlay {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.7);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 1000;
+  padding: 20px;
+}
+
+.modal-content {
+  background: var(--surface-primary, var(--bg-primary, #1a1a1a));
+  border-radius: 16px;
+  border: 1px solid var(--border-primary, #2a2a2a);
+  width: 100%;
+  max-width: 500px;
+  max-height: 80vh;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+}
+
+.modal-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 24px 24px 0;
+}
+
+.modal-title {
+  font-size: 20px;
+  font-weight: 600;
+  color: var(--text-primary, #ffffff);
+  margin: 0;
+}
+
+.close-btn {
+  background: none;
+  border: none;
+  color: var(--text-tertiary, #888888);
+  cursor: pointer;
+  padding: 8px;
+  border-radius: 8px;
+  transition: all 0.2s ease;
+}
+
+.close-btn:hover {
+  background: var(--bg-tertiary, #2a2a2a);
+  color: var(--text-primary, #ffffff);
+}
+
+.close-btn svg {
+  width: 20px;
+  height: 20px;
+}
+
+.modal-body {
+  flex: 1;
+  padding: 24px;
+  overflow-y: auto;
+}
+
+.song-info {
+  background: var(--bg-tertiary, #2a2a2a);
+  border-radius: 12px;
+  padding: 20px;
+  margin-bottom: 24px;
+  border: 1px solid var(--border-secondary, #3a3a3a);
+}
+
+.song-title {
+  font-size: 18px;
+  font-weight: 600;
+  color: var(--text-primary, #ffffff);
+  margin: 0 0 8px 0;
+}
+
+.song-artist {
+  color: var(--text-tertiary, #888888);
+  margin: 0 0 16px 0;
+  font-size: 14px;
+}
+
+.vote-summary {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.heart-icon {
+  width: 20px;
+  height: 20px;
+  color: #ef4444;
+}
+
+.vote-count {
+  color: #ef4444;
+  font-weight: 600;
+  font-size: 16px;
+}
+
+.loading-container {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 40px 20px;
+  gap: 16px;
+}
+
+.spinner {
+  width: 32px;
+  height: 32px;
+  border: 3px solid var(--border-secondary, #3a3a3a);
+  border-top: 3px solid #667eea;
+  border-radius: 50%;
+  animation: spin 1s linear infinite;
+}
+
+@keyframes spin {
+  0% {
+    transform: rotate(0deg);
+  }
+  100% {
+    transform: rotate(360deg);
+  }
+}
+
+.error-container {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 40px 20px;
+  gap: 16px;
+}
+
+.error-icon {
+  width: 48px;
+  height: 48px;
+  color: #ef4444;
+}
+
+.error-message {
+  color: #ef4444;
+  text-align: center;
+  margin: 0;
+}
+
+.retry-btn {
+  background: #667eea;
+  color: white;
+  border: none;
+  padding: 8px 16px;
+  border-radius: 8px;
+  cursor: pointer;
+  font-size: 14px;
+  transition: background 0.2s ease;
+}
+
+.retry-btn:hover {
+  background: #5a67d8;
+}
+
+.voters-list {
+  display: flex;
+  flex-direction: column;
+  gap: 16px;
+}
+
+.voters-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding-bottom: 12px;
+  border-bottom: 1px solid var(--border-secondary, #3a3a3a);
+}
+
+.voters-title {
+  font-weight: 600;
+  color: var(--text-primary, #ffffff);
+  font-size: 16px;
+}
+
+.voters-container {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+  max-height: 300px;
+  overflow-y: auto;
+}
+
+.voter-item {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 12px 16px;
+  background: var(--bg-tertiary, #2a2a2a);
+  border-radius: 8px;
+  border: 1px solid var(--border-secondary, #3a3a3a);
+  transition: all 0.2s ease;
+}
+
+.voter-item:hover {
+  background: var(--bg-quaternary, #333333);
+  border-color: var(--border-secondary, #4a4a4a);
+}
+
+.voter-info {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  flex: 1;
+}
+
+.voter-avatar {
+  width: 36px;
+  height: 36px;
+  border-radius: 50%;
+  background: linear-gradient(135deg, #667eea, #764ba2);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: white;
+  font-weight: 600;
+  font-size: 14px;
+}
+
+.voter-details {
+  display: flex;
+  flex-direction: column;
+  gap: 2px;
+}
+
+.voter-name {
+  color: var(--text-primary, #ffffff);
+  font-weight: 500;
+  font-size: 14px;
+}
+
+.vote-time {
+  color: var(--text-tertiary, #888888);
+  font-size: 12px;
+}
+
+.voter-number {
+  color: var(--text-tertiary, #888888);
+  font-size: 12px;
+  font-weight: 500;
+}
+
+.empty-state {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: 40px 20px;
+  gap: 16px;
+}
+
+.empty-icon {
+  width: 48px;
+  height: 48px;
+  color: var(--text-quaternary, #666666);
+}
+
+.empty-state p {
+  color: var(--text-tertiary, #888888);
+  margin: 0;
+}
+
+.modal-footer {
+  padding: 0 24px 24px;
+  display: flex;
+  justify-content: flex-end;
+}
+
+.close-button {
+  background: var(--bg-quaternary, #3a3a3a);
+  color: var(--text-primary, #ffffff);
+  border: none;
+  padding: 12px 24px;
+  border-radius: 8px;
+  cursor: pointer;
+  font-size: 14px;
+  font-weight: 500;
+  transition: background 0.2s ease;
+}
+
+.close-button:hover {
+  background: #4a4a4a;
+}
+
+/* 滚动条样式 */
+.voters-container::-webkit-scrollbar {
   width: 6px;
 }
 
-.custom-scrollbar::-webkit-scrollbar-track {
-  background: transparent;
-}
-
-.custom-scrollbar::-webkit-scrollbar-thumb {
-  background-color: var(--text-muted);
+.voters-container::-webkit-scrollbar-track {
+  background: var(--bg-tertiary, #2a2a2a);
   border-radius: 3px;
 }
 
-.custom-scrollbar::-webkit-scrollbar-thumb:hover {
-  background-color: var(--text-muted);
+.voters-container::-webkit-scrollbar-thumb {
+  background: #4a4a4a;
+  border-radius: 3px;
+}
+
+.voters-container::-webkit-scrollbar-thumb:hover {
+  background: #5a5a5a;
+}
+
+/* 响应式设计 */
+@media (max-width: 768px) {
+  .modal-overlay {
+    padding: 10px;
+  }
+
+  .modal-content {
+    max-height: 90vh;
+  }
+
+  .modal-header,
+  .modal-body,
+  .modal-footer {
+    padding-left: 16px;
+    padding-right: 16px;
+  }
+
+  .voter-item {
+    padding: 10px 12px;
+  }
+
+  .voter-avatar {
+    width: 32px;
+    height: 32px;
+    font-size: 12px;
+  }
 }
 </style>
diff --git a/app/components/Admin/WorkflowTutorial.vue b/app/components/Admin/WorkflowTutorial.vue
new file mode 100644
index 0000000..61b44a0
--- /dev/null
+++ b/app/components/Admin/WorkflowTutorial.vue
@@ -0,0 +1,126 @@
+<template>
+  <div class="space-y-6 max-w-5xl mx-auto pb-24 md:pb-8 animate-in fade-in slide-in-from-bottom-4 duration-500">
+    <div class="flex flex-col gap-2">
+      <h2 class="text-2xl md:text-3xl font-bold tracking-tight text-zinc-100">工作流与使用教程</h2>
+      <p class="text-zinc-400">了解校园广播站点歌系统的标准操作流程和功能说明，帮助您更高效地管理点歌与排期。</p>
+    </div>
+
+    <div class="grid grid-cols-1 md:grid-cols-2 gap-6">
+      <!-- 歌曲管理流程 -->
+      <div class="bg-zinc-900/50 border border-zinc-800 rounded-xl p-6 hover:border-zinc-700 transition-colors">
+        <div class="flex items-center gap-3 mb-4 text-blue-400">
+          <CheckCircle2 class="w-6 h-6" />
+          <h3 class="text-xl font-semibold">1. 歌曲管理与审核</h3>
+        </div>
+        <ol class="space-y-4 text-zinc-300">
+          <li class="flex gap-3">
+            <span class="flex-shrink-0 w-6 h-6 rounded-full bg-blue-500/20 text-blue-400 flex items-center justify-center text-sm font-bold">1</span>
+            <div>
+              <p class="font-medium text-zinc-100">查看所有歌曲</p>
+              <p class="text-sm text-zinc-500 mt-1">进入“歌曲管理”页面，系统会列出所有用户提交的歌曲。</p>
+            </div>
+          </li>
+          <li class="flex gap-3">
+            <span class="flex-shrink-0 w-6 h-6 rounded-full bg-blue-500/20 text-blue-400 flex items-center justify-center text-sm font-bold">2</span>
+            <div>
+              <p class="font-medium text-zinc-100">试听与检查</p>
+              <p class="text-sm text-zinc-500 mt-1">点击播放按钮试听歌曲质量，检查留言内容是否合规，确保没有不当言论。</p>
+            </div>
+          </li>
+          <li class="flex gap-3">
+            <span class="flex-shrink-0 w-6 h-6 rounded-full bg-blue-500/20 text-blue-400 flex items-center justify-center text-sm font-bold">3</span>
+            <div>
+              <p class="font-medium text-zinc-100">拒绝或修改状态</p>
+              <p class="text-sm text-zinc-500 mt-1">如不符合要求，可以在歌曲管理中拒绝该歌曲，并填写退回原因；审核通过的歌曲可直接用于排期。</p>
+            </div>
+          </li>
+        </ol>
+      </div>
+
+      <!-- 排期流程 -->
+      <div class="bg-zinc-900/50 border border-zinc-800 rounded-xl p-6 hover:border-zinc-700 transition-colors">
+        <div class="flex items-center gap-3 mb-4 text-emerald-400">
+          <CalendarDays class="w-6 h-6" />
+          <h3 class="text-xl font-semibold">2. 节目排期流程</h3>
+        </div>
+        <ol class="space-y-4 text-zinc-300">
+          <li class="flex gap-3">
+            <span class="flex-shrink-0 w-6 h-6 rounded-full bg-emerald-500/20 text-emerald-400 flex items-center justify-center text-sm font-bold">1</span>
+            <div>
+              <p class="font-medium text-zinc-100">选择日期与时段</p>
+              <p class="text-sm text-zinc-500 mt-1">在“排期管理”中，选择目标播放日期和播出时段。</p>
+            </div>
+          </li>
+          <li class="flex gap-3">
+            <span class="flex-shrink-0 w-6 h-6 rounded-full bg-emerald-500/20 text-emerald-400 flex items-center justify-center text-sm font-bold">2</span>
+            <div>
+              <p class="font-medium text-zinc-100">拖拽编排</p>
+              <p class="text-sm text-zinc-500 mt-1">将左侧“待排歌曲”拖拽至右侧的“播放列表”中，可上下拖拽调整播放顺序。</p>
+            </div>
+          </li>
+          <li class="flex gap-3">
+            <span class="flex-shrink-0 w-6 h-6 rounded-full bg-emerald-500/20 text-emerald-400 flex items-center justify-center text-sm font-bold">3</span>
+            <div>
+              <p class="font-medium text-zinc-100">发布排期</p>
+              <p class="text-sm text-zinc-500 mt-1">排期完成后，点击“发布排期”。发布后用户即可在前端页面看到该日期的节目单。</p>
+            </div>
+          </li>
+        </ol>
+      </div>
+
+      <!-- 播音流程 -->
+      <div class="bg-zinc-900/50 border border-zinc-800 rounded-xl p-6 hover:border-zinc-700 transition-colors">
+        <div class="flex items-center gap-3 mb-4 text-purple-400">
+          <Mic2 class="w-6 h-6" />
+          <h3 class="text-xl font-semibold">3. 播音与打印</h3>
+        </div>
+        <ol class="space-y-4 text-zinc-300">
+          <li class="flex gap-3">
+            <span class="flex-shrink-0 w-6 h-6 rounded-full bg-purple-500/20 text-purple-400 flex items-center justify-center text-sm font-bold">1</span>
+            <div>
+              <p class="font-medium text-zinc-100">生成歌单图片/打印</p>
+              <p class="text-sm text-zinc-500 mt-1">播音前，前往“图片歌单”生成今日节目单图片用于宣传，或在“打印排期”中生成播音员用的纸质稿。</p>
+            </div>
+          </li>
+          <li class="flex gap-3">
+            <span class="flex-shrink-0 w-6 h-6 rounded-full bg-purple-500/20 text-purple-400 flex items-center justify-center text-sm font-bold">2</span>
+            <div>
+              <p class="font-medium text-zinc-100">标记已播</p>
+              <p class="text-sm text-zinc-500 mt-1">播音结束后，系统可自动/手动将排期内的歌曲标记为“已播”，方便统计数据。</p>
+            </div>
+          </li>
+        </ol>
+      </div>
+
+      <!-- 常见问题 -->
+      <div class="bg-zinc-900/50 border border-zinc-800 rounded-xl p-6 hover:border-zinc-700 transition-colors">
+        <div class="flex items-center gap-3 mb-4 text-amber-400">
+          <HelpCircle class="w-6 h-6" />
+          <h3 class="text-xl font-semibold">常见问题 (FAQ)</h3>
+        </div>
+        <div class="space-y-4">
+          <div>
+            <h4 class="text-sm font-medium text-zinc-200">Q: 为什么找不到某些待排歌曲？</h4>
+            <p class="text-sm text-zinc-500 mt-1">A: 请检查是否在排期页面的左侧选错了标签（如普通投稿/重播申请），或者该歌曲还未通过审核。</p>
+          </div>
+          <div>
+            <h4 class="text-sm font-medium text-zinc-200">Q: 什么是选曲日期？</h4>
+            <p class="text-sm text-zinc-500 mt-1">A: 选曲日期是用户在点歌时可选择的期望播放日期。请在“选曲日期”设置中提前开放可用的日期。</p>
+          </div>
+          <div>
+            <h4 class="text-sm font-medium text-zinc-200">Q: 权限不足怎么办？</h4>
+            <p class="text-sm text-zinc-500 mt-1">A: 不同的功能需要不同的管理员角色（如歌曲管理员、超级管理员），请联系超级管理员调整您的角色权限。</p>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { CheckCircle2, CalendarDays, Mic2, HelpCircle } from '@lucide/vue'
+</script>
+
+<style scoped>
+/* 可以在此添加特定样式 */
+</style>
diff --git a/app/components/Auth/ChangePasswordForm.vue b/app/components/Auth/ChangePasswordForm.vue
index 211516b..c61c704 100644
--- a/app/components/Auth/ChangePasswordForm.vue
+++ b/app/components/Auth/ChangePasswordForm.vue
@@ -4,12 +4,12 @@
       <div v-if="!isFirstLogin" class="space-y-2">
         <label
           for="current-password"
-          class="text-xs font-black text-text-tertiary uppercase tracking-widest ml-1"
-          >{{ locale.currentPassword }}</label
+          class="text-xs font-black text-zinc-500 uppercase tracking-widest ml-1"
+          >当前密码</label
         >
         <div class="relative group">
           <div
-            class="absolute left-4 top-1/2 -translate-y-1/2 text-text-tertiary group-focus-within:text-primary transition-colors"
+            class="absolute left-4 top-1/2 -translate-y-1/2 text-zinc-500 group-focus-within:text-blue-500 transition-colors"
           >
             <Lock :size="18" />
           </div>
@@ -19,21 +19,17 @@
             :class="[
               inputClass,
               error
-                ? 'border-error shadow-[0_0_15px_var(--auth-error-input-shadow)]'
-                : 'border-border-secondary focus:border-primary-30'
+                ? 'border-rose-500 shadow-[0_0_15px_rgba(244,63,94,0.1)]'
+                : 'border-zinc-800 focus:border-blue-500/30'
             ]"
             :type="showCurrentPassword ? 'text' : 'password'"
-            autocomplete="current-password"
-            :placeholder="locale.currentPasswordPlaceholder"
+            placeholder="请输入当前密码"
             required
             @input="error = ''"
-          />
+          >
           <button
-            class="absolute right-4 top-1/2 -translate-y-1/2 text-text-tertiary hover:text-text-secondary transition-colors"
+            class="absolute right-4 top-1/2 -translate-y-1/2 text-zinc-500 hover:text-zinc-300 transition-colors"
             type="button"
-            :aria-label="
-              showCurrentPassword ? locale.hideCurrentPassword : locale.showCurrentPassword
-            "
             @click="showCurrentPassword = !showCurrentPassword"
           >
             <Eye v-if="!showCurrentPassword" :size="18" />
@@ -45,12 +41,12 @@
       <div class="space-y-2">
         <label
           for="new-password"
-          class="text-xs font-black text-text-tertiary uppercase tracking-widest ml-1"
-          >{{ locale.newPassword }}</label
+          class="text-xs font-black text-zinc-500 uppercase tracking-widest ml-1"
+          >新密码</label
         >
         <div class="relative group">
           <div
-            class="absolute left-4 top-1/2 -translate-y-1/2 text-text-tertiary group-focus-within:text-primary transition-colors"
+            class="absolute left-4 top-1/2 -translate-y-1/2 text-zinc-500 group-focus-within:text-blue-500 transition-colors"
           >
             <KeyRound :size="18" />
           </div>
@@ -60,19 +56,20 @@
             :class="[
               inputClass,
               error
-                ? 'border-error shadow-[0_0_15px_var(--auth-error-input-shadow)]'
-                : 'border-border-secondary focus:border-primary-30'
+                ? 'border-rose-500 shadow-[0_0_15px_rgba(244,63,94,0.1)]'
+                : 'border-zinc-800 focus:border-blue-500/30'
             ]"
             :type="showNewPassword ? 'text' : 'password'"
-            autocomplete="new-password"
-            :placeholder="locale.newPasswordPlaceholder"
+            placeholder="请输入新密码"
             required
-            @input="handleNewPasswordInput"
-          />
+            @input="
+              error = '';
+              validatePassword()
+            "
+          >
           <button
-            class="absolute right-4 top-1/2 -translate-y-1/2 text-text-tertiary hover:text-text-secondary transition-colors"
+            class="absolute right-4 top-1/2 -translate-y-1/2 text-zinc-500 hover:text-zinc-300 transition-colors"
             type="button"
-            :aria-label="showNewPassword ? locale.hideNewPassword : locale.showNewPassword"
             @click="showNewPassword = !showNewPassword"
           >
             <Eye v-if="!showNewPassword" :size="18" />
@@ -82,7 +79,7 @@
 
         <!-- 密码强度指示器 -->
         <div v-if="newPassword" class="px-1 pt-1 space-y-2">
-          <div class="h-1 w-full bg-bg-tertiary rounded-full overflow-hidden">
+          <div class="h-1 w-full bg-zinc-800 rounded-full overflow-hidden">
             <div
               class="h-full transition-all duration-500"
               :class="passwordStrength.colorClass"
@@ -90,8 +87,8 @@
             />
           </div>
           <div class="flex justify-between items-center">
-            <span class="text-[10px] font-black uppercase tracking-widest text-text-tertiary"
-              >{{ locale.passwordStrength }}</span
+            <span class="text-[10px] font-black uppercase tracking-widest text-zinc-500"
+              >密码强度</span
             >
             <span
               class="text-[10px] font-black uppercase tracking-widest"
@@ -106,12 +103,12 @@
       <div class="space-y-2">
         <label
           for="confirm-password"
-          class="text-xs font-black text-text-tertiary uppercase tracking-widest ml-1"
-          >{{ locale.confirmPassword }}</label
+          class="text-xs font-black text-zinc-500 uppercase tracking-widest ml-1"
+          >确认新密码</label
         >
         <div class="relative group">
           <div
-            class="absolute left-4 top-1/2 -translate-y-1/2 text-text-tertiary group-focus-within:text-primary transition-colors"
+            class="absolute left-4 top-1/2 -translate-y-1/2 text-zinc-500 group-focus-within:text-blue-500 transition-colors"
           >
             <CheckCircle2 :size="18" />
           </div>
@@ -121,21 +118,17 @@
             :class="[
               inputClass,
               error || (confirmPassword && newPassword !== confirmPassword)
-                ? 'border-error shadow-[0_0_15px_var(--auth-error-input-shadow)]'
-                : 'border-border-secondary focus:border-primary-30'
+                ? 'border-rose-500 shadow-[0_0_15px_rgba(244,63,94,0.1)]'
+                : 'border-zinc-800 focus:border-blue-500/30'
             ]"
             :type="showConfirmPassword ? 'text' : 'password'"
-            autocomplete="new-password"
-            :placeholder="locale.confirmPasswordPlaceholder"
+            placeholder="请再次输入新密码"
             required
             @input="error = ''"
-          />
+          >
           <button
-            class="absolute right-4 top-1/2 -translate-y-1/2 text-text-tertiary hover:text-text-secondary transition-colors"
+            class="absolute right-4 top-1/2 -translate-y-1/2 text-zinc-500 hover:text-zinc-300 transition-colors"
             type="button"
-            :aria-label="
-              showConfirmPassword ? locale.hideConfirmPassword : locale.showConfirmPassword
-            "
             @click="showConfirmPassword = !showConfirmPassword"
           >
             <Eye v-if="!showConfirmPassword" :size="18" />
@@ -147,14 +140,14 @@
         <div v-if="confirmPassword" class="px-1">
           <div
             v-if="newPassword !== confirmPassword"
-            class="flex items-center gap-1.5 text-error"
+            class="flex items-center gap-1.5 text-rose-500"
           >
             <XCircle :size="12" />
-            <span class="text-[10px] font-bold">{{ locale.mismatch }}</span>
+            <span class="text-[10px] font-bold">密码不匹配</span>
           </div>
-          <div v-else class="flex items-center gap-1.5 text-success">
+          <div v-else class="flex items-center gap-1.5 text-emerald-500">
             <CheckCircle2 :size="12" />
-            <span class="text-[10px] font-bold">{{ locale.matched }}</span>
+            <span class="text-[10px] font-bold">密码匹配</span>
           </div>
         </div>
       </div>
@@ -162,36 +155,34 @@
       <!-- 状态消息 -->
       <div
         v-if="error"
-        aria-live="polite"
-        class="p-3 bg-error-10 border border-error-20 rounded-xl flex items-center gap-3"
+        class="p-3 bg-rose-500/10 border border-rose-500/20 rounded-xl flex items-center gap-3"
       >
-        <AlertCircle :size="16" class="text-error shrink-0" />
-        <span class="text-xs text-error font-medium">{{ error }}</span>
+        <AlertCircle :size="16" class="text-rose-500 shrink-0" />
+        <span class="text-xs text-rose-500 font-medium">{{ error }}</span>
       </div>
 
       <div
         v-if="success"
-        aria-live="polite"
-        class="p-3 bg-success-10 border border-success-20 rounded-xl flex items-center gap-3"
+        class="p-3 bg-emerald-500/10 border border-emerald-500/20 rounded-xl flex items-center gap-3"
       >
-        <CheckCircle2 :size="16" class="text-success shrink-0" />
-        <span class="text-xs text-success font-medium">{{ success }}</span>
+        <CheckCircle2 :size="16" class="text-emerald-500 shrink-0" />
+        <span class="text-xs text-emerald-500 font-medium">{{ success }}</span>
       </div>
 
       <button
         :disabled="loading || !isFormValid"
-        class="w-full flex items-center justify-center gap-2 py-3 bg-primary-hover hover:bg-primary text-text-primary text-sm font-black rounded-xl shadow-lg shadow-[var(--primary-glow)] transition-all active:scale-[0.98] disabled:opacity-50"
+        class="w-full flex items-center justify-center gap-2 py-3 bg-blue-600 hover:bg-blue-500 text-white text-sm font-black rounded-xl shadow-lg shadow-blue-900/20 transition-all active:scale-[0.98] disabled:opacity-50"
         type="submit"
       >
         <Loader2 v-if="loading" :size="18" class="animate-spin" />
-        <span>{{ loading ? locale.processing : isFirstLogin ? locale.setInitial : locale.submitChange }}</span>
+        <span>{{ loading ? '处理中...' : isFirstLogin ? '设置初始密码' : '确认修改密码' }}</span>
       </button>
     </form>
   </div>
 </template>
 
 <script setup>
-import { computed, onBeforeUnmount, ref } from 'vue'
+import { computed, ref } from 'vue'
 import {
   Lock,
   KeyRound,
@@ -202,9 +193,6 @@ import {
   AlertCircle,
   Loader2
 } from '@lucide/vue'
-import { useLocale } from '~/utils/locale'
-import { usePasswordStrength } from '~/composables/usePasswordStrength'
-import { validateInitialPasswordPolicy, validatePasswordPolicy } from '~/utils/password-policy'
 
 // 组件属性
 const props = defineProps({
@@ -216,9 +204,6 @@ const props = defineProps({
 
 const auth = useAuth()
 const router = useRouter()
-const { auth: authLocale } = useLocale()
-const locale = computed(() => authLocale.value?.changePasswordForm || {})
-const { localize: localizeServerError } = useServerErrors()
 
 const currentPassword = ref('')
 const newPassword = ref('')
@@ -226,20 +211,10 @@ const confirmPassword = ref('')
 const error = ref('')
 const success = ref('')
 const loading = ref(false)
-let redirectTimer = null
-
-const scheduleRedirect = (callback) => {
-  if (redirectTimer) clearTimeout(redirectTimer)
-  redirectTimer = setTimeout(callback, 2000)
-}
-
-onBeforeUnmount(() => {
-  if (redirectTimer) clearTimeout(redirectTimer)
-})
 
 // 样式类
 const inputClass =
-  'w-full bg-bg-primary border rounded-xl pl-11 pr-11 py-3 text-sm text-text-primary placeholder:text-text-disabled focus:outline-none transition-all'
+  'w-full bg-zinc-950 border rounded-xl pl-11 pr-11 py-3 text-sm text-zinc-200 placeholder:text-zinc-600 focus:outline-none transition-all'
 
 // 密码显示状态
 const showCurrentPassword = ref(false)
@@ -247,43 +222,84 @@ const showNewPassword = ref(false)
 const showConfirmPassword = ref(false)
 
 // 密码强度计算
-const passwordStrength = usePasswordStrength(newPassword)
+const passwordStrength = computed(() => {
+  const password = newPassword.value
+  if (!password) return { width: '0%', colorClass: '', textColorClass: '', text: '' }
 
-const passwordPolicyError = computed(() =>
-  props.isFirstLogin
-    ? validateInitialPasswordPolicy(newPassword.value)
-    : validatePasswordPolicy(newPassword.value)
-)
+  let score = 0
+
+  if (password.length >= 8) score += 25
+  if (/[A-Z]/.test(password)) score += 25
+  if (/[a-z]/.test(password)) score += 25
+  if (/[0-9]/.test(password) && /[^A-Za-z0-9]/.test(password)) score += 25
+
+  if (score < 50) {
+    return {
+      width: `${score || 10}%`,
+      colorClass: 'bg-rose-500',
+      textColorClass: 'text-rose-500',
+      text: '弱'
+    }
+  } else if (score < 75) {
+    return {
+      width: `${score}%`,
+      colorClass: 'bg-amber-500',
+      textColorClass: 'text-amber-500',
+      text: '中等'
+    }
+  } else if (score < 100) {
+    return {
+      width: `${score}%`,
+      colorClass: 'bg-blue-500',
+      textColorClass: 'text-blue-500',
+      text: '强'
+    }
+  } else {
+    return {
+      width: '100%',
+      colorClass: 'bg-emerald-500',
+      textColorClass: 'text-emerald-500',
+      text: '极强'
+    }
+  }
+})
 
 // 表单验证
 const isFormValid = computed(() => {
-  return Boolean(
-    (props.isFirstLogin || currentPassword.value) &&
-    newPassword.value &&
-    confirmPassword.value &&
-    newPassword.value === confirmPassword.value &&
-    !passwordPolicyError.value
-  )
+  if (props.isFirstLogin) {
+    return (
+      newPassword.value &&
+      confirmPassword.value &&
+      newPassword.value === confirmPassword.value &&
+      newPassword.value.length >= 8
+    )
+  } else {
+    return (
+      currentPassword.value &&
+      newPassword.value &&
+      confirmPassword.value &&
+      newPassword.value === confirmPassword.value &&
+      newPassword.value.length >= 8
+    )
+  }
 })
 
-const handleNewPasswordInput = () => {
-  error.value = newPassword.value ? passwordPolicyError.value || '' : ''
-}
-
-const resetForm = () => {
-  currentPassword.value = ''
-  newPassword.value = ''
-  confirmPassword.value = ''
+const validatePassword = () => {
+  if (newPassword.value && newPassword.value.length < 8) {
+    error.value = '密码长度至少为8位'
+  } else {
+    error.value = ''
+  }
 }
 
 const handleChangePassword = async () => {
   if (newPassword.value !== confirmPassword.value) {
-    error.value = locale.value.newPasswordMismatch
+    error.value = '新密码和确认密码不匹配'
     return
   }
 
-  if (passwordPolicyError.value) {
-    error.value = passwordPolicyError.value
+  if (newPassword.value.length < 8) {
+    error.value = '新密码长度至少为8位'
     return
   }
 
@@ -294,33 +310,52 @@ const handleChangePassword = async () => {
   try {
     if (props.isFirstLogin) {
       await auth.setInitialPassword(newPassword.value)
-      success.value = locale.value.initialSuccess
+      success.value = '密码设置成功！正在跳转...'
 
-      resetForm()
+      // 清空表单
+      currentPassword.value = ''
+      newPassword.value = ''
+      confirmPassword.value = ''
 
       // 密码设置完成后跳转
-      scheduleRedirect(async () => {
+      setTimeout(async () => {
+        // 更新用户状态
+        await auth.refreshUser()
+
         if (auth.isAdmin.value) {
-          router.replace('/dashboard')
+          router.push('/dashboard')
         } else {
-          router.replace('/')
+          router.push('/')
         }
-      })
+      }, 2000)
     } else {
       await auth.changePassword(currentPassword.value, newPassword.value)
-      success.value = locale.value.changeSuccess
+      success.value = '密码修改成功！请重新登录'
 
-      resetForm()
+      // 清空表单
+      currentPassword.value = ''
+      newPassword.value = ''
+      confirmPassword.value = ''
 
       // 密码修改后登出
-      scheduleRedirect(async () => {
-        await auth.logout(false)
-        await router.replace('/login')
-      })
+      setTimeout(() => {
+        auth.logout()
+        router.push('/login')
+      }, 2000)
     }
   } catch (err) {
-    // 统一按错误码本地化服务端错误，未命中再回退到默认文案
-    error.value = localizeServerError(err, locale.value.failed)
+    // 提取错误信息，支持多种错误格式
+    if (err.data && err.data.statusMessage) {
+      error.value = err.data.statusMessage
+    } else if (err.data && err.data.message) {
+      error.value = err.data.message
+    } else if (err.statusMessage) {
+      error.value = err.statusMessage
+    } else if (err.message) {
+      error.value = err.message
+    } else {
+      error.value = '操作失败，请重试'
+    }
   } finally {
     loading.value = false
   }
diff --git a/app/components/Auth/LoginForm.vue b/app/components/Auth/LoginForm.vue
index 83c0d00..430e302 100644
--- a/app/components/Auth/LoginForm.vue
+++ b/app/components/Auth/LoginForm.vue
@@ -1,46 +1,14 @@
 <template>
   <div class="login-form">
     <div class="form-header">
-      <h2>{{ getFormTitle }}</h2>
-      <p v-if="isBindMode && !showCreateMode">{{ formatLocale(locale.bindProvider, providerName, providerUsername) }}</p>
-      <p v-else-if="isBindMode && showCreateMode">{{ formatLocale(locale.createWithProvider, providerName) }}</p>
-      <p v-else-if="showRegisterMode">{{ locale.registerSubtitle }}</p>
-      <p v-else>{{ locale.loginSubtitle }}</p>
-    </div>
-
-    <!-- OAuth 账号创建/绑定模式选择器 -->
-    <div v-if="isBindMode && allowOAuthRegistration" class="mode-selector">
-      <button
-        :class="['mode-btn', { active: !showCreateMode }]"
-        type="button"
-        @click="showCreateMode = false"
-      >
-        <svg fill="none" stroke="currentColor" stroke-width="2" viewBox="0 0 24 24">
-          <path d="M11 16l-6-6m0 0l6-6m-6 6h12.5a4.5 4.5 0 010 9H11" />
-        </svg>
-        {{ locale.bindExisting }}
-      </button>
-      <button
-        :class="['mode-btn', { active: showCreateMode }]"
-        type="button"
-        @click="showCreateMode = true"
-      >
-        <svg fill="none" stroke="currentColor" stroke-width="2" viewBox="0 0 24 24">
-          <path d="M16 21v-2a4 4 0 0 0-4-4H5a4 4 0 0 0-4 4v2" />
-          <circle cx="8.5" cy="7" r="4" />
-          <line x1="20" y1="8" x2="20" y2="14" />
-          <line x1="23" y1="11" x2="17" y2="11" />
-        </svg>
-        {{ locale.createAccount }}
-      </button>
+      <h2>{{ isBindMode ? '绑定账号' : '欢迎回来' }}</h2>
+      <p v-if="isBindMode">即将绑定 {{ providerName }} 账号: {{ providerUsername }}</p>
+      <p v-else>登录您的VoiceHub账户</p>
     </div>
 
     <form :class="['auth-form', { 'has-error': !!error }]" @submit.prevent="handleLogin">
-      <!-- 用户名字段 - 所有模式都需要 -->
       <div class="form-group">
-        <label for="username">
-          {{ showCreateMode ? locale.setUsername : locale.accountName }}
-        </label>
+        <label for="username">姓名/用户名</label>
         <div class="input-wrapper">
           <svg
             class="input-icon"
@@ -56,87 +24,16 @@
             id="username"
             v-model="username"
             :class="{ 'input-error': error }"
-            :autocomplete="!isBindMode && !showCreateMode ? 'username webauthn' : 'username'"
-            :placeholder="showCreateMode ? locale.usernamePattern : locale.usernamePlaceholder"
+            placeholder="请输入姓名/用户名"
             required
             type="text"
             @input="error = ''"
-          />
-        </div>
-        <p v-if="showCreateMode" class="hint-text">{{ locale.usernameHint }}</p>
-      </div>
-
-      <!-- 姓名字段 - 仅注册/创建模式 -->
-      <div v-if="showCreateMode || showRegisterMode" class="form-group">
-        <label for="name">{{ locale.realName }}</label>
-        <div class="input-wrapper">
-          <svg
-            class="input-icon"
-            fill="none"
-            stroke="currentColor"
-            stroke-width="2"
-            viewBox="0 0 24 24"
           >
-            <rect x="3" y="4" width="18" height="18" rx="2" ry="2" />
-            <line x1="16" y1="2" x2="16" y2="6" />
-            <line x1="8" y1="2" x2="8" y2="6" />
-            <line x1="3" y1="10" x2="21" y2="10" />
-          </svg>
-          <input
-            id="name"
-            v-model="name"
-            :class="{ 'input-error': error }"
-            :placeholder="locale.realNamePlaceholder"
-            required
-            type="text"
-            @input="error = ''"
-          />
         </div>
       </div>
 
-      <!-- 年级班级字段 - 仅注册/创建模式，可选 -->
-      <div v-if="showCreateMode || showRegisterMode" class="form-group">
-        <div class="class-row">
-          <CustomSelect
-            v-model="grade"
-            :options="gradeSelectOptions"
-            :disabled="classOptionsLoading || gradeOptions.length === 0"
-            :label="locale.gradeLabel"
-            :placeholder="registerRequiresGradeClass ? locale.selectGrade : locale.optional"
-            class-name="class-select"
-            @change="handleGradeChange"
-          />
-          <CustomSelect
-            v-model="studentClass"
-            :options="classSelectOptions"
-            :disabled="classOptionsLoading || !grade || availableClassOptions.length === 0"
-            :label="locale.classLabel"
-            :placeholder="grade ? locale.selectClass : locale.selectGradeFirst"
-            class-name="class-select"
-            @change="error = ''"
-          />
-        </div>
-        <p class="hint-text">
-          {{
-            gradeOptions.length > 0
-              ? registerRequiresGradeClass
-                ? locale.classHintRequired
-                : locale.classHint
-              : registerRequiresGradeClass
-                ? locale.noClassHintRequired
-                : locale.noClassHint
-          }}
-        </p>
-      </div>
-
-      <!-- 密码字段 -->
       <div class="form-group">
-        <div class="flex justify-between items-center w-full mb-2">
-          <label for="password" style="margin-bottom: 0;">{{ showCreateMode ? locale.setPassword : locale.password }}</label>
-          <NuxtLink v-if="!showCreateMode && !isBindMode && smtpEnabled" to="/forgot-password" class="text-xs text-[var(--primary)] hover:opacity-80 transition-opacity" style="line-height: 1;">
-            {{ locale.forgotPassword }}
-          </NuxtLink>
-        </div>
+        <label for="password">密码</label>
         <div class="input-wrapper">
           <svg
             class="input-icon"
@@ -154,10 +51,10 @@
             v-model="password"
             :class="{ 'input-error': error }"
             :type="showPassword ? 'text' : 'password'"
-            :placeholder="showCreateMode ? locale.createPasswordPlaceholder : locale.passwordPlaceholder"
+            placeholder="请输入密码"
             required
             @input="error = ''"
-          />
+          >
           <button class="password-toggle" type="button" @click="showPassword = !showPassword">
             <svg
               v-if="showPassword"
@@ -177,176 +74,13 @@
             </svg>
           </button>
         </div>
-
-        <!-- 密码强度指示器 -->
-        <div v-if="(showCreateMode || showRegisterMode) && password" class="px-1 pt-1 space-y-2 mt-1">
-          <div class="h-1 w-full bg-[var(--input-border)] rounded-full overflow-hidden">
-            <div
-              class="h-full transition-all duration-500"
-              :class="passwordStrength.colorClass"
-              :style="{ width: passwordStrength.width }"
-            />
-          </div>
-          <div class="flex justify-between items-center">
-            <span class="text-[10px] font-black uppercase tracking-widest text-[var(--text-tertiary)]"
-              >{{ locale.passwordStrength }}</span
-            >
-            <span
-              class="text-[10px] font-black uppercase tracking-widest"
-              :class="passwordStrength.textColorClass"
-            >
-              {{ passwordStrength.text }}
-            </span>
-          </div>
+        <div class="forgot-password-row">
+          <NuxtLink to="/forgot-password" class="forgot-password-link">
+            忘记密码？
+          </NuxtLink>
         </div>
       </div>
 
-      <!-- 确认密码字段 - 仅在创建/注册模式下显示 -->
-      <div v-if="showCreateMode || showRegisterMode" class="form-group">
-        <label for="confirmPassword">{{ locale.confirmPassword }}</label>
-        <div class="input-wrapper">
-          <svg
-            class="input-icon"
-            fill="none"
-            stroke="currentColor"
-            stroke-width="2"
-            viewBox="0 0 24 24"
-          >
-            <rect height="11" rx="2" ry="2" width="18" x="3" y="11" />
-            <circle cx="12" cy="16" r="1" />
-            <path d="M7 11V7a5 5 0 0 1 10 0v4" />
-          </svg>
-          <input
-            id="confirmPassword"
-            v-model="confirmPassword"
-            :class="{ 'input-error': error }"
-            :type="showConfirmPassword ? 'text' : 'password'"
-            :placeholder="locale.confirmPasswordPlaceholder"
-            required
-            @input="error = ''"
-          />
-          <button
-            class="password-toggle"
-            type="button"
-            @click="showConfirmPassword = !showConfirmPassword"
-          >
-            <svg
-              v-if="showConfirmPassword"
-              fill="none"
-              stroke="currentColor"
-              stroke-width="2"
-              viewBox="0 0 24 24"
-            >
-              <path
-                d="M17.94 17.94A10.07 10.07 0 0 1 12 20c-7 0-11-8-11-8a18.45 18.45 0 0 1 5.06-5.94M9.9 4.24A9.12 9.12 0 0 1 12 4c7 0 11 8 11 8a18.5 18.5 0 0 1-2.16 3.19m-6.72-1.07a3 3 0 1 1-4.24-4.24"
-              />
-              <line x1="1" x2="23" y1="1" y2="23" />
-            </svg>
-            <svg v-else fill="none" stroke="currentColor" stroke-width="2" viewBox="0 0 24 24">
-              <path d="M1 12s4-8 11-8 11 8 11 8-4 8-11 8-11-8-11-8z" />
-              <circle cx="12" cy="12" r="3" />
-            </svg>
-          </button>
-        </div>
-      </div>
-
-      <!-- 备注字段 - 仅注册/创建模式下显示（可选） -->
-      <div v-if="showRegisterMode || showCreateMode" class="form-group">
-        <label for="remark">{{ locale.remarkLabel }}</label>
-        <div class="input-wrapper">
-          <svg
-            class="input-icon"
-            fill="none"
-            stroke="currentColor"
-            stroke-width="2"
-            viewBox="0 0 24 24"
-          >
-            <path d="M21 15a2 2 0 0 1-2 2H7l-4 4V5a2 2 0 0 1 2-2h14a2 2 0 0 1 2 2z" />
-          </svg>
-          <input
-            id="remark"
-            v-model="remark"
-            :placeholder="locale.remarkPlaceholder"
-            maxlength="200"
-            type="text"
-            @input="error = ''"
-          />
-        </div>
-      </div>
-
-      <!-- 邮箱字段 - 管理员开启注册邮箱功能后显示（必填，需邮箱验证码验证归属） -->
-      <div v-if="(showRegisterMode || showCreateMode) && registerEmailRequired" class="form-group">
-        <label for="email">{{ locale.emailLabel }}</label>
-        <div class="input-wrapper">
-          <svg
-            class="input-icon"
-            fill="none"
-            stroke="currentColor"
-            stroke-width="2"
-            viewBox="0 0 24 24"
-          >
-            <rect x="2" y="4" width="20" height="16" rx="2" />
-            <path d="m22 7-10 6L2 7" />
-          </svg>
-          <input
-            id="email"
-            v-model="email"
-            type="email"
-            :placeholder="locale.emailPlaceholder"
-            maxlength="100"
-            @input="error = ''"
-          />
-        </div>
-      </div>
-
-      <!-- 邮箱验证码 - 仅注册模式且已填写邮箱时显示 -->
-      <div v-if="(showRegisterMode || showCreateMode) && email" class="form-group">
-        <label for="emailCode">{{ locale.emailCodeLabel }}</label>
-        <div class="input-wrapper">
-          <svg
-            class="input-icon"
-            fill="none"
-            stroke="currentColor"
-            stroke-width="2"
-            viewBox="0 0 24 24"
-          >
-            <path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z" />
-          </svg>
-          <input
-            id="emailCode"
-            v-model="emailCode"
-            type="text"
-            inputmode="numeric"
-            maxlength="6"
-            class="code-input"
-            :placeholder="locale.emailCodePlaceholder"
-            @input="error = ''"
-          />
-          <button
-            type="button"
-            class="code-btn"
-            :disabled="sendingCode || codeCountdown > 0"
-            @click="sendEmailCode"
-          >
-            {{ codeCountdown > 0 ? locale.codeCountdown(codeCountdown) : locale.sendCode }}
-          </button>
-        </div>
-      </div>
-
-      <div v-show="showCaptcha" class="form-group">
-        <TurnstileWidget
-          v-if="captchaProvider === 'turnstile'"
-          ref="turnstileRef"
-          v-model="turnstileToken"
-        />
-        <CaptchaInput
-          v-else
-          ref="captchaRef"
-          v-model="captchaInput"
-          @update:captchaId="captchaId = $event"
-        />
-      </div>
-
       <div v-if="error" class="error-container">
         <svg
           class="error-icon"
@@ -389,42 +123,35 @@
             />
           </circle>
         </svg>
-        <span v-if="loading">{{ showRegisterMode ? locale.registering : isBindMode ? locale.binding : locale.loggingIn }}</span>
-        <span v-else>{{ showRegisterMode ? locale.register : isBindMode ? locale.bindAndLogin : locale.login }}</span>
+        <span v-if="loading">{{ isBindMode ? '绑定中...' : '登录中...' }}</span>
+        <span v-else>{{ isBindMode ? '绑定并登录' : '登录' }}</span>
       </button>
-
-      <!-- 登录/注册模式切换 -->
-      <div v-if="!isBindMode && allowRegister" class="mode-switch">
-        <button
-          v-if="!showRegisterMode"
-          type="button"
-          class="switch-link"
-          @click="switchToRegister"
-        >
-          {{ locale.toRegister }}
-        </button>
-        <button v-else type="button" class="switch-link" @click="switchToLogin">
-          {{ locale.toLogin }}
-        </button>
-      </div>
     </form>
 
-    <AuthOAuthQuickLogin v-if="!isBindMode && !showRegisterMode" />
-
-    <div v-if="!isBindMode && !showRegisterMode && isWebAuthnSupported" class="webauthn-section">
+    <div v-if="!isBindMode && isWebAuthnSupported" class="webauthn-section">
       <div class="divider">
-        <span>{{ locale.or }}</span>
+        <span>或</span>
       </div>
-      <button type="button" class="webauthn-btn" :disabled="loading" @click="handleWebAuthnLogin">
+      <button 
+        type="button" 
+        class="webauthn-btn" 
+        :disabled="loading" 
+        @click="handleWebAuthnLogin"
+      >
         <Fingerprint :size="20" class="webauthn-icon" />
-        <span>{{ locale.webauthn }}</span>
+        <span>使用 Windows Hello / Passkey 登录</span>
       </button>
     </div>
 
-    <AuthOAuthButtons v-if="!isBindMode && !showRegisterMode" />
+    <AuthOAuthButtons v-if="!isBindMode" :always-show="true" />
 
     <div class="form-footer">
-      <p class="help-text">{{ locale.platformNote }}</p>
+      <p class="help-text">不同VoiceHub平台的账号不互通</p>
+      <div style="margin-top: 16px;">
+        <NuxtLink to="/register" class="register-link-btn">
+          还没有账号？去注册
+        </NuxtLink>
+      </div>
     </div>
 
     <AuthTwoFactorVerify
@@ -436,616 +163,128 @@
       @success="handle2FASuccess"
       @cancel="show2FA = false"
     />
-
-    <!-- 绑定已有账户前的二次确认 -->
-    <ConfirmDialog
-      v-model:show="showBindConfirm"
-      :title="locale.confirmBindTitle"
-      :message="bindConfirmMessage"
-      type="warning"
-      :confirm-text="locale.confirmBind"
-      :loading="bindConfirmLoading"
-      @confirm="handleBindConfirm"
-      @cancel="showBindConfirm = false"
-    />
   </div>
 </template>
 
-<script setup>
-import { ref, computed, onMounted, onUnmounted, nextTick, watch } from 'vue'
+<script setup lang="ts">
+import { ref, computed, onMounted } from 'vue'
 import { useAuth } from '~/composables/useAuth'
-import { useSiteConfig } from '~/composables/useSiteConfig'
 import { getProviderDisplayName } from '~/utils/oauth'
-import { validateOAuthRegisterCredentials } from '~/utils/oauth-register'
-import {
-  browserSupportsWebAuthn,
-  browserSupportsWebAuthnAutofill,
-  WebAuthnAbortService
-} from '@simplewebauthn/browser'
-import {
-  getWebAuthnErrorMessage,
-  signalUnknownWebAuthnCredential,
-  startWebAuthnAuthentication
-} from '~/utils/webauthn'
+import { startAuthentication, browserSupportsWebAuthn } from '@simplewebauthn/browser'
 import { Fingerprint } from '@lucide/vue'
-import { usePasswordStrength } from '~/composables/usePasswordStrength'
-import CustomSelect from '~/components/UI/Common/CustomSelect.vue'
-import CaptchaInput from './CaptchaInput.vue'
-import TurnstileWidget from './TurnstileWidget.vue'
-import AuthOAuthQuickLogin from './OAuthQuickLogin.vue'
-import ConfirmDialog from '~/components/UI/ConfirmDialog.vue'
-import { useLocale } from '~/utils/locale'
-import { useOAuthBindReminder } from '~/composables/useOAuthBindReminder'
-
-const { allowOAuthRegistration, allowRegister, fetchSiteConfig, smtpEnabled, captchaEnabled, captchaProvider, registerEmailRequired, registerRequiresGradeClass } = useSiteConfig()
-const { auth: authLocale, serverErrors } = useLocale()
-const locale = computed(() => authLocale.value?.loginForm || {})
-const { localize: localizeServerError } = useServerErrors()
-const { success: toastSuccess } = useToast()
 
 const route = useRoute()
-const router = useRouter()
 const isBindMode = computed(() => route.query.action === 'bind')
 const providerUsername = computed(() => route.query.username || '')
 const providerName = computed(() => {
-  const provider = route.query.provider || 'third-party'
+  const provider = (route.query.provider as string) || '第三方'
   return getProviderDisplayName(provider)
 })
-// 图形验证码与Turnstile相关
-const isGraphicCaptchaRequired = ref(false)
-const captchaId = ref('')
-const captchaInput = ref('')
-const captchaRef = ref(null)
-const turnstileToken = ref('')
-const turnstileRef = ref(null)
-
-const showCaptcha = computed(() => {
-  // 注册模式开启验证码服务时强制显示验证码
-  if (showRegisterMode.value) return captchaEnabled.value
-  // 如果后端明确要求显示验证码，则优先显示
-  if (isGraphicCaptchaRequired.value) return true
-  // 否则根据配置显示
-  if (!captchaEnabled.value) return false
-  return captchaProvider.value === 'turnstile'
-})
-
-const getFormTitle = computed(() => {
-  if (showRegisterMode.value) return locale.value.registerTitle
-  if (!isBindMode.value) return locale.value.welcomeBack
-  if (!showCreateMode.value) return locale.value.bindAccount
-  return locale.value.createNewAccount
-})
 
 const username = ref('')
-const name = ref('')
-const grade = ref('')
-const studentClass = ref('')
 const password = ref('')
-const confirmPassword = ref('')
 const error = ref('')
 const loading = ref(false)
 const showPassword = ref(false)
-const showConfirmPassword = ref(false)
 const isWebAuthnSupported = ref(false)
-const classOptionsLoading = ref(false)
-const classOptionsLoaded = ref(false)
-const classOptions = ref([])
 const show2FA = ref(false)
 const userId2FA = ref(0)
-const methods2FA = ref([])
+const methods2FA = ref<string[]>([])
 const tempToken2FA = ref('')
 const maskedEmail2FA = ref('')
-const showCreateMode = ref(false)
-const showRegisterMode = ref(false)
-const remark = ref('')
-const email = ref('')
-const emailCode = ref('')
-const sendingCode = ref(false)
-const codeCountdown = ref(0)
-const codeTimer = ref(null)
-const showBindConfirm = ref(false)
-const bindConfirmLoading = ref(false)
-
-// 二次确认文案：将第三方账号与当前输入的账户绑定
-const bindConfirmMessage = computed(() => {
-  if (!isBindMode.value || showCreateMode.value) return ''
-  return formatLocale(
-    locale.value.confirmBindMessage,
-    providerName.value,
-    providerUsername.value,
-    username.value
-  )
-})
-
-const passwordStrength = usePasswordStrength(password)
 
 const auth = useAuth()
 
-// 只允许站内绝对路径，避免登录参数被用于开放重定向。
-const getSafeRedirect = (fallback = '/') => {
-  const queryRedirect = route.query.redirect
-  const redirect = (Array.isArray(queryRedirect) ? queryRedirect[0] : queryRedirect) || fallback
-  return redirect.startsWith('/') && !redirect.startsWith('//') && !redirect.startsWith('/\\')
-    ? redirect
-    : fallback
-}
-
-const gradeOptions = computed(() => {
-  return [...new Set(classOptions.value.map((item) => item.grade))]
-})
-
-const gradeSelectOptions = computed(() => {
-  const options = gradeOptions.value.map((option) => ({ label: option, value: option }))
-  // 站点开启"注册时必须选择年级班级"时，去掉"不填写"空选项
-  if (registerRequiresGradeClass.value) return options
-  return [{ label: locale.value.optional, value: '' }, ...options]
-})
-
-const availableClassOptions = computed(() => {
-  if (!grade.value) return []
-
-  return classOptions.value.filter((item) => item.grade === grade.value).map((item) => item.class)
-})
-
-const classSelectOptions = computed(() => {
-  return availableClassOptions.value.map((option) => ({ label: option, value: option }))
-})
-
-const fetchClassOptions = async () => {
-  if (classOptionsLoaded.value || classOptionsLoading.value) return
-
-  classOptionsLoading.value = true
-  try {
-    const url = showRegisterMode.value
-      ? '/api/auth/grade-class-options'
-      : '/api/auth/oauth-register-options'
-    const response = await $fetch(url)
-
-    if (response.success) {
-      classOptions.value = response.classes || []
-      classOptionsLoaded.value = true
-    }
-  } catch (e) {
-    console.error('获取年级班级选项失败:', e)
-  } finally {
-    classOptionsLoading.value = false
-  }
-}
-
-const handleGradeChange = () => {
-  error.value = ''
-  studentClass.value = ''
-}
-
-// 年级班级校验：站点开启必填时二者均须选择；未开启时二者成对填写或全部留空
-const gradeClassRequiredError = () => {
-  if (registerRequiresGradeClass.value && (!grade.value || !studentClass.value)) {
-    return locale.value.gradeClassRequiredByConfig
-  }
-  if ((grade.value && !studentClass.value) || (!grade.value && studentClass.value)) {
-    return locale.value.gradeClassRequired
-  }
-  return ''
-}
-
-const redirectAfterLogin = async () => {
-  if (auth.user.value?.requirePasswordChange) {
-    return navigateTo('/change-password')
-  }
-  return navigateTo(getSafeRedirect(auth.isAdmin.value ? '/dashboard' : '/'))
-}
-
 const handle2FASuccess = async () => {
-  await redirectAfterLogin()
+  if (auth.isAdmin.value) {
+    await navigateTo('/dashboard')
+  } else {
+    await navigateTo('/')
+  }
 }
 
 onMounted(async () => {
   const isApiSupported = browserSupportsWebAuthn()
+  let isPlatformAuthenticatorAvailable = false
+
+  if (isApiSupported && window.PublicKeyCredential?.isUserVerifyingPlatformAuthenticatorAvailable) {
+    try {
+      isPlatformAuthenticatorAvailable = await window.PublicKeyCredential.isUserVerifyingPlatformAuthenticatorAvailable()
+    } catch (e) {
+      console.warn('WebAuthn 平台认证器检查失败:', e)
+    }
+  }
+
+  // 兼容外部安全密钥（如 YubiKey），即使没有内置平台认证器也允许尝试
   isWebAuthnSupported.value = isApiSupported
-
-  // Conditional UI 应尽早启动，让支持的浏览器通过账号输入框原生推荐 Passkey。
-  if (isApiSupported && !isBindMode.value) {
-    void startConditionalWebAuthnLogin()
-  }
-
-  await fetchSiteConfig()
-  if (isBindMode.value) {
-    await fetchClassOptions()
-  }
 })
 
-onUnmounted(() => {
-  WebAuthnAbortService.cancelCeremony()
-  if (codeTimer.value) {
-    clearInterval(codeTimer.value)
-    codeTimer.value = null
-  }
-})
-
-watch(showCreateMode, async (enabled) => {
-  if (enabled) {
-    await fetchClassOptions()
-  } else {
-    grade.value = ''
-    studentClass.value = ''
-  }
-})
-
-watch(showRegisterMode, async (enabled) => {
-  if (enabled) {
-    await fetchClassOptions()
-  } else {
-    grade.value = ''
-    studentClass.value = ''
-    remark.value = ''
-  }
-})
-
-const switchToRegister = () => {
-  showRegisterMode.value = true
-  error.value = ''
-  isGraphicCaptchaRequired.value = false
-}
-
-const switchToLogin = () => {
-  showRegisterMode.value = false
-  error.value = ''
-  grade.value = ''
-  studentClass.value = ''
-  remark.value = ''
-}
-
 const handleLogin = async () => {
   if (!username.value || !password.value) {
-    error.value = locale.value.fullLoginInfo
+    error.value = '请填写完整的登录信息'
     return
   }
 
-  // 注册模式的验证与提交
-  if (showRegisterMode.value) {
-    if (!name.value || !confirmPassword.value) {
-      error.value = locale.value.fullRegisterInfo
-      return
-    }
-    const gradeClassError = gradeClassRequiredError()
-    if (gradeClassError) {
-      error.value = gradeClassError
-      return
-    }
-    return handleRegister()
-  }
-
-  // 创建账户模式的验证
-  if (isBindMode.value && showCreateMode.value) {
-    if (!name.value || !confirmPassword.value) {
-      error.value = locale.value.fullRegisterInfo
-      return
-    }
-    const gradeClassError = gradeClassRequiredError()
-    if (gradeClassError) {
-      error.value = gradeClassError
-      return
-    }
-    return handleRegisterOAuth()
-  }
-
   error.value = ''
-
-  // 绑定已有账户前先弹二次确认，确认后才真正发起绑定请求
-  if (isBindMode.value && !showCreateMode.value) {
-    showBindConfirm.value = true
-    return
-  }
-
-  await performLogin()
-}
-
-// 发起登录/绑定请求，成功后跳转；返回 'success' | '2fa' | 'failed'
-const performLogin = async () => {
   loading.value = true
 
-  // 构建请求体，包含验证码信息
-  const requestBody = {
-    username: username.value,
-    password: password.value
-  }
-  if (showCaptcha.value) {
-    if (captchaProvider.value === 'turnstile') {
-      requestBody.turnstileToken = turnstileToken.value
-    } else {
-      requestBody.captchaId = captchaId.value
-      requestBody.captchaInput = captchaInput.value.trim()
-    }
-  }
-
   try {
-    // 根据模式选择接口
-    const url = isBindMode.value && !showCreateMode.value ? '/api/auth/bind' : '/api/auth/login'
+    if (isBindMode.value) {
+      await $fetch('/api/auth/bind', {
+        method: 'POST',
+        body: {
+          username: username.value,
+          password: password.value
+        }
+      })
 
-    const response = await $fetch(url, {
-      method: 'POST',
-      body: requestBody
-    })
+      // 绑定成功后刷新认证状态
+      await auth.initAuth()
+      await navigateTo('/')
+    } else {
+      const response = await auth.login(username.value, password.value)
 
-    // 账号密码登录成功后记录来源，供微信/QQ 内置浏览器进入主页时引导绑定
-    if (!isBindMode.value && url === '/api/auth/login') {
-      useOAuthBindReminder().markPasswordLogin()
-    }
+      if (response.requires2FA) {
+        userId2FA.value = response.userId
+        methods2FA.value = response.methods
+        tempToken2FA.value = response.tempToken
+        maskedEmail2FA.value = response.maskedEmail || ''
+        show2FA.value = true
+        return
+      }
 
-    // 处理 2FA
-    if (response.requires2FA) {
-      userId2FA.value = response.userId
-      methods2FA.value = response.methods
-      tempToken2FA.value = response.tempToken || ''
-      maskedEmail2FA.value = response.maskedEmail || ''
-      show2FA.value = true
-      return '2fa'
-    }
-
-    // 登录成功，刷新认证状态
-    await auth.initAuth(true)
-    await redirectAfterLogin()
-    return 'success'
-  } catch (err) {
-    // 正确的错误路径：err.data = { statusCode, message, data: { captchaRequired } }
-    const innerData = err.data?.data
-    // 统一按错误码本地化服务端错误，未命中再回退到默认文案
-    error.value = localizeServerError(
-      err,
-      isBindMode.value ? locale.value.bindFailed : locale.value.loginFailed
-    )
-
-    // 如果后端要求验证码，则显示验证码区域（针对图形验证码）
-    if (innerData?.captchaRequired) {
-      isGraphicCaptchaRequired.value = true
-    }
-    // 只要当前显示了验证码，且没有成功登录，就强制刷新验证码
-    if (showCaptcha.value) {
-      await nextTick()
-      if (captchaProvider.value === 'turnstile') {
-        turnstileRef.value?.reset?.()
+      // 登录成功后跳转
+      if (auth.isAdmin.value) {
+        await navigateTo('/dashboard')
       } else {
-        captchaRef.value?.refreshCaptcha?.()
+        await navigateTo('/')
       }
     }
-
-    // 仅凭据错误（401）时清空密码字段（避免验证码错误时误清）
-    if (err.statusCode === 401) {
+  } catch (err) {
+    error.value =
+      err.message || (isBindMode.value ? '绑定失败，请检查账号密码' : '登录失败，请检查账号密码')
+    // 密码错误时清空密码字段
+    if (error.value.includes('密码') || error.value.includes('错误')) {
       password.value = ''
     }
-    return 'failed'
   } finally {
     loading.value = false
   }
 }
 
-// 确认弹窗确认后执行绑定请求；失败或进入 2FA 时关闭弹窗
-const handleBindConfirm = async () => {
-  bindConfirmLoading.value = true
-  try {
-    const result = await performLogin()
-    if (result !== 'success') {
-      showBindConfirm.value = false
-    }
-  } finally {
-    bindConfirmLoading.value = false
-  }
-}
-
-const handleRegisterOAuth = async () => {
-  const validationError = validateOAuthRegisterCredentials(
-    username.value,
-    password.value,
-    confirmPassword.value
-  )
-
-  if (validationError) {
-    error.value = serverErrors.value?.[validationError.code] || locale.value.registerFailed
-    return
-  }
-
-  // 邮箱必填由管理员开关控制：开启时邮箱必须填写，且须附带验证码
-  const emailValue = email.value.trim()
-  if (registerEmailRequired.value && !emailValue) {
-    error.value = locale.value.emailRequired
-    return
-  }
-  if (emailValue && !emailCode.value.trim()) {
-    error.value = locale.value.emailCodeRequired
-    return
-  }
-
-  error.value = ''
+const handleWebAuthnLogin = async () => {
   loading.value = true
-
-  try {
-    const response = await $fetch('/api/auth/oauth-register', {
-      method: 'POST',
-      body: {
-        username: username.value,
-        name: name.value,
-        grade: grade.value,
-        class: studentClass.value,
-        password: password.value,
-        confirmPassword: confirmPassword.value,
-        remark: remark.value.trim(),
-        email: emailValue || undefined,
-        emailCode: emailCode.value.trim() || undefined
-      }
-    })
-
-    if (response.success) {
-      if (response.pendingApproval) {
-        // 审核模式：提示后退出 OAuth 创建视图，回到普通登录界面
-        toastSuccess(locale.value.registerSuccessPending)
-        showCreateMode.value = false
-        username.value = ''
-        name.value = ''
-        password.value = ''
-        confirmPassword.value = ''
-        grade.value = ''
-        studentClass.value = ''
-        if (route.query.action === 'bind') {
-          await router.replace({ query: {} })
-        }
-      } else {
-        // 账户创建成功，刷新认证状态
-        await auth.initAuth(true)
-        return redirectAfterLogin()
-      }
-    }
-  } catch (err) {
-    const apiError = err
-    // 统一按错误码本地化服务端错误，未命中再回退到默认文案
-    error.value = localizeServerError(apiError, locale.value.registerFailed)
-    // 当发生用户名冲突时 (HTTP 409 Conflict)，清空用户名字段
-    if (apiError.statusCode === 409) {
-      username.value = ''
-    }
-  } finally {
-    loading.value = false
-  }
-}
-
-// 发送邮箱验证码：校验格式 → POST /api/auth/email-code → 60 秒倒计时
-const sendEmailCode = async () => {
-  const emailValue = email.value.trim()
-  const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/
-  if (!emailValue || !emailRegex.test(emailValue)) {
-    error.value = locale.value.emailInvalid || '请输入有效的邮箱地址'
-    return
-  }
-
   error.value = ''
-  sendingCode.value = true
-  try {
-    await $fetch('/api/auth/email-code', {
-      method: 'POST',
-      body: { email: emailValue }
-    })
-    toastSuccess(locale.value.codeSent)
-    codeCountdown.value = 60
-    codeTimer.value = setInterval(() => {
-      codeCountdown.value -= 1
-      if (codeCountdown.value <= 0) {
-        clearInterval(codeTimer.value)
-        codeTimer.value = null
-        codeCountdown.value = 0
-      }
-    }, 1000)
-  } catch (err) {
-    const apiError = useServerErrors().localize(err, locale.value.codeSendFailed)
-    error.value = apiError
-  } finally {
-    sendingCode.value = false
-  }
-}
-
-// 用户名密码注册：提交 /api/auth/register，处理待审核与直接登录两种结果
-const handleRegister = async () => {
-  const validationError = validateOAuthRegisterCredentials(
-    username.value,
-    password.value,
-    confirmPassword.value
-  )
-
-  if (validationError) {
-    error.value = serverErrors.value?.[validationError.code] || locale.value.registerFailed
-    return
-  }
-
-  // 邮箱必填由管理员开关控制：开启时邮箱必须填写，且须附带验证码
-  const emailValue = email.value.trim()
-  if (registerEmailRequired.value && !emailValue) {
-    error.value = locale.value.emailRequired
-    return
-  }
-  if (emailValue && !emailCode.value.trim()) {
-    error.value = locale.value.emailCodeRequired
-    return
-  }
-
-  error.value = ''
-  loading.value = true
-
-  try {
-    const requestBody = {
-      username: username.value,
-      name: name.value,
-      grade: grade.value,
-      class: studentClass.value,
-      password: password.value,
-      confirmPassword: confirmPassword.value,
-      remark: remark.value.trim(),
-      email: emailValue || undefined,
-      emailCode: emailCode.value.trim() || undefined
-    }
-    if (showCaptcha.value) {
-      if (captchaProvider.value === 'turnstile') {
-        requestBody.turnstileToken = turnstileToken.value
-      } else {
-        requestBody.captchaId = captchaId.value
-        requestBody.captchaInput = captchaInput.value.trim()
-      }
-    }
-
-    const response = await $fetch('/api/auth/register', {
-      method: 'POST',
-      body: requestBody
-    })
-
-    if (response.success) {
-      if (response.pendingApproval) {
-        // 需要审核：提示后返回登录模式
-        toastSuccess(locale.value.registerSuccessPending)
-        switchToLogin()
-      } else {
-        // 无需审核：自动登录
-        await auth.initAuth(true)
-        return redirectAfterLogin()
-      }
-    }
-  } catch (err) {
-    const apiError = err
-    const innerData = apiError.data?.data
-    // 统一按错误码本地化服务端错误，未命中再回退到默认文案
-    error.value = localizeServerError(apiError, locale.value.registerFailed)
-
-    // 如果后端要求验证码，则显示验证码区域
-    if (innerData?.captchaRequired) {
-      isGraphicCaptchaRequired.value = true
-    }
-    // 只要当前显示了验证码，就强制刷新验证码
-    if (showCaptcha.value) {
-      await nextTick()
-      if (captchaProvider.value === 'turnstile') {
-        turnstileRef.value?.reset?.()
-      } else {
-        captchaRef.value?.refreshCaptcha?.()
-      }
-    }
-
-    // 用户名冲突时清空用户名字段
-    if (apiError.statusCode === 409) {
-      username.value = ''
-    }
-  } finally {
-    loading.value = false
-  }
-}
-
-const isWebAuthnCeremonyAborted = (webAuthnError) =>
-  webAuthnError?.code === 'ERROR_CEREMONY_ABORTED' || webAuthnError?.name === 'AbortError'
-
-const runWebAuthnLogin = async ({ useBrowserAutofill = false, showErrors = true } = {}) => {
-  let options
-  let credential
-
+  
   try {
     // 1. 获取登录选项
-    options = await $fetch('/api/auth/webauthn/login/options', { method: 'POST' })
+    const options = await $fetch('/api/auth/webauthn/login/options', {
+      method: 'POST'
+    })
+
     // 2. 调用浏览器 WebAuthn API
-    credential = await startWebAuthnAuthentication(options, useBrowserAutofill)
+    const credential = await startAuthentication(options)
+
     // 3. 验证登录
     const verification = await $fetch('/api/auth/webauthn/login/verify', {
       method: 'POST',
@@ -1054,46 +293,13 @@ const runWebAuthnLogin = async ({ useBrowserAutofill = false, showErrors = true
 
     if (verification.success) {
       // 登录成功
-      await auth.initAuth(true)
-      return redirectAfterLogin()
+      await auth.initAuth()
+      await navigateTo(verification.redirect || '/')
     }
   } catch (e) {
-    if (isWebAuthnCeremonyAborted(e)) return
-    if (!showErrors && !credential) return
-
     console.error('WebAuthn 登录错误:', e)
-    const message = getWebAuthnErrorMessage(e, locale.value, locale.value.passkeyFailed)
-
-    if (credential?.id && options?.rpId && message === '未找到该 Passkey 关联的账号') {
-      const signaled = await signalUnknownWebAuthnCredential({
-        credentialId: credential.id,
-        rpId: options.rpId
-      })
-      error.value = signaled
-        ? locale.value.passkeyCleanupNotified
-        : locale.value.passkeyCleanupRequired
-    } else {
-      error.value = message
-    }
-  }
-}
-
-const startConditionalWebAuthnLogin = async () => {
-  try {
-    if (await browserSupportsWebAuthnAutofill()) {
-      await runWebAuthnLogin({ useBrowserAutofill: true, showErrors: false })
-    }
-  } catch (e) {
-    console.warn('Passkey 自动填充初始化失败:', e)
-  }
-}
-
-const handleWebAuthnLogin = async () => {
-  loading.value = true
-  error.value = ''
-
-  try {
-    await runWebAuthnLogin()
+    const apiError = e as { data?: { message?: string }, message?: string }
+    error.value = apiError.data?.message || apiError.message || 'Passkey 登录失败'
   } finally {
     loading.value = false
   }
@@ -1207,38 +413,6 @@ const handleWebAuthnLogin = async () => {
   color: var(--input-placeholder);
 }
 
-/* 邮箱验证码输入：右侧预留发送按钮空间 */
-.input-wrapper .code-input {
-  padding-right: 118px;
-}
-
-.code-btn {
-  position: absolute;
-  right: 10px;
-  z-index: 1;
-  padding: 7px 12px;
-  background: var(--btn-primary-bg);
-  color: var(--btn-primary-text);
-  border: 1px solid var(--btn-primary-border);
-  border-radius: var(--radius-md);
-  font-size: 12px;
-  font-weight: var(--font-medium);
-  cursor: pointer;
-  white-space: nowrap;
-  transition:
-    background var(--transition-fast),
-    opacity var(--transition-fast);
-}
-
-.code-btn:hover:not(:disabled) {
-  background: var(--btn-primary-hover);
-}
-
-.code-btn:disabled {
-  opacity: 0.5;
-  cursor: not-allowed;
-}
-
 .input-wrapper input:focus {
   outline: none;
   border-color: var(--input-border-focus);
@@ -1254,16 +428,6 @@ const handleWebAuthnLogin = async () => {
   filter: brightness(1.03);
 }
 
-.class-row {
-  display: grid;
-  grid-template-columns: 1fr 1fr;
-  gap: 12px;
-}
-
-.class-select {
-  min-width: 0;
-}
-
 .input-wrapper input.input-error {
   border-color: var(--error);
   box-shadow: 0 0 0 3px var(--error-light);
@@ -1397,27 +561,28 @@ const handleWebAuthnLogin = async () => {
   height: 20px;
 }
 
-.form-footer {
-  margin-top: 24px;
-  text-align: center;
+.forgot-password-row {
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 10px;
 }
 
-.mode-switch {
-  margin-top: 16px;
-  text-align: center;
-}
-
-.switch-link {
-  background: none;
-  border: none;
-  cursor: pointer;
-  font-size: 14px;
+.forgot-password-link {
+  font-size: 13px;
   color: var(--primary);
+  text-decoration: none;
+  font-weight: var(--font-medium);
   transition: opacity 0.2s ease;
 }
 
-.switch-link:hover {
+.forgot-password-link:hover {
   opacity: 0.8;
+  text-decoration: underline;
+}
+
+.form-footer {
+  margin-top: 24px;
+  text-align: center;
 }
 
 .help-text {
@@ -1436,6 +601,24 @@ const handleWebAuthnLogin = async () => {
   font-size: 11px;
 }
 
+.register-link-btn {
+  display: inline-block;
+  width: 100%;
+  padding: 14px;
+  border-radius: var(--radius-lg);
+  font-size: 16px;
+  font-weight: var(--font-semibold);
+  color: var(--primary);
+  background-color: var(--primary-opacity-10, rgba(59, 130, 246, 0.1));
+  text-decoration: none;
+  transition: all 0.2s ease;
+}
+
+.register-link-btn:hover {
+  background-color: var(--primary-opacity-20, rgba(59, 130, 246, 0.2));
+  transform: translateY(-1px);
+}
+
 .webauthn-section {
   width: 100%;
 }
@@ -1463,7 +646,7 @@ const handleWebAuthnLogin = async () => {
 .webauthn-btn {
   width: 100%;
   padding: 14px;
-  background: var(--panel-bg-secondary);
+  background: var(--surface-secondary);
   color: var(--text-primary);
   border: 1px solid var(--input-border);
   border-radius: var(--radius-lg);
@@ -1478,7 +661,7 @@ const handleWebAuthnLogin = async () => {
 }
 
 .webauthn-btn:hover:not(:disabled) {
-  background: var(--panel-bg-tertiary);
+  background: var(--surface-tertiary);
   border-color: var(--input-border-focus);
 }
 
@@ -1511,76 +694,5 @@ const handleWebAuthnLogin = async () => {
     padding: 14px;
     font-size: 16px;
   }
-
-  .mode-selector {
-    gap: 8px;
-  }
-
-  .mode-btn {
-    padding: 10px 12px;
-    font-size: 13px;
-  }
-
-  .mode-btn svg {
-    width: 16px;
-    height: 16px;
-  }
-
-  .class-row {
-    grid-template-columns: 1fr;
-  }
-}
-
-.mode-selector {
-  display: flex;
-  gap: 12px;
-  margin-bottom: 24px;
-}
-
-.mode-btn {
-  flex: 1;
-  padding: 12px 16px;
-  background: var(--panel-bg-secondary);
-  color: var(--text-secondary);
-  border: 2px solid var(--input-border);
-  border-radius: var(--radius-lg);
-  font-size: 14px;
-  font-weight: var(--font-medium);
-  cursor: pointer;
-  transition: all 0.2s ease;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  gap: 8px;
-  white-space: nowrap;
-}
-
-.mode-btn svg {
-  width: 18px;
-  height: 18px;
-  transition: all 0.2s ease;
-}
-
-.mode-btn:hover:not(.active) {
-  background: var(--panel-bg-tertiary);
-  border-color: var(--input-border-focus);
-  color: var(--text-primary);
-}
-
-.mode-btn.active {
-  background: var(--primary);
-  color: white;
-  border-color: var(--primary);
-}
-
-.mode-btn.active svg {
-  color: white;
-}
-
-.hint-text {
-  font-size: 12px;
-  color: var(--text-quaternary);
-  margin: -4px 0 0 0;
-  line-height: 1.4;
 }
 </style>
diff --git a/app/components/Auth/OAuthBindingCard.vue b/app/components/Auth/OAuthBindingCard.vue
index 462dedd..3329656 100644
--- a/app/components/Auth/OAuthBindingCard.vue
+++ b/app/components/Auth/OAuthBindingCard.vue
@@ -1,172 +1,182 @@
 <template>
   <div class="space-y-6">
     <div v-if="loading" class="flex flex-col items-center justify-center py-12">
-      <Loader2 :size="24" class="text-primary animate-spin mb-3" />
-      <p class="text-text-tertiary text-xs font-medium">{{ locale.loading }}</p>
+      <Loader2 :size="24" class="text-blue-500 animate-spin mb-3" />
+      <p class="text-zinc-500 text-xs font-medium">加载绑定状态...</p>
     </div>
 
     <div v-else class="space-y-4">
-      <div
-        v-for="provider in enabledProviders"
-        :key="provider.key"
-        :class="[itemClass, 'items-start']"
-      >
-        <div class="flex items-start gap-4 flex-1 min-w-0">
+      <!-- GitHub -->
+      <div v-if="config.public.oauth.github" :class="itemClass">
+        <div class="flex items-center gap-4">
           <div
-            class="w-10 h-10 rounded-xl bg-bg-primary flex items-center justify-center border border-border-secondary text-text-primary"
+            class="w-10 h-10 rounded-xl bg-zinc-950 flex items-center justify-center border border-zinc-800 text-zinc-100"
           >
-            <AuthProvidersGitHubIcon v-if="provider.key === 'github'" class="w-5 h-5" />
-            <AuthProvidersCasdoorIcon v-else-if="provider.key === 'casdoor'" class="w-5 h-5" />
-            <AuthProvidersGoogleIcon v-else-if="provider.key === 'google'" class="w-5 h-5" />
-            <Icon
-              v-else-if="provider.routeProvider === 'aggregate'"
-              :name="getAggregateOAuthLoginTypeIcon(provider.loginType)"
-              :size="23"
-              :class="aggregateIconClass(provider.loginType)"
-            />
-            <Shield v-else :size="20" />
+            <AuthProvidersGitHubIcon class="w-5 h-5" />
           </div>
-          <div class="flex flex-col flex-1 min-w-0">
-            <span class="text-sm font-bold text-text-primary">{{
-              provider.name || getProviderDisplayName(provider.key)
+          <div class="flex flex-col">
+            <span class="text-sm font-bold text-zinc-200">{{
+              getProviderDisplayName('github')
             }}</span>
-            <span
-              v-if="getIdentitiesByProvider(provider).length === 0"
-              class="text-[11px] text-text-tertiary mt-0.5"
-              >{{ locale.unbound }}</span
-            >
-            <div
-              v-if="getIdentitiesByProvider(provider).length > 0"
-              class="flex flex-col gap-2 mt-2"
-            >
-              <div
-                v-for="identity in getIdentitiesByProvider(provider)"
-                :key="identity.id"
-                class="flex items-center gap-3 p-2.5 bg-bg-primary-20 border border-border-secondary rounded-xl"
-              >
-                <div
-                  class="w-8 h-8 rounded-full bg-bg-primary border border-border-secondary overflow-hidden flex items-center justify-center text-xs font-bold text-text-secondary shrink-0"
-                >
-                  <img
-                    v-if="identity.avatar && !failedAvatarIds.includes(identity.id)"
-                    :src="identity.avatar"
-                    :alt="identity.providerUsername || provider.name"
-                    class="w-full h-full object-cover"
-                    loading="lazy"
-                    @error="markAvatarFailed(identity.id)"
-                  >
-                  <span v-else>{{
-                    (identity.providerUsername || provider.name || '?').charAt(0)
-                  }}</span>
-                </div>
-                <div class="flex flex-col flex-1 min-w-0">
-                  <span class="text-xs font-medium text-text-secondary truncate">{{
-                    identity.providerUsername
-                  }}</span>
-                  <span
-                    v-if="identity.isAvatarSource"
-                    class="text-[10px] font-bold text-success bg-success-10 border border-success-20 px-2 py-0.5 rounded-full w-fit mt-1"
-                    >{{ locale.currentAvatar }}</span
-                  >
-                </div>
-                <div class="flex items-center gap-1.5 shrink-0">
-                  <button
-                    v-if="!identity.isAvatarSource"
-                    class="px-2.5 py-1.5 bg-primary-hover hover:bg-primary text-text-primary text-[11px] font-bold rounded-lg transition-all active:scale-95 disabled:opacity-50"
-                    :disabled="avatarLoadingId === identity.id || actionLoading"
-                    @click="setAsAvatar(identity)"
-                  >
-                    {{ avatarLoadingId === identity.id ? locale.processing : locale.setAsAvatar }}
-                  </button>
-                  <button
-                    class="px-2.5 py-1.5 bg-error-10 border border-error-20 hover:bg-error-20 text-error text-[11px] font-bold rounded-lg transition-all disabled:opacity-50"
-                    :disabled="actionLoading"
-                    @click="confirmUnbind(provider, identity)"
-                  >
-                    {{ locale.unbind }}
-                  </button>
-                </div>
-              </div>
-            </div>
+            <span v-if="githubIdentity" class="text-[11px] text-blue-500 font-medium mt-0.5">{{
+              githubIdentity.providerUsername
+            }}</span>
+            <span v-else class="text-[11px] text-zinc-500 mt-0.5">未绑定</span>
           </div>
         </div>
 
         <button
-          v-if="getIdentitiesByProvider(provider).length === 0"
-          class="px-4 py-1.5 bg-primary-hover hover:bg-primary text-text-primary text-xs font-black rounded-xl shadow-lg shadow-[var(--primary-glow)] transition-all active:scale-95 disabled:opacity-50"
+          v-if="githubIdentity"
+          class="px-4 py-1.5 bg-rose-500/10 border border-rose-500/20 hover:bg-rose-500/20 text-rose-500 text-xs font-black rounded-xl transition-all disabled:opacity-50"
           :disabled="actionLoading"
-          @click="handleBind(provider)"
+          @click="confirmUnbind('github')"
         >
-          {{ actionLoading ? locale.redirecting : locale.bindNow }}
+          {{ actionLoading ? '处理中...' : '解绑' }}
+        </button>
+        <button
+          v-else
+          class="px-4 py-1.5 bg-blue-600 hover:bg-blue-500 text-white text-xs font-black rounded-xl shadow-lg shadow-blue-900/20 transition-all active:scale-95 disabled:opacity-50"
+          :disabled="actionLoading"
+          @click="handleBind('github')"
+        >
+          {{ actionLoading ? '跳转中...' : '立即绑定' }}
+        </button>
+      </div>
+
+      <!-- Casdoor (如果启用) -->
+      <div v-if="config.public.oauth.casdoor" :class="itemClass">
+        <div class="flex items-center gap-4">
+          <div
+            class="w-10 h-10 rounded-xl bg-zinc-950 flex items-center justify-center border border-zinc-800 text-zinc-100"
+          >
+            <Shield :size="20" />
+          </div>
+          <div class="flex flex-col">
+            <span class="text-sm font-bold text-zinc-200">{{
+              getProviderDisplayName('casdoor')
+            }}</span>
+            <span v-if="casdoorIdentity" class="text-[11px] text-blue-500 font-medium mt-0.5">{{
+              casdoorIdentity.providerUsername
+            }}</span>
+            <span v-else class="text-[11px] text-zinc-500 mt-0.5">未绑定</span>
+          </div>
+        </div>
+
+        <button
+          v-if="casdoorIdentity"
+          class="px-4 py-1.5 bg-rose-500/10 border border-rose-500/20 hover:bg-rose-500/20 text-rose-500 text-xs font-black rounded-xl transition-all disabled:opacity-50"
+          :disabled="actionLoading"
+          @click="confirmUnbind('casdoor')"
+        >
+          {{ actionLoading ? '处理中...' : '解绑' }}
+        </button>
+        <button
+          v-else
+          class="px-4 py-1.5 bg-blue-600 hover:bg-blue-500 text-white text-xs font-black rounded-xl shadow-lg shadow-blue-900/20 transition-all active:scale-95 disabled:opacity-50"
+          :disabled="actionLoading"
+          @click="handleBind('casdoor')"
+        >
+          {{ actionLoading ? '跳转中...' : '立即绑定' }}
+        </button>
+      </div>
+
+      <!-- Google (如果启用) -->
+      <div v-if="config.public.oauth.google" :class="itemClass">
+        <div class="flex items-center gap-4">
+          <div
+            class="w-10 h-10 rounded-xl bg-zinc-950 flex items-center justify-center border border-zinc-800 text-zinc-100"
+          >
+            <AuthProvidersGoogleIcon class="w-5 h-5" />
+          </div>
+          <div class="flex flex-col">
+            <span class="text-sm font-bold text-zinc-200">{{
+              getProviderDisplayName('google')
+            }}</span>
+            <span v-if="googleIdentity" class="text-[11px] text-blue-500 font-medium mt-0.5">{{
+              googleIdentity.providerUsername
+            }}</span>
+            <span v-else class="text-[11px] text-zinc-500 mt-0.5">未绑定</span>
+          </div>
+        </div>
+
+        <button
+          v-if="googleIdentity"
+          class="px-4 py-1.5 bg-rose-500/10 border border-rose-500/20 hover:bg-rose-500/20 text-rose-500 text-xs font-black rounded-xl transition-all disabled:opacity-50"
+          :disabled="actionLoading"
+          @click="confirmUnbind('google')"
+        >
+          {{ actionLoading ? '处理中...' : '解绑' }}
+        </button>
+        <button
+          v-else
+          class="px-4 py-1.5 bg-blue-600 hover:bg-blue-500 text-white text-xs font-black rounded-xl shadow-lg shadow-blue-900/20 transition-all active:scale-95 disabled:opacity-50"
+          :disabled="actionLoading"
+          @click="handleBind('google')"
+        >
+          {{ actionLoading ? '跳转中...' : '立即绑定' }}
         </button>
       </div>
 
       <!-- WebAuthn / Passkey -->
-      <div
+      <div 
         v-if="isWebAuthnSupported || webauthnIdentities.length > 0 || !isSecureContext"
         :class="[
-          itemClass,
-          webauthnIdentities.length > 0 ? 'cursor-pointer hover:bg-bg-secondary-70' : ''
-        ]"
+          itemClass, 
+          webauthnIdentities.length > 0 ? 'cursor-pointer hover:bg-zinc-900/70' : ''
+        ]" 
         @click="toggleWebAuthnList"
       >
         <div class="flex items-center gap-4">
           <div
-            class="w-10 h-10 rounded-xl bg-bg-primary flex items-center justify-center border border-border-secondary text-text-primary"
+            class="w-10 h-10 rounded-xl bg-zinc-950 flex items-center justify-center border border-zinc-800 text-zinc-100"
           >
             <Fingerprint :size="20" />
           </div>
           <div class="flex flex-col">
             <div class="flex items-center gap-2">
-              <span class="text-sm font-bold text-text-primary">Passkey</span>
-              <ChevronDown
+              <span class="text-sm font-bold text-zinc-200">Windows Hello / Passkey</span>
+              <ChevronDown 
                 v-if="webauthnIdentities.length > 0"
-                :size="14"
-                class="text-text-tertiary transition-transform duration-300"
+                :size="14" 
+                class="text-zinc-500 transition-transform duration-300"
                 :class="{ 'rotate-180': isWebAuthnExpanded }"
               />
             </div>
-            <span class="text-[11px] text-text-tertiary mt-0.5"
-              >{{ locale.boundDevices }} {{ webauthnIdentities.length }} {{ locale.devices }}</span
+            <span class="text-[11px] text-zinc-500 mt-0.5"
+              >已绑定 {{ webauthnIdentities.length }} 个设备</span
             >
           </div>
         </div>
 
         <button
           v-if="isWebAuthnSupported"
-          class="px-4 py-1.5 bg-primary-hover hover:bg-primary text-text-primary text-xs font-black rounded-xl shadow-lg shadow-[var(--primary-glow)] transition-all active:scale-95 disabled:opacity-50"
+          class="px-4 py-1.5 bg-blue-600 hover:bg-blue-500 text-white text-xs font-black rounded-xl shadow-lg shadow-blue-900/20 transition-all active:scale-95 disabled:opacity-50"
           :disabled="actionLoading"
           @click.stop="handleWebAuthnRegister"
         >
-          {{ actionLoading ? locale.processing : locale.addDevice }}
+          {{ actionLoading ? '处理中...' : '添加设备' }}
         </button>
-        <div
-          v-else-if="!isSecureContext"
-          class="flex items-center gap-1 text-warning bg-warning-10 px-3 py-1.5 rounded-lg border border-warning-20"
-        >
+        <div v-else-if="!isSecureContext" class="flex items-center gap-1 text-amber-500 bg-amber-500/10 px-3 py-1.5 rounded-lg border border-amber-500/20">
           <AlertTriangle :size="12" />
-          <span class="text-[10px] font-medium">{{ locale.httpsRequired }}</span>
+          <span class="text-[10px] font-medium">需要 HTTPS 环境</span>
         </div>
       </div>
 
       <!-- WebAuthn 设备列表 -->
       <Transition name="expand">
-        <div
-          v-if="isWebAuthnExpanded && webauthnIdentities.length > 0"
-          class="pl-16 -mt-2 overflow-hidden"
-        >
+        <div v-if="isWebAuthnExpanded && webauthnIdentities.length > 0" class="pl-16 -mt-2 overflow-hidden">
           <div class="space-y-2 pt-2">
             <div
               v-for="cred in webauthnIdentities"
               :key="cred.id"
-              class="flex items-center justify-between p-3 bg-bg-primary-20 border border-border-secondary rounded-xl group/item"
+              class="flex items-center justify-between p-3 bg-zinc-950/20 border border-zinc-900 rounded-xl group/item"
             >
               <div class="flex flex-col flex-1 mr-4">
                 <div v-if="editingId === cred.id" class="flex items-center gap-2 mb-1">
                   <input
                     v-model="editingName"
                     type="text"
-                    class="bg-bg-secondary border border-border-tertiary rounded px-2 py-0.5 text-xs text-text-primary focus:outline-none focus:border-primary w-full"
+                    class="bg-zinc-900 border border-zinc-700 rounded px-2 py-0.5 text-xs text-zinc-200 focus:outline-none focus:border-blue-500 w-full"
                     :disabled="isRenaming"
                     @keyup.enter="saveEditing(cred.id)"
                     @keyup.esc="cancelEditing"
@@ -175,18 +185,18 @@
                   />
                 </div>
                 <div v-else class="flex items-center gap-2 mb-0.5">
-                  <span class="text-xs font-medium text-text-secondary">{{ cred.providerUsername }}</span>
-                  <button
-                    class="text-text-tertiary hover:text-text-secondary opacity-0 group-hover/item:opacity-100 transition-opacity p-0.5"
+                  <span class="text-xs font-medium text-zinc-300">{{ cred.providerUsername }}</span>
+                  <button 
+                    class="text-zinc-500 hover:text-zinc-300 opacity-0 group-hover/item:opacity-100 transition-opacity p-0.5"
                     @click.stop="startEditing(cred)"
-                    :title="locale.rename"
+                    title="重命名"
                   >
                     <Pencil :size="12" />
                   </button>
                 </div>
-
-                <span class="text-[10px] text-text-disabled"
-                  >{{ locale.addedAt }} {{ new Date(cred.createdAt).toLocaleString(currentLocale.value, {
+                
+                <span class="text-[10px] text-zinc-600"
+                  >添加于 {{ new Date(cred.createdAt).toLocaleString('zh-CN', { 
                     year: 'numeric', 
                     month: '2-digit', 
                     day: '2-digit', 
@@ -201,28 +211,28 @@
               <div class="flex items-center gap-1">
                 <template v-if="editingId === cred.id">
                   <button
-                    class="text-text-tertiary hover:text-success transition-colors p-1"
+                    class="text-zinc-400 hover:text-green-400 transition-colors p-1"
                     :disabled="isRenaming"
                     @click.stop="saveEditing(cred.id)"
-                    :title="locale.save"
+                    title="保存"
                   >
                     <Check :size="14" />
                   </button>
                   <button
-                    class="text-text-tertiary hover:text-text-primary transition-colors p-1"
+                    class="text-zinc-400 hover:text-zinc-200 transition-colors p-1"
                     :disabled="isRenaming"
                     @click.stop="cancelEditing"
-                    :title="locale.cancel"
+                    title="取消"
                   >
                     <X :size="14" />
                   </button>
                 </template>
                 <button
                   v-else
-                  class="text-xs text-error hover:text-error font-medium px-2 py-1 opacity-0 group-hover/item:opacity-100 transition-opacity"
+                  class="text-xs text-rose-500 hover:text-rose-400 font-medium px-2 py-1 opacity-0 group-hover/item:opacity-100 transition-opacity"
                   @click="confirmUnbindWebAuthn(cred)"
                 >
-                  {{ locale.remove }}
+                  移除
                 </button>
               </div>
             </div>
@@ -244,60 +254,42 @@
   </div>
 </template>
 
-<script setup>
+<script setup lang="ts">
 import { ref, onMounted, computed, nextTick } from 'vue'
-import {
-  Loader2,
-  Shield,
-  Fingerprint,
-  ChevronDown,
-  Pencil,
-  Check,
-  X,
-  AlertTriangle
-} from '@lucide/vue'
+import { Loader2, Shield, Fingerprint, ChevronDown, Pencil, Check, X, AlertTriangle } from '@lucide/vue'
 import ConfirmDialog from '~/components/UI/ConfirmDialog.vue'
-import Icon from '~/components/UI/Icon.vue'
 import { useToast } from '~/composables/useToast'
-import { getAggregateOAuthLoginTypeIcon, getProviderDisplayName } from '~/utils/oauth'
-import { browserSupportsWebAuthn } from '@simplewebauthn/browser'
-import {
-  getWebAuthnErrorMessage,
-  signalUnknownWebAuthnCredential,
-  startWebAuthnRegistration
-} from '~/utils/webauthn'
-import { useLocale } from '~/utils/locale'
-import { useServerErrors } from '~/composables/useLocaleText'
-import { useAuth } from '~/composables/useAuth'
+import { getProviderDisplayName } from '~/utils/oauth'
+import { startRegistration, browserSupportsWebAuthn } from '@simplewebauthn/browser'
 
-const { oauthProviders, refreshSiteConfig } = useSiteConfig()
+const config = useRuntimeConfig()
 const { showToast } = useToast()
-const { refreshUser } = useAuth()
-const { localize: localizeServerError } = useServerErrors()
-const { auth, currentLocale } = useLocale()
-const locale = computed(() => auth.value?.oauthBindingCard || {})
-const { t: callLocale } = useLocaleText(locale)
 const identities = ref([])
 const loading = ref(true)
 const actionLoading = ref(false)
-const avatarLoadingId = ref(null)
-const failedAvatarIds = ref([])
 const isWebAuthnSupported = ref(false)
 const isSecureContext = ref(true)
 
 // 编辑相关
-const editingId = ref(null)
+const editingId = ref<string | null>(null)
 const editingName = ref('')
 const isRenaming = ref(false)
-const editInput = ref(null)
+const editInput = ref<HTMLInputElement | null>(null)
 
-const startEditing = async (cred) => {
+interface WebAuthnCredential {
+  id: string
+  providerUsername: string
+  createdAt: string
+  [key: string]: any
+}
+
+const startEditing = async (cred: WebAuthnCredential) => {
   editingId.value = cred.id
   editingName.value = cred.providerUsername
   // 聚焦输入框
   await nextTick()
   if (editInput.value) {
-    editInput.value?.focus()
+    (editInput.value as HTMLInputElement)?.focus()
   }
 }
 
@@ -306,28 +298,28 @@ const cancelEditing = () => {
   editingName.value = ''
 }
 
-const saveEditing = async (id) => {
+const saveEditing = async (id: string) => {
   if (!editingName.value.trim()) {
-    showToast(locale.value.nameRequired, 'error')
+    showToast('设备名称不能为空', 'error')
     return
   }
-
+  
   if (editingName.value.trim().length > 50) {
-    showToast(locale.value.nameTooLong, 'error')
+    showToast('设备名称过长 (最大50个字符)', 'error')
     return
   }
-
+  
   isRenaming.value = true
   try {
     await $fetch('/api/auth/webauthn/rename', {
       method: 'POST',
       body: { id, name: editingName.value }
     })
-    showToast(locale.value.renameSuccess, 'success')
+    showToast('设备名称修改成功', 'success')
     await fetchIdentities()
     cancelEditing()
-  } catch (e) {
-    showToast(localizeServerError(e, locale.value.renameFailed), 'error')
+  } catch (e: any) {
+    showToast(e.data?.message || '修改失败', 'error')
   } finally {
     isRenaming.value = false
   }
@@ -353,65 +345,17 @@ const confirmDialog = ref({
 
 // 样式类
 const itemClass =
-  'flex items-center justify-between p-4 bg-bg-primary-30 border border-border-secondary rounded-2xl hover:bg-bg-secondary-50 transition-all group'
-
-const aggregateIconClass = (loginType) => {
-  const classes = {
-    qq: 'text-[var(--oauth-qq)]',
-    wx: 'text-[var(--oauth-wx)]',
-    alipay: 'text-[var(--oauth-alipay)]',
-    sina: 'text-[var(--oauth-sina)]',
-    baidu: 'text-[var(--oauth-baidu)]',
-    douyin: 'text-[var(--oauth-douyin)]',
-    huawei: 'text-[var(--oauth-huawei)]',
-    xiaomi: 'text-[var(--oauth-xiaomi)]',
-    gitee: 'text-[var(--oauth-gitee)]',
-    gitea: 'text-text-primary [--gitea-cutout:var(--panel-bg-dialog)]',
-    bilibili: 'text-[var(--oauth-bilibili)]',
-    kuaishou: 'text-[var(--oauth-kuaishou)]'
-  }
-  return classes[loginType] || 'text-text-primary'
-}
-
-const enabledProviders = computed(() => oauthProviders.value || [])
-
-const getProviderName = (provider) => {
-  const matched = enabledProviders.value.find((item) => item.key === provider)
-  return matched?.name || getProviderDisplayName(provider)
-}
-
-const getIdentitiesByProvider = (provider) =>
-  identities.value.filter((item) => item.provider === provider.key)
-
-const markAvatarFailed = (id) => {
-  if (!failedAvatarIds.value.includes(id)) {
-    failedAvatarIds.value.push(id)
-  }
-}
-
-const setAsAvatar = async (identity) => {
-  avatarLoadingId.value = identity.id
-  try {
-    await $fetch('/api/user/avatar', {
-      method: 'POST',
-      body: { identityId: identity.id }
-    })
-    showToast(locale.value.avatarSetSuccess, 'success')
-    await Promise.all([fetchIdentities(), refreshUser()])
-  } catch (e) {
-    showToast(localizeServerError(e, locale.value.avatarSetFailed), 'error')
-  } finally {
-    avatarLoadingId.value = null
-  }
-}
+  'flex items-center justify-between p-4 bg-zinc-950/30 border border-zinc-900 rounded-2xl hover:bg-zinc-900/50 transition-all group'
 
+const githubIdentity = computed(() => identities.value.find((i) => i.provider === 'github'))
+const casdoorIdentity = computed(() => identities.value.find((i) => i.provider === 'casdoor'))
+const googleIdentity = computed(() => identities.value.find((i) => i.provider === 'google'))
 const webauthnIdentities = computed(() => identities.value.filter((i) => i.provider === 'webauthn'))
 
 const fetchIdentities = async () => {
   try {
     loading.value = true
     identities.value = await $fetch('/api/auth/identities')
-    failedAvatarIds.value = []
   } catch (e) {
     console.error('获取绑定信息失败', e)
   } finally {
@@ -422,24 +366,18 @@ const fetchIdentities = async () => {
 const handleBind = (provider) => {
   actionLoading.value = true
   // 绑定也是通过 OAuth 流程，最终回调时会自动识别已登录状态并执行绑定
-  const routeProvider = provider.routeProvider || provider.key
-  const query = new URLSearchParams()
-  if (provider.loginType) query.set('type', provider.loginType)
-  const queryString = query.toString()
-  navigateTo(`/api/auth/${routeProvider}${queryString ? `?${queryString}` : ''}`, {
-    external: true
-  })
+  navigateTo(`/api/auth/${provider}`, { external: true })
 }
 
-const confirmUnbind = (provider, identity) => {
-  const providerName = getProviderName(provider.key)
+const confirmUnbind = (provider) => {
+  const providerName = getProviderDisplayName(provider)
 
   confirmDialog.value = {
-    title: locale.value.unbindTitle,
-    message: callLocale('unbindMessage', '', providerName),
+    title: '解除绑定',
+    message: `确定要解除 ${providerName} 账号的绑定吗？解除后您将无法使用该账号登录。`,
     type: 'danger',
     loading: false,
-    onConfirm: () => handleUnbind(provider.key, identity.id),
+    onConfirm: () => handleUnbind(provider),
     onCancel: () => {
       showConfirmDialog.value = false
     }
@@ -449,8 +387,8 @@ const confirmUnbind = (provider, identity) => {
 
 const confirmUnbindWebAuthn = (cred) => {
   confirmDialog.value = {
-    title: locale.value.removePasskeyTitle,
-    message: callLocale('removePasskeyMessage', '', cred.providerUsername),
+    title: '移除 Passkey',
+    message: `确定要移除设备 "${cred.providerUsername}" 吗？移除后将无法使用该设备登录。`,
     type: 'danger',
     loading: false,
     onConfirm: () => handleUnbind('webauthn', cred.id),
@@ -465,28 +403,15 @@ const handleUnbind = async (provider, id = null) => {
   confirmDialog.value.loading = true
   actionLoading.value = true
   try {
-    const result = await $fetch('/api/auth/unbind', {
+    await $fetch('/api/auth/unbind', {
       method: 'POST',
       body: { provider, id }
     })
-    const cleanupResults = await Promise.all(
-      (result.passkeyCleanup || []).map(signalUnknownWebAuthnCredential)
-    )
     await fetchIdentities()
-    try {
-      await refreshUser()
-    } catch (e) {
-      // 头像来源变化后的用户刷新失败不阻塞解绑流程
-    }
-    const deviceCleanupSucceeded = cleanupResults.length > 0 && cleanupResults.every(Boolean)
-    if (provider === 'webauthn' && !deviceCleanupSucceeded) {
-      showToast(locale.value.passkeyCleanupRequired, 'warning', 6000)
-    } else {
-      showToast(locale.value.unbindSuccess, 'success')
-    }
+    showToast('解除绑定成功', 'success')
     showConfirmDialog.value = false
   } catch (e) {
-    showToast(localizeServerError(e, locale.value.unbindFailed), 'error')
+    showToast(e.data?.message || '解绑失败', 'error')
   } finally {
     actionLoading.value = false
     confirmDialog.value.loading = false
@@ -495,27 +420,39 @@ const handleUnbind = async (provider, id = null) => {
 
 const handleWebAuthnRegister = async () => {
   if (!isWebAuthnSupported.value) {
-    showToast(locale.value.browserNotSupported, 'error')
+    showToast('您的浏览器不支持 Windows Hello / Passkey', 'error')
     return
   }
 
   actionLoading.value = true
   try {
     const options = await $fetch('/api/auth/webauthn/register/options')
-    const attResp = await startWebAuthnRegistration(options)
+    
+    let attResp
+    try {
+      attResp = await startRegistration(options)
+    } catch (e) {
+      if (e.name === 'NotAllowedError') {
+        throw new Error('用户取消了操作')
+      }
+      throw e
+    }
 
     // 提示用户输入设备名称（可选，这里先用默认的）
-    // attResp.label = 'Windows Hello'
-
+    // attResp.label = 'Windows Hello' 
+    
     await $fetch('/api/auth/webauthn/register/verify', {
       method: 'POST',
       body: attResp
     })
-    showToast(locale.value.addDeviceSuccess, 'success')
+    
+    showToast('设备添加成功', 'success')
     await fetchIdentities()
   } catch (e) {
     console.error('WebAuthn 注册错误:', e)
-    const message = getWebAuthnErrorMessage(e, locale.value, locale.value.addDeviceFailed)
+    const apiError = e as { data?: { message?: string }; message?: string }
+    const err = e as Error
+    const message = apiError.data?.message || err.message || '添加设备失败'
     showToast(message, 'error')
   } finally {
     actionLoading.value = false
@@ -523,9 +460,8 @@ const handleWebAuthnRegister = async () => {
 }
 
 onMounted(async () => {
-  await refreshSiteConfig()
   fetchIdentities()
-
+  
   isSecureContext.value = window.isSecureContext
 
   const isApiSupported = browserSupportsWebAuthn()
@@ -533,8 +469,7 @@ onMounted(async () => {
 
   if (isApiSupported && window.PublicKeyCredential?.isUserVerifyingPlatformAuthenticatorAvailable) {
     try {
-      isPlatformAuthenticatorAvailable =
-        await window.PublicKeyCredential.isUserVerifyingPlatformAuthenticatorAvailable()
+      isPlatformAuthenticatorAvailable = await window.PublicKeyCredential.isUserVerifyingPlatformAuthenticatorAvailable()
     } catch (e) {
       console.warn('WebAuthn 平台认证器检查失败:', e)
     }
diff --git a/app/components/Auth/OAuthButtons.vue b/app/components/Auth/OAuthButtons.vue
index e78b068..d7a169f 100644
--- a/app/components/Auth/OAuthButtons.vue
+++ b/app/components/Auth/OAuthButtons.vue
@@ -1,117 +1,194 @@
 <template>
-  <div v-if="hasEnabledProviders" class="mt-6 w-full">
-    <div class="flex items-center text-center text-[var(--text-tertiary)] text-xs mb-4">
-      <div class="flex-1 border-b border-[var(--border-color)] opacity-20" />
-      <span class="px-2.5">{{ locale.divider }}</span>
-      <div class="flex-1 border-b border-[var(--border-color)] opacity-20" />
+  <div v-if="hasEnabledProviders" class="oauth-buttons-section">
+    <div class="oauth-divider">
+      <span>或使用第三方账号登录</span>
     </div>
-    <div class="flex flex-wrap justify-center gap-4">
+    <div class="oauth-buttons">
       <button
-        v-for="provider in enabledProviders"
-        :key="provider.key"
+        v-if="config.public.oauth.github"
         type="button"
-        :class="providerButtonClass(provider)"
-        :title="formatLocale(locale.loginWith, provider.name)"
-        @click="loginWith(provider)"
+        class="oauth-btn oauth-btn-github"
+        title="使用 GitHub 登录"
+        @click="loginWith('github')"
       >
-        <AuthProvidersGitHubIcon v-if="provider.key === 'github'" />
-        <AuthProvidersCasdoorIcon v-else-if="provider.key === 'casdoor'" />
-        <AuthProvidersGoogleIcon v-else-if="provider.key === 'google'" />
-        <Icon
-          v-else-if="provider.routeProvider === 'aggregate'"
-          :name="getAggregateOAuthLoginTypeIcon(provider.loginType)"
-          :size="26"
-        />
-        <Shield v-else :size="18" />
+        <AuthProvidersGitHubIcon />
       </button>
+
+      <button
+        v-if="config.public.oauth.google"
+        type="button"
+        class="oauth-btn oauth-btn-google"
+        title="使用 Google 登录"
+        @click="loginWith('google')"
+      >
+        <AuthProvidersGoogleIcon />
+      </button>
+
+      <button
+        v-if="config.public.oauth.aggregate"
+        type="button"
+        class="oauth-btn oauth-btn-aggregate"
+        title="使用 QQ / 微信登录"
+        @click="loginWith('aggregate')"
+      >
+        <svg viewBox="0 0 24 24" width="22" height="22" fill="currentColor" aria-hidden="true">
+          <path d="M8.5 4C4.9 4 2 6.8 2 10.3c0 2 1.1 3.7 2.8 4.9L4 18l3-1.5c.5.1 1 .2 1.5.2h.6c-.1-.4-.1-.8 0-1.2H8.5C5.5 15.5 3 13.2 3 10.3 3 7.4 5.5 5 8.5 5h1.6c.3-1.1 1.3-1.9 2.5-1.9.5 0 1 .2 1.4.5C13.3 3 10.7 4 8.5 4zM10.1 6c-1.1 0-2 .9-2 2s.9 2 2 2 2-.9 2-2-.9-2-2-2zm8.4 1.2c-2.5 0-4.5 2-4.5 4.5s2 4.5 4.5 4.5c.6 0 1.2-.1 1.7-.3L22 17.5l-.8-2.3c1.4-1 2.3-2.6 2.3-4.3C23.5 9.2 21.5 7.2 19 7.2c-.5 0-1 0-1.4.1C16.9 7.8 17.9 7.2 19 7.2zM17 9.7c-.8 0-1.5.7-1.5 1.5s.7 1.5 1.5 1.5 1.5-.7 1.5-1.5-.7-1.5-1.5-1.5z"/>
+        </svg>
+      </button>
+    </div>
+  </div>
+
+  <div v-else-if="showPlaceholderHint" class="oauth-buttons-section">
+    <div class="oauth-divider oauth-divider-dim">
+      <span>第三方登录</span>
+    </div>
+    <div class="oauth-empty-hint">
+      <svg
+        class="oauth-empty-icon"
+        fill="none"
+        stroke="currentColor"
+        stroke-width="2"
+        viewBox="0 0 24 24"
+      >
+        <path d="M13 10V3L4 14h7v7l9-11h-7z" />
+      </svg>
+      <p>请联系管理员在 <code>.env</code> 中配置第三方 OAuth 应用后即可启用</p>
     </div>
   </div>
 </template>
 
-<script setup>
-import { Shield } from '@lucide/vue'
-import { useLocale } from '~/utils/locale'
-import Icon from '~/components/UI/Icon.vue'
-import { getAggregateOAuthLoginTypeIcon } from '~/utils/oauth'
-
-const { oauthProviders, refreshSiteConfig } = useSiteConfig()
-const route = useRoute()
-const { auth } = useLocale()
-const locale = computed(() => auth.value?.oauthButtons || {})
-const formatLocale = (value, ...args) => {
-  if (typeof value === 'function') return value(...args)
-  if (typeof value === 'string') {
-    return value.replace(/{(\d+)}/g, (match, index) =>
-      args[Number(index)] !== undefined ? String(args[Number(index)]) : match
-    )
-  }
-  return 'OAuth 登录'
+<script setup lang="ts">
+interface Props {
+  alwaysShow?: boolean
 }
-
-onMounted(async () => {
-  await refreshSiteConfig()
+const props = withDefaults(defineProps<Props>(), {
+  alwaysShow: false
 })
-
-const enabledProviders = computed(() => oauthProviders.value || [])
+const config = useRuntimeConfig()
 
 const hasEnabledProviders = computed(() => {
-  return enabledProviders.value.length > 0
+  return config.public.oauth && Object.values(config.public.oauth).some((enabled) => enabled)
 })
 
-const providerButtonClass = (provider) => {
-  const key = provider.routeProvider || provider.key
-  const baseClass =
-    'w-12 h-12 rounded-full border border-[var(--border-color)] bg-[var(--bg-secondary)] text-[var(--text-primary)] flex items-center justify-center cursor-pointer transition-all duration-200 hover:-translate-y-0.5 hover:shadow-sm hover:bg-[var(--bg-tertiary)]'
+const showPlaceholderHint = computed(() => props.alwaysShow && !hasEnabledProviders.value)
 
-  if (key === 'github') {
-    return `${baseClass} hover:bg-[var(--panel-bg-subtle)] hover:text-text-primary hover:border-[var(--panel-bg-subtle)]`
-  }
-  if (key === 'casdoor') {
-    return `${baseClass} hover:border-[var(--oauth-casdoor-green)]`
-  }
-  if (key === 'google') {
-    return `${baseClass} hover:bg-bg-secondary hover:text-black hover:border-[var(--panel-border)]`
-  }
-  if (key === 'aggregate') {
-    const aggregateClasses = {
-      qq: 'hover:bg-[var(--oauth-qq)] hover:text-text-primary hover:border-[var(--oauth-qq)]',
-      wx: 'hover:bg-[var(--oauth-wx)] hover:text-text-primary hover:border-[var(--oauth-wx)]',
-      alipay: 'hover:bg-[var(--oauth-alipay)] hover:text-text-primary hover:border-[var(--oauth-alipay)]',
-      sina: 'hover:bg-[var(--oauth-sina)] hover:text-text-primary hover:border-[var(--oauth-sina)]',
-      baidu: 'hover:bg-[var(--oauth-baidu)] hover:text-text-primary hover:border-[var(--oauth-baidu)]',
-      douyin: 'hover:bg-[var(--panel-bg-darkest)] hover:text-text-primary hover:border-[var(--oauth-douyin)]',
-      huawei: 'hover:bg-[var(--oauth-huawei)] hover:text-text-primary hover:border-[var(--oauth-huawei)]',
-      xiaomi: 'hover:bg-[var(--oauth-xiaomi)] hover:text-text-primary hover:border-[var(--oauth-xiaomi)]',
-      gitee: 'hover:bg-[var(--oauth-gitee)] hover:text-text-primary hover:border-[var(--oauth-gitee)]',
-      gitea:
-        '[--gitea-cutout:var(--bg-secondary)] hover:[--gitea-cutout:var(--text-primary)] hover:bg-bg-secondary hover:text-black hover:border-primary',
-      bilibili: 'hover:bg-[var(--oauth-bilibili)] hover:text-text-primary hover:border-[var(--oauth-bilibili)]',
-      kuaishou: 'hover:bg-[var(--oauth-kuaishou)] hover:text-text-primary hover:border-[var(--oauth-kuaishou)]'
-    }
-    return `${baseClass} ${aggregateClasses[provider.loginType] || ''}`
-  }
-  if (key === 'oauth2') {
-    return `${baseClass} hover:bg-[var(--status-success-icon)] hover:text-text-primary hover:border-[var(--status-success-icon)]`
-  }
-
-  return `${baseClass} hover:border-primary-40 hover:text-primary`
-}
-
-const loginWith = (provider) => {
-  const queryRedirect = route.query.redirect
-  const redirect = Array.isArray(queryRedirect) ? queryRedirect[0] : queryRedirect
-  const safeRedirect =
-    redirect?.startsWith('/') && !redirect.startsWith('//') && !redirect.startsWith('/\\')
-      ? redirect
-      : null
-  const query = new URLSearchParams()
-  if (provider.loginType) query.set('type', provider.loginType)
-  if (safeRedirect) query.set('redirect', safeRedirect)
-  const queryString = query.toString()
-  const routeProvider = provider.routeProvider || provider.key
-  // 外部导航到 API 端点
-  navigateTo(`/api/auth/${routeProvider}${queryString ? `?${queryString}` : ''}`, {
-    external: true
-  })
+const loginWith = (provider: string) => {
+  navigateTo(`/api/auth/${provider}`, { external: true })
 }
 </script>
+
+<style scoped>
+.oauth-buttons-section {
+  width: 100%;
+  margin-top: 24px;
+}
+
+.oauth-divider {
+  display: flex;
+  align-items: center;
+  text-align: center;
+  margin: 0 0 18px 0;
+  color: var(--text-quaternary, #9ca3af);
+  font-size: 12px;
+}
+
+.oauth-divider::before,
+.oauth-divider::after {
+  content: '';
+  flex: 1;
+  border-bottom: 1px solid var(--border-secondary, #d1d5db);
+  opacity: 0.85;
+}
+
+.oauth-divider span {
+  padding: 0 12px;
+  white-space: nowrap;
+}
+
+.oauth-divider-dim {
+  color: var(--text-quaternary, #9ca3af);
+  opacity: 0.8;
+}
+
+.oauth-buttons {
+  display: flex;
+  justify-content: center;
+  gap: 16px;
+}
+
+.oauth-btn {
+  width: 48px;
+  height: 48px;
+  border-radius: 999px;
+  border: 1px solid var(--border-secondary, #d1d5db);
+  background: var(--bg-secondary, #f5f7fa);
+  color: var(--text-primary, #1a2332);
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+  transition:
+    transform 0.2s ease,
+    box-shadow 0.2s ease,
+    background-color 0.2s ease,
+    border-color 0.2s ease,
+    color 0.2s ease;
+}
+
+.oauth-btn:hover {
+  transform: translateY(-1px);
+  box-shadow: var(--shadow-sm);
+}
+
+.oauth-btn-github:hover {
+  background: var(--bg-tertiary, #24292e);
+  color: var(--text-primary, #ffffff);
+  border-color: var(--border-secondary, #24292e);
+}
+
+.oauth-btn-google:hover {
+  background: var(--card-bg, #ffffff);
+  color: var(--text-primary, #111111);
+  border-color: #dadce0;
+}
+
+.oauth-btn-aggregate:hover {
+  background: var(--bg-secondary, #12b7f5);
+  color: var(--text-primary, #ffffff);
+  border-color: var(--border-secondary, #12b7f5);
+}
+
+.oauth-empty-hint {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 10px;
+  padding: 14px 16px;
+  border: 1px dashed var(--border-secondary, #d1d5db);
+  border-radius: var(--radius-lg);
+  background: var(--bg-tertiary, #edf0f5);
+  color: var(--text-tertiary, #6b7280);
+  font-size: 13px;
+}
+
+.oauth-empty-icon {
+  width: 18px;
+  height: 18px;
+  opacity: 0.8;
+  flex-shrink: 0;
+}
+
+.oauth-empty-hint p {
+  margin: 0;
+  line-height: 1.5;
+}
+
+.oauth-empty-hint code {
+  background: var(--input-bg, #ffffff);
+  color: var(--primary, #1e40af);
+  padding: 1px 6px;
+  border-radius: 4px;
+  font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', monospace;
+  font-size: 12px;
+}
+</style>
diff --git a/app/components/Auth/ProfileForm.vue b/app/components/Auth/ProfileForm.vue
new file mode 100644
index 0000000..1403f16
--- /dev/null
+++ b/app/components/Auth/ProfileForm.vue
@@ -0,0 +1,252 @@
+<template>
+  <div class="bg-zinc-900/40 border border-zinc-900 rounded-3xl p-6 md:p-8 shadow-2xl">
+    <div class="flex items-center gap-3 border-b border-zinc-800/50 pb-5 mb-6">
+      <div class="p-2.5 bg-green-500/10 rounded-xl">
+        <UserCircle2 :size="20" class="text-green-500" />
+      </div>
+      <div>
+        <h2 class="text-base font-black text-zinc-100">个人信息设置</h2>
+        <p class="text-xs text-zinc-500 mt-0.5">修改您的个人资料和学校信息</p>
+      </div>
+    </div>
+
+    <form @submit.prevent="handleUpdateProfile" class="space-y-5 max-w-md">
+      <!-- 昵称 -->
+      <div class="space-y-2">
+        <label class="text-sm font-medium text-zinc-300">昵称</label>
+        <input
+          v-model="form.name"
+          type="text"
+          placeholder="留空则显示用户名"
+          class="w-full px-4 py-3 bg-zinc-950 border border-zinc-800 rounded-xl text-sm text-zinc-100 focus:outline-none focus:border-green-500/50 focus:ring-1 focus:ring-green-500/50 transition-all placeholder:text-zinc-600"
+        />
+      </div>
+
+      <!-- 年级与班级 -->
+      <div class="grid grid-cols-2 gap-4">
+        <div class="space-y-2">
+          <label class="text-sm font-medium text-zinc-300">年级</label>
+          <CustomSelect
+            v-model="form.grade"
+            :options="gradeOptions"
+            placeholder="请选择年级"
+            class-name="w-full custom-select-profile"
+          />
+        </div>
+
+        <div class="space-y-2">
+          <label class="text-sm font-medium text-zinc-300">班级</label>
+          <CustomSelect
+            v-model="form.class"
+            :options="classOptions"
+            placeholder="请选择班级"
+            class-name="w-full custom-select-profile"
+          />
+        </div>
+      </div>
+
+      <!-- 学号 -->
+      <div class="space-y-2">
+        <label class="text-sm font-medium text-zinc-300">学号</label>
+        <input
+          v-model="form.studentId"
+          type="text"
+          placeholder="选填"
+          class="w-full px-4 py-3 bg-zinc-950 border border-zinc-800 rounded-xl text-sm text-zinc-100 focus:outline-none focus:border-green-500/50 focus:ring-1 focus:ring-green-500/50 transition-all placeholder:text-zinc-600"
+        />
+      </div>
+
+      <!-- 邮箱 -->
+      <div class="space-y-2">
+        <label class="text-sm font-medium text-zinc-300">邮箱</label>
+        <input
+          v-model="form.email"
+          type="email"
+          placeholder="选填"
+          class="w-full px-4 py-3 bg-zinc-950 border border-zinc-800 rounded-xl text-sm text-zinc-100 focus:outline-none focus:border-green-500/50 focus:ring-1 focus:ring-green-500/50 transition-all placeholder:text-zinc-600"
+        />
+      </div>
+
+      <div v-if="emailChangedAndNotEmpty" class="space-y-2">
+        <label class="text-sm font-medium text-zinc-300">邮箱验证码</label>
+        <div class="flex gap-2">
+          <input
+            v-model="form.emailCode"
+            type="text"
+            maxlength="6"
+            placeholder="输入6位数字验证码"
+            class="flex-1 px-4 py-3 bg-zinc-950 border border-zinc-800 rounded-xl text-sm text-zinc-100 focus:outline-none focus:border-green-500/50 focus:ring-1 focus:ring-green-500/50 transition-all"
+          />
+          <button
+            type="button"
+            :disabled="!form.email || emailActionLoading"
+            class="px-4 py-3 bg-zinc-800 hover:bg-zinc-700 text-zinc-300 text-xs font-bold rounded-xl transition-all disabled:opacity-50 whitespace-nowrap border border-zinc-700"
+            @click="sendProfileEmailCode"
+          >
+            {{ emailActionLoading ? '发送中...' : '发送验证码' }}
+          </button>
+        </div>
+      </div>
+
+      <!-- 保存按钮 -->
+      <button
+        type="submit"
+        :disabled="loading || !isChanged"
+        class="w-full py-3.5 bg-green-600 hover:bg-green-500 disabled:opacity-50 disabled:hover:bg-green-600 text-white rounded-xl text-sm font-black tracking-widest transition-all shadow-lg shadow-green-900/20 mt-6"
+      >
+        <span v-if="loading" class="flex items-center justify-center gap-2">
+          <Loader2 class="w-4 h-4 animate-spin" />
+          保存中...
+        </span>
+        <span v-else>保存修改</span>
+      </button>
+    </form>
+  </div>
+</template>
+
+<script setup>
+import { ref, reactive, computed, onMounted } from 'vue'
+import { UserCircle2, Loader2 } from '@lucide/vue'
+import { useAuth } from '~/composables/useAuth'
+import { useToast } from '~/composables/useToast'
+import CustomSelect from '~/components/UI/Common/CustomSelect.vue'
+
+const auth = useAuth()
+const { showToast } = useToast()
+const loading = ref(false)
+const emailActionLoading = ref(false)
+
+const form = reactive({
+  name: '',
+  grade: '',
+  class: '',
+  studentId: '',
+  email: '',
+  emailCode: ''
+})
+
+const gradeOptions = [
+  { label: '高一', value: '高一' },
+  { label: '高二', value: '高二' },
+  { label: '高三', value: '高三' }
+]
+
+const classOptions = Array.from({ length: 16 }, (_, i) => ({
+  label: `${i + 1}班`,
+  value: (i + 1).toString()
+}))
+
+// 初始数据用于比较是否被修改
+const initialData = ref({})
+
+onMounted(() => {
+  if (auth.user.value) {
+    form.name = auth.user.value.name || ''
+    form.grade = auth.user.value.grade || ''
+    form.class = auth.user.value.class || ''
+    form.studentId = auth.user.value.studentId || ''
+    form.email = auth.user.value.email || ''
+    form.emailCode = ''
+    
+    initialData.value = { ...form }
+  }
+})
+
+const emailChangedAndNotEmpty = computed(() => {
+  const currentEmail = (form.email || '').trim().toLowerCase()
+  const prevEmail = (initialData.value?.email || '').trim().toLowerCase()
+  return currentEmail && currentEmail !== prevEmail
+})
+
+const isChanged = computed(() => {
+  return form.name !== initialData.value.name ||
+    form.grade !== initialData.value.grade ||
+    form.class !== initialData.value.class ||
+    form.studentId !== initialData.value.studentId ||
+    form.email !== initialData.value.email ||
+    (emailChangedAndNotEmpty.value && form.emailCode.length === 6)
+})
+
+const sendProfileEmailCode = async () => {
+  const emailStr = (form.email || '').toString().trim()
+  if (!emailStr) return
+
+  emailActionLoading.value = true
+  try {
+    await $fetch('/api/user/email/send-code', {
+      method: 'POST',
+      body: { email: emailStr },
+      ...auth.getAuthConfig()
+    })
+    showToast('验证码已发送，请查收邮箱', 'success')
+  } catch (err) {
+    showToast(err?.data?.message || err?.message || '验证码发送失败', 'error')
+  } finally {
+    emailActionLoading.value = false
+  }
+}
+
+const handleUpdateProfile = async () => {
+  if (form.name) {
+    const chineseRegex = /^[\u4e00-\u9fa5]+$/
+    if (!chineseRegex.test(form.name)) {
+      showToast('昵称只能包含汉字', 'error')
+      return
+    }
+  }
+
+  if (emailChangedAndNotEmpty.value && !form.emailCode) {
+    showToast('请填写邮箱验证码', 'error')
+    return
+  }
+
+  loading.value = true
+  try {
+    const response = await $fetch('/api/user/profile', {
+      method: 'PUT',
+      body: form
+    })
+
+    if (response.success) {
+      showToast('个人信息更新成功', 'success')
+      initialData.value = { ...form, emailCode: '' }
+      form.emailCode = ''
+      await auth.refreshUser()
+    }
+  } catch (error) {
+    showToast(error.data?.message || '更新失败', 'error')
+  } finally {
+    loading.value = false
+  }
+}
+</script>
+
+<style scoped>
+.custom-select-profile :deep(> .flex) {
+  padding: 10px 16px;
+  background-color: var(--input-bg, #09090b);
+  border: 1px solid var(--input-border, #27272a);
+  border-radius: 0.75rem;
+  color: var(--input-text, #f4f4f5);
+  font-size: 0.875rem;
+  line-height: 1.25rem;
+  height: 46px;
+}
+
+.custom-select-profile :deep(> .flex:hover) {
+  border-color: var(--input-border-focus, #3f3f46);
+}
+
+.custom-select-profile :deep(> .border-blue-500\/50) {
+  border-color: var(--primary, rgba(34, 197, 94, 0.5)) !important;
+  --tw-ring-color: var(--primary-light, rgba(34, 197, 94, 0.5));
+  box-shadow: var(--tw-ring-inset) 0 0 0 calc(1px + var(--tw-ring-offset-width)) var(--tw-ring-color);
+  background-color: var(--input-bg, #09090b) !important;
+}
+
+.custom-select-profile :deep(.text-\[11px\]) {
+  font-size: 0.875rem;
+  line-height: 1.25rem;
+  font-weight: normal;
+}
+</style>
diff --git a/app/components/Auth/Providers/Google/Icon.vue b/app/components/Auth/Providers/Google/Icon.vue
index 7747b02..3bfdecf 100644
--- a/app/components/Auth/Providers/Google/Icon.vue
+++ b/app/components/Auth/Providers/Google/Icon.vue
@@ -2,19 +2,19 @@
   <svg viewBox="0 0 24 24" width="1.2em" height="1.2em" xmlns="http://www.w3.org/2000/svg">
     <g transform="matrix(1, 0, 0, 1, 27.009001, -39.238998)">
       <path
-        fill="var(--oauth-google-blue)"
+        fill="#4285F4"
         d="M -3.264 51.509 C -3.264 50.719 -3.334 49.969 -3.454 49.239 L -14.754 49.239 L -14.754 53.749 L -8.284 53.749 C -8.574 55.229 -9.424 56.479 -10.684 57.329 L -10.684 60.329 L -6.824 60.329 C -4.564 58.239 -3.264 55.159 -3.264 51.509 Z"
       />
       <path
-        fill="var(--oauth-google-green)"
+        fill="#34A853"
         d="M -14.754 63.239 C -11.514 63.239 -8.804 62.159 -6.824 60.329 L -10.684 57.329 C -11.764 58.049 -13.134 58.489 -14.754 58.489 C -17.884 58.489 -20.534 56.379 -21.484 53.529 L -25.464 53.529 L -25.464 56.619 C -23.494 60.539 -19.444 63.239 -14.754 63.239 Z"
       />
       <path
-        fill="var(--oauth-google-yellow)"
+        fill="#FBBC05"
         d="M -21.484 53.529 C -21.734 52.809 -21.864 52.039 -21.864 51.239 C -21.864 50.439 -21.724 49.669 -21.484 48.949 L -21.484 45.859 L -25.464 45.859 C -26.284 47.479 -26.754 49.299 -26.754 51.239 C -26.754 53.179 -26.284 54.999 -25.464 56.619 L -21.484 53.529 Z"
       />
       <path
-        fill="var(--oauth-google-red)"
+        fill="#EA4335"
         d="M -14.754 43.989 C -12.984 43.989 -11.404 44.599 -10.154 45.789 L -6.734 42.369 C -8.804 40.429 -11.514 39.239 -14.754 39.239 C -19.444 39.239 -23.494 41.939 -25.464 45.859 L -21.484 48.949 C -20.534 46.099 -17.884 43.989 -14.754 43.989 Z"
       />
     </g>
diff --git a/app/components/Auth/RegisterForm.vue b/app/components/Auth/RegisterForm.vue
new file mode 100644
index 0000000..ee8fbf2
--- /dev/null
+++ b/app/components/Auth/RegisterForm.vue
@@ -0,0 +1,720 @@
+<template>
+  <div class="login-form">
+    <div class="form-header">
+      <h2>注册账号</h2>
+      <p>创建您的VoiceHub账户</p>
+    </div>
+
+    <form :class="['auth-form', { 'has-error': !!error }]" @submit.prevent="handleRegister">
+      <div class="form-group">
+        <label for="username">真实姓名（大名）</label>
+        <div class="input-wrapper">
+          <svg
+            class="input-icon"
+            fill="none"
+            stroke="currentColor"
+            stroke-width="2"
+            viewBox="0 0 24 24"
+          >
+            <path d="M20 21v-2a4 4 0 0 0-4-4H8a4 4 0 0 0-4 4v2" />
+            <circle cx="12" cy="7" r="4" />
+          </svg>
+          <input
+            id="username"
+            v-model="username"
+            :class="{ 'input-error': error }"
+            placeholder="请输入真实姓名（大名），仅限汉字"
+            required
+            type="text"
+            @input="error = ''"
+          >
+        </div>
+      </div>
+
+      <div class="form-group">
+        <label for="password">密码</label>
+        <div class="input-wrapper">
+          <svg
+            class="input-icon"
+            fill="none"
+            stroke="currentColor"
+            stroke-width="2"
+            viewBox="0 0 24 24"
+          >
+            <rect height="11" rx="2" ry="2" width="18" x="3" y="11" />
+            <circle cx="12" cy="16" r="1" />
+            <path d="M7 11V7a5 5 0 0 1 10 0v4" />
+          </svg>
+          <input
+            id="password"
+            v-model="password"
+            :class="{ 'input-error': error }"
+            :type="showPassword ? 'text' : 'password'"
+            placeholder="请输入密码"
+            required
+            @input="error = ''"
+          >
+          <button class="password-toggle" type="button" @click="showPassword = !showPassword">
+            <svg
+              v-if="showPassword"
+              fill="none"
+              stroke="currentColor"
+              stroke-width="2"
+              viewBox="0 0 24 24"
+            >
+              <path
+                d="M17.94 17.94A10.07 10.07 0 0 1 12 20c-7 0-11-8-11-8a18.45 18.45 0 0 1 5.06-5.94M9.9 4.24A9.12 9.12 0 0 1 12 4c7 0 11 8 11 8a18.5 18.5 0 0 1-2.16 3.19m-6.72-1.07a3 3 0 1 1-4.24-4.24"
+              />
+              <line x1="1" x2="23" y1="1" y2="23" />
+            </svg>
+            <svg v-else fill="none" stroke="currentColor" stroke-width="2" viewBox="0 0 24 24">
+              <path d="M1 12s4-8 11-8 11 8 11 8-4 8-11 8-11-8-11-8z" />
+              <circle cx="12" cy="12" r="3" />
+            </svg>
+          </button>
+        </div>
+      </div>
+
+      <div class="form-row" style="display: flex; gap: 12px;">
+        <div class="form-group" style="flex: 1;">
+          <label for="grade">年级</label>
+          <div class="input-wrapper">
+            <CustomSelect
+              v-model="grade"
+              :options="gradeOptions"
+              placeholder="请选择年级"
+              class-name="w-full custom-select-override"
+              @update:model-value="error = ''"
+            />
+          </div>
+        </div>
+
+        <div class="form-group" style="flex: 1;">
+          <label for="class">班级</label>
+          <div class="input-wrapper">
+            <CustomSelect
+              v-model="studentClass"
+              :options="classOptions"
+              placeholder="请选择班级"
+              class-name="w-full custom-select-override"
+              @update:model-value="error = ''"
+            />
+          </div>
+        </div>
+      </div>
+
+      <div class="form-group">
+        <label for="studentId">学号 (选填)</label>
+        <div class="input-wrapper">
+          <svg class="input-icon" fill="none" stroke="currentColor" stroke-width="2" viewBox="0 0 24 24">
+            <path d="M4 19.5A2.5 2.5 0 0 1 6.5 17H20" />
+            <path d="M6.5 2H20v20H6.5A2.5 2.5 0 0 1 4 19.5v-15A2.5 2.5 0 0 1 6.5 2z" />
+          </svg>
+          <input
+            id="studentId"
+            v-model="studentId"
+            :class="{ 'input-error': error }"
+            placeholder="请输入学号"
+            type="text"
+            @input="error = ''"
+          >
+        </div>
+      </div>
+
+      <div class="form-group">
+        <label for="email">邮箱 (选填)</label>
+        <div class="input-wrapper">
+          <svg
+            class="input-icon"
+            fill="none"
+            stroke="currentColor"
+            stroke-width="2"
+            viewBox="0 0 24 24"
+          >
+            <path d="M4 4h16v16H4z" />
+            <path d="m4 6 8 7 8-7" />
+          </svg>
+          <input
+            id="email"
+            v-model="email"
+            :class="{ 'input-error': error }"
+            placeholder="例如：name@example.com"
+            type="email"
+            @input="error = ''"
+          >
+        </div>
+      </div>
+
+      <div v-if="email" class="form-group">
+        <label for="emailCode">邮箱验证码</label>
+        <div class="flex gap-2" style="display: flex; gap: 8px;">
+          <div class="input-wrapper flex-1" style="flex: 1;">
+            <svg
+              class="input-icon"
+              fill="none"
+              stroke="currentColor"
+              stroke-width="2"
+              viewBox="0 0 24 24"
+            >
+              <path d="M12 22s8-4 8-10V5l-8-3-8 3v7c0 6 8 10 8 10z" />
+            </svg>
+            <input
+              id="emailCode"
+              v-model="emailCode"
+              type="text"
+              maxlength="6"
+              placeholder="6位数字验证码"
+              class="form-input"
+              :disabled="loading"
+            >
+          </div>
+          <button
+            type="button"
+            :disabled="!email || emailActionLoading"
+            class="px-4 py-3 bg-zinc-800 hover:bg-zinc-700 text-zinc-300 text-xs font-bold rounded-xl transition-all disabled:opacity-50 whitespace-nowrap border border-zinc-700"
+            @click="sendRegisterEmailCode"
+          >
+            {{ emailActionLoading ? '发送中...' : '发送验证码' }}
+          </button>
+        </div>
+      </div>
+
+      <div v-if="error" class="error-container">
+        <svg
+          class="error-icon"
+          fill="none"
+          stroke="currentColor"
+          stroke-width="2"
+          viewBox="0 0 24 24"
+        >
+          <circle cx="12" cy="12" r="10" />
+          <line x1="12" x2="12" y1="8" y2="12" />
+          <line x1="12" x2="12.01" y1="16" y2="16" />
+        </svg>
+        <span class="error-message">{{ error }}</span>
+      </div>
+
+      <button :disabled="loading" class="submit-btn register-btn" type="submit">
+        <svg v-if="loading" class="loading-spinner" viewBox="0 0 24 24">
+          <circle
+            cx="12"
+            cy="12"
+            fill="none"
+            r="10"
+            stroke="currentColor"
+            stroke-dasharray="31.416"
+            stroke-dashoffset="31.416"
+            stroke-linecap="round"
+            stroke-width="2"
+          >
+            <animate
+              attributeName="stroke-dasharray"
+              dur="2s"
+              repeatCount="indefinite"
+              values="0 31.416;15.708 15.708;0 31.416"
+            />
+            <animate
+              attributeName="stroke-dashoffset"
+              dur="2s"
+              repeatCount="indefinite"
+              values="0;-15.708;-31.416"
+            />
+          </circle>
+        </svg>
+        <span v-if="loading">注册中...</span>
+        <span v-else>注 册</span>
+      </button>
+    </form>
+
+    <div class="form-footer" style="margin-top: 12px; margin-bottom: 12px;">
+      <p class="help-text">
+        已有账号？ <NuxtLink to="/login" style="color: var(--primary);">去登录</NuxtLink>
+      </p>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue'
+import { useAuth } from '~/composables/useAuth'
+import CustomSelect from '~/components/UI/Common/CustomSelect.vue'
+
+const username = ref('')
+const password = ref('')
+const email = ref('')
+const emailCode = ref('')
+const grade = ref('')
+const studentClass = ref('')
+const studentId = ref('')
+const error = ref('')
+const loading = ref(false)
+const showPassword = ref(false)
+const emailActionLoading = ref(false)
+const pendingRedirectPath = ref('/')
+
+const auth = useAuth()
+
+const gradeOptions = [
+  { label: '高一', value: '高一' },
+  { label: '高二', value: '高二' },
+  { label: '高三', value: '高三' }
+]
+
+const classOptions = Array.from({ length: 16 }, (_, i) => ({
+  label: `${i + 1}班`,
+  value: (i + 1).toString()
+}))
+
+const sendRegisterEmailCode = async () => {
+  if (!email.value || !email.value.trim()) {
+    error.value = '请先输入邮箱'
+    return
+  }
+
+  emailActionLoading.value = true
+  try {
+    await $fetch('/api/auth/email/send-code', {
+      method: 'POST',
+      body: { email: email.value.trim() }
+    })
+    if ((window as any).$showNotification) {
+      ;(window as any).$showNotification('验证码已发送，请查收邮箱', 'success')
+    }
+  } catch (err: any) {
+    if ((window as any).$showNotification) {
+      ;(window as any).$showNotification(err.data?.message || err.message || '验证码发送失败', 'error')
+    }
+  } finally {
+    emailActionLoading.value = false
+  }
+}
+
+const handleRegister = async () => {
+  if (!username.value || !password.value || !grade.value || !studentClass.value) {
+    error.value = '请填写完整的注册信息'
+    return
+  }
+
+  const chineseRegex = /^[\u4e00-\u9fa5]+$/
+  if (!chineseRegex.test(username.value)) {
+    error.value = '真实姓名（大名）只能包含汉字'
+    return
+  }
+
+  if (email.value && !emailCode.value) {
+    error.value = '请填写邮箱验证码'
+    return
+  }
+
+  error.value = ''
+  loading.value = true
+
+  try {
+    const response = await auth.register({
+      username: username.value,
+      password: password.value,
+      email: email.value,
+      emailCode: emailCode.value,
+      grade: grade.value,
+      class: studentClass.value,
+      studentId: studentId.value
+    })
+    
+    if (response?.success) {
+      pendingRedirectPath.value = auth.isAdmin.value ? '/dashboard' : '/'
+      await navigateTo(pendingRedirectPath.value)
+    }
+  } catch (err: any) {
+    error.value = err.data?.message || err.message || '注册失败'
+  } finally {
+    loading.value = false
+  }
+}
+</script>
+
+<style scoped>
+.login-form {
+  width: 100%;
+  max-width: 400px;
+  animation: fadeInUp 0.4s ease both;
+}
+
+@keyframes fadeInUp {
+  0% {
+    opacity: 0;
+    transform: translateY(10px);
+  }
+  100% {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
+
+.form-header {
+  text-align: center;
+  margin-bottom: 32px;
+}
+
+.form-header h2 {
+  font-size: 28px;
+  font-weight: var(--font-bold);
+  color: var(--text-primary);
+  margin: 0 0 8px 0;
+}
+
+.form-header p {
+  font-size: 16px;
+  color: var(--text-tertiary);
+  margin: 0;
+}
+
+.auth-form {
+  display: flex;
+  flex-direction: column;
+  gap: 24px;
+}
+
+.form-group {
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+}
+
+.form-group label {
+  font-size: 14px;
+  font-weight: var(--font-medium);
+  color: var(--text-secondary);
+}
+
+.input-wrapper {
+  position: relative;
+  display: flex;
+  align-items: center;
+}
+
+.input-wrapper::after {
+  content: '';
+  position: absolute;
+  left: 12px;
+  right: 12px;
+  bottom: 8px;
+  height: 2px;
+  background: var(--primary);
+  border-radius: 2px;
+  opacity: 0;
+  transform: scaleX(0.2);
+  transition:
+    transform var(--transition-normal),
+    opacity var(--transition-normal);
+}
+
+.input-wrapper:focus-within::after {
+  opacity: 0.35;
+  transform: scaleX(1);
+}
+
+.input-icon {
+  position: absolute;
+  left: 16px;
+  width: 20px;
+  height: 20px;
+  color: var(--text-quaternary);
+  z-index: 1;
+}
+
+.custom-select-override {
+  width: 100%;
+}
+
+.custom-select-override :deep(> .flex) {
+  padding: 14px 16px;
+  background: var(--input-bg);
+  border: 1px solid var(--input-border);
+  border-radius: var(--radius-lg);
+  color: var(--input-text);
+  height: 54px;
+}
+
+.custom-select-override :deep(> .flex:hover) {
+  filter: brightness(1.03);
+}
+
+.custom-select-override :deep(> .border-blue-500\/50) {
+  border-color: var(--input-border-focus);
+  box-shadow: var(--input-shadow-focus);
+}
+
+.custom-select-override :deep(.text-\[11px\]) {
+  font-size: 16px;
+  font-weight: normal;
+}
+
+.custom-select-override :deep(.text-\[8px\]) {
+  display: none;
+}
+
+.input-wrapper input {
+  width: 100%;
+  padding: 16px 16px 16px 48px;
+  background: var(--input-bg);
+  border: 1px solid var(--input-border);
+  border-radius: var(--radius-lg);
+  color: var(--input-text);
+  font-size: 16px;
+  transition:
+    border-color var(--transition-normal),
+    box-shadow var(--transition-normal);
+}
+
+.input-wrapper input::placeholder {
+  color: var(--input-placeholder);
+}
+
+.input-wrapper input:focus {
+  outline: none;
+  border-color: var(--input-border-focus);
+  box-shadow: var(--input-shadow-focus);
+}
+
+.input-wrapper input:focus + .input-icon,
+.input-wrapper input:not(:placeholder-shown) + .input-icon {
+  color: var(--primary);
+}
+
+.input-wrapper input:hover {
+  filter: brightness(1.03);
+}
+
+.input-wrapper input.input-error {
+  border-color: var(--error);
+  box-shadow: 0 0 0 3px var(--error-light);
+}
+
+.password-toggle {
+  position: absolute;
+  right: 16px;
+  width: 20px;
+  height: 20px;
+  background: none;
+  border: none;
+  color: var(--text-quaternary);
+  cursor: pointer;
+  transition:
+    color 0.2s ease,
+    transform var(--transition-fast);
+  z-index: 1;
+}
+
+.password-toggle:hover {
+  color: var(--text-primary);
+}
+
+.password-toggle:active {
+  transform: scale(0.95);
+}
+
+.password-toggle svg {
+  width: 100%;
+  height: 100%;
+}
+
+.error-container {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  padding: 16px;
+  background: var(--error-light);
+  border: 1px solid var(--error-border);
+  border-radius: var(--radius-lg);
+  color: var(--error);
+}
+
+.auth-form.has-error {
+  animation: shake 0.4s ease;
+}
+
+@keyframes shake {
+  0% {
+    transform: translateX(0);
+  }
+  15% {
+    transform: translateX(-6px);
+  }
+  30% {
+    transform: translateX(6px);
+  }
+  45% {
+    transform: translateX(-4px);
+  }
+  60% {
+    transform: translateX(4px);
+  }
+  75% {
+    transform: translateX(-2px);
+  }
+  90% {
+    transform: translateX(2px);
+  }
+  100% {
+    transform: translateX(0);
+  }
+}
+
+.error-icon {
+  width: 20px;
+  height: 20px;
+  flex-shrink: 0;
+}
+
+.error-message {
+  font-size: 14px;
+  font-weight: var(--font-medium);
+}
+
+.submit-btn {
+  width: 100%;
+  padding: 16px;
+  background: var(--primary);
+  color: var(--text-primary, #ffffff);
+  border: none;
+  border-radius: var(--radius-lg);
+  font-size: 16px;
+  font-weight: var(--font-semibold);
+  cursor: pointer;
+  transition:
+    background var(--transition-normal),
+    box-shadow var(--transition-normal),
+    transform var(--transition-fast);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 8px;
+  position: relative;
+  overflow: hidden;
+}
+
+.submit-btn:hover:not(:disabled) {
+  background: var(--primary-dark);
+  box-shadow: var(--shadow-lg);
+  transform: translateY(-1px);
+}
+
+.submit-btn:disabled {
+  opacity: 0.6;
+  cursor: not-allowed;
+  transform: none;
+}
+
+.submit-btn:active:not(:disabled) {
+  transform: translateY(0);
+}
+
+.register-btn {
+  padding: 18px;
+  font-size: 18px;
+  margin-top: 8px;
+}
+
+.loading-spinner {
+  width: 20px;
+  height: 20px;
+}
+
+.form-footer {
+  margin-top: 24px;
+  text-align: center;
+}
+
+.help-text {
+  font-size: 12px;
+  color: var(--text-quaternary);
+  margin: 0;
+  line-height: 1.5;
+}
+
+.help-text code {
+  background: var(--input-bg);
+  padding: 2px 6px;
+  border-radius: 4px;
+  font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', monospace;
+  color: var(--primary);
+  font-size: 11px;
+}
+
+.webauthn-section {
+  width: 100%;
+}
+
+.divider {
+  display: flex;
+  align-items: center;
+  text-align: center;
+  margin: 20px 0;
+  color: var(--text-quaternary);
+  font-size: 12px;
+}
+
+.divider::before,
+.divider::after {
+  content: '';
+  flex: 1;
+  border-bottom: 1px solid var(--input-border);
+}
+
+.divider span {
+  padding: 0 10px;
+}
+
+.webauthn-btn {
+  width: 100%;
+  padding: 14px;
+  background: var(--surface-secondary);
+  color: var(--text-primary);
+  border: 1px solid var(--input-border);
+  border-radius: var(--radius-lg);
+  font-size: 15px;
+  font-weight: var(--font-medium);
+  cursor: pointer;
+  transition: all 0.2s ease;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 10px;
+}
+
+.webauthn-btn:hover:not(:disabled) {
+  background: var(--surface-tertiary);
+  border-color: var(--input-border-focus);
+}
+
+.webauthn-btn:disabled {
+  opacity: 0.6;
+  cursor: not-allowed;
+}
+
+.webauthn-icon {
+  width: 20px;
+  height: 20px;
+}
+
+/* 响应式设计 */
+@media (max-width: 480px) {
+  .form-header h2 {
+    font-size: 24px;
+  }
+
+  .form-header p {
+    font-size: 14px;
+  }
+
+  .input-wrapper input {
+    padding: 14px 14px 14px 44px;
+    font-size: 16px; /* 防止iOS缩放 */
+  }
+
+  .submit-btn {
+    padding: 14px;
+    font-size: 16px;
+  }
+}
+</style>
diff --git a/app/components/Auth/TwoFactorSetup.vue b/app/components/Auth/TwoFactorSetup.vue
index c114c1d..31b3ab8 100644
--- a/app/components/Auth/TwoFactorSetup.vue
+++ b/app/components/Auth/TwoFactorSetup.vue
@@ -1,18 +1,18 @@
 <template>
   <div class="space-y-6">
     <!-- 状态显示 -->
-    <div class="flex items-center justify-between p-4 bg-bg-primary-50 rounded-xl border border-border-secondary">
+    <div class="flex items-center justify-between p-4 bg-zinc-950/50 rounded-xl border border-zinc-800">
       <div class="flex items-center gap-3">
         <div 
-          class="p-2 rounded-lg flex items-center justify-center"
-          :class="isEnabled ? 'bg-success-10 text-success' : 'bg-bg-tertiary text-text-tertiary'"
+          class="p-2 rounded-lg"
+          :class="isEnabled ? 'bg-green-500/10 text-green-500' : 'bg-zinc-800 text-zinc-500'"
         >
           <ShieldCheck :size="20" />
         </div>
         <div>
-          <h3 class="font-bold text-text-primary">{{ locale.title }}</h3>
-          <p class="text-xs text-text-tertiary">
-            {{ isEnabled ? locale.enabledDesc : locale.disabledDesc }}
+          <h3 class="font-bold text-zinc-100">双重认证 (2FA)</h3>
+          <p class="text-xs text-zinc-500">
+            {{ isEnabled ? '您的账户已开启双重认证保护' : '未开启，建议开启以提升账户安全性' }}
           </p>
         </div>
       </div>
@@ -20,36 +20,36 @@
       <button
         v-if="!isEnabled"
         @click="startSetup"
-        class="px-4 py-2 bg-primary-hover hover:bg-primary text-text-primary text-sm font-bold rounded-lg transition-colors"
+        class="px-4 py-2 bg-blue-600 hover:bg-blue-500 text-white text-sm font-bold rounded-lg transition-colors"
       >
-        {{ locale.enable }}
+        开启
       </button>
       <button
         v-else
         @click="confirmDisable"
-        class="px-4 py-2 bg-error-10 hover:bg-error-20 text-error border border-error-20 text-sm font-bold rounded-lg transition-colors"
+        class="px-4 py-2 bg-red-500/10 hover:bg-red-500/20 text-red-500 border border-red-500/20 text-sm font-bold rounded-lg transition-colors"
       >
-        {{ locale.disable }}
+        关闭
       </button>
     </div>
 
     <!-- 开启流程 -->
-    <div v-if="showSetup" class="bg-bg-primary-30 rounded-xl border border-border-secondary p-6 space-y-6 animate-in fade-in slide-in-from-top-4">
+    <div v-if="showSetup" class="bg-zinc-950/30 rounded-xl border border-zinc-800 p-6 space-y-6 animate-in fade-in slide-in-from-top-4">
       <div class="flex items-start justify-between">
         <div>
-          <h4 class="font-bold text-text-primary mb-1">{{ locale.setupTitle }}</h4>
-          <p class="text-sm text-text-tertiary">{{ locale.setupDesc }}</p>
+          <h4 class="font-bold text-zinc-100 mb-1">设置双重认证</h4>
+          <p class="text-sm text-zinc-400">请使用 Google Authenticator 或其他验证器应用扫描下方二维码</p>
         </div>
-        <button @click="cancelSetup" class="text-text-tertiary hover:text-text-secondary">
+        <button @click="cancelSetup" class="text-zinc-500 hover:text-zinc-300">
           <X :size="20" />
         </button>
       </div>
 
       <div class="flex flex-col md:flex-row gap-8 items-center md:items-start">
         <!-- 二维码区域 -->
-        <div class="flex-shrink-0 bg-bg-secondary p-2 rounded-lg">
+        <div class="flex-shrink-0 bg-white p-2 rounded-lg">
           <img v-if="qrCodeUrl" :src="qrCodeUrl" alt="2FA QR Code" class="w-48 h-48" />
-          <div v-else class="w-48 h-48 flex items-center justify-center bg-bg-secondary text-text-tertiary">
+          <div v-else class="w-48 h-48 flex items-center justify-center bg-zinc-100 text-zinc-400">
             <Loader2 class="animate-spin" />
           </div>
         </div>
@@ -57,17 +57,17 @@
         <!-- 验证输入区域 -->
         <div class="flex-1 space-y-4 w-full">
           <div>
-            <label class="block text-xs font-bold text-text-tertiary uppercase tracking-wider mb-2">
-              {{ locale.manualKey }}
+            <label class="block text-xs font-bold text-zinc-500 uppercase tracking-wider mb-2">
+              手动输入密钥
             </label>
             <div class="flex items-center gap-2">
-              <code class="px-3 py-2 bg-bg-secondary rounded-lg text-text-secondary font-mono text-sm border border-border-secondary select-all">
+              <code class="px-3 py-2 bg-zinc-900 rounded-lg text-zinc-300 font-mono text-sm border border-zinc-800 select-all">
                 {{ secret }}
               </code>
               <button 
                 @click="copySecret"
-                class="p-2 hover:bg-bg-tertiary rounded-lg text-text-tertiary transition-colors"
-                :title="locale.copyKey"
+                class="p-2 hover:bg-zinc-800 rounded-lg text-zinc-400 transition-colors"
+                title="复制密钥"
               >
                 <Copy :size="16" />
               </button>
@@ -75,25 +75,25 @@
           </div>
 
           <div>
-            <label class="block text-xs font-bold text-text-tertiary uppercase tracking-wider mb-2">
-              {{ locale.code }}
+            <label class="block text-xs font-bold text-zinc-500 uppercase tracking-wider mb-2">
+              验证码
             </label>
             <div class="flex gap-2">
               <input
                 v-model="verificationCode"
                 type="text"
-                :placeholder="locale.codePlaceholder"
+                placeholder="请输入6位验证码"
                 maxlength="6"
-                class="flex-1 bg-bg-secondary border border-border-secondary rounded-lg px-4 py-2 text-text-primary placeholder-text-disabled focus:outline-none focus:border-primary focus:ring-1 focus:ring-primary transition-all font-mono text-center tracking-widest"
+                class="flex-1 bg-zinc-900 border border-zinc-800 rounded-lg px-4 py-2 text-zinc-100 placeholder-zinc-600 focus:outline-none focus:border-blue-500 focus:ring-1 focus:ring-blue-500 transition-all font-mono text-center tracking-widest"
                 @keyup.enter="enable2FA"
               />
               <button
                 @click="enable2FA"
                 :disabled="loading || verificationCode.length !== 6"
-                class="px-6 py-2 bg-primary-hover hover:bg-primary disabled:opacity-50 disabled:cursor-not-allowed text-text-primary font-bold rounded-lg transition-colors flex items-center gap-2"
+                class="px-6 py-2 bg-blue-600 hover:bg-blue-500 disabled:opacity-50 disabled:cursor-not-allowed text-white font-bold rounded-lg transition-colors flex items-center gap-2"
               >
                 <Loader2 v-if="loading" class="animate-spin" :size="16" />
-                <span>{{ locale.verifyAndEnable }}</span>
+                <span>验证并开启</span>
               </button>
             </div>
           </div>
@@ -103,12 +103,12 @@
 
     <UIConfirmDialog
       :show="showDisableConfirm"
-      :title="locale.disableTitle"
-      :message="locale.disableContent"
-      :confirm-text="locale.verifyAndDisable"
-      type="danger"
+      title="关闭双重认证"
+      content="关闭后，您的账户将不再受到双重认证保护。为确保安全，请输入您的登录密码以确认。"
+      confirm-text="验证并关闭"
+      confirm-type="danger"
       :show-input="true"
-      :input-placeholder="locale.passwordPlaceholder"
+      input-placeholder="请输入当前登录密码"
       input-type="password"
       @confirm="disable2FA"
       @cancel="showDisableConfirm = false"
@@ -116,18 +116,14 @@
   </div>
 </template>
 
-<script setup>
-import { computed, ref } from 'vue'
+<script setup lang="ts">
+import { ref } from 'vue'
 import { ShieldCheck, X, Copy, Loader2 } from '@lucide/vue'
 import { useToast } from '~/composables/useToast'
-import { useLocale } from '~/utils/locale'
 
-const props = defineProps({
-  initialEnabled: {
-    type: Boolean,
-    default: false
-  }
-})
+const props = defineProps<{
+  initialEnabled?: boolean
+}>()
 
 const isEnabled = ref(props.initialEnabled || false)
 const showSetup = ref(false)
@@ -137,8 +133,6 @@ const qrCodeUrl = ref('')
 const secret = ref('')
 const verificationCode = ref('')
 const { showToast } = useToast()
-const { auth } = useLocale()
-const locale = computed(() => auth.value?.twoFactorSetup || {})
 
 // 获取当前状态（可选，如果父组件没传可以通过API获取，这里暂时假设父组件会传或者初始化为false，
 // 实际生产中最好有一个 API check status，但为了简化，这里先依赖父组件或默认）
@@ -161,8 +155,8 @@ const startSetup = async () => {
       showSetup.value = true
       verificationCode.value = ''
     }
-  } catch (err) {
-    showToast(err.data?.message || err.message || locale.value.fetchFailed, 'error')
+  } catch (err: any) {
+    showToast(err.data?.message || err.message || '获取验证码失败', 'error')
   } finally {
     loading.value = false
   }
@@ -178,9 +172,9 @@ const cancelSetup = () => {
 const copySecret = async () => {
   try {
     await navigator.clipboard.writeText(secret.value)
-    showToast(locale.value.copied, 'success')
+    showToast('密钥已复制', 'success')
   } catch (err) {
-    showToast(locale.value.copyFailed, 'error')
+    showToast('复制失败', 'error')
   }
 }
 
@@ -199,11 +193,11 @@ const enable2FA = async () => {
 
     if (error.value) throw error.value
 
-    showToast(locale.value.enabled, 'success')
+    showToast('双重认证已开启', 'success')
     isEnabled.value = true
     cancelSetup()
-  } catch (err) {
-    showToast(err.data?.message || err.message || locale.value.verifyFailed, 'error')
+  } catch (err: any) {
+    showToast(err.data?.message || err.message || '验证失败', 'error')
   } finally {
     loading.value = false
   }
@@ -213,9 +207,9 @@ const confirmDisable = () => {
   showDisableConfirm.value = true
 }
 
-const disable2FA = async (password) => {
+const disable2FA = async (password: string) => {
   if (!password) {
-    showToast(locale.value.passwordRequired, 'warning')
+    showToast('请输入密码', 'warning')
     return
   }
   
@@ -228,11 +222,11 @@ const disable2FA = async (password) => {
 
     if (error.value) throw error.value
 
-    showToast(locale.value.disabled, 'success')
+    showToast('双重认证已关闭', 'success')
     isEnabled.value = false
     showDisableConfirm.value = false
-  } catch (err) {
-    showToast(err.data?.message || err.message || locale.value.disableFailed, 'error')
+  } catch (err: any) {
+    showToast(err.data?.message || err.message || '关闭失败', 'error')
   } finally {
     loading.value = false
   }
diff --git a/app/components/Auth/TwoFactorVerify.vue b/app/components/Auth/TwoFactorVerify.vue
index 40b822f..d25b728 100644
--- a/app/components/Auth/TwoFactorVerify.vue
+++ b/app/components/Auth/TwoFactorVerify.vue
@@ -7,35 +7,35 @@
     >
       <div
         v-if="show"
-        class="fixed inset-0 z-[2000] bg-bg-primary-80 backdrop-blur-sm flex items-center justify-center p-4"
+        class="fixed inset-0 z-[2000] bg-black/80 backdrop-blur-sm flex items-center justify-center p-4"
         @click="$emit('cancel')"
       >
         <div 
-          class="w-full max-w-md bg-bg-primary border border-border-secondary rounded-2xl p-6 shadow-2xl space-y-6"
+          class="w-full max-w-md bg-zinc-950 border border-zinc-800 rounded-2xl p-6 shadow-2xl space-y-6"
           @click.stop
         >
           <div class="text-center space-y-2">
-            <h3 class="text-xl font-bold text-text-primary">{{ locale.title }}</h3>
-            <p class="text-sm text-text-tertiary">
-              {{ method === 'totp' ? locale.totpDesc : locale.emailDesc }}
+            <h3 class="text-xl font-bold text-zinc-100">双重认证</h3>
+            <p class="text-sm text-zinc-400">
+              {{ method === 'totp' ? '请输入您的认证器应用生成的6位验证码' : '请输入发送到您邮箱的验证码' }}
             </p>
           </div>
 
           <div class="space-y-4">
             <!-- 邮箱输入 (仅 Email 模式) -->
             <div v-if="method === 'email'" class="space-y-2">
-              <label class="block text-sm text-text-tertiary">
-                {{ locale.emailLabel }}
-                <span v-if="maskedEmail" class="block text-xs text-text-tertiary mt-1">
-                  {{ locale.maskedEmailTip }} {{ maskedEmail }}
+              <label class="block text-sm text-zinc-400">
+                请补全您的邮箱以接收验证码
+                <span v-if="maskedEmail" class="block text-xs text-zinc-500 mt-1">
+                  提示: {{ maskedEmail }}
                 </span>
               </label>
               <div class="relative">
                 <input
                   v-model="emailInput"
                   type="email"
-                  :placeholder="locale.emailPlaceholder"
-                  class="w-full bg-bg-secondary border border-border-secondary rounded-lg px-4 py-3 text-text-primary placeholder-text-disabled focus:outline-none focus:border-primary focus:ring-1 focus:ring-primary transition-all"
+                  placeholder="请输入完整邮箱地址"
+                  class="w-full bg-zinc-900 border border-zinc-800 rounded-lg px-4 py-3 text-zinc-100 placeholder-zinc-700 focus:outline-none focus:border-blue-500 focus:ring-1 focus:ring-blue-500 transition-all"
                   :disabled="emailSent && cooldown > 0"
                   @keyup.enter="!emailSent && sendEmailCode()"
                 />
@@ -50,7 +50,7 @@
                   type="text"
                   maxlength="6"
                   placeholder="000000"
-                  class="w-full bg-bg-secondary border border-border-secondary rounded-lg px-4 py-3 text-center text-2xl font-mono tracking-widest text-text-primary placeholder-text-disabled focus:outline-none focus:border-primary focus:ring-1 focus:ring-primary transition-all"
+                  class="w-full bg-zinc-900 border border-zinc-800 rounded-lg px-4 py-3 text-center text-2xl font-mono tracking-widest text-zinc-100 placeholder-zinc-700 focus:outline-none focus:border-blue-500 focus:ring-1 focus:ring-blue-500 transition-all"
                   @keyup.enter="handleVerify"
                   ref="inputRef"
                 />
@@ -63,13 +63,13 @@
                 type="button"
                 @click="sendEmailCode"
                 :disabled="cooldown > 0 || sending || !emailInput"
-                class="text-sm text-primary hover:text-primary disabled:opacity-50 disabled:cursor-not-allowed transition-colors"
+                class="text-sm text-blue-500 hover:text-blue-400 disabled:opacity-50 disabled:cursor-not-allowed transition-colors"
               >
-                {{ resendButtonText }}
+                {{ cooldown > 0 ? `${cooldown}秒后重新发送` : (emailSent ? '重新发送验证码' : '发送验证码') }}
               </button>
             </div>
 
-            <div v-if="error" class="p-3 bg-error-10 border border-error-20 rounded-lg flex items-center gap-2 text-error text-sm">
+            <div v-if="error" class="p-3 bg-red-500/10 border border-red-500/20 rounded-lg flex items-center gap-2 text-red-500 text-sm">
               <AlertCircle :size="16" />
               <span>{{ error }}</span>
             </div>
@@ -77,26 +77,26 @@
             <button
               @click="handleVerify"
               :disabled="loading || code.length !== 6"
-              class="w-full py-3 bg-primary-hover hover:bg-primary disabled:opacity-50 disabled:cursor-not-allowed text-text-primary font-bold rounded-lg transition-colors flex items-center justify-center gap-2"
+              class="w-full py-3 bg-blue-600 hover:bg-blue-500 disabled:opacity-50 disabled:cursor-not-allowed text-white font-bold rounded-lg transition-colors flex items-center justify-center gap-2"
             >
               <Loader2 v-if="loading" class="animate-spin" :size="18" />
-              <span>{{ locale.verifyLogin }}</span>
+              <span>验证登录</span>
             </button>
             
             <!-- 切换验证方式按钮 -->
             <button
               v-if="hasMultipleMethods"
               @click="toggleMethod"
-              class="w-full py-2 text-primary hover:text-primary text-sm transition-colors"
+              class="w-full py-2 text-blue-500 hover:text-blue-400 text-sm transition-colors"
             >
-              {{ method === 'totp' ? locale.switchToEmail : locale.switchToTotp }}
+              {{ method === 'totp' ? '无法使用验证器？切换到邮箱验证' : '使用验证器应用验证' }}
             </button>
 
             <button
               @click="$emit('cancel')"
-              class="w-full py-2 text-text-tertiary hover:text-text-secondary text-sm transition-colors"
+              class="w-full py-2 text-zinc-500 hover:text-zinc-300 text-sm transition-colors"
             >
-              {{ locale.backLogin }}
+              返回登录
             </button>
           </div>
         </div>
@@ -109,7 +109,6 @@
 import { ref, watch, nextTick, computed, onUnmounted } from 'vue'
 import { Loader2, AlertCircle } from '@lucide/vue'
 import { useToast } from '~/composables/useToast'
-import { useLocale } from '~/utils/locale'
 
 const props = defineProps<{
   show: boolean
@@ -125,15 +124,6 @@ const emit = defineEmits<{
 }>()
 
 const { showToast } = useToast()
-const { auth } = useLocale()
-const locale = computed(() => auth.value?.twoFactorVerify || {})
-const { format: formatLocaleValue } = useLocaleText(locale)
-const resendButtonText = computed(() => {
-  if (cooldown.value > 0) {
-    return formatLocaleValue(locale.value.resendCountdown, '', cooldown.value)
-  }
-  return emailSent.value ? locale.value.resendCode : locale.value.sendCode
-})
 // 默认优先使用 TOTP，如果没有则使用 Email
 const defaultMethod = computed(() => props.availableMethods?.includes('totp') ? 'totp' : 'email')
 const method = ref(defaultMethod.value)
@@ -170,7 +160,7 @@ const toggleMethod = () => {
 const sendEmailCode = async () => {
   try {
     if (!emailInput.value) {
-      error.value = locale.value.emailRequired || '请输入邮箱'
+      error.value = '请输入您的邮箱地址'
       return
     }
 
@@ -186,7 +176,7 @@ const sendEmailCode = async () => {
       }
     })
 
-    showToast(locale.value.codeSent, 'success')
+    showToast('验证码已发送', 'success')
     emailSent.value = true
     cooldown.value = 60
     timer = setInterval(() => {
@@ -200,7 +190,7 @@ const sendEmailCode = async () => {
     // 发送成功后自动聚焦验证码输入框
     nextTick(() => inputRef.value?.focus())
   } catch (err: any) {
-    error.value = err.data?.message || err.message || locale.value.sendFailed || '发送失败'
+    error.value = err.data?.message || err.message || '发送失败'
   } finally {
     sending.value = false
   }
@@ -218,7 +208,7 @@ const handleVerify = async () => {
     
     emit('success', response)
   } catch (err: any) {
-    error.value = err.data?.message || err.message || locale.value.verifyFailed || '验证失败'
+    error.value = err.data?.message || err.message || '验证失败'
     code.value = '' // 出错清空
   } finally {
     loading.value = false
diff --git a/app/components/Songs/RequestForm.vue b/app/components/Songs/RequestForm.vue
index 1347745..5be91bd 100644
--- a/app/components/Songs/RequestForm.vue
+++ b/app/components/Songs/RequestForm.vue
@@ -1,100 +1,133 @@
 <template>
   <div class="request-form">
     <div class="rules-section desktop-only-rules">
-      <h2 class="rules-title">
-        <Icon :size="16" class="rules-icon" name="bell" />
-        {{ locale.guidelinesTitle }}
-      </h2>
+      <h2 class="section-title">投稿须知</h2>
       <div class="rules-content-desktop">
         <div
           v-if="submissionGuidelines"
-          class="guidelines-content markdown-body"
-          v-html="renderedGuidelines"
+          class="guidelines-content"
+          v-html="submissionGuidelines.replace(/\n/g, '<br>')"
         />
         <div v-else class="default-guidelines">
-          <p v-for="(rule, index) in locale.defaultGuidelines" :key="`desktop-rule-${index}`">
-            {{ index + 1 }}. {{ rule }}
+          <p>1. 投稿时无需加入书名号</p>
+          <p>2. 除DJ外，其他类型歌曲均接收（包括小语种）</p>
+          <p>3. 禁止投递含有违规内容的歌曲</p>
+          <p>4. 点播的歌曲将由管理员进行审核</p>
+          <p>5. 审核通过后将安排在播放时段播出</p>
+          <p>6. 提交即表明我已阅读投稿须知并已知该歌曲有概率无法播出</p>
+          <p>
+            7.
+            本系统仅提供音乐搜索和播放管理功能，不存储任何音乐文件。所有音乐内容均来自第三方音乐平台，版权归原平台及版权方所有。用户点歌时请确保遵守相关音乐平台的服务条款，尊重音乐作品版权。我们鼓励用户支持正版音乐，在官方平台购买和收听喜爱的音乐作品。
           </p>
+          <p>8. 最终解释权归广播站所有</p>
         </div>
       </div>
     </div>
 
-    <!-- 移动端投稿须知 -->
+    <!-- Mobile Rules Section (Original RequestForm.vue style) -->
     <div class="rules-section mobile-only-rules">
       <h3 class="rules-title">
         <Icon :size="16" class="rules-icon" name="bell" />
-        {{ locale.guidelinesTitle }}
+        投稿须知
       </h3>
       <div class="rules-content">
         <div
           v-if="submissionGuidelines"
-          class="guidelines-content markdown-body"
-          v-html="renderedGuidelines"
+          class="guidelines-content"
+          v-html="submissionGuidelines.replace(/\n/g, '<br>')"
         />
         <div v-else class="default-guidelines">
-          <div
-            v-for="(rule, index) in locale.mobileDefaultGuidelines"
-            :key="`mobile-rule-${index}`"
-            class="rule-item"
-          >
-            <span>{{ index + 1 }}.</span> {{ rule }}
+          <div class="rule-item"><span>1.</span> 投稿时无需加入书名号</div>
+          <div class="rule-item"><span>2.</span> 除DJ外，其他类型歌曲均接收（包括小语种）</div>
+          <div class="rule-item"><span>3.</span> 禁止投递含有违规内容的歌曲</div>
+          <div class="rule-item"><span>4.</span> 点播的歌曲将由管理员进行审核</div>
+          <div class="rule-item"><span>5.</span> 审核通过后将安排在播放时段播出</div>
+          <div class="rule-item">
+            <span>6.</span> 提交即表明我已阅读投稿须知并已知该歌曲有概率无法播出
           </div>
+          <div class="rule-item">
+            <span>7.</span>
+            本系统仅提供音乐搜索和播放管理功能，不存储任何音乐文件。所有音乐内容均来自第三方音乐平台，版权归原平台及版权方所有。
+          </div>
+          <div class="rule-item"><span>8.</span> 最终解释权归广播站所有</div>
         </div>
       </div>
     </div>
 
     <div class="form-container">
       <form class="song-request-form" @submit.prevent="handleSearch">
+        <div v-if="user && submissionStatus" class="submission-status-corner">
+          <div
+            :class="[
+              'submission-status-badge',
+              {
+                open: !submissionStatus.submissionClosed,
+                closed: submissionStatus.submissionClosed
+              }
+            ]"
+          >
+            <div class="badge-title">
+              {{ submissionStatus.submissionClosed ? '投稿未开放' : '投稿开放中' }}
+            </div>
+            <div
+              v-if="submissionStatus.timeLimitationEnabled"
+              class="badge-subtitle"
+            >
+              <template v-if="submissionStatus.currentTimePeriod">
+                {{ submissionStatus.currentTimePeriod.name }}
+              </template>
+              <template v-else-if="submissionStatus.nextTimePeriod">
+                下次开始：{{
+                  submissionStatus.nextTimePeriod.startTime
+                    ? formatBeijingDateTime(submissionStatus.nextTimePeriod.startTime)
+                    : submissionStatus.nextTimePeriod.name
+                }}
+              </template>
+            </div>
+          </div>
+        </div>
+
         <!-- 顶部行：搜索和联合投稿 -->
         <div class="form-header-row">
           <!-- 歌曲搜索区域 -->
           <div class="search-section">
-            <div class="search-label">{{ locale.searchLabel }}</div>
+            <div class="search-label">歌曲搜索</div>
             <div class="search-input-group">
               <input
                 id="title"
                 v-model="title"
                 class="search-input"
-                :placeholder="locale.searchPlaceholder"
-                enterkeyhint="search"
-                required
+                placeholder="请输入歌曲名称"
                 type="text"
-                @keydown.enter.prevent="handleSearch"
+                :disabled="!user"
+                @input="checkSimilarSongs"
               >
               <button
-                :disabled="loading || searching || !title.trim()"
+                :disabled="!user || loading || searching || !title.trim()"
                 class="search-button"
                 type="submit"
               >
-                {{ loading || searching ? locale.processing : locale.search }}
-              </button>
-              <button
-                :disabled="loading || searching"
-                :aria-label="locale.audioMatch"
-                class="audio-match-btn"
-                :title="locale.audioMatch"
-                type="button"
-                @click="openAudioMatchModal"
-              >
-                <Icon :size="16" name="mic" />
-                <span class="btn-text">{{ locale.audioMatchShort }}</span>
+                {{ loading || searching ? '处理中...' : '搜索' }}
               </button>
             </div>
+            <div v-if="!user" class="login-required-hint">
+              <NuxtLink class="login-link" to="/login">登录后可搜索并投稿</NuxtLink>
+            </div>
             <button
               v-if="showImportSemesterBtn"
               class="import-semester-btn"
               type="button"
-              :title="locale.importFromPast"
+              title="从往期导入"
               @click="showImportSongsModal = true"
             >
               <Icon :size="16" name="history" />
-              <span class="btn-text">{{ locale.importFromPast }}</span>
+              <span class="btn-text">从往期导入</span>
             </button>
           </div>
 
           <!-- 联合投稿人区域 -->
           <div v-if="user && enableCollaborativeSubmission" class="collaborators-section">
-            <div class="section-label">{{ locale.collaborators }}</div>
+            <div class="section-label">联合投稿</div>
             <div class="collaborators-list">
               <div v-for="user in collaborators" :key="user.id" class="collaborator-tag">
                 <span class="collaborator-name">{{ user.name }}</span>
@@ -112,30 +145,57 @@
                 @click="showUserSearchModal = true"
               >
                 <Icon :size="14" name="plus" />
-                {{ locale.add }}
+                添加
               </button>
             </div>
           </div>
         </div>
 
-        <!-- 搜索结果容器 -->
-        <div class="search-results-container">
-          <div v-if="!user" class="submission-status-horizontal login-required-notice">
-            <Lock class="notice-icon" :size="14" />
-            <span class="notice-text">{{ locale.loginRequiredNotice }}</span>
-            <button class="login-link-btn" type="button" @click="handleLoginRedirect">
-              {{ locale.loginNow }}
+        <div v-if="expectedPlayDateOptions.length > 0" class="expected-play-section">
+          <div class="expected-play-row">
+            <div class="form-group">
+              <div class="input-wrapper">
+                <CustomSelect
+                  v-model="expectedPlayDate"
+                  :options="expectedPlayDateOptions"
+                  label="期望播出日期"
+                  label-key="displayName"
+                  value-key="id"
+                  placeholder="选择日期"
+                />
+              </div>
+            </div>
+          </div>
+
+          <div
+            v-if="selectedExpectedPlayDate && expectedPlaySequencePills.length > 0"
+            class="sequence-grid"
+          >
+            <button
+              v-for="item in expectedPlaySequencePills"
+              :key="item.seq"
+              type="button"
+              :class="[
+                'sequence-pill',
+                item.taken ? 'taken' : 'free',
+                expectedPlaySequence === String(item.seq) ? 'selected' : ''
+              ]"
+              :disabled="item.taken"
+              :title="item.taken ? getTakenSequenceTitle(item.seq) : ''"
+              @click="chooseExpectedPlaySequence(item.seq)"
+            >
+              {{ item.seq }}
             </button>
           </div>
+
+          <div v-if="selectedExpectedPlayDate" class="sequence-hint">绿色可选，红色已占用</div>
+        </div>
+
+        <!-- 搜索结果容器 -->
+        <div class="search-results-container">
           <!-- 投稿状态显示 - 横向布局，只在设置了限额时显示 -->
           <div
-            v-if="
-              user &&
-              submissionStatus &&
-              (submissionStatus.limitEnabled ||
-                submissionStatus.timeLimitationEnabled ||
-                submissionStatus.submissionClosed)
-            "
+            v-if="user && submissionStatus && submissionStatus.limitEnabled"
             class="submission-status-horizontal"
           >
             <!-- 超级管理员提示 -->
@@ -143,18 +203,18 @@
               v-if="user && (user.role === 'SUPER_ADMIN' || user.role === 'ADMIN')"
               class="admin-notice-horizontal"
             >
-              <span class="admin-icon">👑</span>
-              <span class="admin-text">{{ locale.adminUnlimited }}</span>
+              <Crown class="admin-icon" :size="16" />
+              <span class="admin-text">您是管理员，不受投稿限制</span>
             </div>
 
             <!-- 投稿关闭提示 -->
             <div v-else-if="submissionStatus.submissionClosed" class="submission-closed-notice">
-              <span class="closed-icon">🚫</span>
+              <Ban class="closed-icon" :size="16" />
               <span class="closed-text">
                 {{
                   submissionStatus.timeLimitationEnabled && !submissionStatus.currentTimePeriod
-                    ? locale.outsideRequestTime
-                    : locale.submissionClosed
+                    ? '当前不在投稿开放时段'
+                    : '投稿功能已关闭'
                 }}
               </span>
             </div>
@@ -166,35 +226,35 @@
                 v-if="submissionStatus.timeLimitationEnabled && submissionStatus.currentTimePeriod"
                 class="status-item-horizontal"
               >
-                <span class="status-label">{{ locale.currentPeriod }}</span>
+                <span class="status-label">当前时段：</span>
                 <span class="status-value">{{ submissionStatus.currentTimePeriod.name }}</span>
                 <span
                   v-if="submissionStatus.currentTimePeriod.expected > 0"
                   class="status-remaining"
                 >
-                  ({{ locale.accepted }} {{ submissionStatus.currentTimePeriod.accepted }} /
+                  (已接纳 {{ submissionStatus.currentTimePeriod.accepted }} /
                   {{ submissionStatus.currentTimePeriod.expected }})
                 </span>
               </div>
 
               <div v-if="submissionStatus.dailyLimit" class="status-item-horizontal">
-                <span class="status-label">{{ locale.todayRequests }}</span>
+                <span class="status-label">今日投稿：</span>
                 <span class="status-value"
                   >{{ submissionStatus.dailyUsed }} / {{ submissionStatus.dailyLimit }}</span
                 >
                 <span class="status-remaining"
-                  >{{ locale.remaining }}
+                  >剩余
                   {{ Math.max(0, submissionStatus.dailyLimit - submissionStatus.dailyUsed) }}</span
                 >
               </div>
 
               <div v-if="submissionStatus.weeklyLimit" class="status-item-horizontal">
-                <span class="status-label">{{ locale.weeklyRequests }}</span>
+                <span class="status-label">本周投稿：</span>
                 <span class="status-value"
                   >{{ submissionStatus.weeklyUsed }} / {{ submissionStatus.weeklyLimit }}</span
                 >
                 <span class="status-remaining"
-                  >{{ locale.remaining }}
+                  >剩余
                   {{
                     Math.max(0, submissionStatus.weeklyLimit - submissionStatus.weeklyUsed)
                   }}</span
@@ -202,416 +262,31 @@
               </div>
 
               <div v-if="submissionStatus.monthlyLimit" class="status-item-horizontal">
-                <span class="status-label">{{ locale.monthlyRequests }}</span>
+                <span class="status-label">本月投稿：</span>
                 <span class="status-value"
                   >{{ submissionStatus.monthlyUsed }} / {{ submissionStatus.monthlyLimit }}</span
                 >
                 <span class="status-remaining"
-                  >{{ locale.remaining }}
+                  >剩余
                   {{
                     Math.max(0, submissionStatus.monthlyLimit - submissionStatus.monthlyUsed)
                   }}</span
                 >
               </div>
-              <div v-if="cardCodeLimitBypassActive" class="status-item-horizontal">
-                <span class="status-label">{{ locale.cardCodeLabel }}</span>
-                <span class="status-value">{{ locale.cardCodeBypassesLimit }}</span>
-              </div>
             </div>
           </div>
 
-          <!-- 音乐平台选择按钮 -->
-          <div v-if="platformConfigLoaded" class="platform-selection-container">
+          <div class="platform-selection-container">
             <div class="platform-selection">
-              <button
-                v-for="pKey in availablePlatforms"
-                :key="pKey"
-                :class="['platform-btn', { active: platform === pKey }]"
-                type="button"
-                @click="switchPlatform(pKey)"
-              >
-                {{ locale.platforms[pKey] || pKey }}
-              </button>
-            </div>
-
-            <!-- 网易云音乐登录状态和选项 -->
-            <div v-if="platform === 'netease'" class="netease-options">
-              <!-- 加载中状态 -->
-              <div v-if="checkingNeteaseLogin" class="netease-loading-state">
-                <div class="loading-content">
-                  <div class="loading-spinner" />
-                  <span class="loading-text">{{ locale.refreshing }}</span>
-                </div>
-              </div>
-
-              <!-- 未登录状态 -->
-              <div v-else-if="!isNeteaseLoggedIn" class="login-entry">
-                <div class="login-desc">
-                  <p class="login-title">{{ locale.neteaseLoginTitle }}</p>
-                </div>
-                <div class="login-actions">
-                  <button class="login-btn" type="button" @click="showLoginModal = true">
-                    {{ locale.loginNow }}
-                  </button>
-                  <button class="import-btn" type="button" @click="handleImportClick">
-                    <Icon :size="14" name="upload" />
-                    {{ locale.importData }}
-                  </button>
-                </div>
-              </div>
-
-              <!-- 已登录状态 -->
-              <div v-else class="user-status">
-                <div class="user-compact-row">
-                  <div class="user-profile">
-                    <img
-                      v-if="neteaseUser?.avatarUrl"
-                      :src="convertToHttps(neteaseUser.avatarUrl)"
-                      alt="avatar"
-                      class="user-avatar"
-                    >
-                    <span class="user-name">{{ neteaseUser?.nickname || locale.loggedIn }}</span>
-                  </div>
-
-                  <div class="search-type-switch">
-                    <label :class="['radio-label', { active: searchType === 1 }]">
-                      <input v-model="searchType" :value="1" type="radio" > {{ locale.single }}
-                    </label>
-                    <label :class="['radio-label', { active: searchType === 1009 }]">
-                      <input v-model="searchType" :value="1009" type="radio" > {{ locale.podcast }}
-                    </label>
-                  </div>
-
-                  <div class="user-actions-row">
-                    <button
-                      class="action-btn-compact"
-                      :title="locale.recent"
-                      type="button"
-                      @click="showRecentSongsModal = true"
-                    >
-                      <Icon :size="14" name="history" />
-                      <span>{{ locale.recent }}</span>
-                    </button>
-                    <button
-                      class="action-btn-compact"
-                      :title="locale.playlist"
-                      type="button"
-                      @click="openPlaylistModal('netease')"
-                    >
-                      <Icon :size="14" name="playlist" />
-                      <span>{{ locale.playlist }}</span>
-                    </button>
-                    <button
-                      class="action-btn-compact"
-                      :aria-label="locale.exportCookie"
-                      :title="locale.exportCookie"
-                      type="button"
-                      @click="handleExportData"
-                    >
-                      <Icon :size="14" name="download" />
-                    </button>
-                    <button
-                      class="action-btn-compact text-error hover:text-error hover:bg-error-10"
-                      :aria-label="locale.logout"
-                      :title="locale.logout"
-                      type="button"
-                      @click="handleLogoutNetease"
-                    >
-                      <Icon :size="14" name="logout" />
-                    </button>
-                  </div>
-                </div>
-              </div>
-            </div>
-
-            <!-- QQ音乐登录状态和选项 -->
-            <div v-if="platform === 'tencent'" class="netease-options">
-              <!-- 检查中状态 -->
-              <div v-if="checkingQQLogin" class="netease-loading-state">
-                <div class="loading-content">
-                  <div class="loading-spinner" />
-                  <span class="loading-text">{{ locale.refreshing }}</span>
-                </div>
-              </div>
-
-              <!-- 未登录状态 -->
-              <div v-else-if="!isQQMusicLoggedIn" class="login-entry">
-                <div class="login-desc">
-                  <p class="login-title">{{ locale.qqLoginTitle }}</p>
-                </div>
-                <div class="login-actions">
-                  <button
-                    class="login-btn qq-login-btn"
-                    type="button"
-                    @click="showQQLoginModal = true"
-                  >
-                    {{ locale.loginNow }}
-                  </button>
-                  <button class="import-btn" type="button" @click="handleImportClickQQ">
-                    <Icon :size="14" name="upload" />
-                    {{ locale.importData }}
-                  </button>
-                </div>
-              </div>
-
-              <!-- 已登录状态 -->
-              <div v-else class="user-status">
-                <div class="user-compact-row">
-                  <div class="user-profile">
-                    <img
-                      v-if="qqMusicUser?.avatarUrl"
-                      :src="convertToHttps(qqMusicUser.avatarUrl)"
-                      alt="avatar"
-                      class="user-avatar"
-                    >
-                    <div v-else class="qq-user-avatar">
-                      <Icon :size="14" name="music" />
-                    </div>
-                    <span class="user-name">{{ qqMusicUser?.nickname || locale.qqLoggedIn }}</span>
-                  </div>
-
-                  <div class="user-actions-row">
-                    <button
-                      class="action-btn-compact"
-                      :title="locale.playlist"
-                      type="button"
-                      @click="openPlaylistModal('tencent')"
-                    >
-                      <Icon :size="14" name="playlist" />
-                      <span>{{ locale.playlist }}</span>
-                    </button>
-                    <button
-                      class="action-btn-compact"
-                      :aria-label="locale.exportCookie"
-                      :title="locale.exportCookie"
-                      type="button"
-                      @click="handleExportDataQQ"
-                    >
-                      <Icon :size="14" name="download" />
-                    </button>
-                    <button
-                      class="action-btn-compact text-error hover:bg-error-10 hover:text-error"
-                      :aria-label="locale.logoutQQ"
-                      :title="locale.logoutQQ"
-                      type="button"
-                      @click="handleLogoutQQMusic"
-                    >
-                      <Icon :size="14" name="logout" />
-                    </button>
-                  </div>
-                </div>
-              </div>
+              <div class="platform-btn active">酷狗音乐</div>
             </div>
           </div>
 
           <div class="results-content">
-            <!-- 播出时段、备注和点歌券 -->
-            <div v-if="playTimeSelectionEnabled" class="form-row mb-4">
-              <!-- 播出时段选择 -->
-              <div class="form-group">
-                <div class="input-wrapper">
-                  <CustomSelect
-                    v-model="preferredPlayTimeId"
-                    :options="formattedPlayTimes"
-                    :label="locale.preferredPlayTime"
-                    label-key="displayName"
-                    value-key="id"
-                    :placeholder="locale.choosePlayTime"
-                  />
-                </div>
-              </div>
-            </div>
-
-            <div
-              v-if="enableSubmissionRemarks || cardCodeEnabled"
-              class="form-row submission-meta-row"
-            >
-              <div v-if="enableSubmissionRemarks" class="form-group submission-note-group">
-                <div class="input-wrapper">
-                  <div class="mb-2 flex flex-wrap items-center justify-between gap-2">
-                    <label
-                      for="submission-note"
-                      class="text-[12px] font-bold text-text-secondary"
-                      >{{ locale.submissionNote }}</label
-                    >
-                    <div class="flex items-center gap-2">
-                      <button
-                        v-if="cardCodeEnabled"
-                        :class="[
-                          'mobile-card-code-chip',
-                          trimmedCardCode
-                            ? cardCodeValidation.valid
-                              ? 'is-valid'
-                              : cardCodeValidation.valid === false
-                                ? 'is-invalid'
-                                : 'has-code'
-                            : cardCodeFieldMeta.required
-                              ? 'is-required'
-                              : ''
-                        ]"
-                        type="button"
-                        @click="openCardCodeModal"
-                      >
-                        <Icon
-                          :size="12"
-                          :name="
-                            cardCodeValidation.checking
-                              ? 'loader'
-                              : trimmedCardCode
-                                ? cardCodeValidation.valid === false
-                                  ? 'close'
-                                  : 'check'
-                                : 'plus'
-                          "
-                        />
-                        <span>{{ mobileCardCodeLabel }}</span>
-                      </button>
-                      <label class="custom-checkbox-wrapper">
-                        <input
-                          v-model="submissionNotePublic"
-                          type="checkbox"
-                          class="custom-checkbox-input"
-                          :disabled="submissionNoteRequiresApproval || !siteConfigLoaded"
-                        />
-                        <span class="custom-checkbox-box">
-                          <svg
-                            class="custom-checkbox-icon"
-                            viewBox="0 0 12 10"
-                            fill="none"
-                            xmlns="http://www.w3.org/2000/svg"
-                          >
-                            <path
-                              d="M1 5L4.5 8.5L11 1.5"
-                              stroke="currentColor"
-                              stroke-width="2"
-                              stroke-linecap="round"
-                              stroke-linejoin="round"
-                            />
-                          </svg>
-                        </span>
-                        <span class="custom-checkbox-text">{{ locale.publicToUsers }}</span>
-                      </label>
-                    </div>
-                  </div>
-                  <textarea
-                    id="submission-note"
-                    v-model="submissionNote"
-                    maxlength="300"
-                    class="w-full min-h-[60px] rounded-xl border border-border-secondary bg-bg-secondary-60 px-4 py-2 text-sm text-text-primary focus:outline-none focus:border-primary-50 focus:ring-1 focus:ring-primary-10 resize-y transition-all"
-                  />
-                  <div class="mt-1 flex items-center justify-between gap-2 text-[11px] text-text-tertiary">
-                    <p v-if="submissionNoteRequiresApproval" class="flex min-w-0 items-center gap-1">
-                      <Icon name="info" size="12" class="shrink-0 text-warning" />
-                      <span class="truncate">{{ locale.submissionNoteApprovalHint }}</span>
-                    </p>
-                    <span class="shrink-0">{{ submissionNote.length }}/300</span>
-                  </div>
-                </div>
-              </div>
-
-              <div
-                v-if="cardCodeEnabled"
-                :class="[
-                  'form-group card-code-form-group',
-                  { 'mobile-hidden-card-code-group': enableSubmissionRemarks }
-                ]"
-              >
-                <div class="desktop-card-code-panel">
-                  <div class="flex min-w-0 items-center gap-2">
-                    <div class="min-w-0">
-                      <div class="flex flex-wrap items-center gap-2">
-                        <span class="text-xs font-black text-text-primary">{{
-                          locale.cardCode
-                        }}</span>
-                        <span
-                          :class="[
-                            'rounded-full border px-1.5 py-0.5 text-[9px] font-black',
-                            cardCodeFieldMeta.required
-                              ? 'border-warning-30 bg-warning-10 text-warning-300'
-                              : 'border-border-tertiary bg-bg-tertiary-70 text-text-tertiary'
-                          ]"
-                        >
-                          {{ cardCodeFieldMeta.required ? locale.required : locale.optional }}
-                        </span>
-                      </div>
-                      <p
-                        :class="[
-                          'mt-1 truncate text-[11px]',
-                          cardCodeValidation.valid
-                            ? 'text-success-300'
-                            : cardCodeValidation.valid === false
-                              ? 'text-error-80'
-                              : cardCodeFieldMeta.required
-                                ? 'text-warning-300'
-                                : 'text-text-tertiary'
-                        ]"
-                      >
-                        {{ cardCodeStatusText }}
-                      </p>
-                    </div>
-                  </div>
-                  <div class="flex shrink-0 items-center gap-2">
-                    <button
-                      class="inline-flex h-9 items-center justify-center gap-1.5 rounded-lg border border-warning-25 bg-warning-10 px-3 text-xs font-black text-warning-200 transition-all hover:border-warning-40 hover:bg-warning-15"
-                      type="button"
-                      @click="openCardCodeModal"
-                    >
-                      <Icon :size="13" :name="trimmedCardCode ? 'edit' : 'plus'" />
-                      {{ trimmedCardCode ? locale.editCardCode : locale.addCardCode }}
-                    </button>
-                    <button
-                      v-if="trimmedCardCode"
-                      class="inline-flex h-9 w-9 items-center justify-center rounded-lg border border-border-secondary bg-bg-secondary-80 text-text-tertiary transition-all hover:border-error-30 hover:text-error"
-                      :title="locale.clearCardCode"
-                      type="button"
-                      @click="clearCardCode"
-                    >
-                      <Icon :size="13" name="close" />
-                    </button>
-                  </div>
-                </div>
-
-                <button
-                  v-if="!enableSubmissionRemarks"
-                  :class="[
-                    'mobile-card-code-button',
-                    trimmedCardCode
-                      ? cardCodeValidation.valid
-                        ? 'is-valid'
-                        : cardCodeValidation.valid === false
-                          ? 'is-invalid'
-                          : 'has-code'
-                      : cardCodeFieldMeta.required
-                        ? 'is-required'
-                        : ''
-                  ]"
-                  type="button"
-                  @click="openCardCodeModal"
-                >
-                  <span class="flex min-w-0 items-center gap-2">
-                    <Icon
-                      :size="14"
-                      :name="
-                        cardCodeValidation.checking
-                          ? 'loader'
-                          : trimmedCardCode
-                            ? cardCodeValidation.valid === false
-                              ? 'close'
-                              : 'check'
-                            : 'plus'
-                      "
-                    />
-                    <span class="truncate">{{ cardCodeStatusText }}</span>
-                  </span>
-                  <Icon :size="13" name="chevron-right" />
-                </button>
-              </div>
-            </div>
-
             <!-- 加载状态 -->
             <div v-if="searching" class="loading-state">
-              <AppSpinner :size="40" />
-              <p class="loading-text">{{ locale.processing }}</p>
+              <div class="loading-spinner" />
+              <p class="loading-text">处理中...</p>
             </div>
 
             <!-- 搜索结果列表 -->
@@ -620,127 +295,75 @@
                 <TransitionGroup class="results-grid" name="result-item" tag="div">
                   <div
                     v-for="(result, index) in searchResults"
-                    :key="`${platform}-${result.id || index}`"
+                    :key="`kugou-${result.id || index}`"
                     class="result-item group"
                   >
                     <div
                       class="result-cover"
-                      @click.stop="isBilibiliMultiP(result) ? submitSong(result) : playSong(result)"
+                      @click.stop="playSong(result)"
                     >
                       <img
                         :src="convertToHttps(result.cover)"
-                        :alt="locale.coverAlt"
+                        alt="封面"
                         class="cover-img"
                         referrerpolicy="no-referrer"
                       >
-                      <div v-if="!isBilibiliMultiP(result)" class="play-overlay-container">
+                      <div class="play-overlay-container">
                         <div class="play-button-wrapper">
                           <Icon name="play" :size="20" class="play-icon" />
                         </div>
                       </div>
                     </div>
                     <div class="result-info">
-                      <h4 class="result-title">{{ result.song || result.title }}</h4>
+                      <div class="result-title-row">
+                        <h4 class="result-title">{{ result.song || result.title }}</h4>
+                        <span v-if="result.isVip" class="vip-badge">VIP</span>
+                      </div>
                       <p class="result-artist">{{ result.singer || result.artist }}</p>
-                      <p
-                        v-if="result.album"
-                        :class="['result-album', { 'clickable-album': isNeteaseAlbum(result) }]"
-                        :title="isNeteaseAlbum(result) ? locale.albumDetailsTitle : result.album"
-                        @click.stop="isNeteaseAlbum(result) ? openAlbumDetails(result) : null"
-                      >
-                        <span class="album-label">{{ locale.album }}</span>
-                        <span class="album-name">{{ result.album }}</span>
-                        <Icon
-                          v-if="isNeteaseAlbum(result)"
-                          name="external-link"
-                          :size="12"
-                          class="album-link-icon"
-                        />
-                      </p>
+                      <p v-if="result.album" class="result-album">专辑：{{ result.album }}</p>
                     </div>
                     <div class="result-actions">
-                      <!-- QQ音乐上传到网易云按钮（仅当结果确实来自QQ音乐时显示） -->
-                      <button
-                        v-if="isTencentSource(result)"
-                        class="cloud-disk-btn"
-                        :title="locale.uploadToNeteaseCloud"
-                        @click.stop.prevent="openUploadDialog(result)"
-                      >
-                        <Icon name="cloud-upload" :size="18" />
-                      </button>
-
-                      <!-- 多P视频的特殊处理 -->
-                      <div
-                        v-if="
-                          isBilibiliMultiP(result) && getBilibiliEpisodeStatus(result)?.allSubmitted
-                        "
-                        class="similar-song-info"
-                      >
-                        <span class="similar-text">{{ locale.allEpisodesSubmitted }}</span>
-                        <button
-                          v-if="canResubmitBilibiliEpisodes(result)"
-                          :disabled="
-                            !canSubmitFromSearch || isSongBlockedByRestriction(result) || submitting
-                          "
-                          class="select-btn"
-                          @click.stop.prevent="submitSong(result, { replayRequest: true })"
-                        >
-                          {{ locale.chooseEpisodes }}
-                        </button>
-                      </div>
-                      <div
-                        v-else-if="
-                          isBilibiliMultiP(result) &&
-                          getBilibiliEpisodeStatus(result)?.partialSubmitted
-                        "
-                        class="similar-song-info"
-                      >
-                        <span class="similar-text">{{ locale.partialEpisodesSubmitted }}</span>
-                        <button
-                          :disabled="
-                            !canSubmitFromSearch || isSongBlockedByRestriction(result) || submitting
-                          "
-                          class="select-btn"
-                          @click.stop.prevent="submitSong(result)"
-                        >
-                          {{ locale.chooseEpisodes }}
-                        </button>
-                      </div>
-                      <div v-else-if="getSimilarSong(result)" class="similar-song-info">
+                      <!-- 检查是否已存在相似歌曲 -->
+                      <div v-if="getSimilarSong(result)" class="similar-song-info">
                         <!-- 根据歌曲状态显示不同的文本 -->
                         <span
                           v-if="getSimilarSong(result)?.played"
                           class="similar-text status-played"
                         >
-                          {{ locale.songPlayed }}
+                          {{
+                            isSuperAdmin
+                              ? '歌曲已播放'
+                              : enableReplayRequests
+                                ? '歌曲已播放'
+                                : '歌曲已播放'
+                          }}
                         </span>
                         <span
                           v-else-if="getSimilarSong(result)?.scheduled"
                           class="similar-text status-scheduled"
-                          >{{ locale.songScheduled }}</span
+                          >歌曲已排期</span
                         >
-                        <span v-else class="similar-text">{{ locale.songExists }}</span>
+                        <span v-else class="similar-text">歌曲已存在</span>
 
-                        <!-- 管理员或未开启重复投稿限制时可直接重复投稿；否则普通用户仅可申请重播已播放歌曲。 -->
+                        <!-- 超级管理员对已播放的相似歌曲：显示继续投稿 -->
                         <button
-                          v-if="auth.isAdmin.value || (siteConfigLoaded && !enableSubmissionRestriction)"
-                          :disabled="
-                            !canSubmitFromSearch || isSongBlockedByRestriction(result) || submitting
-                          "
+                          v-if="getSimilarSong(result)?.played && isSuperAdmin"
+                          :disabled="submitting"
                           class="select-btn"
-                          @click.stop.prevent="submitSong(result)"
+                          @click.stop.prevent="submitSong(result, { forceResubmit: true })"
                         >
-                          {{ locale.chooseSubmit }}
+                          继续投稿
                         </button>
+
+                        <!-- 开启重播申请且非管理员对已播放的相似歌曲：显示申请重播 -->
                         <button
                           v-else-if="getSimilarSong(result)?.played && enableReplayRequests"
-                          :disabled="
-                            !canSubmitFromSearch || isSongBlockedByRestriction(result) || submitting
-                          "
-                          class="select-btn"
-                          @click.stop.prevent="submitSong(result, { replayRequest: true })"
+                          :disabled="isReplayButtonDisabled(getSimilarSong(result))"
+                          :title="getReplayButtonTitle(getSimilarSong(result))"
+                          class="replay-btn"
+                          @click.stop.prevent="handleRequestReplay(getSimilarSong(result))"
                         >
-                          {{ locale.requestReplay }}
+                          {{ getReplayButtonText(getSimilarSong(result)) }}
                         </button>
 
                         <!-- 其他用户：显示点赞按钮，根据状态设置不同样式 -->
@@ -761,12 +384,12 @@
                           "
                           :title="
                             getSimilarSong(result)?.played
-                              ? locale.playedCannotLike
+                              ? '已播放的歌曲不能点赞'
                               : getSimilarSong(result)?.scheduled
-                                ? locale.scheduledCannotLike
+                                ? '已排期的歌曲不能点赞'
                                 : getSimilarSong(result)?.voted
-                                  ? locale.liked
-                                  : locale.like
+                                  ? '已点赞'
+                                  : '点赞'
                           "
                           class="like-btn"
                           @click.stop.prevent="
@@ -787,43 +410,25 @@
                           </svg>
                           {{
                             getSimilarSong(result)?.played
-                              ? locale.played
+                              ? '已播放'
                               : getSimilarSong(result)?.scheduled
-                                ? locale.scheduled
+                                ? '已排期'
                                 : getSimilarSong(result)?.voted
-                                  ? locale.liked
-                                  : locale.like
+                                  ? '已点赞'
+                                  : '点赞'
                           }}
                         </button>
                       </div>
-                      <button
-                        v-else-if="!user"
-                        class="select-btn login-btn"
-                        @click.stop.prevent="handleLoginRedirect"
-                      >
-                        {{ locale.loginRequiredToSubmit }}
-                      </button>
                       <button
                         v-else
-                        :disabled="
-                          !canSubmitFromSearch || isSongBlockedByRestriction(result) || submitting
-                        "
-                        :title="
-                          isSongBlockedByRestriction(result)
-                            ? getRestrictionMessage(getRestrictionReason(result))
-                            : ''
-                        "
+                        :disabled="submitting"
                         class="select-btn"
                         @click.stop.prevent="submitSong(result)"
                       >
                         {{
                           submitting
-                            ? locale.processing
-                            : platform === 'netease' && searchType === 1009
-                              ? locale.chooseProgram
-                              : isBilibiliMultiP(result)
-                                ? locale.chooseEpisodes
-                                : locale.chooseSubmit
+                            ? '处理中...'
+                            : '选择投稿'
                         }}
                       </button>
                     </div>
@@ -832,60 +437,208 @@
 
                 <!-- 手动输入按钮 -->
                 <div class="no-results-action">
-                  <button
-                    v-if="!user"
-                    class="manual-submit-btn"
-                    type="button"
-                    @click="handleLoginRedirect"
-                  >
-                    {{ locale.loginRequiredToSubmit }}
-                  </button>
-                  <button
-                    v-else
-                    :disabled="!canSubmitFromSearch"
-                    class="manual-submit-btn"
-                    type="button"
-                    @click="showManualModal = true"
-                  >
-                    {{ locale.manualSubmitLong }}
+                  <button class="manual-submit-btn" type="button" @click="showManualModal = true">
+                    以上没有我想要的歌曲，手动输入提交
                   </button>
                 </div>
               </div>
 
               <!-- 空状态 -->
               <div v-else-if="!searching && hasSearched" key="empty" class="empty-state">
-                <div class="empty-icon">🔍</div>
-                <p class="empty-text">{{ locale.noResults }}</p>
-                <p class="empty-hint">{{ locale.noResultsHint }}</p>
-                <button
-                  v-if="!user"
-                  class="manual-submit-btn"
-                  type="button"
-                  @click="handleLoginRedirect"
-                >
-                  {{ locale.loginRequiredToSubmit }}
-                </button>
-                <button
-                  v-else
-                  :disabled="!canSubmitFromSearch"
-                  class="manual-submit-btn"
-                  type="button"
-                  @click="showManualModal = true"
-                >
-                  {{ locale.manualSubmit }}
+                <Search class="empty-icon" :size="32" />
+                <p class="empty-text">未找到相关歌曲</p>
+                <p class="empty-hint">试试其他关键词</p>
+                <button class="manual-submit-btn" type="button" @click="showManualModal = true">
+                  手动输入提交
                 </button>
               </div>
 
               <!-- 初始状态 -->
               <div v-else-if="!searching" key="initial" class="initial-state">
                 <div class="search-illustration">
-                  <img :alt="locale.searchSongsAlt" class="search-svg" :src="getSearchIcon()" >
+                  <img alt="搜索歌曲" class="search-svg" :src="searchIcon" >
                 </div>
               </div>
             </Transition>
           </div>
         </div>
+
+        <!-- 表单底行：播出时段和备注 -->
+        <div class="form-row">
+          <!-- 播出时段选择 -->
+          <div v-if="playTimeSelectionEnabled && playTimes.length > 0" class="form-group">
+            <div class="input-wrapper">
+              <CustomSelect
+                v-model="preferredPlayTimeId"
+                :options="formattedPlayTimes"
+                label="期望播出时段"
+                label-key="displayName"
+                value-key="id"
+                placeholder="选择时段"
+              />
+            </div>
+          </div>
+
+          <div v-if="enableSubmissionRemarks" class="form-group">
+            <div class="input-wrapper">
+              <div class="flex items-center justify-between mb-2">
+                <label for="submission-note" class="text-[12px] font-bold text-zinc-300">投稿备注留言</label>
+                <label class="custom-checkbox-wrapper">
+                  <input
+                    v-model="submissionNotePublic"
+                    type="checkbox"
+                    class="custom-checkbox-input"
+                  >
+                  <span class="custom-checkbox-box">
+                    <svg class="custom-checkbox-icon" viewBox="0 0 12 10" fill="none" xmlns="http://www.w3.org/2000/svg">
+                      <path d="M1 5L4.5 8.5L11 1.5" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+                    </svg>
+                  </span>
+                  <span class="custom-checkbox-text">公开给已登录用户</span>
+                </label>
+              </div>
+              <textarea
+                id="submission-note"
+                v-model="submissionNote"
+                maxlength="300"
+                class="w-full min-h-[60px] rounded-xl border border-zinc-800 bg-zinc-900/60 px-4 py-2 text-sm text-zinc-100 focus:outline-none focus:border-blue-500/50 focus:ring-1 focus:ring-blue-500/50 resize-y transition-all"
+              />
+              <div class="mt-1 flex justify-end text-[11px] text-zinc-500">
+                <span>{{ submissionNote.length }}/300</span>
+              </div>
+            </div>
+          </div>
+        </div>
       </form>
+
+      <div v-if="groupedSimilarSongs.length > 0" class="similar-song-alert">
+        <div class="alert-header">
+          <div class="alert-header-left">
+            <Icon :size="16" class="alert-icon" name="warning" />
+            <span class="alert-title">发现可能相似的歌曲</span>
+          </div>
+          <!-- 宽屏时显示在右上角的继续投稿按钮 -->
+          <button
+            :disabled="submitting"
+            class="ignore-btn desktop-continue-btn"
+            type="button"
+            @click="ignoreSimilar"
+          >
+            继续投稿
+          </button>
+        </div>
+        <div class="similar-songs-list">
+          <!-- 遍历分组后的相似歌曲 -->
+          <div
+            v-for="group in groupedSimilarSongs"
+            :key="group.isSingle ? group.song.id : group.bvid"
+            class="similar-song-item"
+          >
+            <!-- 单个歌曲（非哔哩哔哩多P） -->
+            <template v-if="group.isSingle">
+              <div class="song-info">
+                <p class="song-title">
+                  《{{ group.song.title }} - {{ group.song.artist }}》
+                  <span v-if="group.song.played" class="song-status status-played">已播放</span>
+                  <span v-else-if="group.song.scheduled" class="song-status status-scheduled"
+                    >已排期</span
+                  >
+                </p>
+                <!-- 根据歌曲状态显示不同的提示 -->
+                <p v-if="group.song.played" class="alert-hint">
+                  {{
+                    isSuperAdmin
+                      ? '该歌曲已播放，您可以继续投稿'
+                      : enableReplayRequests
+                        ? '该歌曲已播放'
+                        : '该歌曲已播放，无法进行投票操作'
+                  }}
+                </p>
+                <p v-else-if="group.song.scheduled" class="alert-hint">
+                  该歌曲已排期，无法进行投票操作
+                </p>
+                <p v-else-if="!group.song.voted" class="alert-hint">
+                  该歌曲已在列表中，是否要投票支持？
+                </p>
+                <p v-else-if="group.song.voted" class="voted-status">
+                  <Icon :size="14" name="success" style="margin-right: 4px" />
+                  您已为此歌曲投票
+                </p>
+              </div>
+              <!-- 只有在歌曲未排期、未播放且未投票时才显示投票按钮 -->
+              <div
+                v-if="!group.song.voted && !group.song.played && !group.song.scheduled"
+                class="song-actions"
+              >
+                <button
+                  :disabled="voting || submitting"
+                  class="vote-btn small"
+                  type="button"
+                  @click="voteForSimilar(group.song)"
+                >
+                  {{ voting ? '投票中...' : '投票支持' }}
+                </button>
+              </div>
+              <!-- 如果歌曲已播放且开启了重播申请（超级管理员不显示） -->
+              <div
+                v-if="
+                  group.song.played &&
+                  enableReplayRequests &&
+                  !isSuperAdmin &&
+                  group.song.semester === currentSemester?.name
+                "
+                class="song-actions"
+              >
+                <button
+                  :disabled="isReplayButtonDisabled(group.song)"
+                  :title="getReplayButtonTitle(group.song)"
+                  class="replay-btn small"
+                  type="button"
+                  @click="handleRequestReplay(group.song)"
+                >
+                  {{ getReplayButtonText(group.song) }}
+                </button>
+              </div>
+            </template>
+
+            <!-- 哔哩哔哩多P合集 -->
+            <template v-else>
+              <div class="song-info">
+                <p class="song-title">
+                  《{{ group.title }} - {{ group.artist }}》
+                  <span v-if="group.allPlayed" class="song-status status-played">全部已播放</span>
+                  <span v-else-if="group.allScheduled" class="song-status status-scheduled"
+                    >全部已排期</span
+                  >
+                  <span v-else class="song-status">{{ group.episodes.length }} 个剧集</span>
+                </p>
+                <p class="alert-hint">该合集有 {{ group.episodes.length }} 个剧集在列表中</p>
+              </div>
+              <div class="song-actions">
+                <button
+                  :disabled="submitting"
+                  class="vote-btn small"
+                  type="button"
+                  @click.stop="openSimilarEpisodesModal(group)"
+                >
+                  查看详情
+                </button>
+              </div>
+            </template>
+          </div>
+        </div>
+        <!-- 移动端时显示在底部的继续投稿按钮 -->
+        <div class="alert-actions mobile-continue-actions">
+          <button
+            :disabled="submitting"
+            class="ignore-btn mobile-continue-btn"
+            type="button"
+            @click="ignoreSimilar"
+          >
+            继续投稿
+          </button>
+        </div>
+      </div>
     </div>
 
     <!-- 历史学期导入弹窗 -->
@@ -895,344 +648,16 @@
       @import-success="handleImportSuccess"
     />
 
-    <!-- 网易云音乐登录弹窗 -->
-    <NeteaseLoginModal
-      :show="showLoginModal"
-      @close="showLoginModal = false"
-      @login-success="handleLoginSuccess"
-    />
-
-    <!-- QQ音乐登录弹窗 -->
-    <QQMusicLoginModal
-      :show="showQQLoginModal"
-      @close="showQQLoginModal = false"
-      @login-success="handleQQLoginSuccess"
-    />
-
-    <!-- 播客节目列表弹窗 -->
-    <PodcastEpisodesModal
-      ref="podcastModalRef"
-      :cookie="podcastCookie"
-      :radio-id="selectedPodcastId"
-      :radio-name="selectedPodcastName"
-      :show="showPodcastModal"
-      @close="showPodcastModal = false"
-      @play="handlePodcastPlay"
-      @submit="handlePodcastSubmit"
-    />
-
-    <!-- Bilibili 剧集选择弹窗 -->
-    <BilibiliEpisodesModal
-      ref="bilibiliModalRef"
-      :show="showBilibiliEpisodesModal"
-      :video="selectedBilibiliVideo"
-      :episodes="bilibiliEpisodes"
-      :submitted-episodes="getBilibiliEpisodeStatus(selectedBilibiliVideo)?.submittedEpisodes || []"
-      :current-user-id="user?.id"
-      :allow-played-resubmit="enableReplayRequests"
-      @close="showBilibiliEpisodesModal = false"
-      @play="handleBilibiliEpisodePlay"
-      @submit="handleBilibiliEpisodeSelect"
-      @vote="handleEpisodeVote"
-    />
-
-    <!-- 专辑详情弹窗 -->
-    <AlbumDetailsModal
-      ref="albumModalRef"
-      :show="showAlbumDetailsModal"
-      :album-id="selectedAlbumId"
-      :album-name="selectedAlbumName"
-      :platform="selectedAlbumPlatform"
-      :submitted-songs="songService.songs.value || []"
-      :current-user-id="user?.id"
-      @close="showAlbumDetailsModal = false"
-      @play="handleAlbumSongPlay"
-      @submit="handleAlbumSongSubmit"
-      @vote="handleAlbumSongVote"
-    />
-
-    <!-- 上传到网易云音乐弹窗 -->
-    <NeteaseUploadDialog
-      :show="showUploadDialog"
-      :song="selectedUploadSong"
-      @close="showUploadDialog = false"
-      @show-login="handleShowLogin"
-    />
-
-    <!-- 最近播放歌曲弹窗 -->
-    <RecentSongsModal
-      ref="recentSongsModalRef"
-      :cookie="neteaseCookie"
-      :show="showRecentSongsModal"
-      @close="showRecentSongsModal = false"
-      @play="handleRecentSongPlay"
-      @submit="handleRecentSongSubmit"
-    />
-
-    <!-- 歌单选择弹窗 -->
-    <PlaylistSelectionModal
-      ref="playlistModalRef"
-      :cookie="playlistModalPlatform === 'tencent' ? qqMusicCookie : neteaseCookie"
-      :platform="playlistModalPlatform"
-      :show="showPlaylistModal"
-      :uid="neteaseUser?.userId || neteaseUser?.id"
-      @close="showPlaylistModal = false"
-      @play="handlePlaylistPlay"
-      @submit="handlePlaylistSubmit"
-    />
-
     <!-- 用户搜索弹窗 -->
     <UserSearchModal
       v-if="enableCollaborativeSubmission"
       v-model:show="showUserSearchModal"
       :exclude-ids="[user?.id, ...collaborators.map((u) => u.id)]"
       :multiple="true"
-      :title="locale.addCollaboratorTitle"
+      title="添加联合投稿人"
       @select="handleUserSelect"
     />
 
-    <!-- 点歌券输入弹窗 -->
-    <Teleport to="body">
-      <Transition
-        enter-active-class="transition duration-300 ease-out"
-        enter-from-class="opacity-0 scale-95"
-        enter-to-class="opacity-100 scale-100"
-        leave-active-class="transition duration-200 ease-in"
-        leave-from-class="opacity-100 scale-100"
-        leave-to-class="opacity-0 scale-95"
-      >
-        <div
-          v-if="showCardCodeModal"
-          class="fixed inset-0 z-[105] flex items-end justify-center bg-bg-primary-80 p-3 backdrop-blur-sm sm:items-center sm:p-6"
-          @click.self="closeCardCodeModal"
-        >
-          <div
-            class="w-full max-w-md overflow-hidden rounded-2xl border border-border-secondary bg-bg-secondary shadow-2xl"
-            @click.stop
-          >
-            <div
-              class="flex items-center justify-between border-b border-border-secondary-70 px-5 py-4"
-            >
-              <div>
-                <div class="flex items-center gap-2">
-                  <h3 class="text-base font-black text-text-primary">{{ locale.cardCode }}</h3>
-                  <span
-                    :class="[
-                      'rounded-full border px-1.5 py-0.5 text-[9px] font-black',
-                      cardCodeFieldMeta.required
-                        ? 'border-warning-30 bg-warning-10 text-warning-300'
-                        : 'border-border-tertiary bg-bg-tertiary-70 text-text-tertiary'
-                    ]"
-                  >
-                    {{ cardCodeFieldMeta.required ? locale.required : locale.optional }}
-                  </span>
-                </div>
-                <p class="mt-1 text-[11px] text-text-tertiary">{{ cardCodeFieldMeta.helper }}</p>
-              </div>
-              <button
-                class="flex h-9 w-9 items-center justify-center rounded-xl bg-bg-tertiary-60 text-text-tertiary transition-all hover:bg-bg-tertiary hover:text-text-primary"
-                type="button"
-                @click="closeCardCodeModal"
-              >
-                <Icon :size="15" name="close" />
-              </button>
-            </div>
-
-            <div class="px-5 py-5">
-              <label
-                for="card-code-modal"
-                class="px-1 text-[10px] font-black uppercase tracking-widest text-text-disabled"
-              >
-                {{ locale.cardCodeLabel }}
-              </label>
-              <input
-                id="card-code-modal"
-                ref="cardCodeInputRef"
-                v-model="cardCodeDraft"
-                :placeholder="cardCodeFieldMeta.placeholder"
-                class="mt-2 w-full rounded-xl border border-border-secondary bg-bg-primary px-4 py-3 text-sm font-bold text-text-primary placeholder-text-disabled transition-all focus:border-warning-50 focus:outline-none focus:ring-1 focus:ring-warning-10"
-                type="text"
-                @keydown.enter.prevent="saveCardCode"
-              >
-              <p
-                :class="[
-                  'mt-2 px-1 text-[11px]',
-                  cardCodeValidation.valid
-                    ? 'text-success-300'
-                    : cardCodeValidation.valid === false
-                      ? 'text-error-80'
-                      : 'text-text-tertiary'
-                ]"
-              >
-                {{ cardCodeModalHint }}
-              </p>
-            </div>
-
-            <div
-              class="flex flex-col-reverse gap-2 border-t border-border-secondary-70 bg-bg-secondary-70 px-5 py-4 sm:flex-row sm:justify-end"
-            >
-              <button
-                class="rounded-lg px-4 py-2.5 text-xs font-bold text-text-tertiary transition-all hover:text-text-secondary"
-                type="button"
-                @click="closeCardCodeModal"
-              >
-                {{ locale.cancel }}
-              </button>
-              <button
-                v-if="trimmedCardCode"
-                class="rounded-lg border border-border-secondary bg-bg-primary px-4 py-2.5 text-xs font-bold text-text-tertiary transition-all hover:border-error-30 hover:text-error"
-                type="button"
-                @click="clearCardCode"
-              >
-                {{ locale.clear }}
-              </button>
-              <button
-                :disabled="cardCodeValidation.checking"
-                class="rounded-lg bg-warning px-5 py-2.5 text-xs font-black text-text-primary transition-all hover:bg-warning disabled:cursor-not-allowed disabled:opacity-60"
-                type="button"
-                @click="saveCardCode"
-              >
-                {{ cardCodeValidation.checking ? locale.validatingCardCode : locale.save }}
-              </button>
-            </div>
-          </div>
-        </div>
-      </Transition>
-    </Teleport>
-
-    <Teleport to="body">
-      <Transition
-        enter-active-class="transition duration-300 ease-out"
-        enter-from-class="opacity-0 scale-95"
-        enter-to-class="opacity-100 scale-100"
-        leave-active-class="transition duration-200 ease-in"
-        leave-from-class="opacity-100 scale-100"
-        leave-to-class="opacity-0 scale-95"
-      >
-        <div
-          v-if="showAudioMatchModal"
-          class="fixed inset-0 z-[110] flex items-center justify-center p-4 sm:p-6 bg-bg-primary-85 backdrop-blur-sm"
-        >
-          <div
-            class="relative w-full max-w-md bg-bg-secondary border border-border-secondary rounded-3xl shadow-2xl flex flex-col max-h-[85vh] overflow-hidden"
-            @click.stop
-          >
-            <div class="px-8 py-7 flex flex-col items-center text-center">
-              <div class="relative">
-                <div
-                  class="w-20 h-20 rounded-full flex items-center justify-center transition-all duration-500"
-                  :class="
-                    audioMatchRecording
-                      ? 'bg-error-20 text-error scale-110'
-                      : audioMatchError
-                        ? 'bg-bg-tertiary-50 text-text-tertiary'
-                        : 'bg-primary-10 text-primary'
-                  "
-                >
-                  <Icon :size="32" name="mic" />
-                </div>
-                <div
-                  v-if="audioMatchRecording"
-                  class="absolute inset-0 rounded-full border-2 border-error animate-ping opacity-30"
-                />
-              </div>
-
-              <h3 class="mt-6 text-xl font-bold text-text-primary tracking-tight">
-                {{ locale.audioMatch }}
-              </h3>
-
-              <p class="mt-2 text-sm text-text-tertiary max-w-[260px]">
-                {{
-                  audioMatchStatus || (audioMatchError ? audioMatchError : locale.audioMatchHint)
-                }}
-              </p>
-
-              <div class="mt-8 flex items-center gap-4">
-                <button
-                  v-if="!audioMatchRecording"
-                  :disabled="audioMatchPreparing || audioMatchProcessing"
-                  class="audio-match-primary-btn"
-                  type="button"
-                  @click="startAudioMatchRecording"
-                >
-                  {{
-                    audioMatchPreparing
-                      ? locale.preparing
-                      : audioMatchProcessing
-                        ? locale.recognizing
-                        : locale.startAudioMatch
-                  }}
-                </button>
-                <button
-                  v-else
-                  :disabled="!audioMatchRecording"
-                  class="audio-match-record-btn"
-                  type="button"
-                  @click="stopAudioMatchRecording"
-                >
-                  <span class="recording-dot" />
-                  {{ locale.recording }}
-                </button>
-                <button class="audio-match-cancel-btn" type="button" @click="closeAudioMatchModal">
-                  {{ locale.cancel }}
-                </button>
-              </div>
-            </div>
-
-            <div
-              v-if="audioMatchResults.length"
-              class="flex-1 overflow-y-auto px-6 pb-6 custom-scrollbar"
-            >
-              <div class="border-t border-border-secondary-60 pt-5">
-                <h4 class="text-sm font-semibold text-text-secondary mb-4">
-                  {{ locale.audioMatchResults }}
-                </h4>
-                <div class="space-y-2">
-                  <button
-                    v-for="match in audioMatchResults"
-                    :key="match.key"
-                    class="audio-match-result-item group/item w-full"
-                    type="button"
-                    @click="useAudioMatchResult(match)"
-                  >
-                    <div class="flex items-center gap-3 min-w-0 flex-1">
-                      <div
-                        class="relative shrink-0 w-11 h-11 rounded-xl overflow-hidden group/cover bg-bg-tertiary-50 flex items-center justify-center"
-                        @click.stop="playAudioMatchResult(match)"
-                      >
-                        <img
-                          v-if="match.cover"
-                          :src="match.cover"
-                          class="w-full h-full object-cover"
-                        >
-                        <Music v-else class="w-5 h-5 text-text-tertiary" />
-                        <div
-                          class="absolute inset-0 bg-bg-primary-50 opacity-0 group-hover/cover:opacity-100 flex items-center justify-center transition-all"
-                        >
-                          <Play class="w-4 h-4 text-text-primary fill-white" />
-                        </div>
-                      </div>
-                      <div class="min-w-0 text-left flex-1">
-                        <p class="truncate text-sm font-medium text-text-primary">
-                          {{ match.name }}
-                        </p>
-                        <p class="truncate text-xs text-text-tertiary mt-0.5">{{ match.artist }}</p>
-                      </div>
-                      <div class="shrink-0 text-right">
-                        <span class="text-[11px] font-mono text-primary">
-                          {{ (match.startTime / 1000).toFixed(1) }}s
-                        </span>
-                      </div>
-                    </div>
-                  </button>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </Transition>
-    </Teleport>
-
     <!-- 手动输入弹窗 -->
     <Teleport to="body">
       <Transition
@@ -1245,29 +670,23 @@
       >
         <div
           v-if="showManualModal"
-          class="fixed inset-0 z-[100] flex items-center justify-center p-4 sm:p-6 bg-bg-primary-80 backdrop-blur-sm"
+          class="fixed inset-0 z-[100] flex items-center justify-center p-4 sm:p-6 bg-zinc-950/80 backdrop-blur-sm"
           @click.self="showManualModal = false"
         >
           <div
-            class="relative w-full max-w-2xl bg-bg-secondary border border-border-secondary rounded-2xl shadow-2xl flex flex-col max-h-[90vh] overflow-hidden"
+            class="relative w-full max-w-2xl bg-zinc-900 border border-zinc-800 rounded-2xl shadow-2xl flex flex-col max-h-[90vh] overflow-hidden"
             @click.stop
           >
             <!-- Header -->
-            <div
-              class="px-8 py-6 border-b border-border-secondary-50 flex items-center justify-between shrink-0"
-            >
+            <div class="px-8 py-6 border-b border-zinc-800/50 flex items-center justify-between shrink-0">
               <div class="flex items-center gap-4">
-                <div
-                  class="w-12 h-12 rounded-2xl bg-primary-hover-10 flex items-center justify-center text-primary"
-                >
+                <div class="w-12 h-12 rounded-2xl bg-blue-600/10 flex items-center justify-center text-blue-500">
                   <Edit3 :size="24" />
                 </div>
-                <h3 class="text-xl font-black text-text-primary tracking-tight">
-                  {{ locale.manualTitle }}
-                </h3>
+                <h3 class="text-xl font-black text-zinc-100 tracking-tight">手动输入歌曲信息</h3>
               </div>
               <button
-                class="w-10 h-10 flex items-center justify-center rounded-xl bg-bg-tertiary-50 text-text-tertiary hover:bg-bg-tertiary hover:text-text-primary transition-all"
+                class="w-10 h-10 flex items-center justify-center rounded-xl bg-zinc-800/50 text-zinc-400 hover:bg-zinc-800 hover:text-zinc-100 transition-all"
                 @click="showManualModal = false"
               >
                 <X class="w-5 h-5" />
@@ -1279,35 +698,28 @@
               <div class="grid grid-cols-1 gap-6">
                 <!-- 歌曲名称 -->
                 <div class="space-y-2">
-                  <label
-                    class="text-[10px] font-black text-text-disabled uppercase tracking-widest px-1"
-                    >{{ locale.songName }}</label
-                  >
+                  <label class="text-[10px] font-black text-zinc-600 uppercase tracking-widest px-1">歌曲名称</label>
                   <div class="relative group">
                     <input
                       :value="title"
-                      class="w-full bg-bg-primary border border-border-secondary rounded-xl px-4 py-3 text-sm text-text-tertiary font-bold focus:outline-none cursor-not-allowed transition-all"
+                      class="w-full bg-zinc-950 border border-zinc-800 rounded-xl px-4 py-3 text-sm text-zinc-400 font-bold focus:outline-none cursor-not-allowed transition-all"
                       readonly
                       type="text"
                     >
                     <div class="absolute inset-y-0 right-4 flex items-center pointer-events-none">
-                      <Lock class="w-4 h-4 text-text-disabled" />
+                      <Lock class="w-4 h-4 text-zinc-600" />
                     </div>
                   </div>
                 </div>
 
                 <!-- 歌手名称 -->
                 <div class="space-y-2">
-                  <label
-                    for="modal-artist"
-                    class="text-[10px] font-black text-text-disabled uppercase tracking-widest px-1"
-                    >{{ locale.artistName }}</label
-                  >
+                  <label for="modal-artist" class="text-[10px] font-black text-zinc-600 uppercase tracking-widest px-1">歌手名称</label>
                   <input
                     id="modal-artist"
                     v-model="manualArtist"
-                    class="w-full bg-bg-primary border border-border-secondary rounded-xl px-4 py-3 text-sm text-text-primary placeholder-text-disabled focus:outline-none focus:border-primary-30 transition-all"
-                    :placeholder="locale.artistPlaceholder"
+                    class="w-full bg-zinc-950 border border-zinc-800 rounded-xl px-4 py-3 text-sm text-zinc-200 placeholder-zinc-600 focus:outline-none focus:border-blue-500/30 transition-all"
+                    placeholder="请输入歌手名称"
                     required
                     type="text"
                   >
@@ -1315,29 +727,22 @@
 
                 <!-- 歌曲封面地址 -->
                 <div class="space-y-2">
-                  <label
-                    for="modal-cover"
-                    class="text-[10px] font-black text-text-disabled uppercase tracking-widest px-1"
-                    >{{ locale.coverUrl }}</label
-                  >
+                  <label for="modal-cover" class="text-[10px] font-black text-zinc-600 uppercase tracking-widest px-1">歌曲封面地址（选填）</label>
                   <div class="relative group">
                     <input
                       id="modal-cover"
                       v-model="manualCover"
                       :class="[
-                        'w-full bg-bg-primary border rounded-xl px-4 py-3 text-sm text-text-primary placeholder-text-disabled focus:outline-none transition-all',
+                        'w-full bg-zinc-950 border rounded-xl px-4 py-3 text-sm text-zinc-200 placeholder-zinc-600 focus:outline-none transition-all',
                         manualCover && !coverValidation.valid
-                          ? 'border-error-50 focus:border-error-50'
-                          : 'border-border-secondary focus:border-primary-30'
+                          ? 'border-red-500/50 focus:border-red-500/50'
+                          : 'border-zinc-800 focus:border-blue-500/30'
                       ]"
-                      :placeholder="locale.coverPlaceholder"
+                      placeholder="请输入歌曲封面图片URL"
                       type="url"
                     >
-                    <div
-                      v-if="coverValidation.validating"
-                      class="absolute inset-y-0 right-4 flex items-center"
-                    >
-                      <Loader2 class="w-4 h-4 text-text-tertiary animate-spin" />
+                    <div v-if="coverValidation.validating" class="absolute inset-y-0 right-4 flex items-center">
+                      <Loader2 class="w-4 h-4 text-zinc-400 animate-spin" />
                     </div>
                   </div>
                   <Transition
@@ -1346,17 +751,11 @@
                     enter-to-class="opacity-100 translate-y-0"
                   >
                     <div v-if="manualCover && !coverValidation.validating" class="px-1 pt-1">
-                      <p
-                        v-if="!coverValidation.valid"
-                        class="text-[10px] font-bold text-error-80 flex items-center gap-1"
-                      >
+                      <p v-if="!coverValidation.valid" class="text-[10px] font-bold text-red-500/80 flex items-center gap-1">
                         <X class="w-3 h-3" /> {{ coverValidation.error }}
                       </p>
-                      <p
-                        v-else
-                        class="text-[10px] font-bold text-success-80 flex items-center gap-1"
-                      >
-                        <Check class="w-3 h-3" /> {{ locale.validUrl }}
+                      <p v-else class="text-[10px] font-bold text-emerald-500/80 flex items-center gap-1">
+                        <Check class="w-3 h-3" /> URL有效
                       </p>
                     </div>
                   </Transition>
@@ -1364,29 +763,22 @@
 
                 <!-- 播放地址 -->
                 <div class="space-y-2">
-                  <label
-                    for="modal-play-url"
-                    class="text-[10px] font-black text-text-disabled uppercase tracking-widest px-1"
-                    >{{ locale.playUrl }}</label
-                  >
+                  <label for="modal-play-url" class="text-[10px] font-black text-zinc-600 uppercase tracking-widest px-1">播放地址（选填）</label>
                   <div class="relative group">
                     <input
                       id="modal-play-url"
                       v-model="manualPlayUrl"
                       :class="[
-                        'w-full bg-bg-primary border rounded-xl px-4 py-3 text-sm text-text-primary placeholder-text-disabled focus:outline-none transition-all',
+                        'w-full bg-zinc-950 border rounded-xl px-4 py-3 text-sm text-zinc-200 placeholder-zinc-600 focus:outline-none transition-all',
                         manualPlayUrl && !playUrlValidation.valid
-                          ? 'border-error-50 focus:border-error-50'
-                          : 'border-border-secondary focus:border-primary-30'
+                          ? 'border-red-500/50 focus:border-red-500/50'
+                          : 'border-zinc-800 focus:border-blue-500/30'
                       ]"
-                      :placeholder="locale.playUrlPlaceholder"
+                      placeholder="请输入歌曲播放URL"
                       type="url"
                     >
-                    <div
-                      v-if="playUrlValidation.validating"
-                      class="absolute inset-y-0 right-4 flex items-center"
-                    >
-                      <Loader2 class="w-4 h-4 text-text-tertiary animate-spin" />
+                    <div v-if="playUrlValidation.validating" class="absolute inset-y-0 right-4 flex items-center">
+                      <Loader2 class="w-4 h-4 text-zinc-400 animate-spin" />
                     </div>
                   </div>
                   <Transition
@@ -1395,17 +787,11 @@
                     enter-to-class="opacity-100 translate-y-0"
                   >
                     <div v-if="manualPlayUrl && !playUrlValidation.validating" class="px-1 pt-1">
-                      <p
-                        v-if="!playUrlValidation.valid"
-                        class="text-[10px] font-bold text-error-80 flex items-center gap-1"
-                      >
+                      <p v-if="!playUrlValidation.valid" class="text-[10px] font-bold text-red-500/80 flex items-center gap-1">
                         <X class="w-3 h-3" /> {{ playUrlValidation.error }}
                       </p>
-                      <p
-                        v-else
-                        class="text-[10px] font-bold text-success-80 flex items-center gap-1"
-                      >
-                        <Check class="w-3 h-3" /> {{ locale.validUrl }}
+                      <p v-else class="text-[10px] font-bold text-emerald-500/80 flex items-center gap-1">
+                        <Check class="w-3 h-3" /> URL有效
                       </p>
                     </div>
                   </Transition>
@@ -1414,23 +800,21 @@
             </div>
 
             <!-- Footer -->
-            <div
-              class="px-8 py-6 bg-bg-secondary-50 border-t border-border-secondary-50 flex gap-3 justify-end shrink-0"
-            >
+            <div class="px-8 py-6 bg-zinc-900/50 border-t border-zinc-800/50 flex gap-3 justify-end shrink-0">
               <button
-                class="px-6 py-2.5 text-xs font-bold text-text-tertiary hover:text-text-secondary transition-all"
+                class="px-6 py-2.5 text-xs font-bold text-zinc-500 hover:text-zinc-300 transition-all"
                 type="button"
                 @click="showManualModal = false"
               >
-                {{ locale.cancel }}
+                取消
               </button>
               <button
-                :disabled="!canSubmitFromSearch || !canSubmitManualForm || submitting"
-                class="px-8 py-2.5 bg-primary-hover hover:bg-primary text-text-primary text-xs font-black rounded-lg transition-all disabled:opacity-50"
+                :disabled="!canSubmitManualForm || submitting"
+                class="px-8 py-2.5 bg-blue-600 hover:bg-blue-500 text-white text-xs font-black rounded-lg transition-all disabled:opacity-50"
                 type="button"
                 @click="handleManualSubmit"
               >
-                {{ submitting ? locale.submitting : locale.confirmSubmit }}
+                {{ submitting ? '提交中...' : '确认提交' }}
               </button>
             </div>
           </div>
@@ -1445,49 +829,27 @@
       type="file"
       @change="handleImportData"
     >
-    <input
-      ref="qqFileInput"
-      accept=".json"
-      style="display: none"
-      type="file"
-      @change="handleImportDataQQ"
-    >
   </div>
 </template>
 
 <script setup>
-import { computed, nextTick, onBeforeUnmount, onMounted, ref, watch } from 'vue'
-import { X, Lock, Loader2, Check, Edit3, Music, Play } from '@lucide/vue'
+import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
+import searchIcon from '~~/public/images/search.svg'
+import { X, Lock, Loader2, Check, Edit3, Crown, Ban, Search } from '@lucide/vue'
 import { useSongs } from '~/composables/useSongs'
-import { useThemeImage } from '~/composables/useThemeImage'
 import { useAudioPlayer } from '~/composables/useAudioPlayer'
-import { useAudioPlayerControl } from '~/composables/useAudioPlayerControl'
 import { useSiteConfig } from '~/composables/useSiteConfig'
 import { useAuth } from '~/composables/useAuth'
 import { useSemesters } from '~/composables/useSemesters'
 import { useMusicSources } from '~/composables/useMusicSources'
 import { useAudioQuality } from '~/composables/useAudioQuality'
-import { usePlatformConfig } from '~/composables/usePlatformConfig'
-import { useLocale } from '~/utils/locale'
+import { useToast } from '~/composables/useToast'
 import CustomSelect from '~/components/UI/Common/CustomSelect.vue'
-import AppSpinner from '~/components/UI/Common/AppSpinner.vue'
 import Icon from '../UI/Icon.vue'
 import { convertToHttps, validateUrl } from '~/utils/url'
-import { isBilibiliSong } from '~/utils/bilibiliSource'
-import { getLoginStatus } from '~/utils/neteaseApi'
-import { getMusicUrl as resolveMusicUrl } from '~/utils/musicUrl'
-import { renderMarkdown } from '~/utils/markdown'
-import { normalizeForMatch as normalizeString } from '~/utils/song-name-normalize'
+
 import ImportSongsModal from './ImportSongsModal.vue'
-import NeteaseLoginModal from './NeteaseLoginModal.vue'
-import QQMusicLoginModal from './QQMusicLoginModal.vue'
-import PodcastEpisodesModal from './PodcastEpisodesModal.vue'
-import BilibiliEpisodesModal from './BilibiliEpisodesModal.vue'
-import AlbumDetailsModal from './AlbumDetailsModal.vue'
-import RecentSongsModal from './RecentSongsModal.vue'
-import PlaylistSelectionModal from './PlaylistSelectionModal.vue'
 import UserSearchModal from '../Common/UserSearchModal.vue'
-import NeteaseUploadDialog from './NeteaseUploadDialog.vue'
 
 const props = defineProps({
   loading: {
@@ -1497,116 +859,126 @@ const props = defineProps({
 })
 
 const emit = defineEmits(['request', 'vote'])
-const { songs: songsLocale } = useLocale()
-const locale = computed(() => useSafeLocale(songsLocale.value?.requestForm || {}))
-const { t: callLocale } = useLocaleText(locale)
-const { localize: localizeServerError } = useServerErrors()
-const { getSearchIcon } = useThemeImage()
 
 // 站点配置
 const {
   guidelines: submissionGuidelines,
   initSiteConfig,
   enableReplayRequests,
-  enableSubmissionRestriction,
   enableCollaborativeSubmission,
-  enableSubmissionRemarks,
-  enableSubmissionLimit,
-  enableCardCodeRequests,
-  requireCardCodeForRequests,
-  enableCardCodeLimitBypass,
-  submissionNoteRequiresApproval,
-  isLoaded: siteConfigLoaded
+  enableSubmissionRemarks
 } = useSiteConfig()
 
-// 将投稿须知 Markdown 渲染为安全 HTML
-const renderedGuidelines = computed(() => renderMarkdown(submissionGuidelines.value))
-
 // 用户认证
 const auth = useAuth()
 const user = computed(() => auth.user.value)
+const isSuperAdmin = computed(() => user.value?.role === 'SUPER_ADMIN')
+const toast = useToast()
+
+let submissionStatusBootstrapped = false
+
+const formatBeijingDateTime = (isoString) => {
+  try {
+    const date = new Date(isoString)
+    const parts = new Intl.DateTimeFormat('zh-CN', {
+      timeZone: 'Asia/Shanghai',
+      year: 'numeric',
+      month: '2-digit',
+      day: '2-digit',
+      hour: '2-digit',
+      minute: '2-digit',
+      hour12: false
+    }).formatToParts(date)
+
+    const map = {}
+    for (const p of parts) {
+      if (p.type !== 'literal') map[p.type] = p.value
+    }
+
+    return `${map.year}-${map.month}-${map.day} ${map.hour}:${map.minute}`
+  } catch {
+    return isoString
+  }
+}
 
 // 学期管理
 const { fetchCurrentSemester, currentSemester, fetchSemesterOptions, semesters } = useSemesters()
 
 // 是否显示“从往期导入”按钮：只有在有多个学期的情况下才显示
 const showImportSemesterBtn = computed(() => semesters.value && semesters.value.length > 1)
-const AUDIO_MATCH_DURATION = 3
 
 const title = ref('')
 const artist = ref('')
-const platform = ref('netease') // 占位值，平台配置加载后跟随后台排序的首选平台
-const platformTouched = ref(false) // 用户是否手动切换过平台，切换后不再覆盖其选择
+const platform = ref('kugou')
 const preferredPlayTimeId = ref('')
+const expectedPlayDate = ref('')
+const expectedPlaySequence = ref('')
 const submissionNote = ref('')
 const submissionNotePublic = ref(true)
-const cardCode = ref('')
-const cardCodeDraft = ref('')
-const showCardCodeModal = ref(false)
-const cardCodeInputRef = ref(null)
-const cardCodeValidation = ref({
-  checking: false,
-  valid: null,
-  message: ''
-})
 const error = ref('')
 const success = ref('')
 const submitting = ref(false)
 const voting = ref(false)
+const requestingReplay = ref(false)
+const similarSongs = ref([])
 
-const {
-  getAvailablePlatforms,
-  loadPlatformConfig,
-  loaded: platformConfigLoaded
-} = usePlatformConfig()
-const availablePlatforms = computed(() => getAvailablePlatforms())
+// 按 BV 号分组相似歌曲（每个合集只显示一次）
+const groupedSimilarSongs = computed(() => {
+  const groups = new Map()
 
-// 监听平台可用性与排序变化：
-// - 当前平台被禁用时，强制切换到第一个可用平台并提示
-// - 用户未手动选择过平台时，默认选中跟随后台排序的第一位
-watch(availablePlatforms, (available) => {
-  if (available.length === 0) return
-  if (!available.includes(platform.value)) {
-    platform.value = available[0]
-    if (window.$showNotification) {
-      const switchedName = locale.value.platforms[platform.value] || ''
-      const msg = callLocale('notifications.platformAutoSwitched', '', switchedName)
-      window.$showNotification(msg, 'info')
+  for (const song of similarSongs.value) {
+    // 检查是否是哔哩哔哩视频
+    if (false && song.musicId) {
+      const bvid = song.musicId.includes(':') ? song.musicId.split(':')[0] : song.musicId
+
+      if (!groups.has(bvid)) {
+        // 创建新的分组
+        groups.set(bvid, {
+          bvid,
+          title: song.title.split(' - ')[0] || song.title, // 提取合集标题
+          artist: song.artist,
+          cover: song.cover,
+          episodes: [],
+          allPlayed: true,
+          allScheduled: true,
+          hasVoted: false
+        })
+      }
+
+      const group = groups.get(bvid)
+      group.episodes.push(song)
+
+      // 更新状态
+      if (!song.played) group.allPlayed = false
+      if (!song.scheduled) group.allScheduled = false
+      if (song.voted) group.hasVoted = true
+    } else {
+      // 非哔哩哔哩视频，直接作为单独项
+      const key = `${song.id}`
+      if (!groups.has(key)) {
+        groups.set(key, {
+          isSingle: true,
+          song
+        })
+      }
     }
-    return
   }
-  if (!platformTouched.value && platform.value !== available[0]) {
-    platform.value = available[0]
-  }
-})
 
+  return Array.from(groups.values())
+})
 const showImportSongsModal = ref(false)
 const showLoginModal = ref(false)
-const showQQLoginModal = ref(false)
 const isNeteaseLoggedIn = ref(false)
 const neteaseUser = ref(null)
 const neteaseCookie = ref('')
-const isQQMusicLoggedIn = ref(false)
-const qqMusicUser = ref(null)
-const qqMusicCookie = ref('')
-const checkingQQLogin = ref(false)
 const searchType = ref(1) // 1: 单曲, 1009: 播客/电台
 
 // 播客弹窗相关
-const showPodcastModal = ref(false)
 const selectedPodcastId = ref('')
 const selectedPodcastName = ref('')
 const podcastCookie = ref('')
 
-const showRecentSongsModal = ref(false)
 const showPlaylistModal = ref(false)
-// 当前打开歌单弹窗对应的音源平台，决定弹窗内数据获取分支
-const playlistModalPlatform = ref('netease')
-
-const openPlaylistModal = (platform) => {
-  playlistModalPlatform.value = platform
-  showPlaylistModal.value = true
-}
 const showUserSearchModal = ref(false)
 const collaborators = ref([])
 
@@ -1615,224 +987,33 @@ const playTimes = ref([])
 const playTimeSelectionEnabled = ref(false)
 const loadingPlayTimes = ref(false)
 
-const cardCodeEnabled = computed(
-  () => enableCardCodeRequests.value || requireCardCodeForRequests.value
-)
-const cardCodeLimitBypassActive = computed(
-  () => enableSubmissionLimit.value && cardCodeEnabled.value && enableCardCodeLimitBypass.value
-)
-
-const cardCodeFieldMeta = computed(() => ({
-  required: requireCardCodeForRequests.value,
-  helper: requireCardCodeForRequests.value
-    ? cardCodeLimitBypassActive.value
-      ? locale.value.cardCodeRequiredBypassHelper
-      : locale.value.cardCodeRequiredHelper
-    : cardCodeLimitBypassActive.value
-      ? locale.value.cardCodeOptionalBypassHelper
-      : locale.value.cardCodeOptionalHelper,
-  placeholder: locale.value.cardCodePlaceholder
-}))
-
-const trimmedCardCode = computed(() => cardCode.value.trim())
-const cardCodeStatusText = computed(() => {
-  if (cardCodeValidation.value.checking) return locale.value.validatingCardCode
-  if (trimmedCardCode.value) {
-    if (cardCodeValidation.value.valid && cardCodeLimitBypassActive.value) {
-      return locale.value.cardCodeAvailableBypass
-    }
-    return cardCodeValidation.value.message || locale.value.cardCodeWillValidate
-  }
-  return cardCodeFieldMeta.value.required
-    ? locale.value.cardCodeRequiredStatus
-    : locale.value.cardCodeOptionalStatus
-})
-const mobileCardCodeLabel = computed(() => {
-  if (cardCodeValidation.value.checking) return locale.value.validatingShort
-  if (trimmedCardCode.value) {
-    if (cardCodeValidation.value.valid === false) return locale.value.cardCodeInvalid
-    if (cardCodeValidation.value.valid) return locale.value.cardCodeAvailable
-    return locale.value.cardCodeFilled
-  }
-  return cardCodeFieldMeta.value.required
-    ? locale.value.cardCodeRequiredShort
-    : locale.value.cardCodeOptionalShort
-})
-const cardCodeModalHint = computed(() => {
-  if (cardCodeValidation.value.checking) return locale.value.validatingCardCode
-  if (cardCodeValidation.value.message) return cardCodeValidation.value.message
-  return locale.value.cardCodeSaveHint
-})
-
-const resetCardCodeValidation = () => {
-  cardCodeValidation.value = {
-    checking: false,
-    valid: null,
-    message: ''
-  }
-}
-
-const openCardCodeModal = async () => {
-  cardCodeDraft.value = cardCode.value
-  showCardCodeModal.value = true
-  await nextTick()
-  cardCodeInputRef.value?.focus()
-}
-
-const closeCardCodeModal = () => {
-  const draftChanged = cardCodeDraft.value.trim() !== cardCode.value.trim()
-  showCardCodeModal.value = false
-  cardCodeDraft.value = cardCode.value
-  if (draftChanged) {
-    resetCardCodeValidation()
-  }
-}
-
-const validateCardCode = async (code) => {
-  const normalizedCode = typeof code === 'string' ? code.trim().toUpperCase() : ''
-  if (!normalizedCode) {
-    resetCardCodeValidation()
-    return !requireCardCodeForRequests.value
-  }
-
-  cardCodeValidation.value = {
-    checking: true,
-    valid: null,
-    message: locale.value.validatingCardCode
-  }
-
-  try {
-    const response = await $fetch('/api/card-codes/validate', {
-      method: 'POST',
-      body: { cardCode: normalizedCode },
-      ...auth.getAuthConfig()
-    })
-
-    cardCodeValidation.value = {
-      checking: false,
-      valid: true,
-      message: locale.value.cardCodeAvailable
-    }
-    return true
-  } catch (err) {
-    const message = localizeServerError(err, locale.value.cardCodeValidateFailed)
-    cardCodeValidation.value = {
-      checking: false,
-      valid: false,
-      message
-    }
-    if (window.$showNotification) {
-      window.$showNotification(message, 'error')
-    }
-    return false
-  }
-}
-
-const saveCardCode = async () => {
-  const draft = cardCodeDraft.value.trim().toUpperCase()
-  if (requireCardCodeForRequests.value && !draft) {
-    if (window.$showNotification) {
-      window.$showNotification(locale.value.cardCodeRequiredWarning, 'warning')
-    }
-    return
-  }
-
-  if (!draft) {
-    clearCardCode()
-    return
-  }
-
-  if (!(await validateCardCode(draft))) {
-    return
-  }
-
-  cardCode.value = draft
-  showCardCodeModal.value = false
-}
-
-const clearCardCode = () => {
-  cardCode.value = ''
-  cardCodeDraft.value = ''
-  showCardCodeModal.value = false
-  resetCardCodeValidation()
-}
-
-const ensureCardCodeForSubmit = async () => {
-  if (!cardCodeEnabled.value) {
-    return true
-  }
-
-  if (!trimmedCardCode.value) {
-    if (!requireCardCodeForRequests.value) {
-      return true
-    }
-
-    await openCardCodeModal()
-    if (window.$showNotification) {
-      window.$showNotification(locale.value.cardCodeRequiredWarning, 'warning')
-    }
-    return false
-  }
-
-  // 已验证过且未变动则跳过重复验证
-  if (cardCodeValidation.value.valid === true) {
-    return true
-  }
-
-  return await validateCardCode(trimmedCardCode.value)
-}
-
 // 投稿状态
 const submissionStatus = ref(null)
 const loadingSubmissionStatus = ref(false)
 
+const expectedPlayDates = ref([])
+
 // 搜索相关
 const searching = ref(false)
 const searchResults = ref([])
-const restrictionCheckMap = ref(new Map())
-const restrictionChecking = ref(false)
-let restrictionCheckRequestId = 0
-const restrictionAbortController = ref(null)
 const selectedCover = ref('')
 const selectedUrl = ref('')
 const audioPlayer = useAudioPlayer() // 使用全局音频播放器
 
 // 搜索请求控制器
 const searchAbortController = ref(null)
-const showAudioMatchModal = ref(false)
-const audioMatchPreparing = ref(false)
-const audioMatchRecording = ref(false)
-const audioMatchProcessing = ref(false)
-const audioMatchStatus = ref('')
-const audioMatchError = ref('')
-const audioMatchResults = ref([])
-let audioMatchScriptsPromise = null
-let audioMatchContext = null
-let audioMatchRecorderNode = null
-let audioMatchMicStream = null
-let audioMatchMicSourceNode = null
-let audioMatchSilentNode = null
 
 // 音源管理器
 const musicSources = useMusicSources()
 const { currentSource, sourceStatus, sourceStatusSummary, currentSourceInfo } = musicSources
-const { checkNeteaseLoginStatus: updateGlobalNeteaseStatus, persistNeteaseVipFlag, clearNeteaseVipFlag } = useAudioQuality()
+const { checkNeteaseLoginStatus: updateGlobalNeteaseStatus } = useAudioQuality()
 const searchError = ref('')
 
 // 手动输入相关
 const showManualModal = ref(false)
 
-const showBilibiliEpisodesModal = ref(false)
 const selectedBilibiliVideo = ref(null)
 const bilibiliEpisodes = ref([])
-const bilibiliEpisodeSubmitOptions = ref({})
-
-// 专辑详情相关
-const showAlbumDetailsModal = ref(false)
-const selectedAlbumId = ref(null)
-const selectedAlbumName = ref(null)
-const selectedAlbumPlatform = ref('netease')
-
 const manualArtist = ref('')
 const manualCover = ref('')
 const manualPlayUrl = ref('')
@@ -1849,374 +1030,12 @@ const playUrlValidation = ref({ valid: true, error: '', validating: false })
 // 网易云音乐登录检查状态
 const checkingNeteaseLogin = ref(false)
 
-const resetAudioMatchState = () => {
-  audioMatchPreparing.value = false
-  audioMatchRecording.value = false
-  audioMatchProcessing.value = false
-  audioMatchStatus.value = ''
-  audioMatchError.value = ''
-  audioMatchResults.value = []
-}
-
-const stopAudioMatchSession = async () => {
-  audioMatchRecording.value = false
-  audioMatchProcessing.value = false
-
-  if (audioMatchMicStream) {
-    audioMatchMicStream.getTracks().forEach((track) => track.stop())
-    audioMatchMicStream = null
-  }
-
-  audioMatchMicSourceNode?.disconnect()
-  audioMatchRecorderNode?.disconnect()
-  audioMatchSilentNode?.disconnect()
-
-  audioMatchMicSourceNode = null
-  audioMatchRecorderNode = null
-  audioMatchSilentNode = null
-
-  if (audioMatchContext) {
-    try {
-      await audioMatchContext.close()
-    } catch {
-      // ignore close failures
-    }
-    audioMatchContext = null
-  }
-}
-
-const loadAudioMatchScript = (src) =>
-  new Promise((resolve, reject) => {
-    if (document.querySelector(`script[data-audio-match="${src}"]`)) {
-      resolve()
-      return
-    }
-
-    const script = document.createElement('script')
-    script.src = src
-    script.async = true
-    script.dataset.audioMatch = src
-    script.onload = () => resolve()
-    script.onerror = () => reject(new Error(callLocale('audioMatchScriptLoadFailed', '', src)))
-    document.head.appendChild(script)
-  })
-
-const ensureAudioMatchScripts = async () => {
-  if (!import.meta.client) return
-
-  if (typeof window.GenerateFP === 'function') {
-    return
-  }
-
-  if (!audioMatchScriptsPromise) {
-    audioMatchScriptsPromise = loadAudioMatchScript('/audio-match/afp.wasm.js')
-      .then(() => loadAudioMatchScript('/audio-match/afp.js'))
-      .then(() => {
-        if (typeof window.GenerateFP !== 'function') {
-          throw new Error(locale.value.audioMatchEngineFailed)
-        }
-      })
-      .catch((err) => {
-        audioMatchScriptsPromise = null
-        throw err
-      })
-  }
-
-  await audioMatchScriptsPromise
-}
-
-const parseAudioMatchResults = (response) => {
-  const resultList =
-    response?.data?.result ||
-    response?.result ||
-    response?.body?.data?.result ||
-    response?.body?.result ||
-    []
-
-  return resultList.map((item, index) => {
-    const song = item?.song || {}
-    const artists = Array.isArray(song.artists)
-      ? song.artists.map((artistItem) => artistItem?.name).filter(Boolean)
-      : []
-
-    return {
-      key: `${song.id || 'unknown'}-${index}`,
-      id: song.id,
-      name: song.name || locale.value.unknownSong,
-      artist: artists.join(' / ') || locale.value.unknownArtist,
-      album: song.album?.name || '',
-      cover: song.album?.picUrl || song.al?.picUrl || '',
-      startTime: typeof item?.startTime === 'number' ? item.startTime : 0
-    }
-  })
-}
-
-const handleAudioMatchFingerprint = async (recording) => {
-  try {
-    audioMatchProcessing.value = true
-    audioMatchStatus.value = locale.value.audioMatchGenerating
-
-    const fingerprint = await window.GenerateFP(recording)
-    const response = await $fetch('/api/api-enhanced/netease/audio/match', {
-      method: 'POST',
-      body: {
-        duration: AUDIO_MATCH_DURATION,
-        audioFP: fingerprint
-      }
-    })
-
-    const matches = parseAudioMatchResults(response)
-    if (!matches.length) {
-      throw new Error(locale.value.audioMatchNoMatch)
-    }
-
-    audioMatchResults.value = matches
-    audioMatchStatus.value = callLocale('audioMatchDone', '', matches.length)
-  } catch (err) {
-    console.error('听歌识曲失败:', err)
-    audioMatchError.value = err?.message || locale.value.audioMatchFailed
-    audioMatchStatus.value = ''
-    audioMatchResults.value = []
-  } finally {
-    audioMatchProcessing.value = false
-  }
-}
-
-const initializeAudioMatch = async () => {
-  await ensureAudioMatchScripts()
-  await stopAudioMatchSession()
-
-  audioMatchPreparing.value = true
-  audioMatchStatus.value = locale.value.microphoneRequesting
-
-  try {
-    const AudioContextClass = window.AudioContext || window.webkitAudioContext
-    audioMatchContext = new AudioContextClass({ sampleRate: 8000 })
-    if (audioMatchContext.state === 'suspended') {
-      await audioMatchContext.resume()
-    }
-
-    if (!navigator.mediaDevices || !navigator.mediaDevices.getUserMedia) {
-      throw new Error(locale.value.microphoneUnsupported)
-    }
-
-    if (audioMatchContext.audioWorklet) {
-      await audioMatchContext.audioWorklet.addModule('/audio-match/rec.js')
-      audioMatchRecorderNode = new AudioWorkletNode(audioMatchContext, 'timed-recorder')
-
-      audioMatchRecorderNode.port.onmessage = async (event) => {
-        switch (event.data.message) {
-          case 'bufferhealth': {
-            const progress = Math.min(1, Number(event.data.health) || 0)
-            const currentSeconds = (AUDIO_MATCH_DURATION * progress).toFixed(1)
-            audioMatchStatus.value = callLocale(
-              'audioMatchRecordingProgress',
-              '',
-              currentSeconds,
-              AUDIO_MATCH_DURATION
-            )
-            break
-          }
-          case 'finished':
-            audioMatchRecording.value = false
-            await handleAudioMatchFingerprint(event.data.recording)
-            break
-          default:
-            break
-        }
-      }
-    } else {
-      // 兼容不支持 AudioWorklet 的浏览器 (如旧版 Safari)
-      const bufferSize = 4096
-      const scriptNode = audioMatchContext.createScriptProcessor(bufferSize, 1, 1)
-
-      let maxLength = 0
-      let recbuffer = new Float32Array()
-      let recording = false
-      let bufIndex = 0
-
-      scriptNode.onaudioprocess = (e) => {
-        if (!recording) return
-
-        const channelL = e.inputBuffer.getChannelData(0)
-        const progress = bufIndex / maxLength
-        const currentSeconds = (AUDIO_MATCH_DURATION * progress).toFixed(1)
-
-        // 提高更新频率以改善用户体验
-        if (bufIndex % bufferSize === 0) {
-          audioMatchStatus.value = callLocale(
-            'audioMatchRecordingProgress',
-            '',
-            currentSeconds,
-            AUDIO_MATCH_DURATION
-          )
-        }
-
-        if (bufIndex + channelL.length > maxLength) {
-          recording = false
-          audioMatchRecording.value = false
-
-          // 确保包含最后一块数据
-          const remaining = maxLength - bufIndex
-          if (remaining > 0) {
-            recbuffer.set(channelL.subarray(0, remaining), bufIndex)
-          }
-
-          bufIndex = 0
-          handleAudioMatchFingerprint(recbuffer)
-        } else {
-          recbuffer.set(channelL, bufIndex)
-          bufIndex += channelL.length
-        }
-      }
-
-      // 模拟 AudioWorkletNode 接口
-      audioMatchRecorderNode = scriptNode
-      audioMatchRecorderNode.port = {
-        postMessage: (msg) => {
-          if (msg.message === 'start') {
-            maxLength = msg.duration * 8000
-            recbuffer = new Float32Array(maxLength)
-            bufIndex = 0
-            recording = true
-          }
-        }
-      }
-    }
-
-    audioMatchSilentNode = audioMatchContext.createGain()
-    audioMatchSilentNode.gain.value = 0
-    audioMatchRecorderNode.connect(audioMatchSilentNode)
-    audioMatchSilentNode.connect(audioMatchContext.destination)
-
-    const GET_USER_MEDIA_TIMEOUT_MS = 15000
-
-    audioMatchMicStream = await Promise.race([
-      navigator.mediaDevices.getUserMedia({
-        audio: {
-          echoCancellation: false,
-          autoGainControl: false,
-          noiseSuppression: false,
-          latency: 0
-        }
-      }),
-      new Promise((_, reject) =>
-        setTimeout(
-          () => reject(new Error(locale.value.microphoneTimeout)),
-          GET_USER_MEDIA_TIMEOUT_MS
-        )
-      )
-    ])
-
-    audioMatchMicSourceNode = audioMatchContext.createMediaStreamSource(audioMatchMicStream)
-    audioMatchMicSourceNode.connect(audioMatchRecorderNode)
-    audioMatchStatus.value = locale.value.microphoneReady
-  } catch (err) {
-    await stopAudioMatchSession()
-    throw err
-  } finally {
-    audioMatchPreparing.value = false
-  }
-}
-
-const openAudioMatchModal = async () => {
-  showAudioMatchModal.value = true
-  resetAudioMatchState()
-
-  try {
-    await initializeAudioMatch()
-  } catch (err) {
-    console.error('初始化听歌识曲失败:', err)
-    audioMatchError.value = err?.message || locale.value.audioMatchInitFailed
-  }
-}
-
-const closeAudioMatchModal = async () => {
-  showAudioMatchModal.value = false
-  resetAudioMatchState()
-  await stopAudioMatchSession()
-}
-
-const playAudioMatchResult = async (match) => {
-  try {
-    const result = {
-      id: match.id,
-      musicId: match.id,
-      song: match.name,
-      singer: match.artist,
-      cover: match.cover || null,
-      musicPlatform: 'netease',
-      hasUrl: false
-    }
-
-    await playSong(result)
-
-    if (match.startTime > 0) {
-      const audioPlayerControl = useAudioPlayerControl()
-      audioPlayerControl.seekAndPlay(match.startTime / 1000)
-    }
-  } catch (err) {
-    console.error('播放听歌识曲片段失败:', err)
-  }
-}
-
-const startAudioMatchRecording = async () => {
-  if (audioMatchPreparing.value || audioMatchRecording.value || audioMatchProcessing.value) return
-
-  audioMatchError.value = ''
-  audioMatchResults.value = []
-
-  if (!audioMatchRecorderNode) {
-    try {
-      await initializeAudioMatch()
-    } catch (err) {
-      console.error('重新初始化听歌识曲失败:', err)
-      audioMatchError.value = err?.message || locale.value.microphoneAccessFailed
-      return
-    }
-  }
-
-  audioMatchStatus.value = callLocale(
-    'audioMatchRecordingProgress',
-    '',
-    '0.0',
-    AUDIO_MATCH_DURATION
-  )
-  audioMatchRecording.value = true
-  audioMatchRecorderNode.port.postMessage({
-    message: 'start',
-    duration: AUDIO_MATCH_DURATION
-  })
-}
-
-const stopAudioMatchRecording = () => {
-  if (audioMatchRecorderNode?.port) {
-    audioMatchRecorderNode.port.postMessage({ message: 'stop' })
-  }
-}
-
-const useAudioMatchResult = async (match) => {
-  platform.value = 'netease'
-  searchType.value = 1
-  title.value = `${match.name} ${match.artist}`.trim()
-  error.value = ''
-  success.value = ''
-
-  await closeAudioMatchModal()
-  await nextTick()
-  await handleSearch()
-}
-
-onBeforeUnmount(() => {
-  stopAudioMatchSession()
-})
-
 const handleImportSuccess = async () => {
   // 不自动关闭弹窗，等待用户在结果页点击完成
   // showImportSongsModal.value = false
   // 刷新歌曲列表以便检查相似歌曲
   try {
-    await songService.fetchSongs(true, currentSemester.value?.name, true)
+    await songService.fetchSongs(true, currentSemester.value?.name, false, true)
   } catch (error) {
     console.error('刷新歌曲列表失败:', error)
   }
@@ -2242,7 +1061,7 @@ const removeCollaborator = (userId) => {
 const fetchPlayTimes = async () => {
   loadingPlayTimes.value = true
   try {
-    const response = await fetch('/api/play-times')
+    const response = await fetch(`/api/play-times?t=${Date.now()}`)
     if (response.ok) {
       const data = await response.json()
       playTimes.value = data.playTimes || []
@@ -2255,6 +1074,122 @@ const fetchPlayTimes = async () => {
   }
 }
 
+const fetchExpectedPlayDates = async () => {
+  if (!user.value) {
+    expectedPlayDates.value = []
+    expectedPlayDate.value = ''
+    expectedPlaySequence.value = ''
+    return
+  }
+
+  try {
+    const data = await $fetch('/api/expected-play-dates', {
+      query: { t: Date.now() }
+    })
+    expectedPlayDates.value = Array.isArray(data) ? data : []
+  } catch {
+    expectedPlayDates.value = []
+  }
+}
+
+const expectedPlayDateOptions = computed(() => {
+  if (!expectedPlayDates.value || expectedPlayDates.value.length === 0) return []
+  return expectedPlayDates.value.map((d) => ({
+    id: d.date,
+    displayName: `${d.date}（${d.weekday}）${d.isFull ? '（已满）' : ''}`,
+    disabled: !!d.isFull
+  }))
+})
+
+const selectedExpectedPlayDate = computed(() => {
+  if (!expectedPlayDate.value) return null
+  return expectedPlayDates.value.find((d) => d.date === expectedPlayDate.value) || null
+})
+
+const expectedPlaySequenceOptions = computed(() => {
+  const d = selectedExpectedPlayDate.value
+  if (d && Array.isArray(d.freeSequences)) {
+    return d.freeSequences.map((seq) => ({
+      id: String(seq),
+      displayName: `第 ${seq} 序号`
+    }))
+  }
+
+  // 如果未选择日期，列出所有日期的可用序号
+  if (!expectedPlayDates.value || expectedPlayDates.value.length === 0) return []
+  
+  const allOptions = []
+  expectedPlayDates.value.forEach((dateInfo) => {
+    if (dateInfo.isFull || !Array.isArray(dateInfo.freeSequences)) return
+    
+    dateInfo.freeSequences.forEach((seq) => {
+      allOptions.push({
+        id: `${dateInfo.date}_${seq}`,
+        displayName: `${dateInfo.date} 第 ${seq} 序号`,
+        date: dateInfo.date,
+        sequence: String(seq)
+      })
+    })
+  })
+  
+  return allOptions
+})
+
+const handleSequenceChange = (val) => {
+  if (!val) {
+    expectedPlaySequence.value = ''
+    return
+  }
+  
+  // 检查是否包含日期信息 (格式为 YYYY-MM-DD_SEQ)
+  if (val.includes('_')) {
+    const [date, seq] = val.split('_')
+    expectedPlayDate.value = date
+    expectedPlaySequence.value = seq
+  } else {
+    expectedPlaySequence.value = val
+  }
+}
+
+const expectedPlaySequencePills = computed(() => {
+  const d = selectedExpectedPlayDate.value
+  if (!d || !Array.isArray(d.allSequences)) return []
+  const taken = new Set(Array.isArray(d.takenSequences) ? d.takenSequences : [])
+  return d.allSequences.map((seq) => ({
+    seq,
+    taken: taken.has(seq),
+    detail: d.takenDetails?.[seq] || null
+  }))
+})
+
+const getTakenSequenceTitle = (seq) => {
+  const d = selectedExpectedPlayDate.value
+  const detail = d?.takenDetails?.[seq]
+  if (!detail) return ''
+  const info = [detail.title, detail.artist].filter(Boolean).join(' - ')
+  return info ? `已占用：${info}` : '已占用'
+}
+
+const chooseExpectedPlaySequence = (seq) => {
+  const d = selectedExpectedPlayDate.value
+  const taken = new Set(Array.isArray(d?.takenSequences) ? d.takenSequences : [])
+  if (taken.has(seq)) return
+  expectedPlaySequence.value = String(seq)
+}
+
+watch(
+  () => expectedPlayDate.value,
+  (newDate, oldDate) => {
+    if (newDate !== oldDate && expectedPlaySequence.value) {
+      // 验证当前选择的序号在新的日期中是否仍然可用
+      const d = expectedPlayDates.value?.find(d => d.date === newDate)
+      if (!d || !Array.isArray(d.freeSequences) || !d.freeSequences.includes(Number(expectedPlaySequence.value))) {
+        expectedPlaySequence.value = ''
+      }
+    }
+  }
+)
+
 const fileInput = ref(null)
 
 const checkNeteaseLoginStatus = async () => {
@@ -2271,8 +1206,6 @@ const checkNeteaseLoginStatus = async () => {
           isNeteaseLoggedIn.value = true
           neteaseUser.value = dataObj.profile || dataObj.account
           localStorage.setItem('netease_user', JSON.stringify(neteaseUser.value))
-          // 同步 VIP 标志（vipType 非 0 即 VIP）
-          persistNeteaseVipFlag(dataObj.profile)
           // 同步全局网易云登录状态
           updateGlobalNeteaseStatus()
         } else {
@@ -2311,7 +1244,7 @@ const handleExportData = () => {
   document.body.removeChild(a)
   URL.revokeObjectURL(url)
   if (window.$showNotification) {
-    window.$showNotification(locale.value.notifications.exportSuccess, 'success')
+    window.$showNotification('导出成功', 'success')
   }
 }
 
@@ -2329,7 +1262,7 @@ const handleImportData = async (event) => {
     if (data.cookie) {
       checkingNeteaseLogin.value = true
       if (window.$showNotification) {
-        window.$showNotification(locale.value.notifications.validatingCookie, 'info')
+        window.$showNotification('正在验证Cookie有效性...', 'info')
       }
 
       const res = await getLoginStatus(data.cookie)
@@ -2340,25 +1273,22 @@ const handleImportData = async (event) => {
           user: dataObj.profile || dataObj.account
         })
         if (window.$showNotification) {
-          window.$showNotification(locale.value.notifications.importSuccess, 'success')
+          window.$showNotification('导入成功', 'success')
         }
       } else {
         if (window.$showNotification) {
-          window.$showNotification(locale.value.notifications.cookieInvalid, 'error')
+          window.$showNotification('导入的Cookie无效或已过期', 'error')
         }
       }
     } else {
       if (window.$showNotification) {
-        window.$showNotification(locale.value.notifications.fileFormatError, 'error')
+        window.$showNotification('文件格式错误', 'error')
       }
     }
   } catch (e) {
     console.error('导入失败', e)
     if (window.$showNotification) {
-      window.$showNotification(
-        callLocale('notifications.importFailed', '', getErrorMessage(e)),
-        'error'
-      )
+      window.$showNotification('导入失败: ' + e.message, 'error')
     }
   } finally {
     checkingNeteaseLogin.value = false
@@ -2375,7 +1305,6 @@ const handleLoginSuccess = (data) => {
   if (import.meta.client) {
     localStorage.setItem('netease_cookie', data.cookie)
     localStorage.setItem('netease_user', JSON.stringify(data.user))
-    persistNeteaseVipFlag(data.user)
     updateGlobalNeteaseStatus()
   }
 }
@@ -2389,185 +1318,10 @@ const handleLogoutNetease = () => {
   if (import.meta.client) {
     localStorage.removeItem('netease_cookie')
     localStorage.removeItem('netease_user')
-    clearNeteaseVipFlag()
     updateGlobalNeteaseStatus()
   }
 }
 
-const applyQqMusicUser = (user) => {
-  qqMusicUser.value = user || { nickname: locale.value.qqLoggedIn }
-}
-
-const validateQqCookie = async (cookie) => {
-  const res = await $fetch('/api/native-api/qq/check-cookie', {
-    method: 'POST',
-    body: { cookie }
-  })
-  return res?.data || {}
-}
-
-// 持久化服务端返回的 VIP 状态，供取链优先级判断（仅 VIP 时优先官方链路）
-const persistQqVipFlag = (data) => {
-  if (typeof data?.isVip !== 'boolean' || !import.meta.client) return
-  localStorage.setItem('qq_music_vip', data.isVip ? '1' : '0')
-}
-
-// 用服务端校验结果补全真实昵称与头像，仅在有增量时更新
-const refreshQqProfileFromServer = async (cookie) => {
-  if (!cookie) return
-  try {
-    const data = await validateQqCookie(cookie)
-    if (!data.valid) return
-    persistQqVipFlag(data)
-    if (!(data.user?.nickname || data.user?.avatarUrl)) return
-
-    const mergedUser = { ...(qqMusicUser.value || {}), ...data.user }
-    applyQqMusicUser(mergedUser)
-    localStorage.setItem('qq_music_user', JSON.stringify(mergedUser))
-  } catch (e) {
-    console.warn('刷新 QQ 用户资料失败:', e)
-  }
-}
-
-// 启动时静默校验本地保存的 QQ 登录态，失效则清理并提示
-const checkQQMusicLoginStatus = async () => {
-  if (!import.meta.client) return
-
-  const cookie = localStorage.getItem('qq_music_cookie')
-  if (!cookie) {
-    handleLogoutQQMusic()
-    return
-  }
-
-  // 先按本地缓存呈现，再异步校验，避免界面闪烁
-  qqMusicCookie.value = cookie
-  isQQMusicLoggedIn.value = true
-  try {
-    const userStr = localStorage.getItem('qq_music_user')
-    qqMusicUser.value = userStr ? JSON.parse(userStr) : { nickname: locale.value.qqLoggedIn }
-  } catch {
-    applyQqMusicUser(null)
-  }
-
-  checkingQQLogin.value = true
-  try {
-    const data = await validateQqCookie(cookie)
-    if (data.valid) {
-      persistQqVipFlag(data)
-      await refreshQqProfileFromServer(cookie)
-    } else {
-      if (window.$showNotification) {
-        window.$showNotification(locale.value.qqLoginExpired, 'warning')
-      }
-      handleLogoutQQMusic()
-    }
-  } catch (e) {
-    console.warn('校验 QQ 登录状态失败，保留本地状态:', e)
-  } finally {
-    checkingQQLogin.value = false
-  }
-}
-
-const handleQQLoginSuccess = (data) => {
-  qqMusicCookie.value = data.cookie
-  applyQqMusicUser(data.user)
-  isQQMusicLoggedIn.value = true
-
-  if (import.meta.client) {
-    localStorage.setItem('qq_music_cookie', data.cookie)
-    localStorage.setItem('qq_music_user', JSON.stringify(qqMusicUser.value))
-  }
-
-  // 立即拉取真实昵称与头像，替换扫码占位信息
-  refreshQqProfileFromServer(data.cookie)
-}
-
-const handleLogoutQQMusic = () => {
-  qqMusicCookie.value = ''
-  qqMusicUser.value = null
-  isQQMusicLoggedIn.value = false
-
-  if (import.meta.client) {
-    localStorage.removeItem('qq_music_cookie')
-    localStorage.removeItem('qq_music_user')
-    localStorage.removeItem('qq_music_vip')
-  }
-}
-
-const handleExportDataQQ = () => {
-  if (!qqMusicCookie.value) return
-  const data = {
-    cookie: qqMusicCookie.value,
-    user: qqMusicUser.value,
-    timestamp: Date.now()
-  }
-  const blob = new Blob([JSON.stringify(data, null, 2)], { type: 'application/json' })
-  const url = URL.createObjectURL(blob)
-  const a = document.createElement('a')
-  a.href = url
-  a.download = `qq_music_cookie_${Date.now()}.json`
-  document.body.appendChild(a)
-  a.click()
-  document.body.removeChild(a)
-  URL.revokeObjectURL(url)
-  if (window.$showNotification) {
-    window.$showNotification(locale.value.notifications.exportSuccess, 'success')
-  }
-}
-
-const qqFileInput = ref(null)
-
-const handleImportClickQQ = () => {
-  qqFileInput.value.click()
-}
-
-const handleImportDataQQ = async (event) => {
-  const file = event.target.files[0]
-  if (!file) return
-
-  try {
-    const text = await file.text()
-    const data = JSON.parse(text)
-    if (data.cookie) {
-      checkingQQLogin.value = true
-      if (window.$showNotification) {
-        window.$showNotification(locale.value.notifications.validatingCookie, 'info')
-      }
-
-      const result = await validateQqCookie(data.cookie)
-      if (result.valid) {
-        const user =
-          result.user?.nickname || result.user?.avatarUrl
-            ? result.user
-            : { nickname: locale.value.qqLoggedIn }
-        handleQQLoginSuccess({ cookie: data.cookie, user })
-        if (window.$showNotification) {
-          window.$showNotification(locale.value.notifications.importSuccess, 'success')
-        }
-      } else {
-        if (window.$showNotification) {
-          window.$showNotification(locale.value.notifications.cookieInvalid, 'error')
-        }
-      }
-    } else {
-      if (window.$showNotification) {
-        window.$showNotification(locale.value.notifications.fileFormatError, 'error')
-      }
-    }
-  } catch (e) {
-    console.error('导入失败', e)
-    if (window.$showNotification) {
-      window.$showNotification(
-        callLocale('notifications.importFailed', '', getErrorMessage(e)),
-        'error'
-      )
-    }
-  } finally {
-    checkingQQLogin.value = false
-  }
-  event.target.value = ''
-}
-
 watch(
   () => searchType.value,
   () => {
@@ -2594,12 +1348,20 @@ watch(
   }
 )
 
+let refreshInterval
+
+const refreshSubmissionInfo = () => {
+  if (import.meta.client && typeof document !== 'undefined' && document.visibilityState === 'hidden') {
+    return
+  }
+  fetchSubmissionStatus()
+  fetchExpectedPlayDates()
+}
+
 onMounted(async () => {
-  // 后台加载平台配置（不阻塞其他初始化）；平台可用性变化由 watch 自动处理
-  loadPlatformConfig()
   checkNeteaseLoginStatus()
-  checkQQMusicLoginStatus()
   fetchPlayTimes()
+  fetchExpectedPlayDates()
   initSiteConfig()
   fetchSubmissionStatus()
   // 获取当前学期和所有学期选项
@@ -2612,24 +1374,26 @@ onMounted(async () => {
     } catch (error) {
       console.error('加载歌曲列表失败:', error)
     }
-
-    try {
-      const pendingSearch = sessionStorage.getItem('pending_search')
-      if (pendingSearch) {
-        const saved = JSON.parse(pendingSearch)
-        sessionStorage.removeItem('pending_search')
-        if (saved.title) {
-          title.value = saved.title
-          if (saved.platform) platform.value = saved.platform
-          await checkNeteaseLoginStatus()
-          await handleSearch()
-        }
-      }
-    } catch {
-      // 浏览器禁用会话存储时不影响页面初始化。
-    }
   }
-  // 音源健康检查功能已移除
+
+  refreshInterval = setInterval(() => {
+    refreshSubmissionInfo()
+  }, 2000)
+
+  if (import.meta.client) {
+    window.addEventListener('focus', refreshSubmissionInfo)
+    document.addEventListener('visibilitychange', refreshSubmissionInfo)
+  }
+})
+
+onUnmounted(() => {
+  if (refreshInterval) {
+    clearInterval(refreshInterval)
+  }
+  if (import.meta.client) {
+    window.removeEventListener('focus', refreshSubmissionInfo)
+    document.removeEventListener('visibilitychange', refreshSubmissionInfo)
+  }
 })
 
 // 过滤出启用的播出时段
@@ -2638,11 +1402,10 @@ const enabledPlayTimes = computed(() => {
 })
 
 const formattedPlayTimes = computed(() => {
-  const options = enabledPlayTimes.value.map((pt) => ({
+  return enabledPlayTimes.value.map((pt) => ({
     ...pt,
     displayName: pt.startTime || pt.endTime ? `${pt.name} (${formatPlayTimeRange(pt)})` : pt.name
   }))
-  return [{ id: '', displayName: locale.value.choosePlayTime }, ...options]
 })
 
 // 格式化播出时段时间范围
@@ -2652,22 +1415,39 @@ const formatPlayTimeRange = (playTime) => {
   if (playTime.startTime && playTime.endTime) {
     return `${playTime.startTime} - ${playTime.endTime}`
   } else if (playTime.startTime) {
-    return `${playTime.startTime}`
+    return `${playTime.startTime} 开始`
   } else if (playTime.endTime) {
-    return `${playTime.endTime}`
+    return `${playTime.endTime} 结束`
   }
 
-  return locale.value.choosePlayTime
+  return '不限时间'
 }
 
+// 监听歌曲服务中的相似歌曲
+watch(
+  () => songService.similarSongFound.value,
+  (newVal) => {
+    // 保持兼容性，如果有相似歌曲，将其放入数组
+    if (newVal) {
+      similarSongs.value = [newVal]
+    } else {
+      similarSongs.value = []
+    }
+  }
+)
+
 // 监听用户状态变化，当用户登录后重新获取投稿状态
 watch(
   () => user.value,
   (newUser) => {
     if (newUser) {
       fetchSubmissionStatus()
+      fetchExpectedPlayDates()
     } else {
       submissionStatus.value = null
+      expectedPlayDates.value = []
+      expectedPlayDate.value = ''
+      expectedPlaySequence.value = ''
     }
   }
 )
@@ -2686,23 +1466,122 @@ watch(enableSubmissionRemarks, (enabled) => {
   }
 })
 
-watch([enableCardCodeRequests, requireCardCodeForRequests], ([enabled, required]) => {
-  if (!enabled && !required) {
-    clearCardCode()
+// 检查相似歌曲
+const checkSimilarSongs = async () => {
+  if (title.value.trim().length > 2) {
+    console.log('检查相似歌曲:', title.value, artist.value)
+    const similar = await songService.checkSimilarSongs(title.value.trim(), artist.value.trim())
+    console.log('相似歌曲结果:', similar, songService.similarSongFound.value)
+    similarSongs.value = similar
+  } else {
+    similarSongs.value = []
   }
-})
+}
 
-watch(cardCodeDraft, (value) => {
-  if (value.trim() !== cardCode.value.trim()) {
-    resetCardCodeValidation()
+// 投票支持相似歌曲
+const voteForSimilar = async (song) => {
+  if (!song || song.voted) return
+
+  voting.value = true
+  try {
+    // 直接调用songService的投票方法，避免重复处理
+    await songService.voteSong(song.id)
+
+    // 更新本地状态
+    song.voted = true
+    song.voteCount = (song.voteCount || 0) + 1
+
+    // 投票成功后刷新歌曲列表
+    await songService.refreshSongsSilent().catch((err) => {
+      console.error('刷新歌曲列表失败', err)
+    })
+
+    // 清除表单并隐藏提示
+    title.value = ''
+    artist.value = ''
+    similarSongs.value = []
+  } catch (err) {
+    error.value = err.message || '投票失败，请稍后重试'
+    if (window.$showNotification) {
+      window.$showNotification(error.value, 'error')
+    }
+  } finally {
+    voting.value = false
   }
-})
+}
+
+// 忽略相似歌曲，继续投稿
+const ignoreSimilar = () => {
+  similarSongs.value = []
+}
+
+// 打开相似剧集详情弹窗
+const openSimilarEpisodesModal = (group) => {
+  if (!group || !group.episodes || group.episodes.length === 0) {
+    if (window.$showNotification) {
+      window.$showNotification('无法打开剧集列表', 'error')
+    }
+    return
+  }
+
+  // 构造一个类似搜索结果的对象
+  const videoData = {
+    id: group.bvid,
+    title: group.title,
+    artist: group.artist,
+    cover: group.cover,
+    pages: [...group.episodes]
+      // 先按照 musicId 中的分P号排序，确保顺序正确
+      .sort((a, b) => {
+        // 提取页码的辅助函数，处理各种边界情况
+        const getPageNumber = (musicId) => {
+          if (!musicId) return 1
+          const parts = musicId.split(':')
+          if (parts.length > 2) {
+            const page = parseInt(parts[2], 10)
+            if (!isNaN(page)) return page
+          }
+          return 1 // 如果没有分页信息，默认为P1
+        }
+        return getPageNumber(a.musicId) - getPageNumber(b.musicId)
+      })
+      .map((episode, index) => {
+        // 从 musicId 中提取 cid 和 page
+        const parts = episode.musicId ? episode.musicId.split(':') : []
+        const cid = parts[1] || ''
+        const page = parts[2] ? parseInt(parts[2]) : index + 1
+
+        // 从标题中提取剧集名称
+        const episodeTitle =
+          episode.title && episode.title.includes(' - ')
+            ? episode.title.split(' - ').slice(1).join(' - ')
+            : episode.title || `第${index + 1}集`
+
+        return {
+          cid,
+          page,
+          part: episodeTitle,
+          duration: episode.duration || 0,
+          // 直接使用 episode 的完整信息
+          songId: episode.id,
+          played: episode.played || false,
+          scheduled: episode.scheduled || false,
+          voted: episode.voted || false,
+          voteCount: episode.voteCount || 0,
+          requesterId: episode.requesterId
+        }
+      })
+  }
+
+  selectedBilibiliVideo.value = videoData
+  bilibiliEpisodes.value = videoData.pages
+}
 
 // 处理剧集投票
 const handleEpisodeVote = async (episode) => {
   if (!episode.songId) {
     if (window.$showNotification) {
-      window.$showNotification(locale.value.notifications.missingSongId, 'error')
+      window.$showNotification('无法投票：缺少歌曲ID', 'error')
     }
     return
   }
@@ -2726,10 +1605,7 @@ const handleEpisodeVote = async (episode) => {
     })
   } catch (err) {
     if (window.$showNotification) {
-      window.$showNotification(
-        getErrorMessage(err) || locale.value.notifications.likeFailed,
-        'error'
-      )
+      window.$showNotification(err.message || '点赞失败', 'error')
     }
   } finally {
     voting.value = false
@@ -2737,6 +1613,16 @@ const handleEpisodeVote = async (episode) => {
 }
 
 // 检查搜索结果是否已存在完全匹配的歌曲
+// 标准化字符串（与useSongs中的逻辑保持一致）
+const normalizeString = (str) => {
+  return str
+    .toLowerCase()
+    .replace(/[\s\-_\(\)\[\]【】（）「」『』《》〈〉""''""''、，。！？：；～·]/g, '')
+    .replace(/[&＆]/g, 'and')
+    .replace(/[feat\.?|ft\.?]/gi, '')
+    .trim()
+}
+
 const getSimilarSong = (result) => {
   // 多P视频不在这里检查相似性，使用专门的 getBilibiliEpisodeStatus
   if (isBilibiliMultiP(result)) {
@@ -2778,7 +1664,7 @@ const handleLikeFromSearch = async (song, originalResult = null) => {
 
   if (song.played || song.scheduled) {
     if (window.$showNotification) {
-      const message = song.played ? locale.value.playedCannotLike : locale.value.scheduledCannotLike
+      const message = song.played ? '已播放的歌曲不能点赞' : '已排期的歌曲不能点赞'
       window.$showNotification(message, 'warning')
     }
     return
@@ -2788,8 +1674,6 @@ const handleLikeFromSearch = async (song, originalResult = null) => {
   if (originalResult && isBilibiliMultiP(originalResult)) {
     selectedBilibiliVideo.value = originalResult
     bilibiliEpisodes.value = originalResult.pages
-    bilibiliEpisodeSubmitOptions.value = {}
-    showBilibiliEpisodesModal.value = true
     return
   }
 
@@ -2804,8 +1688,6 @@ const handleLikeFromSearch = async (song, originalResult = null) => {
 const switchPlatform = (newPlatform) => {
   if (platform.value === newPlatform) return
 
-  platformTouched.value = true
-
   // 如果有正在进行的搜索请求，立即取消
   if (searchAbortController.value) {
     searchAbortController.value.abort()
@@ -2830,10 +1712,18 @@ const handleSearch = async () => {
   success.value = ''
   searchError.value = ''
 
-  if (!title.value.trim()) {
-    error.value = locale.value.notifications.songNameRequired
+  if (!user.value) {
+    error.value = '需要登录才能搜索'
     if (window.$showNotification) {
-      window.$showNotification(locale.value.notifications.songNameRequired, 'error')
+      window.$showNotification('需要登录才能搜索', 'error')
+    }
+    return
+  }
+
+  if (!title.value.trim()) {
+    error.value = '歌曲名称不能为空'
+    if (window.$showNotification) {
+      window.$showNotification('歌曲名称不能为空', 'error')
     }
     return
   }
@@ -2861,16 +1751,10 @@ const handleSearch = async () => {
       limit: 20,
       signal: signal, // 传递AbortSignal
       type: requestPlatform === 'netease' ? requestSearchType : 1,
-      cookie:
-        requestPlatform === 'netease'
-          ? neteaseCookie.value
-          : requestPlatform === 'tencent'
-            ? qqMusicCookie.value
-            : undefined
+      cookie: requestPlatform === 'netease' ? neteaseCookie.value : undefined
     }
 
     console.log('开始多音源搜索:', searchParams)
-    // 平台可用性检查已由 searchSongs 内部统一处理
     const results = await musicSources.searchSongs(searchParams)
 
     // 再次检查是否被中断，防止竞态条件
@@ -2903,21 +1787,10 @@ const handleSearch = async () => {
           item.musicPlatform || (results.source === 'netease-backup' ? 'netease' : results.source)
       }))
 
-      // 如果QQ音乐搜索降级到网易云，自动切换选项卡
-      if (platform.value === 'tencent' && searchResults.value.length > 0) {
-        const firstPlatform =
-          searchResults.value[0].actualMusicPlatform || searchResults.value[0].musicPlatform || ''
-        if (firstPlatform.includes('netease')) {
-          platform.value = 'netease'
-        }
-      }
-
       console.log('搜索成功，找到', results.data.length, '首歌曲')
-      // 异步预检服务端投稿限制（same-song / same-artist）
-      fetchRestrictionChecks()
     } else {
       searchResults.value = []
-      const errorMsg = results && results.error ? results.error : locale.value.noMatchingSongs
+      const errorMsg = results && results.error ? results.error : '没有找到匹配的歌曲'
       error.value = errorMsg
       if (window.$showNotification) {
         window.$showNotification(errorMsg, 'info')
@@ -2931,7 +1804,7 @@ const handleSearch = async () => {
     }
 
     console.error('搜索错误:', err)
-    searchError.value = getErrorMessage(err) || locale.value.searchRequestFailed
+    searchError.value = err.message || '搜索请求失败，请稍后重试'
     error.value = searchError.value
 
     if (window.$showNotification) {
@@ -2956,11 +1829,23 @@ const getAudioUrl = async (result) => {
     // 根据搜索结果的sourceInfo.source字段判断音源类型
     const sourceType = result.sourceInfo?.source || result.actualSource || ''
 
+    if (sourceType === 'kugou') {
+      const songId = result.musicId || result.id
+      if (!songId) throw new Error('缺少歌曲ID参数')
+
+      const urlResult = await musicSources.getSongUrl(songId, 0, 'kugou')
+      if (urlResult && urlResult.success && urlResult.url) {
+        result.url = urlResult.url
+        result.hasUrl = true
+        return result
+      }
+    }
+
     // 哔哩哔哩
-    if (sourceType === 'bilibili' || isBilibiliSong(result)) {
+    if (sourceType === 'bilibili' || false) {
       try {
         const songId = result.musicId || result.id
-        if (!songId) throw new Error(locale.value.notifications.missingSongId)
+        if (!songId) throw new Error('缺少歌曲ID参数')
 
         const options = result.bilibiliCid ? { bilibiliCid: String(result.bilibiliCid) } : undefined
         const urlResult = await musicSources.getSongUrl(songId, 0, 'bilibili', undefined, options)
@@ -2975,20 +1860,33 @@ const getAudioUrl = async (result) => {
       }
     }
 
+    // 对于 vkeys v3（QQ音乐），调用统一的 getSongUrl 获取播放链接
     if (sourceType === 'vkeys-v3') {
       try {
         const songId = result.musicId || result.id
-        if (!songId) throw new Error(locale.value.notifications.missingSongId)
+        if (!songId) throw new Error('缺少歌曲ID参数')
 
         const { getQuality } = useAudioQuality()
-        const urlResult = await musicSources.getSongUrl(songId, getQuality('tencent'), 'tencent')
-        if (urlResult?.success && urlResult.url) {
+        const quality = getQuality(platform.value) || 8
+        const urlResult = await musicSources.getSongUrl(songId, quality, 'tencent')
+
+        if (urlResult && urlResult.success && urlResult.url) {
           result.url = urlResult.url
           result.hasUrl = true
+
+          // 更新搜索结果中的对应项
+          const index = searchResults.value.findIndex(
+            (item) => (item.musicId || item.id) === (result.musicId || result.id)
+          )
+          if (index !== -1) {
+            searchResults.value[index] = { ...result }
+          }
           return result
+        } else {
+          // vkeys v3 未获取到有效链接，继续回退逻辑
         }
-      } catch (error) {
-        console.warn('vkeys v3 获取播放链接失败:', error)
+      } catch (qqV3Error) {
+        // vkeys v3 获取失败，继续回退其它逻辑
       }
     }
 
@@ -3002,7 +1900,7 @@ const getAudioUrl = async (result) => {
         if (platform.value === 'tencent') {
           try {
             const songId = result.musicId || result.id
-            if (!songId) throw new Error(locale.value.notifications.missingSongId)
+            if (!songId) throw new Error('缺少歌曲ID参数')
 
             const { getQuality } = useAudioQuality()
             const quality = getQuality(platform.value) || 8
@@ -3027,16 +1925,12 @@ const getAudioUrl = async (result) => {
               quality: quality
             })
 
-            if (songDetail?.data?.songs?.[0]?.url) {
-              const song = songDetail.data.songs[0]
-              result.url = song.url
+            if (songDetail && songDetail.url) {
+              result.url = songDetail.url
               result.hasUrl = true
-              if (song.cover) result.cover = song.cover
-              if (song.duration) result.duration = song.duration
+              if (songDetail.cover) result.cover = songDetail.cover
+              if (songDetail.duration) result.duration = songDetail.duration
               return result
-            } else {
-              console.warn('getSongDetail 未返回 url，尝试备用音源')
-              throw new Error('song detail has no url')
             }
           } catch (error) {
             // vkeys getSongDetail 失败，继续回退
@@ -3103,106 +1997,34 @@ const getAudioUrl = async (result) => {
       }
     }
 
-    // 如果是网易云音乐且没有被前面特殊的 sourceType 处理（比如听歌识曲的普通结果）
-    if (result.musicPlatform === 'netease' && !result.url) {
-      try {
-        const { getQuality } = useAudioQuality()
-        const quality = getQuality('netease')
-        const songDetail = await musicSources.getSongDetail({
-          ids: [result.musicId || result.id],
-          quality: quality
-        })
-
-        if (songDetail?.data?.songs?.[0]?.url) {
-          const song = songDetail.data.songs[0]
-          result.url = song.url
-          result.hasUrl = true
-          if (song.cover) result.cover = song.cover
-          if (song.duration) result.duration = song.duration
-          return result
-        } else {
-          console.warn('getSongDetail 未返回 url，尝试备用音源')
-          throw new Error('song detail has no url')
-        }
-      } catch (error) {
-        console.error('获取网易云音乐详情失败:', error)
-      }
-
-      // 如果getSongDetail失败，尝试网易云备用源
-      try {
-        const { getQuality } = useAudioQuality()
-        const quality = getQuality('netease')
-        const songId = result.musicId || result.id
-
-        const urlResult = await musicSources.getSongUrl(songId, quality, 'netease')
-
-        if (urlResult && urlResult.success && urlResult.url) {
-          result.url = urlResult.url
-          result.hasUrl = true
-          return result
-        }
-      } catch (backupError) {
-        console.error('备用源获取失败:', backupError)
-      }
-    }
-
-    // 最终回退：使用统一的 resolveMusicUrl（包含 vkeys API 回退）
-    // 对于未登录用户或音源获取失败时使用第三方 API 获取播放链接
-    if (!result.url && result.musicPlatform && result.musicId) {
-      try {
-        const fallbackUrl = await resolveMusicUrl(
-          result.musicPlatform,
-          result.musicId,
-          result.playUrl,
-          {
-            mediaId:
-              result.sourceInfo?.strMediaMid ||
-              result.sourceInfo?.mediaId ||
-              result.sourceInfo?.mediaMid,
-            musicInfo: {
-              name: result.title,
-              artist: result.artist,
-              album: result.album || undefined
-            }
-          }
-        )
-        if (fallbackUrl) {
-          result.url = fallbackUrl
-          result.hasUrl = true
-        }
-      } catch (fallbackError) {
-        console.error('resolveMusicUrl 回退获取失败:', fallbackError)
-      }
-    }
-
     return result
   } catch (err) {
-    error.value = locale.value.notifications.musicUrlFailedRetry
+    error.value = '获取音乐URL失败，请稍后重试'
     if (window.$showNotification) {
-      window.$showNotification(locale.value.notifications.musicUrlFailedRetry, 'error')
+      window.$showNotification('获取音乐URL失败，请稍后重试', 'error')
     }
     return result
   }
 }
 
 // 播放歌曲
-const playSong = async (result, playlist, playlistIndex) => {
+const playSong = async (result) => {
   // 如果还没有获取URL，先获取
   if (!result.hasUrl && !result.url) {
     result = await getAudioUrl(result)
   }
 
   // 对于非哔哩哔哩平台，如果没有URL则提示错误
-  if (!result.url && !isBilibiliSong(result)) {
-    error.value = locale.value.notifications.songUnavailable
+  if (!result.url) {
+    error.value = '该歌曲无法播放，可能是付费内容'
     if (window.$showNotification) {
-      window.$showNotification(locale.value.notifications.songUnavailable, 'error')
+      window.$showNotification('该歌曲无法播放，可能是付费内容', 'error')
     }
     return
   }
 
   let finalMusicId = result.musicId ? String(result.musicId) : null
-  if (isBilibiliSong(result) && result.bilibiliCid) {
+  if (false && result.bilibiliCid) {
     finalMusicId = `${result.musicId}:${result.bilibiliCid}`
     // 如果有分P信息，也添加到 musicId
     if (result.bilibiliPage || result.page) {
@@ -3222,38 +2044,18 @@ const playSong = async (result, playlist, playlistIndex) => {
     musicUrl: result.url || null, // 哔哩哔哩可能没有音频URL
     musicPlatform: result.musicPlatform || platform.value,
     musicId: finalMusicId,
-    albumId: result.albumId,
-    sourceInfo: result.sourceInfo,
     bilibiliCid: result.bilibiliCid // 确保传递 cid
   }
 
   console.log('[RequestForm] 准备播放歌曲:', song)
 
-  // 处理播放列表：如果提供了playlist，将其转换为audioPlayer需要的格式
-  let finalPlaylist
-  let finalIndex
-  if (playlist && playlist.length > 0) {
-    finalPlaylist = playlist.map((s) => ({
-      ...s,
-      id: String(s.id),
-      musicId: String(s.musicId || s.id),
-      musicUrl: s.musicUrl || s.url || null
-    }))
-    // 如果提供了playlistIndex则使用，否则自动查找
-    finalIndex =
-      typeof playlistIndex === 'number'
-        ? playlistIndex
-        : finalPlaylist.findIndex((s) => s.id === String(song.id))
-    if (finalIndex < 0) finalIndex = 0
-  }
-
   // 使用全局播放器播放歌曲
-  const playResult = audioPlayer.playSong(song, finalPlaylist, finalIndex)
+  const playResult = audioPlayer.playSong(song)
 
   if (!playResult) {
     console.error('[RequestForm] 播放器返回 false，播放失败')
     if (window.$showNotification) {
-      window.$showNotification(locale.value.notifications.playFailed, 'error')
+      window.$showNotification('播放失败，请稍后重试', 'error')
     }
     return
   }
@@ -3267,11 +2069,7 @@ const playSong = async (result, playlist, playlistIndex) => {
       const lyrics = useLyrics()
       // 请求歌词（对于bilibili，传递原始的bvid，不包含cid）
       const lyricMusicId = result.bilibiliCid ? result.musicId : song.musicId
-      await lyrics.fetchLyrics(song.musicPlatform, lyricMusicId, {
-        title: song.title,
-        artist: song.artist,
-        album: result.album || ''
-      })
+      await lyrics.fetchLyrics(song.musicPlatform, lyricMusicId)
     } catch (error) {
       console.error('获取歌词失败:', error)
       // 歌词获取失败不影响播放
@@ -3280,34 +2078,7 @@ const playSong = async (result, playlist, playlistIndex) => {
 }
 
 // 选择搜索结果
-const selectResult = async (result) => {
-  // 防止重复点击和事件冒泡
-  event?.stopPropagation()
 
-  // 先获取完整信息
-  if (!result.hasUrl) {
-    result = await getAudioUrl(result)
-  }
-
-  // 标准化属性名称（处理不同API返回格式的差异）
-  const songTitle = result.song || result.title
-  const singerName = result.singer || result.artist
-
-  title.value = songTitle
-  artist.value = singerName
-  selectedCover.value = result.cover || ''
-  selectedUrl.value = result.url || ''
-
-  // 如果没有URL，给出提示
-  if (!result.url) {
-    success.value = locale.value.notifications.songSelectedMaybeLimited
-    if (window.$showNotification) {
-      window.$showNotification(locale.value.notifications.songSelectedMaybeLimited, 'info')
-    }
-  }
-
-  console.log('已选择歌曲:', songTitle, '- 填充表单但不自动提交')
-}
 
 // 打开上传到网易云对话框
 const openUploadDialog = (result) => {
@@ -3328,101 +2099,6 @@ const handleShowLogin = () => {
   showLoginModal.value = true
 }
 
-const handleLoginRedirect = async () => {
-  if (title.value.trim()) {
-    try {
-      sessionStorage.setItem(
-        'pending_search',
-        JSON.stringify({
-          title: title.value.trim(),
-          platform: platform.value
-        })
-      )
-    } catch {
-      // 浏览器禁用会话存储时仍可继续登录。
-    }
-  }
-  await navigateTo(`/login?redirect=${encodeURIComponent('/?tab=request')}`)
-}
-
-// 归一化时长到秒（网易云返回毫秒，其余平台返回秒）
-const normalizeDurationToSeconds = (duration, actualMusicPlatform) => {
-  if (!duration) return null
-  const d = Number(duration)
-  if (!isFinite(d) || d <= 0) return null
-  // 网易云详情接口返回毫秒，其余平台返回秒
-  return actualMusicPlatform === 'netease' || actualMusicPlatform === 'netease-podcast'
-    ? Math.floor(d / 1000)
-    : Math.floor(d)
-}
-
-const SUBMISSION_AUDIO_DURATION_TIMEOUT_MS = 8000
-
-// 播放地址未提供时长时，仅加载媒体元数据，不启动播放。
-const readAudioDuration = (url) => {
-  if (!url || typeof document === 'undefined') return Promise.resolve(null)
-
-  return new Promise((resolve) => {
-    const audio = document.createElement('audio')
-    let settled = false
-    let timeoutId = null
-
-    const cleanup = () => {
-      audio.onloadedmetadata = null
-      audio.ondurationchange = null
-      audio.onerror = null
-      audio.onabort = null
-      if (timeoutId !== null) window.clearTimeout(timeoutId)
-      audio.pause()
-      audio.removeAttribute('src')
-      audio.load()
-    }
-
-    const finish = (duration) => {
-      if (settled) return
-      settled = true
-      cleanup()
-      resolve(duration)
-    }
-
-    const handleMetadata = () => {
-      const duration = Number(audio.duration)
-      if (Number.isFinite(duration) && duration > 0) {
-        finish(Math.floor(duration))
-      }
-    }
-
-    audio.preload = 'metadata'
-    audio.onloadedmetadata = handleMetadata
-    audio.ondurationchange = handleMetadata
-    audio.onerror = () => finish(null)
-    audio.onabort = () => finish(null)
-    timeoutId = window.setTimeout(() => finish(null), SUBMISSION_AUDIO_DURATION_TIMEOUT_MS)
-
-    try {
-      audio.src = url
-      audio.load()
-    } catch {
-      finish(null)
-    }
-  })
-}
-
-const resolveSubmissionDuration = async (result, actualMusicPlatform, fallbackUrl = '') => {
-  const apiDuration = normalizeDurationToSeconds(result.duration, actualMusicPlatform)
-  if (apiDuration !== null) return apiDuration
-
-  const audioDuration = await readAudioDuration(result.url || result.file || fallbackUrl)
-  if (audioDuration === null) return null
-
-  // 保持 result.duration 与各平台搜索结果的单位一致，后续统一转换为秒。
-  result.duration =
-    actualMusicPlatform === 'netease' || actualMusicPlatform === 'netease-podcast'
-      ? audioDuration * 1000
-      : audioDuration
-  return audioDuration
-}
-
 // 提交选中的歌曲
 const submitSong = async (result, options = {}) => {
   // 防止重复点击和重复提交
@@ -3440,7 +2116,6 @@ const submitSong = async (result, options = {}) => {
     selectedPodcastId.value = result.id || result.musicId
     selectedPodcastName.value = result.title || result.song || result.name
     podcastCookie.value = neteaseCookie.value
-    showPodcastModal.value = true
     return
   }
 
@@ -3454,52 +2129,96 @@ const submitSong = async (result, options = {}) => {
     console.log('打开 Bilibili 剧集列表:', result)
     selectedBilibiliVideo.value = result
     bilibiliEpisodes.value = result.pages
-    bilibiliEpisodeSubmitOptions.value =
-      options.replayRequest === true ? { replayRequest: true } : {}
-    showBilibiliEpisodesModal.value = true
     return
   }
 
   console.log('执行submitSong，提交歌曲:', result.title || result.song)
 
+  // 检查投稿限额
+  const limitCheck = checkSubmissionLimit()
+  if (!limitCheck.canSubmit) {
+    error.value = limitCheck.message
+    if (window.$showNotification) {
+      window.$showNotification(limitCheck.message, 'error')
+    }
+    return
+  }
+
+  if (expectedPlayDateOptions.value.length === 0) {
+    error.value = '当前未开放可选播出日期，暂无法投稿'
+    if (window.$showNotification) {
+      window.$showNotification(error.value, 'error')
+    }
+    return
+  }
+
+  if (!expectedPlayDate.value || !expectedPlaySequence.value) {
+    error.value = '请选择期望播出日期与期望播放序号'
+    if (window.$showNotification) {
+      window.$showNotification('请选择期望播出日期与期望播放序号', 'error')
+    }
+    return
+  }
+
   // 使用搜索结果中的数据
   const songTitle = result.song || result.title
   const songArtist = result.singer || result.artist
 
-  let replayTargetSong = null
-
-  // 重播申请需要定位到本学期内已播放的原歌曲；多P 视频按完整 musicId 精确匹配，其余平台由 getSimilarSong 归一化回退
-  if (
-    options.replayRequest === true &&
-    !auth.isAdmin.value &&
-    auth.isAuthenticated.value &&
-    songService.songs.value &&
-    songService.songs.value.length > 0 &&
-    platform.value === 'bilibili' &&
-    result.musicId
-  ) {
-    let fullMusicId = String(result.musicId)
-    if (options.isBilibiliEpisode && options.episode) {
-      const bvId = fullMusicId.split(':')[0]
-      const musicIdParts = [bvId, options.episode.cid]
-      if (options.episode.page && Number(options.episode.page) > 1) {
-        musicIdParts.push(String(options.episode.page))
+  // 只有在用户已登录且歌曲列表已加载时才检查是否已存在完全匹配的歌曲
+  if (auth.isAuthenticated.value && songService.songs.value && songService.songs.value.length > 0) {
+    // 对于哔哩哔哩多P视频，使用 musicId 进行精确匹配
+    if (platform.value === 'bilibili' && result.musicId) {
+      // 构建完整的 musicId
+      let fullMusicId = String(result.musicId)
+      if (options.isBilibiliEpisode && options.episode) {
+        const bvId = fullMusicId.split(':')[0]
+        const musicIdParts = [bvId, options.episode.cid]
+        if (options.episode.page && Number(options.episode.page) > 1) {
+          musicIdParts.push(String(options.episode.page))
+        }
+        fullMusicId = musicIdParts.join(':')
       }
-      fullMusicId = musicIdParts.join(':')
-    }
 
-    replayTargetSong =
-      songService.songs.value.find(
-        (song) => isBilibiliSong(song) && song.musicId === fullMusicId && song.played
-      ) || null
-  }
+      // 检查是否已有相同 musicId 的歌曲
+      const existingSong = songService.songs.value.find(
+        (song) => false && song.musicId === fullMusicId
+      )
 
-  // 能否投稿由服务端预检结论决定（区分本学期查重与排期冷却窗口两种模式，且已随开关关闭放行）
-  if (!auth.isAdmin.value && isSongBlockedByRestriction(result)) {
-    if (window.$showNotification) {
-      window.$showNotification(getRestrictionMessage(getRestrictionReason(result)), 'warning')
+      if (existingSong) {
+        const allowOverride =
+          options.forceResubmit === true || (isSuperAdmin.value && existingSong.played)
+        if (!allowOverride) {
+          if (window.$showNotification) {
+            window.$showNotification(
+              '这首歌曲已经在列表中了，不能重复投稿。您可以为它点赞支持！',
+              'warning'
+            )
+          }
+          return
+        }
+      }
+    } else {
+      // 对于其他平台，使用标题和艺术家进行匹配
+      const existingSong = songService.songs.value.find(
+        (song) =>
+          song.title.toLowerCase() === songTitle.toLowerCase() &&
+          song.artist.toLowerCase() === songArtist.toLowerCase()
+      )
+
+      if (existingSong) {
+        const allowOverride =
+          options.forceResubmit === true || (isSuperAdmin.value && existingSong.played)
+        if (!allowOverride) {
+          if (window.$showNotification) {
+            window.$showNotification(
+              '这首歌曲已经在列表中了，不能重复投稿。您可以为它点赞支持！',
+              'warning'
+            )
+          }
+          return
+        }
+      }
     }
-    return
   }
 
   submitting.value = true
@@ -3510,109 +2229,34 @@ const submitSong = async (result, options = {}) => {
   selectedCover.value = result.cover || ''
   selectedUrl.value = result.url || result.file || ''
 
-  if (options.replayRequest === true) {
-    try {
-      // 严格匹配未命中时回退到归一化模糊匹配，与相似歌曲检测保持一致
-      if (!replayTargetSong) {
-        const similarSong = getSimilarSong(result)
-        if (similarSong?.played) {
-          replayTargetSong = similarSong
-        }
+  try {
+    // 检查黑名单
+    const blacklistCheck = await $fetch('/api/blacklist/check', {
+      method: 'POST',
+      body: {
+        title: title.value,
+        artist: artist.value
       }
+    })
 
-      if (!replayTargetSong) {
-        throw new Error(
-          locale.value.notifications?.replayOriginalNotFound || '未找到可申请重播的原歌曲'
-        )
-      }
-
-      const replayResult = await songService.requestReplay(replayTargetSong.id, {
-        preferredPlayTimeId: preferredPlayTimeId.value ? parseInt(preferredPlayTimeId.value) : null,
-        submissionNote: submissionNote.value.trim() || null,
-        submissionNotePublic: submissionNotePublic.value
-      })
-
-      if (!replayResult) return false
-      resetForm()
-      return true
-    } catch (err) {
-      // 服务端错误按错误码本地化；replayRequestFailed 是带参数的词典函数，需用 formatLocaleValue 求值
-      const replayErrorMessage = localizeServerError(err)
-      error.value =
-        formatLocaleValue(
-          locale.value.notifications?.replayRequestFailed,
-          replayErrorMessage || ''
-        ) || replayErrorMessage
+    if (blacklistCheck.isBlocked) {
+      const reasons = blacklistCheck.reasons.map((r) => r.reason).join('; ')
+      error.value = `该歌曲无法点歌: ${reasons}`
       if (window.$showNotification) {
         window.$showNotification(error.value, 'error')
       }
-      return false
-    } finally {
       submitting.value = false
+      return
     }
+  } catch (err) {
+    console.error('黑名单检查失败:', err)
+    // 黑名单检查失败不阻止提交，只记录错误
   }
 
-  if (!(await ensureCardCodeForSubmit())) {
-    submitting.value = false
-    return false
-  }
-
-  // 检查投稿限额
-  const limitCheck = checkSubmissionLimit()
-  if (!limitCheck.canSubmit) {
-    error.value = limitCheck.message
-    if (window.$showNotification) {
-      window.$showNotification(limitCheck.message, 'error')
-    }
-    submitting.value = false
-    return
-  }
-
-  // 管理员不受黑名单限制
-  if (!auth.isAdmin.value) {
-    try {
-      // 检查黑名单
-      const blacklistCheck = await $fetch('/api/blacklist/check', {
-        method: 'POST',
-        body: {
-          title: title.value,
-          artist: artist.value,
-          musicPlatform: result.actualMusicPlatform || result.musicPlatform || platform.value,
-          musicId: result.musicId ? String(result.musicId) : null
-        }
-      })
-
-      if (blacklistCheck.isBlocked) {
-        const reasons = blacklistCheck.reasons.map((r) => r.reason).join('; ')
-        error.value = callLocale('notifications.blacklistedSong', '', reasons)
-        if (window.$showNotification) {
-          window.$showNotification(error.value, 'error')
-        }
-        submitting.value = false
-        return
-      }
-    } catch (err) {
-      console.error('黑名单检查失败:', err)
-      // 黑名单检查失败不阻止提交，只记录错误
-    }
-  }
-
-  const actualMusicPlatform = result.actualMusicPlatform || result.musicPlatform || platform.value
-  let submissionDurationSeconds = normalizeDurationToSeconds(result.duration, actualMusicPlatform)
-
-  // 只有平台接口没有有效时长时，才获取播放地址并读取音频元数据。
-  if (submissionDurationSeconds === null) {
-    if (!result.url && !result.file && !selectedUrl.value && result.musicId) {
-      const fullResult = await getAudioUrl(result)
-      result = fullResult
-      selectedUrl.value = fullResult.url || ''
-    }
-
-    submissionDurationSeconds = await resolveSubmissionDuration(
-      result,
-      actualMusicPlatform,
-      selectedUrl.value
-    )
+  // 确保获取完整的URL
+  if (!selectedUrl.value && result.musicId) {
+    const fullResult = await getAudioUrl(result)
+    selectedUrl.value = fullResult.url || ''
   }
 
   // 处理 Bilibili 分 P 信息
@@ -3635,28 +2279,27 @@ const submitSong = async (result, options = {}) => {
       artist: artist.value,
       preferredPlayTimeId: preferredPlayTimeId.value ? parseInt(preferredPlayTimeId.value) : null,
       cover: selectedCover.value,
-      musicPlatform: actualMusicPlatform, // 优先使用搜索结果的实际平台来源
+      musicPlatform: 'kugou',
       musicId: result.musicId ? String(result.musicId) : null,
-      durationSeconds: submissionDurationSeconds,
+      playUrl: selectedUrl.value || null,
       submissionNote: submissionNote.value.trim() || null,
       submissionNotePublic: submissionNotePublic.value,
       collaborators: collaborators.value.map((u) => u.id),
       bilibiliCid: bilibiliCid || null,
-      bilibiliPage: bilibiliPage
-    }
-    // 如果用户填写了点歌券，传递给后端
-    if (cardCode.value && cardCode.value.trim()) {
-      songData.cardCode = cardCode.value.trim()
+      bilibiliPage: bilibiliPage,
+      expectedPlayDate: expectedPlayDate.value || null,
+      expectedPlaySequence: expectedPlaySequence.value ? Number(expectedPlaySequence.value) : null
     }
 
-    // 只emit事件，让父组件处理实际的API调用
-    emit('request', songData)
-
-    // 成功提示由父组件处理，这里只重置表单
-    resetForm()
+    // 只emit事件，让父组件处理实际的API调用；由父组件回传结果后再决定是否重置
+    emit('request', songData, (ok) => {
+      if (ok) {
+        resetAfterSubmit()
+      }
+    })
     return true
   } catch (err) {
-    error.value = getErrorMessage(err) || locale.value.notifications.submitFailed
+    error.value = err.message || '投稿失败，请稍后重试'
     if (window.$showNotification) {
       window.$showNotification(error.value, 'error')
     }
@@ -3667,57 +2310,7 @@ const submitSong = async (result, options = {}) => {
 }
 
 // 直接提交表单
-const handleSubmit = async () => {
-  if (submitting.value) return
 
-  if (!(await ensureCardCodeForSubmit())) {
-    return
-  }
-
-  // 检查投稿限额
-  const limitCheck = checkSubmissionLimit()
-  if (!limitCheck.canSubmit) {
-    error.value = limitCheck.message
-    if (window.$showNotification) {
-      window.$showNotification(limitCheck.message, 'error')
-    }
-    return
-  }
-
-  submitting.value = true
-  error.value = ''
-
-  try {
-    // 构建歌曲数据对象
-    const songData = {
-      title: title.value,
-      artist: artist.value,
-      preferredPlayTimeId: preferredPlayTimeId.value ? parseInt(preferredPlayTimeId.value) : null,
-      cover: selectedCover.value,
-      musicPlatform: platform.value,
-      musicId: null, // 手动输入时没有musicId
-      submissionNote: submissionNote.value.trim() || null,
-      submissionNotePublic: submissionNotePublic.value,
-      collaborators: collaborators.value.map((u) => u.id)
-    }
-    if (cardCode.value && cardCode.value.trim()) {
-      songData.cardCode = cardCode.value.trim()
-    }
-
-    // 只emit事件，让父组件处理实际的API调用
-    emit('request', songData)
-
-    // 成功提示由父组件处理，这里只重置表单
-    resetForm()
-  } catch (err) {
-    error.value = getErrorMessage(err) || locale.value.notifications.submitFailed
-    if (window.$showNotification) {
-      window.$showNotification(error.value, 'error')
-    }
-  } finally {
-    submitting.value = false
-  }
-}
 
 const isBilibiliMultiP = (result) => {
   return result && platform.value === 'bilibili' && result.pages && result.pages.length > 1
@@ -3757,22 +2350,11 @@ const getBilibiliEpisodeStatus = (result) => {
   }
 }
 
-const canResubmitBilibiliEpisodes = (result) => {
-  if (!enableReplayRequests.value) return false
 
-  const episodeStatus = getBilibiliEpisodeStatus(result)
-  if (!episodeStatus || episodeStatus.submittedEpisodes.length === 0) return false
 
-  return episodeStatus.submittedEpisodes.every((song) => song.played)
-}
-
-const handleBilibiliEpisodeSelect = async (payload) => {
+const handleBilibiliEpisodeSelect = async (episode) => {
   if (!selectedBilibiliVideo.value) return
 
-  const episode = payload?.episode || payload
-  const episodeStatus = payload?.status || null
-  const isReplayEpisode = episodeStatus?.played === true
-
   const episodeResult = {
     ...selectedBilibiliVideo.value,
     title: `${selectedBilibiliVideo.value.title} - ${episode.part}`,
@@ -3781,14 +2363,11 @@ const handleBilibiliEpisodeSelect = async (payload) => {
   }
 
   const success = await submitSong(episodeResult, {
-    ...(isReplayEpisode ? { replayRequest: true } : bilibiliEpisodeSubmitOptions.value),
     isBilibiliEpisode: true,
     episode: episode
   })
 
   if (success) {
-    showBilibiliEpisodesModal.value = false
-    bilibiliEpisodeSubmitOptions.value = {}
     if (bilibiliModalRef.value && bilibiliModalRef.value.resetSubmissionState) {
       bilibiliModalRef.value.resetSubmissionState()
     }
@@ -3799,64 +2378,20 @@ const handleBilibiliEpisodeSelect = async (payload) => {
   }
 }
 
-const handleBilibiliEpisodePlay = async ({ song: episodeData, playlist, playlistIndex }) => {
-  // 与 biliPlaylist 使用相同的 ID 构建逻辑，确保匹配
+const handleBilibiliEpisodePlay = async (episodeData) => {
   const bvid = episodeData.bvid || episodeData.id
-  let finalId = bvid
-  if (episodeData.cid) {
-    finalId = bvid + ':' + episodeData.cid
-    const page = episodeData.bilibiliPage || episodeData.page
-    if (page && Number(page) > 1) {
-      finalId += ':' + page
-    }
-  }
-
   const episodeResult = {
-    id: finalId,
+    id: bvid,
     title: `${episodeData.title} - ${episodeData.part}`,
     artist: episodeData.artist,
     cover: episodeData.cover || '',
-    musicId: finalId,
+    musicId: bvid,
     musicPlatform: 'bilibili',
     bilibiliCid: episodeData.cid,
     duration: episodeData.duration,
     sourceInfo: { source: 'bilibili' }
   }
-
-  // 转换播放列表为统一格式
-  let biliPlaylist
-  let biliIndex
-  if (playlist && playlist.length > 0) {
-    biliPlaylist = playlist.map((e) => {
-      const bvid = e.bvid || e.id
-      let finalId = bvid
-      if (e.cid) {
-        finalId = bvid + ':' + e.cid
-        const page = e.bilibiliPage || e.page
-        if (page && Number(page) > 1) {
-          finalId += ':' + page
-        }
-      }
-      return {
-        id: finalId,
-        title: `${e.title} - ${e.part}`,
-        artist: e.artist,
-        cover: e.cover || '',
-        musicId: finalId,
-        musicPlatform: 'bilibili',
-        bilibiliCid: e.cid,
-        duration: e.duration,
-        sourceInfo: { source: 'bilibili' }
-      }
-    })
-    biliIndex =
-      typeof playlistIndex === 'number'
-        ? playlistIndex
-        : playlist.findIndex((e) => e.cid === episodeData.cid)
-    if (biliIndex < 0) biliIndex = 0
-  }
-
-  await playSong(episodeResult, biliPlaylist, biliIndex)
+  await playSong(episodeResult)
 }
 
 // 引用模态框组件
@@ -3864,93 +2399,11 @@ const bilibiliModalRef = ref(null)
 const podcastModalRef = ref(null)
 const recentSongsModalRef = ref(null)
 const playlistModalRef = ref(null)
-const albumModalRef = ref(null)
-
-// 判断搜索结果是否为网易云专辑（仅网易云支持专辑详情弹窗）
-const isNeteaseAlbum = (result) => {
-  const p = result.actualMusicPlatform || result.musicPlatform || platform.value
-  return !!(result.albumId && p && p.includes('netease'))
-}
-
-// 判断结果是否来自QQ音乐（用于显示上传按钮）
-const isTencentSource = (result) => {
-  const p = result.actualMusicPlatform || result.musicPlatform || ''
-  return p.includes('vkeys') || p === 'tencent'
-}
-
-// 打开专辑详情（标准化平台名称，AlbumDetailsModal 只识别 netease/tencent）
-const openAlbumDetails = (result) => {
-  if (!result.albumId) return
-
-  selectedAlbumId.value = result.albumId
-  selectedAlbumName.value = result.album || result.albumName
-  const rawPlatform = result.actualMusicPlatform || result.musicPlatform || platform.value
-  selectedAlbumPlatform.value = rawPlatform.includes('netease') ? 'netease' : 'tencent'
-  showAlbumDetailsModal.value = true
-}
-
-// 处理专辑歌曲播放
-const handleAlbumSongPlay = async ({ song, playlist, playlistIndex }) => {
-  await playSong(song, playlist, playlistIndex)
-}
-
-// 处理专辑歌曲投稿
-const handleAlbumSongSubmit = async (songData) => {
-  const success = await submitSong(songData, { isDirectSubmit: true })
-
-  if (success) {
-    showAlbumDetailsModal.value = false
-  }
-
-  if (albumModalRef.value && albumModalRef.value.resetSubmissionState) {
-    albumModalRef.value.resetSubmissionState()
-  }
-}
-
-// 处理专辑歌曲点赞
-const handleAlbumSongVote = async (song) => {
-  if (voting.value) return
-  if (!song.songId) {
-    if (window.$showNotification) {
-      window.$showNotification(locale.value.notifications.missingSongId, 'error')
-    }
-    return
-  }
-
-  if (song.voted) {
-    return
-  }
-
-  voting.value = true
-  try {
-    await songService.voteSong(song.songId)
-
-    if (window.$showNotification) {
-      window.$showNotification(locale.value.notifications.likeSuccess, 'success')
-    }
-
-    // 静默刷新歌曲列表
-    songService.refreshSongsSilent().catch((err) => {
-      console.error('刷新歌曲列表失败', err)
-    })
-  } catch (error) {
-    console.error('点赞失败:', error)
-    if (window.$showNotification) {
-      window.$showNotification(
-        getErrorMessage(error) || locale.value.notifications.likeFailedRetry,
-        'error'
-      )
-    }
-  } finally {
-    voting.value = false
-  }
-}
 
 // 处理播客单集提交
 const handlePodcastSubmit = async (song) => {
   const success = await submitSong(song, { isPodcastEpisode: true })
   if (success) {
-    showPodcastModal.value = false
   } else {
     // 如果失败，重置模态框内的提交状态
     if (podcastModalRef.value && podcastModalRef.value.resetSubmissionState) {
@@ -3969,7 +2422,6 @@ const handlePodcastPlay = async (song) => {
 const handleRecentSongSubmit = async (song) => {
   const success = await submitSong(song, { isPodcastEpisode: false, isDirectSubmit: true })
   if (success) {
-    showRecentSongsModal.value = false
   } else {
     // 如果失败，重置模态框内的提交状态
     if (recentSongsModalRef.value && recentSongsModalRef.value.resetSubmissionState) {
@@ -4004,34 +2456,30 @@ const handlePlaylistPlay = async (song) => {
 // 手动输入相关方法
 const handleManualSubmit = async () => {
   if (!title.value.trim() || !manualArtist.value.trim()) {
-    error.value = locale.value.notifications.completeSongInfoRequired
+    error.value = '请输入完整的歌曲信息'
     if (window.$showNotification) {
-      window.$showNotification(locale.value.notifications.completeSongInfoRequired, 'error')
+      window.$showNotification('请输入完整的歌曲信息', 'error')
     }
     return
   }
 
   // 验证URL
   if (manualCover.value && !coverValidation.value.valid) {
-    error.value = locale.value.notifications.fixCoverUrl
+    error.value = '请修正封面URL错误后再提交'
     if (window.$showNotification) {
-      window.$showNotification(locale.value.notifications.fixCoverUrl, 'error')
+      window.$showNotification('请修正封面URL错误后再提交', 'error')
     }
     return
   }
 
   if (manualPlayUrl.value && !playUrlValidation.value.valid) {
-    error.value = locale.value.notifications.fixPlayUrl
+    error.value = '请修正播放地址URL错误后再提交'
     if (window.$showNotification) {
-      window.$showNotification(locale.value.notifications.fixPlayUrl, 'error')
+      window.$showNotification('请修正播放地址URL错误后再提交', 'error')
     }
     return
   }
 
-  if (!(await ensureCardCodeForSubmit())) {
-    return
-  }
-
   // 检查投稿限额
   const limitCheck = checkSubmissionLimit()
   if (!limitCheck.canSubmit) {
@@ -4045,36 +2493,25 @@ const handleManualSubmit = async () => {
   submitting.value = true
   error.value = ''
 
-  // 管理员不受黑名单限制
-  if (!auth.isAdmin.value) {
-    try {
-      // 检查黑名单
-      const blacklistCheck = await $fetch('/api/blacklist/check', {
-        method: 'POST',
-        body: {
-          title: title.value,
-          artist: manualArtist.value,
-          musicPlatform: platform.value,
-          musicId: null // 手动输入没有 musicId，类型黑名单不生效
-        }
-      })
-
-      if (blacklistCheck.isBlocked) {
-        const reasons = blacklistCheck.reasons.map((r) => r.reason).join('; ')
-        error.value = callLocale('notifications.blacklistedSong', '', reasons)
-        if (window.$showNotification) {
-          window.$showNotification(error.value, 'error')
-        }
-        submitting.value = false
-        return
-      }
-    } catch (err) {
-      console.error('黑名单检查失败:', err)
-      // 黑名单检查失败不阻止提交，只记录错误
-    }
-  }
-
   try {
+    // 检查黑名单
+    const blacklistCheck = await $fetch('/api/blacklist/check', {
+      method: 'POST',
+      body: {
+        title: title.value,
+        artist: manualArtist.value
+      }
+    })
+
+    if (blacklistCheck.isBlocked) {
+      const reasons = blacklistCheck.reasons.map((r) => r.reason).join('; ')
+      error.value = `该歌曲无法点歌: ${reasons}`
+      if (window.$showNotification) {
+        window.$showNotification(error.value, 'error')
+      }
+      submitting.value = false
+      return
+    }
     // 构建歌曲数据对象
     // 如果手动填入了 playUrl，则不保留平台标识符
     const trimmedPlayUrl = manualPlayUrl.value?.trim() || ''
@@ -4091,18 +2528,15 @@ const handleManualSubmit = async () => {
       submissionNotePublic: submissionNotePublic.value
     }
 
-    if (cardCode.value && cardCode.value.trim()) {
-      songData.cardCode = cardCode.value.trim()
-    }
-
-    // 只emit事件，让父组件处理实际的API调用
-    emit('request', songData)
-
-    // 成功提示由父组件处理，这里只重置表单和关闭弹窗
-    resetForm()
-    showManualModal.value = false
+    // 只emit事件，让父组件处理实际的API调用；由父组件回传结果后再决定是否重置/关闭
+    emit('request', songData, (ok) => {
+      if (ok) {
+        resetAfterSubmit()
+        showManualModal.value = false
+      }
+    })
   } catch (err) {
-    error.value = getErrorMessage(err) || locale.value.notifications.submitFailed
+    error.value = err.message || '投稿失败，请稍后重试'
     if (window.$showNotification) {
       window.$showNotification(error.value, 'error')
     }
@@ -4111,36 +2545,145 @@ const handleManualSubmit = async () => {
   }
 }
 
-// 重置表单
-const resetForm = () => {
-  title.value = ''
-  artist.value = ''
-  preferredPlayTimeId.value = ''
-  searchResults.value = []
-  restrictionCheckMap.value = new Map()
-  selectedCover.value = ''
-  selectedUrl.value = ''
+// 申请重播
+const handleRequestReplay = async (song) => {
+  if (requestingReplay.value || !song) return
+
+  // 如果已经申请过，不执行
+  if (song.replayRequested) {
+    if (window.$showNotification) {
+      window.$showNotification('该歌曲已申请过重播', 'info')
+    }
+    return
+  }
+
+  requestingReplay.value = true
+  try {
+    await songService.requestReplay(song.id)
+    // 刷新歌曲状态
+    setTimeout(() => {
+      songService.refreshSongsSilent().catch(console.error)
+    }, 500)
+    if (window.$showNotification) {
+      window.$showNotification('申请重播成功', 'success')
+    }
+  } catch (err) {
+    console.error('申请重播失败:', err)
+    if (window.$showNotification) {
+      window.$showNotification('申请重播失败: ' + err.message, 'error')
+    }
+  } finally {
+    requestingReplay.value = false
+  }
+}
+
+// 获取重播按钮文本
+const getReplayButtonText = (song) => {
+  if (requestingReplay.value) return '申请中...'
+  if (!song) return '申请重播'
+
+  // 检查学期
+  if (currentSemester.value && song.semester !== currentSemester.value.name) {
+    return '非本学期'
+  }
+
+  // 检查重播申请状态
+  if (song.replayRequestStatus === 'REJECTED') {
+    // 如果在冷却期内
+    if (song.replayRequestCooldownRemaining && song.replayRequestCooldownRemaining > 0) {
+      return `已拒绝（${song.replayRequestCooldownRemaining}小时后可重新申请）`
+    }
+    // 冷却期已过
+    return '申请重播'
+  }
+
+  if (song.replayRequestStatus === 'FULFILLED') {
+    return '已重播'
+  }
+
+  if (song.replayRequested || song.replayRequestStatus === 'PENDING') {
+    return '已申请重播'
+  }
+
+  return '申请重播'
+}
+
+// 获取重播按钮标题（tooltip）
+const getReplayButtonTitle = (song) => {
+  if (!song) return '申请重播'
+
+  // 检查学期
+  if (currentSemester.value && song.semester !== currentSemester.value.name) {
+    return '只能申请重播当前学期的歌曲'
+  }
+
+  // 检查重播申请状态
+  if (song.replayRequestStatus === 'REJECTED') {
+    if (song.replayRequestCooldownRemaining && song.replayRequestCooldownRemaining > 0) {
+      return `申请被拒绝，需要等待 ${song.replayRequestCooldownRemaining} 小时后才能重新申请`
+    }
+    return '申请重播'
+  }
+
+  if (song.replayRequestStatus === 'FULFILLED') {
+    return '该歌曲已重播'
+  }
+
+  if (song.replayRequested || song.replayRequestStatus === 'PENDING') {
+    return '该歌曲已申请过重播'
+  }
+
+  return '申请重播'
+}
+
+// 检查重播按钮是否应该禁用
+const isReplayButtonDisabled = (song) => {
+  if (requestingReplay.value || !song) return true
+
+  // 检查学期
+  if (currentSemester.value && song.semester !== currentSemester.value.name) {
+    return true
+  }
+
+  // 检查重播申请状态
+  if (song.replayRequestStatus === 'REJECTED') {
+    // 如果在冷却期内，禁用按钮
+    if (song.replayRequestCooldownRemaining && song.replayRequestCooldownRemaining > 0) {
+      return true
+    }
+    // 冷却期已过，允许重新申请
+    return false
+  }
+
+  if (song.replayRequestStatus === 'FULFILLED') {
+    return true
+  }
+
+  if (song.replayRequested || song.replayRequestStatus === 'PENDING') {
+    return true
+  }
+
+  return false
+}
+
+const resetAfterSubmit = () => {
+  expectedPlayDate.value = ''
+  expectedPlaySequence.value = ''
+  similarSongs.value = []
   showManualModal.value = false
   manualArtist.value = ''
   manualCover.value = ''
   manualPlayUrl.value = ''
-  hasSearched.value = false
   collaborators.value = []
   submissionNote.value = ''
   submissionNotePublic.value = true
-  cardCode.value = ''
-  cardCodeDraft.value = ''
-  showCardCodeModal.value = false
-  resetCardCodeValidation()
   // 重置URL验证状态
   coverValidation.value = { valid: true, error: '', validating: false }
   playUrlValidation.value = { valid: true, error: '', validating: false }
 }
 
 // 停止播放
-const stopPlaying = () => {
-  audioPlayer.stopSong()
-}
+
 
 // 获取投稿状态
 const fetchSubmissionStatus = async () => {
@@ -4149,8 +2692,59 @@ const fetchSubmissionStatus = async () => {
   loadingSubmissionStatus.value = true
 
   try {
+    const prev = submissionStatus.value
     const authConfig = auth.getAuthConfig()
-    const response = await $fetch('/api/songs/submission-status', authConfig)
+    const response = await $fetch('/api/songs/submission-status', {
+      ...authConfig,
+      query: { t: Date.now() }
+    })
+
+    if (submissionStatusBootstrapped) {
+      const wasClosed = !!prev?.submissionClosed
+      const isClosed = !!response?.submissionClosed
+
+      if (wasClosed && !isClosed) {
+        toast.success('投稿已开放')
+      } else if (!wasClosed && isClosed) {
+        const msg =
+          response?.timeLimitationEnabled && !response?.currentTimePeriod ? '当前不在投稿开放时段' : '投稿已关闭'
+        toast.warning(msg)
+      }
+
+      const prevPeriodId = prev?.currentTimePeriod?.id ?? null
+      const nextPeriodId = response?.currentTimePeriod?.id ?? null
+      if (!isClosed && prevPeriodId !== nextPeriodId && nextPeriodId) {
+        const periodName = response?.currentTimePeriod?.name || '当前时段'
+        toast.info(`已进入投稿时段：${periodName}`)
+      }
+
+      const prevDailyRemaining = prev?.dailyRemaining
+      const nextDailyRemaining = response?.dailyRemaining
+      if (typeof prevDailyRemaining === 'number' && typeof nextDailyRemaining === 'number') {
+        if (prevDailyRemaining > 0 && nextDailyRemaining === 0) {
+          toast.warning('今日投稿名额已用完')
+        }
+      }
+
+      const prevWeeklyRemaining = prev?.weeklyRemaining
+      const nextWeeklyRemaining = response?.weeklyRemaining
+      if (typeof prevWeeklyRemaining === 'number' && typeof nextWeeklyRemaining === 'number') {
+        if (prevWeeklyRemaining > 0 && nextWeeklyRemaining === 0) {
+          toast.warning('本周投稿名额已用完')
+        }
+      }
+
+      const prevMonthlyRemaining = prev?.monthlyRemaining
+      const nextMonthlyRemaining = response?.monthlyRemaining
+      if (typeof prevMonthlyRemaining === 'number' && typeof nextMonthlyRemaining === 'number') {
+        if (prevMonthlyRemaining > 0 && nextMonthlyRemaining === 0) {
+          toast.warning('本月投稿名额已用完')
+        }
+      }
+    } else {
+      submissionStatusBootstrapped = true
+    }
+
     submissionStatus.value = response
   } catch (err) {
     console.error('获取投稿状态失败:', err)
@@ -4172,9 +2766,9 @@ const checkSubmissionLimit = () => {
 
   // 检查投稿是否已关闭
   if (submissionStatus.value.submissionClosed) {
-    let message = locale.value.submissionClosed
+    let message = '投稿功能已关闭'
     if (submissionStatus.value.timeLimitationEnabled && !submissionStatus.value.currentTimePeriod) {
-      message = locale.value.outsideRequestTime
+      message = '当前不在投稿开放时段'
     }
     return {
       canSubmit: false,
@@ -4188,7 +2782,7 @@ const checkSubmissionLimit = () => {
     if (expected > 0 && accepted >= expected) {
       return {
         canSubmit: false,
-        message: callLocale('notifications.periodQuotaFull', '', accepted, expected)
+        message: `当前时段投稿名额已满 (${accepted}/${expected})`
       }
     }
   }
@@ -4197,14 +2791,6 @@ const checkSubmissionLimit = () => {
     return { canSubmit: true, message: '' }
   }
 
-  if (
-    cardCodeLimitBypassActive.value &&
-    trimmedCardCode.value &&
-    cardCodeValidation.value.valid === true
-  ) {
-    return { canSubmit: true, message: '' }
-  }
-
   const { dailyLimit, weeklyLimit, monthlyLimit, dailyUsed, weeklyUsed, monthlyUsed } =
     submissionStatus.value
 
@@ -4212,7 +2798,7 @@ const checkSubmissionLimit = () => {
   if (dailyLimit && dailyUsed >= dailyLimit) {
     return {
       canSubmit: false,
-      message: callLocale('notifications.dailyLimitReached', '', dailyUsed, dailyLimit)
+      message: `今日投稿已达上限 (${dailyUsed}/${dailyLimit})`
     }
   }
 
@@ -4220,7 +2806,7 @@ const checkSubmissionLimit = () => {
   if (weeklyLimit && weeklyUsed >= weeklyLimit) {
     return {
       canSubmit: false,
-      message: callLocale('notifications.weeklyLimitReached', '', weeklyUsed, weeklyLimit)
+      message: `本周投稿已达上限 (${weeklyUsed}/${weeklyLimit})`
     }
   }
 
@@ -4228,7 +2814,7 @@ const checkSubmissionLimit = () => {
   if (monthlyLimit && monthlyUsed >= monthlyLimit) {
     return {
       canSubmit: false,
-      message: callLocale('notifications.monthlyLimitReached', '', monthlyUsed, monthlyLimit)
+      message: `本月投稿已达上限 (${monthlyUsed}/${monthlyLimit})`
     }
   }
 
@@ -4292,99 +2878,6 @@ watch(manualPlayUrl, (newUrl) => {
 })
 
 // 计算属性：检查手动表单是否可以提交
-const canSubmitFromSearch = computed(() => {
-  // 复用 checkSubmissionLimit：包含管理员豁免、投稿关闭、时段名额、日/周/月限额及卡码绕过
-  return checkSubmissionLimit().canSubmit
-})
-
-const isSongBlockedByRestriction = (result) => {
-  if (auth.isAdmin.value) return false
-  if (restrictionChecking.value) return false
-  const songTitle = result.song || result.title
-  const songArtist = result.singer || result.artist
-  const key = `${songTitle}||${songArtist}`
-  const check = restrictionCheckMap.value.get(key)
-  if (!check) return false
-  return check.blocked
-}
-
-const getRestrictionReason = (result) => {
-  const songTitle = result.song || result.title
-  const songArtist = result.singer || result.artist
-  const key = `${songTitle}||${songArtist}`
-  const check = restrictionCheckMap.value.get(key)
-  return check?.reason || null
-}
-
-const getRestrictionMessage = (reason) => {
-  if (reason === 'duplicateSong') return locale.value.notifications?.duplicateSong
-  if (reason === 'sameSong') return locale.value.notifications?.restrictionSameSong
-  if (reason === 'sameArtist') return locale.value.notifications?.restrictionSameArtist
-  return locale.value.notifications?.restrictionGeneric
-}
-
-const fetchRestrictionChecks = async () => {
-  // 每次搜索后清空旧预检结果，避免上一轮结果污染
-  const requestId = ++restrictionCheckRequestId
-  restrictionAbortController.value?.abort()
-  restrictionAbortController.value = new AbortController()
-  restrictionCheckMap.value = new Map()
-  if (!auth.isAuthenticated.value || searchResults.value.length === 0) {
-    restrictionChecking.value = false
-    return
-  }
-
-  restrictionChecking.value = true
-  const uniqueResults = []
-  const resultKeys = new Set()
-  for (const result of searchResults.value) {
-    const title = result.song || result.title
-    const artist = result.singer || result.artist
-    const key = `${title}||${artist}`
-    if (!title || !artist || resultKeys.has(key)) continue
-    resultKeys.add(key)
-    uniqueResults.push({
-      key,
-      title,
-      artist,
-      musicPlatform: result.actualMusicPlatform || result.musicPlatform || '',
-      musicId: result.musicId || ''
-    })
-  }
-
-  if (uniqueResults.length === 0) {
-    if (requestId === restrictionCheckRequestId) {
-      restrictionChecking.value = false
-    }
-    return
-  }
-
-  try {
-    const authConfig = auth.getAuthConfig()
-    const response = await $fetch('/api/songs/check-restriction', {
-      method: 'POST',
-      body: { songs: uniqueResults },
-      signal: restrictionAbortController.value.signal,
-      ...authConfig
-    })
-    const checks = Array.isArray(response?.checks) ? response.checks : []
-    if (requestId === restrictionCheckRequestId) {
-      uniqueResults.forEach((result, index) => {
-        restrictionCheckMap.value.set(result.key, checks[index] || { blocked: false, reason: null })
-      })
-    }
-  } catch (err) {
-    const status = err && (err.statusCode || (err.data && err.data.statusCode))
-    if (status === 401 && requestId === restrictionCheckRequestId) {
-      console.warn('投稿限制预检鉴权失败，未应用限制', err)
-    }
-  } finally {
-    if (requestId === restrictionCheckRequestId) {
-      restrictionChecking.value = false
-    }
-  }
-}
-
 const canSubmitManualForm = computed(() => {
   // 必填字段检查
   if (!manualArtist.value.trim()) {
@@ -4410,18 +2903,21 @@ const canSubmitManualForm = computed(() => {
 
 // 暴露方法给父组件
 defineExpose({
-  refreshSubmissionStatus: fetchSubmissionStatus
+  refreshSubmissionStatus: async () => {
+    await Promise.allSettled([fetchSubmissionStatus(), fetchExpectedPlayDates()])
+  }
 })
 </script>
 
 <style scoped>
 .request-form {
   width: 100%;
-  color: var(--text-primary);
+  color: var(--text-primary, #ffffff);
   display: flex;
   gap: 2rem;
   height: calc(100vh - 160px);
-  min-height: 650px;
+  max-height: calc(100vh - 160px);
+  overflow: hidden;
 }
 
 /* 桌面端样式 */
@@ -4434,7 +2930,7 @@ defineExpose({
 }
 
 .rules-section {
-  background: var(--surface-card-bg);
+  background: rgba(0, 0, 0, 0.4);
   border-radius: 13px;
   padding: 1.25rem;
   flex: 0 0 35%; /* 稍微缩小规则区域占比 */
@@ -4443,23 +2939,28 @@ defineExpose({
   overflow-y: auto;
 }
 
+.section-title {
+  font-family: 'MiSans', sans-serif;
+  font-weight: 400;
+  font-size: 15px;
+  letter-spacing: 0.04em;
+  color: var(--text-secondary);
+  margin-bottom: 0.75rem;
+}
+
 .rules-content-desktop {
   font-family: 'MiSans', sans-serif;
   font-weight: 400;
   font-size: 15px;
   line-height: 1.7;
   letter-spacing: 0.04em;
-  color: var(--overlay-40);
+  color: var(--text-primary, #ffffff);
 }
 
 .rules-content-desktop p {
   margin-bottom: 0.6rem;
 }
 
-.guidelines-content {
-  overflow-wrap: anywhere;
-}
-
 /* 移动端样式 */
 .rules-title {
   display: flex;
@@ -4467,19 +2968,19 @@ defineExpose({
   gap: 0.5rem;
   font-size: 15px;
   font-weight: 700;
-  color: var(--overlay-90);
+  color: var(--text-primary);
   margin-bottom: 1.25rem;
 }
 
 .rules-icon {
-  color: var(--color-warning);
+  color: #f59e0b;
 }
 
 .rules-content {
   font-family: 'MiSans', sans-serif;
   font-size: 13px;
   line-height: 1.8;
-  color: var(--overlay-50);
+  color: var(--text-tertiary);
 }
 
 .rule-item {
@@ -4489,7 +2990,7 @@ defineExpose({
 
 .rule-item span {
   margin-right: 0.5rem;
-  color: var(--overlay-30);
+  color: var(--text-disabled);
   font-weight: 600;
 }
 
@@ -4511,6 +3012,90 @@ defineExpose({
   position: relative;
 }
 
+.submission-status-corner {
+  position: absolute;
+  top: 0;
+  right: 0;
+  z-index: 30;
+}
+
+.submission-status-badge {
+  display: flex;
+  flex-direction: column;
+  gap: 2px;
+  padding: 8px 10px;
+  border-radius: 12px;
+  border: 1px solid var(--border-tertiary);
+  background: rgba(6, 15, 22, 0.9);
+  backdrop-filter: blur(8px);
+  min-width: 140px;
+  text-align: center;
+}
+
+@media (max-width: 640px) {
+  .submission-status-corner {
+    position: static;
+    align-self: flex-end;
+    margin-top: -6px;
+    margin-bottom: -2px;
+  }
+
+  .submission-status-badge {
+    min-width: 0;
+    padding: 6px 9px;
+    border-radius: 10px;
+  }
+
+  .badge-title {
+    font-size: 11px;
+  }
+
+  .badge-subtitle {
+    font-size: 10px;
+  }
+}
+
+.submission-status-badge.open {
+  border-color: rgba(16, 185, 129, 0.35);
+}
+
+.submission-status-badge.closed {
+  border-color: rgba(239, 68, 68, 0.35);
+}
+
+.badge-title {
+  font-size: 12px;
+  font-weight: 800;
+  color: var(--text-primary);
+}
+
+.submission-status-badge.open .badge-title {
+  color: rgba(16, 185, 129, 0.95);
+}
+
+.submission-status-badge.closed .badge-title {
+  color: rgba(239, 68, 68, 0.95);
+}
+
+.badge-subtitle {
+  font-size: 11px;
+  font-weight: 600;
+  color: var(--text-secondary);
+}
+
+.login-required-hint {
+  margin-left: 0.5rem;
+  display: flex;
+  align-items: center;
+  white-space: nowrap;
+}
+
+.login-link {
+  font-size: 12px;
+  font-weight: 700;
+  color: rgba(59, 130, 246, 0.9);
+}
+
 /* 搜索区域样式 */
 .form-header-row {
   display: flex;
@@ -4521,20 +3106,82 @@ defineExpose({
   flex-wrap: wrap; /* 允许在窄屏下换行 */
 }
 
+.expected-play-section {
+  display: flex;
+  flex-direction: column;
+  gap: 0.6rem;
+  width: 100%;
+}
+
+.expected-play-row {
+  display: flex;
+  gap: 1rem;
+  width: 100%;
+  flex-wrap: wrap;
+}
+
+.expected-play-row .form-group {
+  flex: 1;
+  min-width: 200px;
+}
+
+.sequence-grid {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 0.5rem;
+}
+
+.sequence-pill {
+  height: 28px;
+  min-width: 28px;
+  padding: 0 10px;
+  border-radius: 10px;
+  border: 1px solid var(--border-primary);
+  background: rgba(0, 0, 0, 0.25);
+  color: rgba(255, 255, 255, 0.85);
+  font-family: 'MiSans', sans-serif;
+  font-weight: 700;
+  font-size: 12px;
+  transition: all 0.2s ease;
+}
+
+.sequence-pill.free {
+  border-color: rgba(16, 185, 129, 0.35);
+  background: rgba(16, 185, 129, 0.08);
+  color: rgba(16, 185, 129, 0.95);
+}
+
+.sequence-pill.taken {
+  border-color: rgba(239, 68, 68, 0.35);
+  background: rgba(239, 68, 68, 0.08);
+  color: rgba(239, 68, 68, 0.95);
+  cursor: not-allowed;
+}
+
+.sequence-pill.selected {
+  box-shadow: 0 0 0 2px rgba(59, 130, 246, 0.25);
+  border-color: rgba(59, 130, 246, 0.6);
+}
+
+.sequence-hint {
+  font-size: 11px;
+  font-weight: 600;
+  color: rgba(255, 255, 255, 0.55);
+}
+
 .search-section {
   display: flex;
   align-items: center;
   gap: 0.75rem;
   flex: 1.5;
-  min-width: 460px; /* 增加最小宽度，确保搜索框、标签和按钮有足够空间 */
-  flex-wrap: wrap; /* 允许在窄屏下换行 */
+  min-width: 400px; /* 增加最小宽度，确保搜索框、标签和按钮有足够空间 */
 }
 
 .search-label {
   font-family: 'MiSans', sans-serif;
   font-weight: 600;
   font-size: 15px;
-  color: var(--text-primary);
+  color: var(--text-primary, #ffffff);
   white-space: nowrap;
   flex-shrink: 0; /* 防止标签被压缩 */
 }
@@ -4543,33 +3190,33 @@ defineExpose({
   display: flex;
   gap: 0.5rem;
   flex: 1;
-  min-width: 220px; /* 保证按钮与输入框同行不重叠 */
+  min-width: 0; /* 允许内部元素正常压缩 */
 }
 
 .search-input {
-  background: var(--panel-bg-quaternary);
-  border: 1px solid var(--panel-border-active);
+  background: var(--input-bg, #040e15);
+  border: 1px solid var(--input-border, #242f38);
   border-radius: 8px;
   padding: 0.6rem 0.85rem;
   font-family: 'MiSans', sans-serif;
   font-weight: 600;
   font-size: 15px;
-  color: var(--overlay-60);
+  color: var(--input-text, rgba(255, 255, 255, 0.6));
   flex: 1;
-  min-width: 80px; /* 确保输入框不会缩到太小 */
+  min-width: 100px; /* 确保输入框不会缩到太小 */
 }
 
 .search-input:focus {
   outline: none;
-  border-color: var(--color-accent);
+  border-color: #0b5afe;
 }
 
 .search-button {
-  background: linear-gradient(180deg, var(--color-accent) 0%, var(--color-accent) 100%);
-  border: 1px solid var(--overlay-16);
+  background: linear-gradient(180deg, var(--bg-secondary, #0043f8) 0%, #0075f8 100%);
+  border: 1px solid rgba(255, 255, 255, 0.16);
   border-radius: 8px;
-  padding: 0.75rem 1.2rem;
-  color: var(--text-primary);
+  padding: 0.75rem 1.5rem;
+  color: var(--text-primary, #ffffff);
   font-family: 'MiSans', sans-serif;
   font-weight: 600;
   font-size: 14px;
@@ -4581,7 +3228,7 @@ defineExpose({
 
 .search-button:hover:not(:disabled) {
   transform: translateY(-2px);
-  box-shadow: 0 4px 12px var(--primary-30);
+  box-shadow: 0 4px 12px rgba(0, 67, 248, 0.3);
 }
 
 .search-button:disabled {
@@ -4590,40 +3237,6 @@ defineExpose({
   transform: none;
 }
 
-.audio-match-btn {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  gap: 0.35rem;
-  background: var(--overlay-8);
-  border: 1px solid var(--overlay-12);
-  border-radius: 8px;
-  padding: 0.75rem 0.75rem;
-  color: var(--overlay-85);
-  font-family: 'MiSans', sans-serif;
-  font-weight: 600;
-  font-size: 13px;
-  cursor: pointer;
-  white-space: nowrap;
-  transition: all 0.2s ease;
-  flex-shrink: 0;
-}
-
-.audio-match-btn .btn-text {
-  display: none;
-}
-
-.audio-match-btn:hover:not(:disabled) {
-  background: var(--primary-18);
-  border-color: var(--requestform-audio-match-hover-border);
-  color: var(--text-primary);
-}
-
-.audio-match-btn:disabled {
-  opacity: 0.5;
-  cursor: not-allowed;
-}
-
 /* 联合投稿人区域 */
 .collaborators-section {
   display: flex;
@@ -4637,7 +3250,7 @@ defineExpose({
   font-family: 'MiSans', sans-serif;
   font-weight: 600;
   font-size: 16px;
-  color: var(--text-primary);
+  color: var(--text-primary, #ffffff);
   white-space: nowrap;
   flex-shrink: 0; /* 防止标签被压缩 */
 }
@@ -4653,18 +3266,18 @@ defineExpose({
   display: flex;
   align-items: center;
   gap: 0.5rem;
-  background: var(--color-accent-alpha-10);
-  border: 1px solid var(--color-accent-alpha-20);
+  background: rgba(11, 90, 254, 0.1);
+  border: 1px solid rgba(11, 90, 254, 0.2);
   border-radius: 6px;
   padding: 0.25rem 0.5rem;
   font-size: 14px;
-  color: var(--text-primary);
+  color: var(--text-primary, #ffffff);
 }
 
 .remove-collaborator {
   background: none;
   border: none;
-  color: var(--overlay-60);
+  color: var(--text-secondary);
   cursor: pointer;
   display: flex;
   align-items: center;
@@ -4672,26 +3285,26 @@ defineExpose({
 }
 
 .remove-collaborator:hover {
-  color: var(--text-primary);
+  color: var(--text-primary, #ffffff);
 }
 
 .add-collaborator-btn {
   display: flex;
   align-items: center;
   gap: 0.25rem;
-  background: var(--overlay-5);
-  border: 1px solid var(--overlay-10);
+  background: var(--bg-tertiary);
+  border: 1px solid rgba(255, 255, 255, 0.1);
   border-radius: 6px;
   padding: 0.25rem 0.75rem;
   font-size: 13px;
-  color: var(--overlay-80);
+  color: rgba(255, 255, 255, 0.8);
   cursor: pointer;
   transition: all 0.2s;
 }
 
 .add-collaborator-btn:hover {
-  background: var(--overlay-10);
-  color: var(--text-primary);
+  background: rgba(255, 255, 255, 0.1);
+  color: var(--text-primary, #ffffff);
 }
 
 /* 自定义复选框样式 */
@@ -4714,8 +3327,8 @@ defineExpose({
   width: 14px;
   height: 14px;
   border-radius: 4px;
-  border: 1px solid var(--panel-bg-hover);
-  background: var(--panel-bg-overlay);
+  border: 1px solid var(--border-secondary, #3f3f46);
+  background: rgba(24, 24, 27, 0.5);
   transition: all 0.2s ease;
 }
 
@@ -4729,8 +3342,8 @@ defineExpose({
 }
 
 .custom-checkbox-input:checked + .custom-checkbox-box {
-  background: var(--color-accent-light);
-  border-color: var(--color-accent-light);
+  background: #3b82f6;
+  border-color: var(--border-secondary, #3b82f6);
 }
 
 .custom-checkbox-input:checked + .custom-checkbox-box .custom-checkbox-icon {
@@ -4740,64 +3353,25 @@ defineExpose({
 
 .custom-checkbox-text {
   font-size: 11px;
-  color: var(--text-muted);
+  color: #9ca3af;
   transition: color 0.2s ease;
 }
 
 .custom-checkbox-input:checked ~ .custom-checkbox-text {
-  color: var(--text-primary-lighter);
+  color: #d1d5db;
 }
 
 .custom-checkbox-wrapper:hover .custom-checkbox-box {
-  border-color: var(--color-accent-light);
+  border-color: #60a5fa;
 }
 
 /* 横向投稿状态样式 */
-.login-required-notice {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  gap: 0.5rem;
-  background: var(--primary-10);
-  border-color: var(--primary-30);
-}
-
-.login-required-notice .notice-icon {
-  flex-shrink: 0;
-  color: var(--color-accent-light);
-}
-
-.login-required-notice .notice-text {
-  color: var(--text-link-hover);
-  font-size: 13px;
-  font-weight: 500;
-}
-
-.login-required-notice .login-link-btn {
-  padding: 0.2rem 0.6rem;
-  border: 1px solid var(--primary-40);
-  border-radius: 4px;
-  background: var(--primary-20);
-  color: var(--color-accent-light);
-  font-size: 12px;
-  font-weight: 600;
-  cursor: pointer;
-  transition:
-    background 0.2s ease,
-    color 0.2s ease;
-}
-
-.login-required-notice .login-link-btn:hover {
-  background: var(--primary-35);
-  color: var(--text-link-hover);
-}
-
 .submission-status-horizontal {
-  background: var(--surface-card-bg-medium);
+  background: rgba(0, 0, 0, 0.3);
   border-radius: 8px;
   padding: 0.4rem 0.75rem;
   margin-bottom: 0.5rem;
-  border: 1px solid var(--overlay-10);
+  border: 1px solid rgba(255, 255, 255, 0.1);
 }
 
 .admin-notice-horizontal {
@@ -4815,7 +3389,7 @@ defineExpose({
   font-family: 'MiSans', sans-serif;
   font-weight: 500;
   font-size: 13px;
-  color: var(--text-highlight);
+  color: #ffd700;
 }
 
 .submission-closed-notice {
@@ -4833,7 +3407,7 @@ defineExpose({
   font-family: 'MiSans', sans-serif;
   font-weight: 500;
   font-size: 13px;
-  color: var(--color-error-light);
+  color: #ff6b6b;
 }
 
 .status-content-horizontal {
@@ -4854,23 +3428,23 @@ defineExpose({
   font-family: 'MiSans', sans-serif;
   font-weight: 600;
   font-size: 13px;
-  color: var(--text-primary);
+  color: var(--text-primary, #ffffff);
 }
 
 .status-item-horizontal .status-value {
   font-family: 'MiSans', sans-serif;
   font-weight: 600;
   font-size: 13px;
-  color: var(--color-accent);
+  color: #0b5afe;
 }
 
 .status-item-horizontal .status-remaining {
   font-family: 'MiSans', sans-serif;
   font-weight: 500;
   font-size: 12px;
-  color: var(--overlay-70);
-  background: var(--color-accent-alpha-10);
-  border: 1px solid var(--color-accent-alpha-30);
+  color: rgba(255, 255, 255, 0.7);
+  background: rgba(11, 90, 254, 0.1);
+  border: 1px solid rgba(11, 90, 254, 0.3);
   border-radius: 4px;
   padding: 0.15rem 0.4rem;
 }
@@ -4886,33 +3460,6 @@ defineExpose({
   min-width: 0;
 }
 
-.submission-meta-row {
-  align-items: stretch;
-}
-
-.submission-note-group,
-.card-code-form-group {
-  flex-basis: 0;
-}
-
-.desktop-card-code-panel {
-  min-height: 94px;
-  height: 100%;
-  border: 1px solid var(--panel-bg-deep);
-  border-radius: 12px;
-  background: var(--panel-bg-overlay);
-  padding: 0.75rem;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  gap: 0.75rem;
-}
-
-.mobile-card-code-chip,
-.mobile-card-code-button {
-  display: none;
-}
-
 .form-group {
   display: flex;
   flex-direction: column;
@@ -4927,7 +3474,7 @@ defineExpose({
   font-weight: 600;
   font-size: 15px;
   letter-spacing: 0.02em;
-  color: var(--overlay-90);
+  color: var(--text-primary);
   margin-bottom: 0.25rem;
 }
 
@@ -4937,21 +3484,21 @@ defineExpose({
 
 .form-input,
 .form-select {
-  background: var(--panel-bg-quaternary);
-  border: 1px solid var(--panel-border-active);
+  background: var(--input-bg, #040e15);
+  border: 1px solid var(--input-border, #242f38);
   border-radius: 8px;
   padding: 0.75rem 1rem;
   font-family: 'MiSans', sans-serif;
   font-weight: 600;
   font-size: 16px;
-  color: var(--overlay-60);
+  color: var(--input-text, rgba(255, 255, 255, 0.6));
   width: 100%;
 }
 
 .form-input:focus,
 .form-select:focus {
   outline: none;
-  border-color: var(--color-accent);
+  border-color: #0b5afe;
 }
 
 /* 平台选择按钮样式 */
@@ -5015,19 +3562,19 @@ defineExpose({
 .login-title {
   font-size: 13px;
   font-weight: 500;
-  color: var(--text-muted-light);
+  color: #a1a1aa;
   margin: 0;
 }
 
 .login-hint {
   font-size: 11px;
-  color: var(--overlay-45);
+  color: rgba(255, 255, 255, 0.45);
   margin: 2px 0 0 0;
   line-height: 1.3;
 }
 
 .login-btn {
-  background: linear-gradient(135deg, var(--color-accent-light) 0%, var(--color-accent-hover) 100%);
+  background: linear-gradient(135deg, #3b82f6 0%, #2563eb 100%);
   color: white;
   border: none;
   padding: 0.45rem 0.85rem;
@@ -5038,24 +3585,15 @@ defineExpose({
   font-family: 'MiSans', sans-serif;
   font-weight: 600;
   white-space: nowrap;
-  box-shadow: 0 4px 10px var(--primary-15);
+  box-shadow: 0 4px 10px rgba(59, 130, 246, 0.15);
 }
 
 .login-btn:hover {
   transform: translateY(-1px);
-  box-shadow: 0 5px 14px var(--primary-25);
+  box-shadow: 0 5px 14px rgba(59, 130, 246, 0.25);
   filter: brightness(1.1);
 }
 
-.qq-login-btn {
-  background: linear-gradient(135deg, var(--color-teal) 0%, var(--color-teal) 100%);
-  box-shadow: 0 4px 10px var(--requestform-qq-login-shadow);
-}
-
-.qq-login-btn:hover {
-  box-shadow: 0 5px 14px var(--requestform-qq-login-shadow-hover);
-}
-
 .header-actions {
   display: flex;
   align-items: center;
@@ -5068,7 +3606,7 @@ defineExpose({
   gap: 0.25rem;
   background: transparent;
   border: none;
-  color: var(--overlay-50);
+  color: var(--text-tertiary);
   padding: 0.2rem 0.4rem;
   border-radius: 4px;
   font-size: 11px;
@@ -5077,8 +3615,8 @@ defineExpose({
 }
 
 .header-btn:hover {
-  color: var(--text-primary);
-  background: var(--overlay-8);
+  color: var(--text-primary, #ffffff);
+  background: rgba(255, 255, 255, 0.08);
 }
 
 .login-actions {
@@ -5088,9 +3626,9 @@ defineExpose({
 }
 
 .import-btn {
-  background: var(--overlay-4);
-  color: var(--overlay-70);
-  border: 1px solid var(--overlay-8);
+  background: rgba(255, 255, 255, 0.04);
+  color: rgba(255, 255, 255, 0.7);
+  border: 1px solid var(--border-tertiary);
   padding: 0.45rem 0.75rem;
   border-radius: 7px;
   font-size: 12px;
@@ -5105,9 +3643,9 @@ defineExpose({
 }
 
 .import-btn:hover {
-  background: var(--overlay-8);
-  border-color: var(--overlay-15);
-  color: var(--text-primary);
+  background: rgba(255, 255, 255, 0.08);
+  border-color: rgba(255, 255, 255, 0.15);
+  color: var(--text-primary, #ffffff);
 }
 
 .user-status {
@@ -5133,25 +3671,12 @@ defineExpose({
   width: 24px;
   height: 24px;
   border-radius: 50%;
-  border: 1.5px solid var(--overlay-10);
-}
-
-.qq-user-avatar {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  width: 24px;
-  height: 24px;
-  flex-shrink: 0;
-  border-radius: 50%;
-  color: var(--color-cyan);
-  background: var(--requestform-user-icon-bg);
-  border: 1.5px solid var(--requestform-user-icon-border);
+  border: 1.5px solid rgba(255, 255, 255, 0.1);
 }
 
 .user-name {
   font-size: 12px;
-  color: var(--overlay-90);
+  color: var(--text-primary);
   font-weight: 600;
   white-space: nowrap;
   overflow: hidden;
@@ -5167,9 +3692,9 @@ defineExpose({
   display: flex;
   align-items: center;
   gap: 0.3rem;
-  background: var(--overlay-4);
-  border: 1px solid var(--overlay-6);
-  color: var(--overlay-70);
+  background: rgba(255, 255, 255, 0.04);
+  border: 1px solid rgba(255, 255, 255, 0.06);
+  color: rgba(255, 255, 255, 0.7);
   padding: 0.35rem 0.6rem;
   border-radius: 6px;
   font-size: 11px;
@@ -5180,181 +3705,17 @@ defineExpose({
 }
 
 .action-btn-compact:hover {
-  background: var(--overlay-8);
-  color: var(--text-primary);
-  border-color: var(--overlay-12);
-}
-
-.audio-waveform {
-  display: flex;
-  align-items: center;
-  gap: 3px;
-  height: 24px;
-}
-
-.audio-waveform .wave-bar {
-  display: block;
-  width: 3px;
-  height: 100%;
-  background: linear-gradient(
-    180deg,
-    var(--color-accent-light) 0%,
-    var(--color-accent-light-hover) 100%
-  );
-  border-radius: 2px;
-  animation: wave 1.2s ease-in-out infinite;
-}
-
-.audio-waveform .wave-bar:nth-child(1) {
-  animation-delay: 0s;
-  height: 45%;
-}
-.audio-waveform .wave-bar:nth-child(2) {
-  animation-delay: 0.1s;
-  height: 70%;
-}
-.audio-waveform .wave-bar:nth-child(3) {
-  animation-delay: 0.2s;
-  height: 100%;
-}
-.audio-waveform .wave-bar:nth-child(4) {
-  animation-delay: 0.3s;
-  height: 60%;
-}
-.audio-waveform .wave-bar:nth-child(5) {
-  animation-delay: 0.4s;
-  height: 40%;
-}
-
-@keyframes wave {
-  0%,
-  100% {
-    transform: scaleY(0.3);
-    opacity: 0.5;
-  }
-  50% {
-    transform: scaleY(1);
-    opacity: 1;
-  }
-}
-
-.audio-match-primary-btn,
-.audio-match-cancel-btn,
-.audio-match-record-btn,
-.audio-match-result-item {
-  transition: all 0.2s ease;
-}
-
-.audio-match-primary-btn {
-  background: linear-gradient(
-    135deg,
-    var(--color-accent-hover) 0%,
-    var(--color-accent-light-hover) 100%
-  );
-  border: none;
-  border-radius: 12px;
-  padding: 0.875rem 2rem;
-  color: var(--text-primary);
-  font-weight: 600;
-  font-size: 14px;
-  cursor: pointer;
-  box-shadow: 0 4px 14px var(--requestform-login-btn-hover-shadow);
-}
-
-.audio-match-primary-btn:hover:not(:disabled) {
-  transform: translateY(-1px);
-  box-shadow: 0 6px 20px var(--requestform-login-btn-hover-shadow-lg);
-}
-
-.audio-match-primary-btn:disabled {
-  opacity: 0.5;
-  cursor: not-allowed;
-  transform: none;
-  box-shadow: none;
-}
-
-.audio-match-record-btn {
-  background: linear-gradient(135deg, var(--color-error-hover) 0%, var(--color-error-hover) 100%);
-  border: none;
-  border-radius: 12px;
-  padding: 0.875rem 2rem;
-  color: var(--text-primary);
-  font-weight: 600;
-  font-size: 14px;
-  cursor: pointer;
-  box-shadow: 0 4px 14px var(--requestform-like-btn-hover-shadow);
-  display: flex;
-  align-items: center;
-  gap: 8px;
-}
-
-.audio-match-record-btn:hover:not(:disabled) {
-  transform: translateY(-1px);
-  box-shadow: 0 6px 20px var(--requestform-like-btn-hover-shadow-lg);
-}
-
-.recording-dot {
-  width: 8px;
-  height: 8px;
-  border-radius: 50%;
-  background: var(--text-primary);
-  animation: pulse-dot 1s ease-in-out infinite;
-}
-
-@keyframes pulse-dot {
-  0%,
-  100% {
-    opacity: 1;
-    transform: scale(1);
-  }
-  50% {
-    opacity: 0.5;
-    transform: scale(0.8);
-  }
-}
-
-.audio-match-cancel-btn {
-  background: transparent;
-  border: 1px solid var(--overlay-10);
-  border-radius: 12px;
-  padding: 0.875rem 1.5rem;
-  color: var(--text-muted-light);
-  font-weight: 500;
-  font-size: 14px;
-  cursor: pointer;
-}
-
-.audio-match-cancel-btn:hover {
-  background: var(--overlay-5);
-  color: var(--text-primary-lighter);
-  border-color: var(--overlay-15);
-}
-
-.audio-match-result-item {
-  width: 100%;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  gap: 1rem;
-  border-radius: 14px;
-  border: 1px solid var(--overlay-8);
-  background: var(--overlay-3);
-  padding: 0.95rem 1rem;
-  cursor: pointer;
-}
-
-.audio-match-result-item:hover {
-  background: var(--primary-10);
-  border-color: var(--requestform-audio-match-hover-border-light);
-  transform: translateY(-1px);
+  background: rgba(255, 255, 255, 0.08);
+  color: var(--text-primary, #ffffff);
+  border-color: rgba(255, 255, 255, 0.12);
 }
 
 .search-type-switch {
   display: flex;
-  background: var(--surface-card-bg-soft);
+  background: var(--bg-primary);
   border-radius: 6px;
   padding: 2px;
-  border: 1px solid var(--overlay-5);
+  border: 1px solid var(--border-secondary);
 }
 
 .radio-label {
@@ -5362,7 +3723,7 @@ defineExpose({
   align-items: center;
   justify-content: center;
   font-size: 11px;
-  color: var(--overlay-40);
+  color: rgba(255, 255, 255, 0.4);
   cursor: pointer;
   padding: 0.15rem 0.5rem;
   border-radius: 4px;
@@ -5370,10 +3731,10 @@ defineExpose({
 }
 
 .radio-label.active {
-  color: var(--text-primary);
+  color: var(--text-primary, #ffffff);
   font-weight: 600;
-  background: var(--overlay-8);
-  box-shadow: 0 1px 3px var(--mask-10);
+  background: rgba(255, 255, 255, 0.08);
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
 }
 
 .radio-label input {
@@ -5386,7 +3747,7 @@ defineExpose({
   gap: 0.2rem;
   background: transparent;
   border: none;
-  color: var(--overlay-40);
+  color: rgba(255, 255, 255, 0.4);
   padding: 0.2rem 0.4rem;
   border-radius: 4px;
   font-size: 11px;
@@ -5395,39 +3756,39 @@ defineExpose({
 }
 
 .logout-btn:hover {
-  color: var(--overlay-70);
-  background: var(--overlay-5);
+  color: rgba(255, 255, 255, 0.7);
+  background: var(--bg-tertiary);
 }
 
 .platform-btn {
-  background: var(--overlay-8);
-  border: 1px solid var(--overlay-12);
+  background: rgba(255, 255, 255, 0.08);
+  border: 1px solid var(--border-primary);
   border-radius: 8px;
   padding: 0.45rem 0.85rem;
   font-family: 'MiSans', sans-serif;
   font-weight: 600;
   font-size: 13px;
-  color: var(--overlay-50);
+  color: var(--text-tertiary);
   cursor: pointer;
   transition: all 0.3s ease;
   white-space: nowrap;
 }
 
 .platform-btn.active {
-  background: linear-gradient(180deg, var(--color-accent) 0%, var(--color-accent) 100%);
-  border-color: var(--overlay-16);
-  color: var(--text-primary);
+  background: linear-gradient(180deg, var(--bg-secondary, #0043f8) 0%, #0075f8 100%);
+  border-color: rgba(255, 255, 255, 0.16);
+  color: var(--text-primary, #ffffff);
 }
 
 .platform-btn:hover:not(.active) {
-  background: var(--overlay-20);
-  color: var(--overlay-80);
+  background: rgba(255, 255, 255, 0.2);
+  color: rgba(255, 255, 255, 0.8);
 }
 
 /* 音源状态显示 */
 .source-status-display {
-  background: var(--overlay-5);
-  border: 1px solid var(--overlay-10);
+  background: var(--bg-tertiary);
+  border: 1px solid rgba(255, 255, 255, 0.1);
   border-radius: 12px;
   padding: 1rem;
   margin-bottom: 1rem;
@@ -5444,14 +3805,14 @@ defineExpose({
 .status-title {
   font-size: 14px;
   font-weight: 600;
-  color: var(--overlay-90);
+  color: var(--text-primary);
   font-family: 'MiSans', sans-serif;
 }
 
 .status-summary {
   font-size: 12px;
-  color: var(--overlay-60);
-  background: var(--overlay-10);
+  color: var(--text-secondary);
+  background: rgba(255, 255, 255, 0.1);
   padding: 0.25rem 0.5rem;
   border-radius: 6px;
   font-family: 'MiSans', sans-serif;
@@ -5478,25 +3839,25 @@ defineExpose({
 }
 
 .source-item.healthy {
-  background: var(--requestform-source-healthy-bg);
-  border-color: var(--requestform-source-healthy-border);
-  color: var(--color-success-light);
+  background: rgba(34, 197, 94, 0.15);
+  border-color: rgba(34, 197, 94, 0.3);
+  color: #4ade80;
 }
 
 .source-item.unhealthy {
-  background: var(--error-15);
-  border-color: var(--error-30);
-  color: var(--color-error-light);
+  background: rgba(239, 68, 68, 0.15);
+  border-color: rgba(239, 68, 68, 0.3);
+  color: #f87171;
 }
 
 .source-item.checking {
-  background: var(--requestform-source-checking-bg);
-  border-color: var(--requestform-source-checking-border);
-  color: var(--color-warning-light);
+  background: rgba(251, 191, 36, 0.15);
+  border-color: rgba(251, 191, 36, 0.3);
+  color: #fbbf24;
 }
 
 .source-item.current {
-  box-shadow: 0 0 0 2px var(--color-accent-alpha-40);
+  box-shadow: 0 0 0 2px rgba(11, 90, 254, 0.4);
   transform: scale(1.02);
 }
 
@@ -5512,18 +3873,18 @@ defineExpose({
 }
 
 .source-item.healthy .source-indicator {
-  background: var(--color-success-hover);
-  box-shadow: 0 0 6px var(--requestform-source-healthy-glow);
+  background: var(--bg-tertiary, #22c55e);
+  box-shadow: 0 0 6px rgba(34, 197, 94, 0.6);
 }
 
 .source-item.unhealthy .source-indicator {
-  background: var(--color-error);
-  box-shadow: 0 0 6px var(--error-60);
+  background: #ef4444;
+  box-shadow: 0 0 6px rgba(239, 68, 68, 0.6);
 }
 
 .source-item.checking .source-indicator {
-  background: var(--color-warning-light);
-  box-shadow: 0 0 6px var(--requestform-source-checking-glow);
+  background: #fbbf24;
+  box-shadow: 0 0 6px rgba(251, 191, 36, 0.6);
   animation: pulse 1.5s ease-in-out infinite;
 }
 
@@ -5543,10 +3904,10 @@ defineExpose({
   gap: 0.5rem;
   margin-top: 0.75rem;
   padding: 0.5rem 0.75rem;
-  background: var(--error-15);
-  border: 1px solid var(--error-30);
+  background: rgba(239, 68, 68, 0.15);
+  border: 1px solid rgba(239, 68, 68, 0.3);
   border-radius: 6px;
-  color: var(--color-error-light);
+  color: #f87171;
   font-size: 12px;
   font-family: 'MiSans', sans-serif;
   font-weight: 500;
@@ -5555,11 +3916,11 @@ defineExpose({
 /* 搜索结果容器样式 */
 .search-results-container {
   flex: 1;
-  background: var(--surface-card-bg);
+  background: rgba(0, 0, 0, 0.4);
   border-radius: 13px;
   display: flex;
   flex-direction: column;
-  min-height: 0;
+  min-height: 400px;
   padding: 0.5rem 1rem 1rem 1rem;
   position: relative;
   z-index: 1;
@@ -5583,8 +3944,17 @@ defineExpose({
   min-height: 200px; /* 添加最小高度 */
 }
 
+.loading-spinner {
+  width: 40px;
+  height: 40px;
+  border: 3px solid rgba(11, 90, 254, 0.2);
+  border-top-color: #0b5afe;
+  border-radius: 50%;
+  animation: spin 1s linear infinite;
+}
+
 .loading-text {
-  color: var(--overlay-60);
+  color: var(--text-secondary);
   font-family: 'MiSans', sans-serif;
   font-weight: 500;
   margin: 0;
@@ -5623,17 +3993,17 @@ defineExpose({
 }
 
 .results-grid::-webkit-scrollbar-track {
-  background: var(--overlay-10);
+  background: rgba(255, 255, 255, 0.1);
   border-radius: 3px;
 }
 
 .results-grid::-webkit-scrollbar-thumb {
-  background: var(--overlay-30);
+  background: rgba(255, 255, 255, 0.3);
   border-radius: 3px;
 }
 
 .results-grid::-webkit-scrollbar-thumb:hover {
-  background: var(--overlay-50);
+  background: rgba(255, 255, 255, 0.5);
 }
 
 /* 空状态和初始状态 */
@@ -5661,13 +4031,13 @@ defineExpose({
   font-family: 'MiSans', sans-serif;
   font-weight: 600;
   font-size: 15px;
-  color: var(--text-primary);
+  color: var(--text-primary, #ffffff);
   margin: 0;
 }
 
 .empty-hint,
 .initial-hint {
-  color: var(--overlay-60);
+  color: var(--text-secondary);
   font-size: 13px;
   margin: 0;
 }
@@ -5695,25 +4065,25 @@ defineExpose({
 .manual-input-trigger {
   margin-top: 1rem;
   padding-top: 1rem;
-  border-top: 1px solid var(--overlay-10);
+  border-top: 1px solid rgba(255, 255, 255, 0.1);
   text-align: center;
 }
 
 .manual-submit-btn {
-  background: var(--overlay-10);
-  border: 1px solid var(--overlay-16);
+  background: rgba(255, 255, 255, 0.1);
+  border: 1px solid rgba(255, 255, 255, 0.16);
   border-radius: 8px;
   padding: 0.5rem 1.5rem;
   font-family: 'MiSans', sans-serif;
   font-weight: 600;
   font-size: 14px;
-  color: var(--text-primary);
+  color: var(--text-primary, #ffffff);
   cursor: pointer;
   transition: all 0.3s ease;
 }
 
 .manual-submit-btn:hover {
-  background: var(--overlay-20);
+  background: rgba(255, 255, 255, 0.2);
   transform: translateY(-2px);
 }
 
@@ -5722,7 +4092,7 @@ defineExpose({
   font-weight: 600;
   font-size: 14px;
   letter-spacing: 0.04em;
-  color: var(--overlay-40);
+  color: rgba(255, 255, 255, 0.4);
   margin-top: 0.5rem;
 }
 
@@ -5733,14 +4103,14 @@ defineExpose({
 }
 
 .submit-button {
-  background: linear-gradient(180deg, var(--color-accent) 0%, var(--color-accent) 100%);
-  border: 1px solid var(--overlay-16);
+  background: linear-gradient(180deg, var(--bg-secondary, #0043f8) 0%, #0075f8 100%);
+  border: 1px solid rgba(255, 255, 255, 0.16);
   border-radius: 8px;
   padding: 0.5rem 1.5rem;
   font-family: 'MiSans', sans-serif;
   font-weight: 600;
   font-size: 14px;
-  color: var(--text-primary);
+  color: var(--text-primary, #ffffff);
   cursor: pointer;
   transition: all 0.3s ease;
 }
@@ -5754,6 +4124,15 @@ defineExpose({
   cursor: not-allowed;
   transform: none;
 }
+.similar-song-alert {
+  background: var(--bg-tertiary, #21242d);
+  border-radius: 10px;
+  padding: 0.5rem 0.75rem;
+  box-shadow: 0px 4px 12px rgba(0, 0, 0, 0.3);
+  margin-top: 0.5rem;
+  flex-shrink: 0;
+  border: 1px solid rgba(255, 255, 255, 0.1);
+}
 
 .alert-header {
   display: flex;
@@ -5770,7 +4149,7 @@ defineExpose({
 }
 
 .alert-icon {
-  color: var(--color-warning);
+  color: #f59e0b;
   flex-shrink: 0;
 }
 
@@ -5778,7 +4157,7 @@ defineExpose({
   font-family: 'MiSans', sans-serif;
   font-weight: 600;
   font-size: 16px;
-  color: var(--text-primary);
+  color: var(--text-primary, #ffffff);
 }
 
 .alert-content {
@@ -5796,7 +4175,7 @@ defineExpose({
   justify-content: space-between;
   align-items: center;
   padding: 0.4rem 0;
-  border-bottom: 1px solid var(--overlay-5);
+  border-bottom: 1px solid rgba(255, 255, 255, 0.05);
 }
 
 .similar-song-item:last-child {
@@ -5811,7 +4190,7 @@ defineExpose({
 .song-title {
   margin: 0 0 0.25rem 0;
   font-size: 14px;
-  color: var(--text-primary);
+  color: var(--text-primary, #ffffff);
   font-weight: 500;
 }
 
@@ -5835,21 +4214,21 @@ defineExpose({
 }
 
 .status-played {
-  color: var(--color-error);
+  color: #ef4444;
 }
 
 .status-scheduled {
-  color: var(--color-warning);
+  color: #f59e0b;
 }
 
 .alert-hint {
-  color: var(--overlay-60);
+  color: var(--text-secondary);
   font-size: 14px;
   margin-top: 0.5rem;
 }
 
 .voted-status {
-  color: var(--color-success);
+  color: #10b981;
   font-size: 14px;
   font-weight: 600;
   margin-top: 0.5rem;
@@ -5865,11 +4244,11 @@ defineExpose({
 }
 
 .vote-btn {
-  background: linear-gradient(180deg, var(--color-accent) 0%, var(--color-accent) 100%);
-  border: 1px solid var(--overlay-16);
+  background: linear-gradient(180deg, var(--bg-secondary, #0043f8) 0%, #0075f8 100%);
+  border: 1px solid rgba(255, 255, 255, 0.16);
   border-radius: 8px;
   padding: 0.5rem 1rem;
-  color: var(--text-primary);
+  color: var(--text-primary, #ffffff);
   font-family: 'MiSans', sans-serif;
   font-weight: 600;
   font-size: 14px;
@@ -5879,21 +4258,21 @@ defineExpose({
 
 .vote-btn:hover:not(:disabled) {
   transform: translateY(-1px);
-  box-shadow: 0 2px 8px var(--primary-30);
+  box-shadow: 0 2px 8px rgba(0, 67, 248, 0.3);
 }
 
 .vote-btn:disabled {
-  background: var(--overlay-20);
+  background: rgba(255, 255, 255, 0.2);
   cursor: not-allowed;
   transform: none;
 }
 
 .ignore-btn {
-  background: var(--overlay-10);
-  border: 1px solid var(--overlay-16);
+  background: rgba(255, 255, 255, 0.1);
+  border: 1px solid rgba(255, 255, 255, 0.16);
   border-radius: 8px;
   padding: 0.5rem 1rem;
-  color: var(--text-primary);
+  color: var(--text-primary, #ffffff);
   font-family: 'MiSans', sans-serif;
   font-weight: 600;
   font-size: 14px;
@@ -5974,13 +4353,13 @@ defineExpose({
 }
 
 /* 弹窗样式 */
-.requestform-modal-overlay {
+.modal-overlay {
   position: fixed;
   top: 0;
   left: 0;
   right: 0;
   bottom: 0;
-  background: var(--mask-60);
+  background: rgba(0, 0, 0, 0.6);
   backdrop-filter: blur(8px);
   display: flex;
   align-items: center;
@@ -5990,13 +4369,13 @@ defineExpose({
 }
 
 .modal-content {
-  background: var(--requestform-modal-overlay-bg);
+  background: rgba(20, 20, 25, 0.95);
   border-radius: 16px;
   width: 90%;
   max-width: 500px;
-  box-shadow: 0 25px 50px -12px var(--mask-50);
+  box-shadow: 0 25px 50px -12px rgba(0, 0, 0, 0.5);
   overflow: hidden;
-  border: 1px solid var(--overlay-10);
+  border: 1px solid rgba(255, 255, 255, 0.1);
   transform-origin: center;
 }
 
@@ -6005,13 +4384,13 @@ defineExpose({
   justify-content: space-between;
   align-items: center;
   padding: 1.25rem 1.5rem;
-  border-bottom: 1px solid var(--overlay-5);
-  background: var(--overlay-2);
+  border-bottom: 1px solid rgba(255, 255, 255, 0.05);
+  background: var(--bg-secondary);
 }
 
 .modal-header h3 {
   margin: 0;
-  color: var(--text-primary);
+  color: var(--text-primary, #ffffff);
   font-family: 'MiSans', sans-serif;
   font-weight: 600;
   font-size: 18px;
@@ -6021,7 +4400,7 @@ defineExpose({
 .close-btn {
   background: transparent;
   border: none;
-  color: var(--overlay-40);
+  color: rgba(255, 255, 255, 0.4);
   font-size: 24px;
   cursor: pointer;
   padding: 0;
@@ -6035,8 +4414,8 @@ defineExpose({
 }
 
 .close-btn:hover {
-  background: var(--overlay-10);
-  color: var(--text-primary);
+  background: rgba(255, 255, 255, 0.1);
+  color: var(--text-primary, #ffffff);
   transform: rotate(90deg);
 }
 
@@ -6070,27 +4449,27 @@ defineExpose({
 }
 
 .btn-secondary {
-  background: var(--overlay-5);
-  border-color: var(--overlay-10);
-  color: var(--overlay-80);
+  background: var(--bg-tertiary);
+  border-color: rgba(255, 255, 255, 0.1);
+  color: rgba(255, 255, 255, 0.8);
 }
 
 .btn-secondary:hover {
-  background: var(--overlay-10);
-  color: var(--text-primary);
-  border-color: var(--overlay-20);
+  background: rgba(255, 255, 255, 0.1);
+  color: var(--text-primary, #ffffff);
+  border-color: rgba(255, 255, 255, 0.2);
 }
 
 .btn-primary {
-  background: linear-gradient(135deg, var(--color-accent) 0%, var(--color-accent) 100%);
-  border-color: var(--overlay-10);
-  color: var(--text-primary);
-  box-shadow: 0 4px 12px var(--primary-30);
+  background: linear-gradient(135deg, var(--bg-secondary, #0043f8) 0%, #0075f8 100%);
+  border-color: rgba(255, 255, 255, 0.1);
+  color: var(--text-primary, #ffffff);
+  box-shadow: 0 4px 12px rgba(0, 67, 248, 0.3);
 }
 
 .btn-primary:hover:not(:disabled) {
   transform: translateY(-2px);
-  box-shadow: 0 6px 16px var(--requestform-submit-btn-hover-shadow);
+  box-shadow: 0 6px 16px rgba(0, 67, 248, 0.4);
 }
 
 .btn-primary:disabled {
@@ -6100,8 +4479,8 @@ defineExpose({
 }
 
 .readonly {
-  background: var(--surface-card-bg-soft) !important;
-  color: var(--overlay-50) !important;
+  background: rgba(0, 0, 0, 0.2) !important;
+  color: rgba(255, 255, 255, 0.5) !important;
   cursor: not-allowed;
   border-color: transparent !important;
 }
@@ -6129,7 +4508,7 @@ defineExpose({
   gap: 1rem;
   transition: all 0.2s ease;
   cursor: pointer;
-  border-bottom: 1px solid var(--overlay-10);
+  border-bottom: 1px solid rgba(255, 255, 255, 0.1);
 }
 
 .result-item:last-child {
@@ -6137,7 +4516,7 @@ defineExpose({
 }
 
 .result-item:hover {
-  background: var(--overlay-5);
+  background: var(--bg-tertiary);
 }
 
 .result-cover {
@@ -6147,8 +4526,8 @@ defineExpose({
   flex-shrink: 0;
   border-radius: 12px;
   overflow: hidden;
-  box-shadow: 0 4px 12px var(--mask-20);
-  background: var(--panel-bg-dialog);
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.2);
+  background: var(--bg-secondary, #18181b);
 }
 
 .cover-img {
@@ -6165,7 +4544,7 @@ defineExpose({
 .play-overlay-container {
   position: absolute;
   inset: 0;
-  background: var(--surface-card-bg);
+  background: rgba(0, 0, 0, 0.4);
   display: flex;
   align-items: center;
   justify-content: center;
@@ -6182,15 +4561,15 @@ defineExpose({
   width: 36px;
   height: 36px;
   border-radius: 50%;
-  background: var(--overlay-20);
+  background: rgba(255, 255, 255, 0.2);
   backdrop-filter: blur(8px);
   -webkit-backdrop-filter: blur(8px);
   display: flex;
   align-items: center;
   justify-content: center;
   color: white;
-  border: 1px solid var(--overlay-30);
-  box-shadow: 0 8px 16px var(--mask-30);
+  border: 1px solid rgba(255, 255, 255, 0.3);
+  box-shadow: 0 8px 16px rgba(0, 0, 0, 0.3);
 }
 
 .play-icon {
@@ -6206,11 +4585,22 @@ defineExpose({
   justify-content: center;
 }
 
+.result-title-row {
+  display: flex;
+  align-items: flex-start;
+  gap: 0.5rem;
+}
+
+.result-title-row .result-title {
+  flex: 1;
+  min-width: 0;
+}
+
 .result-title {
   font-family: 'MiSans', sans-serif;
   font-weight: 600;
   font-size: 15px;
-  color: var(--text-primary);
+  color: var(--text-primary, #ffffff);
   margin: 0;
   display: -webkit-box;
   -webkit-line-clamp: 2;
@@ -6220,8 +4610,22 @@ defineExpose({
   line-height: 1.4;
 }
 
+.vip-badge {
+  flex-shrink: 0;
+  height: 18px;
+  padding: 0 6px;
+  border-radius: 6px;
+  border: 1px solid rgba(245, 158, 11, 0.35);
+  background: rgba(245, 158, 11, 0.12);
+  color: rgba(245, 158, 11, 0.95);
+  font-size: 11px;
+  font-weight: 900;
+  letter-spacing: 0.02em;
+  line-height: 18px;
+}
+
 .result-artist {
-  color: var(--overlay-60);
+  color: var(--text-secondary);
   font-size: 13px;
   margin: 0.25rem 0;
   white-space: nowrap;
@@ -6232,7 +4636,7 @@ defineExpose({
 .result-album,
 .result-quality,
 .result-pay {
-  color: var(--overlay-40);
+  color: rgba(255, 255, 255, 0.4);
   font-size: 11px;
   margin: 0.15rem 0;
 }
@@ -6248,8 +4652,8 @@ defineExpose({
 }
 
 .cloud-disk-btn {
-  background: linear-gradient(180deg, var(--color-error) 0%, var(--color-error-hover) 100%);
-  border: 1px solid var(--overlay-20);
+  background: linear-gradient(180deg, #ec4141 0%, #d83030 100%);
+  border: 1px solid rgba(255, 255, 255, 0.2);
   border-radius: 50%;
   width: 32px;
   height: 32px;
@@ -6258,25 +4662,25 @@ defineExpose({
   display: flex;
   align-items: center;
   justify-content: center;
-  color: var(--text-primary);
+  color: var(--text-primary, #ffffff);
   cursor: pointer;
   transition: all 0.2s cubic-bezier(0.4, 0, 0.2, 1);
   flex-shrink: 0;
-  box-shadow: 0 2px 6px var(--mask-20);
+  box-shadow: 0 2px 6px rgba(0, 0, 0, 0.2);
   -webkit-appearance: none;
   appearance: none;
 }
 
 .cloud-disk-btn:hover {
   transform: translateY(-2px) scale(1.05);
-  box-shadow: 0 4px 12px var(--requestform-delete-btn-hover-shadow);
-  background: linear-gradient(180deg, var(--color-error-hover) 0%, var(--color-error-hover) 100%);
-  border-color: var(--overlay-40);
+  box-shadow: 0 4px 12px rgba(236, 65, 65, 0.5);
+  background: linear-gradient(180deg, #d83030 0%, #c52020 100%);
+  border-color: rgba(255, 255, 255, 0.4);
 }
 
 .cloud-disk-btn:active {
   transform: translateY(0) scale(0.95);
-  box-shadow: 0 2px 4px var(--requestform-delete-btn-hover-shadow-sm);
+  box-shadow: 0 2px 4px rgba(236, 65, 65, 0.3);
 }
 
 .similar-song-info {
@@ -6289,27 +4693,27 @@ defineExpose({
 
 .similar-text {
   font-size: 12px;
-  color: var(--overlay-60);
+  color: var(--text-secondary);
   font-family: 'MiSans', sans-serif;
   font-weight: 500;
 }
 
 .similar-text.status-played {
-  color: var(--color-error);
+  color: #ef4444;
   font-weight: 600;
 }
 
 .similar-text.status-scheduled {
-  color: var(--color-warning);
+  color: #f59e0b;
   font-weight: 600;
 }
 
 .like-btn {
-  background: linear-gradient(180deg, var(--color-error) 0%, var(--color-error-hover) 100%);
-  border: 1px solid var(--overlay-16);
+  background: linear-gradient(180deg, #ef4444 0%, #dc2626 100%);
+  border: 1px solid rgba(255, 255, 255, 0.16);
   border-radius: 6px;
   padding: 0.4rem 0.8rem;
-  color: var(--text-primary);
+  color: var(--text-primary, #ffffff);
   font-family: 'MiSans', sans-serif;
   font-weight: 600;
   font-size: 12px;
@@ -6323,18 +4727,18 @@ defineExpose({
 
 .like-btn:hover:not(:disabled) {
   transform: translateY(-1px);
-  box-shadow: 0 2px 8px var(--error-30);
+  box-shadow: 0 2px 8px rgba(239, 68, 68, 0.3);
 }
 
 .like-btn:disabled {
-  background: var(--overlay-20);
+  background: rgba(255, 255, 255, 0.2);
   cursor: not-allowed;
   transform: none;
 }
 
 .like-btn.disabled {
-  background: var(--overlay-10);
-  border-color: var(--overlay-20);
+  background: rgba(255, 255, 255, 0.1);
+  border-color: rgba(255, 255, 255, 0.2);
   cursor: not-allowed;
   opacity: 0.5;
 }
@@ -6346,11 +4750,11 @@ defineExpose({
 }
 
 .select-btn {
-  background: linear-gradient(180deg, var(--color-accent) 0%, var(--color-accent) 100%);
-  border: 1px solid var(--overlay-16);
+  background: linear-gradient(180deg, var(--bg-secondary, #0043f8) 0%, #0075f8 100%);
+  border: 1px solid rgba(255, 255, 255, 0.16);
   border-radius: 8px;
   padding: 0.5rem 1rem;
-  color: var(--text-primary);
+  color: var(--text-primary, #ffffff);
   font-family: 'MiSans', sans-serif;
   font-weight: 600;
   font-size: 14px;
@@ -6359,11 +4763,11 @@ defineExpose({
 }
 
 .replay-btn {
-  background: var(--requestform-replay-btn-bg);
-  border: 1px solid var(--requestform-replay-btn-border);
+  background: rgba(0, 117, 248, 0.1);
+  border: 1px solid rgba(0, 117, 248, 0.3);
   border-radius: 6px;
   padding: 0.4rem 0.8rem;
-  color: var(--color-accent-light);
+  color: #3b82f6;
   font-family: 'MiSans', sans-serif;
   font-weight: 600;
   font-size: 12px;
@@ -6376,16 +4780,16 @@ defineExpose({
 }
 
 .replay-btn:hover:not(:disabled) {
-  background: var(--requestform-replay-btn-bg-hover);
-  border-color: var(--requestform-replay-btn-border-hover);
-  color: var(--color-accent-light);
+  background: rgba(0, 117, 248, 0.2);
+  border-color: rgba(0, 117, 248, 0.5);
+  color: #60a5fa;
   transform: translateY(-1px);
 }
 
 .replay-btn:disabled {
-  background: var(--overlay-5);
-  border-color: var(--overlay-10);
-  color: var(--overlay-30);
+  background: var(--bg-tertiary);
+  border-color: rgba(255, 255, 255, 0.1);
+  color: var(--text-disabled);
   cursor: not-allowed;
   transform: none;
 }
@@ -6397,31 +4801,31 @@ defineExpose({
   margin-top: 1rem;
   text-align: center;
   padding: 1rem 0;
-  border-top: 1px solid var(--overlay-10);
+  border-top: 1px solid rgba(255, 255, 255, 0.1);
 }
 
 .manual-submit-btn {
-  background: var(--overlay-10);
-  border: 1px solid var(--overlay-16);
+  background: rgba(255, 255, 255, 0.1);
+  border: 1px solid rgba(255, 255, 255, 0.16);
   border-radius: 8px;
   padding: 0.5rem 1.5rem;
   font-family: 'MiSans', sans-serif;
   font-weight: 600;
   font-size: 14px;
-  color: var(--text-primary);
+  color: var(--text-primary, #ffffff);
   cursor: pointer;
   transition: all 0.3s ease;
 }
 
 .manual-submit-btn:hover {
-  background: var(--overlay-20);
+  background: rgba(255, 255, 255, 0.2);
   transform: translateY(-2px);
 }
 
 /* 手动输入区域样式 */
 .manual-input-section {
   margin-top: 2rem;
-  background: var(--surface-card-bg);
+  background: rgba(0, 0, 0, 0.4);
   border-radius: 13px;
   padding: 1.5rem;
 }
@@ -6431,7 +4835,7 @@ defineExpose({
   font-weight: 600;
   font-size: 18px;
   margin-bottom: 1rem;
-  color: var(--text-primary);
+  color: var(--text-primary, #ffffff);
 }
 
 .manual-form {
@@ -6447,11 +4851,11 @@ defineExpose({
 }
 
 .manual-cancel-btn {
-  background: var(--overlay-10);
-  border: 1px solid var(--overlay-16);
+  background: rgba(255, 255, 255, 0.1);
+  border: 1px solid rgba(255, 255, 255, 0.16);
   border-radius: 8px;
   padding: 0.5rem 1rem;
-  color: var(--text-primary);
+  color: var(--text-primary, #ffffff);
   font-family: 'MiSans', sans-serif;
   font-weight: 600;
   font-size: 14px;
@@ -6460,15 +4864,15 @@ defineExpose({
 }
 
 .manual-cancel-btn:hover {
-  background: var(--overlay-20);
+  background: rgba(255, 255, 255, 0.2);
 }
 
 .manual-confirm-btn {
-  background: linear-gradient(180deg, var(--color-accent) 0%, var(--color-accent) 100%);
-  border: 1px solid var(--overlay-16);
+  background: linear-gradient(180deg, var(--bg-secondary, #0043f8) 0%, #0075f8 100%);
+  border: 1px solid rgba(255, 255, 255, 0.16);
   border-radius: 8px;
   padding: 0.5rem 1rem;
-  color: var(--text-primary);
+  color: var(--text-primary, #ffffff);
   font-family: 'MiSans', sans-serif;
   font-weight: 600;
   font-size: 14px;
@@ -6478,7 +4882,7 @@ defineExpose({
 
 .manual-confirm-btn:hover:not(:disabled) {
   transform: translateY(-2px);
-  box-shadow: 0 4px 12px var(--primary-30);
+  box-shadow: 0 4px 12px rgba(0, 67, 248, 0.3);
 }
 
 .manual-confirm-btn:disabled {
@@ -6491,7 +4895,6 @@ defineExpose({
   /* Netease Options Mobile Optimization */
   .netease-options {
     padding: 0.75rem;
-    min-width: unset; /* 移除桌面端的最小宽度限制 */
   }
 
   .user-compact-row {
@@ -6508,16 +4911,11 @@ defineExpose({
   .search-type-switch {
     width: 100%;
     display: flex;
-    min-width: 0;
   }
 
   .radio-label {
     flex: 1;
-    min-width: 0;
     text-align: center;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
   }
 
   .user-actions-row {
@@ -6530,19 +4928,11 @@ defineExpose({
   /* 移动端下让按钮平分宽度 */
   .user-actions-row .action-btn-compact {
     flex: 1;
-    min-width: 0;
     width: auto;
     justify-content: center;
     padding: 0.6rem 0.4rem;
   }
 
-  /* 按钮文字过窄时省略号截断 */
-  .user-actions-row .action-btn-compact span {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-
   /* 移动端显示/隐藏控制 */
   .desktop-only-rules {
     display: none;
@@ -6565,23 +4955,23 @@ defineExpose({
     height: auto;
     margin-bottom: 1.5rem;
     padding: 1.25rem;
-    background: var(--overlay-4);
+    background: rgba(255, 255, 255, 0.04);
     backdrop-filter: blur(20px);
-    border: 1px solid var(--overlay-8);
+    border: 1px solid var(--border-tertiary);
     border-radius: 18px;
   }
 
   .rules-title {
     font-size: 15px;
     font-weight: 700;
-    color: var(--overlay-90);
+    color: var(--text-primary);
     margin-bottom: 1.25rem;
     letter-spacing: normal;
   }
 
   .rules-icon {
     display: block;
-    color: var(--color-warning);
+    color: #f59e0b;
   }
 
   .form-container {
@@ -6619,9 +5009,9 @@ defineExpose({
     display: flex;
     flex-direction: column;
     margin-bottom: 2rem;
-    background: var(--overlay-2);
+    background: var(--bg-secondary);
     backdrop-filter: blur(20px);
-    border: 1px solid var(--overlay-8);
+    border: 1px solid var(--border-tertiary);
     border-radius: 20px;
     /* 允许容器内容触发页面滚动 */
     touch-action: pan-y;
@@ -6713,8 +5103,8 @@ defineExpose({
   }
 
   .search-input {
-    background: var(--overlay-5);
-    border: 1px solid var(--overlay-10);
+    background: var(--bg-tertiary);
+    border: 1px solid rgba(255, 255, 255, 0.1);
     border-radius: 12px;
     padding: 0.75rem 1rem;
     font-size: 15px;
@@ -6731,49 +5121,36 @@ defineExpose({
     font-size: 14px; /* 稍微减小字体 */
   }
 
-  .audio-match-btn {
-    padding: 0.75rem;
-    min-width: 48px;
-  }
-
-  .audio-match-btn .btn-text {
-    display: none;
-  }
-
   /* 移动端平台选择按钮 */
   .platform-selection-container {
     flex-direction: column;
     align-items: stretch;
-    min-width: 0;
   }
-
+  
   .platform-selection {
-    background: var(--surface-card-bg-soft);
+    background: var(--bg-primary);
     padding: 4px;
     border-radius: 12px;
     margin-bottom: 0.5rem;
     display: flex;
-    min-width: 0;
+    overflow: visible;
   }
 
   .platform-btn {
     flex: 1;
-    min-width: 0;
-    padding: 0.5rem 0.25rem;
-    font-size: 12px;
-    line-height: 1.3;
+    padding: 0.5rem;
+    font-size: 13px;
     border-radius: 10px;
     background: transparent;
     border: none;
-    color: var(--overlay-50);
-    white-space: normal;
-    word-break: break-word;
+    color: var(--text-tertiary);
+    min-width: auto;
   }
 
   .platform-btn.active {
-    background: var(--color-accent);
-    color: var(--text-primary);
-    box-shadow: 0 2px 8px var(--color-accent-alpha-30);
+    background: var(--bg-secondary, #0b5afe);
+    color: var(--text-primary, #ffffff);
+    box-shadow: 0 2px 8px rgba(11, 90, 254, 0.3);
   }
 
   /* 移动端音源状态显示 */
@@ -6820,80 +5197,6 @@ defineExpose({
     gap: 1rem;
   }
 
-  .submission-meta-row {
-    gap: 0.75rem;
-  }
-
-  .card-code-form-group {
-    margin-bottom: 0;
-  }
-
-  .mobile-hidden-card-code-group {
-    display: none;
-  }
-
-  .desktop-card-code-panel {
-    display: none;
-  }
-
-  .mobile-card-code-chip {
-    display: inline-flex;
-    align-items: center;
-    gap: 0.35rem;
-    min-height: 28px;
-    border-radius: 999px;
-    border: 1px solid var(--requestform-mobile-chip-border);
-    background: var(--requestform-mobile-chip-bg);
-    color: var(--requestform-mobile-chip-text);
-    padding: 0.25rem 0.55rem;
-    font-size: 11px;
-    font-weight: 800;
-    white-space: nowrap;
-  }
-
-  .mobile-card-code-button {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    gap: 0.75rem;
-    width: 100%;
-    min-height: 42px;
-    border-radius: 12px;
-    border: 1px solid var(--requestform-mobile-chip-border-sm);
-    background: var(--panel-bg-overlay);
-    color: var(--requestform-mobile-button-text);
-    padding: 0.65rem 0.85rem;
-    font-size: 13px;
-    font-weight: 800;
-  }
-
-  .mobile-card-code-chip.is-required,
-  .mobile-card-code-button.is-required {
-    border-color: var(--requestform-chip-required-border);
-    background: var(--requestform-chip-required-bg);
-    color: var(--color-warning-light);
-  }
-
-  .mobile-card-code-chip.has-code,
-  .mobile-card-code-button.has-code {
-    border-color: var(--requestform-chip-required-border-sm);
-    color: var(--color-warning-light);
-  }
-
-  .mobile-card-code-chip.is-valid,
-  .mobile-card-code-button.is-valid {
-    border-color: var(--requestform-chip-valid-border);
-    background: var(--success-10);
-    color: var(--color-success-light);
-  }
-
-  .mobile-card-code-chip.is-invalid,
-  .mobile-card-code-button.is-invalid {
-    border-color: var(--requestform-chip-invalid-border);
-    background: var(--requestform-chip-invalid-bg);
-    color: var(--color-error-light);
-  }
-
   .form-group label {
     font-size: 18px;
   }
@@ -6948,9 +5251,9 @@ defineExpose({
 
   /* 移动端搜索结果优化 */
   .result-item {
-    background: var(--overlay-3);
+    background: rgba(255, 255, 255, 0.03);
     border-radius: 16px;
-    border: 1px solid var(--overlay-6);
+    border: 1px solid rgba(255, 255, 255, 0.06);
     margin-bottom: 0.5rem;
     padding: 10px;
     flex-direction: row;
@@ -7058,6 +5361,47 @@ defineExpose({
     position: relative;
     z-index: 10;
   }
+
+  /* 确保相似歌曲提示在移动端可见 */
+  .similar-song-alert {
+    margin-top: 1rem;
+    margin-bottom: 1rem;
+    z-index: 20;
+    position: relative;
+  }
+
+  /* 移动端投稿开放状态显示优化 */
+  .submission-status-horizontal {
+    padding: 0.75rem;
+    border-radius: 12px;
+    margin-bottom: 1rem;
+  }
+
+  .status-content-horizontal {
+    gap: 0.5rem;
+    flex-direction: column;
+    align-items: stretch;
+  }
+
+  .status-item-horizontal {
+    width: 100%;
+    justify-content: space-between;
+    padding: 0.4rem 0;
+    border-bottom: 1px dashed rgba(255, 255, 255, 0.08);
+  }
+
+  .status-item-horizontal:last-child {
+    border-bottom: none;
+    padding-bottom: 0;
+  }
+  
+  .status-item-horizontal .status-label {
+    color: rgba(255, 255, 255, 0.8);
+  }
+  
+  .status-item-horizontal .status-remaining {
+    margin-left: auto;
+  }
 }
 
 /* 网易云音乐账号加载状态样式 */
@@ -7082,14 +5426,14 @@ defineExpose({
 .netease-loading-state .loading-spinner {
   width: 16px;
   height: 16px;
-  border: 2px solid var(--error-20);
-  border-top-color: var(--color-error);
+  border: 2px solid rgba(239, 68, 68, 0.2);
+  border-top-color: #ef4444;
   border-radius: 50%;
   animation: spin 1s linear infinite;
 }
 
 .netease-loading-state .loading-text {
-  color: var(--text-muted-light);
+  color: #a1a1aa;
   font-size: 13px;
   font-weight: 500;
   margin: 0;
@@ -7097,7 +5441,7 @@ defineExpose({
 
 /* URL验证状态样式 */
 .validation-loading {
-  color: var(--color-warning-light);
+  color: #fbbf24;
   font-size: 0.875rem;
   margin-top: 0.25rem;
   display: flex;
@@ -7106,31 +5450,31 @@ defineExpose({
 }
 
 .validation-error {
-  color: var(--color-error);
+  color: #ef4444;
   font-size: 0.875rem;
   margin-top: 0.25rem;
 }
 
 .validation-success {
-  color: var(--color-success);
+  color: #10b981;
   font-size: 0.875rem;
   margin-top: 0.25rem;
 }
 
 .form-input.error {
-  border-color: var(--color-error);
-  box-shadow: 0 0 0 1px var(--color-error);
+  border-color: #ef4444;
+  box-shadow: 0 0 0 1px #ef4444;
 }
 
 .import-semester-btn {
   display: flex;
   align-items: center;
   gap: 0.4rem;
-  background: var(--overlay-8);
-  border: 1px solid var(--overlay-12);
+  background: rgba(255, 255, 255, 0.08);
+  border: 1px solid var(--border-primary);
   border-radius: 8px;
   padding: 0.6rem 0.8rem;
-  color: var(--overlay-80);
+  color: rgba(255, 255, 255, 0.8);
   font-family: 'MiSans', sans-serif;
   font-weight: 500;
   font-size: 13px;
@@ -7142,9 +5486,9 @@ defineExpose({
 }
 
 .import-semester-btn:hover {
-  background: var(--overlay-15);
-  color: var(--text-primary);
-  border-color: var(--overlay-20);
+  background: rgba(255, 255, 255, 0.15);
+  color: var(--text-primary, #ffffff);
+  border-color: rgba(255, 255, 255, 0.2);
 }
 
 @media (max-width: 768px) {
@@ -7161,7 +5505,7 @@ defineExpose({
 
 .video-info {
   padding: 1rem;
-  border-bottom: 1px solid var(--overlay-10);
+  border-bottom: 1px solid rgba(255, 255, 255, 0.1);
   margin-bottom: 1rem;
 }
 
@@ -7169,14 +5513,14 @@ defineExpose({
   font-family: 'MiSans', sans-serif;
   font-weight: 500;
   font-size: 16px;
-  color: var(--text-primary);
+  color: var(--text-primary, #ffffff);
   margin-bottom: 0.5rem;
 }
 
 .video-author {
   font-family: 'MiSans', sans-serif;
   font-size: 14px;
-  color: var(--overlay-60);
+  color: var(--text-secondary);
 }
 
 .episodes-list {
@@ -7191,16 +5535,16 @@ defineExpose({
   align-items: center;
   gap: 1rem;
   padding: 1rem;
-  background: var(--overlay-5);
-  border: 1px solid var(--overlay-10);
+  background: var(--bg-tertiary);
+  border: 1px solid rgba(255, 255, 255, 0.1);
   border-radius: 8px;
   cursor: pointer;
   transition: all 0.2s ease;
 }
 
 .episode-item:hover {
-  background: var(--overlay-10);
-  border-color: var(--overlay-20);
+  background: rgba(255, 255, 255, 0.1);
+  border-color: rgba(255, 255, 255, 0.2);
   transform: translateX(4px);
 }
 
@@ -7208,8 +5552,8 @@ defineExpose({
   font-family: 'MiSans', sans-serif;
   font-weight: 600;
   font-size: 14px;
-  color: var(--overlay-80);
-  background: var(--overlay-10);
+  color: rgba(255, 255, 255, 0.8);
+  background: rgba(255, 255, 255, 0.1);
   padding: 0.4rem 0.8rem;
   border-radius: 6px;
   min-width: 40px;
@@ -7227,40 +5571,12 @@ defineExpose({
   font-family: 'MiSans', sans-serif;
   font-weight: 500;
   font-size: 14px;
-  color: var(--text-primary);
+  color: var(--text-primary, #ffffff);
 }
 
 .episode-duration {
   font-family: 'MiSans', sans-serif;
   font-size: 12px;
-  color: var(--overlay-50);
-}
-
-/* 专辑详情样式 */
-.clickable-album {
-  cursor: pointer;
-  display: inline-flex;
-  align-items: center;
-  gap: 4px;
-  transition: all 0.2s ease;
-  position: relative;
-}
-
-.clickable-album:hover .album-name {
-  color: var(--color-accent-light);
-  text-decoration: underline;
-}
-
-.album-label {
-  color: var(--overlay-40);
-}
-
-.album-link-icon {
-  opacity: 0.7;
-  transition: opacity 0.2s ease;
-}
-
-.clickable-album:hover .album-link-icon {
-  opacity: 1;
+  color: var(--text-tertiary);
 }
 </style>
diff --git a/app/components/year-review/ArtistSlide.vue b/app/components/year-review/ArtistSlide.vue
index 553b14f..1b060d8 100644
--- a/app/components/year-review/ArtistSlide.vue
+++ b/app/components/year-review/ArtistSlide.vue
@@ -6,29 +6,26 @@
 
     <Transition name="entry" appear>
       <div v-show="active" class="content">
-        <div class="label">{{ yearReview.favoriteArtist }}</div>
+        <div class="label">特别偏爱</div>
 
-        <p class="text-intro">{{ yearReview.topArtistIntro }}</p>
+        <p class="text-intro">你的年度歌手是</p>
 
         <div class="artist-container">
           <div class="artist-bg-blur" />
           <h2 class="artist-name">{{ data.topArtist }}</h2>
         </div>
 
-        <p class="text-desc">{{ yearReview.artistDesc }}</p>
+        <p class="text-desc">Ta 的声音似乎特别吸引你，<br >陪伴了你无数个日夜。</p>
       </div>
     </Transition>
   </div>
 </template>
 
 <script setup>
-import { useLocale } from '~/utils/locale'
-
 defineProps({
   data: Object,
   active: Boolean
 })
-const { yearReview } = useLocale()
 </script>
 
 <style scoped>
@@ -40,13 +37,13 @@ const { yearReview } = useLocale()
   align-items: center;
   justify-content: center;
   overflow: hidden;
-  background-color: var(--panel-bg-tertiary);
+  background-color: var(--surface-primary, var(--bg-primary, #1a0b2e));
 }
 
 .bg-overlay {
   position: absolute;
   inset: 0;
-  background: linear-gradient(to top, var(--bg-primary), transparent, transparent);
+  background: linear-gradient(to top, var(--bg-primary, #111111), transparent, transparent);
   opacity: 0.8;
   z-index: 10;
 }
@@ -56,7 +53,7 @@ const { yearReview } = useLocale()
   top: 0;
   width: 100%;
   height: 100%;
-  background: linear-gradient(to bottom, var(--color-collab-hover), var(--bg-primary));
+  background: linear-gradient(to bottom, #581c87, #000);
   opacity: 0.5;
   animation: pulse 8s infinite;
 }
@@ -72,19 +69,19 @@ const { yearReview } = useLocale()
 }
 
 .label {
-  color: var(--color-collab-light); /* purple-300 */
+  color: #d8b4fe; /* purple-300 */
   letter-spacing: 0.3em;
   text-transform: uppercase;
   margin-bottom: 1.5rem;
   font-size: 0.875rem;
   font-weight: 700;
-  border-bottom: 1px solid var(--year-review-artist-label-border);
+  border-bottom: 1px solid rgba(168, 85, 247, 0.3);
   padding-bottom: 0.5rem;
 }
 
 .text-intro {
   font-size: 1.5rem;
-  color: var(--text-primary-lighter);
+  color: #d1d5db;
   font-weight: 300;
   margin-bottom: 3rem;
 }
@@ -101,7 +98,7 @@ const { yearReview } = useLocale()
   transform: translate(-50%, -50%);
   width: 120%;
   height: 120%;
-  background: var(--year-review-artist-bg-blur);
+  background: rgba(168, 85, 247, 0.2);
   filter: blur(60px);
   border-radius: 50%;
 }
@@ -112,18 +109,18 @@ const { yearReview } = useLocale()
   font-weight: 900;
   font-style: italic;
   letter-spacing: -0.05em;
-  background-image: linear-gradient(to bottom right, var(--color-collab-light), var(--color-pink), var(--color-orange));
+  background-image: linear-gradient(to bottom right, #e9d5ff, #f472b6, #fb923c);
   -webkit-background-clip: text;
   background-clip: text;
   color: transparent;
-  filter: drop-shadow(0 25px 25px var(--mask-15));
+  filter: drop-shadow(0 25px 25px rgba(0, 0, 0, 0.15));
   word-break: break-word;
   padding: 0 0.5rem;
 }
 
 .text-desc {
   margin-top: 3rem;
-  color: var(--text-muted);
+  color: #9ca3af;
   max-width: 24rem;
   margin-left: auto;
   margin-right: auto;
diff --git a/app/components/year-review/FirstSongSlide.vue b/app/components/year-review/FirstSongSlide.vue
index b5aad85..9ab57af 100644
--- a/app/components/year-review/FirstSongSlide.vue
+++ b/app/components/year-review/FirstSongSlide.vue
@@ -9,9 +9,9 @@
 
     <Transition name="entry" appear>
       <div v-show="active" class="content">
-        <span class="badge">{{ yearReview.firstSongBadge }}</span>
+        <span class="badge">初次相遇</span>
 
-        <p class="text-intro">{{ yearReview.firstSongIntro }}</p>
+        <p class="text-intro">这一年，你点的<span class="highlight">第一首歌</span>是</p>
 
         <div class="vinyl-container">
           <div class="vinyl-record">
@@ -53,17 +53,14 @@
 </template>
 
 <script setup>
-import { useLocale } from '~/utils/locale'
-
 defineProps({
   data: Object,
   active: Boolean
 })
-const { yearReview } = useLocale()
 
 const formatDate = (dateStr) => {
   const date = new Date(dateStr)
-  return yearReview.value.date(date.getMonth() + 1, date.getDate())
+  return `${date.getMonth() + 1}月${date.getDate()}日`
 }
 </script>
 
@@ -77,7 +74,7 @@ const formatDate = (dateStr) => {
   align-items: center;
   justify-content: center;
   overflow: hidden;
-  background-color: var(--bg-primary);
+  background-color: var(--bg-primary, #111111);
 }
 
 .bg-blur {
@@ -105,25 +102,25 @@ const formatDate = (dateStr) => {
   display: inline-block;
   padding: 0.25rem 1rem;
   border-radius: 9999px;
-  border: 1px solid var(--overlay-20);
-  background: var(--overlay-5);
+  border: 1px solid rgba(255, 255, 255, 0.2);
+  background: rgba(255, 255, 255, 0.05);
   backdrop-filter: blur(12px);
   font-size: 0.875rem;
   margin-bottom: 1.5rem;
   letter-spacing: 0.1em;
-  color: var(--color-pink); /* brand-pink */
+  color: #f472b6; /* brand-pink */
   font-weight: 600;
 }
 
 .text-intro {
   font-size: 1.5rem;
-  color: var(--text-primary-lighter);
+  color: #d1d5db;
   font-weight: 300;
   margin-bottom: 2rem;
 }
 
 .highlight {
-  color: var(--text-primary);
+  color: var(--text-primary, #ffffff);
   font-weight: 700;
   margin: 0 0.5rem;
 }
@@ -142,9 +139,9 @@ const formatDate = (dateStr) => {
   height: 100%;
   border-radius: 1rem;
   overflow: hidden;
-  box-shadow: 0 25px 50px -12px var(--mask-50);
-  border: 1px solid var(--overlay-10);
-  background: var(--panel-bg-dark);
+  box-shadow: 0 25px 50px -12px rgba(0, 0, 0, 0.5);
+  border: 1px solid rgba(255, 255, 255, 0.1);
+  background: var(--bg-secondary, #111827);
   display: flex;
   align-items: center;
   justify-content: center;
@@ -162,13 +159,13 @@ const formatDate = (dateStr) => {
 }
 
 .placeholder-icon {
-  color: var(--text-muted);
+  color: #4b5563;
 }
 
 .glossy-overlay {
   position: absolute;
   inset: 0;
-  background: linear-gradient(to top right, var(--overlay-10), transparent);
+  background: linear-gradient(to top right, rgba(255, 255, 255, 0.1), transparent);
   pointer-events: none;
 }
 
@@ -184,12 +181,12 @@ const formatDate = (dateStr) => {
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
-  color: var(--text-primary);
+  color: var(--text-primary, #ffffff);
 }
 
 .song-artist {
   font-size: 1.125rem;
-  color: var(--text-muted);
+  color: #9ca3af;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
@@ -198,7 +195,7 @@ const formatDate = (dateStr) => {
 .date-text {
   margin-top: 2rem;
   font-size: 1.125rem;
-  color: var(--text-muted);
+  color: #9ca3af;
   font-family:
     'MiSans',
     system-ui,
diff --git a/app/components/year-review/IntroSlide.vue b/app/components/year-review/IntroSlide.vue
index 40c8afb..4c5e496 100644
--- a/app/components/year-review/IntroSlide.vue
+++ b/app/components/year-review/IntroSlide.vue
@@ -7,7 +7,7 @@
     <Transition name="entry" appear>
       <div v-show="active" class="content">
         <div class="year-bg">{{ data.year }}</div>
-        <div class="sub-title">{{ yearReview.reportTitle }}</div>
+        <div class="sub-title">年度点歌报告</div>
         <h1 class="main-title">VoiceHub</h1>
       </div>
     </Transition>
@@ -15,13 +15,10 @@
 </template>
 
 <script setup>
-import { useLocale } from '~/utils/locale'
-
 defineProps({
   data: Object,
   active: Boolean
 })
-const { yearReview } = useLocale()
 </script>
 
 <style scoped>
@@ -34,7 +31,7 @@ const { yearReview } = useLocale()
   align-items: center;
   justify-content: center;
   overflow: hidden;
-  background: radial-gradient(circle at center, var(--panel-bg-dark), var(--bg-primary));
+  background: radial-gradient(circle at center, var(--bg-secondary, #111827), #000000);
 }
 
 .blob {
@@ -49,7 +46,7 @@ const { yearReview } = useLocale()
   left: -10%;
   width: 500px;
   height: 500px;
-  background: var(--year-review-blob-1-bg);
+  background: rgba(139, 92, 246, 0.4); /* brand-purple */
   animation: spin 20s linear infinite;
 }
 
@@ -58,7 +55,7 @@ const { yearReview } = useLocale()
   right: -10%;
   width: 600px;
   height: 600px;
-  background: var(--year-review-blob-2-bg);
+  background: rgba(244, 114, 182, 0.2); /* brand-pink */
   animation: reverse-spin 25s linear infinite;
 }
 
@@ -76,7 +73,7 @@ const { yearReview } = useLocale()
   transform: translate(-50%, -50%);
   font-size: 14rem;
   font-weight: 900;
-  color: var(--overlay-3);
+  color: rgba(255, 255, 255, 0.03);
   pointer-events: none;
   user-select: none;
   line-height: 1;
@@ -85,7 +82,7 @@ const { yearReview } = useLocale()
 .sub-title {
   font-size: 1.5rem;
   font-weight: 300;
-  color: var(--text-muted);
+  color: #9ca3af;
   margin-bottom: 1rem;
   letter-spacing: 0.2em;
   text-transform: uppercase;
@@ -94,12 +91,12 @@ const { yearReview } = useLocale()
 .main-title {
   font-size: 5rem;
   font-weight: 900;
-  background-image: linear-gradient(to right, var(--text-primary), var(--panel-border-light), var(--text-muted));
+  background-image: linear-gradient(to right, #ffffff, #e5e7eb, #6b7280);
   -webkit-background-clip: text;
   background-clip: text;
   color: transparent;
   margin-bottom: 2rem;
-  filter: drop-shadow(0 25px 25px var(--mask-15));
+  filter: drop-shadow(0 25px 25px rgba(0, 0, 0, 0.15));
 }
 
 @media (max-width: 768px) {
diff --git a/app/components/year-review/MiscSlide.vue b/app/components/year-review/MiscSlide.vue
index 761d9eb..6221775 100644
--- a/app/components/year-review/MiscSlide.vue
+++ b/app/components/year-review/MiscSlide.vue
@@ -5,18 +5,18 @@
     <Transition name="entry" appear>
       <div v-show="active" class="content">
         <div v-if="data.topPlatform" class="card platform-card">
-          <span class="label">{{ yearReview.commonPlatform }}</span>
+          <span class="label">常用平台</span>
           <span class="platform-value">{{ formatPlatform(data.topPlatform) }}</span>
         </div>
 
         <div class="grid-container">
           <div v-if="data.activeMonth" class="card active-card">
-            <span class="label">{{ yearReview.mostActive }}</span>
-            <span class="active-value">{{ yearReview.activeMonth(data.activeMonth) }}</span>
+            <span class="label">最活跃</span>
+            <span class="active-value">{{ data.activeMonth }}<span class="unit">月</span></span>
           </div>
 
           <div class="card votes-card">
-            <span class="label">{{ yearReview.votesCast }}</span>
+            <span class="label">投出票数</span>
             <span class="votes-value">{{ data.totalVotes }}</span>
           </div>
         </div>
@@ -26,16 +26,21 @@
 </template>
 
 <script setup>
-import { useLocale } from '~/utils/locale'
-
 defineProps({
   data: Object,
   active: Boolean
 })
-const { yearReview } = useLocale()
 
 const formatPlatform = (platform) => {
-  const map = yearReview.value.platforms
+  const map = {
+    netease: '网易云音乐',
+    bilibili: '哔哩哔哩',
+    qq: 'QQ音乐',
+    kugou: '酷狗音乐',
+    kuwo: '酷我音乐',
+    migu: '咪咕音乐',
+    tencent: 'QQ音乐'
+  }
   return map[platform] || platform
 }
 </script>
@@ -49,7 +54,7 @@ const formatPlatform = (platform) => {
   align-items: center;
   justify-content: center;
   overflow: hidden;
-  background-color: var(--panel-bg-dark); /* gray-900 */
+  background-color: var(--bg-secondary, #111827); /* gray-900 */
 }
 
 .bg-gradient {
@@ -58,7 +63,7 @@ const formatPlatform = (platform) => {
   left: 0;
   width: 100%;
   height: 50%;
-  background: linear-gradient(to bottom, var(--panel-border-subtle), transparent);
+  background: linear-gradient(to bottom, var(--bg-secondary, #1f2937), transparent);
   opacity: 0.2;
 }
 
@@ -74,8 +79,8 @@ const formatPlatform = (platform) => {
 .card {
   padding: 1.5rem;
   border-radius: 1.5rem;
-  background: var(--overlay-5);
-  border: 1px solid var(--overlay-10);
+  background: rgba(255, 255, 255, 0.05);
+  border: 1px solid rgba(255, 255, 255, 0.1);
   backdrop-filter: blur(12px);
   display: flex;
   flex-direction: column;
@@ -85,7 +90,7 @@ const formatPlatform = (platform) => {
 
 .label {
   font-size: 0.75rem;
-  color: var(--year-review-text-tertiary);
+  color: #6b7280;
   text-transform: uppercase;
   letter-spacing: 0.1em;
   margin-bottom: 0.5rem; /* adjusted */
@@ -94,7 +99,7 @@ const formatPlatform = (platform) => {
 .platform-value {
   font-size: 1.5rem; /* text-2xl */
   font-weight: 700;
-  background-image: linear-gradient(to right, var(--color-error-light), var(--color-orange));
+  background-image: linear-gradient(to right, #f87171, #fb923c);
   -webkit-background-clip: text;
   background-clip: text;
   color: transparent;
@@ -114,19 +119,19 @@ const formatPlatform = (platform) => {
 .active-value {
   font-size: 2.25rem; /* text-4xl */
   font-weight: 700;
-  color: var(--year-review-text-yellow);
+  color: #fde047; /* yellow-300 */
 }
 
 .unit {
   font-size: 1rem;
   margin-left: 0.25rem;
-  color: var(--text-muted);
+  color: #9ca3af;
 }
 
 .votes-value {
   font-size: 1.875rem; /* text-3xl */
   font-weight: 700;
-  color: var(--year-review-text-cyan); /* cyan-300 */
+  color: #67e8f9; /* cyan-300 */
 }
 
 @media (min-width: 768px) {
diff --git a/app/components/year-review/OutroSlide.vue b/app/components/year-review/OutroSlide.vue
index 8b5c704..f62251c 100644
--- a/app/components/year-review/OutroSlide.vue
+++ b/app/components/year-review/OutroSlide.vue
@@ -4,14 +4,14 @@
 
     <Transition name="entry" appear>
       <div v-show="active" class="content">
-        <div class="label">{{ yearReview.future }}</div>
+        <div class="label">未来可期</div>
 
         <div class="year-container">
           <h2 class="year-next">{{ data.year + 1 }}</h2>
           <div class="year-underline" />
         </div>
 
-        <p class="text-intro">{{ yearReview.futureDesc }}</p>
+        <p class="text-intro">愿音乐继续陪伴你的每一天</p>
 
         <div class="action-buttons">
           <NuxtLink to="/" class="btn-primary group">
@@ -30,7 +30,7 @@
                 <path d="m3 9 9-7 9 7v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z" />
                 <polyline points="9 22 9 12 15 12 15 22" />
               </svg>
-              {{ yearReview.backHome }}
+              返回首页
             </span>
           </NuxtLink>
         </div>
@@ -40,14 +40,11 @@
 </template>
 
 <script setup>
-import { useLocale } from '~/utils/locale'
-
 defineProps({
   data: Object,
   active: Boolean
 })
 defineEmits(['share'])
-const { yearReview } = useLocale()
 </script>
 
 <style scoped>
@@ -59,13 +56,13 @@ const { yearReview } = useLocale()
   align-items: center;
   justify-content: center;
   overflow: hidden;
-  background-color: var(--bg-primary);
+  background-color: var(--bg-primary, #111111);
 }
 
 .bg-gradient {
   position: absolute;
   inset: 0;
-  background: radial-gradient(circle at center, var(--panel-border-subtle), var(--bg-primary), var(--bg-primary));
+  background: radial-gradient(circle at center, var(--bg-secondary, #1f2937), #000, #000);
   opacity: 0.5;
 }
 
@@ -78,7 +75,7 @@ const { yearReview } = useLocale()
 }
 
 .label {
-  color: var(--year-review-text-tertiary);
+  color: #6b7280;
   font-size: 0.875rem;
   letter-spacing: 0.5em;
   text-transform: uppercase;
@@ -95,7 +92,7 @@ const { yearReview } = useLocale()
   font-size: 6rem;
   font-weight: 900;
   line-height: 1;
-  background-image: linear-gradient(to bottom, var(--text-primary), var(--panel-border-subtle));
+  background-image: linear-gradient(to bottom, #fff, #1f2937);
   -webkit-background-clip: text;
   background-clip: text;
   color: transparent;
@@ -107,12 +104,12 @@ const { yearReview } = useLocale()
   left: 0;
   width: 100%;
   height: 4px;
-  background: linear-gradient(to right, transparent, var(--overlay-20), transparent);
+  background: linear-gradient(to right, transparent, rgba(255, 255, 255, 0.2), transparent);
 }
 
 .text-intro {
   font-size: 1.125rem;
-  color: var(--text-muted);
+  color: #9ca3af;
   margin-bottom: 3rem;
 }
 
@@ -135,8 +132,8 @@ const { yearReview } = useLocale()
   width: 100%;
   padding: 1rem 2rem;
   border-radius: 9999px;
-  background: var(--text-primary);
-  color: var(--bg-primary);
+  background: var(--card-bg, #fff);
+  color: var(--text-primary, #000);
   font-weight: 700;
   font-size: 1.125rem;
   overflow: hidden;
@@ -153,7 +150,7 @@ const { yearReview } = useLocale()
 .btn-bg {
   position: absolute;
   inset: 0;
-  background: var(--panel-border-light);
+  background: #e5e7eb;
   transform: translateY(100%);
   transition: transform 0.3s;
 }
@@ -174,9 +171,9 @@ const { yearReview } = useLocale()
   width: 100%;
   padding: 1rem 2rem;
   border-radius: 9999px;
-  background: var(--overlay-10);
-  border: 1px solid var(--overlay-20);
-  color: var(--text-primary);
+  background: rgba(255, 255, 255, 0.1);
+  border: 1px solid rgba(255, 255, 255, 0.2);
+  color: var(--text-primary, #ffffff);
   font-weight: 700;
   font-size: 1.125rem;
   backdrop-filter: blur(12px);
@@ -188,7 +185,7 @@ const { yearReview } = useLocale()
 }
 
 .btn-secondary:hover {
-  background: var(--overlay-20);
+  background: rgba(255, 255, 255, 0.2);
 }
 
 .btn-secondary:active {
diff --git a/app/components/year-review/ShareCard.vue b/app/components/year-review/ShareCard.vue
index aafe2cf..bd33395 100644
--- a/app/components/year-review/ShareCard.vue
+++ b/app/components/year-review/ShareCard.vue
@@ -12,27 +12,27 @@
       </div>
 
       <div class="title-section">
-        <h1 class="main-title">{{ yearReview.reportTitle }}</h1>
+        <h1 class="main-title">年度点歌报告</h1>
         <p class="subtitle">Music Journey</p>
       </div>
 
       <div class="stats-grid">
         <div class="stat-item">
           <div class="stat-value">{{ data.totalRequests }}</div>
-          <div class="stat-label">{{ yearReview.requests }}</div>
+          <div class="stat-label">点歌次数</div>
         </div>
         <div class="stat-item">
           <div class="stat-value">{{ data.playedRequests }}</div>
-          <div class="stat-label">{{ yearReview.played }}</div>
+          <div class="stat-label">已播放</div>
         </div>
         <div class="stat-item">
           <div class="stat-value">{{ data.totalVotes }}</div>
-          <div class="stat-label">{{ yearReview.votes }}</div>
+          <div class="stat-label">投票数</div>
         </div>
       </div>
 
       <div class="footer">
-        <div class="footer-text">{{ yearReview.footerSlogan }}</div>
+        <div class="footer-text">用音乐记录每一刻</div>
         <div class="footer-line" />
       </div>
     </div>
@@ -41,7 +41,6 @@
 
 <script setup>
 import { ref } from 'vue'
-import { useLocale } from '~/utils/locale'
 
 defineProps({
   data: {
@@ -51,7 +50,6 @@ defineProps({
 })
 
 const shareCardRef = ref(null)
-const { yearReview } = useLocale()
 
 defineExpose({
   shareCardRef
@@ -65,7 +63,7 @@ defineExpose({
   height: 100%;
   min-height: 600px;
   overflow: hidden;
-  background: linear-gradient(135deg, var(--panel-bg-tertiary) 0%, var(--panel-bg-tertiary) 50%, var(--panel-bg-tertiary) 100%);
+  background: linear-gradient(135deg, var(--bg-secondary, #0f0f23) 0%, #1a1a2e 50%, #16213e 100%);
 }
 
 .card-background {
@@ -77,9 +75,9 @@ defineExpose({
   position: absolute;
   inset: 0;
   background:
-    radial-gradient(circle at 20% 30%, var(--index-card-glow) 0%, transparent 50%),
-    radial-gradient(circle at 80% 70%, var(--year-review-gradient-overlay-end) 0%, transparent 50%),
-    radial-gradient(circle at 50% 50%, var(--primary-10) 0%, transparent 60%);
+    radial-gradient(circle at 20% 30%, rgba(139, 92, 246, 0.15) 0%, transparent 50%),
+    radial-gradient(circle at 80% 70%, rgba(244, 114, 182, 0.15) 0%, transparent 50%),
+    radial-gradient(circle at 50% 50%, rgba(59, 130, 246, 0.1) 0%, transparent 60%);
 }
 
 .noise-overlay {
@@ -108,7 +106,7 @@ defineExpose({
 .logo {
   font-size: 1.5rem;
   font-weight: 900;
-  background: linear-gradient(135deg, var(--color-collab), var(--color-pink));
+  background: linear-gradient(135deg, #8b5cf6, #ec4899);
   -webkit-background-clip: text;
   background-clip: text;
   color: transparent;
@@ -117,7 +115,7 @@ defineExpose({
 .year {
   font-size: 3rem;
   font-weight: 900;
-  color: var(--overlay-10);
+  color: rgba(255, 255, 255, 0.1);
   line-height: 1;
 }
 
@@ -129,7 +127,7 @@ defineExpose({
 .main-title {
   font-size: 3.5rem;
   font-weight: 900;
-  background: linear-gradient(135deg, var(--text-primary) 0%, var(--panel-border-light) 50%, var(--text-muted) 100%);
+  background: linear-gradient(135deg, var(--card-bg, #ffffff) 0%, #e5e7eb 50%, #9ca3af 100%);
   -webkit-background-clip: text;
   background-clip: text;
   color: transparent;
@@ -139,7 +137,7 @@ defineExpose({
 
 .subtitle {
   font-size: 1.25rem;
-  color: var(--overlay-50);
+  color: rgba(255, 255, 255, 0.5);
   letter-spacing: 0.3em;
   text-transform: uppercase;
 }
@@ -154,16 +152,16 @@ defineExpose({
 .stat-item {
   text-align: center;
   padding: 1.5rem;
-  background: var(--overlay-3);
+  background: rgba(255, 255, 255, 0.03);
   border-radius: 1rem;
-  border: 1px solid var(--overlay-8);
+  border: 1px solid rgba(255, 255, 255, 0.08);
   backdrop-filter: blur(10px);
 }
 
 .stat-value {
   font-size: 2.5rem;
   font-weight: 900;
-  background: linear-gradient(135deg, var(--color-accent-light), var(--color-accent-light));
+  background: linear-gradient(135deg, #60a5fa, #3b82f6);
   -webkit-background-clip: text;
   background-clip: text;
   color: transparent;
@@ -172,7 +170,7 @@ defineExpose({
 
 .stat-label {
   font-size: 0.875rem;
-  color: var(--overlay-50);
+  color: rgba(255, 255, 255, 0.5);
   letter-spacing: 0.05em;
 }
 
@@ -183,7 +181,7 @@ defineExpose({
 
 .footer-text {
   font-size: 0.875rem;
-  color: var(--overlay-40);
+  color: rgba(255, 255, 255, 0.4);
   letter-spacing: 0.1em;
   margin-bottom: 1rem;
 }
@@ -191,7 +189,7 @@ defineExpose({
 .footer-line {
   width: 100px;
   height: 2px;
-  background: linear-gradient(90deg, transparent, var(--overlay-20), transparent);
+  background: linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.2), transparent);
   margin: 0 auto;
 }
 
diff --git a/app/components/year-review/StatsSlide.vue b/app/components/year-review/StatsSlide.vue
index e74db36..5ab8c2e 100644
--- a/app/components/year-review/StatsSlide.vue
+++ b/app/components/year-review/StatsSlide.vue
@@ -4,23 +4,23 @@
 
     <Transition name="entry" appear>
       <div v-show="active" class="content">
-        <div class="label">{{ yearReview.musicJourney }}</div>
+        <div class="label">音乐足迹</div>
 
-        <p class="text-intro">{{ yearReview.totalRequestsIntro }}</p>
+        <p class="text-intro">这一年，你一共发起了</p>
 
         <div class="number-container">
           <span class="big-number">{{ data.totalRequests.toLocaleString() }}</span>
-          <span class="suffix">{{ yearReview.requestCount }}</span>
+          <span class="suffix">次点歌</span>
         </div>
 
         <div class="sub-stats">
           <div v-if="data.playedRequests > 0" class="sub-content">
             <p class="text-base">
-              {{ yearReview.playedSummary(data.playedRequests) }}
+              其中，<span class="highlight-green">{{ data.playedRequests }}</span> 首
             </p>
-            <p class="text-sub">{{ yearReview.playedDesc }}</p>
+            <p class="text-sub">在广播站被播出，传递给了更多人</p>
           </div>
-          <p v-else class="text-sub">{{ yearReview.pendingPlayedDesc }}</p>
+          <p v-else class="text-sub">期待你的歌曲早日被播出</p>
         </div>
       </div>
     </Transition>
@@ -28,13 +28,10 @@
 </template>
 
 <script setup>
-import { useLocale } from '~/utils/locale'
-
 defineProps({
   data: Object,
   active: Boolean
 })
-const { yearReview } = useLocale()
 </script>
 
 <style scoped>
@@ -46,7 +43,7 @@ const { yearReview } = useLocale()
   align-items: center;
   justify-content: center;
   overflow: hidden;
-  background-color: var(--panel-bg-darkest); /* gray-950 */
+  background-color: var(--surface-primary, var(--bg-primary, #030712));
 }
 
 .bg-gradient {
@@ -54,7 +51,7 @@ const { yearReview } = useLocale()
   inset: 0;
   background: radial-gradient(
     ellipse at top right,
-    var(--year-review-stats-bg-gradient),
+    rgba(30, 58, 138, 0.4),
     transparent,
     transparent
   );
@@ -69,7 +66,7 @@ const { yearReview } = useLocale()
 
 .label {
   margin-bottom: 1rem;
-  color: var(--color-accent-light); /* brand-blue */
+  color: #3b82f6; /* brand-blue */
   font-weight: 700;
   letter-spacing: 0.05em;
   font-size: 1.125rem;
@@ -77,7 +74,7 @@ const { yearReview } = useLocale()
 
 .text-intro {
   font-size: 1.5rem;
-  color: var(--text-muted);
+  color: #9ca3af;
   margin-bottom: 0.5rem;
 }
 
@@ -94,16 +91,16 @@ const { yearReview } = useLocale()
   font-size: 10rem;
   font-weight: 900;
   line-height: 1;
-  background-image: linear-gradient(to bottom, var(--color-accent-light), var(--color-accent-light-hover));
+  background-image: linear-gradient(to bottom, #60a5fa, #1d4ed8);
   -webkit-background-clip: text;
   background-clip: text;
   color: transparent;
-  filter: drop-shadow(0 0 30px var(--year-review-stat-number-shadow));
+  filter: drop-shadow(0 0 30px rgba(37, 99, 235, 0.5));
 }
 
 .suffix {
   font-size: 1.5rem;
-  color: var(--year-review-text-tertiary);
+  color: #6b7280;
   font-weight: 500;
   margin-left: 0.5rem;
 }
@@ -112,8 +109,8 @@ const { yearReview } = useLocale()
   margin-top: 3rem;
   padding: 1.5rem;
   border-radius: 1rem;
-  background: var(--overlay-5);
-  border: 1px solid var(--overlay-10);
+  background: rgba(255, 255, 255, 0.05);
+  border: 1px solid rgba(255, 255, 255, 0.1);
   backdrop-filter: blur(4px);
 }
 
@@ -125,19 +122,19 @@ const { yearReview } = useLocale()
 
 .text-base {
   font-size: 1.125rem;
-  color: var(--text-primary-lighter);
+  color: #d1d5db;
 }
 
 .highlight-green {
   font-size: 1.875rem;
   font-weight: 700;
-  color: var(--color-success-light);
+  color: #4ade80;
   margin: 0 0.25rem;
 }
 
 .text-sub {
   font-size: 1rem;
-  color: var(--text-muted);
+  color: #9ca3af;
 }
 
 @media (max-width: 768px) {
diff --git a/app/composables/useMusicSources.ts b/app/composables/useMusicSources.ts
index 0b35e48..50e0cc6 100644
--- a/app/composables/useMusicSources.ts
+++ b/app/composables/useMusicSources.ts
@@ -6,7 +6,6 @@
 import {
   getEnabledSources,
   getSourceById,
-  getVkeysIdParam,
   MUSIC_SOURCE_CONFIG,
   type MusicSearchParams,
   type MusicSearchResult,
@@ -16,344 +15,6 @@ import {
   type SongDetailResult,
   type SourceStatus
 } from '~/utils/musicSources'
-import { getBilibiliTrackUrl, searchBilibili, parseBilibiliId } from '~/utils/bilibiliSource'
-import { evaluateLyricDataMatch } from '~/utils/lyric/lyricMatchQuality'
-import { useLyricSettings } from './useLyricSettings'
-import { usePlatformConfig } from './usePlatformConfig'
-import { useServerErrors } from './useLocaleText'
-import { getPlatformDisplayName } from '~/utils/platforms'
-
-// 歌词请求缓存，避免同一首歌重复请求
-const lyricCache = new Map<string, Promise<any>>()
-const lyricProgressSubscribers = new Map<string, Set<LyricProgressCallback>>()
-const LYRIC_CACHE_TTL = 60 * 1000
-
-// 服务器位置检测（模块级单例，避免多次实例化导致重复请求）
-const globalIsServerInChina = ref<boolean | null>(null)
-let locationCheckPromise: Promise<void> | null = null
-// 检测失败后的冷却时间（5 分钟），避免瞬时失败导致长期锁死
-const LOCATION_CHECK_RETRY_TTL = 5 * 60 * 1000
-let locationCheckFailAt = 0
-
-const checkServerLocationGlobal = async () => {
-  if (globalIsServerInChina.value !== null) return
-  // 检测失败后冷却期内不再重试
-  if (locationCheckFailAt && Date.now() < locationCheckFailAt) return
-  // 并发调用时合并为一次请求
-  if (locationCheckPromise) return locationCheckPromise
-
-  locationCheckPromise = (async () => {
-    try {
-      const data = await $fetch('/api/system/location')
-      if (data && data.success) {
-        globalIsServerInChina.value = data.data.isInChina
-        locationCheckFailAt = 0
-        console.log(
-          `[useMusicSources] 服务器位置检测: ${globalIsServerInChina.value ? '中国' : '海外'}`
-        )
-      }
-    } catch (e) {
-      // 失败时保持未知状态（null），进入冷却期，避免把一次瞬时失败永久判定为海外
-      locationCheckFailAt = Date.now() + LOCATION_CHECK_RETRY_TTL
-      console.warn('[useMusicSources] 服务器位置检测失败，稍后重试:', e)
-    } finally {
-      locationCheckPromise = null
-    }
-  })()
-  return locationCheckPromise
-}
-
-type LyricProgressStage = 'official' | 'qm' | 'amll' | 'upgrade' | 'meting'
-
-type LyricProgressPayload = {
-  stage: LyricProgressStage
-  data: LyricResultData
-}
-
-type LyricProgressCallback = (payload: LyricProgressPayload) => void
-
-type LyricUpgradeMeta = {
-  title?: string
-  artist?: string
-  album?: string
-  /** 毫秒，用于跨平台匹配时过滤时长差异过大的候选 */
-  duration?: number
-  /** false = 明确禁止跨平台升级（防止递归），undefined/true = 允许 */
-  allowCrossPlatformUpgrade?: boolean
-  /** 歌词来源优先级，参与缓存键（切换来源后强制重新拉取时传入） */
-  priority?: string
-  /** 用于歌词页先显示基础歌词，再切换到更高阶歌词 */
-  onProgress?: LyricProgressCallback
-}
-
-type LyricResultData = {
-  lrc: string
-  trans?: string
-  yrc?: string
-  ttml?: string
-  /** YRC 对齐的翻译（ytlrc），时间戳与逐字主歌词行边界一致 */
-  ytrans?: string
-}
-
-/**
- * 格式优先级：数字越小越高阶。
- * 用于判断对侧平台的歌词是否值得覆盖当前结果。
- */
-const LYRIC_FORMAT_RANK: Record<string, number> = {
-  ttml: 0,
-  qrc: 1,
-  yrc: 1, // yrc 与 qrc 同阶，都是逐字
-  lrc: 2,
-  none: 3
-}
-
-/** 当前 LyricResultData 的最高阶格式 rank（数字越小越高阶） */
-const getCurrentRank = (data: LyricResultData): number => {
-  if (data.ttml) return LYRIC_FORMAT_RANK.ttml
-  if (data.yrc) return LYRIC_FORMAT_RANK.yrc
-  if (data.lrc) return LYRIC_FORMAT_RANK.lrc
-  return LYRIC_FORMAT_RANK.none
-}
-
-/** 歌词候选匹配文本归一化：小写，去标点/空白/常见联唱标记 */
-const normalizeLyricMatchText = (value: string): string => {
-  return String(value || '')
-    .toLowerCase()
-    .replace(/\b(?:feat|ft)\.?\s*/gi, '')
-    .replace(/[&＆]/g, 'and')
-    .replace(/[、;，,/|()（）·・\s\-_'"`~!?？！.。《》【】\[\]{}^*@#$%+=\\]+/g, '')
-}
-
-/** 双向 includes */
-const bothContains = (a: string, b: string): boolean =>
-  a.length > 0 && b.length > 0 && (a.includes(b) || b.includes(a))
-
-/** 拆分多歌手文本，避免同名歌曲只比较整串导致误判 */
-const splitLyricMatchArtists = (value?: string): string[] =>
-  String(value || '')
-    .split(/[、&＆;，,/|·・]+/g)
-    .map((artist) => normalizeLyricMatchText(artist))
-    .filter(Boolean)
-
-const matchLyricArtists = (
-  candidateArtist: string | undefined,
-  trackArtists: readonly string[]
-): { exact: boolean; contains: boolean } => {
-  if (!trackArtists.length) return { exact: false, contains: false }
-
-  const candFull = normalizeLyricMatchText(candidateArtist || '')
-  const candParts = splitLyricMatchArtists(candidateArtist)
-  if (!candFull) return { exact: false, contains: false }
-
-  const exact = trackArtists.some(
-    (artist) => candFull === artist || candParts.some((part) => part === artist)
-  )
-  if (exact) return { exact: true, contains: false }
-
-  const contains = trackArtists.some(
-    (artist) =>
-      artist.length >= 2 &&
-      (bothContains(candFull, artist) || candParts.some((part) => bothContains(part, artist)))
-  )
-
-  return { exact: false, contains }
-}
-
-const isDurationClose = (left?: number, right?: number, tolerance = 5000): boolean =>
-  typeof left === 'number' && typeof right === 'number' && Math.abs(left - right) <= tolerance
-
-const VERSION_MARKERS: Array<{ key: string; pattern: RegExp }> = [
-  { key: 'live', pattern: /\blive\b|现场/i },
-  { key: 'remix', pattern: /\bremix\b|混音/i },
-  { key: 'instrumental', pattern: /\binstrumental\b|伴奏/i },
-  { key: 'acoustic', pattern: /\bacoustic\b|不插电/i },
-  { key: 'cover', pattern: /\bcover\b|翻唱/i },
-  { key: 'demo', pattern: /\bdemo\b/i },
-  { key: 'remaster', pattern: /\bremaster(?:ed)?\b|重制/i },
-  { key: 'edit', pattern: /\bedit\b/i },
-  { key: 'new', pattern: /新版/i },
-  { key: 'old', pattern: /旧版/i }
-]
-
-const getVersionMarkers = (value: string): string[] =>
-  VERSION_MARKERS.filter(({ pattern }) => pattern.test(value))
-    .map(({ key }) => key)
-    .sort()
-
-const stripVersionMarkers = (value: string): string => {
-  const stripped = VERSION_MARKERS.reduce(
-    (result, { pattern }) => result.replace(pattern, ''),
-    value
-  ).trim()
-  return stripped || value
-}
-
-const isSameVersion = (left: string, right: string): boolean => {
-  const leftMarkers = getVersionMarkers(left)
-  const rightMarkers = getVersionMarkers(right)
-  if (leftMarkers.length === 0 && rightMarkers.length === 0) return true
-  return leftMarkers.join('|') === rightMarkers.join('|')
-}
-
-/** 子串占长串的最低比例，过低视为巧合 */
-const NAME_CONTAIN_MIN_RATIO = 0.34
-
-/**
- * 从候选列表中挑出最匹配的结果，返回候选对象或 null。
- *
- * 硬性条件（不满足直接跳过）：
- *  - title 全等，或双向 includes 且短串占长串比例 ≥ NAME_CONTAIN_MIN_RATIO
- *  - 原歌曲有 artist 时，候选必须命中至少一个 artist（防止同名异歌手误匹配）
- *  - title 仅子串命中时，必须有 artist 或接近时长佐证（防止巧合子串误匹配）
- *  - 双方都有 duration 时，差距不能超过 max(8s, 曲长 × 4%)
- *  - 标题中的现场、混音、伴奏等版本标记必须一致
- *
- * 打分规则（分越高越优先，须 ≥ MIN_SCORE）：
- *  - title 全等 +10，子串命中 +4
- *  - artist 全等 +5，双向 includes +2
- *  - album 全等 +2
- *  - duration 接近（±5s）+3
- */
-const MIN_SCORE = 4
-
-const pickBestLyricCandidate = <
-  T extends { title?: string; artist?: string; album?: string; duration?: number }
->(
-  candidates: T[],
-  track: { title?: string; artist?: string; album?: string; duration?: number }
-): T | null => {
-  const trackTitle = normalizeLyricMatchText(stripVersionMarkers(track.title || ''))
-  const trackArtists = splitLyricMatchArtists(track.artist)
-  const trackAlbum = normalizeLyricMatchText(track.album || '')
-  const trackDuration = track.duration
-
-  let best: T | null = null
-  let bestScore = MIN_SCORE - 1
-
-  for (const candidate of candidates) {
-    const candTitle = normalizeLyricMatchText(stripVersionMarkers(candidate.title || ''))
-    const candAlbum = normalizeLyricMatchText(candidate.album || '')
-
-    if (!isSameVersion(candidate.title || '', track.title || '')) continue
-
-    // 硬性：title 必须匹配
-    const titleExact = candTitle.length > 0 && candTitle === trackTitle
-    if (!titleExact) {
-      if (!bothContains(candTitle, trackTitle)) continue
-      const longer = Math.max(candTitle.length, trackTitle.length)
-      const shorter = Math.min(candTitle.length, trackTitle.length)
-      if (shorter / longer < NAME_CONTAIN_MIN_RATIO) continue
-    }
-
-    // 硬性：时长差距超过动态容差直接跳过
-    if (
-      typeof trackDuration === 'number' &&
-      typeof candidate.duration === 'number' &&
-      Math.abs(trackDuration - candidate.duration) > Math.max(8000, trackDuration * 0.04)
-    )
-      continue
-
-    const artist = matchLyricArtists(candidate.artist, trackArtists)
-
-    // 硬性：原歌曲有歌手时，候选也必须命中歌手，避免同名异歌手歌词串台
-    if (trackArtists.length > 0 && !artist.exact && !artist.contains) continue
-
-    // 硬性：title 仅子串命中时，必须有歌手或时长佐证
-    if (
-      !titleExact &&
-      !artist.exact &&
-      !artist.contains &&
-      !isDurationClose(candidate.duration, trackDuration)
-    ) {
-      continue
-    }
-
-    let score = titleExact ? 10 : 4
-    if (artist.exact) score += 5
-    else if (artist.contains) score += 2
-    if (trackAlbum && candAlbum === trackAlbum) score += 2
-    if (isDurationClose(candidate.duration, trackDuration)) score += 3
-
-    if (score > bestScore) {
-      bestScore = score
-      best = candidate
-    }
-  }
-
-  return best
-}
-
-const buildLyricUpgradeQueries = (meta: LyricUpgradeMeta) => {
-  const title = meta.title?.trim() || ''
-  const artist = meta.artist?.trim() || ''
-  const album = meta.album?.trim() || ''
-
-  const queries = new Set<string>()
-  if (title && artist) {
-    queries.add(`${title} ${artist}`)
-    queries.add(`${artist} ${title}`)
-  }
-  if (title) queries.add(title)
-  if (title && album) queries.add(`${title} ${album}`)
-  return [...queries].filter(Boolean)
-}
-
-const getLyricCacheKey = (platform: string, id: number | string, meta?: LyricUpgradeMeta) => {
-  const title = normalizeLyricMatchText(meta?.title || '')
-  const artist = normalizeLyricMatchText(meta?.artist || '')
-  const album = normalizeLyricMatchText(meta?.album || '')
-  // allowCrossPlatformUpgrade=false 与 undefined/true 的结果不同，需区分
-  const upgradeFlag = meta?.allowCrossPlatformUpgrade === false ? '0' : '1'
-  // 优先级不同时抓取路径不同，结果可能不同；无显式 priority 的调用不区分
-  const priority = meta?.priority || ''
-  const durationBucket = meta?.duration ? Math.round(meta.duration / 5000) : 0
-  return `lyric-v2:${platform}:${id}:${title}:${artist}:${album}:${durationBucket}:${upgradeFlag}:${priority}`
-}
-
-const cloneLyricData = (data: LyricResultData): LyricResultData => ({
-  lrc: data.lrc || '',
-  trans: data.trans || '',
-  yrc: data.yrc || '',
-  ttml: data.ttml || '',
-  ytrans: data.ytrans || ''
-})
-
-const subscribeLyricProgress = (
-  cacheKey: string,
-  callback?: LyricProgressCallback
-): (() => void) => {
-  if (!callback) return () => {}
-
-  let subscribers = lyricProgressSubscribers.get(cacheKey)
-  if (!subscribers) {
-    subscribers = new Set()
-    lyricProgressSubscribers.set(cacheKey, subscribers)
-  }
-  subscribers.add(callback)
-
-  return () => {
-    const currentSubscribers = lyricProgressSubscribers.get(cacheKey)
-    if (!currentSubscribers) return
-    currentSubscribers.delete(callback)
-    if (currentSubscribers.size === 0) {
-      lyricProgressSubscribers.delete(cacheKey)
-    }
-  }
-}
-
-const emitLyricProgress = (cacheKey: string, stage: LyricProgressStage, data: LyricResultData) => {
-  const subscribers = lyricProgressSubscribers.get(cacheKey)
-  if (!subscribers?.size) return
-
-  const payload = { stage, data: cloneLyricData(data) }
-  for (const callback of subscribers) {
-    try {
-      callback(payload)
-    } catch (error) {
-      console.warn('[getLyrics] 歌词进度回调失败:', error)
-    }
-  }
-}
 
 /**
  * 音源管理器 Composable
@@ -368,560 +29,6 @@ export const useMusicSources = () => {
   // 音源状态
   const sourceStatus = ref<Record<string, SourceStatus>>({})
 
-  // 平台启用配置（usePlatformConfig 内部为模块级缓存，各实例共享同一份引用）
-  const { enabledPlatforms: globalEnabledPlatforms } = usePlatformConfig()
-
-  const getMetingSongInfo = async (
-    id: string | number,
-    source: MusicSource
-  ): Promise<{ success: boolean; data?: any; error?: string }> => {
-    try {
-      const response = await $fetch(source.baseUrl, {
-        params: { server: 'netease', type: 'song', id: String(id) },
-        timeout: source.timeout || 8000
-      })
-      if (Array.isArray(response) && response.length > 0) {
-        return { success: true, data: response[0] }
-      }
-      return { success: false, error: 'Meting API 未返回有效数据' }
-    } catch (error: any) {
-      return { success: false, error: error?.message || '未知错误' }
-    }
-  }
-
-  /**
-   * 尝试从对侧平台获取更高阶格式的歌词（TTML > QRC/YRC > LRC）。
-   *
-   * 触发条件（全部满足）：
-   *  1. 调用方未显式禁止跨平台升级（allowCrossPlatformUpgrade !== false）
-   *  2. 当前数据不是最高阶（即无 TTML）
-   *  3. meta 提供了 title + artist 以便搜索
-   *
-   * 升级策略：
-   *  - 目标平台为对侧（netease ↔ tencent，migu → netease）
-   *  - 对侧结果必须比当前格式更高阶才接受
-   *  - TTML 需要 enableOnlineTTMLLyric 开启才接受
-   */
-  const tryUpgradeLyric = async (
-    platform: 'netease' | 'tencent' | 'migu',
-    currentData: LyricResultData,
-    meta?: LyricUpgradeMeta
-  ): Promise<boolean> => {
-    if (meta?.allowCrossPlatformUpgrade === false) return false
-    if (!meta?.title || !meta?.artist) return false
-    if (currentData.ttml) return false
-
-    const currentRank = getCurrentRank(currentData)
-    const targetPlatform = platform === 'netease' ? 'tencent' : 'netease'
-    // 目标平台被管理员禁用时跳过跨平台歌词升级
-    if (import.meta.client && !globalEnabledPlatforms.value.includes(targetPlatform)) {
-      console.warn(`[getLyrics] 跨平台歌词升级跳过：目标平台 ${targetPlatform} 已被禁用`)
-      return false
-    }
-    const queries = buildLyricUpgradeQueries(meta)
-    if (queries.length === 0) return false
-
-    let matchedCandidates: Array<{
-      title: string
-      artist: string
-      album: string
-      duration?: number
-      _song: any
-    }> = []
-
-    for (const keywords of queries) {
-      try {
-        const searchResult = await searchSongs({
-          keywords,
-          platform: targetPlatform,
-          type: 1,
-          limit: 10
-        })
-
-        if (
-          !searchResult.success ||
-          !Array.isArray(searchResult.data) ||
-          !searchResult.data.length
-        ) {
-          continue
-        }
-
-        const candidates = searchResult.data.map((song: any) => ({
-          title: song.title || song.name || '',
-          artist: song.artist || song.singer || '',
-          album: song.album || song.albumName || '',
-          duration: song.duration,
-          _song: song
-        }))
-
-        const best = pickBestLyricCandidate(candidates, meta)
-        if (best) {
-          matchedCandidates = candidates
-          break
-        }
-      } catch (error: any) {
-        console.warn('[getLyrics] 跨平台升级搜索失败:', error?.message || error)
-      }
-    }
-
-    const rejectedIds = new Set<string>()
-    for (let attempt = 0; attempt < 3; attempt++) {
-      const best = pickBestLyricCandidate(
-        matchedCandidates.filter((candidate) => {
-          const id = candidate._song?.musicId
-          return id && !rejectedIds.has(String(id))
-        }),
-        meta
-      )
-      if (!best?._song?.musicId) return false
-      const matchedTrack = best._song
-      rejectedIds.add(String(matchedTrack.musicId))
-
-      try {
-        const upgraded = await fetchLyricsWithoutUpgrade(
-          matchedTrack.musicPlatform || targetPlatform,
-          matchedTrack.musicId,
-          {
-            title: matchedTrack.title,
-            artist: matchedTrack.artist,
-            album: matchedTrack.album,
-            duration: best.duration,
-            allowCrossPlatformUpgrade: false
-          }
-        )
-        if (!upgraded.success || !upgraded.data) continue
-
-        const tryAccept = (
-          candidateData: { lrc?: string; yrc?: string; ttml?: string },
-          format: 'ttml' | 'yrc'
-        ) => {
-          // 无基准歌词时（如咪咕官方歌词获取失败）无法做内容匹配，仅校验时长差异
-          if (!currentData.lrc && !currentData.yrc) {
-            if (meta.duration && best.duration) {
-              const durationDiffMs = Math.abs(meta.duration - best.duration)
-              if (durationDiffMs > Math.max(8000, meta.duration * 0.04)) {
-                console.info(
-                  `[getLyrics] ${targetPlatform}:${matchedTrack.musicId} ${format} rejected/duration_mismatch`
-                )
-                return false
-              }
-            }
-            return true
-          }
-          const decision = evaluateLyricDataMatch(
-            { lrc: currentData.lrc, yrc: currentData.yrc },
-            candidateData,
-            meta.duration,
-            best.duration
-          )
-          console.info(
-            `[getLyrics] ${targetPlatform}:${matchedTrack.musicId} ${format} ${decision.status}/${decision.reason}`,
-            decision.metrics
-          )
-          return decision.status === 'accepted'
-        }
-
-        if (
-          upgraded.data.ttml &&
-          useLyricSettings().enableOnlineTTMLLyric.value &&
-          LYRIC_FORMAT_RANK.ttml < currentRank &&
-          tryAccept({ ttml: upgraded.data.ttml }, 'ttml')
-        ) {
-          currentData.ttml = upgraded.data.ttml
-          if (upgraded.data.trans && !currentData.trans) currentData.trans = upgraded.data.trans
-          return true
-        }
-
-        if (
-          upgraded.data.yrc &&
-          LYRIC_FORMAT_RANK.yrc < currentRank &&
-          tryAccept({ yrc: upgraded.data.yrc }, 'yrc')
-        ) {
-          currentData.yrc = upgraded.data.yrc
-          if (upgraded.data.trans && !currentData.trans) currentData.trans = upgraded.data.trans
-          if (upgraded.data.ytrans && !currentData.ytrans) {
-            currentData.ytrans = upgraded.data.ytrans
-          }
-          return true
-        }
-      } catch (error: any) {
-        console.warn('[getLyrics] 跨平台升级获取失败:', error?.message || error)
-      }
-    }
-
-    return false
-  }
-
-  const fetchLyricsWithoutUpgrade = async (
-    platform: 'netease' | 'tencent' | 'migu',
-    id: number | string,
-    meta?: LyricUpgradeMeta
-  ): Promise<{
-    success: boolean
-    data?: LyricResultData
-    error?: string
-  }> => {
-    const cacheKey = getLyricCacheKey(platform, id, meta)
-    const unsubscribeProgress = subscribeLyricProgress(cacheKey, meta?.onProgress)
-    const progressive = typeof meta?.onProgress === 'function'
-
-    const cached = lyricCache.get(cacheKey)
-    if (cached) {
-      return cached.finally(unsubscribeProgress)
-    }
-
-    const promise = (async () => {
-      try {
-        const settings = useLyricSettings()
-        const enabledSources = getEnabledSources()
-        const neteaseSource = enabledSources.find((source) => source.id.includes('netease-backup'))
-        const vkeysSource = enabledSources.find((source) => source.id === 'vkeys')
-
-        const resultData: LyricResultData = { lrc: '', trans: '', yrc: '', ttml: '' }
-        let hasResult = false
-        let lastProgressSignature = ''
-        let ttmlValidated = false
-
-        const emitProgress = (stage: LyricProgressStage) => {
-          const signature = [
-            stage,
-            resultData.lrc?.length || 0,
-            resultData.trans?.length || 0,
-            resultData.yrc?.length || 0,
-            resultData.ttml?.length || 0,
-            resultData.ytrans?.length || 0
-          ].join(':')
-          if (signature === lastProgressSignature) return
-          lastProgressSignature = signature
-          emitLyricProgress(cacheKey, stage, resultData)
-        }
-
-        const validateTtml = (ttml: string): boolean => {
-          if (!resultData.lrc && !resultData.yrc) return true
-          const decision = evaluateLyricDataMatch(
-            { lrc: resultData.lrc, yrc: resultData.yrc },
-            { ttml },
-            meta?.duration,
-            meta?.duration
-          )
-          console.info(
-            `[getLyrics] ${platform}:${id} ttml ${decision.status}/${decision.reason}`,
-            decision.metrics
-          )
-          ttmlValidated = decision.status === 'accepted'
-          return ttmlValidated
-        }
-
-        const fetchOfficial = async () => {
-          if (platform !== 'netease' || !neteaseSource) return
-          try {
-            // /lyric/new 返回逐字歌词（yrc）及其对齐翻译（ytlrc），
-            // 时间戳贴 YRC 行边界，优先于普通 tlyric
-            const [lrcResp, yrcResp] = await Promise.allSettled([
-              $fetch(`${neteaseSource.baseUrl}/lyric`, {
-                params: { id: id.toString() },
-                timeout: neteaseSource.timeout || 8000
-              }),
-              $fetch(`${neteaseSource.baseUrl}/lyric/new`, {
-                params: {
-                  id: id.toString(),
-                  cp: false,
-                  tv: 0,
-                  lv: 0,
-                  rv: 0,
-                  kv: 0,
-                  yv: 0,
-                  ytv: 0,
-                  yrv: 0
-                },
-                timeout: neteaseSource.timeout || 8000
-              })
-            ])
-
-            if (lrcResp.status === 'fulfilled' && lrcResp.value?.code === 200) {
-              const lr = lrcResp.value
-              if (lr?.lrc?.lyric) resultData.lrc = lr.lrc.lyric
-              if (lr?.tlyric?.lyric) resultData.trans = lr.tlyric.lyric
-            }
-            if (yrcResp.status === 'fulfilled' && yrcResp.value?.code === 200) {
-              const yr = yrcResp.value
-              if (yr?.yrc?.lyric) resultData.yrc = yr.yrc.lyric
-              // ytlrc 为 YRC 对齐翻译，时间戳与逐字行边界一致
-              if (yr?.ytlrc?.lyric) resultData.ytrans = yr.ytlrc.lyric
-              // 无 ytlrc 时用 tlyric 兜底
-              if (!resultData.ytrans && yr?.tlyric?.lyric && !resultData.trans) {
-                resultData.trans = yr.tlyric.lyric
-              }
-            }
-
-            if (resultData.lrc || resultData.yrc) {
-              hasResult = true
-              emitProgress('official')
-            }
-          } catch (e: any) {
-            console.warn('[getLyrics] NeteaseCloudMusicApi 获取失败:', e?.message || e)
-          }
-        }
-
-        const fetchAMLL = async () => {
-          // 锁定 TTML 来源时无视总开关
-          if (!settings.enableOnlineTTMLLyric.value && priority !== 'ttml') return
-
-          try {
-            let url: string
-            if (platform === 'tencent') {
-              url = `https://amlldb.bikonoo.com/lyrics/qq-lyrics/${id}`
-            } else if (platform === 'netease') {
-              const serverUrl = settings.amllDbServer.value
-              if (!serverUrl) return
-              url = serverUrl.replace('%s', id.toString())
-            } else {
-              return
-            }
-
-            const ttml = await $fetch(url, { responseType: 'text' })
-            if (ttml && typeof ttml === 'string' && ttml.includes('<tt')) {
-              if ((resultData.lrc || resultData.yrc) && !validateTtml(ttml)) return
-              resultData.ttml = ttml
-              hasResult = true
-              if (!progressive || ttmlValidated) emitProgress('amll')
-            }
-          } catch {}
-        }
-
-        const fetchQM = async () => {
-          if (!settings.enableQQMusicLyric.value && priority !== 'qm') return
-
-          if (platform === 'tencent') {
-            try {
-              let qqMusicCookie = ''
-              if (import.meta.client) {
-                qqMusicCookie = localStorage.getItem('qq_music_cookie') || ''
-              }
-
-              // 传入元信息以提高原生 QRC 接口匹配精度
-              const nativeResp = await $fetch('/api/native-api/lyric/tx', {
-                params: {
-                  songmid: String(id),
-                  ...(meta?.title ? { name: meta.title } : {}),
-                  ...(meta?.artist ? { artist: meta.artist } : {}),
-                  ...(meta?.album ? { album: meta.album } : {}),
-                  ...(qqMusicCookie ? { cookie: qqMusicCookie } : {})
-                },
-                timeout: 8000
-              })
-              if (nativeResp?.success && nativeResp?.data) {
-                const d = nativeResp.data
-                // qrc 优先于 lrc，两者都写入，解析层按优先级选择
-                if (d.qrc) resultData.yrc = d.qrc // 用 yrc 字段承载 QRC，解析器会识别 XML 格式
-                if (d.lrc) resultData.lrc = d.lrc
-                if (d.trans) resultData.trans = d.trans
-                if (d.qrc || d.lrc) {
-                  hasResult = true
-                  emitProgress('qm')
-                  return
-                }
-              }
-            } catch (e) {
-              console.warn('[getLyrics] 原生歌词接口失败:', e)
-            }
-          }
-
-          if (!vkeysSource) return
-
-          try {
-            let url: string
-            const lyricIdParam = getVkeysIdParam(platform as 'netease' | 'tencent', id)
-            if (platform === 'netease') {
-              url = `${vkeysSource.baseUrl}/netease/lyric?${lyricIdParam.key}=${encodeURIComponent(lyricIdParam.value)}`
-            } else if (platform === 'tencent') {
-              url = `${vkeysSource.baseUrl}/tencent/lyric?${lyricIdParam.key}=${encodeURIComponent(lyricIdParam.value)}`
-            } else {
-              return
-            }
-
-            const resp = await $fetch(url, {
-              timeout: vkeysSource.timeout || 8000,
-              headers: {
-                'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36'
-              }
-            })
-            if (resp?.code === 200 && resp?.data) {
-              const d = resp.data
-              if (d.lrc) resultData.lrc = d.lrc
-              if (d.trans) resultData.trans = d.trans
-              if (d.yrc) resultData.yrc = d.yrc
-              if (d.lrc || d.yrc) {
-                hasResult = true
-                emitProgress('qm')
-              }
-            }
-          } catch (e) {
-            console.warn('[getLyrics] vkeys 获取失败:', e)
-          }
-        }
-
-        /**
-         * 获取咪咕歌词
-         */
-        const fetchMigu = async () => {
-          if (platform !== 'migu') return
-
-          try {
-            const miguResp = await $fetch('/api/native-api/lyric/mg', {
-              params: {
-                contentId: String(id)
-              },
-              timeout: 10000
-            })
-
-            if (miguResp?.success && miguResp?.data) {
-              const d = miguResp.data
-              if (d.lrc) {
-                resultData.lrc = d.lrc
-                hasResult = true
-                emitProgress('official')
-              }
-            }
-          } catch (e) {
-            console.warn('[getLyrics] 咪咕歌词获取失败:', e)
-          }
-        }
-
-        const priority = meta?.priority || settings.lyricPriority.value
-        // 指定具体来源（非 auto）时锁定该来源，失败不回退、不做跨平台升级
-        const sourceLocked = priority === 'qm' || priority === 'official' || priority === 'ttml'
-        if (sourceLocked) {
-          if (platform === 'migu') {
-            await fetchMigu()
-          } else if (priority === 'qm') {
-            await fetchQM()
-          } else if (priority === 'official') {
-            // 锁定 NCM：官方接口，yrc 优先、lrc 兜底（fetchOfficial 内部已同时请求两者）
-            await fetchOfficial()
-          } else {
-            // 锁定 TTML：仅 AMLL DB
-            await fetchAMLL()
-          }
-        } else if (progressive) {
-          if (platform === 'netease') {
-            let triedQM = false
-            const fetchQMOnce = async () => {
-              if (triedQM) return
-              triedQM = true
-              await fetchQM()
-            }
-
-            await fetchOfficial()
-            if (priority === 'auto' && settings.enableQQMusicLyric.value) {
-              await fetchQMOnce()
-            }
-            await fetchAMLL()
-            if (!hasResult) {
-              await fetchQMOnce()
-            }
-          } else if (platform === 'migu') {
-            // 咪咕平台：直接获取咪咕歌词
-            await fetchMigu()
-          } else {
-            await fetchQM()
-            await fetchAMLL()
-            if (!hasResult) {
-              await fetchOfficial()
-            }
-          }
-        } else {
-          // 默认：AMLL → (QQ) → 官方
-          if (platform === 'migu') {
-            await fetchMigu()
-          } else {
-            await fetchAMLL()
-            if (settings.enableQQMusicLyric.value) {
-              await fetchQM()
-            }
-            await fetchOfficial()
-          }
-        }
-
-        if (resultData.ttml && (resultData.lrc || resultData.yrc) && !ttmlValidated) {
-          if (!validateTtml(resultData.ttml)) {
-            resultData.ttml = ''
-          } else if (progressive) {
-            emitProgress('amll')
-          }
-        }
-
-        // 跨平台升级：当前无 TTML 时尝试（有 yrc 也可升级到 ttml，有 lrc 可升级到 yrc/ttml）
-        // 指定具体来源时不做升级，保证结果确实来自所选来源
-        if (!sourceLocked && !resultData.ttml && (resultData.lrc || resultData.yrc || resultData.trans)) {
-          const upgraded = await tryUpgradeLyric(platform, resultData, meta)
-          if (upgraded) {
-            hasResult = true
-            emitProgress('upgrade')
-          }
-        }
-
-        // 咪咕官方歌词获取失败时（海外部署官方接口不可用），仍尝试跨平台升级作为兜底
-        if (platform === 'migu' && !hasResult) {
-          const upgraded = await tryUpgradeLyric(platform, resultData, meta)
-          if (upgraded) {
-            hasResult = true
-            emitProgress('upgrade')
-          }
-        }
-
-        if (hasResult) {
-          return { success: true, data: resultData }
-        }
-
-        if (!sourceLocked && platform === 'netease') {
-          const metingSources = enabledSources.filter((source) => source.id.startsWith('meting-'))
-          for (const source of metingSources) {
-            try {
-              const lyric = await $fetch(source.baseUrl, {
-                params: { server: 'netease', type: 'lrc', id: String(id) },
-                responseType: 'text',
-                timeout: source.timeout || 8000
-              })
-              if (lyric.trim()) {
-                resultData.lrc = lyric
-                emitProgress('meting')
-                return { success: true, data: cloneLyricData(resultData) }
-              }
-            } catch (error: any) {
-              console.warn(
-                `[getLyrics] Meting API ${source.name} 获取失败:`,
-                error?.message || error
-              )
-            }
-          }
-        }
-
-        return { success: false, error: '未获取到歌词' }
-      } catch (error: any) {
-        console.error('[getLyrics] 获取歌词失败:', error)
-        return { success: false, error: error?.message || '未知错误' }
-      }
-    })()
-      .then((res) => {
-        if (!res.success) {
-          lyricCache.delete(cacheKey)
-        }
-        return res
-      })
-      .finally(() => {
-        unsubscribeProgress()
-        setTimeout(() => {
-          if (lyricCache.get(cacheKey) === promise) {
-            lyricCache.delete(cacheKey)
-          }
-        }, LYRIC_CACHE_TTL)
-      })
-
-    lyricCache.set(cacheKey, promise)
-    return promise
-  }
-
   /**
    * 验证播放链接的有效性
    * @param url 播放链接
@@ -934,76 +41,56 @@ export const useMusicSources = () => {
     duration?: number
     error?: string
   }> => {
-    if (!import.meta.client) {
-      return {
-        valid: true
-      }
-    }
-
     try {
+      // 修复HTTP/HTTPS协议问题
       let validatedUrl = url
       if (url.startsWith('http://')) {
         validatedUrl = url.replace('http://', 'https://')
       }
 
-      const exactDuration = await new Promise<number>((resolve, reject) => {
-        const audio = new Audio()
-        let settled = false
-        const timeout = window.setTimeout(() => {
-          finalize(new Error('获取音频元数据超时'))
-        }, 8000)
-
-        const cleanup = () => {
-          window.clearTimeout(timeout)
-          audio.onloadedmetadata = null
-          audio.onerror = null
-          audio.pause()
-          audio.src = ''
-          audio.load()
-        }
-
-        const finalize = (result: number | Error) => {
-          if (settled) {
-            return
-          }
-          settled = true
-          cleanup()
-
-          if (result instanceof Error) {
-            reject(result)
-            return
-          }
-
-          resolve(result)
-        }
-
-        audio.preload = 'metadata'
-        audio.onloadedmetadata = () => {
-          const duration = audio.duration
-          if (!Number.isFinite(duration) || duration <= 0) {
-            finalize(new Error('无效的音频时长'))
-            return
-          }
-          finalize(duration)
-        }
-        audio.onerror = () => {
-          finalize(new Error('无法加载音频文件'))
-        }
-        audio.src = validatedUrl
-        audio.load()
+      // 使用HEAD请求检查链接可用性，避免下载整个文件
+      const response = await fetch(validatedUrl, {
+        method: 'HEAD',
+        signal: AbortSignal.timeout(5000) // 5秒超时
       })
 
-      if (exactDuration < 40) {
+      if (!response.ok) {
         return {
           valid: false,
-          duration: exactDuration,
-          error: `歌曲实际时长过短: ${exactDuration.toFixed(1)}秒`
+          error: `HTTP ${response.status}: ${response.statusText}`
+        }
+      }
+
+      // 检查Content-Type是否为音频文件
+      const contentType = response.headers.get('content-type')
+      if (contentType && !contentType.includes('audio') && !contentType.includes('video')) {
+        return {
+          valid: false,
+          error: `不是音频文件: ${contentType}`
+        }
+      }
+
+      // 尝试获取文件大小来估算时长
+      const contentLength = response.headers.get('content-length')
+      let estimatedDuration = 0
+
+      if (contentLength) {
+        const fileSizeBytes = parseInt(contentLength)
+        // 粗略估算：假设128kbps的音质，1MB约为64秒
+        estimatedDuration = (fileSizeBytes / 1024 / 1024) * 64
+
+        if (estimatedDuration < 5) {
+          return {
+            valid: false,
+            duration: estimatedDuration,
+            error: `歌曲时长过短: ${estimatedDuration.toFixed(1)}秒`
+          }
         }
       }
 
       return {
         valid: true,
-        duration: exactDuration
+        duration: estimatedDuration
       }
     } catch (error: any) {
       return {
@@ -1019,87 +106,24 @@ export const useMusicSources = () => {
   // 最后一次搜索的音源
   const lastUsedSource = ref<string>('')
 
-  /**
-   * 使用 Native Music API 搜索
-   */
-  const searchNativeMusic = async (params: MusicSearchParams): Promise<any[]> => {
-    const platform = params.platform || 'netease'
-    if (platform !== 'netease' && platform !== 'tencent' && platform !== 'migu') {
-      return []
-    }
-
-    let endpoint: string
-    if (platform === 'netease') {
-      endpoint = 'wy'
-    } else if (platform === 'tencent') {
-      endpoint = 'tx'
-    } else {
-      endpoint = 'mg'
-    }
-
-    const url = `/api/native-api/search/${endpoint}`
-    const qqMusicCookie =
-      platform === 'tencent' && import.meta.client
-        ? localStorage.getItem('qq_music_cookie') || undefined
-        : undefined
-
-    try {
-      console.log(`[searchNativeMusic] Requesting ${platform} search: ${params.keywords}`)
-      const response: any = await $fetch(url, {
-        params: {
-          str: params.keywords,
-          page: Math.floor((params.offset || 0) / (params.limit || 30)) + 1,
-          limit: params.limit || 30,
-          cookie: qqMusicCookie
-        }
-      })
-
-      if (!response || !response.list) {
-        return []
-      }
-
-      return response.list.map((item: any) => {
-        const isNetease = platform === 'netease'
-        const isMigu = platform === 'migu'
-        const txSource = response.source === 'qq-music-api' ? 'qq-music-api' : 'native-tx'
-        const mid = item.songmid
-        const id = isNetease ? item.songmid : mid || item.songId
-
-        return {
-          id: id?.toString(),
-          title: item.name,
-          artist: item.singer?.replace(/、/g, '/') || '未知艺术家',
-          cover: item.img,
-          album: item.albumName,
-          albumId: item.albumId,
-          duration: isNetease ? item.duration * 1000 : item.duration, // 网易使用 ms，腾讯/咪咕使用 s
-          musicPlatform: platform,
-          musicId: id?.toString(),
-          url: undefined,
-          hasUrl: false,
-          sourceInfo: {
-            source: isNetease ? 'netease-backup' : isMigu ? 'migu' : txSource,
-            originalId: id?.toString(),
-            originalSongId: !isNetease && item.songId ? item.songId.toString() : undefined,
-            fetchedAt: new Date(),
-            mid: mid,
-            strMediaMid: item.strMediaMid, // Add strMediaMid
-            quality: item._types, // Store quality info from LX
-            types: item.types
-          }
-        }
-      })
-    } catch (error: any) {
-      console.warn(`[searchNativeMusic] Failed:`, error)
-      throw error
-    }
-  }
-
-  // 服务器是否在中国（模块级单例共享）
-  const isServerInChina = globalIsServerInChina
+  // 服务器是否在中国
+  const isServerInChina = ref<boolean | null>(null)
 
   // 检测服务器位置
-  const checkServerLocation = checkServerLocationGlobal
+  const checkServerLocation = async () => {
+    if (isServerInChina.value !== null) return
+
+    try {
+      const data = await $fetch('/api/system/location')
+      if (data && data.success) {
+        isServerInChina.value = data.data.isInChina
+        console.log(`[useMusicSources] 服务器位置检测: ${isServerInChina.value ? '中国' : '海外'}`)
+      }
+    } catch (e) {
+      console.warn('[useMusicSources] 服务器位置检测失败，默认为海外:', e)
+      isServerInChina.value = false
+    }
+  }
 
   /**
    * 搜索歌曲（带故障转移）
@@ -1108,519 +132,71 @@ export const useMusicSources = () => {
     params: MusicSearchParams,
     signal?: AbortSignal
   ): Promise<MusicSearchResult> => {
-    // 检查请求是否已被取消
     if (signal?.aborted) {
       throw new DOMException('搜索请求已被取消', 'AbortError')
     }
 
     isSearching.value = true
 
-    // 确保已检测服务器位置
-    if (isServerInChina.value === null) {
-      await checkServerLocation()
-    }
-
     try {
-      // 优先尝试 Native Music 本地集成搜索 (仅支持网易云和QQ音乐)
-      // 策略调整：
-      // - QQ音乐平台：无论国内外均优先 Native Music
-      // - 网易云音乐平台：仅国内服务器优先 Native Music；海外跳过，直接使用第三方 API
-      const platform = params.platform || 'netease'
-      // 检查平台是否启用（SSR 阶段跳过，$fetch 无 cookie）
-      if (import.meta.client) {
-        if (!globalEnabledPlatforms.value.includes(platform)) {
-          const { currentLocale, siteConfig } = useLocale()
-          const available = globalEnabledPlatforms.value.filter((p) => p !== platform)
-          const platformName = getPlatformDisplayName(
-            platform,
-            siteConfig.value,
-            currentLocale.value
-          )
-          const availableNames = available
-            .map((p) => getPlatformDisplayName(p, siteConfig.value, currentLocale.value))
-            .join('、')
-          const { localize } = useServerErrors()
-          // 先按 code + params 本地化得到 message，再抛出结构化错误：
-          // data.code 供 extractErrorCode 提取，data.message 供 getThrownMessage 提取
-          const payload = {
-            data: {
-              code: 'MUSIC_SOURCE_PLATFORM_DISABLED',
-              params: [platformName, availableNames]
-            }
-          }
-          const err = new Error(localize(payload))
-          ;(err as any).data = payload.data
-          throw err
-        }
-      }
-      const shouldUseNativeFirst = platform === 'tencent' || isServerInChina.value === true
-
-      if (
-        shouldUseNativeFirst &&
-        (platform === 'netease' || platform === 'tencent') &&
-        params.type !== 1009
-      ) {
-        try {
-          const reason =
-            platform === 'tencent'
-              ? '[searchSongs] QQ音乐平台，优先尝试 Native Music 搜索...'
-              : '[searchSongs] 服务器位于国内，优先尝试 Native Music 搜索...'
-          console.log(reason)
-          const result = await searchNativeMusic(params)
-          if (result && result.length > 0) {
-            currentSource.value = 'native-music'
-            lastUsedSource.value = platform === 'netease' ? 'netease-backup' : 'qq-resolver'
-            return {
-              success: true,
-              source: 'native-music',
-              data: result,
-              error: undefined
-            }
-          }
-        } catch (e) {
-          console.warn('[searchSongs] Native Music 搜索失败，回退到其他音源:', e)
-        }
-      } else if (!shouldUseNativeFirst) {
-        console.log(`[searchSongs] 服务器位于海外，跳过 Native Music 优先使用第三方音源`)
+      const url = `/api/music/kg/search?keyword=${encodeURIComponent(params.keywords)}`
+      const response: any = await $fetch(url, { signal })
+      
+      if (!response || !response.data || !response.data.info) {
+        throw new Error('获取酷狗搜索结果失败')
       }
 
-      const enabledSources = getEnabledSources()
-      const errors: any[] = []
+      const results = response.data.info.map((item: any) => ({
+        id: item.hash,
+        title: item.songname,
+        artist: item.singername,
+        cover: item.pic || '', 
+        album: item.album_name || '',
+        duration: item.duration * 1000, // Assuming duration is in seconds
+        musicPlatform: 'kugou',
+        musicId: item.hash,
+        hasUrl: true,
+        isVip: item.isVip,
+        sourceInfo: {
+          source: 'kugou',
+          originalId: item.hash,
+          fetchedAt: new Date()
+        }
+      }))
 
-      if (enabledSources.length === 0) {
-        throw new Error('没有可用的音源')
+      currentSource.value = 'kugou'
+      lastUsedSource.value = 'kugou'
+
+      return {
+        success: true,
+        source: 'kugou',
+        data: results,
+        error: undefined
       }
-
-      // 根据平台选择合适的音源顺序
-      let sourcesToTry: MusicSource[]
-
-      if (params.type === 1009) {
-        // 播客/电台搜索：只允许使用 netease-backup 源
-        sourcesToTry = enabledSources.filter((s) => s.id.includes('netease-backup'))
-        if (sourcesToTry.length === 0) {
-          throw new Error('未找到支持播客搜索的音源(需网易云备用源)')
-        }
-      } else if (params.platform === 'bilibili') {
-        const bilibiliSource = enabledSources.find((s) => s.id === 'bilibili')
-        if (bilibiliSource) {
-          sourcesToTry = [bilibiliSource]
-        } else {
-          throw new Error('未启用哔哩哔哩音源')
-        }
-      } else if (params.platform === 'tencent') {
-        // QQ 音乐搜索优先 v3，v2 作为回退。
-        const v3 = enabledSources.find((s) => s.id === 'vkeys-v3')
-        const v2 = enabledSources.find((s) => s.id === 'vkeys')
-        const tencentSources: MusicSource[] = []
-        if (v3) tencentSources.push(v3)
-        if (v2) tencentSources.push(v2)
-        console.log('QQ音乐平台搜索，优先使用 vkeys v3，失败回退到 v2')
-
-        // 第一阶段：仅尝试腾讯专用源
-        sourcesToTry = tencentSources
-      } else if (params.platform === 'migu') {
-        // 咪咕音乐平台：使用咪咕专用源
-        const miguSource = enabledSources.find((s) => s.id === 'migu')
-        if (miguSource) {
-          sourcesToTry = [miguSource]
-        } else {
-          throw new Error('未启用咪咕音乐音源')
-        }
-      } else {
-        // 网易云音乐平台（默认）：优先使用内置官方接口，再回退 GD Studio。
-        const neteaseSources = enabledSources.filter((s) => s.id.includes('netease-backup'))
-        const gdStudioSource = enabledSources.find((s) => s.id === 'netease-gdstudio')
-
-        sourcesToTry = [...neteaseSources, ...(gdStudioSource ? [gdStudioSource] : [])]
-        console.log('网易云音乐平台搜索，优先使用内置接口，失败回退 GD Studio')
+    } catch (error: any) {
+      return {
+        success: false,
+        source: 'kugou',
+        data: [],
+        error: error.message || '搜索失败'
       }
-
-      // 按选定的顺序尝试每个音源
-      for (const source of sourcesToTry) {
-        // 在每次尝试前检查请求是否已被取消
-        if (signal?.aborted) {
-          throw new DOMException('搜索请求已被取消', 'AbortError')
-        }
-
-        try {
-          console.log(`尝试使用音源: ${source.name} (${source.id})`)
-          const result = await searchWithSource(source, params, signal)
-
-          // 更新状态
-          currentSource.value = source.id
-          lastUsedSource.value = source.id
-          updateSourceStatus(source.id, 'online')
-
-          return {
-            success: true,
-            source: source.id,
-            data: result,
-            error: undefined
-          }
-        } catch (error: any) {
-          console.warn(`音源 ${source.name} 搜索失败:`, error.message)
-          updateSourceStatus(source.id, 'error', error.message)
-          errors.push(error) // 收集错误
-
-          // 如果不是最后一个音源，继续尝试下一个
-          if (source !== sourcesToTry[sourcesToTry.length - 1]) {
-            console.log(`继续尝试下一个音源...`)
-          }
-        }
-      }
-
-      // 若为QQ音乐平台，尝试完腾讯源后允许作为最后手段切换到其他平台（排除已禁用的平台）
-      if (params.platform === 'tencent') {
-        // 音源 id → 平台 key 映射（仅对本功能支持的平台生效）
-        const platformOfSource = (id: string): string => {
-          if (id.includes('netease')) return 'netease'
-          if (id.includes('bilibili')) return 'bilibili'
-          if (id.includes('migu')) return 'migu'
-          return ''
-        }
-        const otherSources = enabledSources.filter(
-          (s) =>
-            s.id !== 'vkeys-v3' &&
-            s.id !== 'vkeys' &&
-            (platformOfSource(s.id)
-              ? globalEnabledPlatforms.value.includes(platformOfSource(s.id))
-              : true)
-        )
-        if (otherSources.length) {
-          console.log('QQ音乐平台所有专用源失败，作为最后手段尝试其他平台音源')
-          for (const source of otherSources) {
-            if (signal?.aborted) {
-              throw new DOMException('搜索请求已被取消', 'AbortError')
-            }
-            try {
-              console.log(`尝试使用音源: ${source.name} (${source.id})`)
-              const result = await searchWithSource(source, params, signal)
-              currentSource.value = source.id
-              lastUsedSource.value = source.id
-              updateSourceStatus(source.id, 'online')
-              return { success: true, source: source.id, data: result, error: undefined }
-            } catch (error: any) {
-              console.warn(`音源 ${source.name} 搜索失败:`, error.message)
-              updateSourceStatus(source.id, 'error', error.message)
-              errors.push(error) // 收集错误
-            }
-          }
-        }
-      }
-
-      // 所有音源都失败了
-      if (errors.length > 0) {
-        const errorDetails = errors.map((e) => e.message || '未知错误').join('; ')
-        throw new Error(`所有音源均不可用: ${errorDetails}`)
-      }
-      throw new Error('所有音源均不可用，请稍后重试')
     } finally {
       isSearching.value = false
     }
   }
 
-  /**
-   * 使用指定音源搜索
-   */
-  const searchWithSource = async (
-    source: MusicSource,
-    params: MusicSearchParams,
-    signal?: AbortSignal
-  ): Promise<any[]> => {
-    const startTime = Date.now()
-
-    let url: string
-    let transformResponse: (data: any) => any[]
-
-    if (source.id === 'bilibili') {
-      try {
-        const result = await searchBilibili(params.keywords)
-        updateSourceStatus(source.id, 'online', undefined, Date.now() - startTime)
-        return result
-      } catch (error: any) {
-        updateSourceStatus(source.id, 'error', error.message, Date.now() - startTime)
-        throw error
-      }
-    } else if (source.id === 'vkeys-v3') {
-      if ((params.platform || 'tencent') !== 'tencent') {
-        throw new Error('vkeys v3 仅支持 QQ 音乐搜索')
-      }
-      const page = Math.floor((params.offset || 0) / (params.limit || 10)) + 1
-      const limit = params.limit || 10
-      url = `${source.baseUrl}/tencent/search/song?keyword=${encodeURIComponent(params.keywords)}&page=${page}&limit=${limit}`
-      transformResponse = transformVkeysV3TencentSearch
-    } else if (source.id === 'vkeys') {
-      // Vkeys API - 根据用户选择的平台使用对应的API
-      const platform = params.platform || 'netease' // 使用用户选择的平台，默认网易云
-
-      // 根据平台使用不同的端点，都使用word参数
-      if (platform === 'tencent') {
-        // QQ音乐使用word参数和tencent端点
-        url = `${source.baseUrl}/tencent?word=${encodeURIComponent(params.keywords)}&num=${params.limit || 30}`
-      } else {
-        // 网易云使用word参数和netease端点
-        url = `${source.baseUrl}/netease?word=${encodeURIComponent(params.keywords)}&num=${params.limit || 30}&page=${Math.floor((params.offset || 0) / (params.limit || 30)) + 1}`
-      }
-
-      transformResponse = (data: any) => transformVkeysResponse(data, platform)
-    } else if (source.id === 'netease-gdstudio') {
-      url = `${source.baseUrl}?types=search&source=netease&name=${encodeURIComponent(params.keywords)}&count=${params.limit || 30}`
-      transformResponse = (data: any) => {
-        if (!Array.isArray(data)) {
-          throw new Error('GD Studio 搜索响应无效')
-        }
-        return data.map((item: any) => ({
-          id: item.id,
-          title: item.name,
-          artist: Array.isArray(item.artist) ? item.artist.join('/') : item.artist || '未知艺术家',
-          // GD Studio 搜索结果可能只返回 pic_id 而非完整 URL，非 URL 值不能当封面使用
-          cover: typeof item.pic === 'string' && item.pic.startsWith('http') ? item.pic : null,
-          album: item.album,
-          albumId: item.album_id,
-          duration: 0,
-          musicPlatform: 'netease',
-          musicId: item.id?.toString(),
-          sourceInfo: {
-            source: 'netease-gdstudio',
-            originalId: item.id?.toString(),
-            fetchedAt: new Date()
-          }
-        }))
-      }
-    } else if (source.id === 'migu') {
-      // 咪咕音乐使用 Native API 搜索
-      const page = Math.floor((params.offset || 0) / (params.limit || 30)) + 1
-      url = `/api/native-api/search/mg?str=${encodeURIComponent(params.keywords)}&page=${page}&limit=${params.limit || 30}`
-      transformResponse = (data: any) => {
-        if (!data || !data.list) {
-          return []
-        }
-        return data.list.map((item: any) => ({
-          id: item.songmid,
-          title: item.name,
-          artist: item.singer?.replace(/、/g, '/') || '未知艺术家',
-          cover: item.img,
-          album: item.albumName,
-          albumId: item.albumId,
-          duration: item.duration, //秒
-          musicPlatform: 'migu',
-          musicId: item.songmid,
-          sourceInfo: {
-            source: 'migu',
-            originalId: item.songmid,
-            fetchedAt: new Date(),
-            quality: item._types,
-            types: item.types
-          }
-        }))
-      }
-    } else {
-      // 网易云备用API
-      // 如果提供了cookie，添加到查询参数中
-      let cookieParam = ''
-      if (params.cookie) {
-        // 将cookie编码后作为参数传递
-        cookieParam = `&cookie=${encodeURIComponent(params.cookie)}`
-      }
-
-      // 如果是播客/电台搜索 (type === 1009)，使用 /cloudsearch 接口
-      if (params.type === 1009) {
-        // 播客/电台搜索接口参数：keywords=关键词, limit=数量, offset=偏移量, type=1009
-        url = `${source.baseUrl}/cloudsearch?keywords=${encodeURIComponent(params.keywords)}&limit=${params.limit || 20}&offset=${params.offset || 0}&type=1009${cookieParam}`
-        transformResponse = async (data: any) => await transformNeteaseResponse(data)
-      } else {
-        // 默认使用 cloudsearch 接口
-        url = `${source.baseUrl}/cloudsearch?keywords=${encodeURIComponent(params.keywords)}&limit=${params.limit || 30}&offset=${params.offset || 0}&type=${params.type || 1}${cookieParam}`
-        transformResponse = async (data: any) => await transformNeteaseResponse(data)
-      }
-    }
-
-    let response: any
-    let finalUrl = url
-
-    try {
-      console.log(`[${source.name}] 请求URL:`, finalUrl)
-      // v3 请求使用简单请求，不携带任何会触发预检的自定义头
-      response = await $fetch(finalUrl, {
-        timeout: source.timeout || config.value.timeout,
-        signal,
-        headers: source.headers
-      })
-      console.log(`[${source.name}] API响应:`, response)
-
-      const responseTime = Date.now() - startTime
-      updateSourceStatus(source.id, 'online', undefined, responseTime)
-    } catch (error: any) {
-      // 如果是网易云备用源且使用的是cloudsearch接口，尝试切换到search接口
-      if (source.id !== 'vkeys' && finalUrl.includes('/cloudsearch')) {
-        console.warn(`[${source.name}] cloudsearch接口失败，尝试使用search接口:`, error.message)
-
-        // 如果提供了cookie，添加到查询参数中
-        let cookieParam = ''
-        if (params.cookie) {
-          cookieParam = `&cookie=${encodeURIComponent(params.cookie)}`
-        }
-
-        const fallbackUrl = `${source.baseUrl}/search?keywords=${encodeURIComponent(params.keywords)}&limit=${params.limit || 30}&offset=${params.offset || 0}&type=${params.type || 1}${cookieParam}`
-
-        try {
-          console.log(`[${source.name}] 备用请求URL:`, fallbackUrl)
-          response = await $fetch(fallbackUrl, {
-            timeout: source.timeout || config.value.timeout,
-            signal,
-            headers: source.headers
-          })
-          console.log(`[${source.name}] 备用API响应:`, response)
-
-          const responseTime = Date.now() - startTime
-          updateSourceStatus(source.id, 'online', undefined, responseTime)
-          finalUrl = fallbackUrl // 更新最终使用的URL
-        } catch (fallbackError: any) {
-          const responseTime = Date.now() - startTime
-          console.error(`[${source.name}] 备用接口也失败:`, fallbackError.message)
-          updateSourceStatus(
-            source.id,
-            'error',
-            `cloudsearch和search接口均失败: ${error.message}, ${fallbackError.message}`,
-            responseTime
-          )
-          throw fallbackError
-        }
-      } else {
-        const responseTime = Date.now() - startTime
-        console.error(`[${source.name}] 网络请求失败:`, error.message)
-        updateSourceStatus(source.id, 'error', error.message, responseTime)
-        throw error
-      }
-    }
-
-    // 单独处理数据转换，避免网络成功但转换失败的情况
-    try {
-      const result = await transformResponse(response)
-      console.log(`[${source.name}] 转换后的数据:`, result)
-      return result
-    } catch (error: any) {
-      console.error(`[${source.name}] 数据转换失败:`, error.message)
-      console.error(`[${source.name}] 原始响应数据:`, response)
-      throw new Error(`数据转换失败: ${error.message}`, { cause: error })
-    }
-  }
-
   /**
    * 获取歌曲详情
    */
   const getSongDetail = async (params: SongDetailParams): Promise<SongDetailResult> => {
-    const enabledSources = getEnabledSources()
-
-    for (const source of enabledSources) {
-      try {
-        const result = await getSongDetailWithSource(source, params)
-
-        updateSourceStatus(source.id, 'online')
-
-        return {
-          success: true,
-          source: source.id,
-          data: { songs: result },
-          error: undefined
-        }
-      } catch (error: any) {
-        console.warn(`音源 ${source.name} 获取歌曲详情失败:`, error.message)
-        updateSourceStatus(source.id, 'error', error.message)
-      }
-    }
-
-    throw new Error('所有音源均不可用')
-  }
-
-  /**
-   * 使用指定音源获取歌曲详情
-   */
-  const getSongDetailWithSource = async (
-    source: MusicSource,
-    params: SongDetailParams
-  ): Promise<any[]> => {
-    const startTime = Date.now()
-
-    // 验证参数
-    if (!params.ids || (Array.isArray(params.ids) && params.ids.length === 0)) {
-      throw new Error('歌曲ID参数不能为空')
-    }
-
-    const ids = Array.isArray(params.ids) ? params.ids.join(',') : params.ids
-
-    // 再次验证处理后的ids
-    if (!ids || ids === 'undefined' || ids === 'null') {
-      throw new Error(`无效的歌曲ID: ${ids}`)
-    }
-
-    let url: string
-    const fetchOptions: any = {
-      timeout: source.timeout || config.value.timeout,
-      headers: {
-        'Content-Type': 'application/json',
-        ...source.headers
-      }
-    }
-    let transformResponse: (data: any) => any[]
-
-    if (source.id === 'vkeys') {
-      // Vkeys API - 使用搜索接口，包含了歌曲详情
-      // 默认使用网易云端点进行详情搜索
-      url = `${source.baseUrl}/netease?word=${encodeURIComponent(ids)}&num=50`
-      transformResponse = (data: any) => transformVkeysResponse(data, 'netease')
-    } else if (source.id === 'netease-gdstudio') {
-      url = `${source.baseUrl}?types=search&source=netease&name=${encodeURIComponent(ids)}&count=1`
-      transformResponse = (response: any) => {
-        if (!Array.isArray(response) || response.length === 0) {
-          throw new Error('GD Studio 未返回歌曲详情')
-        }
-        const data = response[0]
-        return [
-          {
-            id: data.id,
-            title: data.name,
-            artist: Array.isArray(data.artist)
-              ? data.artist.join('/')
-              : data.artist || '未知艺术家',
-            // GD Studio 详情结果可能只返回 pic_id 而非完整 URL，非 URL 值不能当封面使用
-            cover: typeof data.pic === 'string' && data.pic.startsWith('http') ? data.pic : null,
-            album: data.album,
-            duration: 0,
-            musicPlatform: 'netease',
-            musicId: data.id?.toString(),
-            sourceInfo: {
-              source: 'netease-gdstudio',
-              originalId: data.id?.toString(),
-              fetchedAt: new Date()
-            }
-          }
-        ]
-      }
-    } else if (source.id === 'ygking-qq') {
-      throw new Error('Ygking QQ 音乐仅支持播放链接获取')
-    } else {
-      // 网易云备用API
-      url = `${source.baseUrl}/song/detail?ids=${ids}`
-      transformResponse = (response: any) => {
-        if (response.code !== 200 || !response.songs) {
-          throw new Error(`API响应错误: ${response.message || '未知错误'}`)
-        }
-        return transformNeteaseDetailResponse(response)
-      }
-    }
-
-    try {
-      const response = await $fetch(url, fetchOptions)
-
-      const responseTime = Date.now() - startTime
-      updateSourceStatus(source.id, 'online', undefined, responseTime)
-
-      return transformResponse(response)
-    } catch (error: any) {
-      const responseTime = Date.now() - startTime
-      updateSourceStatus(source.id, 'error', error.message, responseTime)
-      throw error
+    // For Kugou, we don't have a specific detail endpoint in our proxy yet, 
+    // and usually the search result provides enough info or we can just return empty detail.
+    // To satisfy the interface, we return a mock or basic info.
+    return {
+      success: true,
+      source: 'kugou',
+      data: { songs: [] },
+      error: undefined
     }
   }
 
@@ -1641,61 +217,8 @@ export const useMusicSources = () => {
     }
   }
 
-  /**
-   * 获取歌曲封面URL（网易云备用源）
-   * 实现两步搜索：先通过歌曲ID获取详情，然后提取封面URL
-   */
-  const getSongPicUrl = async (id: number): Promise<string> => {
-    try {
-      // 获取网易云备用源
-      const enabledSources = getEnabledSources()
-      const neteaseSource = enabledSources.find((source) => source.id.includes('netease-backup'))
-
-      if (!neteaseSource) {
-        console.error('[getSongPicUrl] 未找到网易云备用源')
-        return ''
-      }
-
-      // 直接调用/song/detail接口获取歌曲详情
-      const response = await $fetch(`${neteaseSource.baseUrl}/song/detail`, {
-        params: { ids: id },
-        timeout: neteaseSource.timeout || 8000
-      })
-
-      // 从响应中提取封面URL
-      return response.songs?.[0]?.al?.picUrl || ''
-    } catch (error) {
-      console.error('[getSongPicUrl] 获取封面失败:', error)
-      return ''
-    }
-  }
-
-  /**
-   * 将VoiceHub音质数值映射到网易云API的level参数
-   */
-  const mapQualityToLevel = (quality: number): string => {
-    // 根据网易云API文档映射音质等级
-    switch (quality) {
-      case 2:
-        return 'standard' // 标准 (128k)
-      case 3:
-        return 'higher' // 较高 (192k)
-      case 4:
-        return 'exhigh' // HQ极高 (320k)
-      case 5:
-        return 'lossless' // SQ无损
-      case 6:
-        return 'hires' // Hi-Res
-      case 9:
-        return 'jymaster' // 超清母带
-      default:
-        return 'exhigh' // 默认极高音质
-    }
-  }
-
   /**
    * 获取歌曲播放URL
-   * 根据平台选择合适的音源：网易云优先内置接口；QQ音乐使用 vkeys。
    */
   const getSongUrl = async (
     id: number | string,
@@ -1704,704 +227,42 @@ export const useMusicSources = () => {
     cookie?: string,
     options?: {
       unblock?: boolean
-      bilibiliCid?: string
-      excludeSources?: string[]
     }
   ): Promise<{
     success: boolean
     url?: string
-    source?: string
     error?: string
   }> => {
-    // 特殊处理 netease-podcast 平台：使用网易云逻辑但禁用 unblock
-    if (platform === 'netease-podcast') {
-      platform = 'netease'
-      if (!options) {
-        options = {}
-      }
-      // 只有在未明确指定 unblock 时才强制设为 false
-      if (options.unblock === undefined) {
-        options.unblock = false
-      }
-    }
-
-    // 如果没有提供cookie且在客户端环境，尝试从localStorage获取
-    if (!cookie && import.meta.client) {
-      try {
-        const storedCookie = localStorage.getItem('netease_cookie')
-        if (storedCookie) {
-          cookie = storedCookie
-        }
-      } catch (e) {
-        // Ignore localStorage errors
-      }
-    }
-
     try {
-      // 获取所有启用的音源
-      const enabledSources = getEnabledSources()
+      const hashParam = Array.isArray(id) ? id[0] : id.toString()
 
-      // 支持多个ID的批量查询（用逗号分隔）
-      let idParam = Array.isArray(id) ? id.join(',') : id.toString()
-
-      // 如果是 bilibili 平台且 id 包含 cid，解析出来
-      if (platform === 'bilibili' && !Array.isArray(id)) {
-        const parsed = parseBilibiliId(id)
-        idParam = parsed.bvid
-        if (parsed.cid) {
-          if (!options) {
-            options = {}
-          }
-          if (!options.bilibiliCid) {
-            options.bilibiliCid = parsed.cid
-          }
-        }
+      // Fetch play URL via Kugou proxy
+      const response: any = await $fetch(`/api/music/kg/playurl?hash=${hashParam}`)
+      
+      if (response && response.data && response.data.play_url) {
+        const playUrl = response.data.play_url
+        // Skip HEAD validation for Kugou URLs as they often fail HEAD requests or CORS
+        return { success: true, url: playUrl }
       }
 
-      const hasNeteaseLogin = !!cookie
-      const requestedQuality =
-        quality !== undefined && quality !== null && quality !== '' ? Number(quality) : NaN
-
-      // 定义音源尝试顺序
-      const sourcesToTry: Array<{ source: MusicSource; type: 'netease' | 'tencent' | 'bilibili' }> =
-        []
-
-      if (platform === 'bilibili') {
-        const bilibiliSource = enabledSources.find((source) => source.id === 'bilibili')
-        if (bilibiliSource) {
-          sourcesToTry.push({ source: bilibiliSource, type: 'bilibili' })
-        }
-      } else if (platform === 'migu') {
-        // 咪咕音乐平台：使用咪咕专用源
-        const miguSource = enabledSources.find((source) => source.id === 'migu')
-        if (miguSource) {
-          sourcesToTry.push({ source: miguSource, type: 'migu' as any })
-        }
-      } else if (platform === 'tencent') {
-        // QQ 音乐保留所有 Vkeys 路径，新增直连源仅作为最后回退。
-        const v3 = enabledSources.find((source) => source.id === 'vkeys-v3')
-        const ygkingSource = enabledSources.find((source) => source.id === 'ygking-qq')
-        const v2 = enabledSources.find((source) => source.id === 'vkeys')
-        if (v3) {
-          sourcesToTry.push({ source: v3, type: 'tencent' })
-        }
-        if (v2) {
-          sourcesToTry.push({ source: v2, type: 'tencent' })
-        }
-        if (ygkingSource) {
-          sourcesToTry.push({ source: ygkingSource, type: 'tencent' })
-        }
-      } else {
-        // 网易云音乐平台（默认）
-        const neteaseSource = enabledSources.find((source) => source.id.includes('netease-backup'))
-        const gdStudioSource = enabledSources.find((source) => source.id === 'netease-gdstudio')
-
-        const orderedSources = [neteaseSource, gdStudioSource]
-
-        for (const source of orderedSources) {
-          if (source) {
-            sourcesToTry.push({ source, type: 'netease' })
-          }
-        }
-
-        for (const source of enabledSources.filter((source) => source.id.startsWith('meting-'))) {
-          sourcesToTry.push({ source, type: 'netease' })
-        }
-      }
-
-      // 逐个尝试音源
-      for (const { source, type } of sourcesToTry) {
-        if (options?.excludeSources?.includes(source.id)) {
-          continue
-        }
-
-        try {
-          let url: string | null = null
-
-          if (source.id === 'bilibili') {
-            const result = await getBilibiliTrackUrl(idParam, options?.bilibiliCid)
-            url = result.url
-          } else if (source.id === 'migu') {
-            const miguQualityFlag =
-              quality === 2 ? 'HQ' : quality === 3 ? 'SQ' : quality === 4 ? 'ZQ24' : 'PQ'
-            try {
-              // 服务器位于海外时咪咕官方接口不可用，交由上层使用星海音源
-              if (isServerInChina.value === null) {
-                await checkServerLocation()
-              }
-              if (isServerInChina.value === false) {
-                throw new Error('服务器位于海外，咪咕播放链接改用第三方音源')
-              }
-              // 服务端以 PQ 取链后按 toneFlag 升级音质路径
-              const miguResponse: any = await $fetch('/api/native-api/migu/playurl', {
-                params: {
-                  contentId: idParam,
-                  toneFlag: miguQualityFlag
-                },
-                timeout: source.timeout || 10000
-              })
-
-              if (miguResponse?.success && miguResponse?.url) {
-                url = miguResponse.url
-              }
-            } catch (miguErr) {
-              console.warn('[getSongUrl] 咪咕播放链接获取失败:', miguErr)
-            }
-          } else if (source.id === 'netease-gdstudio') {
-            const response: any = await $fetch(source.baseUrl, {
-              params: { types: 'url', source: 'netease', id: idParam, br: 128 },
-              timeout: source.timeout || 10000
-            })
-            if (response?.url) {
-              url = String(response.url)
-            }
-          } else if (source.id.startsWith('meting-')) {
-            const songInfo = await getMetingSongInfo(idParam, source)
-            if (songInfo.success && songInfo.data?.url) {
-              url = String(songInfo.data.url)
-            } else {
-              const response = await fetch(
-                `${source.baseUrl}?server=netease&type=url&id=${encodeURIComponent(idParam)}`,
-                { redirect: 'follow' }
-              )
-              if (response.ok && response.url) {
-                url = response.url
-              }
-            }
-          } else if (source.id === 'vkeys-v3') {
-            const v3IdParam = getVkeysIdParam('tencent', idParam)
-            const infoResponse: any = await $fetch(
-              `${source.baseUrl}/tencent/song/info?${v3IdParam.key}=${encodeURIComponent(v3IdParam.value)}`,
-              { timeout: source.timeout || 8000 }
-            )
-            const qualityInfo = Array.isArray(infoResponse?.data?.qualityInfo)
-              ? infoResponse.data.qualityInfo
-              : []
-            if (infoResponse?.code !== 0 || qualityInfo.length === 0) {
-              throw new Error('vkeys v3 未返回可用音质')
-            }
-            const targetQuality = Number.isNaN(requestedQuality) ? 8 : requestedQuality
-            const qualityCandidates = [...new Set([targetQuality, 8, 4, 10, 11, 14])]
-            const selectedQuality = qualityCandidates.find((candidate) =>
-              qualityInfo.some(
-                (item: any) => Number(item.type) === candidate && Number(item.size) > 0
-              )
-            )
-            const v2Source = enabledSources.find((item) => item.id === 'vkeys')
-            if (!v2Source || selectedQuality === undefined) {
-              throw new Error('vkeys v3 未找到可播放音质')
-            }
-            const v2Url = `${v2Source.baseUrl}/tencent?${v3IdParam.key}=${encodeURIComponent(v3IdParam.value)}&quality=${selectedQuality}`
-            const v2Response: any = await $fetch(v2Url, { timeout: v2Source.timeout || 8000 })
-            if (v2Response?.code === 200 && v2Response?.data?.url) {
-              url = String(v2Response.data.url)
-            }
-          } else if (source.id === 'ygking-qq') {
-            const qualityMap: Record<number, string> = {
-              4: '128',
-              8: '320',
-              10: 'flac',
-              11: 'master',
-              14: 'master'
-            }
-            const qualityKey = qualityMap[requestedQuality] || '320'
-            const response: any = await $fetch(source.baseUrl, {
-              params: { mid: idParam, quality: qualityKey },
-              timeout: source.timeout || 8000
-            })
-            if (response?.code === 0 && response?.data) {
-              const directUrl =
-                response.data[idParam] || response.data[Object.keys(response.data)[0]]
-              if (directUrl) url = String(directUrl)
-            }
-          } else if (source.id === 'vkeys') {
-            // Vkeys API
-            const endpoint = type === 'tencent' ? 'tencent' : 'netease'
-            const qualityCandidates =
-              type === 'tencent'
-                ? [!isNaN(requestedQuality) ? requestedQuality : 8]
-                : [
-                    ...new Set(
-                      [
-                        !isNaN(requestedQuality) ? requestedQuality : 0,
-                        !hasNeteaseLogin && requestedQuality > 4 ? 4 : null
-                      ].filter((value): value is number => typeof value === 'number')
-                    )
-                  ]
-
-            for (const candidateQuality of qualityCandidates) {
-              const vkeysIdParam = getVkeysIdParam(endpoint as 'netease' | 'tencent', idParam)
-              const vkeysUrl = `${source.baseUrl}/${endpoint}?${vkeysIdParam.key}=${encodeURIComponent(vkeysIdParam.value)}&quality=${candidateQuality}`
-              const vkeysResp = await $fetch(vkeysUrl, { timeout: source.timeout || 8000 })
-
-              if (vkeysResp?.code === 200 && vkeysResp?.data?.url) {
-                url = String(vkeysResp.data.url)
-                break
-              }
-            }
-          } else {
-            // 网易云备用API
-            let neteaseQuality: number | null = null
-
-            // 优先使用传入的 quality 参数
-            if (quality !== undefined && quality !== null) {
-              neteaseQuality = Number(quality)
-            } else {
-              // 否则回退到全局设置
-              try {
-                const { useAudioQuality } = await import('./useAudioQuality')
-                const { getQuality } = useAudioQuality()
-                neteaseQuality = Number(getQuality('netease'))
-              } catch (error) {
-                // 无法获取音质设置，使用默认音质
-              }
-            }
-
-            if (
-              neteaseQuality === null ||
-              Number.isNaN(neteaseQuality) ||
-              (!hasNeteaseLogin && neteaseQuality > 4)
-            ) {
-              neteaseQuality = 4
-            }
-
-            const level = mapQualityToLevel(neteaseQuality)
-
-            // 如果提供了cookie，添加到请求参数中
-            const params: any = {
-              id: idParam,
-              level: level,
-              // 如果用户已登录（有cookie），默认不启用 unblock（false），否则启用（true）
-              unblock: options?.unblock ?? !cookie
-            }
-            if (cookie) {
-              params.cookie = cookie
-            }
-
-            const response = await $fetch(`${source.baseUrl}/song/url/v1`, {
-              params,
-              timeout: source.timeout || 8000
-            })
-
-            if (response?.code === 200 && Array.isArray(response.data) && response.data[0]?.url) {
-              url = response.data[0].url as string
-            }
-          }
-
-          if (url) {
-            // 修复HTTP/HTTPS协议问题
-            if (url.startsWith('http://')) {
-              url = url.replace('http://', 'https://')
-            }
-
-            // 验证播放链接
-            const validation = await validatePlayUrl(url)
-
-            if (validation.valid) {
-              return { success: true, url, source: source.id }
-            } else {
-              // 继续尝试下一个音源
-            }
-          } else {
-            // 未返回有效链接，继续尝试下一个音源
-          }
-        } catch (error: any) {
-          // 当前音源获取失败，继续尝试下一个音源
-          // 继续尝试下一个音源
-        }
-      }
-
-      return { success: false, error: '所有音源均无法获取有效的播放链接' }
+      return { success: false, error: '无法获取有效的播放链接' }
     } catch (error: any) {
-      return { success: false, error: error?.message || '未知错误' }
+      return { success: false, error: error?.message || '获取播放链接失败' }
     }
   }
 
   /**
-   * 获取歌词（统一调度，支持优先级策略）
-   * NeteaseCloudMusicApi 优先，其次 vkeys；腾讯仅 vkeys
+   * 获取歌词
    */
   const getLyrics = async (
-    platform: 'netease' | 'tencent' | 'migu',
-    id: number | string,
-    meta?: LyricUpgradeMeta
+    platform: string,
+    id: number | string
   ): Promise<{
     success: boolean
     data?: { lrc: string; trans?: string; yrc?: string; ttml?: string }
     error?: string
   }> => {
-    return fetchLyricsWithoutUpgrade(platform, id, meta)
-  }
-
-  /**
-   * 转换 Vkeys API 响应
-   */
-  const transformVkeysResponse = (response: any, platform: string = 'netease'): any[] => {
-    console.log('[transformVkeysResponse] 开始转换数据:', { platform, response })
-
-    if (!response) {
-      console.log('[transformVkeysResponse] 响应为空')
-      throw new Error('API响应为空')
-    }
-
-    // 检查错误码，非200状态码抛出错误以触发备用源重试
-    if (response.code !== 200) {
-      const errorMessage = `vkeys API错误: ${response.message || '未知错误'} (code: ${response.code})`
-      console.log('[transformVkeysResponse] API错误:', errorMessage)
-      throw new Error(errorMessage)
-    }
-
-    if (!response.data) {
-      console.log('[transformVkeysResponse] 响应数据为空')
-      throw new Error('API响应数据为空')
-    }
-
-    if (platform === 'tencent') {
-      // QQ音乐返回数组格式
-      const songs = Array.isArray(response.data) ? response.data : [response.data]
-      console.log(`[transformVkeysResponse] QQ音乐处理 ${songs.length} 首歌曲`)
-
-      return songs.map((song: any, index: number) => {
-        const mid = song.mid || song.songmid || song.songMID || song.musicId || song.id
-        const originalSongId =
-          song.id && song.id.toString() !== mid?.toString() ? song.id.toString() : undefined
-        const transformedSong = {
-          id: mid?.toString(),
-          title: song.song || song.name || song.title,
-          artist: song.singer || song.artist || '未知艺术家',
-          cover: song.cover,
-          album: song.album,
-          albumId: song.albumId,
-          duration: song.duration || song.dt,
-          musicPlatform: 'tencent',
-          musicId: mid?.toString(),
-          url: song.url,
-          hasUrl: !!song.url,
-          sourceInfo: {
-            source: 'vkeys',
-            originalId: mid?.toString(),
-            originalSongId,
-            fetchedAt: new Date(),
-            mid,
-            vid: song.vid,
-            quality: song.quality,
-            pay: song.pay,
-            subtitle: song.subtitle,
-            time: song.time,
-            type: song.type,
-            bpm: song.bpm,
-            grp: song.grp
-          }
-        }
-        console.log(`[transformVkeysResponse] QQ音乐转换歌曲 ${index + 1}:`, transformedSong)
-        return transformedSong
-      })
-    } else {
-      // 网易云返回数组格式
-      const songs = Array.isArray(response.data) ? response.data : [response.data]
-      console.log(`[transformVkeysResponse] 网易云处理 ${songs.length} 首歌曲`)
-
-      return songs.map((song: any, index: number) => {
-        const transformedSong = {
-          id: song.id,
-          title: song.song,
-          artist: song.singer || '未知艺术家',
-          cover: song.cover?.trim(), // 去除可能的空格
-          album: song.album,
-          albumId: song.albumId,
-          duration: song.interval || song.time, // 网易云使用interval字段表示时长，备用time字段
-          musicPlatform: 'netease',
-          musicId: song.id?.toString(),
-          url: song.url, // 添加vkeys API返回的播放链接
-          hasUrl: !!song.url, // 标记是否有播放链接
-          sourceInfo: {
-            source: 'vkeys',
-            originalId: song.id?.toString(),
-            fetchedAt: new Date(),
-            quality: song.quality,
-            size: song.size,
-            kbps: song.kbps,
-            url: song.url,
-            link: song.link,
-            time: song.time
-          }
-        }
-        console.log(`[transformVkeysResponse] 网易云转换歌曲 ${index + 1}:`, transformedSong)
-        return transformedSong
-      })
-    }
-  }
-
-  const transformVkeysV3TencentSearch = (response: any): any[] => {
-    if (response?.code !== 0 || !Array.isArray(response?.data?.list)) {
-      throw new Error(`vkeys v3 API 错误: ${response?.message || '响应无效'}`)
-    }
-
-    return response.data.list.map((item: any) => {
-      const mid = item.songMID ?? item.mid
-      const originalSongId = item.songID ?? item.songId ?? item.id
-      const id = mid ?? originalSongId
-      return {
-        id: id?.toString(),
-        title: item.title,
-        artist: Array.isArray(item.singerList)
-          ? item.singerList.map((singer: any) => singer.name).join('/')
-          : item.singer || '',
-        cover: item.albumImage || item.cover || '',
-        album: item.album || '',
-        albumId: item.albumID ?? item.albumId,
-        duration: item.interval ?? item.duration,
-        musicPlatform: 'tencent',
-        musicId: id?.toString(),
-        url: undefined,
-        hasUrl: false,
-        sourceInfo: {
-          source: 'vkeys-v3',
-          originalId: id?.toString(),
-          originalSongId: originalSongId?.toString(),
-          fetchedAt: new Date(),
-          mid,
-          vid: item.vid,
-          quality: item.quality,
-          pay: item.pay,
-          subtitle: item.subtitle,
-          time: item.time,
-          type: item.type,
-          bpm: item.bpm,
-          grp: item.grp
-        }
-      }
-    })
-  }
-
-  /**
-   * 转换网易云 API 搜索响应
-   * 实现两步搜索：处理搜索结果，然后批量获取歌曲详情和封面
-   */
-  const transformNeteaseResponse = async (response: any): Promise<any[]> => {
-    console.log('[transformNeteaseResponse] 开始转换数据:', response)
-
-    // 检查响应是否存在
-    if (!response) {
-      throw new Error('API响应为空')
-    }
-
-    // 检查API响应状态码
-    if (response.code !== undefined && response.code !== 200) {
-      throw new Error(`API响应错误: ${response.message || '未知错误'} (code: ${response.code})`)
-    }
-
-    // 尝试获取结果列表，支持多种类型（单曲、电台、声音等）
-    const result = response.result || response.data
-    if (!result) {
-      throw new Error('API响应格式错误: 缺少result/data字段')
-    }
-
-    let items =
-      result.songs || result.djRadios || result.resources || result.voices || result.list || []
-
-    // 如果是声音搜索(type=2000)，结果可能在 data.resources 或 data.list 中
-    if (!items || items.length === 0) {
-      if (result.data?.resources) {
-        items = result.data.resources
-      } else if (result.list) {
-        items = result.list
-      } else if (Array.isArray(result)) {
-        items = result
-      }
-    }
-
-    if (!Array.isArray(items)) {
-      console.error('[transformNeteaseResponse] 无效的响应结构:', {
-        keys: Object.keys(result),
-        itemsType: typeof items
-      })
-      // 如果找不到列表但也不是错误，可能就是没结果
-      return []
-    }
-
-    console.log(`[transformNeteaseResponse] 找到 ${items.length} 个结果`)
-
-    if (items.length === 0) {
-      return []
-    }
-
-    // 检查是否是歌曲类型的完整信息
-    // 只有当 items 是 songs 且包含 al.picUrl 时才认为是完整信息的歌曲
-    const isSongType = !!result.songs
-    const hasCompleteInfo = isSongType && items.some((item: any) => item.al?.picUrl)
-    console.log(
-      `[transformNeteaseResponse] 结果类型: ${isSongType ? '歌曲' : '其他'}, 完整信息: ${hasCompleteInfo}`
-    )
-
-    let detailResponse: any = null
-    const detailMap = new Map()
-
-    // 如果是search接口响应的歌曲（缺少完整信息），则需要获取详情
-    if (isSongType && !hasCompleteInfo) {
-      // 获取网易云备用源
-      const enabledSources = getEnabledSources()
-      const neteaseSource = enabledSources.find((source) => source.id.includes('netease-backup'))
-
-      if (neteaseSource) {
-        // 提取所有歌曲ID，准备批量获取详情
-        const songIds = items.map((song: any) => song.id).filter((id: any) => id)
-        console.log(`[transformNeteaseResponse] 准备批量获取 ${songIds.length} 首歌曲的详情`)
-
-        if (songIds.length > 0) {
-          try {
-            // 批量获取歌曲详情，包含封面信息
-            detailResponse = await $fetch(`${neteaseSource.baseUrl}/song/detail`, {
-              params: { ids: songIds.join(',') },
-              timeout: neteaseSource.timeout || 8000
-            })
-            console.log(`[transformNeteaseResponse] 批量获取详情成功`)
-          } catch (error) {
-            console.warn(
-              '[transformNeteaseResponse] 批量获取详情失败，将使用搜索结果的基本信息:',
-              error
-            )
-          }
-        }
-
-        // 创建详情映射，方便查找
-        if (detailResponse?.songs) {
-          detailResponse.songs.forEach((song: any) => {
-            detailMap.set(song.id, song)
-          })
-        }
-      }
-    }
-
-    // 转换搜索结果，根据接口类型使用不同的数据提取策略
-    return items
-      .map((item: any, index: number) => {
-        try {
-          let id = item.id
-          let title = item.name
-          let cover: string | null = null
-          let artist: string = '未知艺术家'
-          let album: string | undefined
-          let albumId: string | number | undefined
-          let duration: number = 0
-          let musicId = item.id?.toString()
-
-          // 处理不同类型的数据结构
-          if (isSongType) {
-            // 歌曲类型处理
-            if (hasCompleteInfo) {
-              // cloudsearch接口响应，包含完整信息
-              cover = item.al?.picUrl || null
-              artist = item.ar?.map((a: any) => a.name).join('/') || '未知艺术家'
-              album = item.al?.name
-              albumId = item.al?.id
-              duration = item.dt || 0
-            } else {
-              // search接口响应，需要从详情中获取信息
-              const detail = detailMap.get(item.id)
-              cover =
-                detail?.al?.picUrl ||
-                (item.album?.picId
-                  ? `https://p1.music.126.net/${item.album.picId}/${item.album.picId}.jpg`
-                  : null)
-              artist = item.artists?.map((a: any) => a.name).join('/') || '未知艺术家'
-              album = item.album?.name
-              albumId = item.album?.id || detail?.al?.id
-              duration = item.duration || 0
-            }
-          } else {
-            // 其他类型（如声音、电台等）
-            // 尝试适配声音/播客结构
-            const baseInfo = item.baseInfo || item
-
-            // 优先使用 mainSong.id (声音) 或 mainTrackId (电台节目) 作为歌曲ID，以便能通过 song/url 接口播放
-            // 如果都没有，才使用 baseInfo.id (节目ID)
-            const songId = baseInfo.mainSong?.id || baseInfo.mainTrackId || baseInfo.id
-            id = songId || id
-
-            title = baseInfo.name || title
-            cover = baseInfo.coverUrl || baseInfo.picUrl || item.picUrl || null
-
-            // 尝试获取艺术家/主播信息
-            if (baseInfo.dj) {
-              artist = baseInfo.dj.nickname
-            } else if (item.dj) {
-              artist = item.dj.nickname
-            } else if (baseInfo.artist) {
-              artist = baseInfo.artist.name
-            }
-
-            // 尝试获取专辑/电台信息
-            if (baseInfo.radio) {
-              album = baseInfo.radio.name
-            } else if (item.radio) {
-              album = item.radio.name
-            }
-
-            duration = baseInfo.duration || item.duration || 0
-
-            // 声音ID
-            musicId = id?.toString()
-          }
-
-          const transformedSong = {
-            id: id,
-            title: title,
-            artist,
-            cover,
-            album,
-            albumId,
-            duration,
-            musicPlatform: isSongType ? 'netease' : 'netease-podcast',
-            musicId: musicId,
-            sourceInfo: {
-              source: 'netease-backup',
-              originalId: musicId,
-              fetchedAt: new Date(),
-              hasDetail: hasCompleteInfo || !!detailMap.get(item.id),
-              interface: hasCompleteInfo ? 'cloudsearch' : 'search',
-              type: isSongType ? 'song' : 'voice'
-            }
-          }
-          // 只打印前几个结果，避免日志过多
-          if (index < 3) {
-            console.log(`[transformNeteaseResponse] 转换结果 ${index + 1}:`, transformedSong)
-          }
-          return transformedSong
-        } catch (error: any) {
-          console.error(
-            `[transformNeteaseResponse] 转换第 ${index + 1} 个结果失败:`,
-            error.message,
-            item
-          )
-          // 不抛出错误，而是跳过该项
-          return null
-        }
-      })
-      .filter((item: any) => item !== null)
-  }
-
-  /**
-   * 转换网易云 API 详情响应
-   */
-  const transformNeteaseDetailResponse = (response: any): any[] => {
-    return response.songs.map((song: any) => ({
-      id: song.id,
-      title: song.name,
-      artist: song.ar?.map((artist: any) => artist.name).join('/') || '未知艺术家',
-      cover: song.al?.picUrl,
-      album: song.al?.name,
-      duration: song.dt,
-      fee: song.fee,
-      privilege: song.privilege,
-      musicPlatform: 'netease',
-      musicId: song.id.toString(),
-      sourceInfo: {
-        source: 'netease-backup',
-        originalId: song.id.toString(),
-        fetchedAt: new Date()
-      }
-    }))
+    return { success: false, error: '歌词获取功能正在重构' }
   }
 
   /**
@@ -2442,67 +303,6 @@ export const useMusicSources = () => {
     }
   })
 
-  /**
-   * 获取电台/播客节目列表
-   */
-  const getDjPrograms = async (
-    radioId: string | number,
-    limit: number = 20,
-    offset: number = 0,
-    cookie?: string
-  ): Promise<{
-    success: boolean
-    programs: any[]
-    count: number
-    more: boolean
-    error?: string
-  }> => {
-    const enabledSources = getEnabledSources()
-    // 优先使用网易云备用源
-    const neteaseSources = enabledSources.filter((source) => source.id.includes('netease-backup'))
-
-    // 如果没有找到网易云备用源，尝试其他可能支持的源（虽然目前只有备用源支持此接口）
-    if (neteaseSources.length === 0) {
-      return {
-        success: false,
-        programs: [],
-        count: 0,
-        more: false,
-        error: '未找到可用的网易云音源'
-      }
-    }
-
-    // 尝试所有网易云源
-    for (const source of neteaseSources) {
-      try {
-        let cookieParam = ''
-        if (cookie) {
-          cookieParam = `&cookie=${encodeURIComponent(cookie)}`
-        }
-
-        const url = `${source.baseUrl}/dj/program?rid=${radioId}&limit=${limit}&offset=${offset}${cookieParam}`
-        console.log(`[getDjPrograms] Requesting: ${url}`)
-
-        const response: any = await $fetch(url, {
-          timeout: source.timeout || 8000
-        })
-
-        if (response.code === 200) {
-          return {
-            success: true,
-            programs: response.programs || [],
-            count: response.count || 0,
-            more: response.more || false
-          }
-        }
-      } catch (e: any) {
-        console.warn(`[getDjPrograms] Source ${source.id} failed:`, e.message)
-      }
-    }
-
-    return { success: false, programs: [], count: 0, more: false, error: '获取节目列表失败' }
-  }
-
   return {
     // 状态
     config: readonly(config),
@@ -2510,7 +310,6 @@ export const useMusicSources = () => {
     sourceStatus: readonly(sourceStatus),
     isSearching: readonly(isSearching),
     lastUsedSource: readonly(lastUsedSource),
-    isServerInChina: readonly(isServerInChina),
 
     // 计算属性
     sourceStatusSummary: getSourceStatusSummary,
@@ -2521,10 +320,7 @@ export const useMusicSources = () => {
     getSongDetail,
     getSongUrl,
     getLyrics,
-    getMetingSongInfo,
     updateSourceStatus,
-    validatePlayUrl,
-    getDjPrograms,
-    checkServerLocation
+    validatePlayUrl
   }
 }
diff --git a/app/drizzle/schema.ts b/app/drizzle/schema.ts
index 5ecfcf9..4399622 100644
--- a/app/drizzle/schema.ts
+++ b/app/drizzle/schema.ts
@@ -1,17 +1,12 @@
-import {bigint, boolean, index, integer, pgEnum, pgTable, serial, text, timestamp, uniqueIndex, uuid, varchar, unique} from 'drizzle-orm/pg-core';
+import {bigint, boolean, integer, pgEnum, pgTable, serial, text, timestamp, uuid, varchar, unique, index, uniqueIndex} from 'drizzle-orm/pg-core';
 import {relations, sql} from 'drizzle-orm';
 
 // 枚举定义
 export const blacklistTypeEnum = pgEnum('BlacklistType', ['SONG', 'KEYWORD', 'LANGUAGE', 'GENRE']);
-export const userStatusEnum = pgEnum('user_status', ['active', 'pending', 'withdrawn', 'graduate', 'rejected']);
+export const userStatusEnum = pgEnum('user_status', ['active', 'withdrawn', 'graduate', 'pending', 'rejected']);
 export const collaboratorStatusEnum = pgEnum('collaborator_status', ['PENDING', 'ACCEPTED', 'REJECTED']);
 export const replayRequestStatusEnum = pgEnum('replay_request_status', ['PENDING', 'FULFILLED', 'REJECTED']);
-export const cardCodeStatusEnum = pgEnum('card_code_status', [
-  'AVAILABLE',
-  'LOCKED',
-  'REDEEMED',
-  'INVALID'
-]);
+export const cardCodeStatusEnum = pgEnum('card_code_status', ['AVAILABLE', 'LOCKED', 'REDEEMED', 'INVALID']);
 
 // 用户表
 export const users = pgTable('User', {
@@ -22,6 +17,7 @@ export const users = pgTable('User', {
   name: text('name'),
   grade: text('grade'),
   class: text('class'),
+  studentId: text('studentId'),
   role: text('role').default('USER').notNull(),
   password: text('password').notNull(),
   email: text('email'),
@@ -30,27 +26,31 @@ export const users = pgTable('User', {
   lastLoginIp: text('lastLoginIp'),
   passwordChangedAt: timestamp('passwordChangedAt'),
   forcePasswordChange: boolean('forcePasswordChange').default(false).notNull(),
-  tokenVersion: integer('tokenVersion').default(0).notNull(),
   meowNickname: text('meowNickname'),
   meowBoundAt: timestamp('meowBoundAt'),
-  avatarProvider: text('avatarProvider'),
-  avatarProviderUserId: text('avatarProviderUserId'),
   status: userStatusEnum('status').default('active').notNull(),
   statusChangedAt: timestamp('statusChangedAt').defaultNow(),
   statusChangedBy: integer('statusChangedBy'),
-  // 注册时可选填写的备注，管理员审核时可修改
+  tokenVersion: integer('tokenVersion').default(0).notNull(),
+  avatarProvider: text('avatarProvider'),
+  avatarProviderUserId: text('avatarProviderUserId'),
   remark: text('remark'),
-}, (table) => [uniqueIndex('User_username_unique').on(table.username)]);
+}, (table) => [
+  uniqueIndex('User_username_unique').on(table.username),
+]);
 
-// 登录会话表，id 与 JWT 的 jti 一致
+// 认证会话表
 export const authSessions = pgTable('auth_sessions', {
-  id: uuid('id').primaryKey(),
+  id: uuid('id').primaryKey().defaultRandom(),
   userId: integer('user_id').notNull().references(() => users.id, { onDelete: 'cascade' }),
-  createdAt: timestamp('created_at', { withTimezone: true }).defaultNow().notNull(),
-  lastActiveAt: timestamp('last_active_at', { withTimezone: true }).defaultNow().notNull(),
+  sessionToken: varchar('session_token', { length: 255 }).notNull().unique(),
   expiresAt: timestamp('expires_at', { withTimezone: true }).notNull(),
+  createdAt: timestamp('created_at', { withTimezone: true }).defaultNow().notNull(),
+  updatedAt: timestamp('updated_at', { withTimezone: true }).defaultNow().notNull(),
   ipAddress: text('ip_address'),
   userAgent: text('user_agent'),
+  lastActiveAt: timestamp('last_active_at', { withTimezone: true }).defaultNow().notNull(),
+  isRevoked: boolean('is_revoked').default(false).notNull(),
   browser: text('browser'),
   operatingSystem: text('operating_system'),
   device: text('device'),
@@ -58,12 +58,23 @@ export const authSessions = pgTable('auth_sessions', {
   revokedAt: timestamp('revoked_at', { withTimezone: true }),
   revokedReason: text('revoked_reason')
 }, (table) => [
-  index('auth_sessions_user_active_idx').on(table.userId, table.revokedAt, table.expiresAt),
-  index('auth_sessions_last_active_idx').on(table.lastActiveAt)
+  index('auth_sessions_user_active_idx').on(table.userId, table.isRevoked, table.expiresAt),
+  index('auth_sessions_expires_at_idx').on(table.expiresAt),
+  index('auth_sessions_last_active_idx').on(table.lastActiveAt),
+  uniqueIndex('auth_sessions_session_token_unique').on(table.sessionToken),
 ]);
 
-export type AuthSession = typeof authSessions.$inferSelect;
-export type NewAuthSession = typeof authSessions.$inferInsert;
+// 年级班级配置表
+export const gradeClasses = pgTable('GradeClass', {
+  id: serial('id').primaryKey(),
+  createdAt: timestamp('createdAt').defaultNow().notNull(),
+  updatedAt: timestamp('updatedAt').defaultNow().notNull(),
+  grade: text('grade').notNull(),
+  class: text('class').notNull(),
+  enabled: boolean('enabled').default(true).notNull(),
+}, (table) => [
+  unique('grade_class_unique').on(table.grade, table.class),
+]);
 
 // 播出时段表
 export const playTimes = pgTable('PlayTime', {
@@ -77,25 +88,15 @@ export const playTimes = pgTable('PlayTime', {
   description: text('description'),
 });
 
-// 年级班级配置表（选择器选项来源，优先于从用户提取）
-export const gradeClass = pgTable(
-  'GradeClass',
-  {
-    id: serial('id').primaryKey(),
-    createdAt: timestamp('createdAt').defaultNow().notNull(),
-    updatedAt: timestamp('updatedAt').defaultNow().notNull(),
-    grade: text('grade').notNull(),
-    class: text('class').notNull(),
-  },
-  (table) => [unique('GradeClass_grade_class_unique').on(table.grade, table.class)],
-);
-
 // 歌曲表
 export const songs = pgTable('Song', {
   id: serial('id').primaryKey(),
   createdAt: timestamp('createdAt').defaultNow().notNull(),
   updatedAt: timestamp('updatedAt').defaultNow().notNull(),
-  title: text('title').notNull(),
+  kgHash: varchar('kg_hash', { length: 64 }),
+  title: varchar('title', { length: 100 }).notNull(),
+  singer: varchar('singer', { length: 100 }),
+  coverUrl: varchar('cover_url', { length: 255 }),
   artist: text('artist').notNull(),
   requesterId: integer('requesterId').notNull(),
   played: boolean('played').default(false).notNull(),
@@ -106,17 +107,18 @@ export const songs = pgTable('Song', {
   playUrl: text('playUrl'),
   musicPlatform: text('musicPlatform'),
   musicId: text('musicId'),
-  durationSeconds: integer('durationSeconds'),
   submissionNote: text('submissionNote'),
   submissionNotePublic: boolean('submissionNotePublic').default(false).notNull(),
-  // 公开留言审核状态：'pending' | 'approved' | 'rejected' | null（null 表示未启用审核或不涉及）
-  submissionNotePublicStatus: text('submissionNotePublicStatus'),
   hitRequestId: integer(),
+  expectedPlayDate: text('expectedPlayDate'),
+  expectedPlaySequence: integer('expectedPlaySequence'),
+  durationSeconds: integer('durationSeconds'),
+  submissionNotePublicStatus: text('submissionNotePublicStatus'),
   cardCodeId: integer('cardCodeId').references(() => cardCodes.id, { onDelete: 'set null' }),
 }, (table) => [
   index('song_card_code_id_idx').on(table.cardCodeId),
   index('song_semester_created_at_idx').on(table.semester, table.createdAt),
-  index('song_requester_id_idx').on(table.requesterId)
+  index('song_requester_id_idx').on(table.requesterId),
 ]);
 
 // 投票表
@@ -127,9 +129,18 @@ export const votes = pgTable('Vote', {
   userId: integer('userId').notNull(),
 }, (table) => [
   unique('vote_song_user_unique').on(table.songId, table.userId),
-  index('vote_user_song_idx').on(table.userId, table.songId)
+  index('vote_user_song_idx').on(table.userId, table.songId),
 ]);
 
+export const songComments = pgTable('SongComment', {
+  id: serial('id').primaryKey(),
+  createdAt: timestamp('createdAt').defaultNow().notNull(),
+  updatedAt: timestamp('updatedAt').defaultNow().notNull(),
+  songId: integer('songId').notNull(),
+  userId: integer('userId').notNull(),
+  content: text('content').notNull(),
+});
+
 // 排期表
 export const schedules = pgTable('Schedule', {
   id: serial('id').primaryKey(),
@@ -140,27 +151,39 @@ export const schedules = pgTable('Schedule', {
   played: boolean('played').default(false).notNull(),
   sequence: integer('sequence').default(1).notNull(),
   playTimeId: integer('playTimeId'),
-  // 草稿支持字段
   isDraft: boolean('isDraft').default(false).notNull(),
   publishedAt: timestamp('publishedAt'),
   replayRequestId: integer('replay_request_id'),
 }, (table) => [
-  index('schedule_published_song_idx').on(table.isDraft, table.songId, table.playDate),
-  index('schedule_published_date_idx').on(table.isDraft, table.playDate)
+  index('schedule_published_song_idx').on(table.publishedAt, table.songId),
+  index('schedule_published_date_idx').on(table.publishedAt, table.playDate),
 ]);
 
 // 排期备选池表
-export const scheduleSongPool = pgTable('ScheduleSongPool', {
+export const scheduleSongPool = pgTable('schedule_song_pool', {
   id: serial('id').primaryKey(),
   createdAt: timestamp('createdAt').defaultNow().notNull(),
-  songId: integer('songId').notNull().references(() => songs.id, { onDelete: 'cascade' }),
-  addedBy: integer('addedBy').references(() => users.id, { onDelete: 'set null' })
+  updatedAt: timestamp('updatedAt').defaultNow().notNull(),
+  songId: integer('song_id').notNull().references(() => songs.id, { onDelete: 'cascade' }),
+  targetPlayDate: timestamp('target_play_date'),
+  priority: integer('priority').default(0).notNull(),
+  addedBy: integer('added_by'),
+  note: text('note'),
+  status: text('status').default('PENDING').notNull(),
 }, (table) => [
-  unique('schedule_song_pool_song_unique').on(table.songId)
+  index('schedule_song_pool_song_id_idx').on(table.songId),
+  index('schedule_song_pool_target_date_idx').on(table.targetPlayDate),
 ]);
 
-export type ScheduleSongPool = typeof scheduleSongPool.$inferSelect;
-export type NewScheduleSongPool = typeof scheduleSongPool.$inferInsert;
+// 期望播出日期表
+export const expectedPlayDates = pgTable('ExpectedPlayDate', {
+  id: serial('id').primaryKey(),
+  createdAt: timestamp('createdAt').defaultNow().notNull(),
+  updatedAt: timestamp('updatedAt').defaultNow().notNull(),
+  date: text('date').notNull().unique(),
+  availableSequences: text('availableSequences').notNull(),
+  enabled: boolean('enabled').default(true).notNull(),
+});
 
 // 通知表
 export const notifications = pgTable('Notification', {
@@ -168,27 +191,21 @@ export const notifications = pgTable('Notification', {
   createdAt: timestamp('createdAt').defaultNow().notNull(),
   updatedAt: timestamp('updatedAt').defaultNow().notNull(),
   type: text('type').notNull(),
-  batchId: text('batchId'),
-  source: text('source').default('SYSTEM').notNull(),
-  senderId: integer('senderId'),
-  senderName: text('senderName'),
-  senderUsername: text('senderUsername'),
-  title: text('title'),
   message: text('message').notNull(),
-  important: boolean('important').default(false).notNull(),
   read: boolean('read').default(false).notNull(),
-  userDeleted: boolean('userDeleted').default(false).notNull(),
   userId: integer('userId').notNull(),
   songId: integer('songId'),
+  batchId: uuid('batch_id'),
+  source: text('source').default('SYSTEM').notNull(),
+  senderId: integer('sender_id'),
+  senderName: text('sender_name'),
+  senderUsername: text('sender_username'),
+  title: text('title'),
+  important: boolean('important').default(false).notNull(),
+  userDeleted: boolean('user_deleted').default(false).notNull(),
 }, (table) => [
-  index('notification_user_important_read_created_idx').on(
-    table.userId,
-    table.userDeleted,
-    table.important,
-    table.read,
-    table.createdAt
-  ),
-  index('notification_batch_id_idx').on(table.batchId)
+  index('notification_user_important_read_created_idx').on(table.userId, table.important, table.read, table.createdAt),
+  index('notification_batch_id_idx').on(table.batchId),
 ]);
 
 // 通知设置表
@@ -219,30 +236,22 @@ export const systemSettings = pgTable('SystemSettings', {
   id: serial('id').primaryKey(),
   createdAt: timestamp('createdAt').defaultNow().notNull(),
   updatedAt: timestamp('updatedAt').defaultNow().notNull(),
-  instanceId: text('instance_id'),
-  telemetryEnabled: boolean('telemetryEnabled').default(true).notNull(),
   enablePlayTimeSelection: boolean('enablePlayTimeSelection').default(false).notNull(),
   siteTitle: text('siteTitle'),
   siteLogoUrl: text('siteLogoUrl'),
   schoolLogoHomeUrl: text('schoolLogoHomeUrl'),
   schoolLogoPrintUrl: text('schoolLogoPrintUrl'),
   siteDescription: text('siteDescription'),
+  siteVersion: text('siteVersion'),
   submissionGuidelines: text('submissionGuidelines'),
   icpNumber: text('icpNumber'),
   gonganNumber: text('gonganNumber'),
-  showBeianIcon: boolean('showBeianIcon').default(false).notNull(),
   enableSubmissionLimit: boolean('enableSubmissionLimit').default(false).notNull(),
   dailySubmissionLimit: integer('dailySubmissionLimit'),
   weeklySubmissionLimit: integer('weeklySubmissionLimit'),
   monthlySubmissionLimit: integer('monthlySubmissionLimit'),
-  // 用户可见播出排期范围
-  scheduleDaysBeforeEnabled: boolean('scheduleDaysBeforeEnabled').default(false).notNull(),
-  scheduleDaysBefore: integer('scheduleDaysBefore').default(1).notNull(),
-  scheduleDaysAfterEnabled: boolean('scheduleDaysAfterEnabled').default(false).notNull(),
-  scheduleDaysAfter: integer('scheduleDaysAfter').default(1).notNull(),
   showBlacklistKeywords: boolean('showBlacklistKeywords').default(false).notNull(),
   hideStudentInfo: boolean('hideStudentInfo').default(true).notNull(),
-  // SMTP 邮件配置
   smtpEnabled: boolean('smtpEnabled').default(false).notNull(),
   smtpHost: text('smtpHost'),
   smtpPort: integer('smtpPort').default(587),
@@ -252,63 +261,75 @@ export const systemSettings = pgTable('SystemSettings', {
   smtpFromEmail: text('smtpFromEmail'),
   smtpFromName: text('smtpFromName').default('校园广播站'),
   enableRequestTimeLimitation: boolean('enableRequestTimeLimitation').default(false).notNull(),
-  forceBlockAllRequests: boolean().default(false).notNull(),
-  forcePasswordChangeOnFirstLogin: boolean('forcePasswordChangeOnFirstLogin').default(false).notNull(),
+  forceBlockAllRequests: boolean('forceBlockAllRequests').default(false).notNull(),
   enableReplayRequests: boolean('enableReplayRequests').default(false).notNull(),
   enableCollaborativeSubmission: boolean('enableCollaborativeSubmission').default(true).notNull(),
   enableSubmissionRemarks: boolean('enableSubmissionRemarks').default(false).notNull(),
-  // 卡密点歌相关开关（用于允许用户使用卡密或强制使用卡密投稿）
-  enableCardCodeRequests: boolean('enableCardCodeRequests').default(false).notNull(),
-  requireCardCodeForRequests: boolean('requireCardCodeForRequests').default(false).notNull(),
-  enableCardCodeLimitBypass: boolean('enableCardCodeLimitBypass').default(false).notNull(),
-  // 重复投稿限制：对同一首歌/同一歌手，在其进入排期后的设定时间窗口内禁止再次投稿
+  submissionNoteRequiresApproval: boolean('submissionNoteRequiresApproval').default(false).notNull(),
+  instanceId: text('instanceId'),
+  telemetryEnabled: boolean('telemetryEnabled').default(true).notNull(),
+  showBeianIcon: boolean('showBeianIcon').default(true).notNull(),
+  scheduleDaysDisplay: integer('scheduleDaysDisplay').default(7).notNull(),
+  scheduleDaysEditable: integer('scheduleDaysEditable').default(3).notNull(),
+  scheduleDaysRequestable: integer('scheduleDaysRequestable').default(14).notNull(),
+  scheduleDaysBeforeEnabled: boolean('scheduleDaysBeforeEnabled').default(false).notNull(),
+  scheduleDaysBefore: integer('scheduleDaysBefore').default(1).notNull(),
+  scheduleDaysAfterEnabled: boolean('scheduleDaysAfterEnabled').default(false).notNull(),
+  scheduleDaysAfter: integer('scheduleDaysAfter').default(1).notNull(),
+  forcePasswordChangeOnFirstLogin: boolean('forcePasswordChangeOnFirstLogin').default(false).notNull(),
   enableSubmissionRestriction: boolean('enableSubmissionRestriction').default(false).notNull(),
   submissionRestrictionScope: text('submissionRestrictionScope').default('all').notNull(),
   sameSongRestrictionHours: integer('sameSongRestrictionHours'),
   sameArtistRestrictionHours: integer('sameArtistRestrictionHours'),
-  
-  // 验证码配置
-  captchaProvider: text('captchaProvider').default('graphic').notNull(),
+  cardCodeEnabled: boolean('cardCodeEnabled').default(false).notNull(),
+  cardCodeSubmissionRequired: boolean('cardCodeSubmissionRequired').default(false).notNull(),
+  cardCodeVoteEnabled: boolean('cardCodeVoteEnabled').default(false).notNull(),
+  cardCodeReplayEnabled: boolean('cardCodeReplayEnabled').default(false).notNull(),
+  enableCardCodeRequests: boolean('enableCardCodeRequests').default(false).notNull(),
+  requireCardCodeForRequests: boolean('requireCardCodeForRequests').default(false).notNull(),
+  enableCardCodeLimitBypass: boolean('enableCardCodeLimitBypass').default(false).notNull(),
+  submissionRestrictionEnabled: boolean('submissionRestrictionEnabled').default(false).notNull(),
+  submissionRestrictionGradeEnabled: boolean('submissionRestrictionGradeEnabled').default(false).notNull(),
+  submissionRestrictionClassEnabled: boolean('submissionRestrictionClassEnabled').default(false).notNull(),
+  submissionRestrictionGraduateEnabled: boolean('submissionRestrictionGraduateEnabled').default(false).notNull(),
+  submissionRestrictionWithdrawnEnabled: boolean('submissionRestrictionWithdrawnEnabled').default(false).notNull(),
+  captchaProvider: text('captchaProvider').default('TURNSTILE'),
+  captchaEnabled: boolean('captchaEnabled').default(false).notNull(),
   turnstileSiteKey: text('turnstileSiteKey'),
   turnstileSecretKey: text('turnstileSecretKey'),
-  
-  // 注册配置
-  allowRegister: boolean('allowRegister').default(false).notNull(),
-  registerRequiresApproval: boolean('registerRequiresApproval').default(true).notNull(),
-  oauthRegisterRequiresApproval: boolean('oauthRegisterRequiresApproval').default(true).notNull(),
-  // 注册邮箱（选填→管理员开关控制；需 SMTP 已配置）
+  allowRegister: boolean('allowRegister').default(true).notNull(),
+  registerRequireEmail: boolean('registerRequireEmail').default(false).notNull(),
+  registerRequireEmailVerify: boolean('registerRequireEmailVerify').default(false).notNull(),
+  registerDefaultRole: text('registerDefaultRole').default('USER'),
+  registerEnabledGradeClasses: text('registerEnabledGradeClasses'),
+  registerRequiresApproval: boolean('registerRequiresApproval').default(false).notNull(),
+  oauthRegisterRequiresApproval: boolean('oauthRegisterRequiresApproval').default(false).notNull(),
   registerEmailRequired: boolean('registerEmailRequired').default(false).notNull(),
-  // 注册时必须选择年级班级（本地注册与第三方创建账户均强制）
   registerRequiresGradeClass: boolean('registerRequiresGradeClass').default(false).notNull(),
-  // 投稿公开留言审核
-  submissionNoteRequiresApproval: boolean('submissionNoteRequiresApproval').default(false).notNull(),
-
-  // OAuth 配置
+  oauthEnabled: boolean('oauthEnabled').default(false).notNull(),
+  oauthAllowRegister: boolean('oauthAllowRegister').default(true).notNull(),
+  oauthAllowLogin: boolean('oauthAllowLogin').default(true).notNull(),
+  oauthAllowBind: boolean('oauthAllowBind').default(true).notNull(),
   allowOAuthRegistration: boolean('allowOAuthRegistration').default(false).notNull(),
   oauthRedirectUri: text('oauthRedirectUri'),
   oauthStateSecret: text('oauthStateSecret'),
   oauthProviders: text('oauthProviders').default('[]'),
-  // GitHub OAuth
   githubOAuthEnabled: boolean('githubOAuthEnabled').default(false).notNull(),
   githubClientId: text('githubClientId'),
   githubClientSecret: text('githubClientSecret'),
-  // Casdoor OAuth
   casdoorOAuthEnabled: boolean('casdoorOAuthEnabled').default(false).notNull(),
   casdoorServerUrl: text('casdoorServerUrl'),
   casdoorClientId: text('casdoorClientId'),
   casdoorClientSecret: text('casdoorClientSecret'),
   casdoorOrganizationName: text('casdoorOrganizationName'),
-  // Google OAuth
   googleOAuthEnabled: boolean('googleOAuthEnabled').default(false).notNull(),
   googleClientId: text('googleClientId'),
   googleClientSecret: text('googleClientSecret'),
-  // 聚合登陆
   aggregateOAuthEnabled: boolean('aggregateOAuthEnabled').default(false).notNull(),
   aggregateOAuthAppId: text('aggregateOAuthAppId'),
   aggregateOAuthAppKey: text('aggregateOAuthAppKey'),
   aggregateOAuthLoginType: text('aggregateOAuthLoginType').default('qq'),
   aggregateOAuthEndpoint: text('aggregateOAuthEndpoint'),
-  // Custom OAuth2
   customOAuthEnabled: boolean('customOAuthEnabled').default(false).notNull(),
   customOAuthDisplayName: text('customOAuthDisplayName'),
   customOAuthAuthorizeUrl: text('customOAuthAuthorizeUrl'),
@@ -322,24 +343,17 @@ export const systemSettings = pgTable('SystemSettings', {
   customOAuthNameField: text('customOAuthNameField'),
   customOAuthEmailField: text('customOAuthEmailField'),
   customOAuthAvatarField: text('customOAuthAvatarField'),
-  // 图形验证码
-  captchaEnabled: boolean('captchaEnabled').default(false).notNull(),
   captchaMaxFailures: integer('captchaMaxFailures').default(3).notNull(),
-
-  // 自动备份配置
   autoBackupEnabled: boolean('autoBackupEnabled').default(false).notNull(),
+  autoBackupIntervalHours: integer('autoBackupIntervalHours').default(24).notNull(),
+  autoBackupRetentionDays: integer('autoBackupRetentionDays').default(30).notNull(),
   autoBackupConfig: text('autoBackupConfig'),
-
-  // 站点统计代码（任意站点统计平台的 HTML/JS 片段，注入 SSR 页面 <head>）
-  statisticsCodeEnabled: boolean('statisticsCodeEnabled').default(false).notNull(),
   statisticsCode: text('statisticsCode'),
-
-  // 主题管理配置
-  defaultTheme: text('defaultTheme').default('System').notNull(),
-  enabledThemes: text('enabledThemes').default('["System","ClassicDark","ClassicLight","ModernLight"]').notNull(),
-  // 平台管理配置
-  enabledPlatforms: text('enabledPlatforms').default('["netease","tencent","bilibili","migu"]'),
-  platformOrder: text('platformOrder').default('["netease","tencent","bilibili","migu"]'),
+  statisticsCodeEnabled: boolean('statisticsCodeEnabled').default(false).notNull(),
+  defaultTheme: text('defaultTheme').default('ClassicLight').notNull(),
+  enabledThemes: text('enabledThemes').default('[\"ClassicLight\",\"ModernLight\"]').notNull(),
+  enabledPlatforms: text('enabledPlatforms'),
+  platformOrder: text('platformOrder'),
 });
 
 // 歌曲黑名单表
@@ -354,6 +368,124 @@ export const songBlacklists = pgTable('SongBlacklist', {
   createdBy: integer('createdBy'),
 });
 
+// 卡密表
+export const cardCodes = pgTable('card_codes', {
+  id: serial('id').primaryKey(),
+  code: varchar('code', { length: 64 }).notNull().unique(),
+  status: cardCodeStatusEnum('status').default('AVAILABLE').notNull(),
+  type: text('type').notNull(),
+  value: integer('value').default(1).notNull(),
+  createdAt: timestamp('created_at', { withTimezone: true }).defaultNow().notNull(),
+  updatedAt: timestamp('updated_at', { withTimezone: true }).defaultNow().notNull(),
+  expiresAt: timestamp('expires_at', { withTimezone: true }),
+  lockedAt: timestamp('locked_at', { withTimezone: true }),
+  lockedBy: integer('locked_by'),
+  batchId: varchar('batch_id', { length: 64 }),
+  note: text('note'),
+}, (table) => [
+  index('card_codes_status_idx').on(table.status),
+  index('card_codes_batch_id_idx').on(table.batchId),
+  index('card_codes_expires_at_idx').on(table.expiresAt),
+]);
+
+// 卡密兑换记录表
+export const cardCodeRedemptions = pgTable('card_code_redemptions', {
+  id: serial('id').primaryKey(),
+  cardCodeId: integer('card_code_id').notNull().references(() => cardCodes.id, { onDelete: 'cascade' }),
+  userId: integer('user_id').notNull().references(() => users.id, { onDelete: 'cascade' }),
+  redeemedAt: timestamp('redeemed_at', { withTimezone: true }).defaultNow().notNull(),
+  songId: integer('song_id').references(() => songs.id, { onDelete: 'set null' }),
+  purpose: text('purpose').notNull(),
+}, (table) => [
+  index('card_code_redemptions_user_id_idx').on(table.userId),
+  index('card_code_redemptions_card_code_id_idx').on(table.cardCodeId),
+]);
+
+// OAuth 提供商表
+export const oauthProviders = pgTable('oauth_providers', {
+  id: serial('id').primaryKey(),
+  name: text('name').notNull(),
+  displayName: text('displayName'),
+  enabled: boolean('enabled').default(true).notNull(),
+  clientId: text('clientId'),
+  clientSecret: text('clientSecret'),
+  authorizationEndpoint: text('authorizationEndpoint'),
+  tokenEndpoint: text('tokenEndpoint'),
+  userInfoEndpoint: text('userInfoEndpoint'),
+  scope: text('scope'),
+  redirectUri: text('redirectUri'),
+  usernameClaim: text('usernameClaim').default('preferred_username'),
+  nameClaim: text('nameClaim').default('name'),
+  emailClaim: text('emailClaim').default('email'),
+  avatarClaim: text('avatarClaim'),
+  createdAt: timestamp('created_at').defaultNow().notNull(),
+  updatedAt: timestamp('updated_at').defaultNow().notNull(),
+  sortOrder: integer('sortOrder').default(0).notNull(),
+  icon: text('icon'),
+});
+
+// 用户 Passkeys 表
+export const userPasskeys = pgTable('user_passkeys', {
+  id: text('id').primaryKey(),
+  userId: integer('user_id').notNull().references(() => users.id, { onDelete: 'cascade' }),
+  name: text('name'),
+  publicKey: text('public_key').notNull(),
+  credentialDeviceType: text('credential_device_type').notNull(),
+  credentialBackedUp: boolean('credential_backed_up').notNull(),
+  transports: text('transports'),
+  counter: integer('counter').default(0).notNull(),
+  createdAt: timestamp('created_at', { withTimezone: true }).defaultNow().notNull(),
+  lastUsedAt: timestamp('last_used_at', { withTimezone: true }),
+}, (table) => [
+  index('user_passkeys_user_id_idx').on(table.userId),
+]);
+
+// Passkey Challenges 表
+export const passkeyChallenges = pgTable('passkey_challenges', {
+  id: uuid('id').primaryKey().defaultRandom(),
+  challenge: text('challenge').notNull(),
+  type: text('type').notNull(),
+  userId: integer('user_id'),
+  expiresAt: timestamp('expires_at', { withTimezone: true }).notNull(),
+  createdAt: timestamp('created_at', { withTimezone: true }).defaultNow().notNull(),
+}, (table) => [
+  index('passkey_challenges_challenge_idx').on(table.challenge),
+  index('passkey_challenges_expires_at_idx').on(table.expiresAt),
+]);
+
+// 备份记录表
+export const backupRecords = pgTable('backup_records', {
+  id: serial('id').primaryKey(),
+  filename: text('filename').notNull(),
+  filePath: text('file_path').notNull(),
+  fileSize: bigint('file_size', { mode: 'number' }).notNull(),
+  type: text('type').default('MANUAL').notNull(),
+  status: text('status').default('COMPLETED').notNull(),
+  errorMessage: text('error_message'),
+  createdAt: timestamp('created_at', { withTimezone: true }).defaultNow().notNull(),
+  startedAt: timestamp('started_at', { withTimezone: true }),
+  completedAt: timestamp('completed_at', { withTimezone: true }),
+  createdBy: integer('created_by'),
+  expiresAt: timestamp('expires_at', { withTimezone: true }),
+}, (table) => [
+  index('backup_records_created_at_idx').on(table.createdAt),
+  index('backup_records_status_idx').on(table.status),
+]);
+
+// 投稿限制豁免表
+export const submissionRestrictionExemptions = pgTable('submission_restriction_exemptions', {
+  id: serial('id').primaryKey(),
+  userId: integer('user_id').notNull().references(() => users.id, { onDelete: 'cascade' }),
+  exemptionType: text('exemption_type').notNull(),
+  reason: text('reason'),
+  createdAt: timestamp('created_at', { withTimezone: true }).defaultNow().notNull(),
+  expiresAt: timestamp('expires_at', { withTimezone: true }),
+  createdBy: integer('created_by'),
+}, (table) => [
+  unique('submission_restriction_exemptions_user_type_unique').on(table.userId, table.exemptionType),
+  index('submission_restriction_exemptions_user_id_idx').on(table.userId),
+]);
+
 // API Keys表
 export const apiKeys = pgTable('api_keys', {
   id: uuid('id').primaryKey().defaultRandom(),
@@ -368,7 +500,6 @@ export const apiKeys = pgTable('api_keys', {
   lastUsedAt: timestamp('last_used_at', { withTimezone: true }),
   createdByUserId: integer('created_by_user_id').notNull(),
   usageCount: integer('usage_count').default(0).notNull(),
-
 });
 
 // API Key权限表
@@ -399,9 +530,6 @@ export const apiLogs = pgTable('api_logs', {
 export const userStatusLogs = pgTable('user_status_logs', {
   id: serial('id').primaryKey(),
   userId: integer('user_id').notNull(),
-  // 审计快照：用户被删除后仍可追溯（如注册审核拒绝）
-  username: text('username'),
-  name: text('name'),
   oldStatus: userStatusEnum('old_status'),
   newStatus: userStatusEnum('new_status').notNull(),
   reason: text('reason'),
@@ -418,34 +546,29 @@ export const requestTimes = pgTable("RequestTime", {
   endTime: timestamp({ mode: 'string' }).notNull(),
   enabled: boolean().default(true).notNull(),
   description: text(),
-  // You can use { mode: "bigint" } if numbers are exceeding js number limitations
   expected: bigint({ mode: "number" }).default(0).notNull(),
-  // You can use { mode: "bigint" } if numbers are exceeding js number limitations
   accepted: bigint({ mode: "number" }).default(0).notNull(),
   past: boolean().default(false).notNull(),
 });
 
 // 联合投稿人表
 export const songCollaborators = pgTable('song_collaborators', {
-    id: uuid('id').primaryKey().defaultRandom(),
-    songId: integer('song_id').notNull(),
-    userId: integer('user_id').notNull(),
-    status: collaboratorStatusEnum('status').default('PENDING').notNull(),
-    createdAt: timestamp('created_at', {withTimezone: true}).defaultNow().notNull(),
-    updatedAt: timestamp('updated_at', {withTimezone: true}).defaultNow().notNull(),
-}, (table) => [
-    index('song_collaborators_song_status_idx').on(table.songId, table.status),
-    index('song_collaborators_user_status_idx').on(table.userId, table.status)
-]);
+  id: uuid('id').primaryKey().defaultRandom(),
+  songId: integer('song_id').notNull(),
+  userId: integer('user_id').notNull(),
+  status: collaboratorStatusEnum('status').default('PENDING').notNull(),
+  createdAt: timestamp('created_at', { withTimezone: true }).defaultNow().notNull(),
+  updatedAt: timestamp('updated_at', { withTimezone: true }).defaultNow().notNull(),
+});
 
 // 联合投稿审计日志表
 export const collaborationLogs = pgTable('collaboration_logs', {
-    id: uuid('id').primaryKey().defaultRandom(),
-    collaboratorId: uuid('collaborator_id').notNull(),
-    action: varchar('action', {length: 50}).notNull(), // INVITE, ACCEPT, REJECT, REMOVE
-    operatorId: integer('operator_id').notNull(),
-    ipAddress: text('ip_address'),
-    createdAt: timestamp('created_at', {withTimezone: true}).defaultNow().notNull(),
+  id: uuid('id').primaryKey().defaultRandom(),
+  collaboratorId: uuid('collaborator_id').notNull(),
+  action: varchar('action', { length: 50 }).notNull(),
+  operatorId: integer('operator_id').notNull(),
+  ipAddress: text('ip_address'),
+  createdAt: timestamp('created_at', { withTimezone: true }).defaultNow().notNull(),
 });
 
 // 歌曲重播申请表
@@ -453,20 +576,12 @@ export const songReplayRequests = pgTable('song_replay_requests', {
   id: serial('id').primaryKey(),
   songId: integer('song_id').notNull(),
   userId: integer('user_id').notNull(),
-  createdAt: timestamp('created_at', {withTimezone: true}).defaultNow().notNull(),
-  updatedAt: timestamp('updated_at', {withTimezone: true}).defaultNow().notNull(),
+  createdAt: timestamp('created_at', { withTimezone: true }).defaultNow().notNull(),
+  updatedAt: timestamp('updated_at', { withTimezone: true }).defaultNow().notNull(),
   status: replayRequestStatusEnum('status').default('PENDING').notNull(),
-  preferredPlayTimeId: integer('preferred_play_time_id'),
-  submissionNote: text('submission_note'),
-  submissionNotePublic: boolean('submission_note_public').default(false).notNull(),
-  submissionNotePublicStatus: text('submission_note_public_status'),
-}, (table) => [
-  // 同一用户对同一首歌同时最多一条待处理申请；历史申请（FULFILLED/REJECTED）允许多条
-  uniqueIndex('song_replay_requests_pending_song_user_unique')
-    .on(table.songId, table.userId)
-    .where(sql`${table.status} = 'PENDING'`),
-  index('song_replay_requests_user_status_song_idx').on(table.userId, table.status, table.songId)
-]);
+}, (t) => ({
+  unq: unique().on(t.songId, t.userId),
+}));
 
 // 第三方身份关联表
 export const userIdentities = pgTable('UserIdentity', {
@@ -475,53 +590,58 @@ export const userIdentities = pgTable('UserIdentity', {
   provider: text('provider').notNull(),
   providerUserId: text('providerUserId').notNull(),
   providerUsername: text('providerUsername'),
-  avatar: text('avatar'),
   createdAt: timestamp('createdAt').defaultNow().notNull(),
 }, (t) => ({
   unq: unique().on(t.provider, t.providerUserId),
 }));
 
-export const passwordAuditLogs = pgTable('PasswordAuditLog', {
+export const changelogEntries = pgTable('ChangelogEntry', {
   id: serial('id').primaryKey(),
-  userId: integer('userId').notNull(),
-  actorId: integer('actorId'),
-  action: text('action').notNull(),
-  success: boolean('success').notNull(),
-  ipAddress: text('ipAddress'),
-  userAgent: text('userAgent'),
-  failureReason: text('failureReason'),
-  createdAt: timestamp('createdAt', { withTimezone: true }).defaultNow().notNull()
-}, (table) => ({
-  userCreatedIdx: index('PasswordAuditLog_user_created_idx').on(table.userId, table.createdAt)
-}));
+  createdAt: timestamp('createdAt').defaultNow().notNull(),
+  updatedAt: timestamp('updatedAt').defaultNow().notNull(),
+  version: text('version').notNull(),
+  title: text('title').notNull(),
+  content: text('content').notNull(),
+  published: boolean('published').default(false).notNull(),
+  publishedAt: timestamp('publishedAt'),
+  createdBy: integer('createdBy'),
+});
 
-export const passwordRateLimits = pgTable('PasswordRateLimit', {
-  key: text('key').primaryKey(),
-  count: integer('count').notNull(),
-  resetAt: timestamp('resetAt', { withTimezone: true }).notNull()
-}, (table) => ({
-  resetIdx: index('PasswordRateLimit_reset_idx').on(table.resetAt)
-}));
+// 邮件模板表
+export const emailTemplates = pgTable('EmailTemplate', {
+  id: serial('id').primaryKey(),
+  createdAt: timestamp('createdAt').defaultNow().notNull(),
+  updatedAt: timestamp('updatedAt').defaultNow().notNull(),
+  key: varchar('key', { length: 100 }).notNull(),
+  name: varchar('name', { length: 200 }).notNull(),
+  subject: varchar('subject', { length: 300 }).notNull(),
+  html: text('html').notNull(),
+  updatedByUserId: integer('updatedByUserId'),
+});
 
 // 关系定义
 export const usersRelations = relations(users, ({ many, one }) => ({
   songs: many(songs),
   votes: many(votes),
   notifications: many(notifications),
+  songComments: many(songComments),
   identities: many(userIdentities),
   notificationSettings: one(notificationSettings, {
     fields: [users.id],
     references: [notificationSettings.userId],
   }),
   apiKeys: many(apiKeys),
-  sessions: many(authSessions),
   statusLogs: many(userStatusLogs),
-    collaborations: many(songCollaborators),
+  collaborations: many(songCollaborators),
   replayRequests: many(songReplayRequests),
   statusChangedByUser: one(users, {
     fields: [users.statusChangedBy],
     references: [users.id],
   }),
+  authSessions: many(authSessions),
+  passkeys: many(userPasskeys),
+  cardCodeRedemptions: many(cardCodeRedemptions),
+  submissionRestrictionExemptions: many(submissionRestrictionExemptions),
 }));
 
 export const userIdentitiesRelations = relations(userIdentities, ({ one }) => ({
@@ -531,6 +651,20 @@ export const userIdentitiesRelations = relations(userIdentities, ({ one }) => ({
   }),
 }));
 
+export const authSessionsRelations = relations(authSessions, ({ one }) => ({
+  user: one(users, {
+    fields: [authSessions.userId],
+    references: [users.id],
+  }),
+}));
+
+export const userPasskeysRelations = relations(userPasskeys, ({ one }) => ({
+  user: one(users, {
+    fields: [userPasskeys.userId],
+    references: [users.id],
+  }),
+}));
+
 export const songsRelations = relations(songs, ({ one, many }) => ({
   requester: one(users, {
     fields: [songs.requesterId],
@@ -541,10 +675,28 @@ export const songsRelations = relations(songs, ({ one, many }) => ({
     references: [playTimes.id],
   }),
   votes: many(votes),
+  comments: many(songComments),
   schedules: many(schedules),
   notifications: many(notifications),
-    collaborators: many(songCollaborators),
-    replayRequests: many(songReplayRequests),
+  collaborators: many(songCollaborators),
+  replayRequests: many(songReplayRequests),
+  cardCode: one(cardCodes, {
+    fields: [songs.cardCodeId],
+    references: [cardCodes.id],
+  }),
+  scheduleSongPool: many(scheduleSongPool),
+  cardCodeRedemptions: many(cardCodeRedemptions),
+}));
+
+export const songCommentsRelations = relations(songComments, ({ one }) => ({
+  song: one(songs, {
+    fields: [songComments.songId],
+    references: [songs.id],
+  }),
+  user: one(users, {
+    fields: [songComments.userId],
+    references: [users.id],
+  }),
 }));
 
 export const votesRelations = relations(votes, ({ one }) => ({
@@ -569,6 +721,13 @@ export const schedulesRelations = relations(schedules, ({ one }) => ({
   }),
 }));
 
+export const scheduleSongPoolRelations = relations(scheduleSongPool, ({ one }) => ({
+  song: one(songs, {
+    fields: [scheduleSongPool.songId],
+    references: [songs.id],
+  }),
+}));
+
 export const notificationsRelations = relations(notifications, ({ one }) => ({
   user: one(users, {
     fields: [notifications.userId],
@@ -578,6 +737,10 @@ export const notificationsRelations = relations(notifications, ({ one }) => ({
     fields: [notifications.songId],
     references: [songs.id],
   }),
+  sender: one(users, {
+    fields: [notifications.senderId],
+    references: [users.id],
+  }),
 }));
 
 export const notificationSettingsRelations = relations(notificationSettings, ({ one }) => ({
@@ -592,7 +755,6 @@ export const playTimesRelations = relations(playTimes, ({ many }) => ({
   schedules: many(schedules),
 }));
 
-// API框架关系定义
 export const apiKeysRelations = relations(apiKeys, ({ one, many }) => ({
   createdByUser: one(users, {
     fields: [apiKeys.createdByUserId],
@@ -627,61 +789,90 @@ export const userStatusLogsRelations = relations(userStatusLogs, ({ one }) => ({
   }),
 }));
 
-export const songCollaboratorsRelations = relations(songCollaborators, ({one, many}) => ({
-    song: one(songs, {
-        fields: [songCollaborators.songId],
-        references: [songs.id],
-    }),
-    user: one(users, {
-        fields: [songCollaborators.userId],
-        references: [users.id],
-    }),
-    logs: many(collaborationLogs),
+export const songCollaboratorsRelations = relations(songCollaborators, ({ one, many }) => ({
+  song: one(songs, {
+    fields: [songCollaborators.songId],
+    references: [songs.id],
+  }),
+  user: one(users, {
+    fields: [songCollaborators.userId],
+    references: [users.id],
+  }),
+  logs: many(collaborationLogs),
 }));
 
-export const collaborationLogsRelations = relations(collaborationLogs, ({one}) => ({
-    collaborator: one(songCollaborators, {
-        fields: [collaborationLogs.collaboratorId],
-        references: [songCollaborators.id],
-    }),
-    operator: one(users, {
-        fields: [collaborationLogs.operatorId],
-        references: [users.id],
-    }),
+export const collaborationLogsRelations = relations(collaborationLogs, ({ one }) => ({
+  collaborator: one(songCollaborators, {
+    fields: [collaborationLogs.collaboratorId],
+    references: [songCollaborators.id],
+  }),
+  operator: one(users, {
+    fields: [collaborationLogs.operatorId],
+    references: [users.id],
+  }),
 }));
 
-export const songReplayRequestsRelations = relations(songReplayRequests, ({one}) => ({
-    song: one(songs, {
-        fields: [songReplayRequests.songId],
-        references: [songs.id],
-    }),
-    user: one(users, {
-        fields: [songReplayRequests.userId],
-        references: [users.id],
-    }),
+export const songReplayRequestsRelations = relations(songReplayRequests, ({ one }) => ({
+  song: one(songs, {
+    fields: [songReplayRequests.songId],
+    references: [songs.id],
+  }),
+  user: one(users, {
+    fields: [songReplayRequests.userId],
+    references: [users.id],
+  }),
 }));
 
-// 邮件模板表（仅存储自定义覆盖，内置模板在代码中定义）
-export const emailTemplates = pgTable('EmailTemplate', {
-  id: serial('id').primaryKey(),
-  createdAt: timestamp('createdAt').defaultNow().notNull(),
-  updatedAt: timestamp('updatedAt').defaultNow().notNull(),
-  key: varchar('key', { length: 100 }).notNull(),
-  name: varchar('name', { length: 200 }).notNull(),
-  subject: varchar('subject', { length: 300 }).notNull(),
-  html: text('html').notNull(),
-  updatedByUserId: integer('updatedByUserId'),
-});
+export const cardCodesRelations = relations(cardCodes, ({ many }) => ({
+  songs: many(songs),
+  redemptions: many(cardCodeRedemptions),
+}));
+
+export const cardCodeRedemptionsRelations = relations(cardCodeRedemptions, ({ one }) => ({
+  cardCode: one(cardCodes, {
+    fields: [cardCodeRedemptions.cardCodeId],
+    references: [cardCodes.id],
+  }),
+  user: one(users, {
+    fields: [cardCodeRedemptions.userId],
+    references: [users.id],
+  }),
+  song: one(songs, {
+    fields: [cardCodeRedemptions.songId],
+    references: [songs.id],
+  }),
+}));
+
+export const submissionRestrictionExemptionsRelations = relations(submissionRestrictionExemptions, ({ one }) => ({
+  user: one(users, {
+    fields: [submissionRestrictionExemptions.userId],
+    references: [users.id],
+  }),
+  createdByUser: one(users, {
+    fields: [submissionRestrictionExemptions.createdBy],
+    references: [users.id],
+  }),
+}));
 
 // 导出所有表的类型
 export type User = typeof users.$inferSelect;
 export type NewUser = typeof users.$inferInsert;
+export type AuthSession = typeof authSessions.$inferSelect;
+export type NewAuthSession = typeof authSessions.$inferInsert;
+export type GradeClass = typeof gradeClasses.$inferSelect;
+export type NewGradeClass = typeof gradeClasses.$inferInsert;
 export type Song = typeof songs.$inferSelect;
 export type NewSong = typeof songs.$inferInsert;
 export type Vote = typeof votes.$inferSelect;
 export type NewVote = typeof votes.$inferInsert;
+export type SongComment = typeof songComments.$inferSelect;
+export type NewSongComment = typeof songComments.$inferInsert;
 export type Schedule = typeof schedules.$inferSelect;
 export type NewSchedule = typeof schedules.$inferInsert;
+export type ScheduleSongPool = typeof scheduleSongPool.$inferSelect;
+export type NewScheduleSongPool = typeof scheduleSongPool.$inferInsert;
+export type ExpectedPlayDate = typeof expectedPlayDates.$inferSelect;
+export type NewExpectedPlayDate = typeof expectedPlayDates.$inferInsert;
 export type Notification = typeof notifications.$inferSelect;
 export type NewNotification = typeof notifications.$inferInsert;
 export type NotificationSettings = typeof notificationSettings.$inferSelect;
@@ -694,6 +885,20 @@ export type SystemSettings = typeof systemSettings.$inferSelect;
 export type NewSystemSettings = typeof systemSettings.$inferInsert;
 export type SongBlacklist = typeof songBlacklists.$inferSelect;
 export type NewSongBlacklist = typeof songBlacklists.$inferInsert;
+export type CardCode = typeof cardCodes.$inferSelect;
+export type NewCardCode = typeof cardCodes.$inferInsert;
+export type CardCodeRedemption = typeof cardCodeRedemptions.$inferSelect;
+export type NewCardCodeRedemption = typeof cardCodeRedemptions.$inferInsert;
+export type OAuthProvider = typeof oauthProviders.$inferSelect;
+export type NewOAuthProvider = typeof oauthProviders.$inferInsert;
+export type UserPasskey = typeof userPasskeys.$inferSelect;
+export type NewUserPasskey = typeof userPasskeys.$inferInsert;
+export type PasskeyChallenge = typeof passkeyChallenges.$inferSelect;
+export type NewPasskeyChallenge = typeof passkeyChallenges.$inferInsert;
+export type BackupRecord = typeof backupRecords.$inferSelect;
+export type NewBackupRecord = typeof backupRecords.$inferInsert;
+export type SubmissionRestrictionExemption = typeof submissionRestrictionExemptions.$inferSelect;
+export type NewSubmissionRestrictionExemption = typeof submissionRestrictionExemptions.$inferInsert;
 export type ApiKey = typeof apiKeys.$inferSelect;
 export type NewApiKey = typeof apiKeys.$inferInsert;
 export type ApiKeyPermission = typeof apiKeyPermissions.$inferSelect;
@@ -708,55 +913,11 @@ export type CollaborationLog = typeof collaborationLogs.$inferSelect;
 export type NewCollaborationLog = typeof collaborationLogs.$inferInsert;
 export type SongReplayRequest = typeof songReplayRequests.$inferSelect;
 export type NewSongReplayRequest = typeof songReplayRequests.$inferInsert;
-export type EmailTemplate = typeof emailTemplates.$inferSelect;
-export type NewEmailTemplate = typeof emailTemplates.$inferInsert;export type RequestTime = typeof requestTimes.$inferSelect;
+export type RequestTime = typeof requestTimes.$inferSelect;
 export type NewRequestTime = typeof requestTimes.$inferInsert;
 export type UserIdentity = typeof userIdentities.$inferSelect;
 export type NewUserIdentity = typeof userIdentities.$inferInsert;
-// 卡密表
-export const cardCodes = pgTable('CardCode', {
-  id: serial('id').primaryKey(),
-  createdAt: timestamp('createdAt').defaultNow().notNull(),
-  updatedAt: timestamp('updatedAt').defaultNow().notNull(),
-  code: text('code').notNull().unique(),
-  status: cardCodeStatusEnum('status').default('AVAILABLE').notNull(),
-  lockedBy: integer('lockedBy').references(() => users.id, { onDelete: 'set null' }),
-  lockedAt: timestamp('lockedAt'),
-  redeemedBy: integer('redeemedBy').references(() => users.id, { onDelete: 'set null' }),
-  redeemedAt: timestamp('redeemedAt'),
-  note: text('note'),
-});
-
-// 卡密兑换日志表
-export const cardCodeRedeemLogs = pgTable('CardCodeRedeemLog', {
-  id: serial('id').primaryKey(),
-  createdAt: timestamp('createdAt').defaultNow().notNull(),
-  cardCodeId: integer('cardCodeId').references(() => cardCodes.id, { onDelete: 'set null' }),
-  codeSnapshot: text('codeSnapshot').notNull(),
-  redeemedBy: integer('redeemedBy').notNull().references(() => users.id, { onDelete: 'restrict' }),
-  redeemedAt: timestamp('redeemedAt').defaultNow().notNull(),
-  source: text('source').default('UNKNOWN').notNull(),
-  songId: integer('songId').references(() => songs.id, { onDelete: 'set null' })
-}, (table) => [
-  index('card_code_redeem_log_card_code_id_idx').on(table.cardCodeId)
-]);
-
-export type CardCode = typeof cardCodes.$inferSelect;
-export type NewCardCode = typeof cardCodes.$inferInsert;
-
-// 自动备份历史记录表
-export const backupHistory = pgTable('BackupHistory', {
-  id: serial('id').primaryKey(),
-  createdAt: timestamp('createdAt').defaultNow().notNull(),
-  filename: text('filename').notNull(),
-  totalRecords: integer('totalRecords').default(0).notNull(),
-  backupSize: integer('backupSize').default(0).notNull(),
-  methods: text('methods').notNull(), // JSON: { method: string; success: boolean; error?: string }[]
-  success: boolean('success').default(false).notNull(),
-  triggeredBy: text('triggeredBy'), // 'api' | 'manual'
-}, (table) => [
-  index('backup_history_created_at_idx').on(table.createdAt)
-]);
-
-export type BackupHistory = typeof backupHistory.$inferSelect;
-export type NewBackupHistory = typeof backupHistory.$inferInsert;
+export type ChangelogEntry = typeof changelogEntries.$inferSelect;
+export type NewChangelogEntry = typeof changelogEntries.$inferInsert;
+export type EmailTemplate = typeof emailTemplates.$inferSelect;
+export type NewEmailTemplate = typeof emailTemplates.$inferInsert;
diff --git a/app/pages/change-password.vue b/app/pages/change-password.vue
index 7cf54f4..7cad842 100644
--- a/app/pages/change-password.vue
+++ b/app/pages/change-password.vue
@@ -5,21 +5,29 @@
       <div class="info-section">
         <div class="info-content">
           <div class="logo-section">
-            <img alt="VoiceHub Logo" class="brand-logo" :src="getLogo()" />
-            <h1 v-if="siteTitle" class="brand-title">{{ siteTitle }}</h1>
+            <img
+              alt="VoiceHub Logo"
+              class="brand-logo"
+              :src="logo"
+              width="160"
+              height="160"
+              decoding="async"
+              fetchpriority="high"
+            >
+            <h1 v-if="siteTitle" class="brand-title">{{ siteTitle || 'VoiceHub' }}</h1>
           </div>
 
           <div v-if="isFirstLogin" class="welcome-message">
-            <h2>{{ locale.welcomeTitle }}</h2>
-            <p>{{ locale.welcomeDesc }}</p>
+            <h2>欢迎使用VoiceHub</h2>
+            <p>为了保障您的账号安全，请设置一个新的密码</p>
           </div>
           <div v-else class="security-message">
-            <h2>{{ locale.securityTitle }}</h2>
-            <p>{{ locale.securityDesc }}</p>
+            <h2>账号安全</h2>
+            <p>定期更新密码有助于保护您的账号安全</p>
           </div>
 
           <div class="security-tips">
-            <h3>{{ locale.tipsTitle }}</h3>
+            <h3>密码安全建议</h3>
             <div class="tip-list">
               <div class="tip-item">
                 <svg
@@ -31,7 +39,7 @@
                 >
                   <polyline points="20,6 9,17 4,12" />
                 </svg>
-                <span>{{ locale.tipMinLength }}</span>
+                <span>至少8个字符</span>
               </div>
               <div class="tip-item">
                 <svg
@@ -43,7 +51,7 @@
                 >
                   <polyline points="20,6 9,17 4,12" />
                 </svg>
-                <span>{{ locale.tipCase }}</span>
+                <span>包含大小写字母</span>
               </div>
               <div class="tip-item">
                 <svg
@@ -55,7 +63,7 @@
                 >
                   <polyline points="20,6 9,17 4,12" />
                 </svg>
-                <span>{{ locale.tipSpecial }}</span>
+                <span>包含数字和特殊字符</span>
               </div>
             </div>
           </div>
@@ -66,27 +74,21 @@
       <div class="form-section">
         <div class="form-container">
           <div class="form-header">
-            <h2>{{ isFirstLogin ? locale.setNewPassword : locale.changePasswordTitle }}</h2>
-            <p>{{ isFirstLogin ? locale.setNewPasswordDesc : locale.updatePasswordDesc }}</p>
+            <h2>{{ isFirstLogin ? '设置新密码' : '修改密码' }}</h2>
+            <p>{{ isFirstLogin ? '请设置一个安全的密码' : '更新您的登录密码' }}</p>
           </div>
 
-          <div class="password-form-shell">
-            <ClientOnly>
-              <ChangePasswordForm :is-first-login="isFirstLogin" />
-            </ClientOnly>
-          </div>
+          <ClientOnly>
+            <ChangePasswordForm :is-first-login="isFirstLogin" />
+          </ClientOnly>
 
           <div class="form-footer">
-            <NuxtLink v-if="!requirePasswordChange" class="back-link" to="/">
+            <NuxtLink class="back-link" to="/">
               <svg fill="none" stroke="currentColor" stroke-width="2" viewBox="0 0 24 24">
                 <polyline points="15,18 9,12 15,6" />
               </svg>
-              {{ locale.backToHome }}
+              返回主页
             </NuxtLink>
-            <button v-else class="back-link logout-link" type="button" @click="auth.logout()">
-              <Icon class="shrink-0" name="logout" :size="16" aria-hidden="true" />
-              {{ locale.logout }}
-            </button>
           </div>
         </div>
       </div>
@@ -96,22 +98,15 @@
 
 <script setup>
 import ChangePasswordForm from '~/components/Auth/ChangePasswordForm.vue'
-import Icon from '~/components/UI/Icon.vue'
-import { useLocale } from '~/utils/locale'
-import { useThemeImage } from '~/composables/useThemeImage'
+import { ref } from 'vue'
+import logo from '~~/public/images/logo.png'
 
 // 使用站点配置
 const { siteTitle, initSiteConfig } = useSiteConfig()
-const { changePassword: locale } = useLocale()
-const { getLogo } = useThemeImage()
 
 const auth = useAuth()
 const router = useRouter()
-const isFirstLogin = computed(() => {
-  const currentUser = auth.user.value
-  return currentUser?.needsInitialPasswordSetup === true
-})
-const requirePasswordChange = computed(() => !!auth.user.value?.requirePasswordChange)
+const isFirstLogin = ref(false)
 
 // 未登录用户重定向到登录页
 onMounted(async () => {
@@ -122,38 +117,43 @@ onMounted(async () => {
     router.push('/login')
     return
   }
+
+  // 检查是否需要修改密码（用于显示不同的UI提示）
+  if (import.meta.client) {
+    const userJson = localStorage.getItem('user')
+    if (userJson) {
+      const user = JSON.parse(userJson)
+      isFirstLogin.value = user.forcePasswordChange === true || !user.passwordChangedAt
+    }
+  }
 })
 </script>
 
 <style scoped>
 .auth-layout {
-  width: 100%;
   min-height: 100vh;
-  min-height: 100dvh;
-  background: var(--panel-bg-deepest);
+  background: var(--bg-primary, #ffffff);
   display: flex;
   align-items: center;
   justify-content: center;
   padding: 20px;
-  box-sizing: border-box;
-  overflow-y: auto;
 }
 
 .auth-container {
   width: 100%;
   max-width: 1200px;
-  background: var(--bg-primary);
+  background: var(--surface-primary, var(--bg-primary, #ffffff));
   border-radius: 24px;
-  border: 1px solid var(--panel-border-subtle);
+  border: 1px solid var(--border-primary, #e5e7eb);
   overflow: hidden;
   display: grid;
   grid-template-columns: 1fr 1fr;
   min-height: 600px;
-  margin: auto;
+  box-shadow: 0 10px 40px -10px rgba(15, 23, 42, 0.1);
 }
 
 .info-section {
-  background: linear-gradient(135deg, var(--color-indigo-hover) 0%, var(--color-collab-hover) 100%);
+  background: linear-gradient(135deg, #4f46e5 0%, #7c3aed 100%);
   padding: 60px 40px;
   display: flex;
   align-items: center;
@@ -169,7 +169,7 @@ onMounted(async () => {
   left: 0;
   right: 0;
   bottom: 0;
-  background: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><defs><pattern id="grid" width="10" height="10" patternUnits="userSpaceOnUse"><path d="M 10 0 L 0 0 0 10" fill="none" stroke="%23666" stroke-width="0.5"/></pattern></defs><rect width="100" height="100" fill="url(%23grid)"/></svg>');
+  background: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><defs><pattern id="grid" width="10" height="10" patternUnits="userSpaceOnUse"><path d="M 10 0 L 0 0 0 10" fill="none" stroke="rgba(255,255,255,0.1)" stroke-width="0.5"/></pattern></defs><rect width="100" height="100" fill="url(%23grid)"/></svg>');
   opacity: 0.3;
 }
 
@@ -195,7 +195,10 @@ onMounted(async () => {
   font-size: 36px;
   font-weight: 700;
   margin: 0;
-  color: white;
+  background: linear-gradient(135deg, var(--card-bg, #ffffff) 0%, #f0f0f0 100%);
+  -webkit-background-clip: text;
+  -webkit-text-fill-color: transparent;
+  background-clip: text;
 }
 
 .welcome-message,
@@ -214,7 +217,7 @@ onMounted(async () => {
 .welcome-message p,
 .security-message p {
   font-size: 16px;
-  color: var(--overlay-90);
+  color: rgba(255, 255, 255, 0.9);
   margin: 0;
   line-height: 1.6;
 }
@@ -241,16 +244,16 @@ onMounted(async () => {
   align-items: center;
   gap: 12px;
   padding: 12px 16px;
-  background: var(--overlay-10);
+  background: rgba(255, 255, 255, 0.1);
   border-radius: 8px;
   backdrop-filter: blur(10px);
-  border: 1px solid var(--overlay-20);
+  border: 1px solid rgba(255, 255, 255, 0.2);
 }
 
 .tip-icon {
   width: 16px;
   height: 16px;
-  color: var(--color-success);
+  color: #10b981;
   flex-shrink: 0;
 }
 
@@ -264,7 +267,7 @@ onMounted(async () => {
   display: flex;
   align-items: center;
   justify-content: center;
-  background: var(--bg-primary);
+  background: var(--surface-primary, var(--bg-primary, #ffffff));
 }
 
 .form-container {
@@ -275,11 +278,6 @@ onMounted(async () => {
   align-items: center;
 }
 
-.password-form-shell {
-  width: 100%;
-  min-width: 0;
-}
-
 .form-header {
   text-align: center;
   margin-bottom: 32px;
@@ -288,13 +286,13 @@ onMounted(async () => {
 .form-header h2 {
   font-size: 28px;
   font-weight: 700;
-  color: var(--text-primary);
+  color: var(--text-primary, #1a2332);
   margin: 0 0 8px 0;
 }
 
 .form-header p {
   font-size: 16px;
-  color: var(--text-tertiary-hover);
+  color: var(--text-secondary, #4a5568);
   margin: 0;
 }
 
@@ -308,10 +306,10 @@ onMounted(async () => {
   align-items: center;
   gap: 8px;
   padding: 12px 20px;
-  background: var(--panel-bg-deep);
-  border: 1px solid var(--panel-border);
+  background: var(--surface-secondary, var(--bg-secondary, #f7fafc));
+  border: 1px solid var(--border-primary, #e5e7eb);
   border-radius: 8px;
-  color: var(--text-secondary);
+  color: var(--text-secondary, #4a5568);
   text-decoration: none;
   font-size: 14px;
   font-weight: 500;
@@ -319,9 +317,9 @@ onMounted(async () => {
 }
 
 .back-link:hover {
-  background: var(--panel-border);
-  color: var(--text-primary);
-  border-color: var(--panel-border-light);
+  background: var(--surface-tertiary, var(--bg-tertiary, #edf2f7));
+  color: var(--text-primary, #1a2332);
+  border-color: var(--border-secondary, #cbd5e1);
 }
 
 .back-link svg {
diff --git a/app/pages/dashboard.vue b/app/pages/dashboard.vue
index d817469..fe6abeb 100644
--- a/app/pages/dashboard.vue
+++ b/app/pages/dashboard.vue
@@ -17,91 +17,114 @@
         <!-- 移动端侧边栏遮罩 -->
         <div
           v-if="sidebarOpen"
-          class="fixed inset-0 bg-bg-primary-60 backdrop-blur-sm z-40 lg:hidden transition-opacity duration-300"
+          class="fixed inset-0 bg-black/60 backdrop-blur-sm z-40 lg:hidden transition-opacity duration-300"
           @click="closeSidebar"
         />
 
         <!-- 主内容区域 -->
         <main
-          class="flex-1 flex flex-col h-screen overflow-hidden lg:ml-64 relative bg-bg-primary text-text-primary"
+          class="flex-1 flex flex-col h-screen overflow-hidden lg:ml-64 relative bg-[#09090b] text-zinc-100"
         >
           <header
-            class="h-16 shrink-0 flex items-center justify-between px-4 md:px-8 border-b border-border-secondary bg-bg-primary-60 backdrop-blur-xl z-30"
+            class="admin-main-header h-16 shrink-0 flex items-center justify-between px-4 md:px-8 border-b border-zinc-800 bg-zinc-950/60 backdrop-blur-xl z-30"
           >
             <div class="flex items-center gap-3">
               <button
-                class="lg:hidden p-2 text-text-tertiary hover:bg-bg-tertiary rounded-lg transition-colors"
+                class="admin-mobile-menu-btn lg:hidden p-2 text-zinc-400 hover:bg-zinc-800 rounded-lg transition-colors"
                 @click="toggleSidebar"
               >
                 <Menu :size="20" />
               </button>
               <h1 class="text-xl font-bold tracking-tight">{{ getPageTitle() }}</h1>
             </div>
-            <div class="flex items-center gap-4">
-              <!-- 这里可以添加顶部操作按钮 -->
+            <div class="flex items-center gap-2">
+              <button
+                class="px-3 py-1.5 text-xs font-semibold rounded-lg border border-zinc-700 text-zinc-300 hover:bg-zinc-800 transition-colors"
+                @click="openOnboardingTutorial"
+              >
+                新手引导
+              </button>
             </div>
           </header>
 
           <div
-            class="flex-1 custom-scrollbar p-4 md:p-8 overflow-y-auto"
+            ref="contentScrollRef"
+            class="admin-content-area flex-1 custom-scrollbar p-4 md:p-8 overflow-y-auto"
           >
             <!-- 移动端返回顶部按钮 -->
             <button
               v-if="showBackToTop"
-              :aria-label="locale.backToTop"
-              class="fixed bottom-8 right-8 p-3 bg-primary-hover text-text-primary rounded-full shadow-lg hover:bg-primary transition-all z-50"
+              aria-label="返回顶部"
+              class="back-to-top-btn fixed bottom-8 right-8 p-3 bg-blue-600 text-white rounded-full shadow-lg hover:bg-blue-700 transition-all z-50"
               @click="scrollToTop"
             >
               <ChevronUp :size="24" />
             </button>
 
-            <!-- 数据概览 -->
-            <div
-              v-if="activeTab === 'overview' && permissions.canAccessPage('overview')"
-              class="animate-in fade-in slide-in-from-bottom-4 duration-500"
-            >
-              <LazyAdminOverviewDashboard @navigate="handleNavigate" />
-            </div>
+            <div :key="`${activeTab}-${tabRefreshKey}`">
+              <!-- 数据概览 -->
+              <div
+                v-if="activeTab === 'overview' && permissions.canAccessPage('overview')"
+                class="animate-in fade-in slide-in-from-bottom-4 duration-500"
+              >
+                <LazyAdminOverviewDashboard @navigate="handleNavigate" />
+              </div>
 
-            <!-- 歌曲管理 -->
-            <div
-              v-if="activeTab === 'songs' && permissions.canAccessPage('songs')"
-              class="animate-in fade-in slide-in-from-bottom-4 duration-500"
-            >
-              <LazyAdminSongManagement />
-            </div>
+              <!-- 工作流教程 -->
+              <div
+                v-if="activeTab === 'workflow-tutorial' && permissions.canAccessPage('workflow-tutorial')"
+                class="animate-in fade-in slide-in-from-bottom-4 duration-500"
+              >
+                <LazyAdminWorkflowTutorial />
+              </div>
 
-            <!-- 排期管理 -->
-            <div
-              v-if="activeTab === 'schedule' && permissions.canAccessPage('schedule')"
-              class="animate-in fade-in slide-in-from-bottom-4 duration-500 h-full"
-            >
-              <LazyAdminScheduleManager />
-            </div>
+              <!-- 歌曲管理 -->
+              <div
+                v-if="activeTab === 'songs' && permissions.canAccessPage('songs')"
+                class="animate-in fade-in slide-in-from-bottom-4 duration-500"
+              >
+                <LazyAdminSongManagement />
+              </div>
 
-            <!-- 打印排期 -->
-            <div
-              v-if="activeTab === 'print' && permissions.canAccessPage('print')"
-              class="animate-in fade-in slide-in-from-bottom-4 duration-500 h-full"
-            >
-              <LazyAdminSchedulePrinter />
-            </div>
+              <!-- 排期管理 -->
+              <div
+                v-if="activeTab === 'schedule' && permissions.canAccessPage('schedule')"
+                class="animate-in fade-in slide-in-from-bottom-4 duration-500 h-full"
+              >
+                <LazyAdminScheduleManager />
+              </div>
 
-            <!-- 数据分析 -->
-            <div
-              v-if="activeTab === 'data-analysis' && permissions.canAccessPage('data-analysis')"
-              class="animate-in fade-in slide-in-from-bottom-4 duration-500"
-            >
-              <LazyAdminDataAnalysisPanel />
-            </div>
+              <!-- 打印排期 -->
+              <div
+                v-if="activeTab === 'print' && permissions.canAccessPage('print')"
+                class="animate-in fade-in slide-in-from-bottom-4 duration-500 h-full"
+              >
+                <LazyAdminSchedulePrinter />
+              </div>
 
-            <!-- 用户管理 -->
-            <div
-              v-if="activeTab === 'users' && permissions.canAccessPage('users')"
-              class="animate-in fade-in slide-in-from-bottom-4 duration-500"
-            >
-              <LazyAdminUserManager />
-            </div>
+              <!-- 歌单卡片图片 -->
+              <div
+                v-if="activeTab === 'playlist-card' && permissions.canAccessPage('print')"
+                class="animate-in fade-in slide-in-from-bottom-4 duration-500 h-full"
+              >
+                <LazyAdminPlaylistCardPage />
+              </div>
+
+              <!-- 数据分析 -->
+              <div
+                v-if="activeTab === 'data-analysis' && permissions.canAccessPage('data-analysis')"
+                class="animate-in fade-in slide-in-from-bottom-4 duration-500"
+              >
+                <LazyAdminDataAnalysisPanel />
+              </div>
+
+              <!-- 用户管理 -->
+              <div
+                v-if="activeTab === 'users' && permissions.canAccessPage('users')"
+                class="animate-in fade-in slide-in-from-bottom-4 duration-500"
+              >
+                <LazyAdminUserManager />
+              </div>
 
             <!-- 消息管理 -->
             <div
@@ -151,14 +174,6 @@
               <LazyAdminBlacklistManager />
             </div>
 
-            <!-- 年级班级管理 -->
-            <div
-              v-if="activeTab === 'grade-class' && permissions.canAccessPage('grade-class')"
-              class="animate-in fade-in slide-in-from-bottom-4 duration-500"
-            >
-              <LazyAdminGradeClassManager />
-            </div>
-
             <!-- 站点配置 -->
             <div
               v-if="activeTab === 'site-config' && permissions.canAccessPage('site-config')"
@@ -167,12 +182,20 @@
               <LazyAdminSiteConfigManager />
             </div>
 
-            <!-- 音源控制 -->
+            <!-- 更新日志 -->
             <div
-              v-if="activeTab === 'music-source' && permissions.canAccessPage('music-source')"
+              v-if="activeTab === 'changelog' && permissions.canAccessPage('changelog')"
               class="animate-in fade-in slide-in-from-bottom-4 duration-500"
             >
-              <LazyAdminMusicSourceController />
+              <LazyAdminChangelogManager />
+            </div>
+
+            <!-- 选曲日期管理 -->
+            <div
+              v-if="activeTab === 'expected-play-dates' && permissions.canAccessPage('settings')"
+              class="animate-in fade-in slide-in-from-bottom-4 duration-500 h-full"
+            >
+              <LazyAdminExpectedPlayDates />
             </div>
 
             <!-- 数据库操作 -->
@@ -183,6 +206,14 @@
               <LazyAdminDatabaseManager />
             </div>
 
+            <!-- 权限组管理 -->
+            <div
+              v-if="activeTab === 'roles' && permissions.canAccessPage('roles')"
+              class="animate-in fade-in slide-in-from-bottom-4 duration-500"
+            >
+              <LazyAdminRolesManager />
+            </div>
+
             <!-- API密钥管理 -->
             <div
               v-if="activeTab === 'api-keys' && permissions.canAccessPage('api-keys')"
@@ -190,14 +221,15 @@
             >
               <LazyAdminApiKeyManager />
             </div>
-            <!-- 卡密管理 -->
-            <div
-              v-if="activeTab === 'card-codes' && permissions.canAccessPage('card-codes')"
-              class="animate-in fade-in slide-in-from-bottom-4 duration-500"
-            >
-              <LazyAdminCardCodesManager />
-            </div>
           </div>
+          </div>
+
+          <AdminOnboardingTutorial
+            :visible="showOnboardingTutorial"
+            @navigate="handleNavigate"
+            @close="closeOnboardingTutorial"
+            @complete="completeOnboardingTutorial"
+          />
         </main>
       </div>
     </ClientOnly>
@@ -209,14 +241,12 @@ import { computed, onMounted, onUnmounted, provide, ref, watch } from 'vue'
 import { Menu, ChevronUp } from '@lucide/vue'
 import { useAuth } from '~/composables/useAuth'
 import { usePermissions } from '~/composables/usePermissions'
+import { fetchRolesConfig } from '~/composables/usePermissions'
 import { useSiteConfig } from '~/composables/useSiteConfig'
-import { useLocale } from '~/utils/locale'
-import { useScrollMemory } from '~/composables/useScrollMemory'
+import AdminOnboardingTutorial from '~/components/Admin/AdminOnboardingTutorial.vue'
 
 // 使用站点配置
 const { siteTitle, initSiteConfig } = useSiteConfig()
-const { pages } = useLocale()
-const locale = computed(() => pages.value?.dashboard || {})
 
 // 导入组件
 
@@ -227,14 +257,16 @@ definePageMeta({
 
 // 响应式数据
 const activeTab = ref('overview')
-
-// 各面板滚动位置独立记忆与恢复
-useScrollMemory(() => activeTab.value)
-
 const currentUser = ref(null)
 const sidebarOpen = ref(false)
 const showBackToTop = ref(false)
+const showOnboardingTutorial = ref(false)
+const contentScrollRef = ref(null)
 const beforeNavigateHooks = ref([])
+const tabRefreshKey = ref(0)
+
+let revisionInterval = null
+let lastDataRevision = ''
 
 // 提供注册导航拦截钩子的方法
 const registerBeforeNavigate = (hook) => {
@@ -252,9 +284,57 @@ provide('registerBeforeNavigate', registerBeforeNavigate)
 let auth = null
 const permissions = usePermissions()
 
+const fetchDataRevision = async () => {
+  try {
+    if (!auth || !auth.isAuthenticated.value) return ''
+    const authConfig = auth.getAuthConfig()
+    const result = await $fetch('/api/songs/revision', {
+      ...authConfig,
+      query: { t: Date.now() }
+    })
+    return result?.revision || ''
+  } catch (e) {
+    console.error('获取数据修订号失败:', e)
+    return ''
+  }
+}
+
+const startRevisionPolling = async () => {
+  if (revisionInterval) clearInterval(revisionInterval)
+  lastDataRevision = await fetchDataRevision()
+  revisionInterval = setInterval(async () => {
+    const next = await fetchDataRevision()
+    if (!next || next === lastDataRevision) return
+    lastDataRevision = next
+    tabRefreshKey.value++
+  }, 5000)
+}
+
 // 方法
 const getPageTitle = () => {
-  return locale.value.tabs[activeTab.value] || locale.value.fallbackTitle
+  const titles = {
+    overview: '数据概览',
+    'workflow-tutorial': '流程与教程',
+    'data-analysis': '数据分析',
+    songs: '歌曲管理',
+    schedule: '排期管理',
+    print: '打印排期',
+    'playlist-card': '图片歌单',
+    users: '用户管理',
+    blacklist: '黑名单管理',
+    'api-keys': 'API密钥管理',
+    notifications: '通知管理',
+    'smtp-config': '邮件配置',
+    playtimes: '播出时段',
+    'request-times': '投稿管理',
+    semesters: '学期管理',
+    'expected-play-dates': '选曲日期',
+    'site-config': '站点配置',
+    changelog: '更新日志',
+    database: '数据库操作',
+    password: '修改密码'
+  }
+  return titles[activeTab.value] || '管理后台'
 }
 
 // 动态页面标题
@@ -263,7 +343,7 @@ const dynamicTitle = computed(() => {
   if (siteTitle && siteTitle.value) {
     return `${currentPageTitle} | ${siteTitle.value}`
   }
-  return `${currentPageTitle} | ${locale.value.defaultSiteTitle}`
+  return `${currentPageTitle} | 校园广播站点歌系统`
 })
 
 // 监听activeTab变化，更新页面标题
@@ -288,7 +368,13 @@ watch(
 )
 
 const getRoleDisplayName = (role) => {
-  return locale.value.roles[role] || role
+  const roleNames = {
+    USER: '普通用户',
+    SONG_ADMIN: '歌曲管理员',
+    ADMIN: '超级管理员',
+    SUPER_ADMIN: '超级管理员'
+  }
+  return roleNames[role] || role
 }
 
 const handleLogout = async () => {
@@ -323,6 +409,21 @@ const closeSidebar = () => {
   sidebarOpen.value = false
 }
 
+const openOnboardingTutorial = () => {
+  showOnboardingTutorial.value = true
+}
+
+const closeOnboardingTutorial = () => {
+  showOnboardingTutorial.value = false
+}
+
+const completeOnboardingTutorial = () => {
+  showOnboardingTutorial.value = false
+  if (typeof window !== 'undefined') {
+    localStorage.setItem('voicehub_admin_tutorial_seen_v1', 'true')
+  }
+}
+
 // 监听窗口大小变化，大屏幕时自动关闭移动端侧边栏
 const handleResize = () => {
   if (window.innerWidth > 768) {
@@ -332,12 +433,14 @@ const handleResize = () => {
 
 // 返回顶部功能
 const scrollToTop = () => {
-  window.scrollTo({ top: 0, behavior: 'smooth' })
+  if (contentScrollRef.value) {
+    contentScrollRef.value.scrollTo({ top: 0, behavior: 'smooth' })
+  }
 }
 
 // 监听滚动事件
 const handleScroll = () => {
-  showBackToTop.value = window.scrollY > 300
+  showBackToTop.value = (contentScrollRef.value?.scrollTop || 0) > 300
 }
 
 // 触摸手势支持
@@ -384,6 +487,7 @@ onMounted(async () => {
 
   // 初始化服务
   auth = useAuth()
+  await fetchRolesConfig()
 
   // 检查认证状态（plugin已经初始化过了）
 
@@ -413,7 +517,8 @@ onMounted(async () => {
 
   // 添加窗口大小监听器
   window.addEventListener('resize', handleResize)
-  window.addEventListener('scroll', handleScroll)
+  contentScrollRef.value?.addEventListener('scroll', handleScroll, { passive: true })
+  handleScroll()
 
   // 添加双击关闭侧边栏事件
   document.addEventListener('dblclick', (e) => {
@@ -421,12 +526,21 @@ onMounted(async () => {
       closeSidebar()
     }
   })
+
+  if (!localStorage.getItem('voicehub_admin_tutorial_seen_v1')) {
+    setTimeout(() => {
+      showOnboardingTutorial.value = true
+    }, 800)
+  }
+
+  await startRevisionPolling()
 })
 
 // 组件卸载时清理事件监听器
 onUnmounted(() => {
   window.removeEventListener('resize', handleResize)
-  window.removeEventListener('scroll', handleScroll)
+  contentScrollRef.value?.removeEventListener('scroll', handleScroll)
+  if (revisionInterval) clearInterval(revisionInterval)
 })
 </script>
 
@@ -434,8 +548,8 @@ onUnmounted(() => {
 .admin-layout {
   display: flex;
   min-height: 100vh;
-  background: var(--panel-bg-deepest);
-  color: var(--text-primary);
+  background: var(--bg-primary, #ffffff);
+  color: var(--text-primary, #1a2332);
   position: relative;
 }
 
@@ -447,10 +561,26 @@ onUnmounted(() => {
   background: transparent;
 }
 .custom-scrollbar::-webkit-scrollbar-thumb {
-  background: var(--panel-bg-alt);
+  background: var(--border-primary, #cbd5e1);
   border-radius: 10px;
 }
 .custom-scrollbar::-webkit-scrollbar-thumb:hover {
-  background: var(--panel-bg-hover);
+  background: var(--border-secondary, #94a3b8);
+}
+
+@media (max-width: 768px) {
+  .admin-main-header {
+    padding-top: max(0px, env(safe-area-inset-top));
+  }
+
+  .admin-content-area {
+    padding-bottom: calc(1rem + env(safe-area-inset-bottom));
+  }
+
+  .back-to-top-btn {
+    right: 1rem;
+    bottom: calc(1rem + env(safe-area-inset-bottom));
+    padding: 0.65rem;
+  }
 }
 </style>
diff --git a/app/pages/index.vue b/app/pages/index.vue
index 6158912..7ec75dd 100644
--- a/app/pages/index.vue
+++ b/app/pages/index.vue
@@ -1,146 +1,97 @@
 <template>
   <div class="home">
-    <Transition name="home-boot-loader">
-      <AppLoadingScreen
-        v-if="showBootLoading"
-        :message="bootMessage"
-        :progress="bootProgress"
-        title="Loading..."
-      />
-    </Transition>
-
     <div class="ellipse-effect" />
     <div class="main-content">
       <div class="top-bar">
         <div class="logo-section">
           <NuxtLink class="logo-link" to="/">
-            <img alt="VoiceHub Logo" class="logo-image" :src="getLogo()" />
+            <img
+              alt="VoiceHub Logo"
+              class="logo-image"
+              :src="logo"
+              width="90"
+              height="90"
+              decoding="async"
+              fetchpriority="high"
+            >
           </NuxtLink>
           <!-- 横线和学校logo -->
-          <div v-if="schoolLogoHomeDisplayUrl" class="logo-divider-container">
+          <div v-if="schoolLogoHomeUrl && schoolLogoHomeUrl.trim()" class="logo-divider-container">
             <div class="logo-divider" />
-            <img :src="schoolLogoHomeDisplayUrl" :alt="locale.schoolLogoAlt" class="school-logo" />
+            <img
+              :src="proxiedSchoolLogoUrl"
+              alt="学校Logo"
+              class="school-logo"
+              width="200"
+              height="80"
+              decoding="async"
+              fetchpriority="high"
+            >
           </div>
         </div>
 
         <!-- 用户信息区域 -->
         <div class="user-section">
           <ClientOnly>
-            <div class="user-actions-row">
-              <div class="theme-switcher">
-                <button
-                  type="button"
-                  class="theme-switcher-trigger"
-                  :class="{ 'is-open': showThemeMenu }"
-                  :aria-label="'主题'"
-                  :aria-expanded="showThemeMenu"
-                  @click="toggleThemeMenu"
+            <!-- 主题切换按钮 -->
+            <button
+              class="utility-btn theme-toggle-btn"
+              type="button"
+              aria-label="主题"
+              title="切换主题"
+              @click="handleToggleTheme"
+            >
+              <Icon :name="isDark ? 'sun' : 'moon'" :size="18" />
+              <span class="utility-btn-label">主题</span>
+            </button>
+
+            <div v-if="isClientAuthenticated" class="user-info">
+              <div class="user-details-desktop">
+                <span class="user-name">{{ user?.name || '用户' }}</span>
+                <span v-if="isAdmin" class="user-badge admin">{{ roleName }}</span>
+                <span v-else class="user-badge">{{ userClassInfo }}</span>
+              </div>
+
+              <NuxtLink v-if="isAdmin" class="enter-admin-btn" to="/dashboard">
+                <Icon name="settings" :size="16" />
+                <span>进入后台</span>
+              </NuxtLink>
+
+              <div class="user-avatar-wrapper" @click="toggleUserActions">
+                <img
+                  v-if="user?.avatar && !avatarError"
+                  :src="user.avatar"
+                  class="user-avatar"
+                  @error="avatarError = true"
                 >
-                  <Icon name="gift" :size="19" />
-                </button>
-
-                <Transition name="dropdown-fade">
-                  <div v-if="showThemeMenu" class="theme-dropdown" role="listbox">
-                    <button
-                      v-for="themeItem in themes"
-                      :key="themeItem"
-                      type="button"
-                      role="option"
-                      class="theme-option"
-                      :class="{ 'is-active': selectedTheme === themeItem }"
-                      :aria-selected="selectedTheme === themeItem"
-                      @click="selectTheme(themeItem)"
-                    >
-                      {{ getThemeLabel(themeItem) }}
-                    </button>
-                  </div>
-                </Transition>
-              </div>
-
-              <div class="language-switcher">
-                <button
-                  type="button"
-                  class="language-switcher-trigger"
-                  :class="{ 'is-open': showLanguageMenu }"
-                  :aria-label="common.language"
-                  :aria-expanded="showLanguageMenu"
-                  aria-haspopup="listbox"
-                  @click="toggleLanguageMenu"
-                >
-                  <Icon name="translate" :size="19" />
-                </button>
-
-                <Transition name="dropdown-fade">
-                  <div v-if="showLanguageMenu" class="language-dropdown" role="listbox">
-                    <button
-                      type="button"
-                      role="option"
-                      class="language-option"
-                      :class="{ 'is-active': isFollowingSystem }"
-                      :aria-selected="isFollowingSystem"
-                      @click="selectFollowSystem"
-                    >
-                      <span class="language-option-label">{{ common.followSystem }}</span>
-                    </button>
-                    <button
-                      v-for="localeOption in supportedLocales"
-                      :key="localeOption.code"
-                      type="button"
-                      role="option"
-                      class="language-option"
-                      :class="{ 'is-active': currentLocale === localeOption.code }"
-                      :aria-selected="currentLocale === localeOption.code"
-                      @click="selectLocale(localeOption.code)"
-                    >
-                      <span class="language-option-label">{{ localeOption.label }}</span>
-                    </button>
-                  </div>
-                </Transition>
-              </div>
-
-              <div v-if="isClientAuthenticated" class="user-info">
-                <div class="user-details-desktop">
-                  <span class="user-name">{{ user?.name || locale.userFallback }}</span>
-                  <span v-if="isAdmin" class="user-badge admin">{{ roleName }}</span>
-                  <span v-else class="user-badge">{{ userClassInfo }}</span>
+                <div v-else class="user-avatar-placeholder">
+                  {{ user?.name?.[0] || 'U' }}
                 </div>
+              </div>
 
-                <div class="user-avatar-wrapper" @click="toggleUserActions">
-                  <img
-                    v-if="user?.avatar && !avatarError"
-                    :src="user.avatar"
-                    class="user-avatar"
-                    @error="avatarError = true"
-                  >
-                  <div v-else class="user-avatar-placeholder">
-                    {{ user?.name?.[0] || 'U' }}
-                  </div>
+              <Transition name="dropdown-fade">
+                <div v-if="showUserActions" class="user-actions-dropdown">
+                  <NuxtLink class="action-item" to="/account">
+                    <Icon name="user" :size="16" />
+                    <span>账号管理</span>
+                  </NuxtLink>
+                  <NuxtLink v-if="isAdmin" class="action-item" to="/dashboard">
+                    <Icon name="settings" :size="16" />
+                    <span>管理后台</span>
+                  </NuxtLink>
+                  <button class="action-item logout" @click="handleLogout">
+                    <Icon name="logout" :size="16" />
+                    <span>退出登录</span>
+                  </button>
                 </div>
+              </Transition>
+            </div>
 
-                <Transition name="dropdown-fade">
-                  <div v-if="showUserActions" class="user-actions-dropdown">
-                    <NuxtLink class="action-item" to="/account">
-                      <Icon name="user" :size="16" />
-                      <span>{{ locale.account }}</span>
-                    </NuxtLink>
-                    <NuxtLink v-if="isAdmin" class="action-item" to="/dashboard">
-                      <Icon name="settings" :size="16" />
-                      <span>{{ locale.dashboard }}</span>
-                    </NuxtLink>
-                    <button class="action-item logout" @click="handleLogout">
-                      <Icon name="logout" :size="16" />
-                      <span>{{ locale.logout }}</span>
-                    </button>
-                  </div>
-                </Transition>
-              </div>
-
-              <div v-else class="login-options">
-                <NuxtLink class="login-btn" to="/login">
-                  <Icon name="user" :size="16" />
-                  <span>{{ locale.login }}</span>
-                </NuxtLink>
-              </div>
+            <div v-else class="login-options">
+              <NuxtLink class="login-btn" to="/login">
+                <Icon name="user" :size="16" />
+                <span>登录/注册</span>
+              </NuxtLink>
             </div>
           </ClientOnly>
         </div>
@@ -150,37 +101,37 @@
         <div class="title-container">
           <h2 class="main-title">{{ siteTitle }}</h2>
           <div class="title-divider" />
-          <span class="sub-title">{{ locale.subtitle }}</span>
+          <span class="sub-title">VoiceHub 校园广播系统</span>
         </div>
       </div>
 
       <!-- 中间主体内容区域 -->
       <div class="content-area">
-        <!-- 选项卡区域-->
+        <!-- 选项卡区域 -->
         <div class="tabs-row">
           <div
             :class="{ active: activeTab === 'schedule' }"
-            class="section-tab"
+            class="section-tab schedule-tab"
             @click="handleTabClick('schedule')"
           >
             <Icon class="tab-icon" name="calendar" :size="20" />
-            <span class="tab-text">{{ locale.tabs.schedule }}</span>
+            <span class="tab-text">播出排期</span>
           </div>
           <div
             :class="{ active: activeTab === 'songs' }"
-            class="section-tab"
+            class="section-tab songs-tab"
             @click="handleTabClick('songs')"
           >
             <Icon class="tab-icon" name="music" :size="20" />
-            <span class="tab-text">{{ locale.tabs.songs }}</span>
+            <span class="tab-text">歌曲列表</span>
           </div>
           <div
             :class="{ active: activeTab === 'request' }"
-            class="section-tab"
+            class="section-tab request-tab"
             @click="handleTabClick('request')"
           >
             <Icon class="tab-icon" name="search" :size="20" />
-            <span class="tab-text">{{ locale.tabs.request }}</span>
+            <span class="tab-text">投稿歌曲</span>
           </div>
           <ClientOnly>
             <div
@@ -198,7 +149,7 @@
                 />
               </div>
               <span class="tab-text">
-                {{ locale.tabs.notification }}
+                消息
                 <span
                   v-if="isClientAuthenticated && hasUnreadNotifications"
                   class="notification-badge-desktop"
@@ -208,7 +159,7 @@
             <template #fallback>
               <div class="section-tab disabled" data-tab="notification">
                 <Icon class="tab-icon" name="message-circle" :size="20" />
-                <span class="tab-text">{{ locale.tabs.notification }}</span>
+                <span class="tab-text">消息</span>
               </div>
             </template>
           </ClientOnly>
@@ -227,6 +178,9 @@
                   @semester-change="handleSemesterChange"
                 />
               </div>
+              
+              <!-- 用户使用指南组件 -->
+              <UserTutorial />
             </div>
 
             <!-- 歌曲列表内容 -->
@@ -241,6 +195,7 @@
                   @vote="handleVote"
                   @withdraw="handleWithdraw"
                   @cancel-replay="handleCancelReplay"
+                  @request-replay="handleRequestReplay"
                   @semester-change="handleSemesterChange"
                 />
               </div>
@@ -264,150 +219,54 @@
             >
               <div v-if="!isClientAuthenticated" class="login-required-container">
                 <div class="login-required-content">
-                  <div class="login-icon">🔒</div>
-                  <h3>{{ locale.loginRequired }}</h3>
-                  <p>{{ locale.loginRequiredDesc }}</p>
-                  <button class="login-button" @click="navigateToLogin">{{ locale.loginNow }}</button>
+                  <Lock class="login-icon" :size="48" />
+                  <h3>需要登录</h3>
+                  <p>您需要登录才能查看通知</p>
+                  <button class="login-button" @click="navigateToLogin">立即登录</button>
                 </div>
               </div>
               <div v-else class="notification-container">
-                <!-- 标题和设置按钮-->
+                <!-- 标题和设置按钮 -->
                 <div class="notification-header">
-                  <div class="notification-header-main">
-                    <h2 class="notification-title">{{ locale.notificationCenter }}</h2>
-                    <div
-                      :aria-label="locale.notificationFilterLabel"
-                      class="notification-filter"
-                      role="group"
+                  <h2 class="notification-title">通知中心</h2>
+                  <button class="settings-icon" @click="toggleNotificationSettings">
+                    <svg
+                      fill="none"
+                      height="20"
+                      stroke="currentColor"
+                      stroke-linecap="round"
+                      stroke-linejoin="round"
+                      stroke-width="2"
+                      viewBox="0 0 24 24"
+                      width="20"
+                      xmlns="http://www.w3.org/2000/svg"
                     >
-                      <button
-                        :aria-pressed="notificationsService.currentFilter.value === 'all'"
-                        :class="{ active: notificationsService.currentFilter.value === 'all' }"
-                        type="button"
-                        @click="notificationsService.changeFilter('all')"
-                      >
-                        {{ locale.allNotifications }}
-                      </button>
-                      <button
-                        :aria-pressed="notificationsService.currentFilter.value === 'unread'"
-                        :class="{ active: notificationsService.currentFilter.value === 'unread' }"
-                        type="button"
-                        @click="notificationsService.changeFilter('unread')"
-                      >
-                        {{ locale.unread }}
-                      </button>
-                    </div>
-                    <div class="notification-search">
-                      <Icon :size="17" aria-hidden="true" name="search" />
-                      <input
-                        v-model="notificationSearchInput"
-                        :aria-label="locale.searchNotifications"
-                        :placeholder="locale.searchNotificationsPlaceholder"
-                        autocomplete="off"
-                        maxlength="100"
-                        type="search"
-                        @input="handleNotificationSearchInput"
-                        @keydown.enter.prevent="runNotificationSearch"
-                      >
-                      <button
-                        v-if="notificationSearchInput"
-                        :aria-label="locale.clearNotificationSearch"
-                        :title="locale.clearNotificationSearch"
-                        type="button"
-                        @click="clearNotificationSearch"
-                      >
-                        <Icon :size="15" name="x" />
-                      </button>
-                    </div>
-                  </div>
-                  <div class="notification-header-actions">
-                    <button
-                      :class="{ disabled: !hasUnreadNotifications }"
-                      :disabled="!hasUnreadNotifications"
-                      class="mark-all-read-header"
-                      @click="markAllNotificationsAsRead"
-                    >
-                      <Icon :size="15" name="check" />
-                      <span>{{ locale.markAllRead }}</span>
-                    </button>
-                    <button class="settings-icon" @click="toggleNotificationSettings">
-                      <svg
-                        fill="none"
-                        height="20"
-                        stroke="currentColor"
-                        stroke-linecap="round"
-                        stroke-linejoin="round"
-                        stroke-width="2"
-                        viewBox="0 0 24 24"
-                        width="20"
-                        xmlns="http://www.w3.org/2000/svg"
-                      >
-                        <circle cx="12" cy="12" r="3" />
-                        <path
-                          d="M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1-2.83 0l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2 2 0 0 1-2 2 2 2 0 0 1-2-2v-.09A1.65 1.65 0 0 0 9 19.4a1.65 1.65 0 0 0-1.82.33l-.06.06a2 2 0 0 1-2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0-1.51-1H3a2 2 0 0 1-2-2 2 2 0 0 1 2-2h.09A1.65 1.65 0 0 0 4.6 9a1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33H9a1.65 1.65 0 0 0 1-1.51V3a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06a1.65 1.65 0 0 0-.33 1.82V9a1.65 1.65 0 0 0 1.51 1H21a2 2 0 0 1 2 2 2 2 0 0 1-2 2h-.09a1.65 1.65 0 0 0-1.51 1z"
-                        />
-                      </svg>
-                    </button>
-                  </div>
+                      <circle cx="12" cy="12" r="3" />
+                      <path
+                        d="M19.4 15a1.65 1.65 0 0 0 .33 1.82l.06.06a2 2 0 0 1 0 2.83 2 2 0 0 1-2.83 0l-.06-.06a1.65 1.65 0 0 0-1.82-.33 1.65 1.65 0 0 0-1 1.51V21a2 2 0 0 1-2 2 2 2 0 0 1-2-2v-.09A1.65 1.65 0 0 0 9 19.4a1.65 1.65 0 0 0-1.82.33l-.06.06a2 2 0 0 1-2.83 0 2 2 0 0 1 0-2.83l.06-.06a1.65 1.65 0 0 0 .33-1.82 1.65 1.65 0 0 0-1.51-1H3a2 2 0 0 1-2-2 2 2 0 0 1 2-2h.09A1.65 1.65 0 0 0 4.6 9a1.65 1.65 0 0 0-.33-1.82l-.06-.06a2 2 0 0 1 0-2.83 2 2 0 0 1 2.83 0l.06.06a1.65 1.65 0 0 0 1.82.33H9a1.65 1.65 0 0 0 1-1.51V3a2 2 0 0 1 2-2 2 2 0 0 1 2 2v.09a1.65 1.65 0 0 0 1 1.51 1.65 1.65 0 0 0 1.82-.33l.06-.06a2 2 0 0 1 2.83 0 2 2 0 0 1 0 2.83l-.06.06a1.65 1.65 0 0 0-.33 1.82V9a1.65 1.65 0 0 0 1.51 1H21a2 2 0 0 1 2 2 2 2 0 0 1-2 2h-.09a1.65 1.65 0 0 0-1.51 1z"
+                      />
+                    </svg>
+                  </button>
                 </div>
 
-                <button
-                  :aria-label="formatLocaleValue(
-                    locale.unreadCountSummary,
-                    notificationsService.unreadCount.value
-                  )"
-                  :class="{ empty: !hasUnreadNotifications }"
-                  :disabled="!hasUnreadNotifications"
-                  class="notification-unread-summary"
-                  type="button"
-                  @click="notificationsService.changeFilter('unread')"
-                >
-                  <span class="notification-unread-summary-icon">
-                    <Icon :size="21" aria-hidden="true" name="bell-ring" />
-                  </span>
-                  <span class="notification-unread-summary-copy">
-                    <span>{{ locale.unreadOverview }}</span>
-                    <strong>
-                      {{
-                        formatLocaleValue(
-                          locale.unreadCountSummary,
-                          notificationsService.unreadCount.value
-                        )
-                      }}
-                    </strong>
-                  </span>
-                  <span v-if="hasUnreadNotifications" class="notification-unread-summary-action">
-                    <span>{{ locale.viewUnreadNotifications }}</span>
-                    <Icon :size="17" aria-hidden="true" name="chevron-right" />
-                  </span>
-                </button>
-
                 <!-- 通知列表 -->
                 <div class="notification-list">
                   <div v-if="notificationsLoading" class="loading-indicator">
-                    <AppSpinner :size="32" />
-                    <span>{{ locale.loading }}</span>
+                    <div class="loading-spinner" />
+                    <span>加载中...</span>
                   </div>
 
                   <div v-else-if="userNotifications.length === 0" class="empty-notification">
                     <div class="empty-icon">
-                      <Icon :size="48" color="var(--text-muted)" name="bell" />
+                      <Icon :size="48" color="#6b7280" name="bell" />
                     </div>
-                    <p>
-                      {{
-                        notificationsService.currentSearch.value
-                          ? locale.noMatchingNotifications
-                          : notificationsService.currentFilter.value === 'unread'
-                            ? locale.noUnreadNotifications
-                            : locale.noNotifications
-                      }}
-                    </p>
+                    <p>暂无通知</p>
                   </div>
 
                   <Transition mode="out-in" name="notification-list-fade">
                     <div
                       v-if="userNotifications.length > 0"
-                      :key="`${notificationsService.currentPage.value}-${notificationsService.currentFilter.value}-${notificationsService.currentSearch.value}`"
+                      :key="notificationsService.currentPage.value"
                       class="notification-items"
                     >
                       <div
@@ -423,109 +282,88 @@
                             <Icon
                               v-if="notification.type === 'SONG_SELECTED'"
                               :size="20"
-                              color="var(--color-indigo-hover)"
+                              color="#4f46e5"
                               name="check"
                             />
                             <Icon
                               v-else-if="notification.type === 'SONG_PLAYED'"
                               :size="20"
-                              color="var(--color-success)"
+                              color="#10b981"
                               name="play"
                             />
                             <Icon
                               v-else-if="notification.type === 'SONG_VOTED'"
                               :size="20"
-                              color="var(--color-warning)"
+                              color="#f59e0b"
                               name="thumbs-up"
                             />
                             <Icon
                               v-else-if="notification.type === 'SONG_REJECTED'"
                               :size="20"
-                              color="var(--color-error)"
+                              color="#ef4444"
                               name="x-circle"
                             />
                             <Icon
                               v-else-if="notification.type === 'COLLABORATION_INVITE'"
                               :size="20"
-                              color="var(--color-accent)"
+                              color="#0B5AFE"
                               name="users"
                             />
                             <Icon
                               v-else-if="notification.type === 'COLLABORATION_RESPONSE'"
                               :size="20"
-                              color="var(--color-collab)"
+                              color="#8b5cf6"
                               name="message-circle"
                             />
-                            <Icon v-else :size="20" color="var(--text-muted)" name="bell" />
+                            <Icon v-else :size="20" color="#6b7280" name="bell" />
                           </div>
                           <div class="notification-title-row">
-                            <div class="notification-heading-row">
-                              <div class="notification-title">
-                                <span v-if="notification.type === 'SONG_SELECTED'">{{ locale.notificationTypes.SONG_SELECTED }}</span>
-                                <span v-else-if="notification.type === 'SONG_PLAYED'"
-                                  >{{ locale.notificationTypes.SONG_PLAYED }}</span
-                                >
-                                <span v-else-if="notification.type === 'SONG_VOTED'">{{ locale.notificationTypes.SONG_VOTED }}</span>
-                                <span v-else-if="notification.type === 'SONG_REJECTED'"
-                                  >{{ locale.notificationTypes.SONG_REJECTED }}</span
-                                >
-                                <span v-else-if="notification.type === 'COLLABORATION_INVITE'">
-                                  {{ locale.notificationTypes.COLLABORATION_INVITE }}
-                                  <span
-                                    v-if="notification.handled"
-                                    :class="[
-                                      'status-tag',
-                                      notification.status === 'ACCEPTED'
-                                        ? 'accepted'
-                                        : notification.status === 'INVALID'
-                                          ? 'invalid'
-                                          : 'rejected'
-                                    ]"
-                                  >
-                                    {{
-                                      notification.status === 'ACCEPTED'
-                                        ? locale.inviteStatus.accepted
-                                        : notification.status === 'INVALID'
-                                          ? locale.inviteStatus.invalid
-                                          : locale.inviteStatus.rejected
-                                    }}
-                                  </span>
-                                </span>
-                                <span v-else-if="notification.type === 'COLLABORATION_RESPONSE'"
-                                  >{{ locale.notificationTypes.COLLABORATION_RESPONSE }}</span
-                                >
-                                <span v-else>{{ locale.notificationTypes.SYSTEM }}</span>
-                                <span v-if="!notification.read" class="unread-indicator" />
-                              </div>
-                              <span
-                                class="notification-read-status"
-                                :class="notification.read ? 'is-read' : 'is-unread'"
+                            <div class="notification-title">
+                              <span v-if="notification.type === 'SONG_SELECTED'">歌曲已选中</span>
+                              <span v-else-if="notification.type === 'SONG_PLAYED'"
+                                >歌曲已播放</span
                               >
-                                <Icon :size="14" name="eye" />
-                                {{ notification.read ? locale.read : locale.unread }}
+                              <span v-else-if="notification.type === 'SONG_VOTED'">收到新投票</span>
+                              <span v-else-if="notification.type === 'SONG_REJECTED'"
+                                >歌曲被驳回</span
+                              >
+                              <span v-else-if="notification.type === 'COLLABORATION_INVITE'">
+                                联合投稿邀请
+                                <span
+                                  v-if="notification.handled"
+                                  :class="[
+                                    'status-tag',
+                                    notification.status === 'ACCEPTED'
+                                      ? 'accepted'
+                                      : notification.status === 'INVALID'
+                                        ? 'invalid'
+                                        : 'rejected'
+                                  ]"
+                                >
+                                  {{
+                                    notification.status === 'ACCEPTED'
+                                      ? '- 已接受'
+                                      : notification.status === 'INVALID'
+                                        ? '- 已失效'
+                                        : '- 已拒绝'
+                                  }}
+                                </span>
                               </span>
+                              <span v-else-if="notification.type === 'COLLABORATION_RESPONSE'"
+                                >联合投稿回复</span
+                              >
+                              <span v-else>系统通知</span>
+                              <span v-if="!notification.read" class="unread-indicator" />
                             </div>
                             <div class="notification-time">
                               {{ formatNotificationTime(notification.createdAt) }}
                             </div>
-                            <div class="notification-sender">
-                              <Icon :size="13" aria-hidden="true" name="user" />
-                              <span>{{ locale.sender }}：{{ getNotificationSenderName(notification) }}</span>
-                            </div>
                           </div>
                         </div>
                         <div class="notification-card-body">
-                          <!-- 仅管理员手动发送的通知渲染 Markdown，系统自动通知含用户可控内容，保持纯文本 -->
-                          <div
-                            v-if="isAdminManualNotification(notification)"
-                            class="notification-text markdown-body"
-                            v-html="renderedNotificationMessages[notification.id]"
-                          />
-                          <div v-else class="notification-text">
-                            {{ notification.message }}
-                          </div>
+                          <div class="notification-text">{{ notification.message }}</div>
 
-                          <!-- 联合投稿邀请操作按钮-->
+                          <!-- 联合投稿邀请操作按钮 -->
                           <div
                             v-if="
                               notification.type === 'COLLABORATION_INVITE' && !notification.handled
@@ -537,21 +375,21 @@
                               class="action-button accept-btn"
                               @click.stop="handleCollaborationReply(notification, true)"
                             >
-                              {{ notification.processing ? locale.processing : locale.acceptInvite }}
+                              {{ notification.processing ? '处理中...' : '接受邀请' }}
                             </button>
                             <button
                               :disabled="notification.processing"
                               class="action-button reject-btn"
                               @click.stop="handleCollaborationReply(notification, false)"
                             >
-                              {{ locale.reject }}
+                              拒绝
                             </button>
                           </div>
                         </div>
                         <div class="notification-card-actions">
                           <button
                             class="action-button delete"
-                            :title="locale.delete"
+                            title="删除"
                             @click.stop="deleteNotification(notification.id)"
                           >
                             <svg
@@ -570,7 +408,7 @@
                                 d="M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6m3 0V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2"
                               />
                             </svg>
-                            <span>{{ locale.delete }}</span>
+                            <span>删除</span>
                           </button>
                         </div>
                       </div>
@@ -585,21 +423,16 @@
                 >
                   <div class="pagination-info">
                     <span class="pagination-text">
-                      {{
-                        formatLocaleValue(
-                          locale.paginationInfo,
-                          notificationsService.totalCount.value,
-                          notificationsService.currentPage.value,
-                          notificationsService.totalPages.value
-                        )
-                      }}
+                      共 {{ notificationsService.totalCount.value }} 条通知， 第
+                      {{ notificationsService.currentPage.value }} /
+                      {{ notificationsService.totalPages.value }} 页
                     </span>
                   </div>
 
                   <div class="pagination-controls">
-                    <!-- 每页显示数量选择器-->
+                    <!-- 每页显示数量选择器 -->
                     <div class="page-size-selector">
-                      <label for="pageSize">{{ locale.pageSize }}</label>
+                      <label for="pageSize">每页显示：</label>
                       <CustomSelect
                         id="pageSize"
                         :model-value="notificationsService.pageSize.value"
@@ -617,7 +450,7 @@
                           notificationsService.isPaginationLoading.value
                         "
                         class="page-nav-button"
-                        :title="locale.previousPage"
+                        title="上一页"
                         @click="notificationsService.prevPage()"
                       >
                         <svg
@@ -659,7 +492,7 @@
                           notificationsService.isPaginationLoading.value
                         "
                         class="page-nav-button"
-                        :title="locale.nextPage"
+                        title="下一页"
                         @click="notificationsService.nextPage()"
                       >
                         <svg
@@ -679,13 +512,13 @@
                     </div>
                   </div>
 
-                  <!-- 分页加载状态-->
+                  <!-- 分页加载状态 -->
                   <div
                     v-if="notificationsService.isPaginationLoading.value"
                     class="pagination-loading"
                   >
-                    <AppSpinner :size="16" />
-                    <span>{{ locale.loading }}</span>
+                    <div class="loading-spinner" />
+                    <span>加载中...</span>
                   </div>
                 </div>
 
@@ -697,14 +530,14 @@
                     class="action-button-large"
                     @click="markAllNotificationsAsRead"
                   >
-                    {{ locale.markAllRead }}
+                    全部标记为已读
                   </button>
                   <button class="action-button-large danger" @click="clearAllNotifications">
-                    {{ locale.clearAllMessages }}
+                    清空所有消息
                   </button>
                 </div>
 
-                <!-- 确认对话框-->
+                <!-- 确认对话框 -->
                 <ConfirmDialog
                   v-model:show="showConfirmDialog"
                   :cancel-text="confirmDialogConfig.cancelText"
@@ -737,26 +570,26 @@
       >
         <div
           v-if="showRules"
-          class="fixed inset-0 z-[70] flex items-center justify-center p-4 bg-bg-primary-80 backdrop-blur-sm"
+          class="fixed inset-0 z-[70] flex items-center justify-center p-4 bg-black/80 backdrop-blur-sm"
           @click.self="showRules = false"
         >
           <div
-            class="bg-bg-secondary border border-border-secondary w-full max-w-lg rounded-3xl overflow-hidden shadow-2xl flex flex-col"
+            class="bg-zinc-900 border border-zinc-800 w-full max-w-lg rounded-3xl overflow-hidden shadow-2xl flex flex-col"
           >
             <div class="p-8 pb-4 flex items-center justify-between">
               <div>
-                <h3 class="text-xl font-black text-text-primary tracking-tight flex items-center gap-3">
+                <h3 class="text-xl font-black text-zinc-100 tracking-tight flex items-center gap-3">
                   <div
-                    class="w-10 h-10 rounded-2xl bg-primary-hover-10 flex items-center justify-center text-primary"
+                    class="w-10 h-10 rounded-2xl bg-blue-600/10 flex items-center justify-center text-blue-500"
                   >
                     <Icon name="bell" :size="20" />
                   </div>
-                  {{ locale.rulesTitle }}
+                  点歌规则
                 </h3>
-                <p class="text-xs text-text-tertiary mt-1 ml-13">{{ locale.rulesDesc }}</p>
+                <p class="text-xs text-zinc-500 mt-1 ml-13">投稿前请仔细阅读以下规则</p>
               </div>
               <button
-                class="p-3 bg-bg-tertiary-50 hover:bg-bg-tertiary text-text-tertiary hover:text-text-primary rounded-2xl transition-all"
+                class="p-3 bg-zinc-800/50 hover:bg-zinc-800 text-zinc-500 hover:text-zinc-200 rounded-2xl transition-all"
                 @click="showRules = false"
               >
                 <Icon name="x" :size="20" />
@@ -766,53 +599,53 @@
             <div class="p-8 pt-4 space-y-8">
               <div class="rules-group space-y-4">
                 <h4
-                  class="text-[10px] font-black text-text-tertiary uppercase tracking-widest flex items-center gap-2"
+                  class="text-[10px] font-black text-zinc-500 uppercase tracking-widest flex items-center gap-2"
                 >
                   <Icon name="message-circle" :size="12" />
-                  {{ locale.submissionGuidelines }}
+                  投稿须知
                 </h4>
                 <div
                   v-if="submissionGuidelines"
-                  class="guidelines-rendered markdown-body text-sm text-text-tertiary leading-relaxed font-medium bg-bg-primary-50 p-6 rounded-3xl border border-border-secondary-50"
-                  v-html="renderedGuidelines"
+                  class="text-sm text-zinc-400 leading-relaxed font-medium bg-zinc-950/50 p-6 rounded-3xl border border-zinc-800/50"
+                  v-html="submissionGuidelines.replace(/\n/g, '<br>')"
                 />
                 <div
                   v-else
-                  class="space-y-3 bg-bg-primary-50 p-6 rounded-3xl border border-border-secondary-50"
+                  class="space-y-3 bg-zinc-950/50 p-6 rounded-3xl border border-zinc-800/50"
                 >
-                  <div class="flex gap-3 text-sm text-text-tertiary font-medium">
-                    <span class="text-primary font-black">01</span>
-                    <p>{{ locale.defaultRules[0] }}</p>
+                  <div class="flex gap-3 text-sm text-zinc-400 font-medium">
+                    <span class="text-blue-500 font-black">01</span>
+                    <p>投稿时无需加入书名号</p>
                   </div>
-                  <div class="flex gap-3 text-sm text-text-tertiary font-medium">
-                    <span class="text-primary font-black">02</span>
-                    <p>{{ locale.defaultRules[1] }}</p>
+                  <div class="flex gap-3 text-sm text-zinc-400 font-medium">
+                    <span class="text-blue-500 font-black">02</span>
+                    <p>除DJ外，其他类型歌曲均接收（包括小语种）</p>
                   </div>
-                  <div class="flex gap-3 text-sm text-text-tertiary font-medium">
-                    <span class="text-primary font-black">03</span>
-                    <p>{{ locale.defaultRules[2] }}</p>
+                  <div class="flex gap-3 text-sm text-zinc-400 font-medium">
+                    <span class="text-blue-500 font-black">03</span>
+                    <p>禁止投递含有违规内容的歌曲</p>
                   </div>
                 </div>
               </div>
 
               <div class="rules-group space-y-4">
                 <h4
-                  class="text-[10px] font-black text-text-tertiary uppercase tracking-widest flex items-center gap-2"
+                  class="text-[10px] font-black text-zinc-500 uppercase tracking-widest flex items-center gap-2"
                 >
                   <Icon name="calendar" :size="12" />
-                  {{ locale.playbackTime }}
+                  播放时间
                 </h4>
                 <div
-                  class="bg-primary-hover-10 border border-primary-20 p-6 rounded-3xl flex items-center gap-4"
+                  class="bg-blue-600/10 border border-blue-500/20 p-6 rounded-3xl flex items-center gap-4"
                 >
                   <div
-                    class="w-12 h-12 rounded-2xl bg-primary-hover flex items-center justify-center text-text-primary shadow-lg shadow-[var(--primary-glow-40)]"
+                    class="w-12 h-12 rounded-2xl bg-blue-600 flex items-center justify-center text-white shadow-lg shadow-blue-900/40"
                   >
                     <Icon name="clock" :size="24" />
                   </div>
                   <div>
-                    <p class="text-sm font-black text-text-primary">{{ locale.playbackTimeDesc }}</p>
-                    <p class="text-[10px] text-text-tertiary font-bold uppercase tracking-widest mt-0.5">
+                    <p class="text-sm font-black text-zinc-100">每天夜自修静班前</p>
+                    <p class="text-[10px] text-zinc-500 font-bold uppercase tracking-widest mt-0.5">
                       PLAYBACK TIME
                     </p>
                   </div>
@@ -822,79 +655,87 @@
 
             <div class="p-8 pt-0">
               <button
-                class="w-full px-6 py-4 bg-bg-tertiary hover:bg-bg-quaternary text-text-secondary text-xs font-black rounded-2xl transition-all uppercase tracking-widest shadow-lg active:scale-95"
+                class="w-full px-6 py-4 bg-zinc-800 hover:bg-zinc-700 text-zinc-300 text-xs font-black rounded-2xl transition-all uppercase tracking-widest shadow-lg active:scale-95"
                 @click="showRules = false"
               >
-                {{ locale.gotIt }}
+                我知道了
               </button>
             </div>
           </div>
         </div>
       </Transition>
     </Teleport>
+
+    <div
+      v-if="statisticsCodeEnabled && statisticsCode"
+      id="site-statistics-code"
+      class="hidden"
+      v-html="statisticsCode"
+    />
   </div>
 </template>
 
 <script setup>
 import { computed, nextTick, onMounted, onUnmounted, ref, watch } from 'vue'
-import { useRoute, useRouter } from 'vue-router'
+import { Lock } from '@lucide/vue'
+import { useRouter } from 'vue-router'
 
+import logo from '~~/public/images/logo.png'
 import Icon from '~/components/UI/Icon.vue'
-import AppSpinner from '~/components/UI/Common/AppSpinner.vue'
 import ConfirmDialog from '~/components/UI/ConfirmDialog.vue'
-import AppLoadingScreen from '~/components/UI/AppLoadingScreen.vue'
 
 import { useNotifications } from '~/composables/useNotifications'
 import { useSiteConfig } from '~/composables/useSiteConfig'
-import { useToast } from '~/composables/useToast'
-import { renderMarkdown } from '~/utils/markdown'
-import CustomSelect from '~/components/UI/Common/CustomSelect.vue'
-import { useLocale } from '~/utils/locale'
 import { useTheme } from '~/composables/useTheme'
-import { useThemeImage } from '~/composables/useThemeImage'
-import { useScrollMemory } from '~/composables/useScrollMemory'
+import CustomSelect from '~/components/UI/Common/CustomSelect.vue'
 
 // 获取运行时配置
 const config = useRuntimeConfig()
 const router = useRouter()
-const route = useRoute()
-const { pages, common, currentLocale, setLocale, supportedLocales, isFollowingSystem, followSystemLocale } =
-  useLocale()
-const locale = computed(() => pages.value?.home || {})
-const getHomeText = (section, key, ...args) => formatLocaleValue(locale.value?.[section]?.[key], ...args)
-const getMessage = (key, ...args) => getHomeText('messages', key, ...args)
+
+// 主题
+const { isDark, toggleTheme } = useTheme()
+const handleToggleTheme = () => {
+  toggleTheme()
+}
 
 // 站点配置
 const {
-  isLoaded,
   siteTitle,
   description: siteDescription,
   guidelines: submissionGuidelines,
   icp: icpNumber,
-  schoolLogoHomeDisplayUrl,
+  schoolLogoHomeUrl,
+  statisticsCode,
+  statisticsCodeEnabled,
   initSiteConfig
 } = useSiteConfig()
 
-// 将投稿须知 Markdown 渲染为安全 HTML
-const renderedGuidelines = computed(() => renderMarkdown(submissionGuidelines.value))
-
 const auth = useAuth()
-const { showToast } = useToast()
-const { getLogo } = useThemeImage()
+
 const isClientAuthenticated = computed(() => auth?.isAuthenticated?.value || false)
 const isAdmin = computed(() => auth?.isAdmin?.value || false)
 const user = computed(() => auth?.user?.value || null)
 
 const roleName = computed(() => {
   const role = user.value?.role
-  return locale.value.roles[role] || locale.value.defaultRole
+  const map = {
+    ADMIN: '部长',
+    SUPER_ADMIN: '技术运维',
+    SONG_ADMIN: '工作人员',
+    VICE_MINISTER: '副部',
+    RESIDENT: '常驻',
+    TEACHER: '教师',
+    USER: '学生（普通用户）'
+  }
+  return map[role] || '管理员'
 })
 
 const userClassInfo = computed(() => {
   if (user.value?.grade && user.value?.class) {
     return `${user.value.grade} ${user.value.class}`
   }
-  return locale.value.classFallback
+  return '同学'
 })
 
 const songs = useSongs()
@@ -902,7 +743,7 @@ const songs = useSongs()
 const notificationsService = useNotifications()
 const unreadNotificationCount = ref(0)
 
-// 模拟数据初初始化
+// 模拟数据初始值
 const songCount = ref(0)
 const scheduleCount = ref(0)
 const isRequestOpen = ref(true)
@@ -911,117 +752,11 @@ const isRequestOpen = ref(true)
 const showRequestModal = ref(false)
 const showRules = ref(false)
 const showUserActions = ref(false)
-const showLanguageMenu = ref(false)
-const showThemeMenu = ref(false)
 const avatarError = ref(false)
 
-const BOOT_PROGRESS = {
-  INITIAL: 8,
-  START: 14,
-  CONFIG: 28,
-  AUTH: 46,
-  SLOW_NETWORK: 58,
-  CONTENT: 68,
-  FALLBACK: 82,
-  FINALIZING: 88,
-  COMPLETE: 100
-}
-const MIN_BOOT_TIME_MS = 720
-const BOOT_EXIT_DELAY_MS = 180
-const BOOT_SLOW_THRESHOLD_MS = 8000
-const showBootLoading = ref(true)
-const bootProgress = ref(BOOT_PROGRESS.INITIAL)
-const bootMessage = ref(locale.value.bootMessages.START)
-let bootSlowTimer = null
-
-const hasShownBootLoading = useState('hasShownBootLoading', () => false)
-
-const setBootState = ({ progress, message } = {}) => {
-  if (typeof progress === 'number') {
-    bootProgress.value = progress
-  }
-
-  if (message) {
-    bootMessage.value = message
-  }
-}
-
-const waitForFirstPaint = async () => {
-  await nextTick()
-
-  if (typeof window === 'undefined') {
-    return
-  }
-
-  await new Promise((resolve) => {
-    window.requestAnimationFrame(() => resolve())
-  })
-}
-
-const finishBootLoading = async (startedAt) => {
-  setBootState({ progress: BOOT_PROGRESS.COMPLETE, message: locale.value.bootMessages.COMPLETE })
-
-  const elapsed = Date.now() - startedAt
-  const restTime = Math.max(0, MIN_BOOT_TIME_MS - elapsed)
-  await new Promise((resolve) => setTimeout(resolve, restTime + BOOT_EXIT_DELAY_MS))
-
-  showBootLoading.value = false
-}
-
 const toggleUserActions = (event) => {
   event.stopPropagation()
   showUserActions.value = !showUserActions.value
-  if (showUserActions.value) {
-    showLanguageMenu.value = false
-    showThemeMenu.value = false
-  }
-}
-
-const toggleLanguageMenu = (event) => {
-  event.stopPropagation()
-  showLanguageMenu.value = !showLanguageMenu.value
-  if (showLanguageMenu.value) {
-    showUserActions.value = false
-    showThemeMenu.value = false
-  }
-}
-
-const selectLocale = (code) => {
-  // 手动选择为长期偏好（manual），此后进入网站不再跟随系统语言
-  setLocale(code, true)
-  showLanguageMenu.value = false
-}
-
-const selectFollowSystem = () => {
-  // 清除手动偏好，回到跟随系统语言模式
-  followSystemLocale()
-  showLanguageMenu.value = false
-}
-
-// ==================== 主题切换 ====================
-const { selectedTheme, themes, setTheme: setThemeFn } = useTheme()
-const { theme: themeLocale } = useLocale()
-
-const toggleThemeMenu = (event) => {
-  event.stopPropagation()
-  showThemeMenu.value = !showThemeMenu.value
-  if (showThemeMenu.value) {
-    showUserActions.value = false
-    showLanguageMenu.value = false
-  }
-}
-
-const closeThemeMenu = () => {
-  showThemeMenu.value = false
-}
-
-const selectTheme = (theme) => {
-  setThemeFn(theme)
-  closeThemeMenu()
-}
-
-const getThemeLabel = (theme) => {
-  return themeLocale.value[theme]
 }
 
 // 监听用户头像变化，重置错误状态
@@ -1041,18 +776,6 @@ const handleClickOutside = (event) => {
       showUserActions.value = false
     }
   }
-  if (showLanguageMenu.value) {
-    const switcher = document.querySelector('.language-switcher')
-    if (switcher && !switcher.contains(event.target)) {
-      showLanguageMenu.value = false
-    }
-  }
-  if (showThemeMenu.value) {
-    const switcher = document.querySelector('.theme-switcher')
-    if (switcher && !switcher.contains(event.target)) {
-      showThemeMenu.value = false
-    }
-  }
 }
 
 onMounted(() => {
@@ -1066,9 +789,6 @@ onUnmounted(() => {
 // 标签页状态
 const activeTab = ref('schedule') // 默认显示播出排期
 
-// 各标签页滚动位置独立记忆与恢复
-useScrollMemory(() => activeTab.value)
-
 const tabOrder = ['schedule', 'songs', 'request', 'notification']
 const activeIndex = computed(() => {
   const index = tabOrder.indexOf(activeTab.value)
@@ -1080,38 +800,59 @@ const notificationTabRef = ref(null)
 const hasInitializedAuthData = ref(isClientAuthenticated.value)
 
 let refreshInterval = null
+let lastDataRevision = ''
+
+const fetchDataRevision = async () => {
+  try {
+    const url = isClientAuthenticated.value ? '/api/songs/revision' : '/api/songs/public-revision'
+    const authConfig = isClientAuthenticated.value ? auth.getAuthConfig() : {}
+    const result = await $fetch(url, {
+      ...authConfig,
+      query: { t: Date.now() }
+    })
+    return result?.revision || ''
+  } catch (e) {
+    console.error('获取数据修订号失败:', e)
+    return ''
+  }
+}
+
+const setupRefreshInterval = async () => {
+  if (refreshInterval) {
+    clearInterval(refreshInterval)
+  }
+
+  const intervalSeconds = Math.max(5, Math.min(30, notificationSettings.value.refreshInterval || 10))
+  const intervalMs = intervalSeconds * 1000
+
+  lastDataRevision = await fetchDataRevision()
+
+  refreshInterval = setInterval(async () => {
+    try {
+      const nextRevision = await fetchDataRevision()
+      if (!nextRevision || nextRevision === lastDataRevision) return
+      lastDataRevision = nextRevision
+
+      if (isClientAuthenticated.value) {
+        await Promise.allSettled([
+          songs.fetchSongs(false, undefined, true, true),
+          songs.fetchPublicSchedules(false, undefined, true, true),
+          loadNotifications()
+        ])
+      } else {
+        await Promise.allSettled([songs.fetchPublicSchedules(false, undefined, true, true), songs.fetchSongCount()])
+      }
+
+      await updateSongCounts()
+    } catch (error) {
+      console.error('定期刷新失败:', error)
+    }
+  }, intervalMs)
+}
 
 // 添加通知相关变量
 const userNotifications = computed(() => notificationsService?.notifications?.value || [])
 const notificationsLoading = computed(() => notificationsService?.loading?.value || false)
-const notificationSearchInput = ref('')
-let notificationSearchTimer = null
-
-const runNotificationSearch = async () => {
-  if (notificationSearchTimer) {
-    clearTimeout(notificationSearchTimer)
-    notificationSearchTimer = null
-  }
-  await notificationsService.changeSearch(notificationSearchInput.value)
-}
-
-const handleNotificationSearchInput = () => {
-  if (notificationSearchTimer) clearTimeout(notificationSearchTimer)
-  notificationSearchTimer = setTimeout(() => {
-    notificationSearchTimer = null
-    notificationsService.changeSearch(notificationSearchInput.value)
-  }, 300)
-}
-
-const clearNotificationSearch = async () => {
-  notificationSearchInput.value = ''
-  await runNotificationSearch()
-}
-
-onUnmounted(() => {
-  if (notificationSearchTimer) clearTimeout(notificationSearchTimer)
-})
-
 const hasUnreadNotifications = computed(() => {
   // 确保notificationsService已初始化且有unreadCount
   if (!notificationsService || !notificationsService.unreadCount) {
@@ -1122,12 +863,12 @@ const hasUnreadNotifications = computed(() => {
 })
 const showNotificationSettings = ref(false)
 
-const pageSizeOptions = computed(() => [
-  { label: locale.value.pageSizeOptions.five, value: 5 },
-  { label: locale.value.pageSizeOptions.ten, value: 10 },
-  { label: locale.value.pageSizeOptions.twenty, value: 20 },
-  { label: locale.value.pageSizeOptions.fifty, value: 50 }
-])
+const pageSizeOptions = [
+  { label: '5条', value: 5 },
+  { label: '10条', value: 10 },
+  { label: '20条', value: 20 },
+  { label: '50条', value: 50 }
+]
 
 const notificationSettings = ref({
   songSelectedNotify: true,
@@ -1178,7 +919,7 @@ const loadNotifications = async () => {
     try {
       await notificationsService.fetchNotifications()
     } catch (error) {
-      console.error('[????] ??????:', error)
+      console.error('[通知获取] 加载通知失败:', error)
     }
   }
 }
@@ -1194,13 +935,10 @@ const markNotificationAsRead = async (id) => {
 const markAllNotificationsAsRead = async () => {
   try {
     if (notificationsService) {
-      const result = await notificationsService.markAllAsRead()
-      if (result) {
-        showToast(locale.value.markAllReadSuccess, 'success')
-      }
+      await notificationsService.markAllAsRead()
     }
   } catch (error) {
-    console.error('[????] ???????????', error)
+    console.error('[通知操作] 标记所有通知为已读失败:', error)
   }
 }
 
@@ -1209,11 +947,11 @@ const deleteNotification = async (id) => {
   pendingAction.value = 'delete'
   pendingId.value = id
   confirmDialogConfig.value = {
-    title: locale.value.confirm.deleteTitle,
-    message: locale.value.confirm.deleteMessage,
+    title: '删除消息',
+    message: '确定要删除此消息吗？',
     type: 'warning',
-    confirmText: locale.value.delete,
-    cancelText: locale.value.confirm.cancel
+    confirmText: '删除',
+    cancelText: '取消'
   }
   showConfirmDialog.value = true
 }
@@ -1222,11 +960,11 @@ const deleteNotification = async (id) => {
 const clearAllNotifications = async () => {
   pendingAction.value = 'clearAll'
   confirmDialogConfig.value = {
-    title: locale.value.confirm.clearTitle,
-    message: locale.value.confirm.clearMessage,
+    title: '清空所有消息',
+    message: '确定要清空所有消息吗？此操作不可撤销。',
     type: 'danger',
-    confirmText: locale.value.confirm.clearConfirm,
-    cancelText: locale.value.confirm.cancel
+    confirmText: '清空',
+    cancelText: '取消'
   }
   showConfirmDialog.value = true
 }
@@ -1237,8 +975,8 @@ const confirmDialogConfig = ref({
   title: '',
   message: '',
   type: 'warning',
-  confirmText: locale.value.confirm.ok,
-  cancelText: locale.value.confirm.cancel
+  confirmText: '确定',
+  cancelText: '取消'
 })
 const pendingAction = ref('')
 const pendingId = ref(null)
@@ -1250,10 +988,7 @@ const handleConfirmAction = async () => {
       await notificationsService.deleteNotification(pendingId.value)
       pendingId.value = null
     } else if (pendingAction.value === 'clearAll') {
-      const result = await notificationsService.clearAllNotifications()
-      if (result) {
-        showToast(locale.value.clearAllSuccess, 'success')
-      }
+      await notificationsService.clearAllNotifications()
     }
   }
   showConfirmDialog.value = false
@@ -1284,7 +1019,7 @@ const getVisiblePages = () => {
   const pages = []
 
   if (totalPages <= 7) {
-    // 总页数少于等于7页，显示所有页面
+    // 总页数少于等于7页，显示所有页码
     for (let i = 1; i <= totalPages; i++) {
       pages.push(i)
     }
@@ -1319,54 +1054,30 @@ const getVisiblePages = () => {
   return pages
 }
 
-const getNotificationTypeLabel = (type) =>
-  locale.value?.notificationTypes?.[type] ||
-  locale.value?.notificationTypes?.SYSTEM ||
-  type
-
-const getNotificationSenderName = (notification) =>
-  notification?.sender?.name?.trim() ||
-  notification?.sender?.username?.trim() ||
-  locale.value.systemSender
-
-// 只有管理员手动发送的通知才允许 Markdown 渲染
-const isAdminManualNotification = (notification) => notification?.source === 'ADMIN_MANUAL'
-
-// 预计算已清洗的 Markdown HTML，避免模板内重复解析
-const renderedNotificationMessages = computed(() => {
-  const rendered = {}
-  for (const notification of userNotifications.value) {
-    if (isAdminManualNotification(notification)) {
-      rendered[notification.id] = renderMarkdown(notification.message)
-    }
-  }
-  return rendered
-})
-
 // 格式化通知时间
 const formatNotificationTime = (timeString) => {
   const date = new Date(timeString)
-  const now = getSyncedDate()
+  const now = new Date()
   const diff = now.getTime() - date.getTime()
 
   // 小于1分钟
   if (diff < 60000) {
-    return locale.value?.time?.justNow || '刚刚'
+    return '刚刚'
   }
 
   // 小于1小时
   if (diff < 3600000) {
-    return formatLocaleValue(locale.value.time.minutesAgo, Math.floor(diff / 60000))
+    return `${Math.floor(diff / 60000)}分钟前`
   }
 
   // 小于24小时
   if (diff < 86400000) {
-    return formatLocaleValue(locale.value.time.hoursAgo, Math.floor(diff / 3600000))
+    return `${Math.floor(diff / 3600000)}小时前`
   }
 
   // 小于30天
   if (diff < 2592000000) {
-    return formatLocaleValue(locale.value.time.daysAgo, Math.floor(diff / 86400000))
+    return `${Math.floor(diff / 86400000)}天前`
   }
 
   // 大于30天，显示具体日期
@@ -1378,37 +1089,20 @@ watch(activeTab, (newTab) => {
   if (newTab === 'notification') {
     loadNotifications()
   }
-  if (newTab === 'songs' && isClientAuthenticated.value && songs?.songs?.value?.length === 0 && !songs?.loading?.value) {
-    // 歌曲列表尚未加载，触发一次前台加载（骨架屏显示）
-    songs.fetchSongs().then(() => updateSongCounts())
-  }
 })
 
 watch(
-  () => [auth?.isAuthenticated?.value || false, user.value?.id ?? null, user.value?.role || ''],
-  async ([newAuthState, newUserId, newRole], [oldAuthState, oldUserId, oldRole] = []) => {
-    const identityChanged = newUserId !== oldUserId || newRole !== oldRole
-
-    if (newAuthState && (!oldAuthState || identityChanged)) {
+  () => auth?.isAuthenticated?.value,
+  async (newAuthState, oldAuthState) => {
+    if (newAuthState && !oldAuthState) {
       hasInitializedAuthData.value = true
-      songs.clearPrivateSongs()
-      songs.clearPublicSongs()
-      // 歌曲列表后台预取，避免阻塞首页首屏
-      songs.fetchSongs(true).then(() => updateSongCounts())
-      await Promise.allSettled([
-        loadNotifications(),
-        fetchNotificationSettings(),
-        songs.fetchSongCount(),
-        songs.fetchPublicSchedules()
-      ])
+      await Promise.allSettled([loadNotifications(), fetchNotificationSettings(), songs.fetchSongs()])
       await updateSongCounts()
       return
     }
 
     if (!newAuthState && oldAuthState) {
       hasInitializedAuthData.value = false
-      songs.clearPrivateSongs()
-      songs.clearPublicSongs()
       await Promise.allSettled([songs.fetchSongCount(), songs.fetchPublicSchedules()])
       unreadNotificationCount.value = 0
       await updateSongCounts()
@@ -1426,19 +1120,22 @@ onMounted(() => {
 
 // 获取当前日期和星期
 const getCurrentDate = () => {
-  const now = getSyncedDate()
+  const now = new Date()
   const year = now.getFullYear()
   const month = now.getMonth() + 1
   const date = now.getDate()
-  const weekDay = (locale.value?.time?.weekdays || ['周日', '周一', '周二', '周三', '周四', '周五', '周六'])[now.getDay()] || '今日'
+  const weekDays = ['日', '一', '二', '三', '四', '五', '六']
+  const weekDay = weekDays[now.getDay()]
 
-  return formatLocaleValue(locale.value.time.dateFormat, year, month, date, weekDay)
+  return `${year}年${month}月${date}日 周${weekDay}`
 }
 
 // RequestForm组件引用
 const requestFormRef = ref(null)
 
-// 更新歌曲数量统计（优化版本，避免重复请求
+// 旧的showNotification函数已移除，使用全局通知系统
+
+// 更新歌曲数量统计（优化版本，避免重复请求）
 const updateSongCounts = async (semester = null) => {
   try {
     // 更新排期歌曲数量
@@ -1446,77 +1143,44 @@ const updateSongCounts = async (semester = null) => {
     scheduleCount.value = schedules.length
 
     // 更新总歌曲数量
-    if (isClientAuthenticated.value && songs?.songs?.value?.length) {
-      // 已登录用户且歌曲列表已加载：使用完整歌曲列表
+    if (isClientAuthenticated.value && songs?.songs?.value) {
+      // 已登录用户：使用完整歌曲列表
       songCount.value = songs.songs.value.length
     } else {
-      // 列表未加载完成或未登录：使用总数接口缓存
+      // 未登录用户：使用缓存的歌曲总数
       songCount.value = songs?.songCount?.value || 0
     }
   } catch (e) {
-    console.error('????????', e)
+    console.error('更新歌曲统计失败', e)
   }
 }
 
-// 首页标题：根据加载阶段动态切换
-// 配置加载完成前使用环境配置的站点标题兜底，保证 SSR 输出真实站点名（SEO / 链接预览），
-// 并与 og:title 保持一致；加载完成后切换为数据库配置的站点标题
-const pageTitle = computed(() => {
-  if (showBootLoading.value) {
-    const bootTitle = isLoaded.value ? siteTitle.value : config.public.siteTitle
-    return bootTitle ? `${locale.value.titleLoading} | ${bootTitle}` : locale.value.titleLoading
-  }
-  return `${locale.value.titleHome} | ${siteTitle.value}`
-})
-useHead({ title: pageTitle })
-
-const isFirstVisit = !hasShownBootLoading.value
-
-if (import.meta.client) {
-  if (!isFirstVisit) {
-    showBootLoading.value = false
-  }
-  hasShownBootLoading.value = true
-}
+// 监听siteTitle变化，确保首页title正确设置
+watch(
+  siteTitle,
+  (newSiteTitle) => {
+    if (typeof document !== 'undefined' && newSiteTitle) {
+      document.title = `首页 | ${newSiteTitle}`
+    }
+  },
+  { immediate: true }
+)
 
 // 在组件挂载后初始化认证和歌曲（只会在客户端执行）
 onMounted(async () => {
-  const bootStartedAt = Date.now()
-
-  const queryTab = route.query.tab
-  const tabFromQuery = Array.isArray(queryTab) ? queryTab[0] : queryTab
-  if (tabFromQuery && tabOrder.includes(tabFromQuery)) {
-    activeTab.value = tabFromQuery
-  }
-
   try {
-    if (isFirstVisit) {
-      showBootLoading.value = true
-      setBootState({ progress: BOOT_PROGRESS.START })
-
-      bootSlowTimer = setTimeout(() => {
-        setBootState({
-          progress: Math.max(bootProgress.value, BOOT_PROGRESS.SLOW_NETWORK),
-          message: locale.value.bootMessages.SLOW_NETWORK
-        })
-      }, BOOT_SLOW_THRESHOLD_MS)
-
-      await waitForFirstPaint()
-    }
-
-    setBootState({ progress: BOOT_PROGRESS.CONFIG, message: locale.value.bootMessages.CONFIG })
     await initSiteConfig()
 
-    setBootState({ progress: BOOT_PROGRESS.AUTH, message: locale.value.bootMessages.AUTH })
     const currentUser = await auth.initAuth()
 
-    setBootState({ progress: BOOT_PROGRESS.CONTENT, message: locale.value.bootMessages.CONTENT })
+    if (typeof document !== 'undefined' && siteTitle.value) {
+      document.title = `首页 | ${siteTitle.value}`
+    }
+
     if (isClientAuthenticated.value) {
       hasInitializedAuthData.value = true
-      // 歌曲列表后台预取，避免阻塞首页首屏
-      songs.fetchSongs(true).then(() => updateSongCounts())
       await Promise.allSettled([
-        songs.fetchSongCount(),
+        songs.fetchSongs(),
         songs.fetchPublicSchedules(),
         loadNotifications(),
         fetchNotificationSettings()
@@ -1527,39 +1191,9 @@ onMounted(async () => {
       await Promise.allSettled([songs.fetchSongCount(), songs.fetchPublicSchedules()])
     }
 
-    setBootState({ progress: BOOT_PROGRESS.FINALIZING, message: locale.value.bootMessages.FINALIZING })
     await updateSongCounts()
 
-    const setupRefreshInterval = () => {
-      if (refreshInterval) {
-        clearInterval(refreshInterval)
-      }
-
-      const intervalSeconds = notificationSettings.value.refreshInterval || 60
-      const intervalMs = intervalSeconds * 1000
-
-      console.log(`设置智能刷新间隔: ${intervalSeconds}秒`)
-
-      refreshInterval = setInterval(async () => {
-        try {
-          if (isClientAuthenticated.value) {
-            await Promise.allSettled([
-              songs.fetchSongs(true),
-              songs.fetchPublicSchedules(true),
-              loadNotifications()
-            ])
-          } else {
-            await Promise.allSettled([songs.fetchPublicSchedules(true), songs.fetchSongCount()])
-          }
-
-          await updateSongCounts()
-        } catch (error) {
-          console.error('??????:', error)
-        }
-      }, intervalMs)
-    }
-
-    setupRefreshInterval()
+    await setupRefreshInterval()
 
     if (songs.notification) {
       watch(songs.notification, (newVal) => {
@@ -1568,32 +1202,24 @@ onMounted(async () => {
         }
       })
     }
-  } catch (error) {
-    console.error('???????', error)
-    if (isFirstVisit) {
-      setBootState({ progress: BOOT_PROGRESS.FALLBACK, message: locale.value.bootMessages.FALLBACK })
+
+    // 注入站点统计代码（兜底方案：动态插入 script 到 body 末尾）
+    if (statisticsCodeEnabled.value && statisticsCode.value) {
+      try {
+        injectStatisticsCode(statisticsCode.value)
+      } catch (e) {
+        console.warn('统计代码注入失败:', e)
+      }
     }
+  } catch (error) {
+    console.error('首页初始化失败:', error)
     await Promise.allSettled([songs.fetchPublicSchedules(), songs.fetchSongCount()])
     await updateSongCounts()
-  } finally {
-    if (isFirstVisit) {
-      if (bootSlowTimer) {
-        clearTimeout(bootSlowTimer)
-        bootSlowTimer = null
-      }
-
-      await finishBootLoading(bootStartedAt)
-    }
   }
 })
 
 // 组件卸载时清除定时器
 onUnmounted(() => {
-  if (bootSlowTimer) {
-    clearTimeout(bootSlowTimer)
-    bootSlowTimer = null
-  }
-
   if (refreshInterval) {
     clearInterval(refreshInterval)
   }
@@ -1608,7 +1234,7 @@ const realSongCount = computed(() => {
 const publicSchedules = computed(() => songs?.publicSchedules?.value || [])
 const allSongs = computed(() => songs?.visibleSongs?.value || [])
 const filteredSongs = computed(() => {
-  // 返回所有歌曲，但将已播放的歌曲排在最前
+  // 返回所有歌曲，但将已播放的歌曲排在最后
   if (allSongs.value && allSongs.value.length > 0) {
     const unplayedSongs = allSongs.value.filter((song) => !song.played)
     const playedSongs = allSongs.value.filter((song) => song.played)
@@ -1619,13 +1245,31 @@ const filteredSongs = computed(() => {
 const loading = computed(() => songs?.loading?.value || false)
 const error = computed(() => songs?.error?.value || '')
 
+// 处理学校logo的HTTP/HTTPS代理
+const proxiedSchoolLogoUrl = computed(() => {
+  if (!schoolLogoHomeUrl.value || !schoolLogoHomeUrl.value.trim()) {
+    return ''
+  }
+
+  const logoUrl = schoolLogoHomeUrl.value.trim()
+
+  // 如果是HTTP链接，通过代理访问
+  if (logoUrl.startsWith('http://')) {
+    return `/api/proxy/image?url=${encodeURIComponent(logoUrl)}`
+  }
+
+  // HTTPS链接或相对路径直接返回
+  return logoUrl
+})
+
 // 处理投稿请求
-const handleRequest = async (songData) => {
+const handleRequest = async (songData, done) => {
   if (!auth || !isClientAuthenticated.value) {
     if (window.$showNotification) {
-      window.$showNotification(getMessage('requestLogin'), 'error')
+      window.$showNotification('需要登录才能投稿歌曲', 'error')
     }
     showRequestModal.value = false
+    if (typeof done === 'function') done(false)
     return false
   }
 
@@ -1636,10 +1280,11 @@ const handleRequest = async (songData) => {
     if (result) {
       // 显示投稿成功通知
       if (window.$showNotification) {
-        window.$showNotification(getHomeText('messages', 'requestSuccess', songData.title, songData.artist), 'success')
+        window.$showNotification(`《${songData.title} - ${songData.artist}》投稿成功！`, 'success')
       }
 
       // 强制刷新歌曲列表
+      console.log('投稿成功，刷新歌曲列表')
       await refreshSongs()
 
       // 刷新投稿状态
@@ -1654,16 +1299,16 @@ const handleRequest = async (songData) => {
         }, 500)
       }
 
+      if (typeof done === 'function') done(true)
       return true
     }
+    if (typeof done === 'function') done(false)
     return false
   } catch (err) {
     if (window.$showNotification) {
-      window.$showNotification(
-        getErrorMessage(err) || getHomeText('messages', 'requestFailed'),
-        'error'
-      )
+      window.$showNotification(err.message || '点歌失败', 'error')
     }
+    if (typeof done === 'function') done(false)
     return false
   }
 }
@@ -1671,7 +1316,7 @@ const handleRequest = async (songData) => {
 // 处理投票
 const handleVote = async (song) => {
   if (!isClientAuthenticated.value) {
-    showNotification(getMessage('voteLogin'), 'error')
+    showNotification('请先登录后再投票', 'error')
     return
   }
 
@@ -1691,19 +1336,18 @@ const handleVote = async (song) => {
     // 静默刷新歌曲列表以获取最新状态，但不影响当前视图
     setTimeout(() => {
       songs.refreshSongsSilent().catch((err) => {
-        console.error('????????', err)
+        console.error('刷新歌曲列表失败', err)
       })
     }, 500)
   } catch (err) {
     // 不做任何处理，因为useSongs中已经处理了错误提示
-    console.log('API????useSongs???')
+    console.log('API错误已在useSongs中处理')
   }
 }
 
-// 处理撤回重播申请
 const handleCancelReplay = async (song) => {
   if (!isClientAuthenticated.value) {
-    showNotification(getMessage('cancelReplayLogin'), 'error')
+    showNotification('请先登录才能取消重播申请', 'error')
     return
   }
 
@@ -1712,14 +1356,29 @@ const handleCancelReplay = async (song) => {
     await songs.withdrawReplay(song.id)
     updateSongCounts()
   } catch (err) {
-    // 不做任何处理，因为useSongs中已经处理了错误提示
+    console.log('API错误已在useSongs中处理')
+  }
+}
+
+const handleRequestReplay = async (song) => {
+  if (!isClientAuthenticated.value) {
+    showNotification('请先登录才能申请重播', 'error')
+    return
+  }
+
+  try {
+    if (!songs) return
+    await songs.requestReplay(song.id)
+    updateSongCounts()
+  } catch (err) {
+    console.log('API错误已在useSongs中处理')
   }
 }
 
 // 处理撤回投稿
 const handleWithdraw = async (song) => {
   if (!isClientAuthenticated.value) {
-    showNotification(getMessage('withdrawLogin'), 'error')
+    showNotification('请先登录才能撤回投稿', 'error')
     return
   }
 
@@ -1732,7 +1391,7 @@ const handleWithdraw = async (song) => {
     updateSongCounts()
   } catch (err) {
     // 不做任何处理，因为useSongs中已经处理了错误提示
-    console.log('API????useSongs???')
+    console.log('API错误已在useSongs中处理')
   }
 }
 
@@ -1747,7 +1406,7 @@ const refreshSongs = async () => {
 
     updateSongCounts()
   } catch (err) {
-    console.error('????????', err)
+    console.error('刷新歌曲列表失败', err)
   }
 }
 
@@ -1764,7 +1423,7 @@ const handleSemesterChange = async (semester) => {
     })
     window.dispatchEvent(event)
 
-    console.log('?????????:', semester)
+    console.log('学期切换事件已发送:', semester)
 
     // 更新歌曲计数（基于当前已有数据）
     await updateSongCounts(semester)
@@ -1826,13 +1485,10 @@ const handleCollaborationReply = async (notification, accept) => {
     notification.handled = true
     notification.status = accept ? 'ACCEPTED' : 'REJECTED'
     notification.repliedAt = new Date()
-    // notification.message += accept ? ' (已接受' : ' (已拒绝'
+    // notification.message += accept ? ' (已接受)' : ' (已拒绝)'
 
     if (window.$showNotification) {
-      window.$showNotification(
-        accept ? getMessage('inviteAccepted') : getMessage('inviteRejected'),
-        'success'
-      )
+      window.$showNotification(accept ? '已接受联合投稿邀请' : '已拒绝联合投稿邀请', 'success')
     }
 
     // 标记通知为已读
@@ -1844,12 +1500,9 @@ const handleCollaborationReply = async (notification, accept) => {
     // 刷新通知列表
     await loadNotifications()
   } catch (error) {
-    console.error('??????????', error)
+    console.error('处理联合投稿邀请失败:', error)
     if (window.$showNotification) {
-      window.$showNotification(
-        getErrorMessage(error) || getMessage('operationFailed'),
-        'error'
-      )
+      window.$showNotification(error.statusMessage || '操作失败', 'error')
     }
   } finally {
     notification.processing = false
@@ -1859,13 +1512,11 @@ const handleCollaborationReply = async (notification, accept) => {
 // 格式化刷新间隔
 const formatRefreshInterval = (seconds) => {
   if (seconds < 60) {
-    return formatLocaleValue(locale.value.time.seconds, seconds)
+    return `${seconds}秒`
   } else {
     const minutes = Math.floor(seconds / 60)
     const remainingSeconds = seconds % 60
-    return remainingSeconds > 0
-      ? formatLocaleValue(locale.value.time.minutesSeconds, minutes, remainingSeconds)
-      : formatLocaleValue(locale.value.time.minutes, minutes)
+    return remainingSeconds > 0 ? `${minutes}分${remainingSeconds}秒` : `${minutes}分钟`
   }
 }
 
@@ -1904,10 +1555,42 @@ const navigateToLogin = () => {
 // 显示登录提示
 const showLoginNotice = () => {
   if (window.$showNotification) {
-    window.$showNotification(getMessage('notificationLogin'), 'info')
+    window.$showNotification('需要登录才能查看通知', 'info')
   }
 }
 
+// 注入站点统计代码（兜底方案：动态解析并插入 script 元素到 body 末尾）
+const injectStatisticsCode = (code) => {
+  if (typeof document === 'undefined' || !code) return
+
+  // 先尝试用临时容器解析 HTML，提取其中的 script 标签
+  const tempDiv = document.createElement('div')
+  tempDiv.innerHTML = code
+
+  // 将非 script 的元素先附加到容器中
+  const container = document.getElementById('site-statistics-code')
+  if (container) {
+    Array.from(tempDiv.childNodes).forEach((node) => {
+      if (node.nodeType === 1 && node.tagName && node.tagName.toLowerCase() !== 'script') {
+        container.appendChild(node.cloneNode(true))
+      }
+    })
+  }
+
+  // 单独处理 script 标签：动态创建并插入到 body 末尾，确保能正确执行
+  const scripts = tempDiv.querySelectorAll('script')
+  scripts.forEach((oldScript) => {
+    const newScript = document.createElement('script')
+    Array.from(oldScript.attributes).forEach((attr) => {
+      newScript.setAttribute(attr.name, attr.value)
+    })
+    if (oldScript.textContent) {
+      newScript.textContent = oldScript.textContent
+    }
+    document.body.appendChild(newScript)
+  })
+}
+
 // 检查用户是否需要修改密码
 const checkPasswordChangeRequired = async (user = null) => {
   try {
@@ -1919,7 +1602,7 @@ const checkPasswordChangeRequired = async (user = null) => {
       setTimeout(() => {
         if (window.$showNotification) {
           window.$showNotification(
-            getMessage('changePasswordTip'),
+            '为了您的账户安全，建议您修改密码。您可以点击右上角的"修改密码"按钮进行修改。',
             'info',
             true,
             8000 // 显示8秒
@@ -1928,12 +1611,14 @@ const checkPasswordChangeRequired = async (user = null) => {
       }, 1000)
     }
   } catch (error) {
-    console.error('??????????', error)
+    console.error('检查密码修改状态失败:', error)
   }
 }
 
+// 旧的showToast函数已移除，使用全局通知系统
+
 // 添加未读通知计数
-// 之前已声明了unreadNotificationCount，这里对其进行递增操作
+// 之前已声明了unreadNotificationCount，这里对其进行增强
 if (
   notificationsService &&
   notificationsService.unreadCount &&
@@ -1945,23 +1630,12 @@ if (
 </script>
 
 <style scoped>
-.home-boot-loader-leave-active {
-  transition:
-    opacity 420ms ease,
-    filter 420ms ease;
-}
-
-.home-boot-loader-leave-to {
-  opacity: 0;
-  filter: blur(12px);
-}
-
 .home {
   width: 100%;
   flex: 1;
-  background-color: var(--panel-bg-darker);
+  background-color: var(--bg-primary, #ffffff);
   padding: 1.5rem;
-  color: var(--text-primary);
+  color: var(--text-primary, #1a2332);
   display: flex;
   flex-direction: column;
   min-height: 100vh; /* 确保至少占满视口 */
@@ -1974,7 +1648,7 @@ if (
   position: relative;
   display: flex;
   flex-direction: column;
-  height: 100%; /* 改为占满父容器高度而不是视口高度*/
+  height: 100%; /* 改为占满父容器高度而不是视口高度 */
 }
 
 /* 添加顶部Ellipse 1效果 */
@@ -1987,9 +1661,9 @@ if (
   height: 309px;
   background: radial-gradient(
     ellipse at center,
-    var(--color-accent-alpha-30) 0%,
-    var(--color-accent-alpha-15) 30%,
-    transparent 70%
+    rgba(11, 90, 254, 0.3) 0%,
+    rgba(11, 90, 254, 0.15) 30%,
+    rgba(11, 90, 254, 0) 70%
   );
   z-index: 0;
   pointer-events: none;
@@ -2017,7 +1691,7 @@ if (
 }
 
 .logo-image {
-  width: 150px;
+  width: 80px;
   height: auto;
   object-fit: contain;
 }
@@ -2035,9 +1709,9 @@ if (
   height: 100px;
   background: linear-gradient(
     to bottom,
-    var(--overlay-30),
-    var(--overlay-80),
-    var(--overlay-30)
+    var(--border-secondary, #d1d5db),
+    var(--border-tertiary, #9ca3af),
+    var(--border-secondary, #d1d5db)
   );
   border-radius: 1px;
 }
@@ -2054,14 +1728,55 @@ if (
 .user-section {
   position: relative;
   z-index: 100;
-}
-
-.user-actions-row {
   display: flex;
   align-items: center;
   gap: 10px;
 }
 
+/* 通用工具按钮（主题） */
+.utility-btn {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  padding: 7px 12px;
+  background: var(--surface-secondary, var(--bg-secondary));
+  color: var(--text-primary);
+  border: 1px solid var(--border-primary);
+  border-radius: 10px;
+  font-size: 13px;
+  font-weight: 500;
+  line-height: 1;
+  cursor: pointer;
+  transition:
+    background 0.2s ease,
+    color 0.2s ease,
+    border-color 0.2s ease,
+    transform 0.15s ease;
+}
+
+.utility-btn:hover {
+  background: var(--surface-tertiary, var(--bg-tertiary));
+  border-color: var(--border-secondary);
+}
+
+.utility-btn:active {
+  transform: scale(0.97);
+}
+
+.utility-btn-label {
+  white-space: nowrap;
+}
+
+@media (max-width: 768px) {
+  .utility-btn-label {
+    display: none;
+  }
+  .utility-btn {
+    padding: 7px 8px;
+    border-radius: 9px;
+  }
+}
+
 .user-info {
   display: flex;
   align-items: center;
@@ -2072,166 +1787,29 @@ if (
 .login-options {
   display: flex;
   align-items: center;
-  gap: 10px;
+  gap: 12px;
 }
 
-.language-switcher {
-  position: relative;
-  display: inline-flex;
-}
-
-.language-switcher-trigger {
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  width: 36px;
-  height: 36px;
-  padding: 0;
-  border: 1px solid var(--overlay-10);
-  border-radius: 50%;
-  background: var(--overlay-4);
-  backdrop-filter: blur(12px);
-  -webkit-backdrop-filter: blur(12px);
-  color: var(--overlay-70);
-  cursor: pointer;
-  transition:
-    background 0.2s ease,
-    color 0.2s ease,
-    border-color 0.2s ease;
-}
-
-.language-switcher-trigger:hover,
-.language-switcher-trigger:focus-visible,
-.language-switcher-trigger.is-open {
-  color: var(--text-primary);
-  border-color: var(--overlay-25);
-  background: var(--overlay-8);
-  outline: none;
-}
-
-.language-dropdown {
-  position: absolute;
-  top: calc(100% + 12px);
-  right: 0;
-  background: var(--panel-bg);
-  border: 1px solid var(--overlay-10);
-  border-radius: 12px;
-  padding: 8px;
-  min-width: 160px;
-  box-shadow: 0 10px 30px var(--mask-50);
-  display: flex;
-  flex-direction: column;
-  gap: 4px;
-  z-index: 200;
-}
-
-.language-option {
+.enter-admin-btn {
   display: flex;
   align-items: center;
-  justify-content: space-between;
-  gap: 10px;
-  padding: 10px 12px;
-  border: 0;
+  gap: 6px;
+  padding: 6px 12px;
+  background: var(--primary-light, rgba(30, 64, 175, 0.08));
+  color: var(--primary, #1e40af);
+  border: 1px solid var(--primary-border, rgba(30, 64, 175, 0.15));
   border-radius: 8px;
-  background: transparent;
-  color: var(--overlay-70);
-  font-size: 14px;
-  line-height: 1;
-  cursor: pointer;
-  transition: all 0.2s;
-  width: 100%;
-  text-align: left;
-}
-
-.language-option:hover,
-.language-option:focus-visible {
-  background: var(--overlay-5);
-  color: var(--text-primary);
-  outline: none;
-}
-
-.language-option.is-active {
-  color: var(--text-primary);
-}
-
-.language-option.is-active .language-option-label {
+  font-size: 0.85rem;
   font-weight: 600;
-}
-
-/* ==================== 主题切换 ==================== */
-.theme-switcher {
-  position: relative;
-  display: inline-flex;
-}
-
-.theme-switcher-trigger {
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  width: 36px;
-  height: 36px;
-  padding: 0;
-  border: 1px solid var(--overlay-10);
-  border-radius: 50%;
-  background: var(--overlay-4);
-  backdrop-filter: blur(12px);
-  -webkit-backdrop-filter: blur(12px);
-  color: var(--overlay-70);
+  transition: all 0.2s ease;
   cursor: pointer;
-  transition:
-    background 0.2s ease,
-    color 0.2s ease,
-    border-color 0.2s ease;
+  text-decoration: none;
+  margin-right: 8px;
 }
 
-.theme-switcher-trigger:hover,
-.theme-switcher-trigger:focus-visible,
-.theme-switcher-trigger.is-open {
-  color: var(--text-primary);
-  border-color: var(--overlay-25);
-  background: var(--overlay-8);
-  outline: none;
-}
-
-.theme-dropdown {
-  position: absolute;
-  top: calc(100% + 12px);
-  right: 0;
-  background: var(--panel-bg);
-  border: 1px solid var(--overlay-10);
-  border-radius: 12px;
-  padding: 8px;
-  min-width: 160px;
-  box-shadow: 0 10px 30px var(--mask-50);
-  display: flex;
-  flex-direction: column;
-  gap: 4px;
-  z-index: 200;
-}
-
-.theme-option {
-  display: block;
-  padding: 10px 12px;
-  border: 0;
-  border-radius: 8px;
-  background: transparent;
-  color: var(--overlay-70);
-  font-size: 14px;
-  cursor: pointer;
-  transition: all 0.2s;
-  width: 100%;
-  text-align: left;
-}
-
-.theme-option:hover,
-.theme-option:focus-visible {
-  background: var(--overlay-5);
-  color: var(--text-primary);
-  outline: none;
-}
-
-.theme-option.is-active {
-  color: var(--text-primary);
+.enter-admin-btn:hover {
+  background: var(--primary-border, rgba(30, 64, 175, 0.15));
+  transform: translateY(-1px);
 }
 
 .user-details-desktop {
@@ -2243,21 +1821,21 @@ if (
 .user-name {
   font-size: 14px;
   font-weight: 600;
-  color: var(--overlay-90);
+  color: var(--text-primary, #1a2332);
 }
 
 .user-badge {
   font-size: 10px;
   padding: 1px 6px;
-  background: var(--overlay-10);
-  color: var(--overlay-50);
+  background: var(--surface-tertiary, var(--bg-tertiary));
+  color: var(--text-tertiary, #6b7280);
   border-radius: 4px;
   margin-top: 2px;
 }
 
 .user-badge.admin {
-  background: var(--primary-20);
-  color: var(--color-accent-light);
+  background: var(--primary-light, rgba(30, 64, 175, 0.08));
+  color: var(--primary, #1e40af);
 }
 
 .user-avatar-wrapper {
@@ -2265,8 +1843,8 @@ if (
   height: 36px;
   border-radius: 50%;
   overflow: hidden;
-  background: var(--panel-border);
-  border: 1px solid var(--overlay-10);
+  background: var(--surface-secondary, var(--bg-secondary));
+  border: 1px solid var(--border-primary, #e5e7eb);
   display: flex;
   align-items: center;
   justify-content: center;
@@ -2288,12 +1866,12 @@ if (
   position: absolute;
   top: calc(100% + 12px);
   right: 0;
-  background: var(--panel-bg);
-  border: 1px solid var(--overlay-10);
+  background: var(--surface-primary, var(--bg-primary));
+  border: 1px solid var(--border-primary, #e5e7eb);
   border-radius: 12px;
   padding: 8px;
   min-width: 160px;
-  box-shadow: 0 10px 30px var(--mask-50);
+  box-shadow: var(--shadow-lg, 0 10px 15px rgba(0, 0, 0, 0.1));
   display: flex;
   flex-direction: column;
   gap: 4px;
@@ -2304,25 +1882,24 @@ if (
   align-items: center;
   gap: 10px;
   padding: 10px 12px;
-  border: 0;
   border-radius: 8px;
-  background: transparent;
-  color: var(--overlay-70);
+  color: var(--text-secondary, #4a5568);
   font-size: 14px;
   transition: all 0.2s;
   text-decoration: none;
+  background: transparent;
   width: 100%;
   text-align: left;
 }
 
 .action-item:hover {
-  background: var(--overlay-5);
-  color: var(--text-primary);
+  background: var(--surface-secondary, var(--bg-secondary));
+  color: var(--text-primary, #1a2332);
 }
 
 .action-item.logout:hover {
-  background: var(--error-10);
-  color: var(--color-error);
+  background: var(--error-light, rgba(239, 68, 68, 0.1));
+  color: var(--error, #ef4444);
 }
 
 .notification-badge {
@@ -2332,17 +1909,17 @@ if (
   min-width: 18px;
   height: 18px;
   border-radius: 9px;
-  background-color: var(--color-error);
-  color: white;
+  background-color: var(--error, #ef4444);
+  color: var(--text-primary, #ffffff);
   font-size: 10px;
-  font-weight: bold;
+  font-weight: 700;
   display: flex;
   align-items: center;
   justify-content: center;
   padding: 0 4px;
 }
 
-/* 登录按钮 - 桌面端*/
+/* 登录按钮 - 桌面端 */
 .login-options .login-btn {
   display: flex;
   align-items: center;
@@ -2351,12 +1928,12 @@ if (
   border-radius: 14px;
   font-size: 14px;
   font-weight: 600;
-  background: var(--overlay-4);
+  background: var(--surface-secondary, var(--bg-secondary));
   backdrop-filter: blur(12px);
   -webkit-backdrop-filter: blur(12px);
-  color: var(--text-primary);
-  border: 1px solid var(--overlay-10);
-  box-shadow: 0 4px 15px var(--mask-10);
+  color: var(--text-primary, #1a2332);
+  border: 1px solid var(--border-primary, #e5e7eb);
+  box-shadow: var(--shadow-sm, 0 1px 2px rgba(0, 0, 0, 0.05));
   transition: all 0.4s cubic-bezier(0.23, 1, 0.32, 1);
   text-decoration: none;
   position: relative;
@@ -2364,23 +1941,23 @@ if (
 }
 
 .login-options .login-btn:hover {
-  background: var(--overlay-8);
-  border-color: var(--primary-50);
+  background: var(--surface-tertiary, var(--bg-tertiary));
+  border-color: var(--primary-border, rgba(30, 64, 175, 0.15));
   transform: translateY(-2px);
-  box-shadow: 0 8px 25px var(--primary-20);
-  color: white;
+  box-shadow: var(--shadow-md, 0 4px 6px rgba(0, 0, 0, 0.1));
+  color: var(--text-primary, #1a2332);
 }
 
 .login-options .login-btn :deep(.icon),
 .login-options .login-btn i {
-  color: var(--color-accent-light);
+  color: var(--primary, #1e40af);
   transition: all 0.3s ease;
 }
 
 .login-options .login-btn:hover :deep(.icon),
 .login-options .login-btn:hover i {
   transform: scale(1.1);
-  filter: drop-shadow(0 0 5px var(--primary-50));
+  filter: drop-shadow(0 0 5px rgba(30, 64, 175, 0.3));
 }
 
 .login-options .login-btn:active {
@@ -2407,10 +1984,9 @@ if (
   font-weight: 800;
   font-size: 42px;
   letter-spacing: -0.02em;
-  background: linear-gradient(135deg, var(--text-primary) 0%, var(--overlay-70) 100%);
+  background: linear-gradient(135deg, var(--text-primary, #1a2332) 0%, var(--text-secondary, #4a5568) 100%);
   -webkit-background-clip: text;
   -webkit-text-fill-color: transparent;
-  text-shadow: 0 10px 30px var(--mask-30);
   margin: 0;
   line-height: 1.2;
 }
@@ -2418,16 +1994,16 @@ if (
 .title-divider {
   width: 40px;
   height: 4px;
-  background: var(--title-divider-bg);
+  background: var(--primary, #1e40af);
   border-radius: 2px;
-  box-shadow: 0 0 15px var(--color-accent-alpha-60);
+  box-shadow: 0 0 15px var(--primary-light, rgba(30, 64, 175, 0.08));
 }
 
 .sub-title {
   font-family: 'MiSans', sans-serif;
   font-weight: 500;
   font-size: 14px;
-  color: var(--overlay-40);
+  color: var(--text-quaternary, #9ca3af);
   letter-spacing: 0.2em;
   text-transform: uppercase;
 }
@@ -2438,11 +2014,11 @@ if (
   flex-direction: column;
   gap: 0;
   flex: 1; /* 占据剩余空间 */
-  min-height: 0; /* 允许 flex 子元素收缩*/
+  min-height: 0; /* 允许 flex 子元素收缩 */
   width: 100%; /* 确保宽度占满 */
 }
 
-/* 选项卡片样式- 桌面端*/
+/* 选项卡样式 - 桌面端 */
 .tabs-row {
   display: flex;
   gap: 5px;
@@ -2459,22 +2035,22 @@ if (
 }
 
 .section-tab {
-  background: var(--section-tab-bg);
+  background: var(--surface-secondary, var(--bg-secondary));
   border-radius: 15px 15px 0 0;
   padding: 15px 24px;
   font-family: 'MiSans', sans-serif;
   font-weight: 600;
   font-size: 16px;
-  color: var(--text-secondary);
-  border: 2px solid var(--section-tab-border);
+  color: var(--text-secondary, #4a5568);
+  border: 2px solid var(--border-primary, #e5e7eb);
   border-bottom: none;
   cursor: pointer;
   flex: 0 0 auto;
 }
 
 .section-tab.active {
-  background: var(--panel-bg);
-  color: var(--text-primary);
+  background: var(--surface-primary, var(--bg-primary));
+  color: var(--text-primary, #1a2332);
   position: relative;
   z-index: 1;
 }
@@ -2506,7 +2082,7 @@ if (
   transform: translateY(-20px) scale(1.02);
 }
 
-/* 通知项交错进入动画*/
+/* 通知项交错进入动画 */
 .notification-card {
   animation: notification-item-enter 0.6s cubic-bezier(0.4, 0, 0.2, 1) forwards;
   animation-delay: var(--animation-delay, 0s);
@@ -2520,7 +2096,7 @@ if (
 
 .notification-card:hover {
   transform: translateY(-2px) scale(1.02);
-  box-shadow: 0 8px 25px var(--mask-15);
+  box-shadow: 0 8px 25px rgba(0, 0, 0, 0.15);
 }
 
 @keyframes notification-item-enter {
@@ -2534,13 +2110,13 @@ if (
   }
 }
 
-/* 选项卡切换动画*/
+/* 选项卡切换动画 */
 .section-tab {
   position: relative;
   transition: all 0.3s ease;
   overflow: hidden;
   padding: 0.75rem 1.5rem;
-  z-index: 10; /* 确保在内容之上*/
+  z-index: 10; /* 确保在内容之上 */
   display: flex;
   align-items: center;
   justify-content: center;
@@ -2548,7 +2124,7 @@ if (
 }
 
 .section-tab .tab-icon {
-  display: none; /* PC端默认隐藏图标*/
+  display: none; /* PC端默认隐藏图标 */
 }
 
 .section-tab .icon-wrapper {
@@ -2560,16 +2136,16 @@ if (
   position: relative;
 }
 
-/* PC端通知小圆点*/
+/* PC端通知小圆点 */
 .notification-badge-desktop {
   position: absolute;
   top: -2px;
   right: -8px;
   width: 6px;
   height: 6px;
-  background: var(--color-accent);
+  background: var(--primary, #1e40af);
   border-radius: 50%;
-  box-shadow: 0 0 5px var(--color-accent-alpha-50);
+  box-shadow: 0 0 5px var(--primary-light, rgba(30, 64, 175, 0.08));
 }
 
 .section-tab::after {
@@ -2579,7 +2155,7 @@ if (
   left: 50%;
   width: 0;
   height: 2px;
-  background: var(--color-accent);
+  background: var(--primary, #1e40af);
   transition: all 0.3s ease;
   transform: translateX(-50%);
 }
@@ -2595,21 +2171,21 @@ if (
 /* 移除上浮效果 */
 .section-tab:hover {
   transform: none; /* 移除上浮效果 */
-  background-color: transparent; /* 移除背背景*/
-  box-shadow: none; /* 移除内阴影*/
-  color: var(--text-primary);
+  background-color: transparent; /* 移除背景色 */
+  box-shadow: none; /* 移除内阴影 */
+  color: var(--text-primary, #1a2332);
 }
 
 .section-tab.active:hover {
   background-color: transparent;
   box-shadow: none;
-  color: var(--text-primary);
+  color: var(--text-primary, #1a2332);
 }
 
 /* 内容容器 */
 .tab-content-container {
-  background: var(--panel-bg-overlay);
-  border: 2px solid var(--panel-bg-raised);
+  background: var(--surface-primary, var(--bg-primary));
+  border: 2px solid var(--border-primary, #e5e7eb);
   border-radius: 0 15px 15px 15px;
   padding: 1.5rem;
   margin-top: -2px; /* 使内容容器与标签连接 */
@@ -2618,7 +2194,7 @@ if (
   display: flex;
   flex-direction: column;
   flex: 1; /* 占据剩余空间 */
-  min-height: 0; /* 允许 flex 子元素收缩*/
+  min-height: 0; /* 允许 flex 子元素收缩 */
   overflow: hidden; /* 防止内容溢出 */
 }
 
@@ -2644,8 +2220,8 @@ if (
   padding: 0;
   display: flex;
   flex-direction: column;
-  flex: 1; /* 占满父容器高度*/
-  min-height: 0; /* 允许 flex 子元素收缩*/
+  flex: 1; /* 占满父容器高度 */
+  min-height: 0; /* 允许 flex 子元素收缩 */
   overflow: hidden; /* 防止内容溢出 */
 }
 
@@ -2653,7 +2229,7 @@ if (
   flex: 1; /* 占据剩余空间 */
   display: flex;
   flex-direction: column;
-  min-height: 0; /* 允许 flex 子元素收缩*/
+  min-height: 0; /* 允许 flex 子元素收缩 */
   overflow: hidden; /* 防止内容溢出 */
 }
 
@@ -2666,7 +2242,7 @@ if (
     padding: 0;
   }
 
-  /* 移动端分页控件样式*/
+  /* 移动端分页控件样式 */
   .pagination-controls {
     flex-direction: column;
     gap: 10px;
@@ -2705,7 +2281,7 @@ if (
   font-weight: 400;
   font-size: 16px;
   letter-spacing: 4%;
-  color: var(--overlay-60);
+  color: var(--text-tertiary, #6b7280);
   margin: 1.5rem 0 1rem;
 }
 
@@ -2721,11 +2297,11 @@ if (
   gap: 2rem;
 }
 
-/* 空状态*/
+/* 空状态 */
 .empty-state {
   text-align: center;
   padding: 2rem;
-  color: var(--overlay-60);
+  color: var(--text-tertiary, #6b7280);
 }
 
 /* 下拉菜单动画 */
@@ -2762,241 +2338,37 @@ if (
   align-items: center;
   padding: 1.25rem 0;
   margin-bottom: 1.5rem;
-  border-bottom: 1px solid var(--overlay-8);
-}
-
-.notification-header-main {
-  display: flex;
-  min-width: 0;
-  flex: 1 1 auto;
-  align-items: center;
-  flex-wrap: wrap;
-  gap: 0.5rem;
-}
-
-.notification-filter {
-  display: inline-flex;
-  flex-shrink: 0;
-  border: 1px solid var(--overlay-10);
-  border-radius: 8px;
-  background: var(--chip-bg);
-  padding: 3px;
-}
-
-.notification-filter button {
-  min-height: 28px;
-  border: 0;
-  border-radius: 6px;
-  background: transparent;
-  padding: 0.3rem 0.65rem;
-  color: var(--overlay-55);
-  font-size: 0.75rem;
-  font-weight: 700;
-  white-space: nowrap;
-  cursor: pointer;
-  transition: background 0.2s ease, color 0.2s ease;
-}
-
-.notification-filter button:hover:not(.active) {
-  color: var(--overlay-85);
-}
-
-.notification-filter button.active {
-  background: var(--color-accent);
-  color: #ffffff;
+  border-bottom: 1px solid var(--border-primary, #e5e7eb);
 }
 
 .notification-title {
   font-size: 1.25rem;
   font-weight: 700;
-  color: var(--text-primary);
+  color: var(--text-primary, #1a2332);
   margin: 0;
   display: flex;
   align-items: center;
   gap: 0.75rem;
 }
 
-.notification-header-actions {
-  display: flex;
-  align-items: center;
-  justify-content: flex-end;
-  gap: 0.5rem;
-  margin-left: auto;
-  flex-shrink: 0;
-}
-
-.mark-all-read-header {
-  display: inline-flex;
-  min-height: 36px;
-  align-items: center;
-  justify-content: center;
-  gap: 0.4rem;
-  border: 1px solid var(--color-accent-alpha-22);
-  border-radius: 10px;
-  background: var(--color-accent-alpha-10);
-  padding: 0.45rem 0.75rem;
-  color: var(--color-accent-light);
-  font-size: 0.75rem;
-  font-weight: 700;
-  white-space: nowrap;
-  cursor: pointer;
-  transition: all 0.2s ease;
-}
-
-.mark-all-read-header:hover:not(.disabled) {
-  border-color: var(--color-accent-alpha-40);
-  background: var(--color-accent-alpha-18);
-  color: var(--color-accent-lighter);
-}
-
-.mark-all-read-header.disabled {
-  border-color: var(--overlay-8);
-  background: var(--overlay-3);
-  color: var(--overlay-30);
-  cursor: not-allowed;
-}
-
-.notification-search {
-  display: flex;
-  width: 260px;
-  min-width: 180px;
-  min-height: 36px;
-  flex: 0 1 260px;
-  align-items: center;
-  gap: 0.6rem;
-  border: 1px solid var(--overlay-10);
-  border-radius: 8px;
-  background: var(--chip-bg);
-  padding: 0 0.75rem;
-  color: var(--overlay-40);
-  transition: border-color 0.2s ease, background 0.2s ease;
-}
-
-.notification-search:focus-within {
-  border-color: var(--color-accent-alpha-65);
-  background: var(--overlay-6);
-  color: var(--color-accent-light);
-}
-
-.notification-search input {
-  min-width: 0;
-  flex: 1;
-  border: 0;
-  outline: 0;
-  background: transparent;
-  color: var(--text-primary);
-  font-size: 0.85rem;
-}
-
-.notification-search input::placeholder {
-  color: var(--overlay-35);
-}
-
-.notification-search input::-webkit-search-cancel-button {
-  display: none;
-}
-
-.notification-search button {
-  display: inline-flex;
-  width: 28px;
-  height: 28px;
-  flex-shrink: 0;
-  align-items: center;
-  justify-content: center;
-  border: 0;
-  border-radius: 6px;
-  background: transparent;
-  color: var(--overlay-45);
-  cursor: pointer;
-}
-
-.notification-search button:hover {
-  background: var(--overlay-8);
-  color: var(--text-primary);
-}
-
-.notification-unread-summary {
-  display: flex;
-  width: 100%;
-  min-height: 72px;
-  align-items: center;
-  gap: 0.85rem;
-  margin-bottom: 0.75rem;
-  border: 1px solid var(--color-warning-alpha-24);
-  border-radius: 8px;
-  background: var(--overlay-4);
-  padding: 0.8rem 1rem;
-  color: var(--text-primary);
-  text-align: left;
-  cursor: pointer;
-  transition: border-color 0.2s ease, background 0.2s ease;
-}
-
-.notification-unread-summary:hover:not(:disabled) {
-  border-color: var(--color-warning-alpha-48);
-  background: var(--overlay-7);
-}
-
-.notification-unread-summary:focus-visible {
-  outline: 2px solid var(--color-accent-light);
-  outline-offset: 2px;
-}
-
-.notification-unread-summary.empty {
-  border-color: var(--overlay-9);
-  color: var(--overlay-58);
-  cursor: default;
-}
-
-.notification-unread-summary-icon {
-  display: inline-flex;
-  width: 40px;
-  height: 40px;
-  flex-shrink: 0;
-  align-items: center;
-  justify-content: center;
-  border-radius: 8px;
-  background: var(--color-warning-alpha-14);
-  color: var(--color-warning-light);
-}
-
-.notification-unread-summary.empty .notification-unread-summary-icon {
-  background: var(--overlay-6);
-  color: var(--overlay-40);
-}
-
-.notification-unread-summary-copy {
-  display: flex;
-  min-width: 0;
-  flex: 1;
-  flex-direction: column;
-  gap: 0.15rem;
-}
-
-.notification-unread-summary-copy > span {
-  color: var(--overlay-50);
-  font-size: 0.72rem;
-  font-weight: 600;
-}
-
 .settings-icon {
-  display: inline-flex;
+  background: var(--surface-secondary, var(--bg-secondary));
+  border: 1px solid var(--border-primary, #e5e7eb);
+  color: var(--text-tertiary, #6b7280);
   width: 36px;
   height: 36px;
-  flex-shrink: 0;
+  border-radius: 10px;
+  display: flex;
   align-items: center;
   justify-content: center;
-  border: 1px solid var(--overlay-10);
-  border-radius: 10px;
-  background: var(--chip-bg);
-  color: var(--overlay-45);
   cursor: pointer;
   transition: all 0.2s ease;
 }
 
 .settings-icon:hover {
-  background-color: var(--overlay-10);
-  color: var(--text-primary);
+  background-color: var(--surface-tertiary, var(--bg-tertiary));
+  color: var(--text-primary, #1a2332);
+  transform: rotate(30deg);
 }
 
 /* 通知列表 */
@@ -3018,14 +2390,14 @@ if (
   align-items: center;
   justify-content: center;
   padding: 3rem 0;
-  color: var(--overlay-40);
+  color: var(--text-quaternary, #9ca3af);
   gap: 1.25rem;
 }
 
 .empty-icon {
   width: 80px;
   height: 80px;
-  background: var(--overlay-3);
+  background: var(--surface-secondary, var(--bg-secondary));
   border-radius: 50%;
   display: flex;
   align-items: center;
@@ -3033,6 +2405,21 @@ if (
   margin-bottom: 0.5rem;
 }
 
+.loading-spinner {
+  width: 32px;
+  height: 32px;
+  border: 3px solid var(--border-secondary, #d1d5db);
+  border-top-color: var(--primary, #1e40af);
+  border-radius: 50%;
+  animation: spin 0.8s linear infinite;
+}
+
+@keyframes spin {
+  to {
+    transform: rotate(360deg);
+  }
+}
+
 .notification-items {
   display: flex;
   flex-direction: column;
@@ -3040,9 +2427,8 @@ if (
 }
 
 .notification-card {
-  background: var(--overlay-3);
-  backdrop-filter: blur(20px);
-  border: 1px solid var(--overlay-6);
+  background: var(--surface-secondary, var(--bg-secondary));
+  border: 1px solid var(--border-primary, #e5e7eb);
   border-radius: 20px;
   padding: 1.25rem;
   transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
@@ -3051,14 +2437,14 @@ if (
 }
 
 .notification-card:hover {
-  background: var(--overlay-6);
-  border-color: var(--overlay-12);
+  background: var(--surface-tertiary, var(--bg-tertiary));
+  border-color: var(--border-secondary, #d1d5db);
   transform: translateY(-2px);
 }
 
 .notification-card.unread {
-  background: var(--primary-5);
-  border-color: var(--primary-20);
+  background: var(--primary-light, rgba(30, 64, 175, 0.08));
+  border-color: var(--primary-border, rgba(30, 64, 175, 0.15));
 }
 
 .notification-card-header {
@@ -3073,8 +2459,8 @@ if (
   justify-content: center;
   width: 40px;
   height: 40px;
-  background: var(--primary-10);
-  color: var(--color-accent-light);
+  background: var(--primary-light, rgba(30, 64, 175, 0.08));
+  color: var(--primary, #1e40af);
   border-radius: 12px;
   margin-right: 1rem;
   flex-shrink: 0;
@@ -3086,59 +2472,16 @@ if (
   min-width: 0;
 }
 
-.notification-heading-row {
-  display: flex;
-  align-items: flex-start;
-  justify-content: space-between;
-  gap: 0.75rem;
-}
-
 .notification-title {
   font-size: 0.95rem;
   font-weight: 600;
-  color: var(--text-primary);
-  min-width: 0;
-  overflow-wrap: anywhere;
-}
-
-.notification-read-status {
-  display: inline-flex;
-  align-items: center;
-  gap: 0.3rem;
-  flex-shrink: 0;
-  border: 1px solid transparent;
-  border-radius: 6px;
-  padding: 0.2rem 0.45rem;
-  font-size: 0.7rem;
-  font-weight: 700;
-  line-height: 1;
-}
-
-.notification-read-status.is-read {
-  border-color: var(--success-20);
-  background: var(--success-10);
-  color: var(--color-success-light);
-}
-
-.notification-read-status.is-unread {
-  border-color: var(--warning-20);
-  background: var(--warning-10);
-  color: var(--color-warning-light);
+  color: var(--text-primary, #1a2332);
+  margin-bottom: 0.25rem;
 }
 
 .notification-time {
-  margin-top: 0.4rem;
   font-size: 0.75rem;
-  color: var(--overlay-40);
-}
-
-.notification-sender {
-  display: flex;
-  align-items: center;
-  gap: 0.3rem;
-  margin-top: 0.35rem;
-  font-size: 0.72rem;
-  color: var(--overlay-40);
+  color: var(--text-quaternary, #9ca3af);
 }
 
 .notification-card-body {
@@ -3146,19 +2489,9 @@ if (
 }
 
 .notification-text {
-  color: var(--overlay-70);
+  color: var(--text-secondary, #4a5568);
   font-size: 0.875rem;
   line-height: 1.6;
-  min-width: 0;
-  overflow-wrap: anywhere;
-}
-
-.notification-text.markdown-body > :first-child {
-  margin-top: 0;
-}
-
-.notification-text.markdown-body > :last-child {
-  margin-bottom: 0;
 }
 
 .notification-card-actions {
@@ -3169,9 +2502,9 @@ if (
 }
 
 .action-button.delete {
-  background: var(--error-5);
-  color: var(--color-error);
-  border: 1px solid var(--error-10);
+  background: var(--error-light, rgba(239, 68, 68, 0.1));
+  color: var(--error, #ef4444);
+  border: 1px solid var(--error-border, rgba(239, 68, 68, 0.2));
   padding: 0.4rem 0.75rem;
   border-radius: 8px;
   font-size: 0.75rem;
@@ -3182,22 +2515,22 @@ if (
 }
 
 .action-button.delete:hover {
-  background: var(--error-10);
-  border-color: var(--error-20);
+  background: rgba(239, 68, 68, 0.15);
+  border-color: rgba(239, 68, 68, 0.3);
 }
 
 .notification-actions-bar {
   display: flex;
   gap: 1rem;
   padding: 1rem 0;
-  border-top: 1px solid var(--overlay-8);
+  border-top: 1px solid var(--border-primary, #e5e7eb);
 }
 
 .action-button-large {
   flex: 1;
-  background: var(--overlay-5);
-  border: 1px solid var(--overlay-10);
-  color: var(--text-primary);
+  background: var(--surface-secondary, var(--bg-secondary));
+  border: 1px solid var(--border-primary, #e5e7eb);
+  color: var(--text-primary, #1a2332);
   padding: 0.75rem;
   border-radius: 12px;
   font-size: 0.875rem;
@@ -3207,15 +2540,15 @@ if (
 }
 
 .action-button-large:hover:not(.disabled) {
-  background: var(--overlay-10);
+  background: var(--surface-tertiary, var(--bg-tertiary));
 }
 
 .action-button-large.danger {
-  color: var(--color-error);
+  color: var(--error, #ef4444);
 }
 
 .action-button-large.danger:hover {
-  background: var(--error-10);
+  background: var(--error-light, rgba(239, 68, 68, 0.1));
 }
 
 .action-button-large.disabled {
@@ -3226,8 +2559,8 @@ if (
 /* 分页控件样式 */
 .notification-pagination {
   padding: 15px 0;
-  border-top: 1px solid var(--overlay-10);
-  border-bottom: 1px solid var(--overlay-10);
+  border-top: 1px solid var(--border-primary, #e5e7eb);
+  border-bottom: 1px solid var(--border-primary, #e5e7eb);
 }
 
 .pagination-info {
@@ -3236,7 +2569,7 @@ if (
 }
 
 .pagination-text {
-  color: var(--overlay-70);
+  color: var(--text-secondary, #4a5568);
   font-size: 0.85rem;
 }
 
@@ -3254,7 +2587,7 @@ if (
 }
 
 .page-size-selector label {
-  color: var(--overlay-70);
+  color: var(--text-secondary, #4a5568);
   font-size: 0.85rem;
   white-space: nowrap;
 }
@@ -3270,9 +2603,9 @@ if (
 }
 
 .page-nav-button {
-  background-color: var(--overlay-10);
-  border: 1px solid var(--overlay-20);
-  color: var(--light);
+  background-color: var(--surface-secondary, var(--bg-secondary));
+  border: 1px solid var(--border-primary, #e5e7eb);
+  color: var(--text-primary, #1a2332);
   width: 32px;
   height: 32px;
   border-radius: 6px;
@@ -3285,8 +2618,8 @@ if (
 }
 
 .page-nav-button:hover:not(:disabled) {
-  background-color: var(--overlay-20);
-  border-color: var(--overlay-30);
+  background-color: var(--surface-tertiary, var(--bg-tertiary));
+  border-color: var(--border-secondary, #d1d5db);
   transform: translateY(-1px);
 }
 
@@ -3296,9 +2629,9 @@ if (
 }
 
 .page-nav-button:disabled {
-  background-color: var(--overlay-5);
-  border-color: var(--overlay-10);
-  color: var(--overlay-30);
+  background-color: var(--surface-secondary, var(--bg-secondary));
+  border-color: var(--border-primary, #e5e7eb);
+  color: var(--text-disabled, #c5cbd3);
   cursor: not-allowed;
 }
 
@@ -3309,9 +2642,9 @@ if (
 }
 
 .page-number-button {
-  background-color: var(--overlay-10);
-  border: 1px solid var(--overlay-20);
-  color: var(--light);
+  background-color: var(--surface-secondary, var(--bg-secondary));
+  border: 1px solid var(--border-primary, #e5e7eb);
+  color: var(--text-primary, #1a2332);
   width: 32px;
   height: 32px;
   border-radius: 6px;
@@ -3327,8 +2660,8 @@ if (
 }
 
 .page-number-button:hover:not(:disabled) {
-  background-color: var(--overlay-20);
-  border-color: var(--overlay-30);
+  background-color: var(--surface-tertiary, var(--bg-tertiary));
+  border-color: var(--border-secondary, #d1d5db);
   transform: translateY(-1px);
 }
 
@@ -3340,39 +2673,58 @@ if (
 .page-number-button.active {
   background-color: var(--primary);
   border-color: var(--primary);
-  color: white;
+  color: var(--btn-primary-text, #ffffff);
 }
 
 .page-number-button.active:hover {
-  background-color: var(--color-accent);
-  border-color: var(--color-accent);
+  background-color: var(--primary-hover, #1e3a8a);
+  border-color: var(--primary-hover, #1e3a8a);
 }
 
 .page-number-button:disabled {
-  background-color: var(--overlay-5);
-  border-color: var(--overlay-10);
-  color: var(--overlay-30);
+  background-color: var(--surface-secondary, var(--bg-secondary));
+  border-color: var(--border-primary, #e5e7eb);
+  color: var(--text-disabled, #c5cbd3);
   cursor: not-allowed;
 }
 
 .page-ellipsis {
-  color: var(--overlay-50);
+  color: var(--text-tertiary, #6b7280);
   padding: 0 4px;
   font-size: 0.85rem;
 }
 
-/* 分页加载状态*/
+/* 分页加载状态 */
 .pagination-loading {
   display: flex;
   align-items: center;
   justify-content: center;
   gap: 8px;
   padding: 10px 0;
-  color: var(--overlay-70);
+  color: var(--text-secondary, #4a5568);
   font-size: 0.85rem;
   animation: fade-in 0.3s ease;
 }
 
+.loading-spinner {
+  width: 16px;
+  height: 16px;
+  border: 2px solid var(--border-secondary, #d1d5db);
+  border-top: 2px solid var(--primary);
+  border-radius: 50%;
+  animation: spin 0.8s cubic-bezier(0.4, 0, 0.2, 1) infinite;
+  will-change: transform;
+}
+
+@keyframes spin {
+  0% {
+    transform: rotate(0deg);
+  }
+  100% {
+    transform: rotate(360deg);
+  }
+}
+
 @keyframes fade-in {
   0% {
     opacity: 0;
@@ -3384,19 +2736,19 @@ if (
   }
 }
 
-/* 底部操作区*/
+/* 底部操作栏 */
 .notification-actions-bar {
   display: flex;
   justify-content: center;
   gap: 10px;
   padding: 15px 0;
-  border-top: 1px solid var(--overlay-10);
+  border-top: 1px solid var(--border-primary, #e5e7eb);
 }
 
 .action-button-large {
-  background-color: var(--overlay-10);
+  background-color: var(--surface-secondary, var(--bg-secondary));
   border: none;
-  color: var(--light);
+  color: var(--text-primary, #1a2332);
   padding: 8px 16px;
   border-radius: 6px;
   cursor: pointer;
@@ -3405,42 +2757,42 @@ if (
 }
 
 .action-button-large:hover {
-  background-color: var(--overlay-20);
+  background-color: var(--surface-tertiary, var(--bg-tertiary));
 }
 
 .action-button-large.danger {
-  color: var(--color-error);
+  color: var(--error, #ef4444);
 }
 
 .action-button-large.danger:hover {
-  background-color: var(--error-20);
+  background-color: var(--error-light, rgba(239, 68, 68, 0.1));
 }
 
 .action-button-large.disabled {
-  background-color: var(--overlay-5);
-  color: var(--overlay-30);
+  background-color: var(--surface-secondary, var(--bg-secondary));
+  color: var(--text-disabled, #c5cbd3);
   cursor: not-allowed;
   opacity: 0.5;
 }
 
 .action-button-large.disabled:hover {
-  background-color: var(--overlay-5);
+  background-color: var(--surface-secondary, var(--bg-secondary));
 }
 
-/* ==================== 移动端设置==================== */
+/* ==================== 移动端设计 ==================== */
 
 /* 基础移动端适配 */
 @media (max-width: 768px) {
   .home {
     padding: 0;
-    background-color: var(--panel-bg-darkest);
+    background-color: var(--bg-primary, #ffffff);
   }
 
   .main-content {
     padding: 0;
   }
 
-  /* 隐藏原有的ellipse效果，使用更微妙的背景*/
+  /* 隐藏原有的ellipse效果，使用更微妙的背景 */
   .ellipse-effect {
     display: none;
   }
@@ -3452,8 +2804,8 @@ if (
     align-items: center;
     padding: 10px 12px;
     margin: 0;
-    background: linear-gradient(180deg, var(--color-accent-alpha-10) 0%, transparent 100%);
-    border-bottom: 1px solid var(--overlay-5);
+    background: linear-gradient(180deg, var(--primary-light, rgba(30, 64, 175, 0.08)) 0%, transparent 100%);
+    border-bottom: 1px solid var(--border-primary, #e5e7eb);
   }
 
   .logo-section {
@@ -3473,10 +2825,10 @@ if (
   .logo-divider {
     height: 28px;
     width: 1px;
-    background: var(--overlay-15);
+    background: var(--border-secondary, #d1d5db);
   }
 
-  /* 移动端的主页面里不需要写学校名，保持简约*/
+  /* 移动端的主页面里不需要写学校名，保持简洁 */
   .site-title {
     display: none;
   }
@@ -3486,15 +2838,11 @@ if (
     max-height: 36px;
   }
 
-  /* 用户区域简约*/
+  /* 用户区域简化 */
   .user-section {
     width: auto;
   }
 
-  .user-actions-row {
-    gap: 8px;
-  }
-
   .user-details-desktop {
     display: none; /* 移动端仅显示头像 */
   }
@@ -3502,8 +2850,8 @@ if (
   .user-avatar-wrapper {
     width: 32px;
     height: 32px;
-    background: var(--overlay-5);
-    border-color: var(--overlay-10);
+    background: var(--surface-secondary, var(--bg-secondary));
+    border-color: var(--border-primary, #e5e7eb);
   }
 
   .user-avatar-placeholder {
@@ -3516,27 +2864,6 @@ if (
     padding: 6px;
   }
 
-  .language-switcher-trigger {
-    width: 32px;
-    height: 32px;
-  }
-
-  .theme-switcher-trigger {
-    width: 32px;
-    height: 32px;
-  }
-
-  .language-dropdown {
-    top: calc(100% + 10px);
-    min-width: 140px;
-    padding: 6px;
-  }
-
-  .language-option {
-    padding: 8px 10px;
-    font-size: 13px;
-  }
-
   .action-item {
     padding: 8px 10px;
     font-size: 13px;
@@ -3551,25 +2878,23 @@ if (
     border-radius: 12px;
     font-size: 14px;
     font-weight: 600;
-    background: var(--overlay-8);
+    background: var(--surface-secondary, var(--bg-secondary));
     backdrop-filter: blur(10px);
     -webkit-backdrop-filter: blur(10px);
-    color: white;
-    border: 1px solid var(--overlay-10);
-    box-shadow: 0 4px 12px var(--mask-10);
+    color: var(--text-primary, #1a2332);
+    border: 1px solid var(--border-primary, #e5e7eb);
+    box-shadow: var(--shadow-sm, 0 1px 2px rgba(0, 0, 0, 0.05));
     transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
-    flex-shrink: 0; /* 防止空间不足时按钮被压缩导致文字换行 */
-    white-space: nowrap;
   }
 
   .login-options .login-btn :deep(.icon) {
-    color: var(--color-accent-light);
+    color: var(--primary, #1e40af);
   }
 
   .login-options .login-btn:active {
     transform: scale(0.95);
-    background: var(--overlay-15);
-    border-color: var(--primary-40);
+    background: var(--surface-tertiary, var(--bg-tertiary));
+    border-color: var(--primary-border, rgba(30, 64, 175, 0.15));
   }
 
   /* Footer 间距优化 */
@@ -3577,12 +2902,12 @@ if (
     padding-bottom: calc(80px + env(safe-area-inset-bottom, 0px));
   }
 
-  /* 内容区域 - 全宽无边框*/
+  /* 内容区域 - 全宽无边框 */
   .content-area {
     min-height: auto;
     overflow-x: hidden; /* 防止横向溢出 */
-    max-width: 100vw; /* 确保不超过视口宽度*/
-    box-sizing: border-box; /* 确保padding计入总宽度*/
+    max-width: 100vw; /* 确保不超过视口宽度 */
+    box-sizing: border-box; /* 确保padding计入总宽度 */
   }
 
   .tabs-row {
@@ -3594,17 +2919,17 @@ if (
     max-width: 500px;
     display: flex;
     justify-content: space-around;
-    align-items: stretch; /* 修改为stretch 以配合子元素 height: 100% */
+    align-items: stretch; /* 修改为 stretch 以配合子元素 height: 100% */
     gap: 0;
     padding: 0 0.5rem;
     height: 64px;
-    background: var(--index-footer-bg);
+    background: var(--surface-primary, var(--bg-primary));
     backdrop-filter: blur(20px) saturate(180%);
     -webkit-backdrop-filter: blur(20px) saturate(180%);
-    border: 1px solid var(--overlay-10);
+    border: 1px solid var(--border-primary, #e5e7eb);
     border-radius: 9999px;
     z-index: 1000;
-    box-shadow: 0 12px 40px var(--mask-60);
+    box-shadow: var(--shadow-xl, 0 20px 25px rgba(0, 0, 0, 0.1));
   }
 
   .section-tab {
@@ -3616,7 +2941,7 @@ if (
     padding: 0; /* 移除固定内边距，改用 flex 居中 */
     font-size: 10px;
     font-weight: 500;
-    color: var(--text-muted); /* text-text-tertiary */
+    color: var(--text-tertiary, #6b7280);
     display: flex;
     flex-direction: column;
     align-items: center;
@@ -3641,15 +2966,14 @@ if (
   }
 
   .section-tab.active {
-    color: var(--color-accent-light) !important; /* text-primary - Force blue */
+    color: var(--primary, #1e40af) !important;
     background: transparent !important;
     transform: none !important;
-    text-shadow: 0 0 12px var(--primary-60); /* Text Glow */
   }
 
   /* Prevent hover from turning it white on mobile */
   .section-tab.active:hover {
-    color: var(--color-accent-light) !important;
+    color: var(--primary, #1e40af) !important;
     background: transparent !important;
     box-shadow: none !important;
   }
@@ -3658,7 +2982,6 @@ if (
     opacity: 1;
     color: currentColor;
     transform: none;
-    filter: drop-shadow(0 0 8px var(--primary-50)); /* Icon Glow */
   }
 
   .section-tab.active .tab-text {
@@ -3670,7 +2993,7 @@ if (
     display: none;
   }
 
-  /* 移除底部指示器（横条 彻底隐藏 */
+  /* 移除底部指示器（横条）- 彻底隐藏 */
   .section-tab::after {
     display: none !important;
   }
@@ -3697,7 +3020,7 @@ if (
   }
 
   .section-tab .icon-wrapper {
-    display: flex; /* 移动端显示图标容器*/
+    display: flex; /* 移动端显示图标容器 */
   }
 
   /* 通知徽章 - 回归蓝色风格 */
@@ -3707,10 +3030,10 @@ if (
     right: 0;
     width: 8px;
     height: 8px;
-    background: var(--color-accent);
+    background: var(--primary, #1e40af);
     border-radius: 50%;
-    border: 1.5px solid var(--panel-bg-darkest);
-    box-shadow: 0 0 5px var(--color-accent-alpha-40);
+    border: 1.5px solid var(--surface-primary, var(--bg-primary));
+    box-shadow: 0 0 5px var(--primary-light, rgba(30, 64, 175, 0.08));
     z-index: 2;
   }
 
@@ -3719,7 +3042,7 @@ if (
   }
 
   @keyframes badge-pulse {
-    /* 移除导致位移的动画*/
+    /* 移除导致位移的动画 */
   }
 
   .section-tab.disabled {
@@ -3740,16 +3063,10 @@ if (
   .tab-pane {
     padding: 0;
     overflow-x: hidden; /* 防止横向溢出 */
-    max-width: 100%; /* 确保不超过视口宽度*/
+    max-width: 100%; /* 确保不超过视口宽度 */
   }
 
-  /* 通知标签页移动端留出左右边距，避免内容贴满屏幕 */
-  .notification-pane {
-    padding: 0 0.75rem;
-    box-sizing: border-box;
-  }
-
-  /* 排期标签页优化*/
+  /* 排期标签页优化 */
   .schedule-tab-pane {
     padding: 0;
     min-height: auto;
@@ -3760,9 +3077,9 @@ if (
     flex-direction: column;
     gap: 16px;
     overflow-x: hidden; /* 防止横向溢出 */
-    max-width: 100%; /* 确保不超过视口宽度*/
+    max-width: 100%; /* 确保不超过视口宽度 */
     padding: 0 0.5rem; /* 添加左右内边距，防止内容贴边 */
-    box-sizing: border-box; /* 确保padding计入总宽度*/
+    box-sizing: border-box; /* 确保padding计入总宽度 */
   }
 
   /* 登录选项 */
@@ -3775,12 +3092,12 @@ if (
     padding: 6px 14px;
     font-size: 12px;
     border-radius: 6px;
-    background: var(--color-accent-alpha-15);
-    border: 1px solid var(--color-accent-alpha-30);
+    background: var(--primary-light, rgba(30, 64, 175, 0.08));
+    border: 1px solid var(--primary-border, rgba(30, 64, 175, 0.15));
   }
 }
 
-/* 小屏幕设备额外优化*/
+/* 小屏幕设备额外优化 */
 @media (max-width: 480px) {
   .top-bar {
     padding: 8px 10px;
@@ -3812,83 +3129,6 @@ if (
   .tab-content-container {
     padding: 0 4px calc(80px + env(safe-area-inset-bottom, 0px));
   }
-
-  .notification-header {
-    display: grid;
-    grid-template-columns: auto auto minmax(0, 1fr);
-    align-items: center;
-    gap: 0.65rem 0.35rem;
-  }
-
-  .notification-title {
-    grid-column: 1;
-    grid-row: 1;
-    max-width: 90px;
-    font-size: 1.05rem;
-    line-height: 1.15;
-  }
-
-  .notification-header-main {
-    display: contents;
-  }
-
-  .notification-filter {
-    grid-column: 2;
-    grid-row: 1;
-  }
-
-  .notification-filter button {
-    min-height: 26px;
-    padding: 0.25rem 0.5rem;
-    font-size: 0.7rem;
-  }
-
-  .notification-header-actions {
-    grid-column: 3;
-    grid-row: 1;
-    width: auto;
-    gap: 0.35rem;
-    margin-left: auto;
-  }
-
-  .notification-search {
-    grid-column: 1 / -1;
-    grid-row: 2;
-    width: 100%;
-    max-width: 100%;
-    min-width: 0;
-    margin: 0;
-    box-sizing: border-box;
-    border-radius: 8px;
-  }
-
-  .mark-all-read-header {
-    gap: 0.25rem;
-    padding: 0.4rem 0.5rem;
-    font-size: 0.7rem;
-  }
-
-  .mark-all-read-header span {
-    white-space: normal;
-    line-height: 1.15;
-    text-align: center;
-  }
-
-  .notification-unread-summary {
-    min-height: 66px;
-    padding: 0.7rem 0.75rem;
-  }
-
-  .notification-unread-summary-action {
-    font-size: 0.7rem;
-  }
-
-  /* 窄屏压缩登录按钮，保证“登录”文字横向排布 */
-  .login-options .login-btn {
-    padding: 8px 14px;
-    font-size: 13px;
-    gap: 6px;
-  }
 }
 
 /* 超小屏幕设备 */
@@ -3910,22 +3150,16 @@ if (
   .section-tab {
     font-size: 9px;
   }
-
-  .login-options .login-btn {
-    padding: 8px 10px;
-    font-size: 12px;
-    gap: 4px;
-  }
 }
 
-/* 弹窗遮罩层*/
+/* 弹窗遮罩层 */
 .modal-overlay {
   position: fixed;
   top: 0;
   left: 0;
   right: 0;
   bottom: 0;
-  background: var(--mask-60);
+  background: rgba(0, 0, 0, 0.6);
   backdrop-filter: blur(8px);
   display: flex;
   align-items: center;
@@ -3945,10 +3179,10 @@ if (
 
 /* 弹窗内容 */
 .modal-content {
-  background: linear-gradient(135deg, var(--panel-bg-overlay) 0%, var(--panel-bg-darker) 100%);
+  background: var(--surface-primary, var(--bg-primary, #ffffff));
   border-radius: 20px;
-  border: 1px solid var(--overlay-10);
-  box-shadow: 0 25px 50px -12px var(--mask-50);
+  border: 1px solid var(--border-primary, #e5e7eb);
+  box-shadow: var(--shadow-card, 0 25px 50px -12px rgba(0, 0, 0, 0.12));
   max-width: 420px;
   width: 90%;
   overflow: hidden;
@@ -3972,7 +3206,7 @@ if (
   justify-content: space-between;
   align-items: center;
   padding: 24px 28px 16px;
-  border-bottom: 1px solid var(--overlay-8);
+  border-bottom: 1px solid var(--border-secondary, #f1f5f9);
 }
 
 .modal-header h2 {
@@ -3983,7 +3217,7 @@ if (
     sans-serif;
   font-size: 20px;
   font-weight: 700;
-  color: var(--text-primary);
+  color: var(--text-primary, #1a2332);
   margin: 0;
   letter-spacing: 0.02em;
 }
@@ -3993,9 +3227,9 @@ if (
   width: 32px;
   height: 32px;
   border-radius: 50%;
-  background: var(--overlay-8);
+  background: var(--surface-tertiary, var(--bg-tertiary, #f1f5f9));
   border: none;
-  color: var(--overlay-60);
+  color: var(--text-tertiary, #64748b);
   font-size: 24px;
   line-height: 1;
   cursor: pointer;
@@ -4006,8 +3240,8 @@ if (
 }
 
 .close-button:hover {
-  background: var(--overlay-15);
-  color: var(--text-primary);
+  background: var(--border-secondary, #e2e8f0);
+  color: var(--text-primary, #1a2332);
   transform: rotate(90deg);
 }
 
@@ -4034,24 +3268,24 @@ if (
   gap: 0.5rem;
   font-size: 16px;
   font-weight: 700;
-  color: var(--text-primary);
+  color: var(--text-primary, #1a2332);
   margin: 0;
 }
 
 .rules-icon {
-  color: var(--color-accent-light);
+  color: var(--primary, #0b5afe);
 }
 
 .rules-text {
   font-size: 14px;
-  color: var(--overlay-60);
+  color: var(--text-secondary, #4a5568);
   line-height: 1.6;
   margin: 0;
 }
 
 .guidelines-content {
   font-size: 14px;
-  color: var(--overlay-60);
+  color: var(--text-secondary, #4a5568);
   line-height: 1.6;
 }
 
@@ -4064,31 +3298,31 @@ if (
 .rule-item {
   display: flex;
   font-size: 14px;
-  color: var(--overlay-60);
+  color: var(--text-secondary, #4a5568);
   line-height: 1.5;
 }
 
 .rule-item span {
   margin-right: 0.5rem;
-  color: var(--overlay-30);
+  color: var(--text-disabled, #94a3b8);
   font-weight: 600;
 }
 
 /* 年度报告弹窗 */
 .year-review-overlay {
   backdrop-filter: blur(8px);
-  background: var(--mask-40);
+  background: rgba(15, 23, 42, 0.35);
 }
 
 .year-review-card {
   position: relative;
   width: 90%;
   max-width: 400px;
-  background: var(--panel-bg-darker);
+  background: var(--surface-primary, var(--bg-primary, #ffffff));
   border-radius: 32px;
   overflow: hidden;
-  border: 1px solid var(--overlay-10);
-  box-shadow: 0 25px 50px -12px var(--mask-50);
+  border: 1px solid var(--border-primary, #e5e7eb);
+  box-shadow: var(--shadow-card, 0 25px 50px -12px rgba(0, 0, 0, 0.12));
   animation: card-appear 0.6s cubic-bezier(0.16, 1, 0.3, 1);
 }
 
@@ -4098,14 +3332,14 @@ if (
   left: -50%;
   width: 200%;
   height: 200%;
-  background: radial-gradient(circle, var(--index-card-glow) 0%, transparent 70%);
+  background: radial-gradient(circle, rgba(139, 92, 246, 0.15) 0%, transparent 70%);
   pointer-events: none;
 }
 
 .card-pattern {
   position: absolute;
   inset: 0;
-  background-image: radial-gradient(var(--overlay-5) 1px, transparent 1px);
+  background-image: radial-gradient(rgba(15, 23, 42, 0.06) 1px, transparent 1px);
   background-size: 20px 20px;
   opacity: 0.5;
 }
@@ -4117,9 +3351,9 @@ if (
   width: 36px;
   height: 36px;
   border-radius: 12px;
-  background: var(--overlay-5);
-  border: 1px solid var(--overlay-10);
-  color: var(--overlay-40);
+  background: var(--surface-tertiary, var(--bg-tertiary, #f1f5f9));
+  border: 1px solid var(--border-secondary, #f1f5f9);
+  color: var(--text-tertiary, #64748b);
   display: flex;
   align-items: center;
   justify-content: center;
@@ -4129,8 +3363,8 @@ if (
 }
 
 .card-close:hover {
-  background: var(--overlay-10);
-  color: var(--text-primary);
+  background: var(--border-secondary, #e2e8f0);
+  color: var(--text-primary, #1a2332);
   transform: translateY(2px);
 }
 
@@ -4144,10 +3378,10 @@ if (
 .brand-badge {
   display: inline-block;
   padding: 4px 12px;
-  background: var(--index-brand-badge-bg);
-  border: 1px solid var(--index-brand-badge-border);
+  background: rgba(139, 92, 246, 0.1);
+  border: 1px solid rgba(139, 92, 246, 0.25);
   border-radius: 99px;
-  color: var(--color-collab-light);
+  color: #7c3aed;
   font-size: 12px;
   font-weight: 700;
   letter-spacing: 0.1em;
@@ -4166,13 +3400,13 @@ if (
 .main-icon {
   width: 80px;
   height: 80px;
-  background: linear-gradient(135deg, var(--color-collab) 0%, var(--color-collab-hover) 100%);
+  background: linear-gradient(135deg, #8b5cf6 0%, #6d28d9 100%);
   border-radius: 24px;
   display: flex;
   align-items: center;
   justify-content: center;
-  color: var(--text-primary);
-  box-shadow: 0 10px 25px -5px var(--index-main-icon-shadow);
+  color: var(--text-primary, #ffffff);
+  box-shadow: 0 10px 25px -5px rgba(139, 92, 246, 0.35);
   z-index: 2;
   transform: rotate(-5deg);
 }
@@ -4188,7 +3422,7 @@ if (
 
 .bar {
   width: 4px;
-  background: var(--color-collab);
+  background: #8b5cf6;
   border-radius: 2px;
   animation: bar-dance 1.2s ease-in-out infinite;
 }
@@ -4227,14 +3461,14 @@ if (
 .card-title {
   font-size: 24px;
   font-weight: 800;
-  color: var(--text-primary);
+  color: var(--text-primary, #1a2332);
   margin-bottom: 12px;
   letter-spacing: -0.01em;
 }
 
 .card-description {
   font-size: 15px;
-  color: var(--overlay-50);
+  color: var(--text-secondary, #4a5568);
   line-height: 1.6;
   margin-bottom: 32px;
 }
@@ -4248,10 +3482,10 @@ if (
 .btn-primary {
   width: 100%;
   padding: 16px;
-  background: var(--text-primary);
+  background: var(--primary, #0b5afe);
   border: none;
   border-radius: 16px;
-  color: var(--bg-primary);
+  color: var(--text-primary, #ffffff);
   font-size: 16px;
   font-weight: 700;
   display: flex;
@@ -4264,8 +3498,8 @@ if (
 
 .btn-primary:hover {
   transform: translateY(-2px);
-  box-shadow: 0 10px 20px var(--overlay-10);
-  background: var(--panel-bg-deep);
+  box-shadow: 0 10px 20px rgba(11, 90, 254, 0.2);
+  background: var(--primary-hover, #0043f8);
 }
 
 .btn-primary:active {
@@ -4276,9 +3510,9 @@ if (
   width: 100%;
   padding: 14px;
   background: transparent;
-  border: 1px solid var(--overlay-10);
+  border: 1px solid var(--border-primary, #e5e7eb);
   border-radius: 16px;
-  color: var(--overlay-60);
+  color: var(--text-secondary, #4a5568);
   font-size: 14px;
   font-weight: 600;
   cursor: pointer;
@@ -4286,9 +3520,9 @@ if (
 }
 
 .btn-secondary:hover {
-  background: var(--overlay-5);
-  color: var(--text-primary);
-  border-color: var(--overlay-20);
+  background: var(--surface-tertiary, var(--bg-tertiary, #f1f5f9));
+  color: var(--text-primary, #1a2332);
+  border-color: var(--border-secondary, #d1d5db);
 }
 
 @keyframes card-appear {
@@ -4302,7 +3536,7 @@ if (
   }
 }
 
-/* 覆盖旧动画*/
+/* 覆盖旧动画 */
 .modal-animation-enter-active,
 .modal-animation-leave-active {
   transition: all 0.4s cubic-bezier(0.16, 1, 0.3, 1);
@@ -4330,7 +3564,7 @@ if (
 .ripple-effect {
   position: absolute;
   border-radius: 50%;
-  background-color: var(--overlay-30);
+  background-color: rgba(11, 90, 254, 0.25);
   transform: scale(0);
   animation: ripple 0.6s linear;
   pointer-events: none;
@@ -4366,7 +3600,7 @@ if (
   width: 8px;
   height: 8px;
   border-radius: 50%;
-  background-color: var(--color-accent);
+  background-color: var(--bg-secondary, #0b5afe);
   display: inline-block;
   z-index: 2;
 }
@@ -4374,15 +3608,15 @@ if (
 @keyframes pulse {
   0% {
     transform: scale(1);
-    box-shadow: 0 0 0 0 var(--index-pulsing-ring-shadow);
+    box-shadow: 0 0 0 0 rgba(0, 122, 255, 0.4);
   }
   70% {
     transform: scale(1.05);
-    box-shadow: 0 0 0 5px transparent;
+    box-shadow: 0 0 0 5px rgba(0, 122, 255, 0);
   }
   100% {
     transform: scale(1);
-    box-shadow: 0 0 0 0 transparent;
+    box-shadow: 0 0 0 0 rgba(0, 122, 255, 0);
   }
 }
 
@@ -4392,7 +3626,7 @@ if (
   cursor: not-allowed;
 }
 
-/* 未登录提示样式*/
+/* 未登录提示样式 */
 .login-required-container {
   display: flex;
   flex-direction: column;
@@ -4406,32 +3640,33 @@ if (
   text-align: center;
   max-width: 400px;
   padding: 30px;
-  background-color: var(--index-visualizer-bg);
+  background-color: var(--surface-secondary, var(--bg-secondary, #f7fafc));
   border-radius: 12px;
-  border: 1px solid var(--overlay-10);
-  box-shadow: 0 5px 20px var(--mask-20);
+  border: 1px solid var(--border-primary, #e5e7eb);
+  box-shadow: var(--shadow-card, 0 5px 20px rgba(0, 0, 0, 0.08));
 }
 
 .login-icon {
   font-size: 3rem;
   margin-bottom: 15px;
+  color: var(--primary, #0b5afe);
 }
 
 .login-required-content h3 {
   font-size: 1.5rem;
   margin-bottom: 10px;
-  color: var(--light);
+  color: var(--text-primary, #1a2332);
 }
 
 .login-required-content p {
   margin-bottom: 20px;
-  color: var(--overlay-70);
+  color: var(--text-secondary, #4a5568);
 }
 
 .login-button {
-  background: linear-gradient(180deg, var(--color-accent) 0%, var(--color-accent) 100%);
+  background: linear-gradient(180deg, var(--bg-secondary, #0043f8) 0%, #0075f8 100%);
   border: none;
-  color: white;
+  color: var(--text-primary, #ffffff);
   padding: 10px 20px;
   border-radius: 6px;
   font-weight: 600;
@@ -4441,6 +3676,6 @@ if (
 
 .login-button:hover {
   transform: translateY(-2px);
-  box-shadow: 0 5px 15px var(--primary-30);
+  box-shadow: 0 5px 15px rgba(0, 67, 248, 0.3);
 }
 </style>
diff --git a/app/pages/login.vue b/app/pages/login.vue
index a3710bd..0ab59a2 100644
--- a/app/pages/login.vue
+++ b/app/pages/login.vue
@@ -4,14 +4,26 @@
       <div class="form-section">
         <div class="form-header">
           <div class="logo-row">
-            <img :src="brandLogoSrc" alt="Brand Logo" class="brand-logo-center" />
-            <div v-if="schoolLogoHomeDisplayUrl" class="logo-divider" />
             <img
-              v-if="schoolLogoHomeDisplayUrl"
-              :src="schoolLogoHomeDisplayUrl"
-              :alt="locale.schoolLogoAlt"
+              :src="brandLogoSrc"
+              alt="Brand Logo"
+              class="brand-logo-center"
+              width="96"
+              height="96"
+              decoding="async"
+              fetchpriority="high"
+            >
+            <div v-if="schoolLogoHomeUrl && schoolLogoHomeUrl.trim()" class="logo-divider" />
+            <img
+              v-if="schoolLogoHomeUrl && schoolLogoHomeUrl.trim()"
+              :src="schoolLogoHomeUrl"
+              alt="学校Logo"
               class="school-logo"
-            />
+              width="160"
+              height="160"
+              decoding="async"
+              fetchpriority="high"
+            >
           </div>
           <h1 class="form-title">{{ siteTitle ? siteTitle + ' | VoiceHub' : 'VoiceHub' }}</h1>
           <div class="header-divider" />
@@ -29,25 +41,15 @@
 <script setup>
 import { onMounted, computed, ref } from 'vue'
 import LoginForm from '~/components/Auth/LoginForm.vue'
-import { useLocale } from '~/utils/locale'
-import { useThemeImage } from '~/composables/useThemeImage'
+import logo from '~~/public/images/logo.png'
 
 // 使用站点配置
-const {
-  siteTitle,
-  initSiteConfig,
-  logoUrl,
-  schoolLogoHomeDisplayUrl,
-  icp: icpNumber
-} = useSiteConfig()
-const { pages } = useLocale()
-const locale = computed(() => pages.value?.login || {})
+const { siteTitle, initSiteConfig, logoUrl, schoolLogoHomeUrl, icp: icpNumber } = useSiteConfig()
 // 主品牌Logo优先使用SVG，其次使用站点配置中非ICO的地址
-const { getLogo } = useThemeImage()
 const brandLogoSrc = computed(() => {
   const url = logoUrl.value
   if (url && !url.endsWith('.ico')) return url
-  return getLogo()
+  return logo
 })
 
 // 在组件挂载后初始化站点配置
@@ -57,7 +59,7 @@ onMounted(async () => {
 
   // 设置页面标题
   if (typeof document !== 'undefined' && siteTitle.value) {
-    document.title = `${locale.value.title} | ${siteTitle.value}`
+    document.title = `登录 | ${siteTitle.value}`
   }
 })
 </script>
@@ -72,7 +74,7 @@ onMounted(async () => {
   justify-content: flex-start;
   padding: 20px;
   /* 响应式尺寸变量 */
-  --color-brand-logo-size: clamp(48px, 8vw, 96px);
+  --brand-logo-size: clamp(48px, 8vw, 96px);
   --school-logo-size: clamp(96px, 16vw, 160px);
   --logo-gap: clamp(12px, 2vw, 24px);
   --divider-height: clamp(32px, 10vw, 96px);
@@ -109,7 +111,7 @@ onMounted(async () => {
   left: 0;
   right: 0;
   bottom: 0;
-  background: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><defs><pattern id="grid" width="10" height="10" patternUnits="userSpaceOnUse"><path d="M 10 0 L 0 0 0 10" fill="none" stroke="%23666" stroke-width="0.5"/></pattern></defs><rect width="100" height="100" fill="url(%23grid)"/></svg>');
+  background: url('data:image/svg+xml,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100"><defs><pattern id="grid" width="10" height="10" patternUnits="userSpaceOnUse"><path d="M 10 0 L 0 0 0 10" fill="none" stroke="rgba(255,255,255,0.1)" stroke-width="0.5"/></pattern></defs><rect width="100" height="100" fill="url(%23grid)"/></svg>');
   opacity: 0.3;
 }
 
@@ -136,7 +138,7 @@ onMounted(async () => {
 
 .brand-logo:hover {
   transform: translateY(-3px) scale(1.02);
-  filter: drop-shadow(0 10px 20px var(--mask-25));
+  filter: drop-shadow(0 10px 20px rgba(0, 0, 0, 0.25));
 }
 
 .brand-title {
@@ -224,13 +226,13 @@ onMounted(async () => {
 }
 
 .brand-logo-center {
-  width: var(--color-brand-logo-size);
-  height: var(--color-brand-logo-size);
+  width: var(--brand-logo-size);
+  height: var(--brand-logo-size);
   margin: 0;
   object-fit: contain;
   max-width: 100%;
   max-height: 100%;
-  filter: drop-shadow(0 2px 8px var(--mask-15));
+  filter: drop-shadow(0 2px 8px rgba(0, 0, 0, 0.15));
 }
 
 .school-logo {
@@ -240,7 +242,7 @@ onMounted(async () => {
   object-fit: contain;
   max-width: 100%;
   max-height: 100%;
-  filter: drop-shadow(0 2px 8px var(--mask-15));
+  filter: drop-shadow(0 2px 8px rgba(0, 0, 0, 0.15));
 }
 
 .form-title {
@@ -310,7 +312,7 @@ onMounted(async () => {
 
 .icp-link:hover,
 .voicehub-link:hover {
-  color: var(--overlay-80);
+  color: var(--text-secondary);
 }
 
 @media (max-width: 768px) {
diff --git a/app/utils/musicSources.ts b/app/utils/musicSources.ts
index 934d19e..280271a 100644
--- a/app/utils/musicSources.ts
+++ b/app/utils/musicSources.ts
@@ -59,7 +59,7 @@ export interface SourceStatus {
 export interface MusicSearchParams {
   /** 搜索关键词 */
   keywords: string
-  /** 音乐平台：tencent=QQ音乐, netease=网易云音乐 */
+  /** 音乐平台：目前仅支持 kugou=酷狗音乐 */
   platform?: string
   /** 返回数量限制 */
   limit?: number
@@ -67,8 +67,6 @@ export interface MusicSearchParams {
   offset?: number
   /** 搜索类型：1=单曲, 10=专辑, 100=歌手, 1000=歌单, 1009=播客/电台, 2000=声音 */
   type?: number
-  /** 网易云音乐Cookie */
-  cookie?: string
 }
 
 /**
@@ -111,88 +109,24 @@ export interface SongDetailResult {
 
 /**
  * 默认音源配置
- * 内置网易云和 QQ 音乐音源只保留已验证可用的请求路径。
+ * 包含主音源 Vkeys 和两个网易云备用音源端点
  */
 export const MUSIC_SOURCE_CONFIG: MusicSourceConfig = {
-  primarySource: 'netease-backup-1',
-  enableFailover: true,
+  primarySource: 'kugou',
+  enableFailover: false,
   timeout: 10000,
   retryAttempts: 2,
   sources: [
     {
-      id: 'netease-backup-1',
-      name: 'NeteaseCloudMusicApi',
-      baseUrl: '/api/api-enhanced/netease',
+      id: 'kugou',
+      name: '酷狗音乐',
+      baseUrl: '/api/music',
       priority: 1,
       enabled: true,
-      timeout: 8000,
+      timeout: 10000,
       headers: {
         'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36'
       }
-    },
-    {
-      id: 'vkeys-v3',
-      name: 'Vkeys QQ 音乐 (v3)',
-      baseUrl: 'https://api.vkeys.cn/music',
-      priority: 2,
-      enabled: true,
-      timeout: 10000
-    },
-    {
-      id: 'vkeys',
-      name: 'Vkeys QQ 音乐 (v2)',
-      baseUrl: 'https://api.vkeys.cn/v2/music',
-      priority: 3,
-      enabled: true,
-      timeout: 10000
-    },
-    {
-      id: 'ygking-qq',
-      name: 'Ygking QQ 音乐备用',
-      baseUrl: 'https://api.ygking.top/api/song/url',
-      priority: 4,
-      enabled: true,
-      timeout: 8000
-    },
-    {
-      id: 'netease-gdstudio',
-      name: 'GD Studio 网易云',
-      baseUrl: 'https://music-api.gdstudio.xyz/api.php',
-      priority: 5,
-      enabled: true,
-      timeout: 10000
-    },
-    {
-      id: 'meting-1',
-      name: 'Meting API 网易云备用源1',
-      baseUrl: 'https://api.qijieya.cn/meting/',
-      priority: 6,
-      enabled: true,
-      timeout: 8000
-    },
-    {
-      id: 'meting-2',
-      name: 'Meting API 网易云备用源2',
-      baseUrl: 'https://api.injahow.cn/meting/',
-      priority: 7,
-      enabled: true,
-      timeout: 8000
-    },
-    {
-      id: 'bilibili',
-      name: '哔哩哔哩',
-      baseUrl: 'https://api.bilibili.com',
-      priority: 8,
-      enabled: true,
-      timeout: 10000
-    },
-    {
-      id: 'migu',
-      name: '咪咕音乐',
-      baseUrl: '/api/native-api/migu/playurl',
-      priority: 9,
-      enabled: true,
-      timeout: 10000
     }
   ]
 }
@@ -226,28 +160,3 @@ export function getPrimarySource(): MusicSource | undefined {
 export function getBackupSources(): MusicSource[] {
   return getEnabledSources().filter((source) => source.id !== MUSIC_SOURCE_CONFIG.primarySource)
 }
-
-/**
- * 判断是否为纯数字（旧版 QQ 音乐数字 id）
- */
-function isNumericId(id: string | number): boolean {
-  return /^\d+$/.test(String(id))
-}
-
-/**
- * 构造 vkeys 请求的身份参数
- * 网易云始终用 id；QQ 音乐旧版数字 id 用 id，新版 mid 用 mid
- */
-export function getVkeysIdParam(
-  platform: 'netease' | 'tencent',
-  musicId: string | number
-): { key: string; value: string } {
-  if (platform === 'netease') {
-    return { key: 'id', value: String(musicId) }
-  }
-  // tencent
-  if (isNumericId(musicId)) {
-    return { key: 'id', value: String(musicId) }
-  }
-  return { key: 'mid', value: String(musicId) }
-}
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 57ec9f4..d5ff5f3 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -1,73 +1,27 @@
 import wasm from 'vite-plugin-wasm'
+import glsl from 'vite-plugin-glsl'
 import { fileURLToPath } from 'url'
+import { index, uniqueIndex } from 'drizzle-orm'
 
-// 解析自定义 SEO 和 PWA 配置
-let customSeoConfig: { title?: string; shortName?: string; description?: string; logo?: string } =
-  {}
-try {
-  if (process.env.NUXT_PUBLIC_SEO_CONFIG) {
-    customSeoConfig = JSON.parse(process.env.NUXT_PUBLIC_SEO_CONFIG)
+const customSeoConfig: Record<string, unknown> | null = (() => {
+  const raw = process.env.NUXT_PUBLIC_SEO_CONFIG
+  if (!raw) return null
+  try {
+    const parsed = JSON.parse(raw)
+    if (parsed && typeof parsed === 'object') return parsed as Record<string, unknown>
+    return null
+  } catch {
+    return null
   }
-} catch (e) {
-  console.warn('解析 NUXT_PUBLIC_SEO_CONFIG 失败，请检查 JSON 格式:', e)
+})()
+
+function readNumberEnv(name: string, defaultValue: number): number {
+  const raw = process.env[name]
+  if (raw === undefined || raw === '') return defaultValue
+  const num = Number(raw)
+  return Number.isFinite(num) ? num : defaultValue
 }
 
-const siteTitle =
-  customSeoConfig.title || process.env.NUXT_PUBLIC_SITE_TITLE || 'VoiceHub校园广播站点歌系统'
-const siteShortName = customSeoConfig.shortName || '校园广播'
-const siteDescription =
-  customSeoConfig.description ||
-  process.env.NUXT_PUBLIC_SITE_DESCRIPTION ||
-  '校园广播站点歌系统 - 让你的声音被听见'
-const siteLogo = customSeoConfig.logo || process.env.NUXT_PUBLIC_SITE_LOGO || '/themes/ClassicDark/logo.svg'
-
-const readNumberEnv = (value: string | undefined, fallback: number): number => {
-  if (!value) return fallback
-  const parsed = Number(value)
-  if (!Number.isFinite(parsed)) return fallback
-
-  // For unit-interval settings (for example, Sentry sample rates), reject
-  // out-of-range environment values and fall back to the safe default.
-  if (fallback >= 0 && fallback <= 1) {
-    return parsed >= 0 && parsed <= 1 ? parsed : fallback
-  }
-
-  return parsed
-}
-
-const ssrInlineLyricPackages = ['@applemusic-like-lyrics/lyric']
-
-const backendSentryDsnDefault =
-  'https://2fca0c8a939c8909e02c082ec847e8e8@o4508946125619200.ingest.de.sentry.io/4511244961448016'
-const frontendSentryDsnDefault =
-  'https://3c4fe5353816bcdce36e7cc28703c8fa@o4508946125619200.ingest.de.sentry.io/4511244934774864'
-// Sentry 仅在生产环境启用；Vercel/Netlify 预览部署（测试环境）自动关闭，避免收集测试错误
-// 可显式设置 SENTRY_ENABLED=true/false 强制覆盖，未设置时按 NODE_ENV 与部署环境判断
-const isPreviewDeployment =
-  process.env.VERCEL_ENV === 'preview' ||
-  process.env.CONTEXT === 'deploy-preview' ||
-  process.env.CONTEXT === 'branch-deploy'
-const sentryRuntimeEnabled =
-  process.env.SENTRY_ENABLED !== undefined
-    ? process.env.SENTRY_ENABLED === 'true'
-    : process.env.NODE_ENV === 'production' && !isPreviewDeployment
-const jwtSecret = process.env.JWT_SECRET || ''
-
-// 构造绝对路径 Logo URL 用于 SEO 标签，如果没有 host，则回退为相对路径
-const host = process.env.NUXT_PUBLIC_HOST
-if (!host && !siteLogo.startsWith('http') && process.env.NODE_ENV === 'production') {
-  console.warn(
-    '警告: 在生产环境中未配置 NUXT_PUBLIC_HOST，且 siteLogo 使用了相对路径。这可能会导致网站无法正确抓取和显示预览图。'
-  )
-}
-const absoluteLogo =
-  siteLogo.startsWith('http') || siteLogo.startsWith('//') || !host
-    ? siteLogo
-    : (host.startsWith('http') ? '' : 'https://') +
-      host.replace(/\/$/, '') +
-      '/' +
-      siteLogo.replace(/^\//, '')
-
 // https://nuxt.com/docs/api/configuration/nuxt-config
 export default defineNuxtConfig({
   compatibilityDate: '2026-01-30',
@@ -81,489 +35,55 @@ export default defineNuxtConfig({
   },
   devtools: { enabled: process.env.NODE_ENV === 'development' },
   devServer: {
-    host: '0.0.0.0', // 允许局域网访问
+    host: '0.0.0.0',
     port: 3000
   },
   modules: [
-    '@unocss/nuxt',
-    '@vite-pwa/nuxt',
-    ...(process.env.NODE_ENV === 'development' || process.env.npm_lifecycle_event?.includes('lint')
+    '@nuxtjs/tailwindcss',
+    ...((process.env.NODE_ENV === 'development' || process.env.npm_lifecycle_event?.includes('lint'))
       ? ['@nuxt/eslint']
+      : []),
+    ...((process.env.PWA_ENABLED || 'false') === 'true'
+      ? ['@vite-pwa/nuxt']
       : [])
   ],
 
-  // UnoCSS 配置
-  unocss: {
-    presets: [
-      // Tailwind 3 / Windi CSS compact preset — 完全兼容 Tailwind 类名
-      () => import('@unocss/preset-wind3').then(m => m.presetWind3())
-    ],
-    // 将 Tailwind 语义化颜色映射到 CSS 变量，实现主题自适应
-    theme: {
-      colors: {
-        // === 主色调 ===
-        primary: 'var(--primary)',
-        'primary-hover': 'var(--primary-hover)',
-        'primary-light': 'var(--primary-light)',
-        'primary-border': 'var(--primary-border)',
-        // === 语义色 ===
-        success: 'var(--success)',
-        'success-hover': 'var(--success-hover)',
-        'success-light': 'var(--success-light)',
-        'success-border': 'var(--success-border)',
-        warning: 'var(--warning)',
-        'warning-hover': 'var(--warning-hover)',
-        'warning-light': 'var(--warning-light)',
-        'warning-border': 'var(--warning-border)',
-        error: 'var(--error)',
-        'error-hover': 'var(--error-hover)',
-        'error-light': 'var(--error-light)',
-        'error-border': 'var(--error-border)',
-        // === 背景色 ===
-        'bg-primary': 'var(--bg-primary)',
-        'bg-secondary': 'var(--bg-secondary)',
-        'bg-tertiary': 'var(--bg-tertiary)',
-        'bg-quaternary': 'var(--bg-quaternary)',
-        'bg-hover': 'var(--bg-hover)',
-        // === 文字颜色 ===
-        'text-primary': 'var(--text-primary)',
-        'text-secondary': 'var(--text-secondary)',
-        'text-tertiary': 'var(--text-tertiary)',
-        'text-quaternary': 'var(--text-quaternary)',
-        'text-disabled': 'var(--text-disabled)',
-        // === 边框颜色 ===
-        'border-primary': 'var(--border-primary)',
-        'border-secondary': 'var(--border-secondary)',
-        'border-tertiary': 'var(--border-tertiary)',
-        'border-quaternary': 'var(--border-quaternary)',
-        // === Alpha 透明度变量 ===
-        'primary-5': 'var(--primary-5)',
-        'primary-10': 'var(--primary-10)',
-        'primary-20': 'var(--primary-20)',
-        'primary-30': 'var(--primary-30)',
-        'primary-40': 'var(--primary-40)',
-        'primary-50': 'var(--primary-50)',
-        'primary-60': 'var(--primary-60)',
-        'primary-80': 'var(--primary-80)',
-        'primary-hover-5': 'var(--primary-hover-5)',
-        'primary-hover-10': 'var(--primary-hover-10)',
-        'primary-hover-20': 'var(--primary-hover-20)',
-        'primary-hover-30': 'var(--primary-hover-30)',
-        'success-5': 'var(--success-5)',
-        'success-10': 'var(--success-10)',
-        'success-20': 'var(--success-20)',
-        'success-30': 'var(--success-30)',
-        'success-40': 'var(--success-40)',
-        'success-50': 'var(--success-50)',
-        'success-70': 'var(--success-70)',
-        'success-80': 'var(--success-80)',
-        'success-hover-5': 'var(--success-hover-5)',
-        'success-hover-10': 'var(--success-hover-10)',
-        'success-hover-20': 'var(--success-hover-20)',
-        'warning-5': 'var(--warning-5)',
-        'warning-10': 'var(--warning-10)',
-        'warning-15': 'var(--warning-15)',
-        'warning-20': 'var(--warning-20)',
-        'warning-25': 'var(--warning-25)',
-        'warning-30': 'var(--warning-30)',
-        'warning-40': 'var(--warning-40)',
-        'warning-50': 'var(--warning-50)',
-        'warning-80': 'var(--warning-80)',
-        'warning-200': 'var(--warning-200)',
-        'warning-300': 'var(--warning-300)',
-        'warning-hover-5': 'var(--warning-hover-5)',
-        'warning-hover-10': 'var(--warning-hover-10)',
-        'warning-hover-15': 'var(--warning-hover-15)',
-        'warning-hover-20': 'var(--warning-hover-20)',
-        'warning-hover-25': 'var(--warning-hover-25)',
-        'warning-hover-30': 'var(--warning-hover-30)',
-        'warning-hover-40': 'var(--warning-hover-40)',
-        'warning-hover-50': 'var(--warning-hover-50)',
-        'error-5': 'var(--error-5)',
-        'error-10': 'var(--error-10)',
-        'error-15': 'var(--error-15)',
-        'error-20': 'var(--error-20)',
-        'error-30': 'var(--error-30)',
-        'error-40': 'var(--error-40)',
-        'error-50': 'var(--error-50)',
-        'error-60': 'var(--error-60)',
-        'error-70': 'var(--error-70)',
-        'error-80': 'var(--error-80)',
-        'error-hover-5': 'var(--error-hover-5)',
-        'error-hover-10': 'var(--error-hover-10)',
-        'error-hover-15': 'var(--error-hover-15)',
-        'error-hover-20': 'var(--error-hover-20)',
-        'error-hover-30': 'var(--error-hover-30)',
-        'info-5': 'var(--info-5)',
-        'info-10': 'var(--info-10)',
-        'info-20': 'var(--info-20)',
-        'info-30': 'var(--info-30)',
-        'info-40': 'var(--info-40)',
-        'info-50': 'var(--info-50)',
-        'info-hover-5': 'var(--info-hover-5)',
-        'info-hover-10': 'var(--info-hover-10)',
-        'info-hover-20': 'var(--info-hover-20)',
-        'info-hover-30': 'var(--info-hover-30)',
-        'info-hover-40': 'var(--info-hover-40)',
-        'info-hover-50': 'var(--info-hover-50)',
-        'bg-primary-5': 'var(--bg-primary-5)',
-        'bg-primary-10': 'var(--bg-primary-10)',
-        'bg-primary-20': 'var(--bg-primary-20)',
-        'bg-primary-25': 'var(--bg-primary-25)',
-        'bg-primary-30': 'var(--bg-primary-30)',
-        'bg-primary-40': 'var(--bg-primary-40)',
-        'bg-primary-45': 'var(--bg-primary-45)',
-        'bg-primary-50': 'var(--bg-primary-50)',
-        'bg-primary-60': 'var(--bg-primary-60)',
-        'bg-primary-70': 'var(--bg-primary-70)',
-        'bg-primary-80': 'var(--bg-primary-80)',
-        'bg-primary-85': 'var(--bg-primary-85)',
-        'bg-primary-90': 'var(--bg-primary-90)',
-        'bg-primary-95': 'var(--bg-primary-95)',
-        'bg-secondary-5': 'var(--bg-secondary-5)',
-        'bg-secondary-10': 'var(--bg-secondary-10)',
-        'bg-secondary-15': 'var(--bg-secondary-15)',
-        'bg-secondary-20': 'var(--bg-secondary-20)',
-        'bg-secondary-30': 'var(--bg-secondary-30)',
-        'bg-secondary-40': 'var(--bg-secondary-40)',
-        'bg-secondary-50': 'var(--bg-secondary-50)',
-        'bg-secondary-60': 'var(--bg-secondary-60)',
-        'bg-secondary-70': 'var(--bg-secondary-70)',
-        'bg-secondary-80': 'var(--bg-secondary-80)',
-        'bg-secondary-90': 'var(--bg-secondary-90)',
-        'bg-secondary-95': 'var(--bg-secondary-95)',
-        'bg-tertiary-20': 'var(--bg-tertiary-20)',
-        'bg-tertiary-30': 'var(--bg-tertiary-30)',
-        'bg-tertiary-40': 'var(--bg-tertiary-40)',
-        'bg-tertiary-50': 'var(--bg-tertiary-50)',
-        'bg-tertiary-60': 'var(--bg-tertiary-60)',
-        'bg-tertiary-70': 'var(--bg-tertiary-70)',
-        'bg-tertiary-80': 'var(--bg-tertiary-80)',
-        'bg-quaternary-10': 'var(--bg-quaternary-10)',
-        'bg-quaternary-50': 'var(--bg-quaternary-50)',
-        'border-secondary-30': 'var(--border-secondary-30)',
-        'border-secondary-40': 'var(--border-secondary-40)',
-        'border-secondary-50': 'var(--border-secondary-50)',
-        'border-secondary-60': 'var(--border-secondary-60)',
-        'border-secondary-70': 'var(--border-secondary-70)',
-        'border-secondary-80': 'var(--border-secondary-80)',
-        'border-tertiary-20': 'var(--border-tertiary-20)',
-        'border-tertiary-30': 'var(--border-tertiary-30)',
-        'border-tertiary-50': 'var(--border-tertiary-50)',
-        'text-primary-10': 'var(--text-primary-10)',
-        'text-primary-20': 'var(--text-primary-20)',
-        'text-primary-60': 'var(--text-primary-60)',
-        'text-primary-80': 'var(--text-primary-80)',
-        'text-error-20': 'var(--text-error-20)',
-        'text-error-50': 'var(--text-error-50)',
-        'text-error-60': 'var(--text-error-60)',
-        'text-error-70': 'var(--text-error-70)',
-        'text-error-80': 'var(--text-error-80)',
-        'text-success-50': 'var(--text-success-50)',
-        'text-success-70': 'var(--text-success-70)',
-        'text-success-80': 'var(--text-success-80)',
-        'text-warning-80': 'var(--text-warning-80)',
-
-        // === 用途化变量 — 品牌色 ===
-        // brand-* 旧命名（向后兼容）
-        'brand-blue': 'var(--color-accent)',
-        'brand-blue-light': 'var(--color-accent-light)',
-        'brand-blue-hover': 'var(--color-accent-hover)',
-        'brand-blue-light-hover': 'var(--color-accent-light-hover)',
-        'brand-blue-glow': 'var(--color-accent-glow)',
-        'brand-red': 'var(--color-error)',
-        'brand-red-light': 'var(--color-error-light)',
-        'brand-red-hover': 'var(--color-error-hover)',
-        'brand-red-glow': 'var(--color-error-glow)',
-        'brand-green': 'var(--color-success)',
-        'brand-green-light': 'var(--color-success-light)',
-        'brand-green-hover': 'var(--color-success-hover)',
-        'brand-green-glow': 'var(--color-success-glow)',
-        'brand-yellow': 'var(--color-warning)',
-        'brand-yellow-light': 'var(--color-warning-light)',
-        'brand-yellow-hover': 'var(--color-warning-hover)',
-        'brand-yellow-glow': 'var(--color-warning-glow)',
-        'brand-orange': 'var(--color-orange)',
-        'brand-orange-light': 'var(--color-orange-light)',
-        'brand-orange-hover': 'var(--color-orange-hover)',
-        'brand-orange-glow': 'var(--color-orange-glow)',
-        'brand-purple': 'var(--color-collab)',
-        'brand-purple-hover': 'var(--color-collab-hover)',
-        'brand-purple-light': 'var(--color-collab-light)',
-        'brand-purple-lighter': 'var(--color-collab-lighter)',
-        'brand-purple-glow': 'var(--color-collab-glow)',
-        'brand-pink': 'var(--color-pink)',
-        'brand-cyan': 'var(--color-cyan)',
-        'brand-teal': 'var(--color-teal)',
-        'brand-indigo': 'var(--color-indigo)',
-        'brand-indigo-hover': 'var(--color-indigo-hover)',
-
-        // === 用途化变量 — 通用语义色（accent=强调色, error=错误, success=成功, warning=警告, collab=协作, orange=橙色） ===
-        'accent': 'var(--color-accent)',
-        'accent-light': 'var(--color-accent-light)',
-        'accent-hover': 'var(--color-accent-hover)',
-        'accent-light-hover': 'var(--color-accent-light-hover)',
-        'accent-glow': 'var(--color-accent-glow)',
-        'color-accent': 'var(--color-accent)',
-        'color-accent-light': 'var(--color-accent-light)',
-        'color-accent-hover': 'var(--color-accent-hover)',
-        'color-accent-light-hover': 'var(--color-accent-light-hover)',
-        'color-accent-glow': 'var(--color-accent-glow)',
-        'color-accent-alpha-10': 'var(--color-accent-alpha-10)',
-        'color-accent-alpha-12': 'var(--color-accent-alpha-12)',
-        'color-accent-alpha-15': 'var(--color-accent-alpha-15)',
-        'color-accent-alpha-18': 'var(--color-accent-alpha-18)',
-        'color-accent-alpha-20': 'var(--color-accent-alpha-20)',
-        'color-accent-alpha-25': 'var(--color-accent-alpha-25)',
-        'color-accent-alpha-30': 'var(--color-accent-alpha-30)',
-        'color-accent-alpha-40': 'var(--color-accent-alpha-40)',
-        'color-accent-alpha-50': 'var(--color-accent-alpha-50)',
-        'color-accent-alpha-60': 'var(--color-accent-alpha-60)',
-        'color-accent-alpha-80': 'var(--color-accent-alpha-80)',
-        'error': 'var(--color-error)',
-        'error-light': 'var(--color-error-light)',
-        'error-hover': 'var(--color-error-hover)',
-        'error-glow': 'var(--color-error-glow)',
-        'color-error': 'var(--color-error)',
-        'color-error-light': 'var(--color-error-light)',
-        'color-error-hover': 'var(--color-error-hover)',
-        'color-error-glow': 'var(--color-error-glow)',
-        'success': 'var(--color-success)',
-        'success-light': 'var(--color-success-light)',
-        'success-hover': 'var(--color-success-hover)',
-        'success-glow': 'var(--color-success-glow)',
-        'color-success': 'var(--color-success)',
-        'color-success-light': 'var(--color-success-light)',
-        'color-success-hover': 'var(--color-success-hover)',
-        'color-success-glow': 'var(--color-success-glow)',
-        'warning': 'var(--color-warning)',
-        'warning-light': 'var(--color-warning-light)',
-        'warning-hover': 'var(--color-warning-hover)',
-        'warning-glow': 'var(--color-warning-glow)',
-        'color-warning': 'var(--color-warning)',
-        'color-warning-light': 'var(--color-warning-light)',
-        'color-warning-hover': 'var(--color-warning-hover)',
-        'color-warning-glow': 'var(--color-warning-glow)',
-        'orange': 'var(--color-orange)',
-        'orange-light': 'var(--color-orange-light)',
-        'orange-hover': 'var(--color-orange-hover)',
-        'orange-glow': 'var(--color-orange-glow)',
-        'color-orange': 'var(--color-orange)',
-        'color-orange-light': 'var(--color-orange-light)',
-        'color-orange-hover': 'var(--color-orange-hover)',
-        'color-orange-glow': 'var(--color-orange-glow)',
-        'collab': 'var(--color-collab)',
-        'collab-hover': 'var(--color-collab-hover)',
-        'collab-light': 'var(--color-collab-light)',
-        'collab-lighter': 'var(--color-collab-lighter)',
-        'collab-glow': 'var(--color-collab-glow)',
-        'color-collab': 'var(--color-collab)',
-        'color-collab-hover': 'var(--color-collab-hover)',
-        'color-collab-light': 'var(--color-collab-light)',
-        'color-collab-lighter': 'var(--color-collab-lighter)',
-        'color-collab-glow': 'var(--color-collab-glow)',
-        'color-collab-10': 'var(--color-collab-10)',
-        'pink': 'var(--color-pink)',
-        'color-pink': 'var(--color-pink)',
-        'color-pink-alpha-10': 'var(--color-pink-alpha-10)',
-        'color-pink-alpha-20': 'var(--color-pink-alpha-20)',
-        'cyan': 'var(--color-cyan)',
-        'color-cyan': 'var(--color-cyan)',
-        'teal': 'var(--color-teal)',
-        'color-teal': 'var(--color-teal)',
-        'indigo': 'var(--color-indigo)',
-        'indigo-hover': 'var(--color-indigo-hover)',
-        'color-indigo': 'var(--color-indigo)',
-        'color-indigo-hover': 'var(--color-indigo-hover)',
-
-        // === 用途化变量 — OAuth 第三方平台独立品牌色（--oauth-*） ===
-        'oauth-qq': 'var(--oauth-qq)',
-        'oauth-wx': 'var(--oauth-wx)',
-        'oauth-alipay': 'var(--oauth-alipay)',
-        'oauth-sina': 'var(--oauth-sina)',
-        'oauth-baidu': 'var(--oauth-baidu)',
-        'oauth-douyin': 'var(--oauth-douyin)',
-        'oauth-huawei': 'var(--oauth-huawei)',
-        'oauth-xiaomi': 'var(--oauth-xiaomi)',
-        'oauth-gitee': 'var(--oauth-gitee)',
-        'oauth-bilibili': 'var(--oauth-bilibili)',
-        'oauth-kuaishou': 'var(--oauth-kuaishou)',
-        'oauth-casdoor': 'var(--oauth-casdoor)',
-        // Google 四色
-        'oauth-google-blue': 'var(--oauth-google-blue)',
-        'oauth-google-red': 'var(--oauth-google-red)',
-        'oauth-google-yellow': 'var(--oauth-google-yellow)',
-        'oauth-google-green': 'var(--oauth-google-green)',
-        // 旧命名向后兼容
-        'color-oauth-qq': 'var(--oauth-qq)',
-        'color-oauth-wx': 'var(--oauth-wx)',
-        'color-oauth-alipay': 'var(--oauth-alipay)',
-        'color-oauth-sina': 'var(--oauth-sina)',
-        'color-oauth-baidu': 'var(--oauth-baidu)',
-        'color-oauth-douyin': 'var(--oauth-douyin)',
-        'color-oauth-huawei': 'var(--oauth-huawei)',
-        'color-oauth-xiaomi': 'var(--oauth-xiaomi)',
-        'color-oauth-gitee': 'var(--oauth-gitee)',
-        'color-oauth-bilibili': 'var(--oauth-bilibili)',
-        'color-oauth-kuaishou': 'var(--oauth-kuaishou)',
-
-        // === 用途化变量 — 面板背景色 ===
-        'panel-bg': 'var(--panel-bg)',
-        'panel-bg-alt': 'var(--panel-bg-alt)',
-        'panel-bg-hover': 'var(--panel-bg-hover)',
-        'panel-bg-deep': 'var(--panel-bg-deep)',
-        'panel-bg-deepest': 'var(--panel-bg-deepest)',
-        'panel-bg-overlay': 'var(--panel-bg-overlay)',
-        'panel-bg-elevated': 'var(--panel-bg-elevated)',
-        'panel-bg-dialog': 'var(--panel-bg-dialog)',
-        'panel-bg-subtle': 'var(--panel-bg-subtle)',
-        'panel-bg-tertiary': 'var(--panel-bg-tertiary)',
-        'panel-bg-quaternary': 'var(--panel-bg-quaternary)',
-        'panel-bg-contrast': 'var(--panel-bg-contrast)',
-        'panel-bg-dark': 'var(--panel-bg-dark)',
-        'panel-bg-darker': 'var(--panel-bg-darker)',
-        'panel-bg-darkest': 'var(--panel-bg-darkest)',
-        'panel-bg-compact': 'var(--panel-bg-compact)',
-        'panel-bg-flat': 'var(--panel-bg-flat)',
-        'panel-bg-raised': 'var(--panel-bg-raised)',
-        'panel-bg-inset': 'var(--panel-bg-inset)',
-        'panel-bg-dark-40': 'var(--panel-bg-dark-40)',
-        'panel-bg-dark-50': 'var(--panel-bg-dark-50)',
-        'panel-bg-dark-80': 'var(--panel-bg-dark-80)',
-        'panel-bg-darkest-20': 'var(--panel-bg-darkest-20)',
-        'panel-bg-darkest-30': 'var(--panel-bg-darkest-30)',
-        'panel-bg-darkest-40': 'var(--panel-bg-darkest-40)',
-        'panel-bg-darkest-50': 'var(--panel-bg-darkest-50)',
-        'panel-bg-darkest-60': 'var(--panel-bg-darkest-60)',
-        'panel-bg-darkest-80': 'var(--panel-bg-darkest-80)',
-        'panel-bg-darkest-95': 'var(--panel-bg-darkest-95)',
-        'panel-bg-deepest-30': 'var(--panel-bg-deepest-30)',
-        'panel-bg-deepest-40': 'var(--panel-bg-deepest-40)',
-        'panel-bg-deepest-50': 'var(--panel-bg-deepest-50)',
-        'panel-bg-deepest-80': 'var(--panel-bg-deepest-80)',
-        'panel-bg-deepest-95': 'var(--panel-bg-deepest-95)',
-        'panel-bg-hover-50': 'var(--panel-bg-hover-50)',
-
-        // === 用途化变量 — 文字灰度 ===
-        'text-muted': 'var(--text-muted)',
-        'text-muted-light': 'var(--text-muted-light)',
-        'text-muted-dark': 'var(--text-muted-dark)',
-        'text-tertiary-hover': 'var(--text-tertiary-hover)',
-        'text-primary-light': 'var(--text-primary-light)',
-        'text-primary-lighter': 'var(--text-primary-lighter)',
-        'text-link': 'var(--text-link)',
-        'text-link-hover': 'var(--text-link-hover)',
-        'text-highlight': 'var(--text-highlight)',
-
-        // === 用途化变量 — 边框与分割线 ===
-        'panel-border': 'var(--panel-border)',
-        'panel-border-active': 'var(--panel-border-active)',
-        'panel-border-subtle': 'var(--panel-border-subtle)',
-        'panel-border-light': 'var(--panel-border-light)',
-        'panel-border-dark': 'var(--panel-border-dark)',
-        'panel-border-highlight': 'var(--panel-border-highlight)',
-        'panel-border-brand': 'var(--panel-border-brand)',
-        'panel-border-error': 'var(--panel-border-error)',
-
-        // === 用途化变量 — 状态色 ===
-        'status-info-bg': 'var(--status-info-bg)',
-        'status-info-border': 'var(--status-info-border)',
-        'status-info-glow': 'var(--status-info-glow)',
-        'status-info-icon': 'var(--status-info-icon)',
-        'status-success-icon': 'var(--status-success-icon)',
-        'status-warning-icon': 'var(--status-warning-icon)',
-        'status-error-icon': 'var(--status-error-icon)',
-        'status-error-deep': 'var(--status-error-deep)',
-
-        // === 卡片 ===
-        'card-bg': 'var(--card-bg)',
-        'card-border': 'var(--card-border)',
-        'card-hover-border': 'var(--card-hover-border)',
-        // === 输入框 ===
-        'input-bg': 'var(--input-bg)',
-        'input-border': 'var(--input-border)',
-        'input-text': 'var(--input-text)',
-        'input-placeholder': 'var(--input-placeholder)',
-        // === 模态框 ===
-        'modal-bg': 'var(--modal-bg)',
-        'modal-border': 'var(--modal-border)',
-
-        // === Overlay / 遮罩层半透明（深色=白半透明，浅色=黑半透明） ===
-        'overlay-1': 'var(--overlay-1)',
-        'overlay-2': 'var(--overlay-2)',
-        'overlay-3': 'var(--overlay-3)',
-        'overlay-4': 'var(--overlay-4)',
-        'overlay-5': 'var(--overlay-5)',
-        'overlay-6': 'var(--overlay-6)',
-        'overlay-7': 'var(--overlay-7)',
-        'overlay-8': 'var(--overlay-8)',
-        'overlay-10': 'var(--overlay-10)',
-        'overlay-12': 'var(--overlay-12)',
-        'overlay-14': 'var(--overlay-14)',
-        'overlay-15': 'var(--overlay-15)',
-        'overlay-16': 'var(--overlay-16)',
-        'overlay-18': 'var(--overlay-18)',
-        'overlay-20': 'var(--overlay-20)',
-        'overlay-22': 'var(--overlay-22)',
-        'overlay-25': 'var(--overlay-25)',
-        'overlay-30': 'var(--overlay-30)',
-        'overlay-40': 'var(--overlay-40)',
-        'overlay-42': 'var(--overlay-42)',
-        'overlay-45': 'var(--overlay-45)',
-        'overlay-50': 'var(--overlay-50)',
-        'overlay-52': 'var(--overlay-52)',
-        'overlay-55': 'var(--overlay-55)',
-        'overlay-58': 'var(--overlay-58)',
-        'overlay-60': 'var(--overlay-60)',
-        'overlay-62': 'var(--overlay-62)',
-        'overlay-70': 'var(--overlay-70)',
-        'overlay-78': 'var(--overlay-78)',
-        'overlay-80': 'var(--overlay-80)',
-        'overlay-85': 'var(--overlay-85)',
-        'overlay-86': 'var(--overlay-86)',
-        'overlay-88': 'var(--overlay-88)',
-        'overlay-90': 'var(--overlay-90)',
-        'overlay-92': 'var(--overlay-92)',
-        'overlay-95': 'var(--overlay-95)',
-
-        // === Mask / 暗色遮罩 ===
-        'mask-2': 'var(--mask-2)',
-        'mask-4': 'var(--mask-4)',
-        'mask-5': 'var(--mask-5)',
-        'mask-6': 'var(--mask-6)',
-        'mask-8': 'var(--mask-8)',
-        'mask-10': 'var(--mask-10)',
-        'mask-15': 'var(--mask-15)',
-        'mask-20': 'var(--mask-20)',
-        'mask-25': 'var(--mask-25)',
-        'mask-30': 'var(--mask-30)',
-        'mask-40': 'var(--mask-40)',
-        'mask-50': 'var(--mask-50)',
-        'mask-60': 'var(--mask-60)',
-        'mask-70': 'var(--mask-70)',
-        'mask-80': 'var(--mask-80)',
-        'mask-95': 'var(--mask-95)',
-      },
-      // 圆角映射
-      borderRadius: {
-        sm: 'var(--radius-sm)',
-        md: 'var(--radius-md)',
-        lg: 'var(--radius-lg)',
-        xl: 'var(--radius-xl)',
-        '2xl': 'var(--radius-2xl)',
-      },
-      // 间距映射
-      spacing: {
-        xs: 'var(--spacing-xs)',
-        sm: 'var(--spacing-sm)',
-        md: 'var(--spacing-md)',
-        lg: 'var(--spacing-lg)',
-        xl: 'var(--spacing-xl)',
-        '2xl': 'var(--spacing-2xl)',
-        '3xl': 'var(--spacing-3xl)',
-      },
-    },
-  },
+  pwa: (process.env.PWA_ENABLED || 'false') === 'true'
+    ? {
+        registerType: 'autoUpdate',
+        manifest: {
+          name: process.env.NUXT_PUBLIC_SITE_TITLE || '校园广播站点歌系统',
+          short_name: process.env.NUXT_PUBLIC_SITE_TITLE || 'VoiceHub',
+          description: process.env.NUXT_PUBLIC_SITE_DESCRIPTION || '校园广播站点歌系统',
+          display: (process.env.PWA_DISPLAY as any) || 'standalone',
+          background_color: process.env.PWA_BACKGROUND_COLOR || '#000000',
+          theme_color: process.env.PWA_THEME_COLOR || '#111111',
+          icons: [
+            {
+              src: '/images/logo.png',
+              sizes: '192x192',
+              type: 'image/png'
+            },
+            {
+              src: '/images/logo.png',
+              sizes: '512x512',
+              type: 'image/png'
+            }
+          ]
+        },
+        workbox: {
+          navigateFallback: '/',
+          globPatterns: ['**/*.{js,css,html,png,jpg,jpeg,svg,ico,webp,woff2}']
+        },
+        client: {
+          installPrompt: true,
+          periodicSyncForUpdates: 3600
+        },
+        devOptions: {
+          enabled: process.env.NODE_ENV === 'development'
+        }
+      }
+    : {},
 
   // 引入全局CSS
   css: [
@@ -573,68 +93,80 @@ export default defineNuxtConfig({
     '~/assets/css/transitions.css',
     '~/assets/css/mobile-admin.css',
     '~/assets/css/print-fix.css',
-    '~/assets/css/sf-pro-icons.css',
-    '~/assets/css/markdown.css'
+    '~/assets/css/sf-pro-icons.css'
   ],
 
+  build: {
+    transpile: []
+  },
+
+  // 实验性优化功能
+  experimental: {
+    payloadExtraction: true,
+    renderJsonPayloads: true,
+    viewTransition: true
+  },
+
   // 配置运行时配置
   runtimeConfig: {
     // 服务器私有键（不会暴露到客户端）
-    jwtSecret,
+    jwtSecret: process.env.JWT_SECRET || 'your-secret-key',
     // Redis配置（可选）
     redisUrl: process.env.REDIS_URL || '',
+    redisKeyPrefix: process.env.REDIS_KEY_PREFIX || '',
+    // Sentry 服务端配置（不会暴露到客户端）
     sentry: {
-      dsn: process.env.SENTRY_DSN || backendSentryDsnDefault,
-      environment: process.env.SENTRY_ENVIRONMENT || process.env.NODE_ENV || 'development',
-      release:
-        process.env.SENTRY_RELEASE ||
-        process.env.VERCEL_GIT_COMMIT_SHA ||
-        process.env.COMMIT_REF ||
-        '',
-      tracesSampleRate: readNumberEnv(process.env.SENTRY_TRACES_SAMPLE_RATE, 0.1),
-      enabled: sentryRuntimeEnabled
+      serverDsn: process.env.SENTRY_SERVER_DSN || process.env.SENTRY_DSN || '',
+      dsn: process.env.SENTRY_DSN || '',
+      errorSampleRate: readNumberEnv('SENTRY_ERROR_SAMPLE_RATE', 1.0),
+      tracesSampleRate: readNumberEnv('SENTRY_TRACES_SAMPLE_RATE', 1.0),
+      replaySessionSampleRate: readNumberEnv('SENTRY_REPLAY_SESSION_SAMPLE_RATE', 0),
+      replayOnErrorSampleRate: readNumberEnv('SENTRY_REPLAY_ON_ERROR_SAMPLE_RATE', 0),
+      release: process.env.SENTRY_RELEASE || '',
+      environment: process.env.SENTRY_ENVIRONMENT || process.env.NODE_ENV || 'production'
     },
     // 公共键（会暴露到客户端）
     public: {
-      // 配置后启用内部 API 的 CORS 来源校验；未配置时仅回环 Host 跳过，云平台公开 Host 仍校验
       host: process.env.NUXT_PUBLIC_HOST || '',
       apiBase: '/api',
       oauth: {
         github: !!process.env.GITHUB_CLIENT_ID,
         casdoor: !!process.env.CASDOOR_CLIENT_ID,
-        google: !!process.env.GOOGLE_CLIENT_ID
+        google: !!process.env.GOOGLE_CLIENT_ID,
+        aggregate: !!process.env.AGGREGATE_OAUTH_APP_ID
       },
-      siteTitle,
-      siteLogo,
-      siteDescription,
+      siteTitle: process.env.NUXT_PUBLIC_SITE_TITLE || '校园广播站点歌系统',
+      siteLogo: process.env.NUXT_PUBLIC_SITE_LOGO || '',
+      siteDescription:
+        process.env.NUXT_PUBLIC_SITE_DESCRIPTION || '校园广播站点歌系统 - 让你的声音被听见',
       isNetlify: process.env.NETLIFY === 'true',
+      // SEO 自定义配置（通过 NUXT_PUBLIC_SEO_CONFIG 注入 JSON 字符串）
+      seoConfig: customSeoConfig ?? {},
+      // 图形验证码相关
+      captcha: {
+        enabled: (process.env.CAPTCHA_ENABLED || 'false') === 'true',
+        provider: process.env.CAPTCHA_PROVIDER || 'turnstile',
+        siteKey: process.env.CAPTCHA_SITE_KEY || ''
+      },
+      // PWA 相关结构（本地不启用模块，但保留配置项以便上层应用使用）
+      pwa: {
+        enabled: (process.env.PWA_ENABLED || 'false') === 'true',
+        display: process.env.PWA_DISPLAY || 'standalone',
+        backgroundColor: process.env.PWA_BACKGROUND_COLOR || '#000000',
+        themeColor: process.env.PWA_THEME_COLOR || '#111111'
+      },
+      // 主题配置
+      defaultTheme: process.env.NUXT_PUBLIC_DEFAULT_THEME || 'ClassicLight',
+      enabledThemes: (process.env.NUXT_PUBLIC_ENABLED_THEMES || 'ClassicLight,ModernLight')
+        .split(',')
+        .map((s) => s.trim())
+        .filter(Boolean),
+      // Sentry 客户端配置（仅公开 DSN 与采样率）
       sentry: {
-        dsn: process.env.NUXT_PUBLIC_SENTRY_DSN || frontendSentryDsnDefault,
-        environment:
-          process.env.NUXT_PUBLIC_SENTRY_ENVIRONMENT ||
-          process.env.SENTRY_ENVIRONMENT ||
-          process.env.NODE_ENV ||
-          'development',
-        release:
-          process.env.NUXT_PUBLIC_SENTRY_RELEASE ||
-          process.env.SENTRY_RELEASE ||
-          process.env.VERCEL_GIT_COMMIT_SHA ||
-          process.env.COMMIT_REF ||
-          '',
-        tracesSampleRate: readNumberEnv(
-          process.env.NUXT_PUBLIC_SENTRY_TRACES_SAMPLE_RATE ||
-            process.env.SENTRY_TRACES_SAMPLE_RATE,
-          0.1
-        ),
-        replaysSessionSampleRate: readNumberEnv(
-          process.env.NUXT_PUBLIC_SENTRY_REPLAYS_SESSION_SAMPLE_RATE,
-          0
-        ),
-        replaysOnErrorSampleRate: readNumberEnv(
-          process.env.NUXT_PUBLIC_SENTRY_REPLAYS_ON_ERROR_SAMPLE_RATE,
-          0
-        ),
-        enabled: sentryRuntimeEnabled
+        dsn: process.env.SENTRY_DSN || '',
+        tracesSampleRate: readNumberEnv('SENTRY_TRACES_SAMPLE_RATE', 1.0),
+        replaySessionSampleRate: readNumberEnv('SENTRY_REPLAY_SESSION_SAMPLE_RATE', 0),
+        replayOnErrorSampleRate: readNumberEnv('SENTRY_REPLAY_ON_ERROR_SAMPLE_RATE', 0)
       }
     }
   },
@@ -642,18 +174,10 @@ export default defineNuxtConfig({
   // 配置环境变量
   app: {
     head: {
-      // 首帧前同步恢复主题：SSR 输出的 HTML 无 data-theme，主题 CSS 变量未定义会导致加载页背景透明、主页内容透出
-      script: [
-        {
-          tagPriority: 'critical',
-          // 与 useTheme.ts 默认逻辑一致：无保存值或非法值时回退 ClassicDark；System 按系统配色偏好解析
-          innerHTML: "(function(){var t='ClassicDark';try{var s=localStorage.getItem('voicehub-theme');if(['ClassicDark','ClassicLight','ModernLight'].indexOf(s)>-1){t=s}else if(s==='System'){t=window.matchMedia('(prefers-color-scheme: dark)').matches?'ClassicDark':'ClassicLight'}}catch(e){}document.documentElement.setAttribute('data-theme',t)})()"
-        }
-      ],
-      title: siteTitle,
+      title: process.env.NUXT_PUBLIC_SITE_TITLE || '校园广播站点歌系统',
+      htmlAttrs: { lang: 'zh-CN' },
       meta: [
         { charset: 'utf-8' },
-        { name: 'referrer', content: 'no-referrer' },
         {
           name: 'viewport',
           content:
@@ -661,60 +185,82 @@ export default defineNuxtConfig({
         },
         {
           name: 'description',
-          content: siteDescription
+          content:
+            process.env.NUXT_PUBLIC_SITE_DESCRIPTION || '校园广播站点歌系统 - 让你的声音被听见'
         },
-        // Open Graph 标签
-        { property: 'og:type', content: 'website' },
-        { property: 'og:title', content: siteTitle },
-        { property: 'og:description', content: siteDescription },
-        { property: 'og:site_name', content: siteTitle },
-        { property: 'og:image', content: absoluteLogo },
-        // Twitter 标签
-        { name: 'twitter:card', content: 'summary' },
-        { name: 'twitter:title', content: siteTitle },
-        { name: 'twitter:description', content: siteDescription },
-        { name: 'twitter:image', content: absoluteLogo },
         // 移动端优化
         { name: 'theme-color', content: '#111111' },
+        {
+          name: 'x-default-theme',
+          content: process.env.NUXT_PUBLIC_DEFAULT_THEME || 'ClassicLight'
+        },
         { name: 'apple-mobile-web-app-capable', content: 'yes' },
         { name: 'apple-mobile-web-app-status-bar-style', content: 'black-translucent' },
-        { name: 'apple-mobile-web-app-title', content: siteShortName },
+        { name: 'apple-mobile-web-app-title', content: 'VoiceHub管理' },
         { name: 'mobile-web-app-capable', content: 'yes' },
         { name: 'format-detection', content: 'telephone=no' }
       ],
+      script: [
+        {
+          type: 'text/javascript',
+          tagPosition: 'head',
+          children: [
+            `(function(){try{`,
+            `  var k='voicehub:theme', d=document, r=d.documentElement, s=null, eff=null;`,
+            `  try{s=localStorage.getItem(k)}catch(e){s=null}`,
+            `  if(!s){`,
+            `    try{`,
+            `      var meta=document.querySelector('meta[name="x-default-theme"]');`,
+            `      if(meta && meta.content){s=meta.content}`,
+            `    }catch(e){s=null}`,
+            `    if(!s){s='ClassicLight'}`,
+            `  }`,
+            `  if(s==='System'||s==='system'){eff=window.matchMedia('(prefers-color-scheme: dark)').matches?'dark':'light'}`,
+            `  else if(typeof s==='string'){eff=s.endsWith('Dark')||s==='dark'?'dark':(s.endsWith('Light')||s==='light'?'light':s)}`,
+            `  else{eff='dark'}`,
+            `  r.setAttribute('data-theme', (typeof s==='string'?s:eff));`,
+            `  if(eff==='dark'){r.classList.add('dark'); r.classList.remove('light'); r.style.colorScheme='dark'}`,
+            `  else if(eff==='light'){r.classList.add('light'); r.classList.remove('dark'); r.style.colorScheme='light'}`,
+            `  else{r.classList.remove('dark','light'); r.style.colorScheme='light dark'}`,
+            `  try{`,
+            `    var tm=d.querySelector('meta[name="theme-color"]');`,
+            `    if(tm){tm.content=(eff==='light'?'#f8fafc':'#111111')}`,
+            `  }catch(e){}`,
+            `}catch(e){}})();`
+          ].join('')
+        }
+      ],
       link: [
         { rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' },
+        { rel: 'preload', as: 'image', href: '/images/logo.png' },
+        { rel: 'preload', as: 'image', href: '/images/site-logo.png' },
+        { rel: 'preload', as: 'image', href: '/images/school-logo-white.png' },
         // 优先加载常规字体，确保页面快速显示
         {
           rel: 'preload',
           as: 'style',
-          crossorigin: 'anonymous',
           href: 'https://cdn.jsdelivr.net/npm/misans@4.1.0/lib/Normal/MiSans-Regular.min.css'
         },
         {
           rel: 'stylesheet',
-          crossorigin: 'anonymous',
           href: 'https://cdn.jsdelivr.net/npm/misans@4.1.0/lib/Normal/MiSans-Regular.min.css'
         },
         // 延迟加载其他字重，避免阻塞页面渲染
         {
           rel: 'preload',
           as: 'style',
-          crossorigin: 'anonymous',
           href: 'https://cdn.jsdelivr.net/npm/misans@4.1.0/lib/Normal/MiSans-Medium.min.css',
           onload: "this.onload=null;this.rel='stylesheet'"
         },
         {
           rel: 'preload',
           as: 'style',
-          crossorigin: 'anonymous',
           href: 'https://cdn.jsdelivr.net/npm/misans@4.1.0/lib/Normal/MiSans-Semibold.min.css',
           onload: "this.onload=null;this.rel='stylesheet'"
         },
         {
           rel: 'preload',
           as: 'style',
-          crossorigin: 'anonymous',
           href: 'https://cdn.jsdelivr.net/npm/misans@4.1.0/lib/Normal/MiSans-Bold.min.css',
           onload: "this.onload=null;this.rel='stylesheet'"
         }
@@ -733,6 +279,7 @@ export default defineNuxtConfig({
 
   // 服务器端配置
   nitro: {
+    compressPublicAssets: true,
     preset: process.env.VERCEL
       ? 'vercel'
       : process.env.NETLIFY
@@ -743,15 +290,6 @@ export default defineNuxtConfig({
       wasm: true,
       asyncContext: true
     },
-    // @applemusic-like-lyrics/lyric 的 WASM 模块含顶层 await，需保留现代 ESM 语法。
-    esbuild: {
-      options: {
-        target: 'esnext'
-      }
-    },
-    externals: {
-      inline: ssrInlineLyricPackages
-    },
     timing: true,
     // 增加请求超时时间
     routeRules: {
@@ -831,11 +369,7 @@ export default defineNuxtConfig({
     // 根据部署环境调整配置
     ...(process.env.VERCEL
       ? {
-          vercel: {
-            functions: {
-              maxDuration: 60
-            }
-          }
+          // Vercel 环境：使用标准配置
         }
       : process.env.NETLIFY
         ? {
@@ -851,26 +385,46 @@ export default defineNuxtConfig({
 
   // Vite 配置
   vite: {
-    plugins: [wasm()],
-    optimizeDeps: {
-      include: ['drizzle-orm'],
-      exclude: [
-        '@applemusic-like-lyrics/vue',
-        '@applemusic-like-lyrics/lyric',
-        '#app-manifest',
-        'nuxt'
+    build: {
+      chunkSizeWarningLimit: 2000,
+      cssCodeSplit: true,
+      rollupOptions: {
+        maxParallelFileOps: 2,
+        output: {
+          manualChunks(id) {
+            if (id.includes('node_modules/lucide-vue-next')) {
+              return 'lucide'
+            }
+          }
+        }
+      }
+    },
+    resolve: {
+      alias: [
+        {
+          find: '@applemusic-like-lyrics/core/style.css',
+          replacement: fileURLToPath(
+            new URL('./vendor/amll-core/src/styles/index.css', import.meta.url)
+          )
+        },
+        {
+          find: '@applemusic-like-lyrics/core',
+          replacement: fileURLToPath(new URL('./vendor/amll-core/src/index.ts', import.meta.url))
+        }
       ]
     },
+    plugins: [wasm(), glsl()],
+    optimizeDeps: {
+      include: ['drizzle-orm'],
+      exclude: ['@applemusic-like-lyrics/vue', '@applemusic-like-lyrics/lyric']
+    },
     build: {
-      target: 'esnext',
-      // Vite 8 默认使用 Lightning CSS，会把连续声明中的标准毛玻璃属性误判为重复项
-      cssMinify: 'esbuild',
       sourcemap: false,
       rollupOptions: {
         output: {
           manualChunks(id) {
             if (!id.includes('node_modules')) return
-            if (id.includes('@lucide/vue')) return 'icons'
+            if (id.includes('lucide-vue-next')) return 'icons'
             if (id.includes('@pixi')) return 'pixi'
             if (id.includes('@applemusic-like-lyrics')) return 'lyric-engine'
             if (id.includes('drizzle-orm') || id.includes('postgres')) return 'database'
@@ -883,48 +437,11 @@ export default defineNuxtConfig({
     assetsInclude: ['**/*.wasm'],
     // SSR配置
     ssr: {
-      noExternal: [
-        ...(process.env.VERCEL ? [] : ['drizzle-orm', 'postgres']),
-        ...ssrInlineLyricPackages
-      ]
+      noExternal: process.env.NETLIFY
+        ? ['drizzle-orm', 'postgres']
+        : process.env.VERCEL
+          ? []
+          : ['drizzle-orm', 'postgres']
     }
-  },
-
-  pwa: {
-    registerType: 'autoUpdate',
-    manifest: {
-      name: siteTitle,
-      short_name: siteShortName,
-      description: siteDescription,
-      theme_color: '#111111',
-      background_color: '#111111',
-      display: 'standalone',
-      orientation: 'portrait',
-      scope: '/',
-      start_url: '/',
-      icons: [
-        {
-          src: '/assets/logo.png',
-          sizes: '128x128',
-          type: 'image/png',
-          purpose: 'any'
-        },
-        {
-          src: '/assets/logo-144.png',
-          sizes: '144x144',
-          type: 'image/png',
-          purpose: 'any'
-        }
-      ]
-    },
-    workbox: {
-      navigateFallback: null,
-      globPatterns: ['**/*.{js,css,html,png,svg,ico,woff2}']
-    },
-    devOptions: {
-      enabled: true,
-      type: 'module'
-    },
-    injectRegister: 'auto'
   }
 })
diff --git a/server/api/admin/activities.get.ts b/server/api/admin/activities.get.ts
index f3596b4..a11c99a 100644
--- a/server/api/admin/activities.get.ts
+++ b/server/api/admin/activities.get.ts
@@ -6,7 +6,7 @@ import { desc, eq } from 'drizzle-orm'
 export default defineEventHandler(async (event) => {
   // 检查认证和权限
   const user = event.context.user
-  if (!user || !['SONG_ADMIN', 'ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
+  if (!user || !['ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
     throw createError({
       statusCode: 403,
       message: '需要管理员权限'
diff --git a/server/api/admin/api-keys/[id].delete.ts b/server/api/admin/api-keys/[id].delete.ts
index 653d27f..d9ec167 100644
--- a/server/api/admin/api-keys/[id].delete.ts
+++ b/server/api/admin/api-keys/[id].delete.ts
@@ -6,12 +6,12 @@ import { eq } from 'drizzle-orm'
  * DELETE /api/admin/api-keys/[id]
  */
 export default defineEventHandler(async (event) => {
-  // 检查用户权限 - 只有超级管理员可以管理 API Key
+  // 检查用户权限 - 只有超级管理员可以管理API Key
   const user = event.context.user
   if (!user || user.role !== 'SUPER_ADMIN') {
     throw createError({
       statusCode: 403,
-      message: '只有超级管理员可以管理 API Key'
+      statusMessage: '只有超级管理员可以管理API Key'
     })
   }
 
@@ -20,7 +20,7 @@ export default defineEventHandler(async (event) => {
   if (!apiKeyId) {
     throw createError({
       statusCode: 400,
-      message: 'API Key ID 不能为空'
+      statusMessage: 'API Key ID不能为空'
     })
   }
 
@@ -38,7 +38,7 @@ export default defineEventHandler(async (event) => {
     if (existingApiKey.length === 0) {
       throw createError({
         statusCode: 404,
-        message: 'API Key 不存在'
+        statusMessage: 'API Key不存在'
       })
     }
 
@@ -73,7 +73,7 @@ export default defineEventHandler(async (event) => {
 
     throw createError({
       statusCode: 500,
-      message: `删除 API Key 失败：${error.message}`
+      statusMessage: `删除API Key失败: ${error.message}`
     })
   }
 })
diff --git a/server/api/admin/api-keys/[id].get.ts b/server/api/admin/api-keys/[id].get.ts
index ac8a016..f8c463e 100644
--- a/server/api/admin/api-keys/[id].get.ts
+++ b/server/api/admin/api-keys/[id].get.ts
@@ -6,12 +6,12 @@ import { eq } from 'drizzle-orm'
  * GET /api/admin/api-keys/[id]
  */
 export default defineEventHandler(async (event) => {
-  // 检查用户权限 - 只有超级管理员可以管理 API Key
+  // 检查用户权限 - 只有超级管理员可以管理API Key
   const user = event.context.user
   if (!user || user.role !== 'SUPER_ADMIN') {
     throw createError({
       statusCode: 403,
-      message: '只有超级管理员可以管理 API Key'
+      statusMessage: '只有超级管理员可以管理API Key'
     })
   }
 
@@ -20,7 +20,7 @@ export default defineEventHandler(async (event) => {
   if (!apiKeyId) {
     throw createError({
       statusCode: 400,
-      message: 'API Key ID 不能为空'
+      statusMessage: 'API Key ID不能为空'
     })
   }
 
@@ -52,7 +52,7 @@ export default defineEventHandler(async (event) => {
     if (!apiKey) {
       throw createError({
         statusCode: 404,
-        message: 'API Key 不存在'
+        statusMessage: 'API Key不存在'
       })
     }
 
@@ -86,7 +86,7 @@ export default defineEventHandler(async (event) => {
 
     throw createError({
       statusCode: 500,
-      message: `获取 API Key 详情失败：${error.message}`
+      statusMessage: `获取API Key详情失败: ${error.message}`
     })
   }
 })
diff --git a/server/api/admin/api-keys/[id].put.ts b/server/api/admin/api-keys/[id].put.ts
index 173ac9a..0fb0cda 100644
--- a/server/api/admin/api-keys/[id].put.ts
+++ b/server/api/admin/api-keys/[id].put.ts
@@ -2,7 +2,6 @@ import { apiKeyPermissions, apiKeys, db } from '~/drizzle/db'
 import { eq } from 'drizzle-orm'
 import { z } from 'zod'
 import { getBeijingTime } from '~/utils/timeUtils'
-import { apiPermissionSchema } from './permissions'
 
 /**
  * 更新API Key
@@ -21,18 +20,18 @@ const updateApiKeySchema = z.object({
   expiresAt: z.string().optional().nullable(),
 
   permissions: z
-    .array(apiPermissionSchema)
+    .array(z.enum(['schedules:read', 'songs:read']))
     .min(1, '至少需要选择一个权限')
     .optional()
 })
 
 export default defineEventHandler(async (event) => {
-  // 检查用户权限 - 只有超级管理员可以管理 API Key
+  // 检查用户权限 - 只有超级管理员可以管理API Key
   const user = event.context.user
   if (!user || user.role !== 'SUPER_ADMIN') {
     throw createError({
       statusCode: 403,
-      message: '只有超级管理员可以管理 API Key'
+      statusMessage: '只有超级管理员可以管理API Key'
     })
   }
 
@@ -41,7 +40,7 @@ export default defineEventHandler(async (event) => {
   if (!apiKeyId) {
     throw createError({
       statusCode: 400,
-      message: 'API Key ID 不能为空'
+      statusMessage: 'API Key ID不能为空'
     })
   }
 
@@ -60,7 +59,7 @@ export default defineEventHandler(async (event) => {
     if (existingApiKey.length === 0) {
       throw createError({
         statusCode: 404,
-        message: 'API Key 不存在'
+        statusMessage: 'API Key不存在'
       })
     }
 
@@ -83,14 +82,14 @@ export default defineEventHandler(async (event) => {
             if (isNaN(expiresAt.getTime())) {
               throw createError({
                 statusCode: 400,
-                message: '无效的过期时间格式'
+                statusMessage: '无效的过期时间格式'
               })
             }
             // 验证过期时间不能是过去的时间
             if (expiresAt <= getBeijingTime()) {
               throw createError({
                 statusCode: 400,
-                message: '过期时间不能是过去的时间'
+                statusMessage: '过期时间不能是过去的时间'
               })
             }
           }
@@ -100,7 +99,7 @@ export default defineEventHandler(async (event) => {
           }
           throw createError({
             statusCode: 400,
-            message: '无效的过期时间格式'
+            statusMessage: '无效的过期时间格式'
           })
         }
       }
@@ -148,17 +147,17 @@ export default defineEventHandler(async (event) => {
       throw error
     }
 
-    // 处理 Zod 验证错误
+    // 处理Zod验证错误
     if (error.name === 'ZodError') {
       throw createError({
         statusCode: 400,
-        message: `请求参数验证失败：${error.errors.map((e: any) => e.message).join(', ')}`
+        statusMessage: `请求参数验证失败: ${error.errors.map((e: any) => e.message).join(', ')}`
       })
     }
 
     throw createError({
       statusCode: 500,
-      message: `更新 API Key 失败：${error.message}`
+      statusMessage: `更新API Key失败: ${error.message}`
     })
   }
 })
diff --git a/server/api/admin/api-keys/index.get.ts b/server/api/admin/api-keys/index.get.ts
index e4703a9..0de6b7b 100644
--- a/server/api/admin/api-keys/index.get.ts
+++ b/server/api/admin/api-keys/index.get.ts
@@ -6,12 +6,12 @@ import { and, count, desc, eq, inArray, sql } from 'drizzle-orm'
  * GET /api/admin/api-keys
  */
 export default defineEventHandler(async (event) => {
-  // 检查用户权限 - 只有超级管理员可以管理 API Key
+  // 检查用户权限 - 只有超级管理员可以管理API Key
   const user = event.context.user
   if (!user || user.role !== 'SUPER_ADMIN') {
     throw createError({
       statusCode: 403,
-      message: '只有超级管理员可以管理 API Key'
+      statusMessage: '只有超级管理员可以管理API Key'
     })
   }
 
@@ -167,7 +167,7 @@ export default defineEventHandler(async (event) => {
                     : 'active'
               }
             } catch (keyError) {
-              console.error('处理API Key数据失败:', keyError)
+              console.error('处理API Key数据失败:', keyError, key)
               return null
             }
           })
@@ -193,7 +193,7 @@ export default defineEventHandler(async (event) => {
   } catch (error: any) {
     throw createError({
       statusCode: 500,
-      message: `获取 API Key 列表失败：${error.message}`
+      statusMessage: `获取API Key列表失败: ${error.message}`
     })
   }
 })
diff --git a/server/api/admin/api-keys/index.post.ts b/server/api/admin/api-keys/index.post.ts
index c43bf5a..3bd636f 100644
--- a/server/api/admin/api-keys/index.post.ts
+++ b/server/api/admin/api-keys/index.post.ts
@@ -1,8 +1,7 @@
 import { apiKeyPermissions, apiKeys, db } from '~/drizzle/db'
+import crypto from 'crypto'
 import { z } from 'zod'
 import { getBeijingTime } from '~/utils/timeUtils'
-import { apiPermissionSchema } from './permissions'
-import { generateApiKey, hashApiKey } from '~~/server/utils/apiKeyUtils'
 
 /**
  * 创建API Key
@@ -17,16 +16,16 @@ const createApiKeySchema = z.object({
     .optional(),
   expiresAt: z.union([z.string(), z.null(), z.undefined()]).optional(),
 
-  permissions: z.array(apiPermissionSchema).min(1, '至少需要选择一个权限')
+  permissions: z.array(z.enum(['schedules:read', 'songs:read'])).min(1, '至少需要选择一个权限')
 })
 
 export default defineEventHandler(async (event) => {
-  // 检查用户权限 - 只有超级管理员可以管理 API Key
+  // 检查用户权限 - 只有超级管理员可以管理API Key
   const user = event.context.user
   if (!user || user.role !== 'SUPER_ADMIN') {
     throw createError({
       statusCode: 403,
-      message: '只有超级管理员可以管理 API Key'
+      statusMessage: '只有超级管理员可以管理API Key'
     })
   }
 
@@ -38,7 +37,7 @@ export default defineEventHandler(async (event) => {
     // 生成API Key
     const apiKey = generateApiKey()
     const keyPrefix = apiKey.substring(0, 10) // vhub_xxxxx
-    const keyHash = await hashApiKey(apiKey)
+    const keyHash = crypto.createHash('sha256').update(apiKey).digest('hex')
 
     // 处理过期时间
     let expiresAt: Date | null = null
@@ -60,14 +59,14 @@ export default defineEventHandler(async (event) => {
           if (isNaN(expiresAt.getTime())) {
             throw createError({
               statusCode: 400,
-              message: '无效的过期时间格式'
+              statusMessage: '无效的过期时间格式'
             })
           }
           // 验证过期时间不能是过去的时间
           if (expiresAt <= getBeijingTime()) {
             throw createError({
               statusCode: 400,
-              message: '过期时间不能是过去的时间'
+              statusMessage: '过期时间不能是过去的时间'
             })
           }
         }
@@ -77,7 +76,7 @@ export default defineEventHandler(async (event) => {
         }
         throw createError({
           statusCode: 400,
-          message: '无效的过期时间格式'
+          statusMessage: '无效的过期时间格式'
         })
       }
     }
@@ -100,15 +99,7 @@ export default defineEventHandler(async (event) => {
         })
         .returning({ id: apiKeys.id })
 
-      const createdApiKey = apiKeyResult[0]
-      if (!createdApiKey) {
-        throw createError({
-          statusCode: 500,
-          message: '创建 API Key 失败'
-        })
-      }
-
-      const apiKeyId = createdApiKey.id
+      const apiKeyId = apiKeyResult[0].id
 
       // 插入权限记录
       const permissionValues = validatedData.permissions.map((permission) => ({
@@ -120,7 +111,7 @@ export default defineEventHandler(async (event) => {
 
       return {
         id: apiKeyId,
-        apiKey,
+        apiKey, // 只在创建时返回完整的API Key
         name: validatedData.name,
         description: validatedData.description,
         keyPrefix,
@@ -144,18 +135,27 @@ export default defineEventHandler(async (event) => {
       throw error
     }
 
-    // 处理 Zod 验证错误
+    // 处理Zod验证错误
     if (error.name === 'ZodError') {
       throw createError({
         statusCode: 400,
-        message: `请求参数验证失败：${error.errors.map((e: any) => e.message).join(', ')}`
+        statusMessage: `请求参数验证失败: ${error.errors.map((e: any) => e.message).join(', ')}`
       })
     }
 
     throw createError({
       statusCode: 500,
-      message: `创建 API Key 失败：${error.message}`
+      statusMessage: `创建API Key失败: ${error.message}`
     })
   }
 })
 
+/**
+ * 生成API Key
+ * 格式: vhub_xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx (37字符)
+ */
+function generateApiKey(): string {
+  const prefix = 'vhub_'
+  const randomBytes = crypto.randomBytes(16).toString('hex') // 32字符
+  return prefix + randomBytes
+}
diff --git a/server/api/admin/api-keys/logs.get.ts b/server/api/admin/api-keys/logs.get.ts
index b764cc8..c267ba4 100644
--- a/server/api/admin/api-keys/logs.get.ts
+++ b/server/api/admin/api-keys/logs.get.ts
@@ -5,12 +5,12 @@ import { ApiLogService } from '~~/server/services/apiLogService'
  * GET /api/admin/api-keys/logs
  */
 export default defineEventHandler(async (event) => {
-  // 检查用户权限 - 只有超级管理员可以查看 API 日志
+  // 检查用户权限 - 只有超级管理员可以查看API日志
   const user = event.context.user
   if (!user || user.role !== 'SUPER_ADMIN') {
     throw createError({
       statusCode: 403,
-      message: '只有超级管理员可以查看 API 日志'
+      statusMessage: '只有超级管理员可以查看API日志'
     })
   }
 
@@ -62,10 +62,10 @@ export default defineEventHandler(async (event) => {
       stats: stats.basic
     }
   } catch (error) {
-    console.error('获取 API 访问日志失败:', error)
+    console.error('获取API访问日志失败:', error)
     throw createError({
       statusCode: 500,
-      message: '获取 API 访问日志失败'
+      statusMessage: '获取API访问日志失败'
     })
   }
 })
diff --git a/server/api/admin/backup/clear.post.ts b/server/api/admin/backup/clear.post.ts
index 63f473b..155a899 100644
--- a/server/api/admin/backup/clear.post.ts
+++ b/server/api/admin/backup/clear.post.ts
@@ -4,8 +4,6 @@ import {
   apiKeyPermissions,
   apiKeys,
   apiLogs,
-  cardCodeRedeemLogs,
-  cardCodes,
   collaborationLogs,
   emailTemplates,
   notifications,
@@ -29,10 +27,18 @@ import { eq, inArray, isNull, notInArray, or } from 'drizzle-orm'
 export default defineEventHandler(async (event) => {
   // 验证管理员权限
   const user = event.context.user
-  if (!user || user.role !== 'SUPER_ADMIN') {
+  if (!user || !['ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
     throw createError({
       statusCode: 403,
-      message: '只有超级管理员可以清空数据库'
+      statusMessage: '权限不足'
+    })
+  }
+
+  // 只有超级管理员可以清空数据库
+  if (user.role !== 'SUPER_ADMIN') {
+    throw createError({
+      statusCode: 403,
+      statusMessage: '只有超级管理员可以清空数据库'
     })
   }
 
@@ -61,7 +67,6 @@ export default defineEventHandler(async (event) => {
       await db.delete(apiKeys).where(eq(apiKeys.createdByUserId, currentUserId))
       await db.delete(notifications).where(eq(notifications.userId, currentUserId))
       await db.delete(notificationSettings).where(eq(notificationSettings.userId, currentUserId))
-      await db.delete(cardCodeRedeemLogs).where(eq(cardCodeRedeemLogs.redeemedBy, currentUserId))
       await db.delete(userStatusLogs).where(eq(userStatusLogs.userId, currentUserId))
       await db.delete(userIdentities).where(eq(userIdentities.userId, currentUserId))
       await db.delete(users).where(eq(users.id, currentUserId))
@@ -93,7 +98,6 @@ export default defineEventHandler(async (event) => {
       await db.delete(apiKeys)
       await db.delete(notifications)
       await db.delete(notificationSettings)
-      await db.delete(cardCodeRedeemLogs)
       await db.delete(collaborationLogs)
       await db.delete(songCollaborators)
       await db.delete(songReplayRequests)
@@ -104,7 +108,6 @@ export default defineEventHandler(async (event) => {
       await db.delete(songBlacklists)
       await db.delete(userIdentities)
       await db.delete(songs)
-      await db.delete(cardCodes)
       await db.delete(playTimes)
       await db.delete(semesters)
       await db.delete(requestTimes)
@@ -137,22 +140,16 @@ export default defineEventHandler(async (event) => {
       await db
         .delete(notificationSettings)
         .where(notInArray(notificationSettings.userId, preservedSuperAdminIds))
-      await db.delete(cardCodeRedeemLogs)
       await db.delete(collaborationLogs)
       await db.delete(songCollaborators)
       await db.delete(songReplayRequests)
       await db.delete(schedules)
       await db.delete(votes)
-      await db
-        .delete(userStatusLogs)
-        .where(notInArray(userStatusLogs.userId, preservedSuperAdminIds))
+      await db.delete(userStatusLogs).where(notInArray(userStatusLogs.userId, preservedSuperAdminIds))
       await db.delete(emailTemplates)
       await db.delete(songBlacklists)
-      await db
-        .delete(userIdentities)
-        .where(notInArray(userIdentities.userId, preservedSuperAdminIds))
+      await db.delete(userIdentities).where(notInArray(userIdentities.userId, preservedSuperAdminIds))
       await db.delete(songs)
-      await db.delete(cardCodes)
       await db.delete(playTimes)
       await db.delete(semesters)
       await db.delete(requestTimes)
@@ -172,7 +169,7 @@ export default defineEventHandler(async (event) => {
     console.error('清空数据失败:', error)
     throw createError({
       statusCode: 500,
-      message: '清空数据失败：' + error.message
+      statusMessage: '清空数据失败: ' + error.message
     })
   }
 })
diff --git a/server/api/admin/backup/delete/[filename].delete.ts b/server/api/admin/backup/delete/[filename].delete.ts
index f229d8f..13386de 100644
--- a/server/api/admin/backup/delete/[filename].delete.ts
+++ b/server/api/admin/backup/delete/[filename].delete.ts
@@ -6,10 +6,10 @@ export default defineEventHandler(async (event) => {
   try {
     // 验证管理员权限
     const user = event.context.user
-    if (!user || user.role !== 'SUPER_ADMIN') {
+    if (!user || !['ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
       throw createError({
         statusCode: 403,
-        message: '只有超级管理员可以管理备份文件'
+        statusMessage: '权限不足'
       })
     }
 
@@ -18,7 +18,7 @@ export default defineEventHandler(async (event) => {
     if (!filename) {
       throw createError({
         statusCode: 400,
-        message: '请指定文件名'
+        statusMessage: '请指定文件名'
       })
     }
 
@@ -26,7 +26,7 @@ export default defineEventHandler(async (event) => {
     if (filename.includes('..') || filename.includes('/') || filename.includes('\\')) {
       throw createError({
         statusCode: 400,
-        message: '无效的文件名'
+        statusMessage: '无效的文件名'
       })
     }
 
@@ -34,7 +34,7 @@ export default defineEventHandler(async (event) => {
     if (!filename.endsWith('.json')) {
       throw createError({
         statusCode: 400,
-        message: '只能删除 JSON 格式的备份文件'
+        statusMessage: '只能删除JSON格式的备份文件'
       })
     }
 
@@ -47,14 +47,14 @@ export default defineEventHandler(async (event) => {
     } catch {
       throw createError({
         statusCode: 404,
-        message: '备份文件不存在'
+        statusMessage: '备份文件不存在'
       })
     }
 
     // 删除文件
     await fs.unlink(filepath)
 
-    console.log(`管理员 ${user.username} 删除了备份文件：${filename}`)
+    console.log(`管理员 ${user.username} 删除了备份文件: ${filename}`)
 
     return {
       success: true,
@@ -65,7 +65,7 @@ export default defineEventHandler(async (event) => {
     console.error('删除备份文件失败:', error)
     throw createError({
       statusCode: error.statusCode || 500,
-      message: error.message || '删除备份文件失败'
+      statusMessage: error.statusMessage || '删除备份文件失败'
     })
   }
 })
diff --git a/server/api/admin/backup/download.get.ts b/server/api/admin/backup/download.get.ts
index 303e26b..89d495c 100644
--- a/server/api/admin/backup/download.get.ts
+++ b/server/api/admin/backup/download.get.ts
@@ -6,10 +6,10 @@ export default defineEventHandler(async (event) => {
   try {
     // 验证管理员权限
     const user = event.context.user
-    if (!user || user.role !== 'SUPER_ADMIN') {
+    if (!user || !['ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
       throw createError({
         statusCode: 403,
-        message: '只有超级管理员可以下载备份文件'
+        statusMessage: '权限不足'
       })
     }
 
@@ -19,7 +19,7 @@ export default defineEventHandler(async (event) => {
     if (!filename || typeof filename !== 'string') {
       throw createError({
         statusCode: 400,
-        message: '缺少文件名参数'
+        statusMessage: '缺少文件名参数'
       })
     }
 
@@ -27,7 +27,7 @@ export default defineEventHandler(async (event) => {
     if (filename.includes('..') || filename.includes('/') || filename.includes('\\')) {
       throw createError({
         statusCode: 400,
-        message: '无效的文件名'
+        statusMessage: '无效的文件名'
       })
     }
 
@@ -40,7 +40,7 @@ export default defineEventHandler(async (event) => {
     ) {
       throw createError({
         statusCode: 400,
-        message: '无效的备份文件'
+        statusMessage: '无效的备份文件'
       })
     }
 
@@ -66,19 +66,19 @@ export default defineEventHandler(async (event) => {
       if (error.code === 'ENOENT') {
         throw createError({
           statusCode: 404,
-          message: '备份文件不存在'
+          statusMessage: '备份文件不存在'
         })
       }
       throw createError({
         statusCode: 500,
-        message: '读取备份文件失败'
+        statusMessage: '读取备份文件失败'
       })
     }
   } catch (error) {
     console.error('下载备份文件失败:', error)
     throw createError({
       statusCode: error.statusCode || 500,
-      message: error.message || '下载备份文件失败'
+      statusMessage: error.statusMessage || '下载备份文件失败'
     })
   }
 })
diff --git a/server/api/admin/backup/download/[filename].get.ts b/server/api/admin/backup/download/[filename].get.ts
index 0e07229..d5f0854 100644
--- a/server/api/admin/backup/download/[filename].get.ts
+++ b/server/api/admin/backup/download/[filename].get.ts
@@ -6,10 +6,10 @@ export default defineEventHandler(async (event) => {
   try {
     // 验证管理员权限
     const user = event.context.user
-    if (!user || user.role !== 'SUPER_ADMIN') {
+    if (!user || !['ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
       throw createError({
         statusCode: 403,
-        message: '只有超级管理员可以下载备份文件'
+        statusMessage: '权限不足'
       })
     }
 
@@ -18,7 +18,7 @@ export default defineEventHandler(async (event) => {
     if (!filename) {
       throw createError({
         statusCode: 400,
-        message: '请指定文件名'
+        statusMessage: '请指定文件名'
       })
     }
 
@@ -26,7 +26,7 @@ export default defineEventHandler(async (event) => {
     if (filename.includes('..') || filename.includes('/') || filename.includes('\\')) {
       throw createError({
         statusCode: 400,
-        message: '无效的文件名'
+        statusMessage: '无效的文件名'
       })
     }
 
@@ -34,7 +34,7 @@ export default defineEventHandler(async (event) => {
     if (!filename.endsWith('.json')) {
       throw createError({
         statusCode: 400,
-        message: '只能下载 JSON 格式的备份文件'
+        statusMessage: '只能下载JSON格式的备份文件'
       })
     }
 
@@ -47,7 +47,7 @@ export default defineEventHandler(async (event) => {
     } catch {
       throw createError({
         statusCode: 404,
-        message: '备份文件不存在'
+        statusMessage: '备份文件不存在'
       })
     }
 
@@ -70,7 +70,7 @@ export default defineEventHandler(async (event) => {
     console.error('下载备份文件失败:', error)
     throw createError({
       statusCode: error.statusCode || 500,
-      message: error.message || '下载备份文件失败'
+      statusMessage: error.statusMessage || '下载备份文件失败'
     })
   }
 })
diff --git a/server/api/admin/backup/export.post.ts b/server/api/admin/backup/export.post.ts
index 90ed67b..41b8aaf 100644
--- a/server/api/admin/backup/export.post.ts
+++ b/server/api/admin/backup/export.post.ts
@@ -4,8 +4,6 @@ import {
   apiKeys,
   apiKeyPermissions,
   apiLogs,
-  cardCodeRedeemLogs,
-  cardCodes,
   collaborationLogs,
   emailTemplates,
   notifications,
@@ -13,7 +11,6 @@ import {
   playTimes,
   requestTimes,
   schedules,
-  scheduleSongPool,
   semesters,
   songBlacklists,
   songCollaborators,
@@ -23,10 +20,8 @@ import {
   users,
   userIdentities,
   userStatusLogs,
-  gradeClass,
   votes
 } from '~/drizzle/schema'
-import { inArray } from 'drizzle-orm'
 import { promises as fs } from 'fs'
 import path from 'path'
 
@@ -34,17 +29,15 @@ export default defineEventHandler(async (event) => {
   try {
     // 验证管理员权限
     const user = event.context.user
-    if (!user || user.role !== 'SUPER_ADMIN') {
+    if (!user || !['ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
       throw createError({
         statusCode: 403,
-        message: '只有超级管理员可以导出备份'
+        statusMessage: '权限不足'
       })
     }
 
     const body = await readBody(event)
-    const { tables = 'all' } = body
-    const includeSystemData =
-      typeof body.includeSystemData === 'boolean' ? body.includeSystemData : tables !== 'users'
+    const { tables = 'all', includeSystemData = true } = body
 
     console.log('开始创建数据库备份...')
 
@@ -107,53 +100,6 @@ export default defineEventHandler(async (event) => {
         },
         description: '歌曲数据'
       },
-      cardCodes: {
-        query: async () => {
-          const codesData = await db.select().from(cardCodes)
-          const usersData = await db
-            .select({
-              id: users.id,
-              username: users.username,
-              name: users.name
-            })
-            .from(users)
-
-          return codesData.map((code) => ({
-            ...code,
-            lockedByUser: code.lockedBy ? usersData.find((user) => user.id === code.lockedBy) : null,
-            redeemedByUser: code.redeemedBy ? usersData.find((user) => user.id === code.redeemedBy) : null
-          }))
-        },
-        description: '点歌券数据'
-      },
-      cardCodeRedeemLogs: {
-        query: async () => {
-          const logsData = await db.select().from(cardCodeRedeemLogs)
-          const codesData = await db.select({ id: cardCodes.id, code: cardCodes.code }).from(cardCodes)
-          const songsData = await db
-            .select({
-              id: songs.id,
-              title: songs.title,
-              artist: songs.artist
-            })
-            .from(songs)
-          const usersData = await db
-            .select({
-              id: users.id,
-              username: users.username,
-              name: users.name
-            })
-            .from(users)
-
-          return logsData.map((log) => ({
-            ...log,
-            cardCode: codesData.find((code) => code.id === log.cardCodeId),
-            redeemer: usersData.find((user) => user.id === log.redeemedBy),
-            song: log.songId ? songsData.find((song) => song.id === log.songId) : null
-          }))
-        },
-        description: '点歌券日志'
-      },
       votes: {
         query: async () => {
           const votesData = await db.select().from(votes)
@@ -180,24 +126,6 @@ export default defineEventHandler(async (event) => {
         },
         description: '投票数据'
       },
-      scheduleSongPool: {
-        query: async () => {
-          const poolData = await db.select().from(scheduleSongPool)
-          if (poolData.length === 0) return []
-          const poolSongIds = poolData.map((row) => row.songId)
-          const songsData = await db.select({
-            id: songs.id,
-            title: songs.title,
-            artist: songs.artist
-          }).from(songs).where(inArray(songs.id, poolSongIds))
-          const songsMap = new Map(songsData.map((s) => [s.id, s]))
-          return poolData.map((row) => ({
-            ...row,
-            song: songsMap.get(row.songId) || null
-          }))
-        },
-        description: '排期备选池'
-      },
       schedules: {
         query: async () => {
           const schedulesData = await db.select().from(schedules)
@@ -294,10 +222,6 @@ export default defineEventHandler(async (event) => {
         },
         description: '用户状态变更日志'
       },
-      gradeClass: {
-        query: () => db.select().from(gradeClass),
-        description: '年级班级配置'
-      },
       userIdentities: {
         query: async () => {
           const identitiesData = await db.select().from(userIdentities)
@@ -426,10 +350,7 @@ export default defineEventHandler(async (event) => {
     // 如果包含系统数据，添加系统设置表
     if (includeSystemData) {
       tablesToBackup.systemSettings = {
-        query: async () => {
-          const settings = await db.select().from(systemSettings)
-          return settings
-        },
+        query: () => db.select().from(systemSettings),
         description: '系统设置'
       }
     }
@@ -519,7 +440,7 @@ export default defineEventHandler(async (event) => {
         console.error(`备份表 ${tableName} 失败:`, error)
         throw createError({
           statusCode: 500,
-          message: `备份表 ${tableName} 失败：${error.message}`
+          statusMessage: `备份表 ${tableName} 失败: ${error.message}`
         })
       }
     }
@@ -612,7 +533,7 @@ export default defineEventHandler(async (event) => {
     console.error('创建数据库备份失败:', error)
     throw createError({
       statusCode: error.statusCode || 500,
-      message: error.message || '创建数据库备份失败'
+      statusMessage: error.statusMessage || '创建数据库备份失败'
     })
   }
 })
diff --git a/server/api/admin/backup/list.get.ts b/server/api/admin/backup/list.get.ts
index fdb3df4..e3554df 100644
--- a/server/api/admin/backup/list.get.ts
+++ b/server/api/admin/backup/list.get.ts
@@ -6,10 +6,10 @@ export default defineEventHandler(async (event) => {
   try {
     // 验证管理员权限
     const user = event.context.user
-    if (!user || user.role !== 'SUPER_ADMIN') {
+    if (!user || !['ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
       throw createError({
         statusCode: 403,
-        message: '只有超级管理员可以查看备份文件'
+        statusMessage: '权限不足'
       })
     }
 
@@ -109,10 +109,7 @@ export default defineEventHandler(async (event) => {
           filename.startsWith('users-system-backup-')
         ) {
           type = 'users'
-        } else if (
-          filename.startsWith('songs-backup-') ||
-          filename.startsWith('songs-system-backup-')
-        ) {
+        } else if (filename.startsWith('songs-backup-') || filename.startsWith('songs-system-backup-')) {
           type = 'songs'
         } else if (filename.startsWith('system-settings-backup-')) {
           type = 'system'
@@ -152,7 +149,7 @@ export default defineEventHandler(async (event) => {
     console.error('获取备份文件列表失败:', error)
     throw createError({
       statusCode: 500,
-      message: '获取备份文件列表失败'
+      statusMessage: '获取备份文件列表失败'
     })
   }
 })
diff --git a/server/api/admin/backup/restore-chunk.post.ts b/server/api/admin/backup/restore-chunk.post.ts
index 423d236..f420600 100644
--- a/server/api/admin/backup/restore-chunk.post.ts
+++ b/server/api/admin/backup/restore-chunk.post.ts
@@ -1,10 +1,6 @@
 import { createError, defineEventHandler, readBody } from 'h3'
 import { db } from '~/drizzle/db'
 import {
-  cardCodeRedeemLogs,
-  cardCodes,
-  emailTemplates,
-  gradeClass,
   notificationSettings,
   notifications,
   playTimes,
@@ -19,21 +15,14 @@ import {
   votes
 } from '~/drizzle/schema'
 import { and, eq } from 'drizzle-orm'
-import { restoreScheduleSongPoolRecord } from '~~/server/utils/restoreScheduleSongPool'
-import { omitMaskedSystemSettingsSecrets } from '~~/server/api/admin/system-settings/secretMask'
-import { createApiError } from '~~/server/utils/apiError'
-import { validateThemeConfig } from '~~/server/utils/theme-config'
-import { SERVER_ERROR_CODES } from '~~/server/config/constants'
-import { normalizeScheduleVisibilitySettings } from '~~/server/utils/system-settings-defaults'
-import { syncAllSequences } from '~~/server/utils/sequence-sync'
 
 export default defineEventHandler(async (event) => {
   // 验证管理员权限
   const user = event.context.user
-  if (!user || user.role !== 'SUPER_ADMIN') {
+  if (!user || !['ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
     throw createError({
       statusCode: 403,
-      message: '只有超级管理员可以恢复备份'
+      statusMessage: '权限不足'
     })
   }
 
@@ -50,14 +39,14 @@ export default defineEventHandler(async (event) => {
   if (overwriteSuperAdmin && user.role !== 'SUPER_ADMIN') {
     throw createError({
       statusCode: 403,
-      message: '仅超级管理员可以覆盖超级管理员账号数据'
+      statusMessage: '仅超级管理员可以覆盖超级管理员账号数据'
     })
   }
 
   if (!tableName || !records || !Array.isArray(records)) {
     throw createError({
       statusCode: 400,
-      message: '无效的请求参数'
+      statusMessage: '无效的请求参数'
     })
   }
 
@@ -68,9 +57,6 @@ export default defineEventHandler(async (event) => {
   const songIdMapping = new Map(
     Object.entries(mappings?.songs || {}).map(([k, v]) => [Number(k), Number(v)])
   )
-  const cardCodeIdMapping = new Map(
-    Object.entries(mappings?.cardCodes || {}).map(([k, v]) => [Number(k), Number(v)])
-  )
   const preservedSuperAdminIds = new Set(
     (mappings?.meta?.preservedSuperAdminIds || []).map((id) => Number(id))
   )
@@ -81,8 +67,7 @@ export default defineEventHandler(async (event) => {
 
   const newMappings = {
     users: {},
-    songs: {},
-    cardCodes: {}
+    songs: {}
   }
 
   const stats = {
@@ -114,10 +99,7 @@ export default defineEventHandler(async (event) => {
                 'meowNickname',
                 'forcePasswordChange',
                 'status',
-                'statusChangedBy',
-                'remark',
-                'avatarProvider',
-                'avatarProviderUserId'
+                'statusChangedBy'
               ]
               const dateFields = [
                 'createdAt',
@@ -131,7 +113,7 @@ export default defineEventHandler(async (event) => {
               userFields.forEach((field) => {
                 if (record.hasOwnProperty(field)) {
                   if (field === 'role') {
-                    if (!['USER', 'SONG_ADMIN', 'ADMIN', 'SUPER_ADMIN'].includes(record[field])) {
+                    if (!['USER', 'TEACHER', 'SONG_ADMIN', 'ADMIN', 'SUPER_ADMIN'].includes(record[field])) {
                       userData[field] = 'USER'
                     } else {
                       userData[field] = record[field]
@@ -285,14 +267,10 @@ export default defineEventHandler(async (event) => {
               provider: record.provider,
               providerUserId: record.providerUserId,
               providerUsername: record.providerUsername,
-              avatar: record.avatar || null,
               createdAt: record.createdAt ? new Date(record.createdAt) : new Date()
             }
 
-            if (
-              !shouldOverwriteSuperAdmin &&
-              preservedSuperAdminIds.has(Number(validIdentityUserId))
-            ) {
+            if (!shouldOverwriteSuperAdmin && preservedSuperAdminIds.has(Number(validIdentityUserId))) {
               stats.updated++
               break
             }
@@ -352,12 +330,10 @@ export default defineEventHandler(async (event) => {
 
             const userStatusLogData = {
               userId: validUserId,
-              username: record.username ?? null,
-              name: record.name ?? null,
-              oldStatus: record.oldStatus || record.previousStatus || null,
+              previousStatus: record.previousStatus || null,
               newStatus: record.newStatus,
               reason: record.reason || null,
-              operatorId: record.operatorId || record.changedBy || null,
+              changedBy: record.changedBy || null,
               createdAt: record.createdAt ? new Date(record.createdAt) : new Date()
             }
 
@@ -391,83 +367,6 @@ export default defineEventHandler(async (event) => {
             break
           }
 
-          case 'cardCodes': {
-            const cardCodeData: any = {}
-            const cardCodeFields = ['code', 'status', 'note']
-            cardCodeFields.forEach((field) => {
-              if (record.hasOwnProperty(field)) {
-                cardCodeData[field] = record[field]
-              }
-            })
-
-            if (!cardCodeData.code) return
-
-            const mapUserId = async (field: 'lockedBy' | 'redeemedBy') => {
-              if (!record[field]) return null
-              const mappedUserId = userIdMapping.get(record[field])
-              if (mappedUserId) return mappedUserId
-              if (mode === 'merge') return null
-              const userExists = await tx.query.users.findFirst({
-                where: eq(users.id, record[field])
-              })
-              return userExists ? record[field] : null
-            }
-
-            cardCodeData.lockedBy = await mapUserId('lockedBy')
-            cardCodeData.redeemedBy = await mapUserId('redeemedBy')
-            cardCodeData.lockedAt = record.lockedAt ? new Date(record.lockedAt) : null
-            cardCodeData.redeemedAt = record.redeemedAt ? new Date(record.redeemedAt) : null
-            cardCodeData.createdAt = record.createdAt ? new Date(record.createdAt) : new Date()
-            cardCodeData.updatedAt = record.updatedAt ? new Date(record.updatedAt) : new Date()
-
-            let restoredCardCode
-            if (mode === 'merge') {
-              const existing = await tx.query.cardCodes.findFirst({
-                where: eq(cardCodes.code, cardCodeData.code)
-              })
-              if (existing) {
-                restoredCardCode = (
-                  await tx
-                    .update(cardCodes)
-                    .set(cardCodeData)
-                    .where(eq(cardCodes.id, existing.id))
-                    .returning()
-                )[0]
-                stats.updated++
-              } else {
-                restoredCardCode = (await tx.insert(cardCodes).values(cardCodeData).returning())[0]
-                stats.created++
-              }
-            } else {
-              const existing = await tx.query.cardCodes.findFirst({
-                where: eq(cardCodes.id, record.id)
-              })
-              if (existing) {
-                restoredCardCode = (
-                  await tx
-                    .update(cardCodes)
-                    .set(cardCodeData)
-                    .where(eq(cardCodes.id, record.id))
-                    .returning()
-                )[0]
-                stats.updated++
-              } else {
-                restoredCardCode = (
-                  await tx
-                    .insert(cardCodes)
-                    .values({ ...cardCodeData, id: record.id })
-                    .returning()
-                )[0]
-                stats.created++
-              }
-            }
-
-            if (record.id && restoredCardCode?.id) {
-              newMappings.cardCodes[record.id] = restoredCardCode.id
-            }
-            break
-          }
-
           case 'songs': {
             let validRequesterId = record.requesterId
             let validPreferredPlayTimeId = record.preferredPlayTimeId
@@ -498,25 +397,9 @@ export default defineEventHandler(async (event) => {
               }
             }
 
-            let validCardCodeId = record.cardCodeId || null
-            if (record.cardCodeId) {
-              const mappedCardCodeId = cardCodeIdMapping.get(record.cardCodeId)
-              if (mappedCardCodeId) {
-                validCardCodeId = mappedCardCodeId
-              } else {
-                const cardCodeExists = await tx.query.cardCodes.findFirst({
-                  where: eq(cardCodes.id, record.cardCodeId)
-                })
-                if (!cardCodeExists) {
-                  validCardCodeId = null
-                }
-              }
-            }
-
             const songData: any = {
               requesterId: validRequesterId,
               preferredPlayTimeId: validPreferredPlayTimeId,
-              cardCodeId: validCardCodeId,
               played: record.hasOwnProperty('played') ? record.played : false
             }
 
@@ -527,10 +410,8 @@ export default defineEventHandler(async (event) => {
               'cover',
               'musicPlatform',
               'musicId',
-              'durationSeconds',
               'submissionNote',
-              'submissionNotePublic',
-              'submissionNotePublicStatus'
+              'submissionNotePublic'
             ]
             songFields.forEach((field) => {
               if (record.hasOwnProperty(field)) {
@@ -700,52 +581,10 @@ export default defineEventHandler(async (event) => {
             break
           }
 
-          case 'gradeClass': {
-            const gradeClassData: any = {}
-            const gradeClassFields = ['grade', 'class']
-            gradeClassFields.forEach((field) => {
-              if (record.hasOwnProperty(field)) {
-                gradeClassData[field] =
-                  typeof record[field] === 'string' ? record[field].trim() : record[field]
-              }
-            })
-            // 空行直接跳过，避免空值配置行锁死配置优先校验
-            if (!gradeClassData.grade || !gradeClassData.class) {
-              stats.warnings.push(`gradeClass 记录 ${record.id ?? ''} 年级或班级为空，已跳过`)
-              break
-            }
-
-            if (mode === 'merge') {
-              const existingGradeClass = await tx.query.gradeClass.findFirst({
-                where: and(
-                  eq(gradeClass.grade, gradeClassData.grade),
-                  eq(gradeClass.class, gradeClassData.class)
-                )
-              })
-              if (!existingGradeClass) {
-                await tx.insert(gradeClass).values(gradeClassData)
-                stats.created++
-              }
-            } else {
-              const existing = await tx.query.gradeClass.findFirst({
-                where: eq(gradeClass.id, record.id)
-              })
-              if (!existing) {
-                await tx.insert(gradeClass).values({ ...gradeClassData, id: record.id })
-                stats.created++
-              }
-            }
-            break
-          }
-
           case 'systemSettings': {
-            let systemSettingsData: any = {}
+            const systemSettingsData: any = {}
             const fields = [
               'enablePlayTimeSelection',
-              'instanceId',
-              'defaultTheme',
-              'enabledThemes',
-              'telemetryEnabled',
               'siteTitle',
               'siteLogoUrl',
               'schoolLogoHomeUrl',
@@ -758,25 +597,14 @@ export default defineEventHandler(async (event) => {
               'dailySubmissionLimit',
               'weeklySubmissionLimit',
               'monthlySubmissionLimit',
-              'scheduleDaysBeforeEnabled',
-              'scheduleDaysBefore',
-              'scheduleDaysAfterEnabled',
-              'scheduleDaysAfter',
               'showBlacklistKeywords',
               'hideStudentInfo',
               'enableReplayRequests',
               'enableCollaborativeSubmission',
               'enableSubmissionRemarks',
-              'enableCardCodeRequests',
-              'requireCardCodeForRequests',
-              'enableCardCodeLimitBypass',
-              'enableSubmissionRestriction',
-              'submissionRestrictionScope',
-              'sameSongRestrictionHours',
-              'sameArtistRestrictionHours',
               'enableRequestTimeLimitation',
+              'requestTimeLimitation',
               'forceBlockAllRequests',
-              'forcePasswordChangeOnFirstLogin',
               'smtpEnabled',
               'smtpHost',
               'smtpPort',
@@ -784,79 +612,11 @@ export default defineEventHandler(async (event) => {
               'smtpUsername',
               'smtpPassword',
               'smtpFromEmail',
-              'smtpFromName',
-              'allowOAuthRegistration',
-              'allowRegister',
-              'registerRequiresApproval',
-                'registerEmailRequired',
-              'registerRequiresGradeClass',
-              'oauthRegisterRequiresApproval',
-              'submissionNoteRequiresApproval',
-              'oauthRedirectUri',
-              'oauthStateSecret',
-              'oauthProviders',
-              'githubOAuthEnabled',
-              'githubClientId',
-              'githubClientSecret',
-              'casdoorOAuthEnabled',
-              'casdoorServerUrl',
-              'casdoorClientId',
-              'casdoorClientSecret',
-              'casdoorOrganizationName',
-              'googleOAuthEnabled',
-              'googleClientId',
-              'googleClientSecret',
-              'aggregateOAuthEnabled',
-              'aggregateOAuthAppId',
-              'aggregateOAuthAppKey',
-              'aggregateOAuthLoginType',
-              'aggregateOAuthEndpoint',
-              'customOAuthEnabled',
-              'customOAuthDisplayName',
-              'customOAuthAuthorizeUrl',
-              'customOAuthTokenUrl',
-              'customOAuthUserInfoUrl',
-              'customOAuthScope',
-              'customOAuthClientId',
-              'customOAuthClientSecret',
-              'customOAuthUserIdField',
-              'customOAuthUsernameField',
-              'customOAuthNameField',
-              'customOAuthEmailField',
-              'customOAuthAvatarField',
-              'captchaEnabled',
-              'captchaMaxFailures',
-              'captchaProvider',
-              'turnstileSiteKey',
-              'turnstileSecretKey',
-              'autoBackupEnabled',
-              'autoBackupConfig',
-              'statisticsCodeEnabled',
-              'statisticsCode',
-              'enabledPlatforms',
-              'platformOrder'
+              'smtpFromName'
             ]
             fields.forEach((field) => {
               if (record.hasOwnProperty(field)) systemSettingsData[field] = record[field]
             })
-            if (Object.prototype.hasOwnProperty.call(systemSettingsData, 'defaultTheme') || Object.prototype.hasOwnProperty.call(systemSettingsData, 'enabledThemes')) {
-              if (!Object.prototype.hasOwnProperty.call(systemSettingsData, 'defaultTheme') || !Object.prototype.hasOwnProperty.call(systemSettingsData, 'enabledThemes')) {
-                throw createApiError(400, SERVER_ERROR_CODES.THEME_INVALID_LIST, '主题配置必须同时包含默认主题和启用主题列表')
-              }
-              systemSettingsData.enabledThemes = JSON.stringify(validateThemeConfig(systemSettingsData.defaultTheme, systemSettingsData.enabledThemes))
-            }
-            for (const field of ['scheduleDaysBeforeEnabled', 'scheduleDaysAfterEnabled']) {
-              if (Object.prototype.hasOwnProperty.call(systemSettingsData, field) && systemSettingsData[field] !== null && typeof systemSettingsData[field] !== 'boolean') {
-                throw createApiError(400, SERVER_ERROR_CODES.COMMON_INVALID_PARAMS, `${field} 必须是布尔值`)
-              }
-            }
-            for (const field of ['scheduleDaysBefore', 'scheduleDaysAfter']) {
-              if (Object.prototype.hasOwnProperty.call(systemSettingsData, field) && (systemSettingsData[field] !== null && (!Number.isInteger(systemSettingsData[field]) || systemSettingsData[field] < 1 || systemSettingsData[field] > 730))) {
-                throw createApiError(400, SERVER_ERROR_CODES.COMMON_INVALID_PARAMS, `${field} 必须是 1-730 的正整数`)
-              }
-            }
-            systemSettingsData = normalizeScheduleVisibilitySettings(systemSettingsData)
-            systemSettingsData = omitMaskedSystemSettingsSecrets(systemSettingsData)
 
             if (mode === 'merge') {
               const existing = await tx.query.systemSettings.findFirst()
@@ -888,49 +648,6 @@ export default defineEventHandler(async (event) => {
             break
           }
 
-          case 'emailTemplates': {
-            // 邮件模板（按 key 去重：merge 模式同名 key 覆盖）
-            if (!record.key || !record.name || !record.subject) return
-            const templateData: any = {
-              key: record.key,
-              name: record.name,
-              subject: record.subject,
-              html: record.html || ''
-            }
-            if (record.contentType) templateData.contentType = record.contentType
-            if (record.headerSubtitle) templateData.headerSubtitle = record.headerSubtitle
-            if (record.actionText) templateData.actionText = record.actionText
-            if (record.actionUrl) templateData.actionUrl = record.actionUrl
-            if (record.updatedByUserId) templateData.updatedByUserId = record.updatedByUserId
-            if (record.createdAt) templateData.createdAt = new Date(record.createdAt)
-            if (record.updatedAt) templateData.updatedAt = new Date(record.updatedAt)
-
-            if (mode === 'merge') {
-              const existing = await tx.query.emailTemplates.findFirst({
-                where: eq(emailTemplates.key, record.key)
-              })
-              if (existing) {
-                await tx.update(emailTemplates).set(templateData).where(eq(emailTemplates.id, existing.id))
-                stats.updated++
-              } else {
-                await tx.insert(emailTemplates).values(templateData)
-                stats.created++
-              }
-            } else {
-              const existing = await tx.query.emailTemplates.findFirst({
-                where: eq(emailTemplates.id, record.id)
-              })
-              if (existing) {
-                await tx.update(emailTemplates).set(templateData).where(eq(emailTemplates.id, record.id))
-                stats.updated++
-              } else {
-                await tx.insert(emailTemplates).values({ ...templateData, id: record.id })
-                stats.created++
-              }
-            }
-            break
-          }
-
           case 'schedules': {
             if (!record.songId || !record.playDate) return
 
@@ -1085,43 +802,11 @@ export default defineEventHandler(async (event) => {
             }
 
             const notificationData: any = { userId: validUserId }
-            const fields = [
-              'batchId',
-              'source',
-              'senderName',
-              'senderUsername',
-              'title',
-              'message',
-              'type',
-              'userDeleted'
-            ]
+            const fields = ['title', 'message', 'type']
             fields.forEach((field) => {
               if (record.hasOwnProperty(field)) notificationData[field] = record[field]
             })
-            // senderId 需要重新映射到目标库的用户 ID；映射未命中时回查同 ID 用户并比对用户名快照，
-            // 不一致则置空，避免跨库恢复时将发送人归属到错误用户，展示仍靠快照字段
-            if (Object.prototype.hasOwnProperty.call(record, 'senderId')) {
-              if (record.senderId) {
-                const mappedSenderId = userIdMapping.get(record.senderId)
-                if (mappedSenderId) {
-                  notificationData.senderId = mappedSenderId
-                } else {
-                  const senderExists = await tx.query.users.findFirst({
-                    where: eq(users.id, record.senderId)
-                  })
-                  notificationData.senderId =
-                    senderExists && senderExists.username === record.senderUsername
-                      ? record.senderId
-                      : null
-                }
-              } else {
-                notificationData.senderId = null
-              }
-            }
             notificationData.read = record.hasOwnProperty('read') ? record.read : false
-            notificationData.important = Object.prototype.hasOwnProperty.call(record, 'important')
-              ? record.important
-              : false
             notificationData.createdAt = record.createdAt ? new Date(record.createdAt) : new Date()
             notificationData.updatedAt = record.updatedAt ? new Date(record.updatedAt) : new Date()
 
@@ -1219,79 +904,6 @@ export default defineEventHandler(async (event) => {
             break
           }
 
-          case 'cardCodeRedeemLogs': {
-            let validCardCodeId = record.cardCodeId || null
-            if (record.cardCodeId) {
-              const mappedCardCodeId = cardCodeIdMapping.get(record.cardCodeId)
-              if (mappedCardCodeId) {
-                validCardCodeId = mappedCardCodeId
-              } else {
-                const cardCodeExists = await tx.query.cardCodes.findFirst({
-                  where: eq(cardCodes.id, record.cardCodeId)
-                })
-                if (!cardCodeExists) validCardCodeId = null
-              }
-            }
-
-            let validRedeemedBy = record.redeemedBy
-            if (record.redeemedBy) {
-              const mappedUserId = userIdMapping.get(record.redeemedBy)
-              if (mappedUserId) {
-                validRedeemedBy = mappedUserId
-              } else {
-                const userExists = await tx.query.users.findFirst({
-                  where: eq(users.id, record.redeemedBy)
-                })
-                if (!userExists) return
-              }
-            } else return
-
-            let validSongId = record.songId || null
-            if (record.songId) {
-              const mappedSongId = songIdMapping.get(record.songId)
-              if (mappedSongId) {
-                validSongId = mappedSongId
-              } else {
-                const songExists = await tx.query.songs.findFirst({
-                  where: eq(songs.id, record.songId)
-                })
-                if (!songExists) validSongId = null
-              }
-            }
-
-            const logData: any = {
-              cardCodeId: validCardCodeId,
-              codeSnapshot: record.codeSnapshot,
-              redeemedBy: validRedeemedBy,
-              redeemedAt: record.redeemedAt ? new Date(record.redeemedAt) : new Date(),
-              source: record.source || 'UNKNOWN',
-              songId: validSongId,
-              createdAt: record.createdAt ? new Date(record.createdAt) : new Date()
-            }
-
-            if (!logData.codeSnapshot) return
-
-            if (mode === 'merge') {
-              await tx.insert(cardCodeRedeemLogs).values(logData)
-              stats.created++
-            } else {
-              const existing = await tx.query.cardCodeRedeemLogs.findFirst({
-                where: eq(cardCodeRedeemLogs.id, record.id)
-              })
-              if (existing) {
-                await tx
-                  .update(cardCodeRedeemLogs)
-                  .set(logData)
-                  .where(eq(cardCodeRedeemLogs.id, record.id))
-                stats.updated++
-              } else {
-                await tx.insert(cardCodeRedeemLogs).values({ ...logData, id: record.id })
-                stats.created++
-              }
-            }
-            break
-          }
-
           case 'votes': {
             let validUserId = record.userId
             if (record.userId) {
@@ -1337,11 +949,6 @@ export default defineEventHandler(async (event) => {
             }
             break
           }
-
-          case 'scheduleSongPool': {
-            await restoreScheduleSongPoolRecord(tx, record, songIdMapping, userIdMapping, stats, () => { stats.created++ })
-            break
-          }
         }
       })
       stats.processed++
@@ -1352,35 +959,6 @@ export default defineEventHandler(async (event) => {
     }
   }
 
-  // 防锁死：恢复系统设置块后校验 SMTP 已配置，否则剥离 registerEmailRequired
-  // （避免恢复后注册必填邮箱却无法发码）
-  if (tableName === 'systemSettings') {
-    try {
-      const restoredSettings = await db.select().from(systemSettings).limit(1)
-      if (
-        restoredSettings[0]?.registerEmailRequired &&
-        (!restoredSettings[0]?.smtpEnabled || !restoredSettings[0]?.smtpHost)
-      ) {
-        await db
-          .update(systemSettings)
-          .set({ registerEmailRequired: false })
-          .where(eq(systemSettings.id, restoredSettings[0].id))
-        stats.warnings.push('SMTP 未配置，已剥离 registerEmailRequired，避免注册邮箱流程不可用')
-      }
-    } catch (settingsError) {
-      console.error('恢复后设置一致性校验失败:', settingsError)
-    }
-  }
-
-  // 恢复可能携带显式 id，完成后同步所有自增序列，避免后续插入主键冲突
-  try {
-    await syncAllSequences()
-  } catch (seqError) {
-    const seqErrorMsg = seqError instanceof Error ? seqError.message : '未知错误'
-    stats.warnings.push(`自增序列同步失败: ${seqErrorMsg}`)
-    console.error('自增序列同步失败:', seqError)
-  }
-
   return {
     success: true,
     newMappings,
diff --git a/server/api/admin/backup/restore.post.ts b/server/api/admin/backup/restore.post.ts
index 86b178c..c430dfc 100644
--- a/server/api/admin/backup/restore.post.ts
+++ b/server/api/admin/backup/restore.post.ts
@@ -4,17 +4,13 @@ import {
   apiKeyPermissions,
   apiKeys,
   apiLogs,
-  cardCodeRedeemLogs,
-  cardCodes,
   collaborationLogs,
   emailTemplates,
-  gradeClass,
   notificationSettings,
   notifications,
   playTimes,
   requestTimes,
   schedules,
-  scheduleSongPool,
   semesters,
   songBlacklists,
   songCollaborators,
@@ -28,23 +24,18 @@ import {
 } from '~/drizzle/schema'
 import { promises as fs } from 'fs'
 import path from 'path'
+import { CacheService } from '../../../services/cacheService'
 import { SmtpService } from '../../../services/smtpService'
 import { and, eq, inArray, isNull, notInArray, or } from 'drizzle-orm'
-import { restoreScheduleSongPoolRecord } from '~~/server/utils/restoreScheduleSongPool'
-import { omitMaskedSystemSettingsSecrets } from '~~/server/api/admin/system-settings/secretMask'
-import { validateThemeConfig } from '~~/server/utils/theme-config'
-import { createApiError } from '~~/server/utils/apiError'
-import { SERVER_ERROR_CODES } from '~~/server/config/constants'
-import { normalizeScheduleVisibilitySettings } from '~~/server/utils/system-settings-defaults'
 
 export default defineEventHandler(async (event) => {
   try {
     // 验证管理员权限
     const user = event.context.user
-    if (!user || user.role !== 'SUPER_ADMIN') {
+    if (!user || !['ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
       throw createError({
         statusCode: 403,
-        message: '只有超级管理员可以恢复备份'
+        statusMessage: '权限不足'
       })
     }
 
@@ -63,7 +54,7 @@ export default defineEventHandler(async (event) => {
       if (!formData) {
         throw createError({
           statusCode: 400,
-          message: '请上传备份文件'
+          statusMessage: '请上传备份文件'
         })
       }
 
@@ -83,7 +74,7 @@ export default defineEventHandler(async (event) => {
       if (!fileData) {
         throw createError({
           statusCode: 400,
-          message: '请上传备份文件'
+          statusMessage: '请上传备份文件'
         })
       }
 
@@ -92,7 +83,7 @@ export default defineEventHandler(async (event) => {
       } catch (error) {
         throw createError({
           statusCode: 400,
-          message: '备份文件格式错误'
+          statusMessage: '备份文件格式错误'
         })
       }
 
@@ -110,7 +101,7 @@ export default defineEventHandler(async (event) => {
       if (!filename) {
         throw createError({
           statusCode: 400,
-          message: '请指定备份文件名或上传备份文件'
+          statusMessage: '请指定备份文件名或上传备份文件'
         })
       }
 
@@ -118,7 +109,7 @@ export default defineEventHandler(async (event) => {
       if (safeFilename !== filename) {
         throw createError({
           statusCode: 400,
-          message: '备份文件名不合法'
+          statusMessage: '备份文件名不合法'
         })
       }
 
@@ -126,7 +117,7 @@ export default defineEventHandler(async (event) => {
       clearExisting = bodyClearExisting
       overwriteSuperAdmin = bodyOverwriteSuperAdmin
 
-      console.log(`开始恢复数据库备份：${safeFilename}`)
+      console.log(`开始恢复数据库备份: ${safeFilename}`)
 
       // 读取备份文件
       const backupDir = path.join(process.cwd(), 'backups')
@@ -138,7 +129,7 @@ export default defineEventHandler(async (event) => {
       } catch (error) {
         throw createError({
           statusCode: 404,
-          message: '备份文件不存在或格式错误'
+          statusMessage: '备份文件不存在或格式错误'
         })
       }
     }
@@ -147,12 +138,12 @@ export default defineEventHandler(async (event) => {
     if (!backupData.metadata || !backupData.data) {
       throw createError({
         statusCode: 400,
-        message: '备份文件格式无效'
+        statusMessage: '备份文件格式无效'
       })
     }
 
     console.log(`备份文件信息:`)
-    console.log(`- 版本：${backupData.metadata.version}`)
+    console.log(`- 版本: ${backupData.metadata.version}`)
     console.log(`- 创建时间: ${backupData.metadata.timestamp}`)
     console.log(`- 创建者: ${backupData.metadata.creator}`)
     console.log(`- 总记录数: ${backupData.metadata.totalRecords}`)
@@ -162,7 +153,7 @@ export default defineEventHandler(async (event) => {
     if (overwriteSuperAdmin && user.role !== 'SUPER_ADMIN') {
       throw createError({
         statusCode: 403,
-        message: '仅超级管理员可以覆盖超级管理员账号数据'
+        statusMessage: '仅超级管理员可以覆盖超级管理员账号数据'
       })
     }
     const shouldOverwriteSuperAdmin =
@@ -190,15 +181,12 @@ export default defineEventHandler(async (event) => {
           await db.delete(apiKeys)
           await db.delete(notifications)
           await db.delete(notificationSettings)
-          await db.delete(cardCodeRedeemLogs)
           await db.delete(collaborationLogs)
           await db.delete(songCollaborators)
           await db.delete(songReplayRequests)
-          await db.delete(scheduleSongPool)
           await db.delete(schedules)
           await db.delete(votes)
           await db.delete(songs)
-          await db.delete(cardCodes)
           await db.delete(songBlacklists)
           await db.delete(userStatusLogs)
           await db.delete(emailTemplates)
@@ -239,23 +227,15 @@ export default defineEventHandler(async (event) => {
           }
 
           if (preservedUserIdList.length > 0) {
-            await db.delete(cardCodeRedeemLogs)
             await db.delete(apiKeys).where(notInArray(apiKeys.createdByUserId, preservedUserIdList))
-            await db
-              .delete(notifications)
-              .where(notInArray(notifications.userId, preservedUserIdList))
+            await db.delete(notifications).where(notInArray(notifications.userId, preservedUserIdList))
             await db
               .delete(notificationSettings)
               .where(notInArray(notificationSettings.userId, preservedUserIdList))
-            await db
-              .delete(userStatusLogs)
-              .where(notInArray(userStatusLogs.userId, preservedUserIdList))
-            await db
-              .delete(userIdentities)
-              .where(notInArray(userIdentities.userId, preservedUserIdList))
+            await db.delete(userStatusLogs).where(notInArray(userStatusLogs.userId, preservedUserIdList))
+            await db.delete(userIdentities).where(notInArray(userIdentities.userId, preservedUserIdList))
             await db.delete(users).where(notInArray(users.id, preservedUserIdList))
           } else {
-            await db.delete(cardCodeRedeemLogs)
             await db.delete(apiKeys)
             await db.delete(notifications)
             await db.delete(notificationSettings)
@@ -267,11 +247,9 @@ export default defineEventHandler(async (event) => {
           await db.delete(collaborationLogs)
           await db.delete(songCollaborators)
           await db.delete(songReplayRequests)
-          await db.delete(scheduleSongPool)
           await db.delete(schedules)
           await db.delete(votes)
           await db.delete(songs)
-          await db.delete(cardCodes)
           await db.delete(songBlacklists)
           await db.delete(emailTemplates)
           await db.delete(playTimes)
@@ -289,7 +267,6 @@ export default defineEventHandler(async (event) => {
     // 建立ID映射表
     const userIdMapping = new Map() // 备份ID -> 当前数据库ID
     const songIdMapping = new Map() // 备份ID -> 当前数据库ID
-    const cardCodeIdMapping = new Map() // 备份ID -> 当前数据库ID
 
     // 定义恢复顺序（考虑外键依赖）
     const restoreOrder = [
@@ -297,21 +274,17 @@ export default defineEventHandler(async (event) => {
       'playTimes',
       'semesters',
       'requestTimes',
-      'gradeClass',
       'users',
       'userIdentities',
       'emailTemplates',
       'userStatusLogs',
       'songBlacklist',
-      'cardCodes',
       'songs',
       'songCollaborators',
       'collaborationLogs',
       'songReplayRequests',
       'votes',
       'schedules',
-      'scheduleSongPool',
-      'cardCodeRedeemLogs',
       'notificationSettings',
       'notifications',
       'apiKeys',
@@ -349,10 +322,6 @@ export default defineEventHandler(async (event) => {
               try {
                 await db.$transaction(
                   async (tx) => {
-                    const stats = {
-                      created: 0,
-                      warnings: restoreResults.details.warnings
-                    }
                     // 根据表名选择恢复策略
                     switch (tableName) {
                       case 'users':
@@ -371,10 +340,7 @@ export default defineEventHandler(async (event) => {
                             'forcePasswordChange',
                             'meowNickname',
                             'status',
-                            'statusChangedBy',
-                            'remark',
-                            'avatarProvider',
-                            'avatarProviderUserId'
+                            'statusChangedBy'
                           ]
 
                           // 处理日期字段
@@ -393,7 +359,7 @@ export default defineEventHandler(async (event) => {
                               // 确保角色为有效的硬编码角色
                               if (field === 'role') {
                                 if (
-                                  !['USER', 'SONG_ADMIN', 'ADMIN', 'SUPER_ADMIN'].includes(
+                                  !['USER', 'TEACHER', 'SONG_ADMIN', 'ADMIN', 'SUPER_ADMIN'].includes(
                                     record[field]
                                   )
                                 ) {
@@ -483,8 +449,7 @@ export default defineEventHandler(async (event) => {
                           }
                         } else {
                           const isBackupSuperAdminRecord =
-                            record.role === 'SUPER_ADMIN' ||
-                            preservedSuperAdminIds.has(Number(record.id))
+                            record.role === 'SUPER_ADMIN' || preservedSuperAdminIds.has(Number(record.id))
                           if (!shouldOverwriteSuperAdmin && isBackupSuperAdminRecord) {
                             if (record.id) {
                               const existingProtectedUser = await tx
@@ -494,12 +459,12 @@ export default defineEventHandler(async (event) => {
                                 .limit(1)
                               if (existingProtectedUser.length > 0) {
                                 userIdMapping.set(record.id, existingProtectedUser[0].id)
-                                restoreResults.details.warnings.push(
-                                  `已保留超级管理员账户 ${record.username || `#${record.id}`}`
-                                )
-                                break
                               }
                             }
+                            restoreResults.details.warnings.push(
+                              `已保留超级管理员账户 ${record.username || `#${record.id}`}`
+                            )
+                            break
                           }
 
                           // 完全恢复模式，检查ID是否已存在
@@ -600,7 +565,6 @@ export default defineEventHandler(async (event) => {
                           provider: record.provider,
                           providerUserId: record.providerUserId,
                           providerUsername: record.providerUsername,
-                          avatar: record.avatar || null,
                           createdAt: record.createdAt ? new Date(record.createdAt) : new Date()
                         }
 
@@ -671,11 +635,9 @@ export default defineEventHandler(async (event) => {
                           return // 跳过此记录，因为userId是必需的
                         }
 
-                        // 构建用户状态日志数据（含快照列，删除用户后审计可追溯）
+                        // 构建用户状态日志数据
                         const userStatusLogData = {
                           userId: validUserStatusLogUserId,
-                          username: record.username ?? null,
-                          name: record.name ?? null,
                           oldStatus: record.oldStatus || record.previousStatus || null,
                           newStatus: record.newStatus,
                           reason: record.reason || null,
@@ -716,98 +678,6 @@ export default defineEventHandler(async (event) => {
                         }
                         break
 
-                      case 'cardCodes': {
-                        const cardCodeData: any = {}
-                        const cardCodeFields = ['code', 'status', 'note']
-                        cardCodeFields.forEach((field) => {
-                          if (record.hasOwnProperty(field)) {
-                            cardCodeData[field] = record[field]
-                          }
-                        })
-
-                        if (!cardCodeData.code) {
-                          console.warn('点歌券缺少 code，跳过此记录')
-                          return
-                        }
-
-                        const mapUserId = async (field: 'lockedBy' | 'redeemedBy') => {
-                          if (!record[field]) return null
-                          const mappedUserId = userIdMapping.get(record[field])
-                          if (mappedUserId) return mappedUserId
-                          if (mode === 'merge') return null
-                          const userExists = await tx
-                            .select({ id: users.id })
-                            .from(users)
-                            .where(eq(users.id, record[field]))
-                            .limit(1)
-                          return userExists.length > 0 ? record[field] : null
-                        }
-
-                        cardCodeData.lockedBy = await mapUserId('lockedBy')
-                        cardCodeData.redeemedBy = await mapUserId('redeemedBy')
-                        cardCodeData.lockedAt = record.lockedAt ? new Date(record.lockedAt) : null
-                        cardCodeData.redeemedAt = record.redeemedAt
-                          ? new Date(record.redeemedAt)
-                          : null
-                        cardCodeData.createdAt = record.createdAt
-                          ? new Date(record.createdAt)
-                          : new Date()
-                        cardCodeData.updatedAt = record.updatedAt
-                          ? new Date(record.updatedAt)
-                          : new Date()
-
-                        let restoredCardCode
-                        if (mode === 'merge') {
-                          const existingCardCode = await tx
-                            .select()
-                            .from(cardCodes)
-                            .where(eq(cardCodes.code, cardCodeData.code))
-                            .limit(1)
-
-                          if (existingCardCode.length > 0) {
-                            restoredCardCode = (
-                              await tx
-                                .update(cardCodes)
-                                .set(cardCodeData)
-                                .where(eq(cardCodes.id, existingCardCode[0].id))
-                                .returning()
-                            )[0]
-                          } else {
-                            restoredCardCode = (
-                              await tx.insert(cardCodes).values(cardCodeData).returning()
-                            )[0]
-                          }
-                        } else {
-                          const existingCardCodeWithId = await tx
-                            .select()
-                            .from(cardCodes)
-                            .where(eq(cardCodes.id, record.id))
-                            .limit(1)
-
-                          if (existingCardCodeWithId.length > 0) {
-                            restoredCardCode = (
-                              await tx
-                                .update(cardCodes)
-                                .set(cardCodeData)
-                                .where(eq(cardCodes.id, record.id))
-                                .returning()
-                            )[0]
-                          } else {
-                            restoredCardCode = (
-                              await tx
-                                .insert(cardCodes)
-                                .values({ ...cardCodeData, id: record.id })
-                                .returning()
-                            )[0]
-                          }
-                        }
-
-                        if (record.id && restoredCardCode?.id) {
-                          cardCodeIdMapping.set(record.id, restoredCardCode.id)
-                        }
-                        break
-                      }
-
                       case 'songs':
                         // 验证外键约束
                         let validRequesterId = record.requesterId
@@ -852,31 +722,10 @@ export default defineEventHandler(async (event) => {
                           }
                         }
 
-                        let validCardCodeId = record.cardCodeId || null
-                        if (record.cardCodeId) {
-                          const mappedCardCodeId = cardCodeIdMapping.get(record.cardCodeId)
-                          if (mappedCardCodeId) {
-                            validCardCodeId = mappedCardCodeId
-                          } else {
-                            const cardCodeExists = await tx
-                              .select({ id: cardCodes.id })
-                              .from(cardCodes)
-                              .where(eq(cardCodes.id, record.cardCodeId))
-                              .limit(1)
-                            if (cardCodeExists.length === 0) {
-                              console.warn(
-                                `歌曲 ${record.title} 的点歌券ID ${record.cardCodeId} 不存在，将设为null`
-                              )
-                              validCardCodeId = null
-                            }
-                          }
-                        }
-
                         // 动态构建歌曲数据，自动跳过不存在的字段
                         const songData = {
                           requesterId: validRequesterId, // 必需字段
-                          preferredPlayTimeId: validPreferredPlayTimeId, // 已验证的字段
-                          cardCodeId: validCardCodeId
+                          preferredPlayTimeId: validPreferredPlayTimeId // 已验证的字段
                         }
 
                         // 基本字段
@@ -887,10 +736,8 @@ export default defineEventHandler(async (event) => {
                           'cover',
                           'musicPlatform',
                           'musicId',
-                          'durationSeconds',
                           'submissionNote',
-                          'submissionNotePublic',
-                          'submissionNotePublicStatus'
+                          'submissionNotePublic'
                         ]
                         songFields.forEach((field) => {
                           if (record.hasOwnProperty(field)) {
@@ -1134,58 +981,11 @@ export default defineEventHandler(async (event) => {
                         }
                         break
 
-                      case 'gradeClass':
-                        // 年级班级配置（唯一约束 grade+class）
-                        const gradeClassData = {
-                          grade: typeof record.grade === 'string' ? record.grade.trim() : '',
-                          class: typeof record.class === 'string' ? record.class.trim() : ''
-                        }
-                        // 空行直接跳过，避免空值配置行锁死配置优先校验
-                        if (!gradeClassData.grade || !gradeClassData.class) {
-                          stats.warnings.push(`gradeClass 记录 ${record.id ?? ''} 年级或班级为空，已跳过`)
-                          break
-                        }
-
-                        if (mode === 'merge') {
-                          const existingGradeClass = await tx
-                            .select()
-                            .from(gradeClass)
-                            .where(
-                              and(
-                                eq(gradeClass.grade, gradeClassData.grade),
-                                eq(gradeClass.class, gradeClassData.class)
-                              )
-                            )
-                            .limit(1)
-                          if (existingGradeClass.length === 0) {
-                            await tx.insert(gradeClass).values(gradeClassData)
-                          }
-                        } else {
-                          // 完全恢复模式，检查ID是否已存在
-                          const existingGradeClassWithId = await tx
-                            .select()
-                            .from(gradeClass)
-                            .where(eq(gradeClass.id, record.id))
-                            .limit(1)
-
-                          if (existingGradeClassWithId.length === 0) {
-                            await tx.insert(gradeClass).values({
-                              ...gradeClassData,
-                              id: record.id
-                            })
-                          }
-                        }
-                        break
-
                       case 'systemSettings':
                         // 动态构建系统设置数据，自动跳过不存在的字段
-                        let systemSettingsData = {}
+                        const systemSettingsData = {}
                         const systemSettingsFields = [
                           'enablePlayTimeSelection',
-                          'instanceId',
-                          'defaultTheme',
-                          'enabledThemes',
-                          'telemetryEnabled',
                           'siteTitle',
                           'siteLogoUrl',
                           'schoolLogoHomeUrl',
@@ -1198,24 +998,13 @@ export default defineEventHandler(async (event) => {
                           'dailySubmissionLimit',
                           'weeklySubmissionLimit',
                           'monthlySubmissionLimit',
-                          'scheduleDaysBeforeEnabled',
-                          'scheduleDaysBefore',
-                          'scheduleDaysAfterEnabled',
-                          'scheduleDaysAfter',
                           'showBlacklistKeywords',
                           'enableRequestTimeLimitation',
+                          'requestTimeLimitation',
                           'forceBlockAllRequests',
-                          'forcePasswordChangeOnFirstLogin',
                           'enableReplayRequests',
                           'enableCollaborativeSubmission',
                           'enableSubmissionRemarks',
-                          'enableCardCodeRequests',
-                          'requireCardCodeForRequests',
-                          'enableCardCodeLimitBypass',
-                          'enableSubmissionRestriction',
-                          'submissionRestrictionScope',
-                          'sameSongRestrictionHours',
-                          'sameArtistRestrictionHours',
                           'hideStudentInfo',
                           'smtpEnabled',
                           'smtpHost',
@@ -1224,57 +1013,7 @@ export default defineEventHandler(async (event) => {
                           'smtpUsername',
                           'smtpPassword',
                           'smtpFromEmail',
-                          'smtpFromName',
-                          'allowOAuthRegistration',
-                          'allowRegister',
-                          'registerRequiresApproval',
-                          'registerEmailRequired',
-                          'registerRequiresGradeClass',
-                          'oauthRegisterRequiresApproval',
-                          'submissionNoteRequiresApproval',
-                          'oauthRedirectUri',
-                          'oauthStateSecret',
-                          'oauthProviders',
-                          'githubOAuthEnabled',
-                          'githubClientId',
-                          'githubClientSecret',
-                          'casdoorOAuthEnabled',
-                          'casdoorServerUrl',
-                          'casdoorClientId',
-                          'casdoorClientSecret',
-                          'casdoorOrganizationName',
-                          'googleOAuthEnabled',
-                          'googleClientId',
-                          'googleClientSecret',
-                          'aggregateOAuthEnabled',
-                          'aggregateOAuthAppId',
-                          'aggregateOAuthAppKey',
-                          'aggregateOAuthLoginType',
-                          'aggregateOAuthEndpoint',
-                          'customOAuthEnabled',
-                          'customOAuthDisplayName',
-                          'customOAuthAuthorizeUrl',
-                          'customOAuthTokenUrl',
-                          'customOAuthUserInfoUrl',
-                          'customOAuthScope',
-                          'customOAuthClientId',
-                          'customOAuthClientSecret',
-                          'customOAuthUserIdField',
-                          'customOAuthUsernameField',
-                          'customOAuthNameField',
-                          'customOAuthEmailField',
-                          'customOAuthAvatarField',
-                          'captchaEnabled',
-                          'captchaMaxFailures',
-                          'captchaProvider',
-                          'turnstileSiteKey',
-                          'turnstileSecretKey',
-                          'autoBackupEnabled',
-                          'autoBackupConfig',
-                          'statisticsCodeEnabled',
-                          'statisticsCode',
-                          'enabledPlatforms',
-                          'platformOrder'
+                          'smtpFromName'
                         ]
 
                         // 只添加备份数据中存在的字段
@@ -1283,24 +1022,6 @@ export default defineEventHandler(async (event) => {
                             systemSettingsData[field] = record[field]
                           }
                         })
-                        if (Object.prototype.hasOwnProperty.call(systemSettingsData, 'defaultTheme') || Object.prototype.hasOwnProperty.call(systemSettingsData, 'enabledThemes')) {
-                          if (!Object.prototype.hasOwnProperty.call(systemSettingsData, 'defaultTheme') || !Object.prototype.hasOwnProperty.call(systemSettingsData, 'enabledThemes')) {
-                            throw createApiError(400, SERVER_ERROR_CODES.THEME_INVALID_LIST, '主题配置必须同时包含默认主题和启用主题列表')
-                          }
-                          systemSettingsData.enabledThemes = JSON.stringify(validateThemeConfig(systemSettingsData.defaultTheme, systemSettingsData.enabledThemes))
-                        }
-                        for (const field of ['scheduleDaysBeforeEnabled', 'scheduleDaysAfterEnabled']) {
-                          if (Object.prototype.hasOwnProperty.call(systemSettingsData, field) && systemSettingsData[field] !== null && typeof systemSettingsData[field] !== 'boolean') {
-                            throw createApiError(400, SERVER_ERROR_CODES.COMMON_INVALID_PARAMS, `${field} 必须是布尔值`)
-                          }
-                        }
-                        for (const field of ['scheduleDaysBefore', 'scheduleDaysAfter']) {
-                          if (Object.prototype.hasOwnProperty.call(systemSettingsData, field) && (systemSettingsData[field] !== null && (!Number.isInteger(systemSettingsData[field]) || systemSettingsData[field] < 1 || systemSettingsData[field] > 730))) {
-                            throw createApiError(400, SERVER_ERROR_CODES.COMMON_INVALID_PARAMS, `${field} 必须是 1-730 的正整数`)
-                          }
-                        }
-                        systemSettingsData = normalizeScheduleVisibilitySettings(systemSettingsData)
-                        systemSettingsData = omitMaskedSystemSettingsSecrets(systemSettingsData)
 
                         if (mode === 'merge') {
                           // 检查是否存在系统设置记录（通常只有一条记录）
@@ -1407,26 +1128,6 @@ export default defineEventHandler(async (event) => {
                           ? record.sequence
                           : 1
 
-                        // 重播申请绑定：申请先于排期恢复，校验绑定存在且属于同一首歌，避免悬空绑定
-                        let validScheduleReplayRequestId = null
-                        if (record.replayRequestId) {
-                          const boundReplayRequest = await tx
-                            .select({
-                              id: songReplayRequests.id,
-                              songId: songReplayRequests.songId
-                            })
-                            .from(songReplayRequests)
-                            .where(eq(songReplayRequests.id, record.replayRequestId))
-                            .limit(1)
-                          if (
-                            boundReplayRequest.length > 0 &&
-                            boundReplayRequest[0].songId === validSongId
-                          ) {
-                            validScheduleReplayRequestId = record.replayRequestId
-                          }
-                        }
-                        scheduleData.replayRequestId = validScheduleReplayRequestId
-
                         if (mode === 'merge') {
                           // 检查是否存在相同的排期（按歌曲ID和播放日期）
                           const existingSchedule = await tx
@@ -1603,16 +1304,7 @@ export default defineEventHandler(async (event) => {
 
                         // 动态构建通知数据，自动跳过不存在的字段
                         const notificationData = { userId: validNotificationUserId }
-                        const notificationDataFields = [
-                          'batchId',
-                          'source',
-                          'senderName',
-                          'senderUsername',
-                          'title',
-                          'message',
-                          'type',
-                          'userDeleted'
-                        ]
+                        const notificationDataFields = ['title', 'message', 'type']
 
                         notificationDataFields.forEach((field) => {
                           if (record.hasOwnProperty(field)) {
@@ -1620,38 +1312,8 @@ export default defineEventHandler(async (event) => {
                           }
                         })
 
-                        // senderId 需要重新映射到目标库的用户 ID；映射未命中时回查同 ID 用户并比对用户名快照，
-                        // 不一致则置空，避免跨库恢复时将发送人归属到错误用户，展示仍靠快照字段
-                        if (Object.prototype.hasOwnProperty.call(record, 'senderId')) {
-                          if (record.senderId) {
-                            const mappedSenderId = userIdMapping.get(record.senderId)
-                            if (mappedSenderId) {
-                              notificationData.senderId = mappedSenderId
-                            } else {
-                              const senderExists = await tx
-                                .select({ id: users.id, username: users.username })
-                                .from(users)
-                                .where(eq(users.id, record.senderId))
-                                .limit(1)
-                              notificationData.senderId =
-                                senderExists.length > 0 &&
-                                senderExists[0].username === record.senderUsername
-                                  ? record.senderId
-                                  : null
-                            }
-                          } else {
-                            notificationData.senderId = null
-                          }
-                        }
-
                         // 布尔字段，提供默认值
                         notificationData.read = record.hasOwnProperty('read') ? record.read : false
-                        notificationData.important = Object.prototype.hasOwnProperty.call(
-                          record,
-                          'important'
-                        )
-                          ? record.important
-                          : false
 
                         // 日期字段
                         notificationData.createdAt = record.createdAt
@@ -1864,28 +1526,9 @@ export default defineEventHandler(async (event) => {
                           if (mappedSongId) validReplaySongId = mappedSongId
                         }
 
-                        // 校验期望播出时段是否存在（可选字段）
-                        let validReplayPlayTimeId = record.preferredPlayTimeId || null
-                        if (validReplayPlayTimeId) {
-                          const replayPlayTimeExists = await tx
-                            .select({ id: playTimes.id })
-                            .from(playTimes)
-                            .where(eq(playTimes.id, validReplayPlayTimeId))
-                            .limit(1)
-                          if (replayPlayTimeExists.length === 0) {
-                            validReplayPlayTimeId = null
-                          }
-                        }
-
-                        // 保留原始状态与申请元数据，避免历史已履行记录恢复为 PENDING 触发部分唯一索引冲突
                         const replayData = {
                           songId: validReplaySongId,
                           userId: validReplayUserId,
-                          status: record.status || 'PENDING',
-                          preferredPlayTimeId: validReplayPlayTimeId,
-                          submissionNote: record.submissionNote ?? null,
-                          submissionNotePublic: record.submissionNotePublic === true,
-                          submissionNotePublicStatus: record.submissionNotePublicStatus ?? null,
                           createdAt: record.createdAt ? new Date(record.createdAt) : new Date(),
                           updatedAt: record.updatedAt ? new Date(record.updatedAt) : new Date()
                         }
@@ -1920,101 +1563,6 @@ export default defineEventHandler(async (event) => {
                         }
                         break
 
-                      case 'cardCodeRedeemLogs': {
-                        let validCardCodeId = record.cardCodeId || null
-                        if (record.cardCodeId) {
-                          const mappedCardCodeId = cardCodeIdMapping.get(record.cardCodeId)
-                          if (mappedCardCodeId) {
-                            validCardCodeId = mappedCardCodeId
-                          } else {
-                            const cardCodeExists = await tx
-                              .select({ id: cardCodes.id })
-                              .from(cardCodes)
-                              .where(eq(cardCodes.id, record.cardCodeId))
-                              .limit(1)
-                            if (cardCodeExists.length === 0) {
-                              validCardCodeId = null
-                            }
-                          }
-                        }
-
-                        let validRedeemedBy = record.redeemedBy
-                        if (record.redeemedBy) {
-                          const mappedUserId = userIdMapping.get(record.redeemedBy)
-                          if (mappedUserId) {
-                            validRedeemedBy = mappedUserId
-                          } else {
-                            const userExists = await tx
-                              .select({ id: users.id })
-                              .from(users)
-                              .where(eq(users.id, record.redeemedBy))
-                              .limit(1)
-                            if (userExists.length === 0) {
-                              console.warn(
-                                `点歌券日志的操作用户ID ${record.redeemedBy} 不存在，跳过此记录`
-                              )
-                              return
-                            }
-                          }
-                        } else {
-                          console.warn('点歌券日志缺少redeemedBy，跳过此记录')
-                          return
-                        }
-
-                        let validLogSongId = record.songId || null
-                        if (record.songId) {
-                          const mappedSongId = songIdMapping.get(record.songId)
-                          if (mappedSongId) {
-                            validLogSongId = mappedSongId
-                          } else {
-                            const songExists = await tx
-                              .select({ id: songs.id })
-                              .from(songs)
-                              .where(eq(songs.id, record.songId))
-                              .limit(1)
-                            if (songExists.length === 0) {
-                              validLogSongId = null
-                            }
-                          }
-                        }
-
-                        const logData = {
-                          cardCodeId: validCardCodeId,
-                          codeSnapshot: record.codeSnapshot,
-                          redeemedBy: validRedeemedBy,
-                          redeemedAt: record.redeemedAt ? new Date(record.redeemedAt) : new Date(),
-                          source: record.source || 'UNKNOWN',
-                          songId: validLogSongId,
-                          createdAt: record.createdAt ? new Date(record.createdAt) : new Date()
-                        }
-
-                        if (!logData.codeSnapshot) {
-                          console.warn('点歌券日志缺少codeSnapshot，跳过此记录')
-                          return
-                        }
-
-                        if (mode === 'merge') {
-                          await tx.insert(cardCodeRedeemLogs).values(logData)
-                        } else {
-                          const existingLogWithId = await tx
-                            .select()
-                            .from(cardCodeRedeemLogs)
-                            .where(eq(cardCodeRedeemLogs.id, record.id))
-                            .limit(1)
-                          if (existingLogWithId.length > 0) {
-                            await tx
-                              .update(cardCodeRedeemLogs)
-                              .set(logData)
-                              .where(eq(cardCodeRedeemLogs.id, record.id))
-                          } else {
-                            await tx
-                              .insert(cardCodeRedeemLogs)
-                              .values({ ...logData, id: record.id })
-                          }
-                        }
-                        break
-                      }
-
                       case 'votes':
                         // 验证外键约束
                         let validVoteUserId = record.userId
@@ -2120,11 +1668,6 @@ export default defineEventHandler(async (event) => {
                         }
                         break
 
-                      case 'scheduleSongPool': {
-                        await restoreScheduleSongPoolRecord(tx, record, songIdMapping, userIdMapping, stats)
-                        break
-                      }
-
                       case 'requestTimes':
                         // requestTimes表没有外键依赖
                         const requestTimeData = {
@@ -2572,23 +2115,6 @@ export default defineEventHandler(async (event) => {
     console.log(`📊 处理了 ${restoreResults.details.tablesProcessed} 个表`)
     console.log(`📊 恢复了 ${restoreResults.details.recordsRestored} 条记录`)
 
-    // 防锁死：恢复开关前校验 SMTP 已配置，否则剥离 registerEmailRequired（避免恢复后注册必填邮箱却无法发码）
-    try {
-      const restoredSettings = await db.select().from(systemSettings).limit(1)
-      if (
-      restoredSettings[0]?.registerEmailRequired &&
-      (!restoredSettings[0]?.smtpEnabled || !restoredSettings[0]?.smtpHost)
-    ) {
-        await db
-          .update(systemSettings)
-          .set({ registerEmailRequired: false })
-          .where(eq(systemSettings.id, restoredSettings[0].id))
-        console.warn('⚠️ SMTP 未配置，已剥离 registerEmailRequired，避免注册邮箱流程不可用')
-      }
-    } catch (settingsError) {
-      console.error('恢复后设置一致性校验失败:', settingsError)
-    }
-
     // 重置所有自增序列
     console.log(`🔄 开始重置自增序列...`)
     const sequenceResetResults = []
@@ -2647,6 +2173,17 @@ export default defineEventHandler(async (event) => {
       restoreResults.message = '数据恢复完成，但存在错误'
     }
 
+    // 清除所有缓存
+    try {
+      const cacheService = CacheService.getInstance()
+      await cacheService.clearAllCaches()
+      console.log('数据恢复后缓存已清除')
+    } catch (cacheError) {
+      console.warn('清除缓存失败:', cacheError)
+      restoreResults.details.warnings = restoreResults.details.warnings || []
+      restoreResults.details.warnings.push('清除缓存失败')
+    }
+
     try {
       const smtpService = SmtpService.getInstance()
       const initialized = await smtpService.initializeSmtpConfig()
@@ -2666,7 +2203,7 @@ export default defineEventHandler(async (event) => {
     console.error('恢复数据库备份失败:', error)
     throw createError({
       statusCode: error.statusCode || 500,
-      message: error.message || '恢复数据库备份失败'
+      statusMessage: error.statusMessage || '恢复数据库备份失败'
     })
   }
 })
diff --git a/server/api/admin/backup/upload.post.ts b/server/api/admin/backup/upload.post.ts
index f1a8074..3052029 100644
--- a/server/api/admin/backup/upload.post.ts
+++ b/server/api/admin/backup/upload.post.ts
@@ -7,10 +7,10 @@ export default defineEventHandler(async (event) => {
   try {
     // 验证管理员权限
     const user = event.context.user
-    if (!user || user.role !== 'SUPER_ADMIN') {
+    if (!user || !['ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
       throw createError({
         statusCode: 403,
-        message: '只有超级管理员可以上传备份文件'
+        statusMessage: '权限不足'
       })
     }
 
@@ -28,7 +28,7 @@ export default defineEventHandler(async (event) => {
       keepExtensions: true,
       maxFileSize: 100 * 1024 * 1024, // 100MB
       filter: ({ mimetype, originalFilename }) => {
-        // 只允许 JSON 文件
+        // 只允许JSON文件
         return (
           mimetype === 'application/json' ||
           (originalFilename && originalFilename.endsWith('.json'))
@@ -41,7 +41,7 @@ export default defineEventHandler(async (event) => {
     if (!files.file || !files.file[0]) {
       throw createError({
         statusCode: 400,
-        message: '请选择要上传的备份文件'
+        statusMessage: '请选择要上传的备份文件'
       })
     }
 
@@ -57,7 +57,7 @@ export default defineEventHandler(async (event) => {
       await fs.unlink(uploadedFile.filepath)
       throw createError({
         statusCode: 400,
-        message: '备份文件格式无效'
+        statusMessage: '备份文件格式无效'
       })
     }
 
@@ -66,7 +66,7 @@ export default defineEventHandler(async (event) => {
       await fs.unlink(uploadedFile.filepath)
       throw createError({
         statusCode: 400,
-        message: '不是有效的备份文件'
+        statusMessage: '不是有效的备份文件'
       })
     }
 
@@ -106,7 +106,7 @@ export default defineEventHandler(async (event) => {
     // 重新保存文件
     await fs.writeFile(newFilepath, JSON.stringify(backupData, null, 2), 'utf8')
 
-    console.log(`管理员 ${user.username} 上传了备份文件：${newFilename}`)
+    console.log(`管理员 ${user.username} 上传了备份文件: ${newFilename}`)
 
     // 获取文件信息
     const stats = await fs.stat(newFilepath)
@@ -127,7 +127,7 @@ export default defineEventHandler(async (event) => {
     console.error('上传备份文件失败:', error)
     throw createError({
       statusCode: error.statusCode || 500,
-      message: error.message || '上传备份文件失败'
+      statusMessage: error.statusMessage || '上传备份文件失败'
     })
   }
 })
diff --git a/server/api/admin/blacklist/[id].delete.ts b/server/api/admin/blacklist/[id].delete.ts
index f48d748..32c2fa7 100644
--- a/server/api/admin/blacklist/[id].delete.ts
+++ b/server/api/admin/blacklist/[id].delete.ts
@@ -2,6 +2,7 @@ import { createError, defineEventHandler, getRouterParam } from 'h3'
 import { db } from '~/drizzle/db'
 import { songBlacklists } from '~/drizzle/schema'
 import { eq } from 'drizzle-orm'
+import { CacheService } from '../../../services/cacheService'
 
 export default defineEventHandler(async (event) => {
   // 检查认证和权限
@@ -40,6 +41,15 @@ export default defineEventHandler(async (event) => {
     // 删除黑名单项
     await db.delete(songBlacklists).where(eq(songBlacklists.id, id))
 
+    // 清除歌曲缓存（黑名单变更可能影响歌曲提交验证）
+    try {
+      const cacheService = CacheService.getInstance()
+      await cacheService.clearSongsCache()
+      console.log('黑名单删除后歌曲缓存已清除')
+    } catch (cacheError) {
+      console.warn('清除歌曲缓存失败:', cacheError)
+    }
+
     return {
       success: true,
       message: '黑名单项删除成功'
diff --git a/server/api/admin/blacklist/[id].patch.ts b/server/api/admin/blacklist/[id].patch.ts
index 9c1898f..05c0981 100644
--- a/server/api/admin/blacklist/[id].patch.ts
+++ b/server/api/admin/blacklist/[id].patch.ts
@@ -2,6 +2,7 @@ import { createError, defineEventHandler, getRouterParam, readBody } from 'h3'
 import { db } from '~/drizzle/db'
 import { songBlacklists } from '~/drizzle/schema'
 import { eq } from 'drizzle-orm'
+import { CacheService } from '../../../services/cacheService'
 
 export default defineEventHandler(async (event) => {
   // 检查认证和权限
@@ -54,6 +55,15 @@ export default defineEventHandler(async (event) => {
       .where(eq(songBlacklists.id, id))
       .returning()
 
+    // 清除歌曲缓存（黑名单变更可能影响歌曲提交验证）
+    try {
+      const cacheService = CacheService.getInstance()
+      await cacheService.clearSongsCache()
+      console.log('黑名单更新后歌曲缓存已清除')
+    } catch (cacheError) {
+      console.warn('清除歌曲缓存失败:', cacheError)
+    }
+
     return {
       success: true,
       message: '黑名单项更新成功',
diff --git a/server/api/admin/blacklist/index.post.ts b/server/api/admin/blacklist/index.post.ts
index 88c4ade..cded730 100644
--- a/server/api/admin/blacklist/index.post.ts
+++ b/server/api/admin/blacklist/index.post.ts
@@ -2,11 +2,7 @@ import { createError, defineEventHandler, readBody } from 'h3'
 import { db } from '~/drizzle/db'
 import { songBlacklists } from '~/drizzle/schema'
 import { and, eq } from 'drizzle-orm'
-import {
-  BLACKLIST_TYPES,
-  BLACKLIST_LANGUAGE_VALUES,
-  BLACKLIST_GENRE_VALUES
-} from '~~/server/config/constants'
+import { CacheService } from '../../../services/cacheService'
 
 export default defineEventHandler(async (event) => {
   // 检查认证和权限
@@ -29,27 +25,13 @@ export default defineEventHandler(async (event) => {
     })
   }
 
-  if (!Object.values(BLACKLIST_TYPES).includes(type)) {
+  if (!['SONG', 'KEYWORD', 'LANGUAGE', 'GENRE'].includes(type)) {
     throw createError({
       statusCode: 400,
       message: '无效的黑名单类型'
     })
   }
 
-  // 语种/曲风为固定候选值，防止录入无法匹配的自由文本
-  if (type === BLACKLIST_TYPES.LANGUAGE && !BLACKLIST_LANGUAGE_VALUES.includes(value.trim())) {
-    throw createError({
-      statusCode: 400,
-      message: '无效的语种候选值'
-    })
-  }
-  if (type === BLACKLIST_TYPES.GENRE && !BLACKLIST_GENRE_VALUES.includes(value.trim())) {
-    throw createError({
-      statusCode: 400,
-      message: '无效的曲风候选值'
-    })
-  }
-
   try {
     // 检查是否已存在
     const existing = await db
@@ -77,6 +59,15 @@ export default defineEventHandler(async (event) => {
       })
       .returning()
 
+    // 清除歌曲缓存（黑名单变更可能影响歌曲提交验证）
+    try {
+      const cacheService = CacheService.getInstance()
+      await cacheService.clearSongsCache()
+      console.log('黑名单添加后歌曲缓存已清除')
+    } catch (cacheError) {
+      console.warn('清除歌曲缓存失败:', cacheError)
+    }
+
     return {
       success: true,
       message: '黑名单项添加成功',
diff --git a/server/api/admin/changelog/[id].delete.ts b/server/api/admin/changelog/[id].delete.ts
new file mode 100644
index 0000000..a191ffa
--- /dev/null
+++ b/server/api/admin/changelog/[id].delete.ts
@@ -0,0 +1,28 @@
+import { eq } from 'drizzle-orm'
+import { db } from '~/drizzle/db'
+import { changelogEntries } from '~/drizzle/schema'
+
+export default defineEventHandler(async (event) => {
+  const user = event.context.user
+
+  if (!user) {
+    throw createError({ statusCode: 401, message: '未授权访问' })
+  }
+
+  if (!['ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
+    throw createError({ statusCode: 403, message: '只有管理员才能删除更新日志' })
+  }
+
+  const id = Number(getRouterParam(event, 'id'))
+  if (!Number.isFinite(id) || id <= 0) {
+    throw createError({ statusCode: 400, message: '无效的 id' })
+  }
+
+  const rows = await db.delete(changelogEntries).where(eq(changelogEntries.id, id)).returning()
+  if (!rows[0]) {
+    throw createError({ statusCode: 404, message: '更新日志不存在' })
+  }
+
+  return { success: true }
+})
+
diff --git a/server/api/admin/changelog/[id].put.ts b/server/api/admin/changelog/[id].put.ts
new file mode 100644
index 0000000..e97eaaf
--- /dev/null
+++ b/server/api/admin/changelog/[id].put.ts
@@ -0,0 +1,69 @@
+import { eq } from 'drizzle-orm'
+import { db } from '~/drizzle/db'
+import { changelogEntries } from '~/drizzle/schema'
+
+export default defineEventHandler(async (event) => {
+  const user = event.context.user
+
+  if (!user) {
+    throw createError({ statusCode: 401, message: '未授权访问' })
+  }
+
+  if (!['ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
+    throw createError({ statusCode: 403, message: '只有管理员才能更新更新日志' })
+  }
+
+  const id = Number(getRouterParam(event, 'id'))
+  if (!Number.isFinite(id) || id <= 0) {
+    throw createError({ statusCode: 400, message: '无效的 id' })
+  }
+
+  const body = await readBody(event)
+  const updateData: any = { updatedAt: new Date() }
+
+  if (body?.version !== undefined) {
+    if (body.version !== null && typeof body.version !== 'string') {
+      throw createError({ statusCode: 400, message: 'version 必须是字符串' })
+    }
+    updateData.version = (body.version || '').trim()
+  }
+
+  if (body?.title !== undefined) {
+    if (body.title !== null && typeof body.title !== 'string') {
+      throw createError({ statusCode: 400, message: 'title 必须是字符串' })
+    }
+    updateData.title = (body.title || '').trim()
+  }
+
+  if (body?.content !== undefined) {
+    if (body.content !== null && typeof body.content !== 'string') {
+      throw createError({ statusCode: 400, message: 'content 必须是字符串' })
+    }
+    updateData.content = (body.content || '').trim()
+  }
+
+  if (body?.published !== undefined) {
+    if (typeof body.published !== 'boolean') {
+      throw createError({ statusCode: 400, message: 'published 必须是布尔值' })
+    }
+    updateData.published = body.published
+    updateData.publishedAt = body.published ? new Date() : null
+  }
+
+  if (Object.keys(updateData).length <= 1) {
+    throw createError({ statusCode: 400, message: '没有可更新的字段' })
+  }
+
+  const rows = await db
+    .update(changelogEntries)
+    .set(updateData)
+    .where(eq(changelogEntries.id, id))
+    .returning()
+
+  if (!rows[0]) {
+    throw createError({ statusCode: 404, message: '更新日志不存在' })
+  }
+
+  return rows[0]
+})
+
diff --git a/server/api/admin/changelog/index.get.ts b/server/api/admin/changelog/index.get.ts
new file mode 100644
index 0000000..c8c4838
--- /dev/null
+++ b/server/api/admin/changelog/index.get.ts
@@ -0,0 +1,17 @@
+import { desc } from 'drizzle-orm'
+import { db } from '~/drizzle/db'
+import { changelogEntries } from '~/drizzle/schema'
+
+export default defineEventHandler(async (event) => {
+  const user = event.context.user
+
+  if (!user) {
+    throw createError({ statusCode: 401, message: '未授权访问' })
+  }
+
+  if (!['ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
+    throw createError({ statusCode: 403, message: '只有管理员才能查看更新日志' })
+  }
+
+  return db.select().from(changelogEntries).orderBy(desc(changelogEntries.createdAt))
+})
diff --git a/server/api/admin/changelog/index.post.ts b/server/api/admin/changelog/index.post.ts
new file mode 100644
index 0000000..2fa3acf
--- /dev/null
+++ b/server/api/admin/changelog/index.post.ts
@@ -0,0 +1,44 @@
+import { db } from '~/drizzle/db'
+import { changelogEntries } from '~/drizzle/schema'
+
+export default defineEventHandler(async (event) => {
+  const user = event.context.user
+
+  if (!user) {
+    throw createError({ statusCode: 401, message: '未授权访问' })
+  }
+
+  if (!['ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
+    throw createError({ statusCode: 403, message: '只有管理员才能创建更新日志' })
+  }
+
+  const body = await readBody(event)
+  const version = typeof body?.version === 'string' ? body.version.trim() : ''
+  const title = typeof body?.title === 'string' ? body.title.trim() : ''
+  const content = typeof body?.content === 'string' ? body.content.trim() : ''
+  const published = body?.published === true
+
+  if (!version) {
+    throw createError({ statusCode: 400, message: 'version 不能为空' })
+  }
+  if (!title) {
+    throw createError({ statusCode: 400, message: 'title 不能为空' })
+  }
+  if (!content) {
+    throw createError({ statusCode: 400, message: 'content 不能为空' })
+  }
+
+  const rows = await db
+    .insert(changelogEntries)
+    .values({
+      version,
+      title,
+      content,
+      published,
+      publishedAt: published ? new Date() : null,
+      createdBy: user.id
+    })
+    .returning()
+
+  return rows[0]
+})
diff --git a/server/api/admin/database/cleanup.post.ts b/server/api/admin/database/cleanup.post.ts
index c05735c..d3b0f4f 100644
--- a/server/api/admin/database/cleanup.post.ts
+++ b/server/api/admin/database/cleanup.post.ts
@@ -3,17 +3,13 @@ import { databaseManager } from '~~/server/utils/database-manager'
 
 export default defineEventHandler(async (event) => {
   try {
-    const authResult = await verifyAdminAuth(event)
-
-    if (!authResult.success) {
-      throw createError({
-        statusCode: 401,
-        message: authResult.message
-      })
-    }
+    // 验证管理员权限
+    await verifyAdminAuth(event)
 
+    // 清理过期会话
     const cleanedCount = await databaseManager.cleanupExpiredSessions()
 
+    // 清除健康检查缓存以确保下次检查获取最新状态
     databaseManager.clearHealthCheckCache()
 
     return {
@@ -22,14 +18,17 @@ export default defineEventHandler(async (event) => {
       cleanedCount,
       timestamp: new Date().toISOString()
     }
-  } catch (error: any) {
-    if (error.statusCode === 401) {
-      throw error
+  } catch (error) {
+    if (error instanceof Error && error.message.includes('认证')) {
+      throw createError({
+        statusCode: 401,
+        statusMessage: 'Unauthorized'
+      })
     }
 
     throw createError({
       statusCode: 500,
-      message: error instanceof Error ? error.message : 'Cleanup failed'
+      statusMessage: error instanceof Error ? error.message : 'Cleanup failed'
     })
   }
 })
diff --git a/server/api/admin/database/performance.get.ts b/server/api/admin/database/performance.get.ts
index 9d84fcc..1de9fa1 100644
--- a/server/api/admin/database/performance.get.ts
+++ b/server/api/admin/database/performance.get.ts
@@ -9,7 +9,7 @@ export default defineEventHandler(async (event) => {
     if (!authResult.success) {
       throw createError({
         statusCode: 401,
-        message: authResult.message
+        statusMessage: authResult.message
       })
     }
 
@@ -28,7 +28,7 @@ export default defineEventHandler(async (event) => {
     console.error('Database performance API error:', error)
     throw createError({
       statusCode: 500,
-      message: 'Internal Server Error'
+      statusMessage: 'Internal Server Error'
     })
   }
-})
\ No newline at end of file
+})
diff --git a/server/api/admin/database/pool-status.get.ts b/server/api/admin/database/pool-status.get.ts
index dab32e2..425683b 100644
--- a/server/api/admin/database/pool-status.get.ts
+++ b/server/api/admin/database/pool-status.get.ts
@@ -9,7 +9,7 @@ export default defineEventHandler(async (event) => {
     if (!authResult.success) {
       throw createError({
         statusCode: 401,
-        message: authResult.message
+        statusMessage: authResult.message
       })
     }
 
@@ -28,7 +28,7 @@ export default defineEventHandler(async (event) => {
     console.error('Database pool status API error:', error)
     throw createError({
       statusCode: 500,
-      message: 'Internal Server Error'
+      statusMessage: 'Internal Server Error'
     })
   }
-})
\ No newline at end of file
+})
diff --git a/server/api/admin/database/reset.post.ts b/server/api/admin/database/reset.post.ts
index 97bafb7..89e25fd 100644
--- a/server/api/admin/database/reset.post.ts
+++ b/server/api/admin/database/reset.post.ts
@@ -1,5 +1,6 @@
 import { createError, defineEventHandler } from 'h3'
 import { db } from '~/drizzle/db'
+import { CacheService } from '../../../services/cacheService'
 import {
   apiKeyPermissions,
   apiKeys,
@@ -24,29 +25,6 @@ import {
 } from '~/drizzle/schema'
 import { ne, sql } from 'drizzle-orm'
 
-function getFirstRow<T>(result: any): T | undefined {
-  return result?.rows?.[0] ?? result?.[0]
-}
-
-function quoteIdentifierPart(value: string) {
-  const normalized =
-    value.startsWith('"') && value.endsWith('"') ? value.slice(1, -1).replace(/""/g, '"') : value
-
-  return `"${normalized.replace(/"/g, '""')}"`
-}
-
-function toQualifiedIdentifier(value: string) {
-  return sql.raw(value.split('.').map(quoteIdentifierPart).join('.'))
-}
-
-function toPgRelationName(value: string) {
-  return value.split('.').map(quoteIdentifierPart).join('.')
-}
-
-function toRegclass(value: string) {
-  return sql.raw(`'${value.replace(/'/g, "''")}'::regclass`)
-}
-
 // 重置所有表的自增序列
 async function resetAutoIncrementSequences() {
   const tables = [
@@ -71,31 +49,15 @@ async function resetAutoIncrementSequences() {
 
   for (const table of tables) {
     try {
-      // 获取表的最大ID
-      const maxIdResult = await db.execute(
-        sql`SELECT MAX(id) as max_id FROM ${toQualifiedIdentifier(table.dbName)}`
-      )
-      const maxId = Number(
-        getFirstRow<{ max_id: number | string | null }>(maxIdResult)?.max_id || 0
-      )
-
       // 获取序列名称
       const sequenceNameResult = await db.execute(
-        sql`SELECT pg_get_serial_sequence(${toPgRelationName(table.dbName)}, 'id') as sequence_name`
+        sql.raw(`SELECT pg_get_serial_sequence('"${table.dbName}"', 'id') as sequence_name`)
       )
-      const sequenceName = getFirstRow<{ sequence_name: string | null }>(
-        sequenceNameResult
-      )?.sequence_name
+      const sequenceName = (sequenceNameResult as any)[0]?.sequence_name
 
       if (sequenceName) {
-        if (maxId === 0) {
-          await db.execute(
-            sql`ALTER SEQUENCE ${toQualifiedIdentifier(sequenceName)} RESTART WITH 1`
-          )
-        } else {
-          const newSequenceValue = maxId
-          await db.execute(sql`SELECT setval(${toRegclass(sequenceName)}, ${newSequenceValue})`)
-        }
+        // 重置序列值到 1
+        await db.execute(sql.raw(`ALTER SEQUENCE ${sequenceName} RESTART WITH 1`))
         results.push({ table: table.name, success: true })
       } else {
         results.push({ table: table.name, success: false, message: 'Sequence not found' })
@@ -115,7 +77,7 @@ export default defineEventHandler(async (event) => {
     if (!user || !['ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
       throw createError({
         statusCode: 403,
-        message: '权限不足'
+        statusMessage: '权限不足'
       })
     }
 
@@ -264,11 +226,21 @@ export default defineEventHandler(async (event) => {
       // 重置自增序列
       const sequenceResults = await resetAutoIncrementSequences()
       resetResults.details.sequencesReset = sequenceResults.filter((r) => r.success).length
+
+      // 清除缓存
+      try {
+        const cacheService = CacheService.getInstance()
+        await cacheService.clearAllCache()
+      } catch (error) {
+        console.warn('清除缓存失败:', error)
+        resetResults.details.warnings = resetResults.details.warnings || []
+        resetResults.details.warnings.push('清除缓存失败')
+      }
     } catch (error) {
       console.error('重置数据库失败:', error)
       throw createError({
         statusCode: 500,
-        message: `重置数据库失败：${error.message}`
+        statusMessage: `重置数据库失败: ${error.message}`
       })
     }
 
@@ -276,7 +248,7 @@ export default defineEventHandler(async (event) => {
   } catch (error) {
     throw createError({
       statusCode: error.statusCode || 500,
-      message: error.message || '服务器内部错误'
+      statusMessage: error.statusMessage || '服务器内部错误'
     })
   }
 })
diff --git a/server/api/admin/database/status.get.ts b/server/api/admin/database/status.get.ts
index 4f4a611..0003852 100644
--- a/server/api/admin/database/status.get.ts
+++ b/server/api/admin/database/status.get.ts
@@ -9,7 +9,7 @@ export default defineEventHandler(async (event) => {
     if (!authResult.success) {
       throw createError({
         statusCode: 401,
-        message: authResult.message
+        statusMessage: authResult.message
       })
     }
 
@@ -51,7 +51,7 @@ export default defineEventHandler(async (event) => {
     console.error('Database status API error:', error)
     throw createError({
       statusCode: 500,
-      message: 'Internal Server Error'
+      statusMessage: 'Internal Server Error'
     })
   }
-})
\ No newline at end of file
+})
diff --git a/server/api/admin/db-status.get.ts b/server/api/admin/db-status.get.ts
index 81ab8c7..73ff8f7 100644
--- a/server/api/admin/db-status.get.ts
+++ b/server/api/admin/db-status.get.ts
@@ -63,7 +63,7 @@ export default defineEventHandler(async (event) => {
     console.error('检查数据库状态失败:', error)
     throw createError({
       statusCode: 500,
-      message: '检查数据库状态失败：' + error.message
+      statusMessage: '检查数据库状态失败: ' + error.message
     })
   }
 })
diff --git a/server/api/admin/expected-play-dates/[id].delete.ts b/server/api/admin/expected-play-dates/[id].delete.ts
new file mode 100644
index 0000000..2bcaeaf
--- /dev/null
+++ b/server/api/admin/expected-play-dates/[id].delete.ts
@@ -0,0 +1,27 @@
+import { db } from '~/drizzle/db'
+import { expectedPlayDates } from '~/drizzle/schema'
+import { eq } from 'drizzle-orm'
+
+export default defineEventHandler(async (event) => {
+  const user = event.context.user
+
+  if (!user || (user.role !== 'ADMIN' && user.role !== 'SUPER_ADMIN')) {
+    throw createError({ statusCode: 403, message: '权限不足' })
+  }
+
+  const idParam = event.context.params?.id
+  if (!idParam) {
+    throw createError({ statusCode: 400, message: '无效的ID' })
+  }
+  const id = Number(idParam)
+  if (isNaN(id)) {
+    throw createError({ statusCode: 400, message: '无效的ID' })
+  }
+
+  try {
+    await db.delete(expectedPlayDates).where(eq(expectedPlayDates.id, id))
+    return { success: true }
+  } catch (e: any) {
+    throw createError({ statusCode: 500, message: e.message || '删除失败' })
+  }
+})
\ No newline at end of file
diff --git a/server/api/admin/expected-play-dates/index.ts b/server/api/admin/expected-play-dates/index.ts
new file mode 100644
index 0000000..ec445e1
--- /dev/null
+++ b/server/api/admin/expected-play-dates/index.ts
@@ -0,0 +1,95 @@
+import { db } from '~/drizzle/db'
+import { expectedPlayDates, songs } from '~/drizzle/schema'
+import { desc, eq, and } from 'drizzle-orm'
+
+export default defineEventHandler(async (event) => {
+  const method = event.node.req.method
+  const user = event.context.user
+
+  if (!user || (user.role !== 'ADMIN' && user.role !== 'SUPER_ADMIN')) {
+    throw createError({ statusCode: 403, message: '权限不足' })
+  }
+
+  if (method === 'GET') {
+    const dates = await db.select().from(expectedPlayDates).orderBy(desc(expectedPlayDates.date))
+    const result = []
+    
+    for (const d of dates) {
+      const dateObj = new Date(d.date)
+      const weekdays = ['周日', '周一', '周二', '周三', '周四', '周五', '周六']
+      const weekday = weekdays[dateObj.getDay()]
+
+      let availableSeqs: number[] = []
+      if (d.availableSequences) {
+        availableSeqs = d.availableSequences.split(',').map(s => parseInt(s.trim(), 10)).filter(n => !isNaN(n))
+      }
+
+      const takenSongs = await db.select({
+        sequence: songs.expectedPlaySequence,
+        title: songs.title,
+        artist: songs.artist,
+        requesterId: songs.requesterId
+      })
+      .from(songs)
+      .where(
+        and(
+          eq(songs.expectedPlayDate, d.date),
+          eq(songs.played, false)
+        )
+      )
+
+      const takenSeqs = new Set(takenSongs.map(s => s.sequence).filter(seq => seq !== null))
+      const takenDetails: Record<number, any> = {}
+      takenSongs.forEach(s => {
+        if (s.sequence !== null) {
+          takenDetails[s.sequence] = { title: s.title, artist: s.artist }
+        }
+      })
+
+      const freeSeqs = availableSeqs.filter(seq => !takenSeqs.has(seq))
+
+      result.push({
+        ...d,
+        weekday,
+        allSequences: availableSeqs.sort((a, b) => a - b),
+        takenSequences: Array.from(takenSeqs).sort((a, b) => a - b),
+        takenDetails,
+        freeSequences: freeSeqs.sort((a, b) => a - b),
+        isFull: freeSeqs.length === 0
+      })
+    }
+    
+    return result
+  }
+
+  if (method === 'POST') {
+    const body = await readBody(event)
+    const { date, availableSequences } = body
+
+    if (!date || !availableSequences) {
+      throw createError({ statusCode: 400, message: '日期和序号不能为空' })
+    }
+
+    try {
+      // 检查是否存在
+      const existing = await db.select().from(expectedPlayDates).where(eq(expectedPlayDates.date, date))
+      
+      if (existing.length > 0) {
+        // 更新
+        const result = await db.update(expectedPlayDates)
+          .set({ availableSequences })
+          .where(eq(expectedPlayDates.date, date))
+          .returning()
+        return result[0]
+      } else {
+        // 新增
+        const result = await db.insert(expectedPlayDates)
+          .values({ date, availableSequences })
+          .returning()
+        return result[0]
+      }
+    } catch (e: any) {
+      throw createError({ statusCode: 500, message: e.message || '保存失败' })
+    }
+  }
+})
\ No newline at end of file
diff --git a/server/api/admin/fix-sequence.post.ts b/server/api/admin/fix-sequence.post.ts
index e074d0e..f64158b 100644
--- a/server/api/admin/fix-sequence.post.ts
+++ b/server/api/admin/fix-sequence.post.ts
@@ -1,43 +1,31 @@
 import { db } from '~/drizzle/db'
 import { sql } from 'drizzle-orm'
 
-function getFirstRow<T>(result: any): T | undefined {
-  return result?.rows?.[0] ?? result?.[0]
-}
-
-function quoteIdentifierPart(value: string) {
-  const normalized =
-    value.startsWith('"') && value.endsWith('"') ? value.slice(1, -1).replace(/""/g, '"') : value
-
-  return `"${normalized.replace(/"/g, '""')}"`
-}
-
-function toQualifiedIdentifier(value: string) {
-  return sql.raw(value.split('.').map(quoteIdentifierPart).join('.'))
-}
-
-function toPgRelationName(value: string) {
-  return value.split('.').map(quoteIdentifierPart).join('.')
-}
-
-function toRegclass(value: string) {
-  return sql.raw(`'${value.replace(/'/g, "''")}'::regclass`)
-}
-
 // 修复单个表的序列
 async function fixTableSequence(table: string, dbTableName: string) {
   try {
     // 获取表的最大ID
-    const maxIdResult = await db.execute(
-      sql`SELECT MAX(id) as max_id FROM ${toQualifiedIdentifier(dbTableName)}`
-    )
-    const maxId = Number(getFirstRow<{ max_id: number | string | null }>(maxIdResult)?.max_id || 0)
+    const maxIdResult = await db.execute(sql.raw(`SELECT MAX(id) as max_id FROM "${dbTableName}"`))
+    const maxId = Number((maxIdResult as any)[0]?.max_id || 0)
+
+    if (maxId === 0) {
+      return {
+        success: true,
+        table: table,
+        message: `表 ${table} 为空，无需修复序列`,
+        data: {
+          table: table,
+          maxId: 0,
+          skipped: true
+        }
+      }
+    }
 
     // 获取序列名称
     const sequenceNameResult = await db.execute(
-      sql`SELECT pg_get_serial_sequence(${toPgRelationName(dbTableName)}, 'id') as sequence_name`
+      sql.raw(`SELECT pg_get_serial_sequence('"${dbTableName}"', 'id') as sequence_name`)
     )
-    const sequenceName = getFirstRow<{ sequence_name: string | null }>(sequenceNameResult)?.sequence_name
+    const sequenceName = (sequenceNameResult as any)[0]?.sequence_name
 
     if (!sequenceName) {
       return {
@@ -47,29 +35,29 @@ async function fixTableSequence(table: string, dbTableName: string) {
       }
     }
 
-    if (maxId === 0) {
-      await db.execute(sql`ALTER SEQUENCE ${toQualifiedIdentifier(sequenceName)} RESTART WITH 1`)
+    // 获取当前序列值
+    const currentSeqResult = await db.execute(sql.raw(`SELECT last_value FROM ${sequenceName}`))
+    const currentSeqValue = Number((currentSeqResult as any)[0]?.last_value || 0)
+
+    // 重置序列值到最大ID + 1
+    const newSequenceValue = maxId + 1
+
+    // 检查序列是否已经正确
+    if (currentSeqValue >= newSequenceValue) {
       return {
         success: true,
         table: table,
-        message: `表 ${table} 为空，序列已重置为 1`,
+        message: `表 ${table} 序列值已正确，无需修复`,
         data: {
           table: table,
-          maxId: 0,
-          newSequenceValue: 1,
-          sequenceName: sequenceName
+          maxId: maxId,
+          currentSequenceValue: currentSeqValue,
+          alreadyCorrect: true
         }
       }
     }
 
-    const currentSeqResult = await db.execute(
-      sql`SELECT last_value FROM ${toQualifiedIdentifier(sequenceName)}`
-    )
-    const currentSeqValue = Number(
-      getFirstRow<{ last_value: number | string }>(currentSeqResult)?.last_value || 0
-    )
-    const newSequenceValue = maxId
-    await db.execute(sql`SELECT setval(${toRegclass(sequenceName)}, ${newSequenceValue})`)
+    await db.execute(sql.raw(`SELECT setval('${sequenceName}', ${newSequenceValue})`))
 
     return {
       success: true,
@@ -99,7 +87,7 @@ export default defineEventHandler(async (event) => {
     if (!user || !['ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
       throw createError({
         statusCode: 403,
-        message: '需要管理员权限'
+        statusMessage: '需要管理员权限'
       })
     }
 
diff --git a/server/api/admin/notifications/send.post.ts b/server/api/admin/notifications/send.post.ts
index e85209b..6c8e831 100644
--- a/server/api/admin/notifications/send.post.ts
+++ b/server/api/admin/notifications/send.post.ts
@@ -1,220 +1,179 @@
-import { and, eq, or } from 'drizzle-orm'
 import { db } from '~/drizzle/db'
 import { users } from '~/drizzle/schema'
+import { and, eq, or } from 'drizzle-orm'
 import {
   createBatchSystemNotifications,
   createSystemNotification
-} from '~~/server/services/notificationService'
-import { createApiError } from '~~/server/utils/apiError'
-import { SERVER_ERROR_CODES } from '~~/server/config/constants'
-import {
-  canSendSystemNotification,
-  NOTIFICATION_CONTENT_MAX_LENGTH,
-  NOTIFICATION_TITLE_MAX_LENGTH,
-  resolveImportantFlag
-} from '~~/server/utils/important-notification-policy'
-
-type NotificationFilter = {
-  grade?: unknown
-  class?: unknown
-  classes?: unknown
-  userIds?: unknown
-}
-
-const supportedScopes = ['ALL', 'GRADE', 'CLASS', 'MULTI_CLASS', 'SPECIFIC_USERS'] as const
+} from '../../../services/notificationService'
+import { getClientIP } from '~~/server/utils/ip-utils'
 
 export default defineEventHandler(async (event) => {
+  // 检查用户是否为管理员
   const user = event.context.user
 
   if (!user) {
-    throw createApiError(401, SERVER_ERROR_CODES.NOTIFICATION_AUTH_REQUIRED, '需要登录才能发送通知')
+    throw createError({
+      statusCode: 401,
+      message: '未授权访问'
+    })
   }
 
-  if (!canSendSystemNotification(user.role)) {
-    throw createApiError(
-      403,
-      SERVER_ERROR_CODES.NOTIFICATION_ADMIN_REQUIRED,
-      '只有管理员可以发送系统通知'
-    )
+  if (!['ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
+    throw createError({
+      statusCode: 403,
+      message: '只有管理员可以发送系统通知'
+    })
   }
 
-  const body = await readBody<Record<string, unknown> | null>(event)
-  const sender = {
-    id: user.id,
-    name: user.name,
-    username: user.username
-  }
-  const title = typeof body?.title === 'string' ? body.title.trim() : ''
-  const rawContent = typeof body?.content === 'string' ? body.content : body?.message
-  const content = typeof rawContent === 'string' ? rawContent.trim() : ''
-  const important = resolveImportantFlag(body?.important)
+  try {
+    // 获取客户端IP地址
+    const clientIP = getClientIP(event)
 
-  if (important === null) {
-    throw createApiError(
-      400,
-      SERVER_ERROR_CODES.NOTIFICATION_IMPORTANT_INVALID,
-      '重要通知标记必须是布尔值'
-    )
-  }
+    // 获取请求数据
+    const body = await readBody(event)
+    const { title, message, content, scope, filter, userId, type } = body
 
-  if (!title || !content) {
-    throw createApiError(
-      400,
-      SERVER_ERROR_CODES.NOTIFICATION_TITLE_CONTENT_REQUIRED,
-      '通知标题和内容不能为空'
-    )
-  }
+    // 处理单个用户通知（用于权限变更等系统通知）
+    if (userId && title && (message || content)) {
+      const notificationContent = message || content
+      const result = await createSystemNotification(userId, title, notificationContent, clientIP)
 
-  if (title.length > NOTIFICATION_TITLE_MAX_LENGTH) {
-    throw createApiError(
-      400,
-      SERVER_ERROR_CODES.NOTIFICATION_TITLE_TOO_LONG,
-      `通知标题不能超过 ${NOTIFICATION_TITLE_MAX_LENGTH} 个字符`,
-      { params: [NOTIFICATION_TITLE_MAX_LENGTH] }
-    )
-  }
-
-  if (content.length > NOTIFICATION_CONTENT_MAX_LENGTH) {
-    throw createApiError(
-      400,
-      SERVER_ERROR_CODES.NOTIFICATION_CONTENT_TOO_LONG,
-      `通知正文不能超过 ${NOTIFICATION_CONTENT_MAX_LENGTH} 个字符`,
-      { params: [NOTIFICATION_CONTENT_MAX_LENGTH] }
-    )
-  }
-
-  const targetUserId = body?.userId
-  if (targetUserId !== undefined) {
-    // 兼容旧调用方传入数字字符串的情况
-    const normalizedUserId =
-      typeof targetUserId === 'string' && targetUserId.trim()
-        ? Number(targetUserId.trim())
-        : targetUserId
-    if (!Number.isInteger(normalizedUserId) || Number(normalizedUserId) <= 0) {
-      throw createApiError(400, SERVER_ERROR_CODES.NOTIFICATION_USER_ID_INVALID, '无效的用户 ID')
+      if (result) {
+        return {
+          success: true,
+          message: '通知发送成功',
+          sentCount: 1,
+          totalUsers: 1
+        }
+      } else {
+        throw createError({
+          statusCode: 500,
+          message: '发送通知失败'
+        })
+      }
     }
 
-    const result = await createSystemNotification(
-      Number(normalizedUserId),
-      title,
-      content,
-      important,
-      sender
-    )
+    // 验证批量通知请求数据
+    if (!title || !content) {
+      throw createError({
+        statusCode: 400,
+        message: '通知标题和内容不能为空'
+      })
+    }
+
+    if (!scope || !['ALL', 'GRADE', 'CLASS', 'MULTI_CLASS', 'SPECIFIC_USERS'].includes(scope)) {
+      throw createError({
+        statusCode: 400,
+        message: '无效的通知范围'
+      })
+    }
+
+    // 查询符合条件的用户IDs
+    let userIds: number[] = []
+
+    if (scope === 'ALL') {
+      // 查询所有用户
+      const allUsers = await db.select({ id: users.id }).from(users)
+      userIds = allUsers.map((user) => user.id)
+    } else if (scope === 'GRADE') {
+      // 按年级查询
+      if (!filter?.grade) {
+        throw createError({
+          statusCode: 400,
+          message: '年级不能为空'
+        })
+      }
+
+      const gradeUsers = await db
+        .select({ id: users.id })
+        .from(users)
+        .where(eq(users.grade, filter.grade))
+      userIds = gradeUsers.map((user) => user.id)
+    } else if (scope === 'CLASS') {
+      // 按单个班级查询
+      if (!filter?.grade || !filter?.class) {
+        throw createError({
+          statusCode: 400,
+          message: '年级和班级不能为空'
+        })
+      }
+
+      const classUsers = await db
+        .select({ id: users.id })
+        .from(users)
+        .where(and(eq(users.grade, filter.grade), eq(users.class, filter.class)))
+      userIds = classUsers.map((user) => user.id)
+    } else if (scope === 'MULTI_CLASS') {
+      // 按多个班级查询
+      if (!filter?.classes || !Array.isArray(filter.classes) || filter.classes.length === 0) {
+        throw createError({
+          statusCode: 400,
+          message: '未选择任何班级'
+        })
+      }
+
+      // 构建查询条件，使用OR连接多个班级条件
+      const whereConditions = filter.classes.map((cls: { grade: string; class: string }) =>
+        and(eq(users.grade, cls.grade), eq(users.class, cls.class))
+      )
+
+      const multiClassUsers = await db
+        .select({ id: users.id })
+        .from(users)
+        .where(or(...whereConditions))
+      userIds = multiClassUsers.map((user) => user.id)
+    } else if (scope === 'SPECIFIC_USERS') {
+      // 指定用户
+      if (!filter?.userIds || !Array.isArray(filter.userIds) || filter.userIds.length === 0) {
+        throw createError({
+          statusCode: 400,
+          message: '未选择任何用户'
+        })
+      }
+
+      userIds = filter.userIds
+    }
+
+    if (userIds.length === 0) {
+      return {
+        success: true,
+        message: '没有找到符合条件的用户',
+        sentCount: 0,
+        totalUsers: 0
+      }
+    }
+
+    // 使用通知服务批量发送通知
+    const result = await createBatchSystemNotifications(userIds, title, content, clientIP)
+
     if (!result) {
-      throw createApiError(500, SERVER_ERROR_CODES.NOTIFICATION_SEND_FAILED, '发送通知失败')
+      throw new Error('发送通知失败')
+    }
+
+    // 处理结果
+    let sentCount = 0
+    let totalUsers = userIds.length
+
+    // 判断result类型
+    if (Array.isArray(result)) {
+      sentCount = result.length
+    } else if (result && typeof result === 'object' && 'count' in result) {
+      sentCount = result.count
+      totalUsers = result.total || userIds.length
     }
 
     return {
       success: true,
       message: '通知发送成功',
-      sentCount: 1,
-      totalUsers: 1
+      sentCount,
+      totalUsers
     }
-  }
+  } catch (error: any) {
+    console.error('发送通知失败:', error)
 
-  const scope = typeof body?.scope === 'string' ? body.scope : ''
-  if (!supportedScopes.includes(scope as (typeof supportedScopes)[number])) {
-    throw createApiError(400, SERVER_ERROR_CODES.NOTIFICATION_SCOPE_INVALID, '无效的通知范围')
-  }
-
-  const filter = (
-    body?.filter && typeof body.filter === 'object' ? body.filter : {}
-  ) as NotificationFilter
-  let userIds: number[]
-
-  // 仅向活跃状态的用户发送通知，排除已退学/毕业用户
-  const activeUserCondition = eq(users.status, 'active')
-
-  if (scope === 'ALL') {
-    const allUsers = await db.select({ id: users.id }).from(users).where(activeUserCondition)
-    userIds = allUsers.map((target) => target.id)
-  } else if (scope === 'GRADE') {
-    const grade = typeof filter.grade === 'string' ? filter.grade.trim() : ''
-    if (!grade) {
-      throw createApiError(400, SERVER_ERROR_CODES.NOTIFICATION_GRADE_REQUIRED, '年级不能为空')
-    }
-
-    const gradeUsers = await db.select({ id: users.id }).from(users).where(and(eq(users.grade, grade), activeUserCondition))
-    userIds = gradeUsers.map((target) => target.id)
-  } else if (scope === 'CLASS') {
-    const grade = typeof filter.grade === 'string' ? filter.grade.trim() : ''
-    const className = typeof filter.class === 'string' ? filter.class.trim() : ''
-    if (!grade || !className) {
-      throw createApiError(
-        400,
-        SERVER_ERROR_CODES.NOTIFICATION_GRADE_CLASS_REQUIRED,
-        '年级和班级不能为空'
-      )
-    }
-
-    const classUsers = await db
-      .select({ id: users.id })
-      .from(users)
-      .where(and(eq(users.grade, grade), eq(users.class, className), activeUserCondition))
-    userIds = classUsers.map((target) => target.id)
-  } else if (scope === 'MULTI_CLASS') {
-    if (!Array.isArray(filter.classes) || filter.classes.length === 0) {
-      throw createApiError(400, SERVER_ERROR_CODES.NOTIFICATION_CLASSES_REQUIRED, '未选择任何班级')
-    }
-
-    const classes = filter.classes.map((entry) => {
-      const candidate = entry && typeof entry === 'object' ? (entry as Record<string, unknown>) : {}
-      return {
-        grade: typeof candidate.grade === 'string' ? candidate.grade.trim() : '',
-        className: typeof candidate.class === 'string' ? candidate.class.trim() : ''
-      }
+    throw createError({
+      statusCode: error.statusCode || 500,
+      message: error.message || '发送通知失败'
     })
-
-    if (classes.some((entry) => !entry.grade || !entry.className)) {
-      throw createApiError(400, SERVER_ERROR_CODES.NOTIFICATION_CLASSES_REQUIRED, '班级信息不完整')
-    }
-
-    const whereConditions = classes.map((entry) =>
-      and(eq(users.grade, entry.grade), eq(users.class, entry.className), activeUserCondition)
-    )
-    const multiClassUsers = await db
-      .select({ id: users.id })
-      .from(users)
-      .where(or(...whereConditions))
-    userIds = multiClassUsers.map((target) => target.id)
-  } else {
-    if (!Array.isArray(filter.userIds) || filter.userIds.length === 0) {
-      throw createApiError(400, SERVER_ERROR_CODES.NOTIFICATION_USERS_REQUIRED, '未选择任何用户')
-    }
-
-    if (filter.userIds.some((id) => !Number.isInteger(id) || Number(id) <= 0)) {
-      throw createApiError(
-        400,
-        SERVER_ERROR_CODES.NOTIFICATION_USER_ID_INVALID,
-        '用户 ID 列表包含无效值'
-      )
-    }
-
-    userIds = [...new Set(filter.userIds.map(Number))]
-  }
-
-  if (userIds.length === 0) {
-    return {
-      success: true,
-      message: '没有找到符合条件的用户',
-      sentCount: 0,
-      totalUsers: 0
-    }
-  }
-
-  const result = await createBatchSystemNotifications(userIds, title, content, important, sender)
-  if (!result) {
-    throw createApiError(500, SERVER_ERROR_CODES.NOTIFICATION_SEND_FAILED, '发送通知失败')
-  }
-
-  const sentCount = Array.isArray(result) ? result.length : result.count
-  const totalUsers = Array.isArray(result) ? userIds.length : result.total || userIds.length
-
-  return {
-    success: true,
-    message: '通知发送成功',
-    sentCount,
-    totalUsers
   }
 })
diff --git a/server/api/admin/play-times/[id].ts b/server/api/admin/play-times/[id].ts
index d474da1..a4114d2 100644
--- a/server/api/admin/play-times/[id].ts
+++ b/server/api/admin/play-times/[id].ts
@@ -1,4 +1,5 @@
 import { db } from '~/drizzle/db'
+import { CacheService } from '../../../services/cacheService'
 import { playTimes, schedules, songs } from '~/drizzle/schema'
 import { and, count, eq, ne } from 'drizzle-orm'
 
@@ -13,7 +14,7 @@ export default defineEventHandler(async (event) => {
     })
   }
 
-  if (!['SONG_ADMIN', 'ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
+  if (!['ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
     throw createError({
       statusCode: 403,
       message: '只有管理员才能访问播出时段'
@@ -120,6 +121,16 @@ export default defineEventHandler(async (event) => {
         .returning()
       const updatedPlayTime = updatedPlayTimeResult[0]
 
+      // 清除相关缓存
+      try {
+        const cacheService = CacheService.getInstance()
+        await cacheService.clearSchedulesCache()
+        await cacheService.clearPlayTimesCache()
+        console.log('[Cache] 排期缓存已清除（播放时间更新）')
+      } catch (cacheError) {
+        console.warn('[Cache] 清除缓存失败:', cacheError)
+      }
+
       return updatedPlayTime
     } catch (error: any) {
       console.error('更新播出时段失败:', error)
@@ -172,6 +183,16 @@ export default defineEventHandler(async (event) => {
         .returning()
       const updatedPlayTime = updatedPlayTimeResult[0]
 
+      // 清除相关缓存
+      try {
+        const cacheService = CacheService.getInstance()
+        await cacheService.clearSchedulesCache()
+        await cacheService.clearPlayTimesCache()
+        console.log('[Cache] 排期缓存已清除（播放时间部分更新）')
+      } catch (cacheError) {
+        console.warn('[Cache] 清除缓存失败:', cacheError)
+      }
+
       return updatedPlayTime
     } catch (error: any) {
       console.error('部分更新播出时段失败:', error)
@@ -220,6 +241,19 @@ export default defineEventHandler(async (event) => {
         await db.update(schedules).set({ playTimeId: null }).where(eq(schedules.playTimeId, id))
       }
 
+      // 清除相关缓存
+      try {
+        const cacheService = CacheService.getInstance()
+        await cacheService.clearSchedulesCache()
+        await cacheService.clearPlayTimesCache()
+        if (songsCount > 0) {
+          await cacheService.clearSongsCache()
+        }
+        console.log('[Cache] 缓存已清除（播放时间删除）')
+      } catch (cacheError) {
+        console.warn('[Cache] 清除缓存失败:', cacheError)
+      }
+
       return {
         message: '播出时段已成功删除',
         affected: { songs: songsCount, schedules: schedulesCount }
diff --git a/server/api/admin/play-times/index.post.ts b/server/api/admin/play-times/index.post.ts
index cc860fd..c454ca6 100644
--- a/server/api/admin/play-times/index.post.ts
+++ b/server/api/admin/play-times/index.post.ts
@@ -13,7 +13,7 @@ export default defineEventHandler(async (event) => {
     })
   }
 
-  if (!['SONG_ADMIN', 'ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
+  if (!['ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
     throw createError({
       statusCode: 403,
       message: '只有管理员才能添加播出时段'
@@ -84,6 +84,16 @@ export default defineEventHandler(async (event) => {
       .returning()
     const newPlayTime = newPlayTimeResult[0]
 
+    // 清除相关缓存
+    try {
+      const { cache } = await import('~~/server/utils/cache-helpers')
+      await cache.deletePattern('schedules:*')
+      await cache.deletePattern('playtimes:*')
+      console.log('[Cache] 排期和播放时间缓存已清除（创建播放时间）')
+    } catch (cacheError) {
+      console.warn('清除缓存失败:', cacheError)
+    }
+
     return newPlayTime
   } catch (error: any) {
     console.error('创建播出时段失败:', error)
diff --git a/server/api/admin/play-times/index.ts b/server/api/admin/play-times/index.ts
index e16edd3..af6d73e 100644
--- a/server/api/admin/play-times/index.ts
+++ b/server/api/admin/play-times/index.ts
@@ -1,4 +1,5 @@
 import { asc, db, desc, playTimes } from '~/drizzle/db'
+import { CacheService } from '../../../services/cacheService'
 
 export default defineEventHandler(async (event) => {
   // 检查用户认证和权限
@@ -11,7 +12,7 @@ export default defineEventHandler(async (event) => {
     })
   }
 
-  if (!['SONG_ADMIN', 'ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
+  if (!['ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
     throw createError({
       statusCode: 403,
       message: '只有管理员才能管理播出时段'
@@ -19,11 +20,27 @@ export default defineEventHandler(async (event) => {
   }
 
   try {
+    // 尝试从缓存获取播放时间数据
+    const cacheService = CacheService.getInstance()
+    const cachedPlayTimes = await cacheService.getPlayTimes()
+
+    if (cachedPlayTimes) {
+      return cachedPlayTimes
+    }
+
+    // 缓存中没有，从数据库获取所有播出时段
     const playTimesResult = await db
       .select()
       .from(playTimes)
       .orderBy(desc(playTimes.enabled), asc(playTimes.startTime))
 
+    // 将数据存入缓存
+    try {
+      await cacheService.setPlayTimes(playTimesResult)
+    } catch (cacheError) {
+      console.warn('缓存播放时间数据失败:', cacheError)
+    }
+
     return playTimesResult
   } catch (error) {
     console.error('获取播出时段失败:', error)
diff --git a/server/api/admin/replay-requests/index.get.ts b/server/api/admin/replay-requests/index.get.ts
index e5df0c3..66b30ff 100644
--- a/server/api/admin/replay-requests/index.get.ts
+++ b/server/api/admin/replay-requests/index.get.ts
@@ -1,10 +1,10 @@
-import { db, songs, songReplayRequests, users } from '~/drizzle/db'
-import { desc, eq, sql, and } from 'drizzle-orm'
+import { db, songs, songReplayRequests, users, semesters } from '~/drizzle/db'
+import { desc, eq, sql, and, or } from 'drizzle-orm'
 
 export default defineEventHandler(async (event) => {
   // 1. 检查权限
   const user = event.context.user
-  if (!user || !['SONG_ADMIN', 'ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
+  if (!user || !['ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
     throw createError({ statusCode: 403, message: '权限不足' })
   }
 
@@ -20,49 +20,33 @@ export default defineEventHandler(async (event) => {
     conditions.push(eq(songReplayRequests.status, status as any))
   }
 
-  if (semesterName) {
+  if (semesterName && semesterName !== 'all') {
     conditions.push(eq(songs.semester, semesterName))
   }
 
   // 2. 查询
-  // 获取歌曲信息及重播申请数量，同时关联最新申请人信息
+  // 获取歌曲信息及重播申请数量，同时关联用户信息
   const requestsQuery = db
     .select({
-      song: {
-        id: songs.id,
-        createdAt: songs.createdAt,
-        updatedAt: songs.updatedAt,
-        title: songs.title,
-        artist: songs.artist,
-        requesterId: songs.requesterId,
-        played: songs.played,
-        playedAt: songs.playedAt,
-        semester: songs.semester,
-        preferredPlayTimeId: songs.preferredPlayTimeId,
-        cover: songs.cover,
-        playUrl: songs.playUrl,
-        musicPlatform: songs.musicPlatform,
-        musicId: songs.musicId,
-        durationSeconds: songs.durationSeconds,
-        submissionNote: songs.submissionNote,
-        submissionNotePublic: songs.submissionNotePublic,
-        hitRequestId: songs.hitRequestId
+      song: songs,
+      requester: {
+        id: users.id,
+        name: users.name,
+        grade: users.grade,
+        class: users.class
       },
-      // insert-only 模型下同一用户可能有多条申请，按申请人去重计数
-      requestCount: sql<number>`count(distinct ${songReplayRequests.userId})`
+      requestCount: sql<number>`count(${songReplayRequests.id})`
         .mapWith(Number)
         .as('request_count'),
       lastRequestedAt: sql<string>`max(${songReplayRequests.createdAt})`.as('last_requested_at')
     })
     .from(songs)
     .innerJoin(songReplayRequests, eq(songs.id, songReplayRequests.songId))
-    .groupBy(songs.id)
+    .leftJoin(users, eq(songs.requesterId, users.id))
+    .where(conditions.length > 0 ? and(...conditions) : undefined)
+    .groupBy(songs.id, users.id, users.name, users.grade, users.class)
     .orderBy(desc(sql`request_count`))
 
-  if (conditions.length > 0) {
-    requestsQuery.where(and(...conditions))
-  }
-
   const requests = await requestsQuery
 
   // 获取所有用户姓名，用于处理同名情况
@@ -83,53 +67,47 @@ export default defineEventHandler(async (event) => {
     }
   })
 
-  const formatDisplayName = (userObj: any) => {
-    if (!userObj || !userObj.name) return '未知用户'
-    let displayName = userObj.name
-
-    const sameNameUsers = nameToUsers.get(displayName)
-    if (sameNameUsers && sameNameUsers.length > 1) {
-      if (userObj.grade) {
-        displayName = `${displayName}（${userObj.grade}）`
-      }
-    }
-    return displayName
+  const formatClassInfo = (userObj: any) => {
+    if (!userObj) return ''
+    const parts: string[] = []
+    if (userObj.grade) parts.push(String(userObj.grade))
+    if (userObj.class) parts.push(String(userObj.class))
+    return parts.join(' ').trim()
   }
 
-  // 获取详细的重播申请人信息
-  const requestDetailsQuery = db
-    .select({
-      id: songReplayRequests.id,
-      songId: songReplayRequests.songId,
-      user: {
-        id: users.id,
-        name: users.name,
-        grade: users.grade,
-        class: users.class
-      },
-      createdAt: songReplayRequests.createdAt,
-      status: songReplayRequests.status,
-      preferredPlayTimeId: songReplayRequests.preferredPlayTimeId,
-      submissionNote: songReplayRequests.submissionNote,
-      submissionNotePublic: songReplayRequests.submissionNotePublic,
-      submissionNotePublicStatus: songReplayRequests.submissionNotePublicStatus
-    })
-    .from(songReplayRequests)
-    .innerJoin(users, eq(songReplayRequests.userId, users.id))
-    .innerJoin(songs, eq(songReplayRequests.songId, songs.id))
-    .orderBy(desc(songReplayRequests.createdAt))
+  const formatDisplayName = (userObj: any) => {
+    if (!userObj) return '未知用户'
+    const name = userObj.name ? String(userObj.name).trim() : ''
+    const classInfo = formatClassInfo(userObj)
+    if (!name) return classInfo || '未知用户'
+    return classInfo ? `${classInfo} ${name}` : name
+  }
 
   const subConditions = []
   if (status !== 'ALL') {
     subConditions.push(eq(songReplayRequests.status, status as any))
   }
-  if (semesterName) {
+  if (semesterName && semesterName !== 'all') {
     subConditions.push(eq(songs.semester, semesterName))
   }
 
-  if (subConditions.length > 0) {
-    requestDetailsQuery.where(and(...subConditions))
-  }
+  // 获取详细的重播申请人信息
+  let requestDetailsQuery = db
+    .select({
+      songId: songReplayRequests.songId,
+      user: {
+        name: users.name,
+        grade: users.grade,
+        class: users.class
+      },
+      createdAt: songReplayRequests.createdAt,
+      status: songReplayRequests.status
+    })
+    .from(songReplayRequests)
+    .innerJoin(users, eq(songReplayRequests.userId, users.id))
+    .innerJoin(songs, eq(songReplayRequests.songId, songs.id))
+    .where(subConditions.length > 0 ? and(...subConditions) : undefined)
+    .orderBy(desc(songReplayRequests.createdAt))
 
   const requestDetails = await requestDetailsQuery
 
@@ -137,50 +115,22 @@ export default defineEventHandler(async (event) => {
   requestDetails.forEach((d) => {
     if (!detailsMap.has(d.songId)) detailsMap.set(d.songId, [])
     detailsMap.get(d.songId).push({
-      id: d.id,
-      userId: d.user.id,
       name: formatDisplayName(d.user),
       grade: d.user.grade,
       class: d.user.class,
       createdAt: d.createdAt,
-      status: d.status,
-      preferredPlayTimeId: d.preferredPlayTimeId,
-      submissionNote: d.submissionNote,
-      submissionNotePublic: d.submissionNotePublic
+      status: d.status
     })
   })
 
-  return requests.map((item) => {
-    const requestDetails = detailsMap.get(item.song.id) || []
-    const latestRequest = requestDetails[0]
-
-    return {
-      ...item.song,
-      requesterId: latestRequest?.userId || null,
-      preferredPlayTimeId: latestRequest?.preferredPlayTimeId || null,
-      submissionNote: latestRequest?.submissionNote || null,
-      submissionNotePublic: latestRequest?.submissionNotePublic === true,
-      submissionNotePublicStatus: latestRequest?.submissionNotePublicStatus || null,
-      hasSubmissionNote: !!latestRequest?.submissionNote,
-      requester: latestRequest?.name || '未知用户',
-      requesterGrade: latestRequest?.grade || null,
-      requesterClass: latestRequest?.class || null,
-      replayRequestId: latestRequest?.id || null,
-      replayRequestCount: item.requestCount,
-      replayRequesters: requestDetails.map((request: any) => ({
-        id: request.userId,
-        name: request.name,
-        displayName: request.name,
-        grade: request.grade,
-        class: request.class,
-        status: request.status,
-        createdAt: request.createdAt
-      })),
-      isReplay: true,
-      voteCount: item.requestCount,
-      requestCount: item.requestCount,
-      lastRequestedAt: item.lastRequestedAt,
-      requestDetails
-    }
-  })
+  return requests.map((item) => ({
+    ...item.song,
+    requester: formatDisplayName(item.requester),
+    requesterGrade: item.requester?.grade,
+    requesterClass: item.requester?.class,
+    voteCount: item.requestCount,
+    requestCount: item.requestCount,
+    lastRequestedAt: item.lastRequestedAt,
+    requestDetails: detailsMap.get(item.song.id) || []
+  }))
 })
diff --git a/server/api/admin/replay-requests/reject.post.ts b/server/api/admin/replay-requests/reject.post.ts
index 42aef63..c1612e8 100644
--- a/server/api/admin/replay-requests/reject.post.ts
+++ b/server/api/admin/replay-requests/reject.post.ts
@@ -5,7 +5,7 @@ import { createReplayRequestRejectedNotification } from '~~/server/services/noti
 export default defineEventHandler(async (event) => {
   // 检查管理员权限
   const user = event.context.user
-  if (!user || !['SONG_ADMIN', 'ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
+  if (!user || !['ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
     throw createError({ statusCode: 403, message: '权限不足' })
   }
 
@@ -40,13 +40,15 @@ export default defineEventHandler(async (event) => {
     .where(and(eq(songReplayRequests.songId, songId), eq(songReplayRequests.status, 'PENDING')))
 
   // 发送通知
+  const ipAddress = getRequestIP(event, { xForwardedFor: true })
   for (const req of pendingRequests) {
     await createReplayRequestRejectedNotification(
       req.userId,
       {
         title: song.title,
         artist: song.artist
-      }
+      },
+      ipAddress
     )
   }
 
diff --git a/server/api/admin/request-times/[id].ts b/server/api/admin/request-times/[id].ts
index 20c2bb8..18a8912 100644
--- a/server/api/admin/request-times/[id].ts
+++ b/server/api/admin/request-times/[id].ts
@@ -12,7 +12,7 @@ export default defineEventHandler(async (event) => {
     })
   }
 
-  if (!['SONG_ADMIN', 'ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
+  if (!['ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
     throw createError({
       statusCode: 403,
       message: '只有管理员才能访问投稿开放时段'
@@ -100,6 +100,14 @@ export default defineEventHandler(async (event) => {
         .returning()
       const updatedRequestTime = updatedRequestTimeResult[0]
 
+      try {
+        const { cache } = await import('~~/server/utils/cache-helpers')
+        await cache.deletePattern('schedules:*')
+        console.log('[Cache] 排期缓存已清除（播放时间更新）')
+      } catch (cacheError) {
+        console.warn('[Cache] 清除缓存失败:', cacheError)
+      }
+
       return updatedRequestTime
     } catch (error: any) {
       console.error('更新投稿开放时段失败:', error)
@@ -148,6 +156,14 @@ export default defineEventHandler(async (event) => {
         .returning()
       const updatedRequestTime = updatedRequestTimeResult[0]
 
+      try {
+        const { cache } = await import('~~/server/utils/cache-helpers')
+        await cache.deletePattern('schedules:*')
+        console.log('[Cache] 排期缓存已清除（播放时间部分更新）')
+      } catch (cacheError) {
+        console.warn('[Cache] 清除缓存失败:', cacheError)
+      }
+
       return updatedRequestTime
     } catch (error: any) {
       console.error('部分更新投稿开放时段失败:', error)
@@ -169,6 +185,14 @@ export default defineEventHandler(async (event) => {
         .returning()
       const deletedRequestTime = deletedRequestTimeResult[0]
 
+      try {
+        const { cache } = await import('~~/server/utils/cache-helpers')
+        await cache.deletePattern('schedules:*')
+        console.log('[Cache] 缓存已清除（播放时间删除）')
+      } catch (cacheError) {
+        console.warn('[Cache] 清除缓存失败:', cacheError)
+      }
+
       return {
         message: '投稿开放时段已成功删除'
       }
diff --git a/server/api/admin/request-times/index.post.ts b/server/api/admin/request-times/index.post.ts
index 9a0527f..3419ba9 100644
--- a/server/api/admin/request-times/index.post.ts
+++ b/server/api/admin/request-times/index.post.ts
@@ -12,7 +12,7 @@ export default defineEventHandler(async (event) => {
     })
   }
 
-  if (!['SONG_ADMIN', 'ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
+  if (!['ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
     throw createError({
       statusCode: 403,
       message: '只有管理员才能添加投稿开放时段'
@@ -83,6 +83,15 @@ export default defineEventHandler(async (event) => {
       .returning()
     const newRequestTime = newRequestTimeResult[0]
 
+    try {
+      const { cache } = await import('~~/server/utils/cache-helpers')
+      await cache.deletePattern('schedules:*')
+      await cache.deletePattern('requestTimes:*')
+      console.log('[Cache] 排期和播放时间缓存已清除（创建播放时间）')
+    } catch (cacheError) {
+      console.warn('清除缓存失败:', cacheError)
+    }
+
     return newRequestTime
   } catch (error: any) {
     console.error('创建投稿开放时段失败:', error)
diff --git a/server/api/admin/request-times/index.ts b/server/api/admin/request-times/index.ts
index 065eac7..223e720 100644
--- a/server/api/admin/request-times/index.ts
+++ b/server/api/admin/request-times/index.ts
@@ -12,7 +12,7 @@ export default defineEventHandler(async (event) => {
     })
   }
 
-  if (!['SONG_ADMIN', 'ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
+  if (!['ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
     throw createError({
       statusCode: 403,
       message: '只有管理员才能管理投稿开放时段'
diff --git a/server/api/admin/roles/index.get.ts b/server/api/admin/roles/index.get.ts
new file mode 100644
index 0000000..f7d2c68
--- /dev/null
+++ b/server/api/admin/roles/index.get.ts
@@ -0,0 +1,14 @@
+import { ROLES } from '~~/server/utils/permissions'
+
+export default defineEventHandler((event) => {
+  const user = event.context.user
+
+  if (!user || user.role !== 'SUPER_ADMIN') {
+    throw createError({
+      statusCode: 403,
+      message: '只有超级管理员可以访问角色配置'
+    })
+  }
+
+  return ROLES
+})
diff --git a/server/api/admin/roles/index.put.ts b/server/api/admin/roles/index.put.ts
new file mode 100644
index 0000000..c2f8007
--- /dev/null
+++ b/server/api/admin/roles/index.put.ts
@@ -0,0 +1,46 @@
+import { ROLES, saveRolesConfig } from '~~/server/utils/permissions'
+
+export default defineEventHandler(async (event) => {
+  const user = event.context.user
+
+  if (!user || user.role !== 'SUPER_ADMIN') {
+    throw createError({
+      statusCode: 403,
+      message: '只有超级管理员可以修改角色配置'
+    })
+  }
+
+  const body = await readBody(event)
+  
+  if (!body || typeof body !== 'object') {
+    throw createError({
+      statusCode: 400,
+      message: '无效的角色配置数据'
+    })
+  }
+  
+  // 保护 SUPER_ADMIN 的关键权限不被移除
+  if (body.SUPER_ADMIN) {
+    const requiredPages = ['roles', 'users', 'site-config']
+    const hasRequired = requiredPages.every(p => body.SUPER_ADMIN.pages.includes(p))
+    if (!hasRequired) {
+      requiredPages.forEach(p => {
+        if (!body.SUPER_ADMIN.pages.includes(p)) {
+          body.SUPER_ADMIN.pages.push(p)
+        }
+      })
+    }
+    body.SUPER_ADMIN.canAccessAdmin = true
+  }
+
+  const success = saveRolesConfig(body)
+
+  if (!success) {
+    throw createError({
+      statusCode: 500,
+      message: '保存角色配置失败'
+    })
+  }
+
+  return { success: true, message: '角色配置已保存' }
+})
diff --git a/server/api/admin/schedule.post.ts b/server/api/admin/schedule.post.ts
index 42a095c..44f6905 100644
--- a/server/api/admin/schedule.post.ts
+++ b/server/api/admin/schedule.post.ts
@@ -1,10 +1,17 @@
 import { db } from '~/drizzle/db'
-import { schedules, songs } from '~/drizzle/schema'
-import { and, desc, eq, gte, lte, ne } from 'drizzle-orm'
-import { createSongSelectedNotification, createReplaySongSelectedNotification } from '../../services/notificationService'
-import { redeemCardCodeForSchedule } from '~~/server/services/cardCodeLifecycleService'
-import { fulfillReplayRequestsForSchedule } from '~~/server/utils/scheduleReplayBinding'
-import { getServerDate } from '~~/server/utils/serverTime'
+import {
+  playTimes,
+  schedules,
+  songs,
+  users,
+  votes,
+  songReplayRequests,
+  scheduleSongPool
+} from '~/drizzle/schema'
+import { and, asc, count, desc, eq, gte, lte } from 'drizzle-orm'
+import { createSongSelectedNotification } from '../../services/notificationService'
+import { cacheService } from '~~/server/services/cacheService'
+import { getClientIP } from '~~/server/utils/ip-utils'
 
 export default defineEventHandler(async (event) => {
   // 检查用户认证和权限
@@ -36,12 +43,6 @@ export default defineEventHandler(async (event) => {
   // 检查是否为草稿模式（默认直接发布）
   const isDraft = body.isDraft === true
 
-  // 前端显式选择的重播申请，发布时优先绑定
-  const preferredReplayRequestId =
-    Number.isInteger(Number(body.replayRequestId)) && Number(body.replayRequestId) > 0
-      ? Number(body.replayRequestId)
-      : null
-
   try {
     // 检查歌曲是否存在
     const songResult = await db.select().from(songs).where(eq(songs.id, body.songId)).limit(1)
@@ -55,7 +56,20 @@ export default defineEventHandler(async (event) => {
       })
     }
 
-    const transactionResult = await db.transaction(async (tx) => {
+    await db.transaction(async (tx) => {
+      // 检查是否已经为该歌曲创建过排期，如果有则删除旧的排期
+      const existingScheduleResult = await tx
+        .select()
+        .from(schedules)
+        .where(eq(schedules.songId, body.songId))
+        .limit(1)
+
+      const existingSchedule = existingScheduleResult[0]
+      if (existingSchedule) {
+        // 删除现有排期
+        await tx.delete(schedules).where(eq(schedules.id, existingSchedule.id))
+      }
+
       // 获取序号，如果未提供则查找当天最大序号+1
       let sequence = body.sequence || 1
 
@@ -81,8 +95,9 @@ export default defineEventHandler(async (event) => {
           .orderBy(desc(schedules.sequence))
           .limit(1)
 
-        const latestSchedule = sameDaySchedules[0]
-        if (latestSchedule) sequence = (latestSchedule.sequence || 0) + 1
+        if (sameDaySchedules.length > 0) {
+          sequence = (sameDaySchedules[0].sequence || 0) + 1
+        }
       }
 
       // 解析输入的日期字符串，确保日期正确
@@ -102,120 +117,219 @@ export default defineEventHandler(async (event) => {
           playTimeId: body.playTimeId || null,
           // 草稿支持：根据参数决定是否为草稿
           isDraft: isDraft,
-          publishedAt: isDraft ? null : getServerDate()
+          publishedAt: isDraft ? null : new Date()
         })
         .returning()
 
-      const createdSchedule = scheduleResult[0]
-      if (!createdSchedule) {
-        throw createError({ statusCode: 500, message: '创建排期失败' })
-      }
-
       const schedule = {
-        ...createdSchedule,
+        ...scheduleResult[0],
         song: {
           id: song.id,
           title: song.title,
           artist: song.artist,
-          requesterId: song.requesterId,
-          cardCodeId: song.cardCodeId
+          requesterId: song.requesterId
         }
       }
 
-      let shouldNotify = false
-      let replayRequesterIds: number[] = []
+      // 获取客户端IP地址
+      const clientIP = getClientIP(event)
 
-      // 只有在非草稿模式下才更新重播状态
+      await tx
+        .update(scheduleSongPool)
+        .set({
+          status: 'ASSIGNED',
+          targetPlayDate: playDate
+        })
+        .where(
+          and(
+            eq(scheduleSongPool.songId, body.songId),
+            eq(scheduleSongPool.status, 'PENDING')
+          )
+        )
+
+      // 只有在非草稿模式下才创建通知
       if (!isDraft) {
-        // 检查该歌曲是否已经有其他已发布的排期
-        const existingPublished = await tx
-          .select({ id: schedules.id })
-          .from(schedules)
+        await createSongSelectedNotification(
+          schedule.song.requesterId,
+          schedule.song.id,
+          {
+            title: schedule.song.title,
+            artist: schedule.song.artist,
+            playDate: schedule.playDate
+          },
+          clientIP
+        )
+
+        // 标记该歌曲的所有待处理重播申请为已完成
+        await tx
+          .update(songReplayRequests)
+          .set({ status: 'FULFILLED' })
           .where(
             and(
-              eq(schedules.songId, schedule.song.id),
-              eq(schedules.isDraft, false),
-              ne(schedules.id, createdSchedule.id)
+              eq(songReplayRequests.songId, schedule.song.id),
+              eq(songReplayRequests.status, 'PENDING')
             )
           )
-          .limit(1)
-
-        // 如果之前没有正式发布过，才发送通知（首次排期通知）
-        shouldNotify = existingPublished.length === 0
-
-        const replayBinding = await fulfillReplayRequestsForSchedule({
-          tx,
-          songId: schedule.song.id,
-          scheduleId: createdSchedule.id,
-          at: createdSchedule.publishedAt || getServerDate(),
-          preferredRequestId: preferredReplayRequestId || undefined
-        })
-
-        if (replayBinding) {
-          replayRequesterIds = replayBinding.replayRequesterIds
-        }
-
-        if (existingPublished.length > 0) {
-          console.log(`歌曲 ${schedule.song.id} 已有其他正式排期，不再重复发送通知`)
-        }
-
-        await redeemCardCodeForSchedule(tx, {
-          songId: schedule.song.id,
-          cardCodeId: schedule.song.cardCodeId,
-          operatorId: user.id,
-          at: createdSchedule.publishedAt || getServerDate()
-        })
       }
-
-      return { schedule, shouldNotify, replayRequesterIds }
     })
 
-    let notificationSent = true
-    if (transactionResult.shouldNotify) {
-      try {
-        await createSongSelectedNotification(song.requesterId, song.id, {
-          title: song.title,
-          artist: song.artist,
-          playDate: transactionResult.schedule.playDate
+    // 清除相关缓存
+    try {
+      await cacheService.clearSchedulesCache()
+      await cacheService.clearSongsCache() // 清除歌曲列表缓存，确保scheduled状态更新
+      console.log(`[Cache] 排期缓存和歌曲列表缓存已清除（${isDraft ? '保存草稿' : '创建排期'}）`)
+    } catch (cacheError) {
+      console.error('[Cache] 清除缓存失败:', cacheError)
+    }
+
+    // 重新缓存完整的排期列表
+    try {
+      // 获取所有排期数据
+      const schedulesData = await db
+        .select({
+          id: schedules.id,
+          playDate: schedules.playDate,
+          sequence: schedules.sequence,
+          played: schedules.played,
+          playTimeId: schedules.playTimeId,
+          songId: schedules.songId,
+          songTitle: songs.title,
+          songArtist: songs.artist,
+          songRequesterId: songs.requesterId,
+          songPlayed: songs.played,
+          songCover: songs.cover,
+          songMusicPlatform: songs.musicPlatform,
+          songMusicId: songs.musicId,
+          songPlayUrl: songs.playUrl,
+          songSemester: songs.semester,
+          requesterName: users.name,
+          requesterGrade: users.grade,
+          requesterClass: users.class,
+          playTimeName: playTimes.name,
+          playTimeStartTime: playTimes.startTime,
+          playTimeEndTime: playTimes.endTime,
+          playTimeEnabled: playTimes.enabled
         })
-      } catch (notificationError) {
-        notificationSent = false
-        console.error('排期已创建，但发送歌曲入选通知失败:', notificationError)
-      }
-    }
+        .from(schedules)
+        .innerJoin(songs, eq(schedules.songId, songs.id))
+        .innerJoin(users, eq(songs.requesterId, users.id))
+        .leftJoin(playTimes, eq(schedules.playTimeId, playTimes.id))
+        .orderBy(asc(schedules.playDate))
 
-    // 发送重播申请已安排通知
-    if (!isDraft && transactionResult.replayRequesterIds.length > 0) {
-      for (const replayUserId of transactionResult.replayRequesterIds) {
-        try {
-          await createReplaySongSelectedNotification(replayUserId, song.id, {
-            title: song.title,
-            artist: song.artist,
-            playDate: transactionResult.schedule.playDate
-          }, transactionResult.schedule.id)
-        } catch (error) {
-          console.error(`发送重播安排通知给用户 ${replayUserId} 失败:`, error)
+      // 获取所有用户的姓名列表，用于检测同名用户
+      const allUsers = await db
+        .select({
+          id: users.id,
+          name: users.name,
+          grade: users.grade,
+          class: users.class
+        })
+        .from(users)
+
+      // 创建姓名到用户数组的映射
+      const nameToUsers = new Map()
+      allUsers.forEach((user) => {
+        if (user.name) {
+          if (!nameToUsers.has(user.name)) {
+            nameToUsers.set(user.name, [])
+          }
+          nameToUsers.get(user.name).push(user)
         }
-      }
-    }
+      })
 
-    const schedule = transactionResult.schedule
+      // 获取每首歌的投票数
+      const songIds = schedulesData.map((s) => s.songId)
+      const voteCounts = await Promise.all(
+        songIds.map(async (songId) => {
+          const voteCountResult = await db
+            .select({ count: count() })
+            .from(votes)
+            .where(eq(votes.songId, songId))
+          return { songId, count: voteCountResult[0].count }
+        })
+      )
+
+      const voteCountMap = new Map(voteCounts.map((v) => [v.songId, v.count]))
+
+      // 转换数据格式
+      const formattedSchedules = schedulesData.map((schedule) => {
+        const dateOnly = schedule.playDate
+
+        // 处理投稿人姓名，如果是同名用户则添加后缀
+        let requesterName = schedule.requesterName || '未知用户'
+
+        const sameNameUsers = nameToUsers.get(requesterName)
+        if (sameNameUsers && sameNameUsers.length > 1) {
+          if (schedule.requesterGrade) {
+            const sameGradeUsers = sameNameUsers.filter(
+              (u: {
+                id: number
+                name: string | null
+                grade: string | null
+                class: string | null
+              }) => u.grade === schedule.requesterGrade
+            )
+
+            if (sameGradeUsers.length > 1 && schedule.requesterClass) {
+              requesterName = `${requesterName}（${schedule.requesterGrade} ${schedule.requesterClass}）`
+            } else {
+              requesterName = `${requesterName}（${schedule.requesterGrade}）`
+            }
+          }
+        }
+
+        return {
+          id: schedule.id,
+          playDate: dateOnly.toISOString().split('T')[0],
+          sequence: schedule.sequence || 1,
+          played: schedule.played || false,
+          playTimeId: schedule.playTimeId,
+          playTime: schedule.playTimeName
+            ? {
+                id: schedule.playTimeId,
+                name: schedule.playTimeName,
+                startTime: schedule.playTimeStartTime,
+                endTime: schedule.playTimeEndTime,
+                enabled: schedule.playTimeEnabled
+              }
+            : null,
+          song: {
+            id: schedule.songId,
+            title: schedule.songTitle,
+            artist: schedule.songArtist,
+            requester: requesterName,
+            voteCount: voteCountMap.get(schedule.songId) || 0,
+            played: schedule.songPlayed || false,
+            cover: schedule.songCover || null,
+            musicPlatform: schedule.songMusicPlatform || null,
+            musicId: schedule.songMusicId || null,
+            playUrl: schedule.songPlayUrl || null,
+            semester: schedule.songSemester || null
+          }
+        }
+      })
+
+      const completeSchedules = formattedSchedules
+
+      // 重新缓存完整的排期列表
+      if (completeSchedules && completeSchedules.length > 0) {
+        await cacheService.setSchedulesList(completeSchedules)
+        console.log(`[Cache] 完整排期列表已重新缓存，数量: ${completeSchedules.length}`)
+      } else {
+        console.log('[Cache] 没有排期数据需要缓存')
+      }
+    } catch (cacheError) {
+      console.warn('[Cache] 重新缓存完整排期列表失败，但不影响排期创建:', cacheError)
+    }
 
     return {
       ...schedule,
       isDraft: isDraft,
       publishedAt: isDraft ? null : schedule.publishedAt,
-      message: isDraft
-        ? '排期草稿保存成功'
-        : transactionResult.shouldNotify
-          ? notificationSent
-            ? '排期创建成功，通知已发送'
-            : '排期创建成功，但通知发送失败'
-          : '排期创建成功'
+      message: isDraft ? '排期草稿保存成功' : '排期创建成功，通知已发送'
     }
   } catch (error: any) {
     console.error('创建排期失败:', error)
-    if (error.statusCode) throw error
     throw createError({
       statusCode: 500,
       message: error.message || '创建排期失败'
diff --git a/server/api/admin/schedule/bulk-publish.post.ts b/server/api/admin/schedule/bulk-publish.post.ts
index e4567af..b2d6b91 100644
--- a/server/api/admin/schedule/bulk-publish.post.ts
+++ b/server/api/admin/schedule/bulk-publish.post.ts
@@ -1,17 +1,9 @@
 import { db } from '~/drizzle/db'
-import { schedules, songs } from '~/drizzle/schema'
-import { inArray, and, eq, gte, lte } from 'drizzle-orm'
-import { createSongSelectedNotification, createReplaySongSelectedNotification } from '~~/server/services/notificationService'
+import { playTimes, schedules, songs, songReplayRequests } from '~/drizzle/schema'
+import { and, eq, gte, lte, inArray } from 'drizzle-orm'
+import { createSongSelectedNotification } from '~~/server/services/notificationService'
+import { cacheService } from '~~/server/services/cacheService'
 import { getClientIP } from '~~/server/utils/ip-utils'
-import {
-  redeemCardCodeForSchedule,
-  restoreCardCodeAfterScheduleRemoval
-} from '~~/server/services/cardCodeLifecycleService'
-import {
-  fulfillReplayRequestsForSchedule,
-  restoreReplayRequestsToPending
-} from '~~/server/utils/scheduleReplayBinding'
-import { getServerDate } from '~~/server/utils/serverTime'
 
 export default defineEventHandler(async (event) => {
   // 检查用户认证和权限
@@ -41,27 +33,6 @@ export default defineEventHandler(async (event) => {
     })
   }
 
-  const scheduleItems: Array<{ songId: number; sequence: number; replayRequestId: number | null }> =
-    (body.songs as any[]).map((item: any, index: number) => {
-      const songId = Number(item?.songId)
-      const sequence = Number(item?.sequence)
-      if (
-        !Number.isInteger(songId) ||
-        songId <= 0 ||
-        !Number.isInteger(sequence) ||
-        sequence <= 0
-      ) {
-        throw createError({ statusCode: 400, message: `第 ${index + 1} 条排期数据无效` })
-      }
-      // 管理员拖拽时显式选择的重播申请，发布时优先绑定
-      const replayRequestId = Number(item?.replayRequestId)
-      return {
-        songId,
-        sequence,
-        replayRequestId: Number.isInteger(replayRequestId) && replayRequestId > 0 ? replayRequestId : null
-      }
-    })
-
   const clientIP = getClientIP(event)
   const startTime = Date.now()
 
@@ -76,7 +47,7 @@ export default defineEventHandler(async (event) => {
     const playTimeId = body.playTimeId ? parseInt(body.playTimeId) : null
 
     // 获取所有涉及的歌曲详情（用于通知）
-    const songIds = scheduleItems.map((item) => item.songId)
+    const songIds = body.songs.map((s: any) => s.songId)
     if (songIds.length === 0) {
       // 如果列表为空，说明是清空排期，直接执行删除逻辑即可
     }
@@ -85,13 +56,6 @@ export default defineEventHandler(async (event) => {
       songIds.length > 0 ? await db.select().from(songs).where(inArray(songs.id, songIds)) : []
 
     const songMap = new Map(songDetails.map((s: any) => [s.id, s]))
-    const missingSongIds = Array.from(new Set(songIds)).filter((songId) => !songMap.has(songId))
-    if (missingSongIds.length > 0) {
-      throw createError({
-        statusCode: 404,
-        message: `歌曲不存在：${missingSongIds.join(', ')}`
-      })
-    }
 
     // 需要发送通知的列表
     const notificationsToSend: Array<{
@@ -99,12 +63,6 @@ export default defineEventHandler(async (event) => {
       songId: number
       songInfo: { title: string; artist: string; playDate: Date }
     }> = []
-    const replayNotificationsToSend: Array<{
-      userId: number
-      songId: number
-      songInfo: { title: string; artist: string; playDate: Date }
-      scheduleId: number
-    }> = []
 
     // 开始事务
     await db.transaction(async (tx) => {
@@ -118,142 +76,43 @@ export default defineEventHandler(async (event) => {
         whereConditions.push(eq(schedules.playTimeId, playTimeId))
       }
 
-      // 2. 查找全库内已发布的排期（用于避免重复发送通知）
-      const newSongIds = new Set<number>(scheduleItems.map((item) => item.songId))
-      const newSongIdsArray = Array.from(newSongIds)
-
-      const globalExistingPublished =
-        newSongIdsArray.length > 0
-          ? await tx
-              .select({ songId: schedules.songId })
-              .from(schedules)
-              .where(and(eq(schedules.isDraft, false), inArray(schedules.songId, newSongIdsArray)))
-          : []
-
-      const existingPublishedSongIds = new Set(globalExistingPublished.map((s) => s.songId))
-
-      const schedulesToDelete = await tx
+      // 2. 查找该时间段内已发布的排期（用于避免重复发送通知）
+      const existingPublished = await tx
         .select({
-          songId: schedules.songId,
-          isDraft: schedules.isDraft,
-          replayRequestId: schedules.replayRequestId,
-          cardCodeId: songs.cardCodeId
+          songId: schedules.songId
         })
         .from(schedules)
-        .leftJoin(songs, eq(schedules.songId, songs.id))
-        .where(and(...whereConditions))
+        .where(and(...whereConditions, eq(schedules.isDraft, false)))
 
-      // 记录被删除的已发布排期的重播绑定，同歌重发时回写，避免重播标识丢失
-      const previousReplayBindings = new Map<number, number>()
-      for (const scheduleToDelete of schedulesToDelete) {
-        if (!scheduleToDelete.isDraft && scheduleToDelete.replayRequestId) {
-          previousReplayBindings.set(scheduleToDelete.songId, scheduleToDelete.replayRequestId)
-        }
-      }
+      const existingPublishedSongIds = new Set(existingPublished.map((s) => s.songId))
 
       // 3. 删除该时间段内的所有排期（包括草稿和已发布）
       await tx.delete(schedules).where(and(...whereConditions))
 
-      // 记录本次删除了哪些歌的排期，如果新排期里没有它们，并且全局也没别的正式排期了，需要恢复 PENDING
-      const deletedSongIds = new Set(
-        schedulesToDelete.filter((s) => !s.isDraft).map((s) => s.songId)
-      )
-      const songsToRestore = Array.from(deletedSongIds).filter((id) => !newSongIds.has(id))
-
-      if (songsToRestore.length > 0) {
-        const otherPublished = await tx
-          .select({ songId: schedules.songId })
-          .from(schedules)
-          .where(and(eq(schedules.isDraft, false), inArray(schedules.songId, songsToRestore)))
-
-        const songsWithOtherSchedules = new Set(otherPublished.map((s) => s.songId))
-        const finalRestoreIds = songsToRestore.filter((id) => !songsWithOtherSchedules.has(id))
-
-        if (finalRestoreIds.length > 0) {
-          const finalRestoreIdSet = new Set(finalRestoreIds)
-          const restoreCardCodeMap = new Map<number, number>()
-          for (const deletedSchedule of schedulesToDelete) {
-            if (
-              !deletedSchedule.isDraft &&
-              deletedSchedule.cardCodeId &&
-              finalRestoreIdSet.has(deletedSchedule.songId)
-            ) {
-              restoreCardCodeMap.set(deletedSchedule.songId, deletedSchedule.cardCodeId)
-            }
-          }
-
-          for (const [songId, cardCodeId] of restoreCardCodeMap) {
-            const restoreResult = await restoreCardCodeAfterScheduleRemoval(tx, {
-              songId,
-              cardCodeId,
-              operatorId: user.id
-            })
-            if (
-              !restoreResult.changed &&
-              ['CONCURRENT_CHANGE', 'MISSING_CARD_CODE'].includes(
-                String(restoreResult.reason || '')
-              )
-            ) {
-              throw createError({ statusCode: 409, message: '点歌券返还失败，发布排期已终止' })
-            }
-          }
-
-          // 恢复重播申请（每人仅恢复最新一条，避免违反部分唯一索引）
-          await restoreReplayRequestsToPending({
-            tx,
-            songIds: finalRestoreIds,
-            at: getServerDate()
-          })
-        }
-      }
-
       // 4. 插入新的排期并处理通知
-      const publishedAt = getServerDate()
+      const publishedAt = new Date()
 
-      for (const item of scheduleItems) {
-        const song = songMap.get(item.songId)!
+      for (const item of body.songs) {
+        const song = songMap.get(item.songId)
+        if (!song) {
+          console.warn(`找不到歌曲 ID: ${item.songId}，跳过排期`)
+          continue
+        }
 
         // 插入排期
-        const insertedSchedules = await tx
-          .insert(schedules)
-          .values({
-            songId: item.songId,
-            playDate: playDate,
-            sequence: item.sequence,
-            playTimeId: playTimeId,
-            isDraft: false, // 直接发布
-            publishedAt: publishedAt,
-            updatedAt: publishedAt
-          })
-          .returning({ id: schedules.id })
-
-        const insertedSchedule = insertedSchedules[0]
-        if (!insertedSchedule) {
-          throw createError({ statusCode: 500, message: '创建排期失败' })
-        }
-
-        const replayBinding = await fulfillReplayRequestsForSchedule({
-          tx,
-          songId: song.id,
-          scheduleId: insertedSchedule.id,
-          at: publishedAt,
-          preferredRequestId: item.replayRequestId || undefined,
-          fallbackRequestId: previousReplayBindings.get(song.id) || undefined
+        await tx.insert(schedules).values({
+          songId: item.songId,
+          playDate: playDate,
+          sequence: item.sequence,
+          playTimeId: playTimeId,
+          isDraft: false, // 直接发布
+          publishedAt: publishedAt,
+          updatedAt: publishedAt
         })
 
-        if (replayBinding) {
-          for (const replayUserId of replayBinding.replayRequesterIds) {
-            replayNotificationsToSend.push({
-              userId: replayUserId,
-              songId: song.id,
-              songInfo: { title: song.title, artist: song.artist, playDate: playDate },
-              scheduleId: insertedSchedule.id
-            })
-          }
-        }
-
-        // 如果该歌曲之前未在此时间段发布过，则发送通知
+        // 如果该歌曲之前未在此时间段发布过，则发送通知并更新重播状态
         if (!existingPublishedSongIds.has(item.songId)) {
+          // 添加到通知列表，稍后发送
           notificationsToSend.push({
             requesterId: song.requesterId,
             songId: song.id,
@@ -263,44 +122,42 @@ export default defineEventHandler(async (event) => {
               playDate: playDate
             }
           })
-          existingPublishedSongIds.add(item.songId)
-        }
 
-        await redeemCardCodeForSchedule(tx, {
-          songId: song.id,
-          cardCodeId: song.cardCodeId,
-          operatorId: user.id,
-          at: publishedAt
-        })
+          // 更新重播申请状态
+          await tx
+            .update(songReplayRequests)
+            .set({ status: 'FULFILLED' })
+            .where(
+              and(eq(songReplayRequests.songId, song.id), eq(songReplayRequests.status, 'PENDING'))
+            )
+        }
       }
     })
 
-    // 发送重播安排通知
-    if (replayNotificationsToSend.length > 0) {
-      event.waitUntil(
-        Promise.allSettled(
-          replayNotificationsToSend.map((n) =>
-            createReplaySongSelectedNotification(n.userId, n.songId, n.songInfo, n.scheduleId)
-          )
-        )
-      )
+    // 事务成功提交后，清除缓存
+    try {
+      await cacheService.clearSchedulesCache()
+      await cacheService.clearSongsCache()
+      console.log(`[Cache] 排期缓存和歌曲列表缓存已清除（批量发布排期）`)
+    } catch (cacheError) {
+      console.error('[Cache] 清除缓存失败:', cacheError)
     }
 
-    // 由运行时托管后台通知，避免 Serverless 在响应结束后中止任务。
-    if (notificationsToSend.length > 0) {
-      event.waitUntil(
-        Promise.allSettled(
-          notificationsToSend.map((n) =>
-            createSongSelectedNotification(n.requesterId, n.songId, n.songInfo)
-          )
-        ).then((results) => {
-          const successCount = results.filter((r) => r.status === 'fulfilled').length
-          console.log(
-            `[Notification] 批量发布通知发送完成: ${successCount}/${notificationsToSend.length} 成功`
-          )
-        })
+    // 异步发送通知（不阻塞响应）
+    Promise.allSettled(
+      notificationsToSend.map((n) =>
+        createSongSelectedNotification(n.requesterId, n.songId, n.songInfo, clientIP)
       )
-    }
+    )
+      .then((results) => {
+        const successCount = results.filter((r) => r.status === 'fulfilled').length
+        console.log(
+          `[Notification] 批量发布通知发送完成: ${successCount}/${notificationsToSend.length} 成功`
+        )
+      })
+      .catch((err) => {
+        console.error('[Notification] 批量发送通知时发生未捕获错误:', err)
+      })
 
     console.log(`[Performance] 批量发布排期耗时: ${Date.now() - startTime}ms`)
 
@@ -317,7 +174,7 @@ export default defineEventHandler(async (event) => {
     })
 
     throw createError({
-      statusCode: error.statusCode || 500,
+      statusCode: 500,
       message: error.message || '发布排期失败'
     })
   }
diff --git a/server/api/admin/schedule/draft-bulk.post.ts b/server/api/admin/schedule/draft-bulk.post.ts
new file mode 100644
index 0000000..980fa22
--- /dev/null
+++ b/server/api/admin/schedule/draft-bulk.post.ts
@@ -0,0 +1,107 @@
+import { db } from '~/drizzle/db'
+import { schedules, songReplayRequests, scheduleSongPool } from '~/drizzle/schema'
+import { and, eq, gte, inArray, lte } from 'drizzle-orm'
+import { cacheService } from '~~/server/services/cacheService'
+
+function isValidDateString(dateStr: unknown) {
+  if (typeof dateStr !== 'string') return false
+  const trimmed = dateStr.trim()
+  if (!/^\d{4}-\d{2}-\d{2}$/.test(trimmed)) return false
+  const date = new Date(trimmed + 'T00:00:00.000Z')
+  return !Number.isNaN(date.getTime()) && date.toISOString().slice(0, 10) === trimmed
+}
+
+export default defineEventHandler(async (event) => {
+  const user = event.context.user
+  if (!user || !['SONG_ADMIN', 'ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
+    throw createError({
+      statusCode: 403,
+      message: '权限不足'
+    })
+  }
+
+  const body = await readBody(event)
+  const playDate = body?.playDate
+  const playTimeId = body?.playTimeId
+  const songIds = body?.songIds
+
+  if (!isValidDateString(playDate)) {
+    throw createError({ statusCode: 400, message: '播放日期格式必须为YYYY-MM-DD' })
+  }
+
+  if (!Array.isArray(songIds) || !songIds.every((id) => typeof id === 'number' && id > 0)) {
+    throw createError({ statusCode: 400, message: '歌曲ID列表不能为空且必须为正整数数组' })
+  }
+
+  const playTimeFilterEnabled = playTimeId !== undefined && playTimeId !== null
+  if (playTimeFilterEnabled && (typeof playTimeId !== 'number' || playTimeId <= 0)) {
+    throw createError({ statusCode: 400, message: '播放时间ID必须是正整数' })
+  }
+
+  const startOfDay = new Date(playDate + 'T00:00:00.000Z')
+  const endOfDay = new Date(playDate + 'T23:59:59.999Z')
+
+  const result = await db.transaction(async (tx) => {
+    const whereBase = and(gte(schedules.playDate, startOfDay), lte(schedules.playDate, endOfDay))
+    const whereCondition = playTimeFilterEnabled
+      ? and(whereBase, eq(schedules.playTimeId, playTimeId))
+      : whereBase
+
+    const existingSchedules = await tx
+      .select({ id: schedules.id, songId: schedules.songId })
+      .from(schedules)
+      .where(whereCondition)
+
+    const existingSongIds = existingSchedules.map((s) => s.songId).filter(Boolean) as number[]
+
+    await tx.delete(schedules).where(whereCondition)
+
+    if (existingSongIds.length > 0) {
+      await tx
+        .update(songReplayRequests)
+        .set({ status: 'PENDING', updatedAt: new Date() })
+        .where(
+          and(inArray(songReplayRequests.songId, existingSongIds), eq(songReplayRequests.status, 'FULFILLED'))
+        )
+    }
+
+    if (songIds.length === 0) {
+      return { deletedCount: existingSchedules.length, insertedCount: 0 }
+    }
+
+    const rows = songIds.map((songId, index) => ({
+      songId,
+      playDate: startOfDay,
+      sequence: index + 1,
+      playTimeId: playTimeFilterEnabled ? playTimeId : null,
+      isDraft: true,
+      publishedAt: null
+    }))
+
+    const inserted = await tx.insert(schedules).values(rows).returning({ id: schedules.id })
+
+    if (songIds.length > 0) {
+      await tx
+        .update(scheduleSongPool)
+        .set({
+          status: 'ASSIGNED',
+          targetPlayDate: startOfDay
+        })
+        .where(
+          and(
+            inArray(scheduleSongPool.songId, songIds),
+            eq(scheduleSongPool.status, 'PENDING')
+          )
+        )
+    }
+
+    return { deletedCount: existingSchedules.length, insertedCount: inserted.length }
+  })
+
+  await Promise.allSettled([cacheService.clearSchedulesCache(), cacheService.clearSongsCache()])
+
+  return {
+    success: true,
+    ...result
+  }
+})
diff --git a/server/api/admin/schedule/draft.post.ts b/server/api/admin/schedule/draft.post.ts
index 6ba659e..985ad64 100644
--- a/server/api/admin/schedule/draft.post.ts
+++ b/server/api/admin/schedule/draft.post.ts
@@ -1,8 +1,8 @@
 import { db } from '~/drizzle/db'
 import { playTimes, schedules, songs, songReplayRequests } from '~/drizzle/schema'
 import { and, desc, eq, gte, lte } from 'drizzle-orm'
+import { cacheService } from '~~/server/services/cacheService'
 import { getClientIP } from '~~/server/utils/ip-utils'
-import { createApiError } from '~~/server/utils/apiError'
 
 // 输入验证函数
 function validateInput(body: any) {
@@ -111,22 +111,39 @@ export default defineEventHandler(async (event) => {
         }
       }
 
-      // 校验重播申请绑定（草稿仅记录绑定关系，不修改申请状态）
-      let replayRequestId: number | null = null
-      const requestedReplayId = Number(body.replayRequestId)
-      if (body.replayRequestId != null && Number.isInteger(requestedReplayId) && requestedReplayId > 0) {
-        const replayRequestResult = await tx
-          .select({ id: songReplayRequests.id, songId: songReplayRequests.songId, status: songReplayRequests.status })
-          .from(songReplayRequests)
-          .where(eq(songReplayRequests.id, requestedReplayId))
-          .limit(1)
+      // 检查是否已经为该歌曲创建过排期或草稿，如果有则删除旧的
+      const existingScheduleResult = await tx
+        .select()
+        .from(schedules)
+        .where(eq(schedules.songId, body.songId))
+        .limit(1)
 
-        const replayRequest = replayRequestResult[0]
-        if (!replayRequest || replayRequest.songId !== song.id || replayRequest.status !== 'PENDING') {
-          throw createApiError(400, 'SONG_REPLAY_INVALID_REQUEST', '重播申请无效或已被处理')
+      const existingSchedule = existingScheduleResult[0]
+      if (existingSchedule) {
+        // 删除现有排期或草稿
+        await tx.delete(schedules).where(eq(schedules.id, existingSchedule.id))
+
+        // 恢复该歌曲的重播申请状态为 PENDING
+        // 只恢复状态为 FULFILLED 的申请
+        const updatedRequests = await tx
+          .update(songReplayRequests)
+          .set({
+            status: 'PENDING',
+            updatedAt: new Date()
+          })
+          .where(
+            and(
+              eq(songReplayRequests.songId, body.songId),
+              eq(songReplayRequests.status, 'FULFILLED')
+            )
+          )
+          .returning()
+
+        if (updatedRequests.length > 0) {
+          console.log(
+            `恢复了 ${updatedRequests.length} 个重播申请状态为 PENDING（草稿保存时删除旧排期）`
+          )
         }
-
-        replayRequestId = replayRequest.id
       }
 
       // 获取序号，如果未提供则查找当天最大序号+1
@@ -149,8 +166,9 @@ export default defineEventHandler(async (event) => {
           .orderBy(desc(schedules.sequence))
           .limit(1)
 
-        const latestSchedule = sameDaySchedules[0]
-        if (latestSchedule) sequence = (latestSchedule.sequence || 0) + 1
+        if (sameDaySchedules.length > 0) {
+          sequence = (sameDaySchedules[0].sequence || 0) + 1
+        }
       }
 
       // 解析输入的日期字符串，确保日期正确
@@ -168,7 +186,6 @@ export default defineEventHandler(async (event) => {
           playDate: playDate,
           sequence: sequence,
           playTimeId: body.playTimeId || null,
-          replayRequestId,
           isDraft: true, // 标记为草稿
           publishedAt: null // 草稿状态下没有发布时间
         })
@@ -180,12 +197,21 @@ export default defineEventHandler(async (event) => {
           id: song.id,
           title: song.title,
           artist: song.artist,
-          requesterId: song.requesterId,
-          cardCodeId: song.cardCodeId
+          requesterId: song.requesterId
         }
       }
     })
 
+    // 清除相关缓存（在事务外执行，避免影响事务性能）
+    try {
+      await cacheService.clearSchedulesCache()
+      await cacheService.clearSongsCache()
+      console.log('[Cache] 排期缓存和歌曲列表缓存已清除（保存草稿）')
+    } catch (cacheError) {
+      console.error('[Cache] 清除缓存失败:', cacheError)
+      // 缓存清除失败不应该影响主要操作的成功
+    }
+
     const responseData = {
       ...result.schedule,
       song: result.song,
diff --git a/server/api/admin/schedule/full.get.ts b/server/api/admin/schedule/full.get.ts
index b5db865..500179c 100644
--- a/server/api/admin/schedule/full.get.ts
+++ b/server/api/admin/schedule/full.get.ts
@@ -8,7 +8,7 @@ import {
   songCollaborators,
   songReplayRequests
 } from '~/drizzle/schema'
-import { and, asc, count, countDistinct, eq, gte, lt, inArray, desc } from 'drizzle-orm'
+import { and, asc, count, eq, gte, lt, inArray, desc } from 'drizzle-orm'
 
 export default defineEventHandler(async (event) => {
   // 检查用户身份验证和权限
@@ -79,7 +79,6 @@ export default defineEventHandler(async (event) => {
         playTimeId: schedules.playTimeId,
         isDraft: schedules.isDraft,
         publishedAt: schedules.publishedAt,
-        replayRequestId: schedules.replayRequestId,
         songId: schedules.songId,
         songTitle: songs.title,
         songArtist: songs.artist,
@@ -88,8 +87,6 @@ export default defineEventHandler(async (event) => {
         songCover: songs.cover,
         songMusicPlatform: songs.musicPlatform,
         songMusicId: songs.musicId,
-        songDurationSeconds: songs.durationSeconds,
-        songCardCodeId: songs.cardCodeId,
         songSemester: songs.semester,
         songCreatedAt: songs.createdAt,
         requesterName: users.name,
@@ -180,11 +177,11 @@ export default defineEventHandler(async (event) => {
     const replayRequestersMap = new Map()
 
     if (songIds.length > 0) {
-      // 获取每首歌的重播申请数量（统计 PENDING 和 FULFILLED 状态，按申请人去重）
+      // 获取每首歌的重播申请数量（统计 PENDING 和 FULFILLED 状态）
       const replayCountsData = await db
         .select({
           songId: songReplayRequests.songId,
-          count: countDistinct(songReplayRequests.userId)
+          count: count(songReplayRequests.id)
         })
         .from(songReplayRequests)
         .where(
@@ -210,10 +207,7 @@ export default defineEventHandler(async (event) => {
             class: users.class
           },
           status: songReplayRequests.status,
-          createdAt: songReplayRequests.createdAt,
-          preferredPlayTimeId: songReplayRequests.preferredPlayTimeId,
-          submissionNote: songReplayRequests.submissionNote,
-          submissionNotePublic: songReplayRequests.submissionNotePublic
+          createdAt: songReplayRequests.createdAt
         })
         .from(songReplayRequests)
         .innerJoin(users, eq(songReplayRequests.userId, users.id))
@@ -225,19 +219,12 @@ export default defineEventHandler(async (event) => {
         )
         .orderBy(desc(songReplayRequests.createdAt))
 
-      // 每首歌按用户去重（保留最新一条），只保留前5个申请人
-      const seenRequesterIds = new Map()
       replayRequestersData.forEach((r) => {
         if (!replayRequestersMap.has(r.songId)) {
           replayRequestersMap.set(r.songId, [])
-          seenRequesterIds.set(r.songId, new Set())
-        }
-        const seen = seenRequesterIds.get(r.songId)
-        if (seen.has(r.user.id)) {
-          return
         }
+        // 只保留前5个
         if (replayRequestersMap.get(r.songId).length < 5) {
-          seen.add(r.user.id)
           replayRequestersMap.get(r.songId).push({
             id: r.user.id,
             name: r.user.name || '未知用户',
@@ -249,69 +236,36 @@ export default defineEventHandler(async (event) => {
       })
     }
 
-    // 获取重播申请元数据（按 ID 索引，展示时排期按 replayRequestId 取对应记录）
-    const replayMetadataByIdMap = new Map<number, { submissionNote: string | null; submissionNotePublic: boolean; submissionNotePublicStatus: string | null; preferredPlayTimeId: number | null }>()
-    if (songIds.length > 0) {
-      const replayMetaData = await db
-        .select()
-        .from(songReplayRequests)
-        .where(
-          and(
-            inArray(songReplayRequests.songId, songIds),
-            inArray(songReplayRequests.status, ['PENDING', 'FULFILLED'])
-          )
-        )
-
-      for (const row of replayMetaData) {
-        replayMetadataByIdMap.set(row.id, {
-          submissionNote: row.submissionNote,
-          submissionNotePublic: row.submissionNotePublic,
-          submissionNotePublicStatus: row.submissionNotePublicStatus,
-          preferredPlayTimeId: row.preferredPlayTimeId
-        })
-      }
-    }
-
     // 格式化响应数据
     const formattedSchedules = schedulesData.map((schedule) => {
       const dateOnly = schedule.playDate
 
-      // 处理投稿人姓名消歧
+      // 处理投稿人显示：班级 + 姓名
       let requesterName = schedule.requesterName || 'Unknown User'
-
-      const sameNameUsers = nameToUsers.get(requesterName)
-      if (sameNameUsers && sameNameUsers.length > 1) {
-        if (schedule.requesterGrade) {
-          const sameGradeUsers = sameNameUsers.filter(
-            (u: { id: number; name: string | null; grade: string | null; class: string | null }) =>
-              u.grade === schedule.requesterGrade
-          )
-
-          if (sameGradeUsers.length > 1 && schedule.requesterClass) {
-            requesterName = `${requesterName}（${schedule.requesterGrade} ${schedule.requesterClass}）`
-          } else {
-            requesterName = `${requesterName}（${schedule.requesterGrade}）`
-          }
-        }
+      const requesterClassParts: string[] = []
+      if (schedule.requesterGrade) requesterClassParts.push(String(schedule.requesterGrade))
+      if (schedule.requesterClass) requesterClassParts.push(String(schedule.requesterClass))
+      const requesterClassInfo = requesterClassParts.join(' ').trim()
+      if (requesterClassInfo && requesterName) {
+        requesterName = `${requesterClassInfo} ${requesterName}`
+      } else if (requesterClassInfo) {
+        requesterName = requesterClassInfo
       }
 
-      // 辅助函数：格式化显示名称 (用于联合投稿人)
-      const formatDisplayName = (userObj: any) => {
-        if (!userObj || !userObj.name) return '未知用户'
-        let displayName = userObj.name
+      const formatClassInfo = (userObj: any) => {
+        if (!userObj) return ''
+        const parts: string[] = []
+        if (userObj.grade) parts.push(String(userObj.grade))
+        if (userObj.class) parts.push(String(userObj.class))
+        return parts.join(' ').trim()
+      }
 
-        const sameNameUsers = nameToUsers.get(displayName)
-        if (sameNameUsers && sameNameUsers.length > 1) {
-          if (userObj.grade) {
-            const sameGradeUsers = sameNameUsers.filter((u: any) => u.grade === userObj.grade)
-            if (sameGradeUsers.length > 1 && userObj.class) {
-              displayName = `${displayName}（${userObj.grade} ${userObj.class}）`
-            } else {
-              displayName = `${displayName}（${userObj.grade}）`
-            }
-          }
-        }
-        return displayName
+      const formatDisplayName = (userObj: any) => {
+        if (!userObj) return '未知用户'
+        const name = userObj.name ? String(userObj.name).trim() : ''
+        const classInfo = formatClassInfo(userObj)
+        if (!name) return classInfo || '未知用户'
+        return classInfo ? `${classInfo} ${name}` : name
       }
 
       const collaborators = collaboratorsMap.get(schedule.songId) || []
@@ -324,11 +278,8 @@ export default defineEventHandler(async (event) => {
       }))
 
       // 获取重播申请信息
-      const linkedReplayRequestId = schedule.replayRequestId || null
-      const replayRequestCount = linkedReplayRequestId
-        ? replayRequestCountsMap.get(schedule.songId) || 0
-        : 0
-      const replayRequesters = linkedReplayRequestId ? replayRequestersMap.get(schedule.songId) || [] : []
+      const replayRequestCount = replayRequestCountsMap.get(schedule.songId) || 0
+      const replayRequesters = replayRequestersMap.get(schedule.songId) || []
       const formattedReplayRequesters = replayRequesters.map((r: any) => ({
         id: r.id,
         name: r.name,
@@ -338,8 +289,8 @@ export default defineEventHandler(async (event) => {
         status: r.status
       }))
 
-      // 只有正式绑定了重播申请的排期才按重播展示；草稿排期不提前暴露申请信息
-      const isReplaySong = linkedReplayRequestId !== null
+      // 判断是否为重播：有重播申请（PENDING 或 FULFILLED）
+      const isReplaySong = replayRequestCount > 0
 
       return {
         id: schedule.id,
@@ -347,7 +298,6 @@ export default defineEventHandler(async (event) => {
         updatedAt: schedule.updatedAt,
         playDate: dateOnly.toISOString().split('T')[0],
         sequence: schedule.sequence || 1,
-        replayRequestId: linkedReplayRequestId,
         played: schedule.played || false,
         playTimeId: schedule.playTimeId,
         // 草稿状态信息
@@ -363,39 +313,27 @@ export default defineEventHandler(async (event) => {
               enabled: schedule.playTimeEnabled
             }
           : null,
-        song: (() => {
-          const replayMeta = linkedReplayRequestId ? replayMetadataByIdMap.get(linkedReplayRequestId) : null
-          const hasReplayMeta = !!replayMeta
-
-          return {
-            id: schedule.songId,
-            title: schedule.songTitle,
-            artist: schedule.songArtist,
-            requester: requesterName,
-            requesterId: schedule.songRequesterId,
-            requesterGrade: schedule.requesterGrade || null,
-            requesterClass: schedule.requesterClass || null,
-            collaborators: formattedCollaborators,
-            voteCount: voteCountMap.get(schedule.songId) || 0,
-            played: schedule.songPlayed || false,
-            cover: schedule.songCover || null,
-            cardCodeId: schedule.songCardCodeId || null,
-            musicPlatform: schedule.songMusicPlatform || null,
-            musicId: schedule.songMusicId || null,
-            durationSeconds: schedule.songDurationSeconds || null,
-            semester: schedule.songSemester || null,
-            createdAt: schedule.songCreatedAt,
-            submissionNote: hasReplayMeta ? replayMeta.submissionNote : null,
-            submissionNotePublic: hasReplayMeta ? replayMeta.submissionNotePublic : false,
-            submissionNotePublicStatus: hasReplayMeta ? (replayMeta.submissionNotePublicStatus || null) : null,
-            hasSubmissionNote: hasReplayMeta && !!replayMeta.submissionNote,
-            preferredPlayTimeId: hasReplayMeta ? replayMeta.preferredPlayTimeId : null,
-            // 重播申请信息
-            replayRequestCount: isReplaySong ? replayRequestCount : 0,
-            replayRequesters: isReplaySong ? formattedReplayRequesters : [],
-            isReplay: isReplaySong
-          }
-        })()
+        song: {
+          id: schedule.songId,
+          title: schedule.songTitle,
+          artist: schedule.songArtist,
+          requester: requesterName,
+          requesterId: schedule.songRequesterId,
+          requesterGrade: schedule.requesterGrade || null,
+          requesterClass: schedule.requesterClass || null,
+          collaborators: formattedCollaborators,
+          voteCount: voteCountMap.get(schedule.songId) || 0,
+          played: schedule.songPlayed || false,
+          cover: schedule.songCover || null,
+          musicPlatform: schedule.songMusicPlatform || null,
+          musicId: schedule.songMusicId || null,
+          semester: schedule.songSemester || null,
+          createdAt: schedule.songCreatedAt,
+          // 重播申请信息
+          replayRequestCount: isReplaySong ? replayRequestCount : 0,
+          replayRequesters: isReplaySong ? formattedReplayRequesters : [],
+          isReplay: isReplaySong // 只有已播放过且有重播申请的才标记为重播
+        }
       }
     })
 
diff --git a/server/api/admin/schedule/move-date.post.ts b/server/api/admin/schedule/move-date.post.ts
index 2a83889..4a7820c 100644
--- a/server/api/admin/schedule/move-date.post.ts
+++ b/server/api/admin/schedule/move-date.post.ts
@@ -1,16 +1,16 @@
 import { and, eq, gte, inArray, lte } from 'drizzle-orm'
 import { db } from '~/drizzle/db'
 import { schedules, songs } from '~/drizzle/schema'
+import { cacheService } from '~~/server/services/cacheService'
 import { createSystemNotification } from '~~/server/services/notificationService'
 import { getClientIP } from '~~/server/utils/ip-utils'
-import { getServerDate } from '~~/server/utils/serverTime'
 
 export default defineEventHandler(async (event) => {
   const user = event.context.user
   if (!user || !['SONG_ADMIN', 'ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
     throw createError({
       statusCode: 403,
-      message: '需要歌曲管理员及以上权限'
+      statusMessage: '需要歌曲管理员及以上权限'
     })
   }
 
@@ -47,6 +47,7 @@ export default defineEventHandler(async (event) => {
   }
 
   try {
+    const clientIP = getClientIP(event)
     const moveResult = await db.transaction(async (tx) => {
       const existingOnToDate = await tx
         .select({ id: schedules.id })
@@ -80,7 +81,7 @@ export default defineEventHandler(async (event) => {
       }
 
       const scheduleIds = sourceSchedules.map((item) => item.id)
-      const updateTime = getServerDate()
+      const updateTime = new Date()
       const movedSchedules = await tx
         .update(schedules)
         .set({
@@ -100,7 +101,7 @@ export default defineEventHandler(async (event) => {
 
     const notificationsToSend = moveResult.movedSongs.map((item) => {
       const message = `您投稿的歌曲《${item.songTitle}》原定于 ${fromDate} 播放，已调整至 ${toDate}。`
-      return createSystemNotification(item.requesterId, '排期调整通知', message)
+      return createSystemNotification(item.requesterId, '排期调整通知', message, clientIP)
     })
 
     if (notificationsToSend.length > 0) {
@@ -109,6 +110,14 @@ export default defineEventHandler(async (event) => {
       })
     }
 
+    try {
+      await cacheService.clearSchedulesCache()
+      await cacheService.clearSongsCache()
+      console.log('[Cache] 排期缓存和歌曲列表缓存已清除（迁移排期日期）')
+    } catch (cacheError) {
+      console.error('[Cache] 清除缓存失败:', cacheError)
+    }
+
     return {
       success: true,
       fromDate,
diff --git a/server/api/admin/schedule/publish.post.ts b/server/api/admin/schedule/publish.post.ts
index 8c6195f..e11af81 100644
--- a/server/api/admin/schedule/publish.post.ts
+++ b/server/api/admin/schedule/publish.post.ts
@@ -1,10 +1,10 @@
 import { db } from '~/drizzle/db'
-import { schedules, songs } from '~/drizzle/schema'
-import { and, eq, ne } from 'drizzle-orm'
-import { createSongSelectedNotification, createReplaySongSelectedNotification } from '~~/server/services/notificationService'
-import { redeemCardCodeForSchedule } from '~~/server/services/cardCodeLifecycleService'
-import { fulfillReplayRequestsForSchedule } from '~~/server/utils/scheduleReplayBinding'
+import { playTimes, schedules, songs, users, votes, songReplayRequests } from '~/drizzle/schema'
+import { and, asc, count, eq } from 'drizzle-orm'
+import { createSongSelectedNotification } from '~~/server/services/notificationService'
+import { cacheService } from '~~/server/services/cacheService'
 import { getBeijingTimestamp } from '~/utils/timeUtils'
+import { getClientIP } from '~~/server/utils/ip-utils'
 
 export default defineEventHandler(async (event) => {
   // 检查用户认证和权限
@@ -44,13 +44,11 @@ export default defineEventHandler(async (event) => {
         playTimeId: schedules.playTimeId,
         isDraft: schedules.isDraft,
         publishedAt: schedules.publishedAt,
-        replayRequestId: schedules.replayRequestId,
         song: {
           id: songs.id,
           title: songs.title,
           artist: songs.artist,
-          requesterId: songs.requesterId,
-          cardCodeId: songs.cardCodeId
+          requesterId: songs.requesterId
         }
       })
       .from(schedules)
@@ -72,120 +70,219 @@ export default defineEventHandler(async (event) => {
       })
     }
 
-    // 使用事务包装更新排期和重播申请状态操作，保证原子性
-    const publishResult = await db.transaction(async (tx) => {
-      // 更新草稿为已发布状态
-      const publishedAt = new Date(getBeijingTimestamp())
+    // 更新草稿为已发布状态
+    const publishedAt = new Date(getBeijingTimestamp())
 
-      const publishResult = await tx
-        .update(schedules)
-        .set({
-          isDraft: false,
-          publishedAt: publishedAt,
-          updatedAt: publishedAt
+    const publishResult = await db
+      .update(schedules)
+      .set({
+        isDraft: false,
+        publishedAt: publishedAt,
+        updatedAt: publishedAt
+      })
+      .where(eq(schedules.id, body.scheduleId))
+      .returning()
+
+    const publishedSchedule = publishResult[0]
+
+    if (!publishedSchedule) {
+      throw createError({
+        statusCode: 500,
+        message: '发布排期失败'
+      })
+    }
+
+    // 获取客户端IP地址
+    const clientIP = getClientIP(event)
+
+    // 发布后发送通知（这是与草稿保存的主要区别）
+    await createSongSelectedNotification(
+      draft.song.requesterId,
+      draft.song.id,
+      {
+        title: draft.song.title,
+        artist: draft.song.artist,
+        playDate: draft.playDate
+      },
+      clientIP
+    )
+
+    // 将该歌曲的所有待处理重播申请标记为已完成
+    const updatedRequests = await db
+      .update(songReplayRequests)
+      .set({
+        status: 'FULFILLED',
+        updatedAt: new Date()
+      })
+      .where(
+        and(eq(songReplayRequests.songId, draft.song.id), eq(songReplayRequests.status, 'PENDING'))
+      )
+      .returning()
+
+    if (updatedRequests.length > 0) {
+      console.log(`发布排期：将 ${updatedRequests.length} 个重播申请标记为 FULFILLED`)
+    }
+
+    // 清除相关缓存
+    try {
+      await cacheService.clearSchedulesCache()
+      await cacheService.clearSongsCache()
+      console.log('[Cache] 排期缓存和歌曲列表缓存已清除（发布排期）')
+    } catch (cacheError) {
+      console.error('[Cache] 清除缓存失败:', cacheError)
+    }
+
+    // 重新缓存完整的排期列表
+    try {
+      // 获取所有已发布的排期数据
+      const schedulesData = await db
+        .select({
+          id: schedules.id,
+          playDate: schedules.playDate,
+          sequence: schedules.sequence,
+          played: schedules.played,
+          playTimeId: schedules.playTimeId,
+          isDraft: schedules.isDraft,
+          publishedAt: schedules.publishedAt,
+          songId: schedules.songId,
+          songTitle: songs.title,
+          songArtist: songs.artist,
+          songRequesterId: songs.requesterId,
+          songPlayed: songs.played,
+          songCover: songs.cover,
+          songMusicPlatform: songs.musicPlatform,
+          songMusicId: songs.musicId,
+          songSemester: songs.semester,
+          requesterName: users.name,
+          requesterGrade: users.grade,
+          requesterClass: users.class,
+          playTimeName: playTimes.name,
+          playTimeStartTime: playTimes.startTime,
+          playTimeEndTime: playTimes.endTime,
+          playTimeEnabled: playTimes.enabled
         })
-        .where(and(eq(schedules.id, body.scheduleId), eq(schedules.isDraft, true)))
-        .returning()
-
-      const schedule = publishResult[0]
-
-      if (!schedule) {
-        throw createError({ statusCode: 409, message: '排期已发布或状态已变化，请刷新后重试' })
-      }
-
-      // 检查该歌曲是否已经有其他已发布的排期
-      const existingPublished = await tx
-        .select({ id: schedules.id })
         .from(schedules)
-        .where(
-          and(
-            eq(schedules.songId, draft.song.id),
-            eq(schedules.isDraft, false),
-            ne(schedules.id, body.scheduleId)
-          )
-        )
-        .limit(1)
+        .innerJoin(songs, eq(schedules.songId, songs.id))
+        .innerJoin(users, eq(songs.requesterId, users.id))
+        .leftJoin(playTimes, eq(schedules.playTimeId, playTimes.id))
+        .where(eq(schedules.isDraft, false)) // 只缓存已发布的排期
+        .orderBy(asc(schedules.playDate))
 
-      const shouldNotify = existingPublished.length === 0
-
-      // 履行该歌曲全部待处理重播申请，优先绑定草稿指定的申请
-      let replayRequesterIds: number[] = []
-      const replayBinding = await fulfillReplayRequestsForSchedule({
-        tx,
-        songId: draft.song.id,
-        scheduleId: body.scheduleId,
-        at: publishedAt,
-        preferredRequestId: draft.replayRequestId || undefined,
-        fallbackRequestId: draft.replayRequestId || undefined
-      })
-
-      if (replayBinding) {
-        replayRequesterIds = replayBinding.replayRequesterIds
-        console.log(`发布排期：重播申请 #${replayBinding.replayRequestId} 绑定到排期 #${body.scheduleId}`)
-      }
-
-      if (existingPublished.length > 0) {
-        console.log(`歌曲 ${draft.song.id} 已有其他正式排期，不再重复发送通知`)
-      }
-
-      await redeemCardCodeForSchedule(tx, {
-        songId: draft.song.id,
-        cardCodeId: draft.song.cardCodeId,
-        operatorId: user.id,
-        at: publishedAt
-      })
-
-      return { schedule, shouldNotify, replayRequesterIds, replayRequestId: replayBinding?.replayRequestId ?? null }
-    })
-
-    // 发送重播申请已安排通知
-    if (publishResult.replayRequesterIds?.length > 0) {
-      for (const replayUserId of publishResult.replayRequesterIds) {
-        try {
-          await createReplaySongSelectedNotification(replayUserId, draft.song.id, {
-            title: draft.song.title,
-            artist: draft.song.artist,
-            playDate: publishResult.schedule.playDate
-          }, publishResult.schedule.id)
-        } catch (error) {
-          console.error(`发送重播安排通知给用户 ${replayUserId} 失败:`, error)
-        }
-      }
-    }
-
-    let notificationSent = true
-    if (publishResult.shouldNotify) {
-      try {
-        await createSongSelectedNotification(draft.song.requesterId, draft.song.id, {
-          title: draft.song.title,
-          artist: draft.song.artist,
-          playDate: publishResult.schedule.playDate
+      // 获取所有用户的姓名列表，用于检测同名用户
+      const allUsers = await db
+        .select({
+          id: users.id,
+          name: users.name,
+          grade: users.grade,
+          class: users.class
         })
-      } catch (notificationError) {
-        notificationSent = false
-        console.error('排期已发布，但发送歌曲入选通知失败:', notificationError)
-      }
-    }
+        .from(users)
 
-    const publishedSchedule = publishResult.schedule
+      // 创建姓名到用户数组的映射
+      const nameToUsers = new Map()
+      allUsers.forEach((user) => {
+        if (user.name) {
+          if (!nameToUsers.has(user.name)) {
+            nameToUsers.set(user.name, [])
+          }
+          nameToUsers.get(user.name).push(user)
+        }
+      })
+
+      // 获取每首歌的投票数
+      const songIds = schedulesData.map((s) => s.songId)
+      const voteCounts = await Promise.all(
+        songIds.map(async (songId) => {
+          const voteCountResult = await db
+            .select({ count: count() })
+            .from(votes)
+            .where(eq(votes.songId, songId))
+          return { songId, count: voteCountResult[0].count }
+        })
+      )
+
+      const voteCountMap = new Map(voteCounts.map((v) => [v.songId, v.count]))
+
+      // 转换数据格式
+      const formattedSchedules = schedulesData.map((schedule) => {
+        const dateOnly = schedule.playDate
+
+        // 处理投稿人姓名，如果是同名用户则添加后缀
+        let requesterName = schedule.requesterName || '未知用户'
+
+        const sameNameUsers = nameToUsers.get(requesterName)
+        if (sameNameUsers && sameNameUsers.length > 1) {
+          if (schedule.requesterGrade) {
+            const sameGradeUsers = sameNameUsers.filter(
+              (u: {
+                id: number
+                name: string | null
+                grade: string | null
+                class: string | null
+              }) => u.grade === schedule.requesterGrade
+            )
+
+            if (sameGradeUsers.length > 1 && schedule.requesterClass) {
+              requesterName = `${requesterName}（${schedule.requesterGrade} ${schedule.requesterClass}）`
+            } else {
+              requesterName = `${requesterName}（${schedule.requesterGrade}）`
+            }
+          }
+        }
+
+        return {
+          id: schedule.id,
+          playDate: dateOnly.toISOString().split('T')[0],
+          sequence: schedule.sequence || 1,
+          played: schedule.played || false,
+          playTimeId: schedule.playTimeId,
+          isDraft: schedule.isDraft,
+          publishedAt: schedule.publishedAt,
+          playTime: schedule.playTimeName
+            ? {
+                id: schedule.playTimeId,
+                name: schedule.playTimeName,
+                startTime: schedule.playTimeStartTime,
+                endTime: schedule.playTimeEndTime,
+                enabled: schedule.playTimeEnabled
+              }
+            : null,
+          song: {
+            id: schedule.songId,
+            title: schedule.songTitle,
+            artist: schedule.songArtist,
+            requester: requesterName,
+            voteCount: voteCountMap.get(schedule.songId) || 0,
+            played: schedule.songPlayed || false,
+            cover: schedule.songCover || null,
+            musicPlatform: schedule.songMusicPlatform || null,
+            musicId: schedule.songMusicId || null,
+            semester: schedule.songSemester || null
+          }
+        }
+      })
+
+      const completeSchedules = formattedSchedules
+
+      // 重新缓存完整的排期列表
+      if (completeSchedules && completeSchedules.length > 0) {
+        await cacheService.setSchedulesList(completeSchedules)
+        console.log(`[Cache] 已发布排期列表已重新缓存，数量: ${completeSchedules.length}`)
+      } else {
+        console.log('[Cache] 没有已发布排期数据需要缓存')
+      }
+    } catch (cacheError) {
+      console.warn('[Cache] 重新缓存完整排期列表失败，但不影响排期发布:', cacheError)
+    }
 
     return {
       ...draft,
-      ...publishedSchedule,
-      song: draft.song,
       isDraft: false,
-      publishedAt: publishedSchedule.publishedAt,
-      // 绑定在 fulfill 中回写，.returning() 快照早于绑定，需显式覆盖
-      replayRequestId: publishResult.replayRequestId,
-      message: publishResult.shouldNotify
-        ? notificationSent
-          ? '排期发布成功，通知已发送'
-          : '排期发布成功，但通知发送失败'
-        : '排期发布成功'
+      publishedAt: publishedAt,
+      message: '排期发布成功，通知已发送'
     }
   } catch (error: any) {
     console.error('发布排期失败:', error)
-    if (error.statusCode) throw error
     throw createError({
       statusCode: 500,
       message: error.message || '发布排期失败'
diff --git a/server/api/admin/schedule/remove.post.ts b/server/api/admin/schedule/remove.post.ts
index 0d818f7..9dc1d8e 100644
--- a/server/api/admin/schedule/remove.post.ts
+++ b/server/api/admin/schedule/remove.post.ts
@@ -1,7 +1,5 @@
-import { db, eq, ne, schedules, songs, and } from '~/drizzle/db'
-import { restoreCardCodeAfterScheduleRemoval } from '~~/server/services/cardCodeLifecycleService'
-import { restoreReplayRequestsToPending } from '~~/server/utils/scheduleReplayBinding'
-import { getServerDate } from '~~/server/utils/serverTime'
+import { db, eq, schedules, songs, songReplayRequests, and } from '~/drizzle/db'
+import { cacheService } from '~~/server/services/cacheService'
 
 export default defineEventHandler(async (event) => {
   // 验证管理员权限
@@ -9,7 +7,7 @@ export default defineEventHandler(async (event) => {
   if (!user || !['SONG_ADMIN', 'ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
     throw createError({
       statusCode: 403,
-      message: '需要歌曲管理员及以上权限'
+      statusMessage: '需要歌曲管理员及以上权限'
     })
   }
 
@@ -20,7 +18,7 @@ export default defineEventHandler(async (event) => {
     if (!scheduleId) {
       throw createError({
         statusCode: 400,
-        message: '缺少排期 ID'
+        statusMessage: '缺少排期ID'
       })
     }
 
@@ -33,8 +31,6 @@ export default defineEventHandler(async (event) => {
       .select({
         id: schedules.id,
         songId: schedules.songId,
-        isDraft: schedules.isDraft,
-        cardCodeId: songs.cardCodeId,
         songTitle: songs.title,
         songArtist: songs.artist
       })
@@ -54,69 +50,49 @@ export default defineEventHandler(async (event) => {
 
     console.log(`找到排期 ID=${scheduleIdNumber}, 歌曲=${existingSchedule.songTitle || '未知歌曲'}`)
 
-    // 使用事务包装删除和重播状态更新操作
-    const result = await db.transaction(async (tx) => {
-      // 删除排期
-      const deletedSchedule = await tx
-        .delete(schedules)
-        .where(eq(schedules.id, scheduleIdNumber))
+    // 删除排期
+    const deletedSchedule = await db
+      .delete(schedules)
+      .where(eq(schedules.id, scheduleIdNumber))
+      .returning()
+
+    console.log(`成功删除排期 ID=${scheduleIdNumber}`)
+
+    // 恢复该歌曲的重播申请状态为 PENDING
+    // 只恢复状态不是 PENDING 的申请（可能是 FULFILLED 或其他状态）
+    if (existingSchedule.songId) {
+      const updatedRequests = await db
+        .update(songReplayRequests)
+        .set({
+          status: 'PENDING',
+          updatedAt: new Date()
+        })
+        .where(
+          and(
+            eq(songReplayRequests.songId, existingSchedule.songId),
+            // 不恢复已拒绝的申请
+            eq(songReplayRequests.status, 'FULFILLED')
+          )
+        )
         .returning()
 
-      console.log(`成功删除排期 ID=${scheduleIdNumber}`)
-
-      // 恢复该歌曲的重播申请状态为 PENDING
-      // 只有当该歌曲没有其他正式排期（非草稿）时，才恢复重播申请状态
-      if (existingSchedule.songId) {
-        const otherSchedules = await tx
-          .select({ id: schedules.id })
-          .from(schedules)
-          .where(
-            and(
-              eq(schedules.songId, existingSchedule.songId),
-              eq(schedules.isDraft, false),
-              ne(schedules.id, scheduleIdNumber)
-            )
-          )
-          .limit(1)
-
-        if (otherSchedules.length === 0) {
-          if (!existingSchedule.isDraft && existingSchedule.cardCodeId) {
-            const restoreResult = await restoreCardCodeAfterScheduleRemoval(tx, {
-              songId: existingSchedule.songId,
-              cardCodeId: existingSchedule.cardCodeId,
-              operatorId: user.id
-            })
-            if (
-              !restoreResult.changed &&
-              ['CONCURRENT_CHANGE', 'MISSING_CARD_CODE'].includes(
-                String(restoreResult.reason || '')
-              )
-            ) {
-              throw createError({ statusCode: 409, message: '点歌券返还失败，移除排期已终止' })
-            }
-          }
-
-          // 恢复重播申请（每人仅恢复最新一条，避免违反部分唯一索引）
-          const restoredCount = await restoreReplayRequestsToPending({
-            tx,
-            songIds: [existingSchedule.songId],
-            at: getServerDate()
-          })
-
-          if (restoredCount > 0) {
-            console.log(`恢复了 ${restoredCount} 个重播申请状态为 PENDING`)
-          }
-        } else {
-          console.log(`该歌曲仍有其他正式排期，不恢复重播申请状态`)
-        }
+      if (updatedRequests.length > 0) {
+        console.log(`恢复了 ${updatedRequests.length} 个重播申请状态为 PENDING`)
       }
+    }
 
-      return deletedSchedule
-    })
+    // 清除相关缓存
+    try {
+      await cacheService.clearSchedulesCache()
+      await cacheService.clearSongsCache() // 清除歌曲列表缓存，确保scheduled状态更新
+      console.log('[Cache] 排期缓存和歌曲列表缓存已清除（移除排期）')
+    } catch (cacheError) {
+      console.error('[Cache] 清除缓存失败:', cacheError)
+    }
 
     return {
       success: true,
-      schedule: result
+      schedule: deletedSchedule
     }
   } catch (error: any) {
     console.error('移除排期失败:', error)
diff --git a/server/api/admin/schedule/sequence.post.ts b/server/api/admin/schedule/sequence.post.ts
index a3d9359..2be93f4 100644
--- a/server/api/admin/schedule/sequence.post.ts
+++ b/server/api/admin/schedule/sequence.post.ts
@@ -1,5 +1,6 @@
 import { db, eq } from '~/drizzle/db'
 import { schedules } from '~/drizzle/schema'
+import { cacheService } from '~~/server/services/cacheService'
 
 export default defineEventHandler(async (event) => {
   // 验证用户认证和权限
@@ -7,48 +8,39 @@ export default defineEventHandler(async (event) => {
   if (!user || !['SONG_ADMIN', 'ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
     throw createError({
       statusCode: 403,
-      message: '需要歌曲管理员及以上权限'
+      statusMessage: '需要歌曲管理员及以上权限'
     })
   }
 
   try {
     const body = await readBody(event)
-    const scheduleUpdates = body.schedules
+    const { schedules } = body
 
-    if (!Array.isArray(scheduleUpdates) || scheduleUpdates.length === 0) {
+    if (!schedules || !Array.isArray(schedules) || schedules.length === 0) {
       throw createError({
         statusCode: 400,
-        message: '缺少排期数据'
+        statusMessage: '缺少排期数据'
       })
     }
 
-    const normalizedUpdates = scheduleUpdates.map((item: any, index: number) => {
-      const id = Number(item?.id)
-      const sequence = Number(item?.sequence)
-      if (!Number.isInteger(id) || id <= 0 || !Number.isInteger(sequence) || sequence <= 0) {
-        throw createError({ statusCode: 400, message: `第 ${index + 1} 条排期数据无效` })
-      }
-      return { id, sequence }
-    })
-
     // 批量更新排期顺序
-    const results = await db.transaction(async (tx) => {
-      const updatedRows = await Promise.all(
-        normalizedUpdates.map((item) =>
-          tx
-            .update(schedules)
-            .set({ sequence: item.sequence })
-            .where(eq(schedules.id, item.id))
-            .returning({ id: schedules.id })
-        )
-      )
+    const results = await Promise.all(
+      schedules.map(async (item) => {
+        return db
+          .update(schedules)
+          .set({ sequence: item.sequence })
+          .where(eq(schedules.id, Number(item.id)))
+      })
+    )
 
-      if (updatedRows.some((rows) => rows.length === 0)) {
-        throw createError({ statusCode: 404, message: '部分排期不存在，请刷新后重试' })
-      }
-
-      return updatedRows
-    })
+    // 清除排期相关缓存
+    try {
+      await cacheService.clearSchedulesCache()
+      await cacheService.clearSongsCache()
+      console.log('[Cache] 排期缓存和歌曲列表缓存已清除（更新排期顺序）')
+    } catch (cacheError) {
+      console.error('[Cache] 清除缓存失败:', cacheError)
+    }
 
     return {
       success: true,
@@ -57,11 +49,9 @@ export default defineEventHandler(async (event) => {
   } catch (error: any) {
     console.error('更新排期顺序失败:', error)
 
-    if (error.statusCode) throw error
-
     throw createError({
       statusCode: 500,
-      message: error.message || '更新排期顺序失败'
+      statusMessage: error.message || '更新排期顺序失败'
     })
   }
 })
diff --git a/server/api/admin/semesters/[id].delete.ts b/server/api/admin/semesters/[id].delete.ts
index 0490df2..b55be4f 100644
--- a/server/api/admin/semesters/[id].delete.ts
+++ b/server/api/admin/semesters/[id].delete.ts
@@ -6,16 +6,16 @@ export default defineEventHandler(async (event) => {
   if (!user || !['ADMIN', 'SUPER_ADMIN', 'SONG_ADMIN'].includes(user.role)) {
     throw createError({
       statusCode: 403,
-      message: '需要管理员权限'
+      statusMessage: '需要管理员权限'
     })
   }
 
-  // 获取学期 ID
+  // 获取学期ID
   const semesterId = parseInt(getRouterParam(event, 'id') || '0')
   if (!semesterId || isNaN(semesterId)) {
     throw createError({
       statusCode: 400,
-      message: '无效的学期 ID'
+      statusMessage: '无效的学期ID'
     })
   }
 
@@ -30,7 +30,7 @@ export default defineEventHandler(async (event) => {
   if (!semester) {
     throw createError({
       statusCode: 404,
-      message: '学期不存在'
+      statusMessage: '学期不存在'
     })
   }
 
@@ -38,7 +38,7 @@ export default defineEventHandler(async (event) => {
   if (semester.isActive) {
     throw createError({
       statusCode: 400,
-      message: '不能删除当前活跃的学期'
+      statusMessage: '不能删除当前活跃的学期'
     })
   }
 
@@ -49,7 +49,7 @@ export default defineEventHandler(async (event) => {
   if (songCount > 0) {
     throw createError({
       statusCode: 400,
-      message: `该学期下还有 ${songCount} 首歌曲，无法删除`
+      statusMessage: `该学期下还有 ${songCount} 首歌曲，无法删除`
     })
   }
 
diff --git a/server/api/admin/semesters/index.post.ts b/server/api/admin/semesters/index.post.ts
index 34231e6..f8e17ae 100644
--- a/server/api/admin/semesters/index.post.ts
+++ b/server/api/admin/semesters/index.post.ts
@@ -21,9 +21,8 @@ export default defineEventHandler(async (event) => {
   }
 
   const body = await readBody(event)
-  const name = typeof body.name === 'string' ? body.name.trim() : ''
 
-  if (!name) {
+  if (!body.name) {
     throw createError({
       statusCode: 400,
       message: '学期名称不能为空'
@@ -34,7 +33,7 @@ export default defineEventHandler(async (event) => {
   const existingSemesterResult = await db
     .select()
     .from(semesters)
-    .where(eq(semesters.name, name))
+    .where(eq(semesters.name, body.name))
     .limit(1)
   const existingSemester = existingSemesterResult[0]
 
@@ -62,7 +61,7 @@ export default defineEventHandler(async (event) => {
   const semesterResult = await db
     .insert(semesters)
     .values({
-      name,
+      name: body.name,
       isActive: shouldBeActive || false
     })
     .returning()
diff --git a/server/api/admin/smtp/reload.post.ts b/server/api/admin/smtp/reload.post.ts
index d16bf2a..8ca4f87 100644
--- a/server/api/admin/smtp/reload.post.ts
+++ b/server/api/admin/smtp/reload.post.ts
@@ -19,8 +19,7 @@ export default defineEventHandler(async (event) => {
 
   try {
     const smtpService = SmtpService.getInstance()
-    // 手动重载必须强制刷新，否则 transporter 已存在时直接早退
-    const initialized = await smtpService.initializeSmtpConfig(true)
+    const initialized = await smtpService.initializeSmtpConfig()
 
     return {
       success: true,
diff --git a/server/api/admin/smtp/test-connection.post.ts b/server/api/admin/smtp/test-connection.post.ts
index 0ab6b4f..9a53863 100644
--- a/server/api/admin/smtp/test-connection.post.ts
+++ b/server/api/admin/smtp/test-connection.post.ts
@@ -1,6 +1,4 @@
 import { SmtpService } from '~~/server/services/smtpService'
-import { getSystemSettingsCached } from '~~/server/utils/system-settings-helper'
-import { SMTP_PASSWORD_MASK } from '~~/server/api/admin/system-settings/secretMask'
 
 export default defineEventHandler(async (event) => {
   // 检查请求方法
@@ -54,19 +52,11 @@ export default defineEventHandler(async (event) => {
     const originalTransporter = smtpService.transporter
 
     try {
-      // 掩码密码回退：以数据库持久化值为准，内存单例不可靠（冷启动竞态/陈旧配置）
-      let testPassword = body.smtpPassword
-      if (testPassword === SMTP_PASSWORD_MASK) {
-        const dbSettings = await getSystemSettingsCached()
-        testPassword = dbSettings?.smtpPassword || ''
-      }
-
-      if (!testPassword) {
-        return {
-          success: false,
-          message: '未找到有效的SMTP密码，请重新填写授权码并保存配置'
-        }
-      }
+      // 如果密码是掩码，则使用原始配置中的密码
+      const testPassword =
+        body.smtpPassword === '****************'
+          ? originalConfig?.auth?.pass || body.smtpPassword
+          : body.smtpPassword
 
       // 设置测试配置
       smtpService.smtpConfig = {
diff --git a/server/api/admin/smtp/test-email.post.ts b/server/api/admin/smtp/test-email.post.ts
index 50eeaef..12fcd27 100644
--- a/server/api/admin/smtp/test-email.post.ts
+++ b/server/api/admin/smtp/test-email.post.ts
@@ -1,7 +1,5 @@
 import { SmtpService } from '~~/server/services/smtpService'
 import { getClientIP } from '~~/server/utils/ip-utils'
-import { getSystemSettingsCached } from '~~/server/utils/system-settings-helper'
-import { SMTP_PASSWORD_MASK } from '~~/server/api/admin/system-settings/secretMask'
 
 export default defineEventHandler(async (event) => {
   // 检查请求方法
@@ -62,19 +60,11 @@ export default defineEventHandler(async (event) => {
     const originalTransporter = smtpService.transporter
 
     try {
-      // 掩码密码回退：以数据库持久化值为准，内存单例不可靠（冷启动竞态/陈旧配置）
-      let testPassword = body.smtpPassword
-      if (testPassword === SMTP_PASSWORD_MASK) {
-        const dbSettings = await getSystemSettingsCached()
-        testPassword = dbSettings?.smtpPassword || ''
-      }
-
-      if (!testPassword) {
-        return {
-          success: false,
-          message: '未找到有效的SMTP密码，请重新填写授权码并保存配置'
-        }
-      }
+      // 如果密码是掩码，则使用原始配置中的密码
+      const testPassword =
+        body.smtpPassword === '****************'
+          ? originalConfig?.auth?.pass || body.smtpPassword
+          : body.smtpPassword
 
       // 设置测试配置
       smtpService.smtpConfig = {
diff --git a/server/api/admin/songs/audit.post.ts b/server/api/admin/songs/audit.post.ts
new file mode 100644
index 0000000..8c3fa87
--- /dev/null
+++ b/server/api/admin/songs/audit.post.ts
@@ -0,0 +1,101 @@
+import { db } from '~/drizzle/db'
+import { songs, requestTimes } from '~/drizzle/schema'
+import { eq, sql } from 'drizzle-orm'
+import { cacheService } from '../../../services/cacheService'
+import { createSongRejectedNotification } from '../../../services/notificationService'
+
+export default defineEventHandler(async (event) => {
+  const user = event.context.user
+  if (!user || !['SONG_ADMIN', 'ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
+    throw createError({
+      statusCode: 403,
+      message: '没有权限访问'
+    })
+  }
+
+  const body = await readBody(event)
+
+  if (!body.songId || !['approved', 'rejected'].includes(body.status)) {
+    throw createError({
+      statusCode: 400,
+      message: '参数错误'
+    })
+  }
+
+  try {
+    let songForNotification = null
+
+    const result = await db.transaction(async (tx) => {
+      const songResult = await tx.select().from(songs).where(eq(songs.id, body.songId)).limit(1)
+      const song = songResult[0]
+
+      if (!song) {
+        throw createError({
+          statusCode: 404,
+          message: '歌曲不存在'
+        })
+      }
+
+      songForNotification = song
+
+      if (body.status === 'rejected') {
+        // 如果有 hitRequestId，减少对应时段的已接纳数量
+        if (song.hitRequestId) {
+          try {
+            await tx
+              .update(requestTimes)
+              .set({
+                accepted: sql`GREATEST(0, accepted - 1)`
+              })
+              .where(eq(requestTimes.id, song.hitRequestId))
+          } catch (error) {
+            console.error(`减少投稿时段接纳数量失败: ${error.message}`)
+          }
+        }
+
+        const note = song.submissionNote ? `[审核未通过] ${body.reason || ''}\n${song.submissionNote}` : `[审核未通过] ${body.reason || ''}`
+
+        // 释放排期序号并更新备注
+        const updatedSong = await tx.update(songs).set({
+          expectedPlayDate: null,
+          expectedPlaySequence: null,
+          hitRequestId: null,
+          submissionNote: note
+        }).where(eq(songs.id, body.songId)).returning()
+
+        return { success: true, song: updatedSong[0] }
+      } else {
+        const note = song.submissionNote ? `[审核已通过]\n${song.submissionNote}` : `[审核已通过]`
+        const updatedSong = await tx.update(songs).set({
+          submissionNote: note
+        }).where(eq(songs.id, body.songId)).returning()
+
+        return { success: true, song: updatedSong[0] }
+      }
+    })
+
+    if (body.status === 'rejected' && songForNotification && songForNotification.requesterId) {
+      createSongRejectedNotification(
+        songForNotification.requesterId,
+        { title: songForNotification.title, artist: songForNotification.artist },
+        body.reason?.trim() || '未过审释放排期',
+        getClientIP(event)
+      ).catch(e => console.error(e))
+    }
+
+    await cacheService.clearSongsCache()
+
+    return {
+      success: true,
+      message: body.status === 'rejected' ? '已驳回并释放排期' : '审核已通过',
+      data: result.song
+    }
+  } catch (error) {
+    console.error('审核歌曲失败:', error)
+    if (error.statusCode) throw error
+    throw createError({
+      statusCode: 500,
+      message: '审核失败: ' + error.message
+    })
+  }
+})
diff --git a/server/api/admin/songs/batch-reject.post.ts b/server/api/admin/songs/batch-reject.post.ts
new file mode 100644
index 0000000..2f0af7a
--- /dev/null
+++ b/server/api/admin/songs/batch-reject.post.ts
@@ -0,0 +1,135 @@
+import { db } from '~/drizzle/db'
+import { schedules, songBlacklists, songs, votes, requestTimes } from '~/drizzle/schema'
+import { and, eq, inArray, sql } from 'drizzle-orm'
+import { cacheService } from '../../../services/cacheService'
+import { createSongRejectedNotification } from '../../../services/notificationService'
+import { requireSongAdmin } from '~~/server/utils/requireSongAdmin'
+import { createApiError } from '~~/server/utils/apiError'
+import { SERVER_ERROR_CODES } from '~~/server/config/constants'
+
+const MAX_BATCH_REJECT_COUNT = 1000
+
+export default defineEventHandler(async (event) => {
+  const user = requireSongAdmin(event)
+
+  const body = await readBody(event)
+
+  const songIds = Array.isArray(body?.songIds)
+    ? [...new Set(body.songIds.filter((id: any) => Number.isInteger(id) && id > 0))]
+    : []
+  const reason = typeof body?.reason === 'string' ? body.reason.trim() : ''
+  const addToBlacklist = body?.addToBlacklist === true
+
+  if (songIds.length === 0) {
+    throw createApiError(400, SERVER_ERROR_CODES.SONG_BATCH_REJECT_IDS_REQUIRED, '歌曲ID列表不能为空')
+  }
+
+  if (songIds.length > MAX_BATCH_REJECT_COUNT) {
+    throw createApiError(
+      400,
+      SERVER_ERROR_CODES.SONG_BATCH_REJECT_LIMIT_EXCEEDED,
+      `单次最多驳回 ${MAX_BATCH_REJECT_COUNT} 首歌曲`,
+      { params: [MAX_BATCH_REJECT_COUNT] }
+    )
+  }
+
+  if (!reason) {
+    throw createApiError(400, SERVER_ERROR_CODES.SONG_BATCH_REJECT_REASON_REQUIRED, '驳回原因不能为空')
+  }
+
+  try {
+    let rejectedSongs: any[] = []
+
+    await db.transaction(async (tx) => {
+      const existingSongs = await tx.select().from(songs).where(inArray(songs.id, songIds))
+
+      if (existingSongs.length === 0) {
+        throw createApiError(404, SERVER_ERROR_CODES.SONG_NOT_FOUND, '歌曲不存在或已被删除')
+      }
+
+      const existingIds = existingSongs.map((song) => song.id)
+      console.log(`开始批量驳回歌曲，共 ${existingIds.length} 首`)
+
+      if (addToBlacklist) {
+        const blacklistValues = [...new Set(existingSongs.map((song: any) => `${song.title} - ${song.artist}`))]
+        const existingBlacklist = await tx
+          .select({ value: songBlacklists.value })
+          .from(songBlacklists)
+          .where(and(eq(songBlacklists.type, 'SONG'), inArray(songBlacklists.value, blacklistValues)))
+        const existingSet = new Set(existingBlacklist.map((item) => item.value))
+        const valuesToInsert = blacklistValues.filter((value) => !existingSet.has(value))
+        for (const value of valuesToInsert) {
+          try {
+            await tx.insert(songBlacklists).values({
+              type: 'SONG',
+              value,
+              reason: `歌曲驳回: ${reason}`,
+              createdBy: user.id
+            })
+          } catch (error: any) {
+            console.log(`黑名单添加失败，可能已存在: ${error.message}`)
+          }
+        }
+        console.log(`黑名单添加处理完成`)
+      }
+
+      await tx.delete(votes).where(inArray(votes.songId, existingIds))
+      console.log(`删除了投票记录`)
+
+      await tx.delete(schedules).where(inArray(schedules.songId, existingIds))
+      console.log(`删除了排期记录`)
+
+      const hitRequestIds = [...new Set(existingSongs.map((song: any) => song.hitRequestId).filter(Boolean))]
+      for (const hitRequestId of hitRequestIds) {
+        const count = existingSongs.filter((song: any) => song.hitRequestId === hitRequestId).length
+        try {
+          await tx
+            .update(requestTimes)
+            .set({
+              accepted: sql`GREATEST(0, accepted - ${count})`
+            })
+            .where(eq(requestTimes.id, hitRequestId as any))
+        } catch (error: any) {
+          console.error(`减少投稿时段 ${hitRequestId} 接纳数量失败: ${error.message}`)
+        }
+      }
+
+      rejectedSongs = await tx.delete(songs).where(inArray(songs.id, existingIds)).returning()
+      console.log(`歌曲批量删除完成`)
+    })
+
+    const songsToNotify = rejectedSongs.filter((song) => song.requesterId)
+    for (const song of songsToNotify) {
+      createSongRejectedNotification(
+        song.requesterId,
+        { title: song.title, artist: song.artist },
+        reason
+      ).catch((error: any) => {
+        console.error(`发送驳回通知失败: ${error.message}`)
+      })
+    }
+
+    await cacheService.clearSongsCache()
+    await cacheService.clearSchedulesCache()
+
+    console.log(`批量驳回操作完成，共 ${rejectedSongs.length} 首`)
+
+    return {
+      success: true,
+      message: '歌曲批量驳回成功',
+      data: {
+        rejected: rejectedSongs.length,
+        missing: songIds.length - rejectedSongs.length,
+        notificationSent: songsToNotify.length
+      }
+    }
+  } catch (error: any) {
+    console.error('批量驳回歌曲失败:', error)
+
+    if (error.statusCode) {
+      throw error
+    }
+
+    throw createApiError(500, SERVER_ERROR_CODES.SONG_OPERATION_FAILED, '批量驳回失败: ' + error.message)
+  }
+})
diff --git a/server/api/admin/songs/delete.post.ts b/server/api/admin/songs/delete.post.ts
index 3a1bc0d..ad77c4f 100644
--- a/server/api/admin/songs/delete.post.ts
+++ b/server/api/admin/songs/delete.post.ts
@@ -1,6 +1,7 @@
 import { db } from '~/drizzle/db'
 import { schedules, songs, votes, requestTimes } from '~/drizzle/schema'
 import { eq, sql } from 'drizzle-orm'
+import { cacheService } from '../../../services/cacheService'
 
 export default defineEventHandler(async (event) => {
   // 检查用户认证和权限
@@ -74,6 +75,17 @@ export default defineEventHandler(async (event) => {
       }
     })
 
+    // 清除相关缓存
+    try {
+      await cacheService.clearSongsCache()
+      if (result.deletedSchedules) {
+        await cacheService.clearSchedulesCache()
+      }
+      console.log('[Cache] 歌曲和排期缓存已清除（删除歌曲）')
+    } catch (cacheError) {
+      console.warn('[Cache] 清除缓存失败:', cacheError)
+    }
+
     return result
   } catch (error: any) {
     console.error('删除歌曲时发生错误:', error)
diff --git a/server/api/admin/songs/mark-played.post.ts b/server/api/admin/songs/mark-played.post.ts
index dc21032..10c0567 100644
--- a/server/api/admin/songs/mark-played.post.ts
+++ b/server/api/admin/songs/mark-played.post.ts
@@ -1,17 +1,10 @@
 import { db } from '~/drizzle/db'
 import { createSongPlayedNotification } from '~~/server/services/notificationService'
+import { CacheService } from '~~/server/services/cacheService'
 import { songs, songReplayRequests } from '~/drizzle/schema'
 import { eq, and, inArray } from 'drizzle-orm'
 import { getBeijingTime } from '~/utils/timeUtils'
 import { getClientIP } from '~~/server/utils/ip-utils'
-import { restoreReplayRequestsToPending } from '~~/server/utils/scheduleReplayBinding'
-import { z } from 'zod'
-
-const markPlayedSchema = z.object({
-  songId: z.number().optional(),
-  songIds: z.array(z.number()).max(100, '批量操作单次最多支持 100 首歌曲').optional(),
-  unmark: z.boolean().optional()
-})
 
 export default defineEventHandler(async (event) => {
   // 检查用户认证
@@ -25,7 +18,7 @@ export default defineEventHandler(async (event) => {
   }
 
   // 检查是否是管理员
-  if (!['ADMIN', 'SUPER_ADMIN', 'SONG_ADMIN'].includes(user.role)) {
+  if (!['ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
     throw createError({
       statusCode: 403,
       message: '只有管理员可以标记歌曲为已播放'
@@ -33,24 +26,15 @@ export default defineEventHandler(async (event) => {
   }
 
   const body = await readBody(event)
-  const validatedDataResult = markPlayedSchema.safeParse(body)
 
-  if (!validatedDataResult.success) {
-    throw createError({
-      statusCode: 400,
-      message: validatedDataResult.error.issues[0]?.message || '请求参数无效'
-    })
+  let songIds: number[] = []
+
+  if (body.songId) {
+    songIds = [body.songId]
+  } else if (body.songIds && Array.isArray(body.songIds)) {
+    songIds = body.songIds
   }
 
-  const validatedData = validatedDataResult.data
-
-  const songIds = Array.from(
-    new Set([
-      ...(validatedData.songId !== undefined ? [validatedData.songId] : []),
-      ...(validatedData.songIds || [])
-    ])
-  )
-
   if (songIds.length === 0) {
     throw createError({
       statusCode: 400,
@@ -58,15 +42,19 @@ export default defineEventHandler(async (event) => {
     })
   }
 
-  // 撤回已播放
-  const isUnmark = validatedData.unmark === true
+  // 检查是否是撤回操作
+  const isUnmark = body.unmark === true
 
-  // 过滤需要更新的歌曲
+  // 构建更新条件：只更新状态不符合预期的歌曲
+  // 如果是标记为已播放(!isUnmark)，则只更新 played = false 的歌曲
+  // 如果是撤回(isUnmark)，则只更新 played = true 的歌曲
   const condition = !isUnmark
     ? and(inArray(songs.id, songIds), eq(songs.played, false))
     : and(inArray(songs.id, songIds), eq(songs.played, true))
 
+  // 使用事务确保数据一致性
   const { updatedSongsResult, updatedSongIds } = await db.transaction(async (tx) => {
+    // 更新歌曲状态
     const updatedSongsResult = await tx
       .update(songs)
       .set({
@@ -74,58 +62,60 @@ export default defineEventHandler(async (event) => {
         playedAt: isUnmark ? null : getBeijingTime()
       })
       .where(condition)
-      .returning({ id: songs.id })
+      .returning()
 
-    const updatedSongIds = updatedSongsResult.map((s) => s.id)
+    // 获取实际更新的歌曲ID列表
+    const updatedSongIds = updatedSongsResult.map(s => s.id)
 
     if (updatedSongIds.length > 0) {
-      if (!isUnmark) {
-        // 标记已播放：履行全部待处理的重播申请
-        const updatedRequests = await tx
-          .update(songReplayRequests)
-          .set({
-            status: 'FULFILLED',
-            updatedAt: new Date()
-          })
-          .where(
-            and(
-              inArray(songReplayRequests.songId, updatedSongIds),
-              eq(songReplayRequests.status, 'PENDING')
-            )
-          )
-          .returning({ id: songReplayRequests.id })
+      // 根据操作类型更新重播申请状态
+      const targetStatus = !isUnmark ? 'PENDING' : 'FULFILLED'
+      const newStatus = !isUnmark ? 'FULFILLED' : 'PENDING'
 
-        if (updatedRequests.length > 0) {
-          console.log(`将 ${updatedRequests.length} 个重播申请状态更新为 FULFILLED（歌曲已播放）`)
-        }
-      } else {
-        // 撤回已播放：每人仅恢复最新一条，避免违反部分唯一索引
-        const restoredCount = await restoreReplayRequestsToPending({
-          tx,
-          songIds: updatedSongIds,
-          at: new Date()
+      const updatedRequests = await tx
+        .update(songReplayRequests)
+        .set({
+          status: newStatus,
+          updatedAt: new Date()
         })
+        .where(
+          and(inArray(songReplayRequests.songId, updatedSongIds), eq(songReplayRequests.status, targetStatus))
+        )
+        .returning()
 
-        if (restoredCount > 0) {
-          console.log(`将 ${restoredCount} 个重播申请状态恢复为 PENDING（撤回已播放）`)
-        }
+      if (updatedRequests.length > 0) {
+        const logMessage = !isUnmark
+          ? `将 ${updatedRequests.length} 个重播申请状态更新为 FULFILLED（歌曲已播放）`
+          : `将 ${updatedRequests.length} 个重播申请状态恢复为 PENDING（撤回已播放）`
+        console.log(logMessage)
       }
     }
 
     return { updatedSongsResult, updatedSongIds }
   })
 
-  // 异步发送通知
+  // 清除歌曲和排期相关缓存
+  try {
+    const cacheService = CacheService.getInstance()
+    await cacheService.clearSongsCache()
+    await cacheService.clearSchedulesCache()
+  } catch (error) {
+    console.error('清除缓存失败:', error)
+  }
+
+  // 如果是标记为已播放，则异步发送通知（不阻塞响应）
   if (!isUnmark && updatedSongIds.length > 0) {
-    event.waitUntil(
-      Promise.allSettled(
-        updatedSongIds.map((songId) =>
-          createSongPlayedNotification(songId).catch((err) => {
-            console.error(`发送歌曲(${songId})已播放通知失败:`, err)
-          })
-        )
-      )
-    )
+    // 获取客户端IP地址
+    const clientIP = getClientIP(event)
+
+    // 异步发送通知，不等待完成
+    setImmediate(() => {
+      Promise.allSettled(updatedSongIds.map(songId => 
+        createSongPlayedNotification(songId, clientIP).catch((err) => {
+          console.error(`发送歌曲(${songId})已播放通知失败:`, err)
+        })
+      ))
+    })
   }
 
   return {
diff --git a/server/api/admin/songs/reject.post.ts b/server/api/admin/songs/reject.post.ts
index a325465..29a64ad 100644
--- a/server/api/admin/songs/reject.post.ts
+++ b/server/api/admin/songs/reject.post.ts
@@ -1,6 +1,7 @@
 import { db } from '~/drizzle/db'
 import { schedules, songBlacklists, songs, votes, requestTimes } from '~/drizzle/schema'
 import { eq, sql } from 'drizzle-orm'
+import { cacheService } from '../../../services/cacheService'
 import { createSongRejectedNotification } from '../../../services/notificationService'
 
 export default defineEventHandler(async (event) => {
@@ -108,7 +109,8 @@ export default defineEventHandler(async (event) => {
       createSongRejectedNotification(
         songForNotification.requesterId,
         { title: songForNotification.title, artist: songForNotification.artist },
-        body.reason.trim()
+        body.reason.trim(),
+        getClientIP(event)
       )
         .then(() => {
           console.log(`已发送驳回通知给用户: ${songForNotification.requesterId}`)
@@ -120,6 +122,10 @@ export default defineEventHandler(async (event) => {
       notificationSent = true
     }
 
+    // 清除相关缓存
+    await cacheService.clearSongsCache()
+    await cacheService.clearSchedulesCache()
+
     console.log(`歌曲驳回操作完成: ${body.songId}`)
 
     return {
diff --git a/server/api/admin/stats.get.ts b/server/api/admin/stats.get.ts
index 7db2f50..56e0d27 100644
--- a/server/api/admin/stats.get.ts
+++ b/server/api/admin/stats.get.ts
@@ -1,7 +1,8 @@
 import { createError, defineEventHandler, getQuery } from 'h3'
 import { db } from '~/drizzle/db'
 import { schedules, semesters, songBlacklists, songs, users } from '~/drizzle/schema'
-import { and, count, eq, gte, lt, ne } from 'drizzle-orm'
+import { and, count, eq, gte, lt } from 'drizzle-orm'
+import { cacheService } from '../../services/cacheService'
 import dayjs from 'dayjs'
 import utc from 'dayjs/plugin/utc.js'
 import timezone from 'dayjs/plugin/timezone.js'
@@ -14,7 +15,7 @@ const BEIJING_TIMEZONE = 'Asia/Shanghai'
 export default defineEventHandler(async (event) => {
   // 检查认证和权限
   const user = event.context.user
-  if (!user || !['SONG_ADMIN', 'ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
+  if (!user || !['ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
     throw createError({
       statusCode: 403,
       message: '需要管理员权限'
@@ -25,6 +26,12 @@ export default defineEventHandler(async (event) => {
   const semester = query.semester as string
 
   try {
+    // 尝试从缓存获取数据
+    const cachedStats = await cacheService.getAdminStats(semester)
+    if (cachedStats) {
+      console.log('[Cache] 管理员统计数据缓存命中')
+      return cachedStats
+    }
     // 获取当前时间相关的日期
     const now = new Date()
     const today = new Date(now.getFullYear(), now.getMonth(), now.getDate())
@@ -69,12 +76,9 @@ export default defineEventHandler(async (event) => {
         return result[0].count
       })(),
 
-      // 总用户数（排除待审核用户）
+      // 总用户数
       (async () => {
-        const result = await db
-          .select({ count: count() })
-          .from(users)
-          .where(ne(users.status, 'pending'))
+        const result = await db.select({ count: count() }).from(users)
         return result[0].count
       })(),
 
@@ -170,27 +174,21 @@ export default defineEventHandler(async (event) => {
         return result[0].count
       })(),
 
-      // 本周新增用户（排除待审核）
+      // 本周新增用户
       (async () => {
         const result = await db
           .select({ count: count() })
           .from(users)
-          .where(and(gte(users.createdAt, weekAgo), ne(users.status, 'pending')))
+          .where(gte(users.createdAt, weekAgo))
         return result[0].count
       })(),
 
-      // 上周新增用户（排除待审核）
+      // 上周新增用户
       (async () => {
         const result = await db
           .select({ count: count() })
           .from(users)
-          .where(
-            and(
-              gte(users.createdAt, twoWeeksAgo),
-              lt(users.createdAt, weekAgo),
-              ne(users.status, 'pending')
-            )
-          )
+          .where(and(gte(users.createdAt, twoWeeksAgo), lt(users.createdAt, weekAgo)))
         return result[0].count
       })(),
 
@@ -264,7 +262,7 @@ export default defineEventHandler(async (event) => {
           const result = await db
             .select({ count: count() })
             .from(users)
-            .where(and(gte(users.createdAt, startOfDay), lt(users.createdAt, endOfDay), ne(users.status, 'pending')))
+            .where(and(gte(users.createdAt, startOfDay), lt(users.createdAt, endOfDay)))
           const countValue = result[0].count
 
           trends.push({
@@ -355,6 +353,15 @@ export default defineEventHandler(async (event) => {
       requestsTrend: trendData[3]
     }
 
+    // 缓存结果
+    await cacheService.setAdminStats(semester, result)
+
+    // 只在Redis可用时显示缓存提示
+    const { isRedisReady } = await import('../../utils/redis')
+    if (isRedisReady()) {
+      console.log('[Cache] 管理员统计数据已缓存')
+    }
+
     return result
   } catch (error) {
     console.error('获取统计数据失败:', error)
diff --git a/server/api/admin/stats/active-users.get.ts b/server/api/admin/stats/active-users.get.ts
index 4526344..e5fb760 100644
--- a/server/api/admin/stats/active-users.get.ts
+++ b/server/api/admin/stats/active-users.get.ts
@@ -1,11 +1,12 @@
 import { createError, defineEventHandler, getQuery } from 'h3'
 import { db } from '~/drizzle/db'
-import { songs, users, votes } from '~/drizzle/schema'
+import { songs, users, votes, userIdentities } from '~/drizzle/schema'
+import { CacheService } from '~~/server/services/cacheService'
+import { getUserAvatarUrl } from '~~/server/utils/user-avatar'
 
 export default defineEventHandler(async (event) => {
-  // 检查认证和权限
   const user = event.context.user
-  if (!user || !['SONG_ADMIN', 'ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
+  if (!user || !['ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
     throw createError({
       statusCode: 403,
       message: '需要管理员权限'
@@ -17,18 +18,31 @@ export default defineEventHandler(async (event) => {
   const limit = parseInt(query.limit as string) || 20
 
   try {
-    // 构建查询条件 - 如果没有指定学期或学期为'all'，查询所有用户
+    const cacheService = CacheService.getInstance()
+    const cachedStats = await cacheService.getActiveUsersStats(semester, limit)
+    if (cachedStats) {
+      console.log('[Cache] 活跃用户统计数据缓存命中')
+      return cachedStats
+    }
+
     let songWhere = {}
     if (semester && semester !== 'all') {
       songWhere = { semester: semester }
     }
 
-    // 获取活跃用户数据 - 有投稿歌曲的用户
     const allUsers = await db.select().from(users)
     const allSongs = await db.select().from(songs)
     const allVotes = await db.select().from(votes)
+    const allIdentities = await db.select().from(userIdentities)
+
+    const identitiesMap = new Map<number, typeof allIdentities>()
+    allIdentities.forEach((identity) => {
+      if (!identitiesMap.has(identity.userId)) {
+        identitiesMap.set(identity.userId, [])
+      }
+      identitiesMap.get(identity.userId)!.push(identity)
+    })
 
-    // 过滤有投稿歌曲的用户
     const activeUsers = allUsers
       .filter((user) => {
         const userSongs = allSongs.filter((song) => {
@@ -56,37 +70,48 @@ export default defineEventHandler(async (event) => {
         }
       })
 
-    // 如果没有活跃用户，返回空数组
     if (activeUsers.length === 0) {
       const emptyResult = []
+      await cacheService.setActiveUsersStats(semester, limit, emptyResult)
+      console.log('[Cache] 活跃用户统计数据已缓存（空结果）')
       return emptyResult
     }
 
-    // 计算每个用户的活跃度数据
     const userStats = activeUsers.map((user) => {
       const contributions = user.songs.length
       const likes = user.songs.reduce((total, song) => total + song.votes.length, 0)
-
-      // 活跃度计算：投稿数 * 2 + 点赞数 * 0.5
       const activityScore = Math.round(contributions * 2 + likes * 0.5)
+      const userIdentitiesData = identitiesMap.get(user.id) || []
+      const avatarUrl = getUserAvatarUrl(
+        {
+          id: user.id,
+          name: user.name,
+          username: user.username,
+          email: user.email,
+          avatarProvider: user.avatarProvider,
+          avatarProviderUserId: user.avatarProviderUserId
+        },
+        userIdentitiesData
+      )
 
-      const userStat = {
+      return {
         id: user.id,
-        name: user.name || user.username, // 优先显示真实姓名，如果没有则显示登录名
+        name: user.name || user.username,
         contributions,
         likes,
-        activityScore
+        activityScore,
+        avatarUrl
       }
-
-      return userStat
     })
 
-    // 按活跃度分数降序排列并限制数量
     const sortedUsers = userStats.sort((a, b) => b.activityScore - a.activityScore).slice(0, limit)
 
+    await cacheService.setActiveUsersStats(semester, limit, sortedUsers)
+    console.log('[Cache] 活跃用户统计数据已缓存')
+
     return sortedUsers
   } catch (error) {
-    // 返回空数组而不是抛出错误，避免前端显示错误
+    console.error('[Stats] 获取活跃用户失败:', error)
     return []
   }
 })
diff --git a/server/api/admin/stats/realtime.get.ts b/server/api/admin/stats/realtime.get.ts
index ddadb54..7b4f449 100644
--- a/server/api/admin/stats/realtime.get.ts
+++ b/server/api/admin/stats/realtime.get.ts
@@ -1,14 +1,26 @@
 import { createError, defineEventHandler } from 'h3'
 import { db } from '~/drizzle/db'
-import { songs, users, userIdentities, votes } from '~/drizzle/schema'
+import { CacheService } from '~~/server/services/cacheService'
+import { songs, users, votes, userIdentities } from '~/drizzle/schema'
 import { count, eq, gte, inArray } from 'drizzle-orm'
 import { getBeijingHour, getBeijingStartOfDay } from '~/utils/timeUtils'
-import { resolveAvatarSource } from '~~/server/utils/user-avatar'
+import { getUserAvatarUrl } from '~~/server/utils/user-avatar'
+
+function formatRelativeTime(date: Date | null | undefined): string {
+  if (!date) return '未知'
+  const now = new Date()
+  const diff = now.getTime() - new Date(date).getTime()
+  const minutes = Math.floor(diff / 60000)
+  if (minutes < 1) return '刚刚'
+  if (minutes < 60) return `${minutes}分钟前`
+  const hours = Math.floor(minutes / 60)
+  if (hours < 24) return `${hours}小时前`
+  return `${Math.floor(hours / 24)}天前`
+}
 
 export default defineEventHandler(async (event) => {
-  // 检查认证和权限
   const user = event.context.user
-  if (!user || !['SONG_ADMIN', 'ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
+  if (!user || !['ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
     throw createError({
       statusCode: 403,
       message: '需要管理员权限'
@@ -16,140 +28,172 @@ export default defineEventHandler(async (event) => {
   }
 
   try {
-    // 获取当前时间相关的日期
+    const cacheService = CacheService.getInstance()
+    const cachedStats = await cacheService.getRealtimeStats()
+    if (cachedStats) {
+      console.log('[Cache] 实时统计数据缓存命中')
+      return cachedStats
+    }
     const now = new Date()
-    const today = getBeijingStartOfDay() // 使用北京时间的一天开始
+    const today = getBeijingStartOfDay()
     const oneHourAgo = new Date(now.getTime() - 60 * 60 * 1000)
     const oneDayAgo = new Date(now.getTime() - 24 * 60 * 60 * 1000)
 
-    // 并行获取实时统计数据
     const [activeUsersData, todayRequests, popularGenres, peakHours] = await Promise.all([
-      // 活跃用户数和用户列表 (最近1小时点歌、登录或点赞的用户)
       (async () => {
         try {
-          // 获取最近1小时内点歌的用户
           const recentSongUsers = await db
             .select({
               requesterId: songs.requesterId,
               requesterName: users.name,
               requesterUsername: users.username,
-              requesterId2: users.id
+              requesterId2: users.id,
+              requesterLastActive: songs.createdAt,
+              requesterAvatarProvider: users.avatarProvider,
+              requesterAvatarProviderUserId: users.avatarProviderUserId,
+              requesterEmail: users.email
             })
             .from(songs)
             .innerJoin(users, eq(songs.requesterId, users.id))
             .where(gte(songs.createdAt, oneHourAgo))
-            .groupBy(songs.requesterId, users.id, users.name, users.username)
+            .groupBy(songs.requesterId, users.id, users.name, users.username, users.lastLogin, users.avatarProvider, users.avatarProviderUserId, users.email, songs.createdAt)
 
-          // 获取最近1小时内登录的用户
           const recentLoginUsers = await db
             .select({
               id: users.id,
               username: users.username,
-              name: users.name
+              name: users.name,
+              lastLogin: users.lastLogin,
+              avatarProvider: users.avatarProvider,
+              avatarProviderUserId: users.avatarProviderUserId,
+              email: users.email
             })
             .from(users)
             .where(gte(users.lastLogin, oneHourAgo))
 
-          // 获取最近1小时内点赞过歌曲的用户
           const recentVoteUsers = await db
             .select({
               userId: votes.userId,
               userName: users.name,
               userUsername: users.username,
-              userId2: users.id
+              userId2: users.id,
+              voteCreatedAt: votes.createdAt,
+              userAvatarProvider: users.avatarProvider,
+              userAvatarProviderUserId: users.avatarProviderUserId,
+              userEmail: users.email
             })
             .from(votes)
             .innerJoin(users, eq(votes.userId, users.id))
             .where(gte(votes.createdAt, oneHourAgo))
-            .groupBy(votes.userId, users.id, users.name, users.username)
+            .groupBy(votes.userId, users.id, users.name, users.username, users.avatarProvider, users.avatarProviderUserId, users.email, votes.createdAt)
 
-          // 合并并去重用户列表
-          const userMap = new Map()
+          const userMap = new Map<number, any>()
 
-          // 添加点歌用户
           recentSongUsers.forEach((song) => {
-            userMap.set(song.requesterId2, {
-              id: song.requesterId2,
+            const id = song.requesterId2
+            const existing = userMap.get(id)
+            const lastActive = existing?.lastActive
+              ? new Date(existing.lastActive) > new Date(song.requesterLastActive)
+                ? existing.lastActive
+                : song.requesterLastActive
+              : song.requesterLastActive
+            userMap.set(id, {
+              id,
               username: song.requesterUsername,
               name: song.requesterName,
-              avatar: null
+              email: song.requesterEmail,
+              avatarProvider: song.requesterAvatarProvider,
+              avatarProviderUserId: song.requesterAvatarProviderUserId,
+              lastActive
             })
           })
 
-          // 添加登录用户
-          recentLoginUsers.forEach((user) => {
-            userMap.set(user.id, {
-              id: user.id,
-              username: user.username,
-              name: user.name,
-              avatar: null
+          recentLoginUsers.forEach((u) => {
+            const existing = userMap.get(u.id)
+            const lastActive = existing?.lastActive
+              ? new Date(existing.lastActive) > new Date(u.lastLogin)
+                ? existing.lastActive
+                : u.lastLogin
+              : u.lastLogin
+            userMap.set(u.id, {
+              id: u.id,
+              username: u.username,
+              name: u.name,
+              email: u.email,
+              avatarProvider: u.avatarProvider,
+              avatarProviderUserId: u.avatarProviderUserId,
+              lastActive
             })
           })
 
-          // 添加点赞用户
           recentVoteUsers.forEach((vote) => {
-            userMap.set(vote.userId2, {
-              id: vote.userId2,
+            const id = vote.userId2
+            const existing = userMap.get(id)
+            const lastActive = existing?.lastActive
+              ? new Date(existing.lastActive) > new Date(vote.voteCreatedAt)
+                ? existing.lastActive
+                : vote.voteCreatedAt
+              : vote.voteCreatedAt
+            userMap.set(id, {
+              id,
               username: vote.userUsername,
               name: vote.userName,
-              avatar: null
+              email: vote.userEmail,
+              avatarProvider: vote.userAvatarProvider,
+              avatarProviderUserId: vote.userAvatarProviderUserId,
+              lastActive
             })
           })
 
-          // 解析头像（与用户管理面板同源：优先用户选中的身份，否则按创建顺序取第一个可用头像）
-          const activeUserIds = Array.from(userMap.keys())
-          if (activeUserIds.length > 0) {
-            const [userPrefs, identities] = await Promise.all([
-              db
-                .select({
-                  id: users.id,
-                  avatarProvider: users.avatarProvider,
-                  avatarProviderUserId: users.avatarProviderUserId
-                })
-                .from(users)
-                .where(inArray(users.id, activeUserIds)),
-              db
-                .select({
-                  userId: userIdentities.userId,
-                  provider: userIdentities.provider,
-                  providerUsername: userIdentities.providerUsername,
-                  providerUserId: userIdentities.providerUserId,
-                  avatar: userIdentities.avatar,
-                  createdAt: userIdentities.createdAt
-                })
+          const userIds = Array.from(userMap.keys())
+          let identitiesData: any[] = []
+          if (userIds.length > 0) {
+            try {
+              identitiesData = await db
+                .select()
                 .from(userIdentities)
-                .where(inArray(userIdentities.userId, activeUserIds))
-            ])
-
-            const prefsMap = new Map(userPrefs.map((pref) => [pref.id, pref]))
-            const identitiesMap = new Map()
-            identities.forEach((identity) => {
-              if (!identitiesMap.has(identity.userId)) {
-                identitiesMap.set(identity.userId, [])
-              }
-              identitiesMap.get(identity.userId).push(identity)
-            })
-
-            userMap.forEach((info, id) => {
-              const pref = prefsMap.get(id)
-              const avatarSource = resolveAvatarSource(
-                {
-                  avatarProvider: pref?.avatarProvider,
-                  avatarProviderUserId: pref?.avatarProviderUserId
-                },
-                identitiesMap.get(id) || []
-              )
-              info.avatar = avatarSource?.url ?? null
-            })
+                .where(inArray(userIdentities.userId, userIds))
+            } catch (e) {
+              identitiesData = []
+            }
           }
 
-          const activeUsersList = Array.from(userMap.values())
+          const identitiesMap = new Map<number, any[]>()
+          identitiesData.forEach((identity) => {
+            if (!identitiesMap.has(identity.userId)) {
+              identitiesMap.set(identity.userId, [])
+            }
+            identitiesMap.get(identity.userId)!.push(identity)
+          })
+
+          const activeUsersList = Array.from(userMap.values()).map((u) => {
+            const userIdentitiesData = identitiesMap.get(u.id) || []
+            const avatarUrl = getUserAvatarUrl(
+              {
+                id: u.id,
+                name: u.name,
+                username: u.username,
+                email: u.email,
+                avatarProvider: u.avatarProvider,
+                avatarProviderUserId: u.avatarProviderUserId
+              },
+              userIdentitiesData
+            )
+            return {
+              id: u.id,
+              username: u.username,
+              name: u.name,
+              avatarUrl,
+              lastActive: formatRelativeTime(u.lastActive)
+            }
+          })
 
           return {
             count: activeUsersList.length,
             users: activeUsersList
           }
         } catch (error) {
+          console.error('[Realtime] 获取活跃用户失败:', error)
           return {
             count: 0,
             users: []
@@ -157,7 +201,6 @@ export default defineEventHandler(async (event) => {
         }
       })(),
 
-      // 今日点歌数
       (async () => {
         try {
           const todayCountResult = await db
@@ -170,12 +213,10 @@ export default defineEventHandler(async (event) => {
         }
       })(),
 
-      // 热门流派 (Song模型中没有genre字段，返回空数组)
       (async () => {
         return []
       })(),
 
-      // 高峰时段 (最近7天的小时统计)
       (async () => {
         try {
           const sevenDaysAgo = new Date(now.getTime() - 7 * 24 * 60 * 60 * 1000)
@@ -186,7 +227,6 @@ export default defineEventHandler(async (event) => {
             .from(songs)
             .where(gte(songs.createdAt, sevenDaysAgo))
 
-          // 按小时统计
           const hourCount = songsData.reduce(
             (acc, song) => {
               const hour = getBeijingHour(song.createdAt)
@@ -196,7 +236,6 @@ export default defineEventHandler(async (event) => {
             {} as Record<number, number>
           )
 
-          // 返回前3个高峰时段
           return Object.entries(hourCount)
             .sort(([, a], [, b]) => b - a)
             .slice(0, 3)
@@ -220,8 +259,12 @@ export default defineEventHandler(async (event) => {
       timestamp: now.toISOString()
     }
 
+    await cacheService.setRealtimeStats(result)
+    console.log('[Cache] 实时统计数据已缓存')
+
     return result
   } catch (error) {
+    console.error('[Realtime] 获取失败:', error)
     throw createError({
       statusCode: 500,
       message: '获取实时统计数据失败'
diff --git a/server/api/admin/stats/semester-comparison.get.ts b/server/api/admin/stats/semester-comparison.get.ts
index 74830a4..a2f74fe 100644
--- a/server/api/admin/stats/semester-comparison.get.ts
+++ b/server/api/admin/stats/semester-comparison.get.ts
@@ -4,7 +4,7 @@ import { and, count, db, eq, exists, schedules, semesters, songs, votes } from '
 export default defineEventHandler(async (event) => {
   // 检查认证和权限
   const user = event.context.user
-  if (!user || !['SONG_ADMIN', 'ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
+  if (!user || !['ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
     throw createError({
       statusCode: 403,
       message: '需要管理员权限'
@@ -19,28 +19,30 @@ export default defineEventHandler(async (event) => {
     const semesterStats = await Promise.all(
       semesterList.map(async (semester) => {
         // 统计该学期的歌曲数量
-        const totalSongsResult = await db
-          .select({ count: count() })
-          .from(songs)
-          .where(eq(songs.semester, semester.name))
+        const [totalSongsResult, totalSchedulesResult, totalRequestsResult] = await Promise.all([
+          db
+            .select({ count: count() })
+            .from(songs)
+            .where(eq(songs.semester, semester.name)),
 
-        // 统计该学期的排期数量（通过关联歌曲）
-        const totalSchedulesResult = await db
-          .select({ count: count() })
-          .from(schedules)
-          .innerJoin(songs, eq(schedules.songId, songs.id))
-          .where(eq(songs.semester, semester.name))
+          // 统计该学期的排期数量（通过关联歌曲）
+          db
+            .select({ count: count() })
+            .from(schedules)
+            .innerJoin(songs, eq(schedules.songId, songs.id))
+            .where(eq(songs.semester, semester.name)),
 
-        // 统计该学期有投票的歌曲数量
-        const totalRequestsResult = await db
-          .select({ count: count() })
-          .from(songs)
-          .where(
-            and(
-              eq(songs.semester, semester.name),
-              exists(db.select().from(votes).where(eq(votes.songId, songs.id)))
+          // 统计该学期有投票的歌曲数量
+          db
+            .select({ count: count() })
+            .from(songs)
+            .where(
+              and(
+                eq(songs.semester, semester.name),
+                exists(db.select().from(votes).where(eq(votes.songId, songs.id)))
+              )
             )
-          )
+        ])
 
         const [totalSongs, totalSchedules, totalRequests] = [
           totalSongsResult[0]?.count || 0,
diff --git a/server/api/admin/stats/top-songs.get.ts b/server/api/admin/stats/top-songs.get.ts
index 9686316..13795ed 100644
--- a/server/api/admin/stats/top-songs.get.ts
+++ b/server/api/admin/stats/top-songs.get.ts
@@ -1,12 +1,12 @@
 import { createError, defineEventHandler, getQuery } from 'h3'
 import { db } from '~/drizzle/db'
 import { songs, users, votes, songReplayRequests } from '~/drizzle/schema'
-import { count, countDistinct, desc, eq, sql } from 'drizzle-orm'
+import { count, desc, eq, sql } from 'drizzle-orm'
 
 export default defineEventHandler(async (event) => {
   // 检查认证和权限
   const user = event.context.user
-  if (!user || !['SONG_ADMIN', 'ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
+  if (!user || !['ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
     throw createError({
       statusCode: 403,
       message: '需要管理员权限'
@@ -30,15 +30,14 @@ export default defineEventHandler(async (event) => {
           artist: songs.artist,
           requesterName: users.name,
           requesterUsername: users.username,
-          // insert-only 模型下同一用户可能有多条申请，按申请人去重计数
-          count: countDistinct(songReplayRequests.userId)
+          count: count(songReplayRequests.id)
         })
         .from(songs)
         .leftJoin(users, eq(songs.requesterId, users.id))
         .leftJoin(songReplayRequests, eq(songs.id, songReplayRequests.songId))
         .where(semester && semester !== 'all' ? eq(songs.semester, semester) : sql`1=1`)
         .groupBy(songs.id, songs.title, songs.artist, users.name, users.username)
-        .orderBy(desc(countDistinct(songReplayRequests.userId)))
+        .orderBy(desc(count(songReplayRequests.id)))
         .limit(limit)
     } else {
       // 按投票数排行（默认）
diff --git a/server/api/admin/stats/trends.get.ts b/server/api/admin/stats/trends.get.ts
index 0afb47f..182cc2c 100644
--- a/server/api/admin/stats/trends.get.ts
+++ b/server/api/admin/stats/trends.get.ts
@@ -5,7 +5,7 @@ import { sql } from 'drizzle-orm'
 export default defineEventHandler(async (event) => {
   // 检查认证和权限
   const user = event.context.user
-  if (!user || !['SONG_ADMIN', 'ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
+  if (!user || !['ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
     throw createError({
       statusCode: 403,
       message: '需要管理员权限'
diff --git a/server/api/admin/stats/user-engagement.get.ts b/server/api/admin/stats/user-engagement.get.ts
index ee4a8d9..829b5b2 100644
--- a/server/api/admin/stats/user-engagement.get.ts
+++ b/server/api/admin/stats/user-engagement.get.ts
@@ -1,12 +1,12 @@
 import { createError, defineEventHandler, getQuery } from 'h3'
 import { db } from '~/drizzle/db'
 import { songs, users } from '~/drizzle/schema'
-import { and, count, eq, gte, sql } from 'drizzle-orm'
+import { count } from 'drizzle-orm'
 
 export default defineEventHandler(async (event) => {
   // 检查认证和权限
   const user = event.context.user
-  if (!user || !['SONG_ADMIN', 'ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
+  if (!user || !['ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
     throw createError({
       statusCode: 403,
       message: '需要管理员权限'
@@ -17,40 +17,47 @@ export default defineEventHandler(async (event) => {
   const semester = query.semester as string
 
   try {
-    const songWhereCondition = semester && semester !== 'all' ? eq(songs.semester, semester) : undefined
+    // 构建查询条件
+    const where = semester && semester !== 'all' ? { semester: semester } : {}
 
     // 获取用户参与度数据
     // 1. 获取总用户数
     const totalUsersResult = await db.select({ count: count() }).from(users)
-    const totalUsers = Number(totalUsersResult[0]?.count || 0)
+    const totalUsers = totalUsersResult[0].count
 
     // 2. 获取有请求歌曲的用户数
-    const activeUsersResult = await db
-      .select({ count: sql<number>`COUNT(DISTINCT ${songs.requesterId})` })
-      .from(songs)
-      .where(songWhereCondition)
-    const activeUsers = Number(activeUsersResult[0]?.count || 0)
+    const allUsers = await db.select().from(users)
+    const allSongs = await db.select().from(songs)
+
+    const activeUsers = allUsers.filter((user) => {
+      return allSongs.some((song) => {
+        if (song.requesterId !== user.id) return false
+        if (semester && semester !== 'all' && song.semester !== semester) return false
+        return true
+      })
+    }).length
 
     // 3. 获取用户请求歌曲的平均数量
-    const totalSongRequestsResult = await db
-      .select({ count: count() })
-      .from(songs)
-      .where(songWhereCondition)
-    const totalSongRequests = Number(totalSongRequestsResult[0]?.count || 0)
+    const userSongCounts = allUsers.map((user) => {
+      const songCount = allSongs.filter((song) => song.requesterId === user.id).length
+      return { ...user, _count: { songs: songCount } }
+    })
+
+    const totalSongRequests = userSongCounts.reduce((sum, user) => sum + user._count.songs, 0)
     const averageSongsPerUser = totalUsers > 0 ? totalSongRequests / totalUsers : 0
 
     // 4. 获取最近活跃用户
     const oneWeekAgo = new Date()
     oneWeekAgo.setDate(oneWeekAgo.getDate() - 7)
 
-    const recentWhereCondition = songWhereCondition
-      ? and(songWhereCondition, gte(songs.createdAt, oneWeekAgo))
-      : gte(songs.createdAt, oneWeekAgo)
-    const recentActiveUsersResult = await db
-      .select({ count: sql<number>`COUNT(DISTINCT ${songs.requesterId})` })
-      .from(songs)
-      .where(recentWhereCondition)
-    const recentActiveUsers = Number(recentActiveUsersResult[0]?.count || 0)
+    const recentActiveUsers = allUsers.filter((user) => {
+      return allSongs.some((song) => {
+        if (song.requesterId !== user.id) return false
+        if (semester && semester !== 'all' && song.semester !== semester) return false
+        if (song.createdAt < oneWeekAgo) return false
+        return true
+      })
+    }).length
 
     return {
       totalUsers,
diff --git a/server/api/admin/system-settings/index.post.ts b/server/api/admin/system-settings/index.post.ts
index ad1375d..1c25235 100644
--- a/server/api/admin/system-settings/index.post.ts
+++ b/server/api/admin/system-settings/index.post.ts
@@ -1,92 +1,6 @@
 import { db } from '~/drizzle/db'
 import { systemSettings } from '~/drizzle/schema'
 import { eq } from 'drizzle-orm'
-import { SMTP_PASSWORD_MASK, SECRET_FIELD_MASK, maskSystemSettingsSecrets } from './secretMask'
-import { SYSTEM_SETTINGS_DEFAULTS } from '~~/server/utils/system-settings-defaults'
-import {
-  getAggregateOAuthLoginTypesOrDefault,
-  isSafeAggregateOAuthUrl,
-  normalizeAggregateOAuthLoginTypes
-} from '~~/server/utils/oauth-providers'
-import { createApiError } from '~~/server/utils/apiError'
-import { SERVER_ERROR_CODES, MUSIC_SOURCE_PLATFORMS, DEFAULT_THEMES } from '~~/server/config/constants'
-import { parseThemeArray, validateThemeConfig } from '~~/server/utils/theme-config'
-import { fetchGradeClassOptions } from '~~/server/utils/grade-class-options'
-
-/**
- * 解析数据库中存储的平台数组（历史脏数据/异常写入时回退默认值）
- */
-const parsePlatformStored = (value: unknown): string[] => {
-  try {
-    const parsed = typeof value === 'string' ? JSON.parse(value) : value
-    return Array.isArray(parsed) && parsed.length > 0 ? (parsed as string[]) : [...MUSIC_SOURCE_PLATFORMS]
-  } catch {
-    return [...MUSIC_SOURCE_PLATFORMS]
-  }
-}
-
-/**
- * 校验平台数组 JSON 字符串
- * @param fieldName 字段名（用于错误消息）
- * @param value 原始值（应为 JSON 字符串）
- * @param requireUnique 是否要求无重复（仅 platformOrder 需要）
- * @returns 校验后的数组
- */
-const validatePlatformArray = (fieldName: string, value: unknown, requireUnique = false): string[] => {
-  if (typeof value !== 'string') {
-    throw createApiError(
-      400,
-      SERVER_ERROR_CODES.COMMON_INVALID_PARAMS,
-      `${fieldName} 必须是 JSON 字符串`
-    )
-  }
-
-  let parsed: unknown
-  try {
-    parsed = JSON.parse(value)
-  } catch {
-    throw createApiError(
-      400,
-      SERVER_ERROR_CODES.COMMON_INVALID_PARAMS,
-      `${fieldName} 格式无效，应为合法 JSON 数组`
-    )
-  }
-
-  if (!Array.isArray(parsed)) {
-    throw createApiError(
-      400,
-      SERVER_ERROR_CODES.COMMON_INVALID_PARAMS,
-      `${fieldName} 必须是数组`
-    )
-  }
-
-  const invalid = parsed.filter((p: unknown) => !(MUSIC_SOURCE_PLATFORMS as readonly string[]).includes(p as string))
-  if (invalid.length > 0) {
-    throw createApiError(
-      400,
-      SERVER_ERROR_CODES.COMMON_INVALID_PARAMS,
-      `${fieldName} 包含无效的平台: ${(invalid as string[]).join(', ')}`
-    )
-  }
-
-  if (parsed.length === 0) {
-    throw createApiError(
-      400,
-      SERVER_ERROR_CODES.COMMON_INVALID_PARAMS,
-      `${fieldName} 至少保留一个平台`
-    )
-  }
-
-  if (requireUnique && parsed.length !== new Set(parsed as string[]).size) {
-    throw createApiError(
-      400,
-      SERVER_ERROR_CODES.COMMON_INVALID_PARAMS,
-      `${fieldName} 中不能包含重复的平台`
-    )
-  }
-
-  return parsed as string[]
-}
 
 export default defineEventHandler(async (event) => {
   // 检查用户认证和权限
@@ -112,36 +26,6 @@ export default defineEventHandler(async (event) => {
     // 验证请求体
     const updateData: any = {}
 
-    // 获取当前设置，用于验证依赖配置的完整性
-    const settingsResult = await db.select().from(systemSettings).limit(1)
-    let settings = settingsResult[0]
-
-    if (body.defaultTheme !== undefined || body.enabledThemes !== undefined) {
-      if (user.role !== 'SUPER_ADMIN') {
-        // 主题设置仅超级管理员可修改：普通管理员请求剥离主题字段，其余配置照常处理
-        delete body.defaultTheme
-        delete body.enabledThemes
-      } else {
-        const enabledThemes = body.enabledThemes !== undefined
-          ? validateThemeConfig(body.defaultTheme ?? settings?.defaultTheme ?? 'System', body.enabledThemes)
-          : parseThemeArray(settings?.enabledThemes, DEFAULT_THEMES)
-        const defaultTheme = body.defaultTheme !== undefined ? body.defaultTheme : settings?.defaultTheme || 'System'
-        validateThemeConfig(defaultTheme, JSON.stringify(enabledThemes))
-        if (body.defaultTheme !== undefined) updateData.defaultTheme = defaultTheme
-        updateData.enabledThemes = JSON.stringify(enabledThemes)
-      }
-    }
-
-    if (body.telemetryEnabled !== undefined) {
-      if (typeof body.telemetryEnabled !== 'boolean') {
-        throw createError({
-          statusCode: 400,
-          message: 'telemetryEnabled 必须是布尔值'
-        })
-      }
-      updateData.telemetryEnabled = body.telemetryEnabled
-    }
-
     if (body.hideStudentInfo !== undefined) {
       if (typeof body.hideStudentInfo !== 'boolean') {
         throw createError({
@@ -182,6 +66,17 @@ export default defineEventHandler(async (event) => {
       updateData.siteDescription = body.siteDescription
     }
 
+    if (body.siteVersion !== undefined) {
+      if (body.siteVersion !== null && typeof body.siteVersion !== 'string') {
+        throw createError({
+          statusCode: 400,
+          message: 'siteVersion 必须是字符串或null'
+        })
+      }
+      updateData.siteVersion =
+        body.siteVersion === null ? null : (body.siteVersion.trim() || null)
+    }
+
     if (body.submissionGuidelines !== undefined) {
       updateData.submissionGuidelines = body.submissionGuidelines
     }
@@ -194,30 +89,6 @@ export default defineEventHandler(async (event) => {
       updateData.gonganNumber = body.gonganNumber
     }
 
-    if (body.statisticsCode !== undefined) {
-      if (body.statisticsCode !== null && typeof body.statisticsCode !== 'string') {
-        throw createApiError(400, SERVER_ERROR_CODES.COMMON_INVALID_PARAMS, 'statisticsCode 必须是字符串或 null')
-      }
-      updateData.statisticsCode = body.statisticsCode
-    }
-
-    if (body.statisticsCodeEnabled !== undefined) {
-      if (typeof body.statisticsCodeEnabled !== 'boolean') {
-        throw createApiError(400, SERVER_ERROR_CODES.COMMON_INVALID_PARAMS, 'statisticsCodeEnabled 必须是布尔值')
-      }
-      updateData.statisticsCodeEnabled = body.statisticsCodeEnabled
-    }
-
-    if (body.showBeianIcon !== undefined) {
-      if (typeof body.showBeianIcon !== 'boolean') {
-        throw createError({
-          statusCode: 400,
-          message: 'showBeianIcon 必须是布尔值'
-        })
-      }
-      updateData.showBeianIcon = body.showBeianIcon
-    }
-
     if (body.enableSubmissionLimit !== undefined) {
       if (typeof body.enableSubmissionLimit !== 'boolean') {
         throw createError({
@@ -228,88 +99,6 @@ export default defineEventHandler(async (event) => {
       updateData.enableSubmissionLimit = body.enableSubmissionLimit
     }
 
-    // 点歌券点歌相关设置
-    if (body.enableCardCodeRequests !== undefined) {
-      if (typeof body.enableCardCodeRequests !== 'boolean') {
-        throw createError({
-          statusCode: 400,
-          message: 'enableCardCodeRequests 必须是布尔值'
-        })
-      }
-      updateData.enableCardCodeRequests = body.enableCardCodeRequests
-    }
-
-    if (body.requireCardCodeForRequests !== undefined) {
-      if (typeof body.requireCardCodeForRequests !== 'boolean') {
-        throw createError({
-          statusCode: 400,
-          message: 'requireCardCodeForRequests 必须是布尔值'
-        })
-      }
-      updateData.requireCardCodeForRequests = body.requireCardCodeForRequests
-    }
-
-    if (body.enableCardCodeLimitBypass !== undefined) {
-      if (typeof body.enableCardCodeLimitBypass !== 'boolean') {
-        throw createError({
-          statusCode: 400,
-          message: 'enableCardCodeLimitBypass 必须是布尔值'
-        })
-      }
-      updateData.enableCardCodeLimitBypass = body.enableCardCodeLimitBypass
-    }
-
-    // 重复投稿限制
-    if (body.enableSubmissionRestriction !== undefined) {
-      if (typeof body.enableSubmissionRestriction !== 'boolean') {
-        throw createApiError(
-          400,
-          SERVER_ERROR_CODES.COMMON_INVALID_PARAMS,
-          'enableSubmissionRestriction 必须是布尔值'
-        )
-      }
-      updateData.enableSubmissionRestriction = body.enableSubmissionRestriction
-    }
-
-    if (body.submissionRestrictionScope !== undefined) {
-      if (body.submissionRestrictionScope !== 'self' && body.submissionRestrictionScope !== 'all') {
-        throw createApiError(
-          400,
-          SERVER_ERROR_CODES.COMMON_INVALID_PARAMS,
-          'submissionRestrictionScope 必须是 self 或 all'
-        )
-      }
-      updateData.submissionRestrictionScope = body.submissionRestrictionScope
-    }
-
-    if (body.sameSongRestrictionHours !== undefined) {
-      if (
-        body.sameSongRestrictionHours !== null &&
-        (!Number.isInteger(body.sameSongRestrictionHours) || body.sameSongRestrictionHours < 1 || body.sameSongRestrictionHours > 720)
-      ) {
-        throw createApiError(
-          400,
-          SERVER_ERROR_CODES.COMMON_INVALID_PARAMS,
-          'sameSongRestrictionHours 必须是 1-720 的正整数或 null'
-        )
-      }
-      updateData.sameSongRestrictionHours = body.sameSongRestrictionHours
-    }
-
-    if (body.sameArtistRestrictionHours !== undefined) {
-      if (
-        body.sameArtistRestrictionHours !== null &&
-        (!Number.isInteger(body.sameArtistRestrictionHours) || body.sameArtistRestrictionHours < 1 || body.sameArtistRestrictionHours > 720)
-      ) {
-        throw createApiError(
-          400,
-          SERVER_ERROR_CODES.COMMON_INVALID_PARAMS,
-          'sameArtistRestrictionHours 必须是 1-720 的正整数或 null'
-        )
-      }
-      updateData.sameArtistRestrictionHours = body.sameArtistRestrictionHours
-    }
-
     if (body.dailySubmissionLimit !== undefined) {
       if (
         body.dailySubmissionLimit !== null &&
@@ -349,48 +138,6 @@ export default defineEventHandler(async (event) => {
       updateData.monthlySubmissionLimit = body.monthlySubmissionLimit
     }
 
-    if (body.scheduleDaysBeforeEnabled !== undefined) {
-      if (typeof body.scheduleDaysBeforeEnabled !== 'boolean') {
-        throw createApiError(400, SERVER_ERROR_CODES.COMMON_INVALID_PARAMS, 'scheduleDaysBeforeEnabled 必须是布尔值')
-      }
-      updateData.scheduleDaysBeforeEnabled = body.scheduleDaysBeforeEnabled
-    }
-
-    if (body.scheduleDaysAfterEnabled !== undefined) {
-      if (typeof body.scheduleDaysAfterEnabled !== 'boolean') {
-        throw createApiError(400, SERVER_ERROR_CODES.COMMON_INVALID_PARAMS, 'scheduleDaysAfterEnabled 必须是布尔值')
-      }
-      updateData.scheduleDaysAfterEnabled = body.scheduleDaysAfterEnabled
-    }
-
-    const nextScheduleDaysBeforeEnabled = body.scheduleDaysBeforeEnabled !== undefined
-      ? body.scheduleDaysBeforeEnabled
-      : (settings?.scheduleDaysBeforeEnabled ?? false)
-    const nextScheduleDaysAfterEnabled = body.scheduleDaysAfterEnabled !== undefined
-      ? body.scheduleDaysAfterEnabled
-      : (settings?.scheduleDaysAfterEnabled ?? false)
-
-    if (body.scheduleDaysBefore !== undefined) {
-      if (!Number.isInteger(body.scheduleDaysBefore) || body.scheduleDaysBefore < 1 || body.scheduleDaysBefore > 730) {
-        throw createApiError(400, SERVER_ERROR_CODES.COMMON_INVALID_PARAMS, 'scheduleDaysBefore 必须是 1-730 的正整数')
-      }
-      updateData.scheduleDaysBefore = body.scheduleDaysBefore
-    }
-
-    if (body.scheduleDaysAfter !== undefined) {
-      if (!Number.isInteger(body.scheduleDaysAfter) || body.scheduleDaysAfter < 1 || body.scheduleDaysAfter > 730) {
-        throw createApiError(400, SERVER_ERROR_CODES.COMMON_INVALID_PARAMS, 'scheduleDaysAfter 必须是 1-730 的正整数')
-      }
-      updateData.scheduleDaysAfter = body.scheduleDaysAfter
-    }
-
-    if (nextScheduleDaysBeforeEnabled && body.scheduleDaysBefore === undefined && !(settings?.scheduleDaysBefore >= 1)) {
-      throw createApiError(400, SERVER_ERROR_CODES.COMMON_INVALID_PARAMS, '启用前方排期限制时，必须填写正整数天数')
-    }
-    if (nextScheduleDaysAfterEnabled && body.scheduleDaysAfter === undefined && !(settings?.scheduleDaysAfter >= 1)) {
-      throw createApiError(400, SERVER_ERROR_CODES.COMMON_INVALID_PARAMS, '启用后方排期限制时，必须填写正整数天数')
-    }
-
     if (body.showBlacklistKeywords !== undefined) {
       if (typeof body.showBlacklistKeywords !== 'boolean') {
         throw createError({
@@ -431,62 +178,6 @@ export default defineEventHandler(async (event) => {
       updateData.enableSubmissionRemarks = body.enableSubmissionRemarks
     }
 
-    if (body.captchaEnabled !== undefined) {
-      if (typeof body.captchaEnabled !== 'boolean') {
-        throw createError({
-          statusCode: 400,
-          message: 'captchaEnabled 必须是布尔值'
-        })
-      }
-      updateData.captchaEnabled = body.captchaEnabled
-    }
-
-    if (body.captchaMaxFailures !== undefined) {
-      if (!Number.isInteger(body.captchaMaxFailures) || body.captchaMaxFailures < 1) {
-        throw createError({
-          statusCode: 400,
-          message: 'captchaMaxFailures 必须是正整数'
-        })
-      }
-      updateData.captchaMaxFailures = body.captchaMaxFailures
-    }
-
-    if (body.captchaProvider !== undefined) {
-      if (body.captchaProvider !== 'graphic' && body.captchaProvider !== 'turnstile') {
-        throw createError({
-          statusCode: 400,
-          message: 'captchaProvider 必须是 graphic 或 turnstile'
-        })
-      }
-
-      const nextTurnstileSiteKey =
-        body.turnstileSiteKey !== undefined ? body.turnstileSiteKey : settings?.turnstileSiteKey
-      const nextTurnstileSecretKey =
-        body.turnstileSecretKey !== undefined && body.turnstileSecretKey !== SECRET_FIELD_MASK
-          ? body.turnstileSecretKey
-          : settings?.turnstileSecretKey
-
-      if (
-        body.captchaProvider === 'turnstile' &&
-        (!nextTurnstileSiteKey || !nextTurnstileSecretKey)
-      ) {
-        throw createError({
-          statusCode: 400,
-          message: '启用 Turnstile 验证前，请先配置 Site Key 和 Secret Key'
-        })
-      }
-
-      updateData.captchaProvider = body.captchaProvider
-    }
-
-    if (body.turnstileSiteKey !== undefined) {
-      updateData.turnstileSiteKey = body.turnstileSiteKey
-    }
-
-    if (body.turnstileSecretKey !== undefined && body.turnstileSecretKey !== SECRET_FIELD_MASK) {
-      updateData.turnstileSecretKey = body.turnstileSecretKey
-    }
-
     if (body.enableRequestTimeLimitation !== undefined) {
       if (typeof body.enableRequestTimeLimitation !== 'boolean') {
         throw createError({
@@ -507,6 +198,106 @@ export default defineEventHandler(async (event) => {
       updateData.forceBlockAllRequests = body.forceBlockAllRequests
     }
 
+    if (body.submissionNoteRequiresApproval !== undefined) {
+      if (typeof body.submissionNoteRequiresApproval !== 'boolean') {
+        throw createError({
+          statusCode: 400,
+          message: 'submissionNoteRequiresApproval 必须是布尔值'
+        })
+      }
+      updateData.submissionNoteRequiresApproval = body.submissionNoteRequiresApproval
+    }
+
+    if (body.telemetryEnabled !== undefined) {
+      if (typeof body.telemetryEnabled !== 'boolean') {
+        throw createError({
+          statusCode: 400,
+          message: 'telemetryEnabled 必须是布尔值'
+        })
+      }
+      updateData.telemetryEnabled = body.telemetryEnabled
+    }
+
+    if (body.showBeianIcon !== undefined) {
+      if (typeof body.showBeianIcon !== 'boolean') {
+        throw createError({
+          statusCode: 400,
+          message: 'showBeianIcon 必须是布尔值'
+        })
+      }
+      updateData.showBeianIcon = body.showBeianIcon
+    }
+
+    if (body.scheduleDaysDisplay !== undefined) {
+      if (body.scheduleDaysDisplay !== null && (!Number.isInteger(body.scheduleDaysDisplay) || body.scheduleDaysDisplay < 0)) {
+        throw createError({
+          statusCode: 400,
+          message: 'scheduleDaysDisplay 必须是非负整数或null'
+        })
+      }
+      updateData.scheduleDaysDisplay = body.scheduleDaysDisplay
+    }
+
+    if (body.scheduleDaysEditable !== undefined) {
+      if (body.scheduleDaysEditable !== null && (!Number.isInteger(body.scheduleDaysEditable) || body.scheduleDaysEditable < 0)) {
+        throw createError({
+          statusCode: 400,
+          message: 'scheduleDaysEditable 必须是非负整数或null'
+        })
+      }
+      updateData.scheduleDaysEditable = body.scheduleDaysEditable
+    }
+
+    if (body.scheduleDaysRequestable !== undefined) {
+      if (body.scheduleDaysRequestable !== null && (!Number.isInteger(body.scheduleDaysRequestable) || body.scheduleDaysRequestable < 0)) {
+        throw createError({
+          statusCode: 400,
+          message: 'scheduleDaysRequestable 必须是非负整数或null'
+        })
+      }
+      updateData.scheduleDaysRequestable = body.scheduleDaysRequestable
+    }
+
+    if (body.scheduleDaysBeforeEnabled !== undefined) {
+      if (typeof body.scheduleDaysBeforeEnabled !== 'boolean') {
+        throw createError({
+          statusCode: 400,
+          message: 'scheduleDaysBeforeEnabled 必须是布尔值'
+        })
+      }
+      updateData.scheduleDaysBeforeEnabled = body.scheduleDaysBeforeEnabled
+    }
+
+    if (body.scheduleDaysBefore !== undefined) {
+      if (body.scheduleDaysBefore !== null && (!Number.isInteger(body.scheduleDaysBefore) || body.scheduleDaysBefore < 0)) {
+        throw createError({
+          statusCode: 400,
+          message: 'scheduleDaysBefore 必须是非负整数或null'
+        })
+      }
+      updateData.scheduleDaysBefore = body.scheduleDaysBefore
+    }
+
+    if (body.scheduleDaysAfterEnabled !== undefined) {
+      if (typeof body.scheduleDaysAfterEnabled !== 'boolean') {
+        throw createError({
+          statusCode: 400,
+          message: 'scheduleDaysAfterEnabled 必须是布尔值'
+        })
+      }
+      updateData.scheduleDaysAfterEnabled = body.scheduleDaysAfterEnabled
+    }
+
+    if (body.scheduleDaysAfter !== undefined) {
+      if (body.scheduleDaysAfter !== null && (!Number.isInteger(body.scheduleDaysAfter) || body.scheduleDaysAfter < 0)) {
+        throw createError({
+          statusCode: 400,
+          message: 'scheduleDaysAfter 必须是非负整数或null'
+        })
+      }
+      updateData.scheduleDaysAfter = body.scheduleDaysAfter
+    }
+
     if (body.forcePasswordChangeOnFirstLogin !== undefined) {
       if (typeof body.forcePasswordChangeOnFirstLogin !== 'boolean') {
         throw createError({
@@ -517,30 +308,408 @@ export default defineEventHandler(async (event) => {
       updateData.forcePasswordChangeOnFirstLogin = body.forcePasswordChangeOnFirstLogin
     }
 
-    // 平台管理配置
-    if (body.enabledPlatforms !== undefined || body.platformOrder !== undefined) {
-      const enabled = body.enabledPlatforms !== undefined
-        ? validatePlatformArray('enabledPlatforms', body.enabledPlatforms, true)
-        : parsePlatformStored(settings?.enabledPlatforms)
-      const order = body.platformOrder !== undefined
-        ? validatePlatformArray('platformOrder', body.platformOrder, true)
-        : parsePlatformStored(settings?.platformOrder)
+    if (body.enableSubmissionRestriction !== undefined) {
+      if (typeof body.enableSubmissionRestriction !== 'boolean') {
+        throw createError({
+          statusCode: 400,
+          message: 'enableSubmissionRestriction 必须是布尔值'
+        })
+      }
+      updateData.enableSubmissionRestriction = body.enableSubmissionRestriction
+    }
 
-      // 交叉一致性：排序中必须至少包含一个已启用的平台，避免“无可用平台”死锁
-      if (!order.some((p) => enabled.includes(p))) {
-        throw createApiError(
-          400,
-          SERVER_ERROR_CODES.COMMON_INVALID_PARAMS,
-          'platformOrder 必须包含至少一个已启用的平台'
-        )
-      }
+    if (body.submissionRestrictionScope !== undefined) {
+      updateData.submissionRestrictionScope = body.submissionRestrictionScope
+    }
 
-      if (body.enabledPlatforms !== undefined) {
-        updateData.enabledPlatforms = body.enabledPlatforms
+    if (body.cardCodeEnabled !== undefined) {
+      if (typeof body.cardCodeEnabled !== 'boolean') {
+        throw createError({
+          statusCode: 400,
+          message: 'cardCodeEnabled 必须是布尔值'
+        })
       }
-      if (body.platformOrder !== undefined) {
-        updateData.platformOrder = body.platformOrder
+      updateData.cardCodeEnabled = body.cardCodeEnabled
+    }
+
+    if (body.cardCodeSubmissionRequired !== undefined) {
+      if (typeof body.cardCodeSubmissionRequired !== 'boolean') {
+        throw createError({
+          statusCode: 400,
+          message: 'cardCodeSubmissionRequired 必须是布尔值'
+        })
       }
+      updateData.cardCodeSubmissionRequired = body.cardCodeSubmissionRequired
+    }
+
+    if (body.cardCodeVoteEnabled !== undefined) {
+      if (typeof body.cardCodeVoteEnabled !== 'boolean') {
+        throw createError({
+          statusCode: 400,
+          message: 'cardCodeVoteEnabled 必须是布尔值'
+        })
+      }
+      updateData.cardCodeVoteEnabled = body.cardCodeVoteEnabled
+    }
+
+    if (body.cardCodeReplayEnabled !== undefined) {
+      if (typeof body.cardCodeReplayEnabled !== 'boolean') {
+        throw createError({
+          statusCode: 400,
+          message: 'cardCodeReplayEnabled 必须是布尔值'
+        })
+      }
+      updateData.cardCodeReplayEnabled = body.cardCodeReplayEnabled
+    }
+
+    if (body.enableCardCodeRequests !== undefined) {
+      if (typeof body.enableCardCodeRequests !== 'boolean') {
+        throw createError({
+          statusCode: 400,
+          message: 'enableCardCodeRequests 必须是布尔值'
+        })
+      }
+      updateData.enableCardCodeRequests = body.enableCardCodeRequests
+    }
+
+    if (body.requireCardCodeForRequests !== undefined) {
+      if (typeof body.requireCardCodeForRequests !== 'boolean') {
+        throw createError({
+          statusCode: 400,
+          message: 'requireCardCodeForRequests 必须是布尔值'
+        })
+      }
+      updateData.requireCardCodeForRequests = body.requireCardCodeForRequests
+    }
+
+    if (body.enableCardCodeLimitBypass !== undefined) {
+      if (typeof body.enableCardCodeLimitBypass !== 'boolean') {
+        throw createError({
+          statusCode: 400,
+          message: 'enableCardCodeLimitBypass 必须是布尔值'
+        })
+      }
+      updateData.enableCardCodeLimitBypass = body.enableCardCodeLimitBypass
+    }
+
+    if (body.submissionRestrictionEnabled !== undefined) {
+      if (typeof body.submissionRestrictionEnabled !== 'boolean') {
+        throw createError({
+          statusCode: 400,
+          message: 'submissionRestrictionEnabled 必须是布尔值'
+        })
+      }
+      updateData.submissionRestrictionEnabled = body.submissionRestrictionEnabled
+    }
+
+    if (body.submissionRestrictionGradeEnabled !== undefined) {
+      if (typeof body.submissionRestrictionGradeEnabled !== 'boolean') {
+        throw createError({
+          statusCode: 400,
+          message: 'submissionRestrictionGradeEnabled 必须是布尔值'
+        })
+      }
+      updateData.submissionRestrictionGradeEnabled = body.submissionRestrictionGradeEnabled
+    }
+
+    if (body.submissionRestrictionClassEnabled !== undefined) {
+      if (typeof body.submissionRestrictionClassEnabled !== 'boolean') {
+        throw createError({
+          statusCode: 400,
+          message: 'submissionRestrictionClassEnabled 必须是布尔值'
+        })
+      }
+      updateData.submissionRestrictionClassEnabled = body.submissionRestrictionClassEnabled
+    }
+
+    if (body.submissionRestrictionGraduateEnabled !== undefined) {
+      if (typeof body.submissionRestrictionGraduateEnabled !== 'boolean') {
+        throw createError({
+          statusCode: 400,
+          message: 'submissionRestrictionGraduateEnabled 必须是布尔值'
+        })
+      }
+      updateData.submissionRestrictionGraduateEnabled = body.submissionRestrictionGraduateEnabled
+    }
+
+    if (body.submissionRestrictionWithdrawnEnabled !== undefined) {
+      if (typeof body.submissionRestrictionWithdrawnEnabled !== 'boolean') {
+        throw createError({
+          statusCode: 400,
+          message: 'submissionRestrictionWithdrawnEnabled 必须是布尔值'
+        })
+      }
+      updateData.submissionRestrictionWithdrawnEnabled = body.submissionRestrictionWithdrawnEnabled
+    }
+
+    if (body.captchaProvider !== undefined) {
+      updateData.captchaProvider = body.captchaProvider
+    }
+
+    if (body.captchaEnabled !== undefined) {
+      if (typeof body.captchaEnabled !== 'boolean') {
+        throw createError({
+          statusCode: 400,
+          message: 'captchaEnabled 必须是布尔值'
+        })
+      }
+      updateData.captchaEnabled = body.captchaEnabled
+    }
+
+    if (body.allowRegister !== undefined) {
+      if (typeof body.allowRegister !== 'boolean') {
+        throw createError({
+          statusCode: 400,
+          message: 'allowRegister 必须是布尔值'
+        })
+      }
+      updateData.allowRegister = body.allowRegister
+    }
+
+    if (body.registerRequireEmail !== undefined) {
+      if (typeof body.registerRequireEmail !== 'boolean') {
+        throw createError({
+          statusCode: 400,
+          message: 'registerRequireEmail 必须是布尔值'
+        })
+      }
+      updateData.registerRequireEmail = body.registerRequireEmail
+    }
+
+    if (body.registerRequireEmailVerify !== undefined) {
+      if (typeof body.registerRequireEmailVerify !== 'boolean') {
+        throw createError({
+          statusCode: 400,
+          message: 'registerRequireEmailVerify 必须是布尔值'
+        })
+      }
+      updateData.registerRequireEmailVerify = body.registerRequireEmailVerify
+    }
+
+    if (body.registerDefaultRole !== undefined) {
+      updateData.registerDefaultRole = body.registerDefaultRole
+    }
+
+    if (body.registerRequiresApproval !== undefined) {
+      if (typeof body.registerRequiresApproval !== 'boolean') {
+        throw createError({
+          statusCode: 400,
+          message: 'registerRequiresApproval 必须是布尔值'
+        })
+      }
+      updateData.registerRequiresApproval = body.registerRequiresApproval
+    }
+
+    if (body.oauthRegisterRequiresApproval !== undefined) {
+      if (typeof body.oauthRegisterRequiresApproval !== 'boolean') {
+        throw createError({
+          statusCode: 400,
+          message: 'oauthRegisterRequiresApproval 必须是布尔值'
+        })
+      }
+      updateData.oauthRegisterRequiresApproval = body.oauthRegisterRequiresApproval
+    }
+
+    if (body.registerEmailRequired !== undefined) {
+      if (typeof body.registerEmailRequired !== 'boolean') {
+        throw createError({
+          statusCode: 400,
+          message: 'registerEmailRequired 必须是布尔值'
+        })
+      }
+      updateData.registerEmailRequired = body.registerEmailRequired
+    }
+
+    if (body.registerRequiresGradeClass !== undefined) {
+      if (typeof body.registerRequiresGradeClass !== 'boolean') {
+        throw createError({
+          statusCode: 400,
+          message: 'registerRequiresGradeClass 必须是布尔值'
+        })
+      }
+      updateData.registerRequiresGradeClass = body.registerRequiresGradeClass
+    }
+
+    if (body.oauthEnabled !== undefined) {
+      if (typeof body.oauthEnabled !== 'boolean') {
+        throw createError({
+          statusCode: 400,
+          message: 'oauthEnabled 必须是布尔值'
+        })
+      }
+      updateData.oauthEnabled = body.oauthEnabled
+    }
+
+    if (body.oauthAllowRegister !== undefined) {
+      if (typeof body.oauthAllowRegister !== 'boolean') {
+        throw createError({
+          statusCode: 400,
+          message: 'oauthAllowRegister 必须是布尔值'
+        })
+      }
+      updateData.oauthAllowRegister = body.oauthAllowRegister
+    }
+
+    if (body.oauthAllowLogin !== undefined) {
+      if (typeof body.oauthAllowLogin !== 'boolean') {
+        throw createError({
+          statusCode: 400,
+          message: 'oauthAllowLogin 必须是布尔值'
+        })
+      }
+      updateData.oauthAllowLogin = body.oauthAllowLogin
+    }
+
+    if (body.oauthAllowBind !== undefined) {
+      if (typeof body.oauthAllowBind !== 'boolean') {
+        throw createError({
+          statusCode: 400,
+          message: 'oauthAllowBind 必须是布尔值'
+        })
+      }
+      updateData.oauthAllowBind = body.oauthAllowBind
+    }
+
+    if (body.allowOAuthRegistration !== undefined) {
+      if (typeof body.allowOAuthRegistration !== 'boolean') {
+        throw createError({
+          statusCode: 400,
+          message: 'allowOAuthRegistration 必须是布尔值'
+        })
+      }
+      updateData.allowOAuthRegistration = body.allowOAuthRegistration
+    }
+
+    if (body.oauthProviders !== undefined) {
+      updateData.oauthProviders = body.oauthProviders
+    }
+
+    if (body.githubOAuthEnabled !== undefined) {
+      if (typeof body.githubOAuthEnabled !== 'boolean') {
+        throw createError({
+          statusCode: 400,
+          message: 'githubOAuthEnabled 必须是布尔值'
+        })
+      }
+      updateData.githubOAuthEnabled = body.githubOAuthEnabled
+    }
+
+    if (body.casdoorOAuthEnabled !== undefined) {
+      if (typeof body.casdoorOAuthEnabled !== 'boolean') {
+        throw createError({
+          statusCode: 400,
+          message: 'casdoorOAuthEnabled 必须是布尔值'
+        })
+      }
+      updateData.casdoorOAuthEnabled = body.casdoorOAuthEnabled
+    }
+
+    if (body.googleOAuthEnabled !== undefined) {
+      if (typeof body.googleOAuthEnabled !== 'boolean') {
+        throw createError({
+          statusCode: 400,
+          message: 'googleOAuthEnabled 必须是布尔值'
+        })
+      }
+      updateData.googleOAuthEnabled = body.googleOAuthEnabled
+    }
+
+    if (body.aggregateOAuthEnabled !== undefined) {
+      if (typeof body.aggregateOAuthEnabled !== 'boolean') {
+        throw createError({
+          statusCode: 400,
+          message: 'aggregateOAuthEnabled 必须是布尔值'
+        })
+      }
+      updateData.aggregateOAuthEnabled = body.aggregateOAuthEnabled
+    }
+
+    if (body.aggregateOAuthLoginType !== undefined) {
+      updateData.aggregateOAuthLoginType = body.aggregateOAuthLoginType
+    }
+
+    if (body.customOAuthEnabled !== undefined) {
+      if (typeof body.customOAuthEnabled !== 'boolean') {
+        throw createError({
+          statusCode: 400,
+          message: 'customOAuthEnabled 必须是布尔值'
+        })
+      }
+      updateData.customOAuthEnabled = body.customOAuthEnabled
+    }
+
+    if (body.captchaMaxFailures !== undefined) {
+      if (body.captchaMaxFailures !== null && (!Number.isInteger(body.captchaMaxFailures) || body.captchaMaxFailures < 0)) {
+        throw createError({
+          statusCode: 400,
+          message: 'captchaMaxFailures 必须是非负整数或null'
+        })
+      }
+      updateData.captchaMaxFailures = body.captchaMaxFailures
+    }
+
+    if (body.autoBackupEnabled !== undefined) {
+      if (typeof body.autoBackupEnabled !== 'boolean') {
+        throw createError({
+          statusCode: 400,
+          message: 'autoBackupEnabled 必须是布尔值'
+        })
+      }
+      updateData.autoBackupEnabled = body.autoBackupEnabled
+    }
+
+    if (body.autoBackupIntervalHours !== undefined) {
+      if (body.autoBackupIntervalHours !== null && (!Number.isInteger(body.autoBackupIntervalHours) || body.autoBackupIntervalHours < 0)) {
+        throw createError({
+          statusCode: 400,
+          message: 'autoBackupIntervalHours 必须是非负整数或null'
+        })
+      }
+      updateData.autoBackupIntervalHours = body.autoBackupIntervalHours
+    }
+
+    if (body.autoBackupRetentionDays !== undefined) {
+      if (body.autoBackupRetentionDays !== null && (!Number.isInteger(body.autoBackupRetentionDays) || body.autoBackupRetentionDays < 0)) {
+        throw createError({
+          statusCode: 400,
+          message: 'autoBackupRetentionDays 必须是非负整数或null'
+        })
+      }
+      updateData.autoBackupRetentionDays = body.autoBackupRetentionDays
+    }
+
+    if (body.statisticsCodeEnabled !== undefined) {
+      if (typeof body.statisticsCodeEnabled !== 'boolean') {
+        throw createError({
+          statusCode: 400,
+          message: 'statisticsCodeEnabled 必须是布尔值'
+        })
+      }
+      updateData.statisticsCodeEnabled = body.statisticsCodeEnabled
+    }
+
+    if (body.statisticsCodeBody !== undefined) {
+      updateData.statisticsCodeBody = body.statisticsCodeBody
+    }
+
+    if (body.statisticsCodeHead !== undefined) {
+      updateData.statisticsCodeHead = body.statisticsCodeHead
+    }
+
+    if (body.defaultTheme !== undefined) {
+      updateData.defaultTheme =
+        typeof body.defaultTheme === 'string' && body.defaultTheme.trim()
+          ? body.defaultTheme.trim()
+          : null
+    }
+
+    if (body.enabledThemes !== undefined) {
+      updateData.enabledThemes =
+        body.enabledThemes === null || body.enabledThemes === undefined
+          ? null
+          : typeof body.enabledThemes === 'string'
+            ? body.enabledThemes
+            : JSON.stringify(body.enabledThemes)
     }
 
     // SMTP配置字段
@@ -585,7 +754,7 @@ export default defineEventHandler(async (event) => {
       updateData.smtpUsername = body.smtpUsername
     }
 
-    if (body.smtpPassword !== undefined && body.smtpPassword !== SMTP_PASSWORD_MASK) {
+    if (body.smtpPassword !== undefined && body.smtpPassword !== '****************') {
       updateData.smtpPassword = body.smtpPassword
     }
 
@@ -597,440 +766,6 @@ export default defineEventHandler(async (event) => {
       updateData.smtpFromName = body.smtpFromName
     }
 
-    // OAuth 配置字段
-    if (body.allowOAuthRegistration !== undefined) {
-      if (typeof body.allowOAuthRegistration !== 'boolean') {
-        throw createError({
-          statusCode: 400,
-          message: 'allowOAuthRegistration 必须是布尔值'
-        })
-      }
-      updateData.allowOAuthRegistration = body.allowOAuthRegistration
-    }
-
-    // 注册配置字段
-    if (body.allowRegister !== undefined) {
-      if (typeof body.allowRegister !== 'boolean') {
-        throw createError({
-          statusCode: 400,
-          message: 'allowRegister 必须是布尔值'
-        })
-      }
-      updateData.allowRegister = body.allowRegister
-    }
-
-    if (body.registerRequiresApproval !== undefined) {
-      if (typeof body.registerRequiresApproval !== 'boolean') {
-        throw createError({
-          statusCode: 400,
-          message: 'registerRequiresApproval 必须是布尔值'
-        })
-      }
-      updateData.registerRequiresApproval = body.registerRequiresApproval
-    }
-
-    if (body.oauthRegisterRequiresApproval !== undefined) {
-      if (typeof body.oauthRegisterRequiresApproval !== 'boolean') {
-        throw createError({
-          statusCode: 400,
-          message: 'oauthRegisterRequiresApproval 必须是布尔值'
-        })
-      }
-      updateData.oauthRegisterRequiresApproval = body.oauthRegisterRequiresApproval
-    }
-
-    if (body.submissionNoteRequiresApproval !== undefined) {
-      if (typeof body.submissionNoteRequiresApproval !== 'boolean') {
-        throw createError({
-          statusCode: 400,
-          message: 'submissionNoteRequiresApproval 必须是布尔值'
-        })
-      }
-      updateData.submissionNoteRequiresApproval = body.submissionNoteRequiresApproval
-    }
-
-    // 注册子开关（邮箱必填 / 年级班级必填）以注册入口开启为前提：
-    // 两个入口均关闭时子开关无实际作用，直接落 false，避免整单保存被拒且子开关已隐藏无法取消
-    const registerEntryOpen = Boolean(
-      body.allowRegister ?? settings?.allowRegister
-    ) || Boolean(body.allowOAuthRegistration ?? settings?.allowOAuthRegistration)
-
-    if (body.registerEmailRequired !== undefined) {
-      if (typeof body.registerEmailRequired !== 'boolean') {
-        throw createApiError(400, SERVER_ERROR_CODES.COMMON_INVALID_PARAMS, 'registerEmailRequired 必须是布尔值')
-      }
-      // 开启时 SMTP 必须已配置并启用（合并提交值校验）
-      const nextEmailRequired = registerEntryOpen && body.registerEmailRequired
-      if (nextEmailRequired) {
-        const smtpEnabled = body.smtpEnabled ?? settings?.smtpEnabled
-        const smtpHost = body.smtpHost ?? settings?.smtpHost
-        if (!smtpEnabled || !smtpHost) {
-          throw createApiError(400, SERVER_ERROR_CODES.COMMON_INVALID_PARAMS, '请先配置并开启 SMTP 邮件服务，再启用注册邮箱必填')
-        }
-      }
-      updateData.registerEmailRequired = nextEmailRequired
-    }
-
-    if (body.registerRequiresGradeClass !== undefined) {
-      if (typeof body.registerRequiresGradeClass !== 'boolean') {
-        throw createApiError(400, SERVER_ERROR_CODES.COMMON_INVALID_PARAMS, 'registerRequiresGradeClass 必须是布尔值')
-      }
-      // 开启时系统内必须已有可选年级班级组合，否则注册表单无项可选、注册请求全部被拒
-      const nextGradeClassRequired = registerEntryOpen && body.registerRequiresGradeClass
-      if (nextGradeClassRequired && (await fetchGradeClassOptions()).length === 0) {
-        throw createApiError(
-          400,
-          SERVER_ERROR_CODES.SETTINGS_GRADE_CLASS_OPTIONS_MISSING,
-          '请先在年级班级管理中配置年级班级，再启用注册时必须选择年级班级'
-        )
-      }
-      updateData.registerRequiresGradeClass = nextGradeClassRequired
-    }
-
-    if (body.oauthRedirectUri !== undefined) {
-      const normalizedOauthRedirectUri =
-        typeof body.oauthRedirectUri === 'string'
-          ? body.oauthRedirectUri.trim()
-          : body.oauthRedirectUri
-
-      if (normalizedOauthRedirectUri !== null && normalizedOauthRedirectUri !== '') {
-        try {
-          const uri = new URL(normalizedOauthRedirectUri)
-          // 支持 broker 回调 (包含 /callback 或 /api/auth/[provider]/callback 结构)
-          const validPathPattern = /(?:\/api)?\/auth\/[^/]+\/callback\/?$|\/callback\/?$/
-          if (!validPathPattern.test(uri.pathname)) {
-            throw createError({
-              statusCode: 400,
-              message:
-                'oauthRedirectUri 必须是回调地址，例如 https://yourdomain.com/api/auth/[provider]/callback'
-            })
-          }
-        } catch (error: any) {
-          if (error?.statusCode === 400) throw error
-          throw createError({
-            statusCode: 400,
-            message:
-              'oauthRedirectUri 不是合法URL，示例：https://yourdomain.com/api/auth/[provider]/callback'
-          })
-        }
-      }
-      updateData.oauthRedirectUri =
-        normalizedOauthRedirectUri === '' ? null : normalizedOauthRedirectUri
-    }
-
-    if (body.oauthStateSecret !== undefined && body.oauthStateSecret !== SECRET_FIELD_MASK) {
-      updateData.oauthStateSecret = body.oauthStateSecret
-    }
-
-    const nextOauthRedirectUri =
-      body.oauthRedirectUri !== undefined ? updateData.oauthRedirectUri : settings?.oauthRedirectUri
-    const nextOauthStateSecret =
-      body.oauthStateSecret !== undefined && body.oauthStateSecret !== SECRET_FIELD_MASK
-        ? body.oauthStateSecret
-        : settings?.oauthStateSecret
-    const nextGithubOAuthEnabled =
-      body.githubOAuthEnabled !== undefined
-        ? body.githubOAuthEnabled
-        : (settings?.githubOAuthEnabled ?? false)
-    const nextCasdoorOAuthEnabled =
-      body.casdoorOAuthEnabled !== undefined
-        ? body.casdoorOAuthEnabled
-        : (settings?.casdoorOAuthEnabled ?? false)
-    const nextGoogleOAuthEnabled =
-      body.googleOAuthEnabled !== undefined
-        ? body.googleOAuthEnabled
-        : (settings?.googleOAuthEnabled ?? false)
-    const nextAggregateOAuthEnabled =
-      body.aggregateOAuthEnabled !== undefined
-        ? body.aggregateOAuthEnabled
-        : (settings?.aggregateOAuthEnabled ?? false)
-    const nextCustomOAuthEnabled =
-      body.customOAuthEnabled !== undefined
-        ? body.customOAuthEnabled
-        : (settings?.customOAuthEnabled ?? false)
-
-    if (
-      nextGithubOAuthEnabled ||
-      nextCasdoorOAuthEnabled ||
-      nextGoogleOAuthEnabled ||
-      nextAggregateOAuthEnabled ||
-      nextCustomOAuthEnabled
-    ) {
-      if (!nextOauthRedirectUri || !nextOauthStateSecret) {
-        throw createError({
-          statusCode: 400,
-          message:
-            '启用 OAuth 登录方式前，请先在管理员后台配置 OAuth 重定向 URI 和 OAuth State 密钥'
-        })
-      }
-    }
-
-    // GitHub OAuth
-    if (body.githubOAuthEnabled !== undefined) {
-      if (typeof body.githubOAuthEnabled !== 'boolean') {
-        throw createError({
-          statusCode: 400,
-          message: 'githubOAuthEnabled 必须是布尔值'
-        })
-      }
-      if (body.githubOAuthEnabled && !body.githubClientId && !settings?.githubClientId) {
-        throw createError({ statusCode: 400, message: '启用 GitHub 登录时必须提供 Client ID' })
-      }
-      if (body.githubOAuthEnabled && !body.githubClientSecret && !settings?.githubClientSecret) {
-        throw createError({ statusCode: 400, message: '启用 GitHub 登录时必须提供 Client Secret' })
-      }
-      updateData.githubOAuthEnabled = body.githubOAuthEnabled
-    }
-
-    if (body.githubClientId !== undefined) {
-      updateData.githubClientId = body.githubClientId
-    }
-
-    if (body.githubClientSecret !== undefined && body.githubClientSecret !== SECRET_FIELD_MASK) {
-      updateData.githubClientSecret = body.githubClientSecret
-    }
-
-    // Casdoor OAuth
-    if (body.casdoorOAuthEnabled !== undefined) {
-      if (typeof body.casdoorOAuthEnabled !== 'boolean') {
-        throw createError({
-          statusCode: 400,
-          message: 'casdoorOAuthEnabled 必须是布尔值'
-        })
-      }
-      if (body.casdoorOAuthEnabled && !body.casdoorServerUrl && !settings?.casdoorServerUrl) {
-        throw createError({ statusCode: 400, message: '启用 Casdoor 登录时必须提供服务器 URL' })
-      }
-      if (body.casdoorOAuthEnabled && !body.casdoorClientId && !settings?.casdoorClientId) {
-        throw createError({ statusCode: 400, message: '启用 Casdoor 登录时必须提供 Client ID' })
-      }
-      if (body.casdoorOAuthEnabled && !body.casdoorClientSecret && !settings?.casdoorClientSecret) {
-        throw createError({ statusCode: 400, message: '启用 Casdoor 登录时必须提供 Client Secret' })
-      }
-      if (
-        body.casdoorOAuthEnabled &&
-        !body.casdoorOrganizationName &&
-        !settings?.casdoorOrganizationName
-      ) {
-        throw createError({ statusCode: 400, message: '启用 Casdoor 登录时必须提供组织名称' })
-      }
-      updateData.casdoorOAuthEnabled = body.casdoorOAuthEnabled
-    }
-
-    if (body.casdoorServerUrl !== undefined) {
-      updateData.casdoorServerUrl = body.casdoorServerUrl
-    }
-
-    if (body.casdoorClientId !== undefined) {
-      updateData.casdoorClientId = body.casdoorClientId
-    }
-
-    if (body.casdoorClientSecret !== undefined && body.casdoorClientSecret !== SECRET_FIELD_MASK) {
-      updateData.casdoorClientSecret = body.casdoorClientSecret
-    }
-
-    if (body.casdoorOrganizationName !== undefined) {
-      updateData.casdoorOrganizationName = body.casdoorOrganizationName
-    }
-
-    // Google OAuth
-    if (body.googleOAuthEnabled !== undefined) {
-      if (typeof body.googleOAuthEnabled !== 'boolean') {
-        throw createError({
-          statusCode: 400,
-          message: 'googleOAuthEnabled 必须是布尔值'
-        })
-      }
-      if (body.googleOAuthEnabled && !body.googleClientId && !settings?.googleClientId) {
-        throw createError({ statusCode: 400, message: '启用 Google 登录时必须提供 Client ID' })
-      }
-      if (body.googleOAuthEnabled && !body.googleClientSecret && !settings?.googleClientSecret) {
-        throw createError({ statusCode: 400, message: '启用 Google 登录时必须提供 Client Secret' })
-      }
-      updateData.googleOAuthEnabled = body.googleOAuthEnabled
-    }
-
-    if (body.googleClientId !== undefined) {
-      updateData.googleClientId = body.googleClientId
-    }
-
-    if (body.googleClientSecret !== undefined && body.googleClientSecret !== SECRET_FIELD_MASK) {
-      updateData.googleClientSecret = body.googleClientSecret
-    }
-
-    // 聚合登陆
-    const normalizeOptionalText = (value: any) => (typeof value === 'string' ? value.trim() : value)
-    const storedAggregateLoginTypes = getAggregateOAuthLoginTypesOrDefault(
-      settings?.aggregateOAuthLoginType
-    )
-    const nextAggregateLoginTypes =
-      body.aggregateOAuthLoginType !== undefined
-        ? normalizeAggregateOAuthLoginTypes(body.aggregateOAuthLoginType)
-        : storedAggregateLoginTypes
-    const nextAggregateAppId =
-      body.aggregateOAuthAppId !== undefined
-        ? normalizeOptionalText(body.aggregateOAuthAppId)
-        : settings?.aggregateOAuthAppId
-    const nextAggregateAppKey =
-      body.aggregateOAuthAppKey !== undefined && body.aggregateOAuthAppKey !== SECRET_FIELD_MASK
-        ? normalizeOptionalText(body.aggregateOAuthAppKey)
-        : settings?.aggregateOAuthAppKey
-    const nextAggregateEndpoint =
-      body.aggregateOAuthEndpoint !== undefined
-        ? normalizeOptionalText(body.aggregateOAuthEndpoint)
-        : settings?.aggregateOAuthEndpoint || ''
-
-    if (body.aggregateOAuthEnabled !== undefined) {
-      if (typeof body.aggregateOAuthEnabled !== 'boolean') {
-        throw createError({
-          statusCode: 400,
-          message: 'aggregateOAuthEnabled 必须是布尔值'
-        })
-      }
-      updateData.aggregateOAuthEnabled = body.aggregateOAuthEnabled
-    }
-
-    if (nextAggregateOAuthEnabled && !nextAggregateAppId) {
-      throw createError({ statusCode: 400, message: '启用聚合登陆时必须提供 AppID' })
-    }
-    if (nextAggregateOAuthEnabled && !nextAggregateAppKey) {
-      throw createError({ statusCode: 400, message: '启用聚合登陆时必须提供 AppKey' })
-    }
-    if (nextAggregateOAuthEnabled && !nextAggregateEndpoint) {
-      throw createError({ statusCode: 400, message: '启用聚合登陆时必须提供接口地址' })
-    }
-    if (nextAggregateOAuthEnabled && nextAggregateLoginTypes.length === 0) {
-      throw createError({ statusCode: 400, message: '启用聚合登陆时至少选择一种登录方式' })
-    }
-
-    if (body.aggregateOAuthAppId !== undefined) {
-      updateData.aggregateOAuthAppId = nextAggregateAppId || null
-    }
-
-    if (
-      body.aggregateOAuthAppKey !== undefined &&
-      body.aggregateOAuthAppKey !== SECRET_FIELD_MASK
-    ) {
-      updateData.aggregateOAuthAppKey = nextAggregateAppKey || null
-    }
-
-    if (body.aggregateOAuthLoginType !== undefined) {
-      updateData.aggregateOAuthLoginType = JSON.stringify(nextAggregateLoginTypes)
-    }
-
-    if (body.aggregateOAuthEndpoint !== undefined) {
-      if (nextAggregateEndpoint) {
-        if (!isSafeAggregateOAuthUrl(nextAggregateEndpoint)) {
-          throw createError({
-            statusCode: 400,
-            message: 'aggregateOAuthEndpoint 公网地址必须使用 HTTPS，内网地址可使用 HTTP'
-          })
-        }
-      }
-      updateData.aggregateOAuthEndpoint = nextAggregateEndpoint || null
-    }
-
-    // Custom OAuth2
-    if (body.customOAuthEnabled !== undefined) {
-      if (typeof body.customOAuthEnabled !== 'boolean') {
-        throw createError({
-          statusCode: 400,
-          message: 'customOAuthEnabled 必须是布尔值'
-        })
-      }
-      if (body.customOAuthEnabled) {
-        const requiredCustomFields = [
-          { key: 'customOAuthAuthorizeUrl', label: '授权端点 URL' },
-          { key: 'customOAuthTokenUrl', label: 'Token 端点 URL' },
-          { key: 'customOAuthUserInfoUrl', label: '用户信息端点 URL' },
-          { key: 'customOAuthClientId', label: 'Client ID' },
-          { key: 'customOAuthClientSecret', label: 'Client Secret' },
-          { key: 'customOAuthUserIdField', label: '用户 ID 字段名' }
-        ]
-        for (const field of requiredCustomFields) {
-          if (!body[field.key] && !settings?.[field.key]) {
-            throw createError({
-              statusCode: 400,
-              message: `启用自定义 OAuth2 登录时必须提供 ${field.label}`
-            })
-          }
-        }
-      }
-      updateData.customOAuthEnabled = body.customOAuthEnabled
-    }
-
-    if (body.customOAuthDisplayName !== undefined) {
-      updateData.customOAuthDisplayName = body.customOAuthDisplayName
-    }
-
-    if (body.customOAuthAuthorizeUrl !== undefined) {
-      if (body.customOAuthAuthorizeUrl) {
-        try {
-          new URL(body.customOAuthAuthorizeUrl)
-        } catch {
-          throw createError({ statusCode: 400, message: 'customOAuthAuthorizeUrl 不是合法URL' })
-        }
-      }
-      updateData.customOAuthAuthorizeUrl = body.customOAuthAuthorizeUrl
-    }
-
-    if (body.customOAuthTokenUrl !== undefined) {
-      if (body.customOAuthTokenUrl) {
-        try {
-          new URL(body.customOAuthTokenUrl)
-        } catch {
-          throw createError({ statusCode: 400, message: 'customOAuthTokenUrl 不是合法URL' })
-        }
-      }
-      updateData.customOAuthTokenUrl = body.customOAuthTokenUrl
-    }
-
-    if (body.customOAuthUserInfoUrl !== undefined) {
-      if (body.customOAuthUserInfoUrl) {
-        try {
-          new URL(body.customOAuthUserInfoUrl)
-        } catch {
-          throw createError({ statusCode: 400, message: 'customOAuthUserInfoUrl 不是合法URL' })
-        }
-      }
-      updateData.customOAuthUserInfoUrl = body.customOAuthUserInfoUrl
-    }
-
-    if (body.customOAuthScope !== undefined) {
-      updateData.customOAuthScope = body.customOAuthScope
-    }
-
-    if (body.customOAuthClientId !== undefined) {
-      updateData.customOAuthClientId = body.customOAuthClientId
-    }
-
-    if (
-      body.customOAuthClientSecret !== undefined &&
-      body.customOAuthClientSecret !== SECRET_FIELD_MASK
-    ) {
-      updateData.customOAuthClientSecret = body.customOAuthClientSecret
-    }
-
-    if (body.customOAuthUserIdField !== undefined) {
-      updateData.customOAuthUserIdField = body.customOAuthUserIdField
-    }
-
-    if (body.customOAuthUsernameField !== undefined) {
-      updateData.customOAuthUsernameField = body.customOAuthUsernameField
-    }
-
-    if (body.customOAuthNameField !== undefined) {
-      updateData.customOAuthNameField = body.customOAuthNameField
-    }
-
-    if (body.customOAuthEmailField !== undefined) {
-      updateData.customOAuthEmailField = body.customOAuthEmailField
-    }
-
-    if (body.customOAuthAvatarField !== undefined) {
-      updateData.customOAuthAvatarField = body.customOAuthAvatarField
-    }
-
     // 验证每日、每周和每月限额三选一逻辑
     const limitSettings = [
       body.dailySubmissionLimit,
@@ -1045,41 +780,113 @@ export default defineEventHandler(async (event) => {
       })
     }
 
-    // 重复投稿限制交叉校验：开关关闭即完全不做限制；开启且未设置时长时沿用本学期同一首歌不可重复投稿的旧规则。
-    const nextSameSongHours = body.sameSongRestrictionHours !== undefined
-      ? body.sameSongRestrictionHours
-      : settings?.sameSongRestrictionHours ?? null
-    const nextSameArtistHours = body.sameArtistRestrictionHours !== undefined
-      ? body.sameArtistRestrictionHours
-      : settings?.sameArtistRestrictionHours ?? null
+    const DEFAULTS = {
+  submissionNoteRequiresApproval: false,
+  telemetryEnabled: true,
+  showBeianIcon: true,
+  scheduleDaysDisplay: 7,
+  scheduleDaysEditable: 3,
+  scheduleDaysRequestable: 14,
+  scheduleDaysBeforeEnabled: false,
+  scheduleDaysBefore: 1,
+  scheduleDaysAfterEnabled: false,
+  scheduleDaysAfter: 1,
+  forcePasswordChangeOnFirstLogin: false,
+  enableSubmissionRestriction: false,
+  submissionRestrictionScope: 'all',
+  cardCodeEnabled: false,
+  cardCodeSubmissionRequired: false,
+  cardCodeVoteEnabled: false,
+  cardCodeReplayEnabled: false,
+  enableCardCodeRequests: false,
+  requireCardCodeForRequests: false,
+  enableCardCodeLimitBypass: false,
+  submissionRestrictionEnabled: false,
+  submissionRestrictionGradeEnabled: false,
+  submissionRestrictionClassEnabled: false,
+  submissionRestrictionGraduateEnabled: false,
+  submissionRestrictionWithdrawnEnabled: false,
+  captchaProvider: 'TURNSTILE',
+  captchaEnabled: false,
+  allowRegister: true,
+  registerRequireEmail: false,
+  registerRequireEmailVerify: false,
+  registerDefaultRole: 'USER',
+  registerRequiresApproval: false,
+  oauthRegisterRequiresApproval: false,
+  registerEmailRequired: false,
+  registerRequiresGradeClass: false,
+  oauthEnabled: false,
+  oauthAllowRegister: true,
+  oauthAllowLogin: true,
+  oauthAllowBind: true,
+  allowOAuthRegistration: false,
+  oauthProviders: '[]',
+  githubOAuthEnabled: false,
+  casdoorOAuthEnabled: false,
+  googleOAuthEnabled: false,
+  aggregateOAuthEnabled: false,
+  aggregateOAuthLoginType: 'qq',
+  customOAuthEnabled: false,
+  captchaMaxFailures: 3,
+  autoBackupEnabled: false,
+  autoBackupIntervalHours: 24,
+  autoBackupRetentionDays: 30,
+  statisticsCodeEnabled: false,
+  defaultTheme: 'ClassicLight',
+  enabledThemes: '["ClassicLight","ModernLight"]'
+} as const
 
-    const anyRestrictionHoursPositive =
-      (typeof nextSameSongHours === 'number' && nextSameSongHours >= 1) ||
-      (typeof nextSameArtistHours === 'number' && nextSameArtistHours >= 1)
+    // 获取当前设置，如果不存在则创建
+    const settingsResult = await db.select().from(systemSettings).limit(1)
+    let settings = settingsResult[0] || null
 
-    // 显式关闭但仍有有效时长：拒绝，提示用户先清除时长
-    if (body.enableSubmissionRestriction === false && anyRestrictionHoursPositive) {
-      throw createApiError(
-        400,
-        SERVER_ERROR_CODES.COMMON_INVALID_PARAMS,
-        '关闭重复投稿限制时，同一首歌和同一歌手的限制时间必须同时清空'
-      )
-    }
-    // 时长>0 且 enable 未显式提交 ⇒ 自动开启，维持"时长与开关自洽"不变量
-    if (anyRestrictionHoursPositive && body.enableSubmissionRestriction === undefined) {
-      updateData.enableSubmissionRestriction = true
-    }
+    const fillDefaults = (obj: any) => ({ ...obj, ...Object.fromEntries(Object.entries(DEFAULTS).filter(([k]) => !Object.prototype.hasOwnProperty.call(obj || {}, k) || (obj && obj[k] === undefined || obj[k] === null))) })
 
     if (!settings) {
+      // 如果不存在，创建新设置
       const newSettingsResult = await db
         .insert(systemSettings)
         .values({
-          ...SYSTEM_SETTINGS_DEFAULTS,
-          scheduleDaysBeforeEnabled: SYSTEM_SETTINGS_DEFAULTS.scheduleDaysBeforeEnabled,
-          scheduleDaysBefore: SYSTEM_SETTINGS_DEFAULTS.scheduleDaysBefore,
-          scheduleDaysAfterEnabled: SYSTEM_SETTINGS_DEFAULTS.scheduleDaysAfterEnabled,
-          scheduleDaysAfter: SYSTEM_SETTINGS_DEFAULTS.scheduleDaysAfter,
-          ...updateData
+          hideStudentInfo: updateData.hideStudentInfo ?? false,
+          enablePlayTimeSelection: updateData.enablePlayTimeSelection ?? false,
+          siteTitle: updateData.siteTitle ?? 'VoiceHub',
+          siteLogoUrl: updateData.siteLogoUrl ?? '/favicon.ico',
+          schoolLogoHomeUrl: updateData.schoolLogoHomeUrl ?? null,
+          schoolLogoPrintUrl: updateData.schoolLogoPrintUrl ?? null,
+          siteDescription: updateData.siteDescription ?? '校园广播站点歌系统 - 让你的声音被听见',
+          siteVersion: updateData.siteVersion ?? null,
+          submissionGuidelines:
+            updateData.submissionGuidelines ??
+            `1. 投稿时无需加入书名号
+2. 除DJ外，其他类型歌曲均接收（包括小语种）
+3. 禁止投递含有违规内容的歌曲
+4. 点播的歌曲将由管理员进行审核
+5. 审核通过后将安排在播放时段播出
+6. 提交即表明我已阅读投稿须知并已知该歌曲有概率无法播出
+7. 本系统仅提供音乐搜索和播放管理功能，不存储任何音乐文件。所有音乐内容均来自第三方音乐平台，版权归原平台及版权方所有。用户点歌时请确保遵守相关音乐平台的服务条款，尊重音乐作品版权。我们鼓励用户支持正版音乐，在官方平台购买和收听喜爱的音乐作品。
+8. 最终解释权归广播站所有`,
+          icpNumber: updateData.icpNumber ?? null,
+          gonganNumber: updateData.gonganNumber ?? null,
+          enableSubmissionLimit: updateData.enableSubmissionLimit ?? false,
+          dailySubmissionLimit: updateData.dailySubmissionLimit ?? null,
+          weeklySubmissionLimit: updateData.weeklySubmissionLimit ?? null,
+          monthlySubmissionLimit: updateData.monthlySubmissionLimit ?? null,
+          showBlacklistKeywords: updateData.showBlacklistKeywords ?? false,
+          enableReplayRequests: updateData.enableReplayRequests ?? false,
+          enableCollaborativeSubmission: updateData.enableCollaborativeSubmission ?? true,
+          enableSubmissionRemarks: updateData.enableSubmissionRemarks ?? false,
+          enableRequestTimeLimitation: updateData.enableRequestTimeLimitation ?? false,
+          requestTimeLimitation: updateData.requestTimeLimitation ?? null,
+          forceBlockAllRequests: updateData.forceBlockAllRequests ?? false,
+          smtpEnabled: updateData.smtpEnabled ?? false,
+          smtpHost: updateData.smtpHost ?? null,
+          smtpPort: updateData.smtpPort ?? 587,
+          smtpSecure: updateData.smtpSecure ?? false,
+          smtpUsername: updateData.smtpUsername ?? null,
+          smtpPassword: updateData.smtpPassword ?? null,
+          smtpFromEmail: updateData.smtpFromEmail ?? null,
+          smtpFromName: updateData.smtpFromName ?? '校园广播站'
         })
         .returning()
       settings = newSettingsResult[0]
@@ -1090,28 +897,27 @@ export default defineEventHandler(async (event) => {
         .set(updateData)
         .where(eq(systemSettings.id, settings.id))
         .returning()
-      settings = updatedSettingsResult[0]
+      settings = fillDefaults(updatedSettingsResult[0])
     }
 
-    if (updateData.telemetryEnabled !== undefined) {
-      try {
-        const { setTelemetryEnabledCache } = await import('~~/server/utils/telemetry')
-        setTelemetryEnabledCache(updateData.telemetryEnabled)
-      } catch (telemetryError) {
-        console.warn('[Telemetry] 遥测开关缓存更新失败:', telemetryError)
-      }
+    // 清除系统设置缓存
+    try {
+      const { CacheService } = await import('~~/server/services/cacheService')
+      await CacheService.getInstance().clearSystemSettingsCache()
+      console.log('[Cache] 系统设置缓存已清除（更新系统设置）')
+    } catch (cacheError) {
+      console.warn('清除系统设置缓存失败:', cacheError)
     }
 
     try {
       const { SmtpService } = await import('~~/server/services/smtpService')
-      // 强制刷新：早退检查会导致修改授权码后单例仍持有旧凭据
-      await SmtpService.getInstance().initializeSmtpConfig(true)
+      await SmtpService.getInstance().initializeSmtpConfig()
       console.log('[SMTP] SMTP配置已重新加载（更新系统设置）')
     } catch (smtpError) {
       console.warn('[SMTP] SMTP配置重载失败:', smtpError)
     }
 
-    return maskSystemSettingsSecrets(settings)
+    return settings
   } catch (error) {
     console.error('更新系统设置失败:', error)
 
diff --git a/server/api/admin/system-settings/index.ts b/server/api/admin/system-settings/index.ts
index e12bb07..8603bf9 100644
--- a/server/api/admin/system-settings/index.ts
+++ b/server/api/admin/system-settings/index.ts
@@ -1,7 +1,6 @@
 import { db } from '~/drizzle/db'
 import { systemSettings } from '~/drizzle/schema'
-import { maskSystemSettingsSecrets } from './secretMask'
-import { MUSIC_SOURCE_PLATFORMS } from '~~/server/config/constants'
+import { CacheService } from '../../../services/cacheService'
 import { SYSTEM_SETTINGS_DEFAULTS } from '~~/server/utils/system-settings-defaults'
 
 export default defineEventHandler(async (event) => {
@@ -23,27 +22,33 @@ export default defineEventHandler(async (event) => {
   }
 
   try {
-    // 系统设置包含敏感配置，始终从数据库读取。
+    // 尝试从缓存获取系统设置
+    const cacheService = CacheService.getInstance()
+    let settings = await cacheService.getSystemSettings()
+
+    if (settings) {
+      return settings
+    }
+
+    // 缓存中没有，从数据库获取系统设置，如果不存在则创建默认设置
     const settingsResult = await db.select().from(systemSettings).limit(1)
-    let settings = settingsResult[0]
+    settings = settingsResult[0] || null
 
     if (!settings) {
       const newSettingsResult = await db
         .insert(systemSettings)
         .values({
-          ...SYSTEM_SETTINGS_DEFAULTS,
-          telemetryEnabled: true,
           enablePlayTimeSelection: false,
           siteTitle: process.env.NUXT_PUBLIC_SITE_TITLE || 'VoiceHub',
-          siteLogoUrl: process.env.NUXT_PUBLIC_SITE_LOGO || '/favicon.ico',
-          schoolLogoHomeUrl: null,
-          schoolLogoPrintUrl: null,
+          siteLogoUrl: process.env.NUXT_PUBLIC_SITE_LOGO || '/images/site-logo.png',
+          schoolLogoHomeUrl: '/images/school-logo-white.png',
+          schoolLogoPrintUrl: '/images/school-logo-transparent.png',
           siteDescription:
             process.env.NUXT_PUBLIC_SITE_DESCRIPTION || '校园广播站点歌系统 - 让你的声音被听见',
+          siteVersion: process.env.NUXT_PUBLIC_SITE_VERSION || null,
           submissionGuidelines: '请遵守校园规定，提交健康向上的歌曲。',
           icpNumber: null,
           gonganNumber: null,
-          showBeianIcon: false,
           enableSubmissionLimit: false,
           dailySubmissionLimit: null,
           weeklySubmissionLimit: null,
@@ -51,20 +56,30 @@ export default defineEventHandler(async (event) => {
           showBlacklistKeywords: false,
           enableCollaborativeSubmission: true,
           enableSubmissionRemarks: false,
-          enableSubmissionRestriction: false,
-          submissionRestrictionScope: 'all',
-          sameSongRestrictionHours: null,
-          sameArtistRestrictionHours: null,
-          enabledPlatforms: JSON.stringify([...MUSIC_SOURCE_PLATFORMS]),
-          platformOrder: JSON.stringify([...MUSIC_SOURCE_PLATFORMS]),
-          defaultTheme: 'System',
-          enabledThemes: JSON.stringify(['System', 'ClassicDark', 'ClassicLight', 'ModernLight'])
+          enableRequestTimeLimitation: false,
+          forceBlockAllRequests: false,
+          enableReplayRequests: false,
+          smtpEnabled: false
         })
         .returning()
       settings = newSettingsResult[0]
     }
 
-    return maskSystemSettingsSecrets(settings)
+    // 将设置存入缓存
+    try {
+      const merged: any = { ...SYSTEM_SETTINGS_DEFAULTS, ...(settings || {}) }
+      settings = merged
+      await cacheService.setSystemSettings(settings)
+    } catch (cacheError) {
+      console.warn('缓存系统设置失败:', cacheError)
+    }
+
+    // 隐藏敏感字段
+    if (settings && settings.smtpPassword) {
+      settings.smtpPassword = '****************'
+    }
+
+    return settings
   } catch (error) {
     console.error('获取系统设置失败:', error)
     throw createError({
diff --git a/server/api/admin/users/[id].delete.ts b/server/api/admin/users/[id].delete.ts
index f58f811..b12ec62 100644
--- a/server/api/admin/users/[id].delete.ts
+++ b/server/api/admin/users/[id].delete.ts
@@ -10,7 +10,7 @@ export default defineEventHandler(async (event) => {
     if (!user || !['ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
       throw createError({
         statusCode: 403,
-        message: '没有权限访问'
+        statusMessage: '没有权限访问'
       })
     }
 
@@ -27,7 +27,7 @@ export default defineEventHandler(async (event) => {
     if (!existingUser) {
       throw createError({
         statusCode: 404,
-        message: '用户不存在'
+        statusMessage: '用户不存在'
       })
     }
 
@@ -35,7 +35,7 @@ export default defineEventHandler(async (event) => {
     if (existingUser.id === 1) {
       throw createError({
         statusCode: 403,
-        message: '无法删除系统初始超级管理员'
+        statusMessage: '无法删除系统初始超级管理员'
       })
     }
 
@@ -44,7 +44,7 @@ export default defineEventHandler(async (event) => {
     if (String(existingUser.id) === String(user.id)) {
       throw createError({
         statusCode: 400,
-        message: '不能删除自己的账户'
+        statusMessage: '不能删除自己的账户'
       })
     }
 
@@ -53,13 +53,26 @@ export default defineEventHandler(async (event) => {
     if (existingUser.role === 'SUPER_ADMIN' && user.role !== 'SUPER_ADMIN') {
       throw createError({
         statusCode: 403,
-        message: '权限不足：普通管理员无法删除超级管理员'
+        statusMessage: '权限不足：普通管理员无法删除超级管理员'
       })
     }
 
     // 删除用户
     await db.delete(users).where(eq(users.id, parseInt(userId)))
 
+    // 清除相关缓存
+    try {
+      const { cache } = await import('~~/server/utils/cache-helpers')
+      await cache.deletePattern('songs:*')
+      await cache.deletePattern('schedules:*')
+      await cache.deletePattern('stats:*')
+      // 清除该用户的认证缓存
+      await cache.delete(`auth:user:${existingUser.id}`)
+      console.log('[Cache] 歌曲、排期、统计和用户认证缓存已清除（用户删除）')
+    } catch (cacheError) {
+      console.warn('[Cache] 清除缓存失败:', cacheError)
+    }
+
     return {
       success: true,
       message: '用户删除成功'
@@ -73,7 +86,7 @@ export default defineEventHandler(async (event) => {
 
     throw createError({
       statusCode: 500,
-      message: '删除用户失败：' + error.message
+      statusMessage: '删除用户失败: ' + error.message
     })
   }
 })
diff --git a/server/api/admin/users/[id].put.ts b/server/api/admin/users/[id].put.ts
index 52e759b..4dbfec8 100644
--- a/server/api/admin/users/[id].put.ts
+++ b/server/api/admin/users/[id].put.ts
@@ -3,27 +3,7 @@ import { db } from '~/drizzle/db'
 import { users, userStatusLogs } from '~/drizzle/schema'
 import { eq } from 'drizzle-orm'
 import { updateUserPassword } from '~~/server/services/userService'
-import { createSystemNotification } from '~~/server/services/notificationService'
-import {
-  PASSWORD_AUDIT_ACTIONS,
-  getPasswordAuditContext
-} from '~~/server/services/passwordSecurityService'
-import { createApiError } from '~~/server/utils/apiError'
-import { SERVER_ERROR_CODES } from '~~/server/config/constants'
-import { getAdminPasswordViolation } from '~~/server/utils/admin-password-policy'
-
-const normalizeRequiredText = (value: unknown) => String(value || '').trim()
-const normalizeOptionalText = (value: unknown) => {
-  const normalized = String(value || '').trim()
-  return normalized || null
-}
-
-const roleNames: Record<string, string> = {
-  USER: '用户',
-  SONG_ADMIN: '歌曲管理员',
-  ADMIN: '管理员',
-  SUPER_ADMIN: '超级管理员'
-}
+import { getRoleLevel, canChangeRoleOf, canResetPasswordFor } from '~~/server/utils/permissions'
 
 export default defineEventHandler(async (event) => {
   try {
@@ -32,175 +12,145 @@ export default defineEventHandler(async (event) => {
     if (!user || !['ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
       throw createError({
         statusCode: 403,
-        message: '没有权限访问'
+        statusMessage: '没有权限访问'
       })
     }
 
     const userId = getRouterParam(event, 'id')
-    const userIdNum = Number.parseInt(String(userId), 10)
-    if (!Number.isInteger(userIdNum) || userIdNum <= 0) {
+    const body = await readBody(event)
+    const { name, username, password, role, grade, class: userClass, status } = body
+
+    // 验证必填字段
+    if (!name || !username) {
       throw createError({
         statusCode: 400,
-        message: '无效的用户ID'
+        statusMessage: '姓名和用户名为必填项'
       })
     }
 
-    const body = await readBody(event)
-    const { name, username, password, role, grade, class: userClass, status } = body || {}
-    const normalizedName = normalizeRequiredText(name)
-    const normalizedUsername = normalizeRequiredText(username)
-
-    // 验证必填字段
-    if (!normalizedName || !normalizedUsername) {
+    // 验证姓名和用户名只能包含汉字
+    const chineseRegex = /^[\u4e00-\u9fa5]+$/
+    if (!chineseRegex.test(name) || !chineseRegex.test(username)) {
       throw createError({
         statusCode: 400,
-        message: '姓名和用户名为必填项'
+        statusMessage: '姓名和用户名只能包含汉字'
       })
     }
 
     // 检查用户是否存在
-    const existingUser = await db.select().from(users).where(eq(users.id, userIdNum)).limit(1)
+    const existingUser = await db
+      .select()
+      .from(users)
+      .where(eq(users.id, parseInt(userId)))
+      .limit(1)
 
     if (existingUser.length === 0) {
       throw createError({
         statusCode: 404,
-        message: '用户不存在'
+        statusMessage: '用户不存在'
       })
     }
 
-    const targetUser = existingUser[0]!
+    const targetUser = existingUser[0]
+    const currentLevel = getRoleLevel(user.role)
+    const targetLevel = getRoleLevel(targetUser.role)
 
     // 1. 禁止修改系统初始超级管理员 (ID: 1)
     if (targetUser.id === 1) {
       throw createError({
         statusCode: 403,
-        message: '无法修改系统初始超级管理员'
+        statusMessage: '无法修改系统初始超级管理员'
       })
     }
 
     // 2. 禁止对自身进行任何用户管理操作（包括角色、资料、状态、密码等）
-    // 使用 String 转换确保 ID 比较的准确性
     if (String(userId) === String(user.id)) {
       throw createError({
         statusCode: 400,
-        message: '禁止在用户管理中修改自己的账户'
+        statusMessage: '禁止在用户管理中修改自己的账户'
       })
     }
 
-    // 3. 越级修改保护
-    // 如果目标用户是 SUPER_ADMIN，操作者必须是 SUPER_ADMIN
-    if (targetUser.role === 'SUPER_ADMIN' && user.role !== 'SUPER_ADMIN') {
+    // 3. 非超级管理员必须严格高于目标角色级别
+    if (user.role !== 'SUPER_ADMIN' && currentLevel <= targetLevel) {
       throw createError({
         statusCode: 403,
-        message: '权限不足：普通管理员无法修改超级管理员信息'
+        statusMessage: `权限不足：${user.role} 无法操作同级或更高角色的用户`
       })
     }
 
     // 检查用户名是否被其他用户使用
-    if (normalizedUsername !== targetUser.username) {
+    if (username !== targetUser.username) {
       const duplicateUser = await db
         .select()
         .from(users)
-        .where(eq(users.username, normalizedUsername))
+        .where(eq(users.username, username))
         .limit(1)
 
       if (duplicateUser.length > 0) {
         throw createError({
           statusCode: 400,
-          message: '用户名已被其他用户使用'
+          statusMessage: '用户名已被其他用户使用'
         })
       }
     }
 
-    // 角色权限控制
+    // 角色权限控制（统一使用 canChangeRoleOf 语义化检查）
     let validRole = targetUser.role
-    if (role) {
-      if (!['USER', 'ADMIN', 'SONG_ADMIN', 'SUPER_ADMIN'].includes(role)) {
-        throw createError({
-          statusCode: 400,
-          message: '无效的用户角色'
-        })
-      }
-    }
-
     if (role && role !== targetUser.role) {
-      // 超级管理员可以设置任何角色
-      if (user.role === 'SUPER_ADMIN') {
-        validRole = role
-      }
-      // 管理员只能设置管理员以下的角色（USER, SONG_ADMIN）
-      else if (user.role === 'ADMIN') {
-        if (['USER', 'SONG_ADMIN'].includes(role)) {
-          validRole = role
-        } else {
-          throw createError({
-            statusCode: 403,
-            message: '管理员只能设置用户和歌曲管理员角色'
-          })
-        }
-      }
-      // 其他角色不能设置角色
-      else {
+      if (!canChangeRoleOf(user, targetUser, role)) {
         throw createError({
           statusCode: 403,
-          message: '没有权限设置用户角色'
+          statusMessage: user.role === 'SUPER_ADMIN'
+            ? '超级管理员不能将目标用户提升为 SUPER_ADMIN'
+            : `权限不足：${user.role} 无法将用户角色更改为 ${role}`
         })
       }
+      validRole = role
+    }
+
+    // 如果请求中包含密码更新，校验密码重置权限
+    if (password && !canResetPasswordFor(user, targetUser)) {
+      throw createError({
+        statusCode: 403,
+        statusMessage: `权限不足：${user.role} 无法重置目标用户的密码`
+      })
     }
 
     // 验证status字段的有效性
     if (status && !['active', 'withdrawn', 'graduate'].includes(status)) {
       throw createError({
         statusCode: 400,
-        message: '用户状态只能是 active, withdrawn 或 graduate'
+        statusMessage: '用户状态只能是 active, withdrawn 或 graduate'
       })
     }
 
-    // 待审核用户不得通过编辑接口直接置为 active（须走注册审核流程）
-    if (targetUser.status === 'pending' && status === 'active') {
-      throw createApiError(400, SERVER_ERROR_CODES.USER_NOT_PENDING, '待审核用户需通过注册审核流程处理')
-    }
-
     // 准备更新数据
     const updateData = {
-      name: normalizedName,
-      username: normalizedUsername,
+      name,
+      username,
       role: validRole,
-      grade: normalizeOptionalText(grade),
-      class: normalizeOptionalText(userClass),
-      ...(status && status !== targetUser.status
-        ? {
-            status,
-            statusChangedAt: new Date(),
-            statusChangedBy: user.id
-          }
-        : {})
+      grade,
+      class: userClass
+    }
+
+    // 如果提供了status，则更新状态相关字段
+    if (status && status !== existingUser[0].status) {
+      updateData.status = status
+      updateData.statusChangedAt = new Date()
+      updateData.statusChangedBy = user.id
     }
 
     // 如果提供了密码，则使用统一服务更新密码
     if (password) {
-      const trimmedPassword = String(password).trim()
-      // 管理员重置为临时密码且 forceReset 强制用户登录后修改，仅做基础校验不要求完整复杂度
-      const violation = getAdminPasswordViolation(trimmedPassword)
-      if (violation) {
-        throw createApiError(400, violation.code, violation.message)
-      }
-
-      await updateUserPassword(targetUser.id, trimmedPassword, {
-        forceReset: true,
-        auditContext: {
-          action: PASSWORD_AUDIT_ACTIONS.RESET_PASSWORD,
-          actorId: user.id,
-          ...getPasswordAuditContext(event)
-        }
-      })
+      await updateUserPassword(parseInt(userId), password, true)
     }
 
     // 更新用户其他信息
     const updatedUser = await db
       .update(users)
       .set(updateData)
-      .where(eq(users.id, userIdNum))
+      .where(eq(users.id, parseInt(userId)))
       .returning({
         id: users.id,
         name: users.name,
@@ -219,35 +169,33 @@ export default defineEventHandler(async (event) => {
       })
 
     // 如果状态发生变更，记录到状态变更日志
-    if (status && status !== targetUser.status) {
+    if (status && status !== existingUser[0].status) {
       await db.insert(userStatusLogs).values({
-        userId: targetUser.id,
-        oldStatus: targetUser.status,
+        userId: parseInt(userId),
+        oldStatus: existingUser[0].status,
         newStatus: status,
         reason: `管理员${user.name || user.username}修改用户状态`,
         operatorId: user.id
       })
     }
 
-    if (validRole !== targetUser.role) {
-      const oldRoleName = roleNames[targetUser.role] || targetUser.role
-      const newRoleName = roleNames[validRole] || validRole
-      const notification = await createSystemNotification(
-        targetUser.id,
-        '权限变更通知',
-        `您的账户权限已由系统更新：${oldRoleName} → ${newRoleName}`
-      )
-      if (!notification) {
-        console.warn(`未向用户 ${targetUser.id} 发送权限变更通知`)
-      }
+    // 清除相关缓存
+    try {
+      const { cache } = await import('~~/server/utils/cache-helpers')
+      await cache.deletePattern('songs:*')
+      // 清除该用户的认证缓存（角色或权限可能已变更）
+      await cache.delete(`auth:user:${parseInt(userId)}`)
+      console.log('[Cache] 歌曲和用户认证缓存已清除（用户更新）')
+    } catch (cacheError) {
+      console.warn('[Cache] 清除缓存失败:', cacheError)
     }
 
     return {
       success: true,
-      user: updatedUser[0]!,
+      user: updatedUser[0],
       message: '用户更新成功'
     }
-  } catch (error: any) {
+  } catch (error) {
     console.error('更新用户失败:', error)
 
     if (error.statusCode) {
@@ -256,7 +204,7 @@ export default defineEventHandler(async (event) => {
 
     throw createError({
       statusCode: 500,
-      message: '更新用户失败: ' + error.message
+      statusMessage: '更新用户失败: ' + error.message
     })
   }
 })
diff --git a/server/api/admin/users/[id].ts b/server/api/admin/users/[id].ts
new file mode 100644
index 0000000..8ba3431
--- /dev/null
+++ b/server/api/admin/users/[id].ts
@@ -0,0 +1,122 @@
+import { db } from '~/drizzle/db'
+import { users } from '~/drizzle/schema'
+import { eq } from 'drizzle-orm'
+
+export default defineEventHandler(async (event) => {
+  // 检查认证和权限
+  const user = event.context.user
+  if (!user || !['ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
+    throw createError({
+      statusCode: 403,
+      message: '没有权限访问'
+    })
+  }
+
+  // 安全获取ID参数
+  const params = event.context.params || {}
+  const id = parseInt(params.id || '')
+
+  if (isNaN(id)) {
+    throw createError({
+      statusCode: 400,
+      message: '无效的用户ID'
+    })
+  }
+
+  // 处理PUT请求 - 更新用户
+  if (event.method === 'PUT') {
+    const body = await readBody(event)
+
+    if (!body.name) {
+      throw createError({
+        statusCode: 400,
+        message: '姓名不能为空'
+      })
+    }
+
+    try {
+      const updatedUserResult = await db
+        .update(users)
+        .set({
+          name: body.name,
+          role: body.role,
+          grade: body.grade,
+          class: body.class
+        })
+        .where(eq(users.id, id))
+        .returning({
+          id: users.id,
+          name: users.name,
+          role: users.role,
+          createdAt: users.createdAt,
+          updatedAt: users.updatedAt,
+          grade: users.grade,
+          class: users.class,
+          username: users.username,
+          passwordChangedAt: users.passwordChangedAt
+        })
+      const updatedUser = updatedUserResult[0]
+
+      return updatedUser
+    } catch (error) {
+      console.error('更新用户失败:', error)
+      throw createError({
+        statusCode: 500,
+        message: '更新用户失败'
+      })
+    }
+  }
+
+  // 处理DELETE请求 - 删除用户
+  if (event.method === 'DELETE') {
+    try {
+      const existingUserResult = await db.select().from(users).where(eq(users.id, id)).limit(1)
+      if (existingUserResult.length === 0) {
+        throw createError({
+          statusCode: 404,
+          message: '用户不存在'
+        })
+      }
+      const existingUser = existingUserResult[0]
+
+      // 1. 禁止删除 ID 为 1 的用户 (系统初始超级管理员)
+      if (existingUser.id === 1) {
+        throw createError({
+          statusCode: 403,
+          message: '无法删除系统初始超级管理员'
+        })
+      }
+
+      // 2. 确保不能删除自己
+      if (String(existingUser.id) === String(user.id)) {
+        throw createError({
+          statusCode: 400,
+          message: '不能删除当前登录的用户'
+        })
+      }
+
+      // 3. 越级删除保护
+      if (existingUser.role === 'SUPER_ADMIN' && user.role !== 'SUPER_ADMIN') {
+        throw createError({
+          statusCode: 403,
+          message: '权限不足：普通管理员无法删除超级管理员'
+        })
+      }
+
+      await db.delete(users).where(eq(users.id, id))
+
+      return { success: true }
+    } catch (error) {
+      console.error('删除用户失败:', error)
+      throw createError({
+        statusCode: 500,
+        message: '删除用户失败'
+      })
+    }
+  }
+
+  throw createError({
+    statusCode: 405,
+    message: '不支持的请求方法'
+  })
+})
diff --git a/server/api/admin/users/[id]/reset-password.post.ts b/server/api/admin/users/[id]/reset-password.post.ts
index 290eb6d..c421e5b 100644
--- a/server/api/admin/users/[id]/reset-password.post.ts
+++ b/server/api/admin/users/[id]/reset-password.post.ts
@@ -1,26 +1,18 @@
-import { eq } from 'drizzle-orm'
+import { updateUserPassword } from '~~/server/services/userService'
 import { db } from '~/drizzle/db'
 import { users } from '~/drizzle/schema'
-import { updateUserPassword } from '~~/server/services/userService'
-import {
-  PASSWORD_AUDIT_ACTIONS,
-  getPasswordAuditContext,
-  recordPasswordAudit
-} from '~~/server/services/passwordSecurityService'
-import { createApiError } from '~~/server/utils/apiError'
-import { getAdminPasswordViolation } from '~~/server/utils/admin-password-policy'
+import { eq } from 'drizzle-orm'
+import { canResetPasswordFor, getRoleLevel } from '~~/server/utils/permissions'
 
 export default defineEventHandler(async (event) => {
-  // 检查认证和权限
-  const user = event.context.user
-  if (!user || !['ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
+  const currentUser = event.context.user
+  if (!currentUser || !['ADMIN', 'SUPER_ADMIN'].includes(currentUser.role)) {
     throw createError({
       statusCode: 403,
       message: '没有权限访问'
     })
   }
 
-  // 安全获取ID参数
   const params = event.context.params || {}
   const id = parseInt(params.id || '')
 
@@ -31,39 +23,38 @@ export default defineEventHandler(async (event) => {
     })
   }
 
-  const body = await readBody<Record<string, unknown> | null>(event)
-  const newPassword = typeof body?.newPassword === 'string' ? body.newPassword.trim() : ''
+  const body = await readBody(event)
 
-  // 管理员重置为临时密码且 forceReset 强制用户登录后修改，仅做基础校验不要求完整复杂度
-  const violation = getAdminPasswordViolation(newPassword)
-  if (violation) {
-    throw createApiError(400, violation.code, violation.message)
+  if (!body.newPassword) {
+    throw createError({
+      statusCode: 400,
+      message: '新密码不能为空'
+    })
   }
 
   try {
-    // 查询目标用户用于越级保护
-    const targetUsers = await db
-      .select({ id: users.id, role: users.role })
-      .from(users)
-      .where(eq(users.id, id))
-      .limit(1)
-    const targetUser = targetUsers[0]
-    if (!targetUser) {
-      throw createError({
-        statusCode: 404,
-        message: '用户不存在'
-      })
-    }
-
-    // 禁止对自身进行密码重置（通过用户管理界面）
-    if (id === user.id) {
+    if (id === currentUser.id) {
       throw createError({
         statusCode: 400,
         message: '禁止在用户管理中重置自己的密码'
       })
     }
 
-    // 禁止重置系统初始超级管理员 (ID: 1)
+    const targetUserResult = await db
+      .select({ id: users.id, role: users.role, username: users.username })
+      .from(users)
+      .where(eq(users.id, id))
+      .limit(1)
+
+    if (targetUserResult.length === 0) {
+      throw createError({
+        statusCode: 404,
+        message: '用户不存在'
+      })
+    }
+
+    const targetUser = targetUserResult[0]
+
     if (targetUser.id === 1) {
       throw createError({
         statusCode: 403,
@@ -71,39 +62,36 @@ export default defineEventHandler(async (event) => {
       })
     }
 
-    // 越级保护：目标用户是 SUPER_ADMIN 时，操作者必须是 SUPER_ADMIN
-    if (targetUser.role === 'SUPER_ADMIN' && user.role !== 'SUPER_ADMIN') {
+    const currentLevel = getRoleLevel(currentUser.role)
+    const targetLevel = getRoleLevel(targetUser.role)
+
+    if (currentUser.role !== 'SUPER_ADMIN') {
+      if (currentLevel <= targetLevel) {
+        throw createError({
+          statusCode: 403,
+          message: '权限不足：不能重置角色级别大于等于自己的用户密码'
+        })
+      }
+    }
+
+    if (!canResetPasswordFor(currentUser, targetUser)) {
       throw createError({
         statusCode: 403,
-        message: '权限不足：普通管理员无法重置超级管理员密码'
+        message: '权限不足：当前角色无法重置该用户的密码'
       })
     }
 
-    // 使用统一服务重置密码 (forceReset = true)
-    await updateUserPassword(id, newPassword, {
-      forceReset: true,
-      auditContext: {
-        action: PASSWORD_AUDIT_ACTIONS.RESET_PASSWORD,
-        actorId: user.id,
-        ...getPasswordAuditContext(event)
-      }
-    })
+    await updateUserPassword(id, body.newPassword, true)
 
     return {
       success: true,
       message: '密码重置成功'
     }
   } catch (error) {
-    await recordPasswordAudit(
-      event,
-      id,
-      PASSWORD_AUDIT_ACTIONS.RESET_PASSWORD,
-      false,
-      error instanceof Error ? error.message : '管理员重置密码失败',
-      user.id
-    )
-    console.error('重置密码失败:', error)
-    if (error && typeof error === 'object' && 'statusCode' in error) throw error
+    console.error('[ResetPassword] 失败:', error)
+    if (error.statusCode) {
+      throw error
+    }
     throw createError({
       statusCode: 500,
       message: '重置密码失败'
diff --git a/server/api/admin/users/[id]/songs.get.ts b/server/api/admin/users/[id]/songs.get.ts
index dd99ee4..f06571c 100644
--- a/server/api/admin/users/[id]/songs.get.ts
+++ b/server/api/admin/users/[id]/songs.get.ts
@@ -9,7 +9,7 @@ export default defineEventHandler(async (event) => {
     if (!currentUser) {
       throw createError({
         statusCode: 401,
-        message: '未授权访问'
+        statusMessage: '未授权访问'
       })
     }
 
@@ -18,16 +18,16 @@ export default defineEventHandler(async (event) => {
     if (!allowedRoles.includes(currentUser.role)) {
       throw createError({
         statusCode: 403,
-        message: '权限不足'
+        statusMessage: '权限不足'
       })
     }
 
-    // 获取用户 ID
+    // 获取用户ID
     const userId = parseInt(getRouterParam(event, 'id') as string)
     if (!userId || isNaN(userId)) {
       throw createError({
         statusCode: 400,
-        message: '无效的用户 ID'
+        statusMessage: '无效的用户ID'
       })
     }
 
@@ -49,7 +49,7 @@ export default defineEventHandler(async (event) => {
     if (!user) {
       throw createError({
         statusCode: 404,
-        message: '用户不存在'
+        statusMessage: '用户不存在'
       })
     }
 
@@ -60,7 +60,6 @@ export default defineEventHandler(async (event) => {
         title: songs.title,
         artist: songs.artist,
         semester: songs.semester,
-        durationSeconds: songs.durationSeconds,
         createdAt: songs.createdAt,
         played: songs.played
       })
@@ -267,7 +266,7 @@ export default defineEventHandler(async (event) => {
 
     throw createError({
       statusCode: 500,
-      message: '服务器内部错误'
+      statusMessage: '服务器内部错误'
     })
   }
 })
diff --git a/server/api/admin/users/[id]/status-logs.get.ts b/server/api/admin/users/[id]/status-logs.get.ts
index c9a376b..d125e7d 100644
--- a/server/api/admin/users/[id]/status-logs.get.ts
+++ b/server/api/admin/users/[id]/status-logs.get.ts
@@ -11,7 +11,7 @@ export default defineEventHandler(async (event) => {
     if (!user || !['ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
       throw createError({
         statusCode: 403,
-        message: '没有权限访问'
+        statusMessage: '没有权限访问'
       })
     }
 
@@ -19,12 +19,12 @@ export default defineEventHandler(async (event) => {
     const query = getQuery(event)
     const { page = '1', limit = '20' } = query
 
-    // 验证用户 ID
+    // 验证用户ID
     const numUserId = parseInt(userId)
     if (isNaN(numUserId) || numUserId <= 0) {
       throw createError({
         statusCode: 400,
-        message: '无效的用户 ID'
+        statusMessage: '无效的用户ID'
       })
     }
 
@@ -42,7 +42,7 @@ export default defineEventHandler(async (event) => {
     if (existingUser.length === 0) {
       throw createError({
         statusCode: 404,
-        message: '用户不存在'
+        statusMessage: '用户不存在'
       })
     }
 
@@ -117,7 +117,7 @@ export default defineEventHandler(async (event) => {
 
     throw createError({
       statusCode: 500,
-      message: '获取用户状态变更日志失败：' + error.message
+      statusMessage: '获取用户状态变更日志失败: ' + error.message
     })
   }
 })
diff --git a/server/api/admin/users/[id]/status.put.ts b/server/api/admin/users/[id]/status.put.ts
index 239a6b0..c9137a2 100644
--- a/server/api/admin/users/[id]/status.put.ts
+++ b/server/api/admin/users/[id]/status.put.ts
@@ -4,8 +4,6 @@ import { users, userStatusLogs } from '~/drizzle/schema'
 import { eq } from 'drizzle-orm'
 import { getBeijingTime } from '~/utils/timeUtils'
 import { getStatusText } from '~~/server/utils/user'
-import { createApiError } from '~~/server/utils/apiError'
-import { SERVER_ERROR_CODES } from '~~/server/config/constants'
 
 export default defineEventHandler(async (event) => {
   try {
@@ -14,7 +12,7 @@ export default defineEventHandler(async (event) => {
     if (!user || !['ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
       throw createError({
         statusCode: 403,
-        message: '没有权限访问'
+        statusMessage: '没有权限访问'
       })
     }
 
@@ -26,14 +24,14 @@ export default defineEventHandler(async (event) => {
     if (!status || !['active', 'withdrawn', 'graduate'].includes(status)) {
       throw createError({
         statusCode: 400,
-        message: '状态必须为 active, withdrawn 或 graduate'
+        statusMessage: '状态必须为 active, withdrawn 或 graduate'
       })
     }
 
     if (!reason || reason.trim().length === 0) {
       throw createError({
         statusCode: 400,
-        message: '变更原因为必填项'
+        statusMessage: '变更原因为必填项'
       })
     }
 
@@ -53,22 +51,17 @@ export default defineEventHandler(async (event) => {
     if (existingUser.length === 0) {
       throw createError({
         statusCode: 404,
-        message: '用户不存在'
+        statusMessage: '用户不存在'
       })
     }
 
     const targetUser = existingUser[0]
 
-    // 待审核用户不得通过状态接口直接置为 active（须走注册审核流程）
-    if (targetUser.status === 'pending' && status === 'active') {
-      throw createApiError(400, SERVER_ERROR_CODES.USER_NOT_PENDING, '待审核用户需通过注册审核流程处理')
-    }
-
     // 检查是否为学生用户
     if (targetUser.role !== 'USER') {
       throw createError({
         statusCode: 400,
-        message: '只能修改学生用户的状态'
+        statusMessage: '只能修改学生用户的状态'
       })
     }
 
@@ -76,7 +69,7 @@ export default defineEventHandler(async (event) => {
     if (targetUser.status === status) {
       throw createError({
         statusCode: 400,
-        message: '用户状态未发生变化'
+        statusMessage: '用户状态未发生变化'
       })
     }
 
@@ -106,6 +99,15 @@ export default defineEventHandler(async (event) => {
       })
     })
 
+    // 清除相关缓存
+    try {
+      const { cache } = await import('~~/server/utils/cache-helpers')
+      await cache.delete(`auth:user:${parseInt(userId)}`)
+      console.log('[Cache] 用户认证缓存已清除（状态更新）')
+    } catch (cacheError) {
+      console.warn('[Cache] 清除缓存失败:', cacheError)
+    }
+
     return {
       success: true,
       message: `用户状态已更新为${getStatusText(status)}`,
@@ -126,7 +128,7 @@ export default defineEventHandler(async (event) => {
 
     throw createError({
       statusCode: 500,
-      message: '更新用户状态失败: ' + error.message
+      statusMessage: '更新用户状态失败: ' + error.message
     })
   }
 })
diff --git a/server/api/admin/users/batch-grade-update.post.ts b/server/api/admin/users/batch-grade-update.post.ts
index cc6868e..c1aca74 100644
--- a/server/api/admin/users/batch-grade-update.post.ts
+++ b/server/api/admin/users/batch-grade-update.post.ts
@@ -1,4 +1,5 @@
 import { db } from '~/drizzle/db'
+import { CacheService } from '~~/server/services/cacheService'
 import { users } from '~/drizzle/schema'
 import { inArray } from 'drizzle-orm'
 
@@ -8,7 +9,7 @@ export default defineEventHandler(async (event) => {
     if (event.node.req.method !== 'POST') {
       throw createError({
         statusCode: 405,
-        message: 'Method Not Allowed'
+        statusMessage: 'Method Not Allowed'
       })
     }
 
@@ -20,33 +21,21 @@ export default defineEventHandler(async (event) => {
     if (!userIds || !Array.isArray(userIds) || userIds.length === 0) {
       throw createError({
         statusCode: 400,
-        message: 'userIds is required and must be a non-empty array'
-      })
-    }
-
-    // 对输入的 userIds 进行去重和类型转换
-    const uniqueUserIds = [
-      ...new Set(userIds.map((id) => parseInt(id)).filter((id) => !isNaN(id) && id > 0))
-    ]
-
-    if (uniqueUserIds.length === 0) {
-      throw createError({
-        statusCode: 400,
-        message: '没有有效的用户ID'
+        statusMessage: 'userIds is required and must be a non-empty array'
       })
     }
 
     if (!targetGrade || typeof targetGrade !== 'string') {
       throw createError({
         statusCode: 400,
-        message: 'targetGrade is required and must be a string'
+        statusMessage: 'targetGrade is required and must be a string'
       })
     }
 
     if (typeof keepClass !== 'boolean') {
       throw createError({
         statusCode: 400,
-        message: 'keepClass is required and must be a boolean'
+        statusMessage: 'keepClass is required and must be a boolean'
       })
     }
 
@@ -56,7 +45,7 @@ export default defineEventHandler(async (event) => {
     if (!currentUser) {
       throw createError({
         statusCode: 401,
-        message: 'Authentication required'
+        statusMessage: 'Authentication required'
       })
     }
 
@@ -64,7 +53,7 @@ export default defineEventHandler(async (event) => {
     if (!['ADMIN', 'SUPER_ADMIN'].includes(currentUser.role)) {
       throw createError({
         statusCode: 403,
-        message: 'Insufficient permissions'
+        statusMessage: 'Insufficient permissions'
       })
     }
 
@@ -75,50 +64,26 @@ export default defineEventHandler(async (event) => {
         name: users.name,
         username: users.username,
         grade: users.grade,
-        class: users.class,
-        role: users.role
+        class: users.class
       })
       .from(users)
-      .where(inArray(users.id, uniqueUserIds))
+      .where(inArray(users.id, userIds))
 
     const existingUserIds = existingUsers.map((user) => user.id)
-    const nonExistentUserIds = uniqueUserIds.filter((id) => !existingUserIds.includes(id))
+    const nonExistentUserIds = userIds.filter((id) => !existingUserIds.includes(id))
 
     let updated = 0
     let failed = 0
-    const errors: Array<{ userId: number | string; error: string }> = []
+    const errors: string[] = []
 
     // 记录不存在的用户ID
     if (nonExistentUserIds.length > 0) {
       failed += nonExistentUserIds.length
-      nonExistentUserIds.forEach((id) => {
-        errors.push({ userId: id, error: '用户不存在' })
-      })
-    }
-
-    // 过滤出有权限修改的用户
-    const validExistingUserIds: number[] = []
-    for (const user of existingUsers) {
-      if (user.id === 1) {
-        failed++
-        errors.push({ userId: user.id, error: '无法修改系统初始超级管理员' })
-        continue
-      }
-      if (user.id === currentUser.id) {
-        failed++
-        errors.push({ userId: user.id, error: '禁止在用户管理中批量更新自己的账户' })
-        continue
-      }
-      if (user.role === 'SUPER_ADMIN' && currentUser.role !== 'SUPER_ADMIN') {
-        failed++
-        errors.push({ userId: user.id, error: '权限不足：普通管理员无法修改超级管理员信息' })
-        continue
-      }
-      validExistingUserIds.push(user.id)
+      errors.push(`用户ID ${nonExistentUserIds.join(', ')} 不存在`)
     }
 
     // 批量更新存在的用户
-    if (validExistingUserIds.length > 0) {
+    if (existingUserIds.length > 0) {
       try {
         const updateData: any = {
           grade: targetGrade,
@@ -131,16 +96,25 @@ export default defineEventHandler(async (event) => {
         const updateResult = await db
           .update(users)
           .set(updateData)
-          .where(inArray(users.id, validExistingUserIds))
+          .where(inArray(users.id, existingUserIds))
           .returning({ id: users.id })
 
         updated = updateResult.length
       } catch (error) {
         console.error('批量更新失败:', error)
-        failed += validExistingUserIds.length
-        validExistingUserIds.forEach((id) => {
-          errors.push({ userId: id, error: '批量更新操作失败' })
-        })
+        failed += existingUserIds.length
+        errors.push('批量更新操作失败')
+      }
+    }
+
+    // 如果有用户更新成功，清除相关缓存
+    if (updated > 0) {
+      try {
+        const cacheService = CacheService.getInstance()
+        await cacheService.clearSongsCache()
+        console.log('批量年级更新后缓存清除成功')
+      } catch (cacheError) {
+        console.error('批量年级更新后缓存清除失败:', cacheError)
       }
     }
 
@@ -159,7 +133,7 @@ export default defineEventHandler(async (event) => {
       failed,
       errors,
       details: {
-        totalRequested: uniqueUserIds.length,
+        totalRequested: userIds.length,
         existingUsers: existingUsers.length,
         nonExistentUsers: nonExistentUserIds.length,
         targetGrade,
@@ -175,7 +149,7 @@ export default defineEventHandler(async (event) => {
 
     throw createError({
       statusCode: 500,
-      message: 'Internal Server Error'
+      statusMessage: 'Internal Server Error'
     })
   }
 })
diff --git a/server/api/admin/users/batch-status.put.ts b/server/api/admin/users/batch-status.put.ts
index e75fdb2..6e06a39 100644
--- a/server/api/admin/users/batch-status.put.ts
+++ b/server/api/admin/users/batch-status.put.ts
@@ -4,8 +4,6 @@ import { users, userStatusLogs } from '~/drizzle/schema'
 import { and, eq, inArray } from 'drizzle-orm'
 import { getBeijingTime } from '~/utils/timeUtils'
 import { getStatusText } from '~~/server/utils/user'
-import { createApiError } from '~~/server/utils/apiError'
-import { SERVER_ERROR_CODES } from '~~/server/config/constants'
 
 export default defineEventHandler(async (event) => {
   try {
@@ -14,76 +12,51 @@ export default defineEventHandler(async (event) => {
     if (!user || !['ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
       throw createError({
         statusCode: 403,
-        message: '没有权限访问'
+        statusMessage: '没有权限访问'
       })
     }
 
     const body = await readBody(event)
-    const { userIds, status, reason, sourceStatus } = body
-    const sourceStatusFilter = typeof sourceStatus === 'string' ? sourceStatus.trim() : ''
+    const { userIds, status, reason } = body
 
     // 验证必填字段
     if (!Array.isArray(userIds) || userIds.length === 0) {
       throw createError({
         statusCode: 400,
-        message: '用户ID列表不能为空'
+        statusMessage: '用户ID列表不能为空'
       })
     }
 
     if (!status || !['active', 'withdrawn', 'graduate'].includes(status)) {
       throw createError({
         statusCode: 400,
-        message: '状态必须为 active, withdrawn 或 graduate'
+        statusMessage: '状态必须为 active, withdrawn 或 graduate'
       })
     }
 
-    // 源状态白名单含 pending（支持按待审核筛选批量处理；同时使下方 pending→active 拦截可达）
-    if (sourceStatusFilter && !['active', 'pending', 'withdrawn', 'graduate'].includes(sourceStatusFilter)) {
-      throw createError({
-        statusCode: 400,
-        message: '前置状态必须为 active, pending, withdrawn 或 graduate'
-      })
-    }
-
-    if (sourceStatusFilter === status) {
-      throw createError({
-        statusCode: 400,
-        message: '前置状态不能与目标状态相同'
-      })
-    }
-
-    // 待审核用户不得通过批量状态接口直接置为 active（须走注册审核流程）
-    if (sourceStatusFilter === 'pending' && status === 'active') {
-      throw createApiError(400, SERVER_ERROR_CODES.USER_NOT_PENDING, '待审核用户需通过注册审核流程处理')
-    }
-
     if (!reason || reason.trim().length === 0) {
       throw createError({
         statusCode: 400,
-        message: '变更原因为必填项'
+        statusMessage: '变更原因为必填项'
       })
     }
 
     // 验证用户ID格式
-    const validUserIds = [
-      ...new Set(
-        userIds
-          .filter((id) => {
-            const numId = parseInt(id)
-            return !isNaN(numId) && numId > 0
-          })
-          .map((id) => parseInt(id))
-      )
-    ]
+    const validUserIds = userIds
+      .filter((id) => {
+        const numId = parseInt(id)
+        return !isNaN(numId) && numId > 0
+      })
+      .map((id) => parseInt(id))
 
     if (validUserIds.length === 0) {
       throw createError({
         statusCode: 400,
-        message: '没有有效的用户ID'
+        statusMessage: '没有有效的用户ID'
       })
     }
 
-    // 检查用户是否存在
+    // 检查用户是否存在且为学生角色
     const existingUsers = await db
       .select({
         id: users.id,
@@ -93,69 +66,23 @@ export default defineEventHandler(async (event) => {
         role: users.role
       })
       .from(users)
-      .where(inArray(users.id, validUserIds))
+      .where(and(inArray(users.id, validUserIds), eq(users.role, 'USER')))
 
-    const existingUserIds = existingUsers.map((u) => u.id)
-    const nonExistentUserIds = validUserIds.filter((id) => !existingUserIds.includes(id))
-
-    // 筛选出状态需要变更的用户，并加入越权保护，同时记录失败原因
-    const usersToUpdate = []
-    const errors: Array<{ userId: number | string; error: string }> = []
-
-    if (nonExistentUserIds.length > 0) {
-      nonExistentUserIds.forEach((id) => {
-        errors.push({ userId: id, error: '用户不存在' })
+    if (existingUsers.length === 0) {
+      throw createError({
+        statusCode: 404,
+        statusMessage: '没有找到可更新的学生用户'
       })
     }
 
-    for (const u of existingUsers) {
-      if (u.id === 1) {
-        errors.push({ userId: u.id, error: '无法修改系统初始超级管理员' })
-        continue
-      }
-      if (u.id === user.id) {
-        errors.push({ userId: u.id, error: '禁止在用户管理中批量更新自己的账户' })
-        continue
-      }
-      if (u.role === 'SUPER_ADMIN' && user.role !== 'SUPER_ADMIN') {
-        errors.push({ userId: u.id, error: '权限不足：普通管理员无法修改超级管理员信息' })
-        continue
-      }
-      if (u.role !== 'USER' && user.role !== 'SUPER_ADMIN') {
-        errors.push({ userId: u.id, error: '权限不足：普通管理员无法批量修改其他管理员状态' })
-        continue
-      }
-      if (sourceStatusFilter && u.status !== sourceStatusFilter) {
-        errors.push({
-          userId: u.id,
-          error: `前置状态不匹配：当前为${getStatusText(u.status)}，仅更新${getStatusText(sourceStatusFilter)}`
-        })
-        continue
-      }
-      // 待审核用户不得通过批量状态接口直接置为 active（须走注册审核流程；即使未传 sourceStatus 也按实际状态拦截）
-      if (status === 'active' && u.status === 'pending') {
-        errors.push({ userId: u.id, error: '待审核用户需通过注册审核流程处理' })
-        continue
-      }
-      if (u.status === status) {
-        errors.push({ userId: u.id, error: '用户状态无需变更' })
-        continue
-      }
-      usersToUpdate.push(u)
-    }
+    // 筛选出状态需要变更的用户
+    const usersToUpdate = existingUsers.filter((u) => u.status !== status)
 
     if (usersToUpdate.length === 0) {
-      return {
-        success: false,
-        message: '没有可更新的合法用户',
-        errors,
-        data: {
-          totalRequested: validUserIds.length,
-          totalUpdated: 0,
-          updatedUsers: [],
-          sourceStatus: sourceStatusFilter || null
-        }
-      }
+      throw createError({
+        statusCode: 400,
+        statusMessage: '所选用户的状态均无需变更'
+      })
     }
 
     const currentTime = getBeijingTime()
@@ -194,15 +121,24 @@ export default defineEventHandler(async (event) => {
       }
     })
 
+    // 清除相关缓存
+    try {
+      const { cache } = await import('~~/server/utils/cache-helpers')
+      for (const userId of usersToUpdate.map((u) => u.id)) {
+        await cache.delete(`auth:user:${userId}`)
+      }
+      console.log('[Cache] 批量用户认证缓存已清除（状态更新）')
+    } catch (cacheError) {
+      console.warn('[Cache] 清除缓存失败:', cacheError)
+    }
+
     return {
       success: true,
       message: `成功更新 ${results.length} 个用户的状态为${getStatusText(status)}`,
-      errors,
       data: {
         totalRequested: validUserIds.length,
         totalUpdated: results.length,
         updatedUsers: results,
-        sourceStatus: sourceStatusFilter || null,
         changedAt: currentTime,
         changedBy: user.name
       }
@@ -216,7 +152,7 @@ export default defineEventHandler(async (event) => {
 
     throw createError({
       statusCode: 500,
-      message: '批量更新用户状态失败: ' + error.message
+      statusMessage: '批量更新用户状态失败: ' + error.message
     })
   }
 })
diff --git a/server/api/admin/users/batch-update.post.ts b/server/api/admin/users/batch-update.post.ts
index ae69d1b..5df9c8c 100644
--- a/server/api/admin/users/batch-update.post.ts
+++ b/server/api/admin/users/batch-update.post.ts
@@ -1,5 +1,6 @@
 import { z } from 'zod'
 import { db } from '~/drizzle/db'
+import { CacheService } from '~~/server/services/cacheService'
 import { users, userStatusLogs } from '~/drizzle/schema'
 import { and, eq, inArray, ne } from 'drizzle-orm'
 
@@ -27,7 +28,7 @@ export default defineEventHandler(async (event) => {
     if (!currentUser) {
       throw createError({
         statusCode: 401,
-        message: 'Authentication required'
+        statusMessage: 'Authentication required'
       })
     }
 
@@ -35,7 +36,7 @@ export default defineEventHandler(async (event) => {
     if (!['ADMIN', 'SUPER_ADMIN'].includes(currentUser.role)) {
       throw createError({
         statusCode: 403,
-        message: 'Insufficient permissions'
+        statusMessage: 'Insufficient permissions'
       })
     }
 
@@ -46,7 +47,8 @@ export default defineEventHandler(async (event) => {
     if (!validationResult.success) {
       throw createError({
         statusCode: 400,
-        message: '请求参数无效: ' + validationResult.error.issues.map((e) => e.message).join(', ')
+        statusMessage:
+          '请求参数无效: ' + validationResult.error.errors.map((e) => e.message).join(', ')
       })
     }
 
@@ -55,7 +57,7 @@ export default defineEventHandler(async (event) => {
     // 获取所有要更新的用户ID
     const userIds = updates.map((update) => update.userId)
 
-    // 验证用户是否存在
+    // 验证用户是否存在且为学生角色
     const existingUsers = await db
       .select({
         id: users.id,
@@ -65,38 +67,25 @@ export default defineEventHandler(async (event) => {
         status: users.status
       })
       .from(users)
-      .where(inArray(users.id, userIds))
+      .where(and(inArray(users.id, userIds), eq(users.role, 'USER')))
 
-    // 检查是否所有用户都存在
+    // 检查是否所有用户都存在且为学生
     const existingUserIds = new Set(existingUsers.map((user) => user.id))
     const missingUserIds = userIds.filter((id) => !existingUserIds.has(id))
 
     if (missingUserIds.length > 0) {
       throw createError({
         statusCode: 400,
-        message: `以下用户ID不存在: ${missingUserIds.join(', ')}`
+        statusMessage: `以下用户ID不存在或不是学生: ${missingUserIds.join(', ')}`
       })
     }
 
     // 执行批量更新
     const updateResults = []
     const errors = []
-    const userMap = new Map(existingUsers.map((u) => [u.id, u]))
 
     for (const update of updates) {
       try {
-        const targetUser = userMap.get(update.userId)
-        if (!targetUser) continue
-
-        // 保护系统初始超级管理员
-        if (targetUser.id === 1) {
-          errors.push({
-            userId: update.userId,
-            error: '无法修改系统初始超级管理员'
-          })
-          continue
-        }
-
         // 禁止批量更新包含当前操作者自身
         if (update.userId === currentUser.id) {
           errors.push({
@@ -105,15 +94,6 @@ export default defineEventHandler(async (event) => {
           })
           continue
         }
-
-        // 越级修改保护
-        if (targetUser.role === 'SUPER_ADMIN' && currentUser.role !== 'SUPER_ADMIN') {
-          errors.push({
-            userId: update.userId,
-            error: '权限不足：普通管理员无法修改超级管理员信息'
-          })
-          continue
-        }
         // 构建更新数据
         const updateData: any = {}
 
@@ -162,7 +142,7 @@ export default defineEventHandler(async (event) => {
         }
 
         let updatedUser
-
+        
         // 使用事务确保更新和日志记录的原子性
         await db.transaction(async (tx) => {
           // 更新用户信息
@@ -225,6 +205,17 @@ export default defineEventHandler(async (event) => {
       response.message = `批量更新部分完成，成功更新 ${updateResults.length} 个用户，${errors.length} 个用户更新失败`
     }
 
+    // 如果有用户更新成功，清除相关缓存
+    if (updateResults.length > 0) {
+      try {
+        const cacheService = CacheService.getInstance()
+        await cacheService.clearSongsCache()
+        console.log('批量用户更新后缓存清除成功')
+      } catch (cacheError) {
+        console.error('批量用户更新后缓存清除失败:', cacheError)
+      }
+    }
+
     return response
   } catch (error) {
     console.error('批量更新用户失败:', error)
@@ -237,7 +228,7 @@ export default defineEventHandler(async (event) => {
     // 未知错误
     throw createError({
       statusCode: 500,
-      message: '批量更新用户失败: ' + error.message
+      statusMessage: '批量更新用户失败: ' + error.message
     })
   }
 })
diff --git a/server/api/admin/users/batch.post.ts b/server/api/admin/users/batch.post.ts
index a75b6d2..14033fe 100644
--- a/server/api/admin/users/batch.post.ts
+++ b/server/api/admin/users/batch.post.ts
@@ -1,28 +1,8 @@
 import bcrypt from 'bcryptjs'
 import { db } from '~/drizzle/db'
 import { users } from '~/drizzle/schema'
-import { eq, inArray } from 'drizzle-orm'
-import { getAdminPasswordViolation } from '~~/server/utils/admin-password-policy'
-
-interface UserData {
-  name: string
-  username: string
-  password: string
-  role?: string
-  status?: 'active' | 'withdrawn' | 'graduate'
-  grade?: string | null
-  class?: string | null
-}
-
-interface ValidUserData extends UserData {
-  index: number
-}
-
-const normalizeRequiredText = (value: unknown) => String(value || '').trim()
-const normalizeOptionalText = (value: unknown) => {
-  const normalized = String(value || '').trim()
-  return normalized || null
-}
+import { eq } from 'drizzle-orm'
+import { cacheService } from '../../../services/cacheService'
 
 export default defineEventHandler(async (event) => {
   // 检查认证和权限
@@ -46,129 +26,56 @@ export default defineEventHandler(async (event) => {
   const results = {
     created: 0,
     failed: 0,
-    total: body.users.length,
-    errors: [] as Array<{ index: number; username?: string; name?: string; reason: string }>
+    total: body.users.length
   }
 
-  // 1. 预处理数据：过滤必填字段，提取要查询的用户名
-  const validUsers: ValidUserData[] = []
-  const usernamesToQuery: string[] = []
-  const usernamesInBatch = new Set<string>()
-
+  // 批量添加用户
   for (let i = 0; i < body.users.length; i++) {
     const userData = body.users[i]
-    const normalizedUserData = {
-      ...userData,
-      name: normalizeRequiredText(userData.name),
-      username: normalizeRequiredText(userData.username),
-      grade: normalizeOptionalText(userData.grade),
-      class: normalizeOptionalText(userData.class)
-    }
 
-    if (
-      !normalizedUserData.name ||
-      !normalizedUserData.username ||
-      typeof userData.password !== 'string' ||
-      !userData.password
-    ) {
-      results.failed++
-      results.errors.push({
-        index: i,
-        username: userData.username,
-        name: userData.name,
-        reason: '缺少必填字段（姓名、账号或密码）'
-      })
-      continue
-    }
+    try {
+      // 验证必填字段
+      if (!userData.name || !userData.username || !userData.password) {
+        results.failed++
+        continue
+      }
 
-    const passwordViolation = getAdminPasswordViolation(userData.password)
-    if (passwordViolation) {
-      results.failed++
-      results.errors.push({
-        index: i,
-        username: normalizedUserData.username,
-        name: normalizedUserData.name,
-        reason: passwordViolation.message
-      })
-      continue
-    }
+      const chineseRegex = /^[\u4e00-\u9fa5]+$/
+      if (!chineseRegex.test(userData.name) || !chineseRegex.test(userData.username)) {
+        results.failed++
+        continue
+      }
 
-    if (usernamesInBatch.has(normalizedUserData.username)) {
-      results.failed++
-      results.errors.push({
-        index: i,
-        username: normalizedUserData.username,
-        name: normalizedUserData.name,
-        reason: '批处理中存在重复的账号'
-      })
-      continue
-    }
+      // 检查用户名是否已存在
+      const existingUser = await db
+        .select()
+        .from(users)
+        .where(eq(users.username, userData.username))
+        .limit(1)
 
-    usernamesInBatch.add(normalizedUserData.username)
-    // 限制单次查询 inArray 的长度，如果需要的话。前端分批已经是 50，所以没问题
-    validUsers.push({ index: i, ...normalizedUserData })
-    usernamesToQuery.push(normalizedUserData.username)
-  }
+      if (existingUser.length > 0) {
+        results.failed++
+        continue
+      }
 
-  if (validUsers.length === 0) {
-    return results
-  }
+      // 加密密码
+      const hashedPassword = await bcrypt.hash(userData.password, 10)
 
-  // 2. 批量查询已存在的用户名，减少数据库交互
-  let existingUsernames = new Set<string>()
-  try {
-    const existingUsersList = await db
-      .select({ username: users.username })
-      .from(users)
-      .where(inArray(users.username, usernamesToQuery))
-
-    existingUsernames = new Set(existingUsersList.map((u) => u.username))
-  } catch (error: any) {
-    console.error('批量查询用户失败:', error)
-    throw createError({
-      statusCode: 500,
-      message: '数据库查询错误'
-    })
-  }
-
-  // 3. 过滤掉已存在的用户
-  const usersToInsertData: ValidUserData[] = []
-  for (const userData of validUsers) {
-    if (existingUsernames.has(userData.username)) {
-      results.failed++
-      results.errors.push({
-        index: userData.index,
-        username: userData.username,
-        name: userData.name,
-        reason: '账号已存在'
-      })
-      continue
-    }
-    usersToInsertData.push(userData)
-  }
-
-  if (usersToInsertData.length === 0) {
-    return results
-  }
-
-  try {
-    // 4. 并发加密密码 (由于使用 bcrypt.hash 异步方法，使用 Promise.all 并发处理可以显著提速)
-    const hashedPasswords = await Promise.all(
-      usersToInsertData.map((userData) => bcrypt.hash(userData.password, 10))
-    )
-
-    // 5. 准备批量插入的数据
-    const insertValues = usersToInsertData.map((userData, idx) => {
       // 角色权限控制
       let validRole = 'USER' // 默认角色
       if (userData.role) {
-        const rolePermissions: Record<string, string[]> = {
-          SUPER_ADMIN: ['USER', 'ADMIN', 'SONG_ADMIN', 'SUPER_ADMIN'],
-          ADMIN: ['USER', 'SONG_ADMIN']
-        }
-        const allowedRoles = rolePermissions[user.role]
-        if (allowedRoles?.includes(userData.role)) {
-          validRole = userData.role
+        if (user.role === 'SUPER_ADMIN') {
+          // 超级管理员可以设置任何角色
+          const allowedRoles = ['USER', 'TEACHER', 'ADMIN', 'SONG_ADMIN', 'SUPER_ADMIN']
+          if (allowedRoles.includes(userData.role)) {
+            validRole = userData.role
+          }
+        } else if (user.role === 'ADMIN') {
+          // 普通管理员只能设置 USER 和 SONG_ADMIN 角色
+          const allowedRoles = ['USER', 'TEACHER', 'SONG_ADMIN']
+          if (allowedRoles.includes(userData.role)) {
+            validRole = userData.role
+          }
         }
       }
 
@@ -178,31 +85,34 @@ export default defineEventHandler(async (event) => {
         validStatus = userData.status
       }
 
-      return {
-        name: userData.name,
-        username: userData.username,
-        password: hashedPasswords[idx]!,
-        role: validRole,
-        status: validStatus as 'active' | 'withdrawn' | 'graduate',
-        grade: userData.grade,
-        class: userData.class
-      }
-    })
+      // 创建用户
+      const newUser = await db
+        .insert(users)
+        .values({
+          name: userData.name,
+          username: userData.username,
+          password: hashedPassword,
+          role: validRole,
+          status: validStatus as 'active' | 'withdrawn' | 'graduate',
+          grade: userData.grade,
+          class: userData.class
+        })
+        .returning()
 
-    // 6. 执行批量插入
-    await db.insert(users).values(insertValues)
-    results.created += insertValues.length
-  } catch (error: any) {
-    console.error(`批量插入用户失败:`, error)
-    // 如果批量插入整体失败，则全部标记为失败
-    for (const userData of usersToInsertData) {
+      results.created++
+    } catch (error) {
+      console.error(`用户创建失败:`, error)
       results.failed++
-      results.errors.push({
-        index: userData.index,
-        username: userData.username,
-        name: userData.name,
-        reason: error.message || '数据库批量写入失败'
-      })
+    }
+  }
+
+  // 如果有用户创建成功，清除相关缓存
+  if (results.created > 0) {
+    try {
+      await cacheService.clearSongsCache()
+      console.log('批量用户创建后缓存清除成功')
+    } catch (cacheError) {
+      console.error('批量用户创建后缓存清除失败:', cacheError)
     }
   }
 
diff --git a/server/api/admin/users/index.get.ts b/server/api/admin/users/index.get.ts
index a6afbfa..9c2b06f 100644
--- a/server/api/admin/users/index.get.ts
+++ b/server/api/admin/users/index.get.ts
@@ -1,48 +1,25 @@
 import { createError, defineEventHandler, getQuery } from 'h3'
 import { db } from '~/drizzle/db'
 import { users } from '~/drizzle/schema'
-import { and, asc, desc, count, eq, ilike, inArray, isNull, notInArray, or, sql } from 'drizzle-orm'
-import { resolveAvatarSource } from '~~/server/utils/user-avatar'
-import { ARCHIVED_USER_STATUSES, resolveArchivedFilter } from '~~/server/utils/user-archive'
-
-const UNSET_FILTER_VALUE = '__UNSET__'
+import { and, asc, desc, count, eq, ilike, or, sql } from 'drizzle-orm'
 
 export default defineEventHandler(async (event) => {
   try {
-    // 检查用户是否为管理员
-    const user = event.context.user
-
-    if (!user || !['ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
-      throw createError({
-        statusCode: 403,
-        message: '只有系统管理员可以访问用户列表'
-      })
-    }
-
+    // 获取查询参数
     const query = getQuery(event)
-    const { grade, class: className, search, page = '1', limit = '50', role, status, sortBy = 'id', sortOrder = 'asc', archived } = query
+    const { grade, class: className, search, page = '1', limit = '50', role, status, sortBy = 'id', sortOrder = 'asc' } = query
 
     // 构建筛选条件
     const whereConditions = []
 
     // 年级筛选
     if (grade && typeof grade === 'string' && grade.trim()) {
-      const gradeFilter = grade.trim()
-      whereConditions.push(
-        gradeFilter === UNSET_FILTER_VALUE
-          ? or(isNull(users.grade), eq(users.grade, ''))
-          : eq(users.grade, gradeFilter)
-      )
+      whereConditions.push(eq(users.grade, grade.trim()))
     }
 
     // 班级筛选
     if (className && typeof className === 'string' && className.trim()) {
-      const classFilter = className.trim()
-      whereConditions.push(
-        classFilter === UNSET_FILTER_VALUE
-          ? or(isNull(users.class), eq(users.class, ''))
-          : eq(users.class, classFilter)
-      )
+      whereConditions.push(eq(users.class, className.trim()))
     }
 
     // 角色筛选
@@ -52,18 +29,7 @@ export default defineEventHandler(async (event) => {
 
     // 状态筛选
     if (status && typeof status === 'string' && status.trim()) {
-      const statusFilter = status.trim()
-      if (['active', 'pending', 'withdrawn', 'graduate'].includes(statusFilter)) {
-        whereConditions.push(eq(users.status, statusFilter as 'active' | 'pending' | 'withdrawn' | 'graduate'))
-      }
-    }
-
-    // 归档筛选：archived=1 仅查已归档（graduate/withdrawn）；archived=0 排除已归档；缺省不限制
-    const archivedFilter = resolveArchivedFilter(archived)
-    if (archivedFilter === 'archived') {
-      whereConditions.push(inArray(users.status, [...ARCHIVED_USER_STATUSES]))
-    } else if (archivedFilter === 'unarchived') {
-      whereConditions.push(notInArray(users.status, [...ARCHIVED_USER_STATUSES]))
+      whereConditions.push(eq(users.status, status.trim()))
     }
 
     // 搜索功能（姓名、用户名或IP地址）
@@ -82,12 +48,12 @@ export default defineEventHandler(async (event) => {
 
     // 分页参数
     const pageNum = Math.max(1, parseInt(page as string) || 1)
-    const limitNum = Math.min(Math.max(1, parseInt(limit as string) || 50), 1000)
+    const limitNum = Math.max(1, parseInt(limit as string) || 50)
     const skip = (pageNum - 1) * limitNum
 
     // 获取总数
     const totalResult = await db.select({ count: count() }).from(users).where(whereClause)
-    const total = totalResult[0]?.count || 0
+    const total = totalResult[0].count
 
     // 排序逻辑
     let orderByClause
@@ -129,33 +95,35 @@ export default defineEventHandler(async (event) => {
         forcePasswordChange: true,
         meowNickname: true,
         meowBoundAt: true,
-        email: true,
-        emailVerified: true,
-        remark: true,
         createdAt: true,
         updatedAt: true,
         avatarProvider: true,
-        avatarProviderUserId: true
+        avatarProviderUserId: true,
+        email: true
       },
       with: {
-        identities: {
-          columns: {
-            provider: true,
-            providerUsername: true,
-            providerUserId: true,
-            avatar: true,
-            createdAt: true
-          }
-        }
+        identities: true
       }
     })
 
-    // 处理用户列表，添加头像字段
+    const { getUserAvatarUrl } = await import('~~/server/utils/user-avatar')
+
     const formattedUsers = usersList.map((user) => {
-      const avatarSource = resolveAvatarSource(user, user.identities || [])
+      const avatarUrl = getUserAvatarUrl(
+        {
+          id: user.id,
+          name: user.name,
+          username: user.username,
+          email: user.email,
+          avatarProvider: user.avatarProvider,
+          avatarProviderUserId: user.avatarProviderUserId
+        },
+        user.identities || []
+      )
       return {
         ...user,
-        avatar: avatarSource?.url ?? null
+        avatar: avatarUrl,
+        avatarUrl
       }
     })
 
@@ -183,11 +151,11 @@ export default defineEventHandler(async (event) => {
         search: search || null
       }
     }
-  } catch (error: any) {
+  } catch (error) {
     console.error('获取用户列表失败:', error)
     throw createError({
       statusCode: 500,
-      message: '获取用户列表失败: ' + error.message
+      statusMessage: '获取用户列表失败: ' + error.message
     })
   }
 })
diff --git a/server/api/admin/users/index.post.ts b/server/api/admin/users/index.post.ts
index 6738625..5f41903 100644
--- a/server/api/admin/users/index.post.ts
+++ b/server/api/admin/users/index.post.ts
@@ -2,14 +2,7 @@ import bcrypt from 'bcryptjs'
 import { db } from '~/drizzle/db'
 import { users } from '~/drizzle/schema'
 import { eq } from 'drizzle-orm'
-import { createApiError } from '~~/server/utils/apiError'
-import { getAdminPasswordViolation } from '~~/server/utils/admin-password-policy'
-
-const normalizeRequiredText = (value: unknown) => String(value || '').trim()
-const normalizeOptionalText = (value: unknown) => {
-  const normalized = String(value || '').trim()
-  return normalized || null
-}
+import { getRoleLevel, isRoleHigher, canManageUserRole } from '~~/server/utils/permissions'
 
 export default defineEventHandler(async (event) => {
   // 检查认证和权限
@@ -22,21 +15,22 @@ export default defineEventHandler(async (event) => {
   }
 
   const body = await readBody(event)
-  const normalizedName = normalizeRequiredText(body.name)
-  const normalizedUsername = normalizeRequiredText(body.username)
-  const initialPassword = typeof body.password === 'string' ? body.password : ''
 
   // 验证必填字段
-  if (!normalizedName || !normalizedUsername || !initialPassword) {
+  if (!body.name || !body.username || !body.password) {
     throw createError({
       statusCode: 400,
-      message: '姓名、用户名和密码不能为空'
+      message: '姓名、账号名和密码不能为空'
     })
   }
 
-  const violation = getAdminPasswordViolation(initialPassword)
-  if (violation) {
-    throw createApiError(400, violation.code, violation.message)
+  // 验证姓名和用户名只能包含汉字
+  const chineseRegex = /^[\u4e00-\u9fa5]+$/
+  if (!chineseRegex.test(body.name) || !chineseRegex.test(body.username)) {
+    throw createError({
+      statusCode: 400,
+      message: '姓名和账号名只能包含汉字'
+    })
   }
 
   try {
@@ -44,45 +38,35 @@ export default defineEventHandler(async (event) => {
     const existingUserResult = await db
       .select()
       .from(users)
-      .where(eq(users.username, normalizedUsername))
+      .where(eq(users.username, body.username))
       .limit(1)
     const existingUser = existingUserResult[0]
 
     if (existingUser) {
       throw createError({
         statusCode: 400,
-        message: '用户名已存在'
+        message: '账号名已存在'
       })
     }
 
     // 加密密码
-    const hashedPassword = await bcrypt.hash(initialPassword, 10)
+    const hashedPassword = await bcrypt.hash(body.password, 10)
 
-    // 角色权限控制
+    // 角色权限控制（统一使用 canManageUserRole 数值化级别检查）
     let validRole = 'USER'
-    if (body.role && ['USER', 'ADMIN', 'SONG_ADMIN', 'SUPER_ADMIN'].includes(body.role)) {
-      // 超级管理员可以创建任何角色的用户
-      if (user.role === 'SUPER_ADMIN') {
-        validRole = body.role
-      }
-      // 管理员只能创建管理员以下的角色（USER, SONG_ADMIN）
-      else if (user.role === 'ADMIN') {
-        if (['USER', 'SONG_ADMIN'].includes(body.role)) {
-          validRole = body.role
-        } else {
-          throw createError({
-            statusCode: 403,
-            message: '管理员只能创建用户和歌曲管理员角色'
-          })
-        }
-      }
-      // 其他角色不能创建用户
-      else {
+    const requestedRole = body.role
+    if (requestedRole) {
+      if (!canManageUserRole(user, requestedRole)) {
+        const currentLevel = getRoleLevel(user.role)
+        const targetLevel = getRoleLevel(requestedRole)
         throw createError({
           statusCode: 403,
-          message: '没有权限创建用户'
+          message: isRoleHigher(requestedRole, user.role) || currentLevel <= targetLevel
+            ? `权限不足：${user.role} 无法创建级别高于或等于自身的角色（${requestedRole}）`
+            : `没有权限创建 ${requestedRole} 角色的用户`
         })
       }
+      validRole = requestedRole
     }
 
     // 状态验证
@@ -95,13 +79,13 @@ export default defineEventHandler(async (event) => {
     const newUserResult = await db
       .insert(users)
       .values({
-        name: normalizedName,
-        username: normalizedUsername,
+        name: body.name,
+        username: body.username,
         password: hashedPassword,
         role: validRole,
         status: validStatus as 'active' | 'withdrawn' | 'graduate',
-        grade: normalizeOptionalText(body.grade),
-        class: normalizeOptionalText(body.class)
+        grade: body.grade,
+        class: body.class
       })
       .returning({
         id: users.id,
@@ -116,16 +100,23 @@ export default defineEventHandler(async (event) => {
       })
     const newUser = newUserResult[0]
 
+    // 清除相关缓存
+    try {
+      const { cache } = await import('~~/server/utils/cache-helpers')
+      await cache.deletePattern('songs:*')
+      await cache.deletePattern('stats:*')
+      console.log('[Cache] 歌曲和统计缓存已清除（用户创建）')
+    } catch (cacheError) {
+      console.warn('[Cache] 清除缓存失败:', cacheError)
+    }
+
     return {
       success: true,
       user: newUser,
       message: '用户创建成功'
     }
-  } catch (error: any) {
+  } catch (error) {
     console.error('创建用户失败:', error)
-    if (error?.statusCode) {
-      throw error
-    }
     throw createError({
       statusCode: 500,
       message: '创建用户失败'
diff --git a/server/api/admin/users/status-logs.get.ts b/server/api/admin/users/status-logs.get.ts
index 58bfd53..7e06afb 100644
--- a/server/api/admin/users/status-logs.get.ts
+++ b/server/api/admin/users/status-logs.get.ts
@@ -1,7 +1,7 @@
 import { createError, defineEventHandler, getQuery } from 'h3'
 import { db } from '~/drizzle/db'
 import { users, userStatusLogs } from '~/drizzle/schema'
-import { and, count, desc, eq, ilike, inArray, or, sql } from 'drizzle-orm'
+import { and, count, desc, eq, ilike, or } from 'drizzle-orm'
 import { getStatusText } from '~~/server/utils/user'
 
 export default defineEventHandler(async (event) => {
@@ -11,7 +11,7 @@ export default defineEventHandler(async (event) => {
     if (!user || !['ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
       throw createError({
         statusCode: 403,
-        message: '没有权限访问'
+        statusMessage: '没有权限访问'
       })
     }
 
@@ -46,14 +46,15 @@ export default defineEventHandler(async (event) => {
       .select({
         id: userStatusLogs.id,
         userId: userStatusLogs.userId,
-        // 优先快照列（用户删除后审计可追溯）；存量旧日志快照为 NULL 时回退 join 的用户名
-        userName: sql`COALESCE(${userStatusLogs.name}, ${users.name})`,
-        userUsername: sql`COALESCE(${userStatusLogs.username}, ${users.username})`,
+        userName: users.name,
+        userUsername: users.username,
         oldStatus: userStatusLogs.oldStatus,
         newStatus: userStatusLogs.newStatus,
         reason: userStatusLogs.reason,
         createdAt: userStatusLogs.createdAt,
-        operatorId: userStatusLogs.operatorId
+        operatorId: userStatusLogs.operatorId,
+        operatorName: users.name,
+        operatorUsername: users.username
       })
       .from(userStatusLogs)
       .leftJoin(users, eq(userStatusLogs.userId, users.id))
@@ -66,13 +67,15 @@ export default defineEventHandler(async (event) => {
         .select({
           id: userStatusLogs.id,
           userId: userStatusLogs.userId,
-          userName: sql`COALESCE(${userStatusLogs.name}, ${users.name})`,
-          userUsername: sql`COALESCE(${userStatusLogs.username}, ${users.username})`,
+          userName: users.name,
+          userUsername: users.username,
           oldStatus: userStatusLogs.oldStatus,
           newStatus: userStatusLogs.newStatus,
           reason: userStatusLogs.reason,
           createdAt: userStatusLogs.createdAt,
-          operatorId: userStatusLogs.operatorId
+          operatorId: userStatusLogs.operatorId,
+          operatorName: users.name,
+          operatorUsername: users.username
         })
         .from(userStatusLogs)
         .leftJoin(users, eq(userStatusLogs.userId, users.id))
@@ -80,9 +83,6 @@ export default defineEventHandler(async (event) => {
           and(
             whereClause,
             or(
-              ilike(userStatusLogs.name, `%${searchTerm}%`),
-              ilike(userStatusLogs.username, `%${searchTerm}%`),
-              // 存量旧日志快照列为 NULL，回退 join 的用户名列以便可搜
               ilike(users.name, `%${searchTerm}%`),
               ilike(users.username, `%${searchTerm}%`),
               ilike(userStatusLogs.reason, `%${searchTerm}%`)
@@ -106,8 +106,6 @@ export default defineEventHandler(async (event) => {
         and(
           whereClause,
           or(
-            ilike(userStatusLogs.name, `%${searchTerm}%`),
-            ilike(userStatusLogs.username, `%${searchTerm}%`),
             ilike(users.name, `%${searchTerm}%`),
             ilike(users.username, `%${searchTerm}%`),
             ilike(userStatusLogs.reason, `%${searchTerm}%`)
@@ -137,7 +135,7 @@ export default defineEventHandler(async (event) => {
         username: users.username
       })
       .from(users)
-      .where(inArray(users.id, operatorIds))
+      .where(eq(users.id, operatorIds[0])) // 这里需要用inArray，但先简化处理
 
     const operatorMap = new Map()
     for (const op of operators) {
@@ -166,8 +164,8 @@ export default defineEventHandler(async (event) => {
         createdAt: log.createdAt,
         operator: {
           id: log.operatorId,
-          name: operatorMap.get(log.operatorId)?.name || '未知操作员',
-          username: operatorMap.get(log.operatorId)?.username || 'unknown'
+          name: operatorMap.get(log.operatorId)?.name || log.operatorName || '未知操作员',
+          username: operatorMap.get(log.operatorId)?.username || log.operatorUsername || 'unknown'
         }
       })),
       pagination: {
@@ -193,7 +191,7 @@ export default defineEventHandler(async (event) => {
 
     throw createError({
       statusCode: 500,
-      message: '获取状态变更日志失败: ' + error.message
+      statusMessage: '获取状态变更日志失败: ' + error.message
     })
   }
 })
diff --git a/server/api/music/kg/parse-link.get.ts b/server/api/music/kg/parse-link.get.ts
new file mode 100644
index 0000000..9ae5dba
--- /dev/null
+++ b/server/api/music/kg/parse-link.get.ts
@@ -0,0 +1,81 @@
+import { getQuery, createError } from 'h3'
+import axios from 'axios'
+
+export default defineEventHandler(async (event) => {
+  const query = getQuery(event)
+  const url = query.url as string
+
+  if (!url || !url.includes('kugou.com')) {
+    throw createError({
+      statusCode: 400,
+      message: 'Invalid Kugou URL'
+    })
+  }
+
+  try {
+    // 1. 获取重定向后的最终URL或HTML内容
+    const response = await axios.get(url, {
+      headers: {
+        'User-Agent': 'Mozilla/5.0 (iPhone; CPU iPhone OS 13_2_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.0.3 Mobile/15E148 Safari/604.1'
+      }
+    })
+    
+    // 很多时候链接会跳转，或者HTML里面有 hash 变量
+    const html = response.data
+    // 尝试正则匹配 "hash":"xxx" 或者 hash: 'xxx'
+    const hashMatch = html.match(/"hash"\s*:\s*"([a-zA-Z0-9]+)"/i) || html.match(/hash\s*=\s*"([a-zA-Z0-9]+)"/i) || html.match(/"320hash"\s*:\s*"([a-zA-Z0-9]+)"/i)
+    const albumMatch = html.match(/"album_id"\s*:\s*(\d+)/i)
+    
+    if (hashMatch && hashMatch[1]) {
+      const hash = hashMatch[1]
+      // 用 hash 再次查询歌曲详情或者直接返回
+      // 我们可以调用移动端 track info API
+      const infoUrl = `http://m.kugou.com/app/i/getSongInfo.php?cmd=playInfo&hash=${hash}`
+      const infoRes = await axios.get(infoUrl, { validateStatus: () => true })
+      
+      if (infoRes.data && infoRes.data.songName) {
+        return {
+          id: hash,
+          title: infoRes.data.songName,
+          artist: infoRes.data.singerName,
+          cover: infoRes.data.imgUrl ? infoRes.data.imgUrl.replace('{size}', '150') : '',
+          duration: infoRes.data.timeLength * 1000,
+          musicPlatform: 'kugou',
+          musicId: hash,
+          hasUrl: true,
+          isVip: infoRes.data.privilege >= 10,
+          sourceInfo: {
+            source: 'kugou',
+            originalId: hash,
+            fetchedAt: new Date()
+          }
+        }
+      }
+      
+      // 如果 getSongInfo 失败，我们只返回 hash
+      return {
+        id: hash,
+        title: "解析成功，请点击投稿",
+        artist: "未知歌手",
+        musicPlatform: 'kugou',
+        musicId: hash,
+        hasUrl: true,
+        sourceInfo: {
+          source: 'kugou',
+          originalId: hash,
+          fetchedAt: new Date()
+        }
+      }
+    }
+
+    throw createError({
+      statusCode: 404,
+      message: 'Cannot find song hash in the provided link'
+    })
+  } catch (error: any) {
+    throw createError({
+      statusCode: 500,
+      message: error.message || 'Failed to parse link'
+    })
+  }
+})
\ No newline at end of file
diff --git a/server/api/music/kg/playurl.get.ts b/server/api/music/kg/playurl.get.ts
new file mode 100644
index 0000000..94c6f32
--- /dev/null
+++ b/server/api/music/kg/playurl.get.ts
@@ -0,0 +1,73 @@
+import { getQuery, createError } from 'h3'
+import axios from 'axios'
+
+export default defineEventHandler(async (event) => {
+  const query = getQuery(event)
+  const hash = query.hash as string
+
+  if (!hash) {
+    throw createError({
+      statusCode: 400,
+      message: 'Hash is required'
+    })
+  }
+
+  try {
+    // 首先尝试通过移动端API获取播放链接
+    const infoUrl = `http://m.kugou.com/app/i/getSongInfo.php?cmd=playInfo&hash=${hash}`
+    const infoRes = await axios.get(infoUrl, { validateStatus: () => true })
+    
+    if (infoRes.data && infoRes.data.url) {
+      return {
+        data: {
+          play_url: infoRes.data.url
+        }
+      }
+    }
+
+    // 如果失败或者需要付费（VIP），通过标题和歌手名从网易云匹配一个试听链接
+    if (infoRes.data && infoRes.data.songName) {
+      const keyword = `${infoRes.data.songName} ${infoRes.data.singerName || ''}`.trim()
+      
+      try {
+        // 搜索网易云音乐
+        const searchUrl = `https://music.163.com/api/search/get/web?s=${encodeURIComponent(keyword)}&type=1&offset=0&total=true&limit=1`
+        const searchRes = await axios.get(searchUrl, {
+          headers: {
+            'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36'
+          }
+        })
+        
+        if (searchRes.data?.result?.songs?.length > 0) {
+          const songId = searchRes.data.result.songs[0].id
+          // 获取网易云播放链接
+          const neteaseUrl = `https://music.163.com/song/media/outer/url?id=${songId}.mp3`
+          return {
+            data: {
+              play_url: neteaseUrl
+            }
+          }
+        }
+      } catch (e) {
+        console.error('Fallback to Netease failed:', e)
+      }
+    }
+
+    // 如果都没有，尝试使用原本的 API
+    const url = `http://www.kugou.com/yy/index.php?r=play/getdata&hash=${hash}`
+    const response = await axios.get(url, {
+      headers: {
+        'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36',
+        'Cookie': 'kg_mid=1234567890'
+      },
+      validateStatus: () => true
+    })
+    
+    return response.data
+  } catch (error) {
+    throw createError({
+      statusCode: 500,
+      message: 'Music service unavailable'
+    })
+  }
+})
\ No newline at end of file
diff --git a/server/api/music/kg/search.get.ts b/server/api/music/kg/search.get.ts
new file mode 100644
index 0000000..a6622a9
--- /dev/null
+++ b/server/api/music/kg/search.get.ts
@@ -0,0 +1,54 @@
+import axios from 'axios'
+import crypto from 'crypto'
+
+export default defineEventHandler(async (event) => {
+  const query = getQuery(event)
+  const keyword = query.keyword || query.keywords
+  
+  if (!keyword) {
+    throw createError({
+      statusCode: 400,
+      message: 'Keyword is required'
+    })
+  }
+
+  // 我们在这里使用不需要签名的通用接口或移动端旧接口
+  
+  try {
+    const url = `http://mobilecdn.kugou.com/api/v3/search/song?format=json&keyword=${encodeURIComponent(keyword as string)}&page=1&pagesize=20&showtype=1`
+    const response = await axios.get(url, {
+      headers: {
+        'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36'
+      },
+      // 允许处理不严谨的 SSL 证书或忽略部分请求错误
+      validateStatus: () => true
+    })
+    
+    const data = response.data
+    
+    // Process results to map cover images and VIP status correctly
+    if (data && data.data && data.data.info) {
+      data.data.info = data.data.info.map((item: any) => {
+        return {
+          ...item,
+          isVip: item.pay_type !== 0,
+          // Extract proper image URL from 'union_cover', '320' size or hash, and use https
+          pic: item.trans_param?.union_cover 
+            ? item.trans_param.union_cover.replace('{size}', '400').replace('http://', 'https://')
+            : item['320hash']
+              ? `https://imge.kugou.com/stdmusic/400/${item['320hash'].slice(0,2)}/${item['320hash'].slice(2,4)}/${item['320hash']}.jpg`
+              : item['hash']
+                ? `https://imge.kugou.com/stdmusic/400/${item['hash'].slice(0,2)}/${item['hash'].slice(2,4)}/${item['hash']}.jpg`
+                : undefined
+        }
+      })
+    }
+    
+    return data
+  } catch (error) {
+    throw createError({
+      statusCode: 500,
+      message: 'Music service unavailable'
+    })
+  }
+})
diff --git a/server/api/songs/add.post.ts b/server/api/songs/add.post.ts
index da219bb..b625176 100644
--- a/server/api/songs/add.post.ts
+++ b/server/api/songs/add.post.ts
@@ -1,53 +1,46 @@
 import { db } from '~/drizzle/db'
 import { songs, users } from '~/drizzle/schema'
 import { and, eq, or } from 'drizzle-orm'
-import { createApiError } from '~~/server/utils/apiError'
-import { SERVER_ERROR_CODES } from '~~/server/config/constants'
+import { cacheService } from '~~/server/services/cacheService'
+import { normalizeCoverUrl } from '~~/server/utils/url'
 
 export default defineEventHandler(async (event) => {
   try {
     // 验证请求方法
     if (event.node.req.method !== 'POST') {
-      throw createApiError(405, 'HTTP_METHOD_NOT_ALLOWED', 'Method Not Allowed')
+      throw createError({
+        statusCode: 405,
+        statusMessage: 'Method Not Allowed'
+      })
     }
 
     // 获取已验证的用户信息（由中间件提供）
     const user = event.context.user
     if (!user) {
-      throw createApiError(401, 'AUTH_UNAUTHORIZED_ACCESS', '未授权访问')
+      throw createError({
+        statusCode: 401,
+        statusMessage: '未授权访问'
+      })
     }
 
     // 检查权限
     if (!['ADMIN', 'SONG_ADMIN', 'SUPER_ADMIN'].includes(user.role)) {
-      throw createApiError(403, 'COMMON_INSUFFICIENT_PERMISSION', '权限不足')
+      throw createError({
+        statusCode: 403,
+        statusMessage: '权限不足'
+      })
     }
 
     // 获取请求体
     const body = await readBody(event)
-    const {
-      title,
-      artist,
-      requester,
-      semester,
-      musicPlatform,
-      musicId,
-      cover,
-      playUrl,
-      durationSeconds,
-      preferredPlayTimeId
-    } = body
+    const { title, artist, requester, semester, musicPlatform, musicId, cover, playUrl } = body
 
     // 验证必填字段
     if (!title || !artist) {
-      throw createApiError(400, SERVER_ERROR_CODES.SONG_TITLE_ARTIST_REQUIRED, 'Title and artist are required')
-    }
-
-    // 校验时长范围（30秒~1小时）
-    if (durationSeconds !== null && durationSeconds !== undefined) {
-      const d = Number(durationSeconds)
-      if (!Number.isFinite(d) || d < 30 || d > 3600) {
-        throw createApiError(400, SERVER_ERROR_CODES.COMMON_INVALID_PARAMS, 'Invalid song duration (30s–1h)')
-      }
+      throw createError({
+        statusCode: 400,
+        statusMessage: 'Title and artist are required'
+      })
     }
 
     // 查找投稿人用户
@@ -89,22 +82,28 @@ export default defineEventHandler(async (event) => {
     const existingSong = existingSongResult[0]
 
     if (existingSong) {
-      throw createApiError(409, 'SONG_ALREADY_EXISTS', 'Song already exists')
+      throw createError({
+        statusCode: 409,
+        statusMessage: 'Song already exists'
+      })
     }
 
+    const normalizedCover = normalizeCoverUrl(cover, `add-song:${title || ''}`)
+
     // 创建歌曲
     const newSongResult = await db
       .insert(songs)
       .values({
         title: title.trim(),
         artist: artist.trim(),
+        singer: artist.trim(),
         requesterId,
         semester: semester || null,
-        preferredPlayTimeId: preferredPlayTimeId || null,
         musicPlatform: musicPlatform || null,
         musicId: musicId || null,
-        durationSeconds: durationSeconds ? Number(durationSeconds) : null,
-        cover: cover || null,
+        kgHash: musicPlatform === 'kugou' ? musicId : null,
+        cover: normalizedCover,
+        coverUrl: normalizedCover,
         playUrl: playUrl || null
       })
       .returning()
@@ -132,6 +131,14 @@ export default defineEventHandler(async (event) => {
       requester: requesterInfo
     }
 
+    // 清除歌曲相关缓存
+    try {
+      await cacheService.clearSongsCache()
+      console.log('[Cache] 歌曲缓存已清除（添加歌曲）')
+    } catch (error) {
+      console.error('清除歌曲缓存失败:', error)
+    }
+
     return {
       success: true,
       song: songWithRequester
@@ -145,7 +152,7 @@ export default defineEventHandler(async (event) => {
 
     throw createError({
       statusCode: 500,
-      message: error.message || 'Internal server error'
+      statusMessage: error.message || 'Internal server error'
     })
   }
 })
diff --git a/server/api/songs/request.post.ts b/server/api/songs/request.post.ts
index 668ca1c..22f9761 100644
--- a/server/api/songs/request.post.ts
+++ b/server/api/songs/request.post.ts
@@ -1,14 +1,542 @@
-import { requestSongForUser } from '~~/server/services/songRequestService'
-import { createApiError } from '~~/server/utils/apiError'
+import {
+  collaborationLogs,
+  db,
+  playTimes,
+  requestTimes,
+  semesters,
+  songBlacklists,
+  songCollaborators,
+  songs,
+  systemSettings
+} from '~/drizzle/db'
+import { and, eq, gt, gte, inArray, lt, lte, sql } from 'drizzle-orm'
+import { createCollaborationInvitationNotification } from '~~/server/services/notificationService'
+import { isLimitReached } from '~~/server/utils/submissionLimit'
+import { getBeijingTimeISOString } from '~/utils/timeUtils'
+import { moderateSubmissionNote } from '~~/server/utils/submissionNoteAutoModeration'
+import { normalizeCoverUrl } from '~~/server/utils/url'
 
 export default defineEventHandler(async (event) => {
+  // 检查用户认证
   const user = event.context.user
 
   if (!user) {
-    throw createApiError(401, 'SONG_LOGIN_REQUIRED_REQUEST', '需要登录才能点歌')
+    throw createError({
+      statusCode: 401,
+      message: '需要登录才能点歌'
+    })
   }
 
   const body = await readBody(event)
 
-  return await requestSongForUser(event, user, body)
+  if (!body.title || !body.artist) {
+    throw createError({
+      statusCode: 400,
+      message: '歌曲名称和艺术家不能为空'
+    })
+  }
+
+  try {
+    // 标准化字符串用于精确匹配
+    const normalizeForMatch = (str: string): string => {
+      return str
+        .toLowerCase()
+        .replace(/[\s\-_\(\)\[\]【】（）「」『』《》〈〉""''""''、，。！？：；～·]/g, '')
+        .replace(/[&＆]/g, 'and')
+        .replace(/[feat\.?|ft\.?]/gi, '')
+        .trim()
+    }
+
+    const normalizedTitle = normalizeForMatch(body.title)
+    const normalizedArtist = normalizeForMatch(body.artist)
+
+    // 获取当前学期
+    const currentSemester = await getCurrentSemesterName()
+
+    // 哔哩哔哩平台判定逻辑
+    const isBilibili =
+      body.musicPlatform === 'bilibili' ||
+      String(body.musicId || '').startsWith('BV') ||
+      String(body.musicId || '').startsWith('av')
+
+    // 对于哔哩哔哩平台，如果有 musicId，使用 musicId 进行精确匹配
+    if (isBilibili && body.musicId) {
+      // 构建完整的 musicId（包含分P信息）
+      let fullMusicId = String(body.musicId)
+      const bvId = fullMusicId.split(':')[0]
+
+      if (body.bilibiliCid) {
+        const musicIdParts = [bvId, body.bilibiliCid]
+        if (body.bilibiliPage && Number(body.bilibiliPage) > 1) {
+          musicIdParts.push(String(body.bilibiliPage))
+        }
+        fullMusicId = musicIdParts.join(':')
+      }
+
+      // 检查是否已有相同 musicId 的歌曲
+      const existingSongs = await db
+        .select({
+          id: songs.id,
+          musicId: songs.musicId,
+          played: songs.played
+        })
+        .from(songs)
+        .where(
+          and(
+            eq(songs.semester, currentSemester),
+            eq(songs.musicPlatform, 'bilibili'),
+            eq(songs.musicId, fullMusicId)
+          )
+        )
+
+      if (existingSongs.length > 0) {
+        const isSuperAdmin = user.role === 'SUPER_ADMIN'
+        const hasUnplayedDuplicate = existingSongs.some((s) => !s.played)
+        if (!isSuperAdmin || hasUnplayedDuplicate) {
+          throw createError({
+            statusCode: 400,
+            message: `《${body.title}》已经在列表中，不能重复投稿`
+          })
+        }
+      }
+    } else {
+      // 对于其他平台，使用标题和艺术家进行匹配
+      const allSongs = await db
+        .select({
+          id: songs.id,
+          title: songs.title,
+          artist: songs.artist,
+          semester: songs.semester,
+          played: songs.played
+        })
+        .from(songs)
+        .where(eq(songs.semester, currentSemester))
+
+      const matchingSongs = allSongs.filter((song) => {
+        const songTitle = normalizeForMatch(song.title)
+        const songArtist = normalizeForMatch(song.artist)
+        return songTitle === normalizedTitle && songArtist === normalizedArtist
+      })
+
+      if (matchingSongs.length > 0) {
+        const isSuperAdmin = user.role === 'SUPER_ADMIN'
+        const hasUnplayedDuplicate = matchingSongs.some((s) => !s.played)
+        if (!isSuperAdmin || hasUnplayedDuplicate) {
+          throw createError({
+            statusCode: 400,
+            message: `《${body.title}》已经在列表中，不能重复投稿`
+          })
+        }
+      }
+    }
+
+    // 检查投稿限额（管理员不受限制）
+    const systemSettingsResult = await db.select().from(systemSettings).limit(1)
+    const systemSettingsData = systemSettingsResult[0]
+    const isAdmin = user.role === 'SUPER_ADMIN' || user.role === 'ADMIN'
+
+    // 加载自动审查需要的黑名单（KEYWORD / LANGUAGE / GENRE）
+    let moderationBlacklists: any[] = []
+    try {
+      moderationBlacklists = await db
+        .select()
+        .from(songBlacklists)
+        .where(inArray(songBlacklists.type, ['KEYWORD', 'LANGUAGE', 'GENRE']))
+    } catch (err) {
+      console.warn('[Request API] 加载自动审查黑名单失败，将跳过自动审查:', err)
+      moderationBlacklists = []
+    }
+
+    // 1. 检查强制关闭
+    if (systemSettingsData?.forceBlockAllRequests && !isAdmin) {
+      throw createError({
+        statusCode: 403,
+        message: '投稿功能已关闭'
+      })
+    }
+
+    // 2. 检查投稿时段限制
+    let hitRequestTime: any = null
+    if (systemSettingsData?.enableRequestTimeLimitation && !isAdmin) {
+      // 使用 ISO 字符串格式进行比较，确保数据库能够正确处理
+      const currentTime = getBeijingTimeISOString()
+
+      const hitRequestTimeResult = await db
+        .select()
+        .from(requestTimes)
+        .where(
+          and(
+            lte(requestTimes.startTime, currentTime),
+            gt(requestTimes.endTime, currentTime),
+            eq(requestTimes.enabled, true)
+          )
+        )
+        .limit(1)
+
+      hitRequestTime = hitRequestTimeResult[0]
+
+      if (!hitRequestTime) {
+        throw createError({
+          statusCode: 403,
+          message: '当前不在投稿开放时段'
+        })
+      }
+
+      if (hitRequestTime.expected > 0 && hitRequestTime.accepted >= hitRequestTime.expected) {
+        throw createError({
+          statusCode: 403,
+          message: `当前时段投稿名额已满（${hitRequestTime.accepted}/${hitRequestTime.expected}）`
+        })
+      }
+    }
+
+    // 确定生效的限额类型（三选一逻辑）
+    let effectiveLimit: number | null = null
+    let limitType: 'daily' | 'weekly' | 'monthly' | null = null
+
+    if (systemSettingsData?.enableSubmissionLimit && !isAdmin) {
+      const dailyLimit = systemSettingsData.dailySubmissionLimit
+      const weeklyLimit = systemSettingsData.weeklySubmissionLimit
+      const monthlyLimit = systemSettingsData.monthlySubmissionLimit
+
+      if (dailyLimit !== null && dailyLimit !== undefined) {
+        effectiveLimit = dailyLimit
+        limitType = 'daily'
+      } else if (weeklyLimit !== null && weeklyLimit !== undefined) {
+        effectiveLimit = weeklyLimit
+        limitType = 'weekly'
+      } else if (monthlyLimit !== null && monthlyLimit !== undefined) {
+        effectiveLimit = monthlyLimit
+        limitType = 'monthly'
+      }
+
+      // 如果生效的限额为0，则关闭投稿
+      if (effectiveLimit === 0) {
+        throw createError({
+          statusCode: 403,
+          message: '投稿功能已关闭'
+        })
+      }
+
+      // 如果有生效的限额且大于0，检查使用量
+      // 注意：这里仅作初步检查，严格检查在事务内进行
+    }
+
+    // 检查期望的播出时段是否存在
+    let preferredPlayTime = null
+    if (body.preferredPlayTimeId) {
+      // 检查系统设置是否允许选择播出时段
+      if (!systemSettingsData?.enablePlayTimeSelection) {
+        throw createError({
+          statusCode: 400,
+          message: '播出时段选择功能未启用'
+        })
+      }
+
+      // 检查播出时段是否存在且已启用
+      const playTimeResult = await db
+        .select()
+        .from(playTimes)
+        .where(and(eq(playTimes.id, body.preferredPlayTimeId), eq(playTimes.enabled, true)))
+        .limit(1)
+      preferredPlayTime = playTimeResult[0]
+
+      if (!preferredPlayTime) {
+        throw createError({
+          statusCode: 400,
+          message: '选择的播出时段不存在或未启用'
+        })
+      }
+    }
+
+    const rawSubmissionNote = typeof body.submissionNote === 'string' ? body.submissionNote.trim() : ''
+    if (rawSubmissionNote.length > 300) {
+      throw createError({
+        statusCode: 400,
+        message: '备注留言不能超过300个字符'
+      })
+    }
+    const submissionNote =
+      systemSettingsData?.enableSubmissionRemarks && rawSubmissionNote ? rawSubmissionNote : null
+    const rawSubmissionNotePublic = submissionNote !== null ? body.submissionNotePublic !== false : false
+    const requiresApproval = Boolean(systemSettingsData?.submissionNoteRequiresApproval)
+
+    let finalSubmissionNotePublic = rawSubmissionNotePublic
+    let submissionNotePublicStatus: string | null = null
+
+    if (submissionNote && rawSubmissionNotePublic && requiresApproval) {
+      const mod = moderateSubmissionNote(
+        submissionNote,
+        rawSubmissionNotePublic,
+        requiresApproval,
+        { title: body.title, artist: body.artist, genre: body.genre || null },
+        moderationBlacklists
+      )
+      finalSubmissionNotePublic = mod.notePublic
+      submissionNotePublicStatus = mod.publicStatus
+      if (mod.rejectedReasons.length > 0) {
+        console.log(
+          `[Request API] 投稿留言自动审查未通过，歌曲=${body.title} - ${body.artist}，原因:`,
+          mod.rejectedReasons
+        )
+      }
+    } else if (submissionNote) {
+      // 没开自动审查，也记录一下状态
+      submissionNotePublicStatus = null
+    }
+
+    const submissionNotePublic = finalSubmissionNotePublic
+
+    // 准备发送通知的列表
+    const notificationsToSend: { userId: number; songId: number; songTitle: string }[] = []
+
+    // 创建歌曲和更新状态（使用事务）
+    const song = await db.transaction(async (tx) => {
+      // 检查投稿限额（在事务内进行，防止并发绕过限制）
+      if (
+        systemSettingsData?.enableSubmissionLimit &&
+        !isAdmin &&
+        effectiveLimit &&
+        effectiveLimit > 0 &&
+        limitType
+      ) {
+        if (await isLimitReached(tx, user.id, limitType, effectiveLimit)) {
+          const labelMap: Record<string, string> = { daily: '每日', weekly: '每周', monthly: '每月' }
+          const timeMap: Record<string, string> = { daily: '今日', weekly: '本周', monthly: '本月' }
+
+          throw createError({
+            statusCode: 400,
+            message: `${labelMap[limitType]}投稿限额为${effectiveLimit}首，您${timeMap[limitType]}已达到限额`
+          })
+        }
+      }
+
+      // 如果有时段限制，再次检查并更新已接纳数量
+      if (hitRequestTime) {
+        const latestRequestTimeResult = await tx
+          .select()
+          .from(requestTimes)
+          .where(eq(requestTimes.id, hitRequestTime.id))
+          .limit(1)
+        const latestRequestTime = latestRequestTimeResult[0]
+
+        if (!latestRequestTime || !latestRequestTime.enabled) {
+          throw createError({ statusCode: 403, message: '投稿时段已失效' })
+        }
+
+        // 使用原子更新确保并发安全
+        const updateResult = await tx
+          .update(requestTimes)
+          .set({
+            accepted: sql`${requestTimes.accepted} + 1`
+          })
+          .where(
+            and(
+              eq(requestTimes.id, hitRequestTime.id),
+              // 如果有限额，确保更新时未超限（针对 expected > 0 的情况）
+              latestRequestTime.expected > 0
+                ? lt(requestTimes.accepted, latestRequestTime.expected)
+                : undefined
+            )
+          )
+          .returning()
+
+        if (updateResult.length === 0) {
+          throw createError({ statusCode: 403, message: '当前时段投稿名额已满' })
+        }
+      }
+
+      if (!body.expectedPlayDate || body.expectedPlaySequence === undefined || body.expectedPlaySequence === null) {
+        throw createError({ statusCode: 400, message: '请选择期望播出日期与期望播放序号' })
+      }
+
+      // 检查 expectedPlaySequence 是否已被占用
+      if (body.expectedPlayDate && body.expectedPlaySequence !== undefined && body.expectedPlaySequence !== null) {
+        const expectedSequence = Number(body.expectedPlaySequence)
+        const occupiedCheck = await tx
+          .select({ id: songs.id })
+          .from(songs)
+          .where(
+            and(
+              eq(songs.expectedPlayDate, body.expectedPlayDate),
+              eq(songs.expectedPlaySequence, expectedSequence),
+              eq(songs.played, false) // 只有未播放的才算被占用
+            )
+          )
+          .limit(1)
+
+        if (occupiedCheck.length > 0) {
+          throw createError({
+            statusCode: 400,
+            message: `日期 ${body.expectedPlayDate} 的第 ${expectedSequence} 序号已被占用，请选择其他序号`
+          })
+        }
+      }
+
+      // 创建歌曲
+      let finalMusicId = body.musicId ? String(body.musicId) : null
+
+      // 如果是 Bilibili 平台，处理 musicId 格式
+      if (isBilibili) {
+        const bvId = finalMusicId?.split(':')[0]
+        if (bvId) {
+          const musicIdParts = [bvId]
+          if (body.bilibiliCid) {
+            musicIdParts.push(body.bilibiliCid)
+            if (body.bilibiliPage && Number(body.bilibiliPage) > 1) {
+              musicIdParts.push(String(body.bilibiliPage))
+            }
+          }
+          finalMusicId = musicIdParts.join(':')
+        }
+      }
+
+      const normalizedCover = normalizeCoverUrl(body.cover, `request-song:${body.title || ''}`)
+
+      const songResult = await tx
+        .insert(songs)
+        .values({
+          title: body.title,
+          artist: body.artist,
+          singer: body.artist,
+          requesterId: user.id,
+          preferredPlayTimeId: preferredPlayTime?.id || null,
+          semester: currentSemester, // 使用外部获取的学期名称
+          cover: normalizedCover,
+          coverUrl: normalizedCover,
+          musicPlatform: isBilibili ? 'bilibili' : (body.musicPlatform || null),
+          musicId: finalMusicId,
+          kgHash: body.musicPlatform === 'kugou' ? body.musicId : null,
+          playUrl: body.playUrl || null,
+          submissionNote,
+          submissionNotePublic,
+          submissionNotePublicStatus,
+          hitRequestId: hitRequestTime?.id || null,
+          expectedPlayDate: body.expectedPlayDate || null,
+          expectedPlaySequence: body.expectedPlaySequence !== undefined ? Number(body.expectedPlaySequence) : null
+        })
+        .returning()
+      const newSong = songResult[0]
+
+      // 处理联合投稿人
+      if (
+        body.collaborators &&
+        Array.isArray(body.collaborators) &&
+        body.collaborators.length > 0
+      ) {
+        // 去重
+        const uniqueCollaboratorIds = [...new Set(body.collaborators.map((id: any) => Number(id)))]
+
+        for (const collaboratorId of uniqueCollaboratorIds) {
+          // 跳过自己或无效ID
+          if (isNaN(collaboratorId) || collaboratorId === user.id) continue
+
+          try {
+            // 检查是否已经是联合投稿人
+            const existingCollab = await tx
+              .select()
+              .from(songCollaborators)
+              .where(
+                and(
+                  eq(songCollaborators.songId, newSong.id),
+                  eq(songCollaborators.userId, collaboratorId)
+                )
+              )
+              .limit(1)
+
+            if (existingCollab.length > 0) continue
+
+            // 创建联合投稿记录
+            const collabResult = await tx
+              .insert(songCollaborators)
+              .values({
+                songId: newSong.id,
+                userId: collaboratorId,
+                status: 'PENDING'
+              })
+              .returning()
+
+            const collab = collabResult[0]
+
+            // 记录审计日志
+            await tx.insert(collaborationLogs).values({
+              collaboratorId: collab.id,
+              action: 'INVITE',
+              operatorId: user.id,
+              ipAddress:
+                (event.node.req.headers['x-forwarded-for'] as string) ||
+                event.node.req.socket.remoteAddress
+            })
+
+            // 添加到通知列表，事务结束后发送
+            notificationsToSend.push({
+              userId: collaboratorId,
+              songId: newSong.id,
+              songTitle: newSong.title
+            })
+          } catch (err) {
+            console.error(`邀请用户 ${collaboratorId} 失败:`, err)
+          }
+        }
+      }
+
+      return newSong
+    })
+
+    // 事务提交成功后，发送通知
+    // 即使通知发送失败，也不影响点歌结果
+    for (const notification of notificationsToSend) {
+      try {
+        await createCollaborationInvitationNotification(
+          user.id,
+          notification.userId,
+          notification.songId,
+          notification.songTitle
+        )
+      } catch (error) {
+        console.error(`发送邀请通知给用户 ${notification.userId} 失败:`, error)
+      }
+    }
+
+    return song
+  } catch (error: any) {
+    console.error('点歌失败:', error)
+
+    if (error.statusCode) {
+      throw error
+    } else if (error.message === '未设置活跃学期') {
+      throw createError({
+        statusCode: 400,
+        message: '系统未设置当前活跃学期，请联系管理员'
+      })
+    } else {
+      throw createError({
+        statusCode: 500,
+        message: '点歌失败，请稍后重试'
+      })
+    }
+  }
 })
+
+// 获取当前学期名称
+async function getCurrentSemesterName() {
+  try {
+    // 获取当前活跃的学期
+    const currentSemesterResult = await db
+      .select()
+      .from(semesters)
+      .where(eq(semesters.isActive, true))
+      .limit(1)
+    const currentSemester = currentSemesterResult[0]
+
+    if (currentSemester) {
+      return currentSemester.name
+    }
+
+    // 如果没有活跃学期，抛出错误
+    throw new Error('未设置活跃学期')
+  } catch (error) {
+    console.error('获取当前学期失败:', error)
+    throw error
+  }
+}
diff --git a/server/utils/database-manager.ts b/server/utils/database-manager.ts
index a190d06..22f6fb3 100644
--- a/server/utils/database-manager.ts
+++ b/server/utils/database-manager.ts
@@ -1,10 +1,5 @@
 import { db, getConnectionStatus } from '~/drizzle/db'
 import { sql } from 'drizzle-orm'
-import {
-  getConnectionPoolStatus,
-  getDatabaseMetrics
-} from './database-health'
-import { getServerTimestamp } from './serverTime'
 
 /**
  * 数据库管理器
@@ -33,7 +28,7 @@ export class DatabaseManager {
     connectionStatus: string
     error?: string
   }> {
-    const now = getServerTimestamp()
+    const now = Date.now()
 
     // 检查缓存
     if (this.healthCheckCache && now - this.healthCheckCache.timestamp < this.CACHE_TTL) {
@@ -111,13 +106,12 @@ export class DatabaseManager {
         WHERE datname = current_database() AND state = 'active'
       `)
 
-      const sizeRow = sizeResult[0] as { database_size?: string } | undefined
-      const connectionRow = connectionStats[0] as { active_connections?: number | string } | undefined
+      const sizeRow = sizeResult[0] as any
+      const connectionRow = connectionStats[0] as any
 
       return {
         databaseSize: sizeRow?.database_size || 'Unknown',
-        activeConnections:
-          Number.parseInt(String(connectionRow?.active_connections ?? '0'), 10) || 0,
+        activeConnections: parseInt(connectionRow?.active_connections) || 0,
         serverless: true // Neon Database 是无服务器架构
       }
     } catch (error) {
@@ -132,69 +126,35 @@ export class DatabaseManager {
    * 获取连接状态 - 适配 Neon Database 无服务器架构
    */
   async getConnectionStatus(): Promise<{
-    connected: boolean
     status: string
     activeConnections: number
     serverlessMode: boolean
     autoSuspend: boolean
-    error: string | null
   }> {
     try {
       const connectionStatus = await getConnectionStatus()
 
-      // 用最小查询判断真实连通性，避免底层连接对象状态或统计查询误判。
-      await db.execute(sql`SELECT 1 as connection_check`)
-
       // 获取当前活跃连接数
-      let activeConnections = 0
-      try {
-        const connectionStats = await db.execute(sql`
-          SELECT count(*) as active_connections
-          FROM pg_stat_activity
-          WHERE datname = current_database() AND state = 'active'
-        `)
+      const connectionStats = await db.execute(sql`
+        SELECT count(*) as active_connections
+        FROM pg_stat_activity
+        WHERE datname = current_database() AND state = 'active'
+      `)
 
-        const connRow = connectionStats[0] as { active_connections?: number | string } | undefined
-        activeConnections = Number.parseInt(String(connRow?.active_connections ?? '0'), 10) || 0
-      } catch (metricsError) {
-        console.warn('Failed to get active connection count:', metricsError)
-      }
+      const connRow = connectionStats[0] as any
 
       return {
-        connected: true,
-        status: connectionStatus.status || 'connected',
-        activeConnections,
+        status: connectionStatus.status,
+        activeConnections: parseInt(connRow?.active_connections) || 0,
         serverlessMode: true, // Neon Database 是无服务器架构
-        autoSuspend: true, // 支持自动暂停
-        error: null
+        autoSuspend: true // 支持自动暂停
       }
     } catch (error) {
       console.error('Failed to get connection status:', error)
-      return {
-        connected: false,
-        status: 'error',
-        activeConnections: 0,
-        serverlessMode: true,
-        autoSuspend: true,
-        error: error instanceof Error ? error.message : 'Failed to retrieve connection status'
-      }
+      throw new Error('Failed to retrieve connection status')
     }
   }
 
-  /**
-   * 获取连接池状态
-   */
-  async getConnectionPoolStatus() {
-    return await getConnectionPoolStatus()
-  }
-
-  /**
-   * 获取数据库性能指标
-   */
-  async getPerformanceMetrics() {
-    return await getDatabaseMetrics()
-  }
-
   /**
    * 批量清理过期会话
    */
@@ -206,8 +166,7 @@ export class DatabaseManager {
       `)
 
       // postgres-js returns count in the result array object properties
-      const deleteResult = result as { count?: number | string }
-      return Number.parseInt(String(deleteResult.count ?? '0'), 10) || 0
+      return (result as any).count || 0
     } catch (error) {
       console.error('Failed to cleanup expired sessions:', error)
       throw new Error('Failed to cleanup expired sessions')
diff --git a/tailwind.config.ts b/tailwind.config.ts
new file mode 100644
index 0000000..444aa45
--- /dev/null
+++ b/tailwind.config.ts
@@ -0,0 +1,37 @@
+import type { Config } from 'tailwindcss'
+
+export default <Config>{
+  darkMode: 'class',
+  content: [
+    './app/components/**/*.{js,vue,ts}',
+    './app/layouts/**/*.vue',
+    './app/pages/**/*.vue',
+    './app/plugins/**/*.{js,ts}',
+    './app/app.vue',
+    './app/error.vue'
+  ],
+  theme: {
+    extend: {
+      colors: {
+        primary: 'var(--primary)',
+        success: 'var(--success)',
+        warning: 'var(--warning)',
+        error: 'var(--error)',
+        info: 'var(--info)',
+        text: {
+          primary: 'var(--text-primary)',
+          secondary: 'var(--text-secondary)',
+          tertiary: 'var(--text-tertiary)',
+          quaternary: 'var(--text-quaternary)',
+          disabled: 'var(--text-disabled)'
+        },
+        surface: {
+          DEFAULT: 'var(--bg-primary)',
+          muted: 'var(--bg-secondary)',
+          elevated: 'var(--bg-tertiary)'
+        }
+      }
+    }
+  },
+  plugins: []
+}