feat: 完善登录流程、UI适配及协议文档更新
本次提交包含以下修改： 1. 新增微信登录相关服务及页面逻辑，实现首次微信绑定手机号流程 2. 优化产品匹配卡片 UI，移除不必要状态显示 3. 调整首页 scroll-view 属性及 banner 背景样式 4. 完善积分规则校验逻辑，增加时区及策略格式验证 5. 更新协议草案文档，补充资料清单及功能说明 6. 修复分析结果路由路径，适配新的匹配结果页面 7. 调整品牌 Logo 安卓端字体对齐样式
This commit is contained in:
hujun
@@ -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; }
|
||||
|
||||
@@ -13,14 +13,14 @@
|
||||
</view>
|
||||
<view v-if="errorMessage.length > 0" class="inline-error"><text class="inline-error-copy">{{ errorMessage }}</text><text class="inline-error-action" @click="load">重新加载</text></view>
|
||||
<view class="task-grid">
|
||||
<view class="task" v-for="item in taskViews" :key="item.id" @click="doTask(item)">
|
||||
<button class="task" v-for="item in taskViews" :key="item.id" :open-type="item.id == 'share' ? 'share' : ''" @click="doTask(item)">
|
||||
<AppIcon :name="item.icon" :size="52" />
|
||||
<text class="task-name">{{ item.name }}</text>
|
||||
<text :class="item.status == 'completed' ? 'task-caption completed-caption' : 'task-caption'">{{ taskCaption(item) }}</text>
|
||||
</view>
|
||||
</button>
|
||||
</view>
|
||||
<view class="invite-panel">
|
||||
<text class="panel-title">邀请与资料奖励</text><text class="invite-copy">当前只展示已发布的积分规则，邀请和资料奖励尚未开放。</text>
|
||||
<text class="panel-title">分享与邀请</text><text class="invite-copy">将小程序分享给好友，分享和邀请奖励尚未开放。</text>
|
||||
</view>
|
||||
<view class="records">
|
||||
<view class="record-head" @click="toggleRecords"><text class="panel-title">积分明细</text><view class="record-toggle"><text class="more">{{ recordsExpanded ? '收起' : '展开' }}</text><AppIcon name="chevron-right" :size="26" :class="recordsExpanded ? 'record-arrow expanded-arrow' : 'record-arrow'" muted /></view></view>
|
||||
@@ -48,7 +48,7 @@
|
||||
type TaskView = { id: string, icon: string, name: string, status: string, reward: number | null, ruleVersion: string | null }
|
||||
const taskDefinitions: UTSJSONObject[] = [
|
||||
{ id: 'checkin', icon: 'calendar-check', name: '签到' },
|
||||
{ id: 'profile', icon: 'edit-file', name: '完善资料' },
|
||||
{ id: 'share', icon: 'share', name: '分享' },
|
||||
{ id: 'invitation', icon: 'gift', name: '邀请好友' }
|
||||
]
|
||||
const pendingKey = 'finance.points.checkin.pending'
|
||||
@@ -75,6 +75,7 @@
|
||||
const pointsNote = computed((): string => {
|
||||
if (points.value == null) return '正在同步账户数据'
|
||||
if (points.value.balanceState == 'anomaly') return '账户积分状态异常，请稍后重试'
|
||||
if (rules.value?.status == 'paused') return '签到已暂停，已有积分和明细仍可查看'
|
||||
if (rules.value == null || rules.value.status != 'published') return '积分服务尚未发布，签到暂不可用'
|
||||
return '服务器同步 · ' + points.value.serverDate
|
||||
})
|
||||
@@ -125,6 +126,7 @@
|
||||
const checkInTask = taskPage.items.find((item: PointsTask): boolean => item.task == 'checkin')
|
||||
if (summary.serverDate != taskPage.serverDate || summary.timezone != taskPage.timezone || summary.timezone != currentRules.timezone
|
||||
|| summary.ruleVersion != currentRules.ruleVersion || summary.checkInReward != currentRules.checkInReward || checkInTask == null
|
||||
|| (summary.checkInEnabled && currentRules.status != 'published')
|
||||
|| checkInTask.ruleVersion != summary.ruleVersion || checkInTask.reward != summary.checkInReward
|
||||
|| (checkInTask.status == 'completed') != (summary.ruleVersion != null && summary.signedToday)
|
||||
|| (checkInTask.status == 'available') != (summary.checkInEnabled && !summary.signedToday)) throw new Error('积分状态已变化，请重新加载')
|
||||
@@ -164,12 +166,14 @@
|
||||
if (!sameAccount()) return
|
||||
const currentRules = rules.value
|
||||
if (currentRules == null) { uni.showModal({ title: '积分规则', content: '积分规则暂时无法读取，请稍后重试。', showCancel: false, confirmText: '知道了' }); return }
|
||||
if (currentRules.status != 'published' || currentRules.checkInReward == null || currentRules.ruleVersion == null) {
|
||||
if (currentRules.status == 'draft' || currentRules.publishedRules == null || currentRules.checkInReward == null || currentRules.ruleVersion == null) {
|
||||
uni.showModal({ title: '积分规则', content: '积分服务尚未发布，签到和奖励暂未开放。', showCancel: false, confirmText: '知道了' }); return
|
||||
}
|
||||
uni.showModal({ title: '积分规则', content: '当前规则版本：' + currentRules.ruleVersion + '\n每日签到奖励：' + currentRules.checkInReward.toString() + ' 分\n每日限签到 1 次，不支持补签。', showCancel: false, confirmText: '知道了' })
|
||||
const statusNote = currentRules.status == 'paused' ? '签到已暂停，已有积分和明细仍可查看。\n\n' : ''
|
||||
uni.showModal({ title: '积分规则', content: statusNote + '每日签到奖励：' + currentRules.checkInReward.toString() + ' 分\n按北京时间每日0点划分，每日限签到1次，不支持补签。\n连续签到无额外加成，分享和邀请奖励暂未开放。\n积分不过期，不影响会员等级。\n暂不支持兑换、提现或抵扣AI调用额度。', showCancel: false, confirmText: '知道了' })
|
||||
}
|
||||
const taskCaption = (item: TaskView): string => {
|
||||
if (item.id == 'share') return '分享小程序'
|
||||
if (item.id == 'checkin' && checkingIn.value) return '正在确认…'
|
||||
if (item.id == 'checkin' && pendingRequest.value != null) return '确认上次状态'
|
||||
if (item.status == 'completed') return '今日已完成'
|
||||
@@ -209,9 +213,17 @@
|
||||
const doTask = (item: TaskView): void => {
|
||||
if (!sameAccount()) return
|
||||
if (item.id == 'checkin') { checkIn(); return }
|
||||
if (item.id == 'profile') { uni.navigateTo({ url: '/packages/finance/archive/archive' }); return }
|
||||
if (item.id == 'share') {
|
||||
// #ifndef MP-WEIXIN
|
||||
uni.showModal({ title: '分享', content: '请使用浏览器或客户端的分享功能，将页面分享给好友。', showCancel: false, confirmText: '知道了' })
|
||||
// #endif
|
||||
return
|
||||
}
|
||||
uni.showToast({ title: '邀请奖励暂未开放', icon: 'none' })
|
||||
}
|
||||
// #ifdef MP-WEIXIN
|
||||
onShareAppMessage(() => ({ title: 'AI融资 · 智能融资分析与产品匹配', path: '/pages/home/home' }))
|
||||
// #endif
|
||||
const recordName = (item: PointsLedgerItem): string => item.businessType == 'checkin' ? '每日签到' : '历史积分记录'
|
||||
const recordDate = (item: PointsLedgerItem): string => item.businessDate ?? item.createdAt ?? '日期待核实'
|
||||
const deltaLabel = (item: PointsLedgerItem): string => item.delta >= 0 ? '+' + item.delta.toString() : item.delta.toString()
|
||||
@@ -236,7 +248,11 @@
|
||||
.inline-error-copy { flex: 1; color: #b0473e; font-size: 23rpx; line-height: 34rpx; }
|
||||
.inline-error-action { color: #0868f7; font-size: 23rpx; margin-left: 18rpx; }
|
||||
.task-grid { min-height: 186rpx; flex-direction: row; background-color: #ffffff; border-radius: 18rpx; margin-top: 20rpx; }
|
||||
.task { flex: 1; align-items: center; justify-content: center; padding: 24rpx 0; }
|
||||
.task { flex: 1; flex-direction: column; align-items: center; justify-content: center; padding: 24rpx 0; margin: 0; border-radius: 0; background-color: transparent; line-height: 1.5;
|
||||
/* #ifndef APP */
|
||||
display: flex;
|
||||
/* #endif */
|
||||
}
|
||||
.task-name { margin-top: 14rpx; font-size: 24rpx; color: #172640; font-weight: 600; }
|
||||
.task-caption { margin-top: 7rpx; font-size: 22rpx; color: #66758a; }
|
||||
.completed-caption { color: #168454; }
|
||||
|
||||
@@ -7,7 +7,7 @@ export async function requestSmsCode(phone: string): Promise<boolean> {
|
||||
return true
|
||||
}
|
||||
|
||||
function acceptSession(result: UTSJSONObject, phone: string): string {
|
||||
export function acceptSession(result: UTSJSONObject, phone: string): string {
|
||||
const token = result['token'] as string | null
|
||||
const userId = result['userId'] as string | null
|
||||
const expiresAt = result['expiresAt'] as string | null
|
||||
@@ -19,11 +19,20 @@ function acceptSession(result: UTSJSONObject, phone: string): string {
|
||||
}
|
||||
|
||||
export async function loginWithSms(phone: string, code: string): Promise<string> {
|
||||
return acceptSession(await requestJson('/auth/sms-login', 'POST', { phone, code }), phone)
|
||||
return acceptSession(await requestSmsLogin(phone, code), phone)
|
||||
}
|
||||
|
||||
export async function loginWithPassword(phone: string, password: string): Promise<string> {
|
||||
return acceptSession(await requestJson('/auth/password-login', 'POST', { phone, password }), phone)
|
||||
return acceptSession(await requestPasswordLogin(phone, password), phone)
|
||||
}
|
||||
|
||||
// 页面先校验自身代次与原会话，再接受认证结果；迟到响应不能切换当前账户。
|
||||
export async function requestSmsLogin(phone: string, code: string): Promise<UTSJSONObject> {
|
||||
return await requestJson('/auth/sms-login', 'POST', { phone, code })
|
||||
}
|
||||
|
||||
export async function requestPasswordLogin(phone: string, password: string): Promise<UTSJSONObject> {
|
||||
return await requestJson('/auth/password-login', 'POST', { phone, password })
|
||||
}
|
||||
|
||||
export async function logoutAccount(): Promise<void> {
|
||||
|
||||
@@ -0,0 +1,90 @@
|
||||
import { requestJson } from '@/services/api.uts'
|
||||
import { acceptSession } from './auth.uts'
|
||||
|
||||
export function wechatLoginSupported(): boolean {
|
||||
// App微信SDK及各平台应用凭据接入后再开放原生入口。
|
||||
// #ifdef MP-WEIXIN
|
||||
return true
|
||||
// #endif
|
||||
// #ifndef MP-WEIXIN
|
||||
return false
|
||||
// #endif
|
||||
}
|
||||
|
||||
export function requestWechatAuthorization(): Promise<string> {
|
||||
// #ifdef MP-WEIXIN
|
||||
return new Promise<string>((resolve, reject) => {
|
||||
uni.login({
|
||||
provider: 'weixin',
|
||||
success: (result) => {
|
||||
const code = result.code
|
||||
if (code.length == 0) { reject(new Error('未能取得微信登录凭证，请重新操作')); return }
|
||||
resolve(code)
|
||||
},
|
||||
fail: (error) => {
|
||||
const cancelled = error.errMsg.toLowerCase().includes('cancel') || error.errCode == 1310509
|
||||
reject(new Error(cancelled ? '已取消微信登录' : '微信授权失败，请重新操作'))
|
||||
}
|
||||
})
|
||||
})
|
||||
// #endif
|
||||
// #ifndef MP-WEIXIN
|
||||
return new Promise<string>((resolve, reject) => {
|
||||
reject(new Error('当前平台暂未开放微信登录，请使用手机号登录'))
|
||||
})
|
||||
// #endif
|
||||
}
|
||||
|
||||
function validTicket(value: string): boolean { return /^[A-Za-z0-9_-]{32,128}$/.test(value) }
|
||||
function validPhone(value: string): boolean { return /^1[3-9][0-9]{9}$/.test(value) }
|
||||
|
||||
function validateResult(result: UTSJSONObject): UTSJSONObject {
|
||||
const status = result.getString('status') ?? ''
|
||||
if (status == 'bind_required') {
|
||||
const expires = result.getNumber('expiresIn') ?? 0
|
||||
if (!validTicket(result.getString('bindingTicket') ?? '') || expires < 1 || expires > 600 || Math.floor(expires) != expires || result['token'] != null)
|
||||
throw new Error('微信绑定响应格式不完整，请重新微信登录')
|
||||
} else if (status == 'authenticated') {
|
||||
const expiry = Date.parse(result.getString('expiresAt') ?? '')
|
||||
if (result.getBoolean('consentsConfirmed') != true || !validPhone(result.getString('phone') ?? '')
|
||||
|| !/^[1-9][0-9]{0,18}$/.test(result.getString('userId') ?? '') || (result.getString('token') ?? '').length == 0
|
||||
|| isNaN(expiry) || expiry <= Date.now()) throw new Error('微信登录响应缺少有效账户或协议确认')
|
||||
} else throw new Error('微信登录响应状态无效')
|
||||
return result
|
||||
}
|
||||
|
||||
export async function requestWechatLogin(code: string, agreements: UTSJSONObject[]): Promise<UTSJSONObject> {
|
||||
if (code.length == 0 || code.length > 256 || agreements.length != 2) throw new Error('请重新确认协议并微信登录')
|
||||
let terms = false; let privacy = false; let previousRequestId = ''
|
||||
for (const item of agreements) {
|
||||
const agreementCode = item['agreementCode'] as string | null ?? ''
|
||||
const requestId = item['requestId'] as string | null ?? ''
|
||||
if ((agreementCode == 'terms' && !terms)) terms = true
|
||||
else if ((agreementCode == 'privacy' && !privacy)) privacy = true
|
||||
else throw new Error('用户协议和隐私政策必须分别确认')
|
||||
if (!/^[A-Za-z0-9][A-Za-z0-9._-]{0,63}$/.test(item['agreementVersion'] as string | null ?? '')
|
||||
|| !/^[a-f0-9]{64}$/.test(item['contentHash'] as string | null ?? '') || !/^[A-Za-z0-9_-]{16,64}$/.test(requestId)
|
||||
|| requestId == previousRequestId) throw new Error('协议确认信息不完整，请重新阅读并确认')
|
||||
previousRequestId = requestId
|
||||
}
|
||||
return validateResult(await requestJson('/auth/wechat-login', 'POST', { platform: 'mp-weixin', code, agreements }))
|
||||
}
|
||||
|
||||
export async function requestWechatBindingCode(bindingTicket: string, phone: string): Promise<boolean> {
|
||||
if (!validTicket(bindingTicket) || !validPhone(phone)) throw new Error('请重新微信登录并输入正确手机号')
|
||||
await requestJson('/auth/wechat/sms-code', 'POST', { bindingTicket, phone })
|
||||
return true
|
||||
}
|
||||
|
||||
export async function bindWechatPhone(bindingTicket: string, phone: string, code: string): Promise<UTSJSONObject> {
|
||||
if (!validTicket(bindingTicket) || !validPhone(phone) || !/^[0-9]{6}$/.test(code)) throw new Error('请核对手机号和6位验证码')
|
||||
const result = validateResult(await requestJson('/auth/wechat/bind-phone', 'POST', { bindingTicket, phone, code }))
|
||||
if (result.getString('status') != 'authenticated') throw new Error('手机号绑定尚未完成，请重新微信登录')
|
||||
return result
|
||||
}
|
||||
|
||||
export function acceptWechatSession(result: UTSJSONObject): string {
|
||||
validateResult(result)
|
||||
if (result.getString('status') != 'authenticated') throw new Error('请先完成手机号绑定')
|
||||
return acceptSession(result, result.getString('phone') ?? '')
|
||||
}
|
||||
Reference in New Issue
Block a user