修改bug
This commit is contained in:
Binary file not shown.
6
src/assets/img/publicImage/yellow-arrow.svg
Normal file
6
src/assets/img/publicImage/yellow-arrow.svg
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="7px" height="10px" xmlns="http://www.w3.org/2000/svg">
|
||||||
|
<g transform="matrix(1 0 0 1 -459 -242 )">
|
||||||
|
<path d="M 6.87972508591065 4.76953907815631 C 6.95990836197022 4.83633934535738 7 4.91315965263861 7 5 C 7 5.08684034736139 6.95990836197022 5.16366065464262 6.87972508591065 5.23046092184369 L 1.27491408934708 9.8997995991984 C 1.19473081328751 9.96659986639947 1.10252004581901 10 0.998281786941581 10 C 0.894043528064147 10 0.801832760595647 9.96659986639947 0.721649484536082 9.8997995991984 L 0.120274914089347 9.39879759519038 C 0.0400916380297824 9.33199732798931 0 9.25517702070808 0 9.16833667334669 C 0 9.0814963259853 0.0400916380297824 9.00467601870407 0.120274914089347 8.93787575150301 L 4.84707903780069 5 L 0.120274914089347 1.06212424849699 C 0.0400916380297824 0.995323981295925 0 0.918503674014696 0 0.831663326653307 C 0 0.744822979291916 0.0400916380297824 0.668002672010687 0.120274914089347 0.601202404809619 L 0.721649484536082 0.100200400801603 C 0.801832760595647 0.0334001336005341 0.894043528064147 0 0.998281786941581 0 C 1.10252004581901 0 1.19473081328751 0.0334001336005341 1.27491408934708 0.100200400801603 L 6.87972508591065 4.76953907815631 Z " fill-rule="nonzero" fill="#806c24" stroke="none" transform="matrix(1 0 0 1 459 242 )" />
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
@@ -177,13 +177,15 @@
|
|||||||
import { ref, toRefs, watchEffect, reactive, defineProps, nextTick } from 'vue';
|
import { ref, toRefs, watchEffect, reactive, defineProps, nextTick } from 'vue';
|
||||||
import { useStore } from 'vuex';
|
import { useStore } from 'vuex';
|
||||||
import store from '../../store/index';
|
import store from '../../store/index';
|
||||||
import { useRouter } from 'vue-router';
|
import { useRoute, useRouter } from 'vue-router';
|
||||||
import choosingIdentity from '@/components/edit/choosingIdentity.vue'
|
import choosingIdentity from '@/components/edit/choosingIdentity.vue'
|
||||||
|
|
||||||
const usestore = useStore();
|
const usestore = useStore();
|
||||||
const { wechat } = toRefs(usestore.state);
|
const { wechat } = toRefs(usestore.state);
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
|
|
||||||
|
const route = useRoute()
|
||||||
|
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
count: {
|
count: {
|
||||||
type: Number,
|
type: Number,
|
||||||
@@ -237,6 +239,9 @@ let pitchValue = ref({
|
|||||||
keyword: "",
|
keyword: "",
|
||||||
})
|
})
|
||||||
|
|
||||||
|
if (route.query['companyid']) pitchValue.value['companyid'] = route.query['companyid']
|
||||||
|
|
||||||
|
|
||||||
// 是否点击里 清除金额按钮 因为输入金额后再点击清除按钮是会先请求有金额的列表
|
// 是否点击里 清除金额按钮 因为输入金额后再点击清除按钮是会先请求有金额的列表
|
||||||
let clearingAmountState = false
|
let clearingAmountState = false
|
||||||
// 点击清除金额
|
// 点击清除金额
|
||||||
@@ -260,23 +265,12 @@ const rentInput = () => clearingAmountState = false
|
|||||||
// 点击历史搜索和热门推荐
|
// 点击历史搜索和热门推荐
|
||||||
const handleKeyword = value => {
|
const handleKeyword = value => {
|
||||||
|
|
||||||
// pitchValue.value['keyword'] = value
|
|
||||||
|
|
||||||
// console.log(pitchValue.value['keyword'], "pitchValue.value['keyword']");
|
|
||||||
|
|
||||||
// return
|
|
||||||
// if (!value) pitchValue.value['keyword']
|
|
||||||
// console.log(value, "value");
|
|
||||||
|
|
||||||
// return
|
|
||||||
console.log("pitchValue.value['keyword']", pitchValue.value['keyword']);
|
|
||||||
router.push(`/seachPage?keyword=${value}`)
|
router.push(`/seachPage?keyword=${value}`)
|
||||||
|
|
||||||
if (historyArr.value.indexOf(value) == -1 && value) {
|
if (historyArr.value.indexOf(value) == -1 && value) {
|
||||||
historyArr.value.unshift(value)
|
historyArr.value.unshift(value)
|
||||||
storingHistory()
|
storingHistory()
|
||||||
}
|
}
|
||||||
// seachList()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//搜索数据
|
//搜索数据
|
||||||
|
|||||||
@@ -4,14 +4,24 @@
|
|||||||
<div class="content wid1200">
|
<div class="content wid1200">
|
||||||
<div class="header">
|
<div class="header">
|
||||||
<div class="top flexflex">
|
<div class="top flexflex">
|
||||||
<div class="brand-name flexcenter">{{ company.title }}</div>
|
<!-- <div class="brand-name flexcenter">{{ company.title }}</div> -->
|
||||||
<div class="brand-abstract">{{ info['propaganda'] }}</div>
|
<!-- <div class="brand-abstract">{{ info['propaganda'] }}</div> -->
|
||||||
|
<div class="brand-abstract flexflex">
|
||||||
|
<div class="flexacenter" style="height: min-content;">
|
||||||
|
<div class="item" @click="publicJump('/')">港校租房</div>
|
||||||
|
<img class="arrow" src="@/assets/img/publicImage/yellow-arrow.svg">
|
||||||
|
<div class="item" @click="publicJump('/apartment')">品牌公寓</div>
|
||||||
|
<img class="arrow" src="@/assets/img/publicImage/yellow-arrow.svg">
|
||||||
|
<div class="item" @click="publicJump(`/apartment?companyid=${company.id}`)">{{ company.title }}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
<div class="arc-bj">
|
<div class="arc-bj">
|
||||||
<div class="arc"></div>
|
<div class="arc"></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="header-content flexflex">
|
<div class="header-content flexflex">
|
||||||
<!-- <img class="arc" src="@/assets/img/publicImage/arc-shadow.png"> -->
|
|
||||||
<div class="header-left">
|
<div class="header-left">
|
||||||
<image-watch style="z-index: 1003;" arrow="never" :show="imageShow" :close="cloaseImageShow"
|
<image-watch style="z-index: 1003;" arrow="never" :show="imageShow" :close="cloaseImageShow"
|
||||||
:list="imageList"></image-watch>
|
:list="imageList"></image-watch>
|
||||||
@@ -23,7 +33,6 @@
|
|||||||
:src="item['image'] || item['imageurl']" @click="cloaseImageShow(allCarouselsData)">
|
:src="item['image'] || item['imageurl']" @click="cloaseImageShow(allCarouselsData)">
|
||||||
</el-carousel-item>
|
</el-carousel-item>
|
||||||
</el-carousel>
|
</el-carousel>
|
||||||
<!-- <div class="indicate-type flexacenter" v-if="allCarouselsData.length != 0"> -->
|
|
||||||
<div class="indicate-type flexacenter" v-if="indicateTypeState()">
|
<div class="indicate-type flexacenter" v-if="indicateTypeState()">
|
||||||
<div class="indicate-item"
|
<div class="indicate-item"
|
||||||
:class="{ 'pitch': allCarouselsData[carouselIndex]['type'] == 'lives' }"
|
:class="{ 'pitch': allCarouselsData[carouselIndex]['type'] == 'lives' }"
|
||||||
@@ -696,6 +705,10 @@ const indicateTypeState = () => {
|
|||||||
return total > 1 ? true : false
|
return total > 1 ? true : false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 公共跳转
|
||||||
|
const publicJump = path => router.push(path)
|
||||||
|
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="less" scoped>
|
<style lang="less" scoped>
|
||||||
@@ -733,6 +746,21 @@ const indicateTypeState = () => {
|
|||||||
color: #806C24;
|
color: #806C24;
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
padding-top: 13px;
|
padding-top: 13px;
|
||||||
|
|
||||||
|
.item {
|
||||||
|
cursor: pointer;
|
||||||
|
|
||||||
|
&:not(:last-of-type):hover {
|
||||||
|
color: rgb(51, 51, 51);
|
||||||
|
text-decoration: underline;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
.arrow {
|
||||||
|
margin: 0 13px;
|
||||||
|
width: 7px;
|
||||||
|
height: 10px;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.arc-bj {
|
.arc-bj {
|
||||||
|
|||||||
@@ -35,10 +35,14 @@ import circleBtn from '@/components/public/circle-btn.vue'
|
|||||||
import { ref, onMounted, onUnmounted, watch, getCurrentInstance, nextTick } from 'vue';
|
import { ref, onMounted, onUnmounted, watch, getCurrentInstance, nextTick } from 'vue';
|
||||||
import { ElLoading } from 'element-plus'
|
import { ElLoading } from 'element-plus'
|
||||||
import Masonry from 'masonry-layout';
|
import Masonry from 'masonry-layout';
|
||||||
|
import { useRoute, useRouter } from 'vue-router';
|
||||||
|
|
||||||
|
|
||||||
const { proxy } = getCurrentInstance()
|
const { proxy } = getCurrentInstance()
|
||||||
|
|
||||||
|
const route = useRoute()
|
||||||
|
|
||||||
|
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
item: Object,
|
item: Object,
|
||||||
});
|
});
|
||||||
@@ -57,7 +61,10 @@ onMounted(() => {
|
|||||||
gutter: 20
|
gutter: 20
|
||||||
});
|
});
|
||||||
|
|
||||||
|
if (route.query['companyid']) pitchValue['companyid'] = route.query['companyid']
|
||||||
|
|
||||||
getData()
|
getData()
|
||||||
|
|
||||||
window.addEventListener('scroll', handleScroll);
|
window.addEventListener('scroll', handleScroll);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user