code refactor

This commit is contained in:
MaysWind
2020-11-08 00:40:45 +08:00
parent 9bd341fb0e
commit 7e8b5710c1
12 changed files with 127 additions and 111 deletions
+2 -2
View File
@@ -178,7 +178,7 @@ export default {
return;
}
self.$user.updateToken(data.result);
self.$user.updateTokenAndUserInfo(data.result);
router.navigate('/');
}).catch(error => {
self.logining = false;
@@ -234,7 +234,7 @@ export default {
return;
}
self.$user.updateToken(data.result);
self.$user.updateTokenAndUserInfo(data.result);
self.show2faSheet = false;
router.navigate('/');
}).catch(error => {
+3 -2
View File
@@ -47,7 +47,8 @@ export default {
return 'v' + this.$version();
},
userNickName() {
return this.$user.getUserNickName() || this.$user.getUserName() || this.$t('User');
const userInfo = this.$user.getUserInfo() || {};
return userInfo.nickname || userInfo.username || this.$t('User');
},
currentLocale: {
get: function () {
@@ -99,7 +100,7 @@ export default {
return;
}
self.$user.clearToken();
self.$user.clearTokenAndUserInfo();
router.navigate('/');
}).catch(error => {
self.logouting = false;
+2 -2
View File
@@ -144,8 +144,8 @@ export default {
return;
}
if (typeof(data.result) === 'object') {
self.$user.updateToken(data.result);
if (typeof(data.result.token) === 'string') {
self.$user.updateTokenAndUserInfo(data.result);
}
self.$toast('You have been successfully registered');
+4 -4
View File
@@ -220,12 +220,12 @@ export default {
return;
}
if (self.nickname) {
self.$user.updateUserNickname(self.nickname);
if (typeof(data.result.newToken) === 'string') {
self.$user.updateToken(data.result.newToken);
}
if (typeof(data.result) === 'string') {
self.$user.updateToken(data.result);
if (typeof(data.result.user) === 'object') {
self.$user.updateUserInfo(data.result.user);
}
self.$toast('Your profile has been successfully updated');