update

app.json

@@ -1,5 +1,6 @@
 {
-  "pages":[
+  "pages": [
+    "pages/map/testmap",
     "pages/index/index",
     "pages/EstateDetail/index",
     "pages/AppointmentTime/index",
@@ -14,17 +15,18 @@
     "pages/SelfServiceTool/Cyclopedia/Detail",
     "pages/SelfServiceTool/MortgageCalculator/index",
     "pages/SelfServiceTool/IntegralSettlementPolicy/index",
-    "pages/SelfServiceTool/AboutYinCheng/index"
+    "pages/SelfServiceTool/AboutYinCheng/index",
+    "pages/MyWelfare/index"
   ],
-  "window":{
-    "backgroundTextStyle":"light",
+  "window": {
+    "backgroundTextStyle": "light",
     "navigationBarBackgroundColor": "#bb9c79",
     "navigationBarTitleText": "",
-    "navigationBarTextStyle":"white"
+    "navigationBarTextStyle": "white"
   },
   "permission": {
     "scope.userLocation": {
       "desc": "您的位置将用于效果展示"
     }
   }
-}
+}

config/api.js

@@ -52,6 +52,10 @@ const $api = {
     }
   },
   building: {
+    mainlist: {
+      method: 'GET',
+      url: `${BaseAPIURl}wx/building/mian`
+    },
     list: {
       method: 'GET',
       url: `${BaseAPIURl}wx/building/list`

pages/EstateDetail/index.wxml

@@ -16,17 +16,16 @@
             </block>
           </swiper>
         </view>
-        <view class="remark">
-          <view class="centerLabel">
-            <view class="flex-h">
-              <text class="name flex-item">{{EstateDetail.buildingName}}</text>
-              <text class="price">均价：{{EstateDetail.price}}</text>
-            </view>
-            <text>别名:{{EstateDetail.name || ''}}</text>
+      </view>
+      <view class="remark subContent">
+        <view class="centerLabel">
+          <view class="flex-h">
+            <text class="name flex-item">{{EstateDetail.buildingName}}</text>
+            <text class="price">均价：{{EstateDetail.price}}</text>
           </view>
+          <text>别名:{{EstateDetail.name || ''}}</text>
         </view>
       </view>
-
       <!-- 基本信息 -->
       <view class="mainInfo subContent">
         <text class="title">基本信息</text>

pages/EstateDetail/index.wxss

@@ -56,14 +56,51 @@
 
 .banner {
   width: 100%;
-  height: 0;
+  height:420rpx;
   position: relative;
   overflow: hidden;
   background: #eee;
-  padding-bottom: 120%;
+  /* padding-bottom: 120%; */
 }
 
-.banner .remark {
+.remark{
+  width: 100%;
+  height: 148rpx;
+  overflow: hidden;
+  position: absolute;
+}
+.remark > view {
+  width: 100%;
+}
+
+.remark .name {
+  font-size: 30rpx;
+  line-height: 44rpx;
+  margin-left: 40rpx;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  font-weight: bold;
+}
+
+.remark .price {
+  font-size: 24rpx;
+  line-height: 44rpx;
+  margin-right: 40rpx;
+  margin-left: 20rpx;
+}
+
+.remark > view > text {
+  display: block;
+  padding: 0 40rpx;
+  font-size: 24rpx;
+  line-height: 38rpx;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+/* .banner .remark {
   width: 100%;
   height: 200rpx;
   position: absolute;
@@ -107,7 +144,7 @@
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
-}
+} */
 
 .banner .wx-swiper-dots {
   bottom: 200rpx;

pages/MyWelfare/index.js

@@ -0,0 +1,136 @@
+import store from '../../store'
+import create from '../../utils/create'
+import fetch from '../../utils/http'
+import {
+  get as getApi
+} from '../../config/api'
+
+const app = getApp()
+
+create(store, {
+  onShow() {
+    wx.setNavigationBarTitle({
+      title: '我的福利社'
+    })
+  },
+  onLoad() {
+    let _self = this
+    wx.getSystemInfo({
+      success(res) {
+        _self.setData({
+          WindowHeight: res.windowHeight
+        })
+      }
+    })
+    this.GetList()
+  },
+  data: {
+    list: [],
+    DeleteIndex: null,
+    IsNull: false,
+    WindowHeight: 0,
+    PostData: {
+      pageNum: 1,
+      pageSize: 10
+    },
+    IsLock: false,
+    Total: 1
+  },
+  GetList() {
+    if (!this.data.IsLock && this.data.list.length < this.data.Total) {
+      this.setData({
+        IsLock: true
+      })
+      let userInfo = app.globalData.UserInfo
+      fetch({
+        ...getApi('user.signUpList', {
+          openid: userInfo.openid
+        }),
+        query: {
+          ...this.data.PostData
+        },
+      }).then((res) => {
+        let list = res.data.records || []
+        let aArr = this.data.list || []
+        list.map((item) => {
+          aArr.push(item)
+        })
+        this.setData({
+          list: aArr,
+          Total: res.data.total,
+          PostData: {
+            ...this.data.PostData,
+            pageNum: this.data.PostData.pageNum + 1
+          }
+        })
+        this.setData({
+          IsNull: !this.data.list.length
+        })
+        setTimeout(() => {
+          this.setData({
+            IsLock: false
+          })
+        }, 300)
+      }).catch((err) => {
+        wx.showToast({
+          title: '获取列表失败',
+          icon: 'none',
+        })
+        setTimeout(() => {
+          this.setData({
+            IsLock: false
+          })
+        }, 300)
+      })
+    }
+  },
+  ShowDeleteItem(e) { // 长按显示删除
+    this.setData({
+      DeleteIndex: e.target.dataset.index
+    })
+  },
+  ResetDeleteIndex() { // 重置删除状态
+    this.setData({
+      DeleteIndex: null
+    })
+  },
+  DeleteItem() { // 确认删除逻辑
+    const delId = this.data.DeleteIndex
+    this.ResetDeleteIndex()
+
+    const _self = this
+
+    wx.showModal({
+      title: '确认',
+      content: '确认要删除当前记录?',
+      success(res) {
+        if (res.confirm) {
+
+          fetch({
+            ...getApi('user.delAppointment', {
+              id: delId
+            }),
+          }).then(() => {
+            const list = _self.data.list.filter(x => x.appointmentId !== delId)
+
+            _self.setData({
+              list
+            })
+          }).catch((err) => {
+            wx.showToast({
+              title: '删除失败',
+              icon: 'none',
+            })
+          })
+
+
+        } else if (res.cancel) {
+          console.log('用户点击取消')
+        }
+      }
+    })
+  },
+  onShareAppMessage: function () {
+    return app.globalData.ShareDate
+  }
+})

pages/MyWelfare/index.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": { }
+}

pages/MyWelfare/index.wxml

@@ -0,0 +1,28 @@
+<!--index.wxml-->
+<view class="MainPage" bindtouchmove="ResetDeleteIndex">
+  <scroll-view scroll-y style="height: {{WindowHeight}}px;" bindscrolltolower="GetList">
+    <view class="isNull centerLabel" hidden="{{!IsNull}}">
+      <text>暂无数据</text>
+    </view>
+    <view class="list">
+      <view class="flex-h" wx:for="{{list}}" wx:for-item="item" wx:key="item.activityId">
+
+        <!-- 左侧图片 -->
+        <view class="img">
+          <image mode="aspectFill" src="{{item.imgUrl}}" class="centerLabel cover"></image>
+        </view>
+
+        <!-- 右侧内容 -->
+        <view class="flex-item">
+          <view>
+            <text>{{item.title}}</text>
+            <text>{{item.desc}}</text>
+            <text class="price">活动时间：<text>{{item.activityDate}}</text></text>
+          </view>
+        </view>
+
+      </view>
+    </view>
+    <text class="noMore" wx:if="{{!IsNull}}">{{list.length < Total ? '正在加载更多...' : '已加载全部'}}</text>
+  </scroll-view>
+</view>

pages/MyWelfare/index.wxss

@@ -0,0 +1,84 @@
+/**index.wxss**/
+@import '../../app.wxss';
+
+.list {
+  padding: 30rpx;
+  position: relative;
+  overflow: hidden;
+}
+
+.list > view {
+  padding: 20rpx;
+  position: relative;
+  overflow: hidden;
+  background: #fff;
+  margin-top: 30rpx;
+  box-shadow: 0 0 20rpx 10rpx rgba(0, 0, 0, 0.05);
+}
+
+.list > view:first-child {
+  margin-top: 0;
+}
+
+.img {
+  width: 140rpx;
+  height: 186rpx;
+  position: relative;
+  overflow: hidden;
+  background: #eee;
+  border-radius: 10rpx;
+}
+
+.list > view > .flex-item {
+  margin-left: 30rpx;
+}
+
+.list .delete {
+  width: 100%;
+  position: relative;
+  overflow: hidden;
+  text-align: right;
+  margin-top: -10rpx;
+}
+
+.list .delete image {
+  width: 24rpx;
+  display: inline-block;
+}
+
+.list text {
+  width: 100%;
+  display: block;
+  line-height: 40rpx;
+  font-size: 26rpx;
+  color: #999;
+}
+
+.list .delete + text {
+  font-size: 30rpx;
+  font-weight: bold;
+  color: #000;
+  line-height: 44rpx;
+}
+
+.list text.price {
+  text-align: right;
+  color: red;
+}
+
+.list text.price text {
+  display: inline;
+  color: red;
+  font-size: 30rpx;
+  font-weight: bold;
+}
+
+.noMore {
+  width: 100%;
+  display: block;
+  text-align: center;
+  color: #666;
+  font-size: 24rpx;
+  line-height: 40rpx;
+  margin: 0 20rpx;
+}

pages/SelfServiceTool/MortgageCalculator/index.js

@@ -83,19 +83,11 @@ Page({
       id: '30'
     }],
     ShowCommercialLoanRateList: false,
-    CommercialLoanRateList: [{ // 商业贷款利率选项
-      value: '基准利率（4.9%）',
-      id: '0.049'
-    }, {
-      value: '基准利率7折（3.43%）',
-      id: '0.0343'
-    }, {
-      value: '基准利率75折（3.68%）',
-      id: '0.0368'
-    }, {
+    CommercialLoanRateList: [{
       value: '基准利率8折（3.92%）',
       id: '0.0392'
-    }, {
+    },
+    {
       value: '基准利率85折（4.17%）',
       id: '0.0417'
     }, {
@@ -104,6 +96,9 @@ Page({
     }, {
       value: '基准利率95折（4.66%）',
       id: '0.0466'
+    },{ // 商业贷款利率选项
+        value: '基准利率（4.9%）',
+        id: '0.049'
     }, {
       value: '基准利率1.05倍（5.15%）',
       id: '0.0515'
@@ -113,21 +108,9 @@ Page({
     }, {
       value: '基准利率1.2倍（5.88%）',
       id: '0.0588'
-    }, {
-      value: '基准利率1.3倍（6.37%）',
-      id: '0.0637'
     }],
     ShowPublicHousingFundLoanRateList: false,
     PublicHousingFundLoanRateList: [{ // 公积金贷款利率选项
-      value: '基准利率（3.25%）',
-      id: '0.0325'
-    }, {
-      value: '基准利率7折（2.27%）',
-      id: '0.0227'
-    }, {
-      value: '基准利率75折（2.44%）',
-      id: '0.0244'
-    }, {
       value: '基准利率8折（2.60%）',
       id: '0.026'
     }, {
@@ -139,6 +122,9 @@ Page({
     }, {
       value: '基准利率95折（3.09%）',
       id: '0.0309'
+    }, {
+      value: '基准利率（3.25%）',
+      id: '0.0325'
     }, {
       value: '基准利率1.05倍（3.41%）',
       id: '0.0341'
@@ -148,9 +134,6 @@ Page({
     }, {
       value: '基准利率1.2倍（3.90%）',
       id: '0.039'
-    }, {
-      value: '基准利率1.3倍（4.23%）',
-      id: '0.0423'
     }],
     Options: {
       RepaymentType: '2', // 还款方式： 1-等额本金；2-等额本息（123）

pages/SelfServiceTool/QualifyingTest/index.js

@@ -129,7 +129,7 @@ Page({
               this.setData({
                 CanSubmit: true
               })
-            }, 1000)
+            }, 300)
           }
         }
       })
@@ -142,7 +142,7 @@ Page({
           ActiveIndex: aIndex,
           TapOff: true
         })
-      }, 1000)
+      }, 300)
     }
   },
   PrevQuestion() { // 上一题

pages/UserCenter/UserInfo/index.js

@@ -15,6 +15,39 @@ create(store, {
     })
   },
   SaveUserInfo() { // 提交表单数据
+    if (this.store.data.userInfo.name === '') {
+      wx.showToast({
+        title: '昵称不能为空！',
+        icon: 'none',
+      })
+      return false
+    }
+    if (!this.store.data.userInfo.phone || this.store.data.userInfo.phone == '') {
+      wx.showToast({
+        title: '手机号不能为空！',
+        icon: 'none',
+      })
+      return false
+    }
+    var myreg = /^[1][3,4,5,7,8,9][0-9]{9}$/;
+    if (!myreg.test(this.store.data.userInfo.phone)) {
+      wx.showToast({
+        title: '手机号格式不正确！',
+        icon: 'none',
+      })
+      return false
+    }
+    if (this.store.data.userInfo.idNum && this.store.data.userInfo.idNum!='') {
+      var idreg = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/;
+      if (!idreg.test(this.store.data.userInfo.idNum)) {
+        wx.showToast({
+          title: '身份证格式不正确！',
+          icon: 'none',
+        })
+        return false
+      }
+    }
+
     fetch({ ...getApi('user.update'), data: this.store.data.userInfo }).then(() => {
       // 同步到 globalData
       app.globalData.UserInfo = { ...this.store.data.userInfo }

pages/components/Concessions/index.js

@@ -10,7 +10,7 @@ Component({
   data: {
     UserInfo: app.globalData.UserInfo,
     NavList: [{
-      value: '项目动态',
+      value: '楼盘资讯',
       id: ''
     }, {
       value: '精彩活动',

pages/components/Estate/index.js

@@ -11,7 +11,9 @@ Component({
   properties: {},
   data: {
     UserInfo: app.globalData.UserInfo,
-    EstateList: []
+    EstateList: [],
+    x: 1,
+    y: 1
   },
   lifetimes: {},
   ready: function() {

pages/components/Estate/index.wxml

@@ -2,8 +2,8 @@
 <view class="SubContainer">
   <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" scale-max="2.5" x="{{x}}" y="{{y}}" direction="all">
-        <image mode="aspectFit" src="/assets/images/img4.jpg" class="centerLabel contian bg"></image>
+      <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>
       </movable-view>
     </movable-area>
     <!-- <image mode="widthFix" src="/assets/images/img4.jpg" class="centerLabel cover bg"></image>
@@ -14,13 +14,19 @@
     <text>附近楼盘</text>
     <view class="list">
       <view wx:for="{{EstateList}}" wx:for-item="item" wx:for-index="index" wx:key="key" data-id="{{item.buildingId}}" bindtap="ListTap">
-        <image mode="aspectFill" src="{{item.buildingImg}}" class="centerLabel cover"></image>
-        <text class="price">均价：{{item.price}}</text>
-        <text class="name">{{item.buildingName}}</text>
-        <view class="address flex-h">
-          <image mode="widthFix" src="/assets/images/icon8.png"></image>
+        <image mode="aspectFill" src="{{item.buildingImg}}" class="cover"></image>
+        <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
+          </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

@@ -41,14 +41,14 @@
 .EstateList > text {
   width: 100%;
   display: block;
-  text-indent: 48rpx;
+  text-indent: 34rpx;
   font-size: 32rpx;
   font-weight: bold;
   line-height: 42rpx;
   position: relative;
 }
 
-.EstateList > text::after {
+/* .EstateList > text::after {
   content: '';
   width: 6rpx;
   height: 32rpx;
@@ -57,7 +57,7 @@
   position: absolute;
   left: 30rpx;
   top: 8rpx;
-}
+} */
 
 .EstateList .list {
   width: 100%;
@@ -77,8 +77,8 @@
 
 .EstateList .list > view {
   display: inline-block;
-  width: 285rpx;
-  height: 380rpx;
+  width: 380rpx;
+  height: 390rpx;
   position: relative;
   overflow: hidden;
   border-radius: 10rpx;
@@ -92,16 +92,69 @@
 }
 
 .EstateList .list > view > image {
-  border-radius: 10rpx;
+  border-radius: 10rpx 10rpx 0 0;
+  width: 100%;
+  height: 212rpx;
+  top: 0;
   z-index: 1;
 }
 
 .EstateList .list > view > text {
   position: absolute;
   z-index: 2;
-  color: #fff;
 }
 
+.EstateList .estateDetail{
+  padding: 0 22rpx;
+  display: block;
+}
+
+.EstateList .estateDetail .name{
+  display: block;
+  font-size: 32rpx;
+  line-height: 48rpx;
+  margin-top: 30rpx;
+  overflow: hidden;
+  color: #333333;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  font-weight: 600;
+}
+
+.EstateList .estateDetail .address{
+  color: #666666;
+  font-size: 22rpx;
+  line-height: 36rpx;
+}
+
+.EstateList .estateDetail .address image {
+  display: inline-block;
+  width: 12rpx;
+  margin-right: 10rpx;
+  vertical-align: middle;
+}
+
+.EstateList .estateDetail .address text {
+  color: #666666;
+  font-size: 22rpx;
+  line-height: 36rpx;
+  display: inline-block;
+  vertical-align: middle;
+}
+
+.EstateList .estateDetail .price{
+  font-size: 22rpx;
+  color: #666666;
+  padding-top: 10rpx;
+  line-height: 30rpx;
+  vertical-align: middle;
+}
+
+.EstateList .estateDetail .price text{
+  color: red;
+}
+
+/* 
 .EstateList .price {
   display: inline-block;
   padding: 0 15rpx;
@@ -116,35 +169,25 @@
 .EstateList .name {
   display: block;
   padding: 0 20rpx;
-  font-size: 24rpx;
+  font-size: 32rpx;
   line-height: 34rpx;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
   left: 0;
-  bottom: 46rpx;
+  bottom: 110rpx;
 }
 
 .EstateList .address{
   padding: 0 20rpx;
   position: absolute;
   left: 0;
-  bottom: 16rpx;
+  bottom: 72rpx;
   z-index: 2;
   align-items: center;
 }
 
-.EstateList .address image {
-  display: inline-block;
-  width: 12rpx;
-  margin-right: 10rpx;
-}
-
-.EstateList .address text {
-  color: #fff;
-  font-size: 17rpx;
-  line-height: 30rpx;
-}
+ */
 
 movable-view {
   position: relative;

pages/components/Mine/index.js

@@ -13,7 +13,7 @@ create({
       icon: '/assets/images/icon16.png',
       router: ''
     }, {
-      value: '我的福利社',
+      value: '我报名的活动',
       icon: '/assets/images/icon17.png',
       router: ''
     }, {
@@ -24,10 +24,6 @@ create({
       value: '收藏的楼盘',
       icon: '/assets/images/icon19.png',
       router: ''
-    }, {
-      value: '楼盘展示',
-      icon: '/assets/images/icon20.png',
-      router: ''
     }, {
       value: '购房工具',
       icon: '/assets/images/icon21.png',
@@ -58,8 +54,11 @@ create({
           url: '/pages/UserCenter/UserInfo/index'
         })
       } else if (e.target.dataset.type === 1) { // 我的福利社
-        this.triggerEvent('myevent', {
-          index: 2
+        if (!this.checkUserLogin()) {
+          return
+        }
+        wx.navigateTo({
+          url: '/pages/MyWelfare/index'
         })
       } else if (e.target.dataset.type === 2) { // 预约记录
         if (!this.checkUserLogin()) {

pages/components/SubIndex/index.js

@@ -43,32 +43,69 @@ Component({
       })
     })
 
-    fetch({
-      url: $api.dynamic.list.url,
-      method: $api.dynamic.list.method,
-      data: {
-        pageNum: 1,
-        pageSize: 10
-      }
-    }).then((dynamics) => {
-      const records = dynamics.data.records.map(x => {
-        return {
-          ...x,
-          createDate: x.createDate.slice(2, 10)
+    wx.getSetting({
+      success(res) {
+        if (!res.authSetting['scope.userLocation']) {
+          wx.authorize({
+            scope: 'scope.userLocation',
+            success() {
+              _that.GetBuildingList()
+            }
+          })
+        } else {
+          _that.GetBuildingList()
         }
-      })
-      _that.setData({
-        EstateList: records
-      })
+      }
     })
   },
   pageLifetimes: {
     show: function() {},
   },
   methods: {
+    GetBuildingList() {
+      const _that = this
+      wx.getLocation({
+        type: 'wgs84',
+        success(res) {
+          fetch({
+            url: $api.building.mainlist.url,
+            method: $api.building.mainlist.method,
+            data: {
+              pageNum: 1,
+              pageSize: 10
+            }
+          }).then((buildings) => {
+            const records = buildings.data.map(x => {
+              const distance = parseInt(_that.GetGreatCircleDistance(res.latitude, res.longitude, x.coordinate.split(',')[0], x.coordinate.split(',')[1] || res.longitude))
+              return {
+                ...x,
+                distance: distance / 10
+              }
+            })
+            _that.setData({
+              EstateList: records
+            })
+          })
+        }})
+    },
+    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
+    },
     ItemTap(e) {
       wx.navigateTo({
-        url: '/pages/ActivityDetail/index?type=1&id=' + e.target.dataset.id
+        url: '/pages/EstateDetail/index?id=' + e.target.dataset.id
       })
     },
     TopNavTap(e) { // topnav点击事件

pages/components/SubIndex/index.wxml

@@ -34,15 +34,18 @@
     </view>
   </view>
   <view class="projectList">
-    <text>项目动态</text>
+    <text>精选楼盘</text>
     <view class="list">
       <view wx:for="{{EstateList}}" wx:for-item="item" wx:for-index="index" wx:key="key">
-        <text class="name">{{item.title}}</text>
-        <text class="date">{{item.createDate}}</text>
+        <text class="name">{{item.buildingName}}</text>
+        <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>
         <view class="listImg">
           <view>
-            <image mode="aspectFill" src="{{item.imgUrl}}" class="centerLabel cover" data-id="{{item.dynamicId}}" bindtap="ItemTap"></image>
-            <text>{{item.building.buildingName}}</text>
+            <image mode="aspectFill" src="{{item.buildingImg[0].url}}" class="centerLabel cover" data-id="{{item.buildingId}}" bindtap="ItemTap"></image>
+            <text class="price">均价：{{item.price}}</text>
           </view>
         </view>
       </view>

pages/components/SubIndex/index.wxss

@@ -157,9 +157,22 @@
   font-weight: bold;
 }
 
-.projectList .date {
+.projectList .address {
   font-size: 20rpx;
-  line-height: 32rpx;
+  line-height: 34rpx;
+  color: #666666;
+  padding: 0 20rpx;
+}
+
+.projectList .address image {
+  display: inline-block;
+  width: 18rpx;
+  margin-right: 5rpx;
+  margin-top: 4rpx;
+}
+
+.projectList .address text{
+  padding: 0 5rpx;
 }
 
 .projectList .listImg {
@@ -187,7 +200,7 @@
   background: #bb9c79;
   border-radius: 36rpx;
   position: absolute;
-  left: 20rpx;
+  right: 20rpx;
   bottom: 20rpx;
   z-index: 2;
 }

pages/index/index.js

@@ -40,7 +40,7 @@ create(store, {
       })
     } else if (index === 2) {
       wx.setNavigationBarTitle({
-        title: '项目动态'
+        title: '楼盘资讯'
       })
     } else if (index === 3) {
       wx.setNavigationBarTitle({

pages/map/testmap.js

@@ -0,0 +1,113 @@
+// pages/map/testmap.js
+var QQMapWX = require('../../utils/qqmap-wx-jssdk.js');
+var qqmapsdk;
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    height: 'auto',
+    markers: []
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  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({
+          height: res.windowHeight
+        })
+      }
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+    const _this = this
+    qqmapsdk.search({
+      keyword: '教育',  //搜索关键词
+      page_size: 20,
+      location: '39.980014,116.313972',  //设置周边搜索中心点
+      filter: 'category=大学,中学,小学,幼儿园',
+      success: function (res) { //搜索成功后的回调
+        console.log(res)
+        var mks = []
+        for (var i = 0; i < res.data.length; i++) {
+          mks.push({ // 获取返回结果，放到mks数组中
+            title: res.data[i].title,
+            id: res.data[i].id,
+            latitude: res.data[i].location.lat,
+            longitude: res.data[i].location.lng,
+            iconPath: "/resources/my_marker.png", //图标路径
+            width: 20,
+            height: 20
+          })
+        }
+        _this.setData({ //设置markers属性，将搜索结果显示在地图中
+          markers: mks
+        })
+      },
+      fail: function (res) {
+        console.log(res);
+      },
+      complete: function (res) {
+        console.log(res);
+      }
+    });
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

pages/map/testmap.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

pages/map/testmap.wxml

@@ -0,0 +1 @@
+<map id="map" markers="{{markers}}" longitude="116.313972" latitude="39.980014" scale="14" style="width: 100%; height: {{height}}px;"></map>

pages/map/testmap.wxss

@@ -0,0 +1 @@
+/* pages/map/testmap.wxss */