From cb2674fe488803c1aba40e564ec0b8a45d4acb64 Mon Sep 17 00:00:00 2001
From: A1300399510 <A1300399510>
Date: Thu, 27 Jul 2023 17:51:58 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=8C=E7=BB=B4?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/checkGroup/checkBoxGroup.vue      |  5 +++++
 src/components/seachModule/seachModule.vue       | 10 +++++-----
 .../user/systematic-notification-pop.vue         | 16 ++++++++--------
 src/views/detail.vue                             | 10 +++++-----
 src/views/user.vue                               | 10 +++++-----
 5 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/src/components/checkGroup/checkBoxGroup.vue b/src/components/checkGroup/checkBoxGroup.vue
index 01c3a4b..2c7801c 100644
--- a/src/components/checkGroup/checkBoxGroup.vue
+++ b/src/components/checkGroup/checkBoxGroup.vue
@@ -161,6 +161,11 @@ defineExpose({
         .select-module-box {
             padding: 25px 20px 20px 20px;
 
+            /deep/ .el-checkbox-group {
+                display: flex;
+                flex-wrap: wrap;
+            }
+
             .top-box {
                 display: flex;
                 align-items: center;
diff --git a/src/components/seachModule/seachModule.vue b/src/components/seachModule/seachModule.vue
index de1d4bc..f5bd5df 100644
--- a/src/components/seachModule/seachModule.vue
+++ b/src/components/seachModule/seachModule.vue
@@ -268,7 +268,7 @@ defineExpose({
 }
 
 .btn-qrcode {
-    width: 250px;
+    height: 365px;
     position: absolute;
     right: 0;
     top: 58px;
@@ -277,17 +277,17 @@ defineExpose({
 }
 
 .btn-qrcode .bj {
-    width: 100%;
+    height: 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;
+    width: 100px;
+    height: 110px;
     border-radius: 50%;
-    bottom: 60px;
+    bottom: 86px;
     left: 50%;
     transform: translateX(-50%);
 }
diff --git a/src/components/user/systematic-notification-pop.vue b/src/components/user/systematic-notification-pop.vue
index 8bc4d56..f7a71e0 100644
--- a/src/components/user/systematic-notification-pop.vue
+++ b/src/components/user/systematic-notification-pop.vue
@@ -47,7 +47,7 @@
                                 <img class="QR-code" src="https://app.gter.net/tenement/pc/api/qrcode?type=middlemanAuth">
                             </div>
 
-                            <div v-else class="btn-qrcode">
+                            <div v-else class="btn-qrcode flexcenter">
                                 <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>
@@ -66,7 +66,7 @@
                                     去认证<img class="green-arrow" src="@/assets/img/publicImage/green-arrow.svg">
                                 </div>
                             </template>
-                            <div class="btn-qrcode">
+                            <div class="btn-qrcode flexcenter">
                                 <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>
@@ -93,7 +93,7 @@
                                     去认证<img class="green-arrow" src="@/assets/img/publicImage/green-arrow.svg">
                                 </div>
                             </template>
-                            <div class="btn-qrcode">
+                            <div class="btn-qrcode flexcenter">
                                 <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>
@@ -377,21 +377,21 @@ const goDetail = (uniqid, status) => {
 }
 
 .btn-qrcode {
-    width: 250px;
+    height: 365px;
     margin: 0 auto;
 
     .bj {
-        width: 100%;
+        height: 100%;
         box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.2784313725490196);
         border-radius: 10px;
     }
 
     .QR-code {
         position: absolute;
-        width: 80px;
-        height: 80px;
+        width: 110px;
+        height: 110px;
         border-radius: 50%;
-        bottom: 60px;
+        bottom: 86px;
         left: 50%;
         transform: translateX(-50%);
     }
diff --git a/src/views/detail.vue b/src/views/detail.vue
index 76d2412..4969079 100644
--- a/src/views/detail.vue
+++ b/src/views/detail.vue
@@ -1116,13 +1116,13 @@ let setHousingArr = () => {
             element['type'] = 'videos'
         })
 
-        imgList.value = [...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 = [...imgList.value,...housingInfo['data'].info.picturegroup]
+        imgList.value = [...imgList.value, ...housingInfo['data'].info.picturegroup]
     }
 
 
@@ -1141,11 +1141,11 @@ let setNavigation = () => {
         // console.log(`${store.state.routeList['secondaryIndex'].path}/location/${JSON.stringify([housingInfo['data']['info'].location.substring(0, 1)])}`)
         store.state.routeList['thirdIndex'] = {
             path: `${store.state.routeList['secondaryIndex'].path}`,
-            query:{
-                type:'location',
+            query: {
+                type: 'location',
                 name: location[housingInfo['data']['info'].location.substring(0, 1)],
                 id: housingInfo['data']['info'].location.substring(0, 1),
-                types:`${type[housingInfo['data']['info'].type.substring(0, 1)]},${housingInfo['data']['info'].type}`
+                types: `${type[housingInfo['data']['info'].type.substring(0, 1)]},${housingInfo['data']['info'].type}`
             },
             title: `${location[housingInfo['data']['info'].location.substring(0, 1)]}${type[housingInfo['data']['info'].type.substring(0, 1)]}房源`
         }
diff --git a/src/views/user.vue b/src/views/user.vue
index 20f5c0d..89e299e 100644
--- a/src/views/user.vue
+++ b/src/views/user.vue
@@ -551,21 +551,21 @@ onUnmounted(() => {
 }
 
 .btn-qrcode {
-    width: 250px;
+    height: 365px;
     margin: 0 auto;
 
     .bj {
-        width: 100%;
+        height: 100%;
         box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.2784313725490196);
         border-radius: 10px;
     }
 
     .QR-code {
         position: absolute;
-        width: 80px;
-        height: 80px;
+        width: 110px;
+        height: 110px;
         border-radius: 50%;
-        bottom: 60px;
+        bottom: 86px;
         left: 50%;
         transform: translateX(-50%);
     }

From 438b5179ed1e3c8869e9dc8ecb04ee3ea5fde586 Mon Sep 17 00:00:00 2001
From: A1300399510 <A1300399510>
Date: Thu, 27 Jul 2023 18:17:30 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9B=9E=E5=88=B0?=
 =?UTF-8?q?=E9=A1=B6=E9=83=A8=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/img/publicImage/back-icon.png | Bin 0 -> 1010 bytes
 src/components/detail/breadcrumb.vue     |   2 +-
 src/components/public/backToTop.vue      |  40 +++++++++++++++++++++++
 src/views/HomeView.vue                   |   3 ++
 src/views/apartmentDetail.vue            |   3 +-
 src/views/detail.vue                     |   5 ++-
 src/views/housingView/apartment.vue      |   3 ++
 src/views/housingView/intermediary.vue   |   4 +++
 src/views/housingView/needHousing.vue    |   3 ++
 src/views/housingView/person.vue         |   4 +++
 src/views/seachIndex.vue                 |   3 ++
 src/views/user.vue                       |   4 +++
 12 files changed, 71 insertions(+), 3 deletions(-)
 create mode 100644 src/assets/img/publicImage/back-icon.png
 create mode 100644 src/components/public/backToTop.vue

diff --git a/src/assets/img/publicImage/back-icon.png b/src/assets/img/publicImage/back-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..f2bc9b8d69d41971c84bcad6c80454b4d54a7186
GIT binary patch
literal 1010
zcmV<O0}cF%P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@
z1ONa40RR91K%fHv1ONa40RR91KmY&$07g+lumAu9TuDShRCodHn@eleKorND`l=%0
zLQn)jQM%BDQ1FS*ifccD8#gXp`wd+CSo8}BZd|w#M1(4Jq3#rmRVsqe`f5uB(Zcn2
zAc@Ij?j*T4ckX1Ifj^l!=Va#m|2fG`Ztfi!2`wlP6!@PNh;-yToz58cYv2r6uZwAs
z?KinT1h=CoT2u2b2mtx*1U&_Z)ZmtnXUKmN5q@QPjAjRM{{~y%$P2X-;JS3OO;-WS
z1Z>L&dDMSL1&n9;<SKyj7eO{>13c?*Rr%xuK%EW&&($E0#?MqPx>H~x7GZ-L-16}%
z`5)#Wf5`I4Re(4Mc*W)vcqwBKnpE{PIIfZxZiNaEW74=L$i;9+GH&U10pdSfntMpw
zPX#!&#=$-C6)b`K;Gmyu6;=>E0=@&aEn_&Tg!?sw-~{-lGS7@x>7VtBb<750W#khb
z{1c%DdH+P{fxJH=^g+J;A~Zn0y&^P7zI`GLfP8yI7$AA~MX*5LT@fsjcTWT|l6(6f
zNoFP6_xKk}VrEPHiF<|4aGxDWpz7_dBs~xIf;kx&+Ae&r4gRcac(=`DQJcIx7O-EL
z01+`efx9B~O1`Q9ah#hX^h3Um08Wa~FZsFxI3+?8<a-go2@#qi->U#a6#?@5faz;2
z+-Z}~`8|?ww}!v;Q^2tAZuWnhu4eAYm#qi7%~jdXB)81#q~22UvMA9#3lQ&LM}(;|
zqJ>vunjMa6Y^q7#x1Hk+%qP{+^q4h1Gv_3jtuXhovY09Ytdvah5&s1n<dZyN5#-zB
zH;JvwcBzX!HCGYfQ5s$B$dNxyLi0t}U@fe<zzP?EsS-@NS4)s{b_`6XXZpX6T#Sqt
zJlzWH)7LdXos;?GnxMOFp25CFjaSFUx5G&=6K$e@1)K*Pf&9?m4o9Kv^dKzXm}?Hp
z{=79e8f9L2rCqr(r~LBcDv;OuYv2i(VxHU&qOc9Wi2%UVDjk%jm{hq2G_{tK^8^8$
zJS-NI3Kd{cY$ulr72xDyv6xh-0E=Qfxm2hCCl8Coq(TK)6gye!OVZJ77wbL=YUZeA
z8b$@&HDqY=8Fp)ti|62V;DP3O_yxAYKRO0Y&FZsvLI$F;?qzTZ$lvlFgPWB9AGV<d
g1%d)W0c#5U1rTkpC{{7!+W-In07*qoM6N<$g8nzMU;qFB

literal 0
HcmV?d00001

diff --git a/src/components/detail/breadcrumb.vue b/src/components/detail/breadcrumb.vue
index 5f87f45..6329434 100644
--- a/src/components/detail/breadcrumb.vue
+++ b/src/components/detail/breadcrumb.vue
@@ -62,7 +62,7 @@
                             转发
                         </span>
                         <transmit-btn v-if="data.data['info']" :qrcode="data.data['qrcode']"
-                            :title="data.data.info['title']"></transmit-btn>
+                            :title="data.data.info['subject']"></transmit-btn>
                     </div>
                 </div>
             </div>
diff --git a/src/components/public/backToTop.vue b/src/components/public/backToTop.vue
new file mode 100644
index 0000000..dada9b3
--- /dev/null
+++ b/src/components/public/backToTop.vue
@@ -0,0 +1,40 @@
+<template>
+    <div class="returnTop flexcenter" @click="screenroll()">
+        <img class="icon" src="@/assets/img/publicImage/back-icon.png">
+    </div>
+</template>
+
+<script setup>
+const screenroll = () => {
+    window.scrollTo({
+        top: 0,
+        behavior: "smooth"
+    })
+}
+</script>
+
+<style lang="less" scoped>
+@media screen and (max-width: 1360px) {
+    .returnTop {
+        right: 0 !important;
+    }
+}
+
+.returnTop {
+    position: fixed;
+    right: calc((100vw - 1200px) / 2 - 75px);
+    bottom: 18px;
+    width: 50px;
+    height: 50px;
+    background-color: #323232;
+    box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.11764706);
+    border-radius: 50%;
+    z-index: 10;
+    cursor: pointer;
+
+    .icon {
+        width: 24px;
+        height: 24px;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index 7656a25..b15eee7 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -187,6 +187,8 @@
     <footerTool></footerTool>
     <!-- <indexRegularBox></indexRegularBox> -->
   </div>
+  <back-to-top></back-to-top>
+
 </template>
 
 <script setup>
@@ -202,6 +204,7 @@ import { useRouter } from 'vue-router'
 import store from '../store/index';
 import api from "../utils/api";
 import { ElMessage } from 'element-plus'
+import backToTop from '@/components/public/backToTop.vue'
 
 // 
 let informationData = ref([
diff --git a/src/views/apartmentDetail.vue b/src/views/apartmentDetail.vue
index 9a1d09c..2a1d3cd 100644
--- a/src/views/apartmentDetail.vue
+++ b/src/views/apartmentDetail.vue
@@ -365,6 +365,7 @@
         </div>
     </div>
     <footerpage></footerpage>
+    <back-to-top></back-to-top>
 </template>
 
 <script setup>
@@ -376,6 +377,7 @@ import pageTopBar from '../components/pageTopBar/pageTopBar.vue';
 import footerpage from '@/components/footer/footer.vue'
 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 { useRouter, useRoute } from 'vue-router'
 let router = useRouter()
@@ -571,7 +573,6 @@ const handleNavData = () => {
 // 处理点击nav 滚动事件
 const handleClickNav = value => {
     let scrollTop = eval(value).value.offsetTop + 136
-    // if (value != 'eleseEle') navTab.value = value
     window.scrollTo({ top: scrollTop, behavior: 'smooth' });
 }
 
diff --git a/src/views/detail.vue b/src/views/detail.vue
index 4969079..6b9898f 100644
--- a/src/views/detail.vue
+++ b/src/views/detail.vue
@@ -67,7 +67,7 @@
                                             转发
                                         </span>
                                         <transmit-btn v-if="housingInfo.data" :qrcode="housingInfo.data['qrcode']"
-                                            :title="housingInfo.data.info['title']"></transmit-btn>
+                                            :title="housingInfo.data.info['subject']"></transmit-btn>
                                     </div>
                                 </div>
                                 <div class="concat-btn-box" :class="{ 'concat-btn-show': concatType }">
@@ -962,6 +962,8 @@
     <watchImage :show="imageShow" :close="cloaseImageShow" :list="imgList"></watchImage>
     <!-- 右下角咨询 -->
     <circle-btn></circle-btn>
+    <back-to-top></back-to-top>
+
 </template>
   
 <script setup>
@@ -979,6 +981,7 @@ import indexWaterfallBox from "../components/indexWaterfallBox/indexWaterfallBox
 import Masonry from 'masonry-layout';
 import transmitBtn from '@/components/public/transmitBtn.vue'
 import biserialItem from '../components/biserialListItem/biserialListItem.vue'
+import backToTop from '@/components/public/backToTop.vue'
 
 import store from '@/store';
 
diff --git a/src/views/housingView/apartment.vue b/src/views/housingView/apartment.vue
index 68f0993..674bc1f 100644
--- a/src/views/housingView/apartment.vue
+++ b/src/views/housingView/apartment.vue
@@ -22,6 +22,8 @@
 
     <!-- 右下角咨询 -->
     <circle-btn></circle-btn>
+    <back-to-top></back-to-top>
+    
 </template>
   
 <script setup>
@@ -36,6 +38,7 @@ import { ref, onMounted, onUnmounted, watch, getCurrentInstance, nextTick } from
 import { ElLoading } from 'element-plus'
 import Masonry from 'masonry-layout';
 import { useRoute, useRouter } from 'vue-router';
+import backToTop from '@/components/public/backToTop.vue'
 
 
 const { proxy } = getCurrentInstance()
diff --git a/src/views/housingView/intermediary.vue b/src/views/housingView/intermediary.vue
index 57b4d78..57252d3 100644
--- a/src/views/housingView/intermediary.vue
+++ b/src/views/housingView/intermediary.vue
@@ -25,6 +25,9 @@
     </div>
     <!-- 右下角咨询 -->
     <circle-btn></circle-btn>
+
+    <back-to-top></back-to-top>
+
 </template>
   
 <script setup>
@@ -40,6 +43,7 @@ import tool from '../../toolJs/downLoadMore'
 import { ElMessage } from 'element-plus'
 import footerTool from '@/components/footer/footer.vue'
 import loadMoreText from '../../components/loadMore/loadMoreText.vue'
+import backToTop from '@/components/public/backToTop.vue'
 
 //获取数据
 let pages = ref(1)
diff --git a/src/views/housingView/needHousing.vue b/src/views/housingView/needHousing.vue
index 0a7f2e4..a1186d7 100644
--- a/src/views/housingView/needHousing.vue
+++ b/src/views/housingView/needHousing.vue
@@ -26,6 +26,8 @@
 
     <!-- 右下角咨询 -->
     <circle-btn></circle-btn>
+    <back-to-top></back-to-top>
+
 </template>
   
 <script setup>
@@ -41,6 +43,7 @@ import tool from '../../toolJs/downLoadMore'
 import { ElMessage } from 'element-plus'
 import footerTool from '@/components/footer/footer.vue'
 import loadMoreText from '../../components/loadMore/loadMoreText.vue'
+import backToTop from '@/components/public/backToTop.vue'
 
 //获取数据
 let pages = ref(1)
diff --git a/src/views/housingView/person.vue b/src/views/housingView/person.vue
index c54d07a..2dc53a9 100644
--- a/src/views/housingView/person.vue
+++ b/src/views/housingView/person.vue
@@ -26,6 +26,9 @@
 
     <!-- 右下角咨询 -->
     <circle-btn></circle-btn>
+
+    <back-to-top></back-to-top>
+
 </template>
   
 <script setup>
@@ -42,6 +45,7 @@ import { useRouter } from 'vue-router'
 import { ElMessage } from 'element-plus'
 import footerTool from '@/components/footer/footer.vue'
 import loadMoreText from '../../components/loadMore/loadMoreText.vue'
+import backToTop from '@/components/public/backToTop.vue'
 
 //路由
 const router = useRouter()
diff --git a/src/views/seachIndex.vue b/src/views/seachIndex.vue
index eca5459..edd1607 100644
--- a/src/views/seachIndex.vue
+++ b/src/views/seachIndex.vue
@@ -28,6 +28,8 @@
         <listBtmPrompt></listBtmPrompt>
         <footerTool></footerTool>
     </div>
+    <back-to-top></back-to-top>
+
 </template>
   
 <script setup>
@@ -45,6 +47,7 @@ import { useRouter } from 'vue-router';
 import { ElMessage } from 'element-plus'
 import footerTool from '@/components/footer/footer.vue'
 import loadMoreText from '../components/loadMore/loadMoreText.vue'
+import backToTop from '@/components/public/backToTop.vue'
 
 //路由
 const route = useRouter()
diff --git a/src/views/user.vue b/src/views/user.vue
index 89e299e..9e4b668 100644
--- a/src/views/user.vue
+++ b/src/views/user.vue
@@ -108,6 +108,8 @@
 
     <!-- 系统通知弹窗 -->
     <systematic-notification-pop v-if="systematicState" @close="systematicState = false"></systematic-notification-pop>
+    <back-to-top></back-to-top>
+
 </template>
 
 <script setup>
@@ -118,6 +120,8 @@ import pageFooter from '@/components/footer/footer.vue'
 import publicListItem from '@/components/public/public-list-item.vue'
 import emptyDuck from '@/components/public/empty-duck.vue'
 import choosingIdentity from '@/components/edit/choosingIdentity.vue'
+import backToTop from '@/components/public/backToTop.vue'
+
 import { ref, reactive, onMounted, onUnmounted, getCurrentInstance, nextTick } from 'vue'
 import { useRoute, useRouter } from 'vue-router';