Merge branch 'dev-wangyiming'

# Conflicts:
#	src/views/equip/detail.vue

src/router/index.ts

@@ -96,7 +96,7 @@ const routes: Array<RouteRecordRaw> = [
             },
             // 资讯详情
             {
-                path: '/consultationDetails',
+                path: '/consultationDetails/:id',
                 name: 'consultationDetails',
                 component: () => (import('views/consultationDetails/index.vue'))
             },

src/views/consultationDetails/index.vue

@@ -1,14 +1,69 @@
-<script setup lang="ts"></script>
 
 <template>
     <!-- 咨询详情页面 -->
-    <div class="consultation-details">咨询详情页面(占位)</div>
+    <div class="consultation-details">
+        <div class="title">
+            {{ data.title }}
+        </div>
+        <div class="line"></div>
+        <div class="createTime">
+            发布时间：{{ data.create_time }}
+        </div>
+        <div v-html="data.content"></div>
+    </div>
 </template>
+<script setup lang="ts">
+    import baseData from "@/assets/baseInformation.json"
+    import {ref} from "vue";
+    import {useRoute} from "vue-router";
+
+    const router = useRoute()
+    const data = ref({})
+
+
+    //根据id获取静态模拟数据
+    const getData = () => {
+        const id = router.params.id
+
+        data.value = baseData.find(key => key.id == id)
+
+    }
+
+    const init = () => {
+        getData()
+    }
+    init()
+
+
+</script>
 
 <style>
     .consultation-details {
-        color: #000;
+       .title{
-        background-color: skyblue;
+           text-align: center;
-        height: 200px;
+           font-size: 20px;
+           font-weight: 600;
+       }
+        .line{
+            position: relative;
+            width: 100%;
+            padding-top: 20px;
+            margin-bottom: 10px;
+            &:after{
+                content: '';
+                position: absolute;
+                left: 0;
+                bottom: 0;
+                width: 100%;
+                height: 1px;
+                background: #d1d1d1;
+            }
+        }
+        .createTime{
+            text-align: center;
+        }
+        .notice-content{
+            margin-top: 20px;
+        }
     }
 </style>

src/views/equip/list.vue

@@ -303,7 +303,7 @@ const tagClear = () => {
         key.select = []
         key.index = 0
     })
-
+    getTypeData()
     getData()
 }
 
@@ -389,15 +389,13 @@ const getTypeData = async (typeId = null) => {
         }
     )
 
-
-
     screenChooseList[index].list[screenChooseList[index].index].select = list
 }
 
 //获取列表
 const getData = async (text = '') => {
     //地址信息
-    const address = screenChooseList.find(key => key.name == 'address').select.slice(-1)[0] || null
+    const address = screenChooseList.find(key => key.name == 'address').select
     //类别信息
     const type = screenChooseList.find(key => key.name == 'type').select.slice(-1)[0] || null
     //租金信息
@@ -408,13 +406,17 @@ const getData = async (text = '') => {
     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: '',
-        location: address ? address.id : '',
+        provinceId:address[0]?.id || '',
+        cityId:address[1]?.id || '',
+        areaId:address[2]?.id || '',
         typeId: type ? type.typeId : '',
         monthLeasePriceMin: '',
         monthLeasePriceMax: '',

src/views/home/index.vue

@@ -5,6 +5,8 @@
     import { useStore } from 'store/main'
     import { getHotList } from 'http/api/equip'
     import {reactive} from "vue";
+    import baseData from "@/assets/baseInformation.json"
+
     const router = useRouter()
 
     const leftNavList = ref([])
@@ -33,26 +35,26 @@
         })
     }
 
-    const detailsList = ref([
+    const goInformation = (id) => {
-        {
+        router.push({
-            v_title: '实锤了，确实挖掘技术强！山东用挖掘机在海外市场“挖呀挖”',
+            path:`/consultationDetails/${id}`
-            v_content_info:
+        })
-                '天眼查数据显示，截至今年4月中旬，全国存天眼查数据显示，截至今年4月中旬，全国存天眼查数据显示，截至今年4月中旬，全国存',
+    }
-            v_time: '[2023/11/28]'
+
-        },
+    const detailsList = ref([])
-        {
+
-            v_title: '实锤了，确实挖掘技术强！山东用挖掘机在海外市场“挖呀挖”',
+    const handelInformation = () => {
-            v_content_info:
+        detailsList.value = baseData.map(item => {
-                '天眼查数据显示，截至今年4月中旬，全国存天眼查数据显示，截至今年4月中旬，全国存天眼查数据显示，截至今年4月中旬，全国存',
+            return {
-            v_time: '[2023/11/28]'
+                v_title:item.title,
-        },
+                v_content_info:'',
-        {
+                v_time:`[${item.create_time}]`,
-            v_title: '实锤了，确实挖掘技术强！山东用挖掘机在海外市场“挖呀挖”',
+                id:item.id
-            v_content_info:
+            }
-                '天眼查数据显示，截至今年4月中旬，全国存天眼查数据显示，截至今年4月中旬，全国存天眼查数据显示，截至今年4月中旬，全国存',
+        })
-            v_time: '[2023/11/28]'
+    }
-        }
+    handelInformation()
-    ])
+
 
     const hotDeviceList: any = ref([])
 
@@ -127,7 +129,7 @@
                         @onClick="onClick"
                         :company="item.companyName || '安徽博诺斯有限公司'"
                         :price="item.monthLeasePrice"
-                        :tags="['待租', '合肥市']"
+                        :tags="[item.maStatusStr || '待租', item.cityStr || '合肥']"
                         :name="item.modelName + item.deviceName"
                         :url="item.picUrl"
                         :id="item.maId" />
@@ -164,11 +166,11 @@
                 <div class="right-consult">
                     <div
                         class="consult-box"
-                        @click="$router.push('/consultationDetails')"
+                        @click="goInformation(item.id)"
                         v-for="item in detailsList"
                         :key="item.v_time">
                         <div class="consult-title">
-                            <h2>{{ item.v_title }}</h2>
+                            <h3>{{ item.v_title }}</h3>
                             <span>{{ item.v_time }}</span>
                         </div>
 
@@ -356,9 +358,10 @@
                 flex: 1;
                 width: calc(100% - 340px);
                 // padding-left: 35px;
-
+                overflow-y: auto;
                 .consult-box {
-                    height: 70px;
+                    margin-bottom: 10px;
+                    //height: 70px;
                     padding-left: 15px;
                     cursor: pointer;
                     .consult-title {
@@ -379,7 +382,7 @@
 
                     .consult-info {
                         width: calc(100% - 100px);
-                        height: 40px;
+                        height: 10px;
                         line-height: 40px;
                         border-bottom: 1px dashed #979797;
                         overflow: hidden;