Merge remote-tracking branch 'origin/main'

This commit is contained in:
luJianJun 2023-08-03 16:55:14 +08:00
commit 18291330de
5 changed files with 7 additions and 10 deletions

View File

@ -1,5 +1,5 @@
<template>
<div class="pos-r">
<div class="pos-r" style="z-index: 1;">
<div class="authentication-top"
:class="[pageType==2?'intermediary-top':'']"
v-if="data['data'] && data['data'].info && (data['data'].info.verified === 1||data['data'].isintermediary)">
@ -41,7 +41,7 @@
</el-breadcrumb-item>
</el-breadcrumb>
</div>
<div class="dis-f al-item jus-bet title-box">
<div class="dis-f al-item jus-bet title-box" style="position: relative;">
<div class="detail-title">
{{ data['data']['info'] && data['data']['info'].subject }}
</div>
@ -56,7 +56,7 @@
<div class="line">
</div>
<div class="btn-s dis-f al-item jus-x" style="position: relative;">
<div class="btn-s dis-f al-item jus-x">
<img src="../../assets/img/detail/forward.png" class="img" alt="">
<span class="mg-l-5">
转发

View File

@ -1,5 +1,5 @@
<template>
<el-popover placement="bottom" :width="674" trigger="click" popper-style="padding:0;border-radius: 10px;">
<el-popover placement="bottom-end" :teleported="false" :width="674" trigger="click" popper-style="padding:0;border-radius: 10px;right: 0;">
<template #reference>
<div class="btn" @click="transmit"></div>
</template>
@ -23,9 +23,6 @@
</div>
</div>
</div>
<!-- <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"> -->
</el-popover>
</template>

View File

@ -14,7 +14,7 @@ axios.interceptors.request.use( //响应拦截
showFullScreenLoading()
// 开发时登录用的,可以直接替换小程序的 authorization
// if (process.env.NODE_ENV == "development") config['headers']['authorization'] = "x2mmnl9grt51bpplj2k6ioiuummzhnw3"
// if (process.env.NODE_ENV == "development") config['headers']['authorization'] = "0h870ovk2xckoqfsh8a3t3sg4sg5z7eg"
if (process.env.NODE_ENV == "development") config['headers']['authorization'] = "0h870ovk2xckoqfsh8a3t3sg4sg5z7eg"
return config;
},
error => {

View File

@ -2277,7 +2277,7 @@ img {
font-size: 14px;
padding: 30px 20px;
position: relative;
z-index: 333;
/* z-index: 333; */
.detail-price-box {
font-family: 'PingFangSC-Regular', 'PingFang SC', sans-serif;

View File

@ -40,7 +40,7 @@
</div>
<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"
<el-popover placement="bottom-end" :width="360" trigger="hover" :show-arrow="false"
popper-style="background: transparent;padding:0;box-shadow: none;border: none;">
<template #reference>
<div class="operate-item flexcenter identity">