Merge remote-tracking branch 'origin/main'

This commit is contained in:
2023-07-27 17:34:52 +08:00
8 changed files with 114 additions and 20 deletions

View File

@@ -282,8 +282,8 @@
<div class="group-QRcode-hint flexacenter">
<img class="scan-icon" src="@/assets/img/apartmentDetail/scan-icon.png">
入群请添加
<!-- <b>方同学的小助手</b> -->
<b>{{ wechat['nickname'] }}</b>
<b>方同学的小助手</b>
<!-- <b>{{ wechat['nickname'] }}</b> -->
</div>
</div>
<!-- 同品牌公寓 -->
@@ -1650,7 +1650,7 @@ const publicJump = path => router.push(path)
left: 0;
width: 100vw;
height: 100vh;
// background-color: rgba(0, 0, 0, 0.7);
background-color: rgba(0, 0, 0, 0.7);
z-index: 1002;
.add-customer-box {

View File

@@ -1116,13 +1116,13 @@ let setHousingArr = () => {
element['type'] = 'videos'
})
imgList.value = [...housingInfo['data'].info.video]
imgList.value = [...imgList.value,...housingInfo['data'].info.video]
}
if (housingInfo['data'].info.picturegroup) {
housingInfo['data'].info.picturegroup.forEach(element => {
element['type'] = 'attachment'
})
imgList.value = [...housingInfo['data'].info.picturegroup]
imgList.value = [...imgList.value,...housingInfo['data'].info.picturegroup]
}

View File

@@ -37,7 +37,7 @@
<div class="operate-text">发布房源</div>
<choosing-identity></choosing-identity>
</div>
<template v-if="user['aid'] && user.identity != 0">
<template v-if="user['uid'] && user.identity != 0">
<img class="" src="@/assets/img/publicImage/cut-off-rule.svg">
<el-popover placement="bottom" :width="360" trigger="hover" :show-arrow="false"
popper-style="background: transparent;padding:0;box-shadow: none;border: none;">
@@ -50,9 +50,19 @@
<div class="operate-text">{{ identityObj[user.identity || -1] }}</div>
</div>
</template>
<img v-if="user.identity == 1" style="width: 360px;"
<!-- <img v-if="user.identity == 1" style="width: 360px;"
src="@/assets/img/publicImage/mediation-authentication-code.svg">
<img v-else style="width: 360px;" src="@/assets/img/publicImage/housing-certification-code.svg">
<img v-else style="width: 360px;" src="@/assets/img/publicImage/housing-certification-code.svg"> -->
<div v-if="user.identity == 1" class="btn-qrcode">
<img class="bj" src="@/assets/img/publicImage/mediation-authentication-bj.jpg">
<img class="QR-code" src="https://app.gter.net/tenement/pc/api/qrcode?type=middlemanAuth">
</div>
<div v-else class="btn-qrcode">
<img class="bj" src="@/assets/img/publicImage/housing-certification-bj.jpg">
<img class="QR-code" src="https://app.gter.net/tenement/pc/api/qrcode?type=propertyAuth">
</div>
</el-popover>
</template>
</div>
@@ -293,7 +303,7 @@ const handleDelete = (index, status) => {
// 监听滚动到底部
const handleScroll = () => {
// console.log(user.value, "user");
if (!user.value['aid']) return
if (!user.value['uid']) return
const scrollHeight = document.documentElement.scrollHeight;
const clientHeight = document.documentElement.clientHeight;
const scrollTop = document.documentElement.scrollTop || document.body.scrollTop;
@@ -539,4 +549,25 @@ onUnmounted(() => {
text-align: center;
padding: 30px 0;
}
.btn-qrcode {
width: 250px;
margin: 0 auto;
.bj {
width: 100%;
box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.2784313725490196);
border-radius: 10px;
}
.QR-code {
position: absolute;
width: 80px;
height: 80px;
border-radius: 50%;
bottom: 60px;
left: 50%;
transform: translateX(-50%);
}
}
</style>