Skip to content

H
h5-base
Commit d40e639a authored by IvyXia123's avatar IvyXia123
Browse files
Options

ddd

parent 6ca05ac0
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 6 deletions
dist/index.html
View file @ d40e639a
......@@ -11,4 +11,4 @@
position: fixed;
background: #f4f4f4;
}
/* html{font-size: 1px;} */</style><link href=static/css/app.419a340d5d99fa41c7715c7b65489c6f.css rel=stylesheet></head><body><div id=app></div><script src=https://res.wx.qq.com/open/js/jweixin-1.3.2.js></script><script></script><script type=text/javascript src=static/js/manifest.eea332e10e945cc2e81d.js></script><script type=text/javascript src=static/js/vendor.0c1d6ebbba685002d59c.js></script><script type=text/javascript src=static/js/app.0dd7929d0a8f42a2b348.js></script></body></html>
\ No newline at end of file
/* html{font-size: 1px;} */</style><link href=static/css/app.419a340d5d99fa41c7715c7b65489c6f.css rel=stylesheet></head><body><div id=app></div><script src=https://res.wx.qq.com/open/js/jweixin-1.3.2.js></script><script></script><script type=text/javascript src=static/js/manifest.eea332e10e945cc2e81d.js></script><script type=text/javascript src=static/js/vendor.0c1d6ebbba685002d59c.js></script><script type=text/javascript src=static/js/app.b81cf73cb9c212628eb8.js></script></body></html>
\ No newline at end of file
src/router/index.js
View file @ d40e639a
......@@ -655,10 +655,8 @@ router.beforeEach((to, from, next) => {
// extensionV1
if (to.name === 'weixin' || to.name === 'starRankV2' || to.name === 'order' || to.name === 'buySuccess' || to.name === 'success' || to.name === 'guidelines' || to.name === 'spcShop' || to.name === 'mpShop' || to.name === 'extensionV1Shop' || to.name === 'extensionV1' || to.name === 'author' || to.name === 'bindMobile' || to.name === 'noWechat' || to.name === 'inspectorActivit' || to.name === 'buyDetail'|| to.name === 'passShop'|| to.name === 'ybIndex' ) {
// 无需登录的页面
console.log(899, to.name)
next()
} else if (window.location.href.indexOf('token') > -1 && to.name === 'index') {
console.log(99000)
let token = common.getUrlParam().token || to.query.token;
// debugger
store.dispatch('setToken', token);
......@@ -675,17 +673,21 @@ router.beforeEach((to, from, next) => {
}
});
} else if (localStorage.getItem('cc_token')) {
console.log(8888)
// 已登陆
store.dispatch('setToken', localStorage.getItem('cc_token'));
if (localStorage.getItem('userDesc')) {
sa.login(JSON.parse(localStorage.getItem('userDesc')).user_id);
goOn()
} else {
console.log(7777)
getUserDetailApi().then(res => {
console.log(res)
localStorage.setItem('userDesc', JSON.stringify(res));
sa.login(res.user_id);
goOn()
}).catch(() => {
}).catch((err) => {
console.log(err)
if (localStorage.getItem('userDesc')) {
goOn()
}
......
src/service/index.js
View file @ d40e639a
......@@ -57,7 +57,6 @@ axios.interceptors.request.use(
// console.log(json)
config.params.param_token = md5(JSON.stringify(json));
config.params.v = versiontime;
console.log(JSON.stringify(json))
} else if (config.url !== '/api/admin/login') {
config.data = config.data || {};
config.data.v = versiontime;
......
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