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

src/compents/getphone/index.jsx

@@ -10,8 +10,6 @@ export default function GetUserPhone(props) {
 
     const user = useSelector(state => state.user)
     const dispatch = useDispatch()
-    const [showPannel, setShowPannel] = useState(true)
-    //   const { user, setUser } = useModel('user')
 
     const ToGetUserPhone = (e) => { // 授权手机号
         const { errMsg, ...data } = e.detail
@@ -32,13 +30,11 @@ export default function GetUserPhone(props) {
                     props.onOk(res)
                 }
             }).catch((er) => {
-                setShowPannel(true)
                 if (props.onError) {
                     props.onError(er.message || er.errMsg || er)
                 }
             })
         } else {
-            setShowPannel(true)
             if (props.onError) {
                 props.onError(errMsg)
             }
@@ -46,26 +42,26 @@ export default function GetUserPhone(props) {
     }
 
     const handleCancel = () => {
-        setShowPannel(false)
+        // setShowPannel(false)
         if (props.onCancel) {
             props.onCancel()
         }
     }
 
-
-
-    return (props.visible && <AtModal isOpened={showPannel}>
-        <AtModalHeader>您暂未授权手机号</AtModalHeader>
-        <AtModalAction>
-            <Button onClick={handleCancel}>取消</Button>
-            <Button
-                className='flex-item'
-                open-type='getPhoneNumber'
-                lang='zh_CN'
-                onGetphonenumber={ToGetUserPhone}
-                onClick={() => setShowPannel(false)}
-            >去授权</Button> </AtModalAction>
-    </AtModal>)
+    return (
+        <AtModal isOpened={props.visible} closeOnClickOverlay={false}>
+            <AtModalHeader>您暂未授权手机号</AtModalHeader>
+            <AtModalAction>
+                <Button onClick={handleCancel}>取消</Button>
+                <Button
+                    className='flex-item'
+                    open-type='getPhoneNumber'
+                    lang='zh_CN'
+                    onGetphonenumber={ToGetUserPhone}
+                >去授权</Button>
+            </AtModalAction>
+        </AtModal>
+    )
 
     // return props.visible && (
     //     <view style={{textAlign:'center'}}> 

src/pages/customer/index.js

@@ -16,48 +16,56 @@ const index = (props) => {
  
   const user = useSelector(state => state.user)
 
-  const [pageState, setPageState] = useState(false)
-  useEffect(() => {
-    
+  const [pageState, setPageState] = useState('3')
+  const [houseInfo, setHouseInfo] = useState()
+  const [surroundList, setSurroundList] = useState()
 
-    if(orderId){
-      request({url:'',}).then(res=>{
-        setPageState('1')
+  useEffect(() => {
+    if(props.orderId){
+      request({url: `/taHouseOrder/{props.orderId}`,}).then(res=>{
+        const data = res.data.data
+        if (data.status !== 1) {
+          setPageState('1')
+        }
+      })
+    }
+  }, [props.orderId])
+  
+  useEffect(() => {
+    if(props.houseId){
+      request({url: `/taHouse/${props.houseId}`,}).then(res=>{
+        const data = res.data.data
+        setHouseInfo(data)
+        setPageState('2')
       })
-    }else{
-      setPageState('1')
     }
 
-  }, [])
-
-
-  const onTabClick = (e) => {
-    console.log(e, '111')
-    
-  }
-
-  const onRegisterChange = (e) => {
-    console.log(e, '111')
-  }
+    request({url:'/taHouseSurround', params:{houseId:houseId}}).then((res)=>{
+        const { records } = res.data.data  
+        setSurroundList(records)
+    })
 
+  }, [props.houseId])
  
-  return <View className='index'>
-
-
-     {pageState&&<View>
-{pageState=='1'&&<Register oderId={orderId}></Register>  }
-    <Layout>
-    
-    {pageState=='2'&&<Guide houseId={houseId}></Guide>  }
-    {pageState=='3'&&<Recommend houseId={houseId}></Recommend>  }
-    </Layout>
-    
-    {pageState!='1' &&<Tab value={['入住指引','房东推荐']} pageState={pageState} onClick={[(e) => setPageState('2'),(e) => setPageState('3')]}></Tab>}
-
-    </View>}
+  return (
+    <View className='index'>
+      {pageState=='1'&&<Register oderId={orderId}></Register>}
 
+      <Layout>
+        {pageState=='2'&&<Guide houseId={houseId} dataSource={houseInfo}></Guide>  }
+        {pageState=='3'&&<Recommend houseId={houseId} dataSource={surroundList}></Recommend>  }
+      </Layout>
     
-  </View>
+      {!!houseId && (
+        <Tab
+          value={['入住指引','房东推荐']}
+          pageState={pageState}
+          onClick={[(e) => setPageState('2'),(e) => setPageState('3')]} />
+      )}
+    </View>
+  )
+  
+  
 }
 
 export default index

src/pages/guide/index.jsx

@@ -20,30 +20,31 @@ const guide = (props) => {
     const [state, setState] = useState(1)
 
     const [imgurl, setImgurl] = useState('')
-    const [detail, setDetail] = useState({})
-
-    useDidShow(() => {
-        if (houseId) {
-            getDetail()
-        }
-    })
-
-    useEffect(() => {
-        console.log(houseId, 'params33')
-        if (houseId) {
-            getDetail()
-        }
-
-    }, [])
-    const getDetail = () => {
-        request({ url: `/taHouse/${houseId}` }).then((res) => {
-            setDetail(res.data.data)
-
-            wx.setNavigationBarTitle({
-                title: res.data.data.title
-            })
-        })
-    }
+    // const [detail, setDetail] = useState({})
+    const detail = props.dataSource || {}
+
+    // useDidShow(() => {
+    //     if (houseId) {
+    //         getDetail()
+    //     }
+    // })
+
+    // useEffect(() => {
+    //     console.log(houseId, 'params33')
+    //     if (houseId) {
+    //         getDetail()
+    //     }
+
+    // }, [])
+    // const getDetail = () => {
+    //     request({ url: `/taHouse/${houseId}` }).then((res) => {
+    //         setDetail(res.data.data)
+
+    //         wx.setNavigationBarTitle({
+    //             title: res.data.data.title
+    //         })
+    //     })
+    // }
 
     const onOpenLocation = (lngLat) => {
         const [latitude, longitude] = lngLat.split(',')

src/pages/index/index.jsx

@@ -24,32 +24,26 @@ const index = (props) => {
   // const [userRole, setUserRole] = useState('1')
   // const [pageState, SetPageState] = useState('1')
   // const [list, setList] = useState([])
-  const [visible, setVisible] = useState(false)
+  // const [visible, setVisible] = useState(false)
+  const [showAuthPhone, setShowAuthPhone] = useState(false)
 
   useEffect(() => {
-    if (user.personId && !user.phone) {
-      setVisible(true)
-    }
-    if (user.personId && user.phone) {
-      setVisible(false)
-    }
-  }, [user.phone, user.personId])
-
+    setShowAuthPhone(!user.phone)
+  }, [user.phone])
 
   const onOk = (res) => {
-
     dispatch({ type: 'LOGIN', user: res.data.data })
-    setVisible(false)
+    setShowAuthPhone(false)
   }
 
   const onCancel = (e) => {
-    setVisible(false)
+    setShowAuthPhone(false)
   }
 
   return <View className='index'>
 
     {user.personId && <View>
-      <GetPhone visible={visible} onOk={onOk} onCancel={onCancel} ></GetPhone>
+      <GetPhone visible={showAuthPhone} onOk={onOk} onCancel={onCancel} ></GetPhone>
       {user.role == roleList.customer && <Customer houseId={houseId} orderId={orderId}></Customer>}
       {user.role == roleList.landlord && <Landlord ></Landlord>}
     </View>}

src/pages/recommend/index.jsx

@@ -16,19 +16,22 @@ const recommend = (props) => {
 
     const { value, houseId,...prop } = props
 
-    const [state, setState] = useState(1)
-    const [list, setList] = useState([])
+    // const [state, setState] = useState(1)
+    // const [list, setList] = useState([])
     const [id, setId] = useState()
-    useEffect(() => {
-        getImageList()
-    }, [])
-
-    const getImageList=()=>{
-        request({url:'/taHouseSurround',params:{houseId:houseId}}).then((res)=>{
-            const {records,...page} =res.data.data  
-            setList(records)
-        })
-    }
+
+    const list = props.dataSource || []
+
+    // useEffect(() => {
+    //     getImageList()
+    // }, [])
+
+    // const getImageList=()=>{
+    //     request({url:'/taHouseSurround',params:{houseId:houseId}}).then((res)=>{
+    //         const {records,...page} =res.data.data  
+    //         setList(records)
+    //     })
+    // }
 
 
     //