冲突合并

components.d.ts

@@ -3,7 +3,7 @@
 // @ts-nocheck
 // Generated by unplugin-vue-components
 // Read more: https://github.com/vuejs/core/pull/3399
-export {}
+export { }
 
 declare module 'vue' {
   export interface GlobalComponents {
@@ -13,8 +13,34 @@ declare module 'vue' {
     ElCarousel: typeof import('element-plus/es')['ElCarousel']
     ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
+    ElCountdown: typeof import('element-plus/es')['ElCountdown']
+    ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
+    ElDialog: typeof import('element-plus/es')['ElDialog']
+    ElEmpty: typeof import('element-plus/es')['ElEmpty']
+    ElForm: typeof import('element-plus/es')['ElForm']
+    ElFormItem: typeof import('element-plus/es')['ElFormItem']
+    ElHeader: typeof import('element-plus/es')['ElHeader']
     ElIcon: typeof import('element-plus/es')['ElIcon']
     ElImage: typeof import('element-plus/es')['ElImage']
+    ElInput: typeof import('element-plus/es')['ElInput']
+    ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
+    ElMenu: typeof import('element-plus/es')['ElMenu']
+    ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
+    ElOption: typeof import('element-plus/es')['ElOption']
+    ElPageHeader: typeof import('element-plus/es')['ElPageHeader']
+    ElPagination: typeof import('element-plus/es')['ElPagination']
+    ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm']
+    ElProgress: typeof import('element-plus/es')['ElProgress']
+    ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
+    ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
+    ElRow: typeof import('element-plus/es')['ElRow']
+    ElSelect: typeof import('element-plus/es')['ElSelect']
+    ElStep: typeof import('element-plus/es')['ElStep']
+    ElSteps: typeof import('element-plus/es')['ElSteps']
+    ElTable: typeof import('element-plus/es')['ElTable']
+    ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
+    ElTag: typeof import('element-plus/es')['ElTag']
+    ElUpload: typeof import('element-plus/es')['ElUpload']
     EquipCard: typeof import('./src/components/equipCard.vue')['default']
     EquipCardHall: typeof import('./src/components/equipCardHall/index.vue')['default']
     EquipCardNew: typeof import('./src/components/equipCardNew/index.vue')['default']

src/router/index.ts

@@ -308,29 +308,29 @@ const routes: Array<RouteRecordRaw> = [
             //     },
             // },
             // /* 订单管理（订单详情承租） */
-            // {
+            {
-            //     path: 'orderManagementInfo',
+                path: 'orderManagementInfo',
-            //     name: 'orderManagementInfo',
+                name: 'orderManagementInfo',
-            //     component: () => import('@/views/user/orderManagement/detail.vue'),
+                component: () => import('@/views/user/orderManagement/detail.vue'),
-            //     meta: {
+                meta: {
-            //         title: '订单详情',
+                    title: '订单详情',
-            //         keepAlive: true,
+                    keepAlive: true,
-            //         AuthFlag: false,
+                    AuthFlag: false,
-            //         isLogin: false
+                    isLogin: false
-            //     },
+                },
-            // },
+            },
             // /* 订单管理（退租） */
-            // {
+            {
-            //     path: 'rentinTermination',
+                path: 'rentinTermination',
-            //     name: 'rentinTermination',
+                name: 'rentinTermination',
-            //     component: () => import('views/user/orderManagement/orderCom/rentinTermination.vue'),
+                component: () => import('views/user/orderManagement/orderCom/rentinTermination.vue'),
-            //     meta: {
+                meta: {
-            //         title: '订单管理（退租）',
+                    title: '订单管理（退租）',
-            //         keepAlive: true,
+                    keepAlive: true,
-            //         AuthFlag: false,
+                    AuthFlag: false,
-            //         isLogin: true
+                    isLogin: true
-            //     },
+                },
-            // },
+            },
             // /* 订单管理（续租） */
             // {
             //     path: 'renewalOfLease',

src/views/user/index.vue

@@ -47,6 +47,8 @@ import imgSrc from '@/assets/img/logo.png'
 
 const handleSelect = (name: any, path: any) => {
     // store.editcurrentMenuItem(name)
+
+    store.editcurrentMenuItem(name)
     router.push({
         name,
     })