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

11

parent b8c801e8
...@@ -247,7 +247,7 @@ ...@@ -247,7 +247,7 @@
<el-form-item label="什么渠道了解的该项目(或推荐人是)?"> <el-form-item label="什么渠道了解的该项目(或推荐人是)?">
<el-input <el-input
v-model="referForm.recommend" v-model="referForm.recommend"
placeholder="填写推荐人(选填)" placeholder="填写推荐人或渠道(选填)"
size="small" size="small"
/> />
</el-form-item> </el-form-item>
......
...@@ -153,8 +153,9 @@ function checkCam(code, cb) { ...@@ -153,8 +153,9 @@ function checkCam(code, cb) {
} }
router.beforeEach((to, from, next) => { router.beforeEach((to, from, next) => {
// console.log(to, 'to') console.log(to, 'to')
// console.log(from, 'from') // console.log(from, 'from')
let let
toLogin = "/login", toLogin = "/login",
toRegister = "/register", toRegister = "/register",
...@@ -163,6 +164,7 @@ router.beforeEach((to, from, next) => { ...@@ -163,6 +164,7 @@ router.beforeEach((to, from, next) => {
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) {
code = to.params.code ? to.params.code : to.query.code; code = to.params.code ? to.params.code : to.query.code;
console.log(code)
checkCam(code, (res) => { checkCam(code, (res) => {
if (res) { if (res) {
let token = window.localStorage.getItem("index-token" + code); let token = window.localStorage.getItem("index-token" + code);
...@@ -184,16 +186,9 @@ router.beforeEach((to, from, next) => { ...@@ -184,16 +186,9 @@ router.beforeEach((to, from, next) => {
}); });
} else { } else {
if (to.path == '/signUp/success') {
code = to.query.code;
} else {
code = to.params.code ? to.params.code : to.query.code; code = to.params.code ? to.params.code : to.query.code;
}
// code = to.params.code ? to.params.code : to.query.code;
// console.log(code); // console.log(code);
//return next(); // return next();
let token = window.localStorage.getItem("index-token" + code); let token = window.localStorage.getItem("index-token" + code);
if (!token) { if (!token) {
checkCam(code, (res) => { checkCam(code, (res) => {
...@@ -213,6 +208,7 @@ router.beforeEach((to, from, next) => { ...@@ -213,6 +208,7 @@ router.beforeEach((to, from, next) => {
}); });
} }
} }
}) })
// 页面跳转之后页面回滚到顶部 // 页面跳转之后页面回滚到顶部
......
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