-
-
-
-
-
-
- -
-
-
- --
- -
-
-
- -
- -
-
-
-
- -
-
-
- -
- -
-
-
- -
- -
-
-
- 修改 -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/plugins/requests/index.js b/src/plugins/requests/index.js
index 5aff0a7..c2c8504 100644
--- a/src/plugins/requests/index.js
+++ b/src/plugins/requests/index.js
@@ -4,6 +4,7 @@ import router from "@/router/index";
import Setting from "@/setting";
import store from '@/store'
+const { inIframe } = Setting
const service = axios.create({
baseURL: Setting.apiBaseURL,
timeout: 10000000
@@ -13,7 +14,7 @@ service.defaults.headers.post["Content-Type"] = "application/json;charset=UTF-8"
// 请求拦截器
service.interceptors.request.use(config => {
- let token = localStorage.getItem('review_token')
+ let token = localStorage.getItem(inIframe ? 'review_token' : 'expert_token')
if (token) config.headers.token = token
return config
}, err => {
@@ -37,14 +38,14 @@ service.interceptors.response.use(
// 账号互踢
if (!logouted) {
Util.local.remove(Setting.storeKey)
- localStorage.removeItem('review_token')
+ localStorage.removeItem(inIframe ? 'review_token' : 'expert_token')
window.top.exitSystem && window.top.exitSystem()
Util.errorMsg(res.msg.includes('顶') ? '您的账号已在其他设备登录，您已被迫下线！' : '登录过期，请重新登录！')
localStorage.removeItem('reviewPath')
setTimeout(() => {
- // store.dispatch('user/logout')
+ inIframe || store.dispatch('user/logout')
logouted = 0
- }, 5000)
+ }, 1500)
logouted = 1
}
} else if (!res.status) {
@@ -59,20 +60,6 @@ service.interceptors.response.use(
error => {
if (error.response.status) {
switch (error.response.status) {
- // 401: 未登录
- // 未登录则跳转登录页面，并携带当前页面的路径
- // 在登录成功后返回当前页面，这一步需要在登录页操作。
- case 401:
- if (!logouted) {
- Util.local.remove(Setting.storeKey);
- Util.local.remove(Setting.tokenKey);
- Util.errorMsg("登录过期，请重新登录");
- setTimeout(() => {
- store.dispatch('user/logout')
- }, 1000);
- logouted = 1
- }
- break;
case 500:
Util.errorMsg("网络错误");
break;
diff --git a/src/router/permission.js b/src/router/permission.js
index 269fe3c..14fd94f 100644
--- a/src/router/permission.js
+++ b/src/router/permission.js
@@ -3,6 +3,11 @@ import Setting from '@/setting'
router.beforeEach((to, from, next) => {
document.title = Setting.titleSuffix
- next()
- to.path !== '/theoryReview' && localStorage.setItem('reviewPath', to.fullPath)
+
+ if (!Setting.inIframe && !localStorage.getItem('expert_token') && to.path !== '/login') {
+ next('/login')
+ } else {
+ next()
+ to.path !== '/theoryReview' && localStorage.setItem('reviewPath', to.fullPath)
+ }
})
diff --git a/src/setting.js b/src/setting.js
index 5c1307c..9e98f68 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -25,6 +25,7 @@ const Setting = {
tokenExpires: 1296000000, // token在localStorage的时间(毫秒)
isDev,
isPro,
+ inIframe: window !== window.top, // 当前平台是否处于嵌入到iframe里
/**
* 路由白名单
* */
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 08498f6..d089a9c 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,5 +1,7 @@
import Setting from '@/setting'
-import util from '@/libs/util'
+import Util from '@/libs/util'
+import { post } from '@/plugins/requests/index.js'
+import api from '@/api'
/**
* 用户信息
@@ -19,9 +21,11 @@ export default {
state.avatar = avatar
},
setUserId: (state, userId) => {
+ console.log("🚀 ~ userId:", userId)
state.userId = userId
},
setUserName: (state, userName) => {
+ console.log("🚀 ~ userName:", userName)
state.userName = userName
},
setCrumbs: (state, crumbs) => {
@@ -34,10 +38,15 @@ export default {
actions: {
logout ({ commit, state, dispatch }) {
return new Promise((resolve, reject) => {
- util.local.remove(Setting.storeKey)
- util.local.remove(Setting.tokenKey)
- location.reload()
- resolve()
+ post(api.logout).then(() => {
+ Util.local.remove(Setting.storeKey)
+ localStorage.removeItem('expert_token')
+ localStorage.removeItem('review_token')
+ location.reload()
+ resolve()
+ }).catch(error => {
+ reject(error)
+ })
})
}
}
-
-
- 
基本信息
-
-
-
- 取消
- 更新
-
-
- {{
- emailBtnText }}
-
-
- {{
- phoneBtnText }}
-
-