登录页面改成主页

@@ -38,10 +38,11 @@ router.beforeEach(async (to, from, next) => {
       settingsStore.settings.menu.menuMode !== 'single' && menuStore.setActived(to.path)
       settingsStore.settings.menu.menuMode !== 'single' && menuStore.setActived(to.path)
       // 如果已登录状态下，进入登录页会强制跳转到主页
       // 如果已登录状态下，进入登录页会强制跳转到主页
       if (to.name === 'login') {
       if (to.name === 'login') {
-        next({
-          name: 'login',
-          replace: true,
-        })
+        // next({
+        //   name: 'login',
+        //   replace: true,
+        // })
+        window.location.href = userStore.idassLoginUrl;
       }
       }
       else if (to.name == 'scenes') {
       else if (to.name == 'scenes') {
         next({
         next({
@@ -130,12 +131,13 @@ router.beforeEach(async (to, from, next) => {
       next()
       next()
     }
     }
     else if (!to.query.code && to.name !== 'login') {
     else if (!to.query.code && to.name !== 'login') {
-      next({
-        name: 'login',
-        query: {
-          redirect: to.fullPath !== '/' ? to.fullPath : undefined,
-        },
-      })
+      window.location.href = userStore.idassLoginUrl;
+      // next({
+      //   name: 'login',
+      //   query: {
+      //     redirect: to.fullPath !== '/' ? to.fullPath : undefined,
+      //   },
+      // })
     }
     }
     else {
     else {
       next()
       next()

@@ -27,14 +27,14 @@ interface metaInfoRaw {
 
 
 // 固定路由（默认路由）
 // 固定路由（默认路由）
 const constantRoutes: RouteRecordRaw[] = [
 const constantRoutes: RouteRecordRaw[] = [
-  {
-    path: '/login',
-    name: 'login',
-    component: () => import('@/views/login.vue'),
-    meta: {
-      title: '登录',
-    },
-  },
+  // {
+  //   path: '/login',
+  //   name: 'login',
+  //   component: () => import('@/views/login.vue'),
+  //   meta: {
+  //     title: '登录',
+  //   },
+  // },
   {
   {
     path: '/register',
     path: '/register',
     name: 'register',
     name: 'register',

@@ -176,7 +176,7 @@ const useUserStore = defineStore(
           menuStore.setActived(0)
           menuStore.setActived(0)
           tabbar.value = []
           tabbar.value = []
           tabbarMap.value = {}
           tabbarMap.value = {}
-          window.location.href = idassLoginUrl + '?logout=1';
+          window.location.href = idassLoginUrl.value + '?logout=1';
         });
         });
       } else {
       } else {
         let hasCode = localStorage.getItem('code');
         let hasCode = localStorage.getItem('code');
@@ -195,7 +195,7 @@ const useUserStore = defineStore(
         tabbar.value = []
         tabbar.value = []
         tabbarMap.value = {}
         tabbarMap.value = {}
         if (hasCode) {
         if (hasCode) {
-          window.location.href = idassLoginUrl + '?logout=1';
+          window.location.href = idassLoginUrl.value + '?logout=1';
         } else {
         } else {
           router.push({
           router.push({
             name: 'login',
             name: 'login',
@@ -313,6 +313,7 @@ const useUserStore = defineStore(
       permissions,
       permissions,
       isLogin,
       isLogin,
       isLoginOut,
       isLoginOut,
+      idassLoginUrl,
       getTokenPromise,
       getTokenPromise,
       getToken,
       getToken,
       login,
       login,