This commit is contained in:
2025-09-03 09:13:29 +08:00
parent 8d50c6dadf
commit acaed047ce
6 changed files with 550 additions and 31 deletions

View File

@@ -57,15 +57,7 @@
</div>
</el-form-item>
<el-form-item prop="registrationCode">
<el-input
v-model="registerForm.registrationCode"
placeholder="请输入激活码"
size="large"
:prefix-icon="Ticket"
clearable
/>
</el-form-item>
<el-form-item prop="city">
<el-select
@@ -213,7 +205,7 @@ import { ref, reactive, computed, onMounted } from 'vue'
import { useRouter, useRoute } from 'vue-router'
import { useUserStore } from '@/stores/user'
import { ElMessage, ElMessageBox } from 'element-plus'
import { User, Lock, Message, Edit, ChatDotRound, CreditCard, Ticket, Location } from '@element-plus/icons-vue'
import { User, Lock, Message, Edit, ChatDotRound, CreditCard, Location } from '@element-plus/icons-vue'
import Captcha from '@/components/Captcha.vue'
const router = useRouter()
@@ -228,7 +220,7 @@ const captchaRef = ref()
const registerForm = reactive({
username: '',
phone: '',
registrationCode: '',
city: '',
district_id: '',
password: '',
@@ -321,10 +313,7 @@ const registerRules = {
{ required: true, message: '请输入手机号', trigger: 'blur' },
{ pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号', trigger: 'blur' }
],
registrationCode: [
{ required: true, message: '请输入激活码', trigger: 'blur' },
{ min: 6, message: '激活码长度不能少于6位', trigger: 'blur' }
],
smsCode: [
{ required: true, message: '请输入短信验证码', trigger: 'blur' },
{ pattern: /^\d{6}$/, message: '短信验证码为6位数字', trigger: 'blur' }
@@ -441,7 +430,6 @@ const handleRegister = async () => {
const registerData = {
username: registerForm.username,
phone: registerForm.phone,
registrationCode: registerForm.registrationCode,
city: registerForm.city,
district_id: registerForm.district_id,
password: registerForm.password,
@@ -453,8 +441,21 @@ const handleRegister = async () => {
const result = await userStore.register(registerData)
if (result.success) {
ElMessage.success('注册成功!请登录')
router.push('/login')
// 检查是否需要支付
if (result.needPayment) {
ElMessage.success('用户信息创建成功,请完成支付以激活账户')
// 跳转到支付页面
router.push({
path: '/payment',
query: {
token: result.token,
userId: result.user.id
}
})
} else {
ElMessage.success('注册成功!请登录')
router.push('/login')
}
}
} catch (error) {
console.error('注册失败:', error)
@@ -524,12 +525,7 @@ onMounted(() => {
router.push(redirectPath)
}
// 从URL参数中获取邀请码并自动填入
const inviteCode = route.query.code
if (inviteCode) {
registerForm.registrationCode = inviteCode
ElMessage.success('已自动填入邀请码')
}
// 获取地区数据
fetchRegions()