fix language always being set to English after logged out

This commit is contained in:
MaysWind
2020-11-22 18:48:06 +08:00
parent 1bd33d854f
commit b8d2d687a2
5 changed files with 26 additions and 12 deletions
+8 -2
View File
@@ -185,7 +185,10 @@ export default {
return;
}
self.$settings.setEnableApplicationLock(false);
if (self.$settings.isEnableApplicationLock()) {
self.$settings.setEnableApplicationLock(false);
}
self.$user.updateTokenAndUserInfo(data.result);
if (self.$settings.isAutoUpdateExchangeRatesData()) {
@@ -259,7 +262,10 @@ export default {
return;
}
self.$settings.setEnableApplicationLock(false);
if (self.$settings.isEnableApplicationLock()) {
self.$settings.setEnableApplicationLock(false);
}
self.$user.updateTokenAndUserInfo(data.result);
if (self.$settings.isAutoUpdateExchangeRatesData()) {
+3 -1
View File
@@ -185,8 +185,10 @@ export default {
}
self.$user.clearTokenAndUserInfo();
self.$settings.clearSettings();
self.$exchangeRates.clearExchangeRates();
self.$settings.clearSettings();
self.$locale.init();
router.navigate('/');
}).catch(error => {
self.$logger.error('failed to log out', error);
+3 -1
View File
@@ -157,7 +157,9 @@ export default {
return;
}
self.$settings.setEnableApplicationLock(false);
if (self.$settings.isEnableApplicationLock()) {
self.$settings.setEnableApplicationLock(false);
}
if (self.$utilities.isString(data.result.token)) {
self.$user.updateTokenAndUserInfo(data.result);
+2 -1
View File
@@ -92,8 +92,9 @@ export default {
const router = this.$f7router;
this.$user.clearTokenAndUserInfo();
this.$settings.clearSettings();
this.$exchangeRates.clearExchangeRates();
this.$settings.clearSettings();
this.$locale.init();
router.navigate('/login', {
clearPreviousHistory: true