diff --git a/components.d.ts b/components.d.ts
index b51de7e..7316b7b 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -25,12 +25,8 @@ declare module 'vue' {
     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']
-    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']
@@ -40,16 +36,13 @@ declare module 'vue' {
     ElTabPane: typeof import('element-plus/es')['ElTabPane']
     ElTabs: typeof import('element-plus/es')['ElTabs']
     ElTag: typeof import('element-plus/es')['ElTag']
-    ElTimeline: typeof import('element-plus/es')['ElTimeline']
-    ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
-    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']
     EquipDetailTable: typeof import('./src/components/equipDetailTable.vue')['default']
     FooterInfo: typeof import('./src/components/FooterInfo/index.vue')['default']
     FormComponent: typeof import('./src/components/FormComponent/index.vue')['default']
     Header: typeof import('./src/components/header/index.vue')['default']
-    Hearder: typeof import('./src/components/hearder/index.vue')['default']
     Navmenu: typeof import('./src/components/Navmenu/index.vue')['default']
     PagingComponent: typeof import('./src/components/PagingComponent/index.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/components/equipCardHall/index.vue b/src/components/equipCardHall/index.vue
new file mode 100644
index 0000000..8c79ed4
--- /dev/null
+++ b/src/components/equipCardHall/index.vue
@@ -0,0 +1,191 @@
+<template>
+    <div class="equipCard" @click="cardClick">
+        <img :src="url" alt="" />
+        <ul class="item-details">
+            <li style="margin: 10px 0">
+                <span class="item_1_span"> {{ name }} </span>
+                <!-- <span class="item_2_span"> 待租 </span> -->
+            </li>
+            <li style="color: #b6b6b6">{{ company }}</li>
+            <li style="color: #b6b6b6">
+                <el-icon style="margin-right: 3px; color: #25ac9c"><PhoneFilled /></el-icon>
+                {{ personPhone }}
+            </li>
+        </ul>
+
+        <div style="margin: 10px 0; padding-right: 15px; text-align: right">
+            <span style="text-align: right; color: #ff4800">
+                <i style="font-size: 10px">￥</i>
+                <i style="margin: 0 6px; font-size: 17px; font-weight: bold">{{ price }}</i>
+                <i style="font-size: 10px">/ 天</i>
+            </span>
+        </div>
+    </div>
+</template>
+<script lang="ts" setup>
+const props: any = defineProps({
+    url: {
+        type: String,
+        default:
+            'https://img1.baidu.com/it/u=2080801041,3349735074&fm=253&app=120&size=w931&n=0&f=JPEG&fmt=auto?sec=1701536400&t=117e17eae3082b7b524f890245f7826f',
+    },
+    name: {
+        type: String,
+        default: '测试装备',
+    },
+    tags: {
+        type: Array,
+        default: ['待租', '合肥市'],
+    },
+    company: {
+        type: String,
+        default: '安徽某科技有限公司',
+    },
+    price: {
+        type: [String, Number],
+        default: 99,
+    },
+    timeUnit: {
+        type: String,
+        default: '月',
+    },
+    id: {
+        type: [String, Number],
+        default: '',
+    },
+    personPhone: {
+        type: String,
+        default: '',
+    },
+})
+
+const emit = defineEmits(['onClick'])
+const cardClick = () => {
+    const data = {
+        id: props.id,
+    }
+    emit('onClick', data)
+}
+
+const onHandelLessee = () => {
+    console.log('立即租赁')
+}
+</script>
+<style lang="scss" scoped>
+.equipCard {
+    width: 100%;
+    background: #f7f9fa;
+    display: flex;
+    flex-direction: column;
+
+    img {
+        height: 140px;
+    }
+
+    .title {
+        padding: 16px 2px;
+        font-size: 18px;
+        font-weight: bold;
+        color: #333333;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+    }
+
+    .item-details {
+        padding: 0 10px 0 10px;
+
+        .address {
+            padding-right: 15px;
+        }
+        .address span {
+            width: 50%;
+        }
+
+        .item_1_span {
+            font-size: 16px;
+            font-weight: bold;
+        }
+        .item_2_span {
+            margin-left: 20px;
+            padding: 4px 10px;
+            color: #005af2;
+            border-radius: 4px;
+            background-color: #fff;
+            border: 1px solid #005af2;
+        }
+    }
+    .item-details li {
+        padding: 4px 0;
+        display: flex;
+        align-items: center;
+        font-size: 12px;
+
+        span:first-child {
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+        }
+    }
+
+    .avatar {
+        width: 37%;
+        overflow: hidden;
+        border-radius: 15px;
+        .showImg {
+            width: 100%;
+            padding-bottom: 100%;
+            position: relative;
+            img {
+                position: absolute;
+                left: 0;
+                top: 0;
+                object-fit: cover;
+                width: 100%;
+                height: 100%;
+            }
+        }
+    }
+    .desc {
+        box-sizing: border-box;
+        margin-left: 10px;
+        flex: 1;
+        overflow: hidden;
+
+        .tag {
+            display: flex;
+            margin-top: 8px;
+            .item {
+                background: white;
+                font-size: 14px;
+                font-weight: 400;
+                color: #005af2;
+                padding: 2px 3px;
+                border: 1px solid #005af2;
+                margin-right: 10px;
+                border-radius: 4px;
+            }
+        }
+        .company {
+            margin-top: 10px;
+            font-size: 14px;
+            font-weight: 400;
+            color: #a5a4a4;
+            line-height: 20px;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+        }
+        .price {
+            font-size: 14px;
+            font-weight: 400;
+            color: #ff4800;
+            margin-top: 20px;
+            span {
+                font-size: 25px;
+                font-weight: 600;
+            }
+        }
+    }
+}
+</style>
diff --git a/src/components/header/index.vue b/src/components/header/index.vue
index 96115e5..ee07e21 100644
--- a/src/components/header/index.vue
+++ b/src/components/header/index.vue
@@ -14,7 +14,7 @@ const isShowLogout = computed(() => {
     return store.token
 })
 
-const placeholderText = ref('请输入关键字')
+const placeholderText = ref('搜索设备关键词')
 
 // 退出登录
 const handlerLogout = () => {
diff --git a/src/components/uploadImg.vue b/src/components/uploadImg.vue
index 838a5e8..1cb2456 100644
--- a/src/components/uploadImg.vue
+++ b/src/components/uploadImg.vue
@@ -1,66 +1,71 @@
 <template>
-  <div class="uploadImg" :style="`width:${width}px;height:${width}px`">
-    <el-upload :disabled="disable" class="avatar-uploader" action="#" :show-file-list="false"
-      :on-change="handleAvatarSuccess">
-      <img v-if="imageUrl" :src="imageUrl" @click="clickImg" class="avatar">
-      <!--            <el-icon v-else class="avatar-uploader-icon"  :style="`line-height: ${width}px`"><Plus /></el-icon>-->
-      <el-icon v-else class="avatar-uploader-icon">
-        <Plus />
-      </el-icon>
-    </el-upload>
-  </div>
+    <div class="uploadImg" :style="`width:${width}px;height:${width}px`">
+        <el-upload
+            :disabled="disable"
+            class="avatar-uploader"
+            action="#"
+            :show-file-list="false"
+            :on-change="handleAvatarSuccess"
+        >
+            <img v-if="imageUrl" :src="imageUrl" @click="clickImg" class="avatar" />
+            <!--            <el-icon v-else class="avatar-uploader-icon"  :style="`line-height: ${width}px`"><Plus /></el-icon>-->
+            <el-icon v-else class="avatar-uploader-icon">
+                <Plus />
+            </el-icon>
+        </el-upload>
+    </div>
 </template>
 <script lang="ts" setup>
-import { ref } from "vue";
+import { ref } from 'vue'
 import { Plus } from '@element-plus/icons-vue'
 
 const props = defineProps(['disable', 'width'])
 const imageUrl = ref('')
 
 const handleAvatarSuccess = (res, file) => {
-  imageUrl.value = URL.createObjectURL(res.raw);
+    imageUrl.value = URL.createObjectURL(res.raw)
 }
 
 const emit = defineEmits(['onClick'])
 
 const clickImg = () => {
-  if (!props.disable) {
-    emit('onClick', {
-      ...this.file,
-      baseUrl: this.imageUrl
-    })
-  }
+    if (!props.disable) {
+        emit('onClick', {
+            ...this.file,
+            baseUrl: this.imageUrl,
+        })
+    }
 }
 </script>
 <style lang="scss" scoped>
 .uploadImg {
-  ::v-deep .avatar-uploader {
-    width: 100%;
-    height: 100%;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    border: 1px solid #dfdfdf;
-    overflow: hidden;
-
-    .el-upload--text {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      width: 100%;
-      height: 100%;
-
-      .avatar-uploader-icon {
+    :deep .avatar-uploader {
         width: 100%;
         height: 100%;
-      }
-    }
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        border: 1px solid #dfdfdf;
+        overflow: hidden;
 
-    .avatar {
-      width: 100%;
-      height: 100%;
-      object-fit: cover;
+        .el-upload--text {
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            width: 100%;
+            height: 100%;
+
+            .avatar-uploader-icon {
+                width: 100%;
+                height: 100%;
+            }
+        }
+
+        .avatar {
+            width: 100%;
+            height: 100%;
+            object-fit: cover;
+        }
     }
-  }
 }
 </style>
diff --git a/src/http/api/equip.ts b/src/http/api/equip.ts
index f8bb03f..f39e5c8 100644
--- a/src/http/api/equip.ts
+++ b/src/http/api/equip.ts
@@ -1,11 +1,13 @@
 import { post, get, put } from '../index'
 
+// 获取装备分类/maType/getTypeList
+export const getTypeListApi = () => {
+    return get(`/material-mall/maType/getTypeList`, {})
+}
+
 // 获取装备列表
-export const getList = (params = {}) => {
-    return post('/zlpt-equip/dev/list', {
-        ...params,
-        maStatus: 16
-    })
+export const getDeviceListApi = (data: any) => {
+    return post('/material-mall/dev/list', data)
 }
 
 //获取装备详情
diff --git a/src/http/api/home/index.ts b/src/http/api/home/index.ts
index 6e35998..b0df475 100644
--- a/src/http/api/home/index.ts
+++ b/src/http/api/home/index.ts
@@ -3,6 +3,9 @@ import { get, post } from '../../index'
 export const getGoodsClassListApi = () => {
     return get('/material-mall/maType/getEquipmentType', {})
 }
+export const getCompanyListApi = () => {
+    return get('/material-mall/dev/companyList', {})
+}
 export const getHotSearchListApi = () => {
     return get('/material-mall/maType/getHotSearch', {})
 }
diff --git a/src/layout/header.vue b/src/layout/header.vue
index 558ba36..6e58b37 100644
--- a/src/layout/header.vue
+++ b/src/layout/header.vue
@@ -15,7 +15,7 @@ const isShowLogout = computed(() => {
     return store.token
 })
 
-const placeholderText = ref('请输入关键字')
+const placeholderText = ref('搜索设备关键词')
 
 // 退出登录
 const handlerLogout = () => {
@@ -75,7 +75,7 @@ const searchKeywordBtn = () => {
     } else {
         router.push({
             name: 'equipList',
-            state: { keyWord: keywordIptValue.value },
+            query: { keyWord: keywordIptValue.value },
         })
     }
 }
@@ -196,7 +196,7 @@ const onCarts = () => {
                 @keydown.enter="searchKeywordBtn"
                 ref="inputRef"
                 @focus="placeholderText = ''"
-                @blur="placeholderText = '请输入关键字'"
+                @blur="placeholderText = '搜索设备关键词'"
             />
             <button class="search-btn" @click="searchKeywordBtn">搜索</button>
 
diff --git a/src/router/index.ts b/src/router/index.ts
index 988082f..fc1680b 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -84,7 +84,7 @@ const routes: Array<RouteRecordRaw> = [
                 component: () => import('views/home/index.vue'),
                 meta: {
                     title: '首页',
-                    keepAlive: false,
+                    keepAlive: true,
                     AuthFlag: false,
                     activeName: 'home',
                 },
diff --git a/src/views/EnterpriseCertification.vue b/src/views/EnterpriseCertification.vue
index c36f46b..7538d9d 100644
--- a/src/views/EnterpriseCertification.vue
+++ b/src/views/EnterpriseCertification.vue
@@ -15,7 +15,8 @@
                             <el-input
                                 placeholder="输入企业名称"
                                 clearable
-                                v-model.trim="applyParams.companyName"></el-input>
+                                v-model.trim="applyParams.companyName"
+                            ></el-input>
                         </el-form-item>
                     </el-col>
 
@@ -25,12 +26,14 @@
                                 placeholder="请选择企业类型"
                                 clearable
                                 v-model="applyParams.companyType"
-                                @change="changeProvince">
+                                @change="changeProvince"
+                            >
                                 <el-option
                                     v-for="item in selcompanyTypeList"
                                     :key="item.id"
                                     :label="item.name"
-                                    :value="item.name"></el-option>
+                                    :value="item.name"
+                                ></el-option>
                             </el-select>
                         </el-form-item>
                     </el-col>
@@ -42,12 +45,14 @@
                                 placeholder="请选择企业所属"
                                 clearable
                                 v-model="applyParams.companyLtd"
-                                @change="changeProvince">
+                                @change="changeProvince"
+                            >
                                 <el-option
                                     v-for="item in selcompanyLtdList"
                                     :key="item.id"
                                     :label="item.name"
-                                    :value="item.name"></el-option>
+                                    :value="item.name"
+                                ></el-option>
                             </el-select>
                         </el-form-item>
                     </el-col>
@@ -56,7 +61,8 @@
                             <el-input
                                 placeholder="请输入统一社会信用代码"
                                 clearable
-                                v-model.trim="applyParams.creditCode"></el-input>
+                                v-model.trim="applyParams.creditCode"
+                            ></el-input>
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -68,12 +74,14 @@
                                 placeholder="请选择省份"
                                 clearable
                                 v-model="applyParams.registerS"
-                                @change="changeProvince">
+                                @change="changeProvince"
+                            >
                                 <el-option
                                     v-for="item in selProvinceList"
                                     :key="item.id"
                                     :label="item.name"
-                                    :value="item.code + ',' + item.name"></el-option>
+                                    :value="item.code + ',' + item.name"
+                                ></el-option>
                             </el-select>
                         </el-col>
                         <el-col :span="5">
@@ -81,12 +89,14 @@
                                 v-model="applyParams.registerAddressProvince"
                                 placeholder="请选择市"
                                 @change="changeMarket"
-                                clearable>
+                                clearable
+                            >
                                 <el-option
                                     v-for="item in selMarketList"
                                     :key="item.id"
                                     :label="item.name"
-                                    :value="item.code + ',' + item.name"></el-option>
+                                    :value="item.code + ',' + item.name"
+                                ></el-option>
                             </el-select>
                         </el-col>
                         <el-col :span="5">
@@ -94,19 +104,22 @@
                                 v-model="applyParams.registerAddressArea"
                                 placeholder="请选择区"
                                 clearable
-                                @change="changeArea">
+                                @change="changeArea"
+                            >
                                 <el-option
                                     v-for="item in selAreaList"
                                     :key="item.id"
                                     :label="item.name"
-                                    :value="item.code + ',' + item.name"></el-option>
+                                    :value="item.code + ',' + item.name"
+                                ></el-option>
                             </el-select>
                         </el-col>
                         <el-col :span="6">
                             <el-input
                                 v-model="applyParams.registerAddress"
                                 placeholder="请输入实际办公地址"
-                                clearable></el-input>
+                                clearable
+                            ></el-input>
                         </el-col>
                     </el-row>
                 </el-form-item>
@@ -118,12 +131,14 @@
                                 placeholder="请选择省份"
                                 clearable
                                 v-model="applyParams.registerSs"
-                                @change="opeChangeProvince">
+                                @change="opeChangeProvince"
+                            >
                                 <el-option
                                     v-for="item in selProvinceList"
                                     :key="item.id"
                                     :label="item.name"
-                                    :value="item.code + ',' + item.name"></el-option>
+                                    :value="item.code + ',' + item.name"
+                                ></el-option>
                             </el-select>
                         </el-col>
                         <el-col :span="5">
@@ -131,12 +146,14 @@
                                 v-model="applyParams.operateAddressProvince"
                                 placeholder="请选择市"
                                 @change="opeChangeMarket"
-                                clearable>
+                                clearable
+                            >
                                 <el-option
                                     v-for="item in selMarketList"
                                     :key="item.id"
                                     :label="item.name"
-                                    :value="item.code + ',' + item.name"></el-option>
+                                    :value="item.code + ',' + item.name"
+                                ></el-option>
                             </el-select>
                         </el-col>
                         <el-col :span="5">
@@ -144,19 +161,22 @@
                                 v-model="applyParams.operateAddressArea"
                                 placeholder="请选择区"
                                 @change="opeChangeArea"
-                                clearable>
+                                clearable
+                            >
                                 <el-option
                                     v-for="item in selAreaList"
                                     :key="item.id"
                                     :label="item.name"
-                                    :value="item.code + ',' + item.name"></el-option>
+                                    :value="item.code + ',' + item.name"
+                                ></el-option>
                             </el-select>
                         </el-col>
                         <el-col :span="6">
                             <el-input
                                 v-model="applyParams.operateAddress"
                                 clearable
-                                placeholder="请输入实际办公地址"></el-input>
+                                placeholder="请输入实际办公地址"
+                            ></el-input>
                         </el-col>
                     </el-row>
                 </el-form-item>
@@ -167,12 +187,14 @@
                             <el-select
                                 v-model="applyParams.certificatetype"
                                 clearable
-                                placeholder="请选法人证件类型">
+                                placeholder="请选法人证件类型"
+                            >
                                 <el-option
                                     v-for="item in selIdTypeList"
                                     :key="item.id"
                                     :label="item.name"
-                                    :value="item.name"></el-option>
+                                    :value="item.name"
+                                ></el-option>
                             </el-select>
                         </el-form-item>
                     </el-col>
@@ -182,7 +204,8 @@
                             <el-input
                                 placeholder="请输入法人证件号码"
                                 v-model.trim="applyParams.idNumber"
-                                clearable></el-input>
+                                clearable
+                            ></el-input>
                         </el-form-item>
                     </el-col>
 
@@ -195,7 +218,8 @@
                                 width="120px"
                                 height="120px"
                                 :autoUpload="true"
-                                :successResultCallBack="successResultCallBackFn">
+                                :successResultCallBack="successResultCallBackFn"
+                            >
                                 <template v-slot:default>
                                     <el-icon size="48" color="#aaa"><Plus /></el-icon>
                                 </template>
@@ -217,7 +241,8 @@
                                 :acceptTypeList="['.jpg', '.jpeg', '.png']"
                                 width="120px"
                                 height="120px"
-                                :successResultCallBack="successResultCallBackFnfrCardf">
+                                :successResultCallBack="successResultCallBackFnfrCardf"
+                            >
                                 <template v-slot:default>
                                     <el-icon size="48" color="#aaa"><Plus /></el-icon>
                                 </template>
@@ -237,7 +262,8 @@
                                 :acceptTypeList="['.jpg', '.jpeg', '.png']"
                                 width="120px"
                                 height="120px"
-                                :successResultCallBack="successResultCallBackFnfrCardz">
+                                :successResultCallBack="successResultCallBackFnfrCardz"
+                            >
                                 <template v-slot:default>
                                     <el-icon size="48" color="#aaa"><Plus /></el-icon>
                                 </template>
@@ -257,7 +283,8 @@
                                 :acceptTypeList="['.jpg', '.jpeg', '.png']"
                                 width="120px"
                                 height="120px"
-                                :successResultCallBack="successResultCallBackFnfryz">
+                                :successResultCallBack="successResultCallBackFnfryz"
+                            >
                                 <template v-slot:default>
                                     <el-icon size="48" color="#aaa"><Plus /></el-icon>
                                 </template>
@@ -276,7 +303,8 @@
                             <el-input
                                 placeholder="请输入法人姓名"
                                 v-model.trim="applyParams.legalPerson"
-                                clearable>
+                                clearable
+                            >
                                 >
                             </el-input>
                         </el-form-item>
@@ -286,7 +314,8 @@
                             <el-input
                                 placeholder="请输入邀请码"
                                 v-model.trim="applyParams.invitationCode"
-                                clearable></el-input>
+                                clearable
+                            ></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="6">
@@ -294,7 +323,8 @@
                             <el-input
                                 placeholder="请输入邀请企业名称"
                                 v-model.trim="applyParams.invitationCoName"
-                                clearable></el-input>
+                                clearable
+                            ></el-input>
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -306,7 +336,8 @@
                                 v-model.trim="applyParams.businessScope"
                                 clearable
                                 type="textarea"
-                                :rows="5"></el-input>
+                                :rows="5"
+                            ></el-input>
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -325,7 +356,8 @@
                             <el-input
                                 placeholder="请输入被授权人姓名"
                                 v-model.trim="applyParams.authPerson"
-                                clearable></el-input>
+                                clearable
+                            ></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="5">
@@ -333,7 +365,8 @@
                             <el-input
                                 placeholder="请输入被授权人身份证"
                                 v-model.trim="applyParams.authIdNumber"
-                                clearable></el-input>
+                                clearable
+                            ></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="5">
@@ -342,7 +375,8 @@
                                 <el-input
                                     placeholder="请输入被授权人手机号"
                                     v-model.trim="applyParams.authPhone"
-                                    clearable></el-input>
+                                    clearable
+                                ></el-input>
                                 <div class="tip">
                                     被授权人手机号修改且运营审核通过后，企业系统管理员权限将同步到修改后被授权手机号的登录账号。
                                 </div>
@@ -354,7 +388,8 @@
                             <el-input
                                 v-model.trim="applyParams.authEmail"
                                 placeholder="请输入被授权人邮箱"
-                                clearable>
+                                clearable
+                            >
                                 >
                             </el-input>
                         </el-form-item>
@@ -369,7 +404,8 @@
                                 :acceptTypeList="['.jpg', '.jpeg', '.png']"
                                 width="120px"
                                 height="120px"
-                                :successResultCallBack="successResultCallBackFnCardbsz">
+                                :successResultCallBack="successResultCallBackFnCardbsz"
+                            >
                                 <template v-slot:default>
                                     <el-icon size="48" color="#aaa"><Plus /></el-icon>
                                 </template>
@@ -389,7 +425,8 @@
                                 :acceptTypeList="['.jpg', '.jpeg', '.png']"
                                 width="120px"
                                 height="120px"
-                                :successResultCallBack="successResultCallBackFnCardbsf">
+                                :successResultCallBack="successResultCallBackFnCardbsf"
+                            >
                                 <template v-slot:default>
                                     <el-icon size="48" color="#aaa"><Plus /></el-icon>
                                 </template>
@@ -411,7 +448,8 @@
                                 :acceptTypeList="['.jpg', '.jpeg', '.png']"
                                 width="120px"
                                 height="120px"
-                                :successResultCallBack="successResultCallBackFnsqs">
+                                :successResultCallBack="successResultCallBackFnsqs"
+                            >
                                 <template v-slot:default>
                                     <el-icon size="48" color="#aaa"><Plus /></el-icon>
                                 </template>
@@ -498,446 +536,446 @@
     </div>
 </template>
 <script lang="ts" setup>
-    import uploadComponent from 'components/uploadComponent/index.vue'
-    import { ElMessage } from 'element-plus'
-    import { reactive, ref } from 'vue'
-    import { useStore } from 'store/user'
-    const store = useStore()
+import uploadComponent from 'components/uploadComponent/index.vue'
+import { ElMessage } from 'element-plus'
+import { reactive, ref } from 'vue'
+import { useStore } from 'store/user'
+const store = useStore()
 
-    const previewPicUrl = ref('')
+const previewPicUrl = ref('')
 
-    import { applyAttestationApi } from 'http/api/usercenter/baseinfo'
-
-    onMounted(() => {
-        // 获取省级数据
-        store.getprovinceList()
-        // 获取证件类型数据
-        store.getIdTypeList()
-        // 获取企业类型
-        store.getcompanyTypeList()
-        // 获取企业所属
-        store.getcompanyLtdList()
-    })
-
-    const picItemVisible = ref(false)
-
-    //查看身份证正面示例
-    const previewCardFront = () => {
-        picItemVisible.value = true
-        previewPicUrl.value =
-            'https://p7.itc.cn/images01/20211109/51307123942047a89ec6e05b24b4f152.jpeg'
-    }
-    //查看身份证反面示例
-    const previewCardOpposite = () => {
-        picItemVisible.value = true
-        previewPicUrl.value = 'https://image2.sina.com.cn/dy/o/2005-02-01/1107213262_.haWGD.jpg'
-    }
-    //查看营业执照示例
-    const previewBusinessLicense = () => {
-        picItemVisible.value = true
-        previewPicUrl.value =
-            'https://img0.baidu.com/it/u=399142335,2996450343&fm=253&fmt=auto&app=138&f=JPEG?w=347&h=500'
-    }
-    //查看授权书示例
-    const previewPowerOfAttorney = () => {
-        picItemVisible.value = true
-        previewPicUrl.value =
-            'https://static.quanyaotong.com/uploads/201901/17/35e8cf5034de7484ba256058e972580d.jpg'
-    }
-
-    // 银行数据源绑定
-    const bankTableList = ref([{ v_kaihu: '', v_admin: '' }])
-
-    // 注册地址拼装
-    const AssemblyRegisterAddress: any = reactive([])
-
-    // 经营地址拼装
-    const AssemblyOperateAddress: any = reactive([])
-
-    // 申请认证参数
-    const applyParams: any = reactive({
-        companyName: '', // 企业名称
-        companyType: '', // 企业类型
-        companyLtd: '', // 企业所属
-        creditCode: '', // 统一信用代码
-        registerAddress: '', // 注册地址
-        /* 注册地址ID */
-        registerId: '',
-        /* 经营地址ID */
-        operateId: '',
-        registerS: '',
-        registerAddressProvince: '', // 注册地址(市级)
-        registerAddressArea: '', // 注册地址(区级)
-        registerRealityAddress: '', // 注册地址(实际地址)
-        operateAddress: '', // 经营地址
-
-        registerSs: '',
-        operateAddressProvince: '', // 经营地址(市级)
-        operateAddressArea: '', // 经营地址(区级)
-        operateRealityAddress: '', // 注册地址(实际地址)
-        certificatetype: '', // 法人证件类型
-        idNumber: '', // 法人证件号码
-        /* 企业logo */
-        logoUrl: '',
-        businessLicense: '', // 营业执照
-        legalFaceUrl: '', // 法人身份证国徽面
-        legalNationUrl: '', // 法人身份证肖像
-        legalPerson: '', // 法人姓名
-        invitationCode: '', // 邀请码
-        invitationCoName: '', // 邀请企业名称
-        businessScope: '', // 经营范围
-        authPerson: '', // 被授权人姓名
-        authIdNumber: '', // 被授权身份证号
-        authPhone: '', // 被授权手机号
-
-        /* 被授权人邮箱 */
-        authEmail: '',
-        authDocument:
-            'https://zlpt-1259760603.cos.ap-nanjing.myqcloud.com/488bab245180ebf9f1f3d7db5301be4.png', // 法人授权书
-        idNationUrl:
-            'https://zlpt-1259760603.cos.ap-nanjing.myqcloud.com/488bab245180ebf9f1f3d7db5301be4.png', // 被授权人国徽
-        idFaceUrl:
-            'vhttps://zlpt-1259760603.cos.ap-nanjing.myqcloud.com/488bab245180ebf9f1f3d7db5301be4.png' // 被授权人头像
-    })
-    // 省级数据源
-    const selProvinceList: any = computed(() => {
-        return store.provinceList
-    })
-
-    // 省级下拉框选中时获取市级
-    const changeProvince = (val: any) => {
-        // console.log(val, '省选择**')
-        store.getmarketList(val.split(',')[0])
-
-        AssemblyRegisterAddress[0] = val.split(',')[0]
-    }
-
-    const opeChangeProvince = (val: any) => {
-        // console.log(val, '省选择**')
-        store.getmarketList(val.split(',')[0])
-
-        AssemblyOperateAddress[0] = val.split(',')[0]
-    }
-
-    // 获取市级数据源
-    const selMarketList: any = computed(() => {
-        return store.marketList
-    })
-
-    // 市级下拉框选中获取区级数据
-    const changeMarket = (val: any) => {
-        store.getareaList(val.split(',')[0])
-        AssemblyRegisterAddress[1] = val.split(',')[0]
-    }
-
-    const opeChangeMarket = (val: any) => {
-        store.getareaList(val.split(',')[0])
-        AssemblyOperateAddress[1] = val.split(',')[0]
-    }
-
-    // 获取区级数据源
-    const selAreaList: any = computed(() => {
-        return store.areaList
-    })
-
-    // 区级下拉框选中时
-    const changeArea = (val: any) => {
-        AssemblyRegisterAddress[2] = val.split(',')[0]
-    }
-    const opeChangeArea = (val: any) => {
-        AssemblyOperateAddress[2] = val.split(',')[0]
-    }
-
-    // 获取证件类型
-    const selIdTypeList: any = computed(() => {
-        return store.idTypeList
-    })
+import { applyAttestationApi } from 'http/api/usercenter/baseinfo'
 
+onMounted(() => {
+    // 获取省级数据
+    store.getprovinceList()
+    // 获取证件类型数据
+    store.getIdTypeList()
     // 获取企业类型
-    const selcompanyTypeList: any = computed(() => {
-        return store.companyTypeList
-    })
-
+    store.getcompanyTypeList()
     // 获取企业所属
+    store.getcompanyLtdList()
+})
 
-    const selcompanyLtdList: any = computed(() => {
-        return store.companyLtdList
+const picItemVisible = ref(false)
+
+//查看身份证正面示例
+const previewCardFront = () => {
+    picItemVisible.value = true
+    previewPicUrl.value =
+        'https://p7.itc.cn/images01/20211109/51307123942047a89ec6e05b24b4f152.jpeg'
+}
+//查看身份证反面示例
+const previewCardOpposite = () => {
+    picItemVisible.value = true
+    previewPicUrl.value = 'https://image2.sina.com.cn/dy/o/2005-02-01/1107213262_.haWGD.jpg'
+}
+//查看营业执照示例
+const previewBusinessLicense = () => {
+    picItemVisible.value = true
+    previewPicUrl.value =
+        'https://img0.baidu.com/it/u=399142335,2996450343&fm=253&fmt=auto&app=138&f=JPEG?w=347&h=500'
+}
+//查看授权书示例
+const previewPowerOfAttorney = () => {
+    picItemVisible.value = true
+    previewPicUrl.value =
+        'https://static.quanyaotong.com/uploads/201901/17/35e8cf5034de7484ba256058e972580d.jpg'
+}
+
+// 银行数据源绑定
+const bankTableList = ref([{ v_kaihu: '', v_admin: '' }])
+
+// 注册地址拼装
+const AssemblyRegisterAddress: any = reactive([])
+
+// 经营地址拼装
+const AssemblyOperateAddress: any = reactive([])
+
+// 申请认证参数
+const applyParams: any = reactive({
+    companyName: '', // 企业名称
+    companyType: '', // 企业类型
+    companyLtd: '', // 企业所属
+    creditCode: '', // 统一信用代码
+    registerAddress: '', // 注册地址
+    /* 注册地址ID */
+    registerId: '',
+    /* 经营地址ID */
+    operateId: '',
+    registerS: '',
+    registerAddressProvince: '', // 注册地址(市级)
+    registerAddressArea: '', // 注册地址(区级)
+    registerRealityAddress: '', // 注册地址(实际地址)
+    operateAddress: '', // 经营地址
+
+    registerSs: '',
+    operateAddressProvince: '', // 经营地址(市级)
+    operateAddressArea: '', // 经营地址(区级)
+    operateRealityAddress: '', // 注册地址(实际地址)
+    certificatetype: '', // 法人证件类型
+    idNumber: '', // 法人证件号码
+    /* 企业logo */
+    logoUrl: '',
+    businessLicense: '', // 营业执照
+    legalFaceUrl: '', // 法人身份证国徽面
+    legalNationUrl: '', // 法人身份证肖像
+    legalPerson: '', // 法人姓名
+    invitationCode: '', // 邀请码
+    invitationCoName: '', // 邀请企业名称
+    businessScope: '', // 经营范围
+    authPerson: '', // 被授权人姓名
+    authIdNumber: '', // 被授权身份证号
+    authPhone: '', // 被授权手机号
+
+    /* 被授权人邮箱 */
+    authEmail: '',
+    authDocument:
+        'https://zlpt-1259760603.cos.ap-nanjing.myqcloud.com/488bab245180ebf9f1f3d7db5301be4.png', // 法人授权书
+    idNationUrl:
+        'https://zlpt-1259760603.cos.ap-nanjing.myqcloud.com/488bab245180ebf9f1f3d7db5301be4.png', // 被授权人国徽
+    idFaceUrl:
+        'vhttps://zlpt-1259760603.cos.ap-nanjing.myqcloud.com/488bab245180ebf9f1f3d7db5301be4.png', // 被授权人头像
+})
+// 省级数据源
+const selProvinceList: any = computed(() => {
+    return store.provinceList
+})
+
+// 省级下拉框选中时获取市级
+const changeProvince = (val: any) => {
+    // console.log(val, '省选择**')
+    store.getmarketList(val.split(',')[0])
+
+    AssemblyRegisterAddress[0] = val.split(',')[0]
+}
+
+const opeChangeProvince = (val: any) => {
+    // console.log(val, '省选择**')
+    store.getmarketList(val.split(',')[0])
+
+    AssemblyOperateAddress[0] = val.split(',')[0]
+}
+
+// 获取市级数据源
+const selMarketList: any = computed(() => {
+    return store.marketList
+})
+
+// 市级下拉框选中获取区级数据
+const changeMarket = (val: any) => {
+    store.getareaList(val.split(',')[0])
+    AssemblyRegisterAddress[1] = val.split(',')[0]
+}
+
+const opeChangeMarket = (val: any) => {
+    store.getareaList(val.split(',')[0])
+    AssemblyOperateAddress[1] = val.split(',')[0]
+}
+
+// 获取区级数据源
+const selAreaList: any = computed(() => {
+    return store.areaList
+})
+
+// 区级下拉框选中时
+const changeArea = (val: any) => {
+    AssemblyRegisterAddress[2] = val.split(',')[0]
+}
+const opeChangeArea = (val: any) => {
+    AssemblyOperateAddress[2] = val.split(',')[0]
+}
+
+// 获取证件类型
+const selIdTypeList: any = computed(() => {
+    return store.idTypeList
+})
+
+// 获取企业类型
+const selcompanyTypeList: any = computed(() => {
+    return store.companyTypeList
+})
+
+// 获取企业所属
+
+const selcompanyLtdList: any = computed(() => {
+    return store.companyLtdList
+})
+
+const emit = defineEmits(['closeAuthenticationDialog', 'getUserInfo'])
+
+// 提交认证按钮
+const handlerSubmitBtn = async () => {
+    AssemblyRegisterAddress[3] = applyParams.registerRealityAddress
+    AssemblyOperateAddress[3] = applyParams.operateRealityAddress
+
+    applyParams.registerId = AssemblyRegisterAddress.join(',')
+    applyParams.operateId = AssemblyOperateAddress.join(',')
+
+    const res: any = await applyAttestationApi({
+        bmCompanyInfo: applyParams,
+        bmCoBank: {},
     })
-
-    const emit = defineEmits(['closeAuthenticationDialog', 'getUserInfo'])
-
-    // 提交认证按钮
-    const handlerSubmitBtn = async () => {
-        AssemblyRegisterAddress[3] = applyParams.registerRealityAddress
-        AssemblyOperateAddress[3] = applyParams.operateRealityAddress
-
-        applyParams.registerId = AssemblyRegisterAddress.join(',')
-        applyParams.operateId = AssemblyOperateAddress.join(',')
-
-        const res: any = await applyAttestationApi({
-            bmCompanyInfo: applyParams,
-            bmCoBank: {}
+    if (res.code === 200) {
+        ElMessage({
+            type: 'success',
+            message: '申请成功',
         })
-        if (res.code === 200) {
-            ElMessage({
-                type: 'success',
-                message: '申请成功'
-            })
-            // 关闭弹框
-            emit('closeAuthenticationDialog', false)
-            emit('getUserInfo')
-        }
-    }
-
-    // 关闭按钮
-    const handlerCloseBtn = () => {
+        // 关闭弹框
         emit('closeAuthenticationDialog', false)
+        emit('getUserInfo')
     }
+}
 
-    /* 服务协议 */
-    const serviceAgreement = () => {
-        window.open('https://zlpt-1259760603.cos.ap-nanjing.myqcloud.com/serviceAgreement.pdf')
-    }
-    /* 隐私协议 */
-    const privacyAgreement = () => {
-        window.open('https://zlpt-1259760603.cos.ap-nanjing.myqcloud.com/privacyPolicy.pdf')
-    }
+// 关闭按钮
+const handlerCloseBtn = () => {
+    emit('closeAuthenticationDialog', false)
+}
 
-    const options = reactive([
-        {
-            value: '选项1',
-            label: '黄金糕'
-        },
-        {
-            value: '选项2',
-            label: '双皮奶'
-        },
-        {
-            value: '选项3',
-            label: '蚵仔煎'
-        },
-        {
-            value: '选项4',
-            label: '龙须面'
-        },
-        {
-            value: '选项5',
-            label: '北京烤鸭'
-        }
-    ])
-    const thisValue = ref('')
+/* 服务协议 */
+const serviceAgreement = () => {
+    window.open('https://zlpt-1259760603.cos.ap-nanjing.myqcloud.com/serviceAgreement.pdf')
+}
+/* 隐私协议 */
+const privacyAgreement = () => {
+    window.open('https://zlpt-1259760603.cos.ap-nanjing.myqcloud.com/privacyPolicy.pdf')
+}
 
-    const imageUrl = ref('')
+const options = reactive([
+    {
+        value: '选项1',
+        label: '黄金糕',
+    },
+    {
+        value: '选项2',
+        label: '双皮奶',
+    },
+    {
+        value: '选项3',
+        label: '蚵仔煎',
+    },
+    {
+        value: '选项4',
+        label: '龙须面',
+    },
+    {
+        value: '选项5',
+        label: '北京烤鸭',
+    },
+])
+const thisValue = ref('')
 
-    const bankTableHeader = reactive([
-        {
-            span: 4,
-            label: '开户行',
-            prop: 'bankName'
-        },
-        {
-            span: 2,
-            label: '账号名称',
-            prop: 'b'
-        },
-        {
-            span: 2,
-            label: '银行账号',
-            prop: 'a'
-        },
-        {
-            span: 2,
-            label: '开户行所在地',
-            prop: 'a'
-        },
-        {
-            span: 2,
-            label: '开户许可证核准号（基本存款账号编号）',
-            prop: 'a'
-        },
-        {
-            span: 2,
-            label: '开户行许可证/基本存款账号信息',
-            prop: 'a',
-            slot: 'annex'
-        }
-    ])
+const imageUrl = ref('')
 
-    const bankTableData = reactive([
-        {
-            a: 1,
-            bankName: '中国银行'
-        },
-        {
-            a: 1,
-            bankName: 'test'
-        },
-        {
-            a: 1,
-            bankName: 'test'
-        },
-        {
-            a: 1,
-            bankName: 'test'
-        },
-        {
-            a: 1,
-            bankName: 'test'
-        },
-        {
-            a: 1,
-            bankName: 'test'
-        }
-    ])
+const bankTableHeader = reactive([
+    {
+        span: 4,
+        label: '开户行',
+        prop: 'bankName',
+    },
+    {
+        span: 2,
+        label: '账号名称',
+        prop: 'b',
+    },
+    {
+        span: 2,
+        label: '银行账号',
+        prop: 'a',
+    },
+    {
+        span: 2,
+        label: '开户行所在地',
+        prop: 'a',
+    },
+    {
+        span: 2,
+        label: '开户许可证核准号（基本存款账号编号）',
+        prop: 'a',
+    },
+    {
+        span: 2,
+        label: '开户行许可证/基本存款账号信息',
+        prop: 'a',
+        slot: 'annex',
+    },
+])
 
-    const test = () => {}
+const bankTableData = reactive([
+    {
+        a: 1,
+        bankName: '中国银行',
+    },
+    {
+        a: 1,
+        bankName: 'test',
+    },
+    {
+        a: 1,
+        bankName: 'test',
+    },
+    {
+        a: 1,
+        bankName: 'test',
+    },
+    {
+        a: 1,
+        bankName: 'test',
+    },
+    {
+        a: 1,
+        bankName: 'test',
+    },
+])
 
-    /* log地址 */
-    const successResultCallBackFn = (val: any) => {
-        applyParams.logoUrl = val.msg
-    }
-    /* 法人身份证正面图片地址 */
-    const successResultCallBackFnfrCardz = (val: any) => {
-        applyParams.legalNationUrl = val.msg
-    }
-    /* 法人身份证反面图片地址 */
-    const successResultCallBackFnfrCardf = (val: any) => {
-        applyParams.legalFaceUrl = val.msg
-    }
-    /* 法人营业执照图片地址 */
-    const successResultCallBackFnfryz = (val: any) => {
-        applyParams.businessLicense = val.msg
-    }
-    /* 被授权人身份证正面 */
-    const successResultCallBackFnCardbsz = (val: any) => {
-        applyParams.idFaceUrl = val.msg
-    }
-    /* 被授权人身份证反面 */
-    const successResultCallBackFnCardbsf = (val: any) => {
-        applyParams.idNationUrl = val.msg
-    }
-    /* 法人授权书 */
-    const successResultCallBackFnsqs = (val: any) => {
-        applyParams.authDocument = val.msg
-    }
+const test = () => {}
+
+/* log地址 */
+const successResultCallBackFn = (val: any) => {
+    applyParams.logoUrl = val.msg
+}
+/* 法人身份证正面图片地址 */
+const successResultCallBackFnfrCardz = (val: any) => {
+    applyParams.legalNationUrl = val.msg
+}
+/* 法人身份证反面图片地址 */
+const successResultCallBackFnfrCardf = (val: any) => {
+    applyParams.legalFaceUrl = val.msg
+}
+/* 法人营业执照图片地址 */
+const successResultCallBackFnfryz = (val: any) => {
+    applyParams.businessLicense = val.msg
+}
+/* 被授权人身份证正面 */
+const successResultCallBackFnCardbsz = (val: any) => {
+    applyParams.idFaceUrl = val.msg
+}
+/* 被授权人身份证反面 */
+const successResultCallBackFnCardbsf = (val: any) => {
+    applyParams.idNationUrl = val.msg
+}
+/* 法人授权书 */
+const successResultCallBackFnsqs = (val: any) => {
+    applyParams.authDocument = val.msg
+}
 </script>
 
 <style lang="scss" scoped>
-    .d-flex {
-        display: flex;
-    }
-    .align-center {
-        align-items: center;
-    }
-    ::v-deep.el-form-item {
-        display: flex;
+.d-flex {
+    display: flex;
+}
+.align-center {
+    align-items: center;
+}
+:deep(.el-form-item) {
+    display: flex;
 
-        .el-form-item__content {
-            flex: 1;
-        }
+    .el-form-item__content {
+        flex: 1;
     }
+}
 
-    .enterpriseCertification {
-        height: 100%;
-        /*         background: #f2f2f2;
+.enterpriseCertification {
+    height: 100%;
+    /*         background: #f2f2f2;
         padding: 15px 10px; */
 
-        .card {
-            border-radius: 5px;
-            background: white;
-            padding: 10px;
+    .card {
+        border-radius: 5px;
+        background: white;
+        padding: 10px;
+    }
+
+    .top {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        margin-bottom: 10px;
+
+        .title {
+            font-size: 16px;
+            font-weight: 600;
         }
 
-        .top {
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-            margin-bottom: 10px;
-
-            .title {
-                font-size: 16px;
-                font-weight: 600;
-            }
-
-            .options {
-            }
+        .options {
         }
+    }
 
-        .baseForm {
+    .baseForm {
+        padding: 0 10px;
+    }
+
+    .previewExample {
+        font-size: 12px;
+        color: blue;
+        cursor: pointer;
+        span {
+            margin: 0 5px;
+        }
+    }
+
+    .personInfo {
+        margin-top: 15px;
+        .personForm {
             padding: 0 10px;
-        }
-
-        .previewExample {
-            font-size: 12px;
-            color: blue;
-            cursor: pointer;
-            span {
-                margin: 0 5px;
-            }
-        }
-
-        .personInfo {
-            margin-top: 15px;
-            .personForm {
-                padding: 0 10px;
-                .phone {
-                    .tip {
-                        line-height: normal;
-                        color: red;
-                        font-size: 12px;
-                    }
-                }
-                .agreement {
-                    font-size: 13px !important;
-                    margin-left: 8px;
+            .phone {
+                .tip {
+                    line-height: normal;
+                    color: red;
+                    font-size: 12px;
                 }
             }
-        }
-
-        .bankInfo {
-            margin-top: 15px;
-            .top {
-                .title {
-                    .tip {
-                        color: blue;
-                        font-size: 12px;
-                        cursor: pointer;
-                    }
-                }
-            }
-            .header {
-                .item {
-                    background: #e0efff;
-                    min-height: 40px;
-                    display: flex;
-                    align-items: center;
-                    justify-content: flex-start;
-                    box-sizing: border-box;
-                    padding: 5px;
-                    height: 100%;
-                }
-            }
-            .border-top-left {
-                border-top: 1px solid black;
-                border-left: 1px solid black;
-            }
-            .border-right {
-                border-right: 1px solid black;
-            }
-            .border-bottom {
-                border-bottom: 1px solid black;
-            }
-            .content {
-                .item {
-                    min-height: 40px;
-                    display: flex;
-                    align-items: center;
-                    //justify-content: center;
-                    box-sizing: border-box;
-                    padding: 5px;
-                    height: 100%;
-                }
+            .agreement {
+                font-size: 13px !important;
+                margin-left: 8px;
             }
         }
     }
+
+    .bankInfo {
+        margin-top: 15px;
+        .top {
+            .title {
+                .tip {
+                    color: blue;
+                    font-size: 12px;
+                    cursor: pointer;
+                }
+            }
+        }
+        .header {
+            .item {
+                background: #e0efff;
+                min-height: 40px;
+                display: flex;
+                align-items: center;
+                justify-content: flex-start;
+                box-sizing: border-box;
+                padding: 5px;
+                height: 100%;
+            }
+        }
+        .border-top-left {
+            border-top: 1px solid black;
+            border-left: 1px solid black;
+        }
+        .border-right {
+            border-right: 1px solid black;
+        }
+        .border-bottom {
+            border-bottom: 1px solid black;
+        }
+        .content {
+            .item {
+                min-height: 40px;
+                display: flex;
+                align-items: center;
+                //justify-content: center;
+                box-sizing: border-box;
+                padding: 5px;
+                height: 100%;
+            }
+        }
+    }
+}
 </style>
diff --git a/src/views/cart/index.vue b/src/views/cart/index.vue
index 7c78ea5..9c36c09 100644
--- a/src/views/cart/index.vue
+++ b/src/views/cart/index.vue
@@ -53,13 +53,13 @@
                     </div>
                 </el-col>
                 <el-col :span="22" class="cart-user-info">
-                    <div>{{ item.company_name }}</div>
-                    <div class="user-name">{{ item.user_name }}</div>
-                    <div class="user-phone">{{ item.user_phone }}</div>
+                    <div>{{ item.companyPersonPhoneKey.companyName }}</div>
+                    <div class="user-name">{{ item.companyPersonPhoneKey.person }}</div>
+                    <div class="user-phone">{{ item.companyPersonPhoneKey.personPhone }}</div>
                 </el-col>
             </el-row>
 
-            <el-row class="cart-list" v-for="(goods, j) in item.good_list" :key="j">
+            <el-row class="cart-list" v-for="(goods, j) in item.devInfoVoList" :key="j">
                 <el-col :span="1">
                     <div style="text-align: center">
                         <el-checkbox v-model="goods.isChecked" @change="onChangeGoods(index)">
@@ -67,11 +67,14 @@
                     </div>
                 </el-col>
                 <el-col :span="9" class="goods-info">
-                    <img :src="goods.goods_pic" alt="" />
+                    <img
+                        src="https://fc1tn.baidu.com/it/u=4185529537,1682541874&fm=202&src=766&fc=tdmatt&mola=new&crop=v1"
+                        alt=""
+                    />
                     <div class="goods-code">
-                        <div style="font-size: 14px; font-weight: bold">{{ goods.goods_name }}</div>
-                        <div>装备编号： {{ goods.goods_code }}</div>
-                        <div>装备型号： {{ goods.goods_type }}</div>
+                        <div style="font-size: 14px; font-weight: bold">{{ goods.deviceName }}</div>
+                        <div>装备编号： {{ goods.code }}</div>
+                        <div>装备型号： {{ goods.typeName }}</div>
                     </div>
                 </el-col>
                 <el-col :span="4">
@@ -176,122 +179,29 @@ import moment from 'moment'
 
 const protocolChecked = ref<boolean>(false)
 
-const cardList = ref([
-    {
-        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: 1,
-                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: '',
-            },
-            {
-                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: '',
-            },
-        ],
-    },
-])
+const cardList = ref<any>([])
 
 const getBookCarDetailsData = async () => {
-    const res = await getBookCarDetailsApi()
-    console.log(res, '购物车详情')
+    const res: any = await getBookCarDetailsApi()
+    console.log(res, '----')
+
+    cardList.value = res.data
+
+    cardList.value.forEach((e: any) => {
+        e.isChecked = false
+        e.devInfoVoList.forEach((j: any) => {
+            j.isChecked = false
+        })
+    })
+
+    console.log(cardList.value, '***********')
+    // console.log(res, '购物车详情')
 }
-getBookCarDetailsData()
+
+onMounted(() => {
+    getBookCarDetailsData()
+})
+
 // 日期change事件
 const onLeaseDateChange = (e: any, item: any) => {
     item.lease_date_string = `${e[0]}至${e[1]}`
@@ -305,9 +215,9 @@ const onDeleteGoods = (index: number) => {
 
 // 全选change事件
 const onChangeAll = (e: boolean) => {
-    cardList.value.forEach((item) => {
+    cardList.value.forEach((item: any) => {
         item.isChecked = e
-        item.good_list.forEach((j) => {
+        item.devInfoVoList.forEach((j: any) => {
             j.isChecked = e
         })
     })
@@ -315,33 +225,33 @@ const onChangeAll = (e: boolean) => {
 
 // 公司全选事件
 const onChangeGoods = (index: number) => {
-    cardList.value[index].isChecked = cardList.value[index].good_list.every(
-        (e) => e.isChecked === true,
+    cardList.value[index].isChecked = cardList.value[index].devInfoVoList.every(
+        (e: any) => e.isChecked === true,
     )
 }
 // 公司全选事件
 const onChangeCompany = (e: boolean, index: number, item: any) => {
-    cardList.value[index].good_list.every((j) => (j.isChecked = e))
+    cardList.value[index].devInfoVoList.every((j) => (j.isChecked = e))
 }
 
 // 计算所有装备
 const amountNum = computed(() => {
     let amountNum = 0
     cardList.value.forEach((e) => {
-        amountNum = e.good_list.length + amountNum
+        amountNum = e.devInfoVoList.length + amountNum
     })
     return amountNum
 })
 // 计算全选按钮的选中状态
 const allChecked = computed(() => {
-    return cardList.value.every((e) => e.isChecked === true)
+    return cardList.value.every((e: any) => e.isChecked === true)
 })
 
 // 已勾选的所有装备
 const amountDevice = computed(() => {
     let amountNum = 0
     cardList.value.forEach((e) => {
-        e.good_list.forEach((g) => {
+        e.devInfoVoList.forEach((g) => {
             if (g.isChecked) {
                 amountNum++
             }
@@ -354,7 +264,7 @@ const amountDevice = computed(() => {
 const orderAmountPice = computed(() => {
     let orderAmountPice = 0
     cardList.value.forEach((e) => {
-        e.good_list.forEach((g) => {
+        e.devInfoVoList.forEach((g) => {
             if (g.isChecked) {
                 orderAmountPice = g.goods_num * g.lease_pic * g.lease_day + orderAmountPice
             }
diff --git a/src/views/equip/list.vue b/src/views/equip/list.vue
index a88dfd5..5d8dfcc 100644
--- a/src/views/equip/list.vue
+++ b/src/views/equip/list.vue
@@ -1,610 +1,623 @@
 <template>
     <div class="equipList">
         <NavMenu></NavMenu>
-        <div class="showScreen">
-            <div class="title">
-                筛选条件：
-            </div>
-            <div class="tags">
-                <el-tag
-                        v-for="(tag,i) in screenTags"
-                        :key="i"
-                        class="item"
-                        @close="handleClose(tag,i)"
-                        closable
-                >
-                    {{ tag.name }}
-                </el-tag>
-                <el-tag class="item"
-                        v-if="screenTags.length > 0"
-                        type="danger"
-                        @close="tagClear"
-                        closable>
-                    清空所有条件
-                </el-tag>
-            </div>
-        </div>
 
         <div class="screen">
             <div class="choose">
-                <template v-for="(v,i) in screenChooseList">
-                    <div class="line" v-if="v.index < v.list.length " :key="i">
+                <template v-for="(v, i) in screenChooseList" :key="i">
+                    <div class="line">
                         <div class="label">
-                            {{ v.list[v.index].name }}
+                            {{ v.name }}
                         </div>
-                        <div class="select" :style=" i == 0 ? 'min-height:105px' : ''">
-                            <div class="item"
-                                 @click="selectScreen(i,val,v.index)"
-                                 v-for="(val,index) in v.list[v.index].select" :key="index">
+                        <div class="select">
+                            <div
+                                class="item"
+                                :class="{
+                                    active: val.isChecked,
+                                }"
+                                @click="selectScreen(v.type, val, i)"
+                                v-for="(val, index) in v.list"
+                                :key="index"
+                            >
                                 {{ val.name }}
                             </div>
                         </div>
                     </div>
                 </template>
+                <div class="line" v-if="screenTags.length > 0">
+                    <div class="label">已选条件：</div>
+                    <div class="select tags">
+                        <el-tag
+                            v-for="(tag, i) in screenTags"
+                            :key="i"
+                            class="item"
+                            @close="handleClose(tag)"
+                            closable
+                        >
+                            {{ tag.name }}
+                        </el-tag>
 
+                        <span class="clear-btn" @click="onClearTags"> 清除选项 </span>
+                    </div>
+                </div>
             </div>
             <div class="btns">
-                <div class="item"
-                     @click="changeOption(v)"
-                     :class="v.id == optionActive && 'active'"
-                     v-for="(v,i) in screenOptionList" :key="i">
+                <div
+                    class="item"
+                    @click="changeOption(v)"
+                    :class="v.id == optionActive && 'active'"
+                    v-for="(v, i) in screenOptionList"
+                    :key="i"
+                >
                     {{ v.name }}
                     <template v-if="v.sort">
-                        <el-icon class="icon" v-show="v.sort == 'asc' && v.id == optionActive">
-                            <CaretTop/>
+                        <el-icon class="icon" v-show="v.sort == 'DESC'">
+                            <CaretBottom />
                         </el-icon>
-                        <el-icon class="icon" v-show="v.sort == 'desc' && v.id == optionActive">
-                            <CaretBottom/>
+                        <el-icon class="icon" v-show="v.sort == 'ASC'">
+                            <CaretTop />
                         </el-icon>
                     </template>
                 </div>
             </div>
         </div>
 
-        <div class="showList" v-show="pageData.total > 0">
-            <equip-card
-                    class="card"
-                    v-for="(v,i) in equipList"
+        <!-- <div class="showScreen">
+            <div class="title">筛选条件：</div>
+            <div class="tags">
+                <el-tag
+                    v-for="(tag, i) in screenTags"
                     :key="i"
-                    :url="v.picUrl"
-                    :company="v.companyName"
-                    :tags="[v.maStatusStr,v.cityStr || '合肥市']"
-                    :name="`${v.modelName}${v.deviceName}`"
-                    :price="v.monthLeasePrice"
-                    :id="v.maId"
-                    time-unit="月"
-                    @on-click="toDetail"></equip-card>
+                    class="item"
+                    @close="handleClose(tag, i)"
+                    closable
+                >
+                    {{ tag.name }}
+                </el-tag>
+                <el-tag
+                    class="item"
+                    v-if="screenTags.length > 0"
+                    type="danger"
+                    @close="tagClear"
+                    closable
+                >
+                    清空所有条件
+                </el-tag>
+            </div>
+        </div> -->
+
+        <div class="showList" v-if="total > 0">
+            <EquipCardHall
+                class="card"
+                v-for="(v, i) in equipList"
+                :key="i"
+                :url="v.picUrl"
+                :name="v.deviceName"
+                :price="v.dayLeasePrice"
+                :company="v.companyName"
+                :personPhone="v.personPhone"
+            />
+            <!-- <equip-card
+                class="card"
+                v-for="(v, i) in equipList"
+                :key="i"
+                :url="v.picUrl"
+                :company="v.companyName"
+                :tags="[v.maStatusStr, v.cityStr || '合肥市']"
+                :name="`${v.modelName}${v.deviceName}`"
+                :price="v.monthLeasePrice"
+                :id="v.maId"
+                time-unit="月"
+                @on-click="toDetail"
+            ></equip-card> -->
         </div>
-        <div class="noData" v-show="pageData.total == 0">
-            <el-empty :image-size="200"/>
+        <div class="noData" v-else>
+            <el-empty :image-size="200" />
         </div>
 
-        <div class="pagination" v-show="pageData.total > 0">
+        <div class="pagination">
+            <!-- <el-pagination
+                v-model:current-page="pageData.pageNum"
+                :page-size="pageData.pageSize"
+                @current-change="pageChange"
+                :pager-count="5"
+                layout="prev, pager, next"
+            /> -->
+
             <el-pagination
-                    v-model:current-page="pageData.pageNum"
-                    :page-size="pageData.pageSize"
-                    @current-change="pageChange"
-                    :pager-count="5"
-                    layout="prev, pager, next"
-                    :total="pageData.total"
+                size="small"
+                background
+                layout="prev, pager, next"
+                :page-size="pageData.pageSize"
+                :total="total"
+                class="mt-4"
+                @current-change="onCurrentChange"
+                v-if="total > 0"
             />
         </div>
     </div>
 </template>
 <script lang="ts" setup>
-import {computed, onMounted, onUnmounted, reactive, ref} from "vue";
-import EquipCard from "@/components/equipCard.vue";
-import {useRoute, useRouter} from "vue-router";
-import {apiGetAddressList, apiGetEquipTypeList, getList} from "@/http/api/equip"
-import $bus from "@/utils/bus"
-import NavMenu from "@/components/Navmenu/index.vue"
+import { computed, onMounted, onUnmounted, reactive, ref } from 'vue'
+import EquipCard from '@/components/equipCard.vue'
+import EquipCardHall from '@/components/equipCardHall/index.vue'
+import { useRoute, useRouter } from 'vue-router'
+import {
+    apiGetAddressList,
+    apiGetEquipTypeList,
+    getTypeListApi,
+    getDeviceListApi,
+} from '@/http/api/equip'
+import { getCompanyListApi } from '@/http/api/home'
+import $bus from '@/utils/bus'
+import NavMenu from '@/components/Navmenu/index.vue'
 
 const router = useRouter()
-
+const route: any = useRoute()
 
 //筛选条件列表数据
-const screenChooseList = reactive([
+const screenChooseList: any = reactive([
     {
-        name: 'address',
-        index: 0,
-        select: [],
+        name: '使用年限：',
+        type: 'userYear',
         list: [
             {
-                name: '省份',
+                isChecked: true,
+                name: '全部',
                 value: '',
-                parent: 'address',
-                select: []
+                index: 0,
             },
             {
-                name: '城市',
-                value: '',
-                parent: 'address',
-                select: []
-            }
-        ]
-    },
-    {
-        name: 'type',
-        index: 0,
-        select: [],
-        list: [
-            {
-                name: '类别',
-                value: '',
-                parent: 'type',
-                select: []
+                isChecked: false,
+                name: '0-1年',
+                value: [0, 1],
+                index: 0,
             },
             {
-                name: '组别',
-                value: '',
-                parent: 'type',
-                select: []
+                isChecked: false,
+                name: '1-3年',
+                value: [1, 3],
+                index: 0,
             },
             {
-                name: '产品名称',
-                value: '',
-                parent: 'type',
-                select: []
-            }
-        ]
+                isChecked: false,
+                name: '3-5年',
+                value: [3, 5],
+                index: 0,
+            },
+            {
+                isChecked: false,
+                name: '5-8年',
+                value: [5, 8],
+                index: 0,
+            },
+            {
+                isChecked: false,
+                name: '10年以上',
+                value: ['', 10],
+                index: 0,
+            },
+        ],
     },
     {
-        name: 'rent',
-        index: 0,
-        select: [],
+        type: 'deviceClass',
+        name: '装备分类：',
         list: [
             {
-                name: '租金区间',
+                name: '全部',
                 value: '',
-                parent: 'rent',
-                select: [{
-                    id: 1,
-                    name: '5千元以下',
-                    value: [0, 5000]
-                }, {
-                    id: 1,
-                    name: '5千-1万',
-                    value: [5000, 10000]
-                }, {
-                    id: 1,
-                    name: '1万-5万',
-                    value: [10000, 50000]
-                }, {
-                    id: 1,
-                    name: '5万-10万',
-                    value: [50000, 100000]
-                },]
-            }
-        ]
+                isChecked: true,
+                index: 1,
+            },
+        ],
     },
     {
-        name: 'age',
-        index: 0,
-        select: [],
+        type: 'leasePrice',
+        name: '租金(天/元)：',
         list: [
             {
-                name: '设备机龄',
+                name: '全部',
                 value: '',
-                parent: 'rent',
-                select: [{
-                    id: 1,
-                    name: '一年以下',
-                    value: [0, 1]
-                }, {
-                    id: 1,
-                    name: '1年-3年',
-                    value: [1, 3]
-                }, {
-                    id: 1,
-                    name: '3年-6年',
-                    value: [3, 6]
-                }, {
-                    id: 1,
-                    name: '10年以上',
-                    value: [10, 99999999]
-                }]
-            }
-        ]
+                isChecked: true,
+                index: 2,
+            },
+            {
+                name: '0-500',
+                value: [0, 500],
+                isChecked: false,
+                index: 2,
+            },
+            {
+                name: '500-1000',
+                value: [500, 1000],
+                isChecked: false,
+                index: 2,
+            },
+            {
+                name: '1000-1500',
+                value: [1000, 1500],
+                isChecked: false,
+                index: 2,
+            },
+            {
+                name: '1500-20000',
+                value: [1500, 2000],
+                isChecked: false,
+                index: 2,
+            },
+            {
+                name: '2000-2500',
+                value: [2000, 2500],
+                isChecked: false,
+                index: 2,
+            },
+            {
+                name: '2500-3000',
+                value: [2500, 3000],
+                isChecked: false,
+                index: 2,
+            },
+        ],
     },
     {
-        name: 'time',
-        index: 0,
-        select: [],
+        type: 'companyId',
+        name: '设备所在地：',
         list: [
             {
-                name: '工作小时',
+                isChecked: true,
+                name: '全部',
                 value: '',
-                parent: 'time',
-                select: [{
-                    id: 1,
-                    name: '500小时以内',
-                    value: [0, 500]
-                }, {
-                    id: 1,
-                    name: '500-2000小时',
-                    value: [500, 2000]
-                }, {
-                    id: 1,
-                    name: '2000-5000小时',
-                    value: [2000, 5000]
-                }, {
-                    id: 1,
-                    name: '5000-10000小时',
-                    value: [5000, 10000]
-                }, {
-                    id: 1,
-                    name: '10000小时以上',
-                    value: [10000, 9999999]
-                },]
-            }
-        ]
-    }
+                index: 3,
+            },
+        ],
+    },
 ])
 
+// 已选条件的tag标签
+const screenTags = computed(() => {
+    const selectTagList: any = []
+    screenChooseList.forEach((e: any) => {
+        e.list.forEach((j: any) => {
+            if (j.isChecked && j.name !== '全部') {
+                selectTagList.push(j)
+            }
+        })
+    })
+
+    return selectTagList
+})
 // 综合排序 更新时间 月租金 排序按钮
-const screenOptionList = reactive([
+const screenOptionList: any = reactive([
     {
         name: '综合排序',
-        id: '1',
-        sort: ''
-    }, {
-        name: '更新时间',
-        id: '2',
-        sort: 'asc', //asc or desc
-    }, {
-        name: '月租金',
-        id: '3',
-        sort: 'asc',
+        id: 0,
+        sort: '',
+    },
+    {
+        name: '租金',
+        id: 1,
+        sort: 'DESC',
+    },
+    {
+        name: '上架时间',
+        id: 2,
+        sort: 'DESC', //desc or desc
     },
 ])
 //激活 排序按钮
-const optionActive = ref('1')
-//显示的被选中的筛选条件
-const screenTags = computed<Array<any>>(() => {
-    let arr = []
-    screenChooseList.forEach(key => {
-        arr = [...arr, ...key.select]
-    })
-    return arr
-})
+const optionActive = ref(0)
 
 //分页参数
 const pageData = reactive({
     pageNum: 1,
-    pageSize: 9,
-    total: 0
+    pageSize: 20,
 })
 
+// 总条数
+const total = ref(0)
+
 //装备列表
-const equipList = ref([])
+const equipList: any = ref([])
 
-
-onMounted(() => {
-    $bus.on('search', (val) => {
-        getData(val)
+// 获取装备分类
+const getTypeListData = async () => {
+    const res = await getTypeListApi()
+    const typeList = res.data.map((e: any) => {
+        return { ...e, name: e.typeName, value: e.typeId, isChecked: false, index: 1 }
     })
-})
-onUnmounted(() => {
-    $bus.off('search')
-})
-//删除条件
-const handleClose = (tag, index) => {
-    screenChooseList[tag.parentIndex].select.splice(tag.index)
-    screenChooseList[tag.parentIndex].index = tag.index
-
-    const data = JSON.parse(JSON.stringify(screenChooseList[tag.parentIndex].select))
-
-    getTypeData( data.pop()?.typeId || '' )
-    getData()
+    screenChooseList[1].list.push(...typeList)
 }
-//清除所有标签
-const tagClear = () => {
-    screenChooseList.forEach(key => {
-        key.select = []
-        key.index = 0
+getTypeListData()
+
+// 获取设备所在地
+const getCompanyAddressListData = async () => {
+    const res = await getCompanyListApi()
+    const addressList = res.data.map((e: any) => {
+        return { ...e, name: e.operateAddress, value: e.companyId, isChecked: false, index: 3 }
     })
-    getTypeData()
-    getData()
+    screenChooseList[3].list.push(...addressList)
 }
+getCompanyAddressListData()
 
-const changeOption = (val) => {
-    if (val.sort && optionActive.value == val.id) {
-        val.sort = val.sort == 'asc' ? 'desc' : 'asc'
+// 查询装备列表数据
+const getDeviceListData = async (params: any = null, keyWord: any = null) => {
+    // 组装查询参数
+    const searchParams: any = {
+        keyWord: keyWord ? keyWord : '',
+        ageMin: '',
+        ageMax: '',
+        companyId: '',
+        dayLeasePriceMin: '',
+        dayLeasePriceMax: '',
+        typeId: '',
+        level: '',
+        maStatus: 2,
+        dayLeasePriceOrderBy:
+            optionActive.value == 1 ? screenOptionList[optionActive.value].sort : '',
+        updateTimeOrderBy: optionActive.value == 2 ? screenOptionList[optionActive.value].sort : '',
     }
+
+    screenChooseList.forEach((e: any, index: number) => {
+        e.list.forEach((j: any) => {
+            if (index === 0 && j.isChecked && j.value.length > 0) {
+                searchParams.ageMin = j.value[0]
+                searchParams.ageMax = j.value[1]
+            }
+            if (index === 1 && j.isChecked) {
+                searchParams.typeId = j.value
+            }
+            if (index === 2 && j.isChecked && j.value.length > 0) {
+                searchParams.dayLeasePriceMin = j.value[0]
+                searchParams.dayLeasePriceMax = j.value[1]
+            }
+            if (index === 3 && j.isChecked) {
+                searchParams.companyId = j.value
+                searchParams.level = 1
+            }
+        })
+    })
+
+    if (params) {
+        searchParams.level = params.level ? params.level : ''
+        searchParams.typeId = params.typeId ? params.typeId : ''
+        searchParams.companyId = params.companyId ? params.companyId : ''
+        searchParams.keyWord = params.keyWord ? params.keyWord : ''
+    }
+
+    Object.assign(searchParams, pageData)
+    const { data: res } = await getDeviceListApi(searchParams)
+    equipList.value = res.rows
+    total.value = res.total
+}
+
+// 清除筛选条件
+const onClearTags = () => {
+    screenChooseList.forEach((e: any) => {
+        e.list.forEach((j: any, index: number) => {
+            j.isChecked = false
+            if (index === 0) {
+                j.isChecked = true
+            }
+        })
+    })
+    getDeviceListData()
+}
+
+//删除条件
+const handleClose = (tag: any) => {
+    tag.isChecked = false
+    screenChooseList[tag.index].list[0].isChecked = true
+    getDeviceListData()
+}
+
+// 排序操作
+const changeOption = (val: any) => {
+    if (val.sort && optionActive.value == val.id) {
+        val.sort = val.sort == 'ASC' ? 'DESC' : 'ASC'
+    }
+
+    console.log(screenOptionList, 'screenOptionList')
     optionActive.value = val.id
-    getData()
+    getDeviceListData()
 }
 
 //选中后添加到 大类中的select字段
-const selectScreen = (parentIndex, val, index) => {
-    screenChooseList[parentIndex].select.push(
-        {
-            ...val,
-            index,
-            parentIndex
-        }
-    )
-    screenChooseList[parentIndex].index++
-
-    getData()
-
-    if (screenChooseList[parentIndex].index == screenChooseList[parentIndex].list.length) {
-        return
-    }
-    switch (screenChooseList[parentIndex].name) {
-        case 'address':
-            getAddressData(val.code)
-            break;
-        case 'type':
-            getTypeData(val.typeId)
-            break;
-        default:
-            break;
-    }
-
+const selectScreen = (type: any, item: any, index: number) => {
+    screenChooseList[index].list.forEach((e: any) => {
+        e.isChecked = false
+    })
+    item.isChecked = !item.isChecked
+    // activeParams[type] = item.value
+    getDeviceListData()
 }
 
 //装备card被点击
 const toDetail = (data) => {
     router.push({
-        path: `/equipDetail/${data.id}`
+        path: `/equipDetail/${data.id}`,
     })
 }
 
 //分页page变化
-const pageChange = (val) => {
+const onCurrentChange = (val: number) => {
     pageData.pageNum = val
-    getData()
-}
-//获取地址 省市区字典集合
-const getAddressData = async (code = null) => {
-    let params = {}
-    if (code) {
-        params = {
-            code
-        }
-    }
-    const res = await apiGetAddressList(params)
-    const index = screenChooseList.findIndex(key => key.name == 'address')
-    screenChooseList[index].list[screenChooseList[index].index].select = res.data
-
+    getDeviceListData()
 }
 
-//获取装备分类字典集合
-const getTypeData = async (typeId = null) => {
-    let params = {}
-    if (typeId) {
-        params = {typeId}
-    }
-    const index = screenChooseList.findIndex(key => key.name == 'type')
-    screenChooseList[index].list[screenChooseList[index].index].select = []
-    const res = await apiGetEquipTypeList(params)
-    const list = res.rows.map(
-        item => {
-            return {
-                ...item,
-                name:item.typeName,
-                id:item.typeId
-            }
-        }
-    )
-
-    screenChooseList[index].list[screenChooseList[index].index].select = list
-}
-
-//获取列表
-const getData = async (text = '') => {
-    //地址信息
-    const address = screenChooseList.find(key => key.name == 'address').select
-    //类别信息
-    const type = screenChooseList.find(key => key.name == 'type').select.slice(-1)[0] || null
-    //租金信息
-    const rent = screenChooseList.find(key => key.name == 'rent').select.slice(-1)[0] || null
-    //设备机龄
-    const age = screenChooseList.find(key => key.name == 'age').select.slice(-1)[0] || null
-    //工作小时
-    const time = screenChooseList.find(key => key.name == 'time').select.slice(-1)[0] || null
-
-
-    console.log('addres',address)
-
-    const params = {
-        keyWord: text,
-        pageSize: pageData.pageSize,
-        pageNum: pageData.pageNum,
-        updateTimeOrderBy: '',
-        monthLeasePriceOrderBy: '',
-        provinceId:address[0]?.code || '',
-        cityId:address[1]?.code || '',
-        areaId:address[2]?.code || '',
-        typeId: type ? type.typeId : '',
-        monthLeasePriceMin: '',
-        monthLeasePriceMax: '',
-        ageMin: '',
-        ageMax: '',
-        workingHoursMin: '',
-        workingHoursMax: '',
-        level:type ? type.level : ''
-    }
-
-    if (optionActive.value == '2') {
-        params.updateTimeOrderBy = screenOptionList[1].sort.toUpperCase()
-    } else if (optionActive.value == '3') {
-        params.monthLeasePriceOrderBy = screenOptionList[2].sort.toUpperCase()
-    }
-
-    if(rent){
-        params.monthLeasePriceMin = rent.value[0]
-        params.monthLeasePriceMax = rent.value[1]
-    }
-    if(age){
-        params.ageMin = age.value[0]
-        params.ageMax = age.value[1]
-    }
-    if(time){
-        params.workingHoursMin = time.value[0]
-        params.workingHoursMax = time.value[1]
-    }
-
-    const res = await getList(params)
-
-    pageData.total = res.total || 0
-    equipList.value = res.rows
-}
-
-const getParams = () => {
-    const paramsKey = ['keyWord','typeTag']
-    let params = {}
-    paramsKey.forEach(key => {
-        if (history.state[key]) {
-            params[key] = history.state[key]
-        }
+onMounted(() => {
+    window.addEventListener(() => {
+        console.log(999)
+    }, onbeforeunload)
+    $bus.on('search', (val: any) => {
+        getDeviceListData(null, val)
     })
-    return params
-}
-
-const init = () => {
-    const params = getParams()
-    if (params) {
-        if(params.keyWord){
-            $bus.emit('callBackText', params.keyWord)
-            $bus.off('callBackText')
+    let routeParams: any = null
+    if (route.query.level && route.query.typeId) {
+        routeParams = {
+            level: route.query.level,
+            typeId: route.query.typeId,
         }
-        if(params.typeTag){
-            const index = screenChooseList.findIndex(key => key.name == 'type')
-            const data = params.typeTag.map((key,i) => {
-                return{
-                    ...key,
-                    name:key.typeName,
-                    index:i,
-                    parentIndex:index
-                }
-            })
-            screenChooseList[index].select = data
-            screenChooseList[index].index = data.length
-        }else {
-            getTypeData()
-        }
-    }else {
-        getTypeData()
     }
+    if (route.query.companyId) {
+        routeParams = {
+            companyId: route.query.companyId,
+        }
+    }
+    if (route.query.keyWord) {
+        routeParams = {
+            keyWord: route.query.keyWord,
+        }
+    }
+    getDeviceListData(routeParams, null)
+})
 
-
-    getAddressData()
-    getData(params.keyWord || '')
-}
-init()
-
-
+onUnmounted(() => {
+    $bus.off('search')
+})
 </script>
 <style lang="scss" scoped>
 .equipList {
-
-  .showScreen {
-    margin-top: 20px;
-    display: flex;
-    align-items: center;
-    height: 30px;
-
-    .title {
-      font-size: 16px;
-      font-weight: 500;
-      color: #949494;
-    }
-
-    .tags {
-      .item {
-        margin-left: 10px;
-      }
-    }
-  }
-
-  .screen {
-    .choose {
-      margin-top: 20px;
-
-      .line {
+    .showScreen {
+        margin: 15px 0;
         display: flex;
-        border-bottom: 1px solid #dddddd;
+        align-items: center;
+        border-bottom: 1px solid #ccc;
+        // height: 30px;
 
-        .label {
-          width: 100px;
-          box-sizing: border-box;
-          padding: 15px;
-          background: #f3f3f3;
-          font-size: 16px;
+        .title {
+            font-size: 16px;
+            font-weight: 500;
+            color: #949494;
+        }
+    }
+
+    .screen {
+        margin-bottom: 20px;
+        padding-bottom: 20px;
+        border-bottom: 1px solid #ccc;
+        .choose {
+            margin-top: 20px;
+            font-size: 14px;
+
+            .line {
+                padding: 14px 0;
+                display: flex;
+                align-items: center;
+                // border-bottom: 1px solid #dddddd;
+
+                .label {
+                    // width: 100px;
+                    box-sizing: border-box;
+                    // padding: 0 15px;
+                    // background: #f3f3f3;
+                }
+
+                .select {
+                    flex: 1;
+                    display: flex;
+                    flex-wrap: wrap;
+                    box-sizing: border-box;
+                    padding: 0 15px;
+
+                    .item {
+                        padding: 2px 16px;
+                        margin-right: 15px;
+                        cursor: pointer;
+                        color: #939393;
+                        font-size: 15px;
+                        line-height: 25px;
+                        height: 25px;
+
+                        &:hover {
+                            color: #3cb4a6;
+                        }
+                    }
+
+                    .active {
+                        background-color: #3cb4a6;
+                        color: #fff !important;
+                        border-radius: 25px;
+                    }
+                }
+
+                .tags {
+                    display: flex;
+                    align-items: center;
+                    color: #138472;
+                    .item {
+                        margin-left: 10px;
+                    }
+
+                    .clear-btn {
+                        cursor: pointer;
+                    }
+
+                    .el-tag {
+                        background-color: #fff;
+                        border: 1px solid #138472;
+                        color: #138472;
+                    }
+                    :deep .el-tag .el-tag__close {
+                        color: #138472;
+                    }
+                }
+            }
         }
 
-        .select {
-          flex: 1;
-          display: flex;
-          flex-wrap: wrap;
-          box-sizing: border-box;
-          padding: 15px;
+        .active {
+            color: #138472 !important;
+            font-weight: bold !important;
+        }
 
-          .item {
+        .btns {
+            display: flex;
+            align-items: center;
+            // margin-top: 20px;
+
+            .item {
+                background: #f7f9fa;
+                border-radius: 12px;
+                padding: 10px 20px;
+
+                font-size: 17px;
+                font-weight: 500;
+                color: #9d9d9d;
+                margin-right: 10px;
+                cursor: pointer;
+                user-select: none;
+
+                .icon {
+                    font-size: 15px;
+                }
+            }
+        }
+    }
+
+    .showList {
+        display: flex;
+        align-items: center;
+        flex-wrap: wrap;
+
+        .card {
+            width: calc((100% - 45px) / 4);
             margin-right: 15px;
             cursor: pointer;
-            color: #939393;
-            font-size: 15px;
-            line-height: 25px;
-
-            &:hover {
-              color: red;
+            &:nth-child(4n) {
+                margin-right: 0;
             }
-          }
+
+            margin-bottom: 15px !important;
         }
-      }
     }
 
-    .active {
-      color: #1069FF !important;
+    .pagination {
+        margin-top: 20px;
+        display: flex;
+        justify-content: flex-end;
     }
+}
 
-    .btns {
-      display: flex;
-      align-items: center;
-      margin-top: 20px;
-
-      .item {
-        background: #F7F9FA;
-        border-radius: 12px;
-        padding: 10px 20px;
-
-        font-size: 17px;
-        font-weight: 500;
-        color: #9D9D9D;
-        margin-right: 10px;
-        cursor: pointer;
-        user-select: none;
-
-        .icon {
-          font-size: 15px;
-        }
-      }
-    }
-  }
-
-  .showList {
-    display: flex;
-    align-items: center;
-    flex-wrap: wrap;
-
-    .card {
-      width: calc((100% - 40px) / 3);
-
-      &:nth-child(3n - 1) {
-        margin: 0 20px;
-      }
-
-      margin-top: 15px !important;
-    }
-  }
-
-  .pagination {
-    margin-top: 20px;
-    display: flex;
-    justify-content: flex-end;
-  }
+:deep.el-pagination.is-background .el-pager li.is-active {
+    background-color: #3cb4a6;
 }
 </style>
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index e25f3f8..46b00ce 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -2,15 +2,20 @@
 import EquipCard from 'components/equipCard.vue'
 import EquipCardNew from 'components/equipCardNew/index.vue'
 import NavMenu from 'components/Navmenu/index.vue'
-import { getGoodsClassListApi } from 'http/api/home'
+import { getGoodsClassListApi, getCompanyListApi } from 'http/api/home'
 import { mainStore } from 'store/main'
 import { getHotList } from 'http/api/equip'
 import { reactive, ref } from 'vue'
 import baseData from '@/assets/baseInformation.json'
 
-const router = useRouter()
+const router: any = useRouter()
 
-const leftNavList: any = ref([])
+// const leftNavList: any = ref([])
+const companyList: any = ref([])
+const classList: any = ref([])
+
+const selectOptions = ref<boolean>(false) // 分类
+const selectOptionsValue = ref<string>('分类筛选')
 
 const loopList = ref([
     'https://zlpt-1259760603.cos.ap-nanjing.myqcloud.com/488bab245180ebf9f1f3d7db5301be4.png',
@@ -21,13 +26,42 @@ const getGoodsClassList = async () => {
     const res: any = await getGoodsClassListApi()
     console.log(res, '商品分类列表')
 
-    leftNavList.value = res.rows
+    // leftNavList.value = res.rows
+    classList.value = res.data
 }
 
 getGoodsClassList()
 
-const handlerGoodsDetails = (...arg) => {
-    const arr = arg.map((key, index) => {
+// 获取公司名称
+const getCompanyListData = async () => {
+    const res: any = await getCompanyListApi()
+    companyList.value = res.data
+    console.log('res公司名称', res)
+}
+
+getCompanyListData()
+
+// 点击跳转装备共享大厅
+const onSharedHall = (level: number, typeId: any) => {
+    router.push({
+        name: 'equipList',
+        query: {
+            level,
+            typeId,
+        },
+    })
+}
+const onSharedHallByCompany = (companyId: any) => {
+    router.push({
+        name: 'equipList',
+        query: {
+            companyId,
+        },
+    })
+}
+
+const handlerGoodsDetails = (...arg: any) => {
+    const arr = arg.map((key: any, index: number) => {
         return {
             level: index + 1 + '',
             typeId: key.id,
@@ -76,6 +110,21 @@ getHotDeviceList()
 const onClick = (val: any) => {
     router.push(`/equipDetail/${val.id}`)
 }
+
+// 分类点击事件
+const onSelectOptions = () => {
+    selectOptions.value = !selectOptions.value
+}
+
+// 分类选择事件
+const onSelectItem = (type: number) => {
+    if (type === 1) {
+        selectOptionsValue.value = '分类筛选'
+    } else {
+        selectOptionsValue.value = '公司筛选'
+    }
+    selectOptions.value = false
+}
 </script>
 
 <template>
@@ -85,60 +134,83 @@ const onClick = (val: any) => {
             <div class="home-goods">
                 <ul class="left-nav">
                     <!-- 左侧机械名称菜单按钮 -->
-                    <li class="item-nav" v-for="item in leftNavList" :key="item.name">
-                        {{ item.name }}
-                        <ul class="sub-goods">
-                            <!-- 级联框内 类别名称 -->
-                            <li v-for="child in item.children" :key="child.id">
-                                <!-- 第二级 -->
-                                <span class="second-name">
-                                    {{ child.name }}
-                                </span>
+                    <li class="left-filter" @click="onSelectOptions">
+                        {{ selectOptionsValue }}
+                        <el-icon style="margin-left: 10px"><ArrowDownBold /></el-icon>
 
-                                <span
-                                    style="
-                                        display: flex;
-                                        flex: 1;
-                                        flex-direction: column;
-                                        flex-wrap: wrap;
-                                    "
-                                >
-                                    <span
-                                        v-for="son in child.children"
-                                        :key="son.id"
-                                        style="
-                                            font-size: 14px;
-                                            font-weight: bold;
-                                            width: 100%;
-                                            display: flex;
-                                        "
+                        <div class="select-options" v-if="selectOptions">
+                            <div @click.stop="onSelectItem(1)">分类筛选</div>
+                            <div @click.stop="onSelectItem(2)">公司筛选</div>
+                        </div>
+                    </li>
+
+                    <template v-if="selectOptionsValue === '分类筛选'">
+                        <div v-for="item in classList" :key="item.name" class="item-container">
+                            <li class="item-nav" @click="onSharedHall(1, item.id)">
+                                {{ item.name }}
+                                <ul class="sub-goods">
+                                    <!-- 级联框内 类别名称 -->
+                                    <li
+                                        v-for="child in item.children"
+                                        :key="child.id"
+                                        @click="onSharedHall(2, child.id)"
                                     >
-                                        <!-- {{ son.name }} -->
-
-                                        <span style="width: 30%">
-                                            {{ son.name }}
+                                        <!-- 第二级 -->
+                                        <span class="second-name">
+                                            {{ child.name }}
                                         </span>
 
-                                        <span style="width: 70%; display: flex; flex-wrap: wrap">
+                                        <span
+                                            style="
+                                                display: flex;
+                                                flex: 1;
+                                                flex-direction: column;
+                                                flex-wrap: wrap;
+                                            "
+                                        >
                                             <span
-                                                v-for="son_1 in son.children"
-                                                :key="son_1.id"
+                                                v-for="son in child.children"
+                                                :key="son.id"
                                                 style="
-                                                    font-size: 12px;
-                                                    font-weight: normal;
-                                                    padding: 0 2px;
-                                                    border-bottom: 1px solid #ccc;
+                                                    font-size: 14px;
+                                                    font-weight: bold;
+                                                    width: 100%;
+                                                    display: flex;
                                                 "
-                                                class="last-level"
-                                                @click="handlerGoodsDetails(item, child, son)"
+                                                @click="onSharedHall(3, son.id)"
                                             >
-                                                {{ son_1.name }}
+                                                <!-- {{ son.name }} -->
+
+                                                <span style="width: 30%">
+                                                    {{ son.name }}
+                                                </span>
+
+                                                <span
+                                                    style="
+                                                        width: 70%;
+                                                        display: flex;
+                                                        flex-wrap: wrap;
+                                                    "
+                                                >
+                                                    <span
+                                                        v-for="son_1 in son.children"
+                                                        :key="son_1.id"
+                                                        style="
+                                                            font-size: 12px;
+                                                            font-weight: normal;
+                                                            padding: 0 2px;
+                                                            border-bottom: 1px solid #ccc;
+                                                        "
+                                                        class="last-level"
+                                                        @click="onSharedHall(4, son_1.id)"
+                                                    >
+                                                        {{ son_1.name }}
+                                                    </span>
+                                                </span>
                                             </span>
                                         </span>
-                                    </span>
-                                </span>
 
-                                <!-- <span>{{ child.name }}</span>
+                                        <!-- <span>{{ child.name }}</span>
                                 <span>
                                     <a
                                         v-for="son in child.children"
@@ -148,9 +220,23 @@ const onClick = (val: any) => {
                                         {{ son.name }}
                                     </a>
                                 </span> -->
+                                    </li>
+                                </ul>
                             </li>
-                        </ul>
-                    </li>
+                        </div>
+                    </template>
+
+                    <template v-else>
+                        <div
+                            v-for="item in companyList"
+                            :key="item.companyId"
+                            class="item-container"
+                        >
+                            <li class="item-nav" @click="onSharedHallByCompany(item.companyId)">
+                                {{ item.companyName }}
+                            </li>
+                        </div>
+                    </template>
                 </ul>
                 <div class="right-content">
                     <!-- 轮播图上方导航按钮 -->
@@ -273,80 +359,131 @@ const onClick = (val: any) => {
     .home-goods {
         height: 500px;
         display: flex;
+        position: relative;
 
         .left-nav {
-            position: relative;
+            // padding: 10px 0;
             // margin-top: 8px;
             width: 200px;
             height: 100%;
             display: flex;
-            // background-color: #f7f9fa;
-            background-color: #6599ed;
             flex-direction: column;
-            // justify-content: space-around;
+            align-items: center;
+            background-color: #f7f9fa;
+            overflow: hidden;
+            overflow-y: auto;
 
-            .item-nav {
-                // text-align: left;
-                // padding-left: 50px;
-                color: #fff;
-                height: 46px;
-                line-height: 46px;
-                text-align: center;
-                font-size: 16px !important;
+            .left-filter {
+                margin-top: 10px;
+                padding: 3px 0;
+                position: relative;
+                display: flex;
+                align-content: center;
+                justify-content: center;
+                color: #38b2a4;
+                // height: 46px;
+                // line-height: 46px;
+                // text-align: center;
+                font-weight: bold;
+                cursor: pointer;
 
-                &:hover {
-                    cursor: pointer;
-                    // color: #2282ff;
-                    // font-weight: bold;
-                    background-color: #1abc9c;
+                .select-options {
+                    position: absolute;
+                    width: 120%;
+                    left: 50%;
+                    bottom: -65px;
+                    border-radius: 4px;
+                    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.4);
+                    transform: translateX(-50%);
+                    background-color: #fff;
 
-                    .sub-goods {
-                        display: block;
+                    div {
+                        padding: 8px 6px;
+                        text-align: left;
+                        font-size: 14px;
+                        font-weight: normal;
+                        cursor: pointer;
+                        color: #333;
+                    }
+                    div:hover {
+                        color: #38b2a4;
                     }
                 }
             }
 
-            .sub-goods {
-                position: absolute;
-                display: none;
-                top: 0;
-                left: 200px;
-                width: 915px;
-                max-height: 100%;
-                background-color: #f5f4f4;
-                z-index: 999;
-                // opacity: 0.9;
-                border: 1px solid #333;
-                overflow-y: auto;
-                box-sizing: border-box;
+            .item-container {
+                width: 100%;
+                text-align: center;
+                .item-nav {
+                    // text-align: left;
+                    // padding-left: 50px;
+                    display: inline-block;
+                    margin-top: 10px;
+                    padding: 0 10px;
+                    color: #000;
+                    height: 32px;
+                    line-height: 32px;
+                    text-align: center;
+                    font-size: 16px !important;
 
-                li {
-                    // margin: 10px 0;
-                    color: #333;
-                    font-weight: bold;
-                    display: flex;
-
-                    .second-name {
-                        width: 160px;
-                        margin-left: 10px;
+                    &:hover {
+                        cursor: pointer;
+                        // color: #2282ff;
+                        // font-weight: bold;
+                        background-color: #1abc9c;
+                        border-radius: 18px;
+                        color: #fff;
                     }
+                }
 
-                    span a {
-                        margin: 0 15px;
-                        font-size: 14px;
-                        font-weight: normal;
-                    }
+                .sub-goods {
+                    position: absolute;
+                    display: none;
+                    top: 0;
+                    left: 200px;
+                    width: 915px;
+                    max-height: 100%;
+                    background-color: #f5f4f4;
+                    z-index: 999;
+                    // opacity: 0.9;
+                    border: 1px solid #333;
+                    overflow-y: auto;
+                    box-sizing: border-box;
 
-                    .last-level {
-                        margin-left: 3px;
-                    }
+                    li {
+                        // margin: 10px 0;
+                        color: #333;
+                        font-weight: bold;
+                        display: flex;
 
-                    .last-level:hover {
-                        color: #1abc9c;
-                        border-bottom: 1px solid #1abc9c !important;
+                        .second-name {
+                            width: 160px;
+                            margin-left: 10px;
+                        }
+
+                        span a {
+                            margin: 0 15px;
+                            font-size: 14px;
+                            font-weight: normal;
+                        }
+
+                        .last-level {
+                            margin-left: 3px;
+                        }
+
+                        .last-level:hover {
+                            color: #1abc9c;
+                            border-bottom: 1px solid #1abc9c !important;
+                        }
                     }
                 }
             }
+            .item-container:hover {
+                .sub-goods {
+                    display: block !important;
+                    z-index: 9999;
+                }
+            }
         }
 
         .right-content {
@@ -467,7 +604,7 @@ const onClick = (val: any) => {
     }
 }
 
-::v-deep .el-carousel__container {
+:deep(.el-carousel__container) {
     height: 100%;
 }
 
diff --git a/vite.config.ts b/vite.config.ts
index 5b7b6aa..4fb3a16 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -132,7 +132,8 @@ export default ({ mode }: any) => {
           drop_console: isProduction, //生产正式 去除
           drop_debugger: isProduction //生产正式 去除
         }
-      }
+      },
+      minify: 'terser',
       /*
       rollupOptions: {
           output: {