Merge branch 'dev-sy'

components.d.ts

@@ -21,9 +21,11 @@ declare module 'vue' {
     ElCountdown: typeof import('element-plus/es')['ElCountdown']
     ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
     ElDialog: typeof import('element-plus/es')['ElDialog']
+    ElDivider: typeof import('element-plus/es')['ElDivider']
     ElEmpty: typeof import('element-plus/es')['ElEmpty']
     ElForm: typeof import('element-plus/es')['ElForm']
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
+    ElHeader: typeof import('element-plus/es')['ElHeader']
     ElIcon: typeof import('element-plus/es')['ElIcon']
     ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
@@ -31,15 +33,20 @@ declare module 'vue' {
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
+    ElPageHeader: typeof import('element-plus/es')['ElPageHeader']
     ElPagination: typeof import('element-plus/es')['ElPagination']
     ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm']
     ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
     ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElSelect: typeof import('element-plus/es')['ElSelect']
+    ElStep: typeof import('element-plus/es')['ElStep']
+    ElSteps: typeof import('element-plus/es')['ElSteps']
     ElTable: typeof import('element-plus/es')['ElTable']
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
     ElTag: typeof import('element-plus/es')['ElTag']
+    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']

src/components/FooterInfo/index.vue

@@ -53,7 +53,7 @@
 <style lang="scss">
 .footer-container {
     margin-top: 40px;
-    height: 650px;
+    // height: 650px;
     border-top: 1px solid #979797;
     background: url('../../assets/img/home/2023_12_01_beijing2/beijing2.png') no-repeat;
     background-size: cover;

src/components/equipCardNew/index.vue

@@ -6,7 +6,7 @@
 
         <ul class="item-details">
             <li class="address">
-                <span>{{ company }}</span>
+                <span>{{ operateAddress }}</span>
                 <span style="text-align: right; color: #ff4800">
                     <i style="font-size: 10px">￥</i>
                     <i style="font-size: 14px; font-weight: bold">{{ price }}</i>
@@ -51,6 +51,10 @@ const props: any = defineProps({
         type: String,
         default: '安徽某科技有限公司',
     },
+    operateAddress: {
+        type: String,
+        default: '安徽某科技有限公司',
+    },
     price: {
         type: [String, Number],
         default: 99,

src/views/enterpriseZone/index.vue

@@ -5,6 +5,12 @@ import NavMenu from 'components/Navmenu/index.vue'
 <template>
     <!-- 企业专区 -->
     <NavMenu />
+
+    <div class="container"></div>
 </template>
 
-<style></style>
+<style scoped>
+.container {
+    height: 600px;
+}
+</style>

src/views/home/index.vue

@@ -308,6 +308,7 @@ const onSelectItem = (type: number) => {
                                 :id="g.maId"
                                 :companyId="g.companyId"
                                 :company="g.companyName"
+                                :operateAddress="g.operateAddress"
                                 :name="g.deviceName"
                                 :price="g.dayLeasePrice"
                                 :url="g.picUrl"