|
@@ -20,7 +20,7 @@ router.beforeEach(async(to, from, next) => {
|
|
|
// determine whether the user has logged in
|
|
|
// const hasToken = getToken()
|
|
|
const hasToken = store.getters.id || getToken()
|
|
|
- let isWeChat = Cookies.get('isWeChat')
|
|
|
+ const isWeChat = Cookies.get('isWeChat')
|
|
|
if (to.query.courseid !== '' && to.query.courseid !== undefined) {
|
|
|
console.log(to.query.courseid)
|
|
|
await store.commit('SET_COURSEID', to.query.courseid)
|
|
@@ -49,15 +49,18 @@ router.beforeEach(async(to, from, next) => {
|
|
|
} else {
|
|
|
const userinfo = store.getters.userinfo && Object.keys(store.getters.userinfo).length > 0
|
|
|
console.log('store.getters', store.getters)
|
|
|
+ console.log('store.getters.userinfo', store.getters.userinfo)
|
|
|
+ console.log('isWeChat', isWeChat)
|
|
|
console.log('userinfo', userinfo)
|
|
|
// console.log('to', {...to} )
|
|
|
if (userinfo) {
|
|
|
+ debugger
|
|
|
console.log(store)
|
|
|
- if (isWeChat === '1' || to.path == 'appStoreCopy') {
|
|
|
+ if (isWeChat === '1' || to.path === '/appStoreCopy') {
|
|
|
next()
|
|
|
- } else if(isWeChat === '2'){
|
|
|
+ } else if (isWeChat === '2') {
|
|
|
next('/appStoreCopy')
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
next()
|
|
|
}
|
|
|
NProgress.done()
|