feats

app.js

@@ -13,9 +13,7 @@ App({
             url: $api.user.getCode.url + '?code=' + res.code,
             method: $api.user.getCode.method
           }).then((res) => {
-            if (res.code === 200) {
-              _self.globalData.UserInfo = res.data
-            }
+            _self.globalData.UserInfo = res.data
           })
         } else {
           console.log('登录失败！' + res.errMsg)
@@ -64,7 +62,7 @@ App({
       phone: '',
       idNum: '',
       remark: '',
-      openid: '',
+      openid: '1',
       avatar: '',
     },
     ScreenBottomHeight: 0,

config/api.js

@@ -21,6 +21,10 @@ const $api = {
     appointment: {
       method: 'GET',
       url: `${BaseAPIURl}wx/appointment/:openid`
+    },    
+    delAppointment: {
+      method: 'DELETE',
+      url: `${BaseAPIURl}wx/appointment/of/:id`
     }
   },
   dict: {

pages/AppointmentHistory/index.js

@@ -12,67 +12,25 @@ create(store, {
     })
   },
   onLoad () {
-    
+    const userInfo = app.globalData.UserInfo
+
+    fetch({
+      ...getApi('user.appointment', { 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: {
-    UserInfo: app.globalData.UserInfo, // 用户信息
-    List: [{
-      Name: '示例姓名',
-      PhoneNum: '18267901393',
-      CaseName: '示例项目名称',
-      AppointmentDate: '2019-02-02',
-      Remark: '几点睡觉都会涉及到很多技术'
-    }, {
-      Name: '示例姓名',
-      PhoneNum: '18267901393',
-      CaseName: '示例项目名称',
-      AppointmentDate: '2019-02-02',
-      Remark: '几点睡觉都会涉及到很多技术'
-    }, {
-      Name: '示例姓名',
-      PhoneNum: '18267901393',
-      CaseName: '示例项目名称',
-      AppointmentDate: '2019-02-02',
-      Remark: '几点睡觉都会涉及到很多技术'
-    }, {
-      Name: '示例姓名',
-      PhoneNum: '18267901393',
-      CaseName: '示例项目名称',
-      AppointmentDate: '2019-02-02',
-      Remark: '几点睡觉都会涉及到很多技术'
-    }, {
-      Name: '示例姓名',
-      PhoneNum: '18267901393',
-      CaseName: '示例项目名称',
-      AppointmentDate: '2019-02-02',
-      Remark: '几点睡觉都会涉及到很多技术'
-    }, {
-      Name: '示例姓名',
-      PhoneNum: '18267901393',
-      CaseName: '示例项目名称',
-      AppointmentDate: '2019-02-02',
-      Remark: '几点睡觉都会涉及到很多技术'
-    }, {
-      Name: '示例姓名',
-      PhoneNum: '18267901393',
-      CaseName: '示例项目名称',
-      AppointmentDate: '2019-02-02',
-      Remark: '几点睡觉都会涉及到很多技术'
-    }, {
-      Name: '示例姓名',
-      PhoneNum: '18267901393',
-      CaseName: '示例项目名称',
-      AppointmentDate: '2019-02-02',
-      Remark: '几点睡觉都会涉及到很多技术'
-    }, {
-      Name: '示例姓名',
-      PhoneNum: '18267901393',
-      CaseName: '示例项目名称',
-      AppointmentDate: '2019-02-02',
-      Remark: '几点睡觉都会涉及到很多技术'
-    }],
+    list: [],
     DeleteIndex: null,
-    DeleteOff: true
   },
   ShowDeleteItem(e) { // 长按显示删除
     this.setData({
@@ -85,10 +43,35 @@ create(store, {
     })
   },
   DeleteItem() { // 确认删除逻辑
-    if (this.data.DeleteOff) {
-      this.setData({
-        DeleteOff: false
-      })
-    }
+    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: 'error',
+            })
+          })
+
+
+        } else if (res.cancel) {
+          console.log('用户点击取消')
+        }
+      }
+    })
   }
 })

pages/AppointmentHistory/index.wxml

@@ -1,29 +1,29 @@
 <!--index.wxml-->
 <view class="MainPage" bindtouchmove="ResetDeleteIndex">
   <view class="list">
-    <view wx:for="{{List}}" wx:for-item="item" wx:for-index="idx" wx:key="key">
+    <view wx:for="{{list}}" wx:for-item="item" wx:key="item.appointmentId" bindtap="ResetDeleteIndex">
       <view class="line flex-h">
-        <text>{{item.Name}}</text>
-        <text class="flex-item">{{item.PhoneNum}}</text>
+        <text>{{item.customerName}}</text>
+        <text class="flex-item">{{item.phone}}</text>
       </view>
       <view class="line flex-h">
         <text>预约项目：</text>
-        <text class="flex-item">{{item.CaseName}}</text>
+        <text class="flex-item">{{item.buildingName}}</text>
       </view>
       <view class="line flex-h">
         <text>预约时间：</text>
-        <text class="flex-item">{{item.AppointmentDate}}</text>
+        <text class="flex-item">{{item.appointmentDate}}</text>
       </view>
       <view class="line">
         <text>备注信息：</text>
-        <text style="line-height: 35rpx;">{{item.Remark}}</text>
+        <text style="line-height: 35rpx;">{{item.remark}}</text>
       </view>
-      <view class="delete" hidden="{{DeleteIndex !== idx}}">
-        <view class="centerLabel" data-index="{{idx}}" bindtap="DeleteItem">
+      <view class="delete" hidden="{{DeleteIndex !== item.appointmentId}}">
+        <view class="centerLabel" data-index="{{item.appointmentId}}" bindtap="DeleteItem">
           <image mode="widthFix" src="/assets/images/icon27.png" class="centerLabel"></image>
         </view>
       </view>
-      <view class="layer" data-index="{{idx}}" bindlongpress="ShowDeleteItem"></view>
+      <view class="layer" data-index="{{item.appointmentId}}" bindlongpress="ShowDeleteItem"></view>
     </view>
   </view>
 </view>

pages/MyCollectEstateList/index.js

@@ -1,15 +1,20 @@
-//index.js
-//获取应用实例
+import store from '../../store'
+import create from '../../utils/create'
+import fetch from '../../utils/http'
+import { get as getApi } from '../../config/api'
+
 const app = getApp()
 
-Page({
+create(store, {
   onShow() {
     wx.setNavigationBarTitle({
       title: '收藏的楼盘'
     })
+  },
+  onLoad () {
+
   },
   data: {
-    UserInfo: app.globalData.UserInfo, // 用户信息
     List: [{
       Img: '/assets/images/img5.jpg',
       Name: '示例楼盘名称',

pages/UserCenter/UserInfo/index.js

@@ -15,19 +15,15 @@ create(store, {
     })
   },
   SaveUserInfo() { // 提交表单数据
-    wx.showLoading({ title: '数据更新, 请稍后...', mask: true })
-
     fetch({ ...getApi('user.update'), data: this.data.UserInfo }).then(() => {
       // 同步到 globalData
-      this.globalData.UserInfo = { ...this.data.UserInfo }
+      app.globalData.UserInfo = { ...this.data.UserInfo }
 
-      wx.hideLoading()
       wx.showToast({
         title: '更新成功',
         icon: 'success',
       })
-    }).catch(() => {
-      wx.hideLoading()
+    }).catch((err) => {
       wx.showToast({
         title: '更新失败',
         icon: 'error',

utils/http.js

@@ -1,19 +1,40 @@
 import { apiCode } from '../config/code'
 
+function isArray (arg) {
+  return Object.prototype.toString.call(arg) === '[object Array]';
+}
+
 export default (config = {}) => {
   return new Promise((resolve, reject) => {
+    wx.showLoading({ title: '数据处理中, 请稍后...', mask: true })
+
+    let { query, url } = config
+
+    // query 只支持 url rfc 定义的内容
+    if (query) {
+      const searchStr = Object.keys(query).map((key) => {
+        const val = query[key]
+        return !isArray(val) ? `${key}=${val}` : val.map(it => `${key}=${it}`).join('&')
+      }).join('&')
+
+      const sign = url.indexOf('?') > -1 ? '&' : '?'
+      url = `${url}${sign}${searchStr}`
+    }
+
     wx.request({
-      url: config.url,
+      url: url,
       method: config.method,
       data: config.data,
       success(res) {
-        if (res.statusCode && res.statusCode === apiCode.success) {
+        wx.hideLoading()
+        if (res.statusCode === apiCode.success && res.data.code === apiCode.success) {
           resolve(res.data)
         } else {
           reject(res.data.message + "失败")
         }
       },
       error(msg) {
+        wx.hideLoading()
         reject(msg)
       }
     })