zjxpcyc 6 年 前
コミット
f1a9bde787
共有4 個のファイルを変更した35 個の追加63 個の削除を含む
  1. 10
    2
      config/api.js
  2. 14
    55
      pages/MyCollectEstateList/index.js
  3. 5
    5
      pages/MyCollectEstateList/index.wxml
  4. 6
    1
      pages/UserCenter/UserInfo/index.js

+ 10
- 2
config/api.js ファイルの表示

@@ -25,6 +25,10 @@ const $api = {
25 25
     delAppointment: {
26 26
       method: 'DELETE',
27 27
       url: `${BaseAPIURl}wx/appointment/of/:id`
28
+    },
29
+    building: {
30
+      method: 'GET',
31
+      url: `${BaseAPIURl}wx/collection/:openid`
28 32
     }
29 33
   },
30 34
   dict: {
@@ -123,8 +127,12 @@ function get(k = '', urlParams = {}) {
123 127
   return {
124 128
     ...api,
125 129
     url: api.url.split('/').map((item) => {
126
-      const key = item.replace(':', '')
127
-      return item !== 'https:' && hasKey(urlParams, key) ? urlParams[key] : item
130
+      if (item.indexOf(':') > -1) {
131
+        const key = item.replace(':', '')
132
+        return item !== 'https:' && hasKey(urlParams, key) ? urlParams[key] : item
133
+      }
134
+
135
+      return item
128 136
     }).join('/')
129 137
   }
130 138
 }

+ 14
- 55
pages/MyCollectEstateList/index.js ファイルの表示

@@ -12,64 +12,23 @@ create(store, {
12 12
     })
13 13
   },
14 14
   onLoad () {
15
+    const userInfo = app.globalData.UserInfo
15 16
 
17
+    fetch({
18
+      ...getApi('user.building', { openid: userInfo.openid }),
19
+      query: { pageNum: 1, pageSize: 10 },
20
+    }).then(({ data }) => {
21
+      const list = data.records || []
22
+      this.setData({ list })
23
+    }).catch((err) => {
24
+      wx.showToast({
25
+        title: '获取列表失败',
26
+        icon: 'error',
27
+      })
28
+    })
16 29
   },
17 30
   data: {
18
-    List: [{
19
-      Img: '/assets/images/img5.jpg',
20
-      Name: '示例楼盘名称',
21
-      Address: '南京市xx路xx号',
22
-      Distance: '22.2',
23
-      Price: '2.1'
24
-    }, {
25
-      Img: '/assets/images/img5.jpg',
26
-      Name: '示例楼盘名称',
27
-      Address: '南京市xx路xx号',
28
-      Distance: '22.2',
29
-      Price: '2.1'
30
-    }, {
31
-      Img: '/assets/images/img5.jpg',
32
-      Name: '示例楼盘名称',
33
-      Address: '南京市xx路xx号',
34
-      Distance: '22.2',
35
-      Price: '2.1'
36
-    }, {
37
-      Img: '/assets/images/img5.jpg',
38
-      Name: '示例楼盘名称',
39
-      Address: '南京市xx路xx号',
40
-      Distance: '22.2',
41
-      Price: '2.1'
42
-    }, {
43
-      Img: '/assets/images/img5.jpg',
44
-      Name: '示例楼盘名称',
45
-      Address: '南京市xx路xx号',
46
-      Distance: '22.2',
47
-      Price: '2.1'
48
-    }, {
49
-      Img: '/assets/images/img5.jpg',
50
-      Name: '示例楼盘名称',
51
-      Address: '南京市xx路xx号',
52
-      Distance: '22.2',
53
-      Price: '2.1'
54
-    }, {
55
-      Img: '/assets/images/img5.jpg',
56
-      Name: '示例楼盘名称',
57
-      Address: '南京市xx路xx号',
58
-      Distance: '22.2',
59
-      Price: '2.1'
60
-    }, {
61
-      Img: '/assets/images/img5.jpg',
62
-      Name: '示例楼盘名称',
63
-      Address: '南京市xx路xx号',
64
-      Distance: '22.2',
65
-      Price: '2.1'
66
-    }, {
67
-      Img: '/assets/images/img5.jpg',
68
-      Name: '示例楼盘名称',
69
-      Address: '南京市xx路xx号',
70
-      Distance: '22.2',
71
-      Price: '2.1'
72
-    }],
31
+    list: [],
73 32
     DeleteIndex: null,
74 33
     DeleteOff: true
75 34
   },

+ 5
- 5
pages/MyCollectEstateList/index.wxml ファイルの表示

@@ -1,11 +1,11 @@
1 1
 <!--index.wxml-->
2 2
 <view class="MainPage">
3 3
   <view class="list">
4
-    <view class="flex-h" wx:for="{{List}}" wx:for-item="item" wx:for-index="idx" wx:key="key">
4
+    <view class="flex-h" wx:for="{{list}}" wx:for-item="item" wx:key="item.buildingId">
5 5
 
6 6
       <!-- 左侧图片 -->
7 7
       <view class="img">
8
-        <image mode="aspectFill" src="{{item.Img}}" class="centerLabel cover" bindtap="DeleteItem"></image>
8
+        <image mode="aspectFill" src="{{item.buildingImg}}" class="centerLabel cover" bindtap="DeleteItem"></image>
9 9
       </view>
10 10
 
11 11
       <!-- 右侧内容 -->
@@ -14,10 +14,10 @@
14 14
           <view class="delete">
15 15
             <image mode="widthFix" src="/assets/images/icon28.png"></image>
16 16
           </view>
17
-          <text>{{item.Name}}</text>
18
-          <text>{{item.Address}}</text>
17
+          <text>{{item.name}}</text>
18
+          <text>{{item.address}}</text>
19 19
           <text>距您{{item.Distance}}km</text>
20
-          <text class="price">均价:<text>{{item.Price}}</text>万/平</text>
20
+          <text class="price">均价:<text>{{item.price}}</text>/平</text>
21 21
         </view>
22 22
       </view>
23 23
 

+ 6
- 1
pages/UserCenter/UserInfo/index.js ファイルの表示

@@ -7,13 +7,18 @@ const app = getApp()
7 7
 
8 8
 create(store, {
9 9
   data: {
10
-    UserInfo: app.globalData.UserInfo, // 用户信息
10
+    UserInfo: {}, // 用户信息
11 11
   },
12 12
   onReady() {
13 13
     wx.setNavigationBarTitle({
14 14
       title: '个人资料'
15 15
     })
16 16
   },
17
+  onLoad () {
18
+    this.setData({
19
+      UserInfo: app.globalData.UserInfo
20
+    })
21
+  },
17 22
   SaveUserInfo() { // 提交表单数据
18 23
     fetch({ ...getApi('user.update'), data: this.data.UserInfo }).then(() => {
19 24
       // 同步到 globalData