diff --git a/src/components/detail/imageWatch.vue b/src/components/detail/imageWatch.vue index 3f4a381..5699eaa 100644 --- a/src/components/detail/imageWatch.vue +++ b/src/components/detail/imageWatch.vue @@ -6,10 +6,10 @@
- +
- +
@@ -31,7 +31,7 @@
- +
@@ -61,11 +61,6 @@ const props = defineProps({ } }) -setTimeout(() => { - console.log("list1111", props.list); -}, 5000); - - let show = props.show let list = ref([]) let close = props.close diff --git a/src/components/public/group-QRcode.vue b/src/components/public/group-QRcode.vue new file mode 100644 index 0000000..6427527 --- /dev/null +++ b/src/components/public/group-QRcode.vue @@ -0,0 +1,85 @@ + + + + + \ No newline at end of file diff --git a/src/components/public/login.vue b/src/components/public/login.vue index db45b70..aea28a8 100644 --- a/src/components/public/login.vue +++ b/src/components/public/login.vue @@ -108,7 +108,7 @@ const executeScripts = () => { } -.htmlCode .registerNewApp { +.htmlCode #registerNewApp { color: #000; } diff --git a/src/components/public/phoneQRcode.vue b/src/components/public/phoneQRcode.vue new file mode 100644 index 0000000..0ffafba --- /dev/null +++ b/src/components/public/phoneQRcode.vue @@ -0,0 +1,74 @@ + + + + + \ No newline at end of file diff --git a/src/views/apartmentDetail.vue b/src/views/apartmentDetail.vue index abac8db..355d1d6 100644 --- a/src/views/apartmentDetail.vue +++ b/src/views/apartmentDetail.vue @@ -144,12 +144,12 @@
- +
- +
-
+ + + + + {{ wechat['nickname'] }}
-
+ -->
@@ -378,6 +380,8 @@ 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 phoneqrcode from '@/components/public/phoneQRcode.vue'; +import groupqrcode from '@/components/public/group-QRcode.vue'; import { useRouter, useRoute } from 'vue-router' let router = useRouter() @@ -454,7 +458,10 @@ onMounted(() => { const init = () => { proxy.$get("/tenement/pc/api/apartment/details", { uniqid }).then(res => { - if (res.code != 200) return + if (res.code != 200) { + ElMessage.error(res['message']) + return + } let data = res.data data['roomList'].forEach(element => { @@ -1388,96 +1395,6 @@ const publicJump = path => router.push(path) width: 304px; flex-direction: column; - .QRcode-box { - width: 304px; - height: 304px; - background-color: rgba(255, 255, 255, 1); - border: 1px solid rgba(235, 235, 235, 1); - border-radius: 16px; - -moz-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.117647058823529); - -webkit-box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.117647058823529); - box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.117647058823529); - flex-direction: column; - align-items: center; - margin-bottom: 20px; - - .scan-icon { - width: 14px; - height: 14px; - margin-right: 7px; - } - - &.apartment-QRcode { - padding: 40px 0; - - .mini-program-title { - width: 201px; - height: 24px; - margin-bottom: 28px; - } - - .QRcode-case { - width: 120px; - height: 120px; - background-color: rgba(255, 255, 255, 1); - border-radius: 70px; - -moz-box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.12156862745098); - -webkit-box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.12156862745098); - box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.12156862745098); - margin-bottom: 33px; - - .QRcode-img { - width: 103px; - height: 103px; - border-radius: 70px; - } - } - - .apartment-QRcode-hint { - font-size: 14px; - color: #000000; - } - } - - &.group-QRcode { - padding: 40px 0; - - .group-title { - width: 140px; - height: 26px; - margin-bottom: 26px; - } - - .QRcode-case { - width: 120px; - height: 120px; - background-color: rgba(255, 255, 255, 1); - border-radius: 15px; - -moz-box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.12156862745098); - -webkit-box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.12156862745098); - box-shadow: 0px 0px 8px rgba(0, 0, 0, 0.12156862745098); - margin-bottom: 28px; - - .QRcode-img { - width: 100px; - height: 100px; - } - } - - .group-QRcode-hint { - color: #555555; - font-size: 14px; - - b { - font-size: 14px; - color: #000; - font-weight: 650; - margin-left: 5px; - } - } - } - } - .same-brand-title { margin-bottom: 20px; font-size: 18px; diff --git a/src/views/detail.vue b/src/views/detail.vue index a30edff..74333c3 100644 --- a/src/views/detail.vue +++ b/src/views/detail.vue @@ -675,7 +675,12 @@
-
+ + + + + +
@@ -980,6 +985,8 @@ 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 phoneqrcode from '@/components/public/phoneQRcode.vue'; +import groupqrcode from '@/components/public/group-QRcode.vue'; import store from '@/store'; @@ -1162,6 +1169,7 @@ let setNavigation = () => { types: housingInfo['data']['info'].type }, path: `${store.state.routeList['secondaryIndex'].path}`, + title: `${location[housingInfo['data']['info'].location]}${type[housingInfo['data']['info'].type]}` } }else{ @@ -1227,14 +1235,13 @@ let setOperation = () => { //获取联系方式 let concatData = reactive({}) let getConcatData = () => { - showConcat.value = true - console.log(concatData['data']) if (concatData['data']) return api.contactData({ token: housingInfo['data'].token }).then(res => { console.log(res) if (res.code === 200) { + showConcat.value = true concatData['data'] = res.data let dataCount = 0 Object.keys(concatData['data']).map(res => {