gter.net/gterFang
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
luJianJun 2023-07-27 18:18:45 +08:00
commit bb45673420
15 changed files with 99 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/assets/img/publicImage/back-icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1010 B

5
src/components/checkGroup/checkBoxGroup.vue
View File

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

2
src/components/detail/breadcrumb.vue
View File

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

40
src/components/public/backToTop.vue Normal file
View File

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

10
src/components/seachModule/seachModule.vue
View File

@ -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%);
}

16
src/components/user/systematic-notification-pop.vue
View File

@ -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%);
}

3
src/views/HomeView.vue
View File

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

3
src/views/apartmentDetail.vue
View File

@ -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' });
}

15
src/views/detail.vue
View File

@ -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';
@ -1116,13 +1119,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 +1144,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)]}房源`
}

3
src/views/housingView/apartment.vue
View File

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

4
src/views/housingView/intermediary.vue
View File

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

3
src/views/housingView/needHousing.vue
View File

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

4
src/views/housingView/person.vue
View File

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

3
src/views/seachIndex.vue
View File

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

14
src/views/user.vue
View File

@ -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';
@ -551,21 +555,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%);
}