From 1abae6e0cf81c5699d870bf0de2e6965234e1607 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Tue, 19 May 2026 10:05:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A0=E9=9C=80=E5=B9=B3=E5=8F=B0=E9=A2=84?=
=?UTF-8?q?=E7=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/utils/exportActivityListXlsx.ts | 2 +-
src/views/activities/ActivityList.vue | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/utils/exportActivityListXlsx.ts b/src/utils/exportActivityListXlsx.ts
index 2073f8d..36148e9 100644
--- a/src/utils/exportActivityListXlsx.ts
+++ b/src/utils/exportActivityListXlsx.ts
@@ -40,7 +40,7 @@ function stripHtml(html: unknown, max = 12000): string {
function reservationTypeLabel(t: unknown): string {
const s = String(t ?? '').trim()
if (s === 'online') return '公益性需预约活动'
- if (s === 'none') return '公益性无需预约活动'
+ if (s === 'none') return '无需平台预约公益性科普活动'
if (s === 'paid_study') return '收费科普研学活动'
if (s === 'phone') return '电话预约'
if (s === 'wechat_mp') return '公众号预约'
diff --git a/src/views/activities/ActivityList.vue b/src/views/activities/ActivityList.vue
index 6e67b77..3f248e7 100644
--- a/src/views/activities/ActivityList.vue
+++ b/src/views/activities/ActivityList.vue
@@ -351,7 +351,7 @@ function formatBookingAudienceBadge(audRaw: string, minP: number, maxP: number):
const form = reactive({
venue_id: undefined as number | undefined,
- /** 活动性质 online=公益性需预约 / none=公益性无需预约 / paid_study=收费科普研学 */
+ /** 活动性质 online=公益性需预约 / none=无需平台预约公益性科普 / paid_study=收费科普研学 */
reservation_type: 'online',
is_hot: false,
booking_method_note: '',
@@ -609,7 +609,7 @@ 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) {
+ if (bookingForm.days.length === 0 && rt === 'online') {
Message.warning('请至少添加一个场次')
return false
}
@@ -1546,7 +1546,7 @@ function confirmMapPick() {
function reservationTypeLabel(t?: string | null) {
const s = String(t || '').trim()
if (s === 'online') return '公益性需预约活动'
- if (s === 'none') return '公益性无需预约活动'
+ if (s === 'none') return '无需平台预约公益性科普活动'
if (s === 'paid_study') return '收费科普研学活动'
if (s === 'phone') return '电话预约'
if (s === 'wechat_mp') return '公众号预约'
@@ -2015,7 +2015,7 @@ async function removeActivity(row: Activity) {
style="width: 210px"
>
公益性需预约活动
- 公益性无需预约活动
+ 无需平台预约公益性科普活动
收费科普研学活动
@@ -2475,7 +2475,7 @@ async function removeActivity(row: Activity) {
公益性需预约活动
- 公益性无需预约活动
+ 无需平台预约公益性科普活动
收费科普研学活动