提交 0b39c9c1 编写于 作者: guangjun.yang's avatar guangjun.yang

将token统一

上级 8a174ef6
...@@ -7,7 +7,7 @@ import { setCookie, getCookie, delCookie } from '@/utils/index'; ...@@ -7,7 +7,7 @@ import { setCookie, getCookie, delCookie } from '@/utils/index';
const user = { const user = {
state: { state: {
token: localStorage.getItem('cmeToken') || getCookie('cmeToken') || '', token: localStorage.getItem('couponToken') || getCookie('couponToken') || '',
info: {}, // 用户信息 info: {}, // 用户信息
}, },
mutations: { mutations: {
...@@ -21,9 +21,12 @@ const user = { ...@@ -21,9 +21,12 @@ const user = {
actions: { actions: {
// 外部登陆返回设置token // 外部登陆返回设置token
setToken({ commit, dispatch }, params) { setToken({ commit, dispatch }, params) {
if( typeof(params) == 'object') {
params = params.join("");
}
commit('SET_TOKEN', params); commit('SET_TOKEN', params);
localStorage.setItem('cmeToken', params); localStorage.setItem('couponToken', params);
setCookie('cmeToken', params) setCookie('couponToken', params)
dispatch('getUserInfo'); dispatch('getUserInfo');
}, },
// 获取用户信息 // 获取用户信息
...@@ -74,8 +77,8 @@ const user = { ...@@ -74,8 +77,8 @@ const user = {
logout({ state, commit }) { logout({ state, commit }) {
commit('SET_TOKEN', ''); commit('SET_TOKEN', '');
commit('SET_USER_INFO_2', {}); commit('SET_USER_INFO_2', {});
localStorage.removeItem('cmeToken'); localStorage.removeItem('couponToken');
delCookie('cmeToken') delCookie('couponToken')
}, },
}, },
} }
......
...@@ -211,7 +211,7 @@ module.exports = { ...@@ -211,7 +211,7 @@ module.exports = {
commonCheckToken(noLoggedCallback) { commonCheckToken(noLoggedCallback) {
let param = { let param = {
// token: this.token, // token: this.token,
token: this.token || this.$store.state.user.token || this.$store.state.coop.userInfo.userToken || localStorage.getItem("cmeToken") || getCookie("cmeToken"), token: this.token || this.$store.state.user.token || this.$store.state.coop.userInfo.userToken || localStorage.getItem("couponToken") || getCookie("couponToken"),
setEntry: true setEntry: true
}; };
this.GET("campaign/admin/task/checkToken", param).then(res => { this.GET("campaign/admin/task/checkToken", param).then(res => {
......
...@@ -422,7 +422,7 @@ export default { ...@@ -422,7 +422,7 @@ export default {
localStorage.setItem('returnUrl', this.shareUrl); localStorage.setItem('returnUrl', this.shareUrl);
const { token, info } = this.$store.state.user; const { token, info } = this.$store.state.user;
this.token = token || localStorage.getItem('cmeToken') || getCookie("cmeToken"); this.token = token || localStorage.getItem('couponToken') || getCookie("couponToken");
// 如果有token,但没有用户信息,则获取用户信息 // 如果有token,但没有用户信息,则获取用户信息
if (this.token && !info.id) { if (this.token && !info.id) {
this.commonCheckToken(() => { this.commonCheckToken(() => {
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册