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

修改小bug

Browse Source
This commit is contained in:
A1300399510
2023-07-28 15:20:30 +08:00
parent f07f6586b2
commit 80be8fa65b
5 changed files with 221 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/public/backToTop.vue
View File

@@ -33,7 +33,7 @@ const screenroll = () => {
<style lang="less" scoped> <style lang="less" scoped>
@media screen and (max-width: 1360px) { @media screen and (max-width: 1360px) {
.returnTop { .returnTop {
right: 0 !important; right: 20px !important;
} }
} }
@@ -41,8 +41,8 @@ const screenroll = () => {
position: fixed; position: fixed;
right: calc((100vw - 1200px) / 2 - 75px); right: calc((100vw - 1200px) / 2 - 75px);
bottom: 18px; bottom: 18px;
width: 50px; width: 60px;
height: 50px; height: 60px;
background-color: #323232; background-color: #323232;
box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.11764706); box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.11764706);
border-radius: 50%; border-radius: 50%;
@@ -50,8 +50,8 @@ const screenroll = () => {
cursor: pointer; cursor: pointer;
.icon { .icon {
width: 24px; width: 28px;
height: 24px; height: 28px;
} }
} }
</style> </style>

13
src/components/public/circle-btn.vue
View File

@@ -30,10 +30,19 @@ let circleState = ref(false)
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
@media screen and (max-width: 1360px) {
.circle-btn {
right: 20px !important;
}
}
.circle-btn { .circle-btn {
position: fixed; position: fixed;
bottom: 58px; bottom: 98px;
right: 58px; // right: 58px;
right: calc((100vw - 1200px) / 2 - 75px);
width: 60px; width: 60px;
height: 60px; height: 60px;
background-color: #50e3c2; background-color: #50e3c2;

1
src/components/public/group-QRcode.vue
View File

@@ -27,6 +27,7 @@ const { wechat } = toRefs(store.state);
<style lang="less" scoped> <style lang="less" scoped>
.QRcode-box { .QRcode-box {
width: 304px; width: 304px;
font-family: 'PingFangSC-Semibold', 'PingFang SC Semibold', 'PingFang SC', sans-serif;
// height: 304px; // height: 304px;
background-color: rgba(255, 255, 255, 1); background-color: rgba(255, 255, 255, 1);
border: 1px solid rgba(235, 235, 235, 1); border: 1px solid rgba(235, 235, 235, 1);

1
src/components/public/viewMap.vue
View File

@@ -29,6 +29,7 @@ const props = defineProps({
let key = ref("MVNBZ-PEFWI-O4OGT-5ADVJ-7QAYJ-NBFY4") let key = ref("MVNBZ-PEFWI-O4OGT-5ADVJ-7QAYJ-NBFY4")
const initMap = () => { const initMap = () => {
console.log("props.latlng",props.latlng);
let center = new TMap.LatLng(props.latlng['latitude'], props.latlng['longitude']); let center = new TMap.LatLng(props.latlng['latitude'], props.latlng['longitude']);
let map = new TMap.Map("container", { let map = new TMap.Map("container", {
zoom: 15, zoom: 15,

58
src/views/detail.vue
View File

@@ -163,7 +163,7 @@
|| 0 }} || 0 }}
</div> </div>
</div> </div>
<div class="img-list-box dis-f jus-x al-item" v-show="imgList.length > 0"> plm{{ imageIndex }}plm <div class="img-list-box dis-f jus-x al-item" v-show="imgList.length > 0">
<img src="../assets/img/detail/moreNot.svg" class="icon left-icon" alt="" <img src="../assets/img/detail/moreNot.svg" class="icon left-icon" alt=""
@click.stop="moveImageList('left')" @click.stop="moveImageList('left')"
v-show="imgListTab === 0 && imageLIst[imageLIst.length - 1] > 800"> v-show="imgListTab === 0 && imageLIst[imageLIst.length - 1] > 800">
@@ -177,7 +177,8 @@
style="transform: rotate(180deg);" @click.stop="moveImageList('right')" style="transform: rotate(180deg);" @click.stop="moveImageList('right')"
v-show="imgList.length - 1 === imgListTab && imageLIst[imageLIst.length - 1] > 800"> v-show="imgList.length - 1 === imgListTab && imageLIst[imageLIst.length - 1] > 800">
<div class="dis-f al-item list-box s-w-100" ref="imageList" v-if="imgList.length > 0"> <div class="dis-f al-item list-box s-w-100" ref="imageList" v-if="imgList.length > 0">
<div v-for="(item, i) in imgList" :key="i" @click.stop="imageIndex = i, imageShow = true"> <div v-for="(item, i) in imgList" :key="i"
@click.stop="imageIndex = i, imageShow = true">
<div class="video" v-if="item && !item.thumbnail"> <div class="video" v-if="item && !item.thumbnail">
<div class="icon-box dis-f jus-x al-item"> <div class="icon-box dis-f jus-x al-item">
<img src="../assets/img/detail/videoStop.svg" class="icon" alt=""> <img src="../assets/img/detail/videoStop.svg" class="icon" alt="">
@@ -445,7 +446,7 @@
}}</span> }}</span>
</div> </div>
<div class="dis-f jus-x" style="margin-top:15px;"> <div class="dis-f jus-x" style="margin-top:15px;">
<div v-if="housingInfo['data']"> <div v-if="housingInfo['data'] && housingInfo['data'].info.latitude">
<mapInfo :latlng="{ <mapInfo :latlng="{
longitude: housingInfo['data'].info.longitude * 1, longitude: housingInfo['data'].info.longitude * 1,
latitude: housingInfo['data'].info.latitude * 1 latitude: housingInfo['data'].info.latitude * 1
@@ -738,7 +739,7 @@
<!-- 推荐 --> <!-- 推荐 -->
<div class="dis-f jus-x" v-if="pageType != 3 && (recommendListData.length > 0 || publisherList.length > 0)"> <div class="dis-f jus-x" v-if="pageType != 3 && (recommendListData.length > 0 || publisherList.length > 0)">
<div class="body-maxWidth housing-title" style="margin-top:50px;"> <div class="body-maxWidth housing-title" style="margin-top:50px;">
{{ pageType==2&&housingInfo['data'].isintermediary?`发布者的其他房源（${publisherList.length}）`:'附近房源' }} {{ pageType == 2 && housingInfo['data'].isintermediary ? `发布者的其他房源（${publisherList.length}）` : '附近房源' }}
</div> </div>
</div> </div>
<div class="dis-f jus-x al-item" style="position: relative;" v-if="pageType != 3"> <div class="dis-f jus-x al-item" style="position: relative;" v-if="pageType != 3">
@@ -758,11 +759,12 @@
</div> </div>
<div class="dis-f jus-x bottom-tps" <div class="dis-f jus-x bottom-tps"
v-if="pageType ===1 || (pageType===2&&recommendListData.length>0&&housingInfo['data']&&housingInfo['data'].isintermediary)"> v-if="pageType === 1 || (pageType === 2 && recommendListData.length > 0 && housingInfo['data'] && housingInfo['data'].isintermediary)">
- {{ loadText }} - - {{ loadText }} -
</div> </div>
<footerTool class="mg-t-60"></footerTool> <footerTool class="mg-t-60"></footerTool>
<div class="pop-box" v-show="showConcat"> <div class="pop-mask" v-show="showConcat">
<div class="pop-box">
<!-- 两种信息 --> <!-- 两种信息 -->
<!-- third-concat --> <!-- third-concat -->
<div class="pop-big-box" v-show="concatData.data && concatData.data.count > 1" <div class="pop-big-box" v-show="concatData.data && concatData.data.count > 1"
@@ -845,7 +847,8 @@
</div> </div>
</div> </div>
<div class="text-s"> <div class="text-s">
{{ concatData.data.whatsapp || concatData.data.tel || concatData.data.wechat || {{ concatData.data.whatsapp || concatData.data.tel || concatData.data.wechat
||
'' }} '' }}
</div> </div>
<div class="dis-f jus-x al-item mg-t-60"> <div class="dis-f jus-x al-item mg-t-60">
@@ -859,8 +862,8 @@
<div class="liner"></div> <div class="liner"></div>
<div> <div>
<div class="wx-qrcode-s dis-f jus-x al-item"> <div class="wx-qrcode-s dis-f jus-x al-item">
<img :src="concatData.data && concatData.data.wechatdata.url" class="user-img" <img :src="concatData.data && concatData.data.wechatdata.url"
alt=""> class="user-img" alt="">
</div> </div>
<div style="margin-top:15px;font-size:14px;text-align: center;"> <div style="margin-top:15px;font-size:14px;text-align: center;">
<div> <div>
@@ -875,7 +878,8 @@
</div> </div>
<div v-if="concatData.data && concatData.data.count > 2 && concatData.data.wechatdata.url"> <div v-if="concatData.data && concatData.data.count > 2 && concatData.data.wechatdata.url">
<div class="wx-qrcode-s dis-f jus-x al-item"> <div class="wx-qrcode-s dis-f jus-x al-item">
<img :src="concatData.data && concatData.data.wechatdata.url" class="user-img" alt=""> <img :src="concatData.data && concatData.data.wechatdata.url" class="user-img"
alt="">
</div> </div>
<div style="margin-top:15px;font-size:14px;text-align: center;"> <div style="margin-top:15px;font-size:14px;text-align: center;">
<div> <div>
@@ -954,7 +958,8 @@
微信 微信
</div> </div>
<div class="whatsapp-text"> <div class="whatsapp-text">
{{ concatData.data.whatsapp || concatData.data.tel || concatData.data.wechat || '' }} {{ concatData.data.whatsapp || concatData.data.tel || concatData.data.wechat || ''
}}
</div> </div>
</div> </div>
<div class="s-w-100 dis-f jus-x al-item mg-t-35"> <div class="s-w-100 dis-f jus-x al-item mg-t-35">
@@ -974,25 +979,24 @@
<img src="../assets/img/detail/popBg.svg" class="img" alt=""> <img src="../assets/img/detail/popBg.svg" class="img" alt="">
</div> </div>
</div> </div>
</div>
</div> </div>
<watchImage :show="imageShow" :index="imageIndex" :close="cloaseImageShow" :list="imgList"></watchImage> <watchImage :show="imageShow" :index="imageIndex" :close="cloaseImageShow" :list="imgList"></watchImage>
<!-- 右下角咨询 -->
<circle-btn></circle-btn>
<back-to-top></back-to-top> <back-to-top></back-to-top>
</template> </template>
<script setup> <script setup>
import { reactive, onMounted, ref, nextTick, onBeforeUnmount,watch } from 'vue' import { reactive, onMounted, ref, nextTick, onBeforeUnmount, watch } from 'vue'
import pageTopBar from '../components/pageTopBar/pageTopBar.vue'; import pageTopBar from '../components/pageTopBar/pageTopBar.vue';
import circleBtn from '@/components/public/circle-btn.vue'
import api from "../utils/api"; import api from "../utils/api";
import footerTool from '@/components/footer/footer.vue' import footerTool from '@/components/footer/footer.vue'
import watchImage from '../components/detail/imageWatch.vue' import watchImage from '../components/detail/imageWatch.vue'
import breadcrumb from '../components/detail/breadcrumb.vue' import breadcrumb from '../components/detail/breadcrumb.vue'
import mapInfo from '../components/public/viewMap.vue' import mapInfo from '../components/public/viewMap.vue'
import { ElMessage } from 'element-plus' import { ElMessage } from 'element-plus'
import { useRouter,useRoute } from 'vue-router' import { useRouter, useRoute } from 'vue-router'
import indexWaterfallBox from "../components/indexWaterfallBox/indexWaterfallBox.vue"; import indexWaterfallBox from "../components/indexWaterfallBox/indexWaterfallBox.vue";
import Masonry from 'masonry-layout'; import Masonry from 'masonry-layout';
import transmitBtn from '@/components/public/transmitBtn.vue' import transmitBtn from '@/components/public/transmitBtn.vue'
@@ -1214,10 +1218,10 @@ let getHousingInfo = () => {
}) })
concatInfo['data'] = store.state.indexData.wechat concatInfo['data'] = store.state.indexData.wechat
if (res.data.contacts) contacts['data'] = res.data.contacts if (res.data.contacts) contacts['data'] = res.data.contacts
console.log('pageType',pageType.value) console.log('pageType', pageType.value)
if ( pageType.value ==2&&housingInfo['data'].isintermediary) { if (pageType.value == 2 && housingInfo['data'].isintermediary) {
getPublisherList() getPublisherList()
} else if (pageType.value !=3) { } else if (pageType.value != 3) {
recommendList() recommendList()
} }
@@ -1386,12 +1390,12 @@ let masonryInstance = null
let router = useRouter() let router = useRouter()
let route = useRoute() let route = useRoute()
watch(route,()=>{ watch(route, () => {
let { id, type } = router.currentRoute.value.query let { id, type } = router.currentRoute.value.query
uniqid.value = id uniqid.value = id
pageType.value = type //1个人 2中介 3求房源 pageType.value = type //1个人 2中介 3求房源
publisherList.value=[] publisherList.value = []
recommendListData.value=[] recommendListData.value = []
getHousingInfo() getHousingInfo()
masonryInstance = new Masonry(gridContainer.value, { masonryInstance = new Masonry(gridContainer.value, {
itemSelector: '.waterfall-box', itemSelector: '.waterfall-box',
@@ -2842,5 +2846,15 @@ img {
} }
} }
} }
.pop-mask {
width: 100vw;
height: 100vh;
background-color: rgba(0, 0, 0, 0.7);
position: fixed;
top: 0;
left: 0;
z-index: 999;
}
</style> </style>