Commit 88538974 authored by 杨梦雪's avatar 杨梦雪

2

parent e06d3428
...@@ -70,7 +70,7 @@ export default { ...@@ -70,7 +70,7 @@ export default {
const item = newArr[i]; const item = newArr[i];
if ( if (
(doubt_code == 0 && item.status == 1) || (doubt_code == 0 && item.status == 1) ||
(doubt_info == 0 && item.status == 2) || (doubt_info == 0 && item.status == 2)||
(doubt_check == 0 && item.status == 3) (doubt_check == 0 && item.status == 3)
) { ) {
} else { } else {
...@@ -81,7 +81,7 @@ export default { ...@@ -81,7 +81,7 @@ export default {
}, },
watch: { watch: {
statusNum(val) { statusNum(val) {
// console.log(val, "statusNum"); console.log(val, "statusNum");
this.status = val; this.status = val;
}, },
}, },
......
...@@ -93,7 +93,7 @@ export default { ...@@ -93,7 +93,7 @@ export default {
font-size: 12px; font-size: 12px;
font-weight: 400; font-weight: 400;
margin-right: 20px; margin-right: 20px;
color: #333333; color: #FFFFFF;
text-decoration: none; text-decoration: none;
img { img {
width: 15px; width: 15px;
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
</template> </template>
<script> <script>
/* eslint-disable */ /* eslint-disable */
import Cookie from "js-cookie" import Cookie from "js-cookie";
import { logout } from "r/index/login"; import { logout } from "r/index/login";
export default { export default {
...@@ -50,11 +50,14 @@ export default { ...@@ -50,11 +50,14 @@ export default {
isHover: true, isHover: true,
system_logo: window.localStorage.getItem("system_logo"), system_logo: window.localStorage.getItem("system_logo"),
isLogin: false, isLogin: false,
phone: window.localStorage.getItem("phone"), phone: window.localStorage.getItem(
"phone" + Cookie.get("index-identity")
),
}; };
}, },
created() { created() {
this.isLogin = !!localStorage.getItem("index-token"); let code = Cookie.get("index-identity");
this.isLogin = !!localStorage.getItem("index-token" + code);
}, },
methods: { methods: {
toLogin() { toLogin() {
......
...@@ -60,7 +60,7 @@ export default { ...@@ -60,7 +60,7 @@ export default {
}; };
}, },
created() { created() {
this.token = window.localStorage.getItem("index-token"); this.token = window.localStorage.getItem("index-token"+code);
this.has_amount = window.localStorage.getItem("has_amount"); this.has_amount = window.localStorage.getItem("has_amount");
}, },
methods: { methods: {
...@@ -131,7 +131,7 @@ export default { ...@@ -131,7 +131,7 @@ export default {
return; return;
} else { } else {
if (!this.token || this.token == "") { if (!this.token || this.token == "") {
this.token = window.localStorage.getItem("index-token"); this.token = window.localStorage.getItem("index-token"+code);
} }
let token = this.token; let token = this.token;
const wssURL = SERVER_WS_URL + "/order?token=" + token + "&channel=pc"; const wssURL = SERVER_WS_URL + "/order?token=" + token + "&channel=pc";
......
...@@ -30,7 +30,7 @@ export default { ...@@ -30,7 +30,7 @@ export default {
name: "Header", name: "Header",
data() { data() {
return { return {
phone: window.localStorage.getItem("phone"), phone: window.localStorage.getItem("phone"+Cookie.get("index-identity")),
system_logo: window.localStorage.getItem("system_logo"), system_logo: window.localStorage.getItem("system_logo"),
}; };
}, },
...@@ -55,41 +55,13 @@ export default { ...@@ -55,41 +55,13 @@ export default {
// if (res.code !== 200) return this.$message.error(res.message); // if (res.code !== 200) return this.$message.error(res.message);
// 清除本地缓存除了大学logo // 清除本地缓存除了大学logo
window.localStorage.clear(); window.localStorage.clear();
// window.localStorage.removeItem("doubt_code");
// window.localStorage.removeItem("doubt_info");
// window.localStorage.removeItem("doubt_check");
// window.localStorage.removeItem("index-identity");
// window.localStorage.removeItem("index-token");
// window.localStorage.removeItem("phone");
// window.localStorage.removeItem("camp_name");
// window.localStorage.removeItem("system_color");
// window.localStorage.removeItem("has_amount");
// window.localStorage.removeItem("campsite_id");
// window.localStorage.removeItem("order_no");
// window.localStorage.removeItem("campindex_type");
// this.$store.state.token = "";
// 使用编程式导航跳转到登录页面
// this.$router.push({ name: "recruit" });
let code = Cookie.get("index-identity"); let code = Cookie.get("index-identity");
this.$router.replace("/"+code); this.$router.replace("/"+code);
}, },
// 点击图片跳转到招生简章页面 // 点击图片跳转到招生简章页面
toRecruit() { toRecruit() {
// 清除本地缓存除了大学logo // 清除本地缓存除了大学logo
// window.localStorage.clear();
// window.localStorage.removeItem("doubt_code");
// window.localStorage.removeItem("doubt_info");
// window.localStorage.removeItem("doubt_check");
// window.localStorage.removeItem("index-identity");
// window.localStorage.removeItem("index-token");
// window.localStorage.removeItem("phone");
// window.localStorage.removeItem("camp_name");
// window.localStorage.removeItem("system_color");
// window.localStorage.removeItem("has_amount");
// window.localStorage.removeItem("campsite_id");
// window.localStorage.removeItem("order_no");
// window.localStorage.removeItem("campindex_type");
// this.$store.state.token = "";
let code = Cookie.get("index-identity"); let code = Cookie.get("index-identity");
this.$router.replace("/"+code); this.$router.replace("/"+code);
}, },
......
...@@ -33,7 +33,6 @@ export default { ...@@ -33,7 +33,6 @@ export default {
}; };
}, },
created() { created() {
// let url = location.href; //把当前页面的地址赋给变量 url // let url = location.href; //把当前页面的地址赋给变量 url
// console.log(url) // console.log(url)
// var times = url.split("?"); //分切变量 url 分隔符号为 "?" // var times = url.split("?"); //分切变量 url 分隔符号为 "?"
...@@ -43,16 +42,16 @@ export default { ...@@ -43,16 +42,16 @@ export default {
// url += "?1"; //把变量 url 的值加入 ?1 // url += "?1"; //把变量 url 的值加入 ?1
// self.location.replace(url); //刷新页面 // self.location.replace(url); //刷新页面
// } // }
this.signUpInit() this.signUpInit();
}, },
watch: {}, watch: {},
methods: { methods: {
paying() { paying() {
this.$emit("is_next", 1); this.$emit("is_next", 1);
// console.log(is_next); // console.log(is_next);
}, },
signUpInit(status_val) { signUpInit(status_val) {
// console.log(status_val, "11111"); // console.log(status_val, "11111");
// console.log(isNexts, "2222"); // console.log(isNexts, "2222");
...@@ -146,12 +145,13 @@ export default { ...@@ -146,12 +145,13 @@ export default {
let fileList = []; let fileList = [];
fileList = arr.map((item) => { fileList = arr.map((item) => {
let obj = { let obj = {
url: item url: item,
}; };
return obj return obj;
}); });
const code = Cookie.get("index-identity");
window.localStorage.setItem( window.localStorage.setItem(
"sign_up_file_" + window.localStorage.getItem("phone"), "sign_up_file_" + window.localStorage.getItem("phone" + code),
JSON.stringify(fileList) JSON.stringify(fileList)
); //上传的图片 ); //上传的图片
} }
......
...@@ -527,8 +527,9 @@ export default { ...@@ -527,8 +527,9 @@ export default {
mounted() {}, mounted() {},
created() { created() {
// this.phone = window.localStorage.getItem("phone"); //本地取用户手机号 // this.phone = window.localStorage.getItem("phone"); //本地取用户手机号
const code = Cookie.get("index-identity");
let signUpFile = window.localStorage.getItem( let signUpFile = window.localStorage.getItem(
"sign_up_file_" + window.localStorage.getItem("phone") "sign_up_file_" + window.localStorage.getItem("phone"+code)
); );
// console.log(signUpFile) // console.log(signUpFile)
if (signUpFile && JSON.parse(signUpFile).length > 0) { if (signUpFile && JSON.parse(signUpFile).length > 0) {
...@@ -873,7 +874,7 @@ export default { ...@@ -873,7 +874,7 @@ export default {
// console.log(this.fileList, " this.fileList"); // console.log(this.fileList, " this.fileList");
window.localStorage.setItem( window.localStorage.setItem(
"sign_up_file_" + +window.localStorage.getItem("phone"), "sign_up_file_" + +window.localStorage.getItem("phone"+code),
JSON.stringify(this.fileList) JSON.stringify(this.fileList)
); );
}) })
...@@ -917,7 +918,7 @@ export default { ...@@ -917,7 +918,7 @@ export default {
if (item.url == file.url) { if (item.url == file.url) {
this.fileList.splice(idx, 1); this.fileList.splice(idx, 1);
window.localStorage.setItem( window.localStorage.setItem(
"sign_up_file_" + window.localStorage.getItem("phone"), "sign_up_file_" + window.localStorage.getItem("phone"+code),
JSON.stringify(this.fileList) JSON.stringify(this.fileList)
); );
} }
......
...@@ -37,7 +37,7 @@ instance.interceptors.request.use( ...@@ -37,7 +37,7 @@ instance.interceptors.request.use(
} }
// 调用接口请求添加token认证信息 // 调用接口请求添加token认证信息
// let token = localStorage.getItem("index-token"); // let token = localStorage.getItem("index-token");
const token = localStorage.getItem('index-token') const token = localStorage.getItem('index-token'+code)
// //
config.headers.token = token config.headers.token = token
...@@ -110,7 +110,7 @@ export function request(config) { ...@@ -110,7 +110,7 @@ export function request(config) {
const passwordCode = '/web/code/passwordCode'; const passwordCode = '/web/code/passwordCode';
const changePassCode = '/web/auth/changePassCode'; const changePassCode = '/web/auth/changePassCode';
const loginOut = '/web/auth/loginOut'; const loginOut = '/web/auth/loginOut';
// console.log(config) // console.log(config)
if ( if (
config.url.indexOf(loginUrl) != -1 || config.url.indexOf(loginUrl) != -1 ||
...@@ -124,10 +124,13 @@ export function request(config) { ...@@ -124,10 +124,13 @@ export function request(config) {
) { ) {
return config return config
} }
const token = localStorage.getItem('index-token') const token = localStorage.getItem('index-token'+code)
if (token) {
// console.log(token)
if (token ) {
// console.log(token,'11')
config.headers.token = token config.headers.token = token
} else { } else {
window.localStorage.clear() window.localStorage.clear()
router.push({ router.push({
......
...@@ -90,6 +90,8 @@ router.onError((error) => { ...@@ -90,6 +90,8 @@ router.onError((error) => {
}) })
function checkCam(code, cb) { function checkCam(code, cb) {
// console.log(code, 'code')
// console.log(cb, 'cb')
if (!code) { if (!code) {
Message({ Message({
message: "请访问正确的营地链接地址", message: "请访问正确的营地链接地址",
...@@ -107,7 +109,8 @@ function checkCam(code, cb) { ...@@ -107,7 +109,8 @@ function checkCam(code, cb) {
cb && cb(false); cb && cb(false);
return false; return false;
} }
code && Cookie.set("index-identity", code); store.state.indexIdentity = code;
// this.$message.success(res.data.message); // this.$message.success(res.data.message);
let root = document.querySelector(":root"); let root = document.querySelector(":root");
root.style.setProperty("--color", res.data.system_color); root.style.setProperty("--color", res.data.system_color);
...@@ -135,22 +138,22 @@ function checkCam(code, cb) { ...@@ -135,22 +138,22 @@ function checkCam(code, cb) {
} }
router.beforeEach((to, from, next) => { router.beforeEach((to, from, next) => {
let tokenKey = "index-token", let
toLogin = "/login", toLogin = "/login",
toRegister = "/register", toRegister = "/register",
toReset = "/reset" toReset = "/reset"
let token = localStorage.getItem(tokenKey);
let code = false; let code = false;
document.title = to.meta.title; document.title = to.meta.title;
if (to.path == toLogin || to.path == toRegister || to.path == toReset) { if (to.path == toLogin || to.path == toRegister || to.path == toReset) {
// nextUrl = false;
code = to.params.code ? to.params.code : to.query.code; code = to.params.code ? to.params.code : to.query.code;
checkCam(code, (res) => { checkCam(code, (res) => {
if (res) { if (res) {
let token = window.localStorage.getItem("index-token" + code);
console.log(token, "token")
//检查登陆情况 //检查登陆情况
if(token){ if (token) {
next("/"+code); next("/" + code);
}else { } else {
return next(); return next();
} }
} }
...@@ -164,16 +167,21 @@ router.beforeEach((to, from, next) => { ...@@ -164,16 +167,21 @@ router.beforeEach((to, from, next) => {
}); });
} else { } else {
code = to.params.code ? to.params.code : to.query.code;
let token = window.localStorage.getItem("index-token" + code);
if (!token) { if (!token) {
console.log(token, 'token')
return next(toLogin); return next(toLogin);
} else { } else {
code = to.params.code ? to.params.code : to.query.code;
checkCam(code, (res) => { checkCam(code, (res) => {
if (res) { if (res) {
if(token){ if (token) {
return next(); return next();
}else { } else {
next("/"+code); next("/" + code);
} }
} }
}); });
......
...@@ -13,6 +13,7 @@ let state = { ...@@ -13,6 +13,7 @@ let state = {
// 数据 // 数据
data: [], data: [],
token: '', token: '',
indexIdentity:"",
showDialog: false, showDialog: false,
dialogType: 0, dialogType: 0,
info:{}, info:{},
......
...@@ -28,6 +28,7 @@ import Pass from "c/index/SignUp/pass"; ...@@ -28,6 +28,7 @@ import Pass from "c/index/SignUp/pass";
import Paying from "c/index/SignUp/paying"; import Paying from "c/index/SignUp/paying";
import Success from "c/index/SignUp/success"; import Success from "c/index/SignUp/success";
import { signUpInit } from "r/index/signUp"; import { signUpInit } from "r/index/signUp";
import Cookie from "js-cookie";
export default { export default {
name: "signUp", name: "signUp",
...@@ -70,7 +71,7 @@ export default { ...@@ -70,7 +71,7 @@ export default {
deep: true, deep: true,
}, },
status(val) { status(val) {
// console.log(val, "status"); console.log(val, "status");
}, },
}, },
methods: { methods: {
...@@ -180,12 +181,13 @@ export default { ...@@ -180,12 +181,13 @@ export default {
let fileList = []; let fileList = [];
fileList = arr.map((item) => { fileList = arr.map((item) => {
let obj = { let obj = {
url: item url: item,
}; };
return obj return obj;
}); });
const code = Cookie.get("index-identity");
window.localStorage.setItem( window.localStorage.setItem(
"sign_up_file_" + window.localStorage.getItem("phone"), "sign_up_file_" + window.localStorage.getItem("phone" + code),
JSON.stringify(fileList) JSON.stringify(fileList)
); //上传的图片 ); //上传的图片
} }
......
<template> <template>
<div class="container"> <div class="container">
<div class="title">账号密码登录</div> <div class="title">账号密码登录</div>
<div class="line"></div> <div class="line"></div>
<el-form <el-form
:model="loginForm" :model="loginForm"
:rules="loginFormRules" :rules="loginFormRules"
ref="loginFormRef" ref="loginFormRef"
class="demo-ruleForm" class="demo-ruleForm"
> >
<el-form-item prop="phone"> <el-form-item prop="phone">
<img <img
class="img_l" class="img_l"
src="../../../assets/img/login/username.png" src="../../../assets/img/login/username.png"
alt="" alt=""
/> />
<el-input <el-input
v-model="loginForm.phone" v-model="loginForm.phone"
placeholder="请输入手机号" placeholder="请输入手机号"
maxlength="20" maxlength="20"
></el-input> ></el-input>
</el-form-item> </el-form-item>
<el-form-item prop="password"> <el-form-item prop="password">
<img <img
class="img_l" class="img_l"
src="../../../assets/img/login/password.png" src="../../../assets/img/login/password.png"
alt="" alt=""
/> />
<el-input <el-input
v-model="loginForm.password" v-model="loginForm.password"
:type="isShowPwd ? 'password' : 'text'" :type="isShowPwd ? 'password' : 'text'"
maxlength="20" maxlength="20"
placeholder="请输入密码" placeholder="请输入密码"
></el-input> ></el-input>
<img <img
@click="changePwdStatus()" @click="changePwdStatus()"
v-if="!isShowPwd" v-if="!isShowPwd"
class="img_r" class="img_r"
src="../../../assets/img/login/eye01.png" src="../../../assets/img/login/eye01.png"
alt="" alt=""
/> />
<img <img
@click="changePwdStatus()" @click="changePwdStatus()"
v-if="isShowPwd" v-if="isShowPwd"
class="img_r" class="img_r"
src="../../../assets/img/login/eye01.png" src="../../../assets/img/login/eye01.png"
alt="" alt=""
/> />
</el-form-item> </el-form-item>
<el-form-item style="margin: 40px 0 0 0"></el-form-item> <el-form-item style="margin: 40px 0 0 0"></el-form-item>
<el-form-item> <el-form-item>
<el-button @click="submitForm()">登 录</el-button> <el-button @click="submitForm()">登 录</el-button>
</el-form-item> </el-form-item>
<div class="box"> <div class="box">
<div class="fr" @click="register()">还没有账号?立即注册</div> <div class="fr" @click="register()">还没有账号?立即注册</div>
<div class="fl" @click="forgetPwd()">忘记密码?</div> <div class="fl" @click="forgetPwd()">忘记密码?</div>
</div>
</el-form>
</div> </div>
</el-form>
</div>
</template> </template>
<script> <script>
/* eslint-disable */ /* eslint-disable */
import Cookie from "js-cookie" import Cookie from "js-cookie";
import { login } from "r/index/login"; import { login } from "r/index/login";
import { mobileCheck } from "@/common/utils.js"; import { mobileCheck } from "@/common/utils.js";
...@@ -124,9 +124,6 @@ export default { ...@@ -124,9 +124,6 @@ export default {
}, },
], ],
}, },
}; };
}, },
created() { created() {
...@@ -136,13 +133,13 @@ export default { ...@@ -136,13 +133,13 @@ export default {
// 忘记账号/密码 // 忘记账号/密码
forgetPwd() { forgetPwd() {
let code = Cookie.get("index-identity"); let code = Cookie.get("index-identity");
this.$router.push("/reset?code="+code); this.$router.push("/reset?code=" + code);
}, },
// 去注册 // 去注册
register() { register() {
let code = Cookie.get("index-identity"); let code = Cookie.get("index-identity");
this.$router.push("/register?code="+code); this.$router.push("/register?code=" + code);
}, },
// 改变密码显示状态 // 改变密码显示状态
changePwdStatus() { changePwdStatus() {
...@@ -161,9 +158,11 @@ export default { ...@@ -161,9 +158,11 @@ export default {
return this.$message.error(res.data.message); return this.$message.error(res.data.message);
} }
// this.$message.success("登录成功"); // this.$message.success("登录成功");
// 跳转到报名
const code = Cookie.get("index-identity");
// token存储 // token存储
window.localStorage.setItem("index-token", res.data.token); window.localStorage.setItem("index-token" + code, res.data.token);
window.localStorage.setItem("phone", this.loginForm.phone); window.localStorage.setItem("phone" + code, this.loginForm.phone);
// 报名信息 // 报名信息
window.localStorage.setItem("camp_name", res.data.cam.name); window.localStorage.setItem("camp_name", res.data.cam.name);
//获取主题色 //获取主题色
...@@ -171,9 +170,8 @@ export default { ...@@ -171,9 +170,8 @@ export default {
"system_color", "system_color",
res.data.cam.system_color res.data.cam.system_color
); );
// 跳转到报名
let code = Cookie.get("index-identity"); this.$router.replace("/signUp/examInfo?code=" + code);
this.$router.replace("/signUp/examInfo?code="+code);
}); });
}); });
}, },
......
...@@ -260,8 +260,8 @@ export default { ...@@ -260,8 +260,8 @@ export default {
// this.$message.success(res.data.message); // this.$message.success(res.data.message);
// token存储 // token存储
window.localStorage.setItem("index-token", res.data.token); window.localStorage.setItem("index-token"+code, res.data.token);
window.localStorage.setItem("phone", this.registerForm.phone); window.localStorage.setItem("phone"+code, this.registerForm.phone);
// 报名信息 // 报名信息
window.localStorage.setItem("camp_name", res.data.cam.name); window.localStorage.setItem("camp_name", res.data.cam.name);
//获取主题色 //获取主题色
......
...@@ -260,7 +260,7 @@ export default { ...@@ -260,7 +260,7 @@ export default {
} }
// this.$message.success(res.data.message); // this.$message.success(res.data.message);
// token存储 // token存储
window.localStorage.setItem("index-token", res.token); window.localStorage.setItem("index-token"+code, res.token);
let code = Cookie.get("index-identity"); let code = Cookie.get("index-identity");
this.$router.push("/login?code="+code); this.$router.push("/login?code="+code);
}); });
......
...@@ -59,6 +59,12 @@ export default { ...@@ -59,6 +59,12 @@ export default {
}, },
created() { created() {
this.info = this.$store.state.info; this.info = this.$store.state.info;
//
// let url = location.href; //把当前页面的地址赋给变量 url
// // console.log(url)
// var times = url.split("?"); //分切变量 url 分隔符号为 "?"
// console.log
}, },
methods: { methods: {
toLogin() { toLogin() {
......
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