From 7c2def08ab1222979372111af1d99d402ad4e8a2 Mon Sep 17 00:00:00 2001
From: 13218645326 <sjf13651675634@163.com>
Date: Sun, 10 Dec 2023 03:13:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                             |  2 +-
 src/components/comNav/index.vue         | 19 ++++++++++---------
 src/router/index.ts                     |  2 +-
 src/style/css/{reset.css => reset.scss} |  0
 src/style/scss/index.scss               |  4 ++--
 5 files changed, 14 insertions(+), 13 deletions(-)
 rename src/style/css/{reset.css => reset.scss} (100%)

diff --git a/src/App.vue b/src/App.vue
index 779a6f2..a261f2c 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -11,5 +11,5 @@ console.log('routedddd',route)
 </script>
 
 <style lang="scss">
-@import url("./style/css/reset.css");
+ 
 </style>
diff --git a/src/components/comNav/index.vue b/src/components/comNav/index.vue
index 09b0db8..537d023 100644
--- a/src/components/comNav/index.vue
+++ b/src/components/comNav/index.vue
@@ -1,4 +1,5 @@
 <template>
+  <!-- <h1>{{ navStore.topNavList }}</h1> -->
   <subMenu :menuList="menuInfo.menuList" :collapse="menuInfo.collapse" :backgroundColor="menuInfo.backgroundColor"
     :textColor="menuInfo.textColor" :activeTextColor="menuInfo.activeTextColor" :defaultActive="navStore.defaultActive"
     :defaultOpeneds="menuInfo.defaultOpeneds" :uniqueOpened="menuInfo.uniqueOpened" :menuTrigger="menuInfo.menuTrigger"
@@ -56,15 +57,15 @@ const initRouteList = () => {
   const routes: any = list
   console.log("routes", router)
   const currentNav = routes.find((ele:any)=>ele.meta.folder).children[0]
-  if (navStore.topNavList.length == 0) {
-    let firstNav = {
-      title: currentNav.meta.title,
-      name: currentNav.name,
-      path: currentNav.path
-    }
-    navStore.addNavTarget(firstNav)
-    navStore.setCurrentNav(currentNav.path)
-  }
+  // if (navStore.topNavList.length == 0) {
+  //   let firstNav = {
+  //     title: currentNav.meta.title,
+  //     name: currentNav.name,
+  //     path: currentNav.path
+  //   }
+  //   navStore.addNavTarget(firstNav)
+  //   navStore.setCurrentNav(currentNav.path)
+  // }
   console.log("currentNav", currentNav)
   menuInfo.defaultActive = currentNav.name + '&&' + currentNav.meta.title
   console.log("currentNav", menuInfo.defaultActive)
diff --git a/src/router/index.ts b/src/router/index.ts
index 043ef35..be34db4 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -73,7 +73,7 @@ const routes: Array<RouteRecordRaw> = [
 
             {
                 path: 'enterpriseType',
-                name: 'configuration',
+                name: 'enterpriseType',
                 component: () => import('views/enterpriseManagement/enterpriseType/index.vue'),
                 meta: {
                     title: '企业类型',
diff --git a/src/style/css/reset.css b/src/style/css/reset.scss
similarity index 100%
rename from src/style/css/reset.css
rename to src/style/css/reset.scss
diff --git a/src/style/scss/index.scss b/src/style/scss/index.scss
index 0bce31f..f908ca4 100644
--- a/src/style/scss/index.scss
+++ b/src/style/scss/index.scss
@@ -1,6 +1,6 @@
+@import '../css/reset.scss';
 @import './variable.scss';
 @import './mixin.scss';
 @import './common.module.scss';
 @import './nprogress.scss';
-@import './common.scss';
-@import '../css/reset.css';
\ No newline at end of file
+@import './common.scss';
\ No newline at end of file