XiaoMo/gterFang
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

4.6测试和视频上传限制25M

Browse Source
This commit is contained in:
DESKTOP-RQ919RC\Pc
2025-05-21 18:58:07 +08:00
parent 173e05c13a
commit 4f3989f756
9 changed files with 90 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/assets/img/publicImage/round-fork copy.svg Normal file
View File

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="14px" height="14px" xmlns="http://www.w3.org/2000/svg">
<defs>
<filter x="-50.00%" y="-50.00%" width="200.00%" height="200.00%" filterUnits="objectBoundingBox" id="filter672">
<feColorMatrix type="matrix" values="1 0 0 0 0.244444444444444 0 1 0 0 0.244444444444444 0 0 1 0 0.244444444444444 0 0 0 1 0 " in="SourceGraphic" />
</filter>
</defs>
<g transform="matrix(1 0 0 1 -848 -5874 )">
<image preserveAspectRatio="none" style="overflow:visible" width="14" height="14" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAMAAACdt4HsAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAgRQTFRFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA3l60uwAAAKt0Uk5TACRklLra6/ZjIyyK4N+IKkjCwEYxxv7kzM3ELweN/Pq2cjQKCzVzt/uLBm8UFXDKITfs52EF6OpE9JkPEJrzQvFVV/Iz6SAmyY4uWlbHnEkBEcN1+NQpHGUr4R7cAuUoH94OcTvmTBcltTr5TrkiZk1245K8RQ3d4j71287S9zxBMAzwOO89Mu02d+67OYkJ2IfBA2e/RxlAQ8Wbni1bjCdYnRa4dM+GYtmRtbrgJwAAAAFiS0dEAIgFHUgAAAAJcEhZcwAAAEgAAABIAEbJaz4AAAOcSURBVFjD7Vb5XxJBFB8vUDwIJTGzTMwL8yDFKyMT0dKoINNSJE1Ny9TUzKJLzQ67razM7syy/Sd7b5cFZndg8Zc+/eD7AfZ933y/++bNzJslZMv+Z4uKjomNU6nVqrjYmPiEzbI1iUkcZckp2k3Qt+k4hqWmRUjXbxcp6YYMnW6HIV30M3dGQM/atZsfnL0nx5grQHvz8guyebCwyKTET8gQply8j8ZLSoWilJWH55v346iKSos8ZImvwlh1Xjh+TS2OqTvAjtYfxKj1UJj3I7/hcOgBjTZUCJlDAuZfpQ+XYpMdZ9Ecov5Yv6qW8EVqQYUj7LU4ivnriYI14SwSWZHWQoi0KfEJOYb7gbWjHFh/ZT4hx2GgTg6fwALUi95J+QA/5MQy1MjiLkArRedU++kOOtzpyPZP/AyeLCn/LIBd4v7LheNQQSl0uyHe7XMsuKs1EoEiwIpFp8eD+/lcINrbhyt0XnT7wUuRCHTB+SvxewO4VoN+heZkcNsv+MNDsGB9NH8YRlwM8i+hQpU26P0jl4PCowCMUQLjgOQQtgL//pErwdEJQKIpgRhAjBQyICoMT9L5o5kBmqKQq9C/cglLocUAf+ppOnYNutwohcxw3HXpyt7Aw+0ZhB+vrAXAMt2kABXH3ZIOEnJg8sltjrNTwB3m9r5rRX7trDySCdOKQEBTjQKeqAgEmFPoqBCmMClXkE3BzSjinAr3rxcVZFcjFDGOAnAZ5yV87JD3Fvg6SHOQLyNuJLrZ6pF/30zIA6s8hwXZRsIjnh8MPHyE/EV85BWuUwqPAYmnBKIAKQjym5D/xJeTXOEpAOX0rJKo4/ysAUao5kS3Ro3tJsDA4zwjKetzGFIqOi/466M1EJ1GhZf+CzMHvCWJgBbfId4XneDYqZ7FK4iTYLY08iq4LnWcW/JFk2blHK99z29g6LKUT97i4XWKXn2PNP7ufZbvyYkbfEUmQD4AvEoisI+srg72Ca+2z8r8xlBXG/kCEVuTEt9oZfR0wUxlWHyF6/0rFsBhYQfH8PjZw+ZgxB1i7w0VzsP0bN9C89usCtNc4XvYqpMddX7HqG02XIp5fBOzRzMmaRoXYgplLi/ju1hS6Q8aH+rv4gOOXqJgpsRC4VN37eeir0fNmydifWCKRYkP1uryf6Ab1l2udU/ge10TAR1tOpX1ub+8EiEdTbs0Q7Pdvzo2QRfK+XtqdMPu9do31v5UNm+WvWX/1P4CPzjMW7KpwRMAAAAldEVYdGRhdGU6Y3JlYXRlADIwMjItMTEtMTRUMTk6MjY6NDMrMDg6MDD8II04AAAAJXRFWHRkYXRlOm1vZGlmeQAyMDIyLTExLTE0VDE5OjI2OjQzKzA4OjAwjX01hAAAAEl0RVh0c3ZnOmJhc2UtdXJpAGZpbGU6Ly8vaG9tZS9hZG1pbi9pY29uLWZvbnQvdG1wL2ljb25fYWJmaHIzemNhMW8vZ3VhbmJpLnN2Z2+SHsIAAAAASUVORK5CYII=" x="848px" y="5874px" filter="url(#filter672)" />
</g>
</svg>

5
src/assets/styles/apartmentDetail.css
View File

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

7
src/assets/styles/apartmentDetail.less
View File

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

3
src/components/apartment/seachModule.vue
View File

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

34
src/components/public/apartment-item.vue
View File

@@ -10,12 +10,18 @@
<img v-if="item.selection" class="gter-select" src="@/assets/img/publicImage/gter-select.png" />
<div class="name flexflex">{{ item.title }}</div>
<img class="img" v-lazy="item['image']" @load="loadload" />
<div class="apartment-introduce flexacenter" v-if="item.comment.content">
<div class="remark-on flexacenter">
<img class="fang-icon" :src="item.comment.avatar" />
{{ item.comment.type }}
</div>
<div class="remark-text flex1 ellipsis">{{ item.comment.content }}</div>
<div class="apartment-introduce flexacenter">
<template v-if="item.comment.content">
<div class="remark-on flexacenter">
<img class="fang-icon" :src="item.comment.avatar" />
{{ item.comment.type }}
</div>
<div class="remark-text flex1 ellipsis">{{ item.comment.content }}</div>
</template>
<template v-else>
<div class="apartment-tag flexcenter" v-if="item.company">{{ item.company }}</div>
<div class="flex1 ellipsis">{{ item.propaganda }}</div>
</template>
</div>
</div>
<div class="label-list flexacenter">
@@ -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;
}

10
src/utils/util.js
View File

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

78
src/views/apartmentDetail.vue
View File

@@ -223,7 +223,7 @@
<div class="number">{{ item.discountprice || item.price }}</div>
<div class="month">/月</div>
<div class="original" v-if="!item.discountprice">HK$ {{ item.price }}/月</div>
<div class="original" v-if="item.discountprice">HK$ {{ item.price }}/月</div>
</div>
</div>
<div class="btn flexacenter">
@@ -445,8 +445,8 @@
</div>
</div>
<div class="img-box flexflex" v-if="item.images.length > 0">
<div class="img-item" v-for="(item, index) in item.images" :key="index" @click="openFacilitiesImg(item.img[0].imageurl)">
<img class="icon" :src="item.img[0].thumbnail" />
<div class="img-item" v-for="(item, index) in item.images" :key="index" @click="openFacilitiesImg(item.imageurl)">
<img class="icon" :src="item.thumbnail" />
<div class="name">{{ item.name }}</div>
</div>
</div>
@@ -617,10 +617,6 @@
</el-dialog>
<el-dialog v-model="isInspectPop" width="600" class="inspectPop" :show-close="false">
<!-- <div class="title-box dis-f al-item jus-x">
点评
<img src="@/assets/img/detail/close.png" class="close-icon" @click="isSelectSchool = false" />
</div> -->
<div class="type flexacenter">
<div class="item" :class="{ pitch: remarkTypeid == 0 }" @click="cutRemarkType(0)">全部 {{ spotSum + returnSum }}</div>
<div class="item" :class="{ pitch: remarkTypeid == 1 }" @click="cutRemarkType(1)">寄托实地考察 {{ spotSum }}</div>
@@ -643,7 +639,7 @@
<div class="username flexacenter">
{{ item.nickname }}
<div class="checked-in" v-if="item.typeid == 2">已入住</div>
<img class="image" v-if="item.groupimage" :src="item.groupimage" />
<img class="image" v-else-if="item.groupimage" :src="item.groupimage" />
</div>
<div class="date">{{ item.date }}</div>
<div class="text">{{ item.content }}</div>
@@ -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;
}

2
src/views/edit.vue
View File

@@ -730,7 +730,7 @@ export default {
videoConfig: {
// 上传的文件配置
maxcount: 3, // 最大的文件数量
maxFileSize: 5 * 1024 * 1024, // 单位是字节
maxFileSize: 25 * 1024 * 1024, // 单位是字节
},
isformat: false, // 是否有格式问题

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

@@ -184,6 +184,11 @@ const handleTransfer = (data) => {
moreList.value = [];
getData();
nextTick(() => {
masonryInstanceMore.reloadItems();
masonryInstanceMore.layout();
});
break;
}
}