Skip to content

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

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

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