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

合并冲突

Browse Source
This commit is contained in:
A1300399510
2023-07-28 11:46:11 +08:00
parent 65f43ea7db
commit e9b0f2b425
6 changed files with 194 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
src/views/apartmentDetail.vue
View File

@@ -144,12 +144,12 @@
<div class="media-list flexacenter no-scrollbar" :class="`element${index}`">
<div class="media-item flexcenter" v-for="it in item['videos']"
@click="cloaseImageShow([...item['videos'], ...item['images']])">
<img class="media-img" :src="it['thumbnail']">
<img class="media-img" v-lazy="it['thumbnail']">
<img class="media-icon" src="@/assets/img/apartmentDetail/media-icon.svg" />
</div>
<div class="media-item flexcenter" v-for="it in item['images']"
@click="cloaseImageShow([...item['videos'], ...item['images']])">
<img class="media-img" :src="it['thumbnail']">
<img class="media-img" v-lazy="it['thumbnail']">
</div>
</div>
<div class="media-btn flexcenter" @click="handleMediaBtn('right', index)"
@@ -262,7 +262,9 @@
</div>
</div>
<div class="details-right flexacenter">
<div class="QRcode-box apartment-QRcode flexflex" v-if="true">
<phoneqrcode :type="apartment" :qrcode="qrcode"></phoneqrcode>
<groupqrcode></groupqrcode>
<!-- <div class="QRcode-box apartment-QRcode flexflex" v-if="true">
<img class="mini-program-title" src="@/assets/img/apartmentDetail/mini-program-title.png">
<div class="QRcode-case flexcenter">
<img class="QRcode-img" :src="qrcode" alt="">
@@ -272,8 +274,8 @@
<img class="scan-icon" src="@/assets/img/apartmentDetail/scan-icon.png">
手机查看该公寓
</div>
</div>
<div class="QRcode-box group-QRcode flexflex" v-if="true">
</div> -->
<!-- <div class="QRcode-box group-QRcode flexflex" v-if="true">
<img class="group-title" src="@/assets/img/apartmentDetail/group-title.png">
<div class="QRcode-case flexcenter">
<img class="QRcode-img" :src="wechat['wechatqrcode']" alt="">
@@ -283,9 +285,9 @@
<img class="scan-icon" src="@/assets/img/apartmentDetail/scan-icon.png">
入群请添加
<b>方同学的小助手</b>
<!-- <b>{{ wechat['nickname'] }}</b> -->
<b>{{ wechat['nickname'] }}</b>
</div>
</div>
</div> -->
<!-- 同品牌公寓 -->
<div class="same-brand-title flexcenter" v-if="dualBrandList.length != 0" ref="eleseEle">
<img class="same-brand-icon" src="@/assets/img/apartmentDetail/same-brand.png">
@@ -378,6 +380,8 @@ import viewMap from '@/components/public/viewMap.vue'
import transmitBtn from '@/components/public/transmitBtn.vue'
import backToTop from '@/components/public/backToTop.vue'
import imageWatch from '@/components/detail/imageWatch.vue';
import phoneqrcode from '@/components/public/phoneQRcode.vue';
import groupqrcode from '@/components/public/group-QRcode.vue';
import { useRouter, useRoute } from 'vue-router'
let router = useRouter()
@@ -454,7 +458,10 @@ onMounted(() => {
const init = () => {
proxy.$get("/tenement/pc/api/apartment/details", { uniqid }).then(res => {
if (res.code != 200) return
if (res.code != 200) {
ElMessage.error(res['message'])
return
}
let data = res.data
data['roomList'].forEach(element => {
@@ -1388,96 +1395,6 @@ const publicJump = path => router.push(path)
width: 304px;
flex-direction: column;
.QRcode-box {
width: 304px;
height: 304px;
background-color: rgba(255, 255, 255, 1);
border: 1px solid rgba(235, 235, 235, 1);
border-radius: 16px;
-moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.117647058823529);
-webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.117647058823529);
box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.117647058823529);
flex-direction: column;
align-items: center;
margin-bottom: 20px;
.scan-icon {
width: 14px;
height: 14px;
margin-right: 7px;
}
&.apartment-QRcode {
padding: 40px 0;
.mini-program-title {
width: 201px;
height: 24px;
margin-bottom: 28px;
}
.QRcode-case {
width: 120px;
height: 120px;
background-color: rgba(255, 255, 255, 1);
border-radius: 70px;
-moz-box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.12156862745098);
-webkit-box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.12156862745098);
box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.12156862745098);
margin-bottom: 33px;
.QRcode-img {
width: 103px;
height: 103px;
border-radius: 70px;
}
}
.apartment-QRcode-hint {
font-size: 14px;
color: #000000;
}
}
&.group-QRcode {
padding: 40px 0;
.group-title {
width: 140px;
height: 26px;
margin-bottom: 26px;
}
.QRcode-case {
width: 120px;
height: 120px;
background-color: rgba(255, 255, 255, 1);
border-radius: 15px;
-moz-box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.12156862745098);
-webkit-box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.12156862745098);
box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.12156862745098);
margin-bottom: 28px;
.QRcode-img {
width: 100px;
height: 100px;
}
}
.group-QRcode-hint {
color: #555555;
font-size: 14px;
b {
font-size: 14px;
color: #000;
font-weight: 650;
margin-left: 5px;
}
}
}
}
.same-brand-title {
margin-bottom: 20px;
font-size: 18px;