From 4f3989f75644be1d29813649021c00194e4adcf6 Mon Sep 17 00:00:00 2001 From: "DESKTOP-RQ919RC\\Pc" <1300399510@qq.com> Date: Wed, 21 May 2025 18:58:07 +0800 Subject: [PATCH] =?UTF-8?q?4.6=E6=B5=8B=E8=AF=95=E5=92=8C=E8=A7=86?= =?UTF-8?q?=E9=A2=91=E4=B8=8A=E4=BC=A0=E9=99=90=E5=88=B625M?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../img/publicImage/round-fork copy.svg | 11 +++ src/assets/styles/apartmentDetail.css | 5 +- src/assets/styles/apartmentDetail.less | 7 +- src/components/apartment/seachModule.vue | 3 +- src/components/public/apartment-item.vue | 34 +++++--- src/utils/util.js | 10 ++- src/views/apartmentDetail.vue | 78 ++++++++----------- src/views/edit.vue | 2 +- src/views/housingView/apartment.vue | 5 ++ 9 files changed, 90 insertions(+), 65 deletions(-) create mode 100644 src/assets/img/publicImage/round-fork copy.svg diff --git a/src/assets/img/publicImage/round-fork copy.svg b/src/assets/img/publicImage/round-fork copy.svg new file mode 100644 index 0000000..e61e518 --- /dev/null +++ b/src/assets/img/publicImage/round-fork copy.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/styles/apartmentDetail.css b/src/assets/styles/apartmentDetail.css index 6aad4c0..4479281 100644 --- a/src/assets/styles/apartmentDetail.css +++ b/src/assets/styles/apartmentDetail.css @@ -229,12 +229,12 @@ border-bottom: 1px solid #ebebeb; } .content .header .header-content .header-right .label-list .label-item { + color: #434343; text-align: center; height: 22px; line-height: 22px; - background-color: #ebebeb; + background-color: #eeeeee; border-radius: 8px; - color: #555555; padding: 0 8px; font-size: 13px; margin-right: 10px; @@ -551,6 +551,7 @@ padding: 24px 30px 28px; margin-bottom: 20px; cursor: pointer; + word-break: break-word; } .content .details-box .details-left .remark .head { justify-content: space-between; diff --git a/src/assets/styles/apartmentDetail.less b/src/assets/styles/apartmentDetail.less index c2b514f..d37c15e 100644 --- a/src/assets/styles/apartmentDetail.less +++ b/src/assets/styles/apartmentDetail.less @@ -283,13 +283,13 @@ margin-right: 5px; } - color: #555555; + color: #434343; text-align: center; height: 22px; line-height: 22px; - background-color: rgba(235, 235, 235, 1); + background-color: #eeeeee; border-radius: 8px; - color: #555555; + // color: #555555; padding: 0 8px; font-size: 13px; margin-right: 10px; @@ -710,6 +710,7 @@ padding: 24px 30px 28px; margin-bottom: 20px; cursor: pointer; + word-break: break-word; .head { justify-content: space-between; diff --git a/src/components/apartment/seachModule.vue b/src/components/apartment/seachModule.vue index 1110e39..aae9d07 100644 --- a/src/components/apartment/seachModule.vue +++ b/src/components/apartment/seachModule.vue @@ -267,6 +267,7 @@ let pitchValue = ref({ watchEffect(() => { // nearSchoolList = store.state.apartment.school || [] + console.log('store.state.schoolList',store.state.schoolList); nearSchoolList = store.state.schoolList || []; roomTypeList = store.state.apartment.roomtype || []; roomTypeKey = store.state.roomTypeKey || {}; @@ -738,7 +739,7 @@ const tagList = ["单人间", "大床房", "独立卫浴", "两房整租", "电 } .option-input { - width: 100px; + width: 70px; height: 40px; border: 1px solid rgba(179, 179, 179, 1); border-radius: 10px; diff --git a/src/components/public/apartment-item.vue b/src/components/public/apartment-item.vue index f5275a6..5e19e15 100644 --- a/src/components/public/apartment-item.vue +++ b/src/components/public/apartment-item.vue @@ -10,12 +10,18 @@
{{ item.title }}
-
-
- - {{ item.comment.type }} -
-
{{ item.comment.content }}
+
+ +
@@ -233,6 +239,14 @@ const loadload = () => { .remark-text { width: 247px; } + + .apartment-tag { + padding: 0 8px; + border-radius: 6px; + border: 1px solid #797979; + margin-right: 8px; + color: #fdda55; + } } } @@ -240,10 +254,10 @@ const loadload = () => { flex-wrap: wrap; margin: 0 12px 7px; .label-item { - color: #555555; + color: #434343; text-align: center; height: 22px; - background-color: rgba(235, 235, 235, 1); + background-color: #eeeeee; border-radius: 8px; padding: 0 8px; font-size: 13px; @@ -346,7 +360,7 @@ const loadload = () => { .mile { font-size: 14px; - color: #50e3c2; + color: #34be9f; } } @@ -363,7 +377,7 @@ const loadload = () => { color: #333333; padding: 0 6px; margin-bottom: 5px; - + &:not(:last-of-type) { margin-right: 6px; } diff --git a/src/utils/util.js b/src/utils/util.js index eba573f..beda07d 100644 --- a/src/utils/util.js +++ b/src/utils/util.js @@ -71,7 +71,15 @@ function metersToKilometers(input, type) { } // 计算路程时间 -const calculateDuration = value => (value / 60).toFixed(1) + 'min'; +const calculateDuration = seconds => { + if (seconds < 60) return `${seconds}s`; + const minutes = seconds / 60; + if (minutes < 60) return `${Math.floor(minutes)}min`; + else { + const hours = minutes / 60; + return `${hours.toFixed(1).replace(/\.0$/, '')}h`; + } +} // 计算路程公里数 const calculateDistance = value => (value / 1000).toFixed(1); diff --git a/src/views/apartmentDetail.vue b/src/views/apartmentDetail.vue index 1040ae1..46c6d2c 100644 --- a/src/views/apartmentDetail.vue +++ b/src/views/apartmentDetail.vue @@ -223,7 +223,7 @@
{{ item.discountprice || item.price }}
/月
-
HK$ {{ item.price }}/月
+
HK$ {{ item.price }}/月
@@ -445,8 +445,8 @@
-
- +
+
{{ item.name }}
@@ -617,10 +617,6 @@ -
全部 {{ spotSum + returnSum }}
寄托实地考察 {{ spotSum }}
@@ -643,7 +639,7 @@
{{ item.nickname }}
已入住
- +
{{ item.date }}
{{ item.content }}
@@ -796,7 +792,7 @@ const facilityKeyName = { room: "房间设施", }; -const facilityArr = ["public", "service", "sport", "outdoor", "security", "room"]; // 公寓设施 顺序 +const facilityArr = ["public", "room", "service", "sport", "outdoor", "security"]; // 公寓设施 顺序 let facilitylist = ref([]); let costList = ref([]); @@ -864,12 +860,25 @@ const init = () => { if (Array.isArray(target)) { target.forEach((element) => { label.push(element.name); - if (element.images.length > 0) - images.push({ - name: element.name, - img: element.images, + if (element.images.length > 0) { + element.images.forEach((e) => { + images.push({ + name: element.name, + imageurl: e.imageurl, + thumbnail: e.thumbnail, + }); }); + } }); + + // target.forEach((element) => { + // label.push(element.name); + // if (element.images.length > 0) + // images.push({ + // name: element.name, + // img: element.images, + // }); + // }); } if (label.length > 0) { @@ -966,19 +975,12 @@ const openFacilities = () => { const openFacilitiesImg = (current) => { const list = facilitylist.value || []; let urls = []; - // element.images.forEach((ele) => { - // ele.img.forEach((e) => { - // urls.push(e.imageurl); - // }); - // }); list.forEach((element) => { element.images.forEach((ele) => { - ele.img.forEach((e) => { - urls.push({ - imageurl: e.imageurl, - thumbnail: e.thumbnail, - type: "attachment", - }); + urls.push({ + imageurl: ele.imageurl, + thumbnail: ele.thumbnail, + type: "attachment", }); }); }); @@ -1381,9 +1383,9 @@ const getMapDistance = () => { distance.forEach((element) => { let obj = {}; element.distance = calculateDistance(element.distance); - if (element.walking) obj["walking"] = calculateDuration(element.walking.duration); - if (element.transit) obj["transit"] = calculateDuration(element.transit.duration); - if (element.driving) obj["driving"] = calculateDuration(element.driving.duration); + if (element.walking && element.walking.duration) obj["walking"] = calculateDuration(element.walking.duration); + if (element.transit && element.transit.duration) obj["transit"] = calculateDuration(element.transit.duration); + if (element.driving && element.driving.duration) obj["driving"] = calculateDuration(element.driving.duration); const target = { name: element.name, distance: element.distance, @@ -2060,31 +2062,13 @@ const cutRemarkType = (value) => (remarkTypeid.value = value); .inspectPop { border-radius: 16px; overflow: hidden; + word-break: break-word; .el-dialog__header { display: none; } .el-dialog__body { padding: 0; - .title-box { - font-family: "PingFangSC-Semibold", "PingFang SC Semibold", "PingFang SC", sans-serif; - font-weight: 650; - font-style: normal; - font-size: 25px; - line-height: 26px; - color: #000000; - text-align: center; - padding-top: 25px; - padding-bottom: 16px; - .close-icon { - width: 20px; - height: 20px; - position: absolute; - top: 10px; - right: 10px; - cursor: pointer; - } - } .type { padding: 20px 20px; border-bottom: 1px dotted #d7d7d7; @@ -2163,7 +2147,7 @@ const cutRemarkType = (value) => (remarkTypeid.value = value); // cursor: pointer; margin-bottom: 4px; .image { - height: 20px; + width: 72px; margin-left: 12px; } diff --git a/src/views/edit.vue b/src/views/edit.vue index 8837add..586c6e6 100644 --- a/src/views/edit.vue +++ b/src/views/edit.vue @@ -730,7 +730,7 @@ export default { videoConfig: { // 上传的文件配置 maxcount: 3, // 最大的文件数量 - maxFileSize: 5 * 1024 * 1024, // 单位是字节 + maxFileSize: 25 * 1024 * 1024, // 单位是字节 }, isformat: false, // 是否有格式问题 diff --git a/src/views/housingView/apartment.vue b/src/views/housingView/apartment.vue index 7c9e88c..9b27856 100644 --- a/src/views/housingView/apartment.vue +++ b/src/views/housingView/apartment.vue @@ -184,6 +184,11 @@ const handleTransfer = (data) => { moreList.value = []; getData(); + + nextTick(() => { + masonryInstanceMore.reloadItems(); + masonryInstanceMore.layout(); + }); break; } }