fix

config/dev.js

@@ -4,10 +4,10 @@ module.exports = {
     NODE_ENV: '"development"'
   },
   defineConstants: {
-    HOST: '"http://localhost:7080"',
+    // HOST: '"http://localhost:7080"',
     // HOST: '"https://sgl.ycjcjy.com"',
     // HOST: '"http://192.168.31.68:7080"',
-    // HOST: '"http://192.168.211.181:7080"',
+    HOST: '"http://192.168.211.181:7080"',
  
     // OSS_PATH: "https://njcj.oss-cn-shanghai.aliyuncs.com/",
     // OSS_FAST_PATH: "https://njcj.oss-accelerate.aliyuncs.com/",

src/pages/customer/index.js

@@ -27,11 +27,13 @@ const index = (props) => {
   }
 
   useEffect(() => {
+    
     if(props.orderId){
       request({url: `/taHouseOrder/${props.orderId}`,}).then(res=>{
         const data = res.data.data
+        console.log(data,'props.orderId')
         setOrderInfo(data)
-        regUnFinished(data.status !== 1)
+        setRegUnFinished(data.status !== 1)
       })
     }
   }, [props.orderId])
@@ -43,9 +45,11 @@ const index = (props) => {
   }, [props.orderId, regUnFinished])
   
   useEffect(() => {
+    console.log(props.houseId && (!props.orderId || !regUnFinished),'data')
     if(props.houseId && (!props.orderId || !regUnFinished)){
       request({url: `/taHouse/${props.houseId}`,}).then(res=>{
         const data = res.data.data
+        console.log(data,'data')
         setHouseInfo(data)
         setPageState('2')
       })
@@ -59,15 +63,15 @@ const index = (props) => {
   }, [props.houseId, props.orderId, regUnFinished])
  
   return (
-    <View className='index'>
+    <View className='index' >
       {pageState=='1'&&<Register oderId={orderId} dataSource={orderInfo} onFinished={handleRegisterFinished}></Register>}
 
-      <Layout>
+      {pageState!='1'&&<Layout>
         {pageState=='2'&&<Guide houseId={houseId} dataSource={houseInfo}></Guide>  }
         {pageState=='3'&&<Recommend houseId={houseId} dataSource={surroundList}></Recommend>  }
-      </Layout>
-    
-      {!!houseId && (
+      </Layout>}
+    {/* !!houseId&& */}
+      {pageState!='1' && (
         <Tab
           value={['入住指引','房东推荐']}
           pageState={pageState}

src/pages/customer/register/index.jsx

@@ -2,7 +2,7 @@ import React, { useEffect, useState } from 'react'
 import './register.scss'
 import { View, Text, Input } from '@tarojs/components'
 import ContainerLayout from '../../../compents/container/index'
-import { AtInput } from 'taro-ui'
+// import { AtInput } from 'taro-ui'
 import Tab from '../../../compents/tab'
 import Layout from '../../../layout'
 import request from '@/util/request'
@@ -55,7 +55,7 @@ const InputGroup = props => {
 
   return (
     <View className='register-user'>
-      <Text>入住人{props.index}</Text>
+      <Text>入住人{props.index+1}</Text>
       <ContainerLayout className='register-user-from'>
         {console.log(name,phone,'name,phone')}
         <Input name="name" className='register-user-from-input' value={name} onInput={handeNameChange} placeholder='姓名' type='text' />
@@ -67,8 +67,6 @@ const InputGroup = props => {
 
 const register = (props) => {
 
-  const { orderId } = props
-
   let [list, setList] = useState([])
   useEffect(() => {
     if (props.dataSource) {
@@ -116,7 +114,7 @@ const register = (props) => {
     setList([...list])
   }
 
-  return <View className='register'>
+  return <View className='register' >
     <Layout>
       {list.map((x, index) => {
         let inx = index

src/pages/house/index.jsx

@@ -20,24 +20,40 @@ const house = (props) => {
     const [userRole, setUserRole] = useState('1')
     const [pageState, setPageState] = useState('2')
     const [list, setList] = useState([])
-    useEffect(() => {
+    const [dataSource, setDataSource] = useState([])
+    const [imgSource, setImgSource] = useState([])
+    useDidShow(() => {
+        if (houseId) {
+            getDetail()
+        }
+    })
 
-        setList([
-            {
-                name: 'zhou',
-                phone: '177'
-            },
-            {
-                name: 'zhou',
-                phone: '177'
-            },
-            {
-                name: 'zhou',
-                phone: '177'
-            }
-        ])
+    useEffect(() => {
+        getImageList()
     }, [])
 
+    const getImageList=()=>{
+        request({url:'/taHouseSurround',params:{houseId:houseId}}).then((res)=>{
+            const {records,...page} =res.data.data  
+            setImgSource(records)
+        })
+    }
+    // useEffect(() => {
+    //     console.log(houseId, 'params33')
+    //     if (houseId) {
+    //         getDetail()
+    //     }
+
+    // }, [])
+    const getDetail = () => {
+        request({ url: `/taHouse/${houseId}` }).then((res) => {
+            setDataSource(res.data.data)
+
+            wx.setNavigationBarTitle({
+                title: res.data.data.title
+            })
+        })
+    }
     
 
     const onTabClick = (e) => {
@@ -56,8 +72,8 @@ const house = (props) => {
         <View >
 
             <Layout>
-                {pageState == '2' && <Guide houseId={houseId}></Guide>}
-                {pageState == '3' && <Recommend houseId={houseId}></Recommend>}
+                {pageState == '2' && <Guide houseId={houseId} dataSource={dataSource}></Guide>}
+                {pageState == '3' && <Recommend houseId={houseId} dataSource={imgSource}></Recommend>}
             </Layout>
             {pageState != '1' && <Tab value={['入住指引', '房东推荐']} pageState={pageState} onClick={[(e) => setPageState('2'), (e) => setPageState('3')]}></Tab>}
 

src/pages/share/index.jsx

@@ -52,7 +52,9 @@ const index = (props) => {
         ])
     }, [])
     useShareAppMessage(res => {
-        console.log('3333')
+        Taro.showLoading({
+            title: '分享中',
+          })
         if (res.from === 'button') {
             // 来自页面内转发按钮
             console.log(res.target)
@@ -70,6 +72,7 @@ const index = (props) => {
                 console.log(data.taHouseOrder.orderId)
                 const { orderId } = data.taHouseOrder
                 return request({ url: `/taHouse/${houseId}/share` }).then(res => {
+                    Taro.hideLoading()
                     return {
                         title: '分享到微信',
                         path: `/pages/index/index?houseId=${houseId}&personNum=${personNum}&startTime=${startTime}&endTime=${endTime}&orderId=${orderId}`