From b614fd09a24922e5e97529b2aa7af7580b934a0d Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Thu, 7 May 2026 18:01:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/adminMediaLimits.ts                 |   16 +
 src/views/activities/ActivityList.vue         | 1330 ++++++++++++-----
 src/views/activities/Registrations.vue        |   60 +-
 src/views/h5/VerifyLogin.vue                  |    4 +-
 src/views/h5/VerifyScan.vue                   |   32 +-
 src/views/study-tours/StudyTourList.vue       |   13 +-
 .../ticket-grab/TicketGrabRegistrations.vue   |   60 +-
 src/views/venues/VenueList.vue                |   31 +-
 8 files changed, 1104 insertions(+), 442 deletions(-)
 create mode 100644 src/utils/adminMediaLimits.ts

diff --git a/src/utils/adminMediaLimits.ts b/src/utils/adminMediaLimits.ts
new file mode 100644
index 0000000..e03e532
--- /dev/null
+++ b/src/utils/adminMediaLimits.ts
@@ -0,0 +1,16 @@
+/** 后台封面、轮播图、预约二维码图等：单张图片大小上限（与 UI 文案一致） */
+export const ADMIN_UPLOAD_IMAGE_MAX_BYTES = 1024 * 1024
+
+/** 与上传校验配套，跟在「尺寸推荐」后 */
+export const ADMIN_IMAGE_RECOMMEND_LABEL =
+  '图片尺寸推荐 1200×600，图片大小不超过 1MB'
+
+/** @returns 可提示用户的中文错误文案；未超限或非图片返回 null */
+export function adminUploadImageTooLargeMessage(file: File): string | null {
+  if (!file.type.startsWith('image/')) return null
+  if (file.size <= ADMIN_UPLOAD_IMAGE_MAX_BYTES) return null
+  const mb = file.size / (1024 * 1024)
+  const cur =
+    mb >= 1 ? `${mb.toFixed(2)}MB` : `${Math.ceil(file.size / 1024)}KB`
+  return `单张图片不能超过 1MB（当前约 ${cur}）`
+}
diff --git a/src/views/activities/ActivityList.vue b/src/views/activities/ActivityList.vue
index 4debac2..2f49d4f 100644
--- a/src/views/activities/ActivityList.vue
+++ b/src/views/activities/ActivityList.vue
@@ -1,12 +1,13 @@
 <script setup lang="ts">
 import { computed, nextTick, onMounted, reactive, ref, watch } from 'vue'
 import { useRoute } from 'vue-router'
-import { Message } from '@arco-design/web-vue'
+import { Message, Modal } from '@arco-design/web-vue'
 import RichEditorField from '../../components/RichEditorField.vue'
 import { buildUnifiedActivityVerifyLoginUrl } from '../../api/h5Http'
 import { http } from '../../api/http'
 import { useModalDirtyGuard } from '../../composables/useModalDirtyGuard'
 import { useUnsavedChangesGuard } from '../../composables/useUnsavedChangesGuard'
+import { adminUploadImageTooLargeMessage, ADMIN_IMAGE_RECOMMEND_LABEL } from '../../utils/adminMediaLimits'
 import { listTableRowIndex } from '../../utils/listTableRowIndex'
 
 type Venue = {
@@ -63,6 +64,7 @@ type Activity = {
   reservation_type?: string
   specific_time?: string | null
   offline_reservation_method?: string | null
+  booking_method_note?: string | null
   ticket_fee_note?: string | null
   external_url?: string | null
   /** 线上：已报名人数；H5/统计用 */
@@ -220,6 +222,240 @@ function formatYmdInShanghai(iso: string | undefined | null): string {
   }).format(d)
 }
 
+type TimeSlotForm = { start: string; end: string }
+
+function parseSpecificTimeToSlots(raw?: string | null): TimeSlotForm[] {
+  if (!raw?.trim()) return []
+  const s = raw.trim()
+  if (s.startsWith('[')) {
+    try {
+      const arr = JSON.parse(s) as unknown
+      if (Array.isArray(arr)) {
+        return arr
+          .map((x): TimeSlotForm | null => {
+            if (typeof x !== 'string') return null
+            const p = String(x).split('-').map((t) => t.trim())
+            if (p.length >= 2 && p[0] && p[1]) {
+              return { start: p[0].slice(0, 5), end: p[1].slice(0, 5) }
+            }
+            return null
+          })
+          .filter((x): x is TimeSlotForm => x != null)
+      }
+    } catch {
+      /* 非 JSON */
+    }
+  }
+  const p = s.split('-').map((t) => t.trim())
+  if (p.length >= 2 && p[0] && p[1]) {
+    return [{ start: p[0].replace(/\s.*/, '').slice(0, 5), end: p[1].replace(/\s.*/, '').slice(0, 5) }]
+  }
+  return []
+}
+
+function slotsToSpecificTimePayload(slots: TimeSlotForm[]): string | null {
+  const parts = slots
+    .map((r) => {
+      const a = String(r.start || '').trim()
+      const b = String(r.end || '').trim()
+      if (!a || !b) return ''
+      return `${a}-${b}`
+    })
+    .filter(Boolean)
+  if (!parts.length) return null
+  return JSON.stringify(parts)
+}
+
+function activitySpecificTimeDisplay(raw?: string | null): string {
+  const slots = parseSpecificTimeToSlots(raw)
+  if (!slots.length) return String(raw || '').trim()
+  return slots.map((s) => `${s.start}-${s.end}`).join('，')
+}
+
+/** 活动起止日（YYYY-MM-DD）内的每一个日历日，东八区 */
+function listActivityDateYmdsInclusive(startYmd: string, endYmd: string): string[] {
+  const s = String(startYmd || '').trim().slice(0, 10)
+  const e = String(endYmd || '').trim().slice(0, 10)
+  if (!/^\d{4}-\d{2}-\d{2}$/.test(s) || !/^\d{4}-\d{2}-\d{2}$/.test(e) || s > e) return []
+  const fmt = new Intl.DateTimeFormat('en-CA', {
+    timeZone: 'Asia/Shanghai',
+    year: 'numeric',
+    month: '2-digit',
+    day: '2-digit',
+  })
+  const bump = (cur: string): string => {
+    const [y, mo, d] = cur.split('-').map(Number)
+    const ms =
+      new Date(
+        `${y}-${String(mo).padStart(2, '0')}-${String(d).padStart(2, '0')}T12:00:00+08:00`,
+      ).getTime() + 86400000
+    return fmt.format(new Date(ms))
+  }
+  const out: string[] = []
+  let cur = s
+  while (cur <= e) {
+    out.push(cur)
+    if (cur === e) break
+    cur = bump(cur)
+  }
+  return out
+}
+
+/** 校验 HH:mm 且结束早于同一场次日下的开始则无意义 */
+function isValidHmPair(startHm: string, endHm: string): boolean {
+  const p = /^(\d{1,2}):(\d{2})$/
+  const a = p.exec(String(startHm || '').trim())
+  const b = p.exec(String(endHm || '').trim())
+  if (!a || !b) return false
+  const asm = (+a[1]) * 60 + (+a[2])
+  const bsm = (+b[1]) * 60 + (+b[2])
+  return bsm > asm && asm >= 0 && asm < 1440 && bsm <= 1439
+}
+
+function combineYmdAndHmToDatetime(ymd: string, hm: string): string {
+  const p = /^(\d{1,2}):(\d{2})$/.exec(String(hm || '').trim())
+  if (!p) return `${ymd} 09:00:00`
+  const h = Math.min(23, Math.max(0, +p[1]))
+  const mi = Math.min(59, Math.max(0, +p[2]))
+  return `${ymd} ${String(h).padStart(2, '0')}:${String(mi).padStart(2, '0')}:00`
+}
+
+function parseShanghaiLocalToMs(datetimeYmdHmss: string): number {
+  let s = String(datetimeYmdHmss || '').trim().replace(' ', 'T')
+  if (/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}$/.test(s)) s += ':00'
+  if (!/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}$/.test(s)) return NaN
+  return new Date(`${s}+08:00`).getTime()
+}
+
+function formatDatetimeShanghai(ms: number): string {
+  if (!Number.isFinite(ms)) return ''
+  const d = new Date(ms)
+  const p = new Intl.DateTimeFormat('en-CA', {
+    timeZone: 'Asia/Shanghai',
+    year: 'numeric',
+    month: '2-digit',
+    day: '2-digit',
+    hour: '2-digit',
+    minute: '2-digit',
+    second: '2-digit',
+    hour12: false,
+  })
+    .formatToParts(d)
+    .reduce<Record<string, string>>((acc, x) => {
+      if (x.type !== 'literal') acc[x.type] = x.value
+      return acc
+    }, {})
+  const ymd = `${p.year}-${p.month}-${p.day}`
+  const t = `${(p.hour || '').padStart(2, '0')}:${(p.minute || '').padStart(2, '0')}:${(p.second || '00').padStart(2, '0')}`
+  return `${ymd} ${t}`
+}
+
+function buildSessionDatetimePairsFromActivityForm(): Array<{ session_start_at: string; session_end_at: string }> {
+  const dates = listActivityDateYmdsInclusive(form.start_at, form.end_at)
+  const slots = form.specific_time_slots.filter((r) =>
+    isValidHmPair(String(r.start || '').trim(), String(r.end || '').trim()),
+  )
+  const pairs: Array<{ session_start_at: string; session_end_at: string }> = []
+  for (const ymd of dates) {
+    for (const sl of slots) {
+      pairs.push({
+        session_start_at: combineYmdAndHmToDatetime(ymd, sl.start),
+        session_end_at: combineYmdAndHmToDatetime(ymd, sl.end),
+      })
+    }
+  }
+  return pairs
+}
+
+/** 场次开始调整后：预约截止不再自动填充；仅当已填写截止时与预约开始一起做规则校正 */
+function ensureOnlineBookingTimesConsistent(row: BookingDayRow): void {
+  if (normalizeReservationKind(form.reservation_type) !== 'online') return
+  const sessStartMs = parseShanghaiLocalToMs(row.session_start_at)
+  if (!Number.isFinite(sessStartMs)) return
+  const ymd = row.session_start_at.trim().slice(0, 10)
+  const dlRaw = String(row.booking_deadline_at || '').trim()
+  if (!dlRaw) {
+    row.booking_opens_at = `${ymd} 00:00:00`
+    return
+  }
+  let deadlineMs = parseShanghaiLocalToMs(dlRaw)
+  if (!Number.isFinite(deadlineMs)) return
+  deadlineMs = Math.min(deadlineMs, sessStartMs - 60 * 1000)
+  row.booking_deadline_at = formatDatetimeShanghai(deadlineMs)
+  let opensMs = parseShanghaiLocalToMs(`${ymd} 00:00:00`)
+  if (!Number.isFinite(opensMs) || opensMs > deadlineMs) {
+    opensMs = deadlineMs - 60 * 1000
+  }
+  row.booking_opens_at = formatDatetimeShanghai(opensMs)
+}
+
+const suppressSessionScheduleSync = ref(0)
+
+const MAX_AUTO_SESSION_ROWS = 200
+
+/** 根据「活动日期 + 具体时间」回填各场次的开始/结束（必要时增补空场次行） */
+function syncBookingSessionTimesFromSchedule(): void {
+  if (!visible.value || !canSaveSessionsWithActivity.value) return
+  if (suppressSessionScheduleSync.value > 0) return
+  const pairs = buildSessionDatetimePairsFromActivityForm()
+  if (!pairs.length) return
+
+  const rt = normalizeReservationKind(form.reservation_type)
+  while (
+    pairs.length > bookingForm.days.length
+    && bookingForm.days.length < MAX_AUTO_SESSION_ROWS
+  ) {
+    addBookingDayRow()
+  }
+  const n = Math.min(pairs.length, bookingForm.days.length)
+  for (let i = 0; i < n; i++) {
+    const row = bookingForm.days[i]
+    row.session_start_at = pairs[i].session_start_at
+    row.session_end_at = pairs[i].session_end_at
+    if (rt === 'online') ensureOnlineBookingTimesConsistent(row)
+  }
+}
+
+/** 与 sync 解耦的驱动签名：suppress 或关弹窗时为 __off__，避免 deep watch + 新对象导致递归 effect */
+const sessionScheduleDrivingSignature = computed(() => {
+  if (!visible.value || suppressSessionScheduleSync.value > 0) return '__off__'
+  const slotKey = form.specific_time_slots
+    .map((x) => `${String(x.start ?? '').trim()}|${String(x.end ?? '').trim()}`)
+    .join(';')
+  return `${form.start_at}\n${form.end_at}\n${form.reservation_type}\n${slotKey}`
+})
+
+let inSessionScheduleSync = false
+
+watch(
+  sessionScheduleDrivingSignature,
+  (sig) => {
+    if (sig === '__off__' || inSessionScheduleSync) return
+    inSessionScheduleSync = true
+    try {
+      syncBookingSessionTimesFromSchedule()
+    } finally {
+      inSessionScheduleSync = false
+    }
+  },
+  { flush: 'post' },
+)
+
+function normalizeReservationKind(t?: string | null): string {
+  const s = String(t || '').trim()
+  if (!s || s === 'online' || s === 'none' || s === 'paid_study') return s || 'online'
+  return s
+}
+
+function reservationKindEffective(t?: string | null): string {
+  const s = String(t ?? '').trim()
+  return s === '' ? 'online' : s
+}
+
+function reservationTypeSupportsSessionSettings(rt?: string | null): boolean {
+  return ['online', 'none', 'paid_study'].includes(reservationKindEffective(rt))
+}
+
 function formatActivityTableDateRange(record: Activity): string {
   const s = record.start_at ? formatYmdInShanghai(String(record.start_at)) : ''
   const e = record.end_at ? formatYmdInShanghai(String(record.end_at)) : ''
@@ -242,8 +478,9 @@ const activityBookingStepIntro = computed(() => {
     is_active: !!form.is_active,
   }
   const datePart = formatActivityTableDateRange(r)
-  const timePart = form.specific_time.trim() ? form.specific_time.trim() : '—'
-  return `本次活动日期 ${datePart}，具体时间 ${timePart}，请配置预约场次，保存时将一并提交活动信息与场次。`
+  const timePart =
+    activitySpecificTimeDisplay(form.specific_time).trim() || '—'
+  return `本次活动日期 ${datePart}，具体时间 ${timePart}，请配置场次，保存时将一并提交活动信息与场次。`
 })
 
 /** 审核弹窗内「提交人」展示文案 */
@@ -255,7 +492,7 @@ function auditSubmitterDisplayName(row: Activity | null): string {
   return '平台录入'
 }
 
-/** 场次设置预览标题：不出现 both 等英文码，仅中文标签 + 人数段 */
+/** 场次信息预览标题：不出现 both 等英文码，仅中文标签 + 人数段 */
 function formatBookingAudienceBadge(audRaw: string, minP: number, maxP: number): string {
   const aud = String(audRaw || '').trim()
   const minOk = Number.isFinite(minP) ? Math.max(1, Math.floor(minP)) : 1
@@ -270,19 +507,17 @@ function formatBookingAudienceBadge(audRaw: string, minP: number, maxP: number):
 
 const form = reactive({
   venue_id: undefined as number | undefined,
-  /** 需要报名 online / 无需报名 none / 或自定义文案（仅展示，与 online 逻辑不同） */
-  reservation_type: 'none',
+  /** 活动性质 online=公益性需预约 / none=公益性无需预约 / paid_study=收费科普研学 */
+  reservation_type: 'online',
   is_hot: false,
-  /** 门票说明：免费/收费，提交至 offline_reservation_method */
-  ticket_note: 'free' as 'free' | 'paid',
-  /** 收费说明：仅门票为收费时使用，提交 ticket_fee_note */
+  booking_method_note: '',
   fee_note: '',
   location: '',
   check_in_meeting_point: '',
   lat: undefined as number | undefined,
   lng: undefined as number | undefined,
   specific_time: '',
-  offline_reservation_method: '',
+  specific_time_slots: [] as TimeSlotForm[],
   external_url: '',
   title: '',
   contact_name: '',
@@ -308,8 +543,8 @@ const formErrors = reactive<Record<string, string>>({
   start_at: '',
   end_at: '',
   reservation_type: '',
-  ticket_note: '',
-  offline_reservation_method: '',
+  booking_method_note: '',
+  fee_note: '',
   external_url: '',
   location: '',
   cover_image: '',
@@ -317,6 +552,7 @@ const formErrors = reactive<Record<string, string>>({
   detail_html: '',
   contact_name: '',
   contact_phone: '',
+  specific_time_slots: '',
 })
 
 const activityDateRange = computed({
@@ -348,21 +584,44 @@ const bookingForm = reactive({
   days: [] as BookingDayRow[],
 })
 
-/** 新增/编辑活动弹窗：0 活动信息，1 场次（仅需要报名且未结束时） */
-const activityEditStep = ref(0)
+/** 单场活动仍可编辑表单，但场次与预约配置随活动一并保存；已结束时不再提交场次以避免误操作 */
 const activityModalBookingLoading = ref(false)
 
-const needsBookingStep = computed(() => String(form.reservation_type || '').trim() === 'online')
-const canConfigureBookingStep = computed(
-  () => needsBookingStep.value && formScheduleStatus.value !== 'ended',
+const canSaveSessionsWithActivity = computed(
+  () => formScheduleStatus.value !== 'ended',
 )
 
-const activityModalTitle = computed(() => {
-  const base = isCreate.value ? '新增活动' : '编辑活动'
-  if (activityEditStep.value === 1) return `${base} · 场次设置`
-  return base
+const reservationKindLabelBookingField = computed(() => {
+  const r = normalizeReservationKind(form.reservation_type)
+  if (r === 'online') return '预约方式'
+  if (r === 'none') return '参与提示'
+  if (r === 'paid_study') return '报名方式'
+  return '预约方式'
 })
 
+/** 公益性需预约时展示预约开始/截止/已约等列 */
+const showSessionBookingWindowColumns = computed(
+  () => normalizeReservationKind(form.reservation_type) === 'online',
+)
+
+/** 仅公益性需预约展示「预约对象」及人数段 */
+const showBookingAudienceFields = computed(
+  () => normalizeReservationKind(form.reservation_type) === 'online',
+)
+
+const sessionRulesHint = computed(() => {
+  if (normalizeReservationKind(form.reservation_type) === 'online') {
+    return '每场次的开始时间与结束时间须为同一天内；预约开始、预约截止时间须填写；预约截止时间须早于场次开始时间；预约开始不得晚于预约截止。更改名额不可低于已约人数。'
+  }
+  return '每场次的开始时间与结束时间须为同一天内'
+})
+
+const sessionTableScrollX = computed(() =>
+  showSessionBookingWindowColumns.value ? 1470 : 920,
+)
+
+const activityModalTitle = computed(() => (isCreate.value ? '新增活动' : '编辑活动'))
+
 function unifiedBookingContextActivity(): Activity | null {
   if (!form.start_at && !form.end_at) return null
   return {
@@ -377,7 +636,7 @@ function unifiedBookingContextActivity(): Activity | null {
   } as Activity
 }
 
-function defaultSessionTimesForActivity(act: Activity | null): { start: string; end: string; deadline: string } {
+function defaultSessionTimesForActivity(act: Activity | null): { start: string; end: string } {
   const d = act?.start_at
     ? formatYmdInShanghai(String(act.start_at))
     : new Intl.DateTimeFormat('en-CA', {
@@ -389,20 +648,20 @@ function defaultSessionTimesForActivity(act: Activity | null): { start: string;
   return {
     start: `${d} 09:00:00`,
     end: `${d} 11:00:00`,
-    deadline: `${d} 08:30:00`,
   }
 }
 
 function addBookingDayRow() {
   const act = unifiedBookingContextActivity()
-  const { start, end, deadline } = defaultSessionTimesForActivity(act)
+  const { start, end } = defaultSessionTimesForActivity(act)
+  const dayStr = start.slice(0, 10)
   bookingForm.days.push({
     session_name: `场次 ${bookingForm.days.length + 1}`,
     session_start_at: start,
     session_end_at: end,
-    booking_opens_at: '',
-    booking_deadline_at: deadline,
-    day_quota: 30,
+    booking_opens_at: `${dayStr} 00:00:00`,
+    booking_deadline_at: '',
+    day_quota: 1,
     quota_note: '',
     booked_count: 0,
   })
@@ -424,6 +683,7 @@ function normalizeBookingDayTime(raw: unknown): string {
 }
 
 async function loadBookingForEditActivity(activityId: number) {
+  suppressSessionScheduleSync.value += 1
   activityModalBookingLoading.value = true
   try {
     const { data } = await http.get(`/activities/${activityId}/booking-settings`)
@@ -448,18 +708,21 @@ async function loadBookingForEditActivity(activityId: number) {
         booked_count: Math.max(0, Number(d.booked_count) || 0),
       }
     })
-    if (bookingForm.days.length === 0) {
-      addBookingDayRow()
-    }
   } catch (e: any) {
     Message.error(e?.response?.data?.message ?? '加载场次失败')
     throw e
   } finally {
     activityModalBookingLoading.value = false
+    nextTick(() => {
+      suppressSessionScheduleSync.value -= 1
+    })
   }
 }
 
 function validateBookingFormInternal(): boolean {
+  const rt = normalizeReservationKind(form.reservation_type)
+  const aud =
+    rt === 'none' || rt === 'paid_study' ? 'individual' : bookingForm.booking_audience
   if (bookingForm.days.length === 0) {
     Message.warning('请至少添加一个场次')
     return false
@@ -470,23 +733,35 @@ function validateBookingFormInternal(): boolean {
       Message.warning(`第 ${i + 1} 行请填写场次名称`)
       return false
     }
-    if (!d.session_start_at || !d.session_end_at || !d.booking_deadline_at) {
-      Message.warning(`第 ${i + 1} 行请填写场次开始、结束与预约截止时间`)
+    if (!d.session_start_at || !d.session_end_at) {
+      Message.warning(`第 ${i + 1} 行请填写场次开始与结束时间`)
       return false
     }
-    if (!d.day_quota || d.day_quota < 1) {
-      Message.warning(`第 ${i + 1} 行预约名额须≥1`)
+    if (rt === 'online' && !String(d.booking_deadline_at || '').trim()) {
+      Message.warning(`第 ${i + 1} 行请填写预约截止时间`)
+      return false
+    }
+    if (rt === 'online' && !String(d.booking_opens_at || '').trim()) {
+      Message.warning(`第 ${i + 1} 行请填写预约开始时间`)
+      return false
+    }
+    const booked = Math.max(0, Number(d.booked_count) || 0)
+    const minQ = Math.max(1, booked)
+    if (!d.day_quota || d.day_quota < minQ) {
+      Message.warning(
+        `第 ${i + 1} 行预约名额须≥${minQ}${booked > 0 ? `（已约 ${booked} 人）` : ''}`,
+      )
       return false
     }
   }
   if (
-    bookingForm.booking_audience !== 'individual'
+    aud !== 'individual'
     && bookingForm.max_people_per_order < bookingForm.min_people_per_order
   ) {
     Message.warning('每单最多人数必须大于等于每单最少人数')
     return false
   }
-  if (bookingForm.booking_audience !== 'individual' && bookingForm.max_people_per_order === 1) {
+  if (aud !== 'individual' && bookingForm.max_people_per_order === 1) {
     Message.warning('团体或个人+团体时，每单最多人数不可为 1，且须大于等于每单最少人数')
     return false
   }
@@ -494,26 +769,38 @@ function validateBookingFormInternal(): boolean {
 }
 
 function buildBookingPayload(): Record<string, unknown> {
+  const rt = normalizeReservationKind(form.reservation_type)
+  const forceIndiv = rt === 'none' || rt === 'paid_study'
+  const audience = forceIndiv ? 'individual' : bookingForm.booking_audience
   const payload: Record<string, unknown> = {
-    booking_audience: bookingForm.booking_audience,
+    booking_audience: audience,
     days: bookingForm.days.map((d) => {
+      const start = String(d.session_start_at || '').trim()
+      const deadlineIn =
+        rt === 'online'
+          ? String(d.booking_deadline_at || '').trim()
+          : String(d.booking_deadline_at || '').trim() || start
       const row: Record<string, unknown> = {
         session_name: d.session_name.trim(),
         session_start_at: d.session_start_at,
         session_end_at: d.session_end_at,
-        booking_deadline_at: d.booking_deadline_at,
+        booking_deadline_at: deadlineIn || null,
         day_quota: d.day_quota,
         quota_note: (d.quota_note || '').trim() || null,
       }
-      const opens = (d.booking_opens_at || '').trim()
-      row.booking_opens_at = opens || null
+      if (rt === 'online') {
+        const opens = (d.booking_opens_at || '').trim()
+        row.booking_opens_at = opens || null
+      } else {
+        row.booking_opens_at = null
+      }
       if (d.id && d.id > 0) {
         row.id = d.id
       }
       return row
     }),
   }
-  if (bookingForm.booking_audience !== 'individual') {
+  if (audience !== 'individual') {
     payload.min_people_per_order = bookingForm.min_people_per_order
     payload.max_people_per_order = bookingForm.max_people_per_order
   }
@@ -561,6 +848,11 @@ function quillImageHandler(this: { quill: any }) {
   input.onchange = async () => {
     const file = input.files?.[0]
     if (!file) return
+    const sizeMsg = adminUploadImageTooLargeMessage(file)
+    if (sizeMsg) {
+      Message.warning(sizeMsg)
+      return
+    }
     try {
       const url = await uploadFile(file)
       const range = quill.getSelection(true)
@@ -617,10 +909,17 @@ function formSignature() {
   return JSON.stringify(form)
 }
 
+function addSpecificTimeRow() {
+  form.specific_time_slots.push({ start: '09:00', end: '10:00' })
+}
+
+function removeSpecificTimeRow(i: number) {
+  form.specific_time_slots.splice(i, 1)
+}
+
 function editFlowSignature() {
   return JSON.stringify({
     form: formSignature(),
-    step: activityEditStep.value,
     bookingAudience: bookingForm.booking_audience,
     minP: bookingForm.min_people_per_order,
     maxP: bookingForm.max_people_per_order,
@@ -860,10 +1159,9 @@ async function openAuditActivity(row: Activity, mode: 'audit' | 'view') {
   auditActivityLogs.value = []
   try {
     const logPromise = http.get(`/activities/${row.id}/activity-audit-logs`)
-    const bookingPromise =
-      row.reservation_type === 'online'
-        ? http.get(`/activities/${row.id}/booking-settings`)
-        : Promise.resolve(null)
+    const bookingPromise = reservationTypeSupportsSessionSettings(row.reservation_type)
+      ? http.get(`/activities/${row.id}/booking-settings`)
+      : Promise.resolve(null)
     const verifyPromise =
       row.reservation_type === 'online' && row.audit_status === 'approved' && canOpenActivityVerify(row)
         ? http.get(`/activities/${row.id}/verify-portal`)
@@ -1033,6 +1331,11 @@ async function onBtsBeforeUpload(file: unknown) {
   try {
     let f: File | null = file instanceof File ? file : pickUploadFile(file)
     if (!f) return false
+    const sizeMsg = adminUploadImageTooLargeMessage(f)
+    if (sizeMsg) {
+      Message.warning(sizeMsg)
+      return false
+    }
     const url = await uploadFile(f)
     btsImages.value = [...btsImages.value, { type: 'image', url }]
     Message.success('已添加图片')
@@ -1077,11 +1380,23 @@ async function saveBehindScenes(): Promise<boolean> {
   }
 }
 
-function auditTicketNoteLabel(row: Activity): string {
-  const m = String(row.offline_reservation_method || '')
-  if (m === 'paid') return '收费'
-  if (m === 'free') return '免费'
-  return m || '—'
+function auditBookingWayLabel(row: Activity | null): string {
+  if (!row) return '预约方式'
+  const z = reservationKindEffective(row.reservation_type)
+  if (z === 'online') return '预约方式'
+  if (z === 'none') return '参与提示'
+  if (z === 'paid_study') return '报名方式'
+  return '预约方式'
+}
+
+function auditFeeDisplay(row: Activity | null): string {
+  if (!row) return '—'
+  const z = reservationKindEffective(row.reservation_type)
+  const t = String(row.ticket_fee_note ?? '').trim()
+  if (z === 'online' || z === 'none') {
+    return t || '免费'
+  }
+  return t || '—'
 }
 
 function auditShowExternalUrl(row: Activity): boolean {
@@ -1272,13 +1587,14 @@ function confirmMapPick() {
 
 function reservationTypeLabel(t?: string | null) {
   const s = String(t || '').trim()
-  if (s === 'online') return '需要报名'
-  if (s === 'none') return '无需报名'
+  if (s === 'online') return '公益性需预约活动'
+  if (s === 'none') return '公益性无需预约活动'
+  if (s === 'paid_study') return '收费科普研学活动'
   if (s === 'phone') return '电话预约'
   if (s === 'wechat_mp') return '公众号预约'
   if (s === 'offline_visit' || s === 'offline') return '线下预约'
   if (s === 'other') return '外链跳转'
-  if (!s) return '—'
+  if (!s) return '公益性需预约活动'
   return s
 }
 
@@ -1334,15 +1650,15 @@ function openCreate() {
   editId.value = null
   Object.keys(formErrors).forEach((key) => { formErrors[key] = '' })
   form.venue_id = isVenueAdmin() ? currentUser.value?.venues?.[0]?.id : venues.value[0]?.id
-  form.reservation_type = 'none'
-  form.ticket_note = 'free'
-  form.fee_note = ''
+  form.reservation_type = 'online'
+  form.booking_method_note = '平台预约'
+  form.fee_note = '免费'
   form.location = ''
   form.check_in_meeting_point = ''
   form.lat = undefined
   form.lng = undefined
   form.specific_time = ''
-  form.offline_reservation_method = ''
+  form.specific_time_slots = []
   form.external_url = ''
   form.title = ''
   form.contact_name = ''
@@ -1358,7 +1674,6 @@ function openCreate() {
   form.sort = 0
   form.is_active = true
   form.display_schedule_status = undefined
-  activityEditStep.value = 0
   bookingForm.booking_audience = 'both'
   bookingForm.min_people_per_order = 1
   bookingForm.max_people_per_order = 10
@@ -1373,7 +1688,6 @@ function openEdit(row: Activity) {
   if (!assertCanOpenActivityEditor(row)) return
   isCreate.value = false
   editId.value = row.id
-  activityEditStep.value = 0
   bookingForm.booking_audience = 'both'
   bookingForm.min_people_per_order = 1
   bookingForm.max_people_per_order = 10
@@ -1383,16 +1697,22 @@ function openEdit(row: Activity) {
   form.venue_id = row.venue_id
   form.reservation_type = String(row.reservation_type ?? 'online').trim() || 'online'
   {
-    const m = String(row.offline_reservation_method || '')
-    form.ticket_note = m === 'paid' ? 'paid' : 'free'
-  }
-  form.fee_note = row.ticket_fee_note || ''
+    const eff = reservationKindEffective(form.reservation_type)
+    form.booking_method_note =
+      String(row.booking_method_note ?? '').trim() ||
+      (eff === 'online' ? '平台预约' : '')
+  }
+  form.fee_note =
+    row.ticket_fee_note?.trim() ||
+    (['online', 'none'].includes(reservationKindEffective(form.reservation_type))
+      ? '免费'
+      : '')
   form.location = row.location || ''
   form.check_in_meeting_point = row.check_in_meeting_point || ''
   form.lat = parseCoord(row.lat)
   form.lng = parseCoord(row.lng)
   form.specific_time = row.specific_time || ''
-  form.offline_reservation_method = ''
+  form.specific_time_slots = parseSpecificTimeToSlots(row.specific_time)
   form.external_url = ''
   form.title = row.title
   form.contact_name = row.contact_name ?? ''
@@ -1411,6 +1731,7 @@ function openEdit(row: Activity) {
   resetEditors()
   captureFormBaseline()
   visible.value = true
+  void loadBookingForEditActivity(row.id).catch(() => undefined)
 }
 
 function onSearch() {
@@ -1444,6 +1765,11 @@ async function onCoverSelect(fileItem: any) {
   try {
     const file = pickUploadFile(fileItem)
     if (!file) return false
+    const sizeMsg = adminUploadImageTooLargeMessage(file)
+    if (sizeMsg) {
+      Message.warning(sizeMsg)
+      return false
+    }
     form.cover_image = await uploadFile(file)
     Message.success('封面上传成功')
   } catch (error: any) {
@@ -1456,6 +1782,11 @@ async function onGallerySelect(fileItem: any) {
   try {
     const file = pickUploadFile(fileItem)
     if (!file) return false
+    const sizeMsg = adminUploadImageTooLargeMessage(file)
+    if (sizeMsg) {
+      Message.warning(sizeMsg)
+      return false
+    }
     const url = await uploadFile(file)
     const isVideo = file.type.startsWith('video/')
     form.gallery_media.push({ type: isVideo ? 'video' : 'image', url })
@@ -1538,133 +1869,148 @@ function validateForm(): boolean {
       isValid = false
     }
   }
-  const rt = String(form.reservation_type || '').trim()
-  if (!rt) {
-    formErrors.reservation_type = '请选择或填写报名方式'
-    isValid = false
-  } else if (rt.length > 32) {
-    formErrors.reservation_type = '报名方式最长 32 个字符'
-    isValid = false
-  }
-  if (!form.ticket_note) {
-    formErrors.ticket_note = '请选择门票说明'
-    isValid = false
+  const eff = reservationKindEffective(form.reservation_type)
+  if (['online', 'none', 'paid_study'].includes(eff)) {
+    if (eff === 'paid_study') {
+      if (!form.booking_method_note.trim()) {
+        formErrors.booking_method_note = '收费科普研学活动须填写报名方式'
+        isValid = false
+      }
+      if (!form.fee_note.trim()) {
+        formErrors.fee_note = '收费科普研学活动须填写费用'
+        isValid = false
+      }
+    }
   }
 
-  return isValid
-}
-
-async function onClickNextStep() {
-  if (!validateForm()) {
-    Message.warning('请填写所有必填项')
-    return
-  }
-  if (!canConfigureBookingStep.value) {
-    await submitUnifiedActivity()
-    return
-  }
-  try {
-    if (!isCreate.value && editId.value) {
-      await loadBookingForEditActivity(editId.value)
-    } else {
-      bookingForm.booking_audience = 'both'
-      bookingForm.min_people_per_order = 1
-      bookingForm.max_people_per_order = 10
-      bookingForm.days = []
-      addBookingDayRow()
+  if (reservationTypeSupportsSessionSettings(form.reservation_type)) {
+    const hasValidSlot = form.specific_time_slots.some((row) =>
+      isValidHmPair(String(row.start || '').trim(), String(row.end || '').trim()))
+    if (!hasValidSlot) {
+      formErrors.specific_time_slots =
+        '请至少添加一个具体时间时段，并完整填写开始与结束（格式 HH:mm，结束须晚于开始）'
+      isValid = false
     }
-    activityEditStep.value = 1
-  } catch {
-    /* loadBookingForEditActivity 已提示 */
   }
+
+  return isValid
 }
 
 function onCancelUnifiedModal() {
   if (confirmDiscardChanges()) {
     visible.value = false
-    activityEditStep.value = 0
     editContextRowSnapshot.value = null
   }
 }
 
-async function submitUnifiedActivity() {
-  saving.value = true
-  try {
-    if (!validateForm()) {
-      Message.warning('请填写所有必填项')
-      return false
-    }
-    const needBookingNow = needsBookingStep.value && canConfigureBookingStep.value
-    if (needBookingNow && activityEditStep.value !== 1) {
-      Message.warning('请先填写场次设置后再提交')
-      return false
-    }
-    if (needBookingNow && !validateBookingFormInternal()) {
-      return false
-    }
+/** 已通过校验后的实际保存（由确认弹窗的 onBeforeOk 调用） */
+async function executeUnifiedActivitySave(specificPayload: string | null): Promise<void> {
+  const shouldSyncBooking =
+    canSaveSessionsWithActivity.value && reservationTypeSupportsSessionSettings(form.reservation_type)
 
-    const payload: Record<string, unknown> = {
-      venue_id: form.venue_id,
-      reservation_type: String(form.reservation_type || '').trim(),
-      location: form.location.trim(),
-      check_in_meeting_point: form.check_in_meeting_point.trim() || null,
-      specific_time: form.specific_time.trim() || null,
-      offline_reservation_method: form.ticket_note === 'paid' ? 'paid' : 'free',
-      ticket_fee_note:
-        form.ticket_note === 'paid' ? (form.fee_note.trim() || null) : null,
-      external_url: null,
-      title: form.title.trim(),
-      summary: form.summary.trim() || null,
-      quota: 0,
-      category: null,
-      start_at: form.start_at || null,
-      end_at: form.end_at || null,
-      address: null,
-      contact_name: form.contact_name.trim() || null,
-      contact_phone: form.contact_phone.trim() || null,
-      lat: parseCoord(form.lat) ?? null,
-      lng: parseCoord(form.lng) ?? null,
-      detail_html: form.detail_html || null,
-      cover_image: form.cover_image || null,
-      gallery_media: form.gallery_media,
-      tags: form.tags,
-      reservation_notice: null,
-      open_time: null,
-    }
-    let returned: { id?: number; audit_status?: string } | null = null
-    let actId = editId.value
-    if (isCreate.value) {
-      const { data } = await http.post<{ id: number; audit_status?: string }>('/activities', payload)
-      returned = data
-      actId = data?.id ?? null
-    } else {
-      const { data } = await http.put<{ id?: number; audit_status?: string }>(
-        `/activities/${editId.value}`,
-        payload,
-      )
-      returned = data ?? { audit_status: undefined }
-      actId = editId.value
-    }
-    if (needBookingNow && actId) {
-      await http.put(`/activities/${actId}/booking-settings`, buildBookingPayload())
-    }
-    if (!isSuperAdmin() && returned?.audit_status === 'pending') {
-      Message.success('信息已保存，请等待管理员审核')
-    } else {
-      Message.success(isCreate.value ? '创建活动成功' : '更新活动成功')
-    }
-    captureFormBaseline()
-    visible.value = false
-    activityEditStep.value = 0
-    editContextRowSnapshot.value = null
-    await loadAll()
-    return true
-  } catch (error: any) {
-    Message.error(error?.response?.data?.message ?? '保存失败')
-    return false
-  } finally {
-    saving.value = false
+  const rawRt = String(form.reservation_type || '').trim()
+  const effectiveRt = reservationKindEffective(rawRt)
+  const isUnifiedNature = reservationTypeSupportsSessionSettings(rawRt)
+  const payload: Record<string, unknown> = {
+    venue_id: form.venue_id,
+    reservation_type: effectiveRt,
+    location: form.location.trim(),
+    check_in_meeting_point: form.check_in_meeting_point.trim() || null,
+    specific_time: specificPayload,
+    external_url: null,
+    title: form.title.trim(),
+    summary: form.summary.trim() || null,
+    quota: 0,
+    category: null,
+    start_at: form.start_at || null,
+    end_at: form.end_at || null,
+    address: null,
+    contact_name: form.contact_name.trim() || null,
+    contact_phone: form.contact_phone.trim() || null,
+    lat: parseCoord(form.lat) ?? null,
+    lng: parseCoord(form.lng) ?? null,
+    detail_html: form.detail_html || null,
+    cover_image: form.cover_image || null,
+    gallery_media: form.gallery_media,
+    tags: form.tags,
+    reservation_notice: null,
+    open_time: null,
+  }
+  if (isUnifiedNature) {
+    payload.offline_reservation_method = null
+    payload.booking_method_note = form.booking_method_note.trim() || null
+    payload.ticket_fee_note = form.fee_note.trim() || null
+  } else if (!isCreate.value && editContextRowSnapshot.value) {
+    const snap = editContextRowSnapshot.value
+    payload.offline_reservation_method = snap.offline_reservation_method ?? null
+    payload.ticket_fee_note = snap.ticket_fee_note ?? null
+    payload.booking_method_note = snap.booking_method_note ?? null
+  } else {
+    payload.offline_reservation_method = null
+    payload.ticket_fee_note = form.fee_note.trim() || null
+    payload.booking_method_note = form.booking_method_note.trim() || null
+  }
+  let returned: { id?: number; audit_status?: string } | null = null
+  let actId = editId.value
+  if (isCreate.value) {
+    const { data } = await http.post<{ id: number; audit_status?: string }>('/activities', payload)
+    returned = data
+    actId = data?.id ?? null
+  } else {
+    const { data } = await http.put<{ id?: number; audit_status?: string }>(
+      `/activities/${editId.value}`,
+      payload,
+    )
+    returned = data ?? { audit_status: undefined }
+    actId = editId.value
+  }
+  if (shouldSyncBooking && actId) {
+    await http.put(`/activities/${actId}/booking-settings`, buildBookingPayload())
+  }
+  if (!isSuperAdmin() && returned?.audit_status === 'pending') {
+    Message.success('信息已保存，请等待管理员审核')
+  } else {
+    Message.success(isCreate.value ? '创建活动成功' : '更新活动成功')
+  }
+  captureFormBaseline()
+  visible.value = false
+  editContextRowSnapshot.value = null
+  await loadAll()
+}
+
+function submitUnifiedActivity() {
+  if (!validateForm()) {
+    Message.warning('请填写所有必填项')
+    return
   }
+  const specificPayload = slotsToSpecificTimePayload(form.specific_time_slots)
+  form.specific_time = specificPayload ?? ''
+
+  const shouldSyncBooking =
+    canSaveSessionsWithActivity.value && reservationTypeSupportsSessionSettings(form.reservation_type)
+
+  if (shouldSyncBooking && !validateBookingFormInternal()) {
+    return
+  }
+
+  Modal.confirm({
+    title: '提交确认',
+    content: '请核对本次活动内容信息准确，再确认提交审核。',
+    okText: '确认提交',
+    cancelText: '取消',
+    async onBeforeOk() {
+      saving.value = true
+      try {
+        await executeUnifiedActivitySave(specificPayload)
+        return true
+      } catch (error: any) {
+        Message.error(error?.response?.data?.message ?? '保存失败')
+        return false
+      } finally {
+        saving.value = false
+      }
+    },
+  })
 }
 
 useUnsavedChangesGuard(hasUnsavedChanges, '活动表单有未保存改动，确定要离开吗？')
@@ -1718,13 +2064,12 @@ async function removeActivity(row: Activity) {
       <a-select
         v-model="filters.reservation_type"
         allow-clear
-        allow-create
-        allow-search
-        placeholder="报名方式"
-        style="width: 200px"
+        placeholder="活动性质"
+        style="width: 210px"
       >
-        <a-option value="online">需要报名</a-option>
-        <a-option value="none">无需报名</a-option>
+        <a-option value="online">公益性需预约活动</a-option>
+        <a-option value="none">公益性无需预约活动</a-option>
+        <a-option value="paid_study">收费科普研学活动</a-option>
       </a-select>
       <a-select v-model="filters.is_active" allow-clear placeholder="上架状态" style="width: 130px">
         <a-option value="1">上架</a-option>
@@ -1773,7 +2118,7 @@ async function removeActivity(row: Activity) {
         <a-table-column v-if="!isVenueAdmin()" title="场馆" :width="180" :min-width="120" :ellipsis="true" :tooltip="true">
           <template #cell="{ record }">{{ record.venue?.name || '-' }}</template>
         </a-table-column>
-        <a-table-column title="报名方式" :width="130">
+        <a-table-column title="活动性质" :width="160">
           <template #cell="{ record }">{{ reservationTypeLabel((record as any).reservation_type) }}</template>
         </a-table-column>
         <a-table-column title="浏览量" :width="100">
@@ -1905,19 +2250,19 @@ async function removeActivity(row: Activity) {
         </div>
         <div class="activity-audit-inline-row">
           <span class="activity-audit-inline-label">具体时间</span>
-          <div class="activity-audit-inline-value">{{ auditActivityRecord.specific_time?.trim() ? auditActivityRecord.specific_time : '—' }}</div>
+          <div class="activity-audit-inline-value">{{ activitySpecificTimeDisplay(auditActivityRecord.specific_time) || '—' }}</div>
         </div>
         <div class="activity-audit-inline-row">
-          <span class="activity-audit-inline-label">报名方式</span>
+          <span class="activity-audit-inline-label">活动性质</span>
           <div class="activity-audit-inline-value">{{ reservationTypeLabel(auditActivityRecord.reservation_type) }}</div>
         </div>
         <div class="activity-audit-inline-row">
-          <span class="activity-audit-inline-label">门票说明</span>
-          <div class="activity-audit-inline-value">{{ auditTicketNoteLabel(auditActivityRecord) }}</div>
+          <span class="activity-audit-inline-label">{{ auditBookingWayLabel(auditActivityRecord) }}</span>
+          <div class="activity-audit-inline-value">{{ auditActivityRecord.booking_method_note?.trim() || '—' }}</div>
         </div>
-        <div v-if="auditActivityRecord.offline_reservation_method === 'paid' && auditActivityRecord.ticket_fee_note" class="activity-audit-inline-row">
-          <span class="activity-audit-inline-label">收费说明</span>
-          <div class="activity-audit-inline-value">{{ auditActivityRecord.ticket_fee_note }}</div>
+        <div class="activity-audit-inline-row">
+          <span class="activity-audit-inline-label">费用</span>
+          <div class="activity-audit-inline-value">{{ auditFeeDisplay(auditActivityRecord) }}</div>
         </div>
         <div v-if="auditShowExternalUrl(auditActivityRecord)" class="activity-audit-inline-row">
           <span class="activity-audit-inline-label">外链地址</span>
@@ -2000,8 +2345,11 @@ async function removeActivity(row: Activity) {
         </div>
       </div>
 
-      <div v-if="auditActivityRecord.reservation_type === 'online'" class="activity-audit-stack">
-        <div class="activity-audit-stack__label">场次设置（{{ auditBookingAudienceLabel || '—' }}）</div>
+      <div
+        v-if="auditActivityRecord && reservationTypeSupportsSessionSettings(auditActivityRecord.reservation_type)"
+        class="activity-audit-stack"
+      >
+        <div class="activity-audit-stack__label">场次信息（{{ auditBookingAudienceLabel || '—' }}）</div>
         <div class="activity-audit-stack__body">
           <a-table
             v-if="auditBookingPreview.length"
@@ -2009,19 +2357,36 @@ async function removeActivity(row: Activity) {
             :pagination="false"
             size="small"
             :bordered="{ cell: true }"
+            :scroll="{ x: normalizeReservationKind(auditActivityRecord.reservation_type) === 'online' ? 1410 : 970 }"
           >
             <template #columns>
-              <a-table-column title="场次名称" data-index="session_name" />
-              <a-table-column title="场次开始" data-index="session_start_at" />
-              <a-table-column title="场次结束" data-index="session_end_at" />
-              <a-table-column title="预约截止" data-index="booking_deadline_at" />
-              <a-table-column title="名额" data-index="day_quota" />
-              <a-table-column title="说明" :ellipsis="true" :tooltip="true">
+              <a-table-column title="场次名称" data-index="session_name" :width="152" />
+              <a-table-column title="场次开始" data-index="session_start_at" :width="184" />
+              <a-table-column title="场次结束" data-index="session_end_at" :width="184" />
+              <a-table-column
+                v-if="normalizeReservationKind(auditActivityRecord.reservation_type) === 'online'"
+                title="预约开始"
+                data-index="booking_opens_at"
+                :width="184"
+              />
+              <a-table-column
+                v-if="normalizeReservationKind(auditActivityRecord.reservation_type) === 'online'"
+                title="预约截止"
+                data-index="booking_deadline_at"
+                :width="184"
+              />
+              <a-table-column title="名额" data-index="day_quota" :width="100" />
+              <a-table-column title="说明" :width="220" :ellipsis="true" :tooltip="true">
                 <template #cell="{ record }">
                   <span>{{ ((record as BookingDayRow).quota_note || '').trim() || '—' }}</span>
                 </template>
               </a-table-column>
-              <a-table-column title="已约" data-index="booked_count" />
+              <a-table-column
+                v-if="normalizeReservationKind(auditActivityRecord.reservation_type) === 'online'"
+                title="已约"
+                data-index="booked_count"
+                :width="80"
+              />
             </template>
           </a-table>
           <span v-else class="activity-audit-muted">暂无场次</span>
@@ -2156,7 +2521,6 @@ async function removeActivity(row: Activity) {
     :on-before-cancel="confirmDiscardChanges"
   >
     <a-spin class="activity-edit-spin" style="width: 100%" :loading="activityModalBookingLoading">
-    <div v-show="activityEditStep === 0">
     <a-form :model="form" layout="vertical" class="admin-modal-form">
       <a-form-item label="活动名称" required :help="formErrors.title">
         <a-input v-model="form.title" />
@@ -2164,6 +2528,44 @@ async function removeActivity(row: Activity) {
           <span style="color: #f53f3f;">{{ formErrors.title }}</span>
         </template>
       </a-form-item>
+      <a-form-item label="活动性质" required :help="formErrors.reservation_type">
+        <a-select v-model="form.reservation_type" placeholder="请选择活动性质">
+          <a-option value="online">公益性需预约活动</a-option>
+          <a-option value="none">公益性无需预约活动</a-option>
+          <a-option value="paid_study">收费科普研学活动</a-option>
+          <a-option
+            v-if="
+              !!String(form.reservation_type || '').trim() &&
+              !['online', 'none', 'paid_study'].includes(normalizeReservationKind(form.reservation_type))
+            "
+            :value="form.reservation_type"
+          >
+            （历史类型）{{ reservationTypeLabel(normalizeReservationKind(form.reservation_type)) }}
+          </a-option>
+        </a-select>
+        <template v-if="formErrors.reservation_type" #help>
+          <span style="color: #f53f3f;">{{ formErrors.reservation_type }}</span>
+        </template>
+      </a-form-item>
+      <a-form-item
+        :label="reservationKindLabelBookingField"
+        :required="normalizeReservationKind(form.reservation_type) === 'paid_study'"
+      >
+        <a-input
+          v-model="form.booking_method_note"
+          allow-clear
+          :placeholder="
+            normalizeReservationKind(form.reservation_type) === 'paid_study'
+              ? '请填写报名方式说明'
+              : normalizeReservationKind(form.reservation_type) === 'none'
+                ? '请填写参与提示'
+                : '例如：平台预约'
+          "
+        />
+        <template v-if="formErrors.booking_method_note" #help>
+          <span style="color: #f53f3f;">{{ formErrors.booking_method_note }}</span>
+        </template>
+      </a-form-item>
       <a-form-item v-if="!isVenueAdmin()" label="举办场馆" required :help="formErrors.venue_id">
         <a-select v-model="form.venue_id" allow-search>
           <a-option v-for="v in venues" :key="v.id" :value="v.id">{{ v.name }}</a-option>
@@ -2185,70 +2587,109 @@ async function removeActivity(row: Activity) {
         </template>
       </a-form-item>
       <a-form-item
-        label="活动日期"
-        required
-        :help="formErrors.start_at || formErrors.end_at"
+        label="费用"
+        :required="normalizeReservationKind(form.reservation_type) === 'paid_study'"
       >
-        <a-range-picker
-          v-model="activityDateRange"
-          format="YYYY-MM-DD"
-          value-format="YYYY-MM-DD"
-          :exchange-time="false"
+        <a-input
+          v-model="form.fee_note"
+          placeholder="例如：免费，或收费标准说明"
           style="width: 100%"
+          :max-length="1000"
+          allow-clear
         />
-        <template v-if="formErrors.start_at || formErrors.end_at" #help>
-          <span style="color: #f53f3f;">{{ formErrors.start_at || formErrors.end_at }}</span>
-        </template>
-      </a-form-item>
-      <a-form-item label="具体时间">
-        <a-input v-model="form.specific_time" placeholder="如9:00-10:00，13:00-14:00" allow-clear />
-      </a-form-item>
-      <a-form-item label="报名方式" required>
-        <a-select
-          v-model="form.reservation_type"
-          allow-create
-          allow-search
-          placeholder="可选「需要报名」「无需报名」，或输入自定义文案（仅前端展示，最长 32 字）"
-        >
-          <a-option value="online">需要报名</a-option>
-          <a-option value="none">无需报名</a-option>
-        </a-select>
-        <template v-if="formErrors.reservation_type" #help>
-          <span style="color: #f53f3f;">{{ formErrors.reservation_type }}</span>
+        <template v-if="formErrors.fee_note" #help>
+          <span style="color: #f53f3f;">{{ formErrors.fee_note }}</span>
         </template>
       </a-form-item>
-      <a-form-item label="门票说明" required :help="formErrors.ticket_note">
-        <a-select v-model="form.ticket_note" style="width: 100%">
-          <a-option value="free">免费</a-option>
-          <a-option value="paid">收费</a-option>
-        </a-select>
-        <template v-if="formErrors.ticket_note" #help>
-          <span style="color: #f53f3f;">{{ formErrors.ticket_note }}</span>
-        </template>
-      </a-form-item>
-      <a-form-item v-if="form.ticket_note === 'paid'" label="收费说明">
-        <a-input v-model="form.fee_note" placeholder="请输入收费说明" style="width: 100%" :max-length="1000" allow-clear />
-      </a-form-item>
-      <a-form-item label="标签">
-        <div class="activity-form-tags">
-          <div class="activity-form-tags__line">
-            <a-input v-model="tagInput" class="activity-form-tags__input" placeholder="请输入标签内容" />
-            <a-button type="primary" class="activity-form-tags__save" @click="addTag">保存标签</a-button>
-          </div>
-          <div class="activity-form-tags__chips">
-            <a-tag
-              v-for="(tag, index) in form.tags"
-              :key="`${tag}-${index}`"
-              closable
-              style="margin-bottom: 0"
-              @close="removeTag(index)"
-            >
-              {{ tag }}
-            </a-tag>
-            <span v-if="!form.tags.length" class="activity-form-tags__empty">暂无标签</span>
-          </div>
-        </div>
-      </a-form-item>
+      <a-row :gutter="16" class="admin-modal-form__full">
+        <a-col :xs="24" :md="8">
+          <a-form-item
+            label="活动日期"
+            required
+            :help="formErrors.start_at || formErrors.end_at"
+          >
+            <a-range-picker
+              v-model="activityDateRange"
+              format="YYYY-MM-DD"
+              value-format="YYYY-MM-DD"
+              :exchange-time="false"
+              style="width: 100%"
+            />
+            <template v-if="formErrors.start_at || formErrors.end_at" #help>
+              <span style="color: #f53f3f;">{{ formErrors.start_at || formErrors.end_at }}</span>
+            </template>
+          </a-form-item>
+        </a-col>
+        <a-col :xs="24" :md="8">
+          <a-form-item
+            :required="reservationTypeSupportsSessionSettings(form.reservation_type)"
+            :validate-status="formErrors.specific_time_slots ? 'error' : undefined"
+          >
+            <template #label>
+              <span class="activity-time-label-with-action">
+                <span>具体时间</span>
+                <a-button type="primary" size="mini" class="activity-add-time-slot-btn" @click="addSpecificTimeRow">
+                  添加时段
+                </a-button>
+              </span>
+            </template>
+            <a-space direction="vertical" fill style="width: 100%">
+              <div
+                v-for="(slot, sidx) in form.specific_time_slots"
+                :key="'slot-' + sidx"
+                class="activity-time-slot-row"
+              >
+                <a-time-picker
+                  v-model="slot.start"
+                  class="activity-specific-time-slot-picker"
+                  format="HH:mm"
+                  value-format="HH:mm"
+                  placeholder="开始"
+                  size="small"
+                />
+                <span class="activity-time-slot-row__tilde">至</span>
+                <a-time-picker
+                  v-model="slot.end"
+                  class="activity-specific-time-slot-picker"
+                  format="HH:mm"
+                  value-format="HH:mm"
+                  placeholder="结束"
+                  size="small"
+                />
+                <a-button class="activity-time-slot-row__del" size="mini" status="danger" @click="removeSpecificTimeRow(sidx)">
+                  删除
+                </a-button>
+              </div>
+              <span v-if="!form.specific_time_slots.length" class="activity-time-slots-empty-hint">暂无时段，点击「添加时段」</span>
+            </a-space>
+            <template v-if="formErrors.specific_time_slots" #help>
+              <span style="color: #f53f3f;">{{ formErrors.specific_time_slots }}</span>
+            </template>
+          </a-form-item>
+        </a-col>
+        <a-col :xs="24" :md="8">
+          <a-form-item label="标签">
+            <div class="activity-form-tags">
+              <div class="activity-form-tags__line">
+                <a-input v-model="tagInput" class="activity-form-tags__input" placeholder="请输入标签内容" />
+                <a-button type="primary" class="activity-form-tags__save" @click="addTag">保存标签</a-button>
+              </div>
+              <div class="activity-form-tags__chips">
+                <a-tag
+                  v-for="(tag, index) in form.tags"
+                  :key="`${tag}-${index}`"
+                  closable
+                  style="margin-bottom: 0"
+                  @close="removeTag(index)"
+                >
+                  {{ tag }}
+                </a-tag>
+                <span v-if="!form.tags.length" class="activity-form-tags__empty">暂无标签</span>
+              </div>
+            </div>
+          </a-form-item>
+        </a-col>
+      </a-row>
       <a-row class="admin-modal-form__full" :gutter="16">
         <a-col :xs="24" :md="12">
           <a-form-item label="活动地点" required :help="formErrors.location">
@@ -2285,7 +2726,7 @@ async function removeActivity(row: Activity) {
               <a-upload :auto-upload="false" :show-file-list="false" accept="image/*" :before-upload="onCoverSelect" @change="onCoverChange">
                 <template #upload-button><a-button>上传封面</a-button></template>
               </a-upload>
-              <a-typography-text type="secondary">图片尺寸推荐 1200×600</a-typography-text>
+              <a-typography-text type="secondary">{{ ADMIN_IMAGE_RECOMMEND_LABEL }}</a-typography-text>
               <a-space v-if="form.cover_image" direction="vertical" align="start">
                 <img :src="form.cover_image" class="activity-cover-thumb" @click="openMediaPreview('image', form.cover_image)" />
                 <a-button size="mini" status="danger" @click="removeCover">删除封面</a-button>
@@ -2306,7 +2747,9 @@ async function removeActivity(row: Activity) {
                 >
                   <template #upload-button><a-button type="primary">新增展示资源</a-button></template>
                 </a-upload>
-                <a-typography-text type="secondary" style="margin-top: 12px; display: block">图片尺寸推荐 1200×600</a-typography-text>
+                <a-typography-text type="secondary" style="margin-top: 12px; display: block">{{
+                  ADMIN_IMAGE_RECOMMEND_LABEL
+                }}</a-typography-text>
               </div>
               <div class="activity-gallery-grid">
                 <div
@@ -2334,6 +2777,151 @@ async function removeActivity(row: Activity) {
           </div>
         </div>
       </a-form-item>
+      <div class="admin-modal-form__full" style="width: 100%; margin-bottom: 8px">
+        <div style="font-weight: 600; margin-bottom: 8px">场次信息</div>
+        <a-typography-text v-if="canSaveSessionsWithActivity" type="secondary" style="display: block; margin-bottom: 12px">
+          {{ activityBookingStepIntro }}
+        </a-typography-text>
+        <a-typography-text v-else type="warning" style="display: block; margin-bottom: 12px">
+          活动已结束：本次保存将不更新场次与预约名额（仅活动基本信息）。
+        </a-typography-text>
+        <a-form v-if="showBookingAudienceFields" layout="vertical">
+          <a-row :gutter="16">
+            <a-col :span="8">
+              <a-form-item label="预约对象">
+                <a-select v-model="bookingForm.booking_audience">
+                  <a-option value="individual">个人</a-option>
+                  <a-option value="group">团体</a-option>
+                  <a-option value="both">个人+团体</a-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+            <a-col v-if="bookingForm.booking_audience !== 'individual'" :span="8">
+              <a-form-item label="每单最少人数">
+                <a-input-number v-model="bookingForm.min_people_per_order" :min="1" style="width: 100%" />
+              </a-form-item>
+            </a-col>
+            <a-col v-if="bookingForm.booking_audience !== 'individual'" :span="8">
+              <a-form-item label="每单最多人数">
+                <a-input-number
+                  v-model="bookingForm.max_people_per_order"
+                  :min="2"
+                  style="width: 100%"
+                />
+              </a-form-item>
+            </a-col>
+          </a-row>
+        </a-form>
+        <div style="margin-bottom: 8px; color: var(--color-text-3); font-size: 12px">
+          {{ sessionRulesHint }}
+        </div>
+        <a-button
+          type="primary"
+          class="activity-form-tags__save activity-add-session-btn"
+          style="margin-bottom: 12px"
+          :disabled="!canSaveSessionsWithActivity"
+          @click="addBookingDayRow"
+        >
+          添加场次
+        </a-button>
+        <a-table
+          :data="bookingForm.days"
+          :pagination="false"
+          :bordered="{ cell: true }"
+          size="small"
+          :scroll="{ x: sessionTableScrollX }"
+        >
+          <template #columns>
+            <a-table-column title="场次名称" :width="152">
+              <template #cell="{ rowIndex }">
+                <a-input v-model="bookingForm.days[rowIndex].session_name" placeholder="名称" :disabled="!canSaveSessionsWithActivity" />
+              </template>
+            </a-table-column>
+            <a-table-column title="场次开始" :width="184">
+              <template #cell="{ rowIndex }">
+                <a-date-picker
+                  v-model="bookingForm.days[rowIndex].session_start_at"
+                  show-time
+                  format="YYYY-MM-DD HH:mm"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  style="width: 100%"
+                  :disabled="!canSaveSessionsWithActivity"
+                />
+              </template>
+            </a-table-column>
+            <a-table-column title="场次结束" :width="184">
+              <template #cell="{ rowIndex }">
+                <a-date-picker
+                  v-model="bookingForm.days[rowIndex].session_end_at"
+                  show-time
+                  format="YYYY-MM-DD HH:mm"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  style="width: 100%"
+                  :disabled="!canSaveSessionsWithActivity"
+                />
+              </template>
+            </a-table-column>
+            <a-table-column v-if="showSessionBookingWindowColumns" title="预约开始" :width="184">
+              <template #cell="{ rowIndex }">
+                <a-date-picker
+                  v-model="bookingForm.days[rowIndex].booking_opens_at"
+                  show-time
+                  format="YYYY-MM-DD HH:mm"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  style="width: 100%"
+                  :disabled="!canSaveSessionsWithActivity"
+                />
+              </template>
+            </a-table-column>
+            <a-table-column v-if="showSessionBookingWindowColumns" title="预约截止" :width="184">
+              <template #cell="{ rowIndex }">
+                <a-date-picker
+                  v-model="bookingForm.days[rowIndex].booking_deadline_at"
+                  show-time
+                  format="YYYY-MM-DD HH:mm"
+                  value-format="YYYY-MM-DD HH:mm:ss"
+                  style="width: 100%"
+                  :disabled="!canSaveSessionsWithActivity"
+                />
+              </template>
+            </a-table-column>
+            <a-table-column title="名额" :width="100">
+              <template #cell="{ rowIndex }">
+                <a-input-number
+                  v-model="bookingForm.days[rowIndex].day_quota"
+                  :min="Math.max(1, Number(bookingForm.days[rowIndex].booked_count) || 0)"
+                  style="width: 100%"
+                  :disabled="!canSaveSessionsWithActivity"
+                />
+              </template>
+            </a-table-column>
+            <a-table-column title="说明" :width="200">
+              <template #title>
+                <span>说明</span>
+                <span style="color: var(--color-text-3); font-weight: normal; font-size: 12px">（可选）</span>
+              </template>
+              <template #cell="{ rowIndex }">
+                <a-input
+                  v-model="bookingForm.days[rowIndex].quota_note"
+                  placeholder="可与名额配合说明"
+                  allow-clear
+                  :disabled="!canSaveSessionsWithActivity"
+                />
+              </template>
+            </a-table-column>
+            <a-table-column v-if="showSessionBookingWindowColumns" title="已约" :width="80">
+              <template #cell="{ rowIndex }">
+                {{ bookingForm.days[rowIndex].booked_count ?? 0 }}
+              </template>
+            </a-table-column>
+            <a-table-column title="" :width="68" fixed="right">
+              <template #cell="{ rowIndex }">
+                <a-button type="text" status="danger" :disabled="!canSaveSessionsWithActivity" @click="removeBookingDayRow(rowIndex)">删除</a-button>
+              </template>
+            </a-table-column>
+          </template>
+        </a-table>
+      </div>
       <a-form-item label="活动详情" class="admin-modal-form__full">
         <RichEditorField
           v-model="form.detail_html"
@@ -2344,159 +2932,11 @@ async function removeActivity(row: Activity) {
         />
       </a-form-item>
     </a-form>
-    </div>
-
-    <div v-show="activityEditStep === 1">
-      <a-typography-text v-if="canConfigureBookingStep" type="secondary" style="display: block; margin-bottom: 12px">
-        {{ activityBookingStepIntro }}
-      </a-typography-text>
-      <a-form layout="vertical">
-        <a-row :gutter="16">
-          <a-col :span="8">
-            <a-form-item label="预约对象">
-              <a-select v-model="bookingForm.booking_audience">
-                <a-option value="individual">个人</a-option>
-                <a-option value="group">团体</a-option>
-                <a-option value="both">个人+团体</a-option>
-              </a-select>
-            </a-form-item>
-          </a-col>
-          <a-col v-if="bookingForm.booking_audience !== 'individual'" :span="8">
-            <a-form-item label="每单最少人数">
-              <a-input-number v-model="bookingForm.min_people_per_order" :min="1" style="width: 100%" />
-            </a-form-item>
-          </a-col>
-          <a-col v-if="bookingForm.booking_audience !== 'individual'" :span="8">
-            <a-form-item label="每单最多人数">
-              <a-input-number
-                v-model="bookingForm.max_people_per_order"
-                :min="2"
-                style="width: 100%"
-              />
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-      <div style="margin-bottom: 8px; color: var(--color-text-3); font-size: 12px">
-        每场次的开始时间与结束时间须为同一天内；预约截止时间须早于场次开始时间；预约开始时间可不填写（空=截止前任意时刻均可约，有值则仅在「开始～截止」内可约）。更改名额不可低于已约人数。如对人数限制有特殊要求，可填写「说明」项，例如：人数限制——4组亲子家庭；可将名额填入4，同时在说明中填入「4组亲子家庭」。
-      </div>
-      <a-button long type="outline" style="margin-bottom: 12px" @click="addBookingDayRow">添加场次</a-button>
-      <a-table
-        :data="bookingForm.days"
-        :pagination="false"
-        :bordered="{ cell: true }"
-        size="small"
-        :scroll="{ x: 1380 }"
-      >
-        <template #columns>
-          <a-table-column title="场次名称" :width="112">
-            <template #cell="{ rowIndex }">
-              <a-input v-model="bookingForm.days[rowIndex].session_name" placeholder="名称" />
-            </template>
-          </a-table-column>
-          <a-table-column title="场次开始" :width="160">
-            <template #cell="{ rowIndex }">
-              <a-date-picker
-                v-model="bookingForm.days[rowIndex].session_start_at"
-                show-time
-                format="YYYY-MM-DD HH:mm"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                style="width: 100%"
-              />
-            </template>
-          </a-table-column>
-          <a-table-column title="场次结束" :width="160">
-            <template #cell="{ rowIndex }">
-              <a-date-picker
-                v-model="bookingForm.days[rowIndex].session_end_at"
-                show-time
-                format="YYYY-MM-DD HH:mm"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                style="width: 100%"
-              />
-            </template>
-          </a-table-column>
-          <a-table-column title="预约开始" :width="164">
-            <template #title>
-              <span>预约开始</span>
-              <span style="color: var(--color-text-3); font-weight: normal; font-size: 12px">（可空）</span>
-            </template>
-            <template #cell="{ rowIndex }">
-              <a-date-picker
-                v-model="bookingForm.days[rowIndex].booking_opens_at"
-                show-time
-                format="YYYY-MM-DD HH:mm"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                allow-clear
-                style="width: 100%"
-              />
-            </template>
-          </a-table-column>
-          <a-table-column title="预约截止" :width="160">
-            <template #cell="{ rowIndex }">
-              <a-date-picker
-                v-model="bookingForm.days[rowIndex].booking_deadline_at"
-                show-time
-                format="YYYY-MM-DD HH:mm"
-                value-format="YYYY-MM-DD HH:mm:ss"
-                style="width: 100%"
-              />
-            </template>
-          </a-table-column>
-          <a-table-column title="名额" :width="80">
-            <template #cell="{ rowIndex }">
-              <a-input-number v-model="bookingForm.days[rowIndex].day_quota" :min="1" style="width: 100%" />
-            </template>
-          </a-table-column>
-          <a-table-column title="说明" :width="140">
-            <template #title>
-              <span>说明</span>
-              <span style="color: var(--color-text-3); font-weight: normal; font-size: 12px">（可选）</span>
-            </template>
-            <template #cell="{ rowIndex }">
-              <a-input
-                v-model="bookingForm.days[rowIndex].quota_note"
-                placeholder="例：4组亲子家庭（可与名额数配合填写）"
-                allow-clear
-              />
-            </template>
-          </a-table-column>
-          <a-table-column title="已约" :width="56">
-            <template #cell="{ rowIndex }">
-              {{ bookingForm.days[rowIndex].booked_count ?? 0 }}
-            </template>
-          </a-table-column>
-          <a-table-column title="" :width="68" fixed="right">
-            <template #cell="{ rowIndex }">
-              <a-button type="text" status="danger" @click="removeBookingDayRow(rowIndex)">删除</a-button>
-            </template>
-          </a-table-column>
-        </template>
-      </a-table>
-    </div>
     </a-spin>
 
     <template #footer>
       <a-button @click="onCancelUnifiedModal">取消</a-button>
-      <a-button v-if="activityEditStep === 1" @click="activityEditStep = 0">上一步</a-button>
-      <a-button
-        v-if="activityEditStep === 0 && canConfigureBookingStep"
-        type="primary"
-        :loading="saving"
-        @click="onClickNextStep"
-      >下一步：场次设置</a-button>
-      <a-button
-        v-if="activityEditStep === 0 && !canConfigureBookingStep"
-        type="primary"
-        :loading="saving"
-        @click="submitUnifiedActivity"
-      >提交</a-button>
-      <a-button
-        v-if="activityEditStep === 1"
-        type="primary"
-        :loading="saving"
-        @click="submitUnifiedActivity"
-      >提交</a-button>
+      <a-button type="primary" :loading="saving" @click="submitUnifiedActivity">提交</a-button>
     </template>
   </a-modal>
 
@@ -2599,6 +3039,71 @@ async function removeActivity(row: Activity) {
   flex-shrink: 0;
 }
 
+.activity-time-label-with-action {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  flex-wrap: wrap;
+  line-height: 1.35;
+}
+.activity-add-time-slot-btn {
+  flex-shrink: 0;
+  padding: 0 6px !important;
+  min-width: unset !important;
+  font-size: 11px !important;
+  height: 22px !important;
+  line-height: 20px !important;
+}
+.activity-time-slots-empty-hint {
+  font-size: 12px;
+  color: var(--color-text-3);
+}
+.activity-add-session-btn {
+  width: auto;
+}
+
+.activity-time-slot-row {
+  display: flex;
+  flex-wrap: nowrap;
+  align-items: center;
+  gap: 6px;
+  width: 100%;
+  min-width: 0;
+}
+/* TimePicker 由 Trigger 将类合并到 .arco-picker 根节点，无独立 .arco-trigger 包裹层 */
+.activity-time-slot-row :deep(.activity-specific-time-slot-picker.arco-picker) {
+  flex: 0 0 auto;
+  width: 102px !important;
+  min-width: 102px !important;
+  max-width: 102px !important;
+  box-sizing: border-box;
+  padding: 3px 8px 3px 4px !important;
+}
+.activity-time-slot-row :deep(.activity-specific-time-slot-picker .arco-picker-input) {
+  flex: 1 1 0;
+  min-width: 0;
+  padding: 0 4px 0 6px !important;
+}
+.activity-time-slot-row :deep(.activity-specific-time-slot-picker input) {
+  font-size: 12px;
+  padding-left: 4px !important;
+  min-width: 0;
+}
+.activity-time-slot-row :deep(.activity-specific-time-slot-picker .arco-picker-suffix) {
+  margin-left: 2px;
+}
+.activity-time-slot-row :deep(.activity-specific-time-slot-picker .arco-picker-suffix .arco-icon) {
+  font-size: 12px;
+}
+.activity-time-slot-row__tilde {
+  flex-shrink: 0;
+  color: var(--color-text-3);
+  font-size: 11px;
+}
+.activity-time-slot-row__del {
+  flex-shrink: 0;
+}
+
 .activity-cover-carousel-wrap {
   display: flex;
   flex-wrap: wrap;
@@ -2649,7 +3154,8 @@ async function removeActivity(row: Activity) {
 }
 
 .activity-form-tags {
-  max-width: 520px;
+  width: 100%;
+  max-width: 100%;
 }
 .activity-form-tags__line {
   display: flex;
diff --git a/src/views/activities/Registrations.vue b/src/views/activities/Registrations.vue
index 77b24b2..a6b1a1e 100644
--- a/src/views/activities/Registrations.vue
+++ b/src/views/activities/Registrations.vue
@@ -166,6 +166,20 @@ function onSearch() {
   loadRows()
 }
 
+/** Arco Table 行级 row-class 无效；已取消 / 已过期 用 cell class + inline 背景兜底 */
+function registrationInactiveBodyCellClass(record: unknown) {
+  const st = String((record as { status?: string })?.status ?? '').trim()
+  return st === 'cancelled' || st === 'expired' ? 'reg-row-inactive-cell' : undefined
+}
+
+function registrationInactiveBodyCellStyle(record: unknown) {
+  const st = String((record as { status?: string })?.status ?? '').trim()
+  if (st === 'cancelled' || st === 'expired') {
+    return { backgroundColor: 'var(--color-fill-2)' }
+  }
+  return {}
+}
+
 async function exportCsv() {
   try {
     if (exportFields.value.length === 0) {
@@ -334,32 +348,42 @@ function onPageChange(p: number) {
       @page-change="onPageChange"
     >
       <template #columns>
-        <a-table-column title="" :width="50" :ellipsis="true" :tooltip="true">
+        <a-table-column title="" :width="50" :ellipsis="true" :tooltip="true" :body-cell-class="registrationInactiveBodyCellClass"
+          :body-cell-style="registrationInactiveBodyCellStyle">
           <template #cell="{ rowIndex }">{{
             listTableRowIndex(rowIndex, pagination.current, pagination.pageSize)
           }}</template>
         </a-table-column>
-        <a-table-column title="活动" :width="280" :min-width="220">
+        <a-table-column title="活动" :width="280" :min-width="220" :body-cell-class="registrationInactiveBodyCellClass"
+          :body-cell-style="registrationInactiveBodyCellStyle">
           <template #cell="{ record }">{{ record.activity?.title || '-' }}</template>
         </a-table-column>
-        <a-table-column title="场馆" :width="220" :min-width="180">
+        <a-table-column title="场馆" :width="220" :min-width="180" :body-cell-class="registrationInactiveBodyCellClass"
+          :body-cell-style="registrationInactiveBodyCellStyle">
           <template #cell="{ record }">{{ record.venue?.name || '-' }}</template>
         </a-table-column>
-        <a-table-column title="报名人" data-index="visitor_name" :width="140" :min-width="120" />
-        <a-table-column title="手机号" data-index="visitor_phone" :width="150" :min-width="130" />
-        <a-table-column title="预约类型" :width="100">
+        <a-table-column title="报名人" data-index="visitor_name" :width="140" :min-width="120" :body-cell-class="registrationInactiveBodyCellClass"
+          :body-cell-style="registrationInactiveBodyCellStyle" />
+        <a-table-column title="手机号" data-index="visitor_phone" :width="150" :min-width="130" :body-cell-class="registrationInactiveBodyCellClass"
+          :body-cell-style="registrationInactiveBodyCellStyle" />
+        <a-table-column title="预约类型" :width="100" :body-cell-class="registrationInactiveBodyCellClass"
+          :body-cell-style="registrationInactiveBodyCellStyle">
           <template #cell="{ record }">{{ bookingTypeLabel(record.booking_type, record.ticket_count) }}</template>
         </a-table-column>
-        <a-table-column title="预约票数" :width="110">
+        <a-table-column title="预约票数" :width="110" :body-cell-class="registrationInactiveBodyCellClass"
+          :body-cell-style="registrationInactiveBodyCellStyle">
           <template #cell="{ record }">{{ record.ticket_count ?? 1 }}</template>
         </a-table-column>
-        <a-table-column title="场次名称" :width="160" :min-width="120" :ellipsis="true" :tooltip="true">
+        <a-table-column title="场次名称" :width="160" :min-width="120" :ellipsis="true" :tooltip="true" :body-cell-class="registrationInactiveBodyCellClass"
+          :body-cell-style="registrationInactiveBodyCellStyle">
           <template #cell="{ record }">{{ (record.activity_day?.session_name || '').trim() || '-' }}</template>
         </a-table-column>
-        <a-table-column title="活动时间" :width="220" :min-width="180" :ellipsis="true" :tooltip="true">
+        <a-table-column title="活动时间" :width="220" :min-width="180" :ellipsis="true" :tooltip="true" :body-cell-class="registrationInactiveBodyCellClass"
+          :body-cell-style="registrationInactiveBodyCellStyle">
           <template #cell="{ record }">{{ formatActivitySessionTime(record.activity_day) }}</template>
         </a-table-column>
-        <a-table-column title="状态" :width="120">
+        <a-table-column title="状态" :width="120" :body-cell-class="registrationInactiveBodyCellClass"
+          :body-cell-style="registrationInactiveBodyCellStyle">
           <template #cell="{ record }">
             <a-tag
               :color="
@@ -376,10 +400,12 @@ function onPageChange(p: number) {
             </a-tag>
           </template>
         </a-table-column>
-        <a-table-column title="下单时间" :width="190" :min-width="175">
+        <a-table-column title="下单时间" :width="190" :min-width="175" :body-cell-class="registrationInactiveBodyCellClass"
+          :body-cell-style="registrationInactiveBodyCellStyle">
           <template #cell="{ record }">{{ formatDateTimeZh(record.created_at) }}</template>
         </a-table-column>
-        <a-table-column title="核销时间" :width="190" :min-width="175">
+        <a-table-column title="核销时间" :width="190" :min-width="175" :body-cell-class="registrationInactiveBodyCellClass"
+          :body-cell-style="registrationInactiveBodyCellStyle">
           <template #cell="{ record }">{{ formatDateTimeZh(record.verified_at) }}</template>
         </a-table-column>
         <a-table-column
@@ -391,6 +417,8 @@ function onPageChange(p: number) {
           :tooltip="true"
           fixed="right"
           align="left"
+          :body-cell-class="registrationInactiveBodyCellClass"
+          :body-cell-style="registrationInactiveBodyCellStyle"
         />
       </template>
     </a-table>
@@ -464,5 +492,13 @@ function onPageChange(p: number) {
 .registrations-table :deep(.arco-table-text-ellipsis) {
   white-space: nowrap;
 }
+
+.registrations-table :deep(.arco-table-td.reg-row-inactive-cell) {
+  background-color: var(--color-fill-2) !important;
+}
+
+.registrations-table :deep(.arco-table-tr:hover .arco-table-td.reg-row-inactive-cell) {
+  background-color: var(--color-fill-3) !important;
+}
 </style>
 
diff --git a/src/views/h5/VerifyLogin.vue b/src/views/h5/VerifyLogin.vue
index 880a261..4abb0c8 100644
--- a/src/views/h5/VerifyLogin.vue
+++ b/src/views/h5/VerifyLogin.vue
@@ -70,7 +70,9 @@ onMounted(() => {
       />
       <a-button type="primary" long size="large" :loading="loadingPin" @click="loginSixPin"> 进入核销页 </a-button>
 
-      <p class="m-verify-tip">登录状态将保持较长时间；失效后会自动退回本页。</p>
+      <p class="m-verify-tip">
+        未点击核销页上的「退出」前会一直保持登录；退出后，下次再打开本链接需重新输入 6 位口令。若口令登录态过期或失效，也会自动回到本页。
+      </p>
     </div>
   </div>
 </template>
diff --git a/src/views/h5/VerifyScan.vue b/src/views/h5/VerifyScan.vue
index 6796c90..51af02a 100644
--- a/src/views/h5/VerifyScan.vue
+++ b/src/views/h5/VerifyScan.vue
@@ -119,6 +119,7 @@ function bookerVerifyLine(r: ReservationRow): string {
 
 const todayList = ref<ReservationRow[]>([])
 const listLoading = ref(false)
+const headerRefreshing = ref(false)
 /** 今日活动日汇总（按预约订单数）；与列表同接口权限 */
 const todaySummary = ref<TodaySummary | null>(null)
 
@@ -510,6 +511,21 @@ function startScanLoop() {
   }, 400)
 }
 
+async function refreshVerifyData() {
+  if (!localStorage.getItem(H5_TOKEN_KEY)) {
+    router.replace(loginPath.value)
+    return
+  }
+  headerRefreshing.value = true
+  try {
+    await loadMe()
+    await loadTodayList()
+    Message.success('已刷新')
+  } finally {
+    headerRefreshing.value = false
+  }
+}
+
 async function logout() {
   closeCamera()
   try {
@@ -549,7 +565,10 @@ onBeforeUnmount(() => {
         <div class="m-scan-sub">扫码核对信息后核销</div>
         <div v-if="venueHeadline" class="m-scan-venue">{{ venueHeadline }}</div>
       </div>
-      <a-button size="small" @click="logout">退出</a-button>
+      <div class="m-scan-head-actions">
+        <a-button size="small" :loading="headerRefreshing" @click="refreshVerifyData">刷新</a-button>
+        <a-button size="small" @click="logout">退出</a-button>
+      </div>
     </header>
 
     <section class="m-scan-stats" aria-label="今日预约统计">
@@ -735,6 +754,17 @@ onBeforeUnmount(() => {
   gap: 12px;
   margin-bottom: 28px;
 }
+.m-scan-head-actions {
+  display: flex;
+  flex-direction: column;
+  align-items: stretch;
+  gap: 8px;
+  flex-shrink: 0;
+  min-width: 72px;
+}
+.m-scan-head-actions :deep(.arco-btn) {
+  padding: 0 12px;
+}
 .m-scan-brand {
   font-size: 22px;
   font-weight: 700;
diff --git a/src/views/study-tours/StudyTourList.vue b/src/views/study-tours/StudyTourList.vue
index 40db697..7ee79de 100644
--- a/src/views/study-tours/StudyTourList.vue
+++ b/src/views/study-tours/StudyTourList.vue
@@ -5,6 +5,7 @@ import { http } from '../../api/http'
 import RichEditorField from '../../components/RichEditorField.vue'
 import { listTableRowIndex } from '../../utils/listTableRowIndex'
 import { resolvePublicMediaUrl } from '../../utils/mediaUrl'
+import { adminUploadImageTooLargeMessage, ADMIN_IMAGE_RECOMMEND_LABEL } from '../../utils/adminMediaLimits'
 
 const STUDY_TOUR_LIST_SCROLL_X = 900
 
@@ -123,6 +124,11 @@ function quillImageHandler(this: { quill: any }) {
   input.onchange = async () => {
     const file = input.files?.[0]
     if (!file) return
+    const sizeMsg = adminUploadImageTooLargeMessage(file)
+    if (sizeMsg) {
+      Message.warning(sizeMsg)
+      return
+    }
     try {
       const url = await uploadEditorFile(file)
       const range = quill.getSelection(true)
@@ -198,6 +204,11 @@ async function onCoverSelect(fileItem: any) {
       Message.warning('未识别到上传文件')
       return false
     }
+    const sizeMsg = adminUploadImageTooLargeMessage(file)
+    if (sizeMsg) {
+      Message.warning(sizeMsg)
+      return false
+    }
     form.cover_image = await uploadFile(file)
     Message.success('封面上传成功')
   } catch (error: any) {
@@ -587,7 +598,7 @@ onMounted(async () => {
           <a-upload :auto-upload="false" :show-file-list="false" accept="image/*" :before-upload="onCoverSelect" @change="onCoverChange">
             <template #upload-button><a-button>上传封面</a-button></template>
           </a-upload>
-          <a-typography-text type="secondary">图片尺寸推荐 1200×600</a-typography-text>
+          <a-typography-text type="secondary">{{ ADMIN_IMAGE_RECOMMEND_LABEL }}</a-typography-text>
           <div v-if="form.cover_image" style="display: flex; flex-direction: column; align-items: flex-start; gap: 8px">
             <img
               :src="resolvePublicMediaUrl(form.cover_image)"
diff --git a/src/views/ticket-grab/TicketGrabRegistrations.vue b/src/views/ticket-grab/TicketGrabRegistrations.vue
index 5d2f1b2..03c8dd3 100644
--- a/src/views/ticket-grab/TicketGrabRegistrations.vue
+++ b/src/views/ticket-grab/TicketGrabRegistrations.vue
@@ -113,6 +113,19 @@ function onPageSizeChange(s: number) {
   void loadRows()
 }
 
+function tgRegistrationInactiveBodyCellClass(record: unknown) {
+  const st = String((record as { status?: string })?.status ?? '').trim()
+  return st === 'cancelled' || st === 'expired' ? 'reg-row-inactive-cell' : undefined
+}
+
+function tgRegistrationInactiveBodyCellStyle(record: unknown) {
+  const st = String((record as { status?: string })?.status ?? '').trim()
+  if (st === 'cancelled' || st === 'expired') {
+    return { backgroundColor: 'var(--color-fill-2)' }
+  }
+  return {}
+}
+
 watch(filterVenueId, () => {
   pagination.current = 1
   void loadRows()
@@ -178,6 +191,7 @@ onMounted(async () => {
       </a-space>
 
       <a-table
+        class="tg-registrations-table"
         :scroll="{ x: TG_REGISTRATIONS_LIST_SCROLL_X }"
         :data="rows"
         :loading="loading"
@@ -192,31 +206,40 @@ onMounted(async () => {
         }"
       >
         <template #columns>
-          <a-table-column title="" :width="50" :ellipsis="true" :tooltip="true">
+          <a-table-column title="" :width="50" :ellipsis="true" :tooltip="true" :body-cell-class="tgRegistrationInactiveBodyCellClass"
+          :body-cell-style="tgRegistrationInactiveBodyCellStyle">
             <template #cell="{ rowIndex }">{{
               listTableRowIndex(rowIndex, pagination.current, pagination.pageSize)
             }}</template>
           </a-table-column>
-          <a-table-column title="抢票活动" :width="200" :ellipsis="true" :tooltip="true">
+          <a-table-column title="抢票活动" :width="200" :ellipsis="true" :tooltip="true" :body-cell-class="tgRegistrationInactiveBodyCellClass"
+          :body-cell-style="tgRegistrationInactiveBodyCellStyle">
             <template #cell="{ record }">{{ record.ticket_grab_event?.title ?? '-' }}</template>
           </a-table-column>
-          <a-table-column title="场馆" :width="160" :ellipsis="true" :tooltip="true">
+          <a-table-column title="场馆" :width="160" :ellipsis="true" :tooltip="true" :body-cell-class="tgRegistrationInactiveBodyCellClass"
+          :body-cell-style="tgRegistrationInactiveBodyCellStyle">
             <template #cell="{ record }">{{ record.venue?.name ?? '-' }}</template>
           </a-table-column>
-          <a-table-column title="姓名" data-index="visitor_name" :width="100" />
-          <a-table-column title="身份证" data-index="id_card" :width="180" :ellipsis="true" :tooltip="true" />
-          <a-table-column title="入馆日" :width="120">
+          <a-table-column title="姓名" data-index="visitor_name" :width="100" :body-cell-class="tgRegistrationInactiveBodyCellClass"
+          :body-cell-style="tgRegistrationInactiveBodyCellStyle" />
+          <a-table-column title="身份证" data-index="id_card" :width="180" :ellipsis="true" :tooltip="true" :body-cell-class="tgRegistrationInactiveBodyCellClass"
+          :body-cell-style="tgRegistrationInactiveBodyCellStyle" />
+          <a-table-column title="入馆日" :width="120" :body-cell-class="tgRegistrationInactiveBodyCellClass"
+          :body-cell-style="tgRegistrationInactiveBodyCellStyle">
             <template #cell="{ record }">{{
               record.entry_date ? formatDateZh(String(record.entry_date)) : '-'
             }}</template>
           </a-table-column>
-          <a-table-column title="预约类型" :width="100">
+          <a-table-column title="预约类型" :width="100" :body-cell-class="tgRegistrationInactiveBodyCellClass"
+          :body-cell-style="tgRegistrationInactiveBodyCellStyle">
             <template #cell="{ record }">{{ bookingTypeLabel(record.booking_type, record.ticket_count) }}</template>
           </a-table-column>
-          <a-table-column title="票数" :width="80">
+          <a-table-column title="票数" :width="80" :body-cell-class="tgRegistrationInactiveBodyCellClass"
+          :body-cell-style="tgRegistrationInactiveBodyCellStyle">
             <template #cell="{ record }">{{ record.ticket_count ?? 1 }}</template>
           </a-table-column>
-          <a-table-column title="状态" :width="100">
+          <a-table-column title="状态" :width="100" :body-cell-class="tgRegistrationInactiveBodyCellClass"
+          :body-cell-style="tgRegistrationInactiveBodyCellStyle">
             <template #cell="{ record }">
               <a-tag
                 :color="
@@ -230,15 +253,18 @@ onMounted(async () => {
               >
             </template>
           </a-table-column>
-          <a-table-column title="下单时间" :width="170">
+          <a-table-column title="下单时间" :width="170" :body-cell-class="tgRegistrationInactiveBodyCellClass"
+          :body-cell-style="tgRegistrationInactiveBodyCellStyle">
             <template #cell="{ record }">{{ formatDateTimeZh(record.created_at) }}</template>
           </a-table-column>
-          <a-table-column title="核销时间" :width="170">
+          <a-table-column title="核销时间" :width="170" :body-cell-class="tgRegistrationInactiveBodyCellClass"
+          :body-cell-style="tgRegistrationInactiveBodyCellStyle">
             <template #cell="{ record }">{{
               record.verified_at ? formatDateTimeZh(String(record.verified_at)) : '-'
             }}</template>
           </a-table-column>
-          <a-table-column title="核销 Token" :width="220" :ellipsis="true" :tooltip="true">
+          <a-table-column title="核销 Token" :width="220" :ellipsis="true" :tooltip="true" :body-cell-class="tgRegistrationInactiveBodyCellClass"
+          :body-cell-style="tgRegistrationInactiveBodyCellStyle">
             <template #cell="{ record }">
               <span style="font-family: monospace; font-size: 12px">{{ record.qr_token }}</span>
             </template>
@@ -248,3 +274,13 @@ onMounted(async () => {
     </a-space>
   </a-card>
 </template>
+
+<style scoped>
+.tg-registrations-table :deep(.arco-table-td.reg-row-inactive-cell) {
+  background-color: var(--color-fill-2) !important;
+}
+
+.tg-registrations-table :deep(.arco-table-tr:hover .arco-table-td.reg-row-inactive-cell) {
+  background-color: var(--color-fill-3) !important;
+}
+</style>
diff --git a/src/views/venues/VenueList.vue b/src/views/venues/VenueList.vue
index 7225759..fd32203 100644
--- a/src/views/venues/VenueList.vue
+++ b/src/views/venues/VenueList.vue
@@ -3,6 +3,7 @@ import { nextTick, onMounted, reactive, ref } from 'vue'
 import { Message } from '@arco-design/web-vue'
 import { http } from '../../api/http'
 import RichEditorField from '../../components/RichEditorField.vue'
+import { adminUploadImageTooLargeMessage, ADMIN_IMAGE_RECOMMEND_LABEL } from '../../utils/adminMediaLimits'
 import { listTableRowIndex } from '../../utils/listTableRowIndex'
 import { resolvePublicMediaUrl } from '../../utils/mediaUrl'
 
@@ -148,6 +149,11 @@ function quillImageHandler(this: { quill: any }) {
   input.onchange = async () => {
     const file = input.files?.[0]
     if (!file) return
+    const sizeMsg = adminUploadImageTooLargeMessage(file)
+    if (sizeMsg) {
+      Message.warning(sizeMsg)
+      return
+    }
     try {
       const url = await uploadFile(file)
       const range = quill.getSelection(true)
@@ -566,6 +572,11 @@ async function onCoverSelect(fileItem: any) {
       Message.warning('未识别到上传文件')
       return false
     }
+    const sizeMsg = adminUploadImageTooLargeMessage(file)
+    if (sizeMsg) {
+      Message.warning(sizeMsg)
+      return false
+    }
     form.cover_image = await uploadFile(file)
     Message.success('封面上传成功')
   } catch (error: any) {
@@ -581,6 +592,11 @@ async function onGallerySelect(fileItem: any) {
       Message.warning('未识别到上传文件')
       return false
     }
+    const sizeMsg = adminUploadImageTooLargeMessage(file)
+    if (sizeMsg) {
+      Message.warning(sizeMsg)
+      return false
+    }
     const url = await uploadFile(file)
     if (!url) {
       Message.error('上传成功但未返回可用地址')
@@ -617,6 +633,11 @@ async function onBookingQrSelect(file: File) {
       Message.warning('仅支持图片')
       return false
     }
+    const sizeMsg = adminUploadImageTooLargeMessage(file)
+    if (sizeMsg) {
+      Message.warning(sizeMsg)
+      return false
+    }
     const url = await uploadFile(file)
     if (!url) {
       Message.error('上传成功但未返回可用地址')
@@ -1191,7 +1212,9 @@ onMounted(async () => {
             >
               <template #upload-button><a-button type="primary" size="small">上传图片</a-button></template>
             </a-upload>
-            <a-typography-text type="secondary" style="margin-top: 8px; display: block; font-size: 12px">推荐 1200×600</a-typography-text>
+            <a-typography-text type="secondary" style="margin-top: 8px; display: block; font-size: 12px">{{
+              ADMIN_IMAGE_RECOMMEND_LABEL
+            }}</a-typography-text>
             <div v-if="form.booking_qr_media.length" class="venue-gallery-grid" style="margin-top: 8px">
               <div v-for="(m, i) in form.booking_qr_media" :key="`booking-qr-${i}`" class="venue-gallery-item">
                 <img
@@ -1251,7 +1274,7 @@ onMounted(async () => {
               <a-upload :auto-upload="false" :show-file-list="false" accept="image/*" :before-upload="onCoverSelect" @change="onCoverChange">
                 <template #upload-button><a-button>上传封面</a-button></template>
               </a-upload>
-              <a-typography-text type="secondary">图片尺寸推荐 1200×600</a-typography-text>
+              <a-typography-text type="secondary">{{ ADMIN_IMAGE_RECOMMEND_LABEL }}</a-typography-text>
               <a-space v-if="form.cover_image" direction="vertical" align="start">
                 <img
                   :src="resolvePublicMediaUrl(form.cover_image)"
@@ -1278,7 +1301,9 @@ onMounted(async () => {
                 >
                   <template #upload-button><a-button type="primary">新增轮播资源</a-button></template>
                 </a-upload>
-                <a-typography-text type="secondary" style="margin-top: 12px; display: block">图片尺寸推荐 1200×600</a-typography-text>
+                <a-typography-text type="secondary" style="margin-top: 12px; display: block">{{
+                  ADMIN_IMAGE_RECOMMEND_LABEL
+                }}</a-typography-text>
               </div>
               <div class="venue-gallery-grid">
                 <div