XiaoMo/gterFang
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source 
# Conflicts:
#	src/components/public/head.vue
This commit is contained in:
A1300399510
2023-07-11 19:43:03 +08:00
parent 234b953f6b fd06b66cc8
commit d92968ae76
5 changed files with 71 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/HomeView.vue
View File

@@ -1,7 +1,7 @@
<template>
<div class="home">
<!-- <pageTopBar></pageTopBar> -->
<header></header>
<pageTopBar></pageTopBar>
<!-- <headerNavigation></headerNavigation> -->
<!-- 搜索模块 -->
<seachModule></seachModule>
<!-- 房源展示 -->
@@ -171,7 +171,7 @@ import pageTopBar from '../components/pageTopBar/pageTopBar.vue';
import indexWaterfallBox from "../components/indexWaterfallBox/indexWaterfallBox.vue";
import seachModule from "../components/seachModule/seachModule.vue";
import indexRegularBox from '../components/indexRegularBox/indexRegularBox.vue';
import header from '../components/public/head.vue'
import headerNavigation from '../components/public/head.vue'
//
let informationData = [