update

config/api.js

@@ -21,6 +21,22 @@ const $api = {
     signUpList: { // 报名过的活动
       method: 'GET',
       url: `${BaseAPIURl}wx/activity/byuser/:openid`
+    },
+    appointment: {
+      method: 'GET',
+      url: `${BaseAPIURl}wx/appointment/:openid`
+    },    
+    delAppointment: {
+      method: 'DELETE',
+      url: `${BaseAPIURl}wx/appointment/of/:id`
+    },
+    building: {
+      method: 'GET',
+      url: `${BaseAPIURl}wx/collection/:openid`
+    },
+    delBuilding: {
+      method: 'DELETE',
+      url: `${BaseAPIURl}wx/collection/:openid`
     }
   },
   dict: {
@@ -112,9 +128,9 @@ const $api = {
 const hasKey = (o, k) => Object.keys(o).indexOf(k) > -1
 
 // 获取 api 支持 a.b.c 字符串格式
-function get(k = '') {
+function get(k = '', urlParams = {}) {
   let found = true
-  return k.split('.').reduce((acc, key) => {
+  const api = k.split('.').reduce((acc, key) => {
     if (!found) return acc;
 
     if (acc === 0) {
@@ -133,6 +149,18 @@ function get(k = '') {
       }
     }
   }, 0)
+
+  return {
+    ...api,
+    url: api.url.split('/').map((item) => {
+      if (item.indexOf(':') > -1) {
+        const key = item.replace(':', '')
+        return item !== 'https:' && hasKey(urlParams, key) ? urlParams[key] : item
+      }
+
+      return item
+    }).join('/')
+  }
 }
 
 module.exports = {

pages/EstateDetail/index.js

@@ -49,6 +49,7 @@ Page({
         _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)
@@ -85,7 +86,7 @@ Page({
   OpenPhone() { // 电话咨询
     let _self = this
     wx.makePhoneCall({
-      phoneNumber: _self.data.EstateDetail.PhoneNum
+      phoneNumber: _self.data.EstateDetail.tel
     })
   }
 })

pages/MyCollectEstateList/index.js

@@ -12,72 +12,53 @@ create(store, {
     })
   },
   onLoad () {
+    const userInfo = app.globalData.UserInfo
 
+    fetch({
+      ...getApi('user.building', { openid: userInfo.openid }),
+      query: { pageNum: 1, pageSize: 10 },
+    }).then(({ data }) => {
+      const list = data.records || []
+      this.setData({ list })
+    }).catch((err) => {
+      wx.showToast({
+        title: '获取列表失败',
+        icon: 'error',
+      })
+    })
   },
   data: {
-    List: [{
-      Img: '/assets/images/img5.jpg',
-      Name: '示例楼盘名称',
-      Address: '南京市xx路xx号',
-      Distance: '22.2',
-      Price: '2.1'
-    }, {
-      Img: '/assets/images/img5.jpg',
-      Name: '示例楼盘名称',
-      Address: '南京市xx路xx号',
-      Distance: '22.2',
-      Price: '2.1'
-    }, {
-      Img: '/assets/images/img5.jpg',
-      Name: '示例楼盘名称',
-      Address: '南京市xx路xx号',
-      Distance: '22.2',
-      Price: '2.1'
-    }, {
-      Img: '/assets/images/img5.jpg',
-      Name: '示例楼盘名称',
-      Address: '南京市xx路xx号',
-      Distance: '22.2',
-      Price: '2.1'
-    }, {
-      Img: '/assets/images/img5.jpg',
-      Name: '示例楼盘名称',
-      Address: '南京市xx路xx号',
-      Distance: '22.2',
-      Price: '2.1'
-    }, {
-      Img: '/assets/images/img5.jpg',
-      Name: '示例楼盘名称',
-      Address: '南京市xx路xx号',
-      Distance: '22.2',
-      Price: '2.1'
-    }, {
-      Img: '/assets/images/img5.jpg',
-      Name: '示例楼盘名称',
-      Address: '南京市xx路xx号',
-      Distance: '22.2',
-      Price: '2.1'
-    }, {
-      Img: '/assets/images/img5.jpg',
-      Name: '示例楼盘名称',
-      Address: '南京市xx路xx号',
-      Distance: '22.2',
-      Price: '2.1'
-    }, {
-      Img: '/assets/images/img5.jpg',
-      Name: '示例楼盘名称',
-      Address: '南京市xx路xx号',
-      Distance: '22.2',
-      Price: '2.1'
-    }],
-    DeleteIndex: null,
-    DeleteOff: true
+    list: [],
   },
-  DeleteItem() { // 确认删除逻辑
-    if (this.data.DeleteOff) {
-      this.setData({
-        DeleteOff: false
-      })
-    }
+  DeleteItem(e) { // 确认删除逻辑
+    const buildingId = e.target.dataset.index
+    const userInfo = app.globalData.UserInfo
+    const _self = this
+
+    wx.showModal({
+      title: '确认',
+      content: '确认要删除当前记录?',
+      success(res) {
+        if (res.confirm) {
+          
+          fetch({
+            ...getApi('user.delBuilding', { openid: userInfo.openid }),
+            query: { buildingId },
+          }).then(() => {
+            const list = _self.data.list.filter(x => x.buildingId !== buildingId)
+
+            _self.setData({ list })
+          }).catch((err) => {
+            wx.showToast({
+              title: '删除失败',
+              icon: 'error',
+            })
+          })
+
+        } else if (res.cancel) {
+          console.log('用户点击取消')
+        }
+      }
+    })
   }
 })

pages/MyCollectEstateList/index.wxml

@@ -1,23 +1,23 @@
 <!--index.wxml-->
 <view class="MainPage">
   <view class="list">
-    <view class="flex-h" wx:for="{{List}}" wx:for-item="item" wx:for-index="idx" wx:key="key">
+    <view class="flex-h" wx:for="{{list}}" wx:for-item="item" wx:key="item.buildingId">
 
       <!-- 左侧图片 -->
       <view class="img">
-        <image mode="aspectFill" src="{{item.Img}}" class="centerLabel cover" bindtap="DeleteItem"></image>
+        <image mode="aspectFill" src="{{item.buildingImg}}" class="centerLabel cover"></image>
       </view>
 
       <!-- 右侧内容 -->
       <view class="flex-item">
         <view>
           <view class="delete">
-            <image mode="widthFix" src="/assets/images/icon28.png"></image>
+            <image mode="widthFix" src="/assets/images/icon28.png" bindtap="DeleteItem" data-index="{{item.buildingId}}"></image>
           </view>
-          <text>{{item.Name}}</text>
-          <text>{{item.Address}}</text>
+          <text>{{item.name}}</text>
+          <text>{{item.address}}</text>
           <text>距您{{item.Distance}}km</text>
-          <text class="price">均价：<text>{{item.Price}}</text>万/平</text>
+          <text class="price">均价：<text>{{item.price}}</text>/平</text>
         </view>
       </view>
 

pages/UserCenter/UserInfo/index.js

@@ -7,13 +7,18 @@ const app = getApp()
 
 create(store, {
   data: {
-    UserInfo: app.globalData.UserInfo, // 用户信息
+    UserInfo: {}, // 用户信息
   },
   onReady() {
     wx.setNavigationBarTitle({
       title: '个人资料'
     })
   },
+  onLoad () {
+    this.setData({
+      UserInfo: app.globalData.UserInfo
+    })
+  },
   SaveUserInfo() { // 提交表单数据
     fetch({ ...getApi('user.update'), data: this.data.UserInfo }).then(() => {
       // 同步到 globalData

pages/components/SubIndex/index.js

@@ -1,10 +1,13 @@
 //index.js
 //获取应用实例
 const app = getApp()
+import fetch from '../../../utils/http'
+const $api = require('../../../config/api.js').$api;
 
 Component({
   behaviors: [],
   properties: {},
+  banner: [],
   data: {
     UserInfo: app.globalData.UserInfo,
     TopNavList: [{
@@ -20,28 +23,44 @@ Component({
       icon: '/assets/images/icon7.png',
       remark: '24小时电话客服热线：025-12345678'
     }],
-    EstateList: [{
-      Name: '示例数据',
-      CreateDate: '19-02-02',
-      Img: '/assets/images/img1.jpg',
-      Org: '悦见山'
-    }, {
-      Name: '示例数据',
-      CreateDate: '19-02-02',
-      Img: '/assets/images/img1.jpg',
-      Org: '悦见山'
-    }, {
-      Name: '示例数据',
-      CreateDate: '19-02-02',
-      Img: '/assets/images/img1.jpg',
-      Org: '悦见山'
-    }]
+    EstateList: []
   },
   lifetimes: {},
   ready: function() {
     wx.setNavigationBarTitle({
       title: '银城地产·江北公司'
     })
+    const _that = this
+    fetch({
+      url: $api.banner.list.url,
+      method: $api.banner.list.method,
+      data: {
+        imgLocation: 'firstPage'
+      }
+    }).then((imgs) => {
+      _that.setData({
+        banner: imgs.data
+      })
+    })
+
+    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)
+        }
+      })
+      _that.setData({
+        EstateList: records
+      })
+    })
   },
   pageLifetimes: {
     show: function() {},

pages/components/SubIndex/index.wxml

@@ -2,7 +2,17 @@
 <view class="SubContainer">
   <view class="top">
     <view class="bg">
-      <image mode="aspectFill" src="/assets/images/img1.jpg" class="centerLabel cover"></image>
+        <view class="imgContent">
+          <swiper 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>
@@ -27,12 +37,12 @@
     <text>项目动态</text>
     <view class="list">
       <view wx:for="{{EstateList}}" wx:for-item="item" wx:for-index="index" wx:key="key">
-        <text class="name">{{item.Name}}</text>
-        <text class="date">{{item.CreateDate}}</text>
+        <text class="name">{{item.title}}</text>
+        <text class="date">{{item.createDate}}</text>
         <view class="listImg">
           <view>
-            <image mode="aspectFill" src="{{item.Img}}" class="centerLabel cover"></image>
-            <text>{{item.Org}}</text>
+            <image mode="aspectFill" src="{{item.imgUrl}}" class="centerLabel cover"></image>
+            <text>{{item.building.buildingName}}</text>
           </view>
         </view>
       </view>