切换公司2

src/components/login/loginActions.vue

@@ -1,6 +1,6 @@
 <template>
-   <div> 
-   </div>
+  <div>
+  </div>
 </template>
 
 <script>
@@ -16,7 +16,7 @@ import { USER_MODEL } from '@/services/base/api.js';
 //封装 登录的相关操作
 export default {
   name: 'loginActions',
-  components: {   },
+  components: {},
   data() {
     return {
       logging: false,
@@ -48,7 +48,7 @@ export default {
       return USER_MODEL == "AdminUser";
     },
 
-    afterLoginSuccess({ token, access_expire, uid, msg = '登录成功',pushTo = '/dashboard/workplace' }) {
+    afterLoginSuccess({ closeOthers, token, access_expire, uid, msg = '登录成功', pushTo = '/dashboard/workplace' }) {
 
       setAuthorization({ token: token, expireAt: new Date(access_expire * 1000) }) // 设置token
 
@@ -74,8 +74,13 @@ export default {
           const routesConfig = result.data.data
           this.setRoutesConfig(routesConfig)
           loadRoutes([routesConfig])
-          //this.$router.push(pushTo)
-          this.$closeOthers(pushTo)
+
+          if (closeOthers) {
+            this.$closeOthers(pushTo)
+          } else {
+            this.$router.push(pushTo)
+          }   
+
           this.$message.success(msg, 3)
         }
       })