头像加入一个报错提示,审核时不出现播放视频,距离院校新样式(还没)

This commit is contained in:
A1300399510 2024-04-12 18:51:48 +08:00
parent 425f2dd197
commit 2fdda45cea
18 changed files with 155 additions and 204 deletions

View File

@ -14,7 +14,6 @@
"pages/ad/ad",
"pages/irentDetail/irentDetail",
"pages/show/show",
"pages/video_show/video_show",
"pages/share/share",
"pages/messageCenter/messageCenter",
"pages/webViewwebweb/index",

View File

@ -47,6 +47,7 @@ Page({
isMapFindState: false,
updateLoading: false,
isAllLoaded: false,
},
/**
@ -87,7 +88,7 @@ Page({
// this.get_list();
this.getNewInit()
this.setData({
initState: true
initState: true,
})
this.getTopTitle()

View File

@ -130,6 +130,8 @@ Page({
isMapFindState: false,
morePage: 1, // 更多的页数
moreList: [], // 更多的数据
isShowVideo: true, // 是否显示 视频
},
headerSearchTopHeight: 10,
@ -252,6 +254,7 @@ Page({
initState: true,
isloding: false,
langs: app.globalData.langs,
isShowVideo: app.globalData.isShowVideo,
})
app.globalData['langs'] ? '' : this.getDtailsLangs()

View File

@ -32,10 +32,10 @@
<template wx:if="{{ lists.length == 0 && !loading }}" data="{{ hint: '暂无数据' }}" is="empty-icon"></template>
<view class="totalSum flexcenter" wx:if="{{ totalSum !== 0 }}">- 共 <view class="num">{{ totalSum }}</view> 条中介房源 -</view>
<block wx:for="{{ lists }}" wx:key="index">
<common-list item="{{ item }}" school="{{ school.value || '' }}"></common-list>
<common-list item="{{ item }}" school="{{ school.value || '' }}" isShowVideo="{{ isShowVideo }}"></common-list>
</block>
<view wx:if="{{ moreList.length != 0 }}" class="other-nearby-listings-box flexcenter">没有找到更多房源,为您推荐其他附近房源</view>
<common-list wx:for="{{ moreList }}" wx:key="index" item="{{ item }}" school="{{ school.value || '' }}"></common-list>
<common-list wx:for="{{ moreList }}" wx:key="index" item="{{ item }}" school="{{ school.value || '' }}" isShowVideo="{{ isShowVideo }}"></common-list>
<view class="inTheEnd" wx:if="{{ page == 0 && lists.length != 0 }}">到底了</view>
</view>

View File

@ -137,6 +137,8 @@ Page({
isMapFindState: false,
morePage: 1, // 更多的页数
moreList: [], // 更多的数据
isShowVideo: true, // 是否显示 视频
},
headerSearchTopHeight: 10,
@ -274,6 +276,7 @@ Page({
initState: true,
isloding: false,
langs: app.globalData.langs,
isShowVideo: app.globalData.isShowVideo,
})
app.globalData['langs'] ? '' : this.getDtailsLangs()

View File

@ -30,9 +30,9 @@
</view>
<template wx:if="{{ lists.length == 0 && !loading }}" data="{{ hint: '暂无数据' }}" is="empty-icon"></template>
<view class="totalSum flexcenter" wx:if="{{ totalSum !== 0 }}">- 共 <view class="num">{{ totalSum }}</view> 条{{ intermediaryObj[intermediary] }}房源 -</view>
<common-list wx:for="{{ lists }}" wx:key="index" item="{{ item }}" school="{{ school.value || '' }}"></common-list>
<common-list wx:for="{{ lists }}" wx:key="index" item="{{ item }}" school="{{ school.value || '' }}" isShowVideo="{{ isShowVideo }}"></common-list>
<view wx:if="{{ moreList.length != 0 }}" class="other-nearby-listings-box flexcenter">没有找到更多房源,为您推荐其他附近房源</view>
<common-list wx:for="{{ moreList }}" wx:key="index" item="{{ item }}" school="{{ school.value || '' }}"></common-list>
<common-list wx:for="{{ moreList }}" wx:key="index" item="{{ item }}" school="{{ school.value || '' }}" isShowVideo="{{ isShowVideo }}"></common-list>
<view class="inTheEnd" wx:if="{{ page == 0 && lists.length != 0 }}">到底了</view>
</view>

View File

@ -1296,7 +1296,6 @@ Page({
if (minutes != 0) text += minutes + 'min'
if (remainingSeconds != 0 && minutes == 0) text += remainingSeconds + 's'
}
return text
},
// 转换 米数
@ -1305,5 +1304,5 @@ Page({
if (input >= 1000) text = (input / 1000).toFixed(1) + (type == 'chinese' ? '公里' : 'km')
else text = input + (type == 'chinese' ? '米' : 'm');
return text;
}
},
})

3
pages/show/show.less Normal file
View File

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

View File

@ -46,113 +46,116 @@
<view class="housing-information certification resource-beg">
<view class="HResource-box HResource-box1">
<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>
<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>
<!-- 房源详细信息 -->
<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>
</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>
</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="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>
<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="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>
</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>
</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>
</view>
</block>
<!-- 地址 -->
<view class="location-box" wx:elif="{{ info.intermediary != 6 && info.location }}">
<view class="location-header">
@ -182,24 +185,25 @@
<text class="school-distance">{{ specialSchoolDistance.durationText }}</text>
</block>
</view>
<block wx:for="{{ annexSchoolOmit }}" wx:key="index">
<view class="school-item">
<text class="school-name">{{ item.alias }}</text>
<text class="school-distance">{{ item.distanceText }}</text>
</view>
</block>
<!-- <block wx:for="{{ info.pointData }}" wx:key="index">
<view class="school-item" wx:if="{{ index < 7 }}">
<text class="school-name">{{ item.alias }}</text>
<text class="school-distance">{{ item.recently_distance }}km</text>
</view>
</block> -->
<view class="school-item" wx:for="{{ annexSchoolOmit }}" wx:key="index">
<text class="school-name">{{ item.alias }}</text>
<text class="school-distance">{{ item.distanceText }}</text>
</view>
<!-- 更多 -->
<view class="school-item more">
<text class="school-name">更多</text>
<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>
</view>
</block>
</view>
@ -227,7 +231,6 @@
<view class="root-portal" style="display: flex;align-items: flex-end;" bindtap="negation" data-key="contactInformationState" wx:if="{{ contactInformationState }}" catchtouchmove="locationmove">
<!-- <template is="root-portal" data="{{ info }}"></template> -->
<template is="new-contact-information" data="{{ info,contactValue }}"></template>
</view>
</view>
</view>

View File

@ -2454,11 +2454,9 @@ map .clickmap {
margin-bottom: 39rpx;
}
/* .journey-item:not(:last-of-type)::after { */
.academy-school-item-journey::after {
content: "";
position: absolute;
/* top: calc((100% - 39rpx) / 2 + 6.75rpx); */
top: 0;
left: 39.25rpx;
width: 1rpx;
@ -2541,4 +2539,6 @@ map .clickmap {
color: #a09e9e;
font-size: 22.5rpx;
margin-bottom: 30rpx;
}
}

View File

@ -138,6 +138,8 @@ Page({
authenticatePopupStatus: false, // 认证弹窗状态 intermediary-succeed-pop
authenticatePopupState: null, // 认证弹窗状态 intermediary-succeed-pop
isShowVideo: true, // 是否显示 视频
},
launchAppError(e) {
console.log(e.detail.errMsg)
@ -241,10 +243,9 @@ Page({
status: app.globalData.status,
wechat: app.globalData.wechat,
bottomLift: app.globalData.screen_data.bottomLift,
isShowVideo: app.globalData.isShowVideo,
})
this.getUserInit()
// this['get_' + this.data.tab]()
} else {
setTimeout(function () {
that.get_config()

View File

@ -75,7 +75,7 @@
<view class="list-new-content-list">
<view class="list-new-content-item" wx:for="{{ fav.data }}" wx:key="index">
<template wx:if="{{ item.collectiontype == 'apartment' }}" data="{{ item,index,isUser: true }}" is="apartment-item"></template>
<common-list wx:else bindcollectOperation="add_to_fav" item="{{ item }}" index="{{ index }}" iscollect="{{ true }}"></common-list>
<common-list isShowVideo="{{ isShowVideo }}" wx:else bindcollectOperation="add_to_fav" item="{{ item }}" index="{{ index }}" iscollect="{{ true }}"></common-list>
</view>
</view>
</block>
@ -95,7 +95,7 @@
</view>
<view class="list-new-content-list">
<view class="list-new-content-item" wx:for="{{ publish.data }}" wx:key="index">
<common-list binduserOperation="userOperation" stateData="{{ stateObj[item.status] }}" item="{{ item }}" index="{{ index }}" ispublish="{{ true }}"></common-list>
<common-list isShowVideo="{{ isShowVideo }}" binduserOperation="userOperation" stateData="{{ stateObj[item.status] }}" item="{{ item }}" index="{{ index }}" ispublish="{{ true }}"></common-list>
</view>
</view>
</block>

View File

@ -1,66 +0,0 @@
// pages/video_show/video_show.js
Page({
/**
* 页面的初始数据
*/
data: {
},
/**
* 生命周期函数--监听页面加载
*/
onLoad(options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady() {
},
/**
* 生命周期函数--监听页面显示
*/
onShow() {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide() {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh() {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom() {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage() {
}
})

View File

@ -1,2 +0,0 @@
<!--pages/video_show/video_show.wxml-->
<text>pages/video_show/video_show.wxml</text>

View File

@ -31,9 +31,14 @@ Page({
miucms.request(`${app.globalData.baseURL}/tenement/v2/api/user/uploadAvatar`, {
data: avatarUrl
}).then(res => {
let data = res.data
// app.globalData.user = data.user
app.globalData.user = Object.assign({}, app.globalData.user, data.user)
if (res.code != 200) {
wx.showToast({
icon: "none",
title: res.message || '上传失败,稍候试试。',
})
return
}
let data = res.data = app.globalData.user = Object.assign({}, app.globalData.user, data.user)
app.globalData['setSate'] = true
})
},

View File

@ -17,6 +17,7 @@ Component({
observer: function (res) {}
},
school: String, // 筛选的 学校值
isShowVideo: Boolean,
},
/**

View File

@ -60,7 +60,7 @@
</view>
</view>
<view class="right flexflex">
<view wx:if="{{ item.isvideo }}" class="video flexflex">
<view wx:if="{{ item.isvideo && isShowVideo }}" class="video flexflex">
<view class="mask"></view>
<image class="image" mode="widthFix" lazy-load src="{{ item.imageurl }}"></image>
<image class="video-icon" src="/img/videoplay.png"></image>

View File

@ -56,6 +56,7 @@ function sendData(code) {
app.globalData.wechat = data.wechat;
app.globalData.isMapFindState = data.isMapFindState;
app.globalData.isShowVideo = data.reviewmode == 1 ? false : true;
// app.globalData.isShowVideo = false
app.globalData.header = {
'content-type': 'application/json',