mirror of
https://github.com/ialley-workshop-open/uni-halo.git
synced 2026-11-13 22:11:42 +08:00
feat: 恋爱模块入口校验与强制解锁弹窗
- 首页快捷导航/我的页跳转恋爱日记前拦截:设密码且无有效 token 先弹解锁弹窗 - love 页初始化与清单/相册/故事三模块页防分享直达:不可关闭密码弹窗,解锁后才加载数据 - 模块数据接口 401 locked 时自动弹解锁弹窗 - 解锁弹窗开启验证码时打开即拉取显示 - 抽取 useLoveModuleUnlock 共享 hook 统一解锁流程
This commit is contained in:
@@ -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<ILoveAlbumCard[]>([])
|
||||
const unlockedAlbums = ref<Record<string, string>>({})
|
||||
|
||||
/* ---------------- 恋爱模块解锁(防分享直达:锁定未解锁时不加载数据) ---------------- */
|
||||
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<ILoveAlbumCard | null>(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"
|
||||
/>
|
||||
|
||||
<!-- 模块级密码解锁弹窗(强制不可关闭,防分享直达) -->
|
||||
<uh-unlock-popup v-model:show="unlockModalVisible" title="请解锁" captcha-enabled
|
||||
:tip="unlockTip" placeholder="请输入密码" confirm-text="进入" :closeable="false"
|
||||
:request="handleUnlockRequest" @success="handlePageUnlockSuccess" />
|
||||
</view>
|
||||
</template>
|
||||
|
||||
|
||||
@@ -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<ILoveItemCard[]>([])
|
||||
|
||||
/* ---------------- 恋爱模块解锁(防分享直达:锁定未解锁时不加载数据) ---------------- */
|
||||
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 @@
|
||||
</template>
|
||||
</view>
|
||||
</uh-glass-popup>
|
||||
|
||||
<!-- 模块级密码解锁弹窗(强制不可关闭,防分享直达) -->
|
||||
<uh-unlock-popup v-model:show="unlockModalVisible" title="请解锁" captcha-enabled
|
||||
:tip="unlockTip" placeholder="请输入密码" confirm-text="进入" :closeable="false"
|
||||
:request="handleUnlockRequest" @success="handlePageUnlockSuccess" />
|
||||
</view>
|
||||
</template>
|
||||
@@ -1,10 +1,10 @@
|
||||
<script lang="ts" setup>
|
||||
import { computed, onBeforeUnmount, ref } from 'vue'
|
||||
import { onBeforeUnmount, ref } from 'vue'
|
||||
import { onLoad, onPageScroll, onShow } from '@dcloudio/uni-app'
|
||||
import { useAppConfigStore } from '@/store/appConfig'
|
||||
import { checkAvatarUrl, checkImageUrl } from '@/utils/url'
|
||||
import { getPluginCaptcha, unlockLoveModule, type ICaptchaQuery, type IPluginCaptcha } from '@/api/uni-halo'
|
||||
import { getLoveModuleToken, setLoveModuleToken, type LoveModuleKey } from '@/utils/loveModuleToken'
|
||||
import { getLoveModuleToken, type LoveModuleKey } from '@/utils/loveModuleToken'
|
||||
import { useLoveModuleUnlock } from '@/hooks/useLoveModuleUnlock'
|
||||
import { usePageScroll } from '@/hooks/usePageScroll'
|
||||
import type { ILoveConfigGroup, ILoveModuleConfig } from '@/api/types/uni-halo'
|
||||
|
||||
@@ -148,29 +148,29 @@
|
||||
}
|
||||
|
||||
/* ---------------- 跳转(模块密码拦截) ---------------- */
|
||||
/** 模块密码弹窗状态 */
|
||||
const unlockModalVisible = ref(false)
|
||||
/** 待跳转路径(模块下发的完整 path,解锁成功后 navigateTo) */
|
||||
const pendingPath = ref('')
|
||||
const pendingModule = ref<LoveModuleKey>('ourStory')
|
||||
|
||||
/** 恋爱日记入口(love 页本身)是否锁定:设了密码且本地无有效 token */
|
||||
const loveDiaryLocked = computed(() =>
|
||||
!!loveConfig.value.loveDiary?.passwordEnabled && !getLoveModuleToken('loveDiary'))
|
||||
|
||||
const unlockTip = computed(() => {
|
||||
const moduleCfg = loveConfig.value[pendingModule.value] as ILoveModuleConfig | undefined
|
||||
const tip = moduleCfg?.title || ''
|
||||
return `${tip}已设置访问密码,输入后进入`
|
||||
/** 恋爱模块解锁流程(弹窗状态/请求/成功回调统一由 hook 管理) */
|
||||
const {
|
||||
unlockModalVisible,
|
||||
pendingModule,
|
||||
unlockTip,
|
||||
isModuleLocked,
|
||||
openUnlock,
|
||||
handleUnlockRequest,
|
||||
handleUnlockSuccess,
|
||||
} = useLoveModuleUnlock({
|
||||
onUnlocked: (moduleKey) => {
|
||||
// 恋爱日记入口解锁:恋爱配置已并入 getConfigs loveConfig 组,刷新后重读
|
||||
if (moduleKey === 'loveDiary') {
|
||||
appConfigStore.refreshStatic().then(() => syncLoveConfigFromStore())
|
||||
}
|
||||
},
|
||||
})
|
||||
|
||||
function handleToPage(moduleKey : LoveModuleKey) {
|
||||
const moduleCfg = loveConfig.value[moduleKey] as ILoveModuleConfig | undefined
|
||||
// 模块设了密码且本地无有效 token → 先弹密码框验证
|
||||
if (moduleCfg?.passwordEnabled && !getLoveModuleToken(moduleKey)) {
|
||||
pendingPath.value = moduleCfg.path || ''
|
||||
pendingModule.value = moduleKey
|
||||
unlockModalVisible.value = true
|
||||
if (isModuleLocked(moduleKey)) {
|
||||
openUnlock(moduleKey, moduleCfg?.path || '')
|
||||
return
|
||||
}
|
||||
// 跳转直接使用插件下发的 path
|
||||
@@ -181,29 +181,6 @@
|
||||
}
|
||||
}
|
||||
|
||||
/** 通用解锁弹窗请求: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') {
|
||||
// 恋爱日记入口解锁:恋爱配置已并入 getConfigs loveConfig 组,刷新后重读
|
||||
appConfigStore.refreshStatic().then(() => syncLoveConfigFromStore())
|
||||
}
|
||||
else if (pendingPath.value) {
|
||||
uni.navigateTo({ url: pendingPath.value })
|
||||
}
|
||||
}
|
||||
else {
|
||||
uni.showToast({ icon: 'none', title: '解锁失败,请重试' })
|
||||
}
|
||||
}
|
||||
|
||||
/* ---------------- 生命周期 ---------------- */
|
||||
onPageScroll((option : Page.PageScrollOption) => {
|
||||
updatePageScrollValue(option.scrollTop)
|
||||
@@ -216,11 +193,9 @@
|
||||
onShow(async () => {
|
||||
await appConfigStore.bootstrap()
|
||||
syncLoveConfigFromStore()
|
||||
// 恋爱日记入口(love 页本身)设了密码且本地无 token → 先弹密码框验证
|
||||
if (loveDiaryLocked.value) {
|
||||
pendingPath.value = ''
|
||||
pendingModule.value = 'loveDiary'
|
||||
unlockModalVisible.value = true
|
||||
// 恋爱日记入口(love 页本身)设了密码且本地无 token → 弹不可关闭密码框,解锁后才能查看
|
||||
if (isModuleLocked('loveDiary')) {
|
||||
openUnlock('loveDiary')
|
||||
}
|
||||
})
|
||||
|
||||
@@ -261,7 +236,6 @@
|
||||
<view
|
||||
class="absolute z-2 left-0 bottom-0 w-full h-36 bg-gradient-to-b from-white/0 via-pink-50/50 to-pink-50" />
|
||||
</view>
|
||||
|
||||
<!-- 恋爱记时 -->
|
||||
<view class="love-time-wrap mt-8 w-screen flex flex-col items-center justify-center">
|
||||
<view class="title text-xl text-love font-bold">
|
||||
@@ -315,9 +289,9 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 模块密码验证弹窗-->
|
||||
<uh-unlock-popup v-model:show="unlockModalVisible" title="请输入访问密码" captcha-enabled
|
||||
:tip="unlockTip"
|
||||
<!-- 模块密码验证弹窗(恋爱日记入口强制解锁不可关闭;模块入口点击可取消) -->
|
||||
<uh-unlock-popup v-model:show="unlockModalVisible" title="请解锁" captcha-enabled
|
||||
:tip="unlockTip" :closeable="pendingModule !== 'loveDiary'"
|
||||
placeholder="请输入密码" confirm-text="进入" :request="handleUnlockRequest" @success="handleUnlockSuccess" />
|
||||
</template>
|
||||
|
||||
|
||||
@@ -3,8 +3,9 @@
|
||||
import { onLoad, onPageScroll, onPullDownRefresh, onReachBottom } from '@dcloudio/uni-app'
|
||||
import dayjs from 'dayjs'
|
||||
import { getLoveStories } 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'
|
||||
@@ -111,6 +112,37 @@
|
||||
const currentStory = ref<IStoryCard>(EMPTY_STORY)
|
||||
const storyImageIndex = ref(0)
|
||||
|
||||
/* ---------------- 恋爱模块解锁(防分享直达:锁定未解锁时不加载数据) ---------------- */
|
||||
const {
|
||||
unlockModalVisible,
|
||||
unlockTip,
|
||||
isModuleLocked,
|
||||
openUnlock,
|
||||
handleUnlockRequest,
|
||||
handleUnlockSuccess,
|
||||
} = useLoveModuleUnlock()
|
||||
|
||||
/** 是否放行数据加载(锁定未解锁时为 false,解锁成功置 true) */
|
||||
const canLoad = ref(false)
|
||||
|
||||
/** 锁定则弹不可关闭解锁弹窗,返回是否放行 */
|
||||
function ensureUnlocked() : boolean {
|
||||
if (isModuleLocked('ourStory')) {
|
||||
openUnlock('ourStory')
|
||||
return false
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
/** 解锁成功:存 token 后恢复数据加载 */
|
||||
function handlePageUnlockSuccess(data : { token ?: string }) {
|
||||
handleUnlockSuccess(data)
|
||||
if (getLoveModuleToken('ourStory')) {
|
||||
canLoad.value = true
|
||||
handleGetStories()
|
||||
}
|
||||
}
|
||||
|
||||
/* ---------------- 数据加载 ---------------- */
|
||||
async function handleGetStories() {
|
||||
if (!loadMoreStatus.value.active) {
|
||||
@@ -146,8 +178,11 @@
|
||||
}
|
||||
catch (e) {
|
||||
console.error('获取故事失败', e)
|
||||
// 模块锁 401:清除 token 并提示;命中 locked 时不做旧配置降级(需回入口重新解锁)
|
||||
if (!handleLoveModuleLocked('ourStory', e)) {
|
||||
// 模块锁 401:清除 token 并弹不可关闭解锁弹窗(解锁后恢复加载);命中 locked 不做旧配置降级
|
||||
if (handleLoveModuleLocked('ourStory', e)) {
|
||||
openUnlock('ourStory')
|
||||
}
|
||||
else {
|
||||
handleLoadFromLegacy()
|
||||
}
|
||||
if (loadMoreStatus.value.active) {
|
||||
@@ -231,9 +266,17 @@
|
||||
})
|
||||
|
||||
onLoad(() => {
|
||||
handleGetStories()
|
||||
handlePageInit()
|
||||
})
|
||||
|
||||
/** 页面初始化:先判定模块锁定(防分享直达),解锁或未设密码才加载数据 */
|
||||
async function handlePageInit() {
|
||||
await appConfigStore.bootstrap()
|
||||
if (!ensureUnlocked()) { return }
|
||||
canLoad.value = true
|
||||
handleGetStories()
|
||||
}
|
||||
|
||||
onPullDownRefresh(() => {
|
||||
resetLoadMoreStatus()
|
||||
queryParams.value.page = 1
|
||||
@@ -353,6 +396,11 @@
|
||||
</view>
|
||||
</view>
|
||||
</uh-glass-popup>
|
||||
|
||||
<!-- 模块级密码解锁弹窗(强制不可关闭,防分享直达) -->
|
||||
<uh-unlock-popup v-model:show="unlockModalVisible" title="请解锁" captcha-enabled
|
||||
:tip="unlockTip" placeholder="请输入密码" confirm-text="进入" :closeable="false"
|
||||
:request="handleUnlockRequest" @success="handlePageUnlockSuccess" />
|
||||
</view>
|
||||
</template>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user