距离院校新样式提交

This commit is contained in:
A1300399510 2024-04-15 19:01:48 +08:00
parent 2fdda45cea
commit cc65dd8e00
9 changed files with 2902 additions and 122 deletions

5
.vscode/extensions.json vendored Normal file
View File

@ -0,0 +1,5 @@
{
"recommendations": [
"zhengjiaqi.px-to-rpx"
]
}

10
.vscode/settings.json vendored Normal file
View File

@ -0,0 +1,10 @@
{
"files.associations": {
"*.wxss": "css",
"*.tpl": "html",
"*.vue": "vue",
"*.wxml": "html"
},
"px-to-rpx.baseWidth": 500,
"px-to-rpx.autoRemovePrefixZero": true
}

View File

@ -1212,7 +1212,7 @@ Page({
// if (element.alias.length > 2) element.alias = element.alias.slice(0, 3) + '...'
element['distanceText'] = this.metersToKilometers(element.distance)
element.list.forEach(ele => {
element.list.forEach((ele, ii) => {
ele['durationText'] = this.secondsToHoursMinutes(ele.duration, 'chinese')
ele['durationText2'] = this.secondsToHoursMinutes(ele.duration)
ele['distanceText'] = this.metersToKilometers(ele.distance)
@ -1229,24 +1229,27 @@ Page({
})
}
} else ele.publictransport = null
if (ii == 0) {
const obj = element.list[0] || {}
let toolText = "步行"
if (Object.prototype.toString.call(obj.publictransport) === '[object Object]') toolText = "公交地铁"
element['distanceText'] = obj['distanceText']
element['durationText'] = obj.publictransport?.durationText2 || obj['durationText2']
element['toolText'] = toolText
}
})
if (school == element.id) {
academyPitchIndex = index
const obj = element.list[0] || {}
let toolText = "步行"
if (Object.prototype.toString.call(obj.publictransport) === '[object Object]') toolText = "公交地铁"
specialSchoolDistance = {
alias: element.alias,
distanceText: obj['distanceText'],
durationText: obj.publictransport?.durationText2 || obj['durationText2'],
toolText,
}
specialSchoolDistance = element
} else annexSchoolOmit.push(element)
console.log("element", element);
})
if (specialSchoolDistance) annexSchoolOmit = annexSchoolOmit.slice(0, 5)
else annexSchoolOmit = annexSchoolOmit.slice(0, 7)
else annexSchoolOmit = annexSchoolOmit.slice(0, 4)
this.setData({
annexSchoolList: data,

View File

@ -1,3 +0,0 @@
.school-new {
}

View File

@ -46,115 +46,113 @@
<view class="housing-information certification resource-beg">
<view class="HResource-box HResource-box1">
<block wx:if="{{ false }}">
<view class="advanced-markup flexacenter {{ isintermediary == 1 ? 'advanced-intermediary' : '' }}" wx:if="{{ info.verified == 1 || isintermediary == 1 }}">
<view class="advanced-markup-left flexacenter ">
<image class="advanced-markup-icon" mode="widthFix" src="/img/certified-listings-icon.png"></image>
<image class="advanced-markup-identifying" mode="widthFix" src="/img/certified-listings.png"></image>
<image class="advanced-markup-icon advanced-intermediary-icon" mode="widthFix" src="/img/certified-intermediary.png"></image>
<view class="advanced-intermediary-name">认证中介</view>
</view>
<view class="advanced-markup-right flexacenter">
<image class="advanced-markup-tick" mode="widthFix" src="/img/tick.svg"></image>
<view class="advanced-markup-name">{{ info['intermediary'] != 1 ? '房产证明' : '真实牌照' }}</view>
<image class="advanced-markup-tick" mode="widthFix" src="/img/tick.svg"></image>
<view class="advanced-markup-name">{{ info['intermediary'] != 1 ? '房东身份证' : '身份证明' }}</view>
</view>
</view>
<view class='title'>{{ info.subject }}</view>
<!-- 房源月租 -->
<view class="HResource-rentAndId">
<view class="rent">
<view class="rent-label flexcenter" wx:if="{{ info['intermediary'] == 6 }}">预算</view>
<view id="unit" class="unit">{{ info.currency || "HK$"}}</view>
<view class="money">{{ info.rent }}</view>
<view class="month">/{{ info.rentalperiod }}</view>
</view>
<view class="advanced-markup flexacenter {{ isintermediary == 1 ? 'advanced-intermediary' : '' }}" wx:if="{{ info.verified == 1 || isintermediary == 1 }}">
<view class="advanced-markup-left flexacenter ">
<image class="advanced-markup-icon" mode="widthFix" src="/img/certified-listings-icon.png"></image>
<image class="advanced-markup-identifying" mode="widthFix" src="/img/certified-listings.png"></image>
<image class="advanced-markup-icon advanced-intermediary-icon" mode="widthFix" src="/img/certified-intermediary.png"></image>
<view class="advanced-intermediary-name">认证中介</view>
</view>
<!-- 房源详细信息 -->
<view class="HResource-detail">
<view class="HResource-header">
<!-- 租房类型、合租整租 房间 -->
<template is="HResource-header-item" data="{{ name: info.gptype,value: info.type }}"></template>
<!-- 租期 -->
<template is="HResource-header-item" data="{{ name: '租期', value: info.rentalduration != 0 ? info.rentalduration: '不限' }}"></template>
<!-- 起租日期 -->
<template is="HResource-header-item" data="{{ name: '起租日期',value: info.leasetime || '随时' }}"></template>
</view>
<view class="advanced-markup-right flexacenter">
<image class="advanced-markup-tick" mode="widthFix" src="/img/tick.svg"></image>
<view class="advanced-markup-name">{{ info['intermediary'] != 1 ? '房产证明' : '真实牌照' }}</view>
<image class="advanced-markup-tick" mode="widthFix" src="/img/tick.svg"></image>
<view class="advanced-markup-name">{{ info['intermediary'] != 1 ? '房东身份证' : '身份证明' }}</view>
</view>
</view>
<view class='title'>{{ info.subject }}</view>
<!-- 房源月租 -->
<view class="HResource-rentAndId">
<view class="rent">
<view class="rent-label flexcenter" wx:if="{{ info['intermediary'] == 6 }}">预算</view>
<view id="unit" class="unit">{{ info.currency || "HK$"}}</view>
<view class="money">{{ info.rent }}</view>
<view class="month">/{{ info.rentalperiod }}</view>
</view>
</view>
<!-- 图片和视频 -->
<view class="media-box" wx:if="{{ (info.video && info.video.length != 0) || (info.picturegroup && info.picturegroup.length != 0) }}">
<view class="housing-information-media-top flexacenter">
<block wx:if="{{ info.video && info.video.length != 0 }}">
<image class="housing-information-media-icon1" src="/img/u1737.png" mode="widthFix"></image>
<view class="housing-information-media-quantity flexcenter">{{ info.video.length }}</view>
</block>
<block wx:if="{{ info.picturegroup && info.picturegroup.length != 0 }}">
<image class="housing-information-media-icon" src="/img/u1738.png" mode="widthFix"></image>
<view class="housing-information-media-quantity flexcenter">{{ info.picturegroup.length }}</view>
</block>
</view>
<view class="media-content">
<scroll-view class="scroll-view_H" scroll-x="true" style="width: 100%">
<block wx:if="{{ info.video && info.video.length>0 }}">
<view class="media-item media-video" wx:for="{{ info.video }}" wx:key="index" bindtap="show_video" data-src="{{ item.url }}">
<image class="media-video-bj" src="{{ item.image }}"></image>
<view class="media-video-play">
<image class="media-video-play-icon" mode="widthFix" src="/img/videoplay.png"></image>
<view class="size">{{ item.size }}</view>
</view>
<!-- 房源详细信息 -->
<view class="HResource-detail">
<view class="HResource-header">
<!-- 租房类型、合租整租 房间 -->
<template is="HResource-header-item" data="{{ name: info.gptype,value: info.type }}"></template>
<!-- 租期 -->
<template is="HResource-header-item" data="{{ name: '租期', value: info.rentalduration != 0 ? info.rentalduration: '不限' }}"></template>
<!-- 起租日期 -->
<template is="HResource-header-item" data="{{ name: '起租日期',value: info.leasetime || '随时' }}"></template>
</view>
</view>
<!-- 图片和视频 -->
<view class="media-box" wx:if="{{ (info.video && info.video.length != 0) || (info.picturegroup && info.picturegroup.length != 0) }}">
<view class="housing-information-media-top flexacenter">
<block wx:if="{{ info.video && info.video.length != 0 }}">
<image class="housing-information-media-icon1" src="/img/u1737.png" mode="widthFix"></image>
<view class="housing-information-media-quantity flexcenter">{{ info.video.length }}</view>
</block>
<block wx:if="{{ info.picturegroup && info.picturegroup.length != 0 }}">
<image class="housing-information-media-icon" src="/img/u1738.png" mode="widthFix"></image>
<view class="housing-information-media-quantity flexcenter">{{ info.picturegroup.length }}</view>
</block>
</view>
<view class="media-content">
<scroll-view class="scroll-view_H" scroll-x="true" style="width: 100%">
<block wx:if="{{ info.video && info.video.length>0 }}">
<view class="media-item media-video" wx:for="{{ info.video }}" wx:key="index" bindtap="show_video" data-src="{{ item.url }}">
<image class="media-video-bj" src="{{ item.image }}"></image>
<view class="media-video-play">
<image class="media-video-play-icon" mode="widthFix" src="/img/videoplay.png"></image>
<view class="size">{{ item.size }}</view>
</view>
</block>
<block wx:if="{{ info.images && info.images.length>0 }}">
<view class="media-item" wx:for="{{ info.picturegroup }}" wx:key="index">
<image mode="heightFix" src="{{ item.thumbnail }}" bindtap="preview_img" lazy-load="true" data-index="{{ index }}"></image>
</view>
</block>
</scroll-view>
</view>
</view>
<!-- 基本要求 -->
<view class="HResource-item basic-ask-for">
<view class="HResource-item-head flexacenter">
<image class="HResource-item-head-icon" src="/img/ask-for.png" mode="widthFix"></image>
基本{{ info['intermediary'] == 6 ? '要求' : '信息' }}
</view>
<view class="HResource-item-list {{ info['intermediary'] == 6 ? 'basic-list-aLine' : 'basic-list-twoLine' }}">
<block wx:for="{{ basicRequirementsObj }}" wx:key="index">
<view class="basic-item-Line flexacenter {{ index == basicRequirementsObj.length - 1 ? 'flex1' : '' }}" wx:if="{{ item.value }}">
<view class="basic-Line-key">{{ item.name }}</view>
<view class="basic-Line-value flex1 flexacenter" wx:if="{{ m.isArray(item.value) }}">
<block wx:for="{{ item.value }}" wx:for-item="it" wx:for-index="ind" wx:key="ind">
{{ it }}<text class="vertical" wx:if="{{ ind != item.value.length - 1 }}"></text>
</block>
</view>
<view class="basic-Line-value flex1" wx:else>{{ item.value }}</view>
</view>
</block>
</view>
<block wx:if="{{ info.images && info.images.length>0 }}">
<view class="media-item" wx:for="{{ info.picturegroup }}" wx:key="index">
<image mode="heightFix" src="{{ item.thumbnail }}" bindtap="preview_img" lazy-load="true" data-index="{{ index }}"></image>
</view>
</block>
</scroll-view>
</view>
</view>
<!-- 目标区域 -->
<view class="HResource-item" wx:if="{{ info.intermediary == 6 }}">
<view class="HResource-item-head flexacenter">
<image class="HResource-item-head-icon" src="/img/u1695.png" mode="widthFix"></image>
目标区域
</view>
<view class="HResource-item-list target-area-list">
<view class="target-area-item flexacenter" wx:for="{{ info.locationList }}" wx:key="index">
{{ item.head }}
<view class="target-area-arrows flexcenter">
<image class="target-area-arrows-icon" mode="widthFix" src="/img/Back.svg"></image>
</view>{{ item.end }}
<!-- 基本要求 -->
<view class="HResource-item basic-ask-for">
<view class="HResource-item-head flexacenter">
<image class="HResource-item-head-icon" src="/img/ask-for.png" mode="widthFix"></image>
基本{{ info['intermediary'] == 6 ? '要求' : '信息' }}
</view>
<view class="HResource-item-list {{ info['intermediary'] == 6 ? 'basic-list-aLine' : 'basic-list-twoLine' }}">
<block wx:for="{{ basicRequirementsObj }}" wx:key="index">
<view class="basic-item-Line flexacenter {{ index == basicRequirementsObj.length - 1 ? 'flex1' : '' }}" wx:if="{{ item.value }}">
<view class="basic-Line-key">{{ item.name }}</view>
<view class="basic-Line-value flex1 flexacenter" wx:if="{{ m.isArray(item.value) }}">
<block wx:for="{{ item.value }}" wx:for-item="it" wx:for-index="ind" wx:key="ind">
{{ it }}<text class="vertical" wx:if="{{ ind != item.value.length - 1 }}"></text>
</block>
</view>
<view class="basic-Line-value flex1" wx:else>{{ item.value }}</view>
</view>
</block>
</view>
</view>
<!-- 目标区域 -->
<view class="HResource-item" wx:if="{{ info.intermediary == 6 }}">
<view class="HResource-item-head flexacenter">
<image class="HResource-item-head-icon" src="/img/u1695.png" mode="widthFix"></image>
目标区域
</view>
<view class="HResource-item-list target-area-list">
<view class="target-area-item flexacenter" wx:for="{{ info.locationList }}" wx:key="index">
{{ item.head }}
<view class="target-area-arrows flexcenter">
<image class="target-area-arrows-icon" mode="widthFix" src="/img/Back.svg"></image>
</view>{{ item.end }}
</view>
</view>
</block>
</view>
<!-- 地址 -->
<view class="location-box" wx:elif="{{ info.intermediary != 6 && info.location }}">
@ -175,7 +173,7 @@
</view>
</view>
<!-- 附近学校 -->
<view class="school {{ specialSchoolDistance ? 'special' : '' }}" bindtap="cutNearbySchools" data-type="open" wx:if="{{ annexSchoolOmit.length != 0 }}">
<view class="school {{ specialSchoolDistance ? 'special' : '' }}" bindtap="cutNearbySchools" wx:if="{{ annexSchoolOmit.length != 0 && options['school'] }}">
<view class="school-item {{ specialSchoolDistance.durationText ? 'durationText' : '' }}" wx:if="{{ specialSchoolDistance }}">
<text class="school-name">{{ specialSchoolDistance.alias }}</text>
<text class="school-distance">{{ specialSchoolDistance.distanceText }}</text>
@ -195,14 +193,22 @@
<image class="more-icon" mode="widthFix" src="/img/u1908.svg"></image>
</view>
</view>
<view class="school-new">
<view class="school-new-item flexacenter">
城大
<text class="school-new-text">2.2km</text>
<image class="school-new-icon" src="/img/subway-icon.png"></image>
<text class="school-new-text">2.2km</text>
<view class="school-new flexacenter" wx:if="{{ annexSchoolOmit.length != 0 && !options['school'] }}" bindtap="cutNearbySchools">
<view class="school-new-list flex1">
<view class="school-new-item flexcenter" wx:for="{{ annexSchoolOmit }}" wx:key="indexS">
{{ item.alias }}
<text class="school-new-text">{{ item.distanceText }}</text>
<image wx:if="{{ item.toolText == '公交地铁' }}" class="school-new-icon" mode="widthFix" src="/img/subway-icon.png"></image>
<image wx:else class="school-new-icon" mode="widthFix" src="/img/walk-icon.png"></image>
<text class="school-new-text">{{ item.durationText }}</text>
</view>
</view>
<view class="school-new-more flexcenter">
更多<image class="school-new-more-icon" src="/img/u1908.svg"></image>
</view>
</view>
</block>
</view>

View File

@ -1,5 +1,6 @@
/* pages/show/show.wxss */
@import '../common/common.wxss';
@import './show1.wxss';
.is_rent_btn {
position: absolute;
@ -1113,7 +1114,8 @@ map .clickmap {
}
.certification .school .school-distance {
color: #62b1ff;
/* color: #62b1ff; */
color: #8162FF;
font-size: 21rpx;
}
@ -2358,7 +2360,7 @@ map .clickmap {
max-height: 69vh;
}
.academy-box .academy-right .scroll-view{
.academy-box .academy-right .scroll-view {
/* padding-bottom: 100rpx; */
}
@ -2463,7 +2465,8 @@ map .clickmap {
height: 100%;
display: block;
background-image: linear-gradient(to bottom, #aaaaaa 50%, transparent 50%);
background-size: 1px 4px; /* 控制虚线的宽度和间距 */
background-size: 1px 4px;
/* 控制虚线的宽度和间距 */
}
.journey-item:first-of-type::after {
@ -2541,4 +2544,55 @@ map .clickmap {
margin-bottom: 30rpx;
}
.school-new {
margin-top: 30rpx;
}
.school-new .school-new-list .school-new-item {
width: 270rpx;
height: 54rpx;
background-color: #f6f6f6;
border: 1rpx solid #ebebeb;
border-radius: 15rpx;
box-shadow: 15rpx;
font-size: 24rpx;
color: #333333;
display: inline-flex;
margin-right: 15rpx;
}
.school-new .school-new-list .school-new-item:not(:nth-last-child(-n+2)) {
margin-bottom: 15rpx;
}
.school-new .school-new-list .school-new-item:not(:nth-child(even)) {
margin-right: 15rpx;
}
.school-new .school-new-list .school-new-item .school-new-text {
color: #8162FF;
font-size: 21rpx;
margin-left: 10rpx;
}
.school-new .school-new-list .school-new-item .school-new-icon {
width: 30rpx;
height: 30rpx;
margin-left: 12rpx;
}
.school-new .school-new-more {
width: 117rpx;
height: 123rpx;
background-color: #f6f6f6;
border: 1rpx solid #ebebeb;
border-radius: 15rpx;
font-size: 24rpx;
color: #333333;
}
.school-new .school-new-more .school-new-more-icon {
width: 24rpx;
height: 24rpx;
margin-left: 9rpx;
}

0
pages/show/show1.less Normal file
View File

0
pages/show/show1.wxss Normal file
View File

2705
typings/wx.d.ts vendored Normal file

File diff suppressed because it is too large Load Diff