添加登陆拦截

Author: IFmiss

src/App.vue

@@ -183,9 +183,6 @@ export default {
     getIsBingBg (nowval, oldval) {
       this.fetchData()
       localStorage.setItem('globalInfo', JSON.stringify(store.getters.getGlobalInfo))
-    },
-    '$route': function () {
-      this.updateLoginInfo()
     }
   },
   computed: {
@@ -228,8 +225,6 @@ export default {
     this.isApp()
     // 加载数据
     this.fetchData()
-    // 判断是否登录
-    this.updateLoginInfo()
     // 挂载 onresize事件
     window.onresize = () => {
       this.isApp()

src/common/api/user.js

@@ -1,6 +1,6 @@
 import fecth from 'utils/fecth.js'
 import store from 'store'
-import router from 'router'
+// import router from 'router'
 const LOGIN_INFO = {
 	code: 0,
 	msg: '用户未登录'
@@ -21,7 +21,6 @@ export function todoUserInfo () {
 	let loginInfo = store.getters.getUserInfo
 	return new Promise((resolve, reject) => {
 		if (loginInfo === null) {
-			router.push('/user/login')
 			reject(LOGIN_INFO)
     } else {
 			resolve(loginInfo)

src/components/user/login/login.vue

@@ -79,7 +79,13 @@
 				}).then((res) => {
 					if (res.data.code === '1') {
 						Storage.setCookie('c_user_info', JSON.stringify(res.data), 60 * 60 * 1000 * 24)
-						this.$router.push('/home')
+						this.$store.dispatch('set_UserInfo', res.data)
+						const url = decodeURIComponent(this.$route.query['redirect_url'])
+						if (url) {
+							this.$router.push(url)
+						} else {
+							this.$router.push('/home')
+						}
 					} else {
 						this.$msg(res.data.msg)
 					}
@@ -137,9 +143,6 @@
 		},
 		components: {
 			usercompletion
-		},
-		mounted () {
-			// console.log(Utils.formatDate(new Date(), 'yyyy-MM-dd hh:mm:ss'))
 		}
 	}
 </script>

src/main.js

@@ -5,6 +5,7 @@ import App from './App'
 import router from './router'
 import VueLazyload from 'vue-lazyload'
 import './../static/font-icon/style.css'
+import store from '@/store'
 import Msg from 'vue-message'
 
 import ElementUI from 'element-ui'
@@ -27,6 +28,7 @@ Vue.config.productionTip = false
 const vueExp = new Vue({
   el: '#app',
   router,
+  store,
   template: '<App/>',
   render: h => h(App)
 })

src/router/index.js

@@ -2,6 +2,7 @@ import Vue from 'vue'
 import Router from 'vue-router'
 import store from './../store'
 import Home from '@/components/home'
+import DGlobal from 'common/js/global.js'
 // const Pic = r => require.ensure([], () => r(require('@/components/pic/pic.vue')), 'pic')
 // import Pic from '@/components/pic/pic.vue'
 const Music = r => require.ensure([], () => r(require('@/components/music/music.vue')), 'music')
@@ -60,7 +61,7 @@ const Reward = r => require.ensure([], () => r(require('@/components/reward/rewa
 
 Vue.use(Router)
 
-export default new Router({
+const myRouter = new Router({
   // mode: 'history',
   hashbang: true,
   history: false, // 这个参数改为false就可以了
@@ -88,18 +89,27 @@ export default new Router({
         {
           path: '/',
           redirect: store.getters.getMusicRouter,
+          meta: {
+            auth: true
+          },
           components: {
             listinfo: MusicSheet
           }
         },
         {
           path: '/music/search',
+          meta: {
+            auth: true
+          },
           components: {
             fullscreen: MusicSearch
           }
         },
         {
           path: '/music/albumlist/:id',
+          meta: {
+            auth: true
+          },
           name: 'albumlist',
           components: {
             listinfo: MusicAlbumList
@@ -109,39 +119,57 @@ export default new Router({
         {
           path: '/music/collection',
           name: 'collection',
+          meta: {
+            auth: true
+          },
           components: {
             listinfo: MusicCollection
           }
         },
         {
           path: '/music/sheet/:id',
           name: 'musicindex',
+          meta: {
+            auth: true
+          },
           components: {
             listinfo: MusicSheet
           }
         },
         {
           path: '/music/sheet/',
           redirect: store.getters.getMusicRouter,
+          meta: {
+            auth: true
+          },
           components: {
             listinfo: MusicSheet
           }
         },
         {
           path: '/music/playlist/',
+          meta: {
+            auth: true
+          },
           components: {
             listinfo: MusicPlayList
           }
         },
         {
           path: '/music/toplist/',
+          meta: {
+            auth: true
+          },
           components: {
             listinfo: MusicToplist
           }
         },
         {
           path: '/music/searchlist/:w',
           name: 'searchlist',
+          meta: {
+            auth: true
+          },
           components: {
             listinfo: MusicSearchList
           }
@@ -256,9 +284,35 @@ export default new Router({
         },
         {
           path: '/user/info',
+          meta: {
+            auth: true
+          },
           component: UserInfo
         }
       ]
     }
   ]
 })
+
+myRouter.beforeEach((to, from, next) => {
+  if (DGlobal.storage.getCookie('c_user_info') && !store.getters.getUserInfo) {
+    DGlobal.storage.setCookie('c_user_info', unescape(DGlobal.storage.getCookie('c_user_info')), 60 * 60 * 1000 * 24)
+    store.dispatch({
+      type: 'set_UserInfo',
+      data: JSON.parse(unescape(DGlobal.storage.getCookie('c_user_info')))
+    })
+  }
+
+  if (to.meta && to.meta.auth) {
+    if (store.getters.getUserInfo) {
+      next()
+    } else {
+      const url = encodeURIComponent(to.fullPath)
+      next(`/user/login?redirect_url=${url}`)
+    }
+  } else {
+    next()
+  }
+})
+
+export default myRouter