feat: 支持游客免登录浏览核心页面

未登录用户可先浏览衣橱、穿搭、运势、分享等内容,登录改为用户主动选择,并在登录页增加协议勾选确认与暂不登录入口。
This commit is contained in:
2026-09-16 21:44:04 +08:00
parent c07a969642
commit 45222317af
47 changed files with 996 additions and 12150 deletions
+59 -3
View File
@@ -1,10 +1,11 @@
import { request, redirectToLogin } from '../../utils/request'
import { request } from '../../utils/request'
import * as auth from '../../utils/auth'
import { PagedResult, ClosetShareItem, OutfitShareItem } from '../../types/models'
import { ShareStatus, ShareType } from '../../utils/config'
import { normalizePaged } from '../../utils/paged'
import { setTabBarSelected } from '../../utils/tabbar'
import { navScroll } from '../../utils/nav'
import { GUEST_SHARES, goLogin } from '../../utils/guest'
import { logger } from '../../utils/logger'
// 日志模块名
@@ -25,6 +26,20 @@ interface ShareListItem {
_invalid: boolean
}
// 游客态示例列表:与真实列表同构,复用同一套模板渲染,仅补「示例」标注
function guestShareList(): ShareListItem[] {
return GUEST_SHARES.map((it) => ({
kind: it.kind,
share_uuid: it.key,
title: it.title,
typeText: it.typeText,
expireText: it.expireText,
status: ShareStatus.NORMAL,
created_at: 0,
_invalid: false,
}))
}
Page({
data: {
tabs: [
@@ -40,16 +55,36 @@ Page({
hasMore: true,
// 滚动收缩:由 utils/nav.ts 的共享 handler 驱动
navScrolled: false,
// 游客态(未登录):展示本地示例分享,不发需要授权的请求
guest: false,
},
// scroll-view 滚动 → 导航收缩为玻璃小标题
onNavScroll: navScroll,
onLoad() {
// 首帧渲染前判定游客态:未登录直接渲染示例列表,避免首帧 setData 冲突
if (!auth.isLoggedIn()) {
this.setData({ guest: true, list: guestShareList(), loading: false, hasMore: false })
logger.info(LOG, '未登录进入分享页,渲染游客态示例内容')
}
},
onShow() {
this.syncTabBar()
// 未登录直接回登录页(幂等跳转),不再发出必然 401 的请求
// 未登录:游客态浏览,零请求,不再强制跳登录(微信审核合规要求)
if (!auth.isLoggedIn()) {
redirectToLogin()
if (!this.data.guest) {
this.setData({ guest: true, list: guestShareList(), loading: false, hasMore: false })
}
return
}
// 登录成功回到本页:清掉示例数据,切回真实列表
if (this.data.guest) {
logger.info(LOG, '检测到登录态,从游客态切回真实分享列表')
;(this as any).firstShown = true
this.setData({ guest: false, list: [], loading: true, hasMore: true })
this.refresh()
return
}
// 首帧渲染未结束就 setData 会触发「Expected updated data but get first rendering data」,
@@ -69,16 +104,28 @@ Page({
onTabTap(e: WechatMiniprogram.TouchEvent) {
const index = Number(e.currentTarget.dataset.index)
if (index === this.data.activeTab) return
// 游客态:分段仍可切换,示例内容用于体验浏览,不发请求
if (this.data.guest) {
this.setData({ activeTab: index })
return
}
this.setData({ activeTab: index, list: [], loading: true })
this.refresh()
},
// 游客态点击示例分享 / 受限入口:统一进入登录页,由用户自行选择是否登录
onGuestLogin() {
logger.debug(LOG, '游客态点击受限入口,引导登录')
goLogin()
},
refresh() {
this.setData({ page: 1, hasMore: true, loading: this.data.list.length === 0 })
this.fetchList(1)
},
onReachBottom() {
if (this.data.guest) return
if (!this.data.hasMore || this.data.loading || this.data.loadingMore) return
this.fetchList(this.data.page + 1)
},
@@ -216,6 +263,11 @@ Page({
},
onCreate() {
// 新建分享需登录:游客态先引导登录,不直接进入创建页
if (this.data.guest) {
this.onGuestLogin()
return
}
wx.navigateTo({
url: '/pages/closet-share-create/closet-share-create',
fail: (e) => logger.warn(LOG, 'navigateTo 创建分享失败, err=', e && e.errMsg),
@@ -223,6 +275,10 @@ Page({
},
onItemTap(e: WechatMiniprogram.TouchEvent) {
if (this.data.guest) {
this.onGuestLogin()
return
}
const uuid = e.currentTarget.dataset.uuid as string
const kind = e.currentTarget.dataset.kind as string
logger.debug(LOG, '点击分享项, kind=', kind, 'uuid=', uuid)
@@ -10,6 +10,14 @@
<view class="display">分享</view>
</view>
<!-- 游客态提示条:未登录也可先浏览,登录由用户自行选择 -->
<view wx:if="{{guest}}" class="guest-bar" bindtap="onGuestLogin">
<view class="icon icon-lock"></view>
<text class="gb-t">浏览模式 · 以下为示例分享</text>
<text class="gb-a">登录</text>
<view class="icon icon-chevron-right"></view>
</view>
<!-- 下划线式文字分段 -->
<view class="segbar">
<view class="seg">
@@ -24,7 +32,7 @@
</view>
<empty-state
wx:if="{{!loading && !list.length}}"
wx:if="{{!guest && !loading && !list.length}}"
icon="icon-share"
title="{{activeTab === 0 ? '还没有分享' : '还没有收到分享'}}"
desc="{{activeTab === 0 ? '把衣橱、精选衣物或穿搭分享给好友' : '好友分享给你的衣橱或穿搭会出现在这里'}}"
@@ -65,6 +73,7 @@
</view>
<view class="cs-t">{{item.title}}</view>
<view class="cs-tags">
<text wx:if="{{guest}}" class="pill">示例</text>
<text class="pill">{{item.typeText}}</text>
<text wx:if="{{item._invalid}}" class="pill pill--line">{{item.expireText}}</text>
<text wx:else class="cs-exp">{{item.expireText}}</text>
@@ -73,7 +82,11 @@
</view>
</view>
<view wx:if="{{list.length && !hasMore}}" class="foot-note">没有更多了</view>
<view wx:if="{{!guest && list.length && !hasMore}}" class="foot-note">没有更多了</view>
<view wx:if="{{guest}}" class="guest-foot" bindtap="onGuestLogin">
<text>登录后可创建分享,并查看好友分享给你的内容</text>
<text class="gf-a">去登录</text>
</view>
<view class="gap-64"></view>
</scroll-view>
</view>