Commit cd6ca9ec authored by zhangyanni's avatar zhangyanni

再试一下

parent bfb16447
...@@ -1069,13 +1069,13 @@ export default { ...@@ -1069,13 +1069,13 @@ export default {
// } // }
} else { } 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 ((/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") { if (en == "zh-CN") {
router.push({path: '/loginByPhone', query: to.query}); router.push({path: '/loginByPhone', query: to.query});
} }
else router.push({path: '/loginByEmail', query: to.query}) else router.push({path: '/loginByEmail', query: to.query})
} }
else { else {
if (i18n.locale == "zh-CN") router.push({path: '/mobileLoginCmpt', query: to.query}); if (en == "zh-CN") router.push({path: '/mobileLoginCmpt', query: to.query});
else router.push({path: '/emailLoginCmpt', query: to.query}) else router.push({path: '/emailLoginCmpt', query: to.query})
} }
...@@ -1125,22 +1125,22 @@ export default { ...@@ -1125,22 +1125,22 @@ export default {
this.setUserInfoCookie("selected", "mine"); this.setUserInfoCookie("selected", "mine");
} }
if (to.name == "mobileLoginCmpt") { if (to.name == "mobileLoginCmpt") {
if (i18n.locale == "en") router.push({path: '/emailLoginCmpt', query: to.query}); if (en == "en") router.push({path: '/emailLoginCmpt', query: to.query});
cancelRequest.cancelRequest() cancelRequest.cancelRequest()
} }
if (to.name == "emailLoginCmpt") { if (to.name == "emailLoginCmpt") {
if (i18n.locale == "zh-CN") router.push({path: '/mobileLoginCmpt', query: to.query}); if (en == "zh-CN") router.push({path: '/mobileLoginCmpt', query: to.query});
cancelRequest.cancelRequest() cancelRequest.cancelRequest()
} }
if (to.name == "login") { if (to.name == "login") {
if (i18n.locale == "zh-CN") router.push({path: '/mobileLoginCmpt', query: to.query}); if (en == "zh-CN") router.push({path: '/mobileLoginCmpt', query: to.query});
else router.push({path: '/emailLoginCmpt', query: to.query}) else router.push({path: '/emailLoginCmpt', query: to.query})
} }
if (to.name == "mobileRegisterCmpt") { if (to.name == "mobileRegisterCmpt") {
if (i18n.locale == "en") router.push({path: '/emailRegisterCmpt', query: to.query}); if (en == "en") router.push({path: '/emailRegisterCmpt', query: to.query});
} }
if (to.name == "emailRegisterCmpt") { if (to.name == "emailRegisterCmpt") {
if (i18n.locale == "zh-CN") router.push({path: '/mobileRegisterCmpt', query: to.query}); if (en == "zh-CN") router.push({path: '/mobileRegisterCmpt', query: to.query});
} }
if (to.name == "dashboard") { if (to.name == "dashboard") {
// if(window.innerWidth<=950) router.replace('/index'); // if(window.innerWidth<=950) router.replace('/index');
...@@ -1159,14 +1159,14 @@ export default { ...@@ -1159,14 +1159,14 @@ export default {
} }
} }
if (to.name == "mobileLogin") { if (to.name == "mobileLogin") {
if (i18n.locale == "zh-CN") router.push({path: '/loginByPhone', query: to.query}); if (en == "zh-CN") router.push({path: '/loginByPhone', query: to.query});
else router.push({path: '/loginByEmail', query: to.query}) else router.push({path: '/loginByEmail', query: to.query})
} }
if (to.name == "loginByPhone") { if (to.name == "loginByPhone") {
if (i18n.locale == "en") router.replace({path: '/loginByEmail', query: to.query}); if (en == "en") router.replace({path: '/loginByEmail', query: to.query});
} }
if (to.name == "loginByEmail") { if (to.name == "loginByEmail") {
if (i18n.locale == "zh-CN") router.replace({path: '/loginByPhone', query: to.query}); if (en == "zh-CN") router.replace({path: '/loginByPhone', query: to.query});
} }
} }
if (to.name == "mineIndex" && !this.getUserInfoCookieType() && this.judgeBrandIsWechatOrHtml() == 1) router.replace({path: '/circleList'}) if (to.name == "mineIndex" && !this.getUserInfoCookieType() && this.judgeBrandIsWechatOrHtml() == 1) router.replace({path: '/circleList'})
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
name: "mobileTop", name: "mobileTop",
data() { data() {
return { return {
lang: this.$i18n.locale, lang: !(/miniProgram/i.test(navigator.userAgent))?this.$i18n.locale:this.publicFun.getCookie("language"),
userInfo: this.publicFun.getUserInfoCookieType() ? JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())) : null, userInfo: this.publicFun.getUserInfoCookieType() ? JSON.parse(this.Base64.decode(this.publicFun.getUserInfoCookieType())) : null,
drawer: false, drawer: false,
direction: 'ltr', direction: 'ltr',
......
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