Commit fe9ee03f authored by Xuguangxing's avatar Xuguangxing

feat: 重点- 更新login

parent cfea9023
...@@ -2,7 +2,7 @@ import Bridge from '@qg/js-bridge'; ...@@ -2,7 +2,7 @@ import Bridge from '@qg/js-bridge';
import MpBridge from '@/service/mp'; import MpBridge from '@/service/mp';
import { isWxMp, isApp } from '@/service/validation.service'; import { isWxMp, isApp } from '@/service/validation.service';
import localStorage from '@/service/localStorage.service'; import localStorage from '@/service/localStorage.service';
import cookies from '@/service/cookieStorage.service'; import sessionStorage from '@/service/sessionStorage.service';
export default { export default {
data() { data() {
return { return {
...@@ -18,8 +18,10 @@ export default { ...@@ -18,8 +18,10 @@ export default {
const appData = json.data || {}; const appData = json.data || {};
if (appData && appData.token) { if (appData && appData.token) {
localStorage.set('vccToken', appData.token); localStorage.set('vccToken', appData.token);
cookies.set('vccToken', appData.token); sessionStorage.set('vccToken', appData.token);
// window.sessionStorage.setItem('vccToken', appData.token); // const query = JSON.parse(JSON.stringify(_this.$route.query));
// const name = _this.$route.name;p
// query.vccToken = appData.token;
_this.$nextTick(() => { _this.$nextTick(() => {
window.location.reload(); window.location.reload();
}); });
......
...@@ -5,18 +5,17 @@ import store from '../store'; ...@@ -5,18 +5,17 @@ import store from '../store';
import { isWechat, isApp, isAndroid, isIOS } from './validation.service'; import { isWechat, isApp, isAndroid, isIOS } from './validation.service';
import Cookies from './cookieStorage.service'; import Cookies from './cookieStorage.service';
import localStorage from './localStorage.service'; import localStorage from './localStorage.service';
import sessionStorage from './sessionStorage.service';
// import { Toast } from '@qg/cherry-ui'; // import { Toast } from '@qg/cherry-ui';
export default { export default {
// token校验,整个流程都是登陆后的 // token校验,整个流程都是登陆后的
init: router => { init: router => {
router.beforeEach((to, from, next) => { router.beforeEach((to, from, next) => {
console.log(!to.query.vccToken);
// if (!to.query.vccToken) {
// to.query.vccToken = Cookies.get('vccToken') || '';
// }
localStorage.remove('vccToken');
Cookies.set('h', 0); Cookies.set('h', 0);
if (!to.query.vccToken) {
to.query.vccToken = sessionStorage.get('vccToken') || '';
}
// 所有自定义路由字段在此处理 // 所有自定义路由字段在此处理
const { meta } = to; const { meta } = to;
isWechat && localStorage.set('vccChannel', '159913'); isWechat && localStorage.set('vccChannel', '159913');
...@@ -29,14 +28,13 @@ export default { ...@@ -29,14 +28,13 @@ export default {
const value = to.query[item]; const value = to.query[item];
if (item === 'vccToken' && value === '') { if (item === 'vccToken' && value === '') {
localStorage.remove('vccToken'); localStorage.remove('vccToken');
sessionStorage.remove(item);
} }
if (value && value !== '{token}' && value !== '{vccToken}') { if (value && value !== '{token}' && value !== '{vccToken}') {
console.log(item, value);
localStorage.set(item, value); localStorage.set(item, value);
Cookies.set(item, value); sessionStorage.set(item, value);
} }
}); });
localStorage.set('vccToken', Cookies.get('vccToken') || '');
(isWechat || isApp || Cookies.get('h') === '0') && store.commit('CHANGE_HEADER', false); // 改变header (isWechat || isApp || Cookies.get('h') === '0') && store.commit('CHANGE_HEADER', false); // 改变header
document.body.className = store.state.pay.header ? 'has-header' : ''; document.body.className = store.state.pay.header ? 'has-header' : '';
store.commit('CHANGE_TITLE', meta?.title); // 改变title store.commit('CHANGE_TITLE', meta?.title); // 改变title
......
export default {
get(key) {
let result = window.sessionStorage.getItem(key);
try {
return JSON.parse(result);
} catch (e) {
return result;
}
},
set(key, value) {
let toString = Object.prototype.toString;
if (toString.call(value) === '[object Array]' || toString.call(value) === '[object Object]') {
value = JSON.stringify(value);
}
return window.sessionStorage.setItem(key, value);
},
remove(key) {
return window.sessionStorage.removeItem(key);
},
clear() {
return window.sessionStorage.clear();
}
};
...@@ -269,6 +269,7 @@ export default { ...@@ -269,6 +269,7 @@ export default {
}) })
}, },
created() { created() {
console.log(this.$route);
this.hasLogin = localStorage.get('vccToken') ? true : false; this.hasLogin = localStorage.get('vccToken') ? true : false;
this.detailParam = { ...this.$route.query }; this.detailParam = { ...this.$route.query };
localStorage.remove('orderData'); localStorage.remove('orderData');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment