|
|
@@ -393,7 +393,7 @@ const router = new Router({
|
|
|
meta: {
|
|
|
title: '审核放大',
|
|
|
checkLogin: true,
|
|
|
- pageMenu: '商家中心',
|
|
|
+ pageMenu: '个人中心',
|
|
|
pageMenu2: '无',
|
|
|
}
|
|
|
},
|
|
|
@@ -541,6 +541,7 @@ const router = new Router({
|
|
|
});
|
|
|
router.beforeEach((to, from, next) => {
|
|
|
// console.log(to);
|
|
|
+ // console.log(from);
|
|
|
// return;
|
|
|
|
|
|
if (to.path == '/login' && (from.path == '/register' || from.path == '/login')) {
|
|
|
@@ -591,6 +592,7 @@ router.beforeEach((to, from, next) => {
|
|
|
store.commit('updateBrefName', from.name)
|
|
|
}
|
|
|
|
|
|
+
|
|
|
if ((!store.state.userInfo && to.path !== '/login') || from.path == '/payOrder') {
|
|
|
console.log('a')
|
|
|
axios.get('/userInfo/getUserInfo').then(res => {
|
|
|
@@ -604,6 +606,7 @@ router.beforeEach((to, from, next) => {
|
|
|
next()
|
|
|
} else {
|
|
|
if (to.meta.pageMenu == '商家中心') {
|
|
|
+ // console.log('首页1')
|
|
|
next('/index')
|
|
|
} else {
|
|
|
next()
|
|
|
@@ -632,6 +635,7 @@ router.beforeEach((to, from, next) => {
|
|
|
next('/login?next=' + path);
|
|
|
} else {
|
|
|
if (to.meta.pageMenu == '商家中心') {
|
|
|
+ // console.log('首页2')
|
|
|
next('/index')
|
|
|
} else {
|
|
|
next();
|
|
|
@@ -650,6 +654,7 @@ router.beforeEach((to, from, next) => {
|
|
|
next()
|
|
|
} else {
|
|
|
if (to.meta.pageMenu == '商家中心') {
|
|
|
+ // console.log('首页3')
|
|
|
next('/index')
|
|
|
} else {
|
|
|
next()
|