Skip to content

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

11

parent 21f26f0d
Hide whitespace changes
Inline Side-by-side
Showing with 180 additions and 106 deletions
src/common/validator.js
View file @ cce550be
......@@ -24,12 +24,11 @@ export default {
},
validateid_card: function (rule, value, callback) {
console.log(value, 'sss')
// console.log(value, 'sss')
if (!/(^\d{15}$)|(^\d{17}(\d|X|x)$)/.test(value)) {
callback(new Error("你输入的身份证长度或格式错误"));
callback(new Error("你输入的身份证长度或格式错误"));
}
callback();
callback();
},
// 数字验证
validateNumber: function (rule, value, callback) {
......@@ -49,6 +48,7 @@ export default {
},
// 邮箱验证
validateEmail: function (rule, value, callback) {
console.log(value,'ssss')
if (!emailReg.test(value)) {
callback(new Error('邮箱格式错误！'))
} else {
......
src/components/index/Header.vue
View file @ cce550be
......@@ -115,6 +115,7 @@ export default {
window.localStorage.removeItem("examine_reason" + code);
window.localStorage.removeItem("sign_up_file_18355151517" + code);
window.localStorage.removeItem("schoolName" + code);
// window.localStorage.removeItem("restet_code_time" + code, )
this.isLogin = false;
},
onMouserEnter(val) {
......
src/components/index/SignUp/referInfo.vue
View file @ cce550be
......@@ -179,7 +179,7 @@
v-model="phone"
placeholder="请输入手机号"
size="small"
:disabled="true"
disabled="true"
/>
</el-form-item>
</el-col>
......@@ -190,7 +190,7 @@
v-model="referForm.email"
placeholder="填写电子邮箱"
size="small"
clearable
disabled="true"
/>
</el-form-item>
</el-col>
......@@ -563,6 +563,7 @@ export default {
created() {
const code = this.$store.state.indexIdentity;
this.phone = window.localStorage.getItem("phone" + code); //本地取用户手机号
this.referForm.email = window.localStorage.getItem("email" + code); //本地取用户手机号
let signUpFile = window.localStorage.getItem(
"sign_up_file_" + window.localStorage.getItem("phone" + code) + code
);
......@@ -917,7 +918,7 @@ export default {
// 下载证明资料图片
handleDownload(file) {
// console.log(file,'file22');
window.location.href=file.url
window.location.href = file.url;
},
//删除图片
handleRemove(file) {
......
src/request/index/login.js
View file @ cce550be
......@@ -71,3 +71,4 @@ export function changePassCode(data) {
data
})
}
src/request/index/network.js
View file @ cce550be
......@@ -109,6 +109,7 @@ export function request(config) {
const passMsgOld = '/web/auth/changePassOld';
const getCam = '/web/auth/getCam';
const registerCode = '/web/code/registerCode';
const passwordEmailCode = 'web/code/passwordEmailCode';
const passwordCode = '/web/code/passwordCode';
const changePassCode = '/web/auth/changePassCode';
const loginOut = '/web/auth/loginOut';
......@@ -120,6 +121,7 @@ export function request(config) {
config.url.indexOf(passMsgOld) != -1 ||
config.url.indexOf(getCam) != -1 ||
config.url.indexOf(registerCode) != -1 ||
config.url.indexOf(passwordEmailCode) != -1 ||
config.url.indexOf(changePassCode) != -1 ||
config.url.indexOf(passwordCode) != -1 ||
config.url.indexOf(loginOut) != -1
......@@ -182,13 +184,13 @@ export function request(config) {
instance.interceptors.response.use(
(res) => {
// console.log(res, '11111')
console.log(res, '11111')
// console.log(res.data.code, 'res.data.code')
if (res.data.code == 400034 ||
res.data.code == 400035 ||
// res.data.code == 400001 ||
res.data.code == 400002 ||
res.data.code == 400003) {
res.data.code == 400035 ||
// res.data.code == 400001 ||
res.data.code == 400002 ||
res.data.code == 400003) {
router.push({
path: '/' + store.state.indexIdentity,
......@@ -201,7 +203,7 @@ export function request(config) {
});
return
}
if (res.data.code == 400023 ) {
if (res.data.code == 400023) {
// console.log(store.state.indexIdentity, 'store.state.indexIdentity')
let code = store.state.indexIdentity;
window.localStorage.removeItem("doubt_code" + code);
......@@ -221,6 +223,7 @@ export function request(config) {
window.localStorage.removeItem("examine_reason" + code);
window.localStorage.removeItem("sign_up_file_18355151517" + code);
window.localStorage.removeItem("schoolName" + code);
window.localStorage.removeItem("restet_code_time" + code, )
router.push({
path: '/' + store.state.indexIdentity,
......@@ -274,7 +277,8 @@ export function request(config) {
return res
},
(error) => {
console.log(error.response.status, '5555')
// console.log(error, 'err')
// console.log(error.response.status, '5555')
Message.closeAll()
if (error.response.status === 404) {
// return this.$message.error("营地报名已结束")
......
src/request/index/register.js
View file @ cce550be
......@@ -5,14 +5,22 @@ import {
} from './network'
import store from '@/store'
// 通过邮箱验证码找回密码
export function passwordEmailCode(data) {
data['identity'] = store.state.indexIdentity;
return request({
method: 'post',
url: 'web/code/passwordEmailCode',
params: data
})
}
// 发送注册时候验证码
export function registerCode(data) {
data['identity'] = store.state.indexIdentity;
return request({
method: 'post',
url: '/web/code/registerCode',
params:data
params: data
})
}
export function passwordCode(data) {
......@@ -20,7 +28,7 @@ export function passwordCode(data) {
return request({
method: 'post',
url: '/web/code/passwordCode',
params:data
params: data
})
}
......
src/router/index.js
View file @ cce550be
......@@ -22,45 +22,45 @@ Vue.use(VueRouter)
const routes = [{
path: '/login',
name: 'loginIndex',
meta: {
title: '登录'
path: '/login',
name: 'loginIndex',
meta: {
title: '登录'
},
component: () =>
import('v/index/login/Index.vue'),
children: [...indexLogin]
},
component: () =>
import('v/index/login/Index.vue'),
children: [...indexLogin]
},
{
path: '/',
name: 'cerificateIndex',
meta: {
title: '营地报名'
{
path: '/',
name: 'cerificateIndex',
meta: {
title: '营地报名'
},
// redirect: '/cerificate/signUp',
component: () =>
import('v/index/camp/Index.vue'),
children: [...indexCamp]
},
// redirect: '/cerificate/signUp',
component: () =>
import('v/index/camp/Index.vue'),
children: [...indexCamp]
},
{
path: '/:code',
name: 'recruit',
meta: {
title: ''
{
path: '/:code',
name: 'recruit',
meta: {
title: ''
},
component: () =>
import('v/index/recruit/Index.vue')
},
component: () =>
import('v/index/recruit/Index.vue')
},
{
path: "/404",
name: "notFound",
component: () =>
import('v/index/notFound.vue'),
}, {
path: "*", // 此处需特别注意置于最底部
redirect: "/404"
}
{
path: "/404",
name: "notFound",
component: () =>
import('v/index/notFound.vue'),
}, {
path: "*", // 此处需特别注意置于最底部
redirect: "/404"
}
]
......@@ -95,7 +95,7 @@ function checkCam(code, cb) {
// console.log(cb, 'cb')
// const code=store.status.indexIdentity
store.state.indexIdentity = code;
console.log(code, 'code')
// console.log(code, 'code11111')
if (!code) {
Message({
message: "请访问正确的营地链接地址",
......@@ -106,7 +106,7 @@ function checkCam(code, cb) {
}
getCam(code).then((res) => {
console.log(res)
// console.log(res)
// if (res.data.code != 200) {
// Message({
// message: "请访问正确的营地链接地址",
......@@ -122,7 +122,7 @@ function checkCam(code, cb) {
// return false;
// }
// }
let root = document.querySelector(":root");
root.style.setProperty("--color", res.data.system_color);
root.style.setProperty("--bk_pic", res.data.background_picture); //当前营地的背景图
......
src/views/index/login/Login.vue
View file @ cce550be
......@@ -52,9 +52,11 @@
<el-button @click="submitForm()">登 录</el-button>
</el-form-item>
<div class="box">
<div class="fr" @click="register()">还没有账号？立即注册</div>
<div>
<div class="fr" @click="register()">还没有账号？立即注册</div>
<div class="fl" @click="forgetPwd()">忘记密码？</div>
</div>
<div class="fc">忘记密码请联系管理员邮箱：ydhdservice@163.com</div>
<!-- <div class="fl" @click="forgetPwd()">忘记密码？</div> -->
</div>
</el-form>
</div>
......@@ -164,6 +166,7 @@ export default {
// token存储
window.localStorage.setItem("index-token" + code, res.data.token);
window.localStorage.setItem("phone" + code, this.loginForm.phone);
window.localStorage.setItem("email" + code, res.data.email);
// 报名信息
window.localStorage.setItem("camp_name" + code, res.data.cam.name);
//获取主题色
......@@ -261,18 +264,18 @@ export default {
// display: block;
display: flex;
flex-direction: column;
// .fl {
// float: right;
// height: 18px;
// line-height: 18px;
// color: #999999;
// margin-top: -10px;
// cursor: pointer;
// &:hover {
// color: #563279;
// text-decoration: underline;
// }
// }
.fl {
float: right;
height: 18px;
line-height: 18px;
color: #999999;
margin-top: -10px;
cursor: pointer;
&:hover {
color: var(--color);
text-decoration: underline;
}
}
.fr {
float: left;
height: 18px;
......
src/views/index/login/Register.vue
View file @ cce550be
......@@ -19,6 +19,15 @@
autocomplete="off"
></el-input>
</el-form-item>
<el-form-item prop="email">
<img class="img_l" src="@/assets/img/reset/username.png" alt="" />
<el-input
v-model="registerForm.email"
placeholder="请输入邮箱"
maxlength="20"
autocomplete="off"
></el-input>
</el-form-item>
<!-- <el-form-item prop="code">
<img class="img_l" src="@/assets/img/reset/code.png" alt="" />
<el-input
......@@ -83,11 +92,10 @@
<script>
/* eslint-disable */
// 请求接口
import Cookie from "js-cookie";
import { registerCode, setAccountInfo } from "r/index/register";
import { mobileCheck, checkStrong } from "@/common/utils.js";
import { validatePassword } from "@/common/validator";
import { intervalTime } from "store/time";
import validator from "common/validator";
export default {
name: "index-register",
......@@ -109,7 +117,8 @@ export default {
isShowPwd: true, // 控制密码显示隐藏
registerForm: {
phone: "",
code: "",
// code: "",
email: "",
password: "",
rq_password: "",
},
......@@ -129,6 +138,14 @@ export default {
trigger: "blur",
},
],
// 对邮箱验证
email: [
{ required: true, message: "请输入邮箱", trigger: "blur" },
{
validator: validator.validateEmail,
trigger: "blur",
},
],
// 对验证码进行校验
// code: [
// { required: true, message: "请输入验证码", trigger: "blur" },
......@@ -248,6 +265,7 @@ export default {
if (!valid) return;
setAccountInfo({
phone: this.registerForm.phone,
email: this.registerForm.email,
// code: this.registerForm.code,
password: this.registerForm.password,
rq_password: this.registerForm.rq_password,
......@@ -261,6 +279,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("camp_name" + code, res.data.cam.name);
//获取主题色
......
src/views/index/login/Reset.vue
View file @ cce550be
......@@ -19,18 +19,43 @@
autocomplete="off"
></el-input>
</el-form-item>
<el-form-item prop="code">
<el-form-item prop="email">
<img class="img_l" src="@/assets/img/reset/username.png" alt="" />
<el-input
v-model="resetForm.email"
placeholder="请输入邮箱"
maxlength="20"
autocomplete="off"
></el-input>
</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> -->
<!-- 短信验证码 -->
<!-- <div class="phoneCode">
<span class="code" v-show="showCode" @click="getCode"
>获取验证码</span
>
<span v-show="!showCode" class="count">{{ count }} s</span>
</div>
</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>
<!-- 短信验证码 -->
<div class="phoneCode">
<span class="code" v-show="showCode" @click="getCode"
>获取验证码</span
>获取邮箱验证码</span
>
<span v-show="!showCode" class="count">{{ count }} s</span>
</div>
......@@ -83,13 +108,11 @@
<script>
/* eslint-disable */
// 请求接口
import Cookie from "js-cookie"
import { passwordCode } from "r/index/register";
import { passwordEmailCode } from "r/index/register";
import { changePassCode } from "r/index/login";
import { mobileCheck } from "@/common/utils.js";
import { parseTime } from "common/utils";
import { intervalTime } from "store/time";
import { timeSpan } from "common/utils";
import validator from "common/validator";
export default {
name: "index-reset",
......@@ -110,6 +133,7 @@ export default {
codeTime: "", //手机验证码倒计时时间
resetForm: {
phone: "",
email: "",
code: "",
password: "",
rq_password: "",
......@@ -130,11 +154,19 @@ export default {
trigger: "blur",
},
],
// 对验证码进行校验
code: [
{ required: true, message: "请输入验证码", trigger: "blur" },
{ min: 6, max: 20, message: "请输入正确的验证码", trigger: "blur" },
// 对邮箱验证
email: [
{ required: true, message: "请输入邮箱", trigger: "blur" },
{
validator: validator.validateEmail,
trigger: "blur",
},
],
// 对验证码进行校验
// code: [
// { required: true, message: "请输入验证码", trigger: "blur" },
// { min: 6, max: 20, message: "请输入正确的验证码", trigger: "blur" },
// ],
// 对密码进行校验
password: [
{
......@@ -180,8 +212,9 @@ export default {
};
},
created() {
const endTime = window.localStorage.getItem("restet_code_time");
const phone = window.localStorage.getItem("restet_code_phone");
const code = this.$store.state.indexIdentity;
const endTime = window.localStorage.getItem("restet_code_time" + code);
const phone = window.localStorage.getItem("restet_code_phone" + code);
if (endTime && Number(endTime) > new Date().getTime()) {
this.resetForm.phone = phone;
this.intervalHandle(new Date(), Number(endTime));
......@@ -191,7 +224,7 @@ export default {
// 去注册
toLogin() {
let code = this.$store.state.indexIdentity;
this.$router.push("/login?code="+code);
this.$router.push("/login?code=" + code);
},
// 改变密码显示状态
changePwdStatus() {
......@@ -203,7 +236,7 @@ export default {
const timeLag = intervalTime(startTime, endTime);
console.log(timeLag);
if (!this.timer) {
this.count = timeLag-1;
this.count = timeLag - 1;
this.showCode = false;
this.timer = setInterval(() => {
if (this.count > 0 && this.count <= timeLag) {
......@@ -218,28 +251,28 @@ export default {
},
// 获取手机验证短信
getCode() {
if (!this.resetForm.phone) {
return this.$message.error("请输入手机号");
if (!this.resetForm.email) {
return this.$message.error("请输入邮箱");
}
// if (!this.codeTime) {
// return this.$message.error("您已经获取验证码，请去邮箱中进行查看");
// }
// 接口获得验证码
passwordCode({
phone: this.resetForm.phone,
passwordEmailCode({
email: this.resetForm.email,
}).then((res) => {
console.log(res, "passwordCode");
if (res.data.code != 200) {
return this.$message.error(res.data.message);
}
this.$message.success(res.data.message);
// this.codeTime = parseTime(res.data.data.now);
this.codeTime = res.data.data.now * 1000;
// console.log(this.codeTime)
let code = this.$store.state.indexIdentity;
window.localStorage.setItem(
"restet_code_time",
"restet_code_time" + code,
res.data.data.now * 1000
);
window.localStorage.setItem(
"restet_code_phone",
this.resetForm.phone
);
this.intervalHandle(new Date(), res.data.data.now * 1000);
});
},
......@@ -250,6 +283,7 @@ export default {
if (!valid) return;
changePassCode({
phone: this.resetForm.phone,
email: this.resetForm.email,
code: this.resetForm.code,
password: this.resetForm.password,
rq_password: this.resetForm.rq_password,
......@@ -258,11 +292,15 @@ export default {
if (res.data.code != 200) {
return this.$message.error(res.data.message);
}
// this.$message.success(res.data.message);
this.$message.success(res.data.message);
// token存储
let code = this.$store.state.indexIdentity;
window.localStorage.setItem("index-token"+code, res.token);
this.$router.push("/login?code="+code);
// window.localStorage.setItem("index-token" + code, res.token);
window.localStorage.setItem(
"restet_code_phone" + code,
this.resetForm.phone
);
this.$router.push("/login?code=" + code);
});
});
},
......@@ -271,7 +309,6 @@ export default {
</script>
<style scoped lang="scss">
// 注册输入
.container {
background: #ffffff;
......@@ -353,7 +390,7 @@ export default {
border-bottom: 2px solid #d9d9d9;
&:focus {
border-bottom-color:var(--color);
border-bottom-color: var(--color);
}
}
......@@ -391,7 +428,7 @@ export default {
cursor: pointer;
&:hover {
color: #563279;
color: var(--color);
text-decoration: underline;
}
}
......
src/views/index/recruit/Index.vue
View file @ cce550be
......@@ -64,8 +64,8 @@ export default {
this.info = this.$store.state.info;
let code =this.$store.state.indexIdentity
getCamInfo(code).then((res) => {
console.log(res, '33333')
console.log(res.data.name, 'res.name')
// console.log(res, '33333')
// console.log(res.data.name, 'res.name')
document.title = res.data.name
return false;
})
......
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