Merge branch 'master' of http://git.ycjcjy.com/whole-estate/wxmini

config/api.js

@@ -3,20 +3,20 @@ const BaseAPIURl = require('./baseUrl.js').basePath.BASE_API_URL;
 const $api = {
   user: {
     login: { // 模拟用户登陆
-      methods: 'POST',
-      url: `${BaseAPIURl}/wx/registered`
+      method: 'POST',
+      url: `${BaseAPIURl}wx/registered`
     },
     info: {
-      methods: 'GET',
-      url: `${BaseAPIURl}/wx/info/:appid`
+      method: 'GET',
+      url: `${BaseAPIURl}wx/info/:appid`
     },
     getCode: {
-      methods: 'GET',
-      url: `${BaseAPIURl}/wx/getOpenid`
+      method: 'GET',
+      url: `${BaseAPIURl}wx/getOpenid`
     },
     update: {
-      methods: 'PUT',
-      url: `${BaseAPIURl}/wx/user`
+      method: 'PUT',
+      url: `${BaseAPIURl}wx/user`
     }
   },
   dict: {
@@ -27,14 +27,14 @@ const $api = {
   },
   banner: {
     list: {
-      methods: 'GET',
-      url: `${BaseAPIURl}/wx/banner`
+      method: 'GET',
+      url: `${BaseAPIURl}wx/banner`
     }
   },
   building: {
     list: {
-      methods: 'GET',
-      url: `${BaseAPIURl}/wx/building/list`
+      method: 'GET',
+      url: `${BaseAPIURl}wx/building/list`
     },
     detail: {
       methods: 'GET',
@@ -43,22 +43,22 @@ const $api = {
   },
   dynamic: { // 项目
     list: { // 项目列表
-      methods: 'GET',
-      url: `${BaseAPIURl}/wx/buildingDynamiceList`
+      method: 'GET',
+      url: `${BaseAPIURl}wx/buildingDynamiceList`
     },
     detail: { // 项目详情
-      methods: 'GET',
-      url: `${BaseAPIURl}/wx/buildingDynamiceInfo/:id`
+      method: 'GET',
+      url: `${BaseAPIURl}wx/buildingDynamiceInfo/:id`
     }
   },
   activity: {
     list: { // 活动列表
-      methods: 'GET',
-      url: `${BaseAPIURl}/wx/activity`
+      method: 'GET',
+      url: `${BaseAPIURl}wx/activity`
     },
     detail: { // 活动详情
-      methods: 'GET',
-      url: `${BaseAPIURl}/wx/activity/:id`
+      method: 'GET',
+      url: `${BaseAPIURl}wx/activity/:id`
     }
   },
   appointment: {
@@ -87,6 +87,33 @@ const $api = {
   }
 }
 
+const hasKey = (o, k) => Object.keys(o).indexOf(k) > -1
+
+// 获取 api 支持 a.b.c 字符串格式
+function get(k = '') {
+  let found = true
+  return k.split('.').reduce((acc, key) => {
+    if (!found) return acc;
+
+    if (acc === 0) {
+      if (hasKey($api, key)) {
+        return $api[key]
+      } else {
+        found = false
+        return {}
+      }
+    } else {
+      if (hasKey(acc, key)) {
+        return acc[key]
+      } else {
+        found = false
+        return acc
+      }
+    }
+  }, 0)
+}
+
 module.exports = {
-  $api: $api
-}
+  $api: $api,
+  get: get,
+}

config/baseUrl.js

@@ -1,4 +1,4 @@
 module.exports.basePath = {
-  BASE_API_URL: 'https://dev.jinchengjiaye.com/api',
+  BASE_API_URL: 'https://dev.jinchengjiaye.com/api/',
   BASE_IMG_URL: 'https://whole-estate.oss-cn-beijing.aliyuncs.com/',
 }

pages/UserCenter/UserInfo/index.js

@@ -1,12 +1,13 @@
 import store from '../../../store'
 import create from '../../../utils/create'
+import fetch from '../../../utils/http'
+import { get as getApi } from '../../../config/api'
 
 const app = getApp()
 
 create(store, {
   data: {
     UserInfo: app.globalData.UserInfo, // 用户信息
-    loadding: false, // 表单验重提交开关
   },
   onReady() {
     wx.setNavigationBarTitle({
@@ -14,13 +15,24 @@ create(store, {
     })
   },
   SaveUserInfo() { // 提交表单数据
-    if (!this.data.loadding) {
-      this.setData({
-        loadding: true
-      })
+    wx.showLoading({ title: '数据更新, 请稍后...', mask: true })
 
+    fetch({ ...getApi('user.update'), data: this.data.UserInfo }).then((data) => {
+      // 同步到 globalData
+      this.globalData.UserInfo = { ...this.data.UserInfo }
 
-    }
+      wx.hideLoading()
+      wx.showToast({
+        title: '更新成功',
+        icon: 'success',
+      })
+    }).catch(() => {
+      wx.hideLoading()
+      wx.showToast({
+        title: '更新失败',
+        icon: 'error',
+      })
+    })
   },
   FormInput(e) { // 表单输入数据绑定
     const key = e.target.dataset.name

pages/UserCenter/UserInfo/index.wxml

@@ -29,7 +29,7 @@
       </view>
     </view>
   </view>
-  <view class="btn {{ !loadding && 'active' }}" bindtap="SaveUserInfo">
+  <view class="btn active" bindtap="SaveUserInfo">
     <text>保存</text>
   </view>
 </view>

utils/http.js

@@ -1,4 +1,4 @@
-const apiCode = require('../config/code.js').apiCode;
+import { apiCode } from '../config/code'
 
 export default (config = {}) => {
   return new Promise((resolve, reject) => {
@@ -7,6 +7,7 @@ export default (config = {}) => {
       method: config.method,
       data: config.data,
       success(res) {
+        console.log(res, apiCode)
         if (res.statusCode && res.statusCode === apiCode.success) {
           resolve(res.data)
         } else {