Commit deeda232 authored by zhangyanni's avatar zhangyanni

取消拦截

parent f38ded23
......@@ -1066,7 +1066,9 @@ export default {
// }
} else {
if ((/Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(navigator.userAgent) && navigator.userAgent.toLowerCase().match(/MicroMessenger/i) == 'micromessenger') || /Android|webOS|iPhone|iPad|iPod|BlackBerry/i.test(navigator.userAgent) || /miniProgram/i.test(navigator.userAgent)) {
if (i18n.locale == "zh-CN") router.push({path: '/loginByPhone', query: to.query});
if (i18n.locale == "zh-CN") {
router.push({path: '/loginByPhone', query: to.query});
}
else router.push({path: '/loginByEmail', query: to.query})
}
else {
......@@ -1166,9 +1168,9 @@ export default {
}
if (to.name == "mineIndex" && !this.getUserInfoCookieType() && this.judgeBrandIsWechatOrHtml() == 1) router.replace({path: '/circleList'})
next();
if(to.path!=from.path){
cancelRequest.cancelRequest()
}
// if(to.path!=from.path){
// cancelRequest.cancelRequest()
// }
} else {
console.log(res.msg)
}
......
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