update

config/api.js

@@ -127,6 +127,10 @@ const $api = {
     method: 'POST',
     url: `${BaseAPIURl}uploadImage`
   },
+  visit: {
+    method: 'POST',
+    url: `${BaseAPIURl}/wx/building/visit/:id`
+  }
 }
 
 const hasKey = (o, k) => Object.keys(o).indexOf(k) > -1

pages/EstateDetail/index.js

@@ -17,7 +17,6 @@ Page({
   onLoad: function(options) {
     const id = page.getCurrentPageOptions().id
     const _that = this
-
     //调用wx.getSystemInfo接口，然后动态绑定组件高度
     wx.getSystemInfo({
       success: function(res) {
@@ -32,51 +31,70 @@ Page({
     })
 
     fetch({
-      url: $api.collection.getByUser.url.replace(':openid', app.globalData.UserInfo.openid),
-      method: $api.collection.getByUser.method,
+      url: $api.visit.url.replace(':id', id),
+      method: $api.visit.method,
       data: {
-        pageNum: 1,
-        pageSize: 100
+        customerId: app.globalData.UserInfo.customerId,
+        customerName: app.globalData.UserInfo.name,
+        avatar: app.globalData.UserInfo.avatar,
+        visitType: 'building',
+        visitContent: id
       }
-    }).then((collects) => {
-      _that.setData({
-        Collects: collects.data.records
-      })
+    }).then(() => {
       fetch({
-        url: $api.building.detail.url.replace(':id', id),
-        method: $api.building.detail.method,
-      }).then((data) => {
-        const dicts = app.globalData.Dict
-        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,
-            marketStatus: (dicts.filter(d => d.id == x.marketStatus)[0] || {}).name
-          }
-        })
-        let propertyType = ''
-        data.data.propertyType.split(',').map(x => {
-          const f = dicts.filter(d => d.id == x)
-          if (f.length > 0) {
-            propertyType += (propertyType === '' ? '' : ',') + f[0].name
-          }
-        })
+        url: $api.collection.getByUser.url.replace(':openid', app.globalData.UserInfo.openid),
+        method: $api.collection.getByUser.method,
+        data: {
+          pageNum: 1,
+          pageSize: 100
+        }
+      }).then((collects) => {
         _that.setData({
-          EstateDetail: {
-            ...data.data,
-            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),
-            Photos: photo || []
-          }
+          Collects: collects.data.records
+        })
+        fetch({
+          url: $api.building.detail.url.replace(':id', id),
+          method: $api.building.detail.method,
+        }).then((data) => {
+          const dicts = app.globalData.Dict
+          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,
+              marketStatus: (dicts.filter(d => d.id == x.marketStatus)[0] || {}).name
+            }
+          })
+          let propertyType = ''
+          data.data.propertyType.split(',').map(x => {
+            const f = dicts.filter(d => d.id == x)
+            if (f.length > 0) {
+              propertyType += (propertyType === '' ? '' : ',') + f[0].name
+            }
+          })
+          _that.setData({
+            EstateDetail: {
+              ...data.data,
+              latitude: data.data.coordinate.split(',')[0] - 0,
+              longitude: data.data.coordinate.split(',')[1] - 0,
+              markers: [{
+                id: data.data.buildingId,
+                latitude: data.data.coordinate.split(',')[0] - 0,
+                longitude: data.data.coordinate.split(',')[1] - 0,
+              }],
+              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),
+              Photos: photo || []
+            }
+          })
         })
       })
     })
@@ -89,59 +107,7 @@ Page({
     Collects: [],
     ShowMaxSwiper: false,
     CurrentImgList: [],
-    CurrentIndex: 0,
-    LookerList: [{
-      icon: '/assets/images/img1.jpg',
-      id: ''
-    }, {
-      icon: '/assets/images/img1.jpg',
-      id: ''
-    }, {
-      icon: '/assets/images/img1.jpg',
-      id: ''
-    }, {
-      icon: '/assets/images/img1.jpg',
-      id: ''
-    }, {
-      icon: '/assets/images/img1.jpg',
-      id: ''
-    }, {
-      icon: '/assets/images/img1.jpg',
-      id: ''
-    }, {
-      icon: '/assets/images/img1.jpg',
-      id: ''
-    }, {
-      icon: '/assets/images/img1.jpg',
-      id: ''
-    }, {
-      icon: '/assets/images/img1.jpg',
-      id: ''
-    }, {
-      icon: '/assets/images/img1.jpg',
-      id: ''
-    }, {
-      icon: '/assets/images/img1.jpg',
-      id: ''
-    }, {
-      icon: '/assets/images/img1.jpg',
-      id: ''
-    }, {
-      icon: '/assets/images/img1.jpg',
-      id: ''
-    }, {
-      icon: '/assets/images/img1.jpg',
-      id: ''
-    }, {
-      icon: '/assets/images/img1.jpg',
-      id: ''
-    }, {
-      icon: '/assets/images/img1.jpg',
-      id: ''
-    }, {
-      icon: '/assets/images/img1.jpg',
-      id: ''
-    }]
+    CurrentIndex: 0
   },
   CloseMaxSwiper() { // 关闭大图
     this.setData({
@@ -189,5 +155,10 @@ Page({
       path: '/pages/EstateDetail/index?id=' + this.data.EstateDetail.buildingId,
       imageUrl: this.data.EstateDetail.buildingImg[0].url
     }
+  },
+  toMore () {
+    wx.navigateTo({
+      url: '/pages/VisitorList/index?id=' + this.data.EstateDetail.buildingId,
+    })
   }
 })

pages/EstateDetail/index.wxml

@@ -2,7 +2,6 @@
 <view class="container flex-v">
   <view class="flex-item">
     <view class="content">
-
       <!-- 轮播图 -->
       <view class="banner">
         <view class="imgContent">
@@ -30,11 +29,14 @@
       <!-- 围观 -->
       <view class="looker">
         <text>
-          <text>123</text>人围观
+          <text>{{EstateDetail.visits.length}}</text>人围观
         </text>
         <view class="list">
-          <view class="item" wx:for="{{LookerList}}" wx:for-index="index" wx:for-item="item" wx:key="key" wx:if="{{index <= 12}}">
-            <image mode="aspectFill" src="{{item.icon}}" class="centerLabel cover"></image>
+          <view class="item" wx:for="{{EstateDetail.visits}}" wx:for-index="index" wx:for-item="item" wx:key="key" wx:if="{{index <= 12}}">
+            <image mode="aspectFill" src="{{item.avatar}}" data-index="index" class="centerLabel cover"></image>
+            <view class="centerLabel" wx:if="{{index === 12}}" bindtap='toMore'>
+              <text class="centerLabel">···</text>
+            </view>
           </view>
         </view>
       </view>
@@ -100,14 +102,14 @@
         <view class="map">
           <view>
             <view class="mapBox">
-              <view>
-                <map id="map" markers="{{[]}}" longitude="116.313972" latitude="39.980014" scale="14" style="width: 100%; height: {{height}}px;"></map>
+              <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>
               </view>
             </view>
             <view class="flex-h">
               <view class="flex-item">
-                <text>银城颐居悦见山</text>
-                <text>白马路111号</text>
+                <text>{{EstateDetail.buildingName}}</text>
+                <text>{{EstateDetail.address}}</text>
               </view>
               <text>前往</text>
               <image mode="widthFix" src="/assets/images/icon1.png"></image>

pages/EstateDetail/index.wxss

@@ -88,6 +88,7 @@
   line-height: 44rpx;
   margin-right: 40rpx;
   margin-left: 20rpx;
+  max-width:50%;
 }
 
 .remark > view > text {
@@ -356,17 +357,17 @@
   margin-left: 0;
 }
 
-.looker .list > view:last-child::after {
-  content: '···';
+.looker .list > view > view{
   width: 100%;
   height: 100%;
   position: absolute;
   display: block;
   z-index: 2;
   background: rgba(0, 0, 0, 0.5);
+}
+
+.looker .list > view > view text {
   color: #fff;
-  text-align: center;
-  line-height: 64rpx;
 }
 
 .map {

pages/VisitorList/index.js

@@ -11,25 +11,20 @@ Page({
       title: '访客列表'
     })
   },
-  onLoad: function(options) {},
+  onLoad: function(options) {
+    const id = page.getCurrentPageOptions().id
+    const _that = this
+    fetch({
+      url: $api.building.detail.url.replace(':id', id),
+      method: $api.building.detail.method,
+    }).then((data) => {
+      _that.setData({
+        list: data.data.visits
+      })
+    })
+  },
   data: {
     UserInfo: app.globalData.UserInfo,
-    list: [{
-      icon: '/assets/images/img1.jpg',
-      createDate: '2019-02-02',
-      name: '示例用户名'
-    }, {
-      icon: '/assets/images/img1.jpg',
-      createDate: '2019-02-02',
-      name: '示例用户名'
-    }, {
-      icon: '/assets/images/img1.jpg',
-      createDate: '2019-02-02',
-      name: '示例用户名'
-    }, {
-      icon: '/assets/images/img1.jpg',
-      createDate: '2019-02-02',
-      name: '示例用户名'
-    }]
+    list: []
   }
 })

pages/VisitorList/index.wxml

@@ -3,10 +3,10 @@
   <view>
     <view class="flex-h" wx:for="{{list}}" wx:for-item="item" wx:for-index="index" wx:key="key">
       <view class="icon">
-        <image mode="aspectFill" src="{{item.icon}}" class="centerLabel cover"></image>
+        <image mode="aspectFill" src="{{item.avatar}}" class="centerLabel cover"></image>
       </view>
-      <text class="flex-item">{{item.name}}</text>
-      <text>{{item.createDate}}</text>
+      <text class="flex-item">{{item.customerName}}</text>
+      <text>{{item.visitDate}}</text>
     </view>
   </view>
 </view>

pages/components/SubIndex/index.js

@@ -104,6 +104,7 @@ Component({
       return s / 100
     },
     ItemTap(e) {
+      console.log(e)
       wx.navigateTo({
         url: '/pages/EstateDetail/index?id=' + e.target.dataset.id
       })
@@ -122,6 +123,26 @@ Component({
           phoneNumber: '025-86505555'
         })
       }
+    },
+    toMap() {
+      wx.navigateTo({
+        url: '/pages/map/testmap',
+      })
+    },
+    toBuildingShow() {
+      this.triggerEvent('myevent', {
+        index: 1
+      })
+    },
+    toGf() {
+      wx.navigateTo({
+        url: '/pages/SelfServiceTool/index'
+      })
+    },
+    toTel() {
+      wx.makePhoneCall({
+        phoneNumber: '025-86505555'
+      })
     }
   }
 })

pages/components/SubIndex/index.wxml

@@ -53,45 +53,54 @@
   </view> -->
 
   <view class="top">
-    <image mode="aspectFill" src="/assets/images/img1.jpg" class="centerLabel cover"></image>
+    <!-- <image mode="aspectFill" src="/assets/images/img1.jpg" class="centerLabel cover"></image> -->
+    <view class="topView">
+      <swiper style='height:100%' autoplay="{{true}}" indicator-dots="{{false}}" indicator-color="#83837d" indicator-active-color="#e23838">
+        <block wx:for="{{banner}}" wx:for-item="item" wx:for-index="index" wx:key="key">
+          <swiper-item>
+            <view class="swiper-item">
+              <image mode="aspectFill" src="{{item.url}}" class="centerLabel cover"></image>
+            </view>
+          </swiper-item>
+        </block>
+      </swiper>
+    </view>
   </view>
 
   <view class="nav">
     <view class="flex-h">
-      <view class="flex-item">
+      <view class="flex-item" bindtap="toBuildingShow">
         <image mode="widthFix" src="/assets/images/icon5.png"></image>
         <text>楼盘展示</text>
       </view>
-      <view class="flex-item">
+      <view class="flex-item" bindtap="toGf">
         <image mode="widthFix" src="/assets/images/icon6.png"></image>
         <text>购房工具</text>
       </view>
-      <view class="flex-item">
+      <view class="flex-item" bindtap='toTel'>
         <image mode="widthFix" src="/assets/images/icon7.png"></image>
         <text>电话咨询</text>
       </view>
     </view>
   </view>
 
-  <text class="title">地图看房</text>
+  <text class="title" >地图看房</text>
 
   <view class="mapList">
     <view class="flex-h">
       <view class="flex-item">
-        <!-- <text>银城颐居悦见山</text>
-        <text>均价：<text>￥18000</text>元/m²</text> -->
         <swiper autoplay="{{true}}" style="height: 100rpx;" vertical="{{true}}">
-          <block wx:for="{{['','','']}}" wx:for-item="item" wx:for-index="index" wx:key="key">
+          <block wx:for="{{EstateList}}" wx:for-item="item" wx:for-index="index" wx:key="key">
             <swiper-item>
               <view class="swiper-item">
-                <text>银城颐居悦见山</text>
-                <text>均价：<text>￥18000</text>元/m²</text>
+                <text>{{item.buildingName}}</text>
+                <text>均价：<text>{{item.price}}</text></text>
               </view>
             </swiper-item>
           </block>
         </swiper>
       </view>
-      <view>
+      <view bindtap="toMap">
         <image mode="widthFix" src="/assets/images/icon7.png"></image>
         <text>地图看新房</text>
       </view>
@@ -101,28 +110,26 @@
   <text class="title">精选房源</text>
 
   <view class="roomList">
-    <view wx:for="{{['', '', '']}}" wx:for-index="index" wx:for-item="item" wx:key="key">
+    <view wx:for="{{EstateList}}" wx:for-item="item" wx:for-index="index" wx:key="key" data-id="{{item.buildingId}}" bindtap='ItemTap'>
       <view class="img">
-        <image mode="aspectFill" src="/assets/images/img1.jpg" class="centerLabel cover"></image>
-        <view class="flex-h">
-          <view class="flex-item">
-            <text>111</text>
-            <text>111</text>
-            <text>111</text>
+        <image mode="aspectFill" data-id="{{item.buildingId}}" src="{{item.buildingImg[0].url}}" class="centerLabel cover"></image>
+        <view class="flex-h" data-id="{{item.buildingId}}" >
+          <view class="flex-item" data-id="{{item.buildingId}}" >
+            <text data-id="{{item.buildingId}}" wx:for="{{item.buildingTag}}" wx:for-item="tag" wx:for-index="index" wx:key="key">{{tag.tagName}}</text>
           </view>
-          <image mode="widthFix" src="/assets/images/icon7.png"></image>
-          <text>浦口区</text>
+          <image data-id="{{item.buildingId}}" mode="widthFix" src="/assets/images/icon7.png"></image>
+          <text data-id="{{item.buildingId}}">{{item.buildingArea}}</text>
         </view>
       </view>
-      <text class="icon">热销</text>
-      <view class="info">
-        <view class="flex-h">
-          <text class="flex-item">示例标题</text>
-          <text>均价：<text>￥1.8</text>万元/m²</text>
+      <text data-id="{{item.buildingId}}" class="icon">{{item.marketStatus || ''}}</text>
+      <view data-id="{{item.buildingId}}" class="info">
+        <view data-id="{{item.buildingId}}" class="flex-h">
+          <text class="flex-item" data-id="{{item.buildingId}}">{{item.buildingName}}</text>
+          <text data-id="{{item.buildingId}}">均价：<text>{{item.price}}</text></text>
         </view>
-        <view class="flex-h">
-          <text class="flex-item">江北白马路 距您21.2km</text>
-          <text>114人围观</text>
+        <view data-id="{{item.buildingId}}" class="flex-h">
+          <text class="flex-item" data-id="{{item.buildingId}}">{{item.address}} 距您{{item.distance}}km</text>
+          <text data-id="{{item.buildingId}}">{{item.visits.length}}人围观</text>
         </view>
       </view>
     </view>

pages/components/SubIndex/index.wxss

@@ -14,6 +14,14 @@
   background: #eee;
 }
 
+.topView{
+  position: absolute;
+  width: 100%;
+  top: 0;
+  left: 0;
+  bottom: 0;
+}
+
 .nav {
   padding: 0 40rpx;
   position: relative;
@@ -265,7 +273,11 @@
 
 .roomList .info > view:nth-child(1) > text:nth-child(2) {
   line-height: 52rpx;
-  font-size: 22rpx;
+  font-size:22rpx;
+  max-width:50%;
+  overflow:hidden;
+  white-space:nowrap;
+  text-overflow:ellipsis;
 }
 
 .roomList .info > view:nth-child(1) > text text {

pages/map/testmap.js

@@ -0,0 +1,231 @@
+// pages/map/testmap.js
+var QQMapWX = require('../../utils/qqmap-wx-jssdk.js');
+var qqmapsdk;
+import fetch from '../../utils/http'
+const $api = require('../../config/api.js').$api;
+
+Page({
+
+      /**
+   * 页面的初始数据
+   */
+      data: {
+        longitude: 116.313972,
+        latitude: 39.980014,
+        controls: [],
+        markers: [],
+        height: 'auto',
+        markers: [],
+        showLayer: false,
+        windowHeight: 0,
+        scale: 12,
+        defaultMarkers: [],
+        buildings: [],
+        navList: [{
+          value: '交通',
+          id: 'bus',
+          count: '20'
+        }, {
+          value: '教育',
+          id: 'school',
+          count: '20'
+        }, {
+          value: '医疗',
+          id: 'hospital',
+          count: '20'
+        }, {
+          value: '商业',
+          id: 'business',
+          count: '20'
+        }],
+        navIndex: 0,
+        list: [],
+        actionBuilding: {}
+      },
+    
+      /**
+   * 生命周期函数监听页面加载
+   */
+  onLoad: function (options) {
+    qqmapsdk = new QQMapWX({
+      key: 'KJCBZ-G2MKX-DB443-Z4CBR-7E6K2-GJF5D'
+    });
+    //保证wx.getSystemInfo的回调函数中能够使用this
+    var that = this
+    //调用wx.getSystemInfo接口，然后动态绑定组件高度
+    wx.getSystemInfo({
+      success: function (res) {
+        that.setData({
+          windowHeight: res.windowHeight,
+          height: res.windowHeight
+        })}
+    })
+  },
+
+  clickMarker(marker) {
+    const building = this.data.buildings.filter(x => x.buildingId == marker.markerId)[0]
+    if (!building) {
+      return
+    }
+    this.setData({
+      actionBuilding: building
+    })
+
+    this.search()
+  },
+
+  search() {
+    const building = this.data.actionBuilding
+    const _this = this
+    qqmapsdk.search({
+      keyword: _this.data.navList[_this.data.navIndex].value, //搜索关键词
+      page_size: 20,
+      location: building.coordinate, //设置周边搜索中心点
+      success: function (res) { //搜索成功后的回调
+        var navlist = []
+        for (var i = 0; i < res.data.length; i++) {
+          navlist.push({
+            value: res.data[i].title,
+            id: res.data[i].id,
+            distance: res.data[i]._distance
+          })
+        }
+        _this.setData({ //设置markers属性，将搜索结果显示在地图中
+          showLayer: true,
+          scale: 14,
+          latitude: building.coordinate.split(',')[0],
+          longitude: building.coordinate.split(',')[1],
+          height: 300,
+          list: navlist,
+        })
+      },
+      fail: function (res) {
+        console.log(res);
+      },
+      complete: function (res) {
+        console.log(res);
+      }
+    });
+  },
+
+  GetGreatCircleDistance(lat1, lng1, lat2, lng2) {
+    if (lat1 === lat2 && lng1 === lng2) {
+      return 0
+    }
+    var EARTH_RADIUS = 6378137.0//单位M
+    var PI = Math.PI
+    var radLat1 = lat1 * PI / 180.0
+    var radLat2 = lat2 * PI / 180.0
+    var a = radLat1 - radLat2
+    var b = lng1 * PI / 180.0 - lng2 * PI / 180.0
+    var s = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) + Math.cos(radLat1) * Math.cos(radLat2) * Math.pow(Math.sin(b / 2), 2)))
+    s = s * EARTH_RADIUS
+    s = Math.round(s * 10000) / 10000.0
+    return s / 100
+  },
+
+    /**
+   * 生命周期函数监听页面初次渲染完成
+   */
+    onReady: function() {
+      const _that = this
+      fetch({
+        url: $api.building.mainlist.url,
+        method: $api.building.mainlist.method,
+        data: {
+          pageNum: 1,
+          pageSize: 10
+        }
+      }).then((buildings) => {
+        const markers = buildings.data.map(x => {
+          return {
+            id: x.buildingId,
+            latitude: x.coordinate.split(',')[0],
+            longitude: x.coordinate.split(',')[1],
+            iconPath: '',
+            label: {
+              content: x.buildingName,
+              color: '#fff',
+              bgColor: '#bb9c79',
+              padding: 5,
+              borderRadius: 5
+            }
+          }
+        })
+        _that.setData({
+          defaultMarkers: markers,
+          markers: markers,
+          longitude: markers[0].longitude,
+          latitude: markers[0].latitude,
+          buildings: buildings.data
+        })
+      })
+
+    },
+
+    /**
+   * 生命周期函数监听页面显示
+   */
+    onShow: function() {
+    
+    },
+
+    /**
+   * 生命周期函数监听页面隐藏
+   */
+    onHide: function() {
+    
+    },
+
+    /**
+   * 生命周期函数监听页面卸载
+   */
+    onUnload: function() {
+    
+    },
+
+    /**
+   * 页面相关事件处理函数监听用户下拉动作
+   */
+    onPullDownRefresh: function() {
+    
+    },
+
+    /**
+   * 页面上拉触底事件的处理函数
+   */
+    onReachBottom: function() {
+    
+    },
+
+    /**
+   * 用户点击右上角分享
+   */
+    onShareAppMessage: function() {
+    
+    },
+    cutNav(e) {
+      this.setData({
+        navIndex: e.target.dataset.index
+      })
+      this.search()
+  },
+  closeLayer(){
+    this.setData({
+      showLayer: false,
+      height: this.data.windowHeight
+    })
+  },
+  toFirstPage() {
+    wx.navigateTo({
+      url: '/pages/index/index'
+    })
+  },
+  toDaohang() {
+    wx.openLocation({
+      latitude: this.data.actionBuilding.coordinate.split(',')[0] - 0,
+      longitude: this.data.actionBuilding.coordinate.split(',')[1] - 0,
+      scale: 16
+    })
+  }
+})

pages/map/testmap.wxml

@@ -1,39 +1,39 @@
 <view class="container">
   <view class="map">
-    <map bindtouchstart="closeLayer" id="map" markers="{{markers}}" longitude="116.313972" latitude="39.980014" scale="14" style="width: 100%; height: {{height}}px;"></map>
+    <map bindtouchstart="closeLayer" bindmarkertap="clickMarker" id="map" markers="{{markers}}" longitude="{{longitude}}" latitude="{{latitude}}" scale="{{scale}}" style="width: 100%; height: {{height}}px;"></map>
   </view>
   <cover-view class="layer flex-v {{showLayer ? 'active' : ''}}">
     <cover-view class="nav">
-      <cover-view class="navItem">
+      <cover-view class="navItem" bindtap="toFirstPage">
         <cover-view class="centerLabel">
-          <cover-image class="navImg" mode="widthFix" src="/assets/images/icon1.png"></cover-image>
+          <cover-image class="navImg" mode="widthFix" src="/assets/images/firstpage.png"></cover-image>
           <cover-view class="navText">首页</cover-view>
         </cover-view>
       </cover-view>
-      <cover-view class="navItem">
-        <cover-view class="centerLabel">
-          <cover-image class="navImg" mode="widthFix" src="/assets/images/icon1.png"></cover-image>
+      <cover-view class="navItem" >
+        <button class="centerLabel" open-type="share">
+          <cover-image class="navImg" mode="widthFix" src="/assets/images/share.png"></cover-image>
           <cover-view class="navText">分享</cover-view>
-        </cover-view>
+        </button>
       </cover-view>
-      <cover-view class="navItem">
+      <!-- <cover-view class="navItem">
         <cover-view class="centerLabel">
           <cover-image class="navImg" mode="widthFix" src="/assets/images/icon1.png"></cover-image>
           <cover-view class="navText">南京</cover-view>
         </cover-view>
-      </cover-view>
+      </cover-view> -->
     </cover-view>
     <cover-view class="mainDetail flex-item">
       <cover-view class="detail flex-v">
         <cover-view class="top flex-h">
           <cover-view class="flex-item">
-            <cover-view class="name">银城颐居悦见山</cover-view>
-            <cover-view class="remark">老山风景区</cover-view>
-            <cover-view class="remark">项目自带商业</cover-view>
+            <cover-view class="name">{{actionBuilding.buildingName}}</cover-view>
+            <cover-view class="remark">{{actionBuilding.buildingTag[0].tagName || ''}}</cover-view>
+            <cover-view class="remark">{{actionBuilding.buildingTag[1].tagName || ''}}</cover-view>
           </cover-view>
-          <cover-view class="btn">
+          <cover-view class="btn" bindtap='toDaohang'>
             <cover-view class="centerLabel">
-              <cover-image class="btnImg" mode="widthFix" src="/assets/images/icon1.png"></cover-image>
+              <cover-image class="btnImg" mode="widthFix" src="/assets/images/daohang.png"></cover-image>
               <cover-view class="text">导航</cover-view>
             </cover-view>
           </cover-view>

pages/map/testmap.wxss

@@ -46,14 +46,24 @@
   margin-left: 10px;
 }
 
+.layer .navItem button{
+  padding: 0;
+  line-height: 0;
+  color: #fff;
+  background: none;
+  border: none;
+  font-size: 20px;
+}
+
 .layer .nav .centerLabel {
   text-align: center;
   width: 100%;
 }
 
 .layer .navImg  {
-  max-width: 16px;
-  max-height: 16px;
+  /* max-width: 16px;
+  max-height: 16px; */
+  width: 14px;
   display: inline-block;
 }
 
@@ -63,7 +73,7 @@
   color: #666;
   width: 100%;
   display: block;
-  margin-top: -5rpx;
+  margin-top: -10rpx;
 }
 
 .layer .mainDetail {