fix

src/app.js

@@ -1,6 +1,6 @@
 import { Component } from 'react'
 import Taro from '@tarojs/taro'
-import store, { StoreRoot } from './store'
+import store, { StoreRoot, useModel } from './store'
 
 import './app.less'
 
@@ -11,13 +11,18 @@ class App extends Component {
 
   componentDidShow () { }
   onLaunch (options) {
+
+    const { logins, setUserLocation } = store.getModel('userData').getState()
+
+    // const { sserLocation, setUserLocation } = useModel('userData')
+
     // 登录获取人员信息
 
     Taro.getLocation({
       type: 'gcj02',
       success (res) {
         const location = `${res.longitude},${res.latitude}`
-        Taro.setStorageSync('location', location)
+        setUserLocation(location)
 
       },
       fail (err) {
@@ -27,15 +32,9 @@ class App extends Component {
           title: '获取定位失败',
           icon: 'none',
         })
-        // 默认邓州
-        const location = '112.087493,32.687609';
-        Taro.setStorageSync('location', location)
-
-
       }
     })
 
-    const { logins } = store.getModel('userData').getState()
 
     Taro.login({
       success: (res) => {

src/components/ButtontWX/style.less

@@ -1,7 +1,7 @@
 .buttont-box {
   background: #ff703b;
   display: flex;
-  margin: 0 auto;
+  margin: 1em auto;
   > View {
     margin: 0 auto;
     font-weight: 600;

src/components/CarsListContent/index.jsx

@@ -5,6 +5,7 @@ import Taro, { useReachBottom } from "@tarojs/taro"
 import ButtontWX from '@/components/ButtontWX'
 import withLayout from '@/layouts'
 import addresss from '@/assets/mineImgaes/addresss.png'//地址
+import { useModel } from "@/store"
 
 import { getMachinery, } from "@/services/homes"
 
@@ -12,32 +13,32 @@ import { getMachinery, } from "@/services/homes"
 import './style.less'
 
 export default withLayout((props) => {
-  const location = Taro.getStorageSync('location')
+  const { sserLocation } = useModel('userData')
   // const { carsList } = props
 
   const [carsList, setCarsList] = useState([])
 
 
   useEffect(() => {
-    getMachinery(location).then((e) => {
+    getMachinery(sserLocation).then((e) => {
       setCarsList(e.records)
     })
 
-  }, [location])
+  }, [sserLocation])
 
 
 
 
-  const startReserve = () => {
-    Taro.navigateTo({ url: `/pages/OrderConfirmation/index?id${1}` })
+  const startReserve = (res) => {
+    Taro.navigateTo({ url: `/pages/OrderConfirmation/index?id${res}` })
 
   }
   const goCarsInfo = (res) => {
-    Taro.navigateTo({ url: `/pages/CheckDetails/index?id=${res}&location=${location}` })
+    Taro.navigateTo({ url: `/pages/CheckDetails/index?id=${res}&location=${sserLocation}` })
 
   }
   const goMapInfo = (res) => {
-    Taro.navigateTo({ url: `/pages/CheckMap/index?id=${res}&location=${location}` })
+    Taro.navigateTo({ url: `/pages/CheckMap/index?id=${res}&location=${sserLocation}` })
 
 
   }
@@ -58,7 +59,7 @@ export default withLayout((props) => {
                   <View className='carsListImga-bottom-box-flaxBox-liftText-price'>{item.price}/<Text>公顷</Text></View>
                 </View>
                 <View className='carsListImga-bottom-box-flaxBox-rightBut'>
-                  <ButtontWX onClick={startReserve} butText='预约' butWidth={80} butHeight={34} butFontSize={19} butBorderRadius={0} />
+                  <ButtontWX onClick={() => startReserve(item.machineryId)} butText='预约' butWidth={80} butHeight={34} butFontSize={19} butBorderRadius={0} />
                 </View>
               </View>
               <View className='content-header-box-map' onClick={() => goMapInfo(item.machineryId)}>

src/components/pickerTime/dateTimePicker.js

@@ -0,0 +1,80 @@
+function withData (param) {
+  return param < 10 ? '0' + param : '' + param;
+}
+function getLoopArray (start, end) {
+  var start = start || 0;
+  var end = end || 1;
+  var array = [];
+  for (var i = start; i <= end; i++) {
+    array.push(withData(i));
+  }
+  return array;
+}
+function getMonthDay (year, month) {
+  var flag = year % 400 == 0 || (year % 4 == 0 && year % 100 != 0), array = null;
+
+  switch (month) {
+    case '01':
+    case '03':
+    case '05':
+    case '07':
+    case '08':
+    case '10':
+    case '12':
+      array = getLoopArray(1, 31)
+      break;
+    case '04':
+    case '06':
+    case '09':
+    case '11':
+      array = getLoopArray(1, 30)
+      break;
+    case '02':
+      array = flag ? getLoopArray(1, 29) : getLoopArray(1, 28)
+      break;
+    default:
+      array = '月份格式不正确，请重新输入！'
+  }
+  return array;
+}
+function getNewDateArry () {
+  // 当前时间的处理
+  var newDate = new Date();
+  var year = withData(newDate.getFullYear()),
+    mont = withData(newDate.getMonth() + 1),
+    date = withData(newDate.getDate()),
+    hour = withData(newDate.getHours()),
+    minu = withData(newDate.getMinutes()),
+    seco = withData(newDate.getSeconds());
+
+  return [year, mont, date, hour, minu, seco];
+}
+function dateTimePicker (startYear, endYear, date) {
+  // 返回默认显示的数组和联动数组的声明
+  var dateTime = [], dateTimeArray = [[], [], [], [], [], []];
+  var start = startYear || 1978;
+  var end = endYear || 2100;
+  // 默认开始显示数据
+  var defaultDate = date ? [...date.split(' ')[0].split('-'), ...date.split(' ')[1].split(':')] : getNewDateArry();
+  // 处理联动列表数据
+  /*年月日 时分秒*/
+  dateTimeArray[0] = getLoopArray(start, end);
+  dateTimeArray[1] = getLoopArray(1, 12);
+  dateTimeArray[2] = getMonthDay(defaultDate[0], defaultDate[1]);
+  dateTimeArray[3] = getLoopArray(0, 23);
+  dateTimeArray[4] = getLoopArray(0, 59);
+  dateTimeArray[5] = getLoopArray(0, 59);
+
+  dateTimeArray.forEach((current, index) => {
+    dateTime.push(current.indexOf(defaultDate[index]));
+  });
+
+  return {
+    dateTimeArray: dateTimeArray,
+    dateTime: dateTime
+  }
+}
+module.exports = {
+  dateTimePicker: dateTimePicker,
+  getMonthDay: getMonthDay
+}

src/components/pickerTime/index.js

@@ -0,0 +1,63 @@
+import dateTimePicker from './dateTimePicker.js'
+
+Page({
+  data: {
+    date: '2018-10-01',
+    time: '12:00',
+    dateTimeArray: null,
+    dateTime: null,
+    dateTimeArray1: null,
+    dateTime1: null,
+    startYear: 2000,
+    endYear: 2050
+  },
+  onLoad () {
+    // 获取完整的年月日 时分秒，以及默认显示的数组
+    var obj = dateTimePicker.dateTimePicker(this.data.startYear, this.data.endYear);
+    var obj1 = dateTimePicker.dateTimePicker(this.data.startYear, this.data.endYear);
+    // 精确到分的处理，将数组的秒去掉
+    var lastArray = obj1.dateTimeArray.pop();
+    var lastTime = obj1.dateTime.pop();
+
+    this.setData({
+      dateTime: obj.dateTime,
+      dateTimeArray: obj.dateTimeArray,
+      dateTimeArray1: obj1.dateTimeArray,
+      dateTime1: obj1.dateTime
+    });
+  },
+  changeDate (e) {
+    this.setData({ date: e.detail.value });
+  },
+  changeTime (e) {
+    this.setData({ time: e.detail.value });
+  },
+  changeDateTime (e) {
+    this.setData({ dateTime: e.detail.value });
+  },
+  changeDateTime1 (e) {
+    this.setData({ dateTime1: e.detail.value });
+  },
+  changeDateTimeColumn (e) {
+    var arr = this.data.dateTime, dateArr = this.data.dateTimeArray;
+
+    arr[e.detail.column] = e.detail.value;
+    dateArr[2] = dateTimePicker.getMonthDay(dateArr[0][arr[0]], dateArr[1][arr[1]]);
+
+    this.setData({
+      dateTimeArray: dateArr,
+      dateTime: arr
+    });
+  },
+  changeDateTimeColumn1 (e) {
+    var arr = this.data.dateTime1, dateArr = this.data.dateTimeArray1;
+
+    arr[e.detail.column] = e.detail.value;
+    dateArr[2] = dateTimePicker.getMonthDay(dateArr[0][arr[0]], dateArr[1][arr[1]]);
+
+    this.setData({
+      dateTimeArray1: dateArr,
+      dateTime1: arr
+    });
+  }
+})

src/components/pickerTime/index.json

@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}

src/components/pickerTime/index.wxml

@@ -0,0 +1,8 @@
+<view class="tui-picker-content">
+  <view class="tui-picker-name">日期时间选择器（精确到分）</view>
+  <picker mode="multiSelector" value="{{dateTime1}}" bindchange="changeDateTime1" bindcolumnchange="changeDateTimeColumn1" range="{{dateTimeArray1}}">
+    <view class="tui-picker-detail">
+      选择日期时间: {{dateTimeArray1[0][dateTime1[0]]}}-{{dateTimeArray1[1][dateTime1[1]]}}-{{dateTimeArray1[2][dateTime1[2]]}} {{dateTimeArray1[3][dateTime1[3]]}}:{{dateTimeArray1[4][dateTime1[4]]}}
+    </view>
+  </picker>
+</view>

src/layouts/index.jsx

@@ -6,29 +6,28 @@ import { useEffect } from 'react'
 import { useModel } from '@/store'
 
 
-export default (Child) => (props) => {
-  const { person } = useModel('userData')
-  const router = useRouter()
 
-  const { path } = router
+import useLogin from '@/utils/hooks/useLogin'
 
-  useEffect(() => {
-    if (!person?.phone) {
-      if (path != '/pages/index/index' && path !== '/pages/UserLogin/index') {
-        Taro.navigateTo({ url: `/pages/UserLogin/index?id${1}` })
-      }
-    }
-    console.log("🚀 ~ file: index.jsx ~ line 11 ~ person", person, path)
 
-    // if (path != '/pages/index/index' && !person?.phone) {
-    //   Taro.navigateTo({ url: `/pages/userInfo/index?id${1}` })
-    // }
-  }, [path, person?.phone])
+export default (Child) => (props) => {
+  const { person } = useModel('person')
+  const router = useRouter()
 
+  const location = Taro.getStorageSync('location')
 
+  const { hasPhone } = useLogin()
 
 
+  // Taro.useReady(()=>{
+  //   useLogin(person,router)
+  // })
+  // useEffect(()=>{
+  //   useLogin(person,router)
+  // },[person, person?.phone, router, router?.path])
 
-  return <Child {...props} router={router} />
+  // 确保执行过 login 方法，拿到了 person
+  const isLoged = useMemo(() => !!person?.personId, [person?.personId])
 
-}
+  return isLoged ? <Child {...props} router={router} location={location} /> : <></>
+}

src/pages/CheckMap/index.jsx

@@ -2,11 +2,13 @@ import { useEffect, useState } from "react"
 import { Map, View, Image, Text } from "@tarojs/components"
 import CustomNav from "@/components/CustomNav"
 import ButtontWX from "@/components/ButtontWX"
+import withLayout from '@/layouts'
+
 import Taro from "@tarojs/taro"
 import locationImage from "@/assets/icons/comm/locationImage.png"
 import addresss from '@/assets/mineImgaes/addresss.png'//地址
 import { getMachineryInfo } from "@/services/homes"
-
+import { useModel } from "@/store"
 import './style.less'
 
 
@@ -16,16 +18,13 @@ export default withLayout((props) => {
   const $instance = Taro.getCurrentInstance()
   const { id, location } = $instance.router.params
 
-  const [mapLoca, setMapLoca] = useState('')
-  Taro.getStorage({
-    key: 'location',
-    success: function (res) {
-      setMapLoca(res.data)
-    }
-  })
+
+  const { sserLocation } = useModel('userData')
+
+
 
 
-  const LocationMap = mapLoca.split(",")
+  const LocationMap = sserLocation.split(",")
   console.log("🚀 ~ file: index.jsx ~ line 25 ~ LocationMap", LocationMap)
 
 

src/pages/FeedbackText/index.jsx

@@ -4,9 +4,9 @@ import CustomNav from "@/components/CustomNav"
 import ButtontWX from "@/components/ButtontWX"
 import { feedback } from "@/services/mine"
 import withLayout from '@/layouts'
-
 import Taro from "@tarojs/taro"
 
+
 import './style.less'
 
 
@@ -25,9 +25,7 @@ export default withLayout((props) => {
         icon: 'none',
         duration: 2000
       })
-
     } else {
-
       feedback({ content: textAreaValue }).then(() => {
         Taro.showToast({
           title: '反馈已收到！',
@@ -38,10 +36,7 @@ export default withLayout((props) => {
             setLoading(true)
             Taro.navigateBack({
               delta: 1
-            }
-
-
-            )
+            })
           }, 1000)
 
         })
@@ -49,7 +44,6 @@ export default withLayout((props) => {
     }
 
 
-
   }
 
   return (

src/pages/OrderConfirmation/index.config.js

@@ -4,6 +4,7 @@ export default {
   navigationStyle: 'custom',
   disableScroll: true,
   usingComponents: {
+    "mp-pickerTime": '../../components/pickerTime/index'
   }
 
 }

src/pages/OrderConfirmation/index.jsx

@@ -1,28 +1,70 @@
-import { View, Text } from "@tarojs/components"
+import { View, Image, Form, Input, Picker } from "@tarojs/components"
 import Taro from "@tarojs/taro"
-import { useState } from "react"
+import { useEffect, useState } from "react"
 import withLayout from '@/layouts'
+import { useModel } from "@/store"
+import addresss from '@/assets/mineImgaes/addresss.png'//地址
+import timeImage from '@/assets/icons/comm/timeImage.png'//日期图片
 
 import CustomNav from '@/components/CustomNav'
 import ButtontWX from '@/components/ButtontWX'
+import { generateOrder } from "@/services/order"
 // import BottomMoadl from '@/components/BottomMoadl/index'
-
-
-
+import { getMachineryInfo } from "@/services/homes"
 
 
 
 import './style.less'
 
-export default withLayout((props) => {
+//为了调试，删除了withLayout 记得加上 如果我忘记的话
+
+export default (props) => {
   //底部弹窗
   // const [showFrame, setShowFrame] = useState(false)
   // const setRecommend = () => {
   //   setShowFrame(!showFrame)
   // }
 
-  const okgoPay = () => {
-    Taro.navigateTo({ url: `/pages/OrderInfo/index?id${1}` })
+  const $instance = Taro.getCurrentInstance()
+  const { id } = $instance.router.params
+  const { sserLocation, setUserLocation } = useModel('userData')
+
+  const [timeSel, setTimeSel] = useState('')
+  const [carsInfo, setCarsInfo] = useState({})
+
+
+  const formSubmit = (e) => {
+    console.log('表单输入', e);
+    Taro.navigateTo({ url: `/pages/OrderInfo/index?goOrder=${id}` })
+    // generateOrder({
+    //   charges: 200,
+    //   price: 100,
+    //   amount: 20,
+    //   machineryId: '7cdf832d7a7af0c19ab33418e10e1a94',
+    //   machineryName: '第一台播种机',
+    //   machineryType: 'b4d183f684ed1f3d1cb2194c1975ae46',
+    //   typeName: '播种机',
+    //   address: '我是作业地址：房屋后面',
+    //   appontmentDate: new Date(),
+    // }).then(() => {
+    //   Taro.navigateTo({ url: `/pages/OrderInfo/index?goOrder=${id}` })
+
+    // })
+  }
+  useEffect(() => {
+    // if (id) {
+    //   getMachineryInfo(id, { location: sserLocation, attached: true }).then((e) => {
+    //     setCarsInfo(e)
+    //     console.log('e', e);
+    //   })
+    // }
+
+
+  })
+  const onTimeChange = (e) => {
+    console.log('时间选择器', e);
+    setTimeSel(e.detail.value)
+
   }
   const cancelPay = () => {
     Taro.navigateBack({
@@ -38,14 +80,42 @@ export default withLayout((props) => {
         <CustomNav title='订单确认' />
       </View>
       {/* <BottomMoadl frameTitle='支付方式' flag={showFrame} onRecommend={setRecommend} /> */}
-      <View>
+      <View className='pagesBox'>
+        <Form onSubmit={formSubmit}  >
+          <View className='example-body-WorkingArea'>
+            <View>作业面积/公顷</View>
+            <Input name='address' placeholder='请输入具体面积(公顷)' />
+          </View>
+          <View className='example-body-WorkingTime'>
+            <View>作业时间：</View>
+            <View className='example-body-WorkingTime-TimePicker'>
+              <Image src={timeImage} />
 
-      </View>
-      <View className='BottomtBut' >
-        <ButtontWX butText='取消' onClick={cancelPay} butWidth={123} butHeight={39} butFontSize={16} butBorderRadius={49} />
+              <Picker mode='date' onChange={onTimeChange}>
+                <View className='picker' >
+                  请选择时间 {timeSel}
+                </View>
+              </Picker>
+            </View>
+
+          </View>
+          <View className='example-body-WorkingLocation'>
+            <View>作业位置：</View>
+            <View className='example-body-WorkingLocation-info'>
+              <Image src={addresss} />
+              <View>这就是我的地址位置为位置位置位置位置为阿斯顿撒旦</View>
+            </View>
+          </View>
+
+          <View className='BottomtBut' >
+            <ButtontWX butText='确定' onClick={formSubmit} butWidth={346} butHeight={49} butFontSize={16} butBorderRadius={49} />
+
+            <ButtontWX butText='取消' onClick={cancelPay} butWidth={346} butHeight={49} butFontSize={16} butBorderRadius={49} />
+          </View>
+        </Form>
 
-        <ButtontWX butText='确定' onClick={okgoPay} butWidth={123} butHeight={39} butFontSize={16} butBorderRadius={49} />
       </View>
+
     </View>
   )
-})
+}

src/pages/OrderConfirmation/style.less

@@ -1,4 +1,67 @@
+.pagesBox {
+  width: 94vw;
+  margin: 0 auto;
+  .example-body-WorkingArea {
+    font-size: 35px;
+    font-weight: 600;
+    > Input {
+      padding: 10px 0;
+      height: 4vh;
+      border-bottom: 1px solid rgba(0, 0, 0, 0.2);
+      font-weight: 100;
+    }
+  }
+
+  .example-body-WorkingTime {
+    font-size: 35px;
+    font-weight: 600;
+    margin-top: 1em;
+    &-TimePicker {
+      border-bottom: 1px solid rgba(0, 0, 0, 0.2);
+
+      display: flex;
+      align-items: center;
+      margin: 1em auto;
+      padding-bottom: 1em;
+
+      > Image {
+        width: 34px;
+        height: 34px;
+        padding-right: 15px;
+      }
+    }
+  }
+
+  .example-body-WorkingLocation {
+    font-size: 35px;
+    font-weight: 600;
+    margin-top: 1em;
+
+    &-info {
+      display: flex;
+      align-items: center;
+      border-bottom: 1px solid rgba(0, 0, 0, 0.2);
+      margin: 1em auto;
+      padding-bottom: 1em;
+      > Image {
+        width: 34px;
+        height: 34px;
+        padding-right: 10px;
+      }
+      > View {
+        width: 80vw;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        font-weight: 100;
+        color: #000;
+      }
+    }
+  }
+}
+
 .BottomtBut {
-  width: 99vw;
-  display: flex;
+  padding-top: 2em;
+  margin: 0 auto;
+  // display: flex;
 }

src/pages/OrderInfo/index.jsx

@@ -19,7 +19,7 @@ import './style.less'
 export default withLayout((props) => {
 
   const $instance = Taro.getCurrentInstance()
-  const { orderId } = $instance.router.params
+  const { orderId, goOrder } = $instance.router.params
 
   const [orderInfos, setOrderInfos] = useState()
   //底部弹窗
@@ -61,6 +61,7 @@ export default withLayout((props) => {
         setOrderInfos(res)
       })
     } else {
+
       Taro.showToast({
         title: '暂无订单详情',
         icon: 'error',

src/pages/index/index.jsx

@@ -15,7 +15,6 @@ import './index.less'
 export default withLayout((props) => {
   const { router } = props
   const { person } = useModel('userData')
-  console.log("🚀 ~ file: index.jsx ~ line 18 ~ withLayout ~ person", person)
 
   const { params, path } = router
   const { tab } = params || {}
@@ -24,7 +23,6 @@ export default withLayout((props) => {
 
   const [isDidShow, setIsDidShow] = useState(0)
 
-
   useDidShow(() => {
     setIsDidShow(isDidShow + 1)
   })

src/pages/index/tabs/Homes.jsx

@@ -13,7 +13,7 @@ import { useModel } from "@/store"
 import './HomesCss/style.less'
 
 export default withLayout((props) => {
-  const location = Taro.getStorageSync('location')
+  const { sserLocation } = useModel('userData')
   const [bannerHome, setBannerHome] = useState([])
   const [carsList, setCarsList] = useState([])
 
@@ -25,7 +25,7 @@ export default withLayout((props) => {
       console.log('e', e);
       setBannerHome(e)
     })
-    getMachinery(location).then((e) => {
+    getMachinery(sserLocation).then((e) => {
       setCarsList(e.records)
     })
 

src/pages/index/tabs/Mine.jsx

@@ -12,11 +12,9 @@ import userMoren from '@/assets/mineImgaes/userMoren.png'//默认头像
 import userRight from '@/assets/mineImgaes/userRight.png'
 import { useModel } from "@/store"
 import withLayout from '@/layouts'
-
 import { getAddress } from "@/services/address"
 
 
-
 import './MineCss/style.less'
 
 
@@ -117,16 +115,16 @@ export default withLayout((props) => {
                 <View className='setPassword' onClick={goUserInfo}>修改个人信息</View>
                 <Image className='User-Avatar-background-trueBox-userImg' src={userInfo?.avatar || userMoren} />
                 <View className='User-Avatar-background-trueBox-name'>
-                  <View >{userInfo?.nickName}</View>
+                  <View >{userInfo?.nickName || '请填写姓名'}</View>
                   <View >{userInfo?.phone}</View>
                 </View>
-
               </View>
+
               <UserCellBox title='地址信息'>
                 <View className='addresss-box' onClick={setAddress} >
                   <Image className='addresss-box-images' src={addresss} />
                   <View className='addresss-box-contents'>
-                    <View className='addresss-box-contents-texts' >{addresInfo}</View>
+                    <View className='addresss-box-contents-texts' >{addresInfo || '请填写详细地址'}</View>
                     <View>》</View>
                   </View>
                 </View>

src/pages/index/tabs/Orders.jsx

@@ -84,7 +84,6 @@ export default withLayout((props) => {
   }
 
 
-
   return (
     <scroll-view scrollY style='height: 100%;' >
 

src/store/userData.js

@@ -8,7 +8,12 @@ export default () => {
   const [sessionKey, setSessionKey] = useState()
   const [userPhoneInfo, setUserPhoneInfo] = useState()
 
-  console.log("🚀 ~ file: userData.js ~ line 8 ~ person", person)
+
+  const [sserLocation, setUserLocation] = useState('')
+
+
+  console.log("🚀 来自store的打印 person数据", person)
+  console.log("🚀 来自store的打印 sserLocation定位", sserLocation)
 
 
 
@@ -30,6 +35,9 @@ export default () => {
     userPhoneInfo,
     setUserPhoneInfo,
 
+    sserLocation,
+    setUserLocation,
+
     logins,
   }
 }

src/utils/hooks/useLogin.js

@@ -0,0 +1,27 @@
+import Taro, { useRouter, useDidShow } from "@tarojs/taro";
+import { useModel } from '@/store'
+import { useEffect, useMemo } from "react";
+
+const whiteList = [
+  "/pages/login/index",
+  "/pages/index/index"
+]
+
+export default () => {
+  const router = useRouter()
+  const { person } = useModel('person')
+
+  const isInWhiteList = useMemo(() => whiteList.includes(router.path), [router.path])
+  const hasPhone = useMemo(() => !!person?.phone, [person?.phone])
+
+
+  useEffect(() => {
+    if (!isInWhiteList && !hasPhone) {
+      Taro.navigateTo({ url: "/pages/login/index" });
+    }
+  }, [hasPhone, isInWhiteList])
+
+
+
+  return { hasPhone, isInWhiteList }
+};