Merge branch 'lichang' into lite

src/views/account/components/reset-passwd.vue

@@ -52,6 +52,7 @@ function fnFinish() {
       updateUserPassword(state.form.oldPassword, state.form.confirmPassword)
         .then(res => {
           if (res.code === RESULT_CODE_SUCCESS) {
+            fnLogOut();
             Modal.success({
               title: t('common.tipTitle'),
               content: t('views.account.settings.submitOkTip', {
@@ -59,7 +60,7 @@ function fnFinish() {
               }),
               okText: t('views.account.settings.submitOk'),
               onOk() {
-                fnLogOut().finally(() => router.push({ name: 'Login' }));
+                router.push({ name: 'Login' });
               },
             });
           } else {