update

app.js

@@ -1,4 +1,6 @@
 //app.js
+import fetch from '/utils/http'
+const $api = require('/config/api.js').$api
 
 const HttpSever = require('./utils/http.js').HttpSever;
 const $api = require('./config/api.js').$api;
@@ -6,6 +8,42 @@ const $api = require('./config/api.js').$api;
 App({
   onLaunch: function() {
     let _self = this
+    wx.login({
+      success(res) {
+        if (res.code) {
+          // 发起网络请求
+          fetch({
+            url: $api.user.getCode.url + '?code=' + res.code,
+            method: $api.user.getCode.method
+          }).then((res) => {
+            if (res.code === 200) {
+              _self.globalData.UserInfo = res.data
+            }
+          })
+        } else {
+          console.log('登录失败！' + res.errMsg)
+        }
+      }
+    })
+    wx.getSetting({
+      success: res => {
+        if (res.authSetting['scope.userInfo']) {
+          // 已经授权，可以直接调用 getUserInfo 获取头像昵称，不会弹框
+          wx.getUserInfo({
+            success: res => {
+              // 可以将 res 发送给后台解码出 unionId
+              this.globalData.UserInfo = res.userInfo
+
+              // 由于 getUserInfo 是网络请求，可能会在 Page.onLoad 之后才返回
+              // 所以此处加入 callback 以防止这种情况
+              if (this.userInfoReadyCallback) {
+                this.userInfoReadyCallback(res)
+              }
+            }
+          })
+        }
+      }
+    })
     wx.getSystemInfo({
       success(res) {
         if (res.model.indexOf('iPhone') !== -1 && res.system.indexOf('iOS') !== -1 && res.screenHeight >= 812) { // iphoneX及以上机型适配
@@ -23,9 +61,14 @@ App({
   },
   globalData: {
     UserInfo: {
-      UserIcon: '/assets/images/img4.jpg',
-      UserName: '用户名',
-      UserPhone: '18267901393'
+      customerId: 1,
+      customerName: '',
+      name: '',
+      phone: '',
+      idNum: '',
+      remark: '',
+      openid: '',
+      avatar: '',
     },
     ScreenBottomHeight: 0,
     Dict: []

config/api.js

@@ -10,6 +10,14 @@ const $api = {
       methods: 'GET',
       url: `${BaseAPIURl}/wx/info/:appid`
     },
+    getCode: {
+      methods: 'GET',
+      url: `${BaseAPIURl}/wx/getOpenid`
+    },
+    update: {
+      methods: 'PUT',
+      url: `${BaseAPIURl}/wx/user`
+    }
   },
   dict: {
     list: {
@@ -33,19 +41,26 @@ const $api = {
       url: `${BaseAPIURl}/wx/buildingSelectId/:id`
     }
   },
-  dynamic: {
-    list: {
+  dynamic: { // 项目
+    list: { // 项目列表
       methods: 'GET',
       url: `${BaseAPIURl}/wx/buildingDynamiceList`
     },
-    detail: {
+    detail: { // 项目详情
       methods: 'GET',
       url: `${BaseAPIURl}/wx/buildingDynamiceInfo/:id`
     }
   },
   activity: {
-    
-  }
+    list: { // 活动列表
+      methods: 'GET',
+      url: `${BaseAPIURl}/wx/activity`
+    },
+    detail: { // 活动详情
+      methods: 'GET',
+      url: `${BaseAPIURl}/wx/activity/:id`
+    }
+  },
 }
 
 module.exports = {

config/code.js

@@ -4,10 +4,7 @@
  *  user 用户未登录
  */
 module.exports.apiCode = {
-  common: {
-    successCode: 200,
-    errorCode: 400
-  },
+  success: 200,
   user: {
     notLogin: 401,
   }

pages/ActivityDetail/index.js

@@ -1,15 +1,31 @@
 //index.js
 //获取应用实例
+import fetch from '../../utils/http'
+
 const app = getApp()
+const $api = require('../../config/api.js').$api
 
 Page({
-  onShow() {
-    wx.setNavigationBarTitle({
-      title: '活动详情'
+  onShow() {},
+  onLoad(e) {
+    this.setData({
+      Id: e.id,
+      Type: e.type - 0
     })
+    if (e.type - 0 === 1) {
+      wx.setNavigationBarTitle({
+        title: '项目详情'
+      })
+    } else {
+      wx.setNavigationBarTitle({
+        title: '活动详情'
+      })
+    }
   },
   data: {
     UserInfo: app.globalData.UserInfo,
+    Id: null,
+    Type: null,
     ShowPopup: false,
     FormData: {
       Name: '',
@@ -21,47 +37,54 @@ Page({
       Title: '示例标题',
       Publisher: '示例发布人',
       CreateDate: '2019-02-02',
-      Content: '',
-      CommentList: [{
-        FloorUserIcon: '/assets/images/img1.jpg',
-        FloorUserName: '楼主姓名',
-        CreateDate: '2019-02-02 22:05',
-        Content: '就看到杰卡斯大姐大就看到杰卡斯大姐大就看到杰卡斯大姐大就看到杰卡斯大姐大',
-        ImgList: ['/assets/images/img1.jpg', '/assets/images/img2.jpg', '/assets/images/img5.jpg'],
-        LikeNum: '0',
-        Childs: [{
-          Name: '回复人姓名',
-          CreateDate: '2019-02-02 22:07',
-          Content: 'us很大很大声',
-          LikeNum: '15',
-          ImgList: ['/assets/images/img1.jpg']
-        }, {
-          Name: '回复人姓名',
-          CreateDate: '2019-02-02 22:07',
-          Content: 'us很大很大声',
-          LikeNum: '15',
-          ImgList: []
-        }]
+      Content: ''
+    },
+    CommentList: [{
+      FloorUserIcon: '/assets/images/img1.jpg',
+      FloorUserName: '楼主姓名',
+      CreateDate: '2019-02-02 22:05',
+      Content: '就看到杰卡斯大姐大就看到杰卡斯大姐大就看到杰卡斯大姐大就看到杰卡斯大姐大',
+      ImgList: ['/assets/images/img1.jpg', '/assets/images/img2.jpg', '/assets/images/img5.jpg'],
+      LikeNum: '0',
+      Childs: [{
+        Name: '回复人姓名',
+        CreateDate: '2019-02-02 22:07',
+        Content: 'us很大很大声',
+        LikeNum: '15',
+        ImgList: ['/assets/images/img1.jpg']
       }, {
-        FloorUserIcon: '/assets/images/img1.jpg',
-        FloorUserName: '楼主姓名',
-        CreateDate: '2019-02-02 22:05',
-        Content: '就看到杰卡斯大姐大',
-        ImgList: [],
-        LikeNum: '0',
-        Childs: [{
-          Name: '回复人姓名',
-          CreateDate: '2019-02-02 22:07',
-          Content: 'us很大很大声',
-          LikeNum: '15',
-          ImgList: []
-        }]
+        Name: '回复人姓名',
+        CreateDate: '2019-02-02 22:07',
+        Content: 'us很大很大声',
+        LikeNum: '15',
+        ImgList: []
+      }]
+    }, {
+      FloorUserIcon: '/assets/images/img1.jpg',
+      FloorUserName: '楼主姓名',
+      CreateDate: '2019-02-02 22:05',
+      Content: '就看到杰卡斯大姐大',
+      ImgList: [],
+      LikeNum: '0',
+      Childs: [{
+        Name: '回复人姓名',
+        CreateDate: '2019-02-02 22:07',
+        Content: 'us很大很大声',
+        LikeNum: '15',
+        ImgList: []
       }]
+    }]
+  },
+  onReady() {
+    if (this.data.Type === 1) {
+      this.GetProjectDetail()
+    } else {
+      this.GetActivityDetail()
     }
   },
   AddComment() { // 添加评论
     wx.navigateTo({
-      url: '/pages/ActivityDetail/comment?id='
+      url: '/pages/ActivityDetail/comment?id=' + this.data.Id
     })
   },
   ShowSignUpPopup() { // 打开报名弹窗
@@ -94,5 +117,40 @@ Page({
       })
 
     }
+  },
+  GetActivityDetail() { // 获取活动详情
+    fetch({
+      url: $api.activity.detail.url.replace(':id', this.data.Id),
+      method: $api.activity.detail.method
+    }).then((res) => {
+      if (res.code === 200) {
+        console.log(res.data)
+        this.setData({
+          ActivityDetail: {
+            Title: res.data.title,
+            Publisher: '江北公司',
+            CreateDate: res.data.activityDate,
+            Content: res.data.context
+          }
+        })
+      }
+    })
+  },
+  GetProjectDetail() { // 获取项目详情
+    fetch({
+      url: $api.dynamic.detail.url.replace(':id', this.data.Id),
+      method: $api.dynamic.detail.method
+    }).then((res) => {
+      if (res.code === 200) {
+        this.setData({
+          ActivityDetail: {
+            Title: res.data.title,
+            Publisher: '发布人',
+            CreateDate: res.data.createDate,
+            Content: res.data.url
+          }
+        })
+      }
+    })
   }
 })

pages/ActivityDetail/index.wxml

@@ -1,7 +1,8 @@
 <!--index.wxml-->
 <view class="container">
   <view class="container" style="z-index: 1;">
-    <view class="MainPage">
+    <web-view wx:if="{{Type === 1}}" src="{{ActivityDetail.Content}}"></web-view>
+    <view class="MainPage" wx:if="{{Type === 2}}">
 
       <!-- 文章主体 -->
       <view class="article">
@@ -25,7 +26,7 @@
 
         <!-- 评论列表 -->
         <view class="list">
-          <view class="flex-h" wx:for="{{ActivityDetail.CommentList}}" wx:for-item="item" wx:for-index="idx" wx:key="key">
+          <view class="flex-h" wx:for="{{CommentList}}" wx:for-item="item" wx:for-index="idx" wx:key="key">
 
             <!-- 头像 -->
             <view class="userIcon">
@@ -89,7 +90,7 @@
 
     </view>
   </view>
-  <view class="SignUp">
+  <view class="SignUp" hidden="{{Type !== 2}}">
     <view>
       <text bindtap="ShowSignUpPopup">我要报名</text>
     </view>

pages/UserCenter/UserInfo/index.js

@@ -1,85 +1,36 @@
-//index.js
-//获取应用实例
+import store from '../../../store'
+import create from '../../../utils/create'
+
 const app = getApp()
 
-Page({
+create(store, {
+  data: {
+    UserInfo: app.globalData.UserInfo, // 用户信息
+    loadding: false, // 表单验重提交开关
+  },
   onReady() {
     wx.setNavigationBarTitle({
       title: '个人资料'
     })
   },
-  data: {
-    UserInfo: app.globalData.UserInfo, // 用户信息
-    FormOff: true, // 表单验重提交开关
-    FormData: { // 提交数据
-      UserIcon: '/assets/images/img1.jpg', // 用户头像
-      NickName: '示例昵称', // 昵称
-      PhoneNum: '18267901393', // 绑定手机号
-      CardNum: '346555212451214544', // 证件号码
-      CityId: '1' // 所属城市id
-    },
-    TriggerSelectCity: false, // 显隐选择城市控件
-    CityName: '南京', // 所属城市名称
-    CityList: [{
-      value: '南京',
-      id: '1'
-    }, {
-      value: '上海',
-      id: '2'
-    }, {
-      value: '苏州',
-      id: '3'
-    }]
-  },
-  SaveForm() { // 提交表单数据
-    if (this.data.FormOff) {
+  SaveUserInfo() { // 提交表单数据
+    if (!this.data.loadding) {
       this.setData({
-        FormOff: false
+        loadding: true
       })
+
+
     }
   },
-  SelectCityConfirm(e) { // 确认选择城市
-    this.setData({
-      FormData: {
-        ...this.data.FormData,
-        CityId: e.detail.value.id
-      },
-      CityName: e.detail.value.value,
-      TriggerSelectCity: false
-    })
-  },
-  SelectCityCancel() { // 取消选择城市
-    this.setData({
-      TriggerSelectCity: false
-    })
-  },
-  SelectCity() { // 打开城市选择器
-    this.setData({
-      TriggerSelectCity: true
-    })
-  },
   FormInput(e) { // 表单输入数据绑定
+    const key = e.target.dataset.name
+    const val = e.detail.value
+    
     this.setData({
-      FormData: {
-        ...this.data.FormData,
-        [e.target.dataset.name]: e.detail.value
-      }
-    })
-  },
-  UpdateIcon() { // 更换头像
-    let _self = this
-    wx.chooseImage({
-      count: 1,
-      sizeType: ['original', 'compressed'],
-      sourceType: ['album', 'camera'],
-      success(res) {
-        _self.setData({
-          FormData: {
-            ..._self.data.FormData,
-            UserIcon: res.tempFilePaths
-          }
-        })
+      UserInfo: {
+        ...this.data.UserInfo,
+        [`${key}`]: val,
       }
     })
   }
-})
+})

pages/UserCenter/UserInfo/index.wxml

@@ -4,14 +4,14 @@
     <view class="flex-h" style="padding: 16rpx 50rpx;">
       <text>头像</text>
       <view class="flex-item"></view>
-      <view class="userIcon" bindtap="UpdateIcon">
-        <image mode="aspectFill" src="{{FormData.UserIcon}}" class="centerLabel cover"></image>
+      <view class="userIcon">
+        <image mode="aspectFill" src="{{UserInfo.avatar}}" class="centerLabel cover"></image>
       </view>
     </view>
     <view class="flex-h">
       <text>昵称</text>
       <view class="flex-item">
-        <input value="{{FormData.NickName}}" data-name="NickName" bindinput="FormInput"></input>
+        <input value="{{UserInfo.name}}" data-name="name" bindinput="FormInput"></input>
       </view>
     </view>
   </view>
@@ -19,28 +19,17 @@
     <view class="flex-h">
       <text>绑定手机号</text>
       <view class="flex-item">
-        <input type="number" value="{{FormData.PhoneNum}}" data-name="PhoneNum" bindinput="FormInput"></input>
+        <input type="number" value="{{UserInfo.phone}}" data-name="phone" bindinput="FormInput"></input>
       </view>
     </view>
     <view class="flex-h">
       <text>证件号码</text>
       <view class="flex-item">
-        <input type="idcard" value="{{FormData.CardNum}}" data-name="CardNum" bindinput="FormInput"></input>
+        <input type="idcard" value="{{UserInfo.idNum}}" data-name="idNum" bindinput="FormInput"></input>
       </view>
     </view>
-    <view class="flex-h" bindtap="SelectCity">
-      <text>城市</text>
-      <view class="flex-item"></view>
-      <text>{{CityName}}</text>
-      <image mode="widthFix" src="/assets/images/icon11.png" style="width: 16rpx;"></image>
-    </view>
   </view>
-  <view class="btn" bindtap="SaveUserInfo">
-    <text bindtap="SaveForm">保存</text>
-  </view>
-  <view class="popup" hidden="{{!TriggerSelectCity}}">
-    <view>
-      <van-picker show-toolbar columns="{{ CityList }}" value-key="value" bind:cancel="SelectCityCancel" bind:confirm="SelectCityConfirm" />
-    </view>
+  <view class="btn {{ !loadding && 'active' }}" bindtap="SaveUserInfo">
+    <text>保存</text>
   </view>
 </view>

pages/UserCenter/UserInfo/index.wxss

@@ -68,10 +68,14 @@
   color: #fff;
   line-height: 88rpx;
   font-size: 28rpx;
-  background: #bb9c79;
+  background-color: #ccc;
   border-radius: 10rpx;
 }
 
+.btn.active text {
+  background: #bb9c79;
+}
+
 .popup {
   width: 100%;
   position: absolute;

pages/components/Concessions/index.js

@@ -1,6 +1,8 @@
 //index.js
+import fetch from '../../../utils/http'
 //获取应用实例
 const app = getApp()
+const $api = require('../../../config/api.js').$api
 
 Component({
   behaviors: [],
@@ -15,87 +17,80 @@ Component({
       id: ''
     }],
     NavActiveIndex: 0,
-    ListA: [{
-      Title: '示例数据A',
-      CreateDate: '09-02-12',
-      Org: '悦见山',
-      Img: '/assets/images/img1.jpg',
-      Id: ''
-    }, {
-      Title: '示例数据A',
-      CreateDate: '09-02-12',
-      Org: '悦见山',
-      Img: '/assets/images/img1.jpg',
-      Id: ''
-    }, {
-      Title: '示例数据A',
-      CreateDate: '09-02-12',
-      Org: '悦见山',
-      Img: '/assets/images/img1.jpg',
-      Id: ''
-    }, {
-      Title: '示例数据A',
-      CreateDate: '09-02-12',
-      Org: '悦见山',
-      Img: '/assets/images/img1.jpg',
-      Id: ''
-    }, {
-      Title: '示例数据A',
-      CreateDate: '09-02-12',
-      Org: '悦见山',
-      Img: '/assets/images/img1.jpg',
-      Id: ''
-    }, {
-      Title: '示例数据A',
-      CreateDate: '09-02-12',
-      Org: '悦见山',
-      Img: '/assets/images/img1.jpg',
-      Id: ''
-    }],
-    ListB: [{
-      Title: '示例数据B',
-      CreateDate: '09-02-12',
-      Org: '悦见山',
-      Img: '/assets/images/img1.jpg',
-      Id: ''
-    }, {
-      Title: '示例数据B',
-      CreateDate: '09-02-12',
-      Org: '悦见山',
-      Img: '/assets/images/img1.jpg',
-      Id: ''
-    }, {
-      Title: '示例数据B',
-      CreateDate: '09-02-12',
-      Org: '悦见山',
-      Img: '/assets/images/img1.jpg',
-      Id: ''
-    }, {
-      Title: '示例数据B',
-      CreateDate: '09-02-12',
-      Org: '悦见山',
-      Img: '/assets/images/img1.jpg',
-      Id: ''
-    }, {
-      Title: '示例数据B',
-      CreateDate: '09-02-12',
-      Org: '悦见山',
-      Img: '/assets/images/img1.jpg',
-      Id: ''
-    }, {
-      Title: '示例数据B',
-      CreateDate: '09-02-12',
-      Org: '悦见山',
-      Img: '/assets/images/img1.jpg',
-      Id: ''
-    }]
+    ListA: [],
+    ListB: [],
+    PostDataA: {
+      PageNum: 1,
+      PageSize: 15
+    },
+    PostDataB: {
+      PageNum: 1,
+      PageSize: 15
+    }
   },
   lifetimes: {},
-  ready: function() {},
+  ready: function() {
+    this.GetProjectList()
+    this.GetActivityList()
+  },
   pageLifetimes: {
     show: function() {},
   },
   methods: {
+    GetActivityList() { // 获取活动列表
+      fetch({
+        url: $api.activity.list.url + '?pageNum=' + this.data.PostDataB.PageNum + '&pageSize=' + this.data.PostDataB.PageSize,
+        method: $api.activity.list.method
+      }).then((res) => {
+        if (res.code === 200) {
+          let arr = res.data.records || []
+          let pArr = this.data.ListB
+          arr.map((item) => {
+            pArr.push({
+              Title: item.title,
+              CreateDate: item.activityDate,
+              Org: item.buildingName,
+              Img: item.imgUrl,
+              Id: item.activityId
+            })
+          })
+          this.setData({
+            ListB: pArr,
+            PostDataB: {
+              PageNum: res.data.total === this.data.ListB.length ? this.data.PostDataB.PageNum : this.data.PostDataB.PageNum + 1,
+              PageSize: this.data.PostDataB.PageSize
+            }
+          })
+        }
+      })
+    },
+    GetProjectList() { // 获取项目动态列表
+      fetch({
+        url: $api.dynamic.list.url + '?pageNum=' + this.data.PostDataA.PageNum + '&pageSize=' + this.data.PostDataA.PageSize,
+        method: $api.dynamic.list.method
+      }).then((res) => {
+        if (res.code === 200) {
+          let arr = res.data.records || []
+          let pArr = this.data.ListA
+          arr.map((item) => {
+            pArr.push({
+              Title: item.title,
+              CreateDate: item.createDate,
+              Org: item.buildingName,
+              Img: item.imgUrl,
+              Id: item.dynamicId
+            })
+          })
+          this.setData({
+            ListA: pArr,
+            PostDataA: {
+              PageNum: res.data.total === this.data.ListA.length ? this.data.PostDataA.PageNum : this.data.PostDataA.PageNum + 1,
+              PageSize: this.data.PostDataA.PageSize
+            }
+          })
+        }
+      })
+    },
     CutNav(e) { // 切换nav
       if (e.target.dataset.index !== undefined) {
         this.setData({
@@ -103,8 +98,11 @@ Component({
         })
       }
     },
-    ItemClick() {
-      console.log(111)
+    ItemTap(e) {
+      // console.log(e.target.dataset)
+      wx.navigateTo({
+        url: '/pages/ActivityDetail/index?type=' + e.target.dataset.type + '&id=' + e.target.dataset.id
+      })
     }
   }
 })

pages/components/Concessions/index.wxml

@@ -7,10 +7,10 @@
   </view>
   <view class="content">
     <view hidden="{{NavActiveIndex !== 0}}">
-      <ConcessionsListItem wx:for="{{ListA}}" wx:for-item="item" wx:for-index="index" wx:key="key" Params="{{item}}" />
+      <ConcessionsListItem wx:for="{{ListA}}" wx:for-item="item" wx:for-index="index" wx:key="key" Params="{{item}}" data-id="{{item.Id}}" data-type="1" bindtap="ItemTap" />
     </view>
     <view hidden="{{NavActiveIndex !== 1}}">
-      <ConcessionsListItem wx:for="{{ListB}}" wx:for-item="item" wx:for-index="index" wx:key="key" Params="{{item}}" />
+      <ConcessionsListItem wx:for="{{ListB}}" wx:for-item="item" wx:for-index="index" wx:key="key" Params="{{item}}" data-id="{{item.Id}}" data-type="2" bindtap="ItemTap" />
     </view>
   </view>
 </view>

pages/components/ConcessionsListItem/index.js

@@ -14,9 +14,9 @@ Component({
   },
   methods: {
     TapItem() {
-      wx.navigateTo({
-        url: '/pages/ActivityDetail/index'
-      })
+      // wx.navigateTo({
+      //   url: '/pages/ActivityDetail/index'
+      // })
     }
   }
 })

pages/components/Estate/index.js

@@ -1,7 +1,9 @@
 //index.js
+import fetch from '../../../utils/http'
+
 //获取应用实例
 const app = getApp()
-const HttpSever = require('../../../utils/http.js').HttpSever;
+
 const $api = require('../../../config/api.js').$api;
 
 Component({
@@ -58,7 +60,12 @@ Component({
       wx.getLocation({
         type: 'wgs84',
         success(res) {
+<<<<<<< HEAD
           HttpSever.Ajax({
+=======
+          console.log(res)
+          fetch({
+>>>>>>> 02bbb13da6392818f573d7fc66c72524bffeb347
             url: $api.building.list.url,
             method: $api.building.list.method,
           }).then((data) => {

project.config.json

@@ -19,6 +19,8 @@
 		"hidedInDevtools": []
 	},
 	"isGameTourist": false,
+	"simulatorType": "wechat",
+	"simulatorPluginLibVersion": {},
 	"condition": {
 		"search": {
 			"current": -1,

store.js

@@ -0,0 +1,6 @@
+// 本文件不要删除
+
+export default {
+  data: {},
+  globalData: {},
+}

utils/create.js

@@ -0,0 +1,449 @@
+import diff from './diff'
+
+let originData = null
+let globalStore = null
+let fnMapping = {}
+
+const ARRAYTYPE = '[object Array]'
+const OBJECTTYPE = '[object Object]'
+const FUNCTIONTYPE = '[object Function]'
+
+export default function create(store, option) {
+    let updatePath = null
+    if (arguments.length === 2) {   
+        if (!originData) {
+            originData = JSON.parse(JSON.stringify(store.data))
+            globalStore = store
+            store.instances = {}
+            store.update = update
+            store.push = push
+            store.pull = pull
+            store.add = add
+            store.remove = remove
+            store.originData = originData
+            store.env && initCloud(store.env)
+            extendStoreMethod(store)
+        }
+        getApp().globalData && (getApp().globalData.store = store)
+        //option.data = store.data
+        const onLoad = option.onLoad
+        walk(store.data)
+        // 解决函数属性初始化不能显示的问题，要求必须在data中声明使用
+        // 这段代码是同步store.data到option.data，只有经过walk方法后store.data中的函数才能变成属性，才能被小程序page方法渲染
+        if (option.data && Object.keys(option.data).length > 0) {
+            updatePath = getUpdatePath(option.data)
+            syncValues(store.data, option.data)
+        }
+        option.onLoad = function (e) {
+            this.store = store
+            this._updatePath = updatePath
+            rewriteUpdate(this)
+            store.instances[this.route] = []
+            store.instances[this.route].push(this)
+            onLoad && onLoad.call(this, e)
+            syncValues(store.data, this.data)
+            this.setData(this.data)
+        }
+	
+	// 解决执行navigateBack或reLaunch时清除store.instances对应页面的实例
+	const onUnload = option.onUnload
+        option.onUnload = function () {
+            onUnload && onUnload.call(this)
+            store.instances[this.route] = []
+        }
+
+        Page(option)
+    } else {
+        const ready = store.ready
+        const pure = store.pure
+        const componentUpdatePath = getUpdatePath(store.data)
+        store.ready = function () {
+            if (pure) {
+                this.store = { data: store.data || {} }
+                this.store.originData = store.data ? JSON.parse(JSON.stringify(store.data)) : {}
+                walk(store.data || {})
+                rewritePureUpdate(this)
+            } else {
+                this.page = getCurrentPages()[getCurrentPages().length - 1]
+                this.store = this.page.store
+                this._updatePath = componentUpdatePath
+                syncValues(this.store.data, store.data)
+                walk(store.data || {})
+                this.setData.call(this, this.store.data)
+                rewriteUpdate(this)
+                this.store.instances[this.page.route].push(this)
+            }
+            ready && ready.call(this)
+        }
+        Component(store)
+    }
+}
+
+function syncValues(from, to){
+    Object.keys(to).forEach(key=>{
+        if(from.hasOwnProperty(key)){
+            to[key] = from[key]
+        }
+    })
+}
+
+
+function getUpdatePath(data) {
+	const result = {}
+    dataToPath(data, result)
+	return result
+}
+
+function dataToPath(data, result) {
+	Object.keys(data).forEach(key => {
+		result[key] = true
+		const type = Object.prototype.toString.call(data[key])
+		if (type === OBJECTTYPE) {
+			_objToPath(data[key], key, result)
+		} else if (type === ARRAYTYPE) {
+			_arrayToPath(data[key], key, result)
+		}
+	})
+}
+
+function _objToPath(data, path, result) {
+	Object.keys(data).forEach(key => {
+		result[path + '.' + key] = true
+		delete result[path]
+		const type = Object.prototype.toString.call(data[key])
+		if (type === OBJECTTYPE) {
+			_objToPath(data[key], path + '.' + key, result)
+		} else if (type === ARRAYTYPE) {
+			_arrayToPath(data[key], path + '.' + key, result)
+		}
+	})
+}
+
+function _arrayToPath(data, path, result) {
+	data.forEach((item, index) => {
+		result[path + '[' + index + ']'] = true
+		delete result[path]
+		const type = Object.prototype.toString.call(item)
+		if (type === OBJECTTYPE) {
+			_objToPath(item, path + '[' + index + ']', result)
+		} else if (type === ARRAYTYPE) {
+			_arrayToPath(item, path + '[' + index + ']', result)
+		}
+	})
+}
+
+function rewritePureUpdate(ctx) {
+    ctx.update = function (patch) {
+        const store = this.store
+        const that = this
+        return new Promise(resolve => {
+            //defineFnProp(store.data)
+            if (patch) {
+                for (let key in patch) {
+                    updateByPath(store.data, key, patch[key])
+                }
+            }
+            let diffResult = diff(store.data, store.originData)
+            let array = []
+            if (Object.keys(diffResult)[0] == '') {
+                diffResult = diffResult['']
+            }
+            if (Object.keys(diffResult).length > 0) {
+                array.push( new Promise( cb => that.setData(diffResult, cb) ) )
+                store.onChange && store.onChange(diffResult)
+                for (let key in diffResult) {
+                    updateByPath(store.originData, key, typeof diffResult[key] === 'object' ? JSON.parse(JSON.stringify(diffResult[key])) : diffResult[key])
+                }
+            }
+            Promise.all(array).then( e => resolve(diffResult) )
+        })
+    }
+}
+
+function initCloud(env) {
+    wx.cloud.init()
+    globalStore.db = wx.cloud.database({
+        env: env
+    })
+}
+
+function push(patch) {
+    return new Promise(function (resolve, reject) {
+        _push(update(patch), resolve, reject)
+    })
+}
+
+function _push(diffResult, resolve) {
+    const objs = diffToPushObj(diffResult)
+    Object.keys(objs).forEach((path) => {
+        const arr = path.split('-')
+        const id = globalStore.data[arr[0]][parseInt(arr[1])]._id
+        const obj = objs[path]
+        if (globalStore.methods && globalStore.methods[arr[0]]) {
+            Object.keys(globalStore.methods[arr[0]]).forEach(key => {
+                if (obj.hasOwnProperty(key)) {
+                    delete obj[key]
+                }
+            })
+        }
+        globalStore.db.collection(arr[0]).doc(id).update({
+            data: obj
+        }).then((res) => {
+            resolve(res)
+        })
+    })
+}
+
+function update(patch) {
+    return new Promise(resolve => {
+        //defineFnProp(globalStore.data)
+        if (patch) {
+            for (let key in patch) {
+                updateByPath(globalStore.data, key, patch[key])
+            }
+        }
+        let diffResult = diff(globalStore.data, originData)
+        if (Object.keys(diffResult)[0] == '') {
+            diffResult = diffResult['']
+        }
+        const updateAll = matchGlobalData(diffResult)
+        let array = []
+        if (Object.keys(diffResult).length > 0) {
+            for (let key in globalStore.instances) {
+                globalStore.instances[key].forEach(ins => {
+                    if(updateAll || globalStore.updateAll || ins._updatePath){
+                        // 获取需要更新的字段
+                        const needUpdatePathList = getNeedUpdatePathList(diffResult, ins._updatePath)
+                        if (needUpdatePathList.length) {
+                            const _diffResult = {}
+                            for (let _path in diffResult) {
+                                if (needUpdatePathList.includes(_path)) {
+                                    _diffResult[_path] = diffResult[_path]
+                                }
+                            }
+                            array.push( new Promise(cb => {
+                                ins.setData.call(ins, _diffResult, cb)
+                            }) )
+                        }
+                    }
+                })
+            }
+            globalStore.onChange && globalStore.onChange(diffResult)
+            for (let key in diffResult) {
+                updateByPath(originData, key, typeof diffResult[key] === 'object' ? JSON.parse(JSON.stringify(diffResult[key])) : diffResult[key])
+            }
+        }
+        Promise.all(array).then(e=>{
+            resolve(diffResult)
+        })
+    })
+}
+
+function matchGlobalData(diffResult) {
+    if(!globalStore.globalData) return false
+    for (let keyA in diffResult) {
+        if (globalStore.globalData.indexOf(keyA) > -1) {
+            return true
+        }
+        for (let i = 0, len = globalStore.globalData.length; i < len; i++) {
+            if (includePath(keyA, globalStore.globalData[i])) {
+                return true
+            }
+        }
+    }
+    return false
+}
+
+function getNeedUpdatePathList(diffResult, updatePath){
+    const paths = []
+    for(let keyA in diffResult){
+        if(updatePath[keyA]){
+            paths.push(keyA)
+        }
+        for(let keyB in updatePath){
+            if(includePath(keyA, keyB)){
+                paths.push(keyA)
+            }
+        }
+    }
+    return paths
+}
+
+function includePath(pathA, pathB){
+    if(pathA.indexOf(pathB)===0){
+        const next = pathA.substr(pathB.length, 1)
+        if(next === '['||next === '.'){
+            return true
+        }
+    }
+    return false
+}
+
+function rewriteUpdate(ctx) {
+    ctx.update = update
+}
+
+function updateByPath(origin, path, value) {
+    const arr = path.replace(/]/g, '').replace(/\[/g, '.').split('.')
+    let current = origin
+    for (let i = 0, len = arr.length; i < len; i++) {
+        if (i === len - 1) {
+            current[arr[i]] = value
+        } else {
+            current = current[arr[i]]
+        }
+    }
+}
+
+function pull(cn, where) {
+    return new Promise(function (resolve) {
+        globalStore.db.collection(cn).where(where || {}).get().then(res => {
+            extend(res, cn)
+            resolve(res)
+        })
+    })
+}
+
+function extend(res, cn) {
+    res.data.forEach(item => {
+        const mds = globalStore.methods[cn]
+        mds && Object.keys(mds).forEach(key => {
+            Object.defineProperty(item, key, {
+                enumerable: true,
+                get: () => {
+                    return mds[key].call(item)
+                },
+                set: () => {
+                    //方法不能改写
+                }
+            })
+        })
+    })
+}
+
+function add(cn, data) {
+    return globalStore.db.collection(cn).add({ data })
+}
+
+function remove(cn, id) {
+    return globalStore.db.collection(cn).doc(id).remove()
+}
+
+function diffToPushObj(diffResult) {
+    const result = {}
+    Object.keys(diffResult).forEach(key => {
+        diffItemToObj(key, diffResult[key], result)
+    })
+    return result
+}
+
+function diffItemToObj(path, value, result) {
+    const arr = path.replace(/]/g, '').replace(/\[/g, '.').split('.')
+    const obj = {}
+    let current = null
+    const len = arr.length
+    for (let i = 2; i < len; i++) {
+        if (len === 3) {
+            obj[arr[i]] = value
+        } else {
+            if (i === len - 1) {
+                current[arr[i]] = value
+            } else {
+                const pre = current
+                current = {}
+                if (i === 2) {
+                    obj[arr[i]] = current
+                } else {
+                    pre[arr[i]] = current
+                }
+            }
+        }
+    }
+    const key = arr[0] + '-' + arr[1]
+    result[key] = Object.assign(result[key] || {}, obj)
+}
+
+function extendStoreMethod() {
+    globalStore.method = function (path, fn) {
+        fnMapping[path] = fn
+        let ok = getObjByPath(path)
+        Object.defineProperty(ok.obj, ok.key, {
+            enumerable: true,
+            get: () => {
+                return fnMapping[path].call(globalStore.data)
+            },
+            set: () => {
+                console.warn('Please using store.method to set method prop of data!')
+            }
+        })
+    }
+}
+
+function getObjByPath(path) {
+    const arr = path.replace(/]/g, '').replace(/\[/g, '.').split('.')
+    const len = arr.length
+    if (len > 1) {
+        let current = globalStore.data[arr[0]]
+        for (let i = 1; i < len - 1; i++) {
+            current = current[arr[i]]
+        }
+        return { obj: current, key: arr[len - 1] }
+    } else {
+        return { obj: globalStore.data, key: arr[0] }
+    }
+}
+
+function walk(data) {
+    Object.keys(data).forEach(key => {
+        const obj = data[key]
+        const tp = type(obj)
+        if (tp == FUNCTIONTYPE) {
+            setProp(key, obj)
+        } else if (tp == OBJECTTYPE) {
+            Object.keys(obj).forEach(subKey => {
+                _walk(obj[subKey], key + '.' + subKey)
+            })
+
+        } else if (tp == ARRAYTYPE) {
+            obj.forEach((item, index) => {
+                _walk(item, key + '[' + index + ']')
+            })
+
+        }
+    })
+}
+
+function _walk(obj, path) {
+    const tp = type(obj)
+    if (tp == FUNCTIONTYPE) {
+        setProp(path, obj)
+    } else if (tp == OBJECTTYPE) {
+        Object.keys(obj).forEach(subKey => {
+            _walk(obj[subKey], path + '.' + subKey)
+        })
+
+    } else if (tp == ARRAYTYPE) {
+        obj.forEach((item, index) => {
+            _walk(item, path + '[' + index + ']')
+        })
+
+    }
+}
+
+function setProp(path, fn) {
+    const ok = getObjByPath(path)
+    fnMapping[path] = fn
+    Object.defineProperty(ok.obj, ok.key, {
+        enumerable: true,
+        get: () => {
+            return fnMapping[path].call(globalStore.data)
+        },
+        set: () => {
+            console.warn('Please using store.method to set method prop of data!')
+        }
+    })
+}
+
+function type(obj) {
+    return Object.prototype.toString.call(obj)
+}

utils/diff.js

@@ -0,0 +1,106 @@
+const ARRAYTYPE = '[object Array]'
+const OBJECTTYPE = '[object Object]'
+const FUNCTIONTYPE = '[object Function]'
+
+export default function diff(current, pre) {
+    const result = {}
+    syncKeys(current, pre)
+    _diff(current, pre, '', result)
+    return result
+}
+
+function syncKeys(current, pre) {
+    if (current === pre) return
+    const rootCurrentType = type(current)
+    const rootPreType = type(pre)
+    if (rootCurrentType == OBJECTTYPE && rootPreType == OBJECTTYPE) {
+        if(Object.keys(current).length >= Object.keys(pre).length){
+            for (let key in pre) {
+                const currentValue = current[key]
+                if (currentValue === undefined) {
+                    current[key] = null
+                } else {
+                    syncKeys(currentValue, pre[key])
+                }
+            }
+        }
+    } else if (rootCurrentType == ARRAYTYPE && rootPreType == ARRAYTYPE) {
+        if (current.length >= pre.length) {
+            pre.forEach((item, index) => {
+                syncKeys(current[index], item)
+            })
+        }
+    }
+}
+
+function _diff(current, pre, path, result) {
+    if (current === pre) return
+    const rootCurrentType = type(current)
+    const rootPreType = type(pre)
+    if (rootCurrentType == OBJECTTYPE) {
+        if (rootPreType != OBJECTTYPE || Object.keys(current).length < Object.keys(pre).length && path !== '') {
+            setResult(result, path, current)
+        } else {
+            for (let key in current) {
+                const currentValue = current[key]
+                const preValue = pre[key]
+                const currentType = type(currentValue)
+                const preType = type(preValue)
+                if (currentType != ARRAYTYPE && currentType != OBJECTTYPE) {
+                    if (currentValue != pre[key]) {
+                        setResult(result, (path == '' ? '' : path + ".") + key, currentValue)
+                    }
+                } else if (currentType == ARRAYTYPE) {
+                    if (preType != ARRAYTYPE) {
+                        setResult(result, (path == '' ? '' : path + ".") + key, currentValue)
+                    } else {
+                        if (currentValue.length < preValue.length) {
+                            setResult(result, (path == '' ? '' : path + ".") + key, currentValue)
+                        } else {
+                            currentValue.forEach((item, index) => {
+                                _diff(item, preValue[index], (path == '' ? '' : path + ".") + key + '[' + index + ']', result)
+                            })
+                        }
+                    }
+                } else if (currentType == OBJECTTYPE) {
+                    if (preType != OBJECTTYPE || Object.keys(currentValue).length < Object.keys(preValue).length) {
+                        setResult(result, (path == '' ? '' : path + ".") + key, currentValue)
+                    } else {
+                        for (let subKey in currentValue) {
+                            _diff(currentValue[subKey], preValue[subKey], (path == '' ? '' : path + ".") + key + '.' + subKey, result)
+                        }
+                    }
+                }
+            }
+        }
+    } else if (rootCurrentType == ARRAYTYPE) {
+        if (rootPreType != ARRAYTYPE) {
+            setResult(result, path, current)
+        } else {
+            if (current.length < pre.length) {
+                setResult(result, path, current)
+            } else {
+                current.forEach((item, index) => {
+                    _diff(item, pre[index], path + '[' + index + ']', result)
+                })
+            }
+        }
+    } else {
+        setResult(result, path, current)
+    }
+}
+
+function setResult(result, k, v) {
+    const t = type(v)
+    if (t != FUNCTIONTYPE) {
+        //if (t != OBJECTTYPE && t != ARRAYTYPE) {
+        result[k] = v
+        // } else {
+        //     result[k] = JSON.parse(JSON.stringify(v))
+        // }
+    }
+}
+
+function type(obj) {
+    return Object.prototype.toString.call(obj)
+}

utils/http.js

@@ -1,7 +1,6 @@
 const apiCode = require('../config/code.js').apiCode;
-const $api = require('../config/api.js').$api;
-const $HttpSever = function () { }
 
+<<<<<<< HEAD
 $HttpSever.prototype = {
   /**
    *  通用请求方法
@@ -26,11 +25,26 @@ $HttpSever.prototype = {
         },
         error(msg) {
           reject(msg)
+=======
+export default (config = {}) => {
+  return new Promise((resolve, reject) => {
+    wx.request({
+      url: config.url,
+      method: config.method,
+      data: {
+        ...config.data
+      },
+      success(res) {
+        if (res.statusCode && res.statusCode === apiCode.success) {
+          resolve(res.data)
+        } else {
+          resolve(res.data.message + "失败")
+>>>>>>> 02bbb13da6392818f573d7fc66c72524bffeb347
         }
-      })
+      },
+      error(msg) {
+        reject(msg)
+      }
     })
-  },
+  })
 }
-module.exports = {
-  HttpSever: new $HttpSever()
-}