Merge remote-tracking branch 'origin/main'

# Conflicts:
#	src/views/housingView/apartment.vue

src/views/housingView/apartment.vue

@@ -17,12 +17,17 @@
 import pageTopBar from '../../components/pageTopBar/pageTopBar.vue';
 import seachModule from "../../components/seachModule/seachModule.vue";
 import biserialItem from '../../components/biserialListItem/biserialListItem.vue'
+<<<<<<< HEAD
 import apartmentItem from '@/components/public/apartment-item.vue';
 import haveQuestions from '@/components/public/have-questions.vue'
 import pageFooter from '@/components/footer/footer.vue'
 import { ref, onMounted, onUnmounted, watch, getCurrentInstance, nextTick } from 'vue';
 import { ElLoading } from 'element-plus'
 import Masonry from 'masonry-layout';
+=======
+import { ref, onMounted, watch } from 'vue';
+// import Masonry from 'masonry-layout';
+>>>>>>> origin/main
 
 const { proxy } = getCurrentInstance()
 

src/views/housingView/person.vue

@@ -1,14 +1,16 @@
 <template>
     <div>
         <pageTopBar></pageTopBar>
-        <seachModule></seachModule>
+        <seachModule :count="dataList.count"></seachModule>
         <div class="dis-f jus-x al-item">
             <div class="body-maxWidth mg-t-35">
                 <div class="dis-f jus-bet">
+                    <div>
+                        <biserialItem v-for="(item,i) in dataList.data.data" :key="i" :item="item"></biserialItem>
+                    </div>
                     <div>
                         <biserialItem></biserialItem>
                     </div>
-                    <div></div>
                 </div>
             </div>
         </div>
@@ -17,10 +19,26 @@
 </template>
   
 <script setup>
+import {reactive} from 'vue'
 import pageTopBar from '../../components/pageTopBar/pageTopBar.vue';
 import seachModule from "../../components/seachModule/seachModule.vue";
 import biserialItem from '../../components/biserialListItem/biserialListItem.vue'
 import listBtmPrompt from "../../components/public/have-questions.vue";
+import api from "../../utils/api";
+
+//获取数据
+let dataList= reactive({data:[],count:0})
+let getDataList=()=>{
+    let postData={}
+    api.getLists(postData).then(res=>{
+        console.log(res.data)
+        if(res.code===200){
+            dataList.count=res.data.count
+            dataList.data=res.data
+        }
+    })
+}
+getDataList()
 </script>
 <style scoped>
 img {