diff --git a/auto-imports.d.ts b/auto-imports.d.ts
index a606bd4..00e05c3 100644
--- a/auto-imports.d.ts
+++ b/auto-imports.d.ts
@@ -82,6 +82,6 @@ declare global {
 // for type re-export
 declare global {
   // @ts-ignore
-  export type { Component, ComponentPublicInstance, ComputedRef, DirectiveBinding, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, MaybeRef, MaybeRefOrGetter, VNode, WritableComputedRef } from 'vue'
+  export type { Component, ComponentPublicInstance, ComputedRef, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, VNode, WritableComputedRef } from 'vue'
   import('vue')
 }
diff --git a/components.d.ts b/components.d.ts
index acc6d37..f4b46fd 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -9,19 +9,13 @@ declare module 'vue' {
   export interface GlobalComponents {
     Breadcrumb: typeof import('./src/components/Breadcrumb/index.vue')['default']
     ElButton: typeof import('element-plus/es')['ElButton']
-<<<<<<< HEAD
     ElCarousel: typeof import('element-plus/es')['ElCarousel']
     ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
-=======
->>>>>>> main
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
     ElCol: typeof import('element-plus/es')['ElCol']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
     ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
-<<<<<<< HEAD
     ElDialog: typeof import('element-plus/es')['ElDialog']
-=======
->>>>>>> main
     ElForm: typeof import('element-plus/es')['ElForm']
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
     ElIcon: typeof import('element-plus/es')['ElIcon']
@@ -29,7 +23,6 @@ declare module 'vue' {
     ElInput: typeof import('element-plus/es')['ElInput']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
-<<<<<<< HEAD
     ElOption: typeof import('element-plus/es')['ElOption']
     ElPagination: typeof import('element-plus/es')['ElPagination']
     ElProgress: typeof import('element-plus/es')['ElProgress']
@@ -39,10 +32,6 @@ declare module 'vue' {
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
     ElTag: typeof import('element-plus/es')['ElTag']
     ElUpload: typeof import('element-plus/es')['ElUpload']
-=======
-    ElPagination: typeof import('element-plus/es')['ElPagination']
-    ElRow: typeof import('element-plus/es')['ElRow']
->>>>>>> main
     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']
diff --git a/src/views/user/index.vue b/src/views/user/index.vue
index a244a57..2bc777c 100644
--- a/src/views/user/index.vue
+++ b/src/views/user/index.vue
@@ -168,6 +168,7 @@ onMounted(() => {
     .right-content {
         width: calc(100% - 260px);
         height: 100%;
+        overflow-y: auto;
     }
 
     .active {
diff --git a/src/views/user/orderManagement/index.vue b/src/views/user/orderManagement/index.vue
index 07ffa68..4bb9314 100644
--- a/src/views/user/orderManagement/index.vue
+++ b/src/views/user/orderManagement/index.vue
@@ -1,32 +1,32 @@
 <script setup lang="ts">
-    import { ref } from 'vue'
-    import PagingComponent from 'components/PagingComponent/index.vue'
-    import { useRouter } from 'vue-router'
-    import { getOrderListApi } from 'http/api/usercenter/seekorder'
-    const queryParams = ref({})
-    const router = useRouter()
-    const pageSize = 10
-    const pageNumber = 1
-    const total: any = ref(0)
-    const cardList= ref<any>([])
-    const status = 0
-    // 获取数据列表
-    // const getList = async () => {
-    //     const res: any = await getOrderListApi()
-    //     console.log('获取数据列表***', res)
-    //     tableData.value = res.rows
-    //     total.value = res.total
+import { ref } from 'vue'
+import PagingComponent from 'components/PagingComponent/index.vue'
+import { useRouter } from 'vue-router'
+import { getOrderListApi } from 'http/api/usercenter/seekorder'
+const queryParams = ref({})
+const router = useRouter()
+const pageSize = 10
+const pageNumber = 1
+const total: any = ref(0)
+const cardList = ref<any>([])
+const status = 0
+// 获取数据列表
+// const getList = async () => {
+//     const res: any = await getOrderListApi()
+//     console.log('获取数据列表***', res)
+//     tableData.value = res.rows
+//     total.value = res.total
+// }
+/** 查询列表 */
+const getList = async () => {
+    // if(this.dateRange.length>0){
+    //     this.queryParams.startTime=this.dateRange[0]
+    //     this.queryParams.endTime=this.dateRange[1]
+    // }else{
+    //     this.queryParams.startTime=undefined
+    //     this.queryParams.endTime=undefined
     // }
-        /** 查询列表 */
-     const  getList = async()=> {
-            // if(this.dateRange.length>0){
-            //     this.queryParams.startTime=this.dateRange[0]
-            //     this.queryParams.endTime=this.dateRange[1]
-            // }else{
-            //     this.queryParams.startTime=undefined
-            //     this.queryParams.endTime=undefined
-            // }  
-        cardList.value = [
+    cardList.value = [
         {
             company_name: '安徽博诺斯有限公司',
             user_name: '王先生',
@@ -46,188 +46,188 @@
                     totalAmount: 0,
                     isChecked: false,
                     lease_date_string: '',
-
                 },
             ],
-              },
-              {
-                  company_name: '安徽博诺斯有限公司',
-                  user_name: '王先生',
-                  user_phone: '18725632356',
-                  isChecked: false,
-                  good_list: [
-                      {
-                          goods_pic:
-                              'https://fc1tn.baidu.com/it/u=4185529537,1682541874&fm=202&src=766&fc=tdmatt&mola=new&crop=v1',
-                          goods_name: 'W190挖掘机',
-                          goods_code: '995221_JHL',
-                          goods_type: '挖地型号996',
-                          lease_date: '',
-                          lease_pic: 300,
-                          lease_day: 0,
-                          goods_num: 0,
-                          totalAmount: 0,
-                          isChecked: false,
-                          lease_date_string: '',
-                      },
-                      {
-                          goods_pic:
-                              'https://fc1tn.baidu.com/it/u=4185529537,1682541874&fm=202&src=766&fc=tdmatt&mola=new&crop=v1',
-                          goods_name: 'W190挖掘机',
-                          goods_code: '995221_JHL',
-                          goods_type: '挖地型号996',
-                          lease_date: '',
-                          lease_pic: 300,
-                          lease_day: 0,
-                          goods_num: 0,
-                          totalAmount: 0,
-                          isChecked: false,
-                          lease_date_string: '',
-                      },
-                      {
-                          goods_pic:
-                              'https://fc1tn.baidu.com/it/u=4185529537,1682541874&fm=202&src=766&fc=tdmatt&mola=new&crop=v1',
-                          goods_name: 'W190挖掘机',
-                          goods_code: '995221_JHL',
-                          goods_type: '挖地型号996',
-                          lease_date: '',
-                          lease_pic: 300,
-                          lease_day: 0,
-                          goods_num: 0,
-                          totalAmount: 0,
-                          isChecked: false,
-                          lease_date_string: '',
-                      },
-                  ],
-              },
-              {
-                  company_name: '安徽博诺斯有限公司',
-                  user_name: '王先生',
-                  user_phone: '18725632356',
-                  isChecked: false,
-                  good_list: [
-                      {
-                          goods_pic:
-                              'https://fc1tn.baidu.com/it/u=4185529537,1682541874&fm=202&src=766&fc=tdmatt&mola=new&crop=v1',
-                          goods_name: 'W190挖掘机',
-                          goods_code: '995221_JHL',
-                          goods_type: '挖地型号996',
-                          lease_date: '',
-                          lease_pic: 300,
-                          lease_day: 0,
-                          goods_num: 0,
-                          totalAmount: 0,
-                          isChecked: false,
-                          lease_date_string: '',
-                      },
-                      {
-                          goods_pic:
-                              'https://fc1tn.baidu.com/it/u=4185529537,1682541874&fm=202&src=766&fc=tdmatt&mola=new&crop=v1',
-                          goods_name: 'W190挖掘机',
-                          goods_code: '995221_JHL',
-                          goods_type: '挖地型号996',
-                          lease_date: '',
-                          lease_pic: 300,
-                          lease_day: 0,
-                          goods_num: 0,
-                          totalAmount: 0,
-                          isChecked: false,
-                          lease_date_string: '',
-                      },
-                  ],
-              },
-        ];
-            total.value = cardList.value.length;
-            console.log(total.value)
-        }
+        },
+        {
+            company_name: '安徽博诺斯有限公司',
+            user_name: '王先生',
+            user_phone: '18725632356',
+            isChecked: false,
+            good_list: [
+                {
+                    goods_pic:
+                        'https://fc1tn.baidu.com/it/u=4185529537,1682541874&fm=202&src=766&fc=tdmatt&mola=new&crop=v1',
+                    goods_name: 'W190挖掘机',
+                    goods_code: '995221_JHL',
+                    goods_type: '挖地型号996',
+                    lease_date: '',
+                    lease_pic: 300,
+                    lease_day: 0,
+                    goods_num: 0,
+                    totalAmount: 0,
+                    isChecked: false,
+                    lease_date_string: '',
+                },
+                {
+                    goods_pic:
+                        'https://fc1tn.baidu.com/it/u=4185529537,1682541874&fm=202&src=766&fc=tdmatt&mola=new&crop=v1',
+                    goods_name: 'W190挖掘机',
+                    goods_code: '995221_JHL',
+                    goods_type: '挖地型号996',
+                    lease_date: '',
+                    lease_pic: 300,
+                    lease_day: 0,
+                    goods_num: 0,
+                    totalAmount: 0,
+                    isChecked: false,
+                    lease_date_string: '',
+                },
+                {
+                    goods_pic:
+                        'https://fc1tn.baidu.com/it/u=4185529537,1682541874&fm=202&src=766&fc=tdmatt&mola=new&crop=v1',
+                    goods_name: 'W190挖掘机',
+                    goods_code: '995221_JHL',
+                    goods_type: '挖地型号996',
+                    lease_date: '',
+                    lease_pic: 300,
+                    lease_day: 0,
+                    goods_num: 0,
+                    totalAmount: 0,
+                    isChecked: false,
+                    lease_date_string: '',
+                },
+            ],
+        },
+        {
+            company_name: '安徽博诺斯有限公司',
+            user_name: '王先生',
+            user_phone: '18725632356',
+            isChecked: false,
+            good_list: [
+                {
+                    goods_pic:
+                        'https://fc1tn.baidu.com/it/u=4185529537,1682541874&fm=202&src=766&fc=tdmatt&mola=new&crop=v1',
+                    goods_name: 'W190挖掘机',
+                    goods_code: '995221_JHL',
+                    goods_type: '挖地型号996',
+                    lease_date: '',
+                    lease_pic: 300,
+                    lease_day: 0,
+                    goods_num: 0,
+                    totalAmount: 0,
+                    isChecked: false,
+                    lease_date_string: '',
+                },
+                {
+                    goods_pic:
+                        'https://fc1tn.baidu.com/it/u=4185529537,1682541874&fm=202&src=766&fc=tdmatt&mola=new&crop=v1',
+                    goods_name: 'W190挖掘机',
+                    goods_code: '995221_JHL',
+                    goods_type: '挖地型号996',
+                    lease_date: '',
+                    lease_pic: 300,
+                    lease_day: 0,
+                    goods_num: 0,
+                    totalAmount: 0,
+                    isChecked: false,
+                    lease_date_string: '',
+                },
+            ],
+        },
+    ]
+    total.value = cardList.value.length
+    console.log(total.value)
+}
 
-    onMounted(() => {
-        getList()
+onMounted(() => {
+    getList()
+})
+
+// 查询按钮
+const queryTableList = () => {
+    getList()
+}
+
+const tableData = ref([])
+
+/* 退租按钮 */
+const clickRentingTermination = () => {
+    router.push({ name: 'rentinTermination' })
+    console.log('退租')
+}
+
+/* 查看按钮 */
+const clickPreviewDetails = (row: any) => {
+    console.log('查看', row)
+    router.push({
+        name: 'orderDetails',
+        query: {
+            orderId: row.orderId,
+        },
     })
+}
 
-    // 查询按钮
-    const queryTableList = () => {
-        getList()
-    }
+/* 续租按钮 */
+const clickRenewalOfLease = ({ row }: any) => {
+    console.log('续租', row)
+    router.push({
+        name: 'renewalOfLease',
+        query: {
+            orderId: row.orderId,
+        },
+    })
+}
 
-    const tableData = ref([])
+/* 确认收货 */
+const clickConfirmReceipt = (row: any) => {
+    console.log('确认收货')
+    router.push({
+        name: 'orderDetails',
+        query: {
+            orderId: row.orderId,
+            confirm: 'true',
+        },
+    })
+}
 
-    /* 退租按钮 */
-    const clickRentingTermination = () => {
-        router.push({ name: 'rentinTermination' })
-        console.log('退租')
-    }
-
-    /* 查看按钮 */
-    const clickPreviewDetails = (row: any) => {
-        console.log('查看', row)
-        router.push({
-            name: 'orderDetails',
-            query: {
-                orderId: row.orderId
-            }
-        })
-    }
-
-    /* 续租按钮 */
-    const clickRenewalOfLease = ({ row }: any) => {
-        console.log('续租', row)
-        router.push({
-            name: 'renewalOfLease',
-            query: {
-                orderId: row.orderId
-            }
-        })
-    }
-
-    /* 确认收货 */
-    const clickConfirmReceipt = (row: any) => {
-        console.log('确认收货')
-        router.push({
-            name: 'orderDetails',
-            query: {
-                orderId: row.orderId,
-                confirm: 'true'
-            }
-        })
-    }
-
-    const time = ref([])
+const time = ref([])
 </script>
 
 <template>
     <!-- 订单管理 -->
-<div class="container">
-    <el-form :model="queryParams" :inline="true" size="small">
-        <el-form-item label="订单编号：" prop="menuName">
-            <el-input />
-        </el-form-item>
-        <el-form-item label="创建时间：" prop="menuName">
-            <el-date-picker
-                v-model="time"
-                type="daterange"
-                unlink-panels
-                range-separator="-"
-                start-placeholder="开始时间"
-                end-placeholder="结束时间"
-                style="width: 180px" />
-        </el-form-item>
-        <el-form-item label="状态：" prop="menuName">
-            <el-input />
-        </el-form-item>
-        <el-form-item label="装备类型：" prop="menuName">
-            <el-input />
-        </el-form-item>
-        <el-form-item label="装备名称：" prop="menuName">
-            <el-input />
-        </el-form-item>
-        <el-form-item>
-            <el-button type="primary" @click="queryTableList">查询</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-        </el-form-item>
-    </el-form>
+    <div class="container">
+        <el-form :model="queryParams" :inline="true" size="small">
+            <el-form-item label="订单编号：" prop="menuName">
+                <el-input />
+            </el-form-item>
+            <el-form-item label="创建时间：" prop="menuName">
+                <el-date-picker
+                    v-model="time"
+                    type="daterange"
+                    unlink-panels
+                    range-separator="-"
+                    start-placeholder="开始时间"
+                    end-placeholder="结束时间"
+                    style="width: 180px"
+                />
+            </el-form-item>
+            <el-form-item label="状态：" prop="menuName">
+                <el-input />
+            </el-form-item>
+            <el-form-item label="装备类型：" prop="menuName">
+                <el-input />
+            </el-form-item>
+            <el-form-item label="装备名称：" prop="menuName">
+                <el-input />
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" @click="queryTableList">查询</el-button>
+                <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+            </el-form-item>
+        </el-form>
 
-    <div class="cart-tbody" v-for="(item, index) in cardList" :key="index">
+        <div class="cart-tbody" v-for="(item, index) in cardList" :key="index">
             <el-row style="border-bottom: 1px solid #ccc">
                 <el-col :span="1">
                     <div style="text-align: center">
@@ -239,53 +239,83 @@
                     </div>
                 </el-col>
                 <el-col :span="22">
-                  <el-row> 
-                    <el-col :span="7">
-                    <div class="item" style="flex-shrink: 0;margin-bottom: 5px;font-size: 12px;">
-                        <span>订单编号:</span>
-                      {{ item.company_name }}
-                    </div>
-                    </el-col>
-                    <el-col :span="7">
-                       <div class="item" style="flex-shrink: 0;margin-bottom: 5px;font-size: 12px;">
-                        <span class="user-name">下单时间:</span>   
-                      {{ item.user_name }}
-                    </div>
-                    </el-col>
-                    <el-col :span="7">
-                      <div class="item" style="flex-shrink: 0;margin-bottom: 5px;font-size: 12px;">
-                        <span class="user-phone">装备所属公司:</span>
-                      {{ item.user_phone }}
-                    </div>   
-                    </el-col>
-                     <el-col :span="2">
-                      <div style="flex-shrink: 0;margin-bottom: 1px;font-size: 7px;">
-                          <el-button v-if="status==0" class="item" type="primary" size="small">出库</el-button>
-                          <el-button v-if="status==0" class="item" type="primary" size="small">驳回</el-button>
-                     </div>   
-                    </el-col>
-                  </el-row>
+                    <el-row>
+                        <el-col :span="7">
+                            <div
+                                class="item"
+                                style="flex-shrink: 0; margin-bottom: 5px; font-size: 12px"
+                            >
+                                <span>订单编号:</span>
+                                {{ item.company_name }}
+                            </div>
+                        </el-col>
+                        <el-col :span="7">
+                            <div
+                                class="item"
+                                style="flex-shrink: 0; margin-bottom: 5px; font-size: 12px"
+                            >
+                                <span class="user-name">下单时间:</span>
+                                {{ item.user_name }}
+                            </div>
+                        </el-col>
+                        <el-col :span="6">
+                            <div
+                                class="item"
+                                style="flex-shrink: 0; margin-bottom: 5px; font-size: 12px"
+                            >
+                                <span class="user-phone">装备所属公司:</span>
+                                {{ item.user_phone }}
+                            </div>
+                        </el-col>
+                        <el-col :span="4">
+                            <div style="flex-shrink: 0; margin-bottom: 1px; font-size: 7px">
+                                <el-button
+                                    v-if="status == 0"
+                                    class="item"
+                                    type="primary"
+                                    size="small"
+                                    >出库</el-button
+                                >
+                                <el-button
+                                    v-if="status == 0"
+                                    class="item"
+                                    type="primary"
+                                    size="small"
+                                    >驳回</el-button
+                                >
+                            </div>
+                        </el-col>
+                    </el-row>
 
-                  <el-row> 
-                    <el-col :span="7">
-                    <div class="item" style="flex-shrink: 0;margin-bottom: 5px;font-size: 12px;">
-                        <span>出租方联系电话:</span>
-                      {{ item.company_name }}
-                    </div>
-                    </el-col>
-                    <el-col :span="7">
-                       <div class="item" style="flex-shrink: 0;margin-bottom: 5px;font-size: 12px;">
-                        <span class="user-name">承租方联系电话:</span>   
-                      {{ item.user_name }}
-                    </div>
-                    </el-col>
-                    <el-col :span="7">
-                      <div class="item" style="flex-shrink: 0;margin-bottom: 5px;font-size: 12px;">
-                        <span class="user-phone">承租方地址:</span>
-                      {{ item.user_phone }}
-                    </div>   
-                    </el-col>
-                  </el-row>
+                    <el-row>
+                        <el-col :span="7">
+                            <div
+                                class="item"
+                                style="flex-shrink: 0; margin-bottom: 5px; font-size: 12px"
+                            >
+                                <span>出租方联系电话:</span>
+                                {{ item.company_name }}
+                            </div>
+                        </el-col>
+                        <el-col :span="7">
+                            <div
+                                class="item"
+                                style="flex-shrink: 0; margin-bottom: 5px; font-size: 12px"
+                            >
+                                <span class="user-name">承租方联系电话:</span>
+                                {{ item.user_name }}
+                            </div>
+                        </el-col>
+                        <el-col :span="7">
+                            <div
+                                class="item"
+                                style="flex-shrink: 0; margin-bottom: 5px; font-size: 12px"
+                            >
+                                <span class="user-phone">承租方地址:</span>
+                                {{ item.user_phone }}
+                            </div>
+                        </el-col>
+                    </el-row>
                 </el-col>
             </el-row>
 
@@ -298,28 +328,30 @@
                 </el-col>
                 <el-col :span="8" class="goods-info">
                     <el-col :span="7">
-                     <img :src="goods.goods_pic" alt="" />
+                        <img :src="goods.goods_pic" alt="" />
                     </el-col>
                     <div class="goods-code">
                         <div style="font-size: 12px; font-weight: bold">{{ goods.goods_name }}</div>
-                        <div>租期： {{ goods.lease_day }}{{" "+"天"}}</div>
-                          <div>租金：{{ goods.lease_pic }}{{" "+"元/天"}}</div>
-                          <div>数量：{{ goods.goods_num }}{{" "+"台"}}</div>
+                        <div>租期： {{ goods.lease_day }}{{ ' ' + '天' }}</div>
+                        <div>租金：{{ goods.lease_pic }}{{ ' ' + '元/天' }}</div>
+                        <div>数量：{{ goods.goods_num }}{{ ' ' + '台' }}</div>
                     </div>
                 </el-col>
                 <el-col :span="2">
-                    <div style="font-size: 14px; font-weight: bold;margin-bottom:10px">总费用</div>
-                        <div class="red-font">1500</div>
+                    <div style="font-size: 14px; font-weight: bold; margin-bottom: 10px">
+                        总费用
+                    </div>
+                    <div class="red-font">1500</div>
                 </el-col>
                 <el-col :span="6">
-                  <div style="font-size: 14px; font-weight: bold;margin-bottom:10px">租期</div>
-                    <div  style="color:black;font-weight: bold;">
-                        {{ "2024-10-11"+" " }}{{"至"}}{{ " "+"2024-10-11" }}
+                    <div style="font-size: 14px; font-weight: bold; margin-bottom: 10px">租期</div>
+                    <div style="color: black; font-weight: bold">
+                        {{ '2024-10-11' + ' ' }}{{ '至' }}{{ ' ' + '2024-10-11' }}
                     </div>
                 </el-col>
                 <el-col :span="2">
-                    <div style="font-size: 14px; font-weight: bold;margin-bottom:10px">
-                        {{ "待出租"}}
+                    <div style="font-size: 14px; font-weight: bold; margin-bottom: 10px">
+                        {{ '待出租' }}
                     </div>
                 </el-col>
                 <el-col :span="3">
@@ -359,20 +391,18 @@
                     </div>
                 </el-col>
             </el-row>
-        <PagingComponent
-        @getList="getList"
-        :pageSize="pageSize"
-        :pageNumber="pageNumber"
-        :total="total" /> 
+            <PagingComponent
+                @getList="getList"
+                :pageSize="pageSize"
+                :pageNumber="pageNumber"
+                :total="total"
+            />
         </div>
-
-
-</div>
+    </div>
 </template>
 
 <style lang="scss" scoped>
-
-  .container {
+.container {
     width: 800px;
     margin: 0 auto;
     padding: 10px;
@@ -480,5 +510,5 @@
             text-decoration: underline;
         }
     }
-}    
+}
 </style>