update

config/api.js

@@ -130,6 +130,12 @@ const $api = {
   visit: {
     method: 'POST',
     url: `${BaseAPIURl}/wx/building/visit/:id`
+  },
+  propaganda: {
+    list: {
+      method: 'GET',
+      url: `${BaseAPIURl}/wx/propagandaList`
+    }
   }
 }
 

pages/EstateDetail/index.js

@@ -160,5 +160,10 @@ Page({
     wx.navigateTo({
       url: '/pages/VisitorList/index?id=' + this.data.EstateDetail.buildingId,
     })
+  },
+  toMap (e) {
+    wx.navigateTo({
+      url: '/pages/map/testmap?id=' + this.data.EstateDetail.buildingId,
+    })
   }
 })

pages/EstateDetail/index.wxml

@@ -61,6 +61,10 @@
             <text>最新动态</text>
             <text class="flex-item">{{EstateDetail.dynamic}}</text>
           </view>
+          <view class="flex-h">
+            <text>楼盘优惠</text>
+            <text class="flex-item"><text class="txtred">{{EstateDetail.discount || ''}}</text></text>
+          </view>
         </view>
       </view>
 
@@ -103,10 +107,11 @@
           <view>
             <view class="mapBox">
               <view wx:if="EstateDetail">
-                <map id="map" markers="{{EstateDetail.markers}}" longitude="{{EstateDetail.longitude}}" latitude="{{EstateDetail.latitude}}" scale="14" style="width: 100%; height: {{height}}px;"></map>
+                <!-- <map id="map" markers="{{EstateDetail.markers}}" longitude="{{EstateDetail.longitude}}" latitude="{{EstateDetail.latitude}}" scale="14" style="width: 100%; height: {{height}}px;"></map> -->
+                <image mode="widthFix" src='{{EstateDetail.mapImg}}'></image>
               </view>
             </view>
-            <view class="flex-h">
+            <view class="flex-h" bindtap='toMap'>
               <view class="flex-item">
                 <text>{{EstateDetail.buildingName}}</text>
                 <text>{{EstateDetail.address}}</text>
@@ -116,30 +121,30 @@
             </view>
           </view>
         </view>
-        <view class="transInfo flex-h">
-          <view class="flex-item">
-            <text>交通</text>
-            <image mode="widthFix" src="/assets/images/icon1.png"></image>
-            <text>约20处</text>
-            <text>接驳路线</text>
+        <view class="transInfo flex-h" bindtap='toMap'>
+          <view class="flex-item" data-val='交通'>
+            <text data-val='交通'>交通</text>
+            <image data-val='交通' mode="widthFix" src="/assets/images/icon1.png"></image>
+            <text data-val='交通'>约20处</text>
+            <text data-val='交通'>接驳路线</text>
           </view>
-          <view class="flex-item">
-            <text>教育</text>
-            <image mode="widthFix" src="/assets/images/icon1.png"></image>
-            <text>约20所</text>
-            <text>教育机构</text>
+          <view class="flex-item" data-val='教育'>
+            <text data-val='教育'>教育</text>
+            <image data-val='教育' mode="widthFix" src="/assets/images/icon1.png"></image>
+            <text data-val='教育'>约20所</text>
+            <text data-val='教育'>教育机构</text>
           </view>
-          <view class="flex-item">
-            <text>医疗</text>
-            <image mode="widthFix" src="/assets/images/icon1.png"></image>
-            <text>约20所</text>
-            <text>医疗机构</text>
+          <view class="flex-item" data-val='医疗'>
+            <text data-val='医疗'>医疗</text>
+            <image data-val='医疗' mode="widthFix" src="/assets/images/icon1.png"></image>
+            <text data-val='医疗'>约20所</text>
+            <text data-val='医疗'>医疗机构</text>
           </view>
-          <view class="flex-item">
-            <text>商业</text>
-            <image mode="widthFix" src="/assets/images/icon1.png"></image>
-            <text>约20所</text>
-            <text>周边商业</text>
+          <view class="flex-item" data-val='商业'>
+            <text data-val='商业'>商业</text>
+            <image data-val='商业' mode="widthFix" src="/assets/images/icon1.png"></image>
+            <text data-val='商业'>约20所</text>
+            <text data-val='商业'>周边商业</text>
           </view>
         </view>
         <view style="padding: 0 40rpx;position:relative;overflow:hidden;">

pages/EstateDetail/index.wxss

@@ -198,16 +198,21 @@
 
 .mainInfo .list > view text {
   line-height: 44rpx;
-  font-size: 22rpx;
+  font-size: 24rpx;
   margin-left: 25rpx;
   color: #999;
 }
 
+
 .mainInfo .list > view text:first-child {
   color: #333;
   margin-left: 0;
 }
 
+.mainInfo .list > view text .txtred{
+  color: #e23838;
+}
+
 .roomType .list {
   width: 100%;
   position: relative;
@@ -403,6 +408,11 @@
   overflow: hidden;
 }
 
+.mapBox > view > image{
+  width:100%;
+  height:100%;
+}
+
 .map > view > view.flex-h {
   align-items: center;
   padding: 25rpx 0;

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.jpg" class="centerLabel cover bg"></image>
+        <image mode="aspectFill" src="https://whole-estate.oss-cn-beijing.aliyuncs.com/img4-new-2.jpg" class="centerLabel cover bg"></image>
       </movable-view>
     </movable-area>
     <!-- <image mode="widthFix" src="/assets/images/img4.jpg" class="centerLabel cover bg"></image>

pages/components/SubIndex/index.js

@@ -104,7 +104,6 @@ Component({
       return s / 100
     },
     ItemTap(e) {
-      console.log(e)
       wx.navigateTo({
         url: '/pages/EstateDetail/index?id=' + e.target.dataset.id
       })

pages/index/index.js

@@ -1,5 +1,7 @@
 import store from '../../store'
 import create from '../../utils/create'
+import fetch from '../../utils/http'
+const $api = require('../../config/api.js').$api;
 
 const app = getApp()
 
@@ -8,9 +10,22 @@ create(store, {
     this.setData({
       NavActiveIndex: e.index || 0
     })
+    const _that = this
+    fetch({
+      url: $api.propaganda.list.url,
+      method: $api.propaganda.list.method
+    }).then((imgs) => {
+      if(imgs.data.length>0) {
+        _that.setData({
+          ShowLayer: true,
+          propagandaList: imgs.data
+        })
+      }
+    })
   },
   data: {
     ShowLayer: false,
+    propagandaList: [],
     NavList: [{ // navlist数据
       value: '首页',
       icon: '/assets/images/icon1.png'
@@ -59,5 +74,22 @@ create(store, {
   },
   onShareAppMessage: function () {
     return app.globalData.ShareDate
+  },
+  closeLayer() {
+    this.setData({
+      ShowLayer: false
+    })
+  },
+  propagandaClick(e) {
+    if (e.target.dataset.pro.skipType && e.target.dataset.pro.skipType == 'building' && e.target.dataset.pro.skipId != ''){
+      wx.navigateTo({
+        url: '/pages/EstateDetail/index?id=' + e.target.dataset.pro.skipId,
+      })
+    }
+    if (e.target.dataset.pro.skipType && e.target.dataset.pro.skipType == 'activity' && e.target.dataset.pro.skipId != '') {
+      wx.navigateTo({
+        url: '/pages/ActivityDetail/index?type=2&id=' + e.target.dataset.pro.skipId,
+      })
+    }
   }
 })

pages/index/index.wxml

@@ -37,11 +37,11 @@
   <!-- 弹窗 -->
   <view class="layer" hidden="{{!ShowLayer}}">
     <view class="centerLabel">
-      <view class="top">
+      <view class="top" bindtap='closeLayer'>
         <image mode="widthFix" src="/assets/images/icon43.png"></image>
       </view>
       <view class="content">
-        引用内容
+        <image mode='widthFix' data-pro="{{propagandaList[0]}}" bindtap='propagandaClick' src='{{propagandaList[0].imgUrl}}'></image>
       </view>
     </view>
   </view>

pages/index/index.wxss

@@ -86,6 +86,7 @@
   background: #fff;
   border-radius: 20rpx;
   box-shadow: 0 0 20rpx 10rpx rgba(0, 0, 0, 0.05);
+  overflow: hidden;
 }
 
 .layer .top {
@@ -110,4 +111,8 @@
   overflow: hidden;
   margin: 0 auto;
   z-index: 1001;
-}
+}
+
+.layer .content image{
+  width: 100%;
+}

pages/map/testmap.js

@@ -3,6 +3,7 @@ var QQMapWX = require('../../utils/qqmap-wx-jssdk.js');
 var qqmapsdk;
 import fetch from '../../utils/http'
 const $api = require('../../config/api.js').$api;
+const page = require('../../utils/page.js');
 
 Page({
 
@@ -40,13 +41,21 @@ Page({
         }],
         navIndex: 0,
         list: [],
-        actionBuilding: {}
+        actionBuilding: {},
+        buildingId: ''
       },
     
       /**
    * 生命周期函数监听页面加载
    */
   onLoad: function (options) {
+    const id = page.getCurrentPageOptions().id
+    if (id) {
+      this.setData({
+        buildingId: id
+      })
+    }
+
     qqmapsdk = new QQMapWX({
       key: 'KJCBZ-G2MKX-DB443-Z4CBR-7E6K2-GJF5D'
     });
@@ -63,7 +72,11 @@ Page({
   },
 
   clickMarker(marker) {
-    const building = this.data.buildings.filter(x => x.buildingId == marker.markerId)[0]
+    this.setAction(marker.markerId)
+  },
+
+  setAction(buildingId) {
+    const building = this.data.buildings.filter(x => x.buildingId == buildingId)[0]
     if (!building) {
       return
     }
@@ -130,14 +143,18 @@ Page({
     onReady: function() {
       const _that = this
       fetch({
-        url: $api.building.mainlist.url,
-        method: $api.building.mainlist.method,
+        url: $api.building.list.url,
+        method: $api.building.list.method,
         data: {
           pageNum: 1,
           pageSize: 10
         }
       }).then((buildings) => {
-        const markers = buildings.data.map(x => {
+        let list = buildings.data
+        if (_that.data.buildingId && _that.data.buildingId != '') {
+          list = list.filter(x => x.buildingId == _that.data.buildingId)
+        }
+        const markers = list.map(x => {
           return {
             id: x.buildingId,
             latitude: x.coordinate.split(',')[0],
@@ -157,8 +174,11 @@ Page({
           markers: markers,
           longitude: markers[0].longitude,
           latitude: markers[0].latitude,
-          buildings: buildings.data
+          buildings: list
         })
+        if (_that.data.buildingId && _that.data.buildingId != ''){
+          _that.setAction(_that.data.buildingId)
+        }
       })
 
     },
@@ -211,10 +231,12 @@ Page({
       this.search()
   },
   closeLayer(){
-    this.setData({
-      showLayer: false,
-      height: this.data.windowHeight
-    })
+    if (this.data.buildingId == '') {
+      this.setData({
+        showLayer: false,
+        height: this.data.windowHeight
+      })
+    }
   },
   toFirstPage() {
     wx.navigateTo({