Merge branch 'develop' into 'test'

src/containers/login/index.vue

@@ -84,6 +84,7 @@
 import { mapActions } from 'vuex';
 import { fetchVcode } from '@/api/user/login';
 import CodeView from './components/CodeView';
+import { setTimeout } from 'timers';
 
 export default {
   name: 'login',
@@ -149,9 +150,13 @@ export default {
             if (
               userRoles.find(
                 item => item.menuCode === process.env.VUE_APP_DASHBOARD_CODE
-              )
+              ) &&
+              process.env.VUE_APP_BASE_URL === '/'
             ) {
-              this.$router.push({ name: 'dashboard' });
+              this.$router.push({ path: '/' });
+              setTimeout(() => {
+                this.$router.push({ name: 'dashboard' });
+              }, 400);
             } else {
               this.$router.push({ path: '/' });
             }