huangxw 10 kuukautta sitten
vanhempi
säilyke
b88fc86b0f

+ 25 - 26
src/layout/components/Sidebar/index.vue

@@ -1,23 +1,14 @@
 <template>
-  <div :class="{ 'has-logo': showLogo }" :style="{ backgroundColor: bgColor }">
-    <logo v-if="showLogo" :collapse="isCollapse" />
-    <el-scrollbar :class="sideTheme" wrap-class="scrollbar-wrapper">
-      <transition :enter-active-class="proxy?.animate.menuSearchAnimate.enter" mode="out-in">
-        <el-menu
-          :default-active="activeMenu"
-          :collapse="isCollapse"
-          :background-color="bgColor"
-          :text-color="textColor"
-          :unique-opened="true"
-          :active-text-color="theme"
-          :collapse-transition="false"
-          mode="vertical"
-        >
-          <sidebar-item v-for="(r, index) in sidebarRouters" :key="r.path + index" :item="r" :base-path="r.path" />
-        </el-menu>
-      </transition>
-    </el-scrollbar>
-  </div>
+    <div :class="{ 'has-logo': showLogo }" :style="{ backgroundColor: bgColor }">
+        <logo v-if="showLogo" :collapse="isCollapse" />
+        <el-scrollbar :class="sideTheme" wrap-class="scrollbar-wrapper">
+            <transition :enter-active-class="proxy?.animate.menuSearchAnimate.enter" mode="out-in">
+                <el-menu :default-active="activeMenu" :collapse="isCollapse" :background-color="bgColor" :text-color="textColor" :unique-opened="true" :active-text-color="theme" :collapse-transition="false" mode="vertical">
+                    <sidebar-item v-for="(r, index) in sidebarRouters" :key="r.path + index" :item="r" :base-path="r.path" />
+                </el-menu>
+            </transition>
+        </el-scrollbar>
+    </div>
 </template>
 
 <script setup lang="ts">
@@ -42,14 +33,22 @@ const theme = computed(() => settingsStore.theme);
 const isCollapse = computed(() => !appStore.sidebar.opened);
 
 const activeMenu = computed(() => {
-  const { meta, path } = route;
-  // if set path, the sidebar will highlight the path you set
-  if (meta.activeMenu) {
-    return meta.activeMenu;
-  }
-  return path;
+    const { meta, path } = route;
+    console.log(route);
+    // if set path, the sidebar will highlight the path you set
+    if (route.name) {
+        console.log(route.name);
+        return (route.path as string).split('-')[0];
+    }
+    return path;
 });
-
+// const activeMenu = computed(() => {
+//     const { meta, path } = route;
+//     // if set path, the sidebar will highlight the path you set
+//     if (route.name) {
+//         return (route.name as string).split('-')[0];
+//     }
+// });
 const bgColor = computed(() => (sideTheme.value === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground));
 const textColor = computed(() => (sideTheme.value === 'theme-dark' ? variables.menuColor : variables.menuLightColor));
 </script>

+ 1 - 1
src/views/cdt/orders/detail/index.vue

@@ -29,7 +29,7 @@
     </div>
 </template>
 
-<script setup name="Member-detail" lang="ts">
+<script setup name="orders-detail" lang="ts">
 import { getTestOrderDetail } from '@/api/cdt/orders';
 import { orderInfo, menuInfo } from '../../models';
 const { query }:any = useRoute()

+ 1 - 1
src/views/cdt/orders/index.vue

@@ -75,7 +75,7 @@
                                     <el-button @click="clickRownvoice(row)" text class="small-btn-font" type="primary" size="small">上传发票</el-button>
                                 </template>
                                 <span></span>
-                                <el-button @click="router.push({ path: 'order-detail', query: { orderId: row?.id} })" style="color: #0079fe;" text class="small-btn-font" type="primary" size="small">查看详情</el-button>
+                                <el-button @click="router.push({ path: 'orders-detail', query: { orderId: row?.id} })" style="color: #0079fe;" text class="small-btn-font" type="primary" size="small">查看详情</el-button>
                             </template>
                         </vxe-column>
                     </vxe-table>