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

@@ -58,13 +58,21 @@
<div class=" dis-f jus-x al-item authentication-btn" v-if="routePath === '/personHousing'">
<img src="../../assets/homeImage/authenticationBtnImg.png" class="text-img" alt="">
<img src="../../assets/homeImage/authenticationBtnCode.svg" class="code-img" alt="">
<img src="../../assets/homeImage/personAuthentication.svg" class="btn-qrcode" alt="">
<div 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>
<!-- <img src="../../assets/homeImage/personAuthentication.svg" class="btn-qrcode" alt=""> -->
</div>
<div class=" dis-f jus-x al-item authentication-btn intermediary-btn"
v-if="routePath === '/intermediaryHousing'">
<img src="../../assets/homeImage/intermediaryText.png" class="text-img" alt="">
<img src="../../assets/homeImage/intermediaryCode.svg" class="code-img" alt="">
<img src="../../assets/homeImage/intermediaryAuthentication.svg" class="btn-qrcode" alt="">
<div 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>
<!-- <img src="../../assets/homeImage/intermediaryAuthentication.svg" class="btn-qrcode" alt=""> -->
</div>
</div>
<div class="seach-info-box dis-f" v-if="routePath === '/'">
@@ -260,15 +268,30 @@ defineExpose({
}
.btn-qrcode {
width: 390px;
height: 612px;
width: 250px;
position: absolute;
right: -14px;
top: 45px;
right: 0;
top: 58px;
z-index: 333;
display: none;
}
.btn-qrcode .bj {
width: 100%;
box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.2784313725490196);
border-radius: 10px;
}
.btn-qrcode .QR-code{
position: absolute;
width: 80px;
height: 80px;
border-radius: 50%;
bottom: 60px;
left: 50%;
transform: translateX(-50%);
}
.seach-box-bg {
background: #d7d7d7 !important;
background: inherit;

View File

@@ -38,9 +38,20 @@
</div>
</template>
<img v-if="item['data']['url'].indexOf('middlemanAuth') != -1" style="width: 360px;"
<!-- <img v-if="item['data']['url'].indexOf('middlemanAuth') != -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="item['data']['url'].indexOf('middlemanAuth') != -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>
</div>
<div class="item flexflex" v-else-if="item['event'] == 'middlemanauth'">
@@ -55,7 +66,11 @@
去认证<img class="green-arrow" src="@/assets/img/publicImage/green-arrow.svg">
</div>
</template>
<img style="width: 360px;" src="@/assets/img/publicImage/mediation-authentication-code.svg">
<div 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>
<!-- <img style="width: 360px;" src="@/assets/img/publicImage/mediation-authentication-code.svg"> -->
</el-popover>
</div>
@@ -78,7 +93,11 @@
去认证<img class="green-arrow" src="@/assets/img/publicImage/green-arrow.svg">
</div>
</template>
<img style="width: 360px;" src="@/assets/img/publicImage/housing-certification-code.svg">
<div 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>
<!-- <img style="width: 360px;" src="@/assets/img/publicImage/housing-certification-code.svg"> -->
</el-popover>
</div>
@@ -356,4 +375,25 @@ const goDetail = (uniqid, status) => {
.QR-code {
width: 100%;
}
.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>