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

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;
+
 App({
   onLaunch: function() {
     let _self = this
         }
       }
     })
+
+    HttpSever.Ajax({
+      url: $api.dict.list.url,
+      method: $api.dict.list.method,
+    }).then((data) => {
+      _self.globalData.Dict = data.data
+    })
   },
   globalData: {
     UserInfo: {
       openid: '',
       avatar: '',
     },
-    ScreenBottomHeight: 0
+    ScreenBottomHeight: 0,
+    Dict: []
   }
 })

config/api.js

       url: `${BaseAPIURl}wx/user`
     }
   },
+  dict: {
+    list: {
+      methods: 'GET',
+      url: `${BaseAPIURl}/dict`
+    }
+  },
   banner: {
     list: {
       method: 'GET',
       method: 'GET',
       url: `${BaseAPIURl}wx/building/list`
     },
+    detail: {
+      methods: 'GET',
+      url: `${BaseAPIURl}/wx/buildingSelectId/:id`
+    }
   },
   dynamic: { // 项目
     list: { // 项目列表

pages/AppointmentTime/index.js

 //获取应用实例
 const app = getApp()
 
+const page = require('../../utils/page.js');
+const HttpSever = require('../../utils/http.js').HttpSever;
+const $api = require('../../config/api.js').$api;
+
 Page({
   onShow() {
     wx.setNavigationBarTitle({
       title: '填写预约信息'
     })
+    this.setData({
+      BuildingId: page.getCurrentPageOptions().id,
+      BuildingName: page.getCurrentPageOptions().name
+    })
   },
   data: {
     UserInfo: app.globalData.UserInfo, // 用户信息
     SubmitOff: true, // 提交判重开关
+    BuildingId: '',
+    BuildingName: '',
     FormData: { // 提交表单数据
-      EstateId: '', // 楼盘id
       AppointmentDate: '', // 预约时间戳
       Name: '', // 姓名
       PhoneNum: '', // 手机号
       Remark: '' // 备注
     },
     AppointmentDate: '', // 预约时间
-    EstateName: '', // 楼盘名称
-    EstateList: [{ // 楼盘列表数据
-      value: '示例楼盘A',
-      id: '1'
-    }, {
-      value: '示例楼盘B',
-      id: '2'
-    }, {
-      value: '示例楼盘C',
-      id: '3'
-    }],
-    TriggerSelectEstate: false, // 显隐楼盘选择器
     MinDate: new Date().getTime(),
     TriggerSelectAppointmentDate: false // 显隐预约时间选择器
   },
       this.setData({
         SubmitOff: false
       })
+      if (this.FormData)
+      HttpSever.Ajax({
+        url: $api.building.detail.url.replace(':id', id),
+        method: $api.building.detail.method,
+      }).then((data) => {})
+
     }
   },
   FormInput(e) { // 表单输入数据绑定
       MinDate: new Date().getTime(),
       TriggerSelectAppointmentDate: true
     })
-  },
-  SelectEstateConfirm(e) { // 确认选择楼盘
-    this.setData({
-      FormData: {
-        ...this.data.FormData,
-        EstateId: e.detail.value.id
-      },
-      EstateName: e.detail.value.value,
-      TriggerSelectEstate: false
-    })
-  },
-  SelectEstateCancel() { // 取消选择楼盘
-    this.setData({
-      TriggerSelectEstate: false
-    })
-  },
-  SelectEstate() { // 打开楼盘选择器
-    this.setData({
-      TriggerSelectEstate: true
-    })
   }
 })

pages/AppointmentTime/index.wxml

     <view class="flex-h">
       <text><text>*</text>具体楼盘：</text>
       <view class="flex-item"></view>
-      <text bindtap="SelectEstate">{{EstateName === '' ? '请选择楼盘' : EstateName}}</text>
+      <text>{{BuildingName}}</text>
       <image mode="widthFix" src="/assets/images/icon12.png" style="width: 22rpx;"></image>
     </view>
     <view class="flex-h">
   <view class="btn" bindtap="MakeAnAppointment">
     <text>预约</text>
   </view>
-  <view class="popup" hidden="{{!TriggerSelectEstate}}">
-    <view>
-      <van-picker show-toolbar columns="{{ EstateList }}" value-key="value" bind:cancel="SelectEstateCancel" bind:confirm="SelectEstateConfirm" />
-    </view>
-  </view>
   <view class="popup" hidden="{{!TriggerSelectAppointmentDate}}">
     <view>
       <van-datetime-picker min-date="{{MinDate}}" type="datetime" bind:cancel="SelectAppointmentDateCancel" bind:confirm="SelectAppointmentDateConfirm" />

pages/EstateDetail/index.js

 //获取应用实例
 const app = getApp()
 
+const page = require('../../utils/page.js');
+const HttpSever = require('../../utils/http.js').HttpSever;
+const $api = require('../../config/api.js').$api;
+
 Page({
   onShow() {
     wx.setNavigationBarTitle({
       title: '楼盘详情'
     })
   },
+  onLoad: function (options) {
+    const id = page.getCurrentPageOptions().id
+    const _that = this
+    HttpSever.Ajax({
+      url: $api.building.detail.url.replace(':id', id),
+      method: $api.building.detail.method,
+    }).then((data) => {
+      const dicts = app.globalData.Dict
+      const apart = data.data.buildingApartment.map(x => {
+        return {
+          ...x,
+          imgUrl: (x.buildingImgList[0] || {}).url,
+          marketStatus: (dicts.filter(d => d.id == x.marketStatus)[0] || {}).name
+        }
+      })
+      let propertyType = ''
+      data.data.propertyType.split(',').map(x => {
+        const f = dicts.filter(d => d.id == x)
+        if (f.length > 0) {
+          propertyType += (propertyType === '' ? '' : ',') + f[0].name
+        }
+      })
+      _that.setData({
+        EstateDetail: { ...data.data, propertyType: propertyType, buildingApartment: apart}
+      })
+    })
+  },
   data: {
     UserInfo: app.globalData.UserInfo,
     ScreenBottomHeight: app.globalData.ScreenBottomHeight,
-    EstateDetail: {
-      Name: '楼盘名称', // 楼盘名称
-      Price: '14000', // 均价
-      Remark: '备注', // 备注
-      ImgList: ['/assets/images/img5.jpg', '/assets/images/img5.jpg', '/assets/images/img5.jpg', '/assets/images/img5.jpg'], // banner
-      OpenDate: '2016-02-02', // 开盘日期
-      Address: '江苏省南京市某某路xx号', // 项目地址
-      Type: '叠墅', // 物业类型
-      News: '即将开放', // 最新动态
-      IsCollect: false, // 是否已收藏
-      PhoneNum: '', // 联系电话
-      Id: '', // 楼盘id
-      RoomTypeList: [{
-        Img: '/assets/images/img1.jpg',
-        Type: '商住',
-        AreaNum: '33',
-        State: '在售'
-      }, {
-        Img: '/assets/images/img1.jpg',
-        Type: '商住',
-        AreaNum: '33',
-        State: '在售'
-      }, {
-        Img: '/assets/images/img1.jpg',
-        Type: '商住',
-        AreaNum: '33',
-        State: '在售'
-      }] // 户型
-    }
+    EstateDetail: {}
   },
   MakeAnAppointment() { // 预约看房
     wx.navigateTo({
-      url: '/pages/AppointmentTime/index?id='
+      url: '/pages/AppointmentTime/index?id=' + this.data.EstateDetail.buildingId + '&name=' + this.data.EstateDetail.buildingName
     })
   },
   OpenPhone() { // 电话咨询

pages/EstateDetail/index.wxml

       <view class="banner">
         <view class="imgContent">
           <swiper autoplay="{{true}}" indicator-dots="{{true}}" indicator-color="#83837d" indicator-active-color="#e23838">
-            <block wx:for="{{EstateDetail.ImgList}}" wx:for-item="item" wx:for-index="index" wx:key="key">
+            <block wx:for="{{EstateDetail.buildingImg}}" wx:for-item="item" wx:for-index="index" wx:key="key">
               <swiper-item>
                 <view class="swiper-item">
-                  <image mode="aspectFill" src="{{item}}" class="centerLabel cover"></image>
+                  <image mode="aspectFill" src="{{item.url}}" class="centerLabel cover"></image>
                 </view>
               </swiper-item>
             </block>
         <view class="remark">
           <view class="centerLabel">
             <view class="flex-h">
-              <text class="name flex-item">{{EstateDetail.Name}}</text>
-              <text class="price">均价：{{EstateDetail.Price}}元/m²</text>
+              <text class="name flex-item">{{EstateDetail.buildingName}}</text>
+              <text class="price">均价：{{EstateDetail.price}}</text>
             </view>
-            <text>{{EstateDetail.Remark}}</text>
+            <text>别名:{{EstateDetail.name}}</text>
           </view>
         </view>
       </view>
         <view class="list">
           <view class="flex-h">
             <text>开盘时间</text>
-            <text class="flex-item">{{EstateDetail.OpenDate}}</text>
+            <text class="flex-item">{{EstateDetail.openingDate}}</text>
           </view>
           <view class="flex-h">
             <text>项目地址</text>
-            <text class="flex-item">{{EstateDetail.Address}}</text>
+            <text class="flex-item">{{EstateDetail.address}}</text>
           </view>
           <view class="flex-h">
             <text>物业类型</text>
-            <text class="flex-item">{{EstateDetail.Type}}</text>
+            <text class="flex-item">{{EstateDetail.propertyType}}</text>
           </view>
           <view class="flex-h">
             <text>最新动态</text>
-            <text class="flex-item">{{EstateDetail.News}}</text>
+            <text class="flex-item">{{EstateDetail.dynamic}}</text>
           </view>
         </view>
       </view>
 
       <!-- 户型 -->
       <view class="roomType subContent">
-        <text class="title">户型（{{EstateDetail.RoomTypeList.length}}）</text>
+        <text class="title">户型（{{EstateDetail.buildingApartment.length}}）</text>
         <view class="list">
-          <view class="item" wx:for="{{EstateDetail.RoomTypeList}}" wx:for-item="item" wx:for-index="idx" wx:key="key">
+          <view class="item" wx:for="{{EstateDetail.buildingApartment}}" wx:for-item="item" wx:for-index="idx" wx:key="key">
             <view class="img">
-              <image mode="aspectFill" src="{{item.Img}}" class="centerLabel cover"></image>
+              <image mode="aspectFill" src="{{item.imgUrl}}" class="centerLabel cover"></image>
             </view>
             <view class="info">
-              <text>{{item.Type}}</text>
-              <text>{{item.AreaNum}}m²</text>
+              <text>{{item.apartmentName}}</text>
+              <text>{{item.remark}}</text>
             </view>
-            <text>{{item.State}}</text>
+            <text>{{item.marketStatus}}</text>
           </view>
         </view>
       </view>

pages/components/Estate/index.js

   properties: {},
   data: {
     UserInfo: app.globalData.UserInfo,
-    EstateList: [{
-      Name: '示例数据',
-      Address: '江北 白马路',
-      Distance: '21',
-      Price: '1.8',
-      Img: '/assets/images/img1.jpg'
-    }, {
-      Name: '示例数据',
-      Address: '江北 白马路',
-      Distance: '21',
-      Price: '1.8',
-      Img: '/assets/images/img1.jpg'
-    }, {
-      Name: '示例数据',
-      Address: '江北 白马路',
-      Distance: '21',
-      Price: '1.8',
-      Img: '/assets/images/img1.jpg'
-    }]
+    EstateList: []
   },
   lifetimes: {},
   ready: function() {
     show: function() {},
   },
   methods: {
-    ListTap() { // 跳转楼盘详情
+    ListTap(e) { // 跳转楼盘详情
       wx.navigateTo({
-        url: '/pages/EstateDetail/index?id='
+        url: '/pages/EstateDetail/index?id=' + e.currentTarget.dataset.id
       })
     },
     GetGreatCircleDistance(lat1, lng1, lat2, lng2) {
       var s = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) + Math.cos(radLat1) * Math.cos(radLat2) * Math.pow(Math.sin(b / 2), 2)))
       s = s * EARTH_RADIUS
       s = Math.round(s * 10000) / 10000.0
-      console.log(s)
-      return s
+      return s/100
     },
     ShowLocation() {
       const _that = this
       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) => {
             const eslist = data.data.map(x => {
               const distance = parseInt(_that.GetGreatCircleDistance(res.latitude, res.longitude, x.coordinate.split(',')[0], x.coordinate.split(',')[1] || res.longitude))
               return {
+                buildingId: x.buildingId,
                 buildingName: x.buildingName,
                 price: x.price,
                 address: x.address,
                 buildingImg: (x.buildingImg[0] || {}).url,
-                distance: distance / 1000
+                distance: distance / 10
               }
             })
             _that.setData({

pages/components/Estate/index.wxml

   <view class="EstateList">
     <text>附近楼盘</text>
     <view class="list">
-      <view wx:for="{{EstateList}}" wx:for-item="item" wx:for-index="index" wx:key="key" bindtap="ListTap">
+      <view wx:for="{{EstateList}}" wx:for-item="item" wx:for-index="index" wx:key="key" data-id="{{item.buildingId}}" bindtap="ListTap">
         <image mode="aspectFill" src="{{item.buildingImg}}" class="centerLabel cover"></image>
         <text class="price">均价：{{item.price}}</text>
         <text class="name">{{item.buildingName}}</text>

utils/http.js

 import { apiCode } from '../config/code'
 
+<<<<<<< HEAD
+$HttpSever.prototype = {
+  /**
+   *  通用请求方法
+   * 
+   * @param {any} [config={}] 
+   * @returns 
+   */
+  Ajax(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.common.successCode) {
+            resolve(res.data)
+          } else {
+            resolve(res.data.message + "失败")
+          }
+        },
+        error(msg) {
+          reject(msg)
+=======
 export default (config = {}) => {
   return new Promise((resolve, reject) => {
     wx.request({
           resolve(res.data)
         } else {
           resolve(res.data.message + "失败")
+>>>>>>> 02bbb13da6392818f573d7fc66c72524bffeb347
         }
       },
       error(msg) {

utils/page.js

+/*获取当前页url*/
+function getCurrentPageUrl() {
+  var pages = getCurrentPages()    //获取加载的页面
+  var currentPage = pages[pages.length - 1]    //获取当前页面的对象
+  var url = currentPage.route    //当前页面url
+  return url
+}
+
+/*获取当前页参数*/
+function getCurrentPageOptions() {
+  var pages = getCurrentPages()    //获取加载的页面
+  var currentPage = pages[pages.length - 1]    //获取当前页面的对象
+  var options = currentPage.options    //当前页面所有参数
+  return options
+}
+
+/*获取当前页带参数的url*/
+function getCurrentPageUrlWithArgs() {
+  var pages = getCurrentPages()    //获取加载的页面
+  var currentPage = pages[pages.length - 1]    //获取当前页面的对象
+  var url = currentPage.route    //当前页面url
+  var options = currentPage.options    //如果要获取url中所带的参数可以查看options
+
+  //拼接url的参数
+  var urlWithArgs = url + '?'
+  for (var key in options) {
+    var value = options[key]
+    urlWithArgs += key + '=' + value + '&'
+  }
+  urlWithArgs = urlWithArgs.substring(0, urlWithArgs.length - 1)
+
+  return urlWithArgs
+} 
+
+module.exports = {
+  getCurrentPageUrl: getCurrentPageUrl,
+  getCurrentPageUrlWithArgs: getCurrentPageUrlWithArgs,
+  getCurrentPageOptions: getCurrentPageOptions
+}