更新
This commit is contained in:
@@ -5,7 +5,7 @@ const config = {
|
||||
uploadURL: import.meta.env.VITE_UPLOAD_BASE_URL || 'http://localhost:3000/api/upload'
|
||||
},
|
||||
production: {
|
||||
baseURL: window.location.origin,
|
||||
baseURL: 'https://minio.zrbjr.com/',
|
||||
uploadURL: import.meta.env.VITE_UPLOAD_BASE_URL || `${window.location.origin}/api/upload`
|
||||
}
|
||||
}
|
||||
@@ -29,7 +29,7 @@ export const getImageUrl = (imagePath) => {
|
||||
if (imagePath.startsWith('/uploads')) {
|
||||
const cleanBaseURL = baseURL.replace(/\/$/, '')
|
||||
// console.log('Image starts with /uploads, returning original path:', imagePath)
|
||||
return `${cleanBaseURL}/jurongquan${imagePath}`
|
||||
return `${imagePath}`
|
||||
}
|
||||
|
||||
// 在开发环境下,也需要根据路径前缀处理
|
||||
|
||||
@@ -106,7 +106,7 @@ const inviteLink = ref('')
|
||||
const generateInviteLink = () => {
|
||||
const userId = userStore.user?.id || userStore.user?.user_id || 'guest'
|
||||
console.log(userStore.user.id,userStore.user.user_id)
|
||||
const baseUrl = 'http://192.168.1.124:5173'
|
||||
const baseUrl = `${window.location.origin}/frontend`
|
||||
return `${baseUrl}/register?inviter=${userId}`
|
||||
}
|
||||
|
||||
|
||||
@@ -160,10 +160,10 @@ export default {
|
||||
const settings = ref([
|
||||
{text:'账号安全',path:'/editpasswordpage'},
|
||||
{text:'商户资料',path:'/editdetailspage'},
|
||||
{text:'分销',path:'/distribution'},
|
||||
{text:'通知设置'},
|
||||
{text:'积分获取规则'},
|
||||
{text:'隐私协议'},
|
||||
// {text:'分销',path:'/distribution'},
|
||||
// {text:'通知设置'},
|
||||
// {text:'积分获取规则'},
|
||||
// {text:'隐私协议'},
|
||||
]);
|
||||
const functionItems = ref([
|
||||
{ image: "/imgs/mainpage/jiaoyijilu.png", text: "购物车", path: "/cart" },
|
||||
@@ -435,7 +435,7 @@ export default {
|
||||
};
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
<style lang="scss" scoped>
|
||||
.personal-center {
|
||||
max-width: 600px;
|
||||
margin: 0 auto;
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
</div>
|
||||
|
||||
<div class="payment-methods">
|
||||
<div class="method-item" :class="{ active: selectedMethod === 'wechat_h5' }" @click="selectedMethod = 'wechat_h5'">
|
||||
<!-- <div class="method-item" :class="{ active: selectedMethod === 'wechat_h5' }" @click="selectedMethod = 'wechat_h5'">
|
||||
<div class="method-icon">
|
||||
<svg viewBox="0 0 24 24" width="24" height="24">
|
||||
<path fill="#07C160" d="M8.5 6.5c-1.4 0-2.5 1.1-2.5 2.5s1.1 2.5 2.5 2.5 2.5-1.1 2.5-2.5-1.1-2.5-2.5-2.5zm7 0c-1.4 0-2.5 1.1-2.5 2.5s1.1 2.5 2.5 2.5 2.5-1.1 2.5-2.5-1.1-2.5-2.5-2.5zM12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8 0-1.12.23-2.18.64-3.15.41-.97 1.01-1.85 1.78-2.62.77-.77 1.65-1.37 2.62-1.78C9.82 4.23 10.88 4 12 4s2.18.23 3.15.64c.97.41 1.85 1.01 2.62 1.78.77.77 1.37 1.65 1.78 2.62.41.97.64 2.03.64 3.15 0 4.41-3.59 8-8 8z"/>
|
||||
@@ -24,7 +24,7 @@
|
||||
<div class="method-check" v-show="selectedMethod === 'wechat_h5'">
|
||||
<el-icon><Check /></el-icon>
|
||||
</div>
|
||||
</div>
|
||||
</div> -->
|
||||
|
||||
<div class="method-item" :class="{ active: selectedMethod === 'alipay_wap' }" @click="selectedMethod = 'alipay_wap'">
|
||||
<div class="method-icon">
|
||||
@@ -78,7 +78,7 @@ const router = useRouter()
|
||||
const userStore = useUserStore()
|
||||
|
||||
// 响应式数据
|
||||
const selectedMethod = ref('wechat_h5') // 默认选择微信支付
|
||||
const selectedMethod = ref('alipay_wap') // 默认选择微信支付
|
||||
const paymentLoading = ref(false)
|
||||
const paymentStatus = ref('')
|
||||
const paymentAmount = ref(399) // 注册费用
|
||||
|
||||
@@ -4,9 +4,9 @@
|
||||
<div class="register-card">
|
||||
<div class="register-header">
|
||||
<h2>用户注册</h2>
|
||||
<p>创建你的账号,开始使用前端H5系统</p>
|
||||
<p>创建你的账号,开始使用炬融圈</p>
|
||||
</div>
|
||||
|
||||
|
||||
<el-form
|
||||
ref="registerFormRef"
|
||||
:model="registerForm"
|
||||
@@ -23,7 +23,7 @@
|
||||
clearable
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
|
||||
<el-form-item prop="phone">
|
||||
<el-input
|
||||
v-model="registerForm.phone"
|
||||
@@ -33,7 +33,7 @@
|
||||
clearable
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
|
||||
<el-form-item prop="smsCode">
|
||||
<div class="sms-code-group">
|
||||
<el-input
|
||||
@@ -56,52 +56,28 @@
|
||||
</el-button>
|
||||
</div>
|
||||
</el-form-item>
|
||||
|
||||
|
||||
|
||||
<el-form-item prop="city">
|
||||
<el-select
|
||||
v-model="registerForm.city"
|
||||
placeholder="请选择城市"
|
||||
<el-form-item prop="region">
|
||||
<el-cascader
|
||||
v-model="registerForm.region"
|
||||
:options="regionOptions"
|
||||
placeholder="请选择省市区"
|
||||
size="large"
|
||||
clearable
|
||||
@change="onCityChange"
|
||||
style="width: 100%"
|
||||
:props="{ expandTrigger: 'hover', value: 'code' }"
|
||||
:show-all-levels="true"
|
||||
:collapse-tags="true"
|
||||
:max-collapse-tags="1"
|
||||
:teleported="false"
|
||||
popper-class="mobile-cascader-popper"
|
||||
@change="handleRegionChange"
|
||||
>
|
||||
<template #prefix>
|
||||
<el-icon><Location /></el-icon>
|
||||
</template>
|
||||
<el-option
|
||||
v-for="city in cities"
|
||||
:key="city"
|
||||
:label="city"
|
||||
:value="city"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item prop="district_id">
|
||||
<el-select
|
||||
v-model="registerForm.district_id"
|
||||
placeholder="请选择区域"
|
||||
size="large"
|
||||
clearable
|
||||
:disabled="!registerForm.city"
|
||||
style="width: 100%"
|
||||
>
|
||||
<template #prefix>
|
||||
<el-icon><Location /></el-icon>
|
||||
</template>
|
||||
<el-option
|
||||
v-for="district in filteredDistricts"
|
||||
:key="district.id"
|
||||
:label="district.district_name"
|
||||
:value="district.id"
|
||||
/>
|
||||
</el-select>
|
||||
</el-cascader>
|
||||
</el-form-item>
|
||||
|
||||
|
||||
<el-form-item prop="password">
|
||||
<el-input
|
||||
v-model="registerForm.password"
|
||||
@@ -113,7 +89,7 @@
|
||||
clearable
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
|
||||
<el-form-item prop="confirmPassword">
|
||||
<el-input
|
||||
v-model="registerForm.confirmPassword"
|
||||
@@ -125,7 +101,7 @@
|
||||
clearable
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
|
||||
<el-form-item prop="captcha">
|
||||
<Captcha
|
||||
ref="captchaRef"
|
||||
@@ -134,25 +110,25 @@
|
||||
size="large"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
|
||||
<el-form-item prop="agreement">
|
||||
<el-checkbox
|
||||
<el-checkbox
|
||||
v-model="registerForm.agreement"
|
||||
@change="handleAgreementChange"
|
||||
>
|
||||
我已阅读并同意
|
||||
<el-link
|
||||
type="primary"
|
||||
<el-link
|
||||
type="primary"
|
||||
@click="showAgreement"
|
||||
:class="{ 'viewed': agreementViewed }"
|
||||
:class="{ viewed: agreementViewed }"
|
||||
>
|
||||
《用户协议》
|
||||
</el-link>
|
||||
和
|
||||
<el-link
|
||||
type="primary"
|
||||
<el-link
|
||||
type="primary"
|
||||
@click="showPrivacy"
|
||||
:class="{ 'viewed': privacyViewed }"
|
||||
:class="{ viewed: privacyViewed }"
|
||||
>
|
||||
《隐私政策》
|
||||
</el-link>
|
||||
@@ -162,7 +138,7 @@
|
||||
<span>请先点击查看用户协议和隐私政策</span>
|
||||
</div>
|
||||
</el-form-item>
|
||||
|
||||
|
||||
<el-form-item>
|
||||
<el-button
|
||||
type="primary"
|
||||
@@ -175,7 +151,7 @@
|
||||
</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
|
||||
<div class="register-footer">
|
||||
<p>
|
||||
已有账号?
|
||||
@@ -184,27 +160,9 @@
|
||||
</el-link>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div class="features-preview">
|
||||
<el-divider>注册后你可以</el-divider>
|
||||
<div class="features-list">
|
||||
<div class="feature-item">
|
||||
<el-icon><User /></el-icon>
|
||||
<span>个性化用户中心</span>
|
||||
</div>
|
||||
<div class="feature-item">
|
||||
<el-icon><CreditCard /></el-icon>
|
||||
<span>积分商城购物</span>
|
||||
</div>
|
||||
<div class="feature-item">
|
||||
<el-icon><ChatDotRound /></el-icon>
|
||||
<span>积分转账功能</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<!-- 背景装饰 -->
|
||||
<div class="background-decoration">
|
||||
<div class="decoration-shape shape-1"></div>
|
||||
@@ -216,236 +174,270 @@
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
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, Location, InfoFilled } from '@element-plus/icons-vue'
|
||||
import Captcha from '@/components/Captcha.vue'
|
||||
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,
|
||||
Location,
|
||||
InfoFilled,
|
||||
} from '@element-plus/icons-vue';
|
||||
import Captcha from '@/components/Captcha.vue';
|
||||
import api from '@/utils/api'
|
||||
|
||||
const router = useRouter()
|
||||
const route = useRoute()
|
||||
const userStore = useUserStore()
|
||||
const router = useRouter();
|
||||
const route = useRoute();
|
||||
const userStore = useUserStore();
|
||||
|
||||
// 表单引用
|
||||
const registerFormRef = ref()
|
||||
const captchaRef = ref()
|
||||
const registerFormRef = ref();
|
||||
const captchaRef = ref();
|
||||
|
||||
// 表单数据
|
||||
const registerForm = reactive({
|
||||
username: '',
|
||||
phone: '',
|
||||
|
||||
region: [],
|
||||
province: '',
|
||||
city: '',
|
||||
district: '',
|
||||
district_id: '',
|
||||
password: '',
|
||||
confirmPassword: '',
|
||||
captcha: '',
|
||||
smsCode: '',
|
||||
agreement: false
|
||||
})
|
||||
agreement: false,
|
||||
});
|
||||
|
||||
// 协议查看状态
|
||||
const agreementViewed = ref(false)
|
||||
const privacyViewed = ref(false)
|
||||
const canCheckAgreement = computed(() => agreementViewed.value && privacyViewed.value)
|
||||
const agreementViewed = ref(false);
|
||||
const privacyViewed = ref(false);
|
||||
const canCheckAgreement = computed(
|
||||
() => agreementViewed.value && privacyViewed.value
|
||||
);
|
||||
|
||||
// 短信验证码相关状态
|
||||
const sendingSMS = ref(false)
|
||||
const smsCountdown = ref(0)
|
||||
const sendingSMS = ref(false);
|
||||
const smsCountdown = ref(0);
|
||||
const canSendSMS = computed(() => {
|
||||
const phoneRegex = /^1[3-9]\d{9}$/
|
||||
return phoneRegex.test(registerForm.phone)
|
||||
})
|
||||
const phoneRegex = /^1[3-9]\d{9}$/;
|
||||
return phoneRegex.test(registerForm.phone);
|
||||
});
|
||||
|
||||
// 地区数据
|
||||
const regions = ref([])
|
||||
const regions = ref([]);
|
||||
const regionOptions = ref([]);
|
||||
const cities = computed(() => {
|
||||
const citySet = new Set()
|
||||
regions.value.forEach(region => {
|
||||
const citySet = new Set();
|
||||
regions.value.forEach((region) => {
|
||||
if (region.city_name) {
|
||||
citySet.add(region.city_name)
|
||||
citySet.add(region.city_name);
|
||||
}
|
||||
})
|
||||
return Array.from(citySet).sort()
|
||||
})
|
||||
});
|
||||
return Array.from(citySet).sort();
|
||||
});
|
||||
|
||||
const filteredDistricts = computed(() => {
|
||||
if (!registerForm.city) return []
|
||||
return regions.value.filter(region => region.city_name === registerForm.city)
|
||||
})
|
||||
if (!registerForm.city) return [];
|
||||
return regions.value.filter(
|
||||
(region) => region.city_name === registerForm.city
|
||||
);
|
||||
});
|
||||
|
||||
// 自定义验证函数
|
||||
const validateUsername = (rule, value, callback) => {
|
||||
if (!value) {
|
||||
callback(new Error('请输入用户名'))
|
||||
callback(new Error('请输入用户名'));
|
||||
} else if (value.length < 3) {
|
||||
callback(new Error('用户名至少3个字符'))
|
||||
callback(new Error('用户名至少3个字符'));
|
||||
} else if (value.length > 20) {
|
||||
callback(new Error('用户名不能超过20个字符'))
|
||||
callback(new Error('用户名不能超过20个字符'));
|
||||
} else if (!/^[a-zA-Z0-9_\u4e00-\u9fa5]+$/.test(value)) {
|
||||
callback(new Error('用户名只能包含字母、数字、下划线和中文'))
|
||||
callback(new Error('用户名只能包含字母、数字、下划线和中文'));
|
||||
} else {
|
||||
callback()
|
||||
callback();
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
const validatePassword = (rule, value, callback) => {
|
||||
if (!value) {
|
||||
callback(new Error('请输入密码'))
|
||||
callback(new Error('请输入密码'));
|
||||
} else if (value.length < 6) {
|
||||
callback(new Error('密码至少6个字符'))
|
||||
callback(new Error('密码至少6个字符'));
|
||||
} else if (value.length > 20) {
|
||||
callback(new Error('密码不能超过20个字符'))
|
||||
callback(new Error('密码不能超过20个字符'));
|
||||
} else if (!/(?=.*[a-zA-Z])(?=.*\d)/.test(value)) {
|
||||
callback(new Error('密码必须包含字母和数字'))
|
||||
callback(new Error('密码必须包含字母和数字'));
|
||||
} else {
|
||||
// 如果确认密码已输入,重新验证确认密码
|
||||
if (registerForm.confirmPassword) {
|
||||
registerFormRef.value?.validateField('confirmPassword')
|
||||
registerFormRef.value?.validateField('confirmPassword');
|
||||
}
|
||||
callback()
|
||||
callback();
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
const validateConfirmPassword = (rule, value, callback) => {
|
||||
if (!value) {
|
||||
callback(new Error('请确认密码'))
|
||||
callback(new Error('请确认密码'));
|
||||
} else if (value !== registerForm.password) {
|
||||
callback(new Error('两次输入的密码不一致'))
|
||||
callback(new Error('两次输入的密码不一致'));
|
||||
} else {
|
||||
callback()
|
||||
callback();
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
const validateAgreement = (rule, value, callback) => {
|
||||
if (!value) {
|
||||
callback(new Error('请阅读并同意用户协议和隐私政策'))
|
||||
callback(new Error('请阅读并同意用户协议和隐私政策'));
|
||||
} else {
|
||||
callback()
|
||||
callback();
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
// 表单验证规则
|
||||
const registerRules = {
|
||||
username: [{ validator: validateUsername, trigger: 'blur' }],
|
||||
phone: [
|
||||
{ required: true, message: '请输入手机号', trigger: 'blur' },
|
||||
{ pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号', trigger: 'blur' }
|
||||
{
|
||||
pattern: /^1[3-9]\d{9}$/,
|
||||
message: '请输入正确的手机号',
|
||||
trigger: 'blur',
|
||||
},
|
||||
],
|
||||
|
||||
smsCode: [
|
||||
{ required: true, message: '请输入短信验证码', trigger: 'blur' },
|
||||
{ pattern: /^\d{6}$/, message: '短信验证码为6位数字', trigger: 'blur' }
|
||||
],
|
||||
city: [
|
||||
{ required: true, message: '请选择城市', trigger: 'change' }
|
||||
],
|
||||
district_id: [
|
||||
{ required: true, message: '请选择区域', trigger: 'change' }
|
||||
{ pattern: /^\d{6}$/, message: '短信验证码为6位数字', trigger: 'blur' },
|
||||
],
|
||||
region: [{ required: true, message: '请选择省市区', trigger: 'change' }],
|
||||
password: [{ validator: validatePassword, trigger: 'blur' }],
|
||||
confirmPassword: [{ validator: validateConfirmPassword, trigger: 'blur' }],
|
||||
captcha: [
|
||||
{ required: true, message: '请输入验证码', trigger: 'blur' },
|
||||
{ min: 4, max: 4, message: '验证码长度为4位', trigger: 'blur' }
|
||||
{ min: 4, max: 4, message: '验证码长度为4位', trigger: 'blur' },
|
||||
],
|
||||
agreement: [{ validator: validateAgreement, trigger: 'change' }]
|
||||
}
|
||||
agreement: [{ validator: validateAgreement, trigger: 'change' }],
|
||||
};
|
||||
|
||||
// 发送短信验证码
|
||||
const sendSMSCode = async () => {
|
||||
if (!canSendSMS.value || sendingSMS.value || smsCountdown.value > 0) {
|
||||
return
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
try {
|
||||
sendingSMS.value = true
|
||||
|
||||
sendingSMS.value = true;
|
||||
|
||||
const response = await fetch('/api/sms/send', {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json'
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
body: JSON.stringify({
|
||||
phone: registerForm.phone
|
||||
})
|
||||
})
|
||||
|
||||
const result = await response.json()
|
||||
|
||||
phone: registerForm.phone,
|
||||
}),
|
||||
});
|
||||
|
||||
const result = await response.json();
|
||||
|
||||
if (result.success) {
|
||||
ElMessage.success('验证码发送成功,请查收短信')
|
||||
ElMessage.success('验证码发送成功,请查收短信');
|
||||
// 开始倒计时
|
||||
startCountdown()
|
||||
startCountdown();
|
||||
} else {
|
||||
ElMessage.error(result.message || '发送失败,请重试')
|
||||
ElMessage.error(result.message || '发送失败,请重试');
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('发送短信验证码失败:', error)
|
||||
ElMessage.error('发送失败,请检查网络连接')
|
||||
console.error('发送短信验证码失败:', error);
|
||||
ElMessage.error('发送失败,请检查网络连接');
|
||||
} finally {
|
||||
sendingSMS.value = false
|
||||
sendingSMS.value = false;
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
// 开始倒计时
|
||||
const startCountdown = () => {
|
||||
smsCountdown.value = 60
|
||||
smsCountdown.value = 60;
|
||||
const timer = setInterval(() => {
|
||||
smsCountdown.value--
|
||||
smsCountdown.value--;
|
||||
if (smsCountdown.value <= 0) {
|
||||
clearInterval(timer)
|
||||
clearInterval(timer);
|
||||
}
|
||||
}, 1000)
|
||||
}
|
||||
}, 1000);
|
||||
};
|
||||
|
||||
/**
|
||||
* 获取地区数据
|
||||
*/
|
||||
const fetchRegions = async () => {
|
||||
try {
|
||||
const response = await fetch('/api/regions/zhejiang')
|
||||
const result = await response.json()
|
||||
|
||||
const response = await fetch('/api/regions/zhejiang');
|
||||
const result = await response.json();
|
||||
|
||||
if (result.success) {
|
||||
regions.value = result.data
|
||||
regions.value = result.data;
|
||||
} else {
|
||||
ElMessage.error('获取地区数据失败')
|
||||
ElMessage.error('获取地区数据失败');
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('获取地区数据失败:', error)
|
||||
ElMessage.error('获取地区数据失败,请刷新页面重试')
|
||||
console.error('获取地区数据失败:', error);
|
||||
ElMessage.error('获取地区数据失败,请刷新页面重试');
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
// 加载省市区级联数据
|
||||
const loadRegionOptions = async () => {
|
||||
const provincesResponse = await api.get('/regions/provinces');
|
||||
regionOptions.value = provincesResponse.data.data || [];
|
||||
};
|
||||
|
||||
// 处理级联选择器变化
|
||||
const handleRegionChange = (value) => {
|
||||
if (value && value.length === 3) {
|
||||
registerForm.province = value[0];
|
||||
registerForm.city = value[1];
|
||||
registerForm.district = value[2];
|
||||
registerForm.district_id = value[2];
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* 城市变化处理
|
||||
*/
|
||||
const onCityChange = () => {
|
||||
// 清空区域选择
|
||||
registerForm.district_id = ''
|
||||
}
|
||||
registerForm.district_id = '';
|
||||
};
|
||||
|
||||
// 处理注册
|
||||
const handleRegister = async () => {
|
||||
if (!registerFormRef.value || !captchaRef.value) return
|
||||
|
||||
if (!registerFormRef.value || !captchaRef.value) return;
|
||||
|
||||
try {
|
||||
// 先验证表单
|
||||
const valid = await registerFormRef.value.validate()
|
||||
if (!valid) return
|
||||
|
||||
const valid = await registerFormRef.value.validate();
|
||||
if (!valid) return;
|
||||
|
||||
// 验证验证码
|
||||
const captchaValid = await captchaRef.value.verifyCaptcha(registerForm.captcha)
|
||||
const captchaValid = await captchaRef.value.verifyCaptcha(
|
||||
registerForm.captcha
|
||||
);
|
||||
if (!captchaValid) {
|
||||
registerForm.captcha = ''
|
||||
return
|
||||
registerForm.captcha = '';
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
// 获取验证码信息
|
||||
const captchaInfo = captchaRef.value.getCaptchaInfo()
|
||||
|
||||
const captchaInfo = captchaRef.value.getCaptchaInfo();
|
||||
|
||||
// 提交注册请求(包含验证码信息)
|
||||
const registerData = {
|
||||
username: registerForm.username,
|
||||
@@ -455,33 +447,35 @@ const handleRegister = async () => {
|
||||
password: registerForm.password,
|
||||
smsCode: registerForm.smsCode,
|
||||
captchaId: captchaInfo.captchaId,
|
||||
captchaText: captchaInfo.captchaText
|
||||
}
|
||||
|
||||
const result = await userStore.register(registerData)
|
||||
|
||||
captchaText: captchaInfo.captchaText,
|
||||
province: registerForm.province,
|
||||
};
|
||||
console.log(registerData,'registerData');
|
||||
console.log(registerForm,'registerForm')
|
||||
const result = await userStore.register(registerData);
|
||||
|
||||
if (result.success) {
|
||||
// 检查是否需要支付
|
||||
if (result.needPayment) {
|
||||
ElMessage.success('用户信息创建成功,请完成支付以激活账户')
|
||||
ElMessage.success('用户信息创建成功,请完成支付以激活账户');
|
||||
// 跳转到支付页面
|
||||
router.push({
|
||||
path: '/payment',
|
||||
})
|
||||
});
|
||||
} else {
|
||||
ElMessage.success('注册成功!请登录')
|
||||
router.push('/login')
|
||||
ElMessage.success('注册成功!请登录');
|
||||
router.push('/login');
|
||||
}
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('注册失败:', error)
|
||||
console.error('注册失败:', error);
|
||||
// 注册失败后刷新验证码
|
||||
if (captchaRef.value) {
|
||||
await captchaRef.value.refreshCaptcha()
|
||||
await captchaRef.value.refreshCaptcha();
|
||||
}
|
||||
registerForm.captcha = ''
|
||||
registerForm.captcha = '';
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
// 显示用户协议
|
||||
const showAgreement = () => {
|
||||
@@ -498,13 +492,13 @@ const showAgreement = () => {
|
||||
{
|
||||
confirmButtonText: '我已了解',
|
||||
dangerouslyUseHTMLString: true,
|
||||
customClass: 'agreement-dialog'
|
||||
customClass: 'agreement-dialog',
|
||||
}
|
||||
).then(() => {
|
||||
agreementViewed.value = true
|
||||
ElMessage.success('已查看用户协议')
|
||||
})
|
||||
}
|
||||
agreementViewed.value = true;
|
||||
ElMessage.success('已查看用户协议');
|
||||
});
|
||||
};
|
||||
|
||||
// 显示隐私政策
|
||||
const showPrivacy = () => {
|
||||
@@ -521,47 +515,48 @@ const showPrivacy = () => {
|
||||
{
|
||||
confirmButtonText: '我已了解',
|
||||
dangerouslyUseHTMLString: true,
|
||||
customClass: 'privacy-dialog'
|
||||
customClass: 'privacy-dialog',
|
||||
}
|
||||
).then(() => {
|
||||
privacyViewed.value = true
|
||||
ElMessage.success('已查看隐私政策')
|
||||
})
|
||||
}
|
||||
privacyViewed.value = true;
|
||||
ElMessage.success('已查看隐私政策');
|
||||
});
|
||||
};
|
||||
|
||||
// 处理协议勾选
|
||||
const handleAgreementChange = (value) => {
|
||||
if (value && !canCheckAgreement.value) {
|
||||
registerForm.agreement = false
|
||||
ElMessage.warning('请先查看用户协议和隐私政策后再勾选')
|
||||
return false
|
||||
registerForm.agreement = false;
|
||||
ElMessage.warning('请先查看用户协议和隐私政策后再勾选');
|
||||
return false;
|
||||
}
|
||||
return true
|
||||
}
|
||||
return true;
|
||||
};
|
||||
|
||||
// 图片上传成功处理
|
||||
const handleUploadSuccess = (response, field) => {
|
||||
ElMessage.success('图片上传成功')
|
||||
}
|
||||
ElMessage.success('图片上传成功');
|
||||
};
|
||||
|
||||
// 图片上传失败处理
|
||||
const handleUploadError = (error) => {
|
||||
ElMessage.error('图片上传失败,请重试')
|
||||
}
|
||||
ElMessage.error('图片上传失败,请重试');
|
||||
};
|
||||
|
||||
// 组件挂载时的处理
|
||||
onMounted(() => {
|
||||
// 如果已经登录,直接跳转
|
||||
if (userStore.isAuthenticated) {
|
||||
const redirectPath = route.query.redirect || '/'
|
||||
router.push(redirectPath)
|
||||
const redirectPath = route.query.redirect || '/';
|
||||
router.push(redirectPath);
|
||||
}
|
||||
|
||||
|
||||
|
||||
// 获取地区数据
|
||||
fetchRegions()
|
||||
})
|
||||
fetchRegions();
|
||||
|
||||
// 加载省市区级联数据
|
||||
loadRegionOptions();
|
||||
});
|
||||
</script>
|
||||
|
||||
<style lang="scss" scoped>
|
||||
@@ -646,16 +641,9 @@ onMounted(() => {
|
||||
color: #606266;
|
||||
}
|
||||
|
||||
.features-preview {
|
||||
margin-top: 20px;
|
||||
}
|
||||
|
||||
.features-list {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 12px;
|
||||
margin-top: 15px;
|
||||
}
|
||||
|
||||
|
||||
|
||||
.feature-item {
|
||||
display: flex;
|
||||
@@ -738,7 +726,8 @@ onMounted(() => {
|
||||
}
|
||||
|
||||
@keyframes float {
|
||||
0%, 100% {
|
||||
0%,
|
||||
100% {
|
||||
transform: translateY(0px) rotate(0deg);
|
||||
opacity: 0.7;
|
||||
}
|
||||
@@ -753,11 +742,11 @@ onMounted(() => {
|
||||
.register-container {
|
||||
padding: 15px;
|
||||
}
|
||||
|
||||
|
||||
.register-card {
|
||||
padding: 30px 20px;
|
||||
}
|
||||
|
||||
|
||||
.features-list {
|
||||
gap: 8px;
|
||||
}
|
||||
@@ -890,4 +879,4 @@ onMounted(() => {
|
||||
:deep(.el-link.viewed:hover) {
|
||||
color: #529b2e !important;
|
||||
}
|
||||
</style>
|
||||
</style>
|
||||
|
||||
Reference in New Issue
Block a user