Merge branch 'master' of http://git.ycjcjy.com/shigongli/client-miniapp into master

src/pages/customer/index.js

@@ -17,22 +17,33 @@ const index = (props) => {
   const user = useSelector(state => state.user)
 
   const [pageState, setPageState] = useState('3')
+  const [orderInfo, setOrderInfo] = useState()
   const [houseInfo, setHouseInfo] = useState()
   const [surroundList, setSurroundList] = useState()
+  const [regUnFinished, setRegUnFinished] = useState(true)
+
+  const handleRegisterFinished = () => {
+    setRegUnFinished(false)
+  }
 
   useEffect(() => {
     if(props.orderId){
       request({url: `/taHouseOrder/{props.orderId}`,}).then(res=>{
         const data = res.data.data
-        if (data.status !== 1) {
-          setPageState('1')
-        }
+        setOrderInfo(data)
+        regUnFinished(data.status !== 1)
       })
     }
   }, [props.orderId])
+
+  useEffect(() => {
+    if(props.orderId && regUnFinished){
+      setPageState('1')
+    }
+  }, [props.orderId, regUnFinished])
   
   useEffect(() => {
-    if(props.houseId){
+    if(props.houseId && (!props.orderId || !regUnFinished)){
       request({url: `/taHouse/${props.houseId}`,}).then(res=>{
         const data = res.data.data
         setHouseInfo(data)
@@ -45,11 +56,11 @@ const index = (props) => {
         setSurroundList(records)
     })
 
-  }, [props.houseId])
+  }, [props.houseId, props.orderId, regUnFinished])
  
   return (
     <View className='index'>
-      {pageState=='1'&&<Register oderId={orderId}></Register>}
+      {pageState=='1'&&<Register oderId={orderId} dataSource={orderInfo} onFinished={handleRegisterFinished}></Register>}
 
       <Layout>
         {pageState=='2'&&<Guide houseId={houseId} dataSource={houseInfo}></Guide>  }

src/pages/customer/register/index.jsx

@@ -5,10 +5,10 @@ import ContainerLayout from '../../../compents/container/index'
 import { AtInput } from 'taro-ui'
 import Tab from '../../../compents/tab'
 import Layout from '../../../layout'
+import request from '@/util/request'
 
 
 const InputGroup = props => {
-  console.log('---------', JSON.stringify(props.dataSource))
   const [name, setName] = useState(props.dataSource.name)
   const [phone, setPhone] = useState(props.dataSource.phone)
 
@@ -25,7 +25,6 @@ const InputGroup = props => {
   }, [props.dataSource.phone])
 
   const handeNameChange = e => {
-    console.log('333333333333333333')
     const v = e.detail.value
     setName(v)
     if (props.onChange) {
@@ -72,28 +71,49 @@ const register = (props) => {
 
   let [list, setList] = useState([])
   useEffect(() => {
-    //   console.log(page,'page')
-    const arr = []
-    for (let i = 0; i < 4; i++) {
-      arr.push({
-        name:'',
-        phone:'',
-      })
+    if (props.dataSource) {
+      const {personNum} = props.dataSource.houseSetting || {}
+
+      setList(new Array(personNum || 0).fill('*').map(x => ({name: undefined, phone: undefined})))
     }
-    setList(arr)
-  }, [])
+  }, [props.dataSource])
 
   const onClick = () => {
-    console.log(list)
+    const hasNull = list.filter(x => !x.name || !x.phone)[0]
+    if (hasNull) {
+      Taro.showModal({
+        title: '请将信息填写完成',
+        showCancel: false,
+        success: () => {}
+      })
+
+      return
+    }
+
+    const data = {
+      orderId: props.dataSource.orderId,
+      houseId: props.dataSource.houseSetting.houseId,
+      personList: list,
+    }
+
+    request({ url: '/taHousePerson', method: 'POST', data }).then(res => {
+      if (props.onFinished) {
+        props.onFinished(res)
+      }
+    }).catch(err => {
+      console.error(err)
+      const message = err.message || err.errMsg || err
+      Taro.showToast({
+        title: message,
+        icon: 'none',
+        duration: 3000
+      })
+    })
   }
 
-  const onChangeList = index => value =>  {
-    console.log(111111111, value, index)
- 
+  const onChangeList = index => value =>  { 
     list[index] = value
-
     setList([...list])
-
   }
 
   return <View className='register'>