diff --git a/src/assets/img/detail/WhatsAppIcon.png b/src/assets/img/detail/WhatsAppIcon.png new file mode 100644 index 0000000..0958002 Binary files /dev/null and b/src/assets/img/detail/WhatsAppIcon.png differ diff --git a/src/assets/img/detail/arrowIcon.svg b/src/assets/img/detail/arrowIcon.svg new file mode 100644 index 0000000..27726f0 --- /dev/null +++ b/src/assets/img/detail/arrowIcon.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/assets/img/detail/bigPopBg.svg b/src/assets/img/detail/bigPopBg.svg new file mode 100644 index 0000000..0797830 --- /dev/null +++ b/src/assets/img/detail/bigPopBg.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/img/detail/cloneIcon.png b/src/assets/img/detail/cloneIcon.png new file mode 100644 index 0000000..a3c45ec Binary files /dev/null and b/src/assets/img/detail/cloneIcon.png differ diff --git a/src/assets/img/detail/close.png b/src/assets/img/detail/close.png new file mode 100644 index 0000000..c3e2e52 Binary files /dev/null and b/src/assets/img/detail/close.png differ diff --git a/src/assets/img/detail/crowdImg.jpg b/src/assets/img/detail/crowdImg.jpg new file mode 100644 index 0000000..6ff3a76 Binary files /dev/null and b/src/assets/img/detail/crowdImg.jpg differ diff --git a/src/assets/img/detail/crowdTitle.png b/src/assets/img/detail/crowdTitle.png new file mode 100644 index 0000000..968f81c Binary files /dev/null and b/src/assets/img/detail/crowdTitle.png differ diff --git a/src/assets/img/detail/home.png b/src/assets/img/detail/home.png new file mode 100644 index 0000000..a405115 Binary files /dev/null and b/src/assets/img/detail/home.png differ diff --git a/src/assets/img/detail/imageArrowIcon.svg b/src/assets/img/detail/imageArrowIcon.svg new file mode 100644 index 0000000..e6a9238 --- /dev/null +++ b/src/assets/img/detail/imageArrowIcon.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/assets/img/detail/imageClose.svg b/src/assets/img/detail/imageClose.svg new file mode 100644 index 0000000..79d384b --- /dev/null +++ b/src/assets/img/detail/imageClose.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/img/detail/markIconNot.svg b/src/assets/img/detail/markIconNot.svg new file mode 100644 index 0000000..b819e19 --- /dev/null +++ b/src/assets/img/detail/markIconNot.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/src/assets/img/detail/moreBoxIcon.png b/src/assets/img/detail/moreBoxIcon.png new file mode 100644 index 0000000..bf2858d Binary files /dev/null and b/src/assets/img/detail/moreBoxIcon.png differ diff --git a/src/assets/img/detail/phoneIcon.png b/src/assets/img/detail/phoneIcon.png new file mode 100644 index 0000000..4997d0d Binary files /dev/null and b/src/assets/img/detail/phoneIcon.png differ diff --git a/src/assets/img/detail/popBg.svg b/src/assets/img/detail/popBg.svg new file mode 100644 index 0000000..d30948f --- /dev/null +++ b/src/assets/img/detail/popBg.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/img/detail/popBigBg.svg b/src/assets/img/detail/popBigBg.svg new file mode 100644 index 0000000..a705027 --- /dev/null +++ b/src/assets/img/detail/popBigBg.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/img/detail/popBigBgMap.svg b/src/assets/img/detail/popBigBgMap.svg new file mode 100644 index 0000000..cdae3f9 --- /dev/null +++ b/src/assets/img/detail/popBigBgMap.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/img/detail/popSBg.svg b/src/assets/img/detail/popSBg.svg new file mode 100644 index 0000000..35de9c1 --- /dev/null +++ b/src/assets/img/detail/popSBg.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/img/detail/popSbgMap.svg b/src/assets/img/detail/popSbgMap.svg new file mode 100644 index 0000000..ede6cc6 --- /dev/null +++ b/src/assets/img/detail/popSbgMap.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/img/detail/qrCodeIcon.png b/src/assets/img/detail/qrCodeIcon.png new file mode 100644 index 0000000..f72331d Binary files /dev/null and b/src/assets/img/detail/qrCodeIcon.png differ diff --git a/src/assets/img/detail/school.png b/src/assets/img/detail/school.png new file mode 100644 index 0000000..9bcc8e2 Binary files /dev/null and b/src/assets/img/detail/school.png differ diff --git a/src/assets/img/detail/threeConcatBG.svg b/src/assets/img/detail/threeConcatBG.svg new file mode 100644 index 0000000..1e7d9d3 --- /dev/null +++ b/src/assets/img/detail/threeConcatBG.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/img/detail/threePopbigMap.svg b/src/assets/img/detail/threePopbigMap.svg new file mode 100644 index 0000000..fb96080 --- /dev/null +++ b/src/assets/img/detail/threePopbigMap.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/img/detail/timeIcon.svg b/src/assets/img/detail/timeIcon.svg new file mode 100644 index 0000000..e1d95cb --- /dev/null +++ b/src/assets/img/detail/timeIcon.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/img/detail/voideIcon.svg b/src/assets/img/detail/voideIcon.svg new file mode 100644 index 0000000..d7d6d34 --- /dev/null +++ b/src/assets/img/detail/voideIcon.svg @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/assets/img/detail/wxIcon.png b/src/assets/img/detail/wxIcon.png new file mode 100644 index 0000000..0708891 Binary files /dev/null and b/src/assets/img/detail/wxIcon.png differ diff --git a/src/assets/img/detail/wxQrCode.svg b/src/assets/img/detail/wxQrCode.svg new file mode 100644 index 0000000..8f8d405 --- /dev/null +++ b/src/assets/img/detail/wxQrCode.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/img/detail/wxQrcode.jpg b/src/assets/img/detail/wxQrcode.jpg new file mode 100644 index 0000000..6ff3a76 Binary files /dev/null and b/src/assets/img/detail/wxQrcode.jpg differ diff --git a/src/assets/img/detail/wxTitle.png b/src/assets/img/detail/wxTitle.png new file mode 100644 index 0000000..59974aa Binary files /dev/null and b/src/assets/img/detail/wxTitle.png differ diff --git a/src/components/detail/imageWatch.vue b/src/components/detail/imageWatch.vue index e69de29..5adfeaa 100644 --- a/src/components/detail/imageWatch.vue +++ b/src/components/detail/imageWatch.vue @@ -0,0 +1,207 @@ + + + + + \ No newline at end of file diff --git a/src/components/selectTabBox/selectTabBox.vue b/src/components/selectTabBox/selectTabBox.vue index 803868c..985f166 100644 --- a/src/components/selectTabBox/selectTabBox.vue +++ b/src/components/selectTabBox/selectTabBox.vue @@ -243,23 +243,23 @@ import store from '../../store/index'; let configData = reactive({ data: {} }) //保存筛选参数 -let setStoreSelectData=(obj,data,type)=>{ - console.log(store.state.seachSelect) - // otherCheck['list'] - // releaseObj.id - // gender.id - // hireDate.id - // hireDate.title - // hireTypeObj.id - // hireTypeObj.title - // hireTypeObj.hireId - // selectTabCheck.id - // selectTabCheck.title - // selectTabCheck.data - // selectData.data - // schoolSelectObj.id - // schoolSelectObj.title -} +// let setStoreSelectData=(obj,data,type)=>{ +// console.log(store.state.seachSelect) +// // otherCheck['list'] +// // releaseObj.id +// // gender.id +// // hireDate.id +// // hireDate.title +// // hireTypeObj.id +// // hireTypeObj.title +// // hireTypeObj.hireId +// // selectTabCheck.id +// // selectTabCheck.title +// // selectTabCheck.data +// // selectData.data +// // schoolSelectObj.id +// // schoolSelectObj.title +// } //监听路由 const route = useRouter() @@ -491,7 +491,7 @@ let setHireId = (item) => { let dropdownCommand = (obj) => { hireTypeObj.id = obj.id hireTypeObj.title = obj.title - store.state.routeList['hireTypeObj']=JSON.parse(JSON.stringify(hireTypeObj)) + store.state.routeList['hireTypeObj'] = JSON.parse(JSON.stringify(hireTypeObj)) setSeachCondition('types', obj.id) } @@ -572,9 +572,13 @@ let cleanSelect = () => { //根据路由设置参数 let setRouterQuerySet = ref(true) let routerQuerySet = () => { - // console.log(setRouterQuerySet.value) if (!setRouterQuerySet.value) return //路由参数设置 + if ((routeQuery.data && routeQuery.data.houseingPageType === '1') || (routePath.value === '/intermediaryHousing')) { + otherData = reactive([{ title: '认证中介', id: 'isverified' }, { title: '有电梯', id: 'iselevator' }, { title: '有阳台', id: 'issunshinearea' }]) + } else { + otherData = reactive([{ title: '认证房源', id: 'isverified' }, { title: '有电梯', id: 'iselevator' }, { title: '有阳台', id: 'issunshinearea' }]) + } if (Object.keys(routeQuery.data).length > 0) { if (!routeQuery.data || routeQuery.data && !routeQuery.data.data) return let data = JSON.parse(routeQuery.data.data) @@ -589,12 +593,10 @@ let routerQuerySet = () => { hireTypeObj.hireId = type == 1 ? '合租' : type == 2 ? '整租' : '不限' } else if (routeQuery.data.type === 'location') { let areaItem = JSON.parse(routeQuery.data.areaItem) - console.log(areaItem) selectTabCheck.id = areaItem.id; selectTabCheck.title = areaItem.name selectTabCheck.data = list[areaItem.id].data; selectData.data = seachAreaId(data) - console.log(selectData.data) setCheckBoxData(data)//设置地区选项 } } @@ -970,14 +972,17 @@ img { margin-right: 10px; text-align: center; cursor: pointer; - border:1px solid transparent; + border: 1px solid transparent; } - .btn:hover{ - border:1px solid rgba(235,235,235,1) + + .btn:hover { + border: 1px solid rgba(235, 235, 235, 1) } - .dropdown-btn:hover{ - border:1px solid rgba(235,235,235,1); + + .dropdown-btn:hover { + border: 1px solid rgba(235, 235, 235, 1); } + .dropdown-btn { height: 30px; display: flex; @@ -992,7 +997,7 @@ img { text-align: center; padding: 5px 10px; cursor: pointer; - border:1px solid transparent; + border: 1px solid transparent; .mg-l-30 { margin-left: 30px !important; diff --git a/src/components/skeletonBox/skeletonBox.vue b/src/components/skeletonBox/skeletonBox.vue index 2062b2e..2b05e93 100644 --- a/src/components/skeletonBox/skeletonBox.vue +++ b/src/components/skeletonBox/skeletonBox.vue @@ -2,7 +2,7 @@