feats

src/pages/customer/index.js

@@ -17,6 +17,8 @@ const index = (props) => {
   const user = useSelector(state => state.user)
 
   const [pageState, setPageState] = useState('3')
+  const [houseInfo, setHouseInfo] = useState()
+  const [surroundList, setSurroundList] = useState()
 
   useEffect(() => {
     if(props.orderId){
@@ -28,26 +30,38 @@ const index = (props) => {
       })
     }
   }, [props.orderId])
+  
+  useEffect(() => {
+    if(props.houseId){
+      request({url: `/taHouse/${props.houseId}`,}).then(res=>{
+        const data = res.data.data
+        setHouseInfo(data)
+        setPageState('2')
+      })
+    }
+
+    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')]} />
-            )}      
-          </View>
-        )}
+      {pageState=='1'&&<Register oderId={orderId}></Register>}
+
+      <Layout>
+        {pageState=='2'&&<Guide houseId={houseId} dataSource={houseInfo}></Guide>  }
+        {pageState=='3'&&<Recommend houseId={houseId} dataSource={surroundList}></Recommend>  }
+      </Layout>
+    
+      {!!houseId && (
+        <Tab
+          value={['入住指引','房东推荐']}
+          pageState={pageState}
+          onClick={[(e) => setPageState('2'),(e) => setPageState('3')]} />
+      )}
     </View>
   )
   

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/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)
+    //     })
+    // }
 
 
     //