-
-
-
- 请输入已在平台绑定的 11 位手机号。老用户与小程序为同一账号（按库内手机号匹配）。若曾设置密码可填写，未设置可留空。
-
-
-
-
-
手机号
-
- setAccount((e.target.value || '').trim())}
- maxLength={11}
- />
-
-
-
-
密码（可留空）
-
- setPassword(e.target.value || '')}
- />
-
-
-
-
+
)
diff --git a/reactH5/src/pages/ForgotPassword/ForgotPasswordPage.tsx b/reactH5/src/pages/ForgotPassword/ForgotPasswordPage.tsx
new file mode 100644
index 00000000..05cffa3d
--- /dev/null
+++ b/reactH5/src/pages/ForgotPassword/ForgotPasswordPage.tsx
@@ -0,0 +1,121 @@
+import { useState } from 'react'
+import { useLocation, useNavigate } from 'react-router-dom'
+import { request } from '@/api/request'
+import { useToast } from '@/context/ToastContext'
+import { Icon } from '@/components/Icon/Icon'
+import '@/pages/DevLogin/DevLoginPage.css'
+
+const statusBar = 44
+
+export function ForgotPasswordPage() {
+ const nav = useNavigate()
+ const loc = useLocation() as { state?: { returnTo?: string } }
+ const { showToast } = useToast()
+ const [phone, setPhone] = useState('')
+ const [pwd, setPwd] = useState('')
+ const [pwd2, setPwd2] = useState('')
+ const [loading, setLoading] = useState(false)
+
+ const submit = async () => {
+ const p = phone.replace(/\s/g, '')
+ if (p.length < 11) {
+ showToast('请输入11位手机号')
+ return
+ }
+ if (pwd.length < 6) {
+ showToast('新密码至少6位')
+ return
+ }
+ if (pwd !== pwd2) {
+ showToast('两次密码不一致')
+ return
+ }
+ setLoading(true)
+ try {
+ const res = await request<{ success?: boolean; message?: string }>({
+ url: '/api/miniprogram/h5/reset-password',
+ method: 'POST',
+ data: { phone: p, newPassword: pwd },
+ })
+ if (res?.success) {
+ showToast(res.message || '已提交')
+ const rt =
+ typeof loc.state?.returnTo === 'string' && loc.state.returnTo.startsWith('/') ? loc.state.returnTo : '/'
+ setTimeout(() => nav('/login', { replace: true, state: { returnTo: rt } }), 500)
+ }
+ } catch {
+ /* request 已 toast */
+ } finally {
+ setLoading(false)
+ }
+ }
+
+ return (
+
+
+
+
忘记密码
+
+
+
+
+
+
+
+ 将为此手机号重置 H5 登录密码（与小程序同一账号）。无需短信验证，请勿在公共网络使用；若未开启 H5 登录，请联系管理员。
+
+
+
+
+
+
手机号
+
+ setPhone((e.target.value || '').trim())}
+ maxLength={11}
+ />
+
+
+
+
新密码（至少6位）
+
+ setPwd(e.target.value || '')}
+ />
+
+
+
+
确认新密码
+
+ setPwd2(e.target.value || '')}
+ />
+
+
+
+
+
+
+ )
+}
diff --git a/reactH5/src/pages/Index/IndexPage.tsx b/reactH5/src/pages/Index/IndexPage.tsx
index 53a3b228..13798ada 100644
--- a/reactH5/src/pages/Index/IndexPage.tsx
+++ b/reactH5/src/pages/Index/IndexPage.tsx
@@ -1,5 +1,5 @@
-import { useCallback, useEffect, useState } from 'react'
-import { useNavigate } from 'react-router-dom'
+import { useCallback, useEffect, useRef, useState } from 'react'
+import { useLocation, useNavigate } from 'react-router-dom'
import { request } from '@/api/request'
import { useApp } from '@/context/AppContext'
import { useToast } from '@/context/ToastContext'
@@ -7,7 +7,7 @@ import { trackClick } from '@/utils/trackClick'
import { cleanSingleLineField } from '@/utils/contentParser'
import { isSafeImageSrc } from '@/utils/imageUrl'
import { Icon } from '@/components/Icon/Icon'
-import { LoginModal } from '@/components/LoginModal/LoginModal'
+import { H5_INDEX_AFTER_LOGIN_KEY, H5_LOGIN_JUST_SUCCEEDED_KEY } from '@/constants/h5Auth'
import { submitCkbLeadH5 } from '@/utils/soulBridge'
import {
DEFAULT_KARUO_LINK_AVATAR,
@@ -44,6 +44,7 @@ function normalizeSectionTitle(s: Record
): string {
export function IndexPage() {
const nav = useNavigate()
+ const location = useLocation()
const { showToast } = useToast()
const { global, setGlobal, refreshConfig, getReadCount, getTotalSections } = useApp()
@@ -114,14 +115,30 @@ export function IndexPage() {
const [tipModalSubtitle, setTipModalSubtitle] = useState('')
const [micHorizontalSlots, setMicHorizontalSlots] = useState([])
const [micDefaultGiftId, setMicDefaultGiftId] = useState('')
- const [showLoginModal, setShowLoginModal] = useState(false)
- const [loginModalDesc, setLoginModalDesc] = useState('登录后可参与打赏、上麦与链接嘉宾')
- const [pendingAfterLogin, setPendingAfterLogin] = useState(null)
+ const openTipModalRef = useRef<(tipSource: 'live_mic' | 'home_reward') => void>(() => {})
+ const onHeaderCornerTapRef = useRef<() => void>(() => {})
const updateUserStatus = useCallback(() => {
void Math.min(getReadCount(), totalSections || getTotalSections())
}, [getReadCount, getTotalSections, totalSections])
+ const goToLoginPage = useCallback(
+ (
+ desc: string,
+ indexAfter?: { type: 'tip'; tipSource: string } | { type: 'link_karuo' }
+ ) => {
+ if (indexAfter) {
+ try {
+ sessionStorage.setItem(H5_INDEX_AFTER_LOGIN_KEY, JSON.stringify(indexAfter))
+ } catch {
+ /* */
+ }
+ }
+ nav('/login', { state: { returnTo: '/', desc } })
+ },
+ [nav]
+ )
+
const syncHeaderCorner = useCallback(
(
audit: boolean,
@@ -495,14 +512,60 @@ export function IndexPage() {
updateUserStatus()
}, [updateUserStatus, global.isLoggedIn, totalSections])
+ useEffect(() => {
+ if (!global.isLoggedIn || location.pathname !== '/') return
+
+ let justOk = false
+ try {
+ justOk = sessionStorage.getItem(H5_LOGIN_JUST_SUCCEEDED_KEY) === '1'
+ } catch {
+ return
+ }
+ if (!justOk) return
+ try {
+ sessionStorage.removeItem(H5_LOGIN_JUST_SUCCEEDED_KEY)
+ } catch {
+ /* */
+ }
+
+ let raw: string | null = null
+ try {
+ raw = sessionStorage.getItem(H5_INDEX_AFTER_LOGIN_KEY)
+ } catch {
+ /* */
+ }
+
+ updateUserStatus()
+
+ if (!raw) return
+ try {
+ sessionStorage.removeItem(H5_INDEX_AFTER_LOGIN_KEY)
+ } catch {
+ /* */
+ }
+
+ try {
+ const p = JSON.parse(raw) as { type?: string; tipSource?: string }
+ if (p?.type === 'tip' && p.tipSource) {
+ window.setTimeout(
+ () => openTipModalRef.current(p.tipSource as 'live_mic' | 'home_reward'),
+ 0
+ )
+ } else if (p?.type === 'link_karuo') {
+ window.setTimeout(() => void onHeaderCornerTapRef.current(), 0)
+ }
+ } catch {
+ /* */
+ }
+ }, [global.isLoggedIn, location.pathname, updateUserStatus])
+
const openTipModal = (tipSource: 'live_mic' | 'home_reward') => {
if (global.auditMode) return
if (!global.isLoggedIn) {
- setPendingAfterLogin({ type: 'tip', tipSource })
- setLoginModalDesc(
- tipSource === 'live_mic' ? '登录后可申请上麦并完成礼遇支付' : '登录后可打赏支持'
+ goToLoginPage(
+ tipSource === 'live_mic' ? '登录后可申请上麦并完成礼遇支付' : '登录后可打赏支持',
+ { type: 'tip', tipSource }
)
- setShowLoginModal(true)
return
}
const sch = liveMicSchedule
@@ -529,9 +592,7 @@ export function IndexPage() {
void (async () => {
if (!homePinnedPerson?.token) return
if (!global.isLoggedIn) {
- setPendingAfterLogin({ type: 'link_karuo' })
- setLoginModalDesc('登录后可向嘉宾留下联系方式')
- setShowLoginModal(true)
+ goToLoginPage('登录后可向嘉宾留下联系方式', { type: 'link_karuo' })
return
}
await submitCkbLeadH5(
@@ -550,6 +611,9 @@ export function IndexPage() {
openTipModal(headerCornerAction.kind === 'mic' ? 'live_mic' : 'home_reward')
}
+ openTipModalRef.current = openTipModal
+ onHeaderCornerTapRef.current = onHeaderCornerTap
+
return (
@@ -875,27 +939,6 @@ export function IndexPage() {
)}
- {
- setShowLoginModal(false)
- setPendingAfterLogin(null)
- }}
- onSuccess={() => {
- setShowLoginModal(false)
- const p = pendingAfterLogin
- setPendingAfterLogin(null)
- updateUserStatus()
- if (p?.type === 'tip' && p.tipSource) {
- window.setTimeout(() => openTipModal(p.tipSource as 'live_mic' | 'home_reward'), 0)
- } else if (p?.type === 'link_karuo') {
- window.setTimeout(() => onHeaderCornerTap(), 0)
- }
- }}
- />
-
)
diff --git a/reactH5/src/pages/My/MyPage.tsx b/reactH5/src/pages/My/MyPage.tsx
index 4ce346d4..7d8f7e48 100644
--- a/reactH5/src/pages/My/MyPage.tsx
+++ b/reactH5/src/pages/My/MyPage.tsx
@@ -2,14 +2,13 @@
* 我的页 — 对齐 miniprogram/pages/my 布局与主数据流
*/
import { useCallback, useEffect, useState } from 'react'
-import { useNavigate } from 'react-router-dom'
+import { useLocation, useNavigate } from 'react-router-dom'
import { request } from '@/api/request'
import { storage } from '@/api/storage'
import { useApp } from '@/context/AppContext'
import type { MpUser } from '@/context/AppContext'
import { useToast } from '@/context/ToastContext'
import { Icon } from '@/components/Icon/Icon'
-import { LoginModal } from '@/components/LoginModal/LoginModal'
import { trackClick } from '@/utils/trackClick'
import { formatStatNum } from '@/utils/util'
import { cleanSingleLineField } from '@/utils/contentParser'
@@ -30,10 +29,10 @@ function formatMbtiTagText(user: MpUser | null): string {
export function MyPage() {
const nav = useNavigate()
+ const location = useLocation()
const { showToast } = useToast()
const { global, setGlobal, getReadCount } = useApp()
- const [showLoginModal, setShowLoginModal] = useState(false)
const [userInfo, setUserInfo] = useState