From d682a549a52f372f7c7c56e6b358c6739bde3cf7 Mon Sep 17 00:00:00 2001
From: 406803045 <406803045@qq.com>
Date: Fri, 14 Jun 2019 10:11:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E9=99=A4=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/permission.js  | 108 +++++++++++++++++++++++----------------------
 src/utils/cache.js |   2 +-
 2 files changed, 56 insertions(+), 54 deletions(-)

diff --git a/src/permission.js b/src/permission.js
index f4d8f23..4fe4816 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -5,57 +5,59 @@ import wechatAuth from './plugins/wechatAuth' // 微信登录插件
 const qs = require('qs')
 
 router.beforeEach((to, from, next) => {
-  const loginStatus = Number(store.getters.loginStatus)
-  document.title = getPageTitle(to.meta.title)
-  if (loginStatus === 0) {
-    // 微信未授权登录跳转到授权登录页面
-    const url = window.location.href
-    // 解决重复登录url添加重复的code与state问题
-    const parseUrl = qs.parse(url.split('?')[1])
-    let loginUrl
-    if (parseUrl.code && parseUrl.state) {
-      delete parseUrl.code
-      delete parseUrl.state
-      loginUrl = `${url.split('?')[0]}?${qs.stringify(parseUrl)}`
-    } else {
-      loginUrl = url
-    }
-    // alert(loginUrl)
-    wechatAuth.redirect_uri = loginUrl
-    // 无论拒绝还是授权都设置成1
-    store.dispatch('user/setLoginStatus', 1)
-    window.location.href = wechatAuth.authUrl
-  } else if (loginStatus === 1) {
-    // 微信已经授权回调获取code
-    try {
-      wechatAuth.returnFromWechat(to.fullPath)
-    } catch (err) {
-      store.dispatch('user/setLoginStatus', 0)
-      location.reload()
-      //  next()
-    }
-    // 同意授权 to.fullPath 携带code参数，拒绝授权没有code参数
-    // alert(to.fullPath)
-    // 重新赋值，不然获取不到code
-    const code = wechatAuth.code
-    // alert(code)
-    if (code) {
-      store
-        .dispatch('user/loginWechatAuth', code)
-        .then(res => {
-          store.dispatch('user/setLoginStatus', 2)
-          next()
-        })
-        .catch(() => {
-          store.dispatch('user/setLoginStatus', 0)
-          location.reload()
-        })
-    } else {
-      store.dispatch('user/setLoginStatus', 0)
-      location.reload()
-    }
-  } else {
-    // alert(to.fullPath)
-    next()
-  }
+   store.dispatch('user/fedLogOut').then(() => {
+  })
+  // const loginStatus = Number(store.getters.loginStatus)
+  // document.title = getPageTitle(to.meta.title)
+  // if (loginStatus === 0) {
+  //   // 微信未授权登录跳转到授权登录页面
+  //   const url = window.location.href
+  //   // 解决重复登录url添加重复的code与state问题
+  //   const parseUrl = qs.parse(url.split('?')[1])
+  //   let loginUrl
+  //   if (parseUrl.code && parseUrl.state) {
+  //     delete parseUrl.code
+  //     delete parseUrl.state
+  //     loginUrl = `${url.split('?')[0]}?${qs.stringify(parseUrl)}`
+  //   } else {
+  //     loginUrl = url
+  //   }
+  //   // alert(loginUrl)
+  //   wechatAuth.redirect_uri = loginUrl
+  //   // 无论拒绝还是授权都设置成1
+  //   store.dispatch('user/setLoginStatus', 1)
+  //   window.location.href = wechatAuth.authUrl
+  // } else if (loginStatus === 1) {
+  //   // 微信已经授权回调获取code
+  //   try {
+  //     wechatAuth.returnFromWechat(to.fullPath)
+  //   } catch (err) {
+  //     store.dispatch('user/setLoginStatus', 0)
+  //     location.reload()
+  //     //  next()
+  //   }
+  //   // 同意授权 to.fullPath 携带code参数，拒绝授权没有code参数
+  //   // alert(to.fullPath)
+  //   // 重新赋值，不然获取不到code
+  //   const code = wechatAuth.code
+  //   // alert(code)
+  //   if (code) {
+  //     store
+  //       .dispatch('user/loginWechatAuth', code)
+  //       .then(res => {
+  //         store.dispatch('user/setLoginStatus', 2)
+  //         next()
+  //       })
+  //       .catch(() => {
+  //         store.dispatch('user/setLoginStatus', 0)
+  //         location.reload()
+  //       })
+  //   } else {
+  //     store.dispatch('user/setLoginStatus', 0)
+  //     location.reload()
+  //   }
+  // } else {
+  //   // alert(to.fullPath)
+  //   next()
+  // }
 })
diff --git a/src/utils/cache.js b/src/utils/cache.js
index 1a6e04f..6fc1937 100644
--- a/src/utils/cache.js
+++ b/src/utils/cache.js
@@ -19,7 +19,7 @@ export function saveLoginStatus(status) {
   //storage.set(LoginStatusKey, status)
     var date=new Date();
     date.setTime(date.getTime()+5*60*1000); //设置date为当前时间+5分
-    document.cookie=LoginStatusKey+"="+status+"; expires="+date.toGMTString(); //将date赋值给expires
+    document.cookie=LoginStatusKey+"="+status+"; expires="+date.toGMTString() // 将date赋值给expires
   return status
 }