提交

2023-05-15 10:36:47 +08:00 · 2023-05-10 19:35:30 +08:00
8 changed files with 123 additions and 45 deletions
--- a/pages/edit/edit.wxml
+++ b/pages/edit/edit.wxml
@ -156,9 +156,9 @@
                    <view wx:if="{{ item.field == 'wechat' }}" class="contact-way contact-way-WeChat">
                        <view class="contact-way-title" style="padding-bottom: 28rpx;">微信</view>
                        <view class="contactInformation-wechat" wx:if="{{ contactInformationState == 0 }}">
-                            <!-- <view class="contactInformation-wechat-item" hover-class="option-hover" hover-stay-time="50" bindtap="contactInformationwechatcut" data-state="1">
+                            <view class="contactInformation-wechat-item" hover-class="option-hover" hover-stay-time="50" bindtap="contactInformationwechatcut" data-state="1">
                                <image mode="widthFix" src="/img/pengreydark.png"></image><text>填写微信号</text>
-                            </view> -->
+                            </view>
                            <view class="contactInformation-wechat-item" hover-class="option-hover" bindtap="UploadQRCode" data-state="2">
                                <image src="/img/u789.svg"></image>
                                <text>上传二维码</text>
@ -341,8 +341,9 @@
            <text class="last-step-text" wx:if="{{ popUpSubtitle }}">{{ popUpSubtitle }}</text>
            <view class="AListOF-option option-box">
                <view wx:for="{{ item.choices }}" wx:for-item="it" wx:key="index" data-i="{{ m1.fn([newinfo[it.field]],it.value, it.field).indexOf }}" data-a="{{ newinfo[it.value] }}" class="AListOF-option-item option-item {{ it.disabled == 1 ?  'AListOF-option-item-disabled' : '' }} {{ m1.fn([newinfo[it.field]],it.value, it.field).indexOf ? 'option-hove':'' }}" hover-class="option-hover" hover-stay-time="5" bindtap="{{ it.disabled == 1 ? '' : 'selectOption' }}" data-key="{{ it.key }}" data-field="{{ it.field }}" data-choices="{{ it.choices }}" data-value="{{ it.value }}">
-                <!-- <view wx:for="{{ item.choices }}" wx:for-item="it" wx:key="index" data-i="{{ m1.fn([newinfo[it.field]],it.value, it.field).indexOf }}" data-a="{{ newinfo[it.value] }}" class="AListOF-option-item option-item {{ it.disabled == 1 ?  'AListOF-option-item-disabled' : '' }} {{ m1.fn([newinfo[it.field]],it.value, it.field).indexOf ? 'option-hove':'' }}" hover-class="option-hover" hover-stay-time="5" bindtap="selectOption" data-key="{{ it.key }}" data-field="{{ it.field }}" data-choices="{{ it.choices }}" data-value="{{ it.value }}"> -->
-                    {{it.value}}</view>
+                    <!-- <view wx:for="{{ item.choices }}" wx:for-item="it" wx:key="index" data-i="{{ m1.fn([newinfo[it.field]],it.value, it.field).indexOf }}" data-a="{{ newinfo[it.value] }}" class="AListOF-option-item option-item {{ it.disabled == 1 ?  'AListOF-option-item-disabled' : '' }} {{ m1.fn([newinfo[it.field]],it.value, it.field).indexOf ? 'option-hove':'' }}" hover-class="option-hover" hover-stay-time="5" bindtap="selectOption" data-key="{{ it.key }}" data-field="{{ it.field }}" data-choices="{{ it.choices }}" data-value="{{ it.value }}"> -->
+                    {{it.value}}
+                </view>
            </view>

            <template is="pop-up-footer" data="{{ popUpStepState,field:item.field,newtype,newStatus }}"></template>
--- a/pages/edit/edit.wxss
+++ b/pages/edit/edit.wxss
@ -255,7 +255,7 @@
 }

 .footer-btn .save1 {
-    /* margin-right: 30rpx; */
+    margin-right: 30rpx;
    color: #000;
    background-color: #fff;
    font-weight: 400;
@ -877,8 +877,8 @@
 }

 .contactInformation .contactInformation-wechat-item {
-    /* width: 330rpx; */
-    width: 690rpx;
+    width: 330rpx;
+    /* width: 690rpx; */
    height: 100rpx;
    line-height: 100rpx;
    background-color: #f4f4f4;
--- a/pages/index/index.js
+++ b/pages/index/index.js
@ -24,7 +24,6 @@ Page({
        unreadMessages: 0, // 底部我的图标 未读系统通知数量

        areaIndex: 0, // 
-        envVersionState: false, // 是否在开发环境

        tabValue: 0,
        swiperCurrent: 0, // 新轮播图 滚动的下标
@ -52,14 +51,6 @@ Page({

        wx.showLoading()
        this.get_config()
-
-        let accountInfo = wx.getAccountInfoSync()
-        let envVersion = accountInfo.miniProgram.envVersion
-        if (envVersion != 'develop') return
-        this.setData({
-            envVersionState: true,
-        })
-
    },

    // 获取系统通知数量
@ -556,6 +547,23 @@ Page({
                showTOTOP: false
            })
        }
-    }
+    },
+
+    // 轮播图的加载事件
+    loadHeadSwiper(e) {
+        console.log(e);
+        let ratio = app.globalData.screen_data['windowWidth'] / 750
+        let originalWidth = e.detail.width;
+        let originalHeight = e.detail.height;
+        let height = originalHeight / originalWidth * 690 * ratio
+        console.log(height);
+
+        this.setData({
+            HeadSwiperHeight: height
+        })
+
+        // 460 / 1080 * 690 * 0.5
+
+    },

 })
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@ -13,7 +13,7 @@
    <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="{{ envVersionState && true }}">
+    <block wx:if="{{ false }}">
        <!-- 搜索框 -->
        <navigator url="/pages/search/search" hover-class="hover">
            <view class="search-box flexacenter">
@ -22,10 +22,10 @@
            </view>
        </navigator>
        <view class="headSwiper">
-            <swiper class='headSwiper-swiper' current="{{ swiperCurrent }}" autoplay="{{ true }}" circular interval="{{ 3000 }}" duration="{{ 1000 }}" bindchange="bindchangeSwiper">
+            <swiper class='headSwiper-swiper' current="{{ swiperCurrent }}" autoplay="{{ true }}" circular interval="{{ 3000 }}" duration="{{ 1000 }}" bindchange="bindchangeSwiper" style="height: {{ HeadSwiperHeight + 5 }}px;">
                <block wx:for="{{ banner }}" wx:key="index">
                    <swiper-item>
-                        <image class="headSwiper-img" mode="widthFix" bindtap="handleSwiper" data-appid="{{ item.appid }}" data-url="{{ item.url }}" src="{{ item.imageurl }}"></image>
+                        <image class="headSwiper-img" mode="widthFix" bindtap="handleSwiper" data-appid="{{ item.appid }}" data-url="{{ item.url }}" src="{{ item.imageurl }}" bindload="loadHeadSwiper"></image>
                    </swiper-item>
                </block>
            </swiper>
@ -95,17 +95,21 @@

    </view>

+    <view></view>
    <!-- 区域选择 新 -->
-    <view class="area-selection" wx:if="{{ envVersionState && true }}">
+    <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 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> 个房源
@ -131,9 +135,10 @@
        </view>

    </view>
+    <view></view>

    <!-- 公寓列表 新 -->
-    <view class="apartment-block" wx:if="{{ envVersionState && true }}">
+    <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 }}">
@ -152,12 +157,13 @@
        </scroll-view>
    </view>

+
    <!-- 数据列表 tab 新 -->
-    <view class="tab-list flexacenter" wx:if="{{ envVersionState && true }}">
+    <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="{{ envVersionState && true }}">
+    <view class="pinterest-list flexflex">
        <view class="pinterest-list-left flex1">
            <block wx:for="{{ listDataLeft }}" wx:key="index">
                <block wx:if="{{item.type == 'adv'}}">
@ -374,7 +380,6 @@

 <!-- 广告 -->
 <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>

 <!-- 公寓 -->
@ -402,7 +407,7 @@
                </block>
            </view>
            <view wx:if="{{ item.specifications.length > 2 }}" class="apartment-price-more flexcenter">更多</view>
-            <view class="color-scheme"></view>
+            <!-- <view class="color-scheme"></view> -->

        </view>
    </navigator>
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@ -1,12 +1,14 @@
 /* pages/pageIndex/pageIndex.wxss */
 page {
-    --scheme-bg: #62b1ff
+    --scheme-bg: #62b1ff;
 }

 .container {
    background: rgba(246, 246, 246, 1);
    min-height: 100vh;
    padding-bottom: 160rpx;
+    overflow: hidden;
+    width: 100vw;
 }

 .search-btn {
@ -276,16 +278,17 @@ page {
 }

 .area-selection .shadow {
-    -moz-box-shadow: 0 0 12rpx rgba(0, 0, 0, 0.0784313725490196);
-    -webkit-box-shadow: 0 0 12rpx rgba(0, 0, 0, 0.0784313725490196);
-    box-shadow: 0 0 12rpx rgba(0, 0, 0, 0.0784313725490196);
+    -moz-box-shadow: 0 -6rpx 12rpx rgba(0, 0, 0, 0.0784313725490196);
+    -webkit-box-shadow: 0 -6rpx 12rpx rgba(0, 0, 0, 0.0784313725490196);
+    box-shadow: 0 -6rpx 12rpx rgba(0, 0, 0, 0.0784313725490196);
    /* box-shadow: 0 0 12rpx red; */
 }

 .area-selection {
    width: 690rpx;
    border-radius: 24rpx;
-    margin: 22rpx auto 0;
+    margin: 22rpx 30rpx 0;
+    box-sizing: border-box;
    overflow: hidden;
    filter: drop-shadow(0 0 12rpx rgba(0, 0, 0, 0.0784313725490196));
 }
@ -329,11 +332,50 @@ page {
    /* -moz-box-shadow: 0 -12rpx 12rpx rgba(0, 0, 0, 0.0784313725490196);
    -webkit-box-shadow: 0 -12rpx 12rpx rgba(0, 0, 0, 0.0784313725490196);
    box-shadow: 0 -12rpx 12rpx rgba(0, 0, 0, 0.0784313725490196) */
-    box-shadow: 0 -6rpx 12rpx rgba(0, 0, 0, 0.0784313725490196);
+    box-shadow: 0 -8rpx 12rpx rgba(0, 0, 0, 0.0784313725490196);
    padding-top: 20rpx;
 }

-.area-selection .head .pitch::after,
+.area-selection .head .head-item-pitch {
+    width: 24rpx;
+    height: 24rpx;
+    position: absolute;
+    bottom: 18rpx;
+    background-color: #fff;
+    /* border: 1rpx solid; */
+    /* border-top-color: rgb(98, 177, 255); */
+    /* border-right-color: rgb(98, 177, 255); */
+    /* border-bottom-color: #fff; */
+    /* border-left-color: #fff; */
+}
+
+.area-selection .head .head-item-pitch::after {
+    content: "";
+    width: 24rpx;
+    height: 24rpx;
+    background-color: rgb(98, 177, 255);
+    position: absolute;
+}
+
+.area-selection .head .head-item-pitch-left {
+    left: -24rpx;
+
+}
+
+.area-selection .head .head-item-pitch-right {
+    right: -24rpx;
+
+}
+
+.area-selection .head .head-item-pitch-left::after {
+    border-radius: 0 0 24rpx 0;
+}
+
+.area-selection .head .head-item-pitch-right::after {
+    border-radius: 0 0 0 24rpx;
+}
+
+/* .area-selection .head .pitch::after,
 .area-selection .head .pitch::before {
    content: "";
    position: absolute;
@ -341,15 +383,16 @@ page {
    right: -24rpx;
    width: 24rpx;
    height: 24rpx;
+    background-color: rgb(98, 177, 255);
+    border-radius: 0 0 0 24rpx;
    background: radial-gradient(24rpx at 24rpx 0px, transparent 24rpx, #fff 24rpx);
-}
+} */

-.area-selection .head .pitch::after {
+/* .area-selection .head .pitch::after {
    left: -24rpx;
    right: auto;
    transform: scaleX(-1);
-
-}
+} */

 .area-selection .head .head-underline {
    width: 122rpx;
@ -604,10 +647,19 @@ page {

 .apartment-block {
    margin-top: 37.5rpx;
+    box-sizing: border-box;
+    overflow: hidden;
+}
+
+.apartment-block .scroll {
+    box-sizing: border-box;
+    overflow: hidden;
 }

 .apartment-block .apartment-list {
    padding: 0 30rpx;
+    width: 100vw;
+    box-sizing: border-box;
 }

 .apartment-block .apartment-list .apartment-item {
@ -922,6 +974,7 @@ page {
    width: 690rpx;
    margin: 32rpx auto 30rpx;
    position: relative;
+    border-radius: 20rpx;
 }

 .headSwiper .headSwiper-img {
@ -932,7 +985,7 @@ page {

 .headSwiper .indication-point {
    position: absolute;
-    bottom: 15rpx;
+    bottom: 20rpx;
    right: 15rpx;
    height: 18rpx;
    border-radius: 45rpx;
--- a/pages/show/show.wxml
+++ b/pages/show/show.wxml
@ -221,11 +221,11 @@
        <!-- 图片和视频 -->
        <view class="media-box" wx:if="{{ (info.video && info.video.length != 0) || (info.picturegroup && info.picturegroup.length != 0) }}">
          <view class="media-header">
-            <block wx:if="{{ info.video.length != 0 }}">
+            <block wx:if="{{ info.video && info.video.length != 0 }}">
              <image class="video-icon" mode="widthFix" src="/img/u1737.png"></image>
              <text class="media-num">{{ info.video.length }}</text>
            </block>
-            <block wx:if="{{ info.images.length != 0 }}">
+            <block wx:if="{{ info.images && info.images.length != 0 }}">
              <image class="pic-icon" mode="widthFix" src="/img/u1738.png"></image>
              <text class="media-num">{{ info.picturegroup.length }}</text>
            </block>
--- a/pages/show/show.wxss
+++ b/pages/show/show.wxss
@ -821,12 +821,23 @@ map .clickmap {
  padding: 39rpx 0;
  width: 50%;
  white-space: nowrap;
+  border-bottom: 2rpx dotted #d7d7d7;
+
 }

-.certification .HResource-box .HResource-detail-tier:nth-child(-n+2) {
-  border-bottom: 2rpx dotted #d7d7d7;
+/* .certification .HResource-box .HResource-detail-tier:nth-child(-n+2) { */
+/* .certification .HResource-box .HResource-detail-tier:nth-last-child(-n+2) { */
+.certification .HResource-box .HResource-detail-tier:last-child(even) {
+  /* .certification .HResource-box .HResource-detail-tier:nth-of-type(odd):nth-last-child(-n+2) { */
+  /* border-bottom: 2rpx dotted #d7d7d7; */
+
+  border-bottom: none;
 }

+/* .certification .HResource-box .HResource-detail-tier:nth-of-type(even):nth-last-child(-n+2) {
+  border-bottom: none;
+} */
+
 .certification .HResource-box .HResource-detail-tier:nth-of-type(2n) {
  padding-left: 60rpx;
 }
@ -843,7 +854,7 @@ map .clickmap {
  font-size: 27rpx;
 }

-.certification .HResource-box .HResource-detail-value .HResource-detail-vertical{
+.certification .HResource-box .HResource-detail-value .HResource-detail-vertical {
  width: 2rpx;
  height: 27rpx;
  background-color: #D7D7D7;
--- a/template/toTop/toTop.wxss
+++ b/template/toTop/toTop.wxss
@ -3,7 +3,7 @@
 .to-top-btn{
  position: fixed;
  right: 10rpx;
-  bottom: 100rpx;
+  bottom: 200rpx;
  display: flex;
  align-items: center;
  justify-content: center;
Author	SHA1	Message	Date
A1300399510	0f5967a226	提交	2023-05-15 10:36:47 +08:00
A1300399510	d2e863a889	提交	2023-05-10 19:35:30 +08:00