diff --git a/src/components/selectTabBox/selectTabBox.vue b/src/components/selectTabBox/selectTabBox.vue index a880b8e..1b6f34d 100644 --- a/src/components/selectTabBox/selectTabBox.vue +++ b/src/components/selectTabBox/selectTabBox.vue @@ -53,10 +53,10 @@ -
- 共{{ count || 0 }}条 - {{ routePath === '/personHousing' ? + 共{{ count || 0 }}条{{ routePath === '/personHousing' ? '个人房源' : routePath === '/intermediaryHousing' ? '中介房源' : routePath === '/needHousing' ? - '求房源' : '' }} -   - | -   + '求房源' : '' }} |
-
{{ selectTabCheck.title }}:
+
{{ selectTabCheck.title }}:
{{ item.title }} @@ -351,16 +347,17 @@ let schoolSelectObj = reactive({ id: '', title: '不限' }) let schoolPages = ref(0) //页数 let shcoolData = shallowReactive([]) let setSchoolData = () => { - let arr = store.state.seachTypeData[0] ? store.state.seachTypeData[0].where : [] + console.log(store.state) + let arr = routePath.value === '/' ? store.state.seachTypeData[0] && store.state.seachTypeData[0].where : store.state.schoolList arr.unshift({ name: '不限', id: '' }) let num = 0 for (let i = 0; i < arr.length; i++) { if (!shcoolData[num]) { shcoolData[num] = [] } - if (shcoolData[num].length < 9) shcoolData[num].push(arr[i]) + if (shcoolData[num].length < 4) shcoolData[num].push(arr[i]) - if (shcoolData[num].length === 9) { + if (shcoolData[num].length === 4) { num++ } } @@ -749,6 +746,10 @@ export default { align-items: center; } +.jus-sp { + justify-content: space-around; +} + .s-w-100 { width: 100%; } @@ -871,8 +872,8 @@ img { display: flex; align-items: center; - .mg-r-15 { - margin-right: 15px; + .mg-r-35 { + margin-right: 35px; } .carousel-info-box { @@ -1217,7 +1218,13 @@ img { color: #555555; font-size: 15px; - .bold-text {} + .bold-text { + font-family: 'PingFangSC-Semibold', 'PingFang SC Semibold', 'PingFang SC', sans-serif; + font-weight: 650; + font-style: normal; + font-size: 14px; + color: #000000; + } .btm-btn { font-family: 'PingFangSC-Regular', 'PingFang SC', sans-serif; @@ -1225,7 +1232,7 @@ img { font-style: normal; font-size: 14px; color: #333333; - margin-left: 15px; + margin-left: 20px; .img { width: 8px; diff --git a/src/main.js b/src/main.js index e5ef297..a3214c8 100644 --- a/src/main.js +++ b/src/main.js @@ -84,6 +84,7 @@ api.index().then(res => { store.state.nav = res.data.nav store.state.wechat = res.data.wechat store.state.apartment = res.data.config.apartment + store.state.schoolList=res.data.schoolList }).finally(() => { app.mount('#app') }) \ No newline at end of file