Skip to content

C
campSite
Commit 13401a66 authored by 杨梦雪's avatar 杨梦雪
Browse files
Options

短信验证码注册。忘记密码

parent 18ce5072
Show whitespace changes
Inline Side-by-side
Showing with 121 additions and 87 deletions
src/components/index/SignUp/referInfo.vue
View file @ 13401a66
......@@ -47,7 +47,11 @@
<el-form-item label="出生日期" prop="birthday">
<el-row :gutter="20">
<el-col :span="8">
<el-select v-model="bdYear" placeholder="年">
<el-select
v-model="bdYear"
placeholder="年"
:popper-append-to-body="false"
>
<el-option
v-for="(item, index) in yearArrs"
:key="index"
......@@ -58,7 +62,11 @@
</el-select>
</el-col>
<el-col :span="8">
<el-select v-model="bdMonth" placeholder="月">
<el-select
v-model="bdMonth"
placeholder="月"
:popper-append-to-body="false"
>
<el-option
v-for="(item, index) in monthArrs"
:key="index"
......@@ -73,6 +81,7 @@
ref="birthday"
v-model="bdDay"
placeholder="日"
:popper-append-to-body="false"
@change="getTime"
>
<el-option
......@@ -96,6 +105,7 @@
<el-select
v-model="jgProvinceCode"
placeholder="省"
:popper-append-to-body="false"
@change="changeProvince(1, $event)"
>
<el-option
......@@ -112,6 +122,7 @@
ref="jiguan_code"
v-model="jiguan_city"
placeholder="市"
:popper-append-to-body="false"
@change="getJiguan()"
>
<el-option
......@@ -141,7 +152,12 @@
<el-form-item label="入学年份" prop="start_school_date">
<el-row :gutter="20">
<el-col :span="12">
<el-select v-model="start_grade" placeholder="年级" clearable>
<el-select
v-model="start_grade"
placeholder="年级"
:popper-append-to-body="false"
clearable
>
<el-option
v-for="(item, index) in gradeArrs"
:key="index"
......@@ -157,6 +173,7 @@
v-model="start_year"
placeholder="年份"
clearable
:popper-append-to-body="false"
@change="getyear()"
>
<el-option
......@@ -177,6 +194,7 @@
ref="political_status"
v-model="referForm.political_status"
placeholder="填写政治面貌"
:popper-append-to-body="false"
clearable
>
<el-option
......@@ -205,7 +223,7 @@
v-model="referForm.email"
placeholder="填写电子邮箱"
size="small"
:disabled="true"
/>
</el-form-item>
</el-col>
......@@ -220,6 +238,7 @@
v-model="referForm.school_province"
clearable
placeholder="省"
:popper-append-to-body="false"
@change="changeProvince(2, $event)"
>
<el-option
......@@ -239,6 +258,7 @@
v-model="referForm.school_city"
clearable
placeholder="市"
:popper-append-to-body="false"
@change="changeCity($event)"
>
<el-option
......@@ -253,11 +273,13 @@
</el-col>
<el-col :span="12">
<el-form-item class="no_label" label=" " prop="school">
<!-- <el-select
<el-select
filterable
ref="school"
v-model="referForm.school"
clearable
placeholder="中学"
:popper-append-to-body="false"
>
<el-option
v-for="item in selectSchoolList"
......@@ -266,14 +288,14 @@
:value="item.id"
>
</el-option>
</el-select> -->
<el-autocomplete
</el-select>
<!-- <el-autocomplete
ref="school"
v-model="referForm.school"
:fetch-suggestions="querySearchAsync"
placeholder="中学"
@select="handleSelect"
></el-autocomplete>
></el-autocomplete> -->
</el-form-item>
</el-col>
......@@ -395,7 +417,7 @@ import { upload } from "r/index/network";
import validator from "common/validator";
export default {
name: "CheckForm",
name: "referInfo",
data() {
const validateContent = (rule, value, callback) => {
......@@ -465,10 +487,10 @@ export default {
political_status: [
{ required: true, message: "政治面貌不能为空！", trigger: "blur" },
],
// email: [
// { required: true, message: "电子邮箱不能为空！", trigger: "blur" },
// { validator: validator.validateEmail, trigger: "blur" },
// ],
email: [
{ required: true, message: "电子邮箱不能为空！", trigger: "blur" },
{ validator: validator.validateEmail, trigger: "blur" },
],
school_province: [
{
required: true,
......@@ -578,7 +600,8 @@ export default {
},
],
// 中学（模糊搜索）
timeout: null,
// timeout: null,
// school: "",
// 上传的图片
dialogImageUrl: "",
dialogVisible: false,
......@@ -658,9 +681,7 @@ export default {
}
},
},
mounted() {
this.restaurants = this.selectSchoolList; //中学（模糊搜索）
},
mounted() {},
methods: {
//获取近10年的年份
getTenYear() {
......@@ -785,6 +806,7 @@ export default {
}
return currentCity;
},
// 籍贯城市change事件
getJiguan() {
this.referForm.jiguan_code =
......@@ -808,6 +830,13 @@ export default {
if (!status) {
this.referForm.school = "";
}
// let data = this.selectSchoolList.map((item) => {
// return {
// name: item.id,
// value: item.name,
// };
// });
// this.restaurants = data; //中学（模糊搜索）
},
// 返回当前城市下的学校列表
......@@ -824,6 +853,7 @@ export default {
// console.log(res)
if (res.data.code === 200) {
this.schoolName = res.data.school_list;
// console.log( this.schoolName)
let code = this.$store.state.indexIdentity;
window.localStorage.setItem(
"schoolName" + code,
......@@ -832,6 +862,7 @@ export default {
for (let key in this.schoolName) {
if (this.schoolName[key].city_id == val) {
currentSchool.push(this.schoolName[key]);
console.log(currentSchool, "currentSchool");
}
}
return currentSchool;
......@@ -855,33 +886,36 @@ export default {
}
return currentSchool;
},
// 中学学校（模糊搜索）
querySearchAsync(queryString, cb) {
console.log(queryString, "queryString");
var restaurants = this.restaurants;
console.log(restaurants, "restaurants");
var results = queryString
? restaurants.filter(this.createStateFilter(queryString))
: restaurants;
console.log(results, "results");
clearTimeout(this.timeout);
this.timeout = setTimeout(() => {
cb(results);
}, 3000 * Math.random());
},
createStateFilter(queryString) {
console.log(queryString, "queryString");
return (state) => {
console.log(state, "state");
console;
return (
state.name.toLowerCase().indexOf(queryString.toLowerCase()) === 0
);
};
},
handleSelect(item) {
console.log(item);
},
// querySearchAsync(queryString, cb) {
// console.log(queryString, "queryString");
// console.log(this.restaurants, "this.restaurants");
// var restaurants = this.restaurants;
// console.log(restaurants, "restaurants");
// var results = queryString
// ? restaurants.filter(this.createStateFilter(queryString))
// : restaurants;
// console.log(results, "results");
// clearTimeout(this.timeout);
// this.timeout = setTimeout(() => {
// cb(results);
// }, 3000 * Math.random());
// },
// createStateFilter(queryString) {
// console.log(queryString, "queryString");
// return (state) => {
// console.log(state, "state");
// // state.name.indexOf(queryString) === 0;
// return state.value.indexOf(queryString) === 0;
// };
// },
// handleSelect(item) {
// console.log(item);
// this.school = item.name;
// },
// 图片上传成功前钩子
beforeAvatarUpload(file) {
// console.log(file, "beforeImage");
......@@ -1076,6 +1110,7 @@ export default {
this.scrollView(object);
return false;
}
// this.referForm.school = this.school;
setAccount(this.referForm).then((res) => {
// console.log(res, "setAccount");
if (res.data.code != 200) {
......
src/views/index/login/Register.vue
View file @ 13401a66
......@@ -19,7 +19,7 @@
autocomplete="off"
></el-input>
</el-form-item>
<el-form-item prop="email">
<!-- <el-form-item prop="email">
<img class="img_l" src="@/assets/img/reset/username.png" alt="" />
<el-input
v-model="registerForm.email"
......@@ -27,15 +27,15 @@
autocomplete="off"
></el-input>
</el-form-item>
<!-- <el-form-item prop="code">
</el-form-item> -->
<el-form-item prop="code">
<img class="img_l" src="@/assets/img/reset/code.png" alt="" />
<el-input
v-model="registerForm.code"
placeholder="请输入短信验证码"
maxlength="20"
autocomplete="off"
></el-input> -->
></el-input>
<!-- 短信验证码 -->
<!-- <div class="phoneCode">
<span class="code" v-show="show" @click="getCode"
......@@ -44,18 +44,18 @@
<span v-show="!show" class="count">{{ count }} s</span>
</div>
</el-form-item> -->
<el-form-item prop="code">
<!-- <el-form-item prop="code">
<img class="img_l" src="@/assets/img/reset/code.png" alt="" />
<el-input
v-model="registerForm.code"
placeholder="请输入邮箱注册验证码"
maxlength="6"
autocomplete="off"
></el-input>
></el-input> -->
<!-- 短信验证码 -->
<div class="phoneCode">
<span class="code" v-show="showCode" @click="getCode"
>获取邮箱验证码</span
>获取验证码</span
>
<span v-show="!showCode" class="count">{{ count }} s</span>
</div>
......@@ -139,7 +139,7 @@ export default {
isShowPwd: true, // 控制密码显示隐藏
registerForm: {
phone: "",
email: "",
// email: "",
code: "",
password: "",
rq_password: "",
......@@ -161,13 +161,13 @@ export default {
},
],
// 对邮箱验证
email: [
{ required: true, message: "请输入邮箱", trigger: "blur" },
{
validator: validator.validateEmail,
trigger: "blur",
},
],
// email: [
// { required: true, message: "请输入邮箱", trigger: "blur" },
// {
// validator: validator.validateEmail,
// trigger: "blur",
// },
// ],
// 对验证码进行校验
code: [
{ required: true, message: "请输入验证码", trigger: "blur" },
......@@ -257,16 +257,15 @@ export default {
},
// 获取手机验证短信
getCode() {
if (!this.registerForm.email) {
if (!this.registerForm.phone) {
return this.$message.error("请输入邮箱");
}
// if (!this.codeTime) {
// return this.$message.error("您已经获取验证码，请去邮箱中进行查看");
// }
// 接口获得验证码
registerEmailCode({
email: this.registerForm.email,
registerCode({
phone: this.registerForm.phone,
}).then((res) => {
console.log(res, "passwordCode");
if (res.data.code != 200) {
......@@ -290,7 +289,7 @@ export default {
if (!valid) return;
setAccountInfo({
phone: this.registerForm.phone,
email: this.registerForm.email,
// email: this.registerForm.email,
code: this.registerForm.code,
password: this.registerForm.password,
rq_password: this.registerForm.rq_password,
......@@ -304,7 +303,7 @@ export default {
// token存储
window.localStorage.setItem("index-token" + code, res.data.token);
window.localStorage.setItem("phone" + code, this.registerForm.phone);
window.localStorage.setItem("email" + code, this.registerForm.email);
// window.localStorage.setItem("email" + code, this.registerForm.email);
// 报名信息
window.localStorage.setItem("camp_name" + code, res.data.cam.name);
//获取主题色
......
src/views/index/login/Reset.vue
View file @ 13401a66
......@@ -19,22 +19,22 @@
autocomplete="off"
></el-input>
</el-form-item>
<el-form-item prop="email">
<!-- <el-form-item prop="email">
<img class="img_l" src="@/assets/img/reset/username.png" alt="" />
<el-input
v-model="resetForm.email"
placeholder="请输入邮箱"
autocomplete="off"
></el-input>
</el-form-item>
<!-- <el-form-item prop="code">
</el-form-item> -->
<el-form-item prop="code">
<img class="img_l" src="@/assets/img/reset/code.png" alt="" />
<el-input
v-model="resetForm.code"
placeholder="请输入短信验证码"
maxlength="20"
autocomplete="off"
></el-input> -->
></el-input>
<!-- 短信验证码 -->
<!-- <div class="phoneCode">
<span class="code" v-show="showCode" @click="getCode"
......@@ -43,18 +43,18 @@
<span v-show="!showCode" class="count">{{ count }} s</span>
</div>
</el-form-item> -->
<el-form-item prop="code">
<!-- <el-form-item prop="code">
<img class="img_l" src="@/assets/img/reset/code.png" alt="" />
<el-input
v-model="resetForm.code"
placeholder="请输入邮箱验证码"
maxlength="6"
autocomplete="off"
></el-input>
></el-input> -->
<!-- 短信验证码 -->
<div class="phoneCode">
<span class="code" v-show="showCode" @click="getCode"
>获取邮箱验证码</span
>获取验证码</span
>
<span v-show="!showCode" class="count">{{ count }} s</span>
</div>
......@@ -107,7 +107,7 @@
<script>
/* eslint-disable */
// 请求接口
import { passwordEmailCode } from "r/index/register";
import { passwordCode } from "r/index/register";
import { changePassCode } from "r/index/login";
import { mobileCheck } from "@/common/utils.js";
import { intervalTime } from "store/time";
......@@ -132,7 +132,7 @@ export default {
isShowPwd: true, // 控制密码显示隐藏
resetForm: {
phone: "",
email: "",
// email: "",
code: "",
password: "",
rq_password: "",
......@@ -154,13 +154,13 @@ export default {
},
],
// 对邮箱验证
email: [
{ required: true, message: "请输入邮箱", trigger: "blur" },
{
validator: validator.validateEmail,
trigger: "blur",
},
],
// email: [
// { required: true, message: "请输入邮箱", trigger: "blur" },
// {
// validator: validator.validateEmail,
// trigger: "blur",
// },
// ],
// 对验证码进行校验
code: [
{ required: true, message: "请输入验证码", trigger: "blur" },
......@@ -250,16 +250,16 @@ export default {
},
// 获取手机验证短信
getCode() {
if (!this.resetForm.email) {
return this.$message.error("请输入邮箱");
if (!this.resetForm.phone) {
return this.$message.error("请输入手机号");
}
// if (!this.codeTime) {
// return this.$message.error("您已经获取验证码，请去邮箱中进行查看");
// }
// 接口获得验证码
passwordEmailCode({
passwordCode({
phone: this.resetForm.phone,
email: this.resetForm.email,
// email: this.resetForm.email,
}).then((res) => {
console.log(res, "passwordCode");
if (res.data.code != 200) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment