update

pages/EstateDetail/index.wxml

@@ -20,7 +20,7 @@
         <view class="centerLabel">
           <view class="flex-h">
             <text class="name flex-item">{{EstateDetail.buildingName}}</text>
-            <text class="price">别名:{{EstateDetail.name || ''}}</text>
+            <text class="price" wx:if="{{EstateDetail.name}}">别名:{{EstateDetail.name || ''}}</text>
           </view>
           <text>均价：{{EstateDetail.price}}</text>
         </view>
@@ -177,7 +177,12 @@
       <block wx:for="{{CurrentImgList}}" wx:for-item="item" wx:for-index="index" wx:key="key">
         <swiper-item>
           <view class="swiper-item">
-            <image mode="aspectFit" src="{{item.url}}" class="centerLabel contain" bindtap="CloseMaxSwiper"></image>
+            <movable-area class="centerLabel contain" bindtap="CloseMaxSwiper">
+              <movable-view scale="{{true}}" scale-min="1" scale-max="2" style='width:100%;height:100%' direction="all">
+                <image mode="aspectFit" class="centerLabel contain" src="{{item.url}}"></image>
+              </movable-view>
+            </movable-area>
+            <!-- <image mode="aspectFit" src="{{item.url}}" class="centerLabel contain" bindtap="CloseMaxSwiper"></image> -->
           </view>
         </swiper-item>
       </block>

pages/MyCollectEstateList/index.js

@@ -138,5 +138,10 @@ create(store, {
   },
   onShareAppMessage: function () {
     return app.globalData.ShareDate
+  },
+  toBuilding(e) {
+    wx.navigateTo({
+      url: '/pages/EstateDetail/index?id=' + e.currentTarget.dataset.id
+    })
   }
 })

pages/MyCollectEstateList/index.wxml

@@ -5,26 +5,25 @@
       <text>暂无数据</text>
     </view>
     <view class="list">
-      <view class="flex-h" wx:for="{{list}}" wx:for-item="item" wx:key="item.buildingId">
+      <view class="flex-h" wx:for="{{list}}" wx:for-item="item" wx:key="item.buildingId" data-id='{{item.buildingId}}' bindtap='toBuilding'>
 
         <!-- 左侧图片 -->
-        <view class="img">
-          <image mode="aspectFill" src="{{item.buildingImg[0].url}}" class="centerLabel cover"></image>
+        <view class="img" data-id='{{item.buildingId}}'>
+          <image mode="aspectFill" data-id='{{item.buildingId}}' src="{{item.buildingImg[0].url}}" class="centerLabel cover"></image>
         </view>
 
         <!-- 右侧内容 -->
-        <view class="flex-item">
-          <view>
+        <view data-id='{{item.buildingId}}' class="flex-item" data-id='{{item.buildingId}}'>
+          <view data-id='{{item.buildingId}}'>
             <view class="delete">
               <image mode="widthFix" src="/assets/images/icon28.png" bindtap="DeleteItem" data-index="{{item.buildingId}}"></image>
             </view>
-            <text class="name">{{item.buildingName}}</text>
-            <text>{{item.address}}</text>
-            <text>距您{{item.distance}}km</text>
-            <text class="price">均价：<text>{{item.price}}</text></text>
+            <text data-id='{{item.buildingId}}' class="name">{{item.buildingName}}</text>
+            <text data-id='{{item.buildingId}}'>{{item.address}}</text>
+            <text data-id='{{item.buildingId}}'>距您{{item.distance}}km</text>
+            <text data-id='{{item.buildingId}}' class="price">均价：<text>{{item.price}}</text></text>
           </view>
         </view>
-
       </view>
     </view>
     <text class="noMore" wx:if="{{!IsNull}}">{{list.length < Total ? '正在加载更多...' : '已加载全部'}}</text>

pages/MyCollectEstateList/index.wxss

@@ -21,8 +21,8 @@
 }
 
 .img {
-  width: 140rpx;
-  height: 186rpx;
+  width: 260rpx;
+  height: 146rpx;
   position: relative;
   overflow: hidden;
   background: #eee;
@@ -38,7 +38,7 @@
   position: relative;
   overflow: hidden;
   text-align: right;
-  margin-top: -10rpx;
+  margin-top:-10px;
 }
 
 .list .delete image {
@@ -62,7 +62,9 @@
 }
 
 .list text.name{
-  font-size: 32rpx;
+  font-size: 24rpx;
+  color: #000;
+  margin-top: -20px;
 }
 
 .list text.price text {

pages/MyWelfare/index.js

@@ -53,7 +53,7 @@ create(store, {
         let list = res.data.records || []
         let aArr = this.data.list || []
         list.map((item) => {
-          aArr.push(item)
+          aArr.push({ ...item, activityDate: item.activityDate.split(' ')[0]})
         })
         this.setData({
           list: aArr,

pages/MyWelfare/index.wxml

@@ -17,7 +17,7 @@
           <view>
             <text class="name">{{item.title}}</text>
             <text>{{item.desc}}</text>
-            <text class="price">活动时间：<text>{{item.activityDate || ''}}</text></text>
+            <text class="price">活动时间：<text>{{(item.activityDate || '')}}</text></text>
           </view>
         </view>
 

pages/MyWelfare/index.wxss

@@ -21,8 +21,8 @@
 }
 
 .img {
-  width: 140rpx;
-  height: 186rpx;
+  width: 260rpx;
+  height: 146rpx;
   position: relative;
   overflow: hidden;
   background: #eee;

pages/components/Estate/index.wxml

@@ -3,7 +3,7 @@
   <view class="map">
     <movable-area style="height: 100%; width: 100%; background: #eee;position:absolute;left:0;top:0;">
       <movable-view scale="{{true}}" scale-min="1.3" scale-max="2.5" x="{{x}}" y="{{y}}" direction="all">
-        <image mode="aspectFill" src="https://whole-estate.oss-cn-beijing.aliyuncs.com/img4-new-2.jpg" class="centerLabel cover bg"></image>
+        <image mode="aspectFill" src="https://whole-estate.oss-cn-beijing.aliyuncs.com/img4-new-3.jpg" class="centerLabel cover bg"></image>
       </movable-view>
     </movable-area>
     <!-- <image mode="widthFix" src="/assets/images/img4.jpg" class="centerLabel cover bg"></image>
@@ -18,15 +18,13 @@
         <view class="estateDetail">
           <text class="name">{{item.buildingName}}</text>
           <view class="address">
-            <image mode="widthFix" src="/assets/images/icon41.png" style="width: 12rpx;"></image>{{item.address}} 距您{{item.distance}}km
+            <image mode="widthFix" src="/assets/images/icon41.png" style="width: 12rpx;"></image>{{item.address}}
+          </view>
+          <view class="distance">
+            距您{{item.distance}}km
           </view>
           <view class="price">均价：<text>{{item.price}}</text></view>
         </view>
-        <!-- <view class="address flex-h">
-          <image mode="widthFix" src="/assets/images/icon41.png"></image>
-          <text class="flex-item">{{item.address}} 距您{{item.distance}}km</text>
-        </view>
-        <text class="price">均价：{{item.price}}</text> -->
       </view>
     </view>
   </view>

pages/components/Estate/index.wxss

@@ -35,7 +35,7 @@
   width: 100%;
   position: relative;
   overflow: hidden;
-  padding: 25rpx 0 25rpx 0;
+  padding: 60rpx 0 25rpx 0;
 }
 
 .EstateList > text {
@@ -78,7 +78,7 @@
 .EstateList .list > view {
   display: inline-block;
   width: 380rpx;
-  height: 390rpx;
+  height: 430rpx;
   position: relative;
   overflow: hidden;
   border-radius: 10rpx;
@@ -134,6 +134,13 @@
   vertical-align: middle;
 }
 
+.EstateList .estateDetail .distance{
+  color: #666666;
+  font-size: 22rpx;
+  line-height: 36rpx;
+  margin-left: 22rpx;
+}
+
 .EstateList .estateDetail .address text {
   color: #666666;
   font-size: 22rpx;

pages/components/SubIndex/index.js

@@ -58,6 +58,7 @@ Component({
       }
     })
   },
+  
   pageLifetimes: {
     show: function() {},
   },

pages/components/SubIndex/index.wxss

@@ -265,6 +265,21 @@
 .roomList .info > view {
   align-items: center;
 }
+/* 
+.roomList .info > view .marquee{
+  animation: geiwogun 2s linear infinite;
+	white-space: nowrap;
+}
+
+@keyframes geiwogun {
+from {
+  transform: translate(0, 0);
+}
+to {
+  transform: translate(-50%, 0);
+}
+}
+ */
 
 .roomList .info > view:nth-child(1) > text:nth-child(1) {
   line-height: 52rpx;