Commit 513f92c8 authored by Xuguangxing's avatar Xuguangxing

feat: 修复token传值问题,解决小程序多个H5页面重复登录

parent 7d201aa1
...@@ -296,8 +296,9 @@ export default class Activity extends Mixins(TransformStyleMixin, BottomNavStyle ...@@ -296,8 +296,9 @@ export default class Activity extends Mixins(TransformStyleMixin, BottomNavStyle
} }
handleNavUrl(nav, isCurrent) { handleNavUrl(nav, isCurrent) {
if (isCurrent) { return; } if (isCurrent) { return; }
const token = localStorage.get('vccToken') || '';
// 用于传递新橙参数,避免新橙H5活动中含有遮罩层 // 用于传递新橙参数,避免新橙H5活动中含有遮罩层
const { vccChannel, fromHost, vccToken} = this.$route.query; const { vccChannel, fromHost } = this.$route.query;
const { pageType, pageUrl } = nav; const { pageType, pageUrl } = nav;
console.log(isApp, isWxMp, pageType); console.log(isApp, isWxMp, pageType);
let nativeBridge; let nativeBridge;
...@@ -324,7 +325,7 @@ export default class Activity extends Mixins(TransformStyleMixin, BottomNavStyle ...@@ -324,7 +325,7 @@ export default class Activity extends Mixins(TransformStyleMixin, BottomNavStyle
let url = home.h5; let url = home.h5;
if (vccChannel) { url = this.addOrEditUrlParams(url, 'vccChannel', vccChannel); } if (vccChannel) { url = this.addOrEditUrlParams(url, 'vccChannel', vccChannel); }
if (fromHost) { url = this.addOrEditUrlParams(url, 'fromHost', fromHost); } if (fromHost) { url = this.addOrEditUrlParams(url, 'fromHost', fromHost); }
if (vccToken) { url = this.addOrEditUrlParams(url, 'vccToken', vccToken); } if (token) { url = this.addOrEditUrlParams(url, 'vccToken', token); }
window.location.href = url; window.location.href = url;
} }
} }
...@@ -349,7 +350,7 @@ export default class Activity extends Mixins(TransformStyleMixin, BottomNavStyle ...@@ -349,7 +350,7 @@ export default class Activity extends Mixins(TransformStyleMixin, BottomNavStyle
let url = shopcart.h5; let url = shopcart.h5;
if (vccChannel) { url = this.addOrEditUrlParams(url, 'vccChannel', vccChannel); } if (vccChannel) { url = this.addOrEditUrlParams(url, 'vccChannel', vccChannel); }
if (fromHost) { url = this.addOrEditUrlParams(url, 'fromHost', fromHost); } if (fromHost) { url = this.addOrEditUrlParams(url, 'fromHost', fromHost); }
if (vccToken) { url = this.addOrEditUrlParams(url, 'vccToken', vccToken); } if (token) { url = this.addOrEditUrlParams(url, 'vccToken', token); }
window.location.href = url; window.location.href = url;
} }
} }
...@@ -374,7 +375,7 @@ export default class Activity extends Mixins(TransformStyleMixin, BottomNavStyle ...@@ -374,7 +375,7 @@ export default class Activity extends Mixins(TransformStyleMixin, BottomNavStyle
let url = user.h5; let url = user.h5;
if (vccChannel) { url = this.addOrEditUrlParams(url, 'vccChannel', vccChannel); } if (vccChannel) { url = this.addOrEditUrlParams(url, 'vccChannel', vccChannel); }
if (fromHost) { url = this.addOrEditUrlParams(url, 'fromHost', fromHost); } if (fromHost) { url = this.addOrEditUrlParams(url, 'fromHost', fromHost); }
if (vccToken) { url = this.addOrEditUrlParams(url, 'vccToken', vccToken); } if (token) { url = this.addOrEditUrlParams(url, 'vccToken', token); }
window.location.href = url; window.location.href = url;
} }
} }
...@@ -384,7 +385,7 @@ export default class Activity extends Mixins(TransformStyleMixin, BottomNavStyle ...@@ -384,7 +385,7 @@ export default class Activity extends Mixins(TransformStyleMixin, BottomNavStyle
if (!isApp && !isWxMp) { if (!isApp && !isWxMp) {
if (vccChannel) { url = this.addOrEditUrlParams(url, 'vccChannel', vccChannel); } if (vccChannel) { url = this.addOrEditUrlParams(url, 'vccChannel', vccChannel); }
if (fromHost) { url = this.addOrEditUrlParams(url, 'fromHost', fromHost); } if (fromHost) { url = this.addOrEditUrlParams(url, 'fromHost', fromHost); }
if (vccToken) { url = this.addOrEditUrlParams(url, 'vccToken', vccToken); } if (token) { url = this.addOrEditUrlParams(url, 'vccToken', token); }
} }
window.location.href = pageUrl; window.location.href = pageUrl;
// if (isApp) { // if (isApp) {
......
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