This commit is contained in:
A1300399510 2023-05-15 17:16:49 +08:00
parent 7507225074
commit 4131bd8304
3 changed files with 102 additions and 92 deletions

View File

@ -628,6 +628,8 @@
<view class="contactInformation-wechat" wx:if="{{ contactInformationState == 0 }}">
<view class="contactInformation-wechat-item" hover-class="option-hover" bindtap="UploadQRCode" data-state="2">
<image src="/img/u789.svg"></image>
<image class="contactInformation-recommend" src="/img/u666.png"></image>
<image class="contactInformation-recommend" src="/img/u666.png"></image>
<text>上传二维码</text>
</view>

View File

@ -40,6 +40,8 @@ Page({
listType: "", // 推荐列表类型
pagevalue: null, // 推荐列表的 value
showTOTOP: false, // 返回顶部按钮状态
isNewVersions: true
},
/**

View File

@ -9,11 +9,15 @@
<view class="general-name1 flexacenter" id="general">{{ targetData['title'] }}</view>
</view>
<header-nav inner-text="Some text" isIndexPage="index">{{ topTitle }}</header-nav>
<!-- <header-nav inner-text="Some text" isIndexPage="index" position="{{ 'absolute' }}" bgcolor="linear-gradient(0deg, rgba(246, 246, 246, 1) 2%, rgba(98, 177, 255, 1) 333%)" topImage="{{ true }}"></header-nav> -->
<block wx:if="{{ isNewVersions }}">
<header-nav inner-text="Some text" isIndexPage="index" position="{{ 'absolute' }}" bgcolor="linear-gradient(0deg, rgba(246, 246, 246, 1) 2%, rgba(98, 177, 255, 1) 333%)" topImage="{{ true }}"></header-nav>
</block>
<block wx:else>
<header-nav inner-text="Some text" isIndexPage="index">{{ topTitle }}</header-nav>
</block>
<!-- 新的 首页轮播图 -->
<block wx:if="{{ false }}">
<block wx:if="{{ isNewVersions }}">
<!-- 搜索框 -->
<navigator url="/pages/search/search" hover-class="hover">
<view class="search-box flexacenter">
@ -96,105 +100,106 @@
</view>
<view></view>
<!-- 区域选择 新 -->
<view class="area-selection" wx:if="{{ false }}">
<view class="head flexacenter shadow">
<!-- <view class="head-item flexcenter flex1 {{ index == areaIndex ? 'pitch' : '' }}" wx:for="{{ combination }}" wx:key="index" bindtap="setValue" data-key="areaIndex" data-value="{{ index }}"> -->
<view class="head-item flexflex flex1 {{ index == areaIndex ? 'pitch' : '' }}" wx:for="{{ combination }}" wx:key="index" bindtap="setValue" data-key="areaIndex" data-value="{{ index }}">
<view class="head-item-pitch head-item-pitch-left"></view>
<view class="head-item-pitch head-item-pitch-right"></view>
<view class="head-name">{{ item.name }}</view>
<view class="head-underline" wx:if="{{ index == areaIndex }}"></view>
</view>
</view>
<!-- <view class="area-content shadow"> -->
<view class="area-content">
<view class="area-data flexcenter">
<image class="area-icon" mode="widthFix" src="/img/area-icon.png"></image>
当前共有 <view class="area-amount">{{ combination[areaIndex] && combination[areaIndex].num }}</view> 个房源
</view>
<view wx:if="{{ areaIndex == 0 }}" class="area-list area-school flexflex">
<view class="area-item flexcenter" bindtap="skipPersonList" wx:for="{{ combination[areaIndex].where }}" wx:key="index" data-id="{{ item.id }}" data-key="school">{{ item.name }}</view>
</view>
<view wx:if="{{ areaIndex == 1 }}" class="area-list area-district flexflex">
<view class="area-item flexcenter" bindtap="openAreaPop" data-index="{{ index }}" wx:for="{{ combination[areaIndex].where }}" wx:key="index" data-id="{{ item.id }}">{{ item.name }}</view>
</view>
<block wx:if="{{ areaIndex == 2 }}">
<view class="area-list area-type flexflex" wx:for="{{ combination[areaIndex].where }}" wx:for-item="ite">
<view class="area-type-name">{{ ite.name }}</view>
<view class="area-type-block flex1 flexflex">
<view class="area-item flexcenter" bindtap="skipPersonList" data-id="{{ it.id }}" data-key="types" wx:for="{{ ite.data }}" wx:for-item="it" wx:key="index">{{ it.name }}</view>
</view>
</view>
</block>
</view>
</view>
<view></view>
<!-- 公寓列表 新 -->
<view class="apartment-block" wx:if="{{ false }}">
<scroll-view scroll-x="{{ true }}" class="scroll">
<view class="apartment-list flexflex">
<view class="apartment-item flexflex" wx:for="{{ apartment }}" wx:key="index" bindtap="publicJumps" data-url="/pages/irentDetail/irentDetail?uniqid={{ item.id }}">
<view class="apartment-name one-line-display">{{ item.title }}</view>
<view class="apartment-introduce one-line-display">{{ item.propaganda }}</view>
<view class="apartment-image-list flexacenter">
<block wx:for="{{ item.images }}" wx:key="index">
<image class="apartment-image-item" wx:if="{{ index < 2}}" src="{{ item }}"></image>
</block>
</view>
<block wx:if="{{ isNewVersions }}">
<!-- 区域选择 新 -->
<view class="area-selection">
<view class="head flexacenter shadow">
<!-- <view class="head-item flexcenter flex1 {{ index == areaIndex ? 'pitch' : '' }}" wx:for="{{ combination }}" wx:key="index" bindtap="setValue" data-key="areaIndex" data-value="{{ index }}"> -->
<view class="head-item flexflex flex1 {{ index == areaIndex ? 'pitch' : '' }}" wx:for="{{ combination }}" wx:key="index" bindtap="setValue" data-key="areaIndex" data-value="{{ index }}">
<view class="head-item-pitch head-item-pitch-left"></view>
<view class="head-item-pitch head-item-pitch-right"></view>
<view class="head-name">{{ item.name }}</view>
<view class="head-underline" wx:if="{{ index == areaIndex }}"></view>
</view>
</view>
</scroll-view>
</view>
<!-- <view class="area-content shadow"> -->
<view class="area-content">
<view class="area-data flexcenter">
<image class="area-icon" mode="widthFix" src="/img/area-icon.png"></image>
当前共有 <view class="area-amount">{{ combination[areaIndex] && combination[areaIndex].num }}</view> 个房源
</view>
<!-- 数据列表 tab 新 -->
<view class="tab-list flexacenter" wx:if="{{ false }}">
<view class="tab-item {{ item.select ? 'pitch' : '' }}" wx:for="{{ recommendedTab }}" wx:key="index" bindtap="cutTab" data-type="{{ item.type }}" data-index="{{ index }}">{{ item.name }}</view>
</view>
<!-- 列表 -->
<view class="pinterest-list flexflex" wx:if="{{ false }}">
<view class="pinterest-list-left flex1">
<block wx:for="{{ listDataLeft }}" wx:key="index">
<block wx:if="{{item.type == 'adv'}}">
<template is="adv" data="{{ item }}"></template>
<view wx:if="{{ areaIndex == 0 }}" class="area-list area-school flexflex">
<view class="area-item flexcenter" bindtap="skipPersonList" wx:for="{{ combination[areaIndex].where }}" wx:key="index" data-id="{{ item.id }}" data-key="school">{{ item.name }}</view>
</view>
<view wx:if="{{ areaIndex == 1 }}" class="area-list area-district flexflex">
<view class="area-item flexcenter" bindtap="openAreaPop" data-index="{{ index }}" wx:for="{{ combination[areaIndex].where }}" wx:key="index" data-id="{{ item.id }}">{{ item.name }}</view>
</view>
<block wx:if="{{ areaIndex == 2 }}">
<view class="area-list area-type flexflex" wx:for="{{ combination[areaIndex].where }}" wx:for-item="ite">
<view class="area-type-name">{{ ite.name }}</view>
<view class="area-type-block flex1 flexflex">
<view class="area-item flexcenter" bindtap="skipPersonList" data-id="{{ it.id }}" data-key="types" wx:for="{{ ite.data }}" wx:for-item="it" wx:key="index">{{ it.name }}</view>
</view>
</view>
</block>
<block wx:elif="{{item.type == 'apartment'}}">
<template is="apartment" data="{{ item }}"></template>
</block>
<block wx:else>
<template is="general" data="{{ item }}"></template>
</block>
</block>
</view>
</view>
<view></view>
<!-- 公寓列表 新 -->
<view class="apartment-block">
<scroll-view scroll-x="{{ true }}" class="scroll">
<view class="apartment-list flexflex">
<view class="apartment-item flexflex" wx:for="{{ apartment }}" wx:key="index" bindtap="publicJumps" data-url="/pages/irentDetail/irentDetail?uniqid={{ item.id }}">
<view class="apartment-name one-line-display">{{ item.title }}</view>
<view class="apartment-introduce one-line-display">{{ item.propaganda }}</view>
<view class="apartment-image-list flexacenter">
<block wx:for="{{ item.images }}" wx:key="index">
<image class="apartment-image-item" wx:if="{{ index < 2}}" src="{{ item }}"></image>
</block>
</view>
</view>
</view>
</scroll-view>
</view>
<view class="pinterest-list-left flex1" style="display:flex;flex-direction:column;align-items: flex-end;">
<block wx:for="{{ listDataRight }}" wx:key="index">
<block wx:if="{{item.type == 'adv'}}">
<template is="adv" data="{{ item }}"></template>
</block>
<block wx:elif="{{item.type == 'apartment'}}">
<template is="apartment" data="{{ item }}"></template>
</block>
<block wx:else>
<template is="general" data="{{ item }}"></template>
</block>
</block>
<!-- 数据列表 tab 新 -->
<view class="tab-list flexacenter">
<view class="tab-item {{ item.select ? 'pitch' : '' }}" wx:for="{{ recommendedTab }}" wx:key="index" bindtap="cutTab" data-type="{{ item.type }}" data-index="{{ index }}">{{ item.name }}</view>
</view>
<!-- 列表 -->
<view class="pinterest-list flexflex">
<view class="pinterest-list-left flex1">
<block wx:for="{{ listDataLeft }}" wx:key="index">
<block wx:if="{{item.type == 'adv'}}">
<template is="adv" data="{{ item }}"></template>
</block>
<block wx:elif="{{item.type == 'apartment'}}">
<template is="apartment" data="{{ item }}"></template>
</block>
<block wx:else>
<template is="general" data="{{ item }}"></template>
</block>
</block>
</view>
</view>
<view class="pinterest-list-left flex1" style="display:flex;flex-direction:column;align-items: flex-end;">
<block wx:for="{{ listDataRight }}" wx:key="index">
<block wx:if="{{item.type == 'adv'}}">
<template is="adv" data="{{ item }}"></template>
</block>
<block wx:elif="{{item.type == 'apartment'}}">
<template is="apartment" data="{{ item }}"></template>
</block>
<block wx:else>
<template is="general" data="{{ item }}"></template>
</block>
</block>
</view>
<block wx:if="{{ true }}">
</view>
</block>
<block wx:else>
<!-- 个人房源 -->
<view class="house-block">
<navigator url="/pages/personList/personList" hover-class="hover" class="title">
@ -380,6 +385,7 @@
<!-- 广告 -->
<template name="adv">
<image class="pinterest-list-item" mode="widthFix" src="{{ item.imageLocal || item.image }}" bindtap="handleSwiper" data-statid="{{ item.statid }}" data-id="{{ item.id }}" data-url="{{ item.path || item.url }}"></image>
</template>
<!-- 公寓 -->