From 21ee1c7266053839b22a1d26af76d25d056ee293 Mon Sep 17 00:00:00 2001
From: shiwanyu <shi.wy@neusoft.com>
Date: Tue, 11 Feb 2025 16:54:29 +0800
Subject: [PATCH 1/3] =?UTF-8?q?shi=20=E6=9B=B4=E6=96=B0=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E8=BF=90=E8=A1=8C=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/form/stepForm/Step1.vue | 2 +-
 src/views/form/stepForm/Step2.vue | 2 +-
 src/views/form/stepForm/Step3.vue | 2 --
 src/views/login/index.vue         | 5 ++++-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/views/form/stepForm/Step1.vue b/src/views/form/stepForm/Step1.vue
index e1ef5102..662746cf 100644
--- a/src/views/form/stepForm/Step1.vue
+++ b/src/views/form/stepForm/Step1.vue
@@ -48,7 +48,7 @@
 </template>
 
 <script lang="ts" setup>
-  import { ref, defineEmits } from 'vue';
+  import { ref } from 'vue';
   import { useMessage } from 'naive-ui';
 
   const myAccountList = [
diff --git a/src/views/form/stepForm/Step2.vue b/src/views/form/stepForm/Step2.vue
index 73bca11d..711fe92d 100644
--- a/src/views/form/stepForm/Step2.vue
+++ b/src/views/form/stepForm/Step2.vue
@@ -33,7 +33,7 @@
 </template>
 
 <script lang="ts" setup>
-  import { ref, defineEmits } from 'vue';
+  import { ref } from 'vue';
   import { useMessage } from 'naive-ui';
   const form2Ref: any = ref(null);
   const message = useMessage();
diff --git a/src/views/form/stepForm/Step3.vue b/src/views/form/stepForm/Step3.vue
index 30ef1d7f..a8950128 100644
--- a/src/views/form/stepForm/Step3.vue
+++ b/src/views/form/stepForm/Step3.vue
@@ -32,8 +32,6 @@
 </template>
 
 <script lang="ts" setup>
-  import { defineEmits } from 'vue';
-
   const emit = defineEmits(['finish', 'prevStep']);
   function prevStep() {
     emit('prevStep');
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index e1f4aa46..e0c44519 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -140,7 +140,10 @@
             const toPath = decodeURIComponent((route.query?.redirect || '/') as string);
             message.success('登录成功，即将进入系统');
             if (route.name === LOGIN_NAME) {
-              router.replace('/');
+              // router.replace('/');
+              router.isReady().then(() => {
+                router.push('/');
+              });
             } else router.replace(toPath);
           } else {
             message.info(msg || '登录失败');

From 6ce2ff4cdf35206ce9f076fb0d3121d86f13db8e Mon Sep 17 00:00:00 2001
From: shiwanyu <shi.wy@neusoft.com>
Date: Tue, 11 Feb 2025 17:13:47 +0800
Subject: [PATCH 2/3] =?UTF-8?q?shi=20=E4=BF=AE=E5=A4=8D=E5=90=84=E7=A7=8D?=
 =?UTF-8?q?=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                            |  1 +
 postcss.config.js => postcss.config.cjs |  0
 src/router/index.ts                     |  2 +-
 vite.config.ts                          | 20 +++++++-------------
 4 files changed, 9 insertions(+), 14 deletions(-)
 rename postcss.config.js => postcss.config.cjs (100%)

diff --git a/package.json b/package.json
index a68b4e8c..9b5f18d2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,7 @@
 {
   "name": "naive-ui-admin",
   "version": "2.0.0",
+  "type": "module",
   "author": {
     "name": "Ahjung",
     "email": "735878602@qq.com",
diff --git a/postcss.config.js b/postcss.config.cjs
similarity index 100%
rename from postcss.config.js
rename to postcss.config.cjs
diff --git a/src/router/index.ts b/src/router/index.ts
index a1d909cc..11787f36 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -45,7 +45,7 @@ export const constantRouter: RouteRecordRaw[] = [LoginRoute, RootRoute, Redirect
 
 const router = createRouter({
   history: createWebHistory(),
-  routes: constantRouter,
+  routes: [...constantRouter, ...asyncRoutes],
   strict: true,
   scrollBehavior: () => ({ left: 0, top: 0 }),
 });
diff --git a/vite.config.ts b/vite.config.ts
index 284d15ee..dc5d5cd6 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -1,5 +1,4 @@
-import type { UserConfig, ConfigEnv } from 'vite';
-import { loadEnv } from 'vite';
+import { defineConfig, loadEnv } from 'vite';
 import { resolve } from 'path';
 import { wrapperEnv } from './build/utils';
 import { createVitePlugins } from './build/vite/plugin';
@@ -7,6 +6,7 @@ import { OUTPUT_DIR } from './build/constant';
 import { createProxy } from './build/vite/proxy';
 import pkg from './package.json';
 import { format } from 'date-fns';
+
 const { dependencies, devDependencies, name, version } = pkg;
 
 const __APP_INFO__ = {
@@ -18,25 +18,19 @@ function pathResolve(dir: string) {
   return resolve(process.cwd(), '.', dir);
 }
 
-export default ({ command, mode }: ConfigEnv): UserConfig => {
+export default defineConfig(({ command, mode }) => {
   const root = process.cwd();
   const env = loadEnv(mode, root);
   const viteEnv = wrapperEnv(env);
   const { VITE_PUBLIC_PATH, VITE_PORT, VITE_PROXY } = viteEnv;
   const isBuild = command === 'build';
+
   return {
     base: VITE_PUBLIC_PATH,
-    esbuild: {},
     resolve: {
       alias: [
-        {
-          find: /\/#\//,
-          replacement: pathResolve('types') + '/',
-        },
-        {
-          find: '@',
-          replacement: pathResolve('src') + '/',
-        },
+        { find: /\/#\//, replacement: pathResolve('types') + '/' },
+        { find: '@', replacement: pathResolve('src') + '/' },
       ],
       dedupe: ['vue'],
     },
@@ -63,4 +57,4 @@ export default ({ command, mode }: ConfigEnv): UserConfig => {
       chunkSizeWarningLimit: 2000,
     },
   };
-};
+});

From 8816fd3e85ee3fcdf8629c2cdd13b6bc4e59d3b5 Mon Sep 17 00:00:00 2001
From: shiwanyu <shi.wy@neusoft.com>
Date: Mon, 24 Mar 2025 14:29:51 +0800
Subject: [PATCH 3/3] =?UTF-8?q?shi=20=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.ts       | 5 +++--
 src/store/modules/user.ts | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/router/index.ts b/src/router/index.ts
index 11787f36..1adc3b96 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -18,7 +18,7 @@ function sortRoute(a, b) {
 }
 
 routeModuleList.sort(sortRoute);
-
+console.log(routeModuleList, '----wriririr');
 export const RootRoute: RouteRecordRaw = {
   path: '/',
   name: 'Root',
@@ -45,7 +45,8 @@ export const constantRouter: RouteRecordRaw[] = [LoginRoute, RootRoute, Redirect
 
 const router = createRouter({
   history: createWebHistory(),
-  routes: [...constantRouter, ...asyncRoutes],
+  // routes: [...constantRouter, ...asyncRoutes],
+  routes: constantRouter,
   strict: true,
   scrollBehavior: () => ({ left: 0, top: 0 }),
 });
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index ba847d94..6b551325 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -65,6 +65,7 @@ export const useUserStore = defineStore({
     async login(params: any) {
       const response = await login(params);
       const { result, code } = response;
+      console.log('login', response);
       if (code === ResultEnum.SUCCESS) {
         const ex = 7 * 24 * 60 * 60;
         storage.set(ACCESS_TOKEN, result.token, ex);
@@ -79,6 +80,7 @@ export const useUserStore = defineStore({
     // 获取用户信息
     async getInfo() {
       const data = await getUserInfoApi();
+      console.log('getInfo', data);
       const { result } = data;
       if (result.permissions && result.permissions.length) {
         const permissionsList = result.permissions;