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

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=>{
+      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/household/index.jsx

@@ -1,58 +1,83 @@
-import React, { useEffect, useMemo, useState,useRef } from 'react'
-import Taro from '@tarojs/taro'
+import React, { useEffect, useMemo, useState } from 'react'
+import Taro, { useRouter } from '@tarojs/taro'
 import './index.scss'
-import { View, Text, Input,Image } from '@tarojs/components'
+import { View, Text, Input, Image } from '@tarojs/components'
 import ContainerLayout from '../../../compents/container/index'
 import radio from '../../../assets/radio.png'
 import Layout from '../../../layout/index'
+import request from '../../../util/request'
+import groupby from 'lodash.groupby';
+
 const house = (props) => {
 
-  const [list, setList] = useState([])
-  const [radioHouse, setRadioHouse] = useState()
-  
-    const ref = useRef();
-    useEffect(() => {
-      ref.current = 3;
-    });
-  
-  
-
-  const radioHouseState = useMemo(()=>props.radioHouseState,[props.radioHouseState])
-  wx.setNavigationBarTitle({
-    title: '民宿房源管理'
-  })
-console.log(props,radioHouseState)
+  const router = useRouter()
+  const { houseId } = router.params
+
+  const [list, setList] = useState({})
+
+
+
   useEffect(() => {
-    setList([
-      {
-        id:1,
-        name: 'zhou',
-        phone: '177'
-      },
-      {
-        id:2,
-        name: 'zhou',
-        phone: '177'
-      },
-      {
-        id:3,
-        name: 'zhou',
-        phone: '177'
-      }
-    ])
+    getList()
   }, [])
 
-  const onShare = () => {
-    Taro.navigateTo({ url: "/pages/share/index" })
+  const getList = () => {
+    request({ url: '/taHousePerson',params:{houseId:houseId,pageSize:9999} }).then((res) => {
+      const { records, ...page } = res.data.data
+      console.log(groupby(records, item => item.orderId))
+      setList(groupby(records, item => item.orderId))
+      //   {
+      //   const [date,_] = item.createDate.split('T')
+      //   return date
+      // }))
+    })
   }
 
+  // {
 
+  //   Object.keys(list).map((item) => {
+  //       console.log(list[item], item, 'list[item]11')
 
+  //       return <View className='imglist-card'>
+  //           <View className='imglist-card-tags' style={{ display: 'flex' }}>
+  //               {/* imageimageimageimage34 */}
+  //               {list[item].map((x) => {
+  //                   return <View className='tag' s>{x.tagName}</View>
+  //               })}
+  //           </View>
+  //           <Image src={list[item][0].image} style={{ width: '100%' }} onClick={() => { setData(list[item]); setIsOpened(true) }}></Image>
+  //       </View>
+  //   })
+  // }
   return <View className='household'>
 
     <Layout>
-      <View className='household-text'>vjoaphepionvodashvoia</View>
-    {list.map((x, index) => {
+      {/* <View className='household-text'>vjoaphepionvodashvoia</View> */}
+
+      {
+        Object.keys(list).map((item) => {
+          return <View className='household-view'>
+            {/* {index + 1} */}
+            <Text className='household-view-title'>订单编号：{item}</Text>
+            <ContainerLayout className='household-view-card'>
+              {list[item].map((x) => {
+                return <view>{x.name}: {x.phone}</view>  
+              })}
+              {list[item].length == 0 && '暂无入住人信息'}
+
+            </ContainerLayout>
+
+          </View>
+        })
+
+      }
+      {
+        Object.keys(list).length === 0 && <view style={{textAlign:'center',paddingTop:30}}>
+           暂无入住信息
+        </view>
+      }
+
+      {/* {list.map((x, index) => {
       return <View className='household-view'>
 
         <Text className='household-view-title'>入住日期：{index + 1}</Text>
@@ -63,10 +88,10 @@ console.log(props,radioHouseState)
 
       </View>
 
-    })}
+    })} */}
     </Layout>
-   
-   
+
+
   </View>
 }
 

src/pages/house/household/index.scss

@@ -24,7 +24,7 @@
       margin-top: 26.67px;
       position: relative;
       min-height: 150px;
-
+line-height: 45px;
  text-align: center;
 background-color:#274291;
 

src/pages/house/index.jsx

@@ -20,24 +20,31 @@ const house = (props) => {
     const [userRole, setUserRole] = useState('1')
     const [pageState, setPageState] = useState('2')
     const [list, setList] = useState([])
-    useEffect(() => {
-
-        setList([
-            {
-                name: 'zhou',
-                phone: '177'
-            },
-            {
-                name: 'zhou',
-                phone: '177'
-            },
-            {
-                name: 'zhou',
-                phone: '177'
-            }
-        ])
-    }, [])
+    const [dataSource, setDataSource] = useState([])
+    const [imgSource, setImgSource] = useState([])
+    useDidShow(() => {
+        if (houseId) {
+            getDetail()
+            getImageList()
+        }
+    })
+
+    const getImageList=()=>{
+        request({url:'/taHouseSurround',params:{houseId:houseId}}).then((res)=>{
+            const {records,...page} =res.data.data  
+            setImgSource(records)
+        })
+    }
+
+    const getDetail = () => {
+        request({ url: `/taHouse/${houseId}` }).then((res) => {
+            setDataSource(res.data.data)
 
+            wx.setNavigationBarTitle({
+                title: res.data.data.title
+            })
+        })
+    }
     
 
     const onTabClick = (e) => {
@@ -56,8 +63,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

@@ -2,7 +2,7 @@ import React, { useEffect, useMemo, useState } from 'react'
 // import { useEffect, useLayoutEffect, useReducer, useState, useContext, useRef, useCallback, useMemo } from '@tarojs/taro'
 import Taro, { useShareAppMessage, useRouter } from "@tarojs/taro";
 import { useSelector, } from 'react-redux'
-import { View, Input, Text, Image ,Picker } from '@tarojs/components'
+import { View, Input, Text, Image, Picker } from '@tarojs/components'
 import Layout from '../../layout/index'
 import Tab from '../../compents/tab/index'
 import Container from '../../compents/container/index'
@@ -30,9 +30,9 @@ const index = (props) => {
     const [userRole, setUserRole] = useState('1')
     const [pageState, setPageState] = useState('1')
     const [list, setList] = useState([])
-    const [number,setNumber] = useState()
-    const [startTime,setStartTime]=useState('')
-    const [endTime,setEndTime]=useState('')
+    const [personNum, setPersonNum] = useState()
+    const [startTime, setStartTime] = useState('')
+    const [endTime, setEndTime] = useState('')
     useEffect(() => {
 
         // console.log(page, 'page')
@@ -52,28 +52,57 @@ const index = (props) => {
         ])
     }, [])
     useShareAppMessage(res => {
-        console.log('3333')
+        Taro.showLoading({
+            title: '分享中',
+          })
         if (res.from === 'button') {
             // 来自页面内转发按钮
             console.log(res.target)
         }
-        const response =  syncAddOrder()
-        // /api/ma/taHouseSetting method:'post'
-        return {
-            title: '分享到微信',
-            path: `/pages/index/index?houseId=${houseId}&number=${number}&startTime=${startTime}&endTime=${endTime}`
+
+        const data = {
+            houseId,
+            personNum,
+            startDate: startTime,
+            endDate: endTime
         }
+        return request({ url: '/taHouseSetting', method: 'post', data }).then(res => {
+            const { data } = res.data
+            if (res.data.data) {
+                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}`
+                    }
+                })
+            } else {
+                Taro.showModal({
+                    title: '输入信息有误',
+                    content: '请重新输入',
+                    showCancel: false,
+                    success: function (res) {
+                        if (res.confirm) {
+                            console.log('用户点击确定')
+                        } else if (res.cancel) {
+                            console.log('用户点击取消')
+                        }
+                    }
+                })
+            }
+
+        })
+
+
+
     })
 
     async function syncAddOrder() {
-        const data={
-            houseId,
-            number,
-            startTime,
-            endTime
-        }
-      return  request({url:'/taHouseSetting',method:'post',data})
-      }   
+
+
+    }
 
     const onTimeChange = (e) => {
         console.log(e, '111')
@@ -82,24 +111,11 @@ const index = (props) => {
 
 
     return <View className='share'>
-
-
-        {/* <View className='page-section'>
-            <Text>时间选择器</Text>
-            <View>
-              <Picker mode='time' onChange={this.onTimeChange}>
-                <View className='picker'>
-                  当前选择：{this.state.timeSel}
-                </View>
-              </Picker>
-            </View>
-          </View> */}
-
         <Layout>
             <View className='inputstyle-view'>
                 <Text className='title'>入住人数</Text>
                 <Container className='inputstyle-view-card ' style={{ borderRadius: '20rpx', padding: '0 40rpx' }} >
-                    <Input type='number' onInput={()=>setLngLat(e.detail.value)} placeholderClass='placeholderinput' className='input' type='text' placeholder='' />
+                    <Input type='number' value={personNum} onInput={(e) => setPersonNum(e.detail.value)} placeholderClass='placeholderinput' className='input' type='text' placeholder='' />
                 </Container>
             </View>
             <View className='inputstyle-view'>
@@ -107,7 +123,7 @@ const index = (props) => {
                 <Container className='inputstyle-view-card ' style={{ borderRadius: '20rpx', padding: '0 40rpx' }} >
 
                     <Picker mode='date' onChange={onTimeChange}>
-                        <View className='input' style={{height: '44rpx',lineHeight: '44rpx',fontsize: '28rpx'}}>
+                        <View className='input' style={{ height: '44rpx', lineHeight: '44rpx', fontsize: '28rpx' }}>
                             {startTime}
                         </View>
                     </Picker>
@@ -118,20 +134,16 @@ const index = (props) => {
             <View className='inputstyle-view'>
                 <Text className='title'>离店日期</Text>
                 <Container className='inputstyle-view-card ' style={{ borderRadius: '20rpx', padding: '0 40rpx' }} >
-                <Picker mode='date' onChange={(e)=>{setEndTime(e.detail.value)}}>
-                        <View className='input' style={{height: '44rpx',lineHeight: '44rpx',fontsize: '28rpx'}}>
+                    <Picker mode='date' onChange={(e) => { setEndTime(e.detail.value) }}>
+                        <View className='input' style={{ height: '44rpx', lineHeight: '44rpx', fontsize: '28rpx' }}>
                             {endTime}
                         </View>
                     </Picker>
                 </Container>
             </View>
         </Layout>
-        <Tab openType="share" className='addhousetab' color='#ffffff' pageState='3' onClick={(e) => console.log(33)} value={['分享到微信']} ></Tab> 
-
-
-        {/* onClick={[(e) => setPageState('2'),style={{ display: 'contents' }} (e) => setPageState('1')]} */}
+        <Tab openType="share" className='addhousetab' color='#ffffff' pageState='3' onClick={(e) => console.log(33)} value={['分享到微信']} ></Tab>
 
-        {/* <Tab className='addhousetab' color='#ffffff' pageState='3' value={['分享到微信']} ></Tab> */}
 
     </View>
 }