update

pages/ActivityDetail/index.js

@@ -36,6 +36,7 @@ Page({
     }
   },
   data: {
+    ShowMaxSwiper: false,
     HasSignUp: false,
     UserInfo: app.globalData.UserInfo,
     Id: null,
@@ -54,12 +55,19 @@ Page({
       CreateDate: '',
       Content: ''
     },
-    CommentList: []
+    CommentList: [],
+    CurrentImgList: []
   },
   onReady() {
 
   },
-  PageReset() {
+  CloseMaxSwiper() { // 关闭大图
+    this.setData({
+      ShowMaxSwiper: false,
+      CurrentIndex: 0
+    })
+  },
+  PageReset() { // 页面数据重置
     this.setData({
       ActivityDetail: {
         Title: '',
@@ -69,7 +77,8 @@ Page({
       },
       CommentList: [],
       SubmitOff: true,
-      ShowPopup: false
+      ShowPopup: false,
+      CurrentIndex: 0
     })
   },
   GetSignUpList() { // 获取报名情况
@@ -229,9 +238,26 @@ Page({
         this.setData({
           CommentList: CommentList
         })
+        console.log(this.data.CommentList)
       }
     })
   },
+  CheckBigImg(e) { // 查看大图
+    // console.log(e.target.dataset)
+    if (e.target.dataset.type - 0 === 1) { // 评论大图
+      this.setData({
+        CurrentImgList: this.data.CommentList[e.target.dataset.mainIndex].ImgList,
+        CurrentIndex: e.target.dataset.index,
+        ShowMaxSwiper: true
+      })
+    } else { // 回复大图
+      this.setData({
+        CurrentImgList: this.data.CommentList[e.target.dataset.mainIndex].Childs[e.target.dataset.subIndex].ImgList,
+        CurrentIndex: e.target.dataset.index,
+        ShowMaxSwiper: true
+      })
+    }
+  },
   GetActivityDetail() { // 获取活动详情
     fetch({
       url: $api.activity.detail.url.replace(':id', this.data.Id),

pages/ActivityDetail/index.wxml

@@ -52,7 +52,7 @@
                 <!-- 评论图片列表 -->
                 <view class="imgList">
                   <view wx:for="{{item.ImgList}}" wx:for-item="subItem" wx:for-index="subIdx" wx:key="subKey">
-                    <image mode="aspectFit" src="{{subItem.imgUrl}}" class="centerLabel contain"></image>
+                    <image mode="aspectFit" src="{{subItem.imgUrl}}" class="centerLabel contain" data-type="1" data-mainIndex="{{idx}}" data-index="{{subIdx}}" bindtap="CheckBigImg"></image>
                   </view>
                 </view>
 
@@ -70,10 +70,10 @@
                     </view>
                     <text class="floorContent">{{subItem.Content}}</text>
 
-                    <!-- 评论图片列表 -->
+                    <!-- 回复图片列表 -->
                     <view class="imgList">
                       <view wx:for="{{subItem.ImgList}}" wx:for-item="dSubItem" wx:for-index="dSubIdx" wx:key="dSubKey">
-                        <image mode="aspectFit" src="{{dSubItem.imgUrl}}" class="centerLabel contain"></image>
+                        <image mode="aspectFit" src="{{dSubItem.imgUrl}}" class="centerLabel contain" data-type="2" data-mainIndex="{{idx}}" data-subIndex="{{subIdx}}" data-index="{{dSubIdx}}" bindtap="CheckBigImg"></image>
                       </view>
                     </view>
 
@@ -122,4 +122,15 @@
       </view>
     </view>
   </view>
+  <view class="maxSwiper" hidden="{{!ShowMaxSwiper}}">
+    <swiper autoplay="{{false}}" indicator-dots="{{false}}" current="{{CurrentIndex}}">
+      <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>
+          </view>
+        </swiper-item>
+      </block>
+    </swiper>
+  </view>
 </view>

pages/ActivityDetail/index.wxss

@@ -1,6 +1,21 @@
 /**index.wxss**/
 @import '../../app.wxss';
 
+.maxSwiper {
+  width: 100%;
+  position: absolute;
+  left: 0;
+  top: 0;
+  bottom: 0;
+  z-index: 1000;
+  background: #000;
+}
+
+.maxSwiper > swiper {
+  width: 100%;
+  height: 100%;
+}
+
 .SignUp {
   width: 100%;
   position: absolute;

pages/EstateDetail/index.js

@@ -32,7 +32,14 @@ Page({
         method: $api.building.detail.method,
       }).then((data) => {
         const dicts = app.globalData.Dict
-        const apart = data.data.buildingApartment.map(x => {
+        const apart = data.data.buildingApartment.filter(x => x.apartmentType === 'apart').map(x => {
+          return {
+            ...x,
+            imgUrl: (x.buildingImgList[0] || {}).url,
+            marketStatus: (dicts.filter(d => d.id == x.marketStatus)[0] || {}).name
+          }
+        })
+        const photo = data.data.buildingApartment.filter(x => x.apartmentType === 'photo').map(x => {
           return {
             ...x,
             imgUrl: (x.buildingImgList[0] || {}).url,
@@ -52,9 +59,12 @@ Page({
             openingDate: data.data.openingDate.split(' ')[0],
             propertyType: propertyType,
             buildingApartment: apart,
-            IsCollect: (_that.data.Collects.filter(x => x.buildingId == data.data.buildingId).length > 0 ? true : false)
+            IsCollect: (_that.data.Collects.filter(x => x.buildingId == data.data.buildingId).length > 0 ? true : false),
+            Photos: photo || []
           }
         })
+        console.log(_that.data.EstateDetail.buildingApartment)
+        console.log(_that.data.EstateDetail.Photos)
       })
     })
   },
@@ -62,7 +72,21 @@ Page({
     UserInfo: app.globalData.UserInfo,
     ScreenBottomHeight: app.globalData.ScreenBottomHeight,
     EstateDetail: {},
-    Collects: []
+    Collects: [],
+    ShowMaxSwiper: false,
+    CurrentImgList: []
+  },
+  CloseMaxSwiper() { // 关闭大图
+    this.setData({
+      ShowMaxSwiper: false
+    })
+  },
+  CheckMaxImg(e) { // 查看大图
+    // console.log(e.target.dataset)
+    this.setData({
+      CurrentImgList: this.data.EstateDetail[e.target.dataset.type][e.target.dataset.index].buildingImgList,
+      ShowMaxSwiper: true
+    })
   },
   MakeAnAppointment() { // 预约看房
     wx.navigateTo({

pages/EstateDetail/index.wxml

@@ -56,17 +56,40 @@
         <view class="list">
           <view class="item" wx:for="{{EstateDetail.buildingApartment}}" wx:for-item="item" wx:for-index="idx" wx:key="key">
             <view class="img">
-              <image mode="aspectFill" src="{{item.imgUrl}}" class="centerLabel cover"></image>
+              <image mode="aspectFit" src="{{item.imgUrl}}" class="centerLabel contain" data-type="buildingApartment" data-index="{{idx}}" bindtap="CheckMaxImg"></image>
             </view>
             <view class="info">
               <text>{{item.apartmentName}}</text>
-              <text>{{item.remark}}</text>
+              <!-- <text>{{item.remark}}</text> -->
             </view>
             <text>{{item.marketStatus}}</text>
           </view>
         </view>
       </view>
 
+      <!-- 相册 -->
+      <view class="roomType subContent" hidden="{{!EstateDetail.Photos.length}}">
+        <text class="title">相册（{{EstateDetail.Photos.length}}）</text>
+        <view class="list">
+          <view class="item" wx:for="{{EstateDetail.Photos}}" wx:for-item="item" wx:for-index="idx" wx:key="key">
+            <view class="img">
+              <image mode="aspectFit" src="{{item.imgUrl}}" class="centerLabel contain" data-type="Photos" data-index="{{idx}}" bindtap="CheckMaxImg"></image>
+            </view>
+            <view class="info">
+              <text>{{item.apartmentName}}</text>
+            </view>
+          </view>
+        </view>
+      </view>
+
+      <!-- 周边配套 -->
+      <view class="roomType subContent">
+        <text class="title">周边配套</text>
+        <view style="padding: 0 40rpx;position:relative;overflow:hidden;">
+          <rich-text nodes="{{EstateDetail.remark}}"></rich-text>
+        </view>
+      </view>
+
     </view>
   </view>
 
@@ -87,4 +110,16 @@
     </view>
   </view>
 
+  <view class="maxSwiper" hidden="{{!ShowMaxSwiper}}">
+    <swiper autoplay="{{false}}" indicator-dots="{{false}}">
+      <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>
+          </view>
+        </swiper-item>
+      </block>
+    </swiper>
+  </view>
+
 </view>

pages/EstateDetail/index.wxss

@@ -1,6 +1,21 @@
 /**index.wxss**/
 @import '../../app.wxss';
 
+.maxSwiper {
+  width: 100%;
+  position: absolute;
+  left: 0;
+  top: 0;
+  bottom: 0;
+  z-index: 1000;
+  background: #000;
+}
+
+.maxSwiper > swiper {
+  width: 100%;
+  height: 100%;
+}
+
 .container > .flex-item {
   position: relative;
   overflow: hidden;