Merge branch 'dev'

# Conflicts:
#	backend/internal/modules/payment/payment_start.go
#	deploy/docker-compose.dev.yml
#	frontend/src/features/admin/AdminPaymentsPage.tsx
#	scripts/dev.sh

deploy/caddy/Caddyfile

@@ -102,9 +102,13 @@ www.{$CADDY_DOMAIN} {
 # 解忧商行主站。
 {$CADDY_DOMAIN} {
 	# 主站后台隐藏入口只在本域名提供静态资源；分销站点域名由 storefront 片段统一 404。
+	@main_admin_root path {$ADMIN_BASE_PATH:/console-jy8k3m}
+	redir @main_admin_root {$ADMIN_BASE_PATH:/console-jy8k3m}/ 308
+
 	@main_admin path {$ADMIN_BASE_PATH:/console-jy8k3m} {$ADMIN_BASE_PATH:/console-jy8k3m}/*
 	handle @main_admin {
-		root * /srv/dist
+		uri strip_prefix {$ADMIN_BASE_PATH:/console-jy8k3m}
+		root * /srv/admin
 		try_files {path} /index.html
 		file_server
 	}

deploy/caddy/Dockerfile

@@ -16,7 +16,20 @@ RUN --mount=type=cache,target=/root/.npm \
 COPY frontend/ .
 RUN npm run build
 
-# 第二套独立分销管理后台（React + Ant Design）
+# 独立管理后台（Vue + Element Plus，沿用旧站完整后台）
+FROM node:24-alpine AS admin-build
+
+ARG VITE_ADMIN_BASE_PATH=/console-jy8k3m
+ENV VITE_ADMIN_BASE_PATH=${VITE_ADMIN_BASE_PATH}
+
+WORKDIR /src
+COPY admin-web/package*.json ./
+RUN --mount=type=cache,target=/root/.npm \
+    npm ci --prefer-offline --no-audit --fund=false
+COPY admin-web/ .
+RUN npm run build
+
+# 独立分销管理后台（React + Ant Design）
 FROM node:24-alpine AS distribution-build
 WORKDIR /src
 COPY distribution-admin/package*.json ./
@@ -29,6 +42,7 @@ RUN npm run build
 FROM caddy:2.10-alpine
 
 COPY --from=build /src/dist /srv/dist
+COPY --from=admin-build /src/dist /srv/admin
 # show-dist 由 deploy-prod.sh 在 build 前准备（hfb_show 构建产物或占位页）
 COPY deploy/caddy/show-dist /srv/show-dist
 COPY --from=distribution-build /src/dist /srv/distribution-admin