Commit 0149d807 authored by Z's avatar Z

🐛 Z: Hot: PC: login check cancel comment. & Fix login redirect path bug.

parent 0af9e069
...@@ -32,7 +32,7 @@ const router = new VueRouter({ ...@@ -32,7 +32,7 @@ const router = new VueRouter({
* 路由拦截 * 路由拦截
* 权限验证 * 权限验证
*/ */
/* router.beforeEach(async (to, from, next) => { router.beforeEach(async (to, from, next) => {
// 确认已经加载多标签页数据 https://github.com/d2-projects/d2-admin/issues/201 // 确认已经加载多标签页数据 https://github.com/d2-projects/d2-admin/issues/201
await store.dispatch('d2admin/page/isLoaded') await store.dispatch('d2admin/page/isLoaded')
// 确认已经加载组件尺寸设置 https://github.com/d2-projects/d2-admin/issues/198 // 确认已经加载组件尺寸设置 https://github.com/d2-projects/d2-admin/issues/198
...@@ -64,7 +64,7 @@ const router = new VueRouter({ ...@@ -64,7 +64,7 @@ const router = new VueRouter({
// 不需要身份校验 直接通过 // 不需要身份校验 直接通过
next() next()
} }
}) */ })
router.afterEach(to => { router.afterEach(to => {
// 进度条 // 进度条
......
...@@ -159,7 +159,8 @@ export default { ...@@ -159,7 +159,8 @@ export default {
.then(() => { .then(() => {
// 重定向对象不存在则返回顶层路径 // 重定向对象不存在则返回顶层路径
// this.$router.replace(this.$route.query.redirect || '/homeMain') // this.$router.replace(this.$route.query.redirect || '/homeMain')
this.$router.replace(this.$route.query.redirect || '/homeMain') // this.$router.replace(this.$route.query.redirect || '/homeMain')
this.$router.replace(this.$route.query.redirect || '/home/main')
}) })
} else { } else {
// 登录表单校验失败 // 登录表单校验失败
......
...@@ -17,8 +17,10 @@ ...@@ -17,8 +17,10 @@
</div> </div>
</div> </div>
</div> </div>
<button class="testButton">Test</button>
</div> </div>
<div class="menus"> <div class="menus">
<div class="menu" @click="buttonMainMarketingClick">精准营销</div> <div class="menu" @click="buttonMainMarketingClick">精准营销</div>
<div class="menu activeMenu" @click="buttonSingleMarketingClick">一对一营销侧边栏</div> <div class="menu activeMenu" @click="buttonSingleMarketingClick">一对一营销侧边栏</div>
...@@ -184,3 +186,12 @@ export default { ...@@ -184,3 +186,12 @@ export default {
color: lightcoral; color: lightcoral;
} }
</style> </style>
<style scoped>
.testButton{
border: 1px solid gray;
width: 140px;
font-size: 14px;
}
</style>
\ No newline at end of file
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