merge

config/api.js

@@ -61,6 +61,30 @@ const $api = {
       url: `${BaseAPIURl}wx/activity/:id`
     }
   },
+  appointment: {
+    getByUser: {
+      methods: 'GET',
+      url: `${BaseAPIURl}/wx/appointment/:openid`
+    },
+    save: {
+      methods: 'POST',
+      url: `${BaseAPIURl}/wx/appointment/:openid`
+    }
+  },
+  collection: {
+    getByUser: {
+      methods: 'GET',
+      url: `${BaseAPIURl}/wx/collection/:openid`
+    },
+    save: {
+      methods: 'POST',
+      url: `${BaseAPIURl}/wx/collection/:openid`
+    },
+    deleteById: {
+      methods: 'DELETE',
+      url: `${BaseAPIURl}/wx/collection/:openid`
+    }
+  }
 }
 
 const hasKey = (o, k) => Object.keys(o).indexOf(k) > -1

pages/AppointmentTime/index.js

@@ -3,7 +3,7 @@
 const app = getApp()
 
 const page = require('../../utils/page.js');
-const HttpSever = require('../../utils/http.js').HttpSever;
+import fetch from '../../utils/http'
 const $api = require('../../config/api.js').$api;
 
 Page({
@@ -36,12 +36,47 @@ Page({
       this.setData({
         SubmitOff: false
       })
-      if (this.FormData)
-      HttpSever.Ajax({
-        url: $api.building.detail.url.replace(':id', id),
-        method: $api.building.detail.method,
-      }).then((data) => {})
-
+      if (this.data.FormData.AppointmentDate == '') {
+        wx.showToast({
+          title: '请选择预约时间',
+          icon: 'none'
+        })
+        return
+      }
+      if (this.data.FormData.Name == '') {
+        wx.showToast({
+          title: '请填写您的姓名',
+          icon: 'none'
+        })
+        return
+      }
+      if (this.data.FormData.PhoneNum == '') {
+        wx.showToast({
+          title: '请输入您的手机号',
+          icon: 'none'
+        })
+        return
+      }
+      fetch({
+        url: $api.appointment.save.url.replace(':openid', app.globalData.UserInfo.openid),
+        method: $api.appointment.save.method,
+        data: JSON.stringify({
+          buildingId: this.data.BuildingId,
+          appointmentDate: this.data.FormData.AppointmentDate,
+          customerName: this.data.FormData.Name,
+          phone: this.data.FormData.PhoneNum,
+          remark: this.data.FormData.Remark
+        })
+      }).then((data) => {
+        wx.showToast({
+          title: '预约成功!',
+          success: () => {
+            wx.navigateTo({
+              url: '/pages/EstateDetail/index?id=' + this.data.BuildingId
+            })
+          }
+        })
+      })
     }
   },
   FormInput(e) { // 表单输入数据绑定

pages/AppointmentTime/index.wxml

@@ -8,7 +8,7 @@
       <image mode="widthFix" src="/assets/images/icon12.png" style="width: 22rpx;"></image>
     </view>
     <view class="flex-h">
-      <text>选择预约时间：</text>
+      <text><text>*</text>选择预约时间：</text>
       <view class="flex-item"></view>
       <text bindtap="SelectAppointmentDate">{{AppointmentDate === '' ? '请选择预约时间' : AppointmentDate}}</text>
       <image mode="widthFix" src="/assets/images/icon12.png" style="width: 22rpx;"></image>
@@ -28,7 +28,7 @@
       </view>
     </view>
     <view class="flex-h">
-      <text><text>*</text>备注：</text>
+      <text>备注：</text>
       <view class="flex-item">
         <input placeholder="请输入备注信息" data-name="Remark" bindinput="FormInput" />
       </view>

pages/EstateDetail/index.js

@@ -3,7 +3,7 @@
 const app = getApp()
 
 const page = require('../../utils/page.js');
-const HttpSever = require('../../utils/http.js').HttpSever;
+import fetch from '../../utils/http'
 const $api = require('../../config/api.js').$api;
 
 Page({
@@ -15,27 +15,34 @@ Page({
   onLoad: function (options) {
     const id = page.getCurrentPageOptions().id
     const _that = this
-    HttpSever.Ajax({
-      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.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, propertyType: propertyType, buildingApartment: apart}
+
+    fetch({
+      url: $api.collection.getByUser.replace(':openid', app.globalData.UserInfo.openid),
+      method: $api.collection.getByUser.method
+    }).then((collects) => {
+      console.log(collects)
+      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.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, propertyType: propertyType, buildingApartment: apart }
+        })
       })
     })
   },
@@ -49,6 +56,17 @@ Page({
       url: '/pages/AppointmentTime/index?id=' + this.data.EstateDetail.buildingId + '&name=' + this.data.EstateDetail.buildingName
     })
   },
+  MakeCollect() {
+    app.globalData.UserInfo.openid
+    fetch({
+      url: $api.collection.save.url.replace(':openid', app.globalData.UserInfo.openid) + '?buildingId=' + this.data.EstateDetail.buildingId,
+      method: $api.collection.save.method,
+    }).then((data) => {
+      wx.showToast({
+        title: '收藏成功!'
+      })
+    })
+  },
   OpenPhone() { // 电话咨询
     let _self = this
     wx.makePhoneCall({

pages/EstateDetail/index.wxml

@@ -79,7 +79,7 @@
     <view class="flex-item">
       <image mode="widthFix" wx:if="{{!EstateDetail.IsCollect}}" src="/assets/images/icon25.png" style="width: 34rpx;"></image>
       <image mode="widthFix" wx:if="{{EstateDetail.IsCollect}}" src="/assets/images/icon26.png" style="width: 34rpx;"></image>
-      <text>{{EstateDetail.IsCollect ? '已收藏' : '收藏楼盘'}}</text>
+      <text bindtap="MakeCollect">{{EstateDetail.IsCollect ? '已收藏' : '收藏楼盘'}}</text>
     </view>
     <view class="flex-item" bindtap="OpenPhone">
       <image mode="widthFix" src="/assets/images/icon24.png" style="width: 34rpx;"></image>

utils/http.js

@@ -5,9 +5,7 @@ export default (config = {}) => {
     wx.request({
       url: config.url,
       method: config.method,
-      data: {
-        ...config.data
-      },
+      data: config.data,
       success(res) {
         if (res.statusCode && res.statusCode === apiCode.success) {
           resolve(res.data)