diff --git a/src/api/types/uni-halo.ts b/src/api/types/uni-halo.ts
index 96cb1e7..b18eda6 100644
--- a/src/api/types/uni-halo.ts
+++ b/src/api/types/uni-halo.ts
@@ -112,6 +112,13 @@ export interface IPageConfig {
categoryConfig?: { type?: string }
momentConfig?: { useTagRandomColor?: boolean }
galleryConfig?: { pageTitle?: string }
+ /** 恋爱日记页(插件端「通用配置 → 页面设置 → 恋爱日记」配置;
+ * 2026-09-11 起恋爱页背景图由 loveConfig.pageImages 迁入此处) */
+ loveDiaryConfig?: {
+ pageTitle?: string
+ /** 恋爱页背景图(留空客户端内置回退) */
+ bgImageUrl?: string
+ }
aboutConfig?: {
bgImageUrl?: string
waveImageUrl?: string
diff --git a/src/components/uh-unlock-popup/uh-unlock-popup.vue b/src/components/uh-unlock-popup/uh-unlock-popup.vue
new file mode 100644
index 0000000..b042447
--- /dev/null
+++ b/src/components/uh-unlock-popup/uh-unlock-popup.vue
@@ -0,0 +1,200 @@
+
+
+
+
+
+
+ {{ title }}
+
+
+
+
+
+
+
+ {{ tip }}
+
+
+
+
+
+
+
+
+
+ 点击图片刷新验证码
+
+
+
+
+
+ 取消
+
+
+ {{ loading ? '解锁中...' : confirmText }}
+
+
+
+
+
diff --git a/src/config/appConfig.ts b/src/config/appConfig.ts
index 872b40f..799ae14 100644
--- a/src/config/appConfig.ts
+++ b/src/config/appConfig.ts
@@ -20,6 +20,7 @@ export const DefaultAppConfigs: IAppConfig = {
momentConfig: {
useTagRandomColor: true,
},
+ loveDiaryConfig: {},
},
auditConfig: {
auditModeEnabled: false,
diff --git a/src/pages-blog/love/album.vue b/src/pages-blog/love/album.vue
index c7e510f..c6fa0fa 100644
--- a/src/pages-blog/love/album.vue
+++ b/src/pages-blog/love/album.vue
@@ -1,12 +1,13 @@
@@ -241,8 +279,9 @@ onPullDownRefresh(() => {
-
-
+
+
+
- /**
- * 恋爱清单页
- * 恋爱清单卡片列表(未开始/进行中/已完成),展开查看详情与回忆图片
- */
import { computed, ref } from 'vue'
- import { onLoad, onPullDownRefresh } from '@dcloudio/uni-app'
+ import { onLoad, onPullDownRefresh, onReachBottom } from '@dcloudio/uni-app'
import { getLoveDailyItems } from '@/api/uni-halo'
import { handleLoveModuleLocked } from '@/utils/loveModuleToken'
import { checkImageUrl } from '@/utils/url'
+ import { sleep } from '@/utils/common'
import { DataLoadingStatusEnum, useDataLoadingStatus } from '@/hooks/useDataLoadingStatus'
import type { ILoveDailyItem } from '@/api/types/uni-halo'
@@ -53,7 +50,8 @@
}
/* ---------------- 状态 ---------------- */
- const { loadingStatus, updateLoadingStatus } = useDataLoadingStatus()
+ const { loadingStatus, loadMoreStatus, updateLoadingStatus, updateLoadMoreStatus, resetLoadMoreStatus } = useDataLoadingStatus()
+ const queryParams = ref({ page: 1, size: 10 })
const list = ref([])
/* ---------------- 筛选与排序 ---------------- */
@@ -164,23 +162,41 @@
/* ---------------- 数据加载 ---------------- */
async function handleGetList() {
- updateLoadingStatus(DataLoadingStatusEnum.Loading)
+ if (!loadMoreStatus.value.active) {
+ updateLoadingStatus(DataLoadingStatusEnum.Loading)
+ }
try {
- const res = await getLoveDailyItems({})
- const items = res.data?.items || []
- list.value = items.map(mapItemCard)
- updateLoadingStatus(list.value.length === 0 ? DataLoadingStatusEnum.Empty : DataLoadingStatusEnum.Success)
+ const res = await getLoveDailyItems({ ...queryParams.value })
+ const items = (res.data?.items || []).map(mapItemCard)
+ list.value = loadMoreStatus.value.active
+ ? list.value.concat(items)
+ : items
+ if (!loadMoreStatus.value.active) {
+ await sleep(600)
+ updateLoadingStatus(list.value.length === 0 ? DataLoadingStatusEnum.Empty : DataLoadingStatusEnum.Success)
+ }
+ updateLoadMoreStatus({
+ active: false,
+ status: res.data?.hasNext ? 'loadMore' : 'noMore',
+ hasNext: !!res.data?.hasNext,
+ })
}
catch (e) {
console.error('获取清单失败', e)
// 模块锁 401:清除 token 并提示
handleLoveModuleLocked('loveDaily', e)
- updateLoadingStatus(DataLoadingStatusEnum.Error)
+ if (loadMoreStatus.value.active) {
+ updateLoadMoreStatus({
+ active: false,
+ status: 'error',
+ })
+ }
+ else {
+ updateLoadingStatus(DataLoadingStatusEnum.Error)
+ }
}
finally {
- setTimeout(() => {
- uni.stopPullDownRefresh()
- }, 200)
+ uni.stopPullDownRefresh()
}
}
@@ -238,8 +254,26 @@
})
onPullDownRefresh(() => {
+ resetLoadMoreStatus()
+ queryParams.value.page = 1
handleGetList()
})
+
+ onReachBottom(() => {
+ // 正在加载时阻止重复请求
+ if (loadMoreStatus.value.active) {
+ return
+ }
+ // 有更多数据时继续加载
+ if (loadMoreStatus.value.hasNext) {
+ queryParams.value.page += 1
+ updateLoadMoreStatus({
+ active: true,
+ status: 'loading',
+ })
+ handleGetList()
+ }
+ })
@@ -341,9 +375,7 @@
-
-
-
+
diff --git a/src/pages-blog/love/love.vue b/src/pages-blog/love/love.vue
index 0aabc78..dc1d14e 100644
--- a/src/pages-blog/love/love.vue
+++ b/src/pages-blog/love/love.vue
@@ -3,7 +3,7 @@
import { onLoad, onShow } from '@dcloudio/uni-app'
import { useAppConfigStore } from '@/store/appConfig'
import { checkAvatarUrl, checkImageUrl } from '@/utils/url'
- import { unlockLoveModule } from '@/api/uni-halo'
+ import { getPluginCaptcha, unlockLoveModule, type ICaptchaQuery, type IPluginCaptcha } from '@/api/uni-halo'
import { getLoveModuleToken, setLoveModuleToken, type LoveModuleKey } from '@/utils/loveModuleToken'
definePage({
@@ -31,24 +31,19 @@
waveImageUrl : string
heartImageUrl : string
}
+ loveDiary : { enabled : boolean, passwordEnabled ?: boolean }
ourStory : { enabled : boolean, passwordEnabled ?: boolean }
lovePhoto : { enabled : boolean, passwordEnabled ?: boolean }
loveDaily : { enabled : boolean, passwordEnabled ?: boolean }
- /** 恋爱页入口列表(插件端 spec.love.navList 经 getConfigs 下发,additive;
- * 字段 key/title/subTitle/priority/visible,desc 已改名 subTitle) */
navList ?: ILoveNavItem[]
[key : string] : unknown
}
- /** 恋爱页入口项(对齐插件端 GeneralConfig.LoveNavItem;key 固定 stories/album/list) */
interface ILoveNavItem {
key : string
title ?: string
- /** 副标题(原 app 端 desc 文案改名 subTitle) */
subTitle ?: string
- /** 排序(越大越靠前) */
priority ?: number
- /** 是否展示(不可删除,仅禁用/启用) */
visible ?: boolean
}
@@ -67,6 +62,7 @@
waveImageUrl: '',
heartImageUrl: '',
},
+ loveDiary: { enabled: false, passwordEnabled: false },
ourStory: { enabled: false, passwordEnabled: false },
lovePhoto: { enabled: false, passwordEnabled: false },
loveDaily: { enabled: false, passwordEnabled: false },
@@ -75,27 +71,24 @@
const loveDayCount = ref({ d: 0, h: 0, m: 0, s: 0 })
let loveDayTimer : ReturnType | null = null
- /** 恋爱页入口渲染项(字段由 initList 从插件端 loveConfig.navList 合成:key 映射图标/路径、desc→subTitle) */
interface ILoveNavRenderItem {
key : string
use : boolean
+ locked: boolean
iconPrefix : string
icon : string
title : string
subTitle : string
}
- // 是否使用本地的恋爱页入口数据(本地的可以任意修改图标/路径/文案,插件端的仅可配置 title/subTitle/排序/显隐)
const useLocalNav = false
- /** 内置默认入口项(未配置时回退;字段命名与插件端 loveConfig.navList 一致,desc 文案改名 subTitle) */
const DEFAULT_NAV_LIST : ILoveNavItem[] = [
{ key: 'stories', title: '恋爱故事', subTitle: '我们一起度过的那些经历', priority: 1, visible: true },
{ key: 'album', title: '恋爱相册', subTitle: '定格了我们的那些小美好', priority: 2, visible: true },
{ key: 'list', title: '恋爱清单', subTitle: '你我之间的约定我们都在努力实现', priority: 3, visible: true },
]
- /** 入口 key → 图标与跳转页映射(固定:key=stories/album/list,对应恋爱三模块) */
const NAV_META: Record = {
stories: { iconPrefix: 'uhlove-icon', icon: 'gushi', page: 'stories' },
album: { iconPrefix: 'uhlove-icon', icon: 'xiangce', page: 'album' },
@@ -120,28 +113,36 @@
},
}
- // 从 getConfigs.loveConfig 取模块开关与页面图片(缺省保留默认)
const loveModuleConfig = appConfigs.loveConfig as Partial | undefined
- if (loveModuleConfig) {
+ // 恋爱页背景图:2026-09-11 起插件端由 loveConfig.pageImages 迁至
+ // pageConfig.loveDiaryConfig.bgImageUrl,优先读新位置、兼容回退旧值
+ const loveDiaryPageConfig = appConfigs.pageConfig?.loveDiaryConfig as
+ { bgImageUrl ?: string } | undefined
+ const pageImagesBg =
+ loveDiaryPageConfig?.bgImageUrl
+ || loveModuleConfig?.pageImages?.bgImageUrl
+ || loveConfig.value.pageImages.bgImageUrl
+ if (loveModuleConfig || loveDiaryPageConfig) {
loveConfig.value = {
...loveConfig.value,
- pageImages: loveModuleConfig.pageImages || loveConfig.value.pageImages,
- ourStory: loveModuleConfig.ourStory || loveConfig.value.ourStory,
- lovePhoto: loveModuleConfig.lovePhoto || loveConfig.value.lovePhoto,
- loveDaily: loveModuleConfig.loveDaily || loveConfig.value.loveDaily,
- navList: loveModuleConfig.navList || loveConfig.value.navList,
+ pageImages: {
+ ...loveConfig.value.pageImages,
+ bgImageUrl: pageImagesBg,
+ },
+ loveDiary: loveModuleConfig?.loveDiary || loveConfig.value.loveDiary,
+ ourStory: loveModuleConfig?.ourStory || loveConfig.value.ourStory,
+ lovePhoto: loveModuleConfig?.lovePhoto || loveConfig.value.lovePhoto,
+ loveDaily: loveModuleConfig?.loveDaily || loveConfig.value.loveDaily,
+ navList: loveModuleConfig?.navList || loveConfig.value.navList,
}
}
initList()
- // 未配置纪念日(loveDate 为空)不启动倒计时,避免 NaN
if (loveConfig.value.loveDate) {
handleInitLoveDayCount()
}
}
- /** 恋爱页入口:优先读插件端 loveConfig.navList(visible 过滤 + priority 排序,desc→subTitle,
- * key 映射图标/路径,模块开关 enabled 与条目 visible 均 true 才展示);未配置/为空回退内置默认 */
function initList() {
const configs = loveConfig.value
const configured = configs.navList
@@ -151,7 +152,6 @@
} else {
source = DEFAULT_NAV_LIST;
}
- // priority 排序(越大越靠前;缺失按默认顺序兜底)
const sorted = [...source].sort((a, b) => (b.priority ?? 0) - (a.priority ?? 0))
navList.value = sorted.map((item) => {
const meta = NAV_META[item.key]
@@ -160,13 +160,14 @@
}
const moduleKey = MODULE_KEY_MAP[item.key]
const moduleCfg = moduleKey
- ? (configs[moduleKey] as { enabled ?: boolean } | undefined)
+ ? (configs[moduleKey] as { enabled ?: boolean, passwordEnabled ?: boolean } | undefined)
: undefined
const fallback = DEFAULT_NAV_LIST.find((d) => d.key === item.key)
return {
key: item.key,
- // 模块开关与条目显示开关均开启才展示(与插件端语义一致)
use: !!moduleCfg?.enabled && item.visible !== false,
+ // 模块设了密码且本地无有效 token → 显示 lock;解锁后恢复箭头
+ locked: !!moduleCfg?.passwordEnabled && !(moduleKey && getLoveModuleToken(moduleKey)),
iconPrefix: meta.iconPrefix,
icon: meta.icon,
title: item.title || fallback?.title || '',
@@ -201,7 +202,6 @@
}
/* ---------------- 跳转(模块密码拦截) ---------------- */
- /** 页面名 → 恋爱模块 scope 映射(stories→ourStory、album→lovePhoto、list→loveDaily) */
const MODULE_KEY_MAP: Record = {
stories: 'ourStory',
album: 'lovePhoto',
@@ -209,11 +209,13 @@
}
/** 模块密码弹窗状态 */
- const passwordModalVisible = ref(false)
+ const unlockModalVisible = ref(false)
const pendingPage = ref('')
const pendingModule = ref('ourStory')
- const modulePassword = ref('')
- const unlocking = ref(false)
+
+ /** 恋爱日记入口(love 页本身)是否锁定:设了密码且本地无有效 token */
+ const loveDiaryLocked = computed(() =>
+ !!loveConfig.value.loveDiary?.passwordEnabled && !getLoveModuleToken('loveDiary'))
function handleToPage(pageName : string) {
const module = MODULE_KEY_MAP[pageName]
@@ -224,8 +226,7 @@
if (moduleCfg?.passwordEnabled && !getLoveModuleToken(module)) {
pendingPage.value = pageName
pendingModule.value = module
- modulePassword.value = ''
- passwordModalVisible.value = true
+ unlockModalVisible.value = true
return
}
uni.navigateTo({
@@ -233,30 +234,26 @@
})
}
- /** 密码确认:unlock 签发 token 后进入模块 */
- async function handleConfirmPassword() {
- if (!modulePassword.value.trim()) {
- uni.showToast({ icon: 'none', title: '请输入密码' })
- return
- }
- try {
- unlocking.value = true
- const res = await unlockLoveModule(pendingModule.value, modulePassword.value)
- const token = res.data?.token
- if (token) {
- setLoveModuleToken(pendingModule.value, token)
- passwordModalVisible.value = false
- uni.navigateTo({ url: `/pages-blog/love/${pendingPage.value}` })
+ /** 通用解锁弹窗请求:unlock 签发 token(插件端要求验证码,403 附新码由弹窗展示重试) */
+ async function handleUnlockRequest(password : string, captcha ?: ICaptchaQuery | null) {
+ const res = await unlockLoveModule(pendingModule.value, password, captcha)
+ return res.data as { token ?: string, [key : string] : unknown } | null | undefined
+ }
+
+ /** 解锁成功:存 token;恋爱日记入口(loveDiary)重新拉取恋爱信息,其余进入模块 */
+ function handleUnlockSuccess(data : { token ?: string }) {
+ if (data.token) {
+ setLoveModuleToken(pendingModule.value, data.token)
+ if (pendingModule.value === 'loveDiary') {
+ // 恋爱日记入口解锁:重新拉取 /love-config 并刷新页面状态
+ appConfigStore.fetchLoveConfig().then(() => syncLoveConfigFromStore())
}
else {
- uni.showToast({ icon: 'none', title: '解锁失败,请重试' })
+ uni.navigateTo({ url: `/pages-blog/love/${pendingPage.value}` })
}
}
- catch {
- uni.showToast({ icon: 'none', title: '密码不正确' })
- }
- finally {
- unlocking.value = false
+ else {
+ uni.showToast({ icon: 'none', title: '解锁失败,请重试' })
}
}
@@ -268,6 +265,12 @@
onShow(async () => {
await appConfigStore.bootstrap()
syncLoveConfigFromStore()
+ // 恋爱日记入口(love 页本身)设了密码且本地无 token → 先弹密码框验证
+ if (loveDiaryLocked.value) {
+ pendingPage.value = ''
+ pendingModule.value = 'loveDiary'
+ unlockModalVisible.value = true
+ }
})
onBeforeUnmount(() => {
@@ -278,12 +281,12 @@
-
+
-
+
-
+
@@ -351,7 +354,7 @@
-
@@ -359,27 +362,10 @@
-
-
-
- 请输入访问密码
-
- {{ pendingModule === 'ourStory' ? '恋爱故事' : pendingModule === 'lovePhoto' ? '恋爱相册' : '恋爱清单' }}已设置访问密码,输入后进入
-
-
-
- 取消
-
- {{ unlocking ? '验证中…' : '进入' }}
-
-
-
-
+
+