fix

config/dev.js

@@ -4,9 +4,11 @@ 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"',
+ 
     // OSS_PATH: "https://njcj.oss-cn-shanghai.aliyuncs.com/",
     // OSS_FAST_PATH: "https://njcj.oss-accelerate.aliyuncs.com/",
   },

package-lock.json

@@ -11621,6 +11621,11 @@
       "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=",
       "dev": true
     },
+    "lodash.groupby": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npm.taobao.org/lodash.groupby/download/lodash.groupby-4.6.0.tgz",
+      "integrity": "sha1-Cwih3PaDl8OXhVwyOXg4Mt90A9E="
+    },
     "lodash.sortby": {
       "version": "4.7.0",
       "resolved": "https://registry.npm.taobao.org/lodash.sortby/download/lodash.sortby-4.7.0.tgz",

package.json

@@ -42,6 +42,7 @@
     "@tarojs/runtime": "3.0.13",
     "@tarojs/taro": "3.0.13",
     "lodash": "4.17.15",
+    "lodash.groupby": "^4.6.0",
     "react": "^16.10.0",
     "react-dom": "^16.10.0",
     "react-redux": "^7.2.2",

project.config.json

@@ -4,7 +4,7 @@
 	"description": "十公里小程序",
 	"appid": "wx06a7372d48d56843",
 	"setting": {
-		"urlCheck": true,
+		"urlCheck": false,
 		"es6": false,
 		"postcss": false,
 		"preloadBackgroundData": false,

src/app.config.js

@@ -12,6 +12,7 @@ export default {
     'pages/material/index',
     'pages/label/index',
     'pages/label/edit/index',
+    'pages/addimg/index',
   ],
   window: {
     backgroundTextStyle: 'light',

src/app.js

@@ -26,17 +26,14 @@ console.log(this.props,'this.props')
       success (res) {
         if (res.code) {
           //发起网络请求
-          // console.log(res.code,store.getState(),'code')
-          // asyncLogin().dispatch()
-          // store.dispatch(asyncLogin())
-          // asyncLogin()
+
           request({url:`/login?code=${res.code}`,method:"post"}).then((res)=>{
-            console.log(res.data.data.token,'res.data.data.token')
-            store.dispatch({type:'LOGIN',user:res.data.data})
-            Taro.setStorage({
-              key:"token",
-              data:res.data.data.token
-            })
+            try {
+              Taro.setStorageSync('token', res.data.data.token)
+              store.dispatch({type:'LOGIN',user:res.data.data})
+            } catch (e) { }
+            
+            
           })
         } else {
           console.log('登录失败！' + res.errMsg)

src/app.scss

@@ -55,3 +55,10 @@ page {
    }
  
  }
+
+
+ .nodata{
+   text-align: center;
+   margin: auto;
+   margin-top: 90px;
+ }

src/compents/NoData/index.jsx

@@ -0,0 +1,12 @@
+import React, { useEffect, useState } from 'react'
+import './index.scss'
+
+export default props => {
+  return (
+    <view className={`no-data-wrapper ${props.className}`} style={props.style}>
+      {
+        props.nodata ? <view className="no-data-view">{props.tips || '暂无数据'}</view> : props.children
+      }
+    </view>
+  )
+}

src/compents/NoData/index.scss

@@ -0,0 +1,17 @@
+.no-data-wrapper {
+  position: relative;
+  height: 100%;
+  min-height: 200px;
+
+  .no-data-view {
+    width: 100%;
+    text-align: center;
+    font-size: 0.8em;
+    color: #aaa;
+    position: absolute;
+    left: 0;
+    top: 50%;
+    transform: translateY(-50%);
+    line-height: 2em;
+  }
+}

src/compents/getphone/index.jsx

@@ -0,0 +1,87 @@
+import React, { useState } from 'react'
+import Taro from '@tarojs/taro'
+import { AtModal, AtModalHeader, AtModalContent, AtModalAction } from "taro-ui"
+import { Button } from '@tarojs/components'
+import { useSelector,useDispatch } from 'react-redux'
+import request from '@/util/request'
+import './index.scss'
+
+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
+        console.log(e, 'e')
+        if (errMsg === 'getPhoneNumber:ok') {
+            request({
+                url: "/taPerson/phone",
+                method: 'post',
+                data: {
+                    sessionKey: user.sessionKey || '',
+                    encryptedData: data.encryptedData,
+                    iv: data.iv,
+                }
+            }).then((res) => {
+                // setUser({ ...user, phone: res.phoneNumber })
+
+                if (props.onOk) {
+                    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)
+            }
+        }
+    }
+
+    const handleCancel = () => {
+        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 props.visible && (
+    //     <view style={{textAlign:'center'}}> 
+    //         <view className='GetUserPhone'>
+    //             {
+    //                 showPannel && (
+    //                     <view className='centerLabel'>
+    //                         <text>您暂未授权手机号</text>
+    //                         <view className='flex-h'>
+    //                             <text className='flex-item' onClick={handleCancel}>取消</text>
+    //                             
+    //                         </view>
+    //                     </view>
+    //                 )
+    //             }
+    //         </view>
+    //     </view>
+    // )
+}

src/compents/getphone/index.scss

@@ -0,0 +1,49 @@
+.GetUserPhone {
+    width: 100%;
+    position: fixed !important;
+    left: 0;
+    top: 0;
+    bottom: 0;
+    z-index: 1000;
+    background: rgba(0, 0, 0, 0.7);
+  
+    view {
+      width: 60%;
+      background: #fff;
+      border-radius: 10px;
+  
+      text {
+        display: block;
+        text-align: center;
+        font-size: 32px;
+        line-height: 40px;
+        padding: 40px 0;
+      }
+  
+      .flex-h {
+        position: relative;
+        overflow: hidden;
+        border-top: 2px solid rgba(0, 0, 0, 0.08);
+//   display: flex;
+        text {
+          font-size: 36px;
+          font-weight: bold;
+          line-height: 80px;
+          text-align: center;
+          border-right: 2px solid rgba(0, 0, 0, 0.08);
+          color: #999;
+        }
+        button {
+          font-size: 36px;
+          font-weight: bold;
+          line-height: 80px;
+          background: none;
+          border: none;
+          padding: 0 !important;
+          &::after {
+            display: none;
+          }
+        }
+      }
+    }
+  }

src/compents/tab/index.jsx

@@ -1,11 +1,12 @@
 import React, { useEffect, useState } from 'react'
 import Taro from "@tarojs/taro";
 import { useSelector } from 'react-redux'
-import { View, Image } from '@tarojs/components'
+import { View, Button, Image } from '@tarojs/components'
 import uploadicon from '../../assets/uploadicon.png'
 import roleList from '../../util/userRole'
 import './index.scss'
 
+
 const getColor = (role) => {
     switch (role) {
         case roleList.landlord: return '#274291'
@@ -20,10 +21,10 @@ const tab = (props) => {
 
     const user = useSelector(state => state.user)
 
-    const { value, pageState, color, ...prop } = props
+    const { value, openType, pageState, formType, color, ...prop } = props
 
     const [state, setState] = useState(1)
-    console.log(props)
+    console.log(props, openType, 'formType')
     useEffect(() => {
 
     }, [])
@@ -31,27 +32,65 @@ const tab = (props) => {
     //     color: #fed12f;
     // }${props.className}
     return <View className='tab'>
-        {value.length == 1 && <View className={`tab,tab1,${props.className}`} style={{ backgroundColor: getColor(user.role) ,color}}   onClick={() => props.onClick('2')}>{value[0]}
-        </View>}
+        {value.length == 1 && 
+        <>
+        {openType &&  <button openType="share" className={`tab,tab1,${props.className}`} style={{ backgroundColor: getColor(user.role), color }} onClick={() => props.onClick('2')}>{value[0]}</button>}
+        {!openType && <View className={`tab,tab1,${props.className}`} style={{ backgroundColor: getColor(user.role), color }} onClick={() => props.onClick('2')}>{value[0]}</View>}
+        </>
+        }
         {value.length == 2 && <View className={`tab,tab2,${props.className}`} style={{ display: 'flex', }}>
             <View style={{ width: '50%' }} style={pageState == '2' ? { color: getColor(user.role), width: '50%' } : { width: '50%' }} onClick={props.onClick[0]}>{value[0]}</View>
-            <View style={{ width: '50%' }} style={pageState == '3' ? { color: getColor(user.role), width: '50%' } : { width: '50%' }} onClick={props.onClick[1]}>{value[1]}</View>
-        </View>}
-        {/* {value==1&&<View className={`tab,tab1,${props.className}`} onClick={()=>props.onClick(2)}>onClick={props.onClick[0]('2')}
-            开启旅程
-        </View>}
-        {value!=1&&<View className={`tab,tab2,${props.className}`}  style={{display: 'flex',}}>
-            <View style={{width:'50%'}} style={value=='guide'||value==2 ?{color: getColor(user.role),width:'50%'}:{width:'50%'}}  onClick={()=>props.onClick('guide')}>入住指引</View>
-            <View style={{width:'50%'}} style={value=='recommend' ?{color: getColor(user.role),width:'50%'}:{width:'50%'}} c onClick={()=>props.onClick('recommend')}>房东推荐</View>
-        </View>} */}
-        {/* {value==1&&<View className={`tab,tab1,${props.className}`} style={{background:getColor(user.role),color:'#ffffff'} } onClick={()=>Taro.navigateTo({ url: "/pages/house/add/index" })}>
-           +新增房源
+            {formType && <Button className='tab-btn' formType="submit" plain={true} style={pageState == '3' ? { color: getColor(user.role), width: '50%', border: 'none' } : { width: '50%', border: 'none' }}>{value[1]}</Button>}
+            {openType && <button className='tab-btn' openType="share" plain={true} style={pageState == '3' ? { color: getColor(user.role), width: '50%', border: 'none' } : { width: '50%', border: 'none' }}>{value[1]}</button>}
+            {!formType&&!openType &&
+                <View style={{ width: '50%' }} style={pageState == '3' ? { color: getColor(user.role), width: '50%' } : { width: '50%' }} onClick={props.onClick[1]}>{value[1]}</View>
+            }
         </View>}
-        {value!=1&&<View className={`tab,tab2,${props.className}`}  style={{display: 'flex',}}>
-            <View style={{width:'50%'}} style={value=='guide'||value==2 ?{color: getColor(user.role),width:'50%'}:{width:'50%'}}  onClick={()=>props.onClick('guide')}>入住指引</View>
-            <View style={{width:'50%'}} style={value=='recommend' ?{color: getColor(user.role),width:'50%'}:{width:'50%'}} c onClick={()=>props.onClick('recommend')}>房东推荐</View>
-        </View>} */}
+
     </View>
 };
 
-export default tab
+export default tab
+
+// import React, { useEffect, useState } from 'react'
+// import Taro from "@tarojs/taro";
+// import { Button, View } from '@tarojs/components'
+
+// import './index.scss'
+
+// const getColor = (role) => {
+//     switch (role) {
+//         case roleList.landlord: return '#274291'
+//         case roleList.adminuser: return '#274291'
+//         // landlord: 'landlord',
+//         case roleList.customer: return '#fed12f'
+//     }
+// }
+
+
+// const tab = (props) => {
+//     // formType="submit"
+
+//     const { value, pageState, formType, color, ...prop } = props
+
+//     const [state, setState] = useState(1)
+//     // console.log(props)
+//     useEffect(() => {
+
+//     }, [])
+//     //  &-on{
+//     //     color: #fed12f; style={{ backgroundColor:'#274291' ,color}}
+//     // }${props.className}
+//     return <View className='tab'>
+//         {value.length == 1 && <View className={`tab tab1 ${props.className}`} onClick={() => props.onClick('2')}>{value[0]}
+//         </View>}
+//         {value.length == 2 && <View className={`tab tab2 ${props.className}`} style={{ display: 'flex', }}>
+//             <View style={{ width: '50%' }} style={pageState == '2' ? { color: '#274291', width: '50%' } : { width: '50%' }} onClick={props.onClick[0]}>{value[0]}</View>
+//            { !formType? 
+//             <View formType={formType} style={{ width: '50%' }} style={pageState == '3' ? { color: '#274291', width: '50%' } : { width: '50%' }} onClick={props.onClick[1]}>{value[1]}</View>
+//             :<Button className='tab-btn' formType={formType} plain={true} style={{ width: '50%' }} style={pageState == '3' ? { color: '#274291', width: '50%',border:'none' } : { width: '50%',border:'none' }} onClick={props.onClick[1]}>{value[1]}</Button>}
+//         </View>}
+//     </View>
+// };
+
+// export default tab

src/compents/tab/index.scss

@@ -8,7 +8,9 @@
     text-align: center;
     line-height: 173px;
     z-index:999;
-
+    &-btn{
+        line-height: unset;
+    }
 
     .tab1 {
         background-color: #274291;

src/compents/tags/index.jsx

@@ -2,44 +2,42 @@ import React, { useEffect, useState } from 'react'
 import Taro from "@tarojs/taro";
 import { useSelector } from 'react-redux'
 import { View, Text } from '@tarojs/components'
-import roleList from '../../util/userRole'
 import './index.scss'
-import { set } from 'lodash';
-
-const getColor = (role) => {
-    switch (role) {
-        case roleList.landlord: return '#274291'
-        case roleList.adminuser: return '#274291'
-        // landlord: 'landlord',
-        case roleList.customer: return '#fed12f'
-    }
-}
-
 
 const tags = (props) => {
 
-    const user = useSelector(state => state.user)
 
     const { value, list, onChange, ...prop } = props
 
     const [state, setState] = useState(1)
-    const [key,setKey] = useState(value)
+    const [key, setKey] = useState(value)
+    const [keyList, setKeyList] = useState([])
     console.log(props)
     useEffect(() => {
 
     }, [])
-   const onClick = (item) =>{
-
-       setKey(item.id)
-       onChange(item)
-   }
+    const onClick = (item) => {
+       
+        
+        let  newkeyList= keyList
+        console.log(newkeyList.find(x => x.tagId === item.tagId),'333')
+        if (newkeyList.find(x => x.tagId === item.tagId)) {
+            newkeyList =  newkeyList.filter((x) => x.tagId != item.tagId )
+        } else {
+            newkeyList.push(item)
+        }
+
+console.log(newkeyList,keyList)
+        setKeyList([...newkeyList])
+        onChange([...newkeyList])
+    }
     return <View className='tags'>
-        <View className='at-row at-row--wrap' style={{marginTop:'10rpx'}}>
+        <View className='at-row at-row--wrap' style={{ marginTop: '10rpx' }}>
             {
-                list.map((item)=>{
-                   return <View className='at-col at-col-4 ' >
-                       <View className={`tags-btn tags-btn${item.id===key?'-on':''}`} onClick={()=>onClick(item)} >{item.name}</View>
-                       </View>
+                list.map((item, index) => {
+                    return <View className='at-col at-col-4 ' key={index}>
+                        <View className={`tags-btn tags-btn${keyList.find(x => x.tagId === item.tagId) ? '-on' : ''}`} onClick={() => onClick(item)} >{item.name}</View>
+                    </View>
                 })
             }
 

src/pages/addimg/index.config.js

@@ -0,0 +1,8 @@
+// onShareAppMessage: function () {
+// return custom share data when user share.
+//     console.log('44444444')
+//   },
+
+export default {
+    enableShareAppMessage: true
+}

src/pages/addimg/index.jsx

@@ -0,0 +1,115 @@
+import React, { useEffect, useMemo, useState } from 'react'
+import Taro, { useDidShow, useRouter } from '@tarojs/taro'
+import { useSelector } from 'react-redux'
+import { View, ScrollView, Image } from '@tarojs/components'
+import Layout from '../../layout/index'
+import Tab from '../../compents/tab/index'
+
+import radio from '../../assets/radio.png'
+import './index.scss'
+import request from '../../util/request'
+
+const addimg = (props) => {
+    const router = useRouter()
+    const { houseId, tagIds } = router.params
+    const user = useSelector(state => state.user)
+
+    const [pageState, setPageState] = useState('2')
+    const [list, setList] = useState([])
+
+    const [choiceList, setChoicelist] = useState([])
+
+
+    useEffect(() => {
+        getImageList()
+    }, [])
+
+    const getImageList = () => {
+
+
+        request({ url: '/taMetaImageTag', params: { tagIds: tagIds } }).then((res) => {
+            const { records, ...page } = res.data.data
+
+            const r = records.reduce((all, next) => all.some((atom) => atom.imageId == next.imageId) ? all : [...all, next], []);
+            setList(r)
+        })
+
+    }
+
+    const choiceImg = (value) => {
+        console.log(value, '111')
+        const t = choiceList.find(x => x.imageId == value.imageId)
+        if (t) {
+            setChoicelist(choiceList.filter(x => x.imageId != value.imageId))
+        } else {
+            setChoicelist([
+                ...choiceList,
+                value
+            ])
+        }
+    }
+
+    const onAddimg = (e) => {
+        console.log(e, '111')
+        if (choiceList.length > 0) {
+
+            const data = choiceList.map(x => {
+                return {
+                    houseId,
+                    image: x.image,
+                    imageId:x.imageId,
+                }
+            })
+            request({ url: '/taHouseSurround', method: 'post', data }).then((res)=>{
+                Taro.showModal({
+                    title: '添加成功',
+                    content: '点击确认按钮，返回上级菜单',
+                    showCancel: false,
+                    success: function (res) {
+                        if (res.confirm) {
+                            console.log('用户点击确定')
+        
+                            Taro.navigateBack({
+                                delta: 2
+                            })
+                        } else if (res.cancel) {
+                            console.log('用户点击取消')
+                        }
+                    }
+                })
+               
+            })
+        }
+
+    }
+
+
+    return <View className='addimg'>
+
+
+        <View >
+
+            <View className='at-row at-row--wrap'>
+                {list.map((x) => {
+                    return <View className='at-col at-col-3 addimg-view-card' key={x.imageId}>
+                        <View className='addimg-view-card-radio' onClick={() => choiceImg(x)}>
+                            {choiceList.find(y => y.imageId == x.imageId) && <Image src={radio} style={{ width: '30rpx', height: '20rpx' }}></Image>}
+                        </View>
+                        <Image src={x.image} mode='aspectFit' style={{ width: '100%', height: '200rpx' }} ></Image>
+                    </View>
+                })}
+                {/* {list.map((x) => {
+                    return <View className='at-col at-col-4'>A</View>
+                })} */}
+            </View>
+            <Tab value={['取消', `选择${choiceList.length}`]} pageState="3" onClick={[(e) => Taro.navigateBack({
+                delta: 1
+            }), (e) => onAddimg()]}></Tab>
+
+        </View>
+
+
+    </View>
+}
+
+export default addimg

src/pages/addimg/index.scss

@@ -0,0 +1,32 @@
+.addimg {
+
+  
+  // padding: 13.33px 0;
+  &-view {
+
+    &-card {
+      padding: 0;
+      color: #181818;
+      font-size: 24px;
+      font-weight: 600;
+      margin-top: 26.67px;
+      position: relative;
+
+      &-radio {
+          width: 50px;
+          height: 50px;
+        background-color: #274291;
+        text-align: center;
+        line-height: 50px;
+        position: absolute;
+        border-radius: 25px;
+        top: 0px;
+        right: 0px;
+      }
+
+
+
+    }
+  }
+
+}

src/pages/customer/index.js

@@ -9,39 +9,31 @@ import Recommend from '../recommend/index'
 // import HouseLIst from '../house/list'
 
 import './index.scss'
+import request from '../../util/request'
 
 const index = (props) => {
-
-  const page = useSelector(state => state.page)
-
+  const {houseId,orderId} = props
+ 
   const user = useSelector(state => state.user)
 
-  const [userRole, setUserRole] = useState('1')
-  const [pageState, setPageState] = useState('2')
-  const [list, setList] = useState([])
+  const [pageState, setPageState] = useState(false)
   useEffect(() => {
+    
+
+    if(orderId){
+      request({url:'',}).then(res=>{
+        setPageState('1')
+      })
+    }else{
+      setPageState('1')
+    }
 
-    console.log(page,'page')
-    setList([
-      {
-        name: 'zhou',
-        phone: '177'
-      },
-      {
-        name: 'zhou',
-        phone: '177'
-      },
-      {
-        name: 'zhou',
-        phone: '177'
-      }
-    ])
   }, [])
 
 
   const onTabClick = (e) => {
     console.log(e, '111')
-    setUserRole(e)
+    
   }
 
   const onRegisterChange = (e) => {
@@ -52,39 +44,18 @@ const index = (props) => {
   return <View className='index'>
 
 
-     <View>
-
+     {pageState&&<View>
+{pageState=='1'&&<Register oderId={orderId}></Register>  }
     <Layout>
-    {pageState=='1'&&<Register></Register>  }
-    {pageState=='2'&&<Guide></Guide>  }
-    {pageState=='3'&&<Recommend></Recommend>  }
+    
+    {pageState=='2'&&<Guide houseId={houseId}></Guide>  }
+    {pageState=='3'&&<Recommend houseId={houseId}></Recommend>  }
     </Layout>
-    {pageState=='1' &&<Tab value={['开启旅程']} onClick={(e)=>setPageState(e)}></Tab>}
+    
     {pageState!='1' &&<Tab value={['入住指引','房东推荐']} pageState={pageState} onClick={[(e) => setPageState('2'),(e) => setPageState('3')]}></Tab>}
 
-    </View>
-
-
-
-      {/* userRole={userRole} list={list} onChange={(e) => onRegisterChange(e)} */}
+    </View>}
 
-        {/* {userRole == 1 ? <Register userRole={userRole} list={list} onChange={(e) => onRegisterChange(e)}></Register> :
-          <View>
-            {(userRole == 'guide' || userRole == 2) && <Guide userRole={userRole}/>}
-            {userRole == 'recommend' && <Recommend userRole={userRole}/>}
-          </View>
-        }
-        {userRole == 2 ? <Register userRole={userRole} list={list} onChange={(e) => onRegisterChange(e)}></Register> :
-          <View>
-            {(userRole == 'guide' || userRole == 2) && <Guide userRole={userRole}/>}
-            {userRole == 'recommend' && <Recommend userRole={userRole}/>}
-          </View>
-        }
-     <HouseLIst userRole={userRole} list={list} onChange={(e) => onRegisterChange(e)}></HouseLIst>  */}
-       
-        
-      
-      {/* value={userRole} onClick={(e) => onTabClick(e)*/}
     
   </View>
 }

src/pages/customer/register/index.jsx

@@ -2,52 +2,110 @@ 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'
 
-const register = (props) => {
 
-    // const {list,onChange}= props
+const InputGroup = props => {
+  console.log('---------', JSON.stringify(props.dataSource))
+  const [name, setName] = useState(props.dataSource.name)
+  const [phone, setPhone] = useState(props.dataSource.phone)
 
-    const [list, setList] = useState([])
-    useEffect(() => {
+  useEffect(() => {
+    if (name !== props.dataSource.name) {
+      setName(props.dataSource.name)
+    }
+  }, [props.dataSource.name])
   
-    //   console.log(page,'page')
-      setList([
-        {
-          name: 'zhou',
-          phone: '177'
-        },
-        {
-          name: 'zhou',
-          phone: '177'
-        },
-        {
-          name: 'zhou',
-          phone: '177'
-        },
-        {
-            name: 'zhou',
-            phone: '177'
-          }
-      ])
-    }, [])
-    // const onChange =
-//  onChange={onChange}
-//  onChange={onChange}
-    return <View className='register'>
-        {list.map((x, index) => {
-            return <View className='register-user'>
-                <Text>入住人{index + 1}</Text>
-                <ContainerLayout className='register-user-from'>
-                    <AtInput className='register-user-from-input' title='姓名' type='text'   />
-                    <AtInput className='register-user-from-input'  title='电话' type='text'   />
-                </ContainerLayout>
-
-            </View>
-
-        })}
+  useEffect(() => {
+    if (phone !== props.dataSource.phone) {
+      setPhone(props.dataSource.phone)
+    }
+  }, [props.dataSource.phone])
+
+  const handeNameChange = e => {
+    console.log('333333333333333333')
+    const v = e.detail.value
+    setName(v)
+    if (props.onChange) {
+      props.onChange({
+        name: v,
+        phone
+      })
+    }
+    return v
+  }
+  
+  const handePhoneChange = e => {
+    const v = e.detail.value
+    setPhone(v)
+    if (props.onChange) {
+      props.onChange({
+        name,
+        phone: v
+      })
+    }
+    return v
+  }
+
+  const handleFocues = (_, e) => {
+    e.stopPropagation()
+    e.preventDefault()
+  }
 
+  return (
+    <View className='register-user'>
+      <Text>入住人{props.index}</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' />
+        <Input name="phone" className='register-user-from-input' value={phone} onInput={handePhoneChange} placeholder='电话' type='text' />
+      </ContainerLayout>
     </View>
+  )
+}
+
+const register = (props) => {
+
+  const { orderId } = props
+
+  let [list, setList] = useState([])
+  useEffect(() => {
+    //   console.log(page,'page')
+    const arr = []
+    for (let i = 0; i < 4; i++) {
+      arr.push({
+        name:'',
+        phone:'',
+      })
+    }
+    setList(arr)
+  }, [])
+
+  const onClick = () => {
+    console.log(list)
+  }
+
+  const onChangeList = index => value =>  {
+    console.log(111111111, value, index)
+ 
+    list[index] = value
+
+    setList([...list])
+
+  }
+
+  return <View className='register'>
+    <Layout>
+      {list.map((x, index) => {
+        let inx = index
+        return <InputGroup key={inx} index={index} dataSource={x} onChange={onChangeList(inx)} />
+      })}
+    </Layout>
+
+    <Tab value={['开启旅程']} onClick={(e) => onClick(e)}></Tab>
+  </View>
 }
 
 export default register

src/pages/guide/index.jsx

@@ -1,91 +1,146 @@
-import React, { useState } from 'react'
-import Taro from '@tarojs/taro'
+import React, { useEffect, useState } from 'react'
+import Taro, { useDidShow } from '@tarojs/taro'
 import { View, Text, Image } from '@tarojs/components'
 import ContainerLayout from '../../compents/container/index'
 import icon from '../../assets/icon.png'
 import './index.scss'
 import userRloe from '../../util/userRole'
 import { useSelector } from 'react-redux'
-
+import request from '@/util/request'
+import uploadicon from '../../assets/uploadicon.png'
 const guide = (props) => {
 
     const user = useSelector(state => state.user)
     // const guide = useSelector(state => state.guide)
 
-    const { value, ...prop } = props
-    console.log(guide,'guide')
+
+
+
+    const { value, houseId, ...prop } = 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 onOpenLocation = (lngLat) => {
+        const [latitude, longitude] = lngLat.split(',')
+        console.log(lngLat, latitude, longitude)
+        wx.openLocation({
+            latitude: Number(latitude),
+            longitude: Number(longitude),
+            scale: 18,
+            fail: (err) => {
+                console.log(err)
+            }
+        })
+    }
 
     const onToMap = (type) => {
         if (user.role == userRloe.customer) return
-        console.log(type)
-        switch (type){
-            case 'house':Taro.navigateTo({ url: `/pages/map/index?type=${type}` }); break;
-            case 'park':Taro.navigateTo({ url: `/pages/map/index?type=${type}` }); break;
-            case 'wifi':Taro.navigateTo({ url: `/pages/wifi/index?type=${type}` }); break;
-            case 'image':{
+        switch (type) {
+            case 'address': Taro.navigateTo({ url: `/pages/map/index?houseId=${houseId}&type=${type}` }); break;
+            case 'park': Taro.navigateTo({ url: `/pages/map/index?houseId=${houseId}&type=${type}` }); break;
+            case 'wifi': Taro.navigateTo({ url: `/pages/wifi/index?houseId=${houseId}` }); break;
+            case 'image': {
+                if (user.role == userRloe.customer) return
                 wx.chooseImage({
-                count: 1,
-                sizeType: ['original', 'compressed'],
-                sourceType: ['album',],
-                success: (res)=> {
-                  // tempFilePath可以作为img标签的src属性显示图片
-                
-                  console.log(res)
-                  const tempFilePaths = res.tempFilePaths
-                    setImgurl(tempFilePaths[0])
-                }
-              }); break;}
+                    count: 1,
+                    sizeType: ['original', 'compressed'],
+                    sourceType: ['album',],
+                    success: (res) => {
+                        // tempFilePath可以作为img标签的src属性显示图片
+
+                        console.log(res)
+                        const tempFilePaths = res.tempFilePaths
+                        setImgurl(tempFilePaths[0])
+                    }
+                }); break;
+            }
         }
         // Taro.navigateTo({ url: `/pages/map/index?type=${type}` })
     }
     // 
     return <View className='guide'>
-        <View className='guide-view'>
-            <Text className='guide-view-info'>房屋位置</Text>
-            <ContainerLayout className='guide-view-layout' style={{ display: 'flex', justifyContent: 'space-between' }} onClick={() => onToMap('house')}>
-                <View  >
-                    <View className='guide-view-layout-text1' >南京市 浦口</View>
-                    <View className='guide-view-layout-text2'>秦淮区仙鹤街</View>
-                </View>
-                {user.role == userRloe.customer && <View style={{ float: 'right' }}>
-                    <Image className='icon' src={icon} />
-                    <View className='icontext'>去这里</View>
-                </View>}
-            </ContainerLayout>
-        </View>
-        <View className='guide-view'>
-            <Text className='guide-view-info'>停车位置</Text>
-            <ContainerLayout className='guide-view-layout' style={{ display: 'flex', justifyContent: 'space-between' }} onClick={() => onToMap('park')}>
-                <View  >
-                    <View className='guide-view-layout-text1' >南京市 浦口</View>
-                    <View className='guide-view-layout-text2'>秦淮区仙鹤街</View>
-                </View>
-                {user.role == userRloe.customer && <View style={{ float: 'right' }}>
-                    <Image className='icon' src={icon} />
-                    <View className='icontext'>去这里</View>
-                </View>}
-            </ContainerLayout>
-        </View>
-        <View className='guide-view'>
-            <Text className='guide-view-info'>wifi信息</Text>
-            <ContainerLayout className='guide-view-layout guide-view-wifi' onClick={() => onToMap('wifi')}>
-                <View>
-                    <Text>名称：</Text><Text>{4324}</Text>
-                </View>
-                <View>
-                    <Text>密码：</Text><Text>{23423}</Text>
+        {!!houseId&&<View>
+            <View className='guide-view'>
+                <Text className='guide-view-info'>房屋位置</Text>
+                <ContainerLayout className='guide-view-layout' style={{ display: 'flex', justifyContent: 'space-between' }} onClick={() => onToMap('address')}>
+                    <View  >
+                        <View className='guide-view-layout-text1' >{detail.address}</View>
+                        {/* <View className='guide-view-layout-text2'>{detail.lngLat}</View> */}
+                    </View>
+                    {user.role == userRloe.customer && <View style={{ float: 'right' }} onClick={() => onOpenLocation(detail.lngLat)}>
+                        <Image className='icon' src={icon} />
+                        <View className='icontext' >去这里</View>
+                    </View>}
+                </ContainerLayout>
+            </View>
+            <View className='guide-view'>
+                <Text className='guide-view-info'>停车位置</Text>
+                <ContainerLayout className='guide-view-layout' style={{ display: 'flex', justifyContent: 'space-between' }} onClick={() => onToMap('park')}>
+                    <View  >
+                        <View className='guide-view-layout-text1' >{detail.parking}</View>
+                        {/* <View className='guide-view-layout-text2'>{detail.parkLngLat}</View> */}
+                    </View>
+                    {user.role == userRloe.customer && <View style={{ float: 'right' }} onClick={() => onOpenLocation(detail.parkLngLat)}>
+                        <Image className='icon' src={icon} />
+                        <View className='icontext'>去这里</View>
+                    </View>}
+                </ContainerLayout>
+            </View>
+            <View className='guide-view'>
+                <Text className='guide-view-info'>wifi信息</Text>
+                <ContainerLayout className='guide-view-layout guide-view-wifi' onClick={() => onToMap('wifi')}>
+                    <View>
+                        <Text>名称：</Text><Text>{detail.wifiName}</Text>
+                    </View>
+                    <View>
+                        <Text>密码：</Text><Text>{detail.wifiPassword}</Text>
+                    </View>
+                </ContainerLayout>
+            </View>
+            <View className='guide-view'>
+                <Text className='guide-view-info'>其他指引</Text>
+                {/* <ContainerLayout className='guide-view-layout guide-view-img'> */}
+                {(detail.desc || imgurl) && <Image className='guide-view-img' mode='widthFix' onClick={() => onToMap('image')} src={imgurl || detail.desc}></Image>}
+                {!detail.desc && !imgurl && <View style={{ padding: "300rpx" }} >
+
+                    <Image className='guide-view-img' mode='widthFix' onClick={() => onToMap('image')} src={uploadicon}></Image>
                 </View>
-            </ContainerLayout>
-        </View>
-        <View className='guide-view'>
-            <Text className='guide-view-info'>其他指引</Text>
-            {/* <ContainerLayout className='guide-view-layout guide-view-img'> */}
-            <Image className='guide-view-img' mode='widthFix' onClick={() => onToMap('image')} src={imgurl||"https://ss0.bdstatic.com/70cFuHSh_Q1YnxGkpoWK1HF6hhy/it/u=1657471424,2319316184&fm=26&gp=0.jpg"}></Image>
-            {/* </ContainerLayout> */}
-        </View>
+                }
+            </View>
+        </View>}
+        {
+            !houseId && <View className='recommend-noorder' style={{ marginTop: 'calc(40vh)',textAlign:'center' }}>
+                <Text>哎呀</Text>
+                <Text>暂时没发现您的入住订单呢~</Text>
+
+
+            </View>
+        }
 
     </View>
 };

src/pages/house/addnewhouse/index.jsx

@@ -7,76 +7,84 @@ import Tab from '../../../compents/tab/index'
 import Container from '../../../compents/container/index'
 import locationicon from '../../../assets/locationicon.png'
 import uploadicon from '../../../assets/uploadicon.png'
+import request, { uploadFiles } from '../../../util/request'
 import './index.scss'
 
-const index = (props) => {
 
-    const page = useSelector(state => state.page)
+const index = (props) => {
 
     const user = useSelector(state => state.user)
-
+    const { shopKeeperList = [] } = user
+    const shopId = shopKeeperList[0].shopId || ''
     const [userRole, setUserRole] = useState('1')
     const [pageState, setPageState] = useState('1')
     const [list, setList] = useState([])
-    useEffect(() => {
+    const [imgUrl, setImgUrl] = useState('')
+    const [address, setAddress] = useState({})
+    const [parking, setParking] = useState({})
 
-        console.log(page, 'page')
-        setList([
-            {
-                name: 'zhou',
-                phone: '177'
-            },
-            {
-                name: 'zhou',
-                phone: '177'
-            },
-            {
-                name: 'zhou',
-                phone: '177'
-            }
-        ])
-    }, [])
 
+    useEffect(() => {
 
-    const onTabClick = (e) => {
-        console.log(e, '111')
-        setUserRole(e)
-    }
 
-    const onRegisterChange = (e) => {
-        console.log(e, '111')
-    }
-    const onSave = () => {
-        console.log(333)
+    }, [])
 
-        Taro.showModal({
-            title: '修改成功',
-            content: '点击确认按钮，返回上级菜单',
-            showCancel: false,
-            success: function (res) {
-                if (res.confirm) {
-                    console.log('用户点击确定')
-
-                    Taro.navigateBack({
-                        delta: 1
-                    })
-                } else if (res.cancel) {
-                    console.log('用户点击取消')
-                }
-            }
-        })
-    }
 
-    const onChooseLocation = () => {
+    const onChooseLocation = (type) => {
         console.log(333)
         wx.chooseLocation({
             success: (res) => {
                 console.log(res)
+                if (type == 'address') {
+                    setAddress(res)
+                } else {
+                    setParking(res)
+                }
+
+
             }
         })
     }
     const formSubmit = (e) => {
-        console.log(e, 'formSubmit')
+        console.log(e.detail, 'formSubmit')
+        const data = {
+            ...e.detail.value,
+            lngLat: `${address.latitude},${address.longitude}`,
+            parkLngLat: `${address.latitude},${address.longitude}`,
+            desc:imgUrl,
+        }
+        // latitude
+        // longitude
+        request({ url: '/taHouse', method: 'post', data }).then((res) => {
+            if (res.data.code == 1000)
+                Taro.navigateBack({
+                    delta: 1
+                })
+        })
+
+        // {shopId,
+
+        //     "address": "string",
+
+        //     "lngLat": "string",
+        //     "parkLngLat": "string",
+        //     "parking": "string",
+
+        //     "surroundList": [
+        //       {
+        //         "createDate": "2020-12-29T15:38:53.177Z",
+        //         "houseId": "string",
+        //         "image": "string",
+        //         "imageId": "string",
+        //         "sortNo": 0,
+        //         "status": 0,
+        //         "surroundId": "string"
+        //       }
+        //     ],
+        //     "title": "string",
+        //     "wifiName": "string",
+        //     "wifiPassword": "string"
+        //   }
     }
 
     const formReset = () => {
@@ -85,41 +93,54 @@ const index = (props) => {
 
     return <View className='addnewhouse'>
 
-
-        {/* <Form onSubmit={this.formSubmit} onReset={this.formReset} >
+        <Form onSubmit={formSubmit} onReset={formReset}>
+            {/* <Form onSubmit={this.formSubmit} onReset={this.formReset} >
         <View className='example-body'>
           <Switch name='switch' className='form-switch'></Switch>
         </View>
       </Form> */}
 
-        <Layout>
-            <Form onSubmit={formSubmit} onReset={formReset}>
+            <Layout>
+
                 <View className='inputstyle-view'>
                     <Text className='title'>民宿名称</Text>
                     <Container className='inputstyle-view-card ' style={{ borderRadius: '20rpx', padding: '0 40rpx' }} >
-                        <Input placeholderClass='placeholderinput' className='input' type='text' placeholder='小区/写字楼/大厦等' />
+                        <Input name='title' placeholderClass='placeholderinput' className='input' type='text' placeholder='' />
                     </Container>
                 </View>
-                <View className='inputstyle-view'>
+                {/* <View className='inputstyle-view'>
                     <Text className='title'>房屋名称</Text>
                     <Container className='inputstyle-view-card ' style={{ borderRadius: '20rpx', padding: '0 40rpx' }} >
-                        <Input placeholderClass='placeholderinput' className='input' type='text' placeholder='小区/写字楼/大厦等' />
+                        <Input name='title' placeholderClass='placeholderinput' className='input' type='text' placeholder='' />
                     </Container>
+                </View> */}
+                <View className='inputstyle-view'>
+                    <Text className='title'>位置信息</Text>
+                    <View style={{ display: 'flex' }}>
+                        <Container className='inputstyle-view-card' style={{ width: '100%', borderRadius: '20rpx', padding: '0 40rpx' }}>
+                            <Input name='address' value={address.address} disabled placeholderClass='placeholderinput' className='input' type='text' placeholder='' />
+
+                        </Container>
+                        <Container className='map-view-icon' onClick={() => onChooseLocation('address')}>
+                            <Image className='icon' mode='widthFix' style={{ width: '100%' }} style={{ width: '40rpx' }} src={locationicon} />
+
+                        </Container>
+                    </View>
                 </View>
                 <View className='inputstyle-view'>
-                    <Text className='title'>位置形象</Text>
+                    <Text className='title'>具体地址</Text>
                     <Container className='inputstyle-view-card ' style={{ borderRadius: '20rpx', padding: '0 40rpx' }} >
-                        <Input placeholderClass='placeholderinput' className='input' type='text' placeholder='小区/写字楼/大厦等' />
+                        <Input name='lngLat' placeholderClass='placeholderinput' className='input' type='text' placeholder='' />
                     </Container>
                 </View>
                 <View className='inputstyle-view'>
-                    <Text className='title'>当前地址</Text>
+                    <Text className='title'>停车场地址</Text>
                     <View style={{ display: 'flex' }}>
                         <Container className='inputstyle-view-card' style={{ width: '100%', borderRadius: '20rpx', padding: '0 40rpx' }}>
-                            <Input placeholderClass='placeholderinput' className='input' type='text' placeholder='小区/写字楼/大厦等' />
+                            <Input name='parking' value={parking.address} disabled placeholderClass='placeholderinput' className='input' type='text' placeholder='' />
 
                         </Container>
-                        <Container className='map-view-icon' onClick={onChooseLocation}>
+                        <Container className='map-view-icon' onClick={() => onChooseLocation('parking')}>
                             <Image className='icon' mode='widthFix' style={{ width: '100%' }} style={{ width: '40rpx' }} src={locationicon} />
 
                         </Container>
@@ -128,46 +149,66 @@ const index = (props) => {
                 <View className='inputstyle-view'>
                     <Text className='title'>具体地址</Text>
                     <Container className='inputstyle-view-card ' style={{ borderRadius: '20rpx', padding: '0 40rpx' }} >
-                        <Input placeholderClass='placeholderinput' className='input' type='text' placeholder='小区/写字楼/大厦等' />
+                        <Input name='parkLngLat' placeholderClass='placeholderinput' className='input' type='text' placeholder='' />
                     </Container>
                 </View>
                 <View className='inputstyle-view'>
                     <Text className='title'>WiFi名称</Text>
                     <Container className='inputstyle-view-card ' style={{ borderRadius: '20rpx', padding: '0 40rpx' }} >
-                        <Input placeholderClass='placeholderinput' className='input' type='text' placeholder='小区/写字楼/大厦等' />
+                        <Input name='wifiName' placeholderClass='placeholderinput' className='input' type='text' placeholder='' />
                     </Container>
                 </View>
+
                 <View className='inputstyle-view'>
                     <Text className='title'>WiFi密码</Text>
                     <Container className='inputstyle-view-card ' style={{ borderRadius: '20rpx', padding: '0 40rpx' }} >
-                        <Input placeholderClass='placeholderinput' className='input' type='text' placeholder='小区/写字楼/大厦等' />
+                        <Input name='wifiPassword' placeholderClass='placeholderinput' className='input' type='text' placeholder='' />
                     </Container>
                 </View>
                 <View className='inputstyle-view'>
                     <Text className='title'>其他指引</Text>
                     <Container className='inputstyle-view-card ' style={{ borderRadius: '20rpx', padding: '0 40rpx' }} >
-                        <Image className='guide-view-img' mode='widthFix' onClick={() => wx.chooseImage({
+                        <Image className='guide-view-img' mode='widthFix' onClick={() => Taro.chooseImage({
                             count: 1,
-                            sizeType: ['original', 'compressed'],
-                            sourceType: ['album',],
+                            // sizeType: ['original', 'compressed'],
+                            sourceType: ['album'],
                             success: (res) => {
                                 // tempFilePath可以作为img标签的src属性显示图片
+                                const tempFilePaths = res.tempFilePaths
+
+                                uploadFiles(tempFilePaths).then((res) => {
+                                    console.log(res, 'uploadFiles')
+                                    setImgUrl(res[0])
+                                }).catch((e) => {
+                                    console.log(e, 'err')
+                                })
 
-                                console.log(res)
-                                // const tempFilePaths = res.tempFilePaths
                                 // setImgurl(tempFilePaths[0])
                             }
-                        })} src={uploadicon || "https://ss0.bdstatic.com/70cFuHSh_Q1YnxGkpoWK1HF6hhy/it/u=1657471424,2319316184&fm=26&gp=0.jpg"}></Image>
+                        })} src={imgUrl || uploadicon}></Image>
                         {/* <Input placeholderClass='placeholderinput' className='input' type='text' placeholder='小区/写字楼/大厦等' /> */}
                     </Container>
                 </View>
-            </Form>
-
-        </Layout>
-        <Tab className='addhousetab' pageState='3' value={['取消', '确认新增']} onClick={[(e) => setPageState('2'), () => formSubmit()]}></Tab>
 
 
+            </Layout>
+            <Tab formType="submit" className='addhousetab' pageState='3' value={['取消', '确认新增']} onClick={[(e) => {
+                Taro.navigateBack({
+                    delta: 1
+                })
+            }, () => { console.log('33') }]}></Tab>
+        </Form>
 
+        {/* Taro.chooseImage({
+            sourceType: ['album'],
+            success: (res) => {
+                const tempFilePaths = res.tempFilePaths
+                uploadFiles(tempFilePaths).then((res) => {
+                    console.log(res, 'uploadFiles')
+                    setImgUrl(res[0])
+                })
+            }
+        }) */}
 
 
     </View>

src/pages/house/index.jsx

@@ -1,4 +1,5 @@
 import React, { useEffect, useMemo, useState } from 'react'
+import Taro, { useDidShow,useRouter } from '@tarojs/taro'
 import { useSelector } from 'react-redux'
 import { View, ScrollView } from '@tarojs/components'
 import Layout from '../../layout/index'
@@ -9,19 +10,18 @@ import Recommend from '../recommend/index'
 // import HouseLIst from '../house/list'
 
 import './index.scss'
+import request from '../../util/request'
 
 const house = (props) => {
-
-    const page = useSelector(state => state.page)
-
+    const router = useRouter()
+    const { houseId } = router.params
     const user = useSelector(state => state.user)
-
+   
     const [userRole, setUserRole] = useState('1')
     const [pageState, setPageState] = useState('2')
     const [list, setList] = useState([])
     useEffect(() => {
 
-        console.log(page, 'page')
         setList([
             {
                 name: 'zhou',
@@ -38,6 +38,7 @@ const house = (props) => {
         ])
     }, [])
 
+    
 
     const onTabClick = (e) => {
         console.log(e, '111')
@@ -55,10 +56,10 @@ const house = (props) => {
         <View >
 
             <Layout>
-                {pageState == '2' && <Guide></Guide>}
-                {pageState == '3' && <Recommend></Recommend>}
+                {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>}
+            {pageState != '1' && <Tab value={['入住指引', '房东推荐']} pageState={pageState} onClick={[(e) => setPageState('2'), (e) => setPageState('3')]}></Tab>}
 
         </View>
 

src/pages/house/list/index.jsx

@@ -1,49 +1,52 @@
-import React, { useEffect, useMemo, useState,useRef } from 'react'
-import Taro from '@tarojs/taro'
+import React, { useEffect, useMemo, useState, forwardRef, useImperativeHandle } from 'react'
+import Taro, { useDidShow } 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'
-
-const house = (props) => {
+import request from '@/util/request'
+let house = (props, ref) => {
 
   const [list, setList] = useState([])
   const [radioHouse, setRadioHouse] = useState()
-  
-    const ref = useRef();
-    useEffect(() => {
-      ref.current = 3;
-    });
-  
-  
-
-  const radioHouseState = useMemo(()=>props.radioHouseState,[props.radioHouseState])
+
+
+  useImperativeHandle(ref, () => ({
+    // changeVal 就是暴露给父组件的方法
+    getRefHouseList: () => {
+      getHouseList()
+    }
+  }));
+
+
+
+  const radioHouseState = useMemo(() => props.radioHouseState, [props.radioHouseState])
   wx.setNavigationBarTitle({
     title: '民宿房源管理'
   })
-console.log(props,radioHouseState)
+  console.log(props, radioHouseState)
   useEffect(() => {
-    setList([
-      {
-        id:1,
-        name: 'zhou',
-        phone: '177'
-      },
-      {
-        id:2,
-        name: 'zhou',
-        phone: '177'
-      },
-      {
-        id:3,
-        name: 'zhou',
-        phone: '177'
-      }
-    ])
+    console.log(props, ref,'props, ref')
+    getHouseList()
   }, [])
+  useDidShow(() => {
+
+    getHouseList()
+  })
 
-  const onShare = () => {
-    Taro.navigateTo({ url: "/pages/share/index" })
+  const getHouseList = () => {
+    request({
+      url: '/taHouse',
+      // method: 'get',
+      params: { pageSize: 1, pageSize: 9999 }
+    }).then((res) => {
+      const { records, ...page } = res.data.data
+      setList(records)
+    })
+  }
+
+  const onShare = (x) => {
+    Taro.navigateTo({ url: `/pages/share/index?houseId=${x.houseId}` })
   }
 
 
@@ -51,23 +54,29 @@ console.log(props,radioHouseState)
   return <View className='houselist'>
     {list.map((x, index) => {
       return <View className='houselist-view'>
-        <Text className='houselist-view-title'>房源编号：{index + 1}</Text>
+        {/* <Text className='houselist-view-title'>房源编号：{x.houseId}</Text> */}
         <ContainerLayout className='houselist-view-card'>
-          {radioHouseState&&<View className='houselist-view-card-radio' onClick={()=>{ props.onChange(x),setRadioHouse(x.id)}}>
-            {radioHouse==x.id&&<Image src={radio} style={{width:'30rpx',height:'20rpx'}}></Image>}
+          {radioHouseState && <View className='houselist-view-card-radio' onClick={() => { props.onChange(x), setRadioHouse(x) }}>
+            {radioHouse?.houseId == x?.houseId && <Image src={radio} style={{ width: '30rpx', height: '20rpx' }}></Image>}
           </View>}
-          <View className='top' onClick={() => {if(!radioHouseState) Taro.navigateTo({ url: `/pages/house/index?=${x.id}`  })}}>福娃给v阿萨v不会让发到付</View>
+          <View className='top' onClick={() => { if (!radioHouseState) Taro.navigateTo({ url: `/pages/house/index?houseId=${x.houseId}` }) }}>{x.title}</View>
           <View className='bottom'>
-            <Text onClick={() => {if(!radioHouseState) Taro.navigateTo({ url: `/pages/house/household/index?id=${x.id}` })}}>查看入住人</Text>
-            <Text onClick={onShare}>分享链接</Text>
+            <Text onClick={() => { if (!radioHouseState) Taro.navigateTo({ url: `/pages/house/household/index?houseId=${x.houseId}` }) }}>查看入住人</Text>
+            <Text onClick={()=>onShare(x)}>分享链接</Text>
           </View>
         </ContainerLayout>
-        
+
       </View>
 
     })}
-   
-  </View>
-}
 
+
+    {
+      list.length == 0 &&
+      < View className='nodata'> 暂无数据</View>
+
+    }
+  </View >
+}
+house = forwardRef(house)
 export default house

src/pages/index/index.jsx

@@ -1,69 +1,64 @@
 import React, { useEffect, useMemo, useState } from 'react'
-import { useSelector } from 'react-redux'
+import Taro,{useRouter} from '@tarojs/taro'
+import { useSelector, useDispatch } from 'react-redux'
 import { View, ScrollView } from '@tarojs/components'
 import Tab from '../../compents/tab/index'
 import Customer from '../customer/index'
 import Landlord from '../landlord/index'
-import AdminUser from '../adminUser/index'
-import Guide from '../guide/index'
-import Recommend from '../recommend/index'
-import HouseLIst from '../house/list'
 import roleList from '../../util/userRole'
 import './index.scss'
 import request from '../../util/request'
+import GetPhone from '@/compents/getPhone'
 const index = (props) => {
 
 
+  const router = useRouter()
+
+  const { houseId ,orderId} = router.params
   const user = useSelector(state => state.user)
 
+  const dispatch = useDispatch()
+
   const [userRole, setUserRole] = useState('1')
   const [pageState, SetPageState] = useState('1')
   const [list, setList] = useState([])
-  useEffect(() => {
-    setList([
-      {
-        name: 'zhou',
-        phone: '177'
-      },
-      {
-        name: 'zhou',
-        phone: '177'
-      },
-      {
-        name: 'zhou',
-        phone: '177'
-      }
-    ])
-
-    // fetch({ url: API_CARDS_LIST, payload })
-
-  
+  const [visible, setVisible] = useState(false)
 
+  useEffect(() => {
+    console.log(user,houseId, 'indexuser')
+    if (user.personId && !user.phone) {
+      setVisible(true)
+    }
+    if (user.personId && user.phone) {
+      setVisible(false)
+    }
+  }, [user.phone])
 
-  }, [])
 
+  const onOk = (res) => {
 
-  const onTabClick = (e) => {
-    console.log(e, '111')
-    setUserRole(e)
+    dispatch({ type: 'LOGIN', user: res.data.data })
+    setVisible(false)
   }
 
-  const onRegisterChange = (e) => {
-    console.log(e, '111')
+  const onCancel = (e) => {
+    setVisible(false)
   }
+  console.log(user.role == roleList.landlord, 'indexuser')
+
+  return <View className='index'>
+
+    {user.personId && <View>
+      {visible && <GetPhone visible={true} onOk={onOk} onCancel={onCancel} ></GetPhone>}
+      {!visible && user.role == roleList.customer && <Customer houseId={houseId} orderId={orderId}></Customer>}
+      {!visible && user.role == roleList.landlord && <Landlord ></Landlord>}
+    </View>}
 
 
 
- 
-  return <View className='index'>
-    {/* <ScrollView scrollY style={{ height: 'calc(100vh - 180rpx)' }} >
 
-   
-      <View className='page-container' > */}
 
-      {user.role==roleList.customer&&<Customer></Customer>  }
-      {user.role==roleList.landlord&&<Landlord></Landlord>  }
-        {/* {userRole == 1 ? <Register userRole={userRole} list={list} onChange={(e) => onRegisterChange(e)}></Register> :
+    {/* {userRole == 1 ? <Register userRole={userRole} list={list} onChange={(e) => onRegisterChange(e)}></Register> :
           <View>userRole={userRole} list={list} onChange={(e) => onRegisterChange(e)}
             {(userRole == 'guide' || userRole == 2) && <Guide userRole={userRole}/>}
             {userRole == 'recommend' && <Recommend userRole={userRole}/>}
@@ -76,10 +71,10 @@ const index = (props) => {
           </View>
         }
      <HouseLIst userRole={userRole} list={list} onChange={(e) => onRegisterChange(e)}></HouseLIst>  */}
-       
-        
-      
-      {/* </View>
+
+
+
+    {/* </View>
     </ScrollView>
     <Tab value={userRole} onClick={(e) => onTabClick(e)}></Tab> */}
   </View>

src/pages/landlord/index.jsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useMemo, useState } from 'react'
+import React, { useEffect, useRef, useState } from 'react'
 import Taro, { useDidShow } from "@tarojs/taro";
 import { useSelector } from 'react-redux'
 import { View, ScrollView, Button } from '@tarojs/components'
@@ -22,39 +22,12 @@ const index = (props) => {
   const [list, setList] = useState([])
   const [radioHouseData, setRadioHouseData] = useState()
   const [radioHouseState, setRadioHouseState] = useState(false)
-  console.log(user,'99999999')
-  useEffect(() => {
-
-   
-
-    setList([
-      {
-        name: 'zhou',
-        phone: '177'
-      },
-      {
-        name: 'zhou',
-        phone: '177'
-      },
-      {
-        name: 'zhou',
-        phone: '177'
-      }
-    ])
-
-    getHouseList()
-  }, [])
-
-  // useDidShow(()=>{
-  //   getHouseList()
-  // })
-
-  const getHouseList=()=>{
-    request({
-      url:'/taHouse',
-      method: 'get',
-    })
-  }
+
+
+  const childRef = useRef();
+
+
+
 
 
 
@@ -64,17 +37,37 @@ const index = (props) => {
   const onTabClick = (e) => {
     console.log(e, '111')
     setUserRole(e)
-    
+
   }
 
   const onRegisterChange = (e) => {
     console.log(e, '111')
   }
   const onCopy = (e) => {
-    
-    console.log(radioHouseData, '111')
-    if(radioHouseData.id){
-      Taro.navigateTo({ url: '/pages/house/addnewhouse/index?id=radioHouseData.id'})
+
+    console.log(childRef, '111')
+    if (radioHouseData.houseId) {
+
+      const {houseId,...data} = radioHouseData
+
+      request({ url: '/taHouse', method: 'post', data: { ...data } }).then((res) => {
+        Taro.showModal({
+          title: '复制成功',
+          content: '点击确认按钮，返回上级菜单',
+          showCancel: false,
+          success: function (res) {
+            if (res.confirm) {
+              console.log('用户点击确定')
+            
+              childRef.current.getRefHouseList();
+              setRadioHouseState(false)
+            } else if (res.cancel) {
+              console.log('用户点击取消')
+            }
+          }
+        })
+      })
+      // Taro.navigateTo({ url: '/pages/house/addnewhouse/index?id=radioHouseData.id'})
       // Taro.showModal({
       //   title: '修改成功',
       //   content: '点击确认按钮，返回上级菜单',
@@ -89,23 +82,23 @@ const index = (props) => {
       //     }
       //   }
       // })
-     
-    } 
- 
+
+    }
+
   }
 
-  
+
   return <View className='index'>
 
 
     <View>
 
       <Layout>
-        {pageState == '1' && <HouseLIst  radioHouseState={radioHouseState} onChange={(e) => setRadioHouseData(e)}></HouseLIst>}
+        {pageState == '1' && <HouseLIst ref={childRef} radioHouseState={radioHouseState} onChange={(e) => setRadioHouseData(e)}></HouseLIst>}
       </Layout>
       {!isOpened && <Tab className='addhousetab' value={['+添加房源']} onClick={(e) => setIsOpened(true)}></Tab>}
       {/* {pageState!='1' &&<Tab value={['入住指引','房东推荐']} pageState={pageState} onClick={(e)=>setPageState(e)}></Tab>} */}
-      {radioHouseState && <Tab pageState='3' value={['取消', '确认复制']} onClick={[(e) => { setRadioHouseState(false), setIsOpened(false) },()=>onCopy()]}></Tab>}
+      {radioHouseState && <Tab pageState='3' value={['取消', '确认复制']} onClick={[(e) => { setRadioHouseState(false), setIsOpened(false) }, () => onCopy()]}></Tab>}
     </View>
 
 
@@ -114,7 +107,7 @@ const index = (props) => {
       <View className='floatmodel' >
         <View onClick={() => Taro.navigateTo({ url: '/pages/house/addnewhouse/index' })}>新增房源</View>
         <View onClick={() => { setIsOpened(false); setRadioHouseState(true) }}>复制房源</View>
-        <View style={{ color: '#d2d2d2' }} onClick={()=>setIsOpened(false)}>取消</View>
+        <View style={{ color: '#d2d2d2' }} onClick={() => setIsOpened(false)}>取消</View>
       </View>
 
     </AtFloatLayout>

src/pages/map/index.jsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useMemo, useState } from 'react'
-import Taro from "@tarojs/taro";
+import Taro, { useDidShow, useRouter } from "@tarojs/taro";
 import { useSelector } from 'react-redux'
 import { View, Input, Text, Image } from '@tarojs/components'
 import Layout from '../../layout/index'
@@ -7,53 +7,83 @@ import Tab from '../../compents/tab/index'
 import Container from '../../compents/container/index'
 import locationicon from '../../assets/locationicon.png'
 import './index.scss'
+import request from '../../util/request';
 
 const index = (props) => {
 
-    const page = useSelector(state => state.page)
+    const router = useRouter()
 
-    const user = useSelector(state => state.user)
+    const { houseId, type } = router.params
 
     const [userRole, setUserRole] = useState('1')
     const [pageState, setPageState] = useState('1')
-    const [list, setList] = useState([])
+    const [address, setAddress] = useState({})
+    // const [lngLat, setLngLat] = useState('')
+
+    useDidShow(() => {
+
+    })
+
     useEffect(() => {
+        
+        if (houseId) {
+            getDetail()
+        }
 
-        console.log(page, 'page')
-        setList([
-            {
-                name: 'zhou',
-                phone: '177'
-            },
-            {
-                name: 'zhou',
-                phone: '177'
-            },
-            {
-                name: 'zhou',
-                phone: '177'
-            }
-        ])
     }, [])
+    const getDetail = () => {
+        request({ url: `/taHouse/${houseId}` }).then((res) => {
+            console.log(res.data.data,type, 'getDetail')
+            if (type == "address") {
+                setAddress(res.data.data.address)
+                setLngLat(res.data.data.lngLat)
+            }else if (type == 'park'){
+                setAddress(res.data.data.parking)
+                setLngLat(res.data.data.parkLngLat)
+            }
+
+        })
+    }
 
 
-    const onTabClick = (e) => {
+    const onClick = (e) => {
         console.log(e, '111')
-        setUserRole(e)
+        let data = {}
+        if (type == 'address') {
+            data = {
+                address: address.address,
+                lngLat:`${address.latitude},${address.longitude}`
+            }
+        } else if (type == 'park') {
+            data = {
+                parking: address.address,
+                parkLngLat:`${address.latitude},${address.longitude}`
+            }
+        }
+        console.log(data, '111')
+
+        request({ url: `/taHouse/${houseId}`, method: 'put', data: { ...data, houseId } }).then((res) => {
+            Taro.navigateBack({
+                delta: 1
+            })
+        })
     }
 
-    const onRegisterChange = (e) => {
+    const onChange = (e) => {
         console.log(e, '111')
+        // setLngLat(e.detail.value)
     }
     const onChooseLocation = () => {
-        console.log(333)
+        // console.log(333)
         wx.chooseLocation({
-            success:(res)=>{
+            success: (res) => {
                 console.log(res)
+
+                setAddress(res)
             }
         })
     }
-    
+
 
     return <View className='map'>
 
@@ -61,33 +91,35 @@ const index = (props) => {
 
 
         <Layout>
-            <View className='map-view'>
-                <Text className='title'>位置信息</Text>
+            {/* <View className='map-view'>
+                <Text className='title'></Text>
                 <Container className='map-view-card'>
                 <Input placeholderClass='placeholderinput' className='input' type='text' placeholder='小区/写字楼/大厦等' />
                 </Container>
-            </View>
+            </View> */}
             <View className='map-view' >
-                <Text className='title'>当前地址</Text>
+                <Text className='title'>位置信息</Text>
                 <View style={{ display: 'flex' }}>
-                <Container className='map-view-card' style={{ width: '100%' }}>
-                    <Input placeholderClass='placeholderinput' className='input' type='text' placeholder='小区/写字楼/大厦等' />
+                    <Container className='map-view-card' style={{ width: '100%' }}>
+                        {address.address&&<Input value={address.address} disabled placeholderClass='placeholderinput' className='input' type='text' placeholder='' />}
 
-                </Container>
-                <Container className='map-view-icon' onClick={onChooseLocation}>
-                    <Image className='icon' mode='widthFix' style={{ width: '100%' }} style={{width: '40rpx'}} src={locationicon} />
+                    </Container>
+                    <Container className='map-view-icon' onClick={() => onChooseLocation()}>
+                        <Image className='icon' mode='widthFix' style={{ width: '100%' }} style={{ width: '40rpx' }} src={locationicon} />
 
-                </Container>
+                    </Container>
                 </View>
             </View>
             <View className='map-view'>
                 <Text className='title'>具体地址</Text>
                 <Container className='map-view-card'>
-                <Input placeholderClass='placeholderinput' className='input' type='text' placeholder='小区/写字楼/大厦等' />
+                    <Input value={address.lngLat} onInput={onChange} placeholderClass='placeholderinput' className='input' type='text' placeholder='小区/写字楼/大厦等' />
                 </Container>
             </View>
         </Layout>
-        {pageState == '1' && <Tab className='addhousetab' pageState='3' value={['取消', '保存修改']} onClick={[(e) => setPageState('2'), (e) => setPageState('3')]}></Tab>}
+        {pageState == '1' && <Tab className='addhousetab' pageState='3' value={['取消', '保存修改']} onClick={[(e) => Taro.navigateBack({
+            delta: 1
+        }), () => onClick()]}></Tab>}
 
 
 

src/pages/material/index.jsx

@@ -1,6 +1,6 @@
- import React, { useEffect, useMemo, useState } from 'react'
+import React, { useEffect, useState } from 'react'
 // import { useEffect, useLayoutEffect, useReducer, useState, useContext, useRef, useCallback, useMemo } from '@tarojs/taro'
-import Taro, { useShareAppMessage } from "@tarojs/taro";
+import Taro, { useDidShow,useRouter } from "@tarojs/taro";
 import { useSelector, } from 'react-redux'
 import { View, Input, Text, Image } from '@tarojs/components'
 import Layout from '../../layout/index'
@@ -9,7 +9,8 @@ import Container from '../../compents/container/index'
 import locationicon from '../../assets/locationicon.png'
 import Tags from '../../compents/tags/index'
 import './index.scss'
-
+import request from '../../util/request'
+import groupby from 'lodash.groupby';
 // Page({
 //     data: {
 //         text: 'init data',
@@ -18,174 +19,82 @@ import './index.scss'
 // })
 
 const index = (props) => {
+    const router = useRouter()
 
-
-
-    const page = useSelector(state => state.page)
-
+    const { houseId } = router.params
     const user = useSelector(state => state.user)
 
     const [userRole, setUserRole] = useState('1')
-    const [pageState, setPageState] = useState('1')
+    const [pageState, setPageState] = useState('0')
     const [list, setList] = useState([])
+    const [labelList, setLabelList] = useState([])
+    const [arrList, setArrList] = useState({})
+    
     useEffect(() => {
 
-        // console.log(page, 'page')
-        setList([
-            {
-                typename: '行政区域',
-                list: [
-                    {
-                        id: 1,
-                        name: '建邺区'
-                    },
-                    {
-                        id: 2,
-                        name: '建邺区'
-                    },
-                    {
-                        id: 3,
-                        name: '建邺区'
-                    },
-                    {
-                        id: 4,
-                        name: '建邺区'
-                    },
-                    {
-                        id: 5,
-                        name: '建邺区'
-                    },
-                    {
-                        id: 6,
-                        name: '建邺区'
-                    },{
-                        id: 7,
-                        name: '建邺区'
-                    },
-                    {
-                        id: 8,
-                        name: '建邺区'
-                    },
-                    
-
-                ]
-            },
-            {
-                typename: '行政区域',
-                list: [
-                    {
-                        id: 1,
-                        name: '建邺区'
-                    },
-                    {
-                        id: 2,
-                        name: '建邺区'
-                    },
-                    {
-                        id: 3,
-                        name: '建邺区'
-                    },
-
-                ]
-            },
-            {
-                typename: '行政区域',
-                list: [
-                    {
-                        id: 1,
-                        name: '建邺区'
-                    },
-                    {
-                        id: 2,
-                        name: '建邺区'
-                    },
-                    {
-                        id: 3,
-                        name: '建邺区'
-                    },
-
-                ]
-            },
-        ])
+
+
     }, [])
-    useShareAppMessage(res => {
-        console.log('3333')
-        if (res.from === 'button') {
-            // 来自页面内转发按钮
-            console.log(res.target)
-        }
-        return {
-            title: '自定义转发标题',
-            path: '/page/share/index'
-        }
+
+    useDidShow(() => {
+        getMateTagGroupList()
     })
 
-    const onTabClick = (e) => {
-        console.log(e, '111')
-        setUserRole(e)
-    }
 
-    const onRegisterChange = (e) => {
-        console.log(e, '111')
+    const getMateTagGroupList = () => {
+        request({ url: '/taMateTagGroup', params: { pageSize: 1, pageSize: 9999 } }).then((res) => {
+            const { records, ...page } = res.data.data
+            setList(records)
+        })
     }
-    const onSave = () => {
-        console.log(333)
 
-        Taro.showModal({
-            title: '修改成功',
-            content: '点击确认按钮，返回上级菜单',
-            showCancel: false,
-            success: function (res) {
-                if (res.confirm) {
-                    console.log('用户点击确定')
+    const onSearch = () => {
+        console.log(333)
+        // getImageList()
 
-                    Taro.navigateBack({
-                        delta: 1
-                    })
-                } else if (res.cancel) {
-                    console.log('用户点击取消')
-                }
-            }
-        })
+        Taro.navigateTo({url:`/pages/addimg/index?tagIds=${labelList.map(x => x.tagId).join(',')}&houseId=${houseId}`})
     }
 
-    return <View className='material'>
+    const onLabelChange = (e, index) => {
+
+        
+        let newArrArrList={
+            ...arrList,
+            [index]: e
+        }
+        setArrList(newArrArrList)
+        console.log(newArrArrList, 'arrList')
+        let newArr = Object.values(newArrArrList).reduce((pre, cur) => {
+
+            return pre.concat(cur)
 
+        }, [])
+        setLabelList(newArr)
+        console.log(newArr, 'newArr')
+    }
 
+    return <View className='material'>
+        <View style={{ display: pageState == 1 ? 'none' : 'block' }}>
+            <Layout>
+                {
+                    list.map((item, index) => {
+                        return <View className='material-card' key={index}>
+                            <Text>{item.name}</Text>
+                            <Tags list={item.taMateTagList} onChange={(e) => onLabelChange(e, index)} > </Tags>
+                        </View>
+                    })
+                }
+            </Layout>
+            <Tab pageState='3' value={['取消', '开始查询']} onClick={[(e) => Taro.navigateBack({
+                delta: 1
+            }), (e) => onSearch()]}></Tab>
+        </View>
 
 
-        <Layout>
-            {
-                list.map((item) => {
-                    return <View className='material-card'>
-                        <Text>{item.typename}</Text>
-                        <Tags list={item.list}  onChange={(e)=>{console.log(e)}} style={{marginTop:'90rpx'}}> </Tags>
-                    </View>
-                })
-            }
-
-            {/* <View className='inputstyle-view'>
-                <Text className='title'>入住人数</Text>
-                <Container className='inputstyle-view-card ' style={{ borderRadius: '20rpx', padding: '0 40rpx' }} >
-                    <Input placeholderClass='placeholderinput' className='input' type='text' placeholder='' />
-                </Container>
-            </View>
-            <View className='inputstyle-view'>
-                <Text className='title'>入住日期</Text>
-                <Container className='inputstyle-view-card ' style={{ borderRadius: '20rpx', padding: '0 40rpx' }} >
-                    <Input placeholderClass='placeholderinput' className='input' type='text' placeholder='' />
-                </Container>
-            </View>
-
-            <View className='inputstyle-view'>
-                <Text className='title'>离店日期</Text>
-                <Container className='inputstyle-view-card ' style={{ borderRadius: '20rpx', padding: '0 40rpx' }} >
-                    <Input placeholderClass='placeholderinput' className='input' type='text' placeholder='' />
-                </Container>
-            </View> */}
+        {pageState == '1' && <><Layout>
+            12222222
         </Layout>
-{/* className='addhousetab' */}
-        <Tab  pageState='3' value={['取消', '开始查询']} onClick={[(e) => setPageState('2'), (e) => setPageState('3')]}></Tab>
+            <Tab pageState='3' value={['取消', '确认']} onClick={[(e) => setPageState('2'), (e) => setPageState('3')]}></Tab></>}
     </View>
 }
 

src/pages/recommend/index.jsx

@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from 'react'
 import Taro from '@tarojs/taro'
-import { View, Text, Image } from '@tarojs/components'
+import { View, Text, Image, Button } from '@tarojs/components'
 import ContainerLayout from '../../compents/container/index'
 import more from '../../assets/more.png'
 import deleteicon from '../../assets/deleteicon.png'
@@ -8,108 +8,93 @@ import userRloe from '../../util/userRole'
 import './index.scss'
 import { useSelector } from 'react-redux'
 import { AtFab } from 'taro-ui'
+import request from '../../util/request'
 
 const recommend = (props) => {
 
     const user = useSelector(state => state.user)
 
-    const { value, ...prop } = props
+    const { value, houseId,...prop } = props
 
     const [state, setState] = useState(1)
     const [list, setList] = useState([])
     const [id, setId] = useState()
     useEffect(() => {
-        setList([{
-            id: 1,
-            src: 'https://ss0.bdstatic.com/70cFuHSh_Q1YnxGkpoWK1HF6hhy/it/u=1657471424,2319316184&fm=26&gp=0.jpg',
-            title: '八八餐厅1',
-            srcdetail: '',
-        }, {
-            id: 2,
-            src: 'https://ss0.bdstatic.com/70cFuHSh_Q1YnxGkpoWK1HF6hhy/it/u=1657471424,2319316184&fm=26&gp=0.jpg',
-            title: '八八餐厅2',
-            srcdetail: '',
-        }, {
-            id: 3,
-            src: 'https://ss0.bdstatic.com/70cFuHSh_Q1YnxGkpoWK1HF6hhy/it/u=1657471424,2319316184&fm=26&gp=0.jpg',
-            title: '八八餐厅3',
-            srcdetail: '',
-        }, {
-            id: 4,
-            src: 'https://ss0.bdstatic.com/70cFuHSh_Q1YnxGkpoWK1HF6hhy/it/u=1657471424,2319316184&fm=26&gp=0.jpg',
-            title: '八八餐厅4',
-            srcdetail: '',
-        }])
+        getImageList()
     }, [])
 
-    
+    const getImageList=()=>{
+        request({url:'/taHouseSurround',params:{houseId:houseId}}).then((res)=>{
+            const {records,...page} =res.data.data  
+            setList(records)
+        })
+    }
+
+
     // 
 
     const onClick = (item) => {
-        if(user.role == userRloe.customer){
-            setId(item.id)
+        if (user.role == userRloe.customer) {
+            setId(item.surroundId)
         }
-        else{
+        else {
+
+           
             Taro.showModal({
                 title: '确定删除该图片吗？',
                 content: '确定后，相关房东推荐会即时更新',
-                cancelColor:'#d2d2d2',
-                confirmColor:"#274191",
+                cancelColor: '#d2d2d2',
+                confirmColor: "#274191",
                 success: function (res) {
                     if (res.confirm) {
                         console.log('用户点击确定')
-        
-                     
+                        request({url: `/taHouseSurround/${item.surroundId}`, method: 'DELETE'}).then((res)=>{
+                            getImageList()
+                        })
+                       
+
                     } else if (res.cancel) {
                         console.log('用户点击取消')
                     }
                 }
             })
         }
-        
+
     }
+   
+
     return <View className='recommend'>
+      {user.role == userRloe.landlord && <Button onClick={()=>Taro.navigateTo({url:`/pages/material/index?houseId=${houseId}`})}>添加图片</Button>}
         {
             true && list.map((x) => {
                 return <View className='recommend-view'>
                     <ContainerLayout className='recommend-view-layout' >
-                        {id != x.id ? <View><Image className='recommend-view-img' src={x.src} style={{ height: '280rpx' }}></Image>
-                            <View style={{ display: 'flex', justifyContent: 'space-between' }}>
-                                <View className='recommend-view-info'>
-                                    <Text className='recommend-view-info-title'>{x.title}</Text>
-                                    <Text className='introduction'>水煮鱼</Text>
-                                </View>
-                               { userRloe.customer==user.role ?  <Image className='icon' src={more  } onClick={() => onClick(x)}></Image>
-
-                              :  <Image className='icon' src={ deleteicon } style ={{width:'40rpx'}} onClick={() => onClick(x)}></Image>
-                              }
-                            </View>
+                        {id != x.surroundId ? <View className='recommend-view-card'>
+
+                            <Image className='recommend-view-img' src={x.image} ></Image>
+
+
+                            {userRloe.customer == user.role ? <Image className='icon' src={more} onClick={() => onClick(x)}></Image>
+
+                                : <Image className='icon' src={deleteicon} style={{ width: '40rpx' }} onClick={() => onClick(x)}></Image>
+                            }
+
+
+
                         </View> :
-                            <View><Image className='recommend-view-img' mode='widthFix' src="https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=3184265929,203096592&fm=26&gp=0.jpg"></Image>
-                                <View style={{ display: 'flex', justifyContent: 'space-between' }}>
-                                    <View className='recommend-view-info'>
-                                        <Text className='text'>地址：{x.title}</Text>
-                                        <Text className='text'>推荐：水煮鱼</Text>
-                                    </View>
-                                </View>
+                            <View style={{ height: "700rpx" }}>
+                                <Image className='recommend-view-img'
+                                    src="https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=3184265929,203096592&fm=26&gp=0.jpg"></Image>
+
                             </View>
                         }
                     </ContainerLayout>
+
                 </View>
             })
         }
-<AtFab>
-  <Text className='at-fab__icon at-icon at-icon-menu'></Text>
-</AtFab>
-        {
-            false && <View className='recommend-noorder' style={{ marginTop: 'calc(40vh)' }}>
-                <Text>哎呀</Text>
-                <Text>暂时没发现您的入住订单呢~</Text>
-
-
-            </View>
-        }
-
+        
+        {list.length==0&& < View className='nodata'> 暂无数据</View>}
 
     </View>
 };

src/pages/recommend/index.scss

@@ -2,32 +2,21 @@
   padding: 13.3px 0;
   &-view {
     margin: 40px 0 0;
-
-    &-img{
+    position: relative;
+    &-card{
       width: 100%;
       height: 420px;
-      border-radius: 40px 40px 0 0;
     }
+    &-img{
+      width: 100%;
+      height:  100%;
+      border-radius: 40px;
+      
 
-    &-info{
-      padding: 10px 40px 22px;
-      display: grid;
-      &-title{
-        font-size: 28px;
-        color: #181818;
-        
-      }
-      .introduction{
-        font-size: 24px;
-        color: #7b7b7b;
-        font-weight: 500;
-      }
-      .text{
-        font-size: 24px;
-        font-weight: 550;
-      }
+    
     }
 
+
     &-layout {
       padding: 0;
 
@@ -41,6 +30,9 @@
       width: 10px;
       height: 40px;
       padding:20px 30px;
+      position: absolute;
+      right: 30px;
+      bottom: 30px;
   }
 
   &-noorder{

src/pages/share/index.jsx

@@ -1,13 +1,14 @@
 import React, { useEffect, useMemo, useState } from 'react'
 // import { useEffect, useLayoutEffect, useReducer, useState, useContext, useRef, useCallback, useMemo } from '@tarojs/taro'
-import Taro, { useShareAppMessage } from "@tarojs/taro";
+import Taro, { useShareAppMessage, useRouter } from "@tarojs/taro";
 import { useSelector, } from 'react-redux'
-import { View, Input, Text, Image } 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'
 import locationicon from '../../assets/locationicon.png'
 import './index.scss'
+import request from '../../util/request';
 
 // Page({
 //     data: {
@@ -18,15 +19,20 @@ import './index.scss'
 
 const index = (props) => {
 
-  
 
-    const page = useSelector(state => state.page)
+
+    const router = useRouter()
+
+    const { houseId } = router.params
 
     const user = useSelector(state => state.user)
 
     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('')
     useEffect(() => {
 
         // console.log(page, 'page')
@@ -49,75 +55,83 @@ const index = (props) => {
         console.log('3333')
         if (res.from === 'button') {
             // 来自页面内转发按钮
-              console.log(res.target)
+            console.log(res.target)
         }
+        const response =  syncAddOrder()
+        // /api/ma/taHouseSetting method:'post'
         return {
-            title: '自定义转发标题',
-            path: '/page/share/index'
+            title: '分享到微信',
+            path: `/pages/index/index?houseId=${houseId}&number=${number}&startTime=${startTime}&endTime=${endTime}`
         }
     })
 
-    const onTabClick = (e) => {
-        console.log(e, '111')
-        setUserRole(e)
-    }
+    async function syncAddOrder() {
+        const data={
+            houseId,
+            number,
+            startTime,
+            endTime
+        }
+      return  request({url:'/taHouseSetting',method:'post',data})
+      }   
 
-    const onRegisterChange = (e) => {
+    const onTimeChange = (e) => {
         console.log(e, '111')
-    }
-    const onSave = () => {
-        console.log(333)
-
-        Taro.showModal({
-            title: '修改成功',
-            content: '点击确认按钮，返回上级菜单',
-            showCancel: false,
-            success: function (res) {
-                if (res.confirm) {
-                    console.log('用户点击确定')
-
-                    Taro.navigateBack({
-                        delta: 1
-                    })
-                } else if (res.cancel) {
-                    console.log('用户点击取消')
-                }
-            }
-        })
+        setStartTime(e.detail.value)
     }
 
-    return <View className='share'>
 
+    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 placeholderClass='placeholderinput' className='input' type='text' placeholder='' />
+                    <Input type='number' onInput={()=>setLngLat(e.detail.value)} placeholderClass='placeholderinput' className='input' type='text' placeholder='' />
                 </Container>
             </View>
             <View className='inputstyle-view'>
                 <Text className='title'>入住日期</Text>
                 <Container className='inputstyle-view-card ' style={{ borderRadius: '20rpx', padding: '0 40rpx' }} >
-                    <Input placeholderClass='placeholderinput' className='input' type='text' placeholder='' />
+
+                    <Picker mode='date' onChange={onTimeChange}>
+                        <View className='input' style={{height: '44rpx',lineHeight: '44rpx',fontsize: '28rpx'}}>
+                            {startTime}
+                        </View>
+                    </Picker>
+                    {/* <Input placeholderClass='placeholderinput' className='input' type='text' placeholder='' /> */}
                 </Container>
             </View>
 
             <View className='inputstyle-view'>
                 <Text className='title'>离店日期</Text>
                 <Container className='inputstyle-view-card ' style={{ borderRadius: '20rpx', padding: '0 40rpx' }} >
-                    <Input placeholderClass='placeholderinput' className='input' type='text' placeholder='' />
+                <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>
-        <button open-type="share" style={{display:'contents'}}><Tab className='addhousetab' color='#ffffff' pageState='3' onClick={(e) => console.log(33)} value={['分享到微信']} ></Tab> </button>
+        <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')]} */}
+        {/* onClick={[(e) => setPageState('2'),style={{ display: 'contents' }} (e) => setPageState('1')]} */}
 
-{/* <Tab className='addhousetab' color='#ffffff' pageState='3' value={['分享到微信']} ></Tab> */}
+        {/* <Tab className='addhousetab' color='#ffffff' pageState='3' value={['分享到微信']} ></Tab> */}
 
     </View>
 }

src/pages/wifi/index.jsx

@@ -1,15 +1,18 @@
 import React, { useEffect, useMemo, useState } from 'react'
-import Taro from "@tarojs/taro";
+import Taro,{useRouter } from "@tarojs/taro";
 import { useSelector } from 'react-redux'
 import { View, Input, Text, Image } from '@tarojs/components'
 import Layout from '../../layout/index'
 import Tab from '../../compents/tab/index'
 import Container from '../../compents/container/index'
 import locationicon from '../../assets/locationicon.png'
+import request from '../../util/request'
 import './index.scss'
 
 const index = (props) => {
+    const router = useRouter()
 
+    const { houseId } = router.params
     const page = useSelector(state => state.page)
 
     const user = useSelector(state => state.user)
@@ -17,24 +20,23 @@ const index = (props) => {
     const [userRole, setUserRole] = useState('1')
     const [pageState, setPageState] = useState('1')
     const [list, setList] = useState([])
-    useEffect(() => {
-
-        console.log(page, 'page')
-        setList([
-            {
-                name: 'zhou',
-                phone: '177'
-            },
-            {
-                name: 'zhou',
-                phone: '177'
-            },
-            {
-                name: 'zhou',
-                phone: '177'
-            }
-        ])
+    const [wifiName,setWifiName] = useState('')
+    const [wifiPassword,setWifiPassword] = useState('')
+
+   useEffect(() => {
+        
+        if (houseId) {
+            getDetail()
+        }
+
     }, [])
+    const getDetail = () => {
+        request({ url: `/taHouse/${houseId}` }).then((res) => {
+            console.log(res.data.data, 'getDetail')
+            setWifiName(res.data.data.wifiName)
+            setWifiPassword(res.data.data.wifiPassword)
+        })
+    }
 
 
     const onTabClick = (e) => {
@@ -47,25 +49,35 @@ const index = (props) => {
     }
     const onSave = () => {
         console.log(333)
+        const data= {
+            wifiName,
+            wifiPassword
+        }
+
+        request({ url: `/taHouse/${houseId}`, method: 'put', data: { ...data, houseId } }).then((res) => {
+            Taro.navigateBack({
+                delta: 1
+            })
+        })
         
-        Taro.showModal({
-            title: '修改成功',
-            content: '点击确认按钮，返回上级菜单',
-            showCancel:false,
-            success: function (res) {
-              if (res.confirm) {
-                console.log('用户点击确定')
-
-                Taro.navigateBack({
-                    delta: 1
-                  })
-              } else if (res.cancel) {
-                console.log('用户点击取消')
-              }
-            }
-          })
+        // Taro.showModal({
+        //     title: '修改成功',
+        //     content: '点击确认按钮，返回上级菜单',
+        //     showCancel:false,
+        //     success: function (res) {
+        //       if (res.confirm) {
+        //         console.log('用户点击确定')
+
+        //         Taro.navigateBack({
+        //             delta: 1
+        //           })
+        //       } else if (res.cancel) {
+        //         console.log('用户点击取消')
+        //       }
+        //     }
+        //   })
     }
-    onSave
+
 
     return <View className='map'>
 
@@ -76,18 +88,21 @@ const index = (props) => {
             <View className='map-view'>
                 <Text className='title'>WiFi名称</Text>
                 <Container className='map-view-card'>
-                <Input placeholderClass='placeholderinput' className='input' type='text' placeholder='小区/写字楼/大厦等' />
+                <Input value={wifiName} onInput={(e)=>setWifiName(e.detail.value)}  placeholderClass='placeholderinput' className='input' type='text' placeholder='小区/写字楼/大厦等' />
                 </Container>
             </View>
-          
+         
+
             <View className='map-view'>
                 <Text className='title'>密码</Text>
                 <Container className='map-view-card'>
-                <Input placeholderClass='placeholderinput' className='input' type='text' placeholder='小区/写字楼/大厦等' />
+                <Input value={wifiPassword} onInput={(e)=>setWifiPassword(e.detail.value)} placeholderClass='placeholderinput' className='input' type='text' placeholder='小区/写字楼/大厦等' />
                 </Container>
             </View>
         </Layout>
-         <Tab className='addhousetab' pageState='3' value={['取消', '保存修改']} onClick={[(e) => setPageState('2'), () => onSave()]}></Tab>
+         <Tab className='addhousetab' pageState='3' value={['取消', '保存修改']} onClick={[(e) =>Taro.navigateBack({
+                delta: 1
+            }), () => onSave()]}></Tab>
 
 
 

src/reducers/user.js

@@ -7,7 +7,10 @@ import {
 //     customer:'customer'
 // adminuser
 const INITIAL_STATE = {
+
+  phone:false
   // role: 'adminuser',
+  // role: 'landlord',
   // role:''
   // role: 'customer'
 }
@@ -34,12 +37,30 @@ export default function user(state = INITIAL_STATE, action) {
   console.log(state, 'state33')
   switch (action.type) {
     case 'LOGIN': {
-      console.log(state,action, 'state')
-      return {
-        ...state,
-        ...action.user,
-        role: 'landlord',
+
+      if (action.user.shopKeeperList.length > 0) {
+        return {
+          ...state,
+          ...action.user,
+          // role: 'landlord',
+          role: 'customer',
+        }
+      } else {
+        return {
+          ...state,
+          ...action.user,
+          role: 'customer',
+      
+          
+          
+        }
       }
+
+
+
+    }
+    case 'phone': {
+      return state
     }
 
     default:

src/util/request.js

@@ -1,4 +1,6 @@
 import Taro from '@tarojs/taro'
+import { useSelector } from 'react-redux'
+import user from '../reducers/user'
 
 const baseURL = HOST
 
@@ -30,10 +32,12 @@ export function optionBuilder(options) {
   //   const showMessage = Object.prototype.hasOwnProperty.call(payload, 'showToast') ? payload.showToast : showToast
   //   const consultant = Taro.getStorageSync('consultantId') || ''
   //   const recommender = Taro.getStorageSync('recommender') || ''
+  // const token = useSelector(state => state.user)
   let api = `/api/ma${url}`
   if (method == 'GET' && JSON.stringify(params) != "{}") {
     api = `${api}?${paramsToString(params)}`
   }
+  // user.user?.token||
   const token = Taro.getStorageSync('token')||''
   console.log(token,'token')
   return [{
@@ -42,7 +46,7 @@ export function optionBuilder(options) {
       data,
       header: {
         'content-type': 'application/json',
-        'authorization': `X-Authorization-JWT ${token}`,
+      'X-Authorization-JWT': `${token}`,
         // 'appId': appId,
         // 'x-action': 'miniapp',
         // 'x-version': Version,
@@ -57,3 +61,53 @@ export function optionBuilder(options) {
     // }
   ]
 }
+
+
+export const uploadFiles = async (files,url) => {
+  const uploads = []
+  const token = Taro.getStorageSync('token')||''
+  for (var i = 0; i < files.length; i++) {
+    uploads[i] = new Promise((resolve, reject) => {
+      Taro.uploadFile({
+        url:  url||`${baseURL}/api/ma/image`,
+        filePath: files[i],
+        header: {
+          'authorization': `X-Authorization-JWT ${token}`,
+
+          // 'x-action': 'miniapp'
+        },
+        name: 'file',
+        success: function (res) {
+          // debugger
+          const _data = JSON.parse(res.data)
+          // if (_data.code !== CODE_SUCCESS) {
+          //   reject(new Error(_data.message))
+          // }
+
+          resolve(_data.data)
+        },
+        fail(err) {
+          reject(err)
+        }
+      })
+    })
+  }
+
+  return Promise.all(uploads)
+}
+
+
+function paramsToString(params) {
+  return Object.keys(params).map((key) => {
+    const val = params[key]
+    return Array.isArray(val) ? val.map((x) => {
+      return composeKeyValue(key, x)
+    }).join('&') : composeKeyValue(key, val)
+
+  }).join('&')
+}
+
+function composeKeyValue(k, v, encode) {
+
+  return encode === false ? `${k}=${v}` : `${encodeURIComponent(k)}=${encodeURIComponent(v)}`
+}