diff --git a/components.d.ts b/components.d.ts
index 84af7ee..9a5a2ad 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -8,6 +8,8 @@ export {}
 declare module 'vue' {
   export interface GlobalComponents {
     Breadcrumb: typeof import('./src/components/Breadcrumb/index.vue')['default']
+    ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb']
+    ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem']
     ElButton: typeof import('element-plus/es')['ElButton']
     ElCarousel: typeof import('element-plus/es')['ElCarousel']
     ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
@@ -19,6 +21,7 @@ declare module 'vue' {
     ElDialog: typeof import('element-plus/es')['ElDialog']
     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']
@@ -31,6 +34,8 @@ declare module 'vue' {
     ElProgress: typeof import('element-plus/es')['ElProgress']
     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']
diff --git a/src/store/user.ts b/src/store/user.ts
index 762fe57..74287e4 100644
--- a/src/store/user.ts
+++ b/src/store/user.ts
@@ -144,13 +144,8 @@ export const useStore = defineStore('myUser', {
         editUserMenuList(type: number) {
             const leaseList: any = [
                 { title: '订单管理', name: 'orderManagementCz' },
-<<<<<<< HEAD
                 { title: '商品管理', name: 'goodsManagement' },
                 { title: '商品上下架', name: 'goodsUpdown' },
-=======
-                { title: '装备管理', name: 'goodsManagement' },
-                // { title: '商品上下架', name: 'goodsUpdown' },
->>>>>>> main
                 // { title: '机手管理', name: 'operatorManagement' },
                 // { title: '寻源竞价', name: 'sourcingBidding' },
                 // { title: '专区管理', name: 'zoneManag' },
diff --git a/src/views/user/index.vue b/src/views/user/index.vue
index 6865a6b..3941ec3 100644
--- a/src/views/user/index.vue
+++ b/src/views/user/index.vue
@@ -46,9 +46,6 @@ const userInfo: any = computed(() => {
 const handleSelect = (name: any, path: any) => {
     store.editcurrentMenuItem(name)
 }
-const activeMenuItem = computed(() => {
-    return store.currentMenuItem
-})
 
 const activeseekingRent = computed(() => {
     return store.currentMenuType
@@ -58,6 +55,10 @@ const menuList: any = computed(() => {
     return store.leaseAndLesseeUserList
 })
 
+const activeMenuItem = computed(() => {
+    return store.leaseAndLesseeUserList[0].name
+})
+
 // watch(route, (newVlaue) => {
 //     if (newVlaue.path.indexOf('myuser') === -1) {
 //         store.editcurrentMenuItem('baseInfo')