优化
This commit is contained in:
yzy committed
1 parent
01af5542b8
commit
a4e01d96b8
1 file changed
+249
-240
+249
-240
@@ -5,276 +5,285 @@ import { useUserStore } from '@/store/user.js';
|
||||
|
||||
const userStore = useUserStore();
|
||||
|
||||
// 注册相关变量
|
||||
const registerEmail = ref(''); // 注册邮箱
|
||||
const registerPassword = ref(''); // 注册密码
|
||||
const confirmPassword = ref(''); // 确认密码
|
||||
const verificationCode = ref(''); // 验证码
|
||||
const codeBtnText = ref('获取验证码');
|
||||
const codeBtnDisabled = ref(false);
|
||||
const checked = ref(true); // 同意条款，默认勾选
|
||||
let countdownTimer = null;
|
||||
// Registration related variables
|
||||
const registerEmail = ref(''); // Email for registration
|
||||
const registerPassword = ref(''); // Password for registration
|
||||
const confirmPassword = ref(''); // Confirm password
|
||||
const verificationCode = ref(''); // Verification code
|
||||
const codeBtnText = ref('Get Code');
|
||||
const codeBtnDisabled = ref(false);
|
||||
const checked = ref(true); // Agree to terms, default checked
|
||||
let countdownTimer = null;
|
||||
|
||||
// 邮箱格式验证
|
||||
const validateEmail = (email) => {
|
||||
const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
|
||||
return emailRegex.test(email);
|
||||
};
|
||||
// Email format validation
|
||||
const validateEmail = (email) => {
|
||||
const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
|
||||
return emailRegex.test(email);
|
||||
};
|
||||
|
||||
// 同意条款切换
|
||||
const onChange = (e) => {
|
||||
checked.value = e.detail.value; // 更新checked值
|
||||
};
|
||||
// Toggle agreement to terms
|
||||
const onChange = (e) => {
|
||||
checked.value = e.detail.value; // Update checked value
|
||||
};
|
||||
|
||||
// 显示用户协议
|
||||
const showAgreement = () => {
|
||||
uni.showModal({
|
||||
title: '用户协议',
|
||||
content: '欢迎使用我们的服务！\n\n本协议规定了您使用我们服务的条款和条件，请仔细阅读。\n\n1. 服务使用条款\n2. 隐私政策\n3. 账户安全\n4. 免责声明\n\n继续使用即表示您同意遵守这些条款。',
|
||||
showCancel: true,
|
||||
confirmText: '同意',
|
||||
cancelText: '取消',
|
||||
success: (res) => {
|
||||
if (res.confirm) {
|
||||
checked.value = true;
|
||||
}
|
||||
}
|
||||
});
|
||||
};
|
||||
const showAgreement = () => {
|
||||
uni.showModal({
|
||||
title: 'User Agreement',
|
||||
content: 'Welcome to our service!\n\nThis agreement sets forth the terms and conditions for your use of our services, please read carefully.\n\n1. Terms of Service\n2. Privacy Policy\n3. Account Security\n4. Disclaimer\n\nContinuing to use means you agree to comply with these terms.',
|
||||
showCancel: true,
|
||||
confirmText: 'Agree',
|
||||
cancelText: 'Cancel',
|
||||
success: (res) => {
|
||||
if (res.confirm) {
|
||||
checked.value = true;
|
||||
}
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
// 获取验证码
|
||||
const getVerificationCode = async () => {
|
||||
if (!registerEmail.value) {
|
||||
uni.showToast({
|
||||
title: '请输入邮箱',
|
||||
icon: 'none',
|
||||
});
|
||||
return;
|
||||
}
|
||||
const getVerificationCode = async () => {
|
||||
if (!registerEmail.value) {
|
||||
uni.showToast({
|
||||
title: 'Please enter email',
|
||||
icon: 'none',
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
if (!validateEmail(registerEmail.value)) {
|
||||
uni.showToast({
|
||||
title: '请输入正确的邮箱',
|
||||
icon: 'none',
|
||||
});
|
||||
return;
|
||||
}
|
||||
if (!validateEmail(registerEmail.value)) {
|
||||
uni.showToast({
|
||||
title: 'Please enter a valid email',
|
||||
icon: 'none',
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
// 发送验证码
|
||||
try {
|
||||
uni.showLoading({
|
||||
title: '发送中...',
|
||||
mask: true,
|
||||
});
|
||||
// Send verification code
|
||||
try {
|
||||
uni.showLoading({
|
||||
title: 'Sending...',
|
||||
mask: true,
|
||||
});
|
||||
|
||||
const params = {
|
||||
email: registerEmail.value,
|
||||
register: true
|
||||
};
|
||||
const params = {
|
||||
email: registerEmail.value,
|
||||
register: true
|
||||
};
|
||||
|
||||
const res = await sendCodeToEmail(params);
|
||||
const res = await sendCodeToEmail(params);
|
||||
|
||||
if (res && res.code === 0) {
|
||||
uni.hideLoading();
|
||||
uni.showToast({
|
||||
title: '验证码已发送',
|
||||
icon: 'success',
|
||||
});
|
||||
if (res && res.code === 0) {
|
||||
uni.hideLoading();
|
||||
uni.showToast({
|
||||
title: 'Verification code sent',
|
||||
icon: 'success',
|
||||
});
|
||||
|
||||
// 开始倒计时
|
||||
let timeLeft = 60;
|
||||
codeBtnDisabled.value = true;
|
||||
codeBtnText.value = `${timeLeft}秒`;
|
||||
// Start countdown
|
||||
let timeLeft = 60;
|
||||
codeBtnDisabled.value = true;
|
||||
codeBtnText.value = `${timeLeft}s`;
|
||||
|
||||
countdownTimer = setInterval(() => {
|
||||
timeLeft--;
|
||||
codeBtnText.value = `${timeLeft}秒`;
|
||||
countdownTimer = setInterval(() => {
|
||||
timeLeft--;
|
||||
codeBtnText.value = `${timeLeft}s`;
|
||||
|
||||
if (timeLeft <= 0) {
|
||||
clearInterval(countdownTimer);
|
||||
codeBtnText.value = '重新获取';
|
||||
codeBtnDisabled.value = false;
|
||||
}
|
||||
}, 1000);
|
||||
} else {
|
||||
uni.hideLoading();
|
||||
uni.showToast({
|
||||
title: res.msg || '发送失败',
|
||||
icon: 'error',
|
||||
});
|
||||
}
|
||||
} catch (error) {
|
||||
uni.hideLoading();
|
||||
uni.showToast({
|
||||
title: error.message || '发送失败，请重试',
|
||||
icon: 'error',
|
||||
});
|
||||
}
|
||||
};
|
||||
if (timeLeft <= 0) {
|
||||
clearInterval(countdownTimer);
|
||||
codeBtnText.value = 'Resend';
|
||||
codeBtnDisabled.value = false;
|
||||
}
|
||||
}, 1000);
|
||||
} else {
|
||||
uni.hideLoading();
|
||||
uni.showToast({
|
||||
title: res.msg || 'Send failed',
|
||||
icon: 'error',
|
||||
});
|
||||
}
|
||||
} catch (error) {
|
||||
uni.hideLoading();
|
||||
uni.showToast({
|
||||
title: error.message || 'Send failed, please try again',
|
||||
icon: 'error',
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
// 注册提交
|
||||
const onRegister = async () => {
|
||||
if (!registerEmail.value) {
|
||||
uni.showToast({
|
||||
title: '请输入邮箱',
|
||||
icon: 'none',
|
||||
});
|
||||
return;
|
||||
}
|
||||
const onRegister = async () => {
|
||||
if (!registerEmail.value) {
|
||||
uni.showToast({
|
||||
title: 'Please enter email',
|
||||
icon: 'none',
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
if (!validateEmail(registerEmail.value)) {
|
||||
uni.showToast({
|
||||
title: '请输入正确的邮箱',
|
||||
icon: 'none',
|
||||
});
|
||||
return;
|
||||
}
|
||||
if (!validateEmail(registerEmail.value)) {
|
||||
uni.showToast({
|
||||
title: 'Please enter a valid email',
|
||||
icon: 'none',
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
if (!verificationCode.value) {
|
||||
uni.showToast({
|
||||
title: '请输入验证码',
|
||||
icon: 'none',
|
||||
});
|
||||
return;
|
||||
}
|
||||
if (!verificationCode.value) {
|
||||
uni.showToast({
|
||||
title: 'Please enter verification code',
|
||||
icon: 'none',
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
if (!registerPassword.value) {
|
||||
uni.showToast({
|
||||
title: '请输入密码',
|
||||
icon: 'none',
|
||||
});
|
||||
return;
|
||||
}
|
||||
if (!registerPassword.value) {
|
||||
uni.showToast({
|
||||
title: 'Please enter password',
|
||||
icon: 'none',
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
if (registerPassword.value !== confirmPassword.value) {
|
||||
uni.showToast({
|
||||
title: '两次输入密码不一致',
|
||||
icon: 'none',
|
||||
});
|
||||
return;
|
||||
}
|
||||
if (registerPassword.value !== confirmPassword.value) {
|
||||
uni.showToast({
|
||||
title: 'Passwords do not match',
|
||||
icon: 'none',
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
if (registerPassword.value.length < 6) {
|
||||
uni.showToast({
|
||||
title: '密码至少6位',
|
||||
icon: 'none',
|
||||
});
|
||||
return;
|
||||
}
|
||||
if (registerPassword.value.length < 6) {
|
||||
uni.showToast({
|
||||
title: 'Password must be at least 6 characters',
|
||||
icon: 'none',
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
if (!checked.value) {
|
||||
uni.showToast({
|
||||
title: '请先同意用户协议',
|
||||
icon: 'none',
|
||||
duration: 2000,
|
||||
});
|
||||
return;
|
||||
}
|
||||
if (!checked.value) {
|
||||
uni.showToast({
|
||||
title: 'Please agree to the user agreement',
|
||||
icon: 'none',
|
||||
duration: 2000,
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
uni.showLoading({
|
||||
title: '注册中...',
|
||||
mask: true,
|
||||
});
|
||||
try {
|
||||
uni.showLoading({
|
||||
title: 'Registering...',
|
||||
mask: true,
|
||||
});
|
||||
|
||||
// 调用注册API
|
||||
const registerParams = {
|
||||
email: registerEmail.value,
|
||||
verificationCode: verificationCode.value,
|
||||
password: registerPassword.value,
|
||||
confirmPassword: confirmPassword.value
|
||||
};
|
||||
// Call registration API
|
||||
const registerParams = {
|
||||
email: registerEmail.value,
|
||||
verificationCode: verificationCode.value,
|
||||
password: registerPassword.value,
|
||||
confirmPassword: confirmPassword.value
|
||||
};
|
||||
|
||||
const res = await register(registerParams);
|
||||
const res = await register(registerParams);
|
||||
|
||||
if (res && res.code === 0) {
|
||||
uni.hideLoading();
|
||||
uni.showToast({
|
||||
title: '注册成功',
|
||||
icon: 'success',
|
||||
});
|
||||
if (res && res.code === 0) {
|
||||
uni.hideLoading();
|
||||
uni.showToast({
|
||||
title: 'Registration successful',
|
||||
icon: 'success',
|
||||
});
|
||||
|
||||
// 注册成功后自动登录
|
||||
setTimeout(async () => {
|
||||
try {
|
||||
const loginRes = await loginByEmail({
|
||||
email: registerEmail.value,
|
||||
password: registerPassword.value
|
||||
});
|
||||
// Auto login after successful registration
|
||||
setTimeout(async () => {
|
||||
try {
|
||||
const loginRes = await loginByEmail({
|
||||
email: registerEmail.value,
|
||||
password: registerPassword.value
|
||||
});
|
||||
|
||||
if (loginRes && loginRes.code === 0) {
|
||||
// 存储用户信息到全局状态
|
||||
userStore.setUserInfo(loginRes.data);
|
||||
userStore.setToken(loginRes.data.accessToken);
|
||||
userStore.setLoginStatus(true);
|
||||
if (loginRes && loginRes.code === 0) {
|
||||
// Store user info to global state
|
||||
userStore.setUserInfo(loginRes.data);
|
||||
userStore.setToken(loginRes.data.accessToken);
|
||||
userStore.setLoginStatus(true);
|
||||
|
||||
uni.showToast({
|
||||
title: '登录成功',
|
||||
icon: 'success',
|
||||
});
|
||||
uni.showToast({
|
||||
title: 'Login successful',
|
||||
icon: 'success',
|
||||
});
|
||||
|
||||
// 跳转到首页
|
||||
uni.switchTab({
|
||||
url: '/pages/mine/index'
|
||||
});
|
||||
} else {
|
||||
uni.showToast({
|
||||
title: loginRes.msg || '自动登录失败',
|
||||
icon: 'none',
|
||||
});
|
||||
// Navigate to home page
|
||||
uni.switchTab({
|
||||
url: '/pages/mine/index'
|
||||
});
|
||||
} else {
|
||||
uni.showToast({
|
||||
title: loginRes.msg || 'Auto login failed',
|
||||
icon: 'none',
|
||||
});
|
||||
|
||||
// 即使自动登录失败也跳转到首页，让用户重新登录
|
||||
uni.switchTab({
|
||||
url: '/pages/mine/index'
|
||||
});
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('自动登录失败:', error);
|
||||
uni.showToast({
|
||||
title: '自动登录失败，请手动登录',
|
||||
icon: 'none',
|
||||
});
|
||||
// Navigate to home page even if auto login fails, so user can login manually
|
||||
uni.switchTab({
|
||||
url: '/pages/mine/index'
|
||||
});
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Auto login failed:', error);
|
||||
uni.showToast({
|
||||
title: 'Auto login failed, please login manually',
|
||||
icon: 'none',
|
||||
});
|
||||
|
||||
// 跳转到首页
|
||||
uni.switchTab({
|
||||
url: '/pages/mine/index'
|
||||
});
|
||||
}
|
||||
}, 1000);
|
||||
} else {
|
||||
uni.hideLoading();
|
||||
uni.showToast({
|
||||
title: res.msg || '注册失败',
|
||||
icon: 'error',
|
||||
});
|
||||
}
|
||||
} catch (error) {
|
||||
uni.hideLoading();
|
||||
uni.showToast({
|
||||
title: error.message || '注册失败，请稍后重试',
|
||||
icon: 'error',
|
||||
});
|
||||
}
|
||||
};
|
||||
// Navigate to home page
|
||||
uni.switchTab({
|
||||
url: '/pages/mine/index'
|
||||
});
|
||||
}
|
||||
}, 1000);
|
||||
} else {
|
||||
uni.hideLoading();
|
||||
uni.showToast({
|
||||
title: res.msg || 'Registration failed',
|
||||
icon: 'error',
|
||||
});
|
||||
}
|
||||
} catch (error) {
|
||||
uni.hideLoading();
|
||||
uni.showToast({
|
||||
title: error.message || 'Registration failed, please try again',
|
||||
icon: 'error',
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
// Clear input field
|
||||
const clearInput = (type) => {
|
||||
if (type === 'registerEmail') {
|
||||
registerEmail.value = '';
|
||||
} else if (type === 'registerPassword') {
|
||||
registerPassword.value = '';
|
||||
} else if (type === 'confirmPassword') {
|
||||
confirmPassword.value = '';
|
||||
} else if (type === 'verificationCode') {
|
||||
verificationCode.value = '';
|
||||
}
|
||||
};
|
||||
|
||||
//跳转到登录页面
|
||||
//跳转到注册页面
|
||||
const goLoginPage = function() {
|
||||
uni.navigateTo({
|
||||
url:'/pages/login/index'
|
||||
})
|
||||
}
|
||||
|
||||
// 清空输入框
|
||||
const clearInput = (type) => {
|
||||
if (type === 'registerEmail') {
|
||||
registerEmail.value = '';
|
||||
} else if (type === 'registerPassword') {
|
||||
registerPassword.value = '';
|
||||
} else if (type === 'confirmPassword') {
|
||||
confirmPassword.value = '';
|
||||
} else if (type === 'verificationCode') {
|
||||
verificationCode.value = '';
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<view class="h-[120vh] p-4 min-h-screen bg-white flex flex-col justify-center">
|
||||
<view class="p-4 min-h-screen bg-white flex flex-col justify-center">
|
||||
<!-- 标题 -->
|
||||
<view class="mb-12 mt-20 text-center">
|
||||
<view class="mb-12 text-center">
|
||||
<image src="/static/tabbar/find.png" class="w-20 h-20 mb-8" mode="aspectFit"></image>
|
||||
<text class="block text-3xl font-bold text-gray-800 mb-4">CREATE ACCOUNT</text>
|
||||
<text class="text-sm text-gray-500">Join Sweekar to get started</text>
|
||||
@@ -372,22 +381,22 @@ const clearInput = (type) => {
|
||||
<!-- 登录链接 -->
|
||||
<view class="flex justify-center items-center my-8 text-gray-500 text-sm">
|
||||
<text>Already have an account?</text>
|
||||
<text class="text-green-500 ml-2" @click="$Router.push('/pages/login/index')">Sign in</text>
|
||||
<text class="text-green-500 ml-2" @click="goLoginPage">Sign in</text>
|
||||
</view>
|
||||
|
||||
<!-- 同意条款 -->
|
||||
<view class="mt-auto text-center">
|
||||
<!-- <view class="mt-auto text-center">
|
||||
<label class="flex items-center justify-center text-xs text-gray-500 leading-loose">
|
||||
<checkbox
|
||||
class="scale-75 mr-2"
|
||||
:checked="checked"
|
||||
@change="onChange"
|
||||
/>
|
||||
我已阅读并同意
|
||||
<text class="text-green-500 underline" @tap="showAgreement">《用户协议》</text>
|
||||
和
|
||||
<text class="text-green-500 underline" @tap="showAgreement">《隐私政策》</text>
|
||||
I have read and agree to the
|
||||
<text class="text-green-500 underline" @tap="showAgreement"> User Agreement</text>
|
||||
and
|
||||
<text class="text-green-500 underline" @tap="showAgreement"> Privacy Policy</text>
|
||||
</label>
|
||||
</view>
|
||||
</view> -->
|
||||
</view>
|
||||
</template>
|
||||
Reference in new issue
Block a user