merge error

config/api.js

@@ -26,7 +26,7 @@ const $api = {
   dict: {
     list: {
       methods: 'GET',
-      url: `${BaseAPIURl}/dict`
+      url: `${BaseAPIURl}dict`
     }
   },
   banner: {
@@ -41,8 +41,8 @@ const $api = {
       url: `${BaseAPIURl}wx/building/list`
     },
     detail: {
-      methods: 'GET',
-      url: `${BaseAPIURl}/wx/buildingSelectId/:id`
+      method: 'GET',
+      url: `${BaseAPIURl}wx/buildingSelectId/:id`
     }
   },
   dynamic: { // 项目
@@ -67,25 +67,25 @@ const $api = {
   },
   appointment: {
     getByUser: {
-      methods: 'GET',
+      method: 'GET',
       url: `${BaseAPIURl}wx/appointment/:openid`
     },
     save: {
-      methods: 'POST',
+      method: 'POST',
       url: `${BaseAPIURl}wx/appointment/:openid`
     }
   },
   collection: {
     getByUser: {
-      methods: 'GET',
+      method: 'GET',
       url: `${BaseAPIURl}wx/collection/:openid`
     },
     save: {
-      methods: 'POST',
+      method: 'POST',
       url: `${BaseAPIURl}wx/collection/:openid`
     },
     deleteById: {
-      methods: 'DELETE',
+      method: 'DELETE',
       url: `${BaseAPIURl}wx/collection/:openid`
     }
   }

pages/EstateDetail/index.js

@@ -17,10 +17,16 @@ Page({
     const _that = this
 
     fetch({
-      url: $api.collection.getByUser.replace(':openid', app.globalData.UserInfo.openid),
-      method: $api.collection.getByUser.method
+      url: $api.collection.getByUser.url.replace(':openid', app.globalData.UserInfo.openid),
+      method: $api.collection.getByUser.method,
+      data: {
+        pageNum: 1,
+        pageSize: 100
+      }
     }).then((collects) => {
-      console.log(collects)
+      _that.setData({
+        Collects: collects.data.records
+      })
       fetch({
         url: $api.building.detail.url.replace(':id', id),
         method: $api.building.detail.method,
@@ -41,7 +47,12 @@ Page({
           }
         })
         _that.setData({
-          EstateDetail: { ...data.data, propertyType: propertyType, buildingApartment: apart }
+          EstateDetail: { 
+            ...data.data, 
+            propertyType: propertyType, 
+            buildingApartment: apart, 
+            IsCollect: (_that.data.Collects.filter(x => x.buildingId == data.data.buildingId).length>0? true:false)
+            }
         })
       })
     })
@@ -49,7 +60,8 @@ Page({
   data: {
     UserInfo: app.globalData.UserInfo,
     ScreenBottomHeight: app.globalData.ScreenBottomHeight,
-    EstateDetail: {}
+    EstateDetail: {},
+    Collects: []
   },
   MakeAnAppointment() { // 预约看房
     wx.navigateTo({
@@ -57,7 +69,7 @@ Page({
     })
   },
   MakeCollect() {
-    app.globalData.UserInfo.openid
+    const _that = this
     fetch({
       url: $api.collection.save.url.replace(':openid', app.globalData.UserInfo.openid) + '?buildingId=' + this.data.EstateDetail.buildingId,
       method: $api.collection.save.method,
@@ -65,6 +77,9 @@ Page({
       wx.showToast({
         title: '收藏成功!'
       })
+      _that.setData({
+        EstateDetail: { ..._that.data.EstateDetail, IsCollect:true}
+      })
     })
   },
   OpenPhone() { // 电话咨询