feat(home): 首页品牌条文案支持后台配置
This commit is contained in:
@@ -0,0 +1,169 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
import { readError } from '@/shared/utils/error'
|
||||||
|
import { ElMessage } from 'element-plus'
|
||||||
|
import { ref, watch } from 'vue'
|
||||||
|
|
||||||
|
import { defaultHomeBrandBar } from '@/features/listings/api/homeConfig'
|
||||||
|
import { updateSystemConfig, type SystemConfig } from '@/features/admin/api/systemConfigs'
|
||||||
|
import { safeParseJSON } from '@/shared/utils/json'
|
||||||
|
|
||||||
|
const props = defineProps<{
|
||||||
|
modelValue: boolean
|
||||||
|
config: SystemConfig
|
||||||
|
}>()
|
||||||
|
|
||||||
|
const emit = defineEmits<{
|
||||||
|
(e: 'update:modelValue', val: boolean): void
|
||||||
|
(e: 'saved'): void
|
||||||
|
}>()
|
||||||
|
|
||||||
|
const submitting = ref(false)
|
||||||
|
const description = ref('')
|
||||||
|
const eyebrow = ref('')
|
||||||
|
const title = ref('')
|
||||||
|
const subtitle = ref('')
|
||||||
|
|
||||||
|
watch(
|
||||||
|
() => props.modelValue,
|
||||||
|
val => {
|
||||||
|
if (!val) return
|
||||||
|
const parsed = safeParseJSON(props.config.value, defaultHomeBrandBar)
|
||||||
|
eyebrow.value = normalizeText(parsed?.eyebrow, defaultHomeBrandBar.eyebrow)
|
||||||
|
title.value = normalizeText(parsed?.title, defaultHomeBrandBar.title)
|
||||||
|
subtitle.value = normalizeText(parsed?.subtitle, defaultHomeBrandBar.subtitle)
|
||||||
|
description.value = props.config.description || ''
|
||||||
|
},
|
||||||
|
{ immediate: true }
|
||||||
|
)
|
||||||
|
|
||||||
|
function normalizeText(value: unknown, fallback: string) {
|
||||||
|
return typeof value === 'string' && value.trim() ? value.trim() : fallback
|
||||||
|
}
|
||||||
|
|
||||||
|
function resetHomeBrandBar() {
|
||||||
|
eyebrow.value = defaultHomeBrandBar.eyebrow
|
||||||
|
title.value = defaultHomeBrandBar.title
|
||||||
|
subtitle.value = defaultHomeBrandBar.subtitle
|
||||||
|
}
|
||||||
|
|
||||||
|
async function handleSave() {
|
||||||
|
submitting.value = true
|
||||||
|
try {
|
||||||
|
const value = JSON.stringify(
|
||||||
|
{
|
||||||
|
eyebrow: eyebrow.value.trim() || defaultHomeBrandBar.eyebrow,
|
||||||
|
title: title.value.trim() || defaultHomeBrandBar.title,
|
||||||
|
subtitle: subtitle.value.trim() || defaultHomeBrandBar.subtitle,
|
||||||
|
},
|
||||||
|
null,
|
||||||
|
2
|
||||||
|
)
|
||||||
|
await updateSystemConfig(props.config.key, {
|
||||||
|
value,
|
||||||
|
description: description.value,
|
||||||
|
})
|
||||||
|
ElMessage.success('配置已更新')
|
||||||
|
emit('saved')
|
||||||
|
emit('update:modelValue', false)
|
||||||
|
} catch (error) {
|
||||||
|
ElMessage.error(readError(error, '保存失败'))
|
||||||
|
} finally {
|
||||||
|
submitting.value = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<el-dialog
|
||||||
|
:model-value="modelValue"
|
||||||
|
title="编辑首页品牌文案"
|
||||||
|
width="680px"
|
||||||
|
@update:model-value="emit('update:modelValue', $event)"
|
||||||
|
>
|
||||||
|
<div class="dialog-body">
|
||||||
|
<p class="config-key-label">
|
||||||
|
<strong>{{ config.key }}</strong>
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<div class="home-config-editor">
|
||||||
|
<div class="editor-toolbar">
|
||||||
|
<span>品牌条文案</span>
|
||||||
|
<el-button size="small" @click="resetHomeBrandBar">恢复默认文案</el-button>
|
||||||
|
</div>
|
||||||
|
<el-form-item label="小标签" class="full-control">
|
||||||
|
<el-input
|
||||||
|
v-model="eyebrow"
|
||||||
|
maxlength="60"
|
||||||
|
show-word-limit
|
||||||
|
placeholder="例如:JIEYOU TRADING HOUSE · 账号租赁"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="主标题" class="full-control">
|
||||||
|
<el-input v-model="title" maxlength="20" show-word-limit placeholder="例如:解忧柜选" />
|
||||||
|
</el-form-item>
|
||||||
|
<el-form-item label="服务承诺" class="full-control">
|
||||||
|
<el-input
|
||||||
|
v-model="subtitle"
|
||||||
|
maxlength="80"
|
||||||
|
show-word-limit
|
||||||
|
placeholder="例如:实名审核 · 流程留痕 · 账单透明 · 争议可申诉"
|
||||||
|
/>
|
||||||
|
</el-form-item>
|
||||||
|
<p class="field-hint">留空的字段会自动回退到默认文案,保存后前台刷新页面即可生效。</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<el-form-item label="配置说明" class="desc-item">
|
||||||
|
<el-input v-model="description" type="textarea" :rows="3" placeholder="配置说明" />
|
||||||
|
</el-form-item>
|
||||||
|
</div>
|
||||||
|
<template #footer>
|
||||||
|
<el-button @click="emit('update:modelValue', false)">取消</el-button>
|
||||||
|
<el-button type="primary" :loading="submitting" @click="handleSave">保存</el-button>
|
||||||
|
</template>
|
||||||
|
</el-dialog>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
.dialog-body {
|
||||||
|
display: grid;
|
||||||
|
gap: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.config-key-label {
|
||||||
|
margin: 0;
|
||||||
|
color: #374151;
|
||||||
|
}
|
||||||
|
|
||||||
|
.home-config-editor {
|
||||||
|
display: grid;
|
||||||
|
gap: 14px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.editor-toolbar {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
justify-content: space-between;
|
||||||
|
gap: 12px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.editor-toolbar span {
|
||||||
|
color: #30343a;
|
||||||
|
font-weight: 700;
|
||||||
|
}
|
||||||
|
|
||||||
|
.full-control {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.field-hint {
|
||||||
|
margin: 0;
|
||||||
|
color: #6b7280;
|
||||||
|
font-size: 12px;
|
||||||
|
line-height: 1.6;
|
||||||
|
}
|
||||||
|
|
||||||
|
.desc-item {
|
||||||
|
margin-top: 14px;
|
||||||
|
margin-bottom: 0;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -38,6 +38,7 @@ import PublishOptionsDialog from '../components/PublishOptionsDialog.vue'
|
|||||||
import SalePriceDialog from '../components/SalePriceDialog.vue'
|
import SalePriceDialog from '../components/SalePriceDialog.vue'
|
||||||
import HomeAnnouncementsDialog from '../components/HomeAnnouncementsDialog.vue'
|
import HomeAnnouncementsDialog from '../components/HomeAnnouncementsDialog.vue'
|
||||||
import HomeBannersDialog from '../components/HomeBannersDialog.vue'
|
import HomeBannersDialog from '../components/HomeBannersDialog.vue'
|
||||||
|
import HomeBrandBarDialog from '../components/HomeBrandBarDialog.vue'
|
||||||
import AwRecycleDialog from '../components/AwRecycleDialog.vue'
|
import AwRecycleDialog from '../components/AwRecycleDialog.vue'
|
||||||
import {
|
import {
|
||||||
defaultAWRecycleConfig,
|
defaultAWRecycleConfig,
|
||||||
@@ -92,6 +93,7 @@ const salePriceVisible = ref(false)
|
|||||||
const qualityOwnerVisible = ref(false)
|
const qualityOwnerVisible = ref(false)
|
||||||
const announcementsVisible = ref(false)
|
const announcementsVisible = ref(false)
|
||||||
const bannersVisible = ref(false)
|
const bannersVisible = ref(false)
|
||||||
|
const brandBarVisible = ref(false)
|
||||||
const awRecycleVisible = ref(false)
|
const awRecycleVisible = ref(false)
|
||||||
const cooperationFeedbackVisible = ref(false)
|
const cooperationFeedbackVisible = ref(false)
|
||||||
const listingPublishAgreementsVisible = ref(false)
|
const listingPublishAgreementsVisible = ref(false)
|
||||||
@@ -134,6 +136,9 @@ const cooperationFeedbackConfig = computed(
|
|||||||
const homeEntriesEnabledConfig = computed(
|
const homeEntriesEnabledConfig = computed(
|
||||||
() => configs.value.find(item => item.key === 'mobile.home_entries_enabled') || null
|
() => configs.value.find(item => item.key === 'mobile.home_entries_enabled') || null
|
||||||
)
|
)
|
||||||
|
const homeBrandBarConfig = computed(
|
||||||
|
() => configs.value.find(item => item.key === 'mobile.home_brand_bar') || null
|
||||||
|
)
|
||||||
const homeEntriesDisplayEnabled = computed(() => {
|
const homeEntriesDisplayEnabled = computed(() => {
|
||||||
const raw = homeEntriesEnabledConfig.value?.value.trim().toLowerCase() || ''
|
const raw = homeEntriesEnabledConfig.value?.value.trim().toLowerCase() || ''
|
||||||
return raw === 'true' || raw === '1'
|
return raw === 'true' || raw === '1'
|
||||||
@@ -185,6 +190,7 @@ const regularConfigs = computed(() =>
|
|||||||
item.key !== 'listing.publish_cooldown_minutes' &&
|
item.key !== 'listing.publish_cooldown_minutes' &&
|
||||||
item.key !== 'mobile.home_announcements' &&
|
item.key !== 'mobile.home_announcements' &&
|
||||||
item.key !== 'mobile.home_banners' &&
|
item.key !== 'mobile.home_banners' &&
|
||||||
|
item.key !== 'mobile.home_brand_bar' &&
|
||||||
item.key !== 'mobile.aw_recycle' &&
|
item.key !== 'mobile.aw_recycle' &&
|
||||||
item.key !== 'mobile.cooperation_feedback' &&
|
item.key !== 'mobile.cooperation_feedback' &&
|
||||||
item.key !== 'mobile.home_entries_enabled' &&
|
item.key !== 'mobile.home_entries_enabled' &&
|
||||||
@@ -368,6 +374,8 @@ function openEdit(row: SystemConfig) {
|
|||||||
announcementsVisible.value = true
|
announcementsVisible.value = true
|
||||||
} else if (row.key === 'mobile.home_banners') {
|
} else if (row.key === 'mobile.home_banners') {
|
||||||
bannersVisible.value = true
|
bannersVisible.value = true
|
||||||
|
} else if (row.key === 'mobile.home_brand_bar') {
|
||||||
|
brandBarVisible.value = true
|
||||||
} else if (row.key === 'mobile.aw_recycle') {
|
} else if (row.key === 'mobile.aw_recycle') {
|
||||||
awRecycleVisible.value = true
|
awRecycleVisible.value = true
|
||||||
} else if (row.key === 'mobile.cooperation_feedback') {
|
} else if (row.key === 'mobile.cooperation_feedback') {
|
||||||
@@ -749,6 +757,7 @@ function formatConfigValue(row: SystemConfig) {
|
|||||||
v-if="
|
v-if="
|
||||||
homeAnnouncementsConfig ||
|
homeAnnouncementsConfig ||
|
||||||
homeBannersConfig ||
|
homeBannersConfig ||
|
||||||
|
homeBrandBarConfig ||
|
||||||
awRecycleConfig ||
|
awRecycleConfig ||
|
||||||
cooperationFeedbackConfig ||
|
cooperationFeedbackConfig ||
|
||||||
homeEntriesEnabledConfig
|
homeEntriesEnabledConfig
|
||||||
@@ -760,7 +769,7 @@ function formatConfigValue(row: SystemConfig) {
|
|||||||
<p class="eyebrow">Home Content</p>
|
<p class="eyebrow">Home Content</p>
|
||||||
<h2>首页运营配置</h2>
|
<h2>首页运营配置</h2>
|
||||||
<span
|
<span
|
||||||
>管理首页公告、轮播图、AW炫彩回收与合作反馈入口展示图,保存后
|
>管理首页公告、轮播图、品牌条文案、AW炫彩回收与合作反馈入口展示图,保存后
|
||||||
PC/移动端从接口读取。</span
|
PC/移动端从接口读取。</span
|
||||||
>
|
>
|
||||||
</div>
|
</div>
|
||||||
@@ -771,6 +780,9 @@ function formatConfigValue(row: SystemConfig) {
|
|||||||
<el-button v-if="homeBannersConfig" @click="openEdit(homeBannersConfig)"
|
<el-button v-if="homeBannersConfig" @click="openEdit(homeBannersConfig)"
|
||||||
>编辑轮播图</el-button
|
>编辑轮播图</el-button
|
||||||
>
|
>
|
||||||
|
<el-button v-if="homeBrandBarConfig" @click="openEdit(homeBrandBarConfig)"
|
||||||
|
>编辑品牌文案</el-button
|
||||||
|
>
|
||||||
<el-button v-if="awRecycleConfig" type="primary" @click="openEdit(awRecycleConfig)"
|
<el-button v-if="awRecycleConfig" type="primary" @click="openEdit(awRecycleConfig)"
|
||||||
>编辑 AW炫彩回收</el-button
|
>编辑 AW炫彩回收</el-button
|
||||||
>
|
>
|
||||||
@@ -824,7 +836,10 @@ function formatConfigValue(row: SystemConfig) {
|
|||||||
<strong>更新</strong>
|
<strong>更新</strong>
|
||||||
<span>{{
|
<span>{{
|
||||||
formatHomeConfigStatus(
|
formatHomeConfigStatus(
|
||||||
cooperationFeedbackConfig || awRecycleConfig || homeBannersConfig,
|
homeBrandBarConfig ||
|
||||||
|
cooperationFeedbackConfig ||
|
||||||
|
awRecycleConfig ||
|
||||||
|
homeBannersConfig,
|
||||||
'未初始化'
|
'未初始化'
|
||||||
)
|
)
|
||||||
}}</span>
|
}}</span>
|
||||||
@@ -1087,6 +1102,13 @@ function formatConfigValue(row: SystemConfig) {
|
|||||||
@saved="loadConfigs"
|
@saved="loadConfigs"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
<HomeBrandBarDialog
|
||||||
|
v-if="homeBrandBarConfig"
|
||||||
|
v-model="brandBarVisible"
|
||||||
|
:config="homeBrandBarConfig"
|
||||||
|
@saved="loadConfigs"
|
||||||
|
/>
|
||||||
|
|
||||||
<AwRecycleDialog
|
<AwRecycleDialog
|
||||||
v-if="awRecycleConfig"
|
v-if="awRecycleConfig"
|
||||||
v-model="awRecycleVisible"
|
v-model="awRecycleVisible"
|
||||||
|
|||||||
@@ -203,6 +203,12 @@ export interface CooperationFeedbackConfig {
|
|||||||
enabled: boolean
|
enabled: boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface HomeBrandBarConfig {
|
||||||
|
eyebrow: string
|
||||||
|
title: string
|
||||||
|
subtitle: string
|
||||||
|
}
|
||||||
|
|
||||||
export interface MobileHomeConfig {
|
export interface MobileHomeConfig {
|
||||||
announcements: string[]
|
announcements: string[]
|
||||||
banners: HomeBannerSlide[]
|
banners: HomeBannerSlide[]
|
||||||
@@ -211,6 +217,15 @@ export interface MobileHomeConfig {
|
|||||||
cooperation_feedback: CooperationFeedbackConfig
|
cooperation_feedback: CooperationFeedbackConfig
|
||||||
/** 首页业务入口总开关:关闭后 PC/移动端同时隐藏回收与合作入口。 */
|
/** 首页业务入口总开关:关闭后 PC/移动端同时隐藏回收与合作入口。 */
|
||||||
home_entries_enabled: boolean
|
home_entries_enabled: boolean
|
||||||
|
/** 首页品牌条三行文案,后台可配置;空字段回退默认文案。 */
|
||||||
|
brand_bar: HomeBrandBarConfig
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 首页品牌条默认文案,与后端 mobile.home_brand_bar 默认值保持一致。 */
|
||||||
|
export const defaultHomeBrandBar: HomeBrandBarConfig = {
|
||||||
|
eyebrow: 'JIEYOU TRADING HOUSE · 账号租赁',
|
||||||
|
title: '解忧柜选',
|
||||||
|
subtitle: '实名审核 · 流程留痕 · 账单透明 · 争议可申诉',
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 总开关默认展示,保持引入总开关前的线上表现;需要隐藏时由后台开关显式关闭。 */
|
/** 总开关默认展示,保持引入总开关前的线上表现;需要隐藏时由后台开关显式关闭。 */
|
||||||
@@ -319,6 +334,22 @@ export function mergeHomeConfig(config?: Partial<MobileHomeConfig>): MobileHomeC
|
|||||||
: defaultCooperationFeedbackConfig.enabled,
|
: defaultCooperationFeedbackConfig.enabled,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const brandRaw = config?.brand_bar
|
||||||
|
const brandBar: HomeBrandBarConfig = {
|
||||||
|
eyebrow:
|
||||||
|
typeof brandRaw?.eyebrow === 'string' && brandRaw.eyebrow.trim()
|
||||||
|
? brandRaw.eyebrow.trim()
|
||||||
|
: defaultHomeBrandBar.eyebrow,
|
||||||
|
title:
|
||||||
|
typeof brandRaw?.title === 'string' && brandRaw.title.trim()
|
||||||
|
? brandRaw.title.trim()
|
||||||
|
: defaultHomeBrandBar.title,
|
||||||
|
subtitle:
|
||||||
|
typeof brandRaw?.subtitle === 'string' && brandRaw.subtitle.trim()
|
||||||
|
? brandRaw.subtitle.trim()
|
||||||
|
: defaultHomeBrandBar.subtitle,
|
||||||
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
announcements: announcements.length ? announcements : defaultHomeAnnouncements,
|
announcements: announcements.length ? announcements : defaultHomeAnnouncements,
|
||||||
banners: banners.length ? banners : defaultHomeBanners,
|
banners: banners.length ? banners : defaultHomeBanners,
|
||||||
@@ -329,6 +360,7 @@ export function mergeHomeConfig(config?: Partial<MobileHomeConfig>): MobileHomeC
|
|||||||
typeof config?.home_entries_enabled === 'boolean'
|
typeof config?.home_entries_enabled === 'boolean'
|
||||||
? config.home_entries_enabled
|
? config.home_entries_enabled
|
||||||
: defaultHomeEntriesEnabled,
|
: defaultHomeEntriesEnabled,
|
||||||
|
brand_bar: brandBar,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -36,6 +36,8 @@ func validateConfigValue(key, value string) error {
|
|||||||
return ErrInvalidConfig
|
return ErrInvalidConfig
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
|
case homeBrandBarConfigKey:
|
||||||
|
return validateHomeBrandBar(value)
|
||||||
default:
|
default:
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -37,6 +37,15 @@ type HomeConfigDTO struct {
|
|||||||
CooperationFeedback CooperationFeedbackConfig `json:"cooperation_feedback"`
|
CooperationFeedback CooperationFeedbackConfig `json:"cooperation_feedback"`
|
||||||
// HomeEntriesEnabled 首页业务入口总开关:关闭后 PC/移动端同时隐藏回收与合作入口。
|
// HomeEntriesEnabled 首页业务入口总开关:关闭后 PC/移动端同时隐藏回收与合作入口。
|
||||||
HomeEntriesEnabled bool `json:"home_entries_enabled"`
|
HomeEntriesEnabled bool `json:"home_entries_enabled"`
|
||||||
|
// BrandBar 首页品牌条三行文案,后台可配置;留空时回退默认文案。
|
||||||
|
BrandBar HomeBrandBarConfig `json:"brand_bar"`
|
||||||
|
}
|
||||||
|
|
||||||
|
// HomeBrandBarConfig 首页品牌条文案:小标签 / 主标题 / 服务承诺。
|
||||||
|
type HomeBrandBarConfig struct {
|
||||||
|
Eyebrow string `json:"eyebrow"`
|
||||||
|
Title string `json:"title"`
|
||||||
|
Subtitle string `json:"subtitle"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// AWRecycleConfig 首页「AW炫彩回收」入口:点击展示可配置图片。
|
// AWRecycleConfig 首页「AW炫彩回收」入口:点击展示可配置图片。
|
||||||
|
|||||||
@@ -0,0 +1,81 @@
|
|||||||
|
package systemconfig
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"encoding/json"
|
||||||
|
"strings"
|
||||||
|
"unicode/utf8"
|
||||||
|
)
|
||||||
|
|
||||||
|
const homeBrandBarConfigKey = "mobile.home_brand_bar"
|
||||||
|
|
||||||
|
// 首页品牌条单行文案上限:防止后台输入超长文本撑破 PC/移动端布局。
|
||||||
|
const (
|
||||||
|
homeBrandBarEyebrowMaxRunes = 60
|
||||||
|
homeBrandBarTitleMaxRunes = 20
|
||||||
|
homeBrandBarSubtitleMaxRunes = 80
|
||||||
|
)
|
||||||
|
|
||||||
|
func defaultHomeBrandBar() HomeBrandBarConfig {
|
||||||
|
return HomeBrandBarConfig{
|
||||||
|
Eyebrow: "JIEYOU TRADING HOUSE · 账号租赁",
|
||||||
|
Title: "解忧柜选",
|
||||||
|
Subtitle: "实名审核 · 流程留痕 · 账单透明 · 争议可申诉",
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func defaultHomeBrandBarConfigValue() string {
|
||||||
|
raw, err := json.Marshal(defaultHomeBrandBar())
|
||||||
|
if err != nil {
|
||||||
|
return `{"eyebrow":"JIEYOU TRADING HOUSE · 账号租赁","title":"解忧柜选","subtitle":"实名审核 · 流程留痕 · 账单透明 · 争议可申诉"}`
|
||||||
|
}
|
||||||
|
return string(raw)
|
||||||
|
}
|
||||||
|
|
||||||
|
// normalizeHomeBrandBar 去除首尾空白;空字段回退默认文案,避免前台出现空白品牌条。
|
||||||
|
func normalizeHomeBrandBar(item HomeBrandBarConfig) HomeBrandBarConfig {
|
||||||
|
def := defaultHomeBrandBar()
|
||||||
|
eyebrow := strings.TrimSpace(item.Eyebrow)
|
||||||
|
if eyebrow == "" {
|
||||||
|
eyebrow = def.Eyebrow
|
||||||
|
}
|
||||||
|
title := strings.TrimSpace(item.Title)
|
||||||
|
if title == "" {
|
||||||
|
title = def.Title
|
||||||
|
}
|
||||||
|
subtitle := strings.TrimSpace(item.Subtitle)
|
||||||
|
if subtitle == "" {
|
||||||
|
subtitle = def.Subtitle
|
||||||
|
}
|
||||||
|
return HomeBrandBarConfig{
|
||||||
|
Eyebrow: eyebrow,
|
||||||
|
Title: title,
|
||||||
|
Subtitle: subtitle,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func validateHomeBrandBar(value string) error {
|
||||||
|
var item HomeBrandBarConfig
|
||||||
|
if err := json.Unmarshal([]byte(value), &item); err != nil {
|
||||||
|
return ErrInvalidConfig
|
||||||
|
}
|
||||||
|
item = normalizeHomeBrandBar(item)
|
||||||
|
if utf8.RuneCountInString(item.Eyebrow) > homeBrandBarEyebrowMaxRunes ||
|
||||||
|
utf8.RuneCountInString(item.Title) > homeBrandBarTitleMaxRunes ||
|
||||||
|
utf8.RuneCountInString(item.Subtitle) > homeBrandBarSubtitleMaxRunes {
|
||||||
|
return ErrInvalidConfig
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *Service) homeBrandBar(ctx context.Context) (HomeBrandBarConfig, error) {
|
||||||
|
value, err := s.repo.FindValue(ctx, homeBrandBarConfigKey)
|
||||||
|
if err != nil {
|
||||||
|
return defaultHomeBrandBar(), err
|
||||||
|
}
|
||||||
|
item := defaultHomeBrandBar()
|
||||||
|
if err := json.Unmarshal([]byte(value), &item); err != nil {
|
||||||
|
item = defaultHomeBrandBar()
|
||||||
|
}
|
||||||
|
return normalizeHomeBrandBar(item), nil
|
||||||
|
}
|
||||||
@@ -0,0 +1,83 @@
|
|||||||
|
package systemconfig
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestHomeBrandBarConfigRegistered(t *testing.T) {
|
||||||
|
value := ""
|
||||||
|
for _, item := range defaultConfigs {
|
||||||
|
if item.Key == homeBrandBarConfigKey {
|
||||||
|
value = item.Value
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if value != defaultHomeBrandBarConfigValue() {
|
||||||
|
t.Fatalf("defaultConfigs 中 %s 的默认值 = %q, want %q", homeBrandBarConfigKey, value, defaultHomeBrandBarConfigValue())
|
||||||
|
}
|
||||||
|
visible := false
|
||||||
|
for _, key := range adminVisibleConfigKeys {
|
||||||
|
if key == homeBrandBarConfigKey {
|
||||||
|
visible = true
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !visible {
|
||||||
|
t.Fatalf("adminVisibleConfigKeys 缺少 %s", homeBrandBarConfigKey)
|
||||||
|
}
|
||||||
|
var parsed HomeBrandBarConfig
|
||||||
|
if err := json.Unmarshal([]byte(value), &parsed); err != nil {
|
||||||
|
t.Fatalf("默认值不是合法 JSON: %v", err)
|
||||||
|
}
|
||||||
|
if parsed != defaultHomeBrandBar() {
|
||||||
|
t.Fatalf("默认值解析结果 = %+v, want %+v", parsed, defaultHomeBrandBar())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestNormalizeHomeBrandBar(t *testing.T) {
|
||||||
|
got := normalizeHomeBrandBar(HomeBrandBarConfig{
|
||||||
|
Eyebrow: " 测试标签 ",
|
||||||
|
Title: " ",
|
||||||
|
Subtitle: "",
|
||||||
|
})
|
||||||
|
def := defaultHomeBrandBar()
|
||||||
|
if got.Eyebrow != "测试标签" {
|
||||||
|
t.Fatalf("Eyebrow = %q, want %q", got.Eyebrow, "测试标签")
|
||||||
|
}
|
||||||
|
if got.Title != def.Title {
|
||||||
|
t.Fatalf("空标题应回退默认值, got %q want %q", got.Title, def.Title)
|
||||||
|
}
|
||||||
|
if got.Subtitle != def.Subtitle {
|
||||||
|
t.Fatalf("空副标题应回退默认值, got %q want %q", got.Subtitle, def.Subtitle)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestValidateHomeBrandBar(t *testing.T) {
|
||||||
|
valid := []string{
|
||||||
|
`{"eyebrow":"JIEYOU TRADING HOUSE · 账号租赁","title":"解忧柜选","subtitle":"实名审核 · 流程留痕 · 账单透明 · 争议可申诉"}`,
|
||||||
|
`{}`,
|
||||||
|
`{"eyebrow":"","title":"","subtitle":""}`,
|
||||||
|
`{"eyebrow":"A","title":"柜选","subtitle":"透明"}`,
|
||||||
|
}
|
||||||
|
for _, value := range valid {
|
||||||
|
if err := validateConfigValue(homeBrandBarConfigKey, value); err != nil {
|
||||||
|
t.Fatalf("validateConfigValue(%q) = %v, want nil", value, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
invalid := []string{
|
||||||
|
``,
|
||||||
|
`not-json`,
|
||||||
|
`[]`,
|
||||||
|
`{"title":"` + strings.Repeat("超", homeBrandBarTitleMaxRunes+1) + `"}`,
|
||||||
|
`{"eyebrow":"` + strings.Repeat("长", homeBrandBarEyebrowMaxRunes+1) + `"}`,
|
||||||
|
`{"subtitle":"` + strings.Repeat("长", homeBrandBarSubtitleMaxRunes+1) + `"}`,
|
||||||
|
}
|
||||||
|
for _, value := range invalid {
|
||||||
|
if err := validateConfigValue(homeBrandBarConfigKey, value); err != ErrInvalidConfig {
|
||||||
|
t.Fatalf("validateConfigValue(%q) = %v, want ErrInvalidConfig", value, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -57,6 +57,7 @@ var defaultConfigs = []defaultConfig{
|
|||||||
{Key: awRecycleConfigKey, Value: defaultAWRecycleConfigValue(), Description: "首页 AW炫彩回收入口配置 JSON(标题/副标题/展示图片)"},
|
{Key: awRecycleConfigKey, Value: defaultAWRecycleConfigValue(), Description: "首页 AW炫彩回收入口配置 JSON(标题/副标题/展示图片)"},
|
||||||
{Key: cooperationFeedbackConfigKey, Value: defaultCooperationFeedbackConfigValue(), Description: "首页 合作与反馈入口配置 JSON(标题/副标题/展示图片)"},
|
{Key: cooperationFeedbackConfigKey, Value: defaultCooperationFeedbackConfigValue(), Description: "首页 合作与反馈入口配置 JSON(标题/副标题/展示图片)"},
|
||||||
{Key: homeEntriesEnabledConfigKey, Value: defaultHomeEntriesEnabledConfigValue(), Description: "首页 AW炫彩回收/合作与反馈入口总开关(关闭后 PC/移动端均隐藏)"},
|
{Key: homeEntriesEnabledConfigKey, Value: defaultHomeEntriesEnabledConfigValue(), Description: "首页 AW炫彩回收/合作与反馈入口总开关(关闭后 PC/移动端均隐藏)"},
|
||||||
|
{Key: homeBrandBarConfigKey, Value: defaultHomeBrandBarConfigValue(), Description: "首页品牌条文案 JSON(小标签/主标题/服务承诺)"},
|
||||||
{Key: publishOptionsConfigKey, Value: defaultPublishOptionsConfigValue(), Description: "发布页选项配置 JSON"},
|
{Key: publishOptionsConfigKey, Value: defaultPublishOptionsConfigValue(), Description: "发布页选项配置 JSON"},
|
||||||
{Key: salePriceConfigKey, Value: defaultSalePriceConfigValue(), Description: "内部出售定价规则 JSON"},
|
{Key: salePriceConfigKey, Value: defaultSalePriceConfigValue(), Description: "内部出售定价规则 JSON"},
|
||||||
{Key: DistributionSettlementHoldDaysKey, Value: defaultDistributionSettlementHoldDaysValue(), Description: "新建分销站点默认结算冷却天数(0=立即释放,最大 365)"},
|
{Key: DistributionSettlementHoldDaysKey, Value: defaultDistributionSettlementHoldDaysValue(), Description: "新建分销站点默认结算冷却天数(0=立即释放,最大 365)"},
|
||||||
@@ -87,6 +88,7 @@ var adminVisibleConfigKeys = []string{
|
|||||||
"mobile.aw_recycle",
|
"mobile.aw_recycle",
|
||||||
"mobile.cooperation_feedback",
|
"mobile.cooperation_feedback",
|
||||||
"mobile.home_entries_enabled",
|
"mobile.home_entries_enabled",
|
||||||
|
homeBrandBarConfigKey,
|
||||||
"order.agreements",
|
"order.agreements",
|
||||||
"order.pending_payment_timeout_minutes",
|
"order.pending_payment_timeout_minutes",
|
||||||
"order.return_overdue_grace_minutes",
|
"order.return_overdue_grace_minutes",
|
||||||
|
|||||||
@@ -55,6 +55,10 @@ func (s *Service) HomeConfig(ctx context.Context, siteCode string) (*HomeConfigD
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
brandBar, err := s.homeBrandBar(ctx)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
config := &HomeConfigDTO{
|
config := &HomeConfigDTO{
|
||||||
Announcements: announcements,
|
Announcements: announcements,
|
||||||
Banners: banners,
|
Banners: banners,
|
||||||
@@ -62,6 +66,7 @@ func (s *Service) HomeConfig(ctx context.Context, siteCode string) (*HomeConfigD
|
|||||||
AWRecycle: awRecycle,
|
AWRecycle: awRecycle,
|
||||||
CooperationFeedback: cooperationFeedback,
|
CooperationFeedback: cooperationFeedback,
|
||||||
HomeEntriesEnabled: homeEntriesEnabled,
|
HomeEntriesEnabled: homeEntriesEnabled,
|
||||||
|
BrandBar: brandBar,
|
||||||
}
|
}
|
||||||
s.applySiteHomeOverrides(ctx, siteCode, config)
|
s.applySiteHomeOverrides(ctx, siteCode, config)
|
||||||
return config, nil
|
return config, nil
|
||||||
|
|||||||
@@ -34,6 +34,12 @@ export interface HomeBannerItem {
|
|||||||
mobile?: HomeBannerVisual
|
mobile?: HomeBannerVisual
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface HomeBrandBarConfig {
|
||||||
|
eyebrow: string
|
||||||
|
title: string
|
||||||
|
subtitle: string
|
||||||
|
}
|
||||||
|
|
||||||
export interface HomeConfig {
|
export interface HomeConfig {
|
||||||
announcements: string[]
|
announcements: string[]
|
||||||
banners: HomeBannerItem[]
|
banners: HomeBannerItem[]
|
||||||
@@ -41,6 +47,15 @@ export interface HomeConfig {
|
|||||||
aw_recycle: HomeEntryConfig
|
aw_recycle: HomeEntryConfig
|
||||||
cooperation_feedback: HomeEntryConfig
|
cooperation_feedback: HomeEntryConfig
|
||||||
home_entries_enabled: boolean
|
home_entries_enabled: boolean
|
||||||
|
/** 首页品牌条三行文案,后台可配置;旧接口未返回时前台回退默认值。 */
|
||||||
|
brand_bar?: HomeBrandBarConfig
|
||||||
|
}
|
||||||
|
|
||||||
|
/** 首页品牌条默认文案,与后端 mobile.home_brand_bar 默认值保持一致。 */
|
||||||
|
export const fallbackBrandBar: HomeBrandBarConfig = {
|
||||||
|
eyebrow: 'JIEYOU TRADING HOUSE · 账号租赁',
|
||||||
|
title: '解忧柜选',
|
||||||
|
subtitle: '实名审核 · 流程留痕 · 账单透明 · 争议可申诉',
|
||||||
}
|
}
|
||||||
|
|
||||||
export const fallbackBanners: HomeBannerItem[] = [
|
export const fallbackBanners: HomeBannerItem[] = [
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ import {
|
|||||||
import { Link } from 'react-router-dom'
|
import { Link } from 'react-router-dom'
|
||||||
|
|
||||||
import { BrandLogo } from '@/components/BrandLogo'
|
import { BrandLogo } from '@/components/BrandLogo'
|
||||||
|
import { fallbackBrandBar, useHomeConfig } from '@/features/home/api'
|
||||||
import { HomePortalRow } from '@/features/home/HomePortalRow'
|
import { HomePortalRow } from '@/features/home/HomePortalRow'
|
||||||
import { useListings } from '@/features/listings/api'
|
import { useListings } from '@/features/listings/api'
|
||||||
import {
|
import {
|
||||||
@@ -296,6 +297,9 @@ export function ListingListPage() {
|
|||||||
localStorage.setItem('jieyou:listings:view', mode)
|
localStorage.setItem('jieyou:listings:view', mode)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const homeConfig = useHomeConfig()
|
||||||
|
const brandBar = homeConfig.data?.brand_bar ?? fallbackBrandBar
|
||||||
|
|
||||||
const publishOptions = useQuery({
|
const publishOptions = useQuery({
|
||||||
queryKey: ['listing-publish-options'],
|
queryKey: ['listing-publish-options'],
|
||||||
queryFn: fetchListingPublishOptions,
|
queryFn: fetchListingPublishOptions,
|
||||||
@@ -384,11 +388,9 @@ export function ListingListPage() {
|
|||||||
<section className="home-market-bar">
|
<section className="home-market-bar">
|
||||||
<div className="home-market-bar__inner">
|
<div className="home-market-bar__inner">
|
||||||
<div className="home-market-bar__copy">
|
<div className="home-market-bar__copy">
|
||||||
<span className="home-market-bar__eyebrow">JIEYOU TRADING HOUSE · 账号租赁</span>
|
<span className="home-market-bar__eyebrow">{brandBar.eyebrow}</span>
|
||||||
<strong className="home-market-bar__title">解忧柜选</strong>
|
<strong className="home-market-bar__title">{brandBar.title}</strong>
|
||||||
<span className="home-market-bar__trust">
|
<span className="home-market-bar__trust">{brandBar.subtitle}</span>
|
||||||
实名审核 · 流程留痕 · 账单透明 · 争议可申诉
|
|
||||||
</span>
|
|
||||||
</div>
|
</div>
|
||||||
<Input.Search
|
<Input.Search
|
||||||
allowClear
|
allowClear
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ import { Link, useNavigate } from 'react-router-dom'
|
|||||||
import { BrandLogo } from '@/components/BrandLogo'
|
import { BrandLogo } from '@/components/BrandLogo'
|
||||||
import {
|
import {
|
||||||
fallbackBanners,
|
fallbackBanners,
|
||||||
|
fallbackBrandBar,
|
||||||
useHomeConfig,
|
useHomeConfig,
|
||||||
type HomeBannerItem,
|
type HomeBannerItem,
|
||||||
type HomeEntryConfig,
|
type HomeEntryConfig,
|
||||||
@@ -444,6 +445,7 @@ export function MobileHomePage() {
|
|||||||
const banners = (homeConfig.data?.banners ?? fallbackBanners)
|
const banners = (homeConfig.data?.banners ?? fallbackBanners)
|
||||||
.filter(banner => banner.enabled !== false)
|
.filter(banner => banner.enabled !== false)
|
||||||
.slice(0, 4)
|
.slice(0, 4)
|
||||||
|
const brandBar = homeConfig.data?.brand_bar ?? fallbackBrandBar
|
||||||
|
|
||||||
const runBannerAction = (banner: HomeBannerItem) => {
|
const runBannerAction = (banner: HomeBannerItem) => {
|
||||||
const action = banner.mobile?.action
|
const action = banner.mobile?.action
|
||||||
@@ -469,7 +471,7 @@ export function MobileHomePage() {
|
|||||||
<section className="mobile-home-search">
|
<section className="mobile-home-search">
|
||||||
<div className="mobile-home-search__heading">
|
<div className="mobile-home-search__heading">
|
||||||
<div>
|
<div>
|
||||||
<span>解忧柜选</span>
|
<span>{brandBar.title}</span>
|
||||||
<strong>今天想租什么账号?</strong>
|
<strong>今天想租什么账号?</strong>
|
||||||
</div>
|
</div>
|
||||||
<Link to="/m/announcements">规则</Link>
|
<Link to="/m/announcements">规则</Link>
|
||||||
|
|||||||
@@ -255,25 +255,35 @@
|
|||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
gap: 1px;
|
gap: 1px;
|
||||||
min-width: 232px;
|
min-width: 232px;
|
||||||
|
max-width: 360px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.home-market-bar__eyebrow {
|
.home-market-bar__eyebrow {
|
||||||
|
max-width: 100%;
|
||||||
|
overflow: hidden;
|
||||||
color: var(--ink-muted);
|
color: var(--ink-muted);
|
||||||
font-size: 10.5px;
|
font-size: 10.5px;
|
||||||
letter-spacing: 0.18em;
|
letter-spacing: 0.18em;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: nowrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
.home-market-bar__title {
|
.home-market-bar__title {
|
||||||
|
max-width: 100%;
|
||||||
|
overflow: hidden;
|
||||||
color: var(--brand-ink);
|
color: var(--brand-ink);
|
||||||
font-family: 'Noto Serif SC', 'Songti SC', serif;
|
font-family: 'Noto Serif SC', 'Songti SC', serif;
|
||||||
font-size: 22px;
|
font-size: 22px;
|
||||||
letter-spacing: 0.05em;
|
letter-spacing: 0.05em;
|
||||||
line-height: 1.35;
|
line-height: 1.35;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: nowrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
.home-market-bar__trust {
|
.home-market-bar__trust {
|
||||||
color: var(--ink-muted);
|
color: var(--ink-muted);
|
||||||
font-size: 11px;
|
font-size: 11px;
|
||||||
|
line-height: 1.4;
|
||||||
}
|
}
|
||||||
|
|
||||||
.home-market-bar__search {
|
.home-market-bar__search {
|
||||||
|
|||||||
Reference in New Issue
Block a user