feat: 完善登录流程、UI适配及协议文档更新

本次提交包含以下修改： 1. 新增微信登录相关服务及页面逻辑，实现首次微信绑定手机号流程 2. 优化产品匹配卡片 UI，移除不必要状态显示 3. 调整首页 scroll-view 属性及 banner 背景样式 4. 完善积分规则校验逻辑，增加时区及策略格式验证 5. 更新协议草案文档，补充资料清单及功能说明 6. 修复分析结果路由路径，适配新的匹配结果页面 7. 调整品牌 Logo 安卓端字体对齐样式
2026-10-22 11:24:15 +08:00
parent e5406c23a6
commit 2c9d3feab5
36 changed files with 1246 additions and 212 deletions
@@ -6,15 +6,16 @@
 				<BrandLogo />
 				<text class="welcome">欢迎登录 AI融资</text>
 				<text class="login-subtitle">智能评估，让融资更简单</text>
-				<text class="form-heading">{{ mode == 'phone' ? '手机号登录 / 注册' : '密码登录' }}</text>
+				<text class="form-heading">{{ wechatBindingTicket.length > 0 ? '微信绑定手机号' : (mode == 'phone' ? '手机号登录 / 注册' : '密码登录') }}</text>
+				<text v-if="wechatBindingTicket.length > 0" class="binding-note">首次微信登录需验证手机号。已有账户将直接关联，保留原有资料和积分。</text>
 				<view class="input-box"><text class="input-prefix">+86</text><input v-model="phone" :disabled="loading || authenticated" type="number" maxlength="11" placeholder="请输入手机号" class="field-input" /></view>
 				<view v-if="mode == 'password'" class="input-box"><input v-model="password" :disabled="loading || authenticated" password placeholder="请输入登录密码" class="field-input" /></view>
 				<view v-if="mode == 'phone' && smsSent" class="input-box"><input v-model="smsCode" :disabled="loading || authenticated" type="number" maxlength="6" placeholder="请输入 6 位验证码" class="field-input" /><text class="countdown" @click="resendSms">{{ countdown > 0 ? countdown.toString() + 's 后重试' : '重新获取' }}</text></view>
 				<text v-if="errorMessage.length > 0" class="error-message">{{ errorMessage }}</text>
-				<button class="login-button" :disabled="loading" @click="login">{{ loading ? '处理中…' : (authenticated ? '确认同意记录并继续' : (mode == 'phone' ? (smsSent ? '登录' : '获取验证码') : '登录')) }}</button>
-				<view class="mode-row"><text class="mode-link" @click="switchMode">{{ mode == 'phone' ? '密码登录' : '使用验证码登录' }}</text></view>
-				<view class="other-login"><view class="line"></view><text class="other-text">其他登录方式</text><view class="line"></view></view>
-				<view class="social-row"><view class="social-button" @click="socialLogin('微信')"><image class="social-icon" src="/packages/account/static/wechat.svg" mode="aspectFit" /><text class="social-label">微信</text></view><view class="social-button" @click="socialLogin('一键登录')"><image class="social-icon" src="/packages/account/static/quick-login.svg" mode="aspectFit" /><text class="social-label">一键登录</text></view></view>
+				<button class="login-button" :disabled="loading" @click="login">{{ loading ? '处理中…' : (authenticated ? '确认同意记录并继续' : (mode == 'phone' ? (smsSent ? (wechatBindingTicket.length > 0 ? '验证并登录' : '登录') : '获取验证码') : '登录')) }}</button>
+				<view class="mode-row"><text v-if="wechatBindingTicket.length == 0" class="mode-link" @click="switchMode">{{ mode == 'phone' ? '密码登录' : '使用验证码登录' }}</text><text v-else class="mode-link" @click="cancelWechatBinding">取消绑定，使用手机号登录</text></view>
+				<view v-if="wechatBindingTicket.length == 0 && !authenticated" class="other-login"><view class="line"></view><text class="other-text">其他登录方式</text><view class="line"></view></view>
+				<view v-if="wechatBindingTicket.length == 0 && !authenticated" class="social-row"><view v-if="wechatSupported" class="social-button" @click="beginWechatLogin"><image class="social-icon" src="/packages/account/static/wechat.svg" mode="aspectFit" /><text class="social-label">微信登录</text></view><view class="social-button" @click="quickLogin"><image class="social-icon" src="/packages/account/static/quick-login.svg" mode="aspectFit" /><text class="social-label">一键登录</text></view></view>
 				<view class="agreement"><view class="check-hit" @click="toggleAgreement"><view :class="agreed ? 'check checked' : 'check'"><text v-if="agreed" class="check-mark">✓</text></view></view><text class="agreement-copy">我已阅读并同意<text class="agreement-link" @click="showAgreement('terms')">《用户协议》</text>和<text class="agreement-link" @click="showAgreement('privacy')">《隐私政策》</text></text></view>
 				<text v-if="agreementState == 'ready'" class="agreement-note">确认版本：用户协议 {{ terms.version }} / 隐私政策 {{ privacy.version }}</text>
 				<text v-else class="agreement-note">{{ agreementNote }}</text>
@@ -28,8 +29,9 @@
 <script setup lang="uts">
 	import { usePageLayout } from '@/services/layout.uts'
 	import BrandLogo from '@/components/BrandLogo.uvue'
-	import { API_BASE_URL, requestSmsCode, loginWithSms, loginWithPassword } from '@/packages/account/services/auth.uts'
-	import { getSession } from '@/services/api.uts'
+	import { API_BASE_URL, requestSmsCode, requestSmsLogin, requestPasswordLogin, acceptSession } from '@/packages/account/services/auth.uts'
+	import { wechatLoginSupported, requestWechatAuthorization, requestWechatLogin, requestWechatBindingCode, bindWechatPhone, acceptWechatSession } from '@/packages/account/services/wechat-login.uts'
+	import { getSession, ApiRequestError } from '@/services/api.uts'
 	import { Agreement, emptyAgreement, fetchAgreement, agreementRoute, agreementUnavailable, agreementChanged, grantConsent, consentRequestId, sameConsentSession } from '@/services/agreements.uts'
 	import { consumeInitialLaunch } from '@/services/launch.uts'
    import { assistantReturnPath } from '@/services/assistant-return.uts'
@@ -79,6 +81,9 @@
 	const errorMessage = ref('')
 	const agreed = ref(false)
 	const authenticated = ref(false)
+	const wechatSupported = wechatLoginSupported()
+	const wechatBindingTicket = ref('')
+	let wechatBindingExpiresAt = 0; let wechatOriginSession = ''
 	const terms = ref<Agreement>(emptyAgreement()); const privacy = ref<Agreement>(emptyAgreement())
 	const agreementState = ref('loading'); const agreementNote = ref('正在加载用户协议与隐私政策…')
 	const isDemo = API_BASE_URL.length == 0
@@ -86,6 +91,10 @@
 	type LoginConsentCommand = { agreement: Agreement, requestId: string }
 	let pendingConsents: LoginConsentCommand[] = []; let confirmedCount = 0; let selectedTerms: Agreement | null = null; let selectedPrivacy: Agreement | null = null
 	const showAgreement = (code: string) => { const item = code == 'terms' ? terms.value : privacy.value; const url = agreementRoute(code, item.version); if (pageVisible && url.length > 0) uni.navigateTo({ url }) }
+	const quickLogin = () => {
+		if (!pageVisible || loading.value || authenticated.value || wechatBindingTicket.value.length > 0) return
+		uni.showModal({ title: '一键登录暂未开放', content: '请先使用手机号登录。该登录方式将在正式服务接入后开放。', showCancel: false, confirmText: '我知道了' })
+	}
 	const sameAuthentication = (): boolean => { const current = getSession(); return sameConsentSession(authToken, authUserId, current?.getString('token') ?? '', current?.getString('userId') ?? '') }
 	const clearAuthentication = () => { authToken = ''; authUserId = ''; authenticated.value = false; pendingConsents = []; confirmedCount = 0; agreed.value = false; selectedTerms = null; selectedPrivacy = null; generation++ }
 	const toggleAgreement = () => {
@@ -121,7 +130,8 @@
 		clearInterval(countdownTimer)
 	})
 	const switchMode = () => { if (loading.value || authenticated.value) return; mode.value = mode.value == 'phone' ? 'password' : 'phone'; errorMessage.value = '' }
-	const socialLogin = (provider: string) => { uni.showModal({ title: provider + '暂未开放', content: '请先使用手机号登录。该登录方式将在正式服务接入后开放。', showCancel: false, confirmText: '我知道了' }) }
+	const sessionIdentity = (): string => { const session = getSession(); return (session?.getString('token') ?? '') + ':' + (session?.getString('userId') ?? '') }
+	const currentLoginRequest = (request: number, origin: string): boolean => pageVisible && request == generation && origin == sessionIdentity()
 	const validPhone = (): boolean => {
 		if (!/^1[3-9][0-9]{9}$/.test(phone.value)) { errorMessage.value = '请输入正确的 11 位手机号'; return false }
 		return true
@@ -133,6 +143,68 @@
 			if (countdown.value <= 1) { countdown.value = 0; clearInterval(countdownTimer) } else countdown.value -= 1
 		}, 1000)
 	}
+	const resetWechatBinding = () => {
+		wechatBindingTicket.value = ''; wechatBindingExpiresAt = 0; wechatOriginSession = ''
+		smsSent.value = false; smsCode.value = ''; countdown.value = 0; clearInterval(countdownTimer)
+	}
+	const cancelWechatBinding = () => {
+		if (loading.value || authenticated.value) return
+		generation++; resetWechatBinding(); mode.value = 'phone'; errorMessage.value = ''
+	}
+	const bindingReady = (): boolean => {
+		if (wechatBindingTicket.value.length == 0) return true
+		if (wechatOriginSession != sessionIdentity()) {
+			resetWechatBinding(); errorMessage.value = '登录状态已变化，请重新微信登录'; return false
+		}
+		if (Date.now() >= wechatBindingExpiresAt) {
+			resetWechatBinding(); errorMessage.value = '绑定已过期，请重新微信登录'; return false
+		}
+		return true
+	}
+	async function handleWechatError(error: any | null, request: number) {
+		if (!pageVisible || request != generation) return
+		if (agreementChanged(error)) {
+			resetWechatBinding(); agreed.value = false; selectedTerms = null; selectedPrivacy = null
+			loading.value = false; await loadAgreements(); errorMessage.value = '协议版本已更新，请重新阅读并勾选后微信登录。'
+		} else {
+			if (error instanceof ApiRequestError && error.errorCode == 'WECHAT_BINDING_EXPIRED') resetWechatBinding()
+			errorMessage.value = error instanceof Error ? error.message : '微信登录失败，请重新操作'
+		}
+	}
+	const acceptWechatResult = (result: UTSJSONObject, request: number, origin: string) => {
+		if (!currentLoginRequest(request, origin)) return
+		const token = acceptWechatSession(result)
+		const session = getSession()
+		if (session?.getString('token') != token) throw new Error('登录状态已变化，请重新登录')
+		authToken = token; authUserId = session?.getString('userId') ?? ''; authenticated.value = true
+		pendingConsents = []; resetWechatBinding()
+		uni.redirectTo({ url: afterLoginUrl })
+	}
+	const beginWechatLogin = async () => {
+		if (!pageVisible || loading.value || authenticated.value || !wechatSupported) return
+		// 密码登录保留的协议未发布例外，不适用于新微信入口。
+		if (agreementState.value != 'ready' || !agreed.value || selectedTerms == null || selectedPrivacy == null) {
+			errorMessage.value = '请先阅读并确认已正式发布的用户协议和隐私政策'; return
+		}
+		const commands: UTSJSONObject[] = [
+			{ agreementCode: 'terms', agreementVersion: selectedTerms!.version, contentHash: selectedTerms!.contentHash, requestId: consentRequestId() },
+			{ agreementCode: 'privacy', agreementVersion: selectedPrivacy!.version, contentHash: selectedPrivacy!.contentHash, requestId: consentRequestId() }
+		]
+		const request = ++generation; const origin = sessionIdentity()
+		loading.value = true; errorMessage.value = ''
+		try {
+			const code = await requestWechatAuthorization()
+			if (!currentLoginRequest(request, origin)) return
+			const result = await requestWechatLogin(code, commands)
+			if (!currentLoginRequest(request, origin)) return
+			if (result.getString('status') == 'bind_required') {
+				resetWechatBinding(); mode.value = 'phone'; phone.value = ''; password.value = ''
+				wechatBindingTicket.value = result.getString('bindingTicket') ?? ''
+				wechatBindingExpiresAt = Date.now() + (result.getNumber('expiresIn') ?? 0) * 1000; wechatOriginSession = origin
+			} else acceptWechatResult(result, request, origin)
+		} catch (error) { if (currentLoginRequest(request, origin)) await handleWechatError(error, request) }
+		finally { if (request == generation) loading.value = false }
+	}
 	async function confirmLoginConsents(request: number) {
 		if (!pageVisible || request != generation || !sameAuthentication()) throw new Error('登录状态已变化，请重新登录')
 		if (pendingConsents.length == 0 && agreementState.value == 'ready') {
@@ -149,41 +221,53 @@
 	}
 	const resendSms = async () => {
 		if (!pageVisible || authenticated.value || loading.value || countdown.value > 0 || !validPhone()) return
+		if (!bindingReady()) return
 		if (!agreementReadyForLogin()) return
-		const request = generation
+		const request = generation; const origin = sessionIdentity()
 		loading.value = true; errorMessage.value = ''
 		try {
-			if (!(await requestSmsCode(phone.value))) throw new Error('验证码发送失败，请稍后重试')
-			if (!pageVisible || request != generation) return
+			const sent = wechatBindingTicket.value.length > 0 ? await requestWechatBindingCode(wechatBindingTicket.value, phone.value) : await requestSmsCode(phone.value)
+			if (!sent) throw new Error('验证码发送失败，请稍后重试')
+			if (!currentLoginRequest(request, origin)) return
 			startCountdown()
 			uni.showToast({ title: isDemo ? '请输入 6 位验证码' : '验证码已重新发送', icon: 'none' })
-		} catch (error) { if (pageVisible && request == generation) errorMessage.value = error instanceof Error ? error.message : '验证码发送失败，请稍后重试' } finally { if (request == generation) loading.value = false }
+		} catch (error) { if (currentLoginRequest(request, origin)) await handleWechatError(error, request) } finally { if (request == generation) loading.value = false }
 	}
 	const login = async () => {
 		if (!pageVisible || loading.value) return
 		errorMessage.value = ''
+		if (!bindingReady()) return
 		if (authenticated.value && !sameAuthentication()) { clearAuthentication(); errorMessage.value = '登录状态已变化，请重新登录'; return }
 		if (pendingConsents.length == 0 && !agreementReadyForLogin()) return
 		if (!authenticated.value && !validPhone()) return
-		const request = ++generation
+		const request = ++generation; const origin = sessionIdentity()
 		loading.value = true
 		try {
 			if (authenticated.value) { await confirmLoginConsents(request); return }
 			let token = ''
 			if (mode.value == 'phone') {
 				if (!smsSent.value) {
-					if (!(await requestSmsCode(phone.value))) throw new Error('验证码发送失败，请稍后重试')
-					if (!pageVisible || request != generation) return
+					const sent = wechatBindingTicket.value.length > 0 ? await requestWechatBindingCode(wechatBindingTicket.value, phone.value) : await requestSmsCode(phone.value)
+					if (!sent) throw new Error('验证码发送失败，请稍后重试')
+					if (!currentLoginRequest(request, origin)) return
 					smsSent.value = true; startCountdown()
 					uni.showToast({ title: isDemo ? '请输入 6 位验证码' : '验证码已发送', icon: 'none' })
 					return
 				} else {
 					if (!/^[0-9]{6}$/.test(smsCode.value)) throw new Error('请输入 6 位数字验证码')
-					token = await loginWithSms(phone.value, smsCode.value)
+					if (wechatBindingTicket.value.length > 0) {
+						const result = await bindWechatPhone(wechatBindingTicket.value, phone.value, smsCode.value)
+						acceptWechatResult(result, request, origin); return
+					}
+					const result = await requestSmsLogin(phone.value, smsCode.value)
+					if (!currentLoginRequest(request, origin)) return
+					token = acceptSession(result, phone.value)
 				}
 			} else {
 				if (password.value.length < 6) throw new Error('密码至少需要 6 位')
-				token = await loginWithPassword(phone.value, password.value)
+				const result = await requestPasswordLogin(phone.value, password.value)
+				if (!currentLoginRequest(request, origin)) return
+				token = acceptSession(result, phone.value)
 			}
 			if (!pageVisible || request != generation) return
 			const session = getSession()
@@ -192,19 +276,22 @@
 			await confirmLoginConsents(request)
 		} catch (err) {
 			if (!pageVisible || request != generation) return
+			if (!authenticated.value && origin != sessionIdentity()) return
+			if (wechatBindingTicket.value.length > 0) { await handleWechatError(err, request); return }
 			if (agreementChanged(err)) { pendingConsents = []; confirmedCount = 0; agreed.value = false; selectedTerms = null; selectedPrivacy = null; loading.value = false; await loadAgreements(); errorMessage.value = '协议版本已更新，请重新阅读并勾选后继续。' }
 			else errorMessage.value = (err instanceof Error ? err.message : '登录失败，请稍后重试') + (authenticated.value ? '；同意记录未确认，请点击按钮以原请求重试。' : '')
 		} finally { if (request == generation) loading.value = false }
 	}
 	onShow(async () => {
 		pageVisible = true
+		if (wechatBindingTicket.value.length > 0) bindingReady()
 		if (authenticated.value && !sameAuthentication()) clearAuthentication()
 		clearInterval(accountTimer); accountTimer = setInterval(() => { if (pageVisible && authenticated.value && !sameAuthentication()) { clearAuthentication(); loading.value = false; errorMessage.value = '登录状态已变化，请重新登录'; loadAgreements() } }, 1000)
 		if (pendingConsents.length == 0) await loadAgreements()
 	})
 	const hidePage = () => { pageVisible = false; generation++; agreementGeneration++; loading.value = false; clearInterval(accountTimer) }
 	onHide(() => hidePage())
-	onUnload(() => { hidePage(); clearInterval(countdownTimer); clearAuthentication() })
+	onUnload(() => { hidePage(); clearInterval(countdownTimer); resetWechatBinding(); clearAuthentication() })
 	onUnmounted(() => { clearInterval(countdownTimer); clearInterval(accountTimer) })
 </script>

@@ -213,6 +300,7 @@
 	.welcome { font-size: 42rpx; line-height: 60rpx; font-weight: 800; margin-top: 38rpx; color: #152443; }
 	.login-subtitle { font-size: 26rpx; color: #748198; line-height: 40rpx; margin-top: 8rpx; }
 	.form-heading { margin-top: 54rpx; font-size: 28rpx; font-weight: 600; color: #22324a; }
+	.binding-note { margin-top: 16rpx; color: #748198; font-size: 24rpx; line-height: 38rpx; }
 	.input-box { height: 96rpx; margin-top: 22rpx; border: 1rpx solid #dce4ef; border-radius: 16rpx; padding: 0 24rpx; flex-direction: row; align-items: center; background-color: #fafcff; }
 	.input-prefix { font-size: 28rpx; color: #31415a; margin-right: 22rpx; flex-shrink: 0; }
 	.field-input { flex: 1; min-width: 0; font-size: 28rpx; color: #17243c; }