diff --git a/src/components/uh-album-unlock-popup/uh-album-unlock-popup.vue b/src/components/uh-album-unlock-popup/uh-album-unlock-popup.vue
index d56dfca..ce45da0 100644
--- a/src/components/uh-album-unlock-popup/uh-album-unlock-popup.vue
+++ b/src/components/uh-album-unlock-popup/uh-album-unlock-popup.vue
@@ -73,6 +73,8 @@
if (val) {
password.value = ''
resetCaptcha()
+ // 插件端开启验证码时打开即拉取显示,避免首次提交 403 后才出现
+ handleRefreshCaptcha()
}
})
diff --git a/src/components/uh-home-quick-nav/uh-home-quick-nav.vue b/src/components/uh-home-quick-nav/uh-home-quick-nav.vue
index c81b6ee..71b4711 100644
--- a/src/components/uh-home-quick-nav/uh-home-quick-nav.vue
+++ b/src/components/uh-home-quick-nav/uh-home-quick-nav.vue
@@ -1,5 +1,6 @@
@@ -41,4 +53,9 @@
+
+
+
diff --git a/src/components/uh-unlock-popup/uh-unlock-popup.vue b/src/components/uh-unlock-popup/uh-unlock-popup.vue
index b042447..ee6c973 100644
--- a/src/components/uh-unlock-popup/uh-unlock-popup.vue
+++ b/src/components/uh-unlock-popup/uh-unlock-popup.vue
@@ -13,6 +13,8 @@
placeholder ?: string
/** 确认按钮文案 */
confirmText ?: string
+ /** 是否可关闭(强制解锁场景传 false:隐藏关闭按钮/取消按钮,点遮罩不关) */
+ closeable ?: boolean
/** 是否启用防刷验证码(受保护写接口 403 附新码时展示) */
captchaEnabled ?: boolean
/** 解锁请求函数(父组件注入具体接口;返回含 token 的对象表示成功) */
@@ -24,6 +26,7 @@
tip: '',
placeholder: '请输入密码',
confirmText: '解锁',
+ closeable: true,
captchaEnabled: false,
request: undefined,
})
@@ -85,6 +88,10 @@
if (val) {
password.value = ''
resetCaptcha()
+ // 插件端开启验证码时打开即拉取显示,避免首次提交 403 后才出现
+ if (props.captchaEnabled) {
+ handleRefreshCaptcha()
+ }
}
})
@@ -155,46 +162,49 @@
+ :close-on-click-modal="closeable" safe-area-inset-bottom @update:model-value="handleOnPopupClose">
- {{ title }}
+
+ {{ title }}
-
-
+
-
+
{{ tip }}
+ class="box-border mt-6 h-9 px-3 rounded-xl text-xs uh-global-card-glass uh-shadow-xs border" />
-
+
点击图片刷新验证码
-
+
-
取消
-
{{ loading ? '解锁中...' : confirmText }}
-
+
\ No newline at end of file
diff --git a/src/hooks/useLoveModuleUnlock.ts b/src/hooks/useLoveModuleUnlock.ts
new file mode 100644
index 0000000..1b00228
--- /dev/null
+++ b/src/hooks/useLoveModuleUnlock.ts
@@ -0,0 +1,102 @@
+/**
+ * 恋爱模块解锁流程(供 love 页 / 首页快捷导航 / 我的页 / 三模块页共用):
+ * - path → moduleKey 判定(插件端下发 path 前缀匹配,兼容带 query)
+ * - 锁定判定(passwordEnabled && 本地无有效 token)
+ * - 解锁弹窗状态 + 解锁请求 + 成功回调(存 token,可配置跳转)
+ */
+import { computed, ref } from 'vue'
+import { unlockLoveModule, type ICaptchaQuery } from '@/api/uni-halo'
+import { getLoveModuleToken, setLoveModuleToken, type LoveModuleKey } from '@/utils/loveModuleToken'
+import { useAppConfigStore } from '@/store/appConfig'
+import type { ILoveModuleConfig } from '@/api/types/uni-halo'
+
+/** 恋爱模块 path 前缀 → moduleKey(与插件端下发 path 约定一致) */
+const LOVE_MODULE_PATH_MAP: Array<{ key: LoveModuleKey; pathPrefix: string }> = [
+ { key: 'loveDiary', pathPrefix: '/pages-blog/love/love' },
+ { key: 'ourStory', pathPrefix: '/pages-blog/love/stories' },
+ { key: 'lovePhoto', pathPrefix: '/pages-blog/love/album' },
+ { key: 'loveDaily', pathPrefix: '/pages-blog/love/list' },
+]
+
+/** 由跳转 path 反查恋爱模块 key(非恋爱模块路径返回 undefined) */
+export function getLoveModuleKeyByPath(path: string): LoveModuleKey | undefined {
+ return LOVE_MODULE_PATH_MAP.find(item => path.startsWith(item.pathPrefix))?.key
+}
+
+export function useLoveModuleUnlock(options?: {
+ /** 解锁成功(已存 token)后的回调,如刷新配置/恢复数据加载 */
+ onUnlocked?: (moduleKey: LoveModuleKey) => void
+}) {
+ const appConfigStore = useAppConfigStore()
+ const loveConfig = computed(() => appConfigStore.configs.loveConfig)
+
+ /* ---------------- 弹窗状态 ---------------- */
+ const unlockModalVisible = ref(false)
+ /** 待解锁模块 */
+ const pendingModule = ref('loveDiary')
+ /** 解锁成功后跳转路径(空则不跳转) */
+ const pendingPath = ref('')
+
+ const unlockTip = computed(() => {
+ const moduleCfg = getModuleConfig(pendingModule.value)
+ const tip = moduleCfg?.title || ''
+ return `${tip}已设置访问密码,输入后进入`
+ })
+
+ /** 恋爱模块配置读取(入口与三模块共用字段;loveDiary 仅密码状态) */
+ function getModuleConfig(moduleKey: LoveModuleKey): ILoveModuleConfig | undefined {
+ return (loveConfig.value as unknown as Record)[moduleKey]
+ }
+
+ /** 模块是否锁定:设了密码且本地无有效 token */
+ function isModuleLocked(moduleKey: LoveModuleKey): boolean {
+ return !!getModuleConfig(moduleKey)?.passwordEnabled && !getLoveModuleToken(moduleKey)
+ }
+
+ /** 打开解锁弹窗(path 用于解锁成功后跳转,空则不跳) */
+ function openUnlock(moduleKey: LoveModuleKey, path = '') {
+ pendingModule.value = moduleKey
+ pendingPath.value = path
+ unlockModalVisible.value = true
+ }
+
+ /** 通用解锁请求: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 → 回调 → 按配置跳转 */
+ function handleUnlockSuccess(data: { token?: string }) {
+ if (!data.token) {
+ uni.showToast({ icon: 'none', title: '解锁失败,请重试' })
+ return
+ }
+ setLoveModuleToken(pendingModule.value, data.token)
+ options?.onUnlocked?.(pendingModule.value)
+ if (pendingPath.value) {
+ uni.navigateTo({ url: pendingPath.value })
+ }
+ }
+
+ /** 跳转拦截:命中恋爱模块且锁定 → 弹窗并返回 true(调用方不再跳转) */
+ function interceptNavigateByPath(path: string): boolean {
+ const moduleKey = getLoveModuleKeyByPath(path)
+ if (moduleKey && isModuleLocked(moduleKey)) {
+ openUnlock(moduleKey, path)
+ return true
+ }
+ return false
+ }
+
+ return {
+ unlockModalVisible,
+ pendingModule,
+ unlockTip,
+ isModuleLocked,
+ openUnlock,
+ handleUnlockRequest,
+ handleUnlockSuccess,
+ interceptNavigateByPath,
+ }
+}
diff --git a/src/pages-blog/love/album.vue b/src/pages-blog/love/album.vue
index 95a968d..414f6ff 100644
--- a/src/pages-blog/love/album.vue
+++ b/src/pages-blog/love/album.vue
@@ -6,7 +6,8 @@ import { getLoveAlbumByName, getLoveAlbums } from '@/api/uni-halo'
import { useAppConfigStore } from '@/store/appConfig'
import { checkImageUrl } from '@/utils/url'
import { getCache, setCache } from '@/utils/storage'
-import { handleLoveModuleLocked } from '@/utils/loveModuleToken'
+import { getLoveModuleToken, handleLoveModuleLocked } from '@/utils/loveModuleToken'
+import { useLoveModuleUnlock } from '@/hooks/useLoveModuleUnlock'
import { sleep } from '@/utils/common'
import { DataLoadingStatusEnum, useDataLoadingStatus } from '@/hooks/useDataLoadingStatus'
import { usePageScroll } from '@/hooks/usePageScroll'
@@ -65,6 +66,37 @@ const queryParams = ref({ page: 1, size: 10 })
const dataList = ref([])
const unlockedAlbums = ref>({})
+/* ---------------- 恋爱模块解锁(防分享直达:锁定未解锁时不加载数据) ---------------- */
+const {
+ unlockModalVisible,
+ unlockTip,
+ isModuleLocked,
+ openUnlock,
+ handleUnlockRequest,
+ handleUnlockSuccess,
+} = useLoveModuleUnlock()
+
+/** 是否放行数据加载(锁定未解锁时为 false,解锁成功置 true) */
+const canLoad = ref(false)
+
+/** 锁定则弹不可关闭解锁弹窗,返回是否放行 */
+function ensureUnlocked(): boolean {
+ if (isModuleLocked('lovePhoto')) {
+ openUnlock('lovePhoto')
+ return false
+ }
+ return true
+}
+
+/** 解锁成功:存 token 后恢复数据加载 */
+function handlePageUnlockSuccess(data: { token?: string }) {
+ handleUnlockSuccess(data)
+ if (getLoveModuleToken('lovePhoto')) {
+ canLoad.value = true
+ handleGetData()
+ }
+}
+
/** 密码解锁弹窗 */
const showUnlockModal = ref(false)
const currentUnlockAlbum = ref(null)
@@ -128,8 +160,10 @@ async function handleGetData() {
}
catch (e) {
console.error('获取相册失败', e)
- // 模块锁 401:清除 token 并提示
- handleLoveModuleLocked('lovePhoto', e)
+ // 模块锁 401:清除 token 并弹不可关闭解锁弹窗(解锁后恢复加载)
+ if (handleLoveModuleLocked('lovePhoto', e)) {
+ openUnlock('lovePhoto')
+ }
if (loadMoreStatus.value.active) {
updateLoadMoreStatus({
active: false,
@@ -216,10 +250,18 @@ onPageScroll((option: Page.PageScrollOption) => {
})
onLoad(() => {
- handleRestoreUnlockedAlbums()
- handleGetData()
+ handlePageInit()
})
+/** 页面初始化:先判定模块锁定(防分享直达),解锁或未设密码才加载数据 */
+async function handlePageInit() {
+ handleRestoreUnlockedAlbums()
+ await appConfigStore.bootstrap()
+ if (!ensureUnlocked()) { return }
+ canLoad.value = true
+ handleGetData()
+}
+
onPullDownRefresh(() => {
resetLoadMoreStatus()
queryParams.value.page = 1
@@ -299,6 +341,11 @@ onReachBottom(() => {
:album-name="viewerAlbumName" :album-key="viewerAlbumKey" :token="viewerAlbumToken"
@update:show="showPhotoViewer = $event"
/>
+
+
+
diff --git a/src/pages-blog/love/list.vue b/src/pages-blog/love/list.vue
index 1249b44..3e5804f 100644
--- a/src/pages-blog/love/list.vue
+++ b/src/pages-blog/love/list.vue
@@ -2,7 +2,9 @@
import { computed, ref } from 'vue'
import { onLoad, onPageScroll, onPullDownRefresh, onReachBottom } from '@dcloudio/uni-app'
import { getLoveDailyItems } from '@/api/uni-halo'
- import { handleLoveModuleLocked } from '@/utils/loveModuleToken'
+ import { getLoveModuleToken, handleLoveModuleLocked } from '@/utils/loveModuleToken'
+ import { useAppConfigStore } from '@/store/appConfig'
+ import { useLoveModuleUnlock } from '@/hooks/useLoveModuleUnlock'
import { checkImageUrl } from '@/utils/url'
import { sleep } from '@/utils/common'
import { DataLoadingStatusEnum, useDataLoadingStatus } from '@/hooks/useDataLoadingStatus'
@@ -57,6 +59,38 @@
const queryParams = ref({ page: 1, size: 10 })
const list = ref([])
+ /* ---------------- 恋爱模块解锁(防分享直达:锁定未解锁时不加载数据) ---------------- */
+ const appConfigStore = useAppConfigStore()
+ const {
+ unlockModalVisible,
+ unlockTip,
+ isModuleLocked,
+ openUnlock,
+ handleUnlockRequest,
+ handleUnlockSuccess,
+ } = useLoveModuleUnlock()
+
+ /** 是否放行数据加载(锁定未解锁时为 false,解锁成功置 true) */
+ const canLoad = ref(false)
+
+ /** 锁定则弹不可关闭解锁弹窗,返回是否放行 */
+ function ensureUnlocked() : boolean {
+ if (isModuleLocked('loveDaily')) {
+ openUnlock('loveDaily')
+ return false
+ }
+ return true
+ }
+
+ /** 解锁成功:存 token 后恢复数据加载 */
+ function handlePageUnlockSuccess(data : { token ?: string }) {
+ handleUnlockSuccess(data)
+ if (getLoveModuleToken('loveDaily')) {
+ canLoad.value = true
+ handleGetList()
+ }
+ }
+
/* ---------------- 筛选与排序 ---------------- */
interface IFilterOption {
label : string
@@ -186,8 +220,10 @@
}
catch (e) {
console.error('获取清单失败', e)
- // 模块锁 401:清除 token 并提示
- handleLoveModuleLocked('loveDaily', e)
+ // 模块锁 401:清除 token 并弹不可关闭解锁弹窗(解锁后恢复加载)
+ if (handleLoveModuleLocked('loveDaily', e)) {
+ openUnlock('loveDaily')
+ }
if (loadMoreStatus.value.active) {
updateLoadMoreStatus({
active: false,
@@ -257,9 +293,17 @@
})
onLoad(() => {
- handleGetList()
+ handlePageInit()
})
+ /** 页面初始化:先判定模块锁定(防分享直达),解锁或未设密码才加载数据 */
+ async function handlePageInit() {
+ await appConfigStore.bootstrap()
+ if (!ensureUnlocked()) { return }
+ canLoad.value = true
+ handleGetList()
+ }
+
onPullDownRefresh(() => {
resetLoadMoreStatus()
queryParams.value.page = 1
@@ -417,5 +461,10 @@
+
+
+
\ No newline at end of file
diff --git a/src/pages-blog/love/love.vue b/src/pages-blog/love/love.vue
index 623bdcf..a7356f4 100644
--- a/src/pages-blog/love/love.vue
+++ b/src/pages-blog/love/love.vue
@@ -1,10 +1,10 @@