Merge remote-tracking branch 'origin/main'

src/components/seachModule/seachModule.vue

@@ -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;
+    width: 250px;
-    height: 612px;
     position: absolute;
-    right: -14px;
+    right: 0;
-    top: 45px;
+    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;

src/components/user/systematic-notification-pop.vue

@@ -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>

src/utils/axios.js

@@ -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 => {

src/views/apartmentDetail.vue

@@ -282,8 +282,8 @@
                     <div class="group-QRcode-hint flexacenter">
                         <img class="scan-icon" src="@/assets/img/apartmentDetail/scan-icon.png">
                         入群请添加
-                        <!-- <b>方同学的小助手</b> -->
+                        <b>方同学的小助手</b>
-                        <b>{{ wechat['nickname'] }}</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 {

src/views/detail.vue

@@ -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]
     }
 
 

src/views/user.vue

@@ -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>