Merge branch 'develop' into 'test'

src/containers/login/index.vue

@@ -146,12 +146,13 @@ export default {
         })
           .then(userRoles => {
             console.log('login done');
+
             this.loading = false;
             if (
               userRoles.find(
                 item => item.menuCode === process.env.VUE_APP_DASHBOARD_CODE
               ) &&
-              process.env.VUE_APP_BASE_URL === '/'
+              this.$router.options.base === '/'
             ) {
               this.$router.push({ path: '/' });
               setTimeout(() => {