chore(merge): 将 develop 同步到 release/v1.0.0

src/App.vue

@@ -22,7 +22,6 @@ appStore.initTheme()
 <template>
   <ConfigGlobal :size="currentSize">
     <RouterView :class="greyMode ? `${prefixCls}-grey-mode` : ''" />
-    <footer class="app-copyright">© FruitShorts</footer>
   </ConfigGlobal>
 </template>
 
@@ -49,15 +48,4 @@ body {
 .@{prefix-cls}-grey-mode {
   filter: grayscale(100%);
 }
-
-.app-copyright {
-  position: fixed;
-  right: 20px;
-  bottom: 10px;
-  z-index: 5;
-  font-size: 12px;
-  line-height: 1;
-  color: var(--el-text-color-secondary, #909399);
-  pointer-events: none;
-}
 </style>

src/api/admin/appUser.ts

@@ -11,8 +11,6 @@ export interface AppUserPageParams {
   status?: string
   countryCode?: string
   registerSource?: string
-  /** 客户端平台：ANDROID / IOS / WEB */
-  platform?: string
 }
 
 export interface WatchHistoryPageParams {
@@ -23,8 +21,6 @@ export interface WatchHistoryPageParams {
   dramaTitle?: string
   dramaId?: number
   episodeId?: number
-  /** 客户端平台：ANDROID / IOS / WEB */
-  platform?: string
   source?: string
   finished?: boolean
   startTime?: string

src/api/admin/appVersion.ts

@@ -1,69 +0,0 @@
-// Author: fruit.com.cn
-
-import request from '@/axios'
-
-export interface AppVersionItem {
-  id: string
-  platform: 'ANDROID' | 'IOS'
-  platformText: string
-  versionCode: number
-  versionName: string
-  downloadUrl: string
-  updateContent?: string
-  forceUpdate: number
-  minSupportedCode: number
-  status: number
-  statusText: string
-  releasedAt?: string
-  createdAt?: string
-}
-
-export interface AppVersionSaveData {
-  platform: 'ANDROID' | 'IOS'
-  versionCode: number
-  versionName: string
-  downloadUrl: string
-  updateContent?: string
-  forceUpdate?: 0 | 1
-  minSupportedCode?: number
-}
-
-export const listAppVersionsApi = (params: {
-  pageIndex?: number
-  pageSize?: number
-  platform?: string
-  status?: number
-  keyword?: string
-}) => {
-  return request.get<{ total: number; list: AppVersionItem[] }>({
-    url: '/admin/app-versions/page',
-    params
-  })
-}
-
-export const getAppVersionApi = (id: string | number) => {
-  return request.get<AppVersionItem>({ url: `/admin/app-versions/${id}` })
-}
-
-export const createAppVersionApi = (data: AppVersionSaveData) => {
-  return request.post<string>({ url: '/admin/app-versions', data })
-}
-
-export const batchCreateAppVersionsApi = (data: AppVersionSaveData[]) => {
-  return request.post<string[]>({ url: '/admin/app-versions/batch', data })
-}
-
-export const updateAppVersionApi = (id: string | number, data: AppVersionSaveData) => {
-  return request.post<void>({ url: `/admin/app-versions/${id}`, data })
-}
-
-export const updateAppVersionStatusApi = (id: string | number, status: 0 | 1) => {
-  return request.post<void>({
-    url: `/admin/app-versions/${id}/status`,
-    params: { status }
-  })
-}
-
-export const deleteAppVersionApi = (id: string | number) => {
-  return request.delete<void>({ url: `/admin/app-versions/${id}` })
-}

src/api/admin/contentTag.ts

@@ -1,41 +0,0 @@
-// Author: fruit.com.cn
-
-import request from '@/axios'
-
-export interface ContentTagItem {
-  id: number
-  name: string
-  nameEn: string
-  nameId: string
-  locales?: Record<string, string>
-  bgColor?: string
-  sort: number
-  status: number
-}
-
-export interface ContentTagSaveData {
-  name: string
-  locales: Record<string, string>
-  bgColor?: string
-  sort?: number
-  status?: number
-}
-
-export const listContentTagsApi = (enabledOnly = false) => {
-  return request.get<ContentTagItem[]>({
-    url: '/admin/content-tags',
-    params: enabledOnly ? { enabledOnly: true } : undefined
-  })
-}
-
-export const createContentTagApi = (data: ContentTagSaveData) => {
-  return request.post<number>({ url: '/admin/content-tags', data })
-}
-
-export const updateContentTagApi = (id: number, data: ContentTagSaveData) => {
-  return request.put<void>({ url: `/admin/content-tags/${id}`, data })
-}
-
-export const deleteContentTagApi = (id: number) => {
-  return request.delete<void>({ url: `/admin/content-tags/${id}` })
-}

src/api/admin/dashboard.ts

@@ -27,28 +27,6 @@ export interface TranscodeBoard {
   notes: string[]
 }
 
-/** 近 7 天每日趋势（给折线图用）。 */
-export interface DashboardTrend {
-  dates: string[]
-  newUsers: number[]
-  playEvents: number[]
-  newTranscodes: number[]
-  transcodeSuccess: number[]
-}
-
-/** 分布项（给饼图用）。 */
-export interface DistributionItem {
-  label: string
-  value: number
-}
-
-export interface DashboardDistribution {
-  dramaStatus: Record<string, number>
-  transcodeStatus: Record<string, number>
-  episodeMedia: Record<string, number>
-  pendingModeration: DistributionItem[]
-}
-
 export const getDashboardOverviewApi = () => {
   return request.get<DashboardOverview>({ url: '/admin/dashboard/overview' })
 }
@@ -56,11 +34,3 @@ export const getDashboardOverviewApi = () => {
 export const getTranscodeBoardApi = () => {
   return request.get<TranscodeBoard>({ url: '/admin/dashboard/transcode' })
 }
-
-export const getDashboardTrendApi = () => {
-  return request.get<DashboardTrend>({ url: '/admin/dashboard/trend' })
-}
-
-export const getDashboardDistributionApi = () => {
-  return request.get<DashboardDistribution>({ url: '/admin/dashboard/distribution' })
-}

src/api/admin/drama.ts

@@ -52,7 +52,6 @@ export const listDramaCategoryOptionsApi = () => {
 
 export interface DramaCategorySaveData {
   name: string
-  locales: Record<string, string>
   sort?: number
   status?: number
 }

src/api/admin/dramaClassification.ts

@@ -6,9 +6,6 @@ import type { PageResult } from './types'
 export interface DramaClassificationItem {
   id: number
   name: string
-  nameEn: string
-  nameId: string
-  locales?: Record<string, string>
   sort: number
   status: number
   dramaCount: number
@@ -17,7 +14,6 @@ export interface DramaClassificationItem {
 
 export interface DramaClassificationSaveData {
   name: string
-  locales: Record<string, string>
   sort?: number
   status?: number
 }

src/api/admin/dramaPlaylistCategory.ts

@@ -7,13 +7,7 @@ import type { ClassificationDramaItem } from './dramaClassification'
 export interface DramaPlaylistCategoryItem {
   id: number
   name: string
-  nameEn: string
-  nameId: string
   description: string
-  descriptionEn: string
-  descriptionId: string
-  locales?: Record<string, string>
-  descriptionLocales?: Record<string, string>
   sort: number
   status: number
   dramaCount: number
@@ -21,8 +15,7 @@ export interface DramaPlaylistCategoryItem {
 
 export interface DramaPlaylistCategorySaveData {
   name: string
-  locales: Record<string, string>
+  description?: string
-  descriptionLocales?: Record<string, string>
   sort?: number
   status?: number
 }

src/api/admin/engagement.ts

@@ -1,54 +0,0 @@
-// Author: fruit.com.cn
-
-import request from '@/axios'
-import type { PageResult } from './types'
-
-/** 收藏与点赞只读分页筛选条件。 */
-export interface EngagementPageParams {
-  pageIndex?: number
-  pageSize?: number
-  keyword?: string
-  userId?: string | number
-  deviceId?: string
-  /** 客户端平台：ANDROID / IOS / WEB */
-  platform?: string
-  dramaId?: string | number
-  dramaTitle?: string
-  targetType?: string
-  targetId?: string | number
-  episodeId?: string | number
-  startTime?: string
-  endTime?: string
-}
-
-/** 后台互动列表行。 */
-export interface EngagementItem {
-  id: string
-  userId: string | null
-  uid: string | null
-  nickname: string | null
-  deviceId: string | null
-  /** 客户端平台 ANDROID / IOS / WEB；老客户端未上报时为空。 */
-  platform: string | null
-  anonymous: boolean
-  dramaId: string | null
-  dramaTitle: string | null
-  dramaCover: string | null
-  dramaStatus: string | null
-  dramaPublished: boolean | null
-  targetType: string
-  targetId: string
-  episodeId: string | null
-  episodeNo: number | null
-  episodeTitle: string | null
-  commentSummary: string | null
-  createdAt: string
-}
-
-/** 查询收藏分页。 */
-export const pageFavoritesApi = (params: EngagementPageParams) =>
-  request.get<PageResult<EngagementItem>>({ url: '/admin/favorites/page', params })
-
-/** 查询点赞分页。 */
-export const pageLikesApi = (params: EngagementPageParams) =>
-  request.get<PageResult<EngagementItem>>({ url: '/admin/likes/page', params })

src/api/admin/transcode.ts

@@ -1,12 +1,7 @@
 // Author: fruit.com.cn
 
 import request from '@/axios'
-import type {
+import type { EpisodeTranscodeItem, MediaThumbnailResult, TranscodeTriggerResult } from './types'
-  EpisodeTranscodeItem,
-  MediaThumbnailResult,
-  TranscodeBackfillResult,
-  TranscodeTriggerResult
-} from './types'
 
 /** 分集编辑页聚合查询转码任务、清晰度与帧图。 */
 export const getEpisodeTranscodeApi = (episodeId: number | string) => {
@@ -33,11 +28,3 @@ export const triggerMediaTranscodeApi = (mediaAssetId: string) => {
     url: `/admin/media/${mediaAssetId}/transcode`
   })
 }
-
-/** 手动补齐转码：扫描缺码率产物/帧图的分集并入队。 */
-export const runTranscodeBackfillApi = (batchSize?: number) => {
-  return request.post<TranscodeBackfillResult>({
-    url: '/admin/media/transcode/backfill',
-    params: batchSize ? { batchSize } : undefined
-  })
-}

src/api/admin/transcodeNotice.ts

@@ -1,27 +0,0 @@
-// Author: fruit.com.cn
-
-import request from '@/axios'
-
-export interface TranscodeNoticeItem {
-  id: number
-  status: string
-  dramaTitle: string
-  episodeNo?: number
-  episodeTitle?: string
-  progress?: number
-  errorMsg?: string
-  updatedAt?: string
-}
-
-export interface TranscodeNotice {
-  running: number
-  success: number
-  failed: number
-  runningList: TranscodeNoticeItem[]
-  successList: TranscodeNoticeItem[]
-  failedList: TranscodeNoticeItem[]
-}
-
-export const getTranscodeNoticesApi = () => {
-  return request.get<TranscodeNotice>({ url: '/admin/notifications/transcode' })
-}

src/api/admin/types.ts

@@ -8,9 +8,6 @@ export interface PageResult<T> {
 export interface DramaCategory {
   id: number
   name: string
-  nameEn?: string
-  nameId?: string
-  locales?: Record<string, string>
   sort?: number
   status?: number
   /** 该类型下的短剧数量，管理列表才有 */
@@ -324,16 +321,6 @@ export interface TranscodeTriggerResult {
   status: string
 }
 
-export interface TranscodeBackfillItem {
-  episodeId: string
-  taskId: string
-}
-
-export interface TranscodeBackfillResult {
-  triggered: number
-  items: TranscodeBackfillItem[]
-}
-
 export interface BannerItem {
   id: number
   imageUrl: string

src/constants/contentLanguages.ts

@@ -1,46 +0,0 @@
-// Author: fruit.com.cn
-
-export interface ContentLanguage {
-  code: string
-  label: string
-}
-
-export const CONTENT_LANGUAGES: ContentLanguage[] = [
-  { code: 'zh', label: '中文' },
-  { code: 'en', label: '英文' },
-  { code: 'id', label: '印尼语' }
-]
-
-export function languageLabel(code: string) {
-  return CONTENT_LANGUAGES.find((item) => item.code === code)?.label || code
-}
-
-export function languageCodes(locales?: Record<string, string> | null) {
-  const source = locales || {}
-  return CONTENT_LANGUAGES.map((item) => item.code).filter((code) => source[code])
-}
-
-export function localesFromColumns(
-  locales: Record<string, string> | null | undefined,
-  zh?: string,
-  en?: string,
-  id?: string
-) {
-  if (locales && Object.keys(locales).length) {
-    return { ...locales }
-  }
-  const result: Record<string, string> = {}
-  if (zh) result.zh = zh
-  if (en) result.en = en
-  if (id) result.id = id
-  if (!result.zh) result.zh = ''
-  return result
-}
-
-export function payloadLocales(locales: Record<string, string>, codes: string[]) {
-  const result: Record<string, string> = {}
-  codes.forEach((code) => {
-    result[code] = String(locales[code] || '').trim()
-  })
-  return result
-}

src/layout/components/ToolHeader.vue

@@ -6,7 +6,6 @@ import { Collapse } from '@/components/Collapse'
 import { LocaleDropdown } from '@/components/LocaleDropdown'
 import { SizeDropdown } from '@/components/SizeDropdown'
 import { UserInfo } from '@/components/UserInfo'
-import TranscodeNoticeButton from './TranscodeNoticeButton.vue'
 import { Screenfull } from '@/components/Screenfull'
 import { Breadcrumb } from '@/components/Breadcrumb'
 import { useAppStore } from '@/store/modules/app'
@@ -74,7 +73,6 @@ export default defineComponent({
               color="var(--top-header-text-color)"
             ></LocaleDropdown>
           ) : undefined}
-          <TranscodeNoticeButton color="var(--top-header-text-color)"></TranscodeNoticeButton>
           <UserInfo></UserInfo>
         </div>
       </div>
@@ -97,7 +95,7 @@ export default defineComponent({
   }
 }
 
-@media (width <= 768px) {
+@media (max-width: 768px) {
   .@{prefix-cls} {
     padding-right: 8px;
     padding-left: 8px;

src/layout/components/TranscodeNoticeButton.vue

@@ -1,89 +0,0 @@
-<!-- Author: fruit.com.cn -->
-<!-- 顶栏转码通知：角标汇总转码中、成功、失败，点击进入通知页。 -->
-
-<script setup lang="ts">
-import { computed, onBeforeUnmount, onMounted, ref } from 'vue'
-import { useRouter } from 'vue-router'
-import { Bell } from '@element-plus/icons-vue'
-import { getTranscodeNoticesApi } from '@/api/admin/transcodeNotice'
-import { TRANSCODE_NOTICE_SEEN, unreadCounts } from '@/utils/transcodeNoticeSeen'
-
-const POLL_MS = 30000
-const BADGE_MAX = 99
-
-defineProps<{ color?: string }>()
-const router = useRouter()
-const running = ref(0)
-const success = ref(0)
-const failed = ref(0)
-const seenTick = ref(0)
-let timer = 0
-
-const total = computed(() => {
-  seenTick.value
-  const unread = unreadCounts({
-    running: running.value,
-    success: success.value,
-    failed: failed.value
-  })
-  return unread.running + unread.success + unread.failed
-})
-
-async function refresh() {
-  const res = await getTranscodeNoticesApi()
-  running.value = Number(res.data?.running || 0)
-  success.value = Number(res.data?.success || 0)
-  failed.value = Number(res.data?.failed || 0)
-}
-
-function open() {
-  router.push({ name: 'transcode-notices' })
-}
-
-function onSeen() {
-  seenTick.value += 1
-}
-
-onMounted(() => {
-  refresh().catch(() => undefined)
-  window.addEventListener(TRANSCODE_NOTICE_SEEN, onSeen)
-  timer = window.setInterval(() => {
-    refresh().catch(() => undefined)
-  }, POLL_MS)
-})
-
-onBeforeUnmount(() => {
-  window.removeEventListener(TRANSCODE_NOTICE_SEEN, onSeen)
-  window.clearInterval(timer)
-})
-</script>
-
-<template>
-  <el-badge :value="total" :max="BADGE_MAX" :hidden="total === 0" class="notice-badge">
-    <div class="notice-button" :style="{ color }" @click="open">
-      <el-icon :size="18"><Bell /></el-icon>
-    </div>
-  </el-badge>
-</template>
-
-<style scoped>
-.notice-badge {
-  display: flex;
-  align-items: center;
-  height: 100%;
-}
-
-.notice-button {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  width: 36px;
-  height: 100%;
-  cursor: pointer;
-}
-
-.notice-badge :deep(.el-badge__content.is-fixed) {
-  top: 8px;
-  right: 2px;
-}
-</style>

src/locales/en.ts

@@ -657,11 +657,6 @@ export default {
     saveFailed: 'Failed to save transcode settings',
     loadFailed: 'Failed to load transcode settings',
     noPermission: 'This account cannot manage transcode settings',
-    backfill: 'Backfill transcodes',
-    backfillTip: 'Scan episodes missing renditions or thumbnails and enqueue them for transcoding',
-    backfillDone: 'Enqueued {count} episodes into the transcode queue',
-    backfillEmpty: 'No episodes need transcoding',
-    backfillFailed: 'Failed to run transcode backfill',
     enabled: 'Enable transcode profile',
     enabledDescription:
       'Marks whether this transcode profile is enabled; the quality ladder is still validated when saved.',

src/locales/zh-CN.ts

@@ -648,11 +648,6 @@ export default {
     saveFailed: '转码设置保存失败',
     loadFailed: '转码设置加载失败',
     noPermission: '当前账号没有转码设置权限',
-    backfill: '立即补齐转码',
-    backfillTip: '扫描缺少清晰度产物或帧图的分集并自动入队转码',
-    backfillDone: '本轮已补入 {count} 个分集进入转码队列',
-    backfillEmpty: '没有需要补转的分集',
-    backfillFailed: '补齐转码执行失败',
     enabled: '启用转码配置',
     enabledDescription: '标记当前转码配置是否启用；保存时仍会校验下方档位。',
     segmentSeconds: 'HLS 分片时长（秒）',

src/permission.ts

@@ -96,12 +96,7 @@ router.beforeEach(async (to, from, next) => {
 
       const redirectPath = from.query.redirect || to.path
       const redirect = decodeURIComponent(redirectPath as string)
-      // 只按路径重进。刷新时动态路由还没注册，先被兜底路由接住；
+      const nextData = to.path === redirect ? { ...to, replace: true } : { path: redirect }
-      // 若把当时匹配到的 name 带回去，会一直停在 404。
-      const nextData =
-        to.path === redirect
-          ? { path: to.path, query: to.query, hash: to.hash, replace: true }
-          : { path: redirect, replace: true }
       permissionStore.setIsAddRouters(true)
       next(nextData)
     }

src/router/index.ts

@@ -52,35 +52,6 @@ export const constantRouterMap: AppRouteRecordRaw[] = [
       title: '404',
       noTagsView: true
     }
-  },
-  {
-    path: '/notifications',
-    component: Layout,
-    name: 'Notifications',
-    meta: {
-      hidden: true,
-      title: '通知'
-    },
-    children: [
-      {
-        path: 'transcode',
-        name: 'transcode-notices',
-        component: () => import('@/views/common/TranscodeNoticeView.vue'),
-        meta: {
-          title: '转码通知'
-        }
-      }
-    ]
-  },
-  {
-    path: '/:pathMatch(.*)*',
-    name: 'UnresolvedPath',
-    component: () => import('@/views/Error/404.vue'),
-    meta: {
-      hidden: true,
-      title: '404',
-      noTagsView: true
-    }
   }
 ]
 
@@ -261,14 +232,7 @@ const router = createRouter({
 })
 
 export const resetRouter = (): void => {
-  const resetWhiteNameList = [
+  const resetWhiteNameList = ['Redirect', 'RedirectParent', 'Login', 'NoFind', 'Root']
-    'Redirect',
-    'RedirectParent',
-    'Login',
-    'NoFind',
-    'Root',
-    'UnresolvedPath'
-  ]
   router.getRoutes().forEach((route) => {
     const { name } = route
     if (name && !resetWhiteNameList.includes(name as string)) {

src/store/modules/app.ts

@@ -47,7 +47,7 @@ export const useAppStore = defineStore('app', {
       breadcrumb: true, // 面包屑
       breadcrumbIcon: true, // 面包屑图标
       collapse: false, // 折叠菜单
-      uniqueOpened: true, // 是否只保持一个子菜单的展开（菜单手风琴）
+      uniqueOpened: false, // 是否只保持一个子菜单的展开
       hamburger: true, // 折叠图标
       screenfull: true, // 全屏图标
       size: true, // 尺寸图标
@@ -71,9 +71,9 @@ export const useAppStore = defineStore('app', {
         // 左侧菜单边框颜色
         leftMenuBorderColor: 'inherit',
         // 左侧菜单背景颜色
-        leftMenuBgColor: '#fff',
+        leftMenuBgColor: '#001529',
         // 左侧菜单浅色背景颜色
-        leftMenuBgLightColor: '#fff',
+        leftMenuBgLightColor: '#0f2438',
         // 左侧菜单选中背景颜色
         leftMenuBgActiveColor: 'var(--app-primary-strong)',
         // 左侧菜单收起选中背景颜色
@@ -346,10 +346,8 @@ export const useAppStore = defineStore('app', {
       if (context.store.theme?.elColorPrimary !== '#c4322a') {
         context.store.setTheme({ elColorPrimary: '#c4322a' })
       }
-      // 头部主题默认强制为白色、菜单主题也强制为白色
+      context.store.setMenuTheme(context.store.theme.leftMenuBgColor)
-      // 避免老用户浏览器残留其他主题色，清缓存也能恢复到项目品牌配色
+      context.store.setHeaderTheme(context.store.theme.topHeaderBgColor)
-      context.store.setHeaderTheme('#fff')
-      context.store.setMenuTheme('#fff')
     }
   }
 })

src/styles/business/app-user-management.css

@@ -18,8 +18,7 @@
 }
 
 .app-user-toolbar .app-user-status,
-.app-user-toolbar .app-user-country,
+.app-user-toolbar .app-user-country {
-.app-user-toolbar .app-user-platform {
   width: 150px;
   flex: 0 0 150px;
 }
@@ -64,7 +63,6 @@
 .app-user-meta {
   display: flex;
   flex-direction: column;
-  align-items: flex-start;
   gap: 2px;
   min-width: 0;
 }

src/styles/var.css

@@ -6,25 +6,23 @@
 
   --left-menu-min-width: 64px;
 
-  --left-menu-bg-color: #fff;
+  --left-menu-bg-color: #17110f;
 
-  --left-menu-bg-light-color: #fff;
+  --left-menu-bg-light-color: #221815;
 
-  --left-menu-bg-active-color: rgba(196, 50, 42, 0.1);
+  --left-menu-bg-active-color: var(--app-primary-strong);
 
-  --left-menu-text-color: #333;
+  --left-menu-text-color: #d7cbc4;
 
-  --left-menu-text-active-color: var(--el-color-primary);
+  --left-menu-text-active-color: #fff;
 
-  --left-menu-border-color: #eee;
+  --left-menu-collapse-bg-active-color: var(--app-primary-strong);
-
-  --left-menu-collapse-bg-active-color: rgba(196, 50, 42, 0.1);
   /* left menu end */
 
   /* logo start */
   --logo-height: 50px;
 
-  --logo-title-text-color: #303133;
+  --logo-title-text-color: #fff;
   /* logo end */
 
   /* header start */

src/utils/transcodeNoticeSeen.ts

@@ -1,51 +0,0 @@
-// Author: fruit.com.cn
-
-const SEEN_KEY = 'transcode-notice-seen'
-
-export const TRANSCODE_NOTICE_SEEN = 'transcode-notice-seen'
-
-export interface NoticeCounts {
-  running: number
-  success: number
-  failed: number
-}
-
-/** 上次打开通知页时已经看过的数量。 */
-export function readSeen(): NoticeCounts {
-  try {
-    const raw = localStorage.getItem(SEEN_KEY)
-    if (!raw) return { running: 0, success: 0, failed: 0 }
-    const data = JSON.parse(raw) as NoticeCounts
-    return {
-      running: Number(data.running || 0),
-      success: Number(data.success || 0),
-      failed: Number(data.failed || 0)
-    }
-  } catch {
-    return { running: 0, success: 0, failed: 0 }
-  }
-}
-
-/** 比上次查看多出来的数量，看过的不再计入角标。 */
-export function unreadCounts(current: NoticeCounts): NoticeCounts {
-  const seen = readSeen()
-  return {
-    running: Math.max(0, current.running - seen.running),
-    success: Math.max(0, current.success - seen.success),
-    failed: Math.max(0, current.failed - seen.failed)
-  }
-}
-
-/** 把当前数量记为已读，并通知顶栏收起角标。 */
-export function markTranscodeNoticeSeen(current: NoticeCounts) {
-  const seen = readSeen()
-  localStorage.setItem(
-    SEEN_KEY,
-    JSON.stringify({
-      running: Math.max(seen.running, current.running),
-      success: Math.max(seen.success, current.success),
-      failed: Math.max(seen.failed, current.failed)
-    })
-  )
-  window.dispatchEvent(new Event(TRANSCODE_NOTICE_SEEN))
-}

src/views/Login/Login.vue

@@ -31,94 +31,6 @@ const themeChange = () => {
             <img src="@/assets/imgs/brand-mark.png" alt="" />
             <span>{{ underlineToHump(appStore.getTitle) }}</span>
           </div>
-          <div class="hero-fruits" aria-hidden="true">
-            <svg class="fruit cherry" viewBox="0 0 120 140">
-              <path
-                d="M62 38c8-16 24-24 36-22"
-                fill="none"
-                stroke="#7d9a62"
-                stroke-width="3"
-                stroke-linecap="round"
-              />
-              <path
-                d="M58 40c2-18-8-30-6-36"
-                fill="none"
-                stroke="#6d8a55"
-                stroke-width="3"
-                stroke-linecap="round"
-              />
-              <ellipse
-                cx="34"
-                cy="28"
-                rx="14"
-                ry="7"
-                fill="#8fb56f"
-                transform="rotate(-28 34 28)"
-              />
-              <circle cx="42" cy="78" r="28" fill="#c4322a" />
-              <circle cx="78" cy="86" r="26" fill="#a82822" />
-              <circle cx="32" cy="68" r="8" fill="#fff" opacity=".28" />
-            </svg>
-            <svg class="fruit mango" viewBox="0 0 150 170">
-              <path d="M78 28c18 2 28 8 34 16-22 4-36 2-48-8 4-4 8-8 14-8z" fill="#6d8a55" />
-              <path
-                d="M86 36c6-16 2-24-2-28"
-                fill="none"
-                stroke="#5f7a4c"
-                stroke-width="3"
-                stroke-linecap="round"
-              />
-              <path
-                d="M46 58c-18 28-16 62 8 84 28 24 62 10 74-16 14-30 4-62-16-80-18-16-46-10-66 12z"
-                fill="#f0b429"
-              />
-              <path
-                d="M58 78c8 22 10 40 4 58"
-                fill="none"
-                stroke="#ffe08a"
-                stroke-width="8"
-                stroke-linecap="round"
-                opacity=".55"
-              />
-              <ellipse
-                cx="62"
-                cy="86"
-                rx="14"
-                ry="22"
-                fill="#fff"
-                opacity=".2"
-                transform="rotate(-24 62 86)"
-              />
-            </svg>
-            <svg class="fruit banana" viewBox="0 0 160 150">
-              <path
-                d="M28 108c18-46 48-74 92-86 8 10 10 22 4 34-28 10-50 28-66 58-6 12-16 16-30 12-8-2-12-10 0-18z"
-                fill="#f2d34b"
-              />
-              <path
-                d="M36 102c16-38 42-62 80-74"
-                fill="none"
-                stroke="#ffe98a"
-                stroke-width="7"
-                stroke-linecap="round"
-                opacity=".7"
-              />
-              <path
-                d="M118 24c8 2 14 10 12 16"
-                fill="none"
-                stroke="#6d8a55"
-                stroke-width="4"
-                stroke-linecap="round"
-              />
-              <path
-                d="M30 112c-6 8-4 16 4 16"
-                fill="none"
-                stroke="#c9a227"
-                stroke-width="4"
-                stroke-linecap="round"
-              />
-            </svg>
-          </div>
           <div class="hero-copy">
             <p class="hero-kicker">{{ t('login.consoleLabel') }}</p>
             <h1>{{ t('login.welcome') }}</h1>
@@ -169,58 +81,16 @@ const themeChange = () => {
   flex-direction: column;
   justify-content: space-between;
 
-  &::before,
   &::after {
     position: absolute;
-    border: 1px solid rgb(255 255 255 / 12%);
+    right: -80px;
+    bottom: -120px;
+    width: 360px;
+    height: 360px;
+    border: 1px solid rgb(255 255 255 / 16%);
     border-radius: 50%;
     content: '';
   }
-
-  &::before {
-    top: -140px;
-    left: -80px;
-    width: 420px;
-    height: 420px;
-  }
-
-  &::after {
-    right: -120px;
-    bottom: -160px;
-    width: 460px;
-    height: 460px;
-  }
-}
-
-.hero-fruits {
-  position: absolute;
-  inset: 0;
-  z-index: 0;
-  pointer-events: none;
-}
-
-.fruit {
-  position: absolute;
-  filter: drop-shadow(0 18px 24px rgb(0 0 0 / 28%));
-}
-
-.cherry {
-  top: 16%;
-  right: 14%;
-  width: 150px;
-}
-
-.mango {
-  top: 30%;
-  left: 38%;
-  width: 210px;
-}
-
-.banana {
-  top: 54%;
-  left: 12%;
-  width: 200px;
-  transform: rotate(-8deg);
 }
 
 .hero-brand {
@@ -243,14 +113,13 @@ const themeChange = () => {
 .hero-copy {
   position: relative;
   z-index: 1;
-  max-width: 420px;
+  max-width: 460px;
 
   h1 {
-    margin: 12px 0 0;
+    margin: 10px 0 12px;
-    font-size: 44px;
+    font-size: 40px;
-    font-weight: 600;
+    font-weight: 700;
-    line-height: 1.15;
+    line-height: 1.2;
-    letter-spacing: -0.03em;
     color: #fff;
   }
 }
@@ -322,12 +191,8 @@ const themeChange = () => {
     padding: 16px 24px 20px;
   }
 
-  .hero-fruits {
-    display: none;
-  }
-
   .hero-copy h1 {
-    margin: 6px 0 0;
+    margin: 6px 0 8px;
     font-size: 28px;
   }
 

src/views/common/DashboardView.vue

@@ -5,8 +5,6 @@ import { computed, onMounted, ref } from 'vue'
 import { useRouter } from 'vue-router'
 import { AppIcons } from '@/constants/icons'
 import { pageDramasApi } from '@/api/admin/drama'
-import { getDashboardOverviewApi, getDashboardTrendApi } from '@/api/admin/dashboard'
-import DashboardMetricWall from '@/views/dashboard/DashboardMetricWall.vue'
 import { useRbac } from '@/stores/rbac'
 import { formatCount } from '@/utils/format'
 import { statusClass } from '@/utils/status'
@@ -17,8 +15,6 @@ const { can } = useRbac()
 const loading = ref(false)
 const dramas = ref([])
 const total = ref(0)
-const overview = ref(null)
-const trend = ref(null)
 
 const totalViews = computed(() =>
   dramas.value.reduce((sum, item) => sum + Number(item.views || 0), 0)
@@ -29,12 +25,6 @@ const reviewingCount = computed(
 const publishedCount = computed(
   () => dramas.value.filter((item) => item.status === 'published').length
 )
-const metricFallback = computed(() => ({
-  'content.dramaTotal': total.value,
-  'content.dramaReviewing': reviewingCount.value,
-  'content.dramaPublished': publishedCount.value,
-  'playback.viewTotal': totalViews.value
-}))
 const recentDramas = computed(() =>
   [...dramas.value]
     .sort((a, b) => String(b.updatedAt || '').localeCompare(String(a.updatedAt || '')))
@@ -44,16 +34,10 @@ const recentDramas = computed(() =>
 onMounted(async () => {
   loading.value = true
   try {
-    const [res, board, trendRes] = await Promise.all([
+    const res = await pageDramasApi({ pageIndex: 1, pageSize: 200 })
-      pageDramasApi({ pageIndex: 1, pageSize: 200 }),
-      getDashboardOverviewApi().catch(() => null),
-      getDashboardTrendApi().catch(() => null)
-    ])
     // 接口失败时 axios 拦截器会把业务错误吞成 undefined，这里不能让页面跟着崩
     dramas.value = res?.data?.list || []
     total.value = res?.data?.total || 0
-    overview.value = board?.data || null
-    trend.value = trendRes?.data || null
   } finally {
     loading.value = false
   }
@@ -61,83 +45,72 @@ onMounted(async () => {
 </script>
 
 <template>
-  <div class="workbench">
+  <div class="page-heading"
-    <div class="page-heading"
+    ><div><div class="eyebrow">内容概览</div><h1>工作台</h1><p>查看短剧内容与近期处理事项。</p></div
-      ><div
+    ><el-button
-        ><div class="eyebrow">内容概览</div><h1>工作台</h1
+      v-if="can('drama:create')"
-        ><p>用户、设备、留存与短剧内容总览。</p></div
+      type="primary"
-      ><el-button
+      class="primary-button"
-        v-if="can('drama:create')"
+      @click="router.push({ name: 'dramas' })"
-        type="primary"
+      ><AppIcon :icon="AppIcons.add" />上传新短剧</el-button
-        class="primary-button"
+    ></div
-        @click="router.push({ name: 'dramas' })"
+  >
-        ><AppIcon :icon="AppIcons.add" />上传新短剧</el-button
+  <div v-loading="loading" class="stats-grid">
+    <div class="stat-card"
+      ><div class="stat-top"
+        ><span>短剧总数</span
+        ><span class="stat-icon"><AppIcon :icon="AppIcons.content" /></span></div
+      ><div class="stat-value">{{ total }} <small>部</small></div></div
+    >
+    <div class="stat-card"
+      ><div class="stat-top"
+        ><span>累计播放量</span
+        ><span class="stat-icon"><AppIcon :icon="AppIcons.videoPlay" /></span></div
+      ><div class="stat-value">{{ formatCount(totalViews) }}</div></div
+    >
+    <div class="stat-card"
+      ><div class="stat-top"
+        ><span>待审核内容</span
+        ><span class="stat-icon"><AppIcon :icon="AppIcons.clock" /></span></div
+      ><div class="stat-value">{{ reviewingCount }} <small>项</small></div></div
+    >
+    <div class="stat-card"
+      ><div class="stat-top"
+        ><span>已上线</span
+        ><span class="stat-icon"><AppIcon :icon="AppIcons.checkCircle" /></span></div
+      ><div class="stat-value">{{ publishedCount }} <small>部</small></div></div
+    >
+  </div>
+  <section class="panel recent-panel"
+    ><div class="panel-heading"
+      ><div><h2>最近更新</h2><p>短剧内容与发布状态</p></div
+      ><el-button text class="view-all" @click="router.push({ name: 'dramas' })"
+        >短剧管理</el-button
       ></div
     >
-    <DashboardMetricWall
+    <el-table
       v-loading="loading"
-      :overview="overview"
+      :data="recentDramas"
-      :trend="trend"
+      row-key="id"
-      :fallback="metricFallback"
+      empty-text="暂无短剧数据"
-    />
+      class="dashboard-el-table"
-    <section class="panel recent-panel"
+      ><el-table-column prop="title" label="短剧名称" min-width="280" /><el-table-column
-      ><div class="panel-heading"
+        prop="genre"
-        ><div><h2>最近更新</h2><p>短剧内容与发布状态</p></div
+        label="类型"
-        ><el-button text class="view-all" @click="router.push({ name: 'dramas' })"
+        width="150" /><el-table-column label="集数" width="120"
-          >短剧管理</el-button
+        ><template #default="scope">{{ scope?.row?.episodes }} 集</template></el-table-column
-        ></div
+      ><el-table-column label="播放量" width="140"
-      >
+        ><template #default="scope">{{ formatCount(scope?.row?.views) }}</template></el-table-column
-      <el-table
+      ><el-table-column label="状态" width="130"
-        v-loading="loading"
+        ><template #default="scope"
-        :data="recentDramas"
+          ><el-tag
-        row-key="id"
+            v-if="scope?.row"
-        empty-text="暂无短剧数据"
+            :class="['status-badge', statusClass(scope.row.status)]"
-        class="dashboard-el-table"
+            effect="light"
-        ><el-table-column prop="title" label="短剧名称" min-width="280" /><el-table-column
+            >{{ scope.row.statusText }}</el-tag
-          prop="genre"
+          ></template
-          label="类型"
+        ></el-table-column
-          width="150" /><el-table-column label="集数" width="120"
+      ><el-table-column prop="updatedAt" label="更新时间" width="180"
-          ><template #default="scope">{{ scope?.row?.episodes }} 集</template></el-table-column
+    /></el-table>
-        ><el-table-column label="播放量" width="140"
+  </section>
-          ><template #default="scope">{{
-            formatCount(scope?.row?.views)
-          }}</template></el-table-column
-        ><el-table-column label="状态" width="130"
-          ><template #default="scope"
-            ><el-tag
-              v-if="scope?.row"
-              :class="['status-badge', statusClass(scope.row.status)]"
-              effect="light"
-              >{{ scope.row.statusText }}</el-tag
-            ></template
-          ></el-table-column
-        ><el-table-column prop="updatedAt" label="更新时间" width="180"
-      /></el-table>
-    </section>
-  </div>
 </template>
-
-<style scoped>
-.workbench {
-  display: flex;
-  flex-direction: column;
-  min-width: 0;
-}
-
-.workbench .page-heading {
-  flex: none;
-  margin-bottom: 12px;
-}
-
-.workbench :deep(.screen) {
-  flex: 1;
-  min-height: 0;
-}
-
-.recent-panel {
-  flex: none;
-  max-height: 220px;
-  margin-top: 12px;
-  overflow: auto;
-}
-</style>

src/views/common/TranscodeNoticeView.vue

@@ -1,100 +0,0 @@
-<!-- Author: fruit.com.cn -->
-<!-- 转码通知页：按转码中、成功、失败查看短剧和集数。 -->
-
-<script setup lang="ts">
-import { computed, onMounted, ref } from 'vue'
-import PageHeading from '@/views/components/PageHeading.vue'
-import {
-  getTranscodeNoticesApi,
-  type TranscodeNotice,
-  type TranscodeNoticeItem
-} from '@/api/admin/transcodeNotice'
-import { formatDateTime } from '@/utils/format'
-import { markTranscodeNoticeSeen } from '@/utils/transcodeNoticeSeen'
-
-const loading = ref(false)
-const tab = ref('RUNNING')
-const notice = ref<TranscodeNotice | null>(null)
-
-const rows = computed<TranscodeNoticeItem[]>(() => {
-  if (tab.value === 'SUCCESS') return notice.value?.successList || []
-  if (tab.value === 'FAILED') return notice.value?.failedList || []
-  return notice.value?.runningList || []
-})
-
-function episodeText(row: TranscodeNoticeItem) {
-  const no = row.episodeNo ? `第${row.episodeNo}集` : ''
-  if (!row.episodeTitle || row.episodeTitle === no) return no || '集数未知'
-  return no ? `${no} ${row.episodeTitle}` : row.episodeTitle
-}
-
-async function load() {
-  loading.value = true
-  try {
-    const res = await getTranscodeNoticesApi()
-    notice.value = res.data || null
-    if (notice.value) {
-      markTranscodeNoticeSeen({
-        running: Number(notice.value.running || 0),
-        success: Number(notice.value.success || 0),
-        failed: Number(notice.value.failed || 0)
-      })
-    }
-  } finally {
-    loading.value = false
-  }
-}
-
-onMounted(load)
-</script>
-
-<template>
-  <PageHeading
-    eyebrow="通知"
-    title="转码通知"
-    description="查看转码中、转码成功和转码失败的短剧与集数。"
-  >
-    <el-button :loading="loading" @click="load">刷新</el-button>
-  </PageHeading>
-
-  <section class="panel notice-panel">
-    <el-tabs v-model="tab">
-      <el-tab-pane label="转码中" name="RUNNING" />
-      <el-tab-pane label="转码成功" name="SUCCESS" />
-      <el-tab-pane label="转码失败" name="FAILED" />
-    </el-tabs>
-
-    <el-table
-      v-loading="loading"
-      :data="rows"
-      row-key="id"
-      border
-      class="drama-el-table"
-      empty-text="暂无通知"
-    >
-      <el-table-column prop="dramaTitle" label="短剧" min-width="220" show-overflow-tooltip />
-      <el-table-column label="集数" min-width="180" show-overflow-tooltip>
-        <template #default="{ row }">{{ episodeText(row) }}</template>
-      </el-table-column>
-      <el-table-column label="进度" width="100">
-        <template #default="{ row }">{{ row.progress ?? 0 }}%</template>
-      </el-table-column>
-      <el-table-column
-        v-if="tab === 'FAILED'"
-        prop="errorMsg"
-        label="失败原因"
-        min-width="220"
-        show-overflow-tooltip
-      />
-      <el-table-column label="更新时间" width="180">
-        <template #default="{ row }">{{ formatDateTime(row.updatedAt) }}</template>
-      </el-table-column>
-    </el-table>
-  </section>
-</template>
-
-<style scoped>
-.notice-panel {
-  padding: 8px 16px 16px;
-}
-</style>

src/views/components/AppUserCell.vue

@@ -1,43 +0,0 @@
-<!-- Author: fruit.com.cn -->
-
-<script setup>
-import { computed } from 'vue'
-
-/**
- * 后台各列表共用的「用户」单元格。
- *
- * 口径：已登录显示昵称 + `UID xxx`；未登录显示「游客」标签 + `设备 xxx`。
- * 两行都带标签，避免一串随机字母看不出是什么。平台由独立的「系统」列展示。
- */
-const props = defineProps({
-  row: { type: Object, required: true }
-})
-
-const isGuest = computed(() => props.row?.userId == null)
-</script>
-
-<template>
-  <div class="app-user-meta">
-    <template v-if="isGuest">
-      <el-tag type="info" size="small">游客</el-tag>
-      <span class="app-user-uid app-user-device" :title="row.deviceId || ''">
-        设备: {{ row.deviceId || '—' }}
-      </span>
-    </template>
-    <template v-else>
-      <span class="app-user-name" :title="row.nickname || ''">
-        昵称: {{ row.nickname || '未设置昵称' }}
-      </span>
-      <span class="app-user-uid">UID: {{ row.uid || `#${row.userId}` }}</span>
-    </template>
-  </div>
-</template>
-
-<style scoped>
-.app-user-device {
-  max-width: 150px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-</style>

src/views/components/LocaleTextFields.vue

@@ -1,75 +0,0 @@
-<!-- Author: fruit.com.cn -->
-<!-- 先勾选语言，再填写对应文案。中文始终保留。 -->
-
-<script setup>
-import { CONTENT_LANGUAGES, languageLabel } from '@/constants/contentLanguages'
-
-const props = defineProps({
-  languages: { type: Array, required: true },
-  locales: { type: Object, required: true },
-  label: { type: String, default: '名称' },
-  maxlength: { type: Number, default: 64 },
-  multiline: { type: Boolean, default: false },
-  showLanguages: { type: Boolean, default: true },
-  required: { type: Boolean, default: true }
-})
-const emit = defineEmits(['update:languages', 'update:locales'])
-
-function changeLanguages(codes) {
-  const next = codes.includes('zh') ? codes : ['zh', ...codes]
-  const locales = { ...props.locales }
-  next.forEach((code) => {
-    if (locales[code] == null) locales[code] = ''
-  })
-  emit('update:locales', locales)
-  emit('update:languages', next)
-}
-
-function changeLocale(code, value) {
-  emit('update:locales', { ...props.locales, [code]: value })
-}
-</script>
-
-<template>
-  <el-form-item v-if="showLanguages" label="语言" required>
-    <el-select
-      :model-value="languages"
-      multiple
-      placeholder="选择语言"
-      style="width: 100%"
-      @change="changeLanguages"
-    >
-      <el-option
-        v-for="item in CONTENT_LANGUAGES"
-        :key="item.code"
-        :label="item.label"
-        :value="item.code"
-        :disabled="item.code === 'zh'"
-      />
-    </el-select>
-  </el-form-item>
-  <el-form-item
-    v-for="code in languages"
-    :key="label + code"
-    :label="languageLabel(code) + label"
-    :required="required"
-  >
-    <el-input
-      v-if="!multiline"
-      :model-value="locales[code]"
-      @update:model-value="changeLocale(code, $event)"
-      :maxlength="maxlength"
-      :placeholder="'请填写' + languageLabel(code) + label"
-    />
-    <el-input
-      v-else
-      :model-value="locales[code]"
-      @update:model-value="changeLocale(code, $event)"
-      type="textarea"
-      :rows="2"
-      :maxlength="maxlength"
-      show-word-limit
-      :placeholder="'请填写' + languageLabel(code) + label"
-    />
-  </el-form-item>
-</template>

src/views/contentManagement/CategoryDramaView.vue

@@ -6,12 +6,6 @@ import { computed, onMounted, reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { AppIcon } from '@/components/AppIcon'
 import { AppIcons } from '@/constants/icons'
-import {
-  languageCodes,
-  languageLabel,
-  localesFromColumns,
-  payloadLocales
-} from '@/constants/contentLanguages'
 import {
   bindClassificationDramasApi,
   createClassificationApi,
@@ -24,8 +18,6 @@ import {
 } from '@/api/admin/dramaClassification'
 import { statusClass } from '@/utils/status'
 import { useRbac } from '@/stores/rbac'
-import ClassificationDramaDialogs from './ClassificationDramaDialogs.vue'
-import ClassificationSideList from './ClassificationSideList.vue'
 import PageHeading from '@/views/components/PageHeading.vue'
 
 const { can } = useRbac()
@@ -54,9 +46,7 @@ const keyword = ref('')
 const dialogVisible = ref(false)
 const saving = ref(false)
 const editingId = ref(null)
-const languages = ref(['zh'])
+const form = reactive({ name: '', sort: 1, status: 1 })
-const emptyForm = () => ({ locales: { zh: '' }, sort: 1, status: 1 })
-const form = reactive(emptyForm())
 
 const candidateVisible = ref(false)
 const candidateLoading = ref(false)
@@ -120,39 +110,25 @@ function changePage(value) {
 
 function openCreate() {
   editingId.value = null
-  languages.value = ['zh']
   const maxSort = classifications.value.reduce((max, item) => Math.max(max, item.sort || 0), 0)
-  Object.assign(form, emptyForm(), { sort: maxSort + 1 })
+  Object.assign(form, { name: '', sort: maxSort + 1, status: 1 })
   dialogVisible.value = true
 }
 
 function openEdit(row) {
   editingId.value = row.id
-  const locales = localesFromColumns(row.locales, row.name, row.nameEn, row.nameId)
+  Object.assign(form, { name: row.name, sort: row.sort ?? 0, status: row.status ?? 1 })
-  languages.value = languageCodes(locales)
-  Object.assign(form, {
-    locales,
-    sort: row.sort ?? 0,
-    status: row.status ?? 1
-  })
   dialogVisible.value = true
 }
 
 async function saveClassification() {
-  const locales = payloadLocales(form.locales, languages.value)
+  if (!form.name.trim()) {
-  const missing = languages.value.find((code) => !locales[code])
+    ElMessage.warning('请填写分类名称')
-  if (!locales.zh || missing) {
-    ElMessage.warning(missing ? `请填写${languageLabel(missing)}名称` : '请填写中文名称')
     return
   }
   saving.value = true
   try {
-    const payload = {
+    const payload = { name: form.name.trim(), sort: form.sort, status: form.status }
-      name: locales.zh,
-      locales,
-      sort: form.sort,
-      status: form.status
-    }
     if (editingId.value) {
       await updateClassificationApi(editingId.value, payload)
       ElMessage.success('分类已更新')
@@ -280,13 +256,48 @@ onMounted(loadClassifications)
   </PageHeading>
 
   <div class="classification-layout">
-    <ClassificationSideList
+    <aside class="panel classification-layout__side">
-      :classifications="classifications"
+      <div class="classification-layout__side-title">全部分类</div>
-      :active-id="activeId"
+      <el-scrollbar height="560px">
-      @select="selectClassification"
+        <ul class="classification-list">
-      @edit="openEdit"
+          <li
-      @remove="confirmDelete"
+            v-for="item in classifications"
-    />
+            :key="item.id"
+            class="classification-list__item"
+            :class="{ 'is-active': item.id === activeId }"
+            @click="selectClassification(item)"
+          >
+            <div class="classification-list__main">
+              <span class="classification-list__name">{{ item.name }}</span>
+              <span class="classification-list__count">{{ item.dramaCount || 0 }}</span>
+            </div>
+            <div class="classification-list__actions" @click.stop>
+              <el-button
+                v-if="can('drama:update')"
+                text
+                circle
+                size="small"
+                @click="openEdit(item)"
+              >
+                <AppIcon :icon="AppIcons.edit" :size="15" />
+              </el-button>
+              <el-button
+                v-if="can('drama:delete')"
+                text
+                circle
+                size="small"
+                @click="confirmDelete(item)"
+              >
+                <AppIcon :icon="AppIcons.delete" :size="15" />
+              </el-button>
+            </div>
+          </li>
+          <li v-if="!classifications.length" class="classification-list__empty">
+            还没有分类，点右上角「新建分类」开始
+          </li>
+        </ul>
+      </el-scrollbar>
+    </aside>
 
     <section class="panel classification-layout__main">
       <div class="classification-toolbar">
@@ -365,28 +376,77 @@ onMounted(loadClassifications)
     </section>
   </div>
 
-  <ClassificationDramaDialogs
+  <el-dialog v-model="dialogVisible" :title="editingId ? '编辑分类' : '新建分类'" width="460px">
-    v-model:editor-visible="dialogVisible"
+    <el-form label-position="top">
-    v-model:languages="languages"
+      <el-form-item label="分类名称" required>
-    v-model:candidate-visible="candidateVisible"
+        <el-input v-model="form.name" maxlength="20" placeholder="例如：本周必看" />
-    v-model:candidate-keyword="candidateKeyword"
+      </el-form-item>
-    :editing-id="editingId"
+      <div class="classification-form-row">
-    :form="form"
+        <el-form-item label="排序">
-    @update:form="Object.assign(form, $event)"
+          <el-input-number v-model="form.sort" :min="0" :max="999" />
-    :saving="saving"
+        </el-form-item>
-    :candidate-loading="candidateLoading"
+        <el-form-item label="状态">
-    :candidates="candidates"
+          <el-switch v-model="form.status" :active-value="1" :inactive-value="0" />
-    :candidate-page="candidatePage"
+        </el-form-item>
-    :candidate-page-size="candidatePageSize"
+      </div>
-    :candidate-total="candidateTotal"
+    </el-form>
-    :binding="binding"
+    <template #footer>
-    :selected-count="selectedDramas.length"
+      <el-button @click="dialogVisible = false">取消</el-button>
-    @save="saveClassification"
+      <el-button type="primary" :loading="saving" @click="saveClassification">保存</el-button>
-    @search="candidateSearch"
+    </template>
-    @page="changeCandidatePage"
+  </el-dialog>
-    @selection="onSelectionChange"
+
-    @confirm="confirmBind"
+  <el-dialog v-model="candidateVisible" title="添加关联短剧" width="760px">
-  />
+    <div class="classification-toolbar__search" style="margin-bottom: 12px">
+      <el-input
+        v-model="candidateKeyword"
+        placeholder="搜索短剧名称"
+        clearable
+        style="width: 220px"
+        @keyup.enter="candidateSearch"
+        @clear="candidateSearch"
+      />
+      <el-button type="primary" plain @click="candidateSearch">查询</el-button>
+    </div>
+    <el-table
+      v-loading="candidateLoading"
+      :data="candidates"
+      row-key="id"
+      border
+      max-height="380"
+      empty-text="没有可关联的短剧"
+      @selection-change="onSelectionChange"
+    >
+      <el-table-column type="selection" width="48" />
+      <el-table-column prop="title" label="短剧名称" min-width="220" />
+      <el-table-column label="集数" width="90">
+        <template #default="{ row }">{{ row.totalEpisodes || 0 }}</template>
+      </el-table-column>
+      <el-table-column label="状态" width="110">
+        <template #default="{ row }">
+          <span class="status-dot" :class="statusClass(row.status)">
+            {{ STATUS_TEXT[row.status] || row.status }}
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="sort" label="排序" width="90" />
+    </el-table>
+    <div class="classification-pagination">
+      <el-pagination
+        :current-page="candidatePage"
+        :page-size="candidatePageSize"
+        :total="candidateTotal"
+        layout="total, prev, pager, next"
+        @current-change="changeCandidatePage"
+      />
+    </div>
+    <template #footer>
+      <el-button @click="candidateVisible = false">取消</el-button>
+      <el-button type="primary" :loading="binding" @click="confirmBind">
+        确定关联{{ selectedDramas.length ? `（${selectedDramas.length}）` : '' }}
+      </el-button>
+    </template>
+  </el-dialog>
 </template>
 
 <style scoped>
@@ -397,6 +457,83 @@ onMounted(loadClassifications)
   align-items: start;
 }
 
+.classification-layout__side {
+  padding: 12px 0 8px;
+}
+
+.classification-layout__side-title {
+  padding: 0 16px 10px;
+  font-weight: 600;
+  color: var(--el-text-color-primary);
+}
+
+.classification-list {
+  padding: 0;
+  margin: 0;
+  list-style: none;
+}
+
+.classification-list__item {
+  display: flex;
+  padding: 8px 12px 8px 16px;
+  color: var(--el-text-color-regular);
+  cursor: pointer;
+  border-left: 3px solid transparent;
+  align-items: center;
+  justify-content: space-between;
+  gap: 8px;
+}
+
+.classification-list__item:hover {
+  background: var(--el-fill-color-light);
+}
+
+.classification-list__item.is-active {
+  font-weight: 600;
+  color: var(--el-color-primary);
+  background: var(--el-color-primary-light-9);
+  border-left-color: var(--el-color-primary);
+}
+
+.classification-list__main {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  min-width: 0;
+}
+
+.classification-list__name {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.classification-list__count {
+  min-width: 24px;
+  padding: 0 6px;
+  font-size: 12px;
+  line-height: 18px;
+  color: var(--el-text-color-secondary);
+  text-align: center;
+  background: var(--el-fill-color);
+  border-radius: 9px;
+}
+
+.classification-list__actions {
+  display: none;
+  gap: 2px;
+}
+
+.classification-list__item:hover .classification-list__actions {
+  display: flex;
+}
+
+.classification-list__empty {
+  padding: 16px;
+  line-height: 1.6;
+  color: var(--el-text-color-secondary);
+}
+
 .classification-layout__main {
   padding: 16px;
 }
@@ -448,4 +585,10 @@ onMounted(loadClassifications)
   justify-content: flex-end;
   margin-top: 14px;
 }
+
+.classification-form-row {
+  display: grid;
+  grid-template-columns: 1fr 1fr;
+  gap: 12px;
+}
 </style>

src/views/contentManagement/CategoryManagementView.vue

@@ -4,12 +4,6 @@
 import { onMounted, reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { AppIcons } from '@/constants/icons'
-import {
-  languageCodes,
-  languageLabel,
-  localesFromColumns,
-  payloadLocales
-} from '@/constants/contentLanguages'
 import {
   createDramaCategoryApi,
   deleteDramaCategoryApi,
@@ -17,7 +11,6 @@ import {
   updateDramaCategoryApi
 } from '@/api/admin/drama'
 import { useRbac } from '@/stores/rbac'
-import LocaleTextFields from '@/views/components/LocaleTextFields.vue'
 import PageHeading from '@/views/components/PageHeading.vue'
 
 const { can } = useRbac()
@@ -27,8 +20,7 @@ const list = ref([])
 const dialogVisible = ref(false)
 const saving = ref(false)
 const editingId = ref(null)
-const languages = ref(['zh'])
+const form = reactive({ name: '', sort: 1, status: 1 })
-const form = reactive({ locales: { zh: '' }, sort: 1, status: 1 })
 
 async function load() {
   loading.value = true
@@ -46,29 +38,21 @@ function nextSort() {
 
 function openCreate() {
   editingId.value = null
-  languages.value = ['zh']
+  Object.assign(form, { name: '', sort: nextSort(), status: 1 })
-  Object.assign(form, { locales: { zh: '' }, sort: nextSort(), status: 1 })
   dialogVisible.value = true
 }
 
 function openEdit(row) {
   editingId.value = row.id
-  const locales = localesFromColumns(row.locales, row.name, row.nameEn, row.nameId)
+  Object.assign(form, { name: row.name, sort: row.sort ?? 0, status: row.status ?? 1 })
-  languages.value = languageCodes(locales)
-  Object.assign(form, { locales, sort: row.sort ?? 0, status: row.status ?? 1 })
   dialogVisible.value = true
 }
 
 async function saveCategory() {
-  const locales = payloadLocales(form.locales, languages.value)
+  if (!form.name.trim()) return ElMessage.warning('请填写类型名称')
-  const missing = languages.value.find((code) => !locales[code])
-  if (!locales.zh || missing) {
-    ElMessage.warning(missing ? `请填写${languageLabel(missing)}名称` : '请填写中文名称')
-    return
-  }
   saving.value = true
   try {
-    const payload = { name: locales.zh, locales, sort: form.sort, status: form.status }
+    const payload = { name: form.name.trim(), sort: form.sort, status: form.status }
     if (editingId.value) {
       await updateDramaCategoryApi(editingId.value, payload)
       ElMessage.success('类型已更新')
@@ -131,20 +115,7 @@ onMounted(load)
       empty-text="还没有短剧类型"
     >
       <el-table-column type="index" label="序号" width="80" />
-      <el-table-column prop="name" label="类型名称" min-width="160" />
+      <el-table-column prop="name" label="类型名称" min-width="200" />
-      <el-table-column label="语言" min-width="180">
-        <template #default="{ row }">
-          <el-tag
-            v-for="code in languageCodes(
-              row.locales || localesFromColumns(null, row.name, row.nameEn, row.nameId)
-            )"
-            :key="code"
-            effect="light"
-            class="locale-tag"
-            >{{ languageLabel(code) }}</el-tag
-          >
-        </template>
-      </el-table-column>
       <el-table-column label="短剧数" width="110">
         <template #default="{ row }">{{ row.dramaCount || 0 }} 部</template>
       </el-table-column>
@@ -175,15 +146,11 @@ onMounted(load)
     </el-table>
   </section>
 
-  <el-dialog v-model="dialogVisible" :title="editingId ? '编辑类型' : '新建类型'" width="560px">
+  <el-dialog v-model="dialogVisible" :title="editingId ? '编辑类型' : '新建类型'" width="460px">
     <el-form label-position="top">
-      <LocaleTextFields
+      <el-form-item label="类型名称" required>
-        v-model:languages="languages"
+        <el-input v-model="form.name" maxlength="20" placeholder="例如：都市情感" />
-        :locales="form.locales"
+      </el-form-item>
-        @update:locales="form.locales = $event"
-        label="名称"
-        :maxlength="64"
-      />
       <div class="form-row">
         <el-form-item label="排序">
           <el-input-number v-model="form.sort" :min="0" :max="999" />
@@ -199,9 +166,3 @@ onMounted(load)
     </template>
   </el-dialog>
 </template>
-
-<style scoped>
-.locale-tag + .locale-tag {
-  margin-left: 6px;
-}
-</style>

src/views/contentManagement/ClassificationDramaDialogs.vue

@@ -1,171 +0,0 @@
-<!-- Author: fruit.com.cn -->
-<!-- 分类管理弹窗：编辑分类，以及把短剧关联进分类。 -->
-
-<script setup>
-import { statusClass } from '@/utils/status'
-import LocaleTextFields from '@/views/components/LocaleTextFields.vue'
-import { AppIcon } from '@/components/AppIcon'
-import { AppIcons } from '@/constants/icons'
-
-const SORT_MAX = 9999
-
-const STATUS_TEXT = {
-  draft: '草稿',
-  reviewing: '审核中',
-  approved: '待发布',
-  published: '已上线',
-  offline: '已下线'
-}
-
-defineProps({
-  editorVisible: { type: Boolean, default: false },
-  editingId: { type: [String, Number], default: null },
-  languages: { type: Array, default: () => ['zh'] },
-  form: { type: Object, required: true },
-  saving: { type: Boolean, default: false },
-  candidateVisible: { type: Boolean, default: false },
-  candidateLoading: { type: Boolean, default: false },
-  candidates: { type: Array, default: () => [] },
-  candidateKeyword: { type: String, default: '' },
-  candidatePage: { type: Number, default: 1 },
-  candidatePageSize: { type: Number, default: 10 },
-  candidateTotal: { type: Number, default: 0 },
-  binding: { type: Boolean, default: false },
-  selectedCount: { type: Number, default: 0 }
-})
-
-const emit = defineEmits([
-  'update:editorVisible',
-  'update:languages',
-  'update:form',
-  'update:candidateVisible',
-  'update:candidateKeyword',
-  'save',
-  'search',
-  'page',
-  'selection',
-  'confirm'
-])
-</script>
-
-<template>
-  <el-dialog
-    :model-value="editorVisible"
-    :title="editingId ? '编辑分类' : '新建分类'"
-    width="560px"
-    @update:model-value="emit('update:editorVisible', $event)"
-  >
-    <el-form label-position="top">
-      <LocaleTextFields
-        :languages="languages"
-        :locales="form.locales"
-        label="名称"
-        :maxlength="64"
-        @update:languages="emit('update:languages', $event)"
-        @update:locales="emit('update:form', { ...form, locales: $event })"
-      />
-      <div class="classification-form-row">
-        <el-form-item label="排序">
-          <el-input-number
-            :model-value="form.sort"
-            :min="0"
-            :max="SORT_MAX"
-            controls-position="right"
-            @update:model-value="emit('update:form', { ...form, sort: $event })"
-          />
-        </el-form-item>
-        <el-form-item label="状态">
-          <el-switch
-            :model-value="form.status"
-            :active-value="1"
-            :inactive-value="0"
-            @update:model-value="emit('update:form', { ...form, status: $event })"
-          />
-        </el-form-item>
-      </div>
-    </el-form>
-    <template #footer>
-      <el-button @click="emit('update:editorVisible', false)">取消</el-button>
-      <el-button type="primary" :loading="saving" @click="emit('save')">保存</el-button>
-    </template>
-  </el-dialog>
-
-  <el-dialog
-    :model-value="candidateVisible"
-    title="添加关联短剧"
-    width="760px"
-    @update:model-value="emit('update:candidateVisible', $event)"
-  >
-    <div class="classification-toolbar__search">
-      <el-input
-        :model-value="candidateKeyword"
-        placeholder="搜索短剧名称"
-        clearable
-        style="width: 220px"
-        @update:model-value="emit('update:candidateKeyword', $event)"
-        @keyup.enter="emit('search')"
-        @clear="emit('search')"
-      />
-      <el-button type="primary" plain @click="emit('search')">查询</el-button>
-    </div>
-    <el-table
-      v-loading="candidateLoading"
-      :data="candidates"
-      row-key="id"
-      border
-      max-height="380"
-      empty-text="没有可关联的短剧"
-      @selection-change="emit('selection', $event)"
-    >
-      <el-table-column type="selection" width="48" />
-      <el-table-column prop="title" label="短剧名称" min-width="220" />
-      <el-table-column label="集数" width="90">
-        <template #default="{ row }">{{ row.totalEpisodes || 0 }}</template>
-      </el-table-column>
-      <el-table-column label="状态" width="110">
-        <template #default="{ row }">
-          <span class="status-dot" :class="statusClass(row.status)">
-            {{ STATUS_TEXT[row.status] || row.status }}
-          </span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="sort" label="排序" width="90" />
-    </el-table>
-    <div class="classification-pagination">
-      <el-pagination
-        :current-page="candidatePage"
-        :page-size="candidatePageSize"
-        :total="candidateTotal"
-        layout="total, prev, pager, next"
-        @current-change="emit('page', $event)"
-      />
-    </div>
-    <template #footer>
-      <el-button @click="emit('update:candidateVisible', false)">取消</el-button>
-      <el-button type="primary" :loading="binding" @click="emit('confirm')">
-        确定关联{{ selectedCount ? `（${selectedCount}）` : '' }}
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
-
-<style scoped>
-.classification-form-row {
-  display: grid;
-  grid-template-columns: 1fr 1fr;
-  gap: 12px;
-}
-
-.classification-toolbar__search {
-  display: flex;
-  gap: 8px;
-  flex-wrap: wrap;
-  margin-bottom: 12px;
-}
-
-.classification-pagination {
-  display: flex;
-  justify-content: flex-end;
-  margin-top: 14px;
-}
-</style>

src/views/contentManagement/ClassificationSideList.vue

@@ -1,140 +0,0 @@
-<!-- Author: fruit.com.cn -->
-<!-- 分类管理左侧列表：切换、编辑、删除。 -->
-
-<script setup>
-import { AppIcon } from '@/components/AppIcon'
-import { AppIcons } from '@/constants/icons'
-import { useRbac } from '@/stores/rbac'
-
-defineProps({
-  classifications: { type: Array, default: () => [] },
-  activeId: { type: [String, Number], default: null }
-})
-
-const emit = defineEmits(['select', 'edit', 'remove'])
-const { can } = useRbac()
-</script>
-
-<template>
-  <aside class="panel classification-layout__side">
-    <div class="classification-layout__side-title">全部分类</div>
-    <el-scrollbar height="560px">
-      <ul class="classification-list">
-        <li
-          v-for="item in classifications"
-          :key="item.id"
-          class="classification-list__item"
-          :class="{ 'is-active': item.id === activeId }"
-          @click="emit('select', item)"
-        >
-          <div class="classification-list__main">
-            <span class="classification-list__name">{{ item.name }}</span>
-            <span class="classification-list__count">{{ item.dramaCount || 0 }}</span>
-          </div>
-          <div class="classification-list__actions" @click.stop>
-            <el-button
-              v-if="can('drama:update')"
-              text
-              circle
-              size="small"
-              @click="emit('edit', item)"
-            >
-              <AppIcon :icon="AppIcons.edit" :size="15" />
-            </el-button>
-            <el-button
-              v-if="can('drama:delete')"
-              text
-              circle
-              size="small"
-              @click="emit('remove', item)"
-            >
-              <AppIcon :icon="AppIcons.delete" :size="15" />
-            </el-button>
-          </div>
-        </li>
-        <li v-if="!classifications.length" class="classification-list__empty">
-          还没有分类，点右上角「新建分类」开始
-        </li>
-      </ul>
-    </el-scrollbar>
-  </aside>
-</template>
-
-<style scoped>
-.classification-layout__side {
-  padding: 12px 0 8px;
-}
-
-.classification-layout__side-title {
-  padding: 0 16px 10px;
-  font-weight: 600;
-  color: var(--el-text-color-primary);
-}
-
-.classification-list {
-  padding: 0;
-  margin: 0;
-  list-style: none;
-}
-
-.classification-list__item {
-  display: flex;
-  padding: 8px 12px 8px 16px;
-  color: var(--el-text-color-regular);
-  cursor: pointer;
-  border-left: 3px solid transparent;
-  align-items: center;
-  justify-content: space-between;
-  gap: 8px;
-}
-
-.classification-list__item:hover {
-  background: var(--el-fill-color-light);
-}
-
-.classification-list__item.is-active {
-  font-weight: 600;
-  color: var(--el-color-primary);
-  background: var(--el-color-primary-light-9);
-  border-left-color: var(--el-color-primary);
-}
-
-.classification-list__main {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  min-width: 0;
-}
-
-.classification-list__name {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.classification-list__count {
-  min-width: 24px;
-  padding: 0 6px;
-  font-size: 12px;
-  line-height: 18px;
-  color: var(--el-text-color-secondary);
-  text-align: center;
-  background: var(--el-fill-color);
-  border-radius: 9px;
-}
-
-.classification-list__actions {
-  display: none;
-  gap: 2px;
-}
-
-.classification-list__item:hover .classification-list__actions {
-  display: flex;
-}
-
-.classification-list__empty {
-  padding: 16px;
-  line-height: 1.6;
-  color: var(--el-text-color-secondary);
-}
-</style>

src/views/contentManagement/DramaManagementView.vue

@@ -5,13 +5,6 @@ import { computed, nextTick, onMounted, reactive, ref } from 'vue'
 import { useRouter } from 'vue-router'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { AppIcons } from '@/constants/icons'
-import {
-  languageLabel,
-  languageCodes,
-  localesFromColumns,
-  payloadLocales
-} from '@/constants/contentLanguages'
-import LocaleTextFields from '@/views/components/LocaleTextFields.vue'
 import { AppImage } from '@/components/AppImage'
 import {
   changeDramaStatusApi,
@@ -23,7 +16,6 @@ import {
 } from '@/api/admin/drama'
 import { useRbac } from '@/stores/rbac'
 import { formatCount } from '@/utils/format'
-import { listContentTagsApi } from '@/api/admin/contentTag'
 import { statusClass } from '@/utils/status'
 import { uploadFile } from '@/utils/uploader'
 
@@ -38,7 +30,8 @@ const categories = ref([])
 const keyword = ref('')
 const statusFilter = ref(undefined)
 const categoryIds = ref([])
-const tags = ref([])
+const dramaTypes = ref([])
+const hotFilter = ref(undefined)
 const pageIndex = ref(1)
 const pageSize = ref(10)
 
@@ -52,14 +45,11 @@ const editingId = ref(null)
 const editingCommentCount = ref(0)
 const editingLikeCount = ref(0)
 const formRef = ref()
-const textLanguages = ref(['zh'])
 const form = reactive({
   title: '',
-  titleLocales: { zh: '' },
   categoryIds: [],
-  tagId: null,
+  dramaTypes: ['LIVE'],
   description: '',
-  synopsisLocales: { zh: '' },
   freeEpisodes: 3,
   unlockCoin: 0,
   favoriteCount: 0,
@@ -72,6 +62,16 @@ const form = reactive({
 const MAX_COVER_SIZE = 5 * 1024 * 1024
 const COVER_TYPES = ['image/jpeg', 'image/png', 'image/webp']
 
+const formRules = {
+  title: [{ required: true, message: '请输入短剧名称', trigger: 'blur' }],
+  categoryIds: [
+    { type: 'array', required: true, min: 1, message: '请至少选择一个类型', trigger: 'change' }
+  ],
+  dramaTypes: [
+    { type: 'array', required: true, min: 1, message: '请至少选择一个内容类型', trigger: 'change' }
+  ]
+}
+
 const coverDisplayName = computed(
   () => coverFileName.value || (form.cover ? coverBasename(form.cover) : '尚未选择封面')
 )
@@ -90,6 +90,11 @@ const statusOptions = [
   { code: 'offline', text: '已下线' }
 ]
 
+const dramaTypeOptions = [
+  { value: 'ANIME', label: '漫剧' },
+  { value: 'LIVE', label: '真人剧' }
+]
+
 const actionMeta = {
   submit: { label: '提交审核', done: '已提交审核' },
   approve: { label: '审核通过', done: '已通过审核' },
@@ -106,7 +111,9 @@ async function load() {
       pageSize: pageSize.value,
       keyword: keyword.value.trim() || undefined,
       status: statusFilter.value || undefined,
-      categoryIds: categoryIds.value.length ? categoryIds.value : undefined
+      categoryIds: categoryIds.value.length ? categoryIds.value : undefined,
+      dramaTypes: dramaTypes.value.length ? dramaTypes.value : undefined,
+      isHot: hotFilter.value
     })
     list.value = res.data?.list || []
     total.value = res.data?.total || 0
@@ -120,11 +127,6 @@ async function loadCategories() {
   categories.value = res.data || []
 }
 
-async function loadTags() {
-  const res = await listContentTagsApi(true)
-  tags.value = res.data || []
-}
-
 function search() {
   pageIndex.value = 1
   load()
@@ -134,6 +136,8 @@ function resetFilters() {
   keyword.value = ''
   statusFilter.value = undefined
   categoryIds.value = []
+  dramaTypes.value = []
+  hotFilter.value = undefined
   search()
 }
 
@@ -142,50 +146,24 @@ function handleSizeChange() {
   load()
 }
 
-function selectedCategoryIds(row) {
-  const values =
-    Array.isArray(row.categoryIds) && row.categoryIds.length
-      ? row.categoryIds
-      : row.categoryId
-        ? [row.categoryId]
-        : []
-  return values.filter((id) => Number(id) > 0)
-}
-
 function coverBasename(path) {
   if (!path) return ''
   const clean = path.split('?')[0].split('#')[0]
   return decodeURIComponent(clean.split('/').pop() || clean)
 }
 
-/** 长整型计数字段在接口里是字符串，数字输入框只接受 number。 */
-function toCount(value) {
-  const count = Number(value)
-  return Number.isFinite(count) ? count : 0
-}
-
 async function resetValidation() {
   await nextTick()
   formRef.value?.clearValidate()
 }
 
-function changeTextLanguages(codes) {
-  textLanguages.value = codes
-  codes.forEach((code) => {
-    if (form.synopsisLocales[code] == null) form.synopsisLocales[code] = ''
-  })
-}
-
 function openCreate() {
   editingId.value = null
-  textLanguages.value = ['zh']
   Object.assign(form, {
     title: '',
-    titleLocales: { zh: '' },
     categoryIds: [],
-    tagId: null,
+    dramaTypes: ['LIVE'],
     description: '',
-    synopsisLocales: { zh: '' },
     freeEpisodes: 3,
     unlockCoin: 0,
     favoriteCount: 0,
@@ -204,35 +182,41 @@ function openCreate() {
 
 function openEdit(row) {
   editingId.value = row.id
-  const titleLocales = localesFromColumns(row.titleLocales, row.title)
-  const synopsisLocales = localesFromColumns(row.synopsisLocales, row.description)
-  textLanguages.value = languageCodes(titleLocales)
-  textLanguages.value.forEach((code) => {
-    if (synopsisLocales[code] == null) synopsisLocales[code] = ''
-  })
   Object.assign(form, {
     title: row.title,
-    titleLocales,
+    categoryIds:
-    categoryIds: selectedCategoryIds(row),
+      Array.isArray(row.categoryIds) && row.categoryIds.length
-    tagId: Number(row.tagId) > 0 ? row.tagId : null,
+        ? row.categoryIds
+        : row.categoryId
+          ? [row.categoryId]
+          : [],
+    dramaTypes:
+      Array.isArray(row.dramaTypes) && row.dramaTypes.length
+        ? row.dramaTypes
+        : row.dramaType
+          ? [row.dramaType]
+          : ['LIVE'],
     description: row.description || '',
-    synopsisLocales,
+    freeEpisodes: row.freeEpisodes ?? 3,
-    freeEpisodes: toCount(row.freeEpisodes ?? 3),
+    unlockCoin: row.unlockCoin ?? 0,
-    unlockCoin: toCount(row.unlockCoin),
+    favoriteCount: row.favoriteCount ?? 0,
-    favoriteCount: toCount(row.favoriteCount),
+    heat: row.views ?? 0,
-    heat: toCount(row.views),
     isHot: !!row.isHot,
-    sort: toCount(row.sort),
+    sort: row.sort ?? 0,
     cover: row.cover || ''
   })
   coverFileName.value = row.cover ? coverBasename(row.cover) : ''
   coverError.value = ''
-  editingCommentCount.value = toCount(row.commentCount)
+  editingCommentCount.value = row.commentCount ?? 0
-  editingLikeCount.value = toCount(row.likeCount)
+  editingLikeCount.value = row.likeCount ?? 0
   dialogVisible.value = true
   resetValidation()
 }
 
+function dramaTypeLabel(value) {
+  return dramaTypeOptions.find((item) => item.value === value)?.label || '真人剧'
+}
+
 function rowCategoryList(row) {
   if (Array.isArray(row.categoryNames) && row.categoryNames.length) {
     return row.categoryNames.filter(Boolean)
@@ -244,26 +228,25 @@ function rowCategoryList(row) {
     .filter(Boolean)
 }
 
+function rowDramaTypes(row) {
+  if (Array.isArray(row.dramaTypes) && row.dramaTypes.length) return row.dramaTypes
+  return row.dramaType ? [row.dramaType] : []
+}
+
 async function saveDrama() {
   if (saving.value || uploadingCover.value) return
-  const titles = payloadLocales(form.titleLocales, textLanguages.value)
+  try {
-  const missing = textLanguages.value.find((code) => !titles[code])
+    await formRef.value?.validate()
-  if (!titles.zh || missing) {
+  } catch {
-    ElMessage.warning(missing ? `请填写${languageLabel(missing)}名称` : '请输入短剧名称')
     return
   }
-  const synopses = payloadLocales(form.synopsisLocales, textLanguages.value)
   const categoryNames = form.categoryIds
     .map((id) => categories.value.find((item) => item.id === id)?.name)
     .filter(Boolean)
   const payload = {
     ...form,
-    title: titles.zh,
+    title: form.title.trim(),
-    titleLocales: titles,
+    genre: categoryNames.join(' / ')
-    description: synopses.zh || '',
-    synopsisLocales: synopses,
-    genre: categoryNames.join(' / '),
-    tagId: form.tagId || 0
   }
   saving.value = true
   try {
@@ -387,7 +370,7 @@ function reviewActions(row) {
 }
 
 onMounted(async () => {
-  await Promise.all([loadCategories(), loadTags()])
+  await loadCategories()
   await load()
 })
 </script>
@@ -430,6 +413,22 @@ onMounted(async () => {
             :key="item.id"
             :label="item.name"
             :value="item.id" /></el-select
+        ><el-select
+          v-model="dramaTypes"
+          class="drama-multi-select"
+          multiple
+          clearable
+          placeholder="全部内容类型"
+          @change="search"
+          ><el-option
+            v-for="item in dramaTypeOptions"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value" /></el-select
+        ><el-select v-model="hotFilter" clearable placeholder="全部热度" @change="search"
+          ><el-option label="仅热门" :value="true" /><el-option
+            label="非热门"
+            :value="false" /></el-select
         ><el-button @click="resetFilters">重置</el-button></div
       ><span class="table-result-count">共 {{ total }} 部短剧</span></div
     >
@@ -466,17 +465,24 @@ onMounted(async () => {
       >
       <el-table-column label="类型" min-width="200"
         ><template #default="{ row }"
-          ><div v-if="rowCategoryList(row).length" class="tag-wrap"
+          ><div class="tag-wrap"
             ><el-tag v-for="name in rowCategoryList(row)" :key="name" type="info" effect="light">{{
               name
             }}</el-tag></div
-          ><span v-else class="table-empty-text">—</span></template
+          ></template
         >
       </el-table-column>
-      <el-table-column label="标签" min-width="120"
+      <el-table-column label="内容类型" min-width="180"
         ><template #default="{ row }"
-          ><span v-if="row.tagName">{{ row.tagName }}</span
+          ><div class="tag-wrap"
-          ><span v-else class="table-empty-text">—</span></template
+            ><el-tag
+              v-for="type in rowDramaTypes(row)"
+              :key="type"
+              :type="type === 'ANIME' ? 'warning' : 'info'"
+              effect="light"
+              >{{ dramaTypeLabel(type) }}</el-tag
+            ></div
+          ></template
         ></el-table-column
       >
       <el-table-column label="集数" width="90"
@@ -507,6 +513,12 @@ onMounted(async () => {
           }}</el-tag></template
         ></el-table-column
       >
+      <el-table-column label="热门" width="90"
+        ><template #default="{ row }"
+          ><el-tag v-if="row.isHot" type="danger" effect="light">热门</el-tag
+          ><span v-else class="table-empty-text">—</span></template
+        ></el-table-column
+      >
       <el-table-column prop="updatedAt" label="更新时间" width="160" />
       <el-table-column label="审核" width="140"
         ><template #default="{ row }"
@@ -564,12 +576,141 @@ onMounted(async () => {
   <el-dialog
     v-model="dialogVisible"
     :title="editingId ? '编辑短剧' : '新建短剧'"
-    width="760px"
+    width="680px"
     class="drama-editor-dialog"
     :close-on-click-modal="false"
     :before-close="beforeDialogClose"
   >
-    <el-form ref="formRef" :model="form" label-position="top" class="drama-editor-form">
+    <el-form
+      ref="formRef"
+      :model="form"
+      :rules="formRules"
+      label-position="top"
+      class="drama-editor-form"
+    >
+      <section class="editor-section">
+        <h3 class="editor-section-title">基础信息</h3>
+        <div class="editor-grid editor-grid--two">
+          <el-form-item label="短剧名称" prop="title">
+            <el-input v-model="form.title" maxlength="80" placeholder="请输入短剧名称" />
+          </el-form-item>
+          <el-form-item label="类型" prop="categoryIds">
+            <el-select
+              v-model="form.categoryIds"
+              class="drama-multi-select"
+              multiple
+              filterable
+              placeholder="请选择类型"
+            >
+              <el-option
+                v-for="item in categories"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
+          <el-form-item label="内容类型" prop="dramaTypes">
+            <el-select
+              v-model="form.dramaTypes"
+              class="drama-multi-select"
+              multiple
+              filterable
+              placeholder="请选择内容类型"
+            >
+              <el-option
+                v-for="item in dramaTypeOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              />
+            </el-select>
+          </el-form-item>
+        </div>
+        <el-form-item label="简介">
+          <el-input
+            v-model="form.description"
+            type="textarea"
+            :rows="3"
+            maxlength="1000"
+            show-word-limit
+            placeholder="简要介绍剧情"
+          />
+        </el-form-item>
+      </section>
+
+      <section class="editor-section">
+        <h3 class="editor-section-title">付费设置</h3>
+        <div class="editor-grid editor-grid--two">
+          <el-form-item label="免费集数">
+            <el-input-number
+              v-model="form.freeEpisodes"
+              class="editor-number"
+              controls-position="right"
+              :min="0"
+              :max="200"
+            />
+          </el-form-item>
+          <el-form-item label="单集解锁金币">
+            <el-input-number
+              v-model="form.unlockCoin"
+              class="editor-number"
+              controls-position="right"
+              :min="0"
+              :max="9999"
+            />
+          </el-form-item>
+        </div>
+        <div class="editor-grid editor-grid--two">
+          <el-form-item label="是否热门">
+            <el-switch v-model="form.isHot" />
+          </el-form-item>
+          <el-form-item label="排序权重">
+            <el-input-number
+              v-model="form.sort"
+              class="editor-number"
+              controls-position="right"
+              :min="0"
+              :max="99999"
+              :precision="0"
+            />
+            <p class="readonly-stat-hint">数值越大越靠前，相同权重按 ID 倒序</p>
+          </el-form-item>
+        </div>
+      </section>
+
+      <section class="editor-section">
+        <h3 class="editor-section-title">互动数据</h3>
+        <div class="editor-grid editor-grid--two">
+          <el-form-item label="收藏数">
+            <el-input-number
+              v-model="form.favoriteCount"
+              class="editor-number"
+              controls-position="right"
+              :min="0"
+              :precision="0"
+            />
+          </el-form-item>
+          <el-form-item label="点赞数">
+            <div class="readonly-stat">{{ formatCount(editingLikeCount) }}</div>
+            <p class="readonly-stat-hint">全剧分集汇总，只读</p>
+          </el-form-item>
+          <el-form-item label="热度">
+            <el-input-number
+              v-model="form.heat"
+              class="editor-number"
+              controls-position="right"
+              :min="0"
+              :precision="0"
+            />
+          </el-form-item>
+          <el-form-item label="评论数">
+            <div class="readonly-stat">{{ formatCount(editingCommentCount) }}</div>
+            <p class="readonly-stat-hint">全剧汇总，实时统计，只读</p>
+          </el-form-item>
+        </div>
+      </section>
+
       <section class="editor-section">
         <h3 class="editor-section-title">封面</h3>
         <div class="cover-editor">
@@ -635,119 +776,6 @@ onMounted(async () => {
           </div>
         </div>
       </section>
-
-      <section class="editor-section">
-        <h3 class="editor-section-title">基础信息</h3>
-        <LocaleTextFields
-          :languages="textLanguages"
-          :locales="form.titleLocales"
-          @update:locales="form.titleLocales = $event"
-          label="名称"
-          :maxlength="80"
-          @update:languages="changeTextLanguages"
-        />
-        <div class="editor-grid editor-grid--two">
-          <el-form-item label="类型">
-            <el-select
-              v-model="form.categoryIds"
-              class="drama-multi-select"
-              multiple
-              filterable
-              clearable
-              placeholder="可不选"
-            >
-              <el-option
-                v-for="item in categories"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="标签">
-            <el-select v-model="form.tagId" clearable filterable placeholder="可不选">
-              <el-option v-for="item in tags" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </div>
-        <LocaleTextFields
-          :languages="textLanguages"
-          :locales="form.synopsisLocales"
-          @update:locales="form.synopsisLocales = $event"
-          label="简介"
-          :maxlength="1000"
-          multiline
-          :show-languages="false"
-          :required="false"
-        />
-      </section>
-
-      <section class="editor-section">
-        <h3 class="editor-section-title">付费设置</h3>
-        <div class="editor-grid editor-grid--two">
-          <el-form-item label="免费集数">
-            <el-input-number
-              v-model="form.freeEpisodes"
-              class="editor-number"
-              controls-position="right"
-              :min="0"
-              :max="200"
-            />
-          </el-form-item>
-          <el-form-item label="单集解锁金币">
-            <el-input-number
-              v-model="form.unlockCoin"
-              class="editor-number"
-              controls-position="right"
-              :min="0"
-              :max="9999"
-            />
-          </el-form-item>
-          <el-form-item label="排序">
-            <el-input-number
-              v-model="form.sort"
-              class="editor-number"
-              controls-position="right"
-              :min="0"
-              :max="99999"
-              :precision="0"
-            />
-            <p class="readonly-stat-hint">数值越大越靠前，相同权重按 ID 倒序</p>
-          </el-form-item>
-        </div>
-      </section>
-
-      <section class="editor-section">
-        <h3 class="editor-section-title">互动数据</h3>
-        <div class="editor-grid editor-grid--two">
-          <el-form-item label="收藏数">
-            <el-input-number
-              v-model="form.favoriteCount"
-              class="editor-number"
-              controls-position="right"
-              :min="0"
-              :precision="0"
-            />
-          </el-form-item>
-          <el-form-item label="点赞数">
-            <div class="readonly-stat">{{ formatCount(editingLikeCount) }}</div>
-            <p class="readonly-stat-hint">全剧分集汇总，只读</p>
-          </el-form-item>
-          <el-form-item label="热度">
-            <el-input-number
-              v-model="form.heat"
-              class="editor-number"
-              controls-position="right"
-              :min="0"
-              :precision="0"
-            />
-          </el-form-item>
-          <el-form-item label="评论数">
-            <div class="readonly-stat">{{ formatCount(editingCommentCount) }}</div>
-            <p class="readonly-stat-hint">全剧汇总，实时统计，只读</p>
-          </el-form-item>
-        </div>
-      </section>
     </el-form>
 
     <template #footer>
@@ -788,20 +816,6 @@ onMounted(async () => {
   min-width: 0;
 }
 
-.drama-editor-form :deep(.el-form-item) {
-  margin-right: 0;
-}
-
-.drama-editor-form :deep(.el-form-item__content) {
-  min-width: 0;
-}
-
-.drama-editor-form :deep(.el-input),
-.drama-editor-form :deep(.el-textarea),
-.drama-editor-form :deep(.el-select) {
-  width: 100%;
-}
-
 .tag-wrap {
   display: flex;
   flex-wrap: wrap;

src/views/contentManagement/DramaPlaylistView.vue

@@ -6,12 +6,6 @@ import { computed, onMounted, reactive, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { AppIcon } from '@/components/AppIcon'
 import { AppIcons } from '@/constants/icons'
-import {
-  languageCodes,
-  languageLabel,
-  localesFromColumns,
-  payloadLocales
-} from '@/constants/contentLanguages'
 import {
   bindPlaylistCategoryDramasApi,
   createPlaylistCategoryApi,
@@ -24,7 +18,6 @@ import {
 } from '@/api/admin/dramaPlaylistCategory'
 import { statusClass } from '@/utils/status'
 import { useRbac } from '@/stores/rbac'
-import LocaleTextFields from '@/views/components/LocaleTextFields.vue'
 import PageHeading from '@/views/components/PageHeading.vue'
 
 const { can } = useRbac()
@@ -53,14 +46,7 @@ const keyword = ref('')
 const dialogVisible = ref(false)
 const saving = ref(false)
 const editingId = ref(null)
-const languages = ref(['zh'])
+const form = reactive({ name: '', description: '', sort: 1, status: 1 })
-const emptyForm = () => ({
-  locales: { zh: '' },
-  descriptionLocales: { zh: '' },
-  sort: 1,
-  status: 1
-})
-const form = reactive(emptyForm())
 
 const candidateVisible = ref(false)
 const candidateLoading = ref(false)
@@ -122,37 +108,18 @@ function changePage(value) {
   loadDramas()
 }
 
-function changeLanguages(codes) {
-  languages.value = codes
-  codes.forEach((code) => {
-    if (form.descriptionLocales[code] == null) form.descriptionLocales[code] = ''
-  })
-}
-
 function openCreate() {
   editingId.value = null
-  languages.value = ['zh']
   const maxSort = categories.value.reduce((max, item) => Math.max(max, item.sort || 0), 0)
-  Object.assign(form, emptyForm(), { sort: maxSort + 1 })
+  Object.assign(form, { name: '', description: '', sort: maxSort + 1, status: 1 })
   dialogVisible.value = true
 }
 
 function openEdit(row) {
   editingId.value = row.id
-  const locales = localesFromColumns(row.locales, row.name, row.nameEn, row.nameId)
-  languages.value = languageCodes(locales)
-  const descriptionLocales = localesFromColumns(
-    row.descriptionLocales,
-    row.description,
-    row.descriptionEn,
-    row.descriptionId
-  )
-  languages.value.forEach((code) => {
-    if (descriptionLocales[code] == null) descriptionLocales[code] = ''
-  })
   Object.assign(form, {
-    locales,
+    name: row.name,
-    descriptionLocales,
+    description: row.description || '',
     sort: row.sort ?? 0,
     status: row.status ?? 1
   })
@@ -160,18 +127,15 @@ function openEdit(row) {
 }
 
 async function saveCategory() {
-  const locales = payloadLocales(form.locales, languages.value)
+  if (!form.name.trim()) {
-  const missing = languages.value.find((code) => !locales[code])
+    ElMessage.warning('请填写剧单分类名称')
-  if (!locales.zh || missing) {
-    ElMessage.warning(missing ? `请填写${languageLabel(missing)}名称` : '请填写中文名称')
     return
   }
   saving.value = true
   try {
     const payload = {
-      name: locales.zh,
+      name: form.name.trim(),
-      locales,
+      description: form.description.trim(),
-      descriptionLocales: payloadLocales(form.descriptionLocales, languages.value),
       sort: form.sort,
       status: form.status
     }
@@ -426,27 +390,22 @@ onMounted(loadCategories)
   <el-dialog
     v-model="dialogVisible"
     :title="editingId ? '编辑剧单分类' : '新建剧单分类'"
-    width="640px"
+    width="460px"
   >
     <el-form label-position="top">
-      <LocaleTextFields
+      <el-form-item label="分类名称" required>
-        :languages="languages"
+        <el-input v-model="form.name" maxlength="20" placeholder="例如：本周必看" />
-        :locales="form.locales"
+      </el-form-item>
-        @update:locales="form.locales = $event"
+      <el-form-item label="描述">
-        label="名称"
+        <el-input
-        :maxlength="64"
+          v-model="form.description"
-        @update:languages="changeLanguages"
+          type="textarea"
-      />
+          :rows="2"
-      <LocaleTextFields
+          maxlength="255"
-        :languages="languages"
+          show-word-limit
-        :locales="form.descriptionLocales"
+          placeholder="分类用途说明"
-        @update:locales="form.descriptionLocales = $event"
+        />
-        label="描述"
+      </el-form-item>
-        :maxlength="255"
-        multiline
-        :show-languages="false"
-        :required="false"
-      />
       <div class="playlist-form-row">
         <el-form-item label="排序">
           <el-input-number v-model="form.sort" :min="0" :max="999" />

src/views/contentManagement/TagManagementView.vue

@@ -1,239 +0,0 @@
-<!-- Author: fruit.com.cn -->
-<!-- 标签管理：名称分中文、英文、印尼语。短剧编辑时单选一个标签。 -->
-
-<script setup>
-import { onMounted, reactive, ref } from 'vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { AppIcons } from '@/constants/icons'
-import {
-  languageCodes,
-  languageLabel,
-  localesFromColumns,
-  payloadLocales
-} from '@/constants/contentLanguages'
-import {
-  createContentTagApi,
-  deleteContentTagApi,
-  listContentTagsApi,
-  updateContentTagApi
-} from '@/api/admin/contentTag'
-import { useRbac } from '@/stores/rbac'
-import LocaleTextFields from '@/views/components/LocaleTextFields.vue'
-import PageHeading from '@/views/components/PageHeading.vue'
-
-const { can } = useRbac()
-
-const tags = ref([])
-const loading = ref(false)
-const saving = ref(false)
-const dialogVisible = ref(false)
-const editingId = ref(null)
-const languages = ref(['zh'])
-const DEFAULT_TAG_COLOR = '#E5484D'
-const emptyForm = () => ({
-  locales: { zh: '' },
-  bgColor: DEFAULT_TAG_COLOR,
-  sort: 1,
-  status: 1
-})
-const form = reactive(emptyForm())
-
-async function load() {
-  loading.value = true
-  try {
-    const res = await listContentTagsApi()
-    tags.value = res.data || []
-  } finally {
-    loading.value = false
-  }
-}
-
-function nextSort() {
-  return tags.value.reduce((max, item) => Math.max(max, item.sort || 0), 0) + 1
-}
-
-function openCreate() {
-  editingId.value = null
-  languages.value = ['zh']
-  Object.assign(form, emptyForm(), { sort: nextSort() })
-  dialogVisible.value = true
-}
-
-function openEdit(row) {
-  editingId.value = row.id
-  const locales = localesFromColumns(row.locales, row.name, row.nameEn, row.nameId)
-  languages.value = languageCodes(locales)
-  Object.assign(form, {
-    locales,
-    bgColor: row.bgColor || DEFAULT_TAG_COLOR,
-    sort: row.sort ?? 0,
-    status: row.status ?? 1
-  })
-  dialogVisible.value = true
-}
-
-async function save() {
-  const locales = payloadLocales(form.locales, languages.value)
-  if (!locales.zh) {
-    ElMessage.warning('请填写中文名称')
-    return
-  }
-  const missing = languages.value.find((code) => !locales[code])
-  if (missing) {
-    ElMessage.warning(`请填写${languageLabel(missing)}名称`)
-    return
-  }
-  saving.value = true
-  try {
-    const payload = {
-      name: locales.zh,
-      locales,
-      bgColor: form.bgColor || DEFAULT_TAG_COLOR,
-      sort: form.sort,
-      status: form.status
-    }
-    if (editingId.value) {
-      await updateContentTagApi(editingId.value, payload)
-      ElMessage.success('标签已更新')
-    } else {
-      await createContentTagApi(payload)
-      ElMessage.success('标签已创建')
-    }
-    dialogVisible.value = false
-    await load()
-  } finally {
-    saving.value = false
-  }
-}
-
-async function confirmDelete(row) {
-  try {
-    await ElMessageBox.confirm(
-      `确定删除标签「${row.name}」吗？已选该标签的短剧会取消选择。`,
-      '删除确认',
-      {
-        confirmButtonText: '确认删除',
-        cancelButtonText: '取消',
-        type: 'warning',
-        confirmButtonClass: 'el-button--danger'
-      }
-    )
-  } catch {
-    return
-  }
-  await deleteContentTagApi(row.id)
-  ElMessage.success('标签已删除')
-  await load()
-}
-
-onMounted(load)
-</script>
-
-<template>
-  <PageHeading
-    eyebrow="内容管理"
-    title="标签管理"
-    description="维护短剧标签。名称分中文、英文、印尼语，短剧编辑时单选一个。"
-  >
-    <el-button v-if="can('drama:create')" type="primary" class="primary-button" @click="openCreate">
-      <AppIcon :icon="AppIcons.add" />
-      新建标签
-    </el-button>
-  </PageHeading>
-
-  <section class="panel">
-    <el-table
-      v-loading="loading"
-      :data="tags"
-      row-key="id"
-      border
-      class="drama-el-table"
-      empty-text="还没有标签"
-    >
-      <el-table-column type="index" label="序号" width="80" />
-      <el-table-column prop="name" label="中文名称" min-width="160" />
-      <el-table-column label="语言" min-width="220">
-        <template #default="{ row }">
-          <el-tag
-            v-for="code in languageCodes(
-              row.locales || localesFromColumns(null, row.name, row.nameEn, row.nameId)
-            )"
-            :key="code"
-            effect="light"
-            class="locale-tag"
-            >{{ languageLabel(code) }}</el-tag
-          >
-        </template>
-      </el-table-column>
-      <el-table-column label="背景色" width="100">
-        <template #default="{ row }">
-          <span class="tag-color" :style="{ background: row.bgColor || DEFAULT_TAG_COLOR }"></span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="sort" label="排序" width="100" />
-      <el-table-column label="状态" width="110">
-        <template #default="{ row }">
-          <el-tag :type="row.status === 1 ? 'success' : 'info'" effect="light">{{
-            row.status === 1 ? '启用' : '停用'
-          }}</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" width="200" fixed="right">
-        <template #default="{ row }">
-          <div class="table-actions">
-            <el-button v-if="can('drama:update')" type="primary" size="small" @click="openEdit(row)"
-              >编辑</el-button
-            >
-            <el-button
-              v-if="can('drama:delete')"
-              type="danger"
-              size="small"
-              @click="confirmDelete(row)"
-              >删除</el-button
-            >
-          </div>
-        </template>
-      </el-table-column>
-    </el-table>
-  </section>
-
-  <el-dialog v-model="dialogVisible" :title="editingId ? '编辑标签' : '新建标签'" width="560px">
-    <el-form label-position="top">
-      <LocaleTextFields
-        v-model:languages="languages"
-        :locales="form.locales"
-        @update:locales="form.locales = $event"
-        label="名称"
-        :maxlength="64"
-      />
-      <el-form-item label="背景色">
-        <el-color-picker v-model="form.bgColor" color-format="hex" />
-      </el-form-item>
-      <div class="form-row">
-        <el-form-item label="排序">
-          <el-input-number v-model="form.sort" :min="0" :max="999" />
-        </el-form-item>
-        <el-form-item label="状态">
-          <el-switch v-model="form.status" :active-value="1" :inactive-value="0" />
-        </el-form-item>
-      </div>
-    </el-form>
-    <template #footer>
-      <el-button @click="dialogVisible = false">取消</el-button>
-      <el-button type="primary" :loading="saving" @click="save">保存</el-button>
-    </template>
-  </el-dialog>
-</template>
-
-<style scoped>
-.locale-tag + .locale-tag {
-  margin-left: 6px;
-}
-
-.tag-color {
-  display: inline-block;
-  width: 28px;
-  height: 16px;
-  border-radius: 4px;
-}
-</style>

src/views/contentManagement/upload/BatchUploadDialog.vue

@@ -326,17 +326,17 @@ function onEpisodesCreated(): void {
 
 .batch-upload-hint {
   margin: 0 0 12px;
-  color: var(--el-text-color-secondary);
   font-size: 13px;
+  color: var(--el-text-color-secondary);
 }
 
 .batch-upload-rejected {
-  margin-bottom: 12px;
   padding: 8px 12px;
-  border-radius: 6px;
+  margin-bottom: 12px;
-  background: color-mix(in srgb, var(--el-color-danger) 8%, transparent);
-  color: var(--el-color-danger);
   font-size: 12px;
+  color: var(--el-color-danger);
+  background: color-mix(in srgb, var(--el-color-danger) 8%, transparent);
+  border-radius: 6px;
 }
 
 .batch-upload-rejected p {
@@ -348,12 +348,12 @@ function onEpisodesCreated(): void {
 }
 
 .batch-upload-summary {
-  margin: 0 0 12px;
   padding: 8px 12px;
-  border-radius: 6px;
+  margin: 0 0 12px;
-  background: color-mix(in srgb, var(--el-color-success) 10%, transparent);
-  color: var(--el-text-color-primary);
   font-size: 13px;
+  color: var(--el-text-color-primary);
+  background: color-mix(in srgb, var(--el-color-success) 10%, transparent);
+  border-radius: 6px;
 }
 
 .batch-upload-list {

src/views/contentManagement/upload/CreateEpisodesDialog.vue

@@ -202,9 +202,9 @@ function hasFailed(): boolean {
 <style scoped>
 .create-episode-hint {
   margin: 0 0 12px;
-  color: var(--el-text-color-secondary);
   font-size: 13px;
   line-height: 1.5;
+  color: var(--el-text-color-secondary);
 }
 
 .create-episode-head,
@@ -229,8 +229,8 @@ function hasFailed(): boolean {
 
 .create-episode-head {
   margin-bottom: 8px;
-  color: var(--el-text-color-secondary);
   font-size: 12px;
+  color: var(--el-text-color-secondary);
 }
 
 .create-episode-list {
@@ -253,8 +253,8 @@ function hasFailed(): boolean {
 }
 
 .create-episode-result {
-  color: var(--el-text-color-secondary);
   font-size: 12px;
+  color: var(--el-text-color-secondary);
 }
 
 .create-episode-row.is-saved .create-episode-result {

src/views/contentManagement/upload/UploadTaskRow.vue

@@ -100,10 +100,10 @@ const canRetry = computed(() => props.item.status === 'failed')
 }
 
 .upload-task-row__index {
-  flex: 0 0 auto;
   min-width: 1.5em;
-  color: var(--el-text-color-secondary);
   font-size: 13px;
+  color: var(--el-text-color-secondary);
+  flex: 0 0 auto;
   font-variant-numeric: tabular-nums;
 }
 
@@ -116,22 +116,22 @@ const canRetry = computed(() => props.item.status === 'failed')
 
 .upload-task-row__error {
   margin: 6px 0 0;
-  color: var(--el-color-danger);
   font-size: 12px;
+  color: var(--el-color-danger);
 }
 
 .upload-task-row__actions {
-  margin-top: 8px;
   display: flex;
+  margin-top: 8px;
+  margin-left: auto;
   gap: 8px;
   justify-content: flex-end;
-  margin-left: auto;
 }
 
 .upload-task-row.is-failed {
+  padding-right: 8px;
+  padding-left: 8px;
   background: color-mix(in srgb, var(--el-color-danger) 6%, transparent);
   border-radius: 6px;
-  padding-left: 8px;
-  padding-right: 8px;
 }
 </style>

src/views/dashboard/BusinessDashboardView.vue

@@ -1,324 +1,145 @@
 <!-- Author: fruit.com.cn -->
 
-<script setup lang="ts">
+<script setup>
-import { nextTick, onBeforeUnmount, onMounted, ref } from 'vue'
+import { onMounted, ref } from 'vue'
 import PageHeading from '@/views/components/PageHeading.vue'
-import DashboardMetricWall from '@/views/dashboard/DashboardMetricWall.vue'
+import { getDashboardOverviewApi, getTranscodeBoardApi } from '@/api/admin/dashboard'
-import echarts from '@/plugins/echarts'
-import {
-  getDashboardDistributionApi,
-  getDashboardOverviewApi,
-  getDashboardTrendApi,
-  getTranscodeBoardApi
-} from '@/api/admin/dashboard'
-import type {
-  DashboardDistribution,
-  DashboardOverview,
-  DashboardTrend,
-  TranscodeBoard
-} from '@/api/admin/dashboard'
 import { dateCell } from '@/utils/format'
 
+/**
+ * 指标展示配置：key 与后端 /admin/dashboard/overview 返回的字段一一对应，
+ * 不在前端编字段；口径说明见后端 DashboardService 注释与 docs/api-phase1.md「2.8」。
+ */
+const GROUPS = [
+  {
+    key: 'user',
+    title: '用户',
+    metrics: [
+      { key: 'total', label: '总用户数' },
+      { key: 'newToday', label: '今日新增' },
+      { key: 'new7d', label: '近 7 天新增' },
+      { key: 'active7d', label: '近 7 天活跃' },
+      { key: 'banned', label: '封禁' },
+      { key: 'limited', label: '受限' },
+      { key: 'deactivated', label: '已注销' }
+    ]
+  },
+  {
+    key: 'content',
+    title: '内容',
+    metrics: [
+      { key: 'dramaTotal', label: '短剧总数' },
+      { key: 'dramaPublished', label: '已上线短剧' },
+      { key: 'dramaReviewing', label: '待审短剧' },
+      { key: 'dramaDraft', label: '草稿短剧' },
+      { key: 'dramaOffline', label: '已下线短剧' },
+      { key: 'episodeTotal', label: '剧集总数' },
+      { key: 'episodePublished', label: '已上线剧集' },
+      { key: 'episodeWithMedia', label: '有片源剧集' },
+      { key: 'commentPending', label: '待审评论' },
+      { key: 'reportPending', label: '待处理举报' }
+    ]
+  },
+  {
+    key: 'playback',
+    title: '播放',
+    metrics: [
+      { key: 'viewTotal', label: '累计观看' },
+      { key: 'playTotal', label: '累计播放' },
+      { key: 'watchedDramas', label: '看过的剧（去重）' },
+      { key: 'finishedDramas', label: '看过且完播' },
+      { key: 'finishRate', label: '完播率' },
+      { key: 'playEvents7d', label: '近 7 天播放流水' },
+      { key: 'playEventsTotal', label: '播放流水总量' }
+    ]
+  },
+  {
+    key: 'revenue',
+    title: '收入',
+    metrics: [
+      { key: 'orderTotal', label: '订单总数' },
+      { key: 'orderDelivered', label: '已交付订单' },
+      { key: 'orderRefunded', label: '已退款订单' },
+      { key: 'paidAmount', label: '已支付金额' },
+      { key: 'coinRecharged', label: '金币充值' },
+      { key: 'coinConsumed', label: '金币消耗' },
+      { key: 'coinBalance', label: '金币余额' },
+      { key: 'entitlementActive', label: '有效权益' }
+    ]
+  },
+  {
+    key: 'cost',
+    title: '成本',
+    metrics: [
+      { key: 'transcodeQueued', label: '转码排队' },
+      { key: 'transcodeRunning', label: '转码中' },
+      { key: 'transcodeFailed', label: '转码失败' },
+      { key: 'transcodeSuccess', label: '转码成功' },
+      { key: 'renditions', label: '多码率产物' },
+      { key: 'otpSent7d', label: '近 7 天验证码' },
+      { key: 'cdnTrafficBytes', label: 'CDN 流量' }
+    ]
+  }
+]
+
 const loading = ref(false)
-const overview = ref<DashboardOverview | null>(null)
+const overview = ref(null)
-const trend = ref<DashboardTrend | null>(null)
+const transcode = ref(null)
-const distribution = ref<DashboardDistribution | null>(null)
-const transcode = ref<TranscodeBoard | null>(null)
 const lastUpdated = ref('')
 
-/** ECharts 容器 ref 与实例，统一管理 resize / dispose。 */
+async function load() {
-const trendRef = ref<HTMLElement>()
-const dramaPieRef = ref<HTMLElement>()
-const transcodePieRef = ref<HTMLElement>()
-const episodePieRef = ref<HTMLElement>()
-const chartInstances: echarts.ECharts[] = []
-
-const statusLabel = {
-  reviewing: '待审',
-  published: '已上线',
-  draft: '草稿',
-  offline: '已下线'
-} as const
-
-const transcodeStatusLabel = {
-  QUEUED: '排队中',
-  RUNNING: '执行中',
-  SUCCESS: '成功',
-  FAILED: '失败',
-  CANCELED: '已取消'
-} as const
-
-function renderCharts() {
-  disposeAll()
-  renderTrend()
-  renderDramaPie()
-  renderTranscodePie()
-  renderEpisodePie()
-  renderQueueBar()
-}
-
-const queueBarRef = ref<HTMLElement>()
-function renderQueueBar() {
-  if (!queueBarRef.value || !transcode.value) return
-  const q = transcode.value.queue || {}
-  const chart = echarts.init(queueBarRef.value)
-  chartInstances.push(chart)
-  chart.setOption({
-    tooltip: { trigger: 'axis', axisPointer: { type: 'shadow' } },
-    grid: { left: 80, right: 24, top: 16, bottom: 24 },
-    xAxis: { type: 'value', splitLine: { lineStyle: { type: 'dashed' } } },
-    yAxis: { type: 'category', data: ['排队', '执行中', '成功', '失败'] },
-    series: [
-      {
-        type: 'bar',
-        data: [q.queued || 0, q.running || 0, q.success || 0, q.failed || 0],
-        itemStyle: {
-          borderRadius: [0, 4, 4, 0],
-          color: (p: { dataIndex: number }) =>
-            ['#F6BD16', '#5B8FF9', '#5AD8A6', '#E86452'][p.dataIndex]
-        },
-        label: { show: true, position: 'right' }
-      }
-    ]
-  })
-}
-
-async function loadAndRender() {
   loading.value = true
   try {
-    const [board, t, dist, queue] = await Promise.all([
+    const [board, queue] = await Promise.all([getDashboardOverviewApi(), getTranscodeBoardApi()])
-      getDashboardOverviewApi(),
-      getDashboardTrendApi(),
-      getDashboardDistributionApi(),
-      getTranscodeBoardApi()
-    ])
     overview.value = board.data || null
-    trend.value = t.data || null
-    distribution.value = dist.data || null
     transcode.value = queue.data || null
     lastUpdated.value = new Date().toLocaleString()
-    await nextTick()
-    renderCharts()
   } finally {
     loading.value = false
   }
 }
 
-function disposeAll() {
+/** 取不到的指标后端返回 null，这里显示「暂无数据源」而不是 0 */
-  chartInstances.forEach((c) => c.dispose())
+function display(value) {
-  chartInstances.length = 0
+  if (value === null || value === undefined) return '暂无数据源'
+  if (typeof value === 'number' && !Number.isInteger(value)) return value.toFixed(3)
+  return value
 }
 
-const basePieSeriesOption = {
+function groupValue(groupKey, metricKey) {
-  type: 'pie' as const,
+  return overview.value?.[groupKey]?.[metricKey]
-  radius: ['40%', '70%'],
-  avoidLabelOverlap: true,
-  itemStyle: { borderRadius: 6, borderColor: '#fff', borderWidth: 2 },
-  label: { show: false, position: 'center' },
-  emphasis: {
-    label: { show: true, fontSize: 16, fontWeight: 'bold' }
-  }
 }
 
-function renderTrend() {
+onMounted(load)
-  if (!trendRef.value || !trend.value) return
-  const chart = echarts.init(trendRef.value)
-  chartInstances.push(chart)
-  chart.setOption({
-    tooltip: { trigger: 'axis', axisPointer: { type: 'cross' } },
-    legend: { top: 0, textStyle: { fontSize: 12 } },
-    grid: { left: 48, right: 48, top: 40, bottom: 28 },
-    xAxis: { type: 'category', data: trend.value.dates, boundaryGap: false },
-    yAxis: [
-      { type: 'value', name: '用户/播放', splitLine: { lineStyle: { type: 'dashed' } } },
-      { type: 'value', name: '转码任务', splitLine: { show: false } }
-    ],
-    series: [
-      {
-        name: '新增用户',
-        type: 'line',
-        smooth: true,
-        yAxisIndex: 0,
-        data: trend.value.newUsers,
-        itemStyle: { color: '#5B8FF9' }
-      },
-      {
-        name: '播放事件',
-        type: 'line',
-        smooth: true,
-        yAxisIndex: 0,
-        data: trend.value.playEvents,
-        itemStyle: { color: '#5AD8A6' }
-      },
-      {
-        name: '新增转码',
-        type: 'bar',
-        yAxisIndex: 1,
-        data: trend.value.newTranscodes,
-        itemStyle: { color: '#F6BD16', borderRadius: [3, 3, 0, 0] }
-      },
-      {
-        name: '转码成功',
-        type: 'bar',
-        yAxisIndex: 1,
-        data: trend.value.transcodeSuccess,
-        itemStyle: { color: '#945FB9', borderRadius: [3, 3, 0, 0] }
-      }
-    ]
-  })
-}
-
-function renderDramaPie() {
-  if (!dramaPieRef.value || !distribution.value) return
-  const data = Object.entries(distribution.value.dramaStatus || {}).map(([k, v]) => ({
-    name: (statusLabel as Record<string, string>)[k] || k,
-    value: v
-  }))
-  const chart = echarts.init(dramaPieRef.value)
-  chartInstances.push(chart)
-  chart.setOption({
-    tooltip: { trigger: 'item', formatter: '{b}: {c} ({d}%)' },
-    legend: { bottom: 0, itemWidth: 12, itemHeight: 12, textStyle: { fontSize: 12 } },
-    color: ['#F6BD16', '#5AD8A6', '#5B8FF9', '#E86452'],
-    series: [{ ...basePieSeriesOption, name: '短剧状态', data }]
-  })
-}
-
-function renderTranscodePie() {
-  if (!transcodePieRef.value || !distribution.value) return
-  const data = Object.entries(distribution.value.transcodeStatus || {}).map(([k, v]) => ({
-    name: (transcodeStatusLabel as Record<string, string>)[k] || k,
-    value: v
-  }))
-  const chart = echarts.init(transcodePieRef.value)
-  chartInstances.push(chart)
-  chart.setOption({
-    tooltip: { trigger: 'item', formatter: '{b}: {c} ({d}%)' },
-    legend: { bottom: 0, itemWidth: 12, itemHeight: 12, textStyle: { fontSize: 12 } },
-    color: ['#F6BD16', '#5B8FF9', '#5AD8A6', '#E86452', '#C9C9C9'],
-    series: [{ ...basePieSeriesOption, name: '转码状态', data }]
-  })
-}
-
-function renderEpisodePie() {
-  if (!episodePieRef.value || !distribution.value) return
-  const data = Object.entries(distribution.value.episodeMedia || {}).map(([k, v]) => ({
-    name: k,
-    value: v
-  }))
-  const chart = echarts.init(episodePieRef.value)
-  chartInstances.push(chart)
-  chart.setOption({
-    tooltip: { trigger: 'item', formatter: '{b}: {c} ({d}%)' },
-    legend: { bottom: 0, itemWidth: 12, itemHeight: 12, textStyle: { fontSize: 12 } },
-    color: ['#5AD8A6', '#E86452'],
-    series: [{ ...basePieSeriesOption, name: '片源覆盖', data }]
-  })
-}
-
-function onResize() {
-  chartInstances.forEach((c) => c.resize())
-}
-
-onMounted(loadAndRender)
-window.addEventListener('resize', onResize)
-onBeforeUnmount(() => {
-  disposeAll()
-  window.removeEventListener('resize', onResize)
-})
 </script>
 
 <template>
   <PageHeading
     eyebrow="数据看板"
     title="运营大盘"
-    description="用户、设备、留存、内容、播放与成本总览，以及近 7 天趋势。"
+    description="用户、内容、播放、收入与成本总览，以及转码队列。"
   >
-    <el-button :loading="loading" @click="loadAndRender">刷新</el-button>
+    <el-button :loading="loading" @click="load">刷新</el-button>
   </PageHeading>
 
-  <div v-loading="loading" class="board-wrap">
+  <section v-loading="loading" class="panel">
-    <DashboardMetricWall :overview="overview" :trend="trend" />
+    <p class="console-hint"
-
+      >数据时间：{{ lastUpdated }}（口径见每组的后端定义，缺数据源显示「暂无数据源」）</p
-    <!-- 趋势折线图（双 Y 轴 + 柱） -->
+    >
-    <section class="panel chart-panel">
+    <div v-for="group in GROUPS" :key="group.key" class="board-group">
-      <div class="panel-heading">
+      <h3 class="board-title">{{ group.title }}</h3>
-        <div>
+      <div class="board-grid">
-          <h2>近 7 天趋势</h2>
+        <div v-for="metric in group.metrics" :key="metric.key" class="board-card">
-          <p>每日新增用户 / 播放事件 / 转码任务</p>
+          <span class="board-label">{{ metric.label }}</span>
-        </div>
+          <span
-        <span class="muted">数据时间：{{ lastUpdated }}</span>
+            class="board-value"
-      </div>
+            :class="{ 'board-value-empty': groupValue(group.key, metric.key) === null }"
-      <div ref="trendRef" class="chart chart-lg"></div>
-    </section>
-
-    <!-- 分布饼图组 -->
-    <section class="panel">
-      <div class="panel-heading">
-        <div>
-          <h2>状态分布</h2>
-          <p>短剧状态 / 转码状态 / 片源覆盖</p>
-        </div>
-      </div>
-      <div class="pie-row">
-        <div class="pie-cell">
-          <div class="pie-title">短剧状态</div>
-          <div ref="dramaPieRef" class="chart chart-pie"></div>
-        </div>
-        <div class="pie-cell">
-          <div class="pie-title">转码状态</div>
-          <div ref="transcodePieRef" class="chart chart-pie"></div>
-        </div>
-        <div class="pie-cell">
-          <div class="pie-title">片源覆盖</div>
-          <div ref="episodePieRef" class="chart chart-pie"></div>
-        </div>
-      </div>
-    </section>
-
-    <!-- 转码队列 + 失败明细 -->
-    <section class="panel transcode-panel">
-      <div class="panel-heading">
-        <div>
-          <h2>转码看板</h2>
-          <p>队列积压与失败任务明细</p>
-        </div>
-        <p class="muted">{{ transcode?.notes?.join('；') || '' }}</p>
-      </div>
-      <div class="transcode-grid">
-        <div ref="queueBarRef" class="chart chart-bar"></div>
-        <div class="transcode-fail">
-          <h3>失败任务（最近 20 条）</h3>
-          <el-table
-            :data="transcode?.failedTasks || []"
-            border
-            class="drama-el-table"
-            empty-text="当前没有失败的转码任务"
-            size="small"
           >
-            <el-table-column prop="id" label="任务ID" width="100" />
+            {{ display(groupValue(group.key, metric.key)) }}
-            <el-table-column prop="episodeId" label="剧集" width="100" />
+          </span>
-            <el-table-column prop="status" label="状态" width="90" />
-            <el-table-column prop="retryCount" label="重试" width="70" />
-            <el-table-column
-              prop="errorMsg"
-              label="失败原因"
-              min-width="220"
-              show-overflow-tooltip
-            />
-            <el-table-column
-              prop="createdAt"
-              label="创建时间"
-              min-width="160"
-              show-overflow-tooltip
-              :formatter="dateCell"
-            />
-          </el-table>
         </div>
       </div>
-    </section>
+    </div>
-
-    <!-- 口径说明 -->
     <el-alert
       v-if="overview?.notes?.length"
       class="board-notes"
@@ -331,105 +152,31 @@ onBeforeUnmount(() => {
         <li v-for="note in overview.notes" :key="note">{{ note }}</li>
       </ul>
     </el-alert>
-  </div>
+  </section>
+
+  <section class="panel board-transcode">
+    <h3 class="board-title">转码看板</h3>
+    <p class="console-hint">
+      {{ transcode?.notes?.join('；') || '' }}
+    </p>
+    <el-table
+      :data="transcode?.failedTasks || []"
+      border
+      class="drama-el-table"
+      empty-text="当前没有失败的转码任务"
+    >
+      <el-table-column prop="id" label="任务ID" width="90" />
+      <el-table-column prop="episodeId" label="剧集ID" width="90" />
+      <el-table-column prop="status" label="状态" width="110" />
+      <el-table-column prop="retryCount" label="重试次数" width="100" />
+      <el-table-column prop="errorMsg" label="失败原因" min-width="240" show-overflow-tooltip />
+      <el-table-column
+        prop="createdAt"
+        label="创建时间"
+        min-width="165"
+        show-overflow-tooltip
+        :formatter="dateCell"
+      />
+    </el-table>
+  </section>
 </template>
-
-<style scoped lang="less">
-.board-wrap {
-  display: flex;
-  flex-direction: column;
-  gap: 16px;
-}
-
-.panel {
-  padding: 20px 24px;
-  background: var(--el-bg-color);
-  border: 1px solid var(--el-border-color-lighter);
-  border-radius: 8px;
-}
-
-.panel-heading {
-  display: flex;
-  justify-content: space-between;
-  align-items: flex-start;
-  margin-bottom: 12px;
-
-  h2 {
-    margin: 0;
-    font-size: 16px;
-    font-weight: 600;
-  }
-
-  h3 {
-    margin: 0 0 8px;
-    font-size: 14px;
-    font-weight: 600;
-  }
-
-  p {
-    margin: 4px 0 0;
-    font-size: 13px;
-    color: var(--el-text-color-secondary);
-  }
-
-  .muted {
-    font-size: 12px;
-    color: var(--el-text-color-placeholder);
-  }
-}
-
-.chart {
-  width: 100%;
-}
-
-.chart-lg {
-  height: 320px;
-}
-
-.chart-pie {
-  height: 220px;
-}
-
-.chart-bar {
-  height: 220px;
-}
-
-.pie-row {
-  display: grid;
-  grid-template-columns: repeat(3, 1fr);
-  gap: 16px;
-}
-
-.pie-cell {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-
-  .pie-title {
-    margin-bottom: 4px;
-    font-size: 13px;
-    color: var(--el-text-color-secondary);
-  }
-}
-
-.transcode-grid {
-  display: grid;
-  grid-template-columns: 1fr 2fr;
-  gap: 20px;
-}
-
-.board-notes {
-  :deep(ul) {
-    padding-left: 18px;
-    margin: 4px 0 0;
-    font-size: 12px;
-  }
-}
-
-@media (width <= 900px) {
-  .pie-row,
-  .transcode-grid {
-    grid-template-columns: 1fr;
-  }
-}
-</style>

src/views/dashboard/DashboardMetricWall.vue

@@ -1,445 +0,0 @@
-<!-- Author: fruit.com.cn -->
-<!-- 工作台可视化大屏：用户、设备、留存与内容趋势。 -->
-
-<script setup lang="ts">
-import { computed, nextTick, onBeforeUnmount, onMounted, ref, watch } from 'vue'
-import echarts from '@/plugins/echarts'
-import type { DashboardOverview, DashboardTrend } from '@/api/admin/dashboard'
-import { formatCount } from '@/utils/format'
-
-const props = defineProps<{
-  overview: DashboardOverview | null
-  trend?: DashboardTrend | null
-  fallback?: Record<string, number>
-}>()
-
-const trendRef = ref<HTMLElement>()
-const deviceRef = ref<HTMLElement>()
-const clock = ref('')
-let trendChart: echarts.ECharts | null = null
-let deviceChart: echarts.ECharts | null = null
-let timer = 0
-
-const AXIS = '#909399'
-const SPLIT = '#e6e8eb'
-const BRAND = '#c4322a'
-const AMBER = '#e9aa4b'
-
-const kpis = computed(() => [
-  { label: '总用户数', value: text('user', 'total'), accent: BRAND },
-  { label: '今日新增', value: text('user', 'newToday'), accent: '#55b987' },
-  { label: '近 7 天新增', value: text('user', 'new7d'), accent: AMBER },
-  { label: '近 7 天活跃', value: text('user', 'active7d'), accent: '#d3615b' },
-  { label: '累计播放', value: text('playback', 'viewTotal'), accent: BRAND },
-  { label: '已上线短剧', value: text('content', 'dramaPublished'), accent: '#55b987' }
-])
-
-const rails = computed(() => [
-  { label: '短剧总数', value: text('content', 'dramaTotal') },
-  { label: '待审核', value: text('content', 'dramaReviewing') },
-  { label: '有片源', value: text('content', 'episodeWithMedia') },
-  { label: '近 7 天播放', value: text('playback', 'playEvents7d') },
-  { label: '完播率', value: rate('playback', 'finishRate') },
-  { label: '金币消耗', value: text('revenue', 'coinConsumed') },
-  { label: '转码中', value: text('cost', 'transcodeRunning') },
-  { label: '转码排队', value: text('cost', 'transcodeQueued') }
-])
-
-const retentionDay = computed(() => percent('user', 'retention1d'))
-const retentionWeek = computed(() => percent('user', 'retention7d'))
-
-function metric(group: string, key: string) {
-  const source = props.overview?.[group as keyof DashboardOverview]
-  if (source && typeof source === 'object') {
-    const value = (source as Record<string, number | null>)[key]
-    if (value !== undefined && value !== null) return Number(value)
-  }
-  const fallback = props.fallback?.[`${group}.${key}`]
-  return fallback == null ? null : Number(fallback)
-}
-
-function text(group: string, key: string) {
-  const value = metric(group, key)
-  return value == null || Number.isNaN(value) ? '--' : formatCount(value)
-}
-
-function percent(group: string, key: string) {
-  const value = metric(group, key)
-  if (value == null || Number.isNaN(value)) return null
-  return Math.max(0, Math.min(100, Math.round(value * 1000) / 10))
-}
-
-function rate(group: string, key: string) {
-  const value = percent(group, key)
-  return value == null ? '--' : `${value.toFixed(1)}%`
-}
-
-function tick() {
-  clock.value = new Date().toLocaleString('zh-CN', { hour12: false })
-}
-
-function renderCharts() {
-  renderTrend()
-  renderDevices()
-}
-
-function renderTrend() {
-  if (!trendRef.value) return
-  trendChart = trendChart ?? echarts.init(trendRef.value)
-  const trend = props.trend
-  trendChart.setOption({
-    backgroundColor: 'transparent',
-    tooltip: {
-      trigger: 'axis',
-      backgroundColor: '#fff',
-      borderColor: '#e6e8eb',
-      textStyle: { color: '#303640' }
-    },
-    legend: { top: 0, left: 0, textStyle: { color: AXIS }, itemWidth: 12, itemHeight: 8 },
-    grid: { left: 42, right: 16, top: 32, bottom: 24 },
-    xAxis: {
-      type: 'category',
-      data: trend?.dates ?? [],
-      axisLine: { lineStyle: { color: 'rgba(255,255,255,.16)' } },
-      axisLabel: { color: AXIS, fontSize: 11 }
-    },
-    yAxis: {
-      type: 'value',
-      splitLine: { lineStyle: { color: SPLIT, type: 'dashed' } },
-      axisLabel: { color: AXIS, fontSize: 11 }
-    },
-    series: [
-      {
-        name: '新增用户',
-        type: 'line',
-        smooth: true,
-        showSymbol: false,
-        data: trend?.newUsers ?? [],
-        lineStyle: { width: 2, color: BRAND },
-        areaStyle: { color: 'rgba(196, 50, 42, 0.12)' }
-      },
-      {
-        name: '播放事件',
-        type: 'line',
-        smooth: true,
-        showSymbol: false,
-        data: trend?.playEvents ?? [],
-        lineStyle: { width: 2, color: AMBER }
-      }
-    ]
-  })
-}
-
-function renderDevices() {
-  if (!deviceRef.value) return
-  deviceChart = deviceChart ?? echarts.init(deviceRef.value)
-  const android = metric('user', 'androidActive7d') ?? 0
-  const ios = metric('user', 'iosActive7d') ?? 0
-  deviceChart.setOption({
-    backgroundColor: 'transparent',
-    tooltip: {
-      trigger: 'item',
-      backgroundColor: '#fff',
-      borderColor: '#e6e8eb',
-      textStyle: { color: '#303640' }
-    },
-    legend: { bottom: 0, textStyle: { color: AXIS }, itemWidth: 10, itemHeight: 10 },
-    title: {
-      text: formatCount(android + ios),
-      subtext: '活跃设备',
-      left: 'center',
-      top: '38%',
-      textStyle: { color: '#303640', fontSize: 22, fontWeight: 700 },
-      subtextStyle: { color: AXIS, fontSize: 12 }
-    },
-    series: [
-      {
-        type: 'pie',
-        radius: ['58%', '76%'],
-        center: ['50%', '46%'],
-        label: { show: false },
-        data: [
-          { name: 'Android', value: android, itemStyle: { color: '#55b987' } },
-          { name: 'iOS', value: ios, itemStyle: { color: BRAND } }
-        ]
-      }
-    ]
-  })
-}
-
-function onResize() {
-  trendChart?.resize()
-  deviceChart?.resize()
-}
-
-watch(
-  () => [props.overview, props.trend],
-  () => nextTick(renderCharts),
-  { deep: true }
-)
-
-onMounted(() => {
-  tick()
-  timer = window.setInterval(tick, 1000)
-  window.addEventListener('resize', onResize)
-  nextTick(renderCharts)
-})
-
-onBeforeUnmount(() => {
-  window.clearInterval(timer)
-  window.removeEventListener('resize', onResize)
-  trendChart?.dispose()
-  deviceChart?.dispose()
-})
-</script>
-
-<template>
-  <section class="screen">
-    <header class="screen-head">
-      <h2>运营概览</h2>
-      <time>{{ clock }}</time>
-    </header>
-
-    <div class="kpi-row">
-      <article v-for="item in kpis" :key="item.label" class="kpi">
-        <i :style="{ background: item.accent }"></i>
-        <div>
-          <strong>{{ item.value }}</strong>
-          <span>{{ item.label }}</span>
-        </div>
-      </article>
-    </div>
-
-    <div class="viz-row">
-      <article class="panel trend-panel">
-        <h3>近 7 日新增与播放</h3>
-        <div ref="trendRef" class="chart"></div>
-      </article>
-      <article class="panel">
-        <h3>活跃设备占比</h3>
-        <div ref="deviceRef" class="chart"></div>
-      </article>
-      <article class="panel retain">
-        <h3>用户留存</h3>
-        <div class="rings">
-          <div class="ring" :style="{ '--p': `${retentionDay ?? 0}%` }">
-            <strong>{{ retentionDay == null ? '--' : `${retentionDay.toFixed(1)}%` }}</strong>
-            <span>次日留存</span>
-          </div>
-          <div class="ring week" :style="{ '--p': `${retentionWeek ?? 0}%` }">
-            <strong>{{ retentionWeek == null ? '--' : `${retentionWeek.toFixed(1)}%` }}</strong>
-            <span>7 日留存</span>
-          </div>
-        </div>
-      </article>
-    </div>
-
-    <div class="rail">
-      <div v-for="item in rails" :key="item.label">
-        <strong>{{ item.value }}</strong>
-        <span>{{ item.label }}</span>
-      </div>
-    </div>
-  </section>
-</template>
-
-<style scoped lang="less">
-.screen {
-  display: flex;
-  flex-direction: column;
-  gap: 12px;
-  min-width: 0;
-  min-height: 0;
-  color: #303640;
-}
-
-.screen-head {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-
-  h2 {
-    margin: 0;
-    font-size: 14px;
-    font-weight: 600;
-    color: #2f343c;
-  }
-}
-
-time {
-  font-size: 12px;
-  color: #909399;
-  font-variant-numeric: tabular-nums;
-}
-
-.kpi-row,
-.viz-row,
-.rail {
-  min-width: 0;
-}
-
-.kpi-row {
-  display: grid;
-  grid-template-columns: repeat(6, minmax(0, 1fr));
-  gap: 12px;
-}
-
-.kpi {
-  display: flex;
-  gap: 10px;
-  align-items: center;
-  min-width: 0;
-  min-height: 72px;
-  padding: 12px 14px;
-  background: #fff;
-  border: 1px solid #e6e8eb;
-  border-radius: 6px;
-
-  i {
-    width: 3px;
-    height: 32px;
-    border-radius: 3px;
-    flex: none;
-  }
-
-  strong {
-    display: block;
-    overflow: hidden;
-    font-size: 22px;
-    line-height: 1.1;
-    color: #303640;
-    font-variant-numeric: tabular-nums;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-
-  span {
-    display: block;
-    margin-top: 4px;
-    font-size: 12px;
-    color: #909399;
-  }
-}
-
-.viz-row {
-  display: grid;
-  grid-template-columns: minmax(0, 1.4fr) minmax(0, 0.8fr) minmax(0, 0.7fr);
-  gap: 12px;
-  flex: 1;
-  min-height: 220px;
-}
-
-.panel {
-  display: flex;
-  flex-direction: column;
-  min-width: 0;
-  min-height: 0;
-  padding: 12px 14px 8px;
-  background: #fff;
-  border: 1px solid #e6e8eb;
-  border-radius: 6px;
-
-  h3 {
-    margin: 0;
-    font-size: 13px;
-    font-weight: 600;
-    color: #2f343c;
-  }
-}
-
-.chart {
-  width: 100%;
-  height: 240px;
-}
-
-.rings {
-  display: flex;
-  flex: 1;
-  justify-content: space-around;
-  align-items: center;
-  min-height: 180px;
-}
-
-.ring {
-  --p: 0%;
-
-  display: grid;
-  width: 112px;
-  height: 112px;
-  background: conic-gradient(#c4322a var(--p), #f5d9d8 0);
-  border-radius: 50%;
-  place-items: center;
-
-  &::after {
-    width: 82px;
-    height: 82px;
-    background: #fff;
-    border-radius: 50%;
-    content: '';
-    grid-area: 1 / 1;
-  }
-
-  strong,
-  span {
-    grid-area: 1 / 1;
-    z-index: 1;
-  }
-
-  strong {
-    margin-top: -12px;
-    font-size: 16px;
-    color: #303640;
-  }
-
-  span {
-    margin-top: 24px;
-    font-size: 12px;
-    color: #909399;
-  }
-}
-
-.week {
-  background: conic-gradient(#e9aa4b var(--p), #fff5e7 0);
-}
-
-.rail {
-  display: grid;
-  grid-template-columns: repeat(8, minmax(0, 1fr));
-  gap: 12px;
-
-  div {
-    min-width: 0;
-    padding: 10px 8px;
-    text-align: center;
-    background: #fff;
-    border: 1px solid #e6e8eb;
-    border-radius: 6px;
-  }
-
-  strong {
-    display: block;
-    overflow: hidden;
-    font-size: 16px;
-    color: #303640;
-    font-variant-numeric: tabular-nums;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-  }
-
-  span {
-    font-size: 12px;
-    color: #909399;
-  }
-}
-
-@media (width <= 760px) {
-  .kpi-row {
-    grid-template-columns: repeat(2, minmax(0, 1fr));
-  }
-
-  .viz-row,
-  .rail {
-    grid-template-columns: minmax(0, 1fr);
-  }
-}
-</style>

src/views/systemManagement/AppVersionView.vue

@@ -1,519 +0,0 @@
-<!-- Author: fruit.com.cn -->
-
-<script setup lang="ts">
-import type { FormInstance, FormRules } from 'element-plus'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { computed, ref } from 'vue'
-import PageHeading from '@/views/components/PageHeading.vue'
-import { AppIcons } from '@/constants/icons'
-import { dateCell } from '@/utils/format'
-import {
-  batchCreateAppVersionsApi,
-  deleteAppVersionApi,
-  listAppVersionsApi,
-  updateAppVersionApi,
-  updateAppVersionStatusApi
-} from '@/api/admin/appVersion'
-import type { AppVersionItem, AppVersionSaveData } from '@/api/admin/appVersion'
-
-const platformOptions = [
-  { label: 'Android', value: 'ANDROID' },
-  { label: 'iOS', value: 'IOS' }
-]
-const statusOptions = [
-  { label: '已发布', value: 1 },
-  { label: '已下架', value: 0 }
-]
-
-interface FilterState {
-  platform: string
-  status: number | undefined
-  keyword: string
-}
-
-const loading = ref(false)
-const list = ref<AppVersionItem[]>([])
-const total = ref(0)
-const pageIndex = ref(1)
-const pageSize = ref(20)
-const filter = ref<FilterState>({ platform: '', status: undefined, keyword: '' })
-
-const dialogOpen = ref(false)
-const formLoading = ref(false)
-const editingId = ref<string | null>(null)
-const formRef = ref<FormInstance>()
-
-/** 新建时两个平台一起配（各自可启停），编辑时用单份。 */
-interface PlatformBlock {
-  enabled: boolean
-  data: AppVersionSaveData
-}
-const emptyPlatform = (platform: 'ANDROID' | 'IOS'): AppVersionSaveData => ({
-  platform,
-  versionCode: 0,
-  versionName: '',
-  downloadUrl: '',
-  updateContent: '',
-  forceUpdate: 0,
-  minSupportedCode: 0
-})
-const androidBlock = ref<PlatformBlock>({ enabled: true, data: emptyPlatform('ANDROID') })
-const iosBlock = ref<PlatformBlock>({ enabled: true, data: emptyPlatform('IOS') })
-const editForm = ref<AppVersionSaveData>(emptyPlatform('ANDROID'))
-
-const rules: FormRules = {
-  platform: [{ required: true, message: '请选择平台', trigger: 'change' }],
-  versionCode: [
-    { required: true, message: '请填写整数版本号', trigger: 'blur' },
-    { type: 'number', min: 1, max: 999999, message: '范围 1~999999', trigger: 'blur' }
-  ],
-  versionName: [
-    { required: true, message: '请填写展示版本号', trigger: 'blur' },
-    { max: 32, message: '最长 32 字符', trigger: 'blur' }
-  ],
-  downloadUrl: [
-    { required: true, message: '请填写下载地址', trigger: 'blur' },
-    { max: 512, message: '最长 512 字符', trigger: 'blur' }
-  ]
-}
-
-async function fetchList() {
-  loading.value = true
-  try {
-    const res = await listAppVersionsApi({
-      pageIndex: pageIndex.value,
-      pageSize: pageSize.value,
-      platform: filter.value.platform || undefined,
-      status: filter.value.status,
-      keyword: filter.value.keyword.trim() || undefined
-    })
-    list.value = res.data?.list ?? []
-    total.value = res.data?.total ?? 0
-  } catch {
-    /* axios interceptor 已弹消息 */
-  } finally {
-    loading.value = false
-  }
-}
-
-function openCreate() {
-  editingId.value = null
-  androidBlock.value = { enabled: true, data: emptyPlatform('ANDROID') }
-  iosBlock.value = { enabled: true, data: emptyPlatform('IOS') }
-  dialogOpen.value = true
-}
-
-function openEdit(row: AppVersionItem) {
-  editingId.value = row.id
-  editForm.value = {
-    platform: row.platform,
-    versionCode: row.versionCode,
-    versionName: row.versionName,
-    downloadUrl: row.downloadUrl,
-    updateContent: row.updateContent ?? '',
-    forceUpdate: row.forceUpdate === 1 ? 1 : 0,
-    minSupportedCode: row.minSupportedCode
-  }
-  dialogOpen.value = true
-}
-
-async function submit() {
-  formLoading.value = true
-  try {
-    if (editingId.value) {
-      await updateAppVersionApi(editingId.value, editForm.value)
-      ElMessage.success('已更新')
-    } else {
-      const toCreate: AppVersionSaveData[] = []
-      if (androidBlock.value.enabled) toCreate.push(androidBlock.value.data)
-      if (iosBlock.value.enabled) toCreate.push(iosBlock.value.data)
-      if (toCreate.length === 0) {
-        ElMessage.warning('至少启用一个平台')
-        return
-      }
-      await batchCreateAppVersionsApi(toCreate)
-      ElMessage.success(`已创建 ${toCreate.length} 条版本`)
-    }
-    dialogOpen.value = false
-    await fetchList()
-  } catch {
-    /* axios interceptor 已弹消息 */
-  } finally {
-    formLoading.value = false
-  }
-}
-
-async function toggleStatus(row: AppVersionItem) {
-  const next = row.status === 1 ? 0 : 1
-  await updateAppVersionStatusApi(row.id, next as 0 | 1)
-  ElMessage.success(next === 1 ? '已发布' : '已下架')
-  await fetchList()
-}
-
-async function remove(row: AppVersionItem) {
-  await ElMessageBox.confirm(
-    `确认删除 ${row.platformText} ${row.versionName}（${row.versionCode}）？`,
-    '删除版本',
-    { type: 'warning', confirmButtonText: '删除', cancelButtonText: '取消' }
-  )
-  await deleteAppVersionApi(row.id)
-  ElMessage.success('已删除')
-  await fetchList()
-}
-
-const forceText = computed(() => (v: number) => (v === 1 ? '强制' : '可选升级'))
-</script>
-
-<template>
-  <PageHeading eyebrow="后台管理" title="版本管理" description="App 版本发布、上下架与删除。" />
-
-  <section class="toolbar">
-    <el-form :inline="true" :model="filter" @submit.prevent="fetchList">
-      <el-form-item label="平台">
-        <el-select v-model="filter.platform" clearable placeholder="全部" style="width: 120px">
-          <el-option
-            v-for="o in platformOptions"
-            :key="o.value"
-            :label="o.label"
-            :value="o.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="状态">
-        <el-select v-model="filter.status" clearable placeholder="全部" style="width: 120px">
-          <el-option v-for="o in statusOptions" :key="o.value" :label="o.label" :value="o.value" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="关键字">
-        <el-input
-          v-model="filter.keyword"
-          placeholder="匹配 versionName"
-          clearable
-          style="width: 180px"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" :icon="AppIcons.search" @click="fetchList">查询</el-button>
-        <el-button plain @click="openCreate" :icon="AppIcons.add">新建版本</el-button>
-      </el-form-item>
-    </el-form>
-  </section>
-
-  <el-table :data="list" v-loading="loading" border stripe>
-    <el-table-column prop="platformText" label="平台" width="100" />
-    <el-table-column prop="versionCode" label="版本码" width="90" />
-    <el-table-column prop="versionName" label="展示版本" width="120" />
-    <el-table-column prop="downloadUrl" label="下载地址" show-overflow-tooltip min-width="220">
-      <template #default="{ row }">
-        <el-link :href="row.downloadUrl" target="_blank" type="primary" :underline="false">
-          {{ row.downloadUrl }}
-        </el-link>
-      </template>
-    </el-table-column>
-    <el-table-column prop="forceUpdate" label="升级" width="80">
-      <template #default="{ row }">
-        <el-tag :type="row.forceUpdate === 1 ? 'danger' : 'info'" size="small">
-          {{ forceText(row.forceUpdate) }}
-        </el-tag>
-      </template>
-    </el-table-column>
-    <el-table-column prop="minSupportedCode" label="兜底最低" width="100" />
-    <el-table-column prop="status" label="状态" width="90">
-      <template #default="{ row }">
-        <el-tag :type="row.status === 1 ? 'success' : 'info'" size="small">
-          {{ row.statusText }}
-        </el-tag>
-      </template>
-    </el-table-column>
-    <el-table-column prop="releasedAt" label="发布时间" width="160" :formatter="dateCell" />
-    <el-table-column prop="createdAt" label="创建时间" width="160" :formatter="dateCell" />
-    <el-table-column label="操作" width="240" fixed="right">
-      <template #default="{ row }">
-        <el-button size="small" link type="primary" @click="openEdit(row)">编辑</el-button>
-        <el-button size="small" link type="warning" @click="toggleStatus(row)">
-          {{ row.status === 1 ? '下架' : '发布' }}
-        </el-button>
-        <el-button size="small" link type="danger" @click="remove(row)">删除</el-button>
-      </template>
-    </el-table-column>
-  </el-table>
-
-  <el-pagination
-    class="pagination"
-    v-model:current-page="pageIndex"
-    v-model:page-size="pageSize"
-    :total="total"
-    layout="total, sizes, prev, pager, next"
-    :page-sizes="[10, 20, 50]"
-    @current-change="fetchList"
-    @size-change="fetchList"
-  />
-
-  <el-dialog
-    v-model="dialogOpen"
-    :title="editingId ? '编辑版本' : '新建版本'"
-    width="820px"
-    @close="() => formRef?.resetFields()"
-  >
-    <!-- 编辑模式：单平台 -->
-    <el-form
-      v-if="editingId"
-      ref="formRef"
-      :model="editForm"
-      :rules="rules"
-      label-width="120px"
-      v-loading="formLoading"
-    >
-      <el-row :gutter="12">
-        <el-col :span="8">
-          <el-form-item label="整数版本" prop="versionCode">
-            <el-input-number
-              v-model="editForm.versionCode"
-              :min="1"
-              :max="999999"
-              controls-position="right"
-              class="w-full"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="16">
-          <el-form-item label="展示版本" prop="versionName">
-            <el-input v-model="editForm.versionName" placeholder="如 1.2.0" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-form-item label="下载地址" prop="downloadUrl">
-        <el-input v-model="editForm.downloadUrl" placeholder="Android apk / iOS App Store 链接" />
-      </el-form-item>
-      <el-row :gutter="12">
-        <el-col :span="12">
-          <el-form-item label="强制升级">
-            <el-switch
-              v-model="editForm.forceUpdate"
-              :active-value="1"
-              :inactive-value="0"
-              active-text="强制"
-              inactive-text="可选"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="兜底最低版本">
-            <el-input-number
-              v-model="editForm.minSupportedCode"
-              :min="0"
-              controls-position="right"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-form-item label="更新说明">
-        <el-input
-          v-model="editForm.updateContent"
-          type="textarea"
-          :rows="3"
-          placeholder="换行分隔多条更新内容"
-          maxlength="2000"
-          show-word-limit
-        />
-      </el-form-item>
-    </el-form>
-
-    <!-- 新建模式：Android + iOS 两块 -->
-    <div v-else class="dual-blocks" v-loading="formLoading">
-      <div class="platform-block" :class="{ disabled: !androidBlock.enabled }">
-        <header>
-          <span class="platform-title">Android</span>
-          <el-switch
-            v-model="androidBlock.enabled"
-            active-text="启用"
-            inactive-text="跳过"
-            inline-prompt
-          />
-        </header>
-        <el-form
-          :model="androidBlock.data"
-          :rules="rules"
-          label-width="120px"
-          :disabled="!androidBlock.enabled"
-        >
-          <el-row :gutter="12">
-            <el-col :span="8">
-              <el-form-item label="整数版本" prop="versionCode">
-                <el-input-number
-                  v-model="androidBlock.data.versionCode"
-                  :min="1"
-                  :max="999999"
-                  controls-position="right"
-                  class="w-full"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="16">
-              <el-form-item label="展示版本" prop="versionName">
-                <el-input v-model="androidBlock.data.versionName" placeholder="如 1.2.0" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-form-item label="下载地址" prop="downloadUrl">
-            <el-input v-model="androidBlock.data.downloadUrl" placeholder="apk 下载链接" />
-          </el-form-item>
-          <el-row :gutter="12">
-            <el-col :span="12">
-              <el-form-item label="强制升级">
-                <el-switch
-                  v-model="androidBlock.data.forceUpdate"
-                  :active-value="1"
-                  :inactive-value="0"
-                  active-text="强制"
-                  inactive-text="可选"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="兜底最低">
-                <el-input-number
-                  v-model="androidBlock.data.minSupportedCode"
-                  :min="0"
-                  controls-position="right"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-form-item label="更新说明">
-            <el-input
-              v-model="androidBlock.data.updateContent"
-              type="textarea"
-              :rows="3"
-              placeholder="换行分隔多条"
-              maxlength="2000"
-              show-word-limit
-            />
-          </el-form-item>
-        </el-form>
-      </div>
-
-      <div class="platform-block" :class="{ disabled: !iosBlock.enabled }">
-        <header>
-          <span class="platform-title">iOS</span>
-          <el-switch
-            v-model="iosBlock.enabled"
-            active-text="启用"
-            inactive-text="跳过"
-            inline-prompt
-          />
-        </header>
-        <el-form
-          :model="iosBlock.data"
-          :rules="rules"
-          label-width="120px"
-          :disabled="!iosBlock.enabled"
-        >
-          <el-row :gutter="12">
-            <el-col :span="8">
-              <el-form-item label="整数版本" prop="versionCode">
-                <el-input-number
-                  v-model="iosBlock.data.versionCode"
-                  :min="1"
-                  :max="999999"
-                  controls-position="right"
-                  class="w-full"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="16">
-              <el-form-item label="展示版本" prop="versionName">
-                <el-input v-model="iosBlock.data.versionName" placeholder="如 1.2.0" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-form-item label="下载地址" prop="downloadUrl">
-            <el-input v-model="iosBlock.data.downloadUrl" placeholder="App Store 链接" />
-          </el-form-item>
-          <el-row :gutter="12">
-            <el-col :span="12">
-              <el-form-item label="强制升级">
-                <el-switch
-                  v-model="iosBlock.data.forceUpdate"
-                  :active-value="1"
-                  :inactive-value="0"
-                  active-text="强制"
-                  inactive-text="可选"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="兜底最低">
-                <el-input-number
-                  v-model="iosBlock.data.minSupportedCode"
-                  :min="0"
-                  controls-position="right"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-form-item label="更新说明">
-            <el-input
-              v-model="iosBlock.data.updateContent"
-              type="textarea"
-              :rows="3"
-              placeholder="换行分隔多条"
-              maxlength="2000"
-              show-word-limit
-            />
-          </el-form-item>
-        </el-form>
-      </div>
-    </div>
-
-    <template #footer>
-      <el-button @click="dialogOpen = false">取消</el-button>
-      <el-button type="primary" :loading="formLoading" @click="submit">
-        {{ editingId ? '保存' : '创建并发布' }}
-      </el-button>
-    </template>
-  </el-dialog>
-</template>
-
-<style scoped lang="less">
-.toolbar {
-  margin-bottom: 12px;
-}
-
-.pagination {
-  margin-top: 12px;
-  justify-content: flex-end;
-}
-
-.dual-blocks {
-  display: flex;
-  flex-direction: column;
-  gap: 16px;
-}
-
-.platform-block {
-  padding: 14px 16px 4px;
-  background: var(--el-fill-color-blank);
-  border: 1px solid var(--el-border-color-lighter);
-  border-radius: 8px;
-
-  header {
-    display: flex;
-    padding-bottom: 8px;
-    margin-bottom: 6px;
-    border-bottom: 1px solid var(--el-border-color-lighter);
-    align-items: center;
-    justify-content: space-between;
-  }
-
-  .platform-title {
-    font-size: 15px;
-    font-weight: 600;
-  }
-
-  &.disabled {
-    border-style: dashed;
-    opacity: 0.5;
-  }
-}
-</style>

src/views/systemManagement/TranscodeSettingsView.vue

@@ -14,7 +14,6 @@ const {
   rules,
   loading,
   saving,
-  backfilling,
   loadError,
   canManage,
   qualityRules,
@@ -24,8 +23,7 @@ const {
   loadProfile,
   addRung,
   deleteRung,
-  saveProfile,
+  saveProfile
-  runBackfill
 } = useTranscodeSettings()
 </script>
 
@@ -35,18 +33,6 @@ const {
     :title="t('transcodeSettings.title')"
     :description="t('transcodeSettings.description')"
   >
-    <el-tooltip :content="t('transcodeSettings.backfillTip')" placement="top">
-      <el-button
-        type="success"
-        plain
-        :loading="backfilling"
-        :disabled="!canManage || loading"
-        @click="runBackfill"
-      >
-        <AppIcon v-if="!backfilling" :icon="AppIcons.videoPlay" />
-        {{ t('transcodeSettings.backfill') }}
-      </el-button>
-    </el-tooltip>
     <el-button :disabled="loading" @click="loadProfile">
       <AppIcon :icon="AppIcons.refresh" />
       {{ t('transcodeSettings.reload') }}

src/views/systemManagement/composables/transcodeSettingsActions.ts

@@ -5,7 +5,6 @@ import type { ComputedRef, Ref } from 'vue'
 import { ElMessage } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { getMediaTranscodeProfileApi, saveMediaTranscodeProfileApi } from '@/api/admin/media'
-import { runTranscodeBackfillApi } from '@/api/admin/transcode'
 import type { MediaTranscodeProfile } from '@/api/admin/types'
 import { applyProfileToForm, buildProfilePayload } from './transcodeProfileModel'
 
@@ -16,7 +15,6 @@ interface SettingsContext {
   formRef: Ref<FormInstance | undefined>
   loading: Ref<boolean>
   saving: Ref<boolean>
-  backfilling: Ref<boolean>
   loadError: Ref<string>
   canManage: ComputedRef<boolean>
   t: Translate
@@ -79,28 +77,3 @@ export const saveTranscodeProfile = async (context: SettingsContext): Promise<vo
     context.saving.value = false
   }
 }
-
-/** 手动补齐转码：扫一遍缺码率产物/帧图的分集并入队。 */
-export const runTranscodeBackfill = async (context: SettingsContext): Promise<void> => {
-  if (!context.canManage.value || context.backfilling.value) {
-    return
-  }
-  context.backfilling.value = true
-  try {
-    const response = await runTranscodeBackfillApi()
-    if (response.code !== 0) {
-      ElMessage.error(response.message || context.t('transcodeSettings.backfillFailed'))
-      return
-    }
-    const triggered = response.data?.triggered ?? 0
-    if (triggered > 0) {
-      ElMessage.success(context.t('transcodeSettings.backfillDone', { count: triggered }))
-    } else {
-      ElMessage.info(context.t('transcodeSettings.backfillEmpty'))
-    }
-  } catch {
-    ElMessage.error(context.t('transcodeSettings.backfillFailed'))
-  } finally {
-    context.backfilling.value = false
-  }
-}

src/views/systemManagement/composables/useTranscodeSettings.ts

@@ -13,11 +13,7 @@ import {
   positiveEvenRule,
   positiveIntegerRule
 } from './transcodeProfileRules'
-import {
+import { loadTranscodeProfile, saveTranscodeProfile } from './transcodeSettingsActions'
-  loadTranscodeProfile,
-  runTranscodeBackfill,
-  saveTranscodeProfile
-} from './transcodeSettingsActions'
 
 /** 转码设置页的响应式状态与动作装配。 */
 export function useTranscodeSettings() {
@@ -26,11 +22,10 @@ export function useTranscodeSettings() {
   const formRef = ref<FormInstance>()
   const loading = ref(false)
   const saving = ref(false)
-  const backfilling = ref(false)
   const loadError = ref('')
   const form = reactive<MediaTranscodeProfile>(defaultProfile())
   const canManage = computed(() => can('episode:upload'))
-  const context = { form, formRef, loading, saving, backfilling, loadError, canManage, t }
+  const context = { form, formRef, loading, saving, loadError, canManage, t }
   const rules = computed(() => createProfileRules(t))
   const enabledRules = computed(() => createEnabledRules(form, t))
   const qualityRules = (index: number) => createQualityRules(form, index, t)
@@ -55,7 +50,6 @@ export function useTranscodeSettings() {
     rules,
     loading,
     saving,
-    backfilling,
     loadError,
     canManage,
     qualityRules,
@@ -65,7 +59,6 @@ export function useTranscodeSettings() {
     loadProfile,
     addRung,
     deleteRung,
-    saveProfile,
+    saveProfile
-    runBackfill: () => runTranscodeBackfill(context)
   }
 }

src/views/userManagement/AppUsersView.vue

@@ -9,11 +9,9 @@ import { useRbac } from '@/stores/rbac'
 import {
   APP_USER_STATUS,
   COUNTRY_OPTIONS,
-  countryText,
-  formatDateTime,
   formatDuration,
-  platformText,
   statusMeta,
+  systemText,
   useAppUsers
 } from './composables/useAppUsers'
 
@@ -27,7 +25,6 @@ const {
   keyword,
   statusFilter,
   countryFilter,
-  platformFilter,
   currentPage,
   pageSize,
   detailVisible,
@@ -56,11 +53,6 @@ const SOURCE_TEXT = {
   FAVORITE: '收藏'
 }
 const BAN_TYPE_TEXT = { BAN: '封禁', LIMIT: '限制', MUTE: '禁言' }
-const PLATFORM_OPTIONS = [
-  { value: '', label: '全部系统' },
-  { value: 'ANDROID', label: 'Android' },
-  { value: 'IOS', label: 'iOS' }
-]
 const APPEAL_TEXT = {
   none: '未申诉',
   pending: '待处理',
@@ -124,20 +116,6 @@ function canBeBanned(row) {
           :value="item.value"
         />
       </el-select>
-      <el-select
-        v-model="platformFilter"
-        class="app-user-platform"
-        clearable
-        placeholder="全部系统"
-        @change="queryUsers"
-      >
-        <el-option
-          v-for="item in PLATFORM_OPTIONS"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"
-        />
-      </el-select>
       <el-select
         v-model="countryFilter"
         class="app-user-country"
@@ -187,24 +165,24 @@ function canBeBanned(row) {
               <template v-else>{{ avatarText(row) }}</template>
             </span>
             <div class="app-user-meta">
-              <span class="app-user-name" :title="row.nickname || ''">
+              <span class="app-user-name" :title="row.nickname">{{
-                昵称: {{ row.nickname || '未设置昵称' }}
+                row.nickname || '未设置昵称'
-              </span>
+              }}</span>
-              <span class="app-user-uid">UID: {{ row.uid }}</span>
+              <span class="app-user-uid" :title="row.uid">{{ row.uid }}</span>
             </div>
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="系统" width="110" show-overflow-tooltip>
+      <el-table-column label="系统" width="130" show-overflow-tooltip>
-        <template #default="{ row }">{{ platformText(row) }}</template>
+        <template #default="{ row }">{{ systemText(row) }}</template>
       </el-table-column>
       <el-table-column label="手机 / 邮箱" min-width="150" show-overflow-tooltip>
         <template #default="{ row }">
           <span class="app-user-mono">{{ row.maskedTarget || '—' }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="国家" width="110">
+      <el-table-column label="国家" width="90">
-        <template #default="{ row }">{{ countryText(row.countryCode) }}</template>
+        <template #default="{ row }">{{ row.countryCode || '—' }}</template>
       </el-table-column>
       <el-table-column label="状态" width="90">
         <template #default="{ row }">
@@ -270,8 +248,8 @@ function canBeBanned(row) {
             <template v-else>{{ avatarText(detail) }}</template>
           </span>
           <div class="app-user-meta">
-            <span class="app-user-name"> 昵称: {{ detail.nickname || '未设置昵称' }} </span>
+            <span class="app-user-name">{{ detail.nickname || '未设置昵称' }}</span>
-            <span class="app-user-uid">UID: {{ detail.uid }}</span>
+            <span class="app-user-uid">{{ detail.uid }}</span>
           </div>
           <el-tag :type="statusMeta(detail.status).tag" effect="light" style="margin-left: auto">
             {{ statusMeta(detail.status).label }}
@@ -284,10 +262,7 @@ function canBeBanned(row) {
               {{ detail.maskedTarget || '—' }}
             </el-descriptions-item>
             <el-descriptions-item label="国家 / 地区">
-              {{ countryText(detail.countryCode) }}
+              {{ detail.countryCode || '—' }} / {{ detail.regionCode || '—' }}
-              <template v-if="detail.regionCode && detail.regionCode !== detail.countryCode">
-                / {{ countryText(detail.regionCode) }}
-              </template>
             </el-descriptions-item>
             <el-descriptions-item label="语言">{{ detail.language || '—' }}</el-descriptions-item>
             <el-descriptions-item label="时区">{{ detail.timezone || '—' }}</el-descriptions-item>
@@ -297,7 +272,7 @@ function canBeBanned(row) {
             <el-descriptions-item label="最后登录">{{
               detail.lastLoginAt || '—'
             }}</el-descriptions-item>
-            <el-descriptions-item label="系统">{{ platformText(detail) }}</el-descriptions-item>
+            <el-descriptions-item label="系统">{{ systemText(detail) }}</el-descriptions-item>
             <el-descriptions-item label="会员">
               {{ detail.vipLevel ? `等级 ${detail.vipLevel}` : '未开通（第二阶段）' }}
             </el-descriptions-item>
@@ -329,17 +304,15 @@ function canBeBanned(row) {
             <el-table-column label="完成" width="70">
               <template #default="{ row }">{{ row.finished ? '是' : '否' }}</template>
             </el-table-column>
-            <el-table-column label="系统" width="100" show-overflow-tooltip>
+            <el-table-column label="系统" width="120" show-overflow-tooltip>
-              <template #default="{ row }">{{ platformText(row) }}</template>
+              <template #default="{ row }">{{ systemText(row) }}</template>
             </el-table-column>
             <el-table-column label="来源" width="80">
               <template #default="{ row }">{{
                 SOURCE_TEXT[row.source] || row.source || '—'
               }}</template>
             </el-table-column>
-            <el-table-column label="时间" width="160">
+            <el-table-column prop="watchedAt" label="时间" width="160" show-overflow-tooltip />
-              <template #default="{ row }">{{ formatDateTime(row.watchedAt) }}</template>
-            </el-table-column>
           </el-table>
         </div>
 

src/views/userManagement/FavoritesView.vue

@@ -1,194 +0,0 @@
-<!-- Author: fruit.com.cn -->
-
-<script setup>
-import { onMounted, reactive, ref } from 'vue'
-import dayjs from 'dayjs'
-import PageHeading from '@/views/components/PageHeading.vue'
-import AppUserCell from '@/views/components/AppUserCell.vue'
-import { pageFavoritesApi } from '@/api/admin/engagement'
-import { platformText } from './composables/useAppUsers'
-
-const PAGE_SIZES = [10, 20, 50]
-const PLATFORM_OPTIONS = [
-  { value: '', label: '全部系统' },
-  { value: 'ANDROID', label: 'Android' },
-  { value: 'IOS', label: 'iOS' }
-]
-
-const filters = reactive({
-  keyword: '',
-  deviceId: '',
-  dramaTitle: '',
-  platform: '',
-  range: null
-})
-const rows = ref([])
-const total = ref(0)
-const loading = ref(false)
-const pageIndex = ref(1)
-const pageSize = ref(10)
-
-async function load() {
-  loading.value = true
-  try {
-    const res = await pageFavoritesApi({
-      pageIndex: pageIndex.value,
-      pageSize: pageSize.value,
-      keyword: filters.keyword.trim() || undefined,
-      deviceId: filters.deviceId.trim() || undefined,
-      dramaTitle: filters.dramaTitle.trim() || undefined,
-      platform: filters.platform || undefined,
-      startTime: filters.range?.[0] || undefined,
-      endTime: filters.range?.[1] || undefined
-    })
-    rows.value = res.data?.list || []
-    total.value = res.data?.total || 0
-  } finally {
-    loading.value = false
-  }
-}
-
-function search() {
-  pageIndex.value = 1
-  load()
-}
-
-function resetFilters() {
-  Object.assign(filters, {
-    keyword: '',
-    deviceId: '',
-    dramaTitle: '',
-    platform: '',
-    range: null
-  })
-  search()
-}
-
-function handleSizeChange() {
-  pageIndex.value = 1
-  load()
-}
-
-function formatTime(value) {
-  return value && dayjs(value).isValid() ? dayjs(value).format('YYYY-MM-DD HH:mm:ss') : '—'
-}
-
-onMounted(load)
-</script>
-
-<template>
-  <PageHeading eyebrow="用户管理" title="收藏列表" />
-  <section class="panel">
-    <div class="console-toolbar">
-      <el-input
-        v-model="filters.keyword"
-        class="console-keyword"
-        clearable
-        placeholder="uid / 昵称"
-        @keyup.enter="search"
-      />
-      <el-input
-        v-model="filters.deviceId"
-        class="console-keyword"
-        clearable
-        placeholder="设备 ID"
-        @keyup.enter="search"
-      />
-      <el-input
-        v-model="filters.dramaTitle"
-        class="console-keyword"
-        clearable
-        placeholder="短剧名称"
-        @keyup.enter="search"
-      />
-      <el-select v-model="filters.platform" class="console-select" placeholder="全部系统">
-        <el-option
-          v-for="item in PLATFORM_OPTIONS"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"
-        />
-      </el-select>
-
-      <el-date-picker
-        v-model="filters.range"
-        class="engagement-range"
-        type="datetimerange"
-        value-format="YYYY-MM-DD HH:mm:ss"
-        range-separator="至"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-      />
-      <el-button type="primary" @click="search">查询</el-button>
-      <el-button @click="resetFilters">重置</el-button>
-      <span class="console-count">共 {{ total }} 条</span>
-    </div>
-    <el-table
-      v-loading="loading"
-      :data="rows"
-      row-key="id"
-      border
-      class="drama-el-table"
-      empty-text="暂无收藏"
-    >
-      <el-table-column label="用户" min-width="200">
-        <template #default="{ row }">
-          <AppUserCell :row="row" />
-        </template>
-      </el-table-column>
-      <el-table-column label="系统" width="100">
-        <template #default="{ row }">{{ platformText(row) }}</template>
-      </el-table-column>
-      <el-table-column label="短剧" min-width="220">
-        <template #default="{ row }">
-          <div class="engagement-drama">
-            <el-image
-              v-if="row.dramaCover"
-              :src="row.dramaCover"
-              fit="cover"
-              class="engagement-cover"
-            />
-            <span>{{ row.dramaTitle || `短剧 #${row.dramaId || '—'}` }}</span>
-            <el-tag v-if="row.dramaPublished === false" type="info" size="small" effect="plain"
-              >未发布</el-tag
-            >
-          </div>
-        </template>
-      </el-table-column>
-      <el-table-column label="收藏时间" min-width="170">
-        <template #default="{ row }">{{ formatTime(row.createdAt) }}</template>
-      </el-table-column>
-    </el-table>
-    <div class="pagination">
-      <el-pagination
-        v-model:current-page="pageIndex"
-        v-model:page-size="pageSize"
-        :page-sizes="PAGE_SIZES"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        background
-        @current-change="load"
-        @size-change="handleSizeChange"
-      />
-    </div>
-  </section>
-</template>
-
-<style scoped>
-.engagement-range {
-  width: 360px;
-  max-width: 100%;
-}
-
-.engagement-drama {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-}
-
-.engagement-cover {
-  width: 40px;
-  height: 56px;
-  flex: none;
-}
-</style>

src/views/userManagement/LikesView.vue

@@ -1,201 +0,0 @@
-<!-- Author: fruit.com.cn -->
-
-<script setup>
-import { onMounted, reactive, ref } from 'vue'
-import dayjs from 'dayjs'
-import PageHeading from '@/views/components/PageHeading.vue'
-import AppUserCell from '@/views/components/AppUserCell.vue'
-import { pageLikesApi } from '@/api/admin/engagement'
-import { platformText } from './composables/useAppUsers'
-
-const PAGE_SIZES = [10, 20, 50]
-const TARGET_OPTIONS = [
-  { value: '', label: '全部' },
-  { value: 'DRAMA', label: '短剧' },
-  { value: 'EPISODE', label: '剧集' },
-  { value: 'COMMENT', label: '评论' }
-]
-const PLATFORM_OPTIONS = [
-  { value: '', label: '全部系统' },
-  { value: 'ANDROID', label: 'Android' },
-  { value: 'IOS', label: 'iOS' }
-]
-
-const filters = reactive({
-  keyword: '',
-  deviceId: '',
-  dramaTitle: '',
-  range: null,
-  targetType: '',
-  platform: ''
-})
-const rows = ref([])
-const total = ref(0)
-const loading = ref(false)
-const pageIndex = ref(1)
-const pageSize = ref(10)
-
-async function load() {
-  loading.value = true
-  try {
-    const res = await pageLikesApi({
-      pageIndex: pageIndex.value,
-      pageSize: pageSize.value,
-      keyword: filters.keyword.trim() || undefined,
-      deviceId: filters.deviceId.trim() || undefined,
-      dramaTitle: filters.dramaTitle.trim() || undefined,
-      targetType: filters.targetType || undefined,
-      platform: filters.platform || undefined,
-      startTime: filters.range?.[0] || undefined,
-      endTime: filters.range?.[1] || undefined
-    })
-    rows.value = res.data?.list || []
-    total.value = res.data?.total || 0
-  } finally {
-    loading.value = false
-  }
-}
-
-function search() {
-  pageIndex.value = 1
-  load()
-}
-
-function resetFilters() {
-  Object.assign(filters, {
-    keyword: '',
-    deviceId: '',
-    dramaTitle: '',
-    range: null,
-    targetType: '',
-    platform: ''
-  })
-  search()
-}
-
-function handleSizeChange() {
-  pageIndex.value = 1
-  load()
-}
-
-function formatTime(value) {
-  return value && dayjs(value).isValid() ? dayjs(value).format('YYYY-MM-DD HH:mm:ss') : '—'
-}
-
-function targetText(row) {
-  if (row.targetType === 'COMMENT') return row.commentSummary || '—'
-  if (row.targetType === 'EPISODE') return `${row.dramaTitle || '—'} 第 ${row.episodeNo ?? '—'} 集`
-  return row.dramaTitle || '—'
-}
-
-function typeText(type) {
-  return TARGET_OPTIONS.find((item) => item.value === type)?.label || type || '—'
-}
-
-onMounted(load)
-</script>
-
-<template>
-  <PageHeading eyebrow="用户管理" title="点赞列表" />
-  <section class="panel">
-    <div class="console-toolbar">
-      <el-input
-        v-model="filters.keyword"
-        class="console-keyword"
-        clearable
-        placeholder="uid / 昵称"
-        @keyup.enter="search"
-      />
-      <el-input
-        v-model="filters.deviceId"
-        class="console-keyword"
-        clearable
-        placeholder="设备 ID"
-        @keyup.enter="search"
-      />
-      <el-input
-        v-model="filters.dramaTitle"
-        class="console-keyword"
-        clearable
-        placeholder="短剧名称"
-        @keyup.enter="search"
-      />
-      <el-select v-model="filters.targetType" class="console-select" placeholder="全部目标类型">
-        <el-option
-          v-for="item in TARGET_OPTIONS"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"
-        />
-      </el-select>
-      <el-select v-model="filters.platform" class="console-select" placeholder="全部系统">
-        <el-option
-          v-for="item in PLATFORM_OPTIONS"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"
-        />
-      </el-select>
-      <el-date-picker
-        v-model="filters.range"
-        class="engagement-range"
-        type="datetimerange"
-        value-format="YYYY-MM-DD HH:mm:ss"
-        range-separator="至"
-        start-placeholder="开始时间"
-        end-placeholder="结束时间"
-      />
-      <el-button type="primary" @click="search">查询</el-button>
-      <el-button @click="resetFilters">重置</el-button>
-      <span class="console-count">共 {{ total }} 条</span>
-    </div>
-    <el-table
-      v-loading="loading"
-      :data="rows"
-      row-key="id"
-      border
-      class="drama-el-table"
-      empty-text="暂无点赞"
-    >
-      <el-table-column label="用户" min-width="200">
-        <template #default="{ row }">
-          <AppUserCell :row="row" />
-        </template>
-      </el-table-column>
-      <el-table-column label="系统" width="100">
-        <template #default="{ row }">{{ platformText(row) }}</template>
-      </el-table-column>
-      <el-table-column label="目标类型" width="110">
-        <template #default="{ row }">{{ typeText(row.targetType) }}</template>
-      </el-table-column>
-      <el-table-column label="目标" min-width="200" show-overflow-tooltip>
-        <template #default="{ row }"
-          ><span :title="targetText(row)">{{ targetText(row) }}</span></template
-        >
-      </el-table-column>
-      <el-table-column prop="dramaTitle" label="所属短剧" min-width="180" show-overflow-tooltip />
-      <el-table-column label="点赞时间" min-width="170">
-        <template #default="{ row }">{{ formatTime(row.createdAt) }}</template>
-      </el-table-column>
-    </el-table>
-    <div class="pagination">
-      <el-pagination
-        v-model:current-page="pageIndex"
-        v-model:page-size="pageSize"
-        :page-sizes="PAGE_SIZES"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        background
-        @current-change="load"
-        @size-change="handleSizeChange"
-      />
-    </div>
-  </section>
-</template>
-
-<style scoped>
-.engagement-range {
-  width: 360px;
-  max-width: 100%;
-}
-</style>

src/views/userManagement/WatchHistoryView.vue

@@ -3,9 +3,8 @@
 <script setup>
 import { onMounted, reactive, ref } from 'vue'
 import PageHeading from '@/views/components/PageHeading.vue'
-import AppUserCell from '@/views/components/AppUserCell.vue'
 import { pageWatchHistoryApi } from '@/api/admin/appUser'
-import { formatDateTime, formatDuration, platformText } from './composables/useAppUsers'
+import { formatDuration, systemText } from './composables/useAppUsers'
 
 const SOURCE_OPTIONS = [
   { value: '', label: '全部' },
@@ -21,18 +20,11 @@ const FINISHED_OPTIONS = [
   { value: false, label: '未看完' }
 ]
 
-const PLATFORM_OPTIONS = [
-  { value: '', label: '全部系统' },
-  { value: 'ANDROID', label: 'Android' },
-  { value: 'IOS', label: 'iOS' }
-]
-
 const filters = reactive({
   keyword: '',
   dramaTitle: '',
   source: '',
   finished: '',
-  platform: '',
   range: null
 })
 const rows = ref([])
@@ -51,7 +43,6 @@ async function load() {
       dramaTitle: filters.dramaTitle.trim() || undefined,
       source: filters.source || undefined,
       finished: filters.finished === '' ? undefined : filters.finished,
-      platform: filters.platform || undefined,
       startTime: filters.range?.[0] || undefined,
       endTime: filters.range?.[1] || undefined
     })
@@ -72,7 +63,6 @@ function resetFilters() {
   filters.dramaTitle = ''
   filters.source = ''
   filters.finished = ''
-  filters.platform = ''
   filters.range = null
   search()
 }
@@ -154,19 +144,6 @@ onMounted(load)
           :value="item.value"
         />
       </el-select>
-      <el-select
-        v-model="filters.platform"
-        class="console-select"
-        placeholder="全部系统"
-        @change="search"
-      >
-        <el-option
-          v-for="item in PLATFORM_OPTIONS"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"
-        />
-      </el-select>
       <el-date-picker
         v-model="filters.range"
         class="watch-history-range"
@@ -190,16 +167,17 @@ onMounted(load)
       class="drama-el-table"
       empty-text="暂无符合条件的观看记录"
     >
-      <el-table-column label="观看时间" min-width="170">
+      <el-table-column prop="watchedAt" label="观看时间" min-width="170" show-overflow-tooltip />
-        <template #default="{ row }">{{ formatDateTime(row.watchedAt) }}</template>
+      <el-table-column label="用户" min-width="180">
-      </el-table-column>
-      <el-table-column label="用户" min-width="200">
         <template #default="{ row }">
-          <AppUserCell :row="row" />
+          <div class="app-user-meta">
+            <span class="app-user-name">{{ row.nickname || '未设置昵称' }}</span>
+            <span class="app-user-uid">{{ row.uid || `用户 #${row.userId || '—'}` }}</span>
+          </div>
         </template>
       </el-table-column>
-      <el-table-column label="系统" width="100">
+      <el-table-column label="系统" width="130" show-overflow-tooltip>
-        <template #default="{ row }">{{ platformText(row) }}</template>
+        <template #default="{ row }">{{ systemText(row) }}</template>
       </el-table-column>
       <el-table-column label="短剧" min-width="190">
         <template #default="{ row }">

src/views/userManagement/composables/useAppUsers.js

@@ -1,7 +1,6 @@
 // Author: fruit.com.cn
 
 import { onMounted, reactive, ref } from 'vue'
-import dayjs from 'dayjs'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import {
   getAppUserApi,
@@ -29,69 +28,6 @@ export const COUNTRY_OPTIONS = [
   { value: 'CN', label: '中国' }
 ]
 
-/** 国家码 → 中文名，与后端 CountryProfile 保持一致；未收录的仍显示原码 */
-const COUNTRY_TEXT = {
-  ID: '印度尼西亚',
-  MY: '马来西亚',
-  SG: '新加坡',
-  TH: '泰国',
-  VN: '越南',
-  PH: '菲律宾',
-  KH: '柬埔寨',
-  MM: '缅甸',
-  LA: '老挝',
-  BN: '文莱',
-  CN: '中国',
-  TW: '中国台湾',
-  HK: '中国香港',
-  MO: '中国澳门',
-  JP: '日本',
-  KR: '韩国',
-  IN: '印度',
-  PK: '巴基斯坦',
-  BD: '孟加拉国',
-  LK: '斯里兰卡',
-  NP: '尼泊尔',
-  US: '美国',
-  CA: '加拿大',
-  MX: '墨西哥',
-  BR: '巴西',
-  AR: '阿根廷',
-  CL: '智利',
-  CO: '哥伦比亚',
-  PE: '秘鲁',
-  VE: '委内瑞拉',
-  EC: '厄瓜多尔',
-  GT: '危地马拉',
-  DO: '多米尼加',
-  GB: '英国',
-  DE: '德国',
-  FR: '法国',
-  ES: '西班牙',
-  IT: '意大利',
-  NL: '荷兰',
-  PL: '波兰',
-  RU: '俄罗斯',
-  UA: '乌克兰',
-  TR: '土耳其',
-  SA: '沙特阿拉伯',
-  AE: '阿联酋',
-  IL: '以色列',
-  EG: '埃及',
-  NG: '尼日利亚',
-  ZA: '南非',
-  KE: '肯尼亚',
-  MA: '摩洛哥',
-  AU: '澳大利亚',
-  NZ: '新西兰'
-}
-
-/** 国家列统一展示中文名，无值时显示横线 */
-export function countryText(code) {
-  const value = (code || '').toUpperCase()
-  return COUNTRY_TEXT[value] || value || '—'
-}
-
 export function statusMeta(status) {
   return (
     APP_USER_STATUS.find((item) => item.value === status) || { label: status || '-', tag: 'info' }
@@ -100,15 +36,12 @@ export function statusMeta(status) {
 
 const PLATFORM_TEXT = { ANDROID: 'Android', IOS: 'iOS', WEB: 'Web' }
 
-/** 客户端平台，只有 iOS / Android 两种取值（缺记录显示横线）。 */
+/** 登录会话上的系统，例如 Android 16。没有记录时显示横线。 */
-export function platformText(row) {
+export function systemText(row) {
-  const platform = row?.platform || ''
+  const name = PLATFORM_TEXT[row?.platform] || row?.platform || ''
-  return PLATFORM_TEXT[platform] || platform || '—'
+  const version = row?.osVersion || ''
-}
+  const text = `${name} ${version}`.trim()
-
+  return text || '—'
-/** 后端返回 ISO 时间串，统一格式化成后台可读的本地时间 */
-export function formatDateTime(value) {
-  return value && dayjs(value).isValid() ? dayjs(value).format('YYYY-MM-DD HH:mm:ss') : '—'
 }
 
 /** 毫秒转 mm:ss，观看流水里的进度用 */
@@ -127,7 +60,6 @@ export function useAppUsers() {
   const keyword = ref('')
   const statusFilter = ref(undefined)
   const countryFilter = ref(undefined)
-  const platformFilter = ref(undefined)
   const currentPage = ref(1)
   const pageSize = ref(10)
 
@@ -150,8 +82,7 @@ export function useAppUsers() {
         pageSize: pageSize.value,
         keyword: keyword.value.trim() || undefined,
         status: statusFilter.value,
-        countryCode: countryFilter.value,
+        countryCode: countryFilter.value
-        platform: platformFilter.value || undefined
       })
       users.value = res.data?.list || []
       total.value = res.data?.total || 0
@@ -169,7 +100,6 @@ export function useAppUsers() {
     keyword.value = ''
     statusFilter.value = undefined
     countryFilter.value = undefined
-    platformFilter.value = undefined
     queryUsers()
   }
 
@@ -256,7 +186,6 @@ export function useAppUsers() {
     keyword,
     statusFilter,
     countryFilter,
-    platformFilter,
     currentPage,
     pageSize,
     detailVisible,