feat(player): 接入创蓝短信手机注册与登录页优化
新增 SMS 验证码注册、8 国手机号选择与 Redis 频控；优化登录/注册 UI 及图形验证码样式。 Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
251
apps/player/src/components/PhoneCountrySelect.vue
Normal file
251
apps/player/src/components/PhoneCountrySelect.vue
Normal file
@@ -0,0 +1,251 @@
|
||||
<script setup lang="ts">
|
||||
import { ref, computed, onMounted, onUnmounted, watch } from 'vue';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import {
|
||||
PHONE_COUNTRIES,
|
||||
getPhoneCountryLabel,
|
||||
searchPhoneCountries,
|
||||
findPhoneCountryByIso,
|
||||
defaultPhoneIsoForLocale,
|
||||
} from '@thebet365/shared';
|
||||
|
||||
const model = defineModel<string>({ required: true });
|
||||
const { t, locale } = useI18n();
|
||||
|
||||
const open = ref(false);
|
||||
const query = ref('');
|
||||
const root = ref<HTMLElement | null>(null);
|
||||
|
||||
const options = computed(() =>
|
||||
searchPhoneCountries(query.value, locale.value).map((country) => ({
|
||||
iso: country.iso,
|
||||
dial: country.dial,
|
||||
code: `+${country.dial}`,
|
||||
name: getPhoneCountryLabel(country, locale.value),
|
||||
flag: country.flag,
|
||||
})),
|
||||
);
|
||||
|
||||
const current = computed(() => {
|
||||
const matched = findPhoneCountryByIso(model.value)
|
||||
?? PHONE_COUNTRIES.find((c) => c.dial === model.value);
|
||||
if (matched) {
|
||||
return {
|
||||
iso: matched.iso,
|
||||
code: `+${matched.dial}`,
|
||||
name: getPhoneCountryLabel(matched, locale.value),
|
||||
};
|
||||
}
|
||||
return { iso: '--', code: '+--', name: '' };
|
||||
});
|
||||
|
||||
function pick(iso: string) {
|
||||
model.value = iso;
|
||||
open.value = false;
|
||||
query.value = '';
|
||||
}
|
||||
|
||||
function toggle() {
|
||||
open.value = !open.value;
|
||||
if (open.value) query.value = '';
|
||||
}
|
||||
|
||||
function onOutsideClick(e: Event) {
|
||||
if (!root.value?.contains(e.target as Node)) {
|
||||
open.value = false;
|
||||
query.value = '';
|
||||
}
|
||||
}
|
||||
|
||||
watch(open, (isOpen) => {
|
||||
if (!isOpen) query.value = '';
|
||||
});
|
||||
|
||||
onMounted(() => {
|
||||
if (!findPhoneCountryByIso(model.value)) {
|
||||
model.value = defaultPhoneIsoForLocale(locale.value);
|
||||
}
|
||||
document.addEventListener('click', onOutsideClick);
|
||||
document.addEventListener('touchend', onOutsideClick);
|
||||
});
|
||||
onUnmounted(() => {
|
||||
document.removeEventListener('click', onOutsideClick);
|
||||
document.removeEventListener('touchend', onOutsideClick);
|
||||
});
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div ref="root" class="country-switch" :class="{ open }">
|
||||
<button
|
||||
type="button"
|
||||
class="country-trigger"
|
||||
:aria-expanded="open"
|
||||
aria-haspopup="listbox"
|
||||
:title="current.name"
|
||||
@click.stop="toggle"
|
||||
>
|
||||
<span class="country-iso">{{ current.iso }}</span>
|
||||
<span class="country-sep">·</span>
|
||||
<span class="country-dial">{{ current.code }}</span>
|
||||
</button>
|
||||
<div v-show="open" class="country-panel">
|
||||
<input
|
||||
v-model="query"
|
||||
class="country-search"
|
||||
type="search"
|
||||
:placeholder="t('auth.country_search')"
|
||||
autocomplete="off"
|
||||
@click.stop
|
||||
/>
|
||||
<ul class="country-menu" role="listbox">
|
||||
<li
|
||||
v-for="opt in options"
|
||||
:key="opt.iso"
|
||||
role="option"
|
||||
:aria-selected="model === opt.iso"
|
||||
class="country-option"
|
||||
:class="{ active: model === opt.iso }"
|
||||
@click="pick(opt.iso)"
|
||||
>
|
||||
<span class="country-iso">{{ opt.iso }}</span>
|
||||
<span class="country-dial">{{ opt.code }}</span>
|
||||
<span class="country-name">{{ opt.name }}</span>
|
||||
</li>
|
||||
<li v-if="options.length === 0" class="country-empty">{{ t('auth.country_not_found') }}</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
.country-switch {
|
||||
position: relative;
|
||||
flex: 0 0 auto;
|
||||
}
|
||||
|
||||
.country-trigger {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 3px;
|
||||
height: 36px;
|
||||
padding: 0 8px;
|
||||
border: 1px solid var(--border);
|
||||
border-radius: 6px;
|
||||
background: #0d0d0d;
|
||||
color: var(--text);
|
||||
font-family: inherit;
|
||||
font-size: 12px;
|
||||
line-height: 1;
|
||||
cursor: pointer;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.country-trigger:active {
|
||||
background: var(--bg-hover);
|
||||
}
|
||||
|
||||
.country-iso {
|
||||
font-weight: 700;
|
||||
letter-spacing: 0.03em;
|
||||
}
|
||||
|
||||
.country-sep {
|
||||
color: var(--text-muted);
|
||||
font-size: 10px;
|
||||
}
|
||||
|
||||
.country-dial {
|
||||
color: var(--text-muted);
|
||||
font-weight: 600;
|
||||
}
|
||||
|
||||
.country-panel {
|
||||
position: absolute;
|
||||
top: calc(100% + 4px);
|
||||
left: 0;
|
||||
z-index: 60;
|
||||
width: min(260px, calc(100vw - 48px));
|
||||
padding: 4px;
|
||||
background: #141414;
|
||||
border: 1px solid var(--border);
|
||||
border-radius: 6px;
|
||||
box-shadow: var(--shadow);
|
||||
}
|
||||
|
||||
.country-search {
|
||||
width: 100%;
|
||||
margin-bottom: 4px;
|
||||
padding: 6px 8px;
|
||||
border: 1px solid var(--border);
|
||||
border-radius: 4px;
|
||||
background: #0d0d0d;
|
||||
color: var(--text);
|
||||
font-size: 12px;
|
||||
font-family: inherit;
|
||||
}
|
||||
|
||||
.country-search::placeholder {
|
||||
color: rgba(255, 255, 255, 0.35);
|
||||
}
|
||||
|
||||
.country-search:focus {
|
||||
outline: none;
|
||||
border-color: #555;
|
||||
}
|
||||
|
||||
.country-menu {
|
||||
max-height: 180px;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
list-style: none;
|
||||
overflow-y: auto;
|
||||
}
|
||||
|
||||
.country-option {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 6px;
|
||||
padding: 6px 8px;
|
||||
border-radius: 4px;
|
||||
font-size: 12px;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.country-option:hover,
|
||||
.country-option.active {
|
||||
background: var(--bg-hover);
|
||||
}
|
||||
|
||||
.country-option .country-iso {
|
||||
flex-shrink: 0;
|
||||
width: 26px;
|
||||
font-weight: 700;
|
||||
color: var(--text);
|
||||
}
|
||||
|
||||
.country-option .country-dial {
|
||||
flex-shrink: 0;
|
||||
width: 38px;
|
||||
color: var(--text-muted);
|
||||
}
|
||||
|
||||
.country-name {
|
||||
min-width: 0;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
white-space: nowrap;
|
||||
color: var(--text-muted);
|
||||
}
|
||||
|
||||
.country-option:hover .country-name,
|
||||
.country-option.active .country-name {
|
||||
color: var(--text);
|
||||
}
|
||||
|
||||
.country-empty {
|
||||
padding: 10px 8px;
|
||||
color: var(--text-muted);
|
||||
font-size: 11px;
|
||||
text-align: center;
|
||||
}
|
||||
</style>
|
||||
@@ -12,6 +12,8 @@ const validated = ref(false);
|
||||
const errorMsg = ref('');
|
||||
|
||||
const CHARS = 'ABCDEFGHJKLMNPQRSTUVWXYZ23456789';
|
||||
const CANVAS_W = 96;
|
||||
const CANVAS_H = 36;
|
||||
|
||||
function generateCode() {
|
||||
let result = '';
|
||||
@@ -24,40 +26,39 @@ function generateCode() {
|
||||
function drawCaptcha() {
|
||||
const canvas = canvasRef.value;
|
||||
if (!canvas) return;
|
||||
const w = 108, h = 44;
|
||||
canvas.width = w;
|
||||
canvas.height = h;
|
||||
canvas.width = CANVAS_W;
|
||||
canvas.height = CANVAS_H;
|
||||
const ctx = canvas.getContext('2d');
|
||||
if (!ctx) return;
|
||||
|
||||
ctx.fillStyle = '#2a2210';
|
||||
ctx.fillRect(0, 0, w, h);
|
||||
ctx.fillStyle = '#0d0d0d';
|
||||
ctx.fillRect(0, 0, CANVAS_W, CANVAS_H);
|
||||
|
||||
for (let i = 0; i < 28; i++) {
|
||||
ctx.fillStyle = `rgba(212, 175, 55, ${0.1 + Math.random() * 0.2})`;
|
||||
for (let i = 0; i < 20; i++) {
|
||||
ctx.fillStyle = `rgba(255, 255, 255, ${0.03 + Math.random() * 0.06})`;
|
||||
ctx.beginPath();
|
||||
ctx.arc(Math.random() * w, Math.random() * h, Math.random() * 2.2, 0, Math.PI * 2);
|
||||
ctx.arc(Math.random() * CANVAS_W, Math.random() * CANVAS_H, Math.random() * 1.8, 0, Math.PI * 2);
|
||||
ctx.fill();
|
||||
}
|
||||
|
||||
for (let i = 0; i < 5; i++) {
|
||||
ctx.strokeStyle = `rgba(212, 175, 55, ${0.15 + Math.random() * 0.25})`;
|
||||
for (let i = 0; i < 3; i++) {
|
||||
ctx.strokeStyle = `rgba(255, 255, 255, ${0.06 + Math.random() * 0.08})`;
|
||||
ctx.lineWidth = 1;
|
||||
ctx.beginPath();
|
||||
ctx.moveTo(Math.random() * w, Math.random() * h);
|
||||
ctx.lineTo(Math.random() * w, Math.random() * h);
|
||||
ctx.moveTo(Math.random() * CANVAS_W, Math.random() * CANVAS_H);
|
||||
ctx.lineTo(Math.random() * CANVAS_W, Math.random() * CANVAS_H);
|
||||
ctx.stroke();
|
||||
}
|
||||
|
||||
const charWidth = w / (code.value.length + 1);
|
||||
const charWidth = CANVAS_W / (code.value.length + 1);
|
||||
for (let i = 0; i < code.value.length; i++) {
|
||||
ctx.save();
|
||||
const x = charWidth * (i + 0.5) + (Math.random() - 0.5) * 4;
|
||||
const y = h / 2 + (Math.random() - 0.5) * 6;
|
||||
const x = charWidth * (i + 0.5) + (Math.random() - 0.5) * 3;
|
||||
const y = CANVAS_H / 2 + (Math.random() - 0.5) * 4;
|
||||
ctx.translate(x, y);
|
||||
ctx.rotate((Math.random() - 0.5) * 0.4);
|
||||
ctx.font = `bold ${18 + Math.random() * 6}px 'Courier New', monospace`;
|
||||
ctx.fillStyle = `hsl(${40 + Math.random() * 20}, ${80 + Math.random() * 20}%, ${65 + Math.random() * 20}%)`;
|
||||
ctx.rotate((Math.random() - 0.5) * 0.35);
|
||||
ctx.font = `bold ${15 + Math.random() * 4}px 'Courier New', monospace`;
|
||||
ctx.fillStyle = `rgba(240, 216, 117, ${0.85 + Math.random() * 0.15})`;
|
||||
ctx.textAlign = 'center';
|
||||
ctx.textBaseline = 'middle';
|
||||
ctx.fillText(code.value[i], 0, 0);
|
||||
@@ -94,24 +95,58 @@ defineExpose({ validate, refresh });
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div class="captcha-row">
|
||||
<input v-model="honeypot" type="text" name="website" tabindex="-1"
|
||||
autocomplete="off" class="hp-field" aria-hidden="true" />
|
||||
<input v-model="input" type="text" maxlength="4"
|
||||
class="captcha-input" :placeholder="t('auth.captcha_placeholder')" autocomplete="off" />
|
||||
<canvas ref="canvasRef" class="captcha-canvas"
|
||||
:title="t('auth.captcha_refresh')" role="button" tabindex="0"
|
||||
@click="refresh" @keydown.enter="refresh" />
|
||||
<div class="captcha-wrap">
|
||||
<div class="captcha-row">
|
||||
<input
|
||||
v-model="honeypot"
|
||||
type="text"
|
||||
name="website"
|
||||
tabindex="-1"
|
||||
autocomplete="off"
|
||||
class="hp-field"
|
||||
aria-hidden="true"
|
||||
/>
|
||||
<input
|
||||
v-model="input"
|
||||
type="text"
|
||||
maxlength="4"
|
||||
class="captcha-input"
|
||||
:placeholder="t('auth.captcha_placeholder')"
|
||||
autocomplete="off"
|
||||
/>
|
||||
<canvas
|
||||
ref="canvasRef"
|
||||
class="captcha-canvas"
|
||||
:width="CANVAS_W"
|
||||
:height="CANVAS_H"
|
||||
:title="t('auth.captcha_refresh')"
|
||||
role="button"
|
||||
tabindex="0"
|
||||
@click="refresh"
|
||||
@keydown.enter="refresh"
|
||||
/>
|
||||
</div>
|
||||
<p v-if="errorMsg" class="captcha-error">{{ errorMsg }}</p>
|
||||
</div>
|
||||
<p v-if="errorMsg" class="captcha-error">{{ errorMsg }}</p>
|
||||
</template>
|
||||
|
||||
<style scoped>
|
||||
.captcha-wrap {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.captcha-row {
|
||||
display: flex;
|
||||
gap: 0;
|
||||
align-items: stretch;
|
||||
height: 44px;
|
||||
height: 36px;
|
||||
border: 1px solid var(--border);
|
||||
border-radius: 6px;
|
||||
background: #0d0d0d;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.captcha-row:focus-within {
|
||||
border-color: #555;
|
||||
}
|
||||
|
||||
.hp-field {
|
||||
@@ -126,40 +161,33 @@ defineExpose({ validate, refresh });
|
||||
.captcha-input {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
padding: 0 14px;
|
||||
border: 1px solid var(--border);
|
||||
border-right: none;
|
||||
border-radius: 8px 0 0 8px;
|
||||
background: #1a1a1a;
|
||||
color: #fff;
|
||||
font-size: 15px;
|
||||
padding: 0 10px;
|
||||
border: none;
|
||||
background: transparent;
|
||||
color: var(--text);
|
||||
font-size: 14px;
|
||||
font-weight: 700;
|
||||
letter-spacing: 0.15em;
|
||||
letter-spacing: 0.12em;
|
||||
text-transform: uppercase;
|
||||
outline: none;
|
||||
text-align: center;
|
||||
font-family: inherit;
|
||||
}
|
||||
|
||||
.captcha-input::placeholder {
|
||||
color: var(--text-muted);
|
||||
color: rgba(255, 255, 255, 0.32);
|
||||
font-weight: 600;
|
||||
letter-spacing: 0.02em;
|
||||
text-transform: none;
|
||||
}
|
||||
|
||||
.captcha-input:focus {
|
||||
border-color: var(--primary-light);
|
||||
}
|
||||
|
||||
.captcha-canvas {
|
||||
flex-shrink: 0;
|
||||
width: 108px;
|
||||
height: 44px;
|
||||
width: 96px;
|
||||
height: 36px;
|
||||
cursor: pointer;
|
||||
display: block;
|
||||
border-radius: 0 8px 8px 0;
|
||||
border: 1px solid var(--border);
|
||||
border-left: none;
|
||||
border: none;
|
||||
border-left: 1px solid var(--border);
|
||||
}
|
||||
|
||||
.captcha-error {
|
||||
|
||||
63
apps/player/src/composables/useSmsCode.ts
Normal file
63
apps/player/src/composables/useSmsCode.ts
Normal file
@@ -0,0 +1,63 @@
|
||||
import { ref, onUnmounted } from 'vue';
|
||||
import api from '../api';
|
||||
|
||||
const COOLDOWN_SECONDS = 60;
|
||||
|
||||
export function useSmsCode() {
|
||||
const sessionId = ref<string | null>(null);
|
||||
const countdown = ref(0);
|
||||
const sending = ref(false);
|
||||
const error = ref<string | null>(null);
|
||||
let timer: ReturnType<typeof setInterval> | null = null;
|
||||
|
||||
function clearTimer() {
|
||||
if (timer) {
|
||||
clearInterval(timer);
|
||||
timer = null;
|
||||
}
|
||||
}
|
||||
|
||||
function startCountdown() {
|
||||
clearTimer();
|
||||
countdown.value = COOLDOWN_SECONDS;
|
||||
timer = setInterval(() => {
|
||||
if (countdown.value <= 1) {
|
||||
clearTimer();
|
||||
countdown.value = 0;
|
||||
} else {
|
||||
countdown.value -= 1;
|
||||
}
|
||||
}, 1000);
|
||||
}
|
||||
|
||||
async function send(phone: string, countryCode: string) {
|
||||
if (countdown.value > 0 || sending.value) return;
|
||||
const trimmed = phone.trim();
|
||||
const dial = countryCode.replace(/\D/g, '');
|
||||
if (!trimmed || !dial) {
|
||||
error.value = 'phone_required';
|
||||
return;
|
||||
}
|
||||
sending.value = true;
|
||||
error.value = null;
|
||||
try {
|
||||
const locale = localStorage.getItem('locale') || 'zh-CN';
|
||||
const { data } = await api.post('/player/sms/send', {
|
||||
phone: trimmed,
|
||||
countryCode: dial,
|
||||
locale,
|
||||
});
|
||||
sessionId.value = data.data.sessionId;
|
||||
startCountdown();
|
||||
} catch (e: unknown) {
|
||||
const msg = (e as { response?: { data?: { error?: string } } })?.response?.data?.error;
|
||||
error.value = msg || 'send_failed';
|
||||
} finally {
|
||||
sending.value = false;
|
||||
}
|
||||
}
|
||||
|
||||
onUnmounted(clearTimer);
|
||||
|
||||
return { sessionId, countdown, sending, error, send };
|
||||
}
|
||||
@@ -93,9 +93,28 @@ const i18n = createI18n({
|
||||
register_failed: '注册失败，请重试',
|
||||
continue_browsing: '暂不登录',
|
||||
username_placeholder: '请输入账号',
|
||||
login_account: '手机号 / 账号',
|
||||
login_account_placeholder: '本地号码或账号',
|
||||
login_username_placeholder: '手机号（含区号）或账号',
|
||||
confirm_password: '确认密码',
|
||||
password_mismatch: '两次密码不一致',
|
||||
password_placeholder: '请输入密码',
|
||||
login_btn: '登录',
|
||||
login_failed: '登录失败，请重试',
|
||||
phone: '手机号',
|
||||
phone_placeholder: '请输入手机号',
|
||||
phone_local_placeholder: '请输入手机号',
|
||||
phone_required: '请填写手机号',
|
||||
phone_invalid: '手机号格式无效，请检查位数与号码',
|
||||
phone_country_unsupported: '暂不支持该国家/地区',
|
||||
sms_code: '短信验证码',
|
||||
sms_code_placeholder: '6 位验证码',
|
||||
sms_code_required: '请填写短信验证码',
|
||||
sms_required: '请先获取短信验证码',
|
||||
send_sms: '获取验证码',
|
||||
resend_sms: '{sec}s 后重试',
|
||||
country_search: '搜索国家或区号',
|
||||
country_not_found: '未找到匹配国家',
|
||||
},
|
||||
support: {
|
||||
short: '客服',
|
||||
@@ -476,9 +495,28 @@ const i18n = createI18n({
|
||||
register_failed: 'Registration failed, please try again',
|
||||
continue_browsing: 'Skip login',
|
||||
username_placeholder: 'Enter username',
|
||||
login_account: 'Phone / Username',
|
||||
login_account_placeholder: 'Local number or username',
|
||||
login_username_placeholder: 'Registered phone (with country code) or username',
|
||||
confirm_password: 'Confirm password',
|
||||
password_mismatch: 'Passwords do not match',
|
||||
password_placeholder: 'Enter password',
|
||||
login_btn: 'Log In',
|
||||
login_failed: 'Login failed, please try again',
|
||||
phone: 'Phone',
|
||||
phone_placeholder: 'Enter phone number',
|
||||
phone_local_placeholder: 'Enter phone number',
|
||||
phone_required: 'Phone number is required',
|
||||
phone_invalid: 'Invalid phone number format',
|
||||
phone_country_unsupported: 'This country or region is not supported',
|
||||
sms_code: 'SMS Code',
|
||||
sms_code_placeholder: '6-digit code',
|
||||
sms_code_required: 'Please enter the SMS code',
|
||||
sms_required: 'Please request an SMS code first',
|
||||
send_sms: 'Get Code',
|
||||
resend_sms: 'Retry in {sec}s',
|
||||
country_search: 'Search country or code',
|
||||
country_not_found: 'No matching country',
|
||||
},
|
||||
support: {
|
||||
short: 'Support',
|
||||
@@ -865,9 +903,28 @@ const i18n = createI18n({
|
||||
register_failed: 'Pendaftaran gagal, sila cuba lagi',
|
||||
continue_browsing: 'Langkau log masuk',
|
||||
username_placeholder: 'Masukkan nama pengguna',
|
||||
login_account: 'Telefon / Akaun',
|
||||
login_account_placeholder: 'Nombor tempatan atau akaun',
|
||||
login_username_placeholder: 'Telefon berdaftar (dengan kod negara) atau akaun',
|
||||
confirm_password: 'Sahkan kata laluan',
|
||||
password_mismatch: 'Kata laluan tidak sepadan',
|
||||
password_placeholder: 'Masukkan kata laluan',
|
||||
login_btn: 'Log Masuk',
|
||||
login_failed: 'Log masuk gagal, sila cuba lagi',
|
||||
phone: 'Telefon',
|
||||
phone_placeholder: 'Masukkan nombor telefon',
|
||||
phone_local_placeholder: 'Masukkan nombor telefon',
|
||||
phone_required: 'Nombor telefon diperlukan',
|
||||
phone_invalid: 'Format nombor telefon tidak sah',
|
||||
phone_country_unsupported: 'Negara atau wilayah ini tidak disokong',
|
||||
sms_code: 'Kod SMS',
|
||||
sms_code_placeholder: 'Kod 6 digit',
|
||||
sms_code_required: 'Sila masukkan kod SMS',
|
||||
sms_required: 'Sila minta kod SMS dahulu',
|
||||
send_sms: 'Dapatkan Kod',
|
||||
resend_sms: 'Cuba lagi dalam {sec}s',
|
||||
country_search: 'Cari negara atau kod',
|
||||
country_not_found: 'Tiada negara sepadan',
|
||||
},
|
||||
support: {
|
||||
short: 'Sokongan',
|
||||
|
||||
@@ -20,8 +20,13 @@ export const useAuthStore = defineStore('auth', () => {
|
||||
loginPromptVisible.value = false;
|
||||
}
|
||||
|
||||
async function login(username: string, password: string) {
|
||||
const { data } = await api.post('/player/auth/login', { username, password });
|
||||
async function login(username: string, password: string, countryCode?: string) {
|
||||
const dial = countryCode?.replace(/\D/g, '');
|
||||
const { data } = await api.post('/player/auth/login', {
|
||||
username,
|
||||
password,
|
||||
...(dial ? { countryCode: dial } : {}),
|
||||
});
|
||||
token.value = data.data.token;
|
||||
user.value = data.data.user;
|
||||
localStorage.setItem('token', token.value);
|
||||
@@ -32,12 +37,23 @@ export const useAuthStore = defineStore('auth', () => {
|
||||
return returnTo;
|
||||
}
|
||||
|
||||
async function register(username: string, password: string, inviteCode?: string) {
|
||||
async function register(
|
||||
phone: string,
|
||||
countryCode: string,
|
||||
password: string,
|
||||
smsCode: string,
|
||||
sessionId: string,
|
||||
inviteCode?: string,
|
||||
) {
|
||||
const locale = localStorage.getItem('locale') || 'zh-CN';
|
||||
const code = inviteCode?.trim();
|
||||
const dial = countryCode.replace(/\D/g, '');
|
||||
const { data } = await api.post('/player/auth/register', {
|
||||
username,
|
||||
phone,
|
||||
countryCode: dial,
|
||||
password,
|
||||
smsCode,
|
||||
sessionId,
|
||||
locale,
|
||||
...(code ? { inviteCode: code } : {}),
|
||||
});
|
||||
|
||||
@@ -79,6 +79,11 @@
|
||||
background: #0d0d0d !important;
|
||||
border: 1px solid var(--border) !important;
|
||||
box-shadow: none;
|
||||
color: var(--text);
|
||||
}
|
||||
|
||||
.ps-gold-input::placeholder {
|
||||
color: rgba(255, 255, 255, 0.35);
|
||||
}
|
||||
|
||||
.ps-gold-input:focus {
|
||||
|
||||
@@ -66,10 +66,20 @@ function goRegister() {
|
||||
<LocaleSwitcher compact />
|
||||
</div>
|
||||
<form @submit.prevent="submit" class="login-form ps-gold-frame">
|
||||
<label>{{ t('auth.username') }}</label>
|
||||
<input v-model="username" class="ps-gold-input" required />
|
||||
<label>{{ t('auth.password') }}</label>
|
||||
<input v-model="password" class="ps-gold-input" type="password" required />
|
||||
<div class="field">
|
||||
<label>{{ t('auth.username') }}</label>
|
||||
<input
|
||||
v-model="username"
|
||||
class="field-input"
|
||||
required
|
||||
autocomplete="username"
|
||||
:placeholder="t('auth.login_username_placeholder')"
|
||||
/>
|
||||
</div>
|
||||
<div class="field">
|
||||
<label>{{ t('auth.password') }}</label>
|
||||
<input v-model="password" class="field-input" type="password" required />
|
||||
</div>
|
||||
<RobotVerify ref="captchaRef" />
|
||||
<p v-if="error" class="error">{{ error }}</p>
|
||||
<button type="submit" class="btn-login btn-gold-outline" :disabled="loading">
|
||||
@@ -111,11 +121,45 @@ function goRegister() {
|
||||
|
||||
.login-form {
|
||||
width: 100%;
|
||||
max-width: 340px;
|
||||
max-width: 320px;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 10px;
|
||||
padding: 14px;
|
||||
gap: 8px;
|
||||
padding: 12px;
|
||||
}
|
||||
|
||||
.field {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 4px;
|
||||
}
|
||||
|
||||
.field-input {
|
||||
width: 100%;
|
||||
height: 36px;
|
||||
padding: 0 10px;
|
||||
border: 1px solid var(--border);
|
||||
border-radius: 6px;
|
||||
background: #0d0d0d;
|
||||
color: var(--text);
|
||||
font-size: 14px;
|
||||
font-family: inherit;
|
||||
}
|
||||
|
||||
.field-input:focus {
|
||||
outline: none;
|
||||
border-color: #555;
|
||||
}
|
||||
|
||||
.inline-row {
|
||||
display: flex;
|
||||
gap: 6px;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.inline-row .field-input {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
label {
|
||||
|
||||
@@ -2,34 +2,59 @@
|
||||
import { ref } from 'vue';
|
||||
import { useRoute, useRouter } from 'vue-router';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
import { defaultPhoneIsoForLocale, getPhoneDialFromIso } from '@thebet365/shared';
|
||||
import { useAuthStore } from '../stores/auth';
|
||||
import { useAppLocale } from '../composables/useAppLocale';
|
||||
import { useSmsCode } from '../composables/useSmsCode';
|
||||
import LocaleSwitcher from '../components/LocaleSwitcher.vue';
|
||||
import RobotVerify from '../components/RobotVerify.vue';
|
||||
import PhoneCountrySelect from '../components/PhoneCountrySelect.vue';
|
||||
import loginBg from '../assets/images/h5bg.png';
|
||||
|
||||
const { t } = useI18n();
|
||||
const { t, locale } = useI18n();
|
||||
const { initFromUser } = useAppLocale();
|
||||
const auth = useAuthStore();
|
||||
const router = useRouter();
|
||||
const route = useRoute();
|
||||
const captchaRef = ref<InstanceType<typeof RobotVerify> | null>(null);
|
||||
const username = ref('');
|
||||
|
||||
const phone = ref('');
|
||||
const countryIso = ref(defaultPhoneIsoForLocale(locale.value));
|
||||
const password = ref('');
|
||||
const confirmPassword = ref('');
|
||||
const smsCode = ref('');
|
||||
const inviteCode = ref(typeof route.query.code === 'string' ? route.query.code : '');
|
||||
const error = ref('');
|
||||
const loading = ref(false);
|
||||
|
||||
const { sessionId, countdown, sending, error: smsError, send } = useSmsCode();
|
||||
|
||||
async function sendCode() {
|
||||
await send(phone.value, getPhoneDialFromIso(countryIso.value));
|
||||
}
|
||||
|
||||
async function submit() {
|
||||
if (!captchaRef.value?.validate()) {
|
||||
error.value = t('auth.captcha_wrong');
|
||||
captchaRef.value?.refresh();
|
||||
if (!sessionId.value) {
|
||||
error.value = t('auth.sms_required');
|
||||
return;
|
||||
}
|
||||
if (!smsCode.value.trim()) {
|
||||
error.value = t('auth.sms_code_required');
|
||||
return;
|
||||
}
|
||||
if (password.value !== confirmPassword.value) {
|
||||
error.value = t('auth.password_mismatch');
|
||||
return;
|
||||
}
|
||||
loading.value = true;
|
||||
error.value = '';
|
||||
try {
|
||||
await auth.register(username.value, password.value, inviteCode.value);
|
||||
await auth.register(
|
||||
phone.value,
|
||||
getPhoneDialFromIso(countryIso.value),
|
||||
password.value,
|
||||
smsCode.value,
|
||||
sessionId.value,
|
||||
inviteCode.value,
|
||||
);
|
||||
initFromUser(auth.user?.locale);
|
||||
const redirectTo = (route.query.redirect as string) || '/';
|
||||
router.push(redirectTo);
|
||||
@@ -43,6 +68,25 @@ async function submit() {
|
||||
function goLogin() {
|
||||
router.push({ path: '/login', query: route.query.redirect ? { redirect: route.query.redirect as string } : {} });
|
||||
}
|
||||
|
||||
function isGuestBrowsablePath(path: string): boolean {
|
||||
if (!path || path === '/' || path === '/bet') return true;
|
||||
if (path.startsWith('/match/')) return true;
|
||||
return false;
|
||||
}
|
||||
|
||||
function continueBrowsing() {
|
||||
const redirect = typeof route.query.redirect === 'string' ? route.query.redirect : '';
|
||||
const target = isGuestBrowsablePath(redirect) ? redirect || '/' : '/';
|
||||
router.replace(target);
|
||||
}
|
||||
|
||||
const fieldError = () => {
|
||||
if (error.value) return error.value;
|
||||
if (smsError.value === 'phone_required') return t('auth.phone_required');
|
||||
if (smsError.value) return smsError.value;
|
||||
return '';
|
||||
};
|
||||
</script>
|
||||
|
||||
<template>
|
||||
@@ -52,14 +96,61 @@ function goLogin() {
|
||||
</div>
|
||||
<form @submit.prevent="submit" class="login-form ps-gold-frame">
|
||||
<h2 class="form-title">{{ t('auth.register') }}</h2>
|
||||
<label>{{ t('auth.invite_code') }} <span class="optional-tag">{{ t('auth.optional') }}</span></label>
|
||||
<input v-model="inviteCode" class="ps-gold-input" autocomplete="off" />
|
||||
<label>{{ t('auth.username') }}</label>
|
||||
<input v-model="username" class="ps-gold-input" required autocomplete="username" />
|
||||
<label>{{ t('auth.password') }}</label>
|
||||
<input v-model="password" class="ps-gold-input" type="password" required autocomplete="new-password" minlength="8" />
|
||||
<RobotVerify ref="captchaRef" />
|
||||
<p v-if="error" class="error">{{ error }}</p>
|
||||
|
||||
<div class="field">
|
||||
<label>{{ t('auth.phone') }}</label>
|
||||
<div class="inline-row">
|
||||
<PhoneCountrySelect v-model="countryIso" />
|
||||
<input
|
||||
v-model="phone"
|
||||
class="field-input"
|
||||
type="tel"
|
||||
required
|
||||
autocomplete="tel-national"
|
||||
:placeholder="t('auth.phone_local_placeholder')"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="field">
|
||||
<label>{{ t('auth.sms_code') }}</label>
|
||||
<div class="inline-row">
|
||||
<input
|
||||
v-model="smsCode"
|
||||
class="field-input"
|
||||
inputmode="numeric"
|
||||
maxlength="6"
|
||||
autocomplete="one-time-code"
|
||||
:placeholder="t('auth.sms_code_placeholder')"
|
||||
/>
|
||||
<button
|
||||
type="button"
|
||||
class="btn-secondary"
|
||||
:disabled="sending || countdown > 0 || !phone.trim()"
|
||||
@click="sendCode"
|
||||
>
|
||||
{{ countdown > 0 ? `${countdown}s` : t('auth.send_sms') }}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="field">
|
||||
<label>{{ t('auth.password') }}</label>
|
||||
<input v-model="password" class="field-input" type="password" required autocomplete="new-password" minlength="8" />
|
||||
</div>
|
||||
|
||||
<div class="field">
|
||||
<label>{{ t('auth.confirm_password') }}</label>
|
||||
<input v-model="confirmPassword" class="field-input" type="password" required autocomplete="new-password" minlength="8" />
|
||||
</div>
|
||||
|
||||
<div class="field field-optional">
|
||||
<label>{{ t('auth.invite_code') }} <span class="optional-tag">{{ t('auth.optional') }}</span></label>
|
||||
<input v-model="inviteCode" class="field-input" autocomplete="off" />
|
||||
</div>
|
||||
|
||||
<p v-if="fieldError()" class="error">{{ fieldError() }}</p>
|
||||
|
||||
<button type="submit" class="btn-login btn-gold-outline" :disabled="loading">
|
||||
{{ t('auth.register_btn') }}
|
||||
</button>
|
||||
@@ -67,6 +158,9 @@ function goLogin() {
|
||||
{{ t('auth.have_account') }}
|
||||
</button>
|
||||
</form>
|
||||
<button type="button" class="btn-skip-light" @click="continueBrowsing">
|
||||
{{ t('auth.continue_browsing') }}
|
||||
</button>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -87,7 +181,7 @@ function goLogin() {
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: flex-end;
|
||||
padding: 28vh 20px calc(12vh + max(28px, env(safe-area-inset-bottom)));
|
||||
padding: 30vh 16px calc(10vh + max(20px, env(safe-area-inset-bottom)));
|
||||
background-color: var(--tertiary);
|
||||
background-size: cover;
|
||||
background-position: center top;
|
||||
@@ -96,41 +190,101 @@ function goLogin() {
|
||||
|
||||
.login-form {
|
||||
width: 100%;
|
||||
max-width: 340px;
|
||||
max-width: 320px;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 10px;
|
||||
padding: 14px;
|
||||
gap: 8px;
|
||||
padding: 12px;
|
||||
}
|
||||
|
||||
.form-title {
|
||||
margin: 0 0 4px;
|
||||
font-size: 18px;
|
||||
margin: 0 0 2px;
|
||||
font-size: 16px;
|
||||
font-weight: 800;
|
||||
color: #fff;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.optional-tag {
|
||||
font-size: 10px;
|
||||
font-weight: 500;
|
||||
color: rgba(255, 255, 255, 0.45);
|
||||
.field {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 4px;
|
||||
}
|
||||
|
||||
.field-optional {
|
||||
opacity: 0.85;
|
||||
}
|
||||
|
||||
label {
|
||||
font-size: 11px;
|
||||
font-size: 10px;
|
||||
color: var(--text-muted);
|
||||
font-weight: 600;
|
||||
letter-spacing: 0.04em;
|
||||
letter-spacing: 0.03em;
|
||||
}
|
||||
|
||||
.optional-tag {
|
||||
font-size: 10px;
|
||||
font-weight: 500;
|
||||
color: rgba(255, 255, 255, 0.4);
|
||||
}
|
||||
|
||||
.field-input {
|
||||
width: 100%;
|
||||
height: 36px;
|
||||
padding: 0 10px;
|
||||
border: 1px solid var(--border);
|
||||
border-radius: 6px;
|
||||
background: #0d0d0d;
|
||||
color: var(--text);
|
||||
font-size: 14px;
|
||||
font-family: inherit;
|
||||
}
|
||||
|
||||
.field-input::placeholder {
|
||||
color: rgba(255, 255, 255, 0.32);
|
||||
}
|
||||
|
||||
.field-input:focus {
|
||||
outline: none;
|
||||
border-color: #555;
|
||||
}
|
||||
|
||||
.inline-row {
|
||||
display: flex;
|
||||
gap: 6px;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.inline-row .field-input {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.btn-secondary {
|
||||
flex-shrink: 0;
|
||||
height: 36px;
|
||||
padding: 0 10px;
|
||||
border: 1px solid var(--border);
|
||||
border-radius: 6px;
|
||||
background: #141414;
|
||||
color: var(--text);
|
||||
font-size: 11px;
|
||||
font-weight: 600;
|
||||
white-space: nowrap;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.btn-secondary:disabled {
|
||||
opacity: 0.45;
|
||||
cursor: not-allowed;
|
||||
}
|
||||
|
||||
.btn-login {
|
||||
margin-top: 4px;
|
||||
padding: 10px 14px;
|
||||
margin-top: 2px;
|
||||
padding: 9px 12px;
|
||||
border-radius: 6px;
|
||||
font-size: 14px;
|
||||
font-weight: 800;
|
||||
letter-spacing: 0.06em;
|
||||
}
|
||||
|
||||
.btn-login:disabled {
|
||||
@@ -153,9 +307,30 @@ label {
|
||||
color: rgba(255, 255, 255, 0.75);
|
||||
}
|
||||
|
||||
.error {
|
||||
color: var(--danger);
|
||||
.btn-skip-light {
|
||||
position: absolute;
|
||||
bottom: calc(20px + env(safe-area-inset-bottom));
|
||||
left: 50%;
|
||||
transform: translateX(-50%);
|
||||
padding: 8px 16px;
|
||||
border: none;
|
||||
background: transparent;
|
||||
color: rgba(255, 255, 255, 0.45);
|
||||
font-size: 13px;
|
||||
font-weight: 300;
|
||||
cursor: pointer;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.btn-skip-light:active {
|
||||
color: rgba(255, 255, 255, 0.65);
|
||||
}
|
||||
|
||||
.error {
|
||||
margin: 0;
|
||||
color: var(--danger);
|
||||
font-size: 12px;
|
||||
font-weight: 600;
|
||||
line-height: 1.3;
|
||||
}
|
||||
</style>
|
||||
|
||||
Reference in New Issue
Block a user