fix

config/dev.js

     // HOST: '"http://localhost:7080"',
     // HOST: '"https://sgl.ycjcjy.com"',
     HOST: '"http://192.168.31.68:7080"',
-    // HOST: '"http://192.168.211.181:7080"',
+    HOST: '"http://192.168.211.105:7080"',
  
     // OSS_PATH: "https://njcj.oss-cn-shanghai.aliyuncs.com/",
     // OSS_FAST_PATH: "https://njcj.oss-accelerate.aliyuncs.com/",

src/app.config.js

   window: {
     backgroundTextStyle: 'light',
     navigationBarBackgroundColor: '#fff',
-    navigationBarTitleText: 'WeChat',
+    navigationBarTitleText: '十公里',
     navigationBarTextStyle: 'black'
   },
   usingComponents: {

src/app.scss

    text-align: center;
    margin: auto;
    margin-top: 90px;
- }
+ }
+
+
+ .scrol{
+  height: calc(100vh - 173.33px)
+ }

src/layout/index.jsx

 import { View, ScrollView } from '@tarojs/components'
 
 const Layout = ({ children }) => {
-    return <ScrollView scrollY style={{ height: 'calc(100vh - 162rpx)' }} >
+    return <ScrollView className='scrol' scrollY  >
         <View className='page-container' >
             {children}
         </View>
+        <View style={{height:'10rpx'}}></View>
     </ScrollView>
 }
 

src/pages/account/index.jsx

 
 
   const radioHouseState = useMemo(() => props.radioHouseState, [props.radioHouseState])
-  wx.setNavigationBarTitle({
-    title: '民宿房源管理'
-  })
+
   console.log(props, radioHouseState)
   useEffect(() => {
     setList([
       })}
     </Layout>
     {/* onClick={(e)=>(e) */}
-    <Tab value={['+新增名宿老板账号']} color='#ffffff' onClick={() => { Taro.navigateTo({ url: `/pages/account/edit/index` }) }} ></Tab>
+    <Tab value={['+新增民宿老板账号']} color='#ffffff' onClick={() => { Taro.navigateTo({ url: `/pages/account/edit/index` }) }} ></Tab>
   </View>
 }
 

src/pages/addimg/index.config.js

 //   },
 
 export default {
-    enableShareAppMessage: true
+    navigationBarTitleText: '图片列表',
 }

src/pages/adminUser/index.jsx

 import { xor } from 'lodash';
 
 const menuList = [{
-  title: '名宿老板账号管理',
+  title: '民宿宿老板账号管理',
   icon: usericon,
   url: '/pages/account/index'
 }, {

src/pages/guide/index.jsx

 import './index.scss'
 import userRloe from '../../util/userRole'
 import { useSelector } from 'react-redux'
-import request from '@/util/request'
+import request,{uploadFiles } from '@/util/request'
 import uploadicon from '../../assets/uploadicon.png'
 const guide = (props) => {
 
                     sizeType: ['original', 'compressed'],
                     sourceType: ['album',],
                     success: (res) => {
-                        // tempFilePath可以作为img标签的src属性显示图片
-
-                        console.log(res)
-                        const tempFilePaths = res.tempFilePaths
-                        setImgurl(tempFilePaths[0])
+                                // tempFilePath可以作为img标签的src属性显示图片
+                                const tempFilePaths = res.tempFilePaths
+
+                        uploadFiles(tempFilePaths).then((res) => {
+                            console.log(res, 'uploadFiles')
+                            // setImgUrl(res[0])
+                            setImgurl(res[0])
+                            request({ url: `/taHouse/${houseId}`, method: 'put', data: { ...detail, desc:res[0] } }).then((res) => {
+                                
+                            })
+                        }).catch((e) => {
+                            console.log(e, 'err')
+                        })
+
+                        // setImgurl(tempFilePaths[0])
                     }
+                    // success: (res) => {
+                    //     // tempFilePath可以作为img标签的src属性显示图片
+
+                    //     console.log(res)
+                    //     const tempFilePaths = res.tempFilePaths
+                    //     setImgurl(tempFilePaths[0])
+
+
+                        
+                    // }
                 }); break;
             }
         }
         // Taro.navigateTo({ url: `/pages/map/index?type=${type}` })
     }
-    // 
+     const [addressName,addressDetail] = (detail.address||'').split('____')
+     const [parkingName,parkingDetail] = (detail.parking||'').split('____')
     return <View className='guide'>
         {!!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 className='guide-view-layout-text1' >{addressName}</View>
+                        <View className='guide-view-layout-text2'>{addressDetail}</View>
                     </View>
                     {user.role == userRloe.customer && <View style={{ float: 'right' }} onClick={() => onOpenLocation(detail.lngLat)}>
                         <Image className='icon' src={icon} />
                 <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 className='guide-view-layout-text1' >{parkingName}</View>
+                        <View className='guide-view-layout-text2'>{parkingDetail}</View>
                     </View>
                     {user.role == userRloe.customer && <View style={{ float: 'right' }} onClick={() => onOpenLocation(detail.parkLngLat)}>
                         <Image className='icon' src={icon} />

src/pages/house/addnewhouse/index.config.js

 export default {
-
-  
-}
+ 
+    navigationBarTitleText: '新增房源',
+  }

src/pages/house/addnewhouse/index.jsx

         })
     }
     const formSubmit = (e) => {
-        console.log(e.detail, 'formSubmit')
+        // console.log(e.detail, 'formSubmit')
+        const value = e.detail.value
         const data = {
-            ...e.detail.value,
+            ...value,
+            address: `${value.address}____${value.addressdetail}`,
+            parking: `${value.parking}____${value.parkingdetail}`,
             lngLat: `${address.latitude},${address.longitude}`,
             parkLngLat: `${address.latitude},${address.longitude}`,
+            
             desc:imgUrl,
         }
-        // latitude
-        // longitude
+        console.log(data,e.detail.value,'formSubmit')
         request({ url: '/taHouse', method: 'post', data }).then((res) => {
             if (res.data.code == 1000)
                 Taro.navigateBack({
             <Layout>
 
                 <View className='inputstyle-view'>
-                    <Text className='title'>民宿名称</Text>
+                    <Text className='title'>房源名称</Text>
                     <Container className='inputstyle-view-card ' style={{ borderRadius: '20rpx', padding: '0 40rpx' }} >
                         <Input name='title' placeholderClass='placeholderinput' className='input' type='text' placeholder='' />
                     </Container>
                     <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='' />
+                            <Input name='address' value={address.name} disabled placeholderClass='placeholderinput' className='input' type='text' placeholder='' />
 
                         </Container>
                         <Container className='map-view-icon' onClick={() => onChooseLocation('address')}>
                 <View className='inputstyle-view'>
                     <Text className='title'>具体地址</Text>
                     <Container className='inputstyle-view-card ' style={{ borderRadius: '20rpx', padding: '0 40rpx' }} >
-                        <Input name='lngLat' placeholderClass='placeholderinput' className='input' type='text' placeholder='' />
+                        <Input name='addressdetail' value={address.address} 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='parking' value={parking.address} disabled placeholderClass='placeholderinput' className='input' type='text' placeholder='' />
+                            <Input name='parking' value={parking.name} disabled placeholderClass='placeholderinput' className='input' type='text' placeholder='' />
 
                         </Container>
                         <Container className='map-view-icon' onClick={() => onChooseLocation('parking')}>
                 <View className='inputstyle-view'>
                     <Text className='title'>具体地址</Text>
                     <Container className='inputstyle-view-card ' style={{ borderRadius: '20rpx', padding: '0 40rpx' }} >
-                        <Input name='parkLngLat' placeholderClass='placeholderinput' className='input' type='text' placeholder='' />
+                        <Input name='parkingdetail' value={parking.address} placeholderClass='placeholderinput' className='input' type='text' placeholder='' />
                     </Container>
                 </View>
                 <View className='inputstyle-view'>

src/pages/house/household/index.config.js

 export default {
-
-  
-}
+    navigationBarTitleText: '民宿房源管理',
+}

src/pages/house/index.config.js

-// export default {
-//     navigationStyle: "custom"
-    
-//   }
+export default {
+    // navigationStyle: "custom"
+    navigationBarTitleText: '',
+  }
   

src/pages/house/index.jsx

 import Tab from '../../compents/tab/index'
 import Guide from '../guide/index'
 import Recommend from '../recommend/index'
+import roleList from '../../util/userRole'
 
 // import HouseLIst from '../house/list'
 
 import request from '../../util/request'
 
 const house = (props) => {
+    
     const router = useRouter()
     const { houseId } = router.params
     const user = useSelector(state => state.user)
     const [list, setList] = useState([])
     const [dataSource, setDataSource] = useState([])
     const [imgSource, setImgSource] = useState([])
+
+    useEffect(() => {
+        if (user.role == roleList.landlord) {
+          wx.setNavigationBarTitle({
+            title: '民宿房源管理'
+          });
+        }
+        if (user.role == roleList.customer) {
+          wx.setNavigationBarTitle({
+            title: '十公里周边指南'
+          });
+        }
+      }, [user.role]);
+
     useDidShow(() => {
         if (houseId) {
             getDetail()
         request({ url: `/taHouse/${houseId}` }).then((res) => {
             setDataSource(res.data.data)
 
-            wx.setNavigationBarTitle({
-                title: res.data.data.title
-            })
         })
     }
     

src/pages/house/list/index.jsx

   }
 
   useEffect(() => {
-    console.log(props, ref,'props, ref')
+
     getHouseList()
 
     Taro.nextTick(() => {

src/pages/house/list/index.scss

       position: relative;
 
       &-radio {
-          width: 50px;
-          height: 50px;
+          width: 40px;
+          height: 40px;
         background-color: #274291;
         text-align: center;
-        line-height: 50px;
+        line-height: 40px;
         position: absolute;
-        border-radius: 25px;
-        top: -12.5px;
-        right: -12.5px;
+        border-radius: 20px;
+        top: -2px;
+        right: 2px;
       }
 
       .top {

src/pages/index/index.config.js

 export default {
-  navigationBarTitleText: '首页',
+  // navigationBarTitleText: '首页',
   
 }

src/pages/index/index.jsx

-import React, { useEffect, useMemo, useState } from 'react'
-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 roleList from '../../util/userRole'
-import './index.scss'
-import request from '../../util/request'
-import GetPhone from '@/compents/getPhone'
-const index = (props) => {
+import React, { useEffect, useMemo, useState } from "react";
+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 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);
+
+  console.log(user);
+
+  const dispatch = useDispatch();
 
-
-  const router = useRouter()
-
-  const { houseId ,orderId} = router.params
-  const user = useSelector(state => state.user)
-
-  console.log(user)
-
-  const dispatch = useDispatch()
+  useEffect(() => {
+    if (user.role == roleList.landlord) {
+      wx.setNavigationBarTitle({
+        title: '名宿房源管理'
+      });
+    }
+    if (user.role == roleList.customer) {
+      wx.setNavigationBarTitle({
+        title: '十公里周边指南'
+      });
+    }
+  }, [user.role]);
 
   // const [userRole, setUserRole] = useState('1')
   // const [pageState, SetPageState] = useState('1')
   // const [list, setList] = useState([])
   // const [visible, setVisible] = useState(false)
-  const [showAuthPhone, setShowAuthPhone] = useState(false)
+  const [showAuthPhone, setShowAuthPhone] = useState(false);
 
   useEffect(() => {
-    setShowAuthPhone(!user.phone)
-  }, [user.phone])
-
-  const onOk = (res) => {
-    dispatch({ type: 'LOGIN', user: res.data.data })
-    setShowAuthPhone(false)
-  }
-
-  const onCancel = (e) => {
-    setShowAuthPhone(false)
-  }
-
-  return <View className='index'>
-
-    {user.personId && <View>
-      <GetPhone visible={showAuthPhone} onOk={onOk} onCancel={onCancel} ></GetPhone>
-      {user.role == roleList.customer &&!showAuthPhone&& <Customer houseId={houseId} orderId={orderId}></Customer>}
-      {user.role == roleList.landlord &&!showAuthPhone&& <Landlord ></Landlord>}
-    </View>}
-
-
-
-
-
-    {/* {userRole == 1 ? <Register userRole={userRole} list={list} onChange={(e) => onRegisterChange(e)}></Register> :
+    setShowAuthPhone(!user.phone);
+  }, [user.phone]);
+
+  const onOk = res => {
+    dispatch({ type: "LOGIN", user: res.data.data });
+    setShowAuthPhone(false);
+  };
+
+  const onCancel = e => {
+    setShowAuthPhone(false);
+  };
+
+  return (
+    <View className="index">
+      {user.personId && (
+        <View>
+          <GetPhone
+            visible={showAuthPhone}
+            onOk={onOk}
+            onCancel={onCancel}
+          ></GetPhone>
+          {user.role == roleList.customer && !showAuthPhone && (
+            <Customer houseId={houseId} orderId={orderId}></Customer>
+          )}
+          {user.role == roleList.landlord && !showAuthPhone && (
+            <Landlord></Landlord>
+          )}
+        </View>
+      )}
+
+      {/* {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}/>}
         }
      <HouseLIst userRole={userRole} list={list} onChange={(e) => onRegisterChange(e)}></HouseLIst>  */}
 
-
-
-    {/* </View>
+      {/* </View>
     </ScrollView>
     <Tab value={userRole} onClick={(e) => onTabClick(e)}></Tab> */}
-  </View>
-}
+    </View>
+  );
+};
 
-export default index
+export default index;

src/pages/landlord/index.jsx

 
     <AtFloatLayout isOpened={isOpened} onClose={() => handleClose()} style={{ zIndex: '1000' }}>
       <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={{width:"50%" ,textAlign:'center'}} onClick={() => Taro.navigateTo({ url: '/pages/house/addnewhouse/index' })}>新增房源</View>
+        <View style={{width:"50%" ,textAlign:'center'}}  onClick={() => { setIsOpened(false); setRadioHouseState(true) }}>复制房源</View>
+        <View style={{width:"50%" ,textAlign:'center', color: '#d2d2d2' }} onClick={() => setIsOpened(false)}>取消</View>
       </View>
 
     </AtFloatLayout>

src/pages/map/index.config.js

 export default {
-
-  
-}
+ 
+    navigationBarTitleText: '修改地址',
+  }

src/pages/map/index.jsx

     const [userRole, setUserRole] = useState('1')
     const [pageState, setPageState] = useState('1')
     const [address, setAddress] = useState({})
-    // const [lngLat, setLngLat] = useState('')
 
+    // 在onInput详细地址时有bug，不能放在adderss里，所有加了个value
+    const [value,setValue] = useState('')
+    // const [lngLat, setLngLat] = useState('')
+console.log(address,'setAddress')
     useDidShow(() => {
 
     })
         request({ url: `/taHouse/${houseId}` }).then((res) => {
             console.log(res.data.data,type, 'getDetail')
             if (type == "address") {
+                const [addressName,addressDetail] = (res.data.data.address||'').split('____')
                 setAddress({
-                    address:res.data.data.address,
+                    name:addressName,
+                    address:addressDetail,
                     lngLat:res.data.data.lngLat
                 })
+
+                setValue(addressDetail)
                 // setAddress(res.data.data.address)
                 // setLngLat(res.data.data.lngLat)
             }else if (type == 'park'){
-
+                const [addressName,addressDetail] = (res.data.data.parking||'').split('____')
                 setAddress({
-                    address:res.data.data.parking,
+                    name:addressName,
+                    address:addressDetail,
                     lngLat:res.data.data.parkLngLat
                 })
+                setValue(addressDetail)
                 // address(res.data.data)
                 // setAddress(res.data.data.parking)
                 // setLngLat(res.data.data.parkLngLat)
         let data = {}
         if (type == 'address') {
             data = {
-                address: address.address,
+                address: `${address.name}____${value}`,
                 lngLat:`${address.latitude},${address.longitude}`
             }
         } else if (type == 'park') {
             data = {
-                parking: address.address,
+                parking: `${address.name}____${value}`,
                 parkLngLat:`${address.latitude},${address.longitude}`
             }
         }
         })
     }
 
-    const onChange = (e) => {
-        console.log(e, '111')
-        // setLngLat(e.detail.value)
-    }
     const onChooseLocation = () => {
         console.log(333)
         wx.chooseLocation({
                 console.log(res)
 
                 setAddress(res)
+                setValue(res.address)
             },
             fail: (err) => {
                 console.log(err)
         })
     }
 
-
     return <View className='map'>
 
 
 
 
         <Layout>
-            {/* <View className='map-view'>
-                <Text className='title'></Text>
-                <Container className='map-view-card'>
-                <Input placeholderClass='placeholderinput' className='input' type='text' placeholder='小区/写字楼/大厦等' />
-                </Container>
-            </View> */}
             <View className='map-view' >
                 <Text className='title'>位置信息</Text>
                 <View style={{ display: 'flex' }}>
                     <Container className='map-view-card' style={{ width: '100%' }}>
-                        {address.address&&<Input value={address.address} disabled placeholderClass='placeholderinput' className='input' type='text' placeholder='' />}
+                        {address.address&&<Input value={address.name} disabled placeholderClass='placeholderinput' className='input' type='text' placeholder='' />}
 
                     </Container>
                     <Container className='map-view-icon' onClick={() => onChooseLocation()}>
             <View className='map-view'>
                 <Text className='title'>具体地址</Text>
                 <Container className='map-view-card'>
-                    <Input  onInput={onChange} placeholderClass='placeholderinput' className='input' type='text' placeholder='' />
+                    <Input value={value} onInput={(e)=>setValue(e.detail.value)} placeholderClass='placeholderinput' className='input' type='text' placeholder='' />
                 </Container>
             </View>
         </Layout>

src/pages/material/index.config.js

 export default {
 
-  
+  navigationBarTitleText: '选择分类标签',
 }

src/pages/recommend/index.jsx

             true && list.map((x) => {
                 return <View className='recommend-view'>
                     <ContainerLayout className='recommend-view-layout'  >
-                        {id != x.surroundId ? <View className='recommend-view-card' style={{ height: "300rpx",overflow:'hidden' }}>
+                        {id != x.surroundId ? <View className='recommend-view-card' style={userRloe.customer == user.role ? { height: "300rpx",overflow:'hidden' }:''}>
 
                             <Image className='recommend-view-img' mode='widthFix' 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>
+                                : <Image className='icon' src={deleteicon} mode='widthFix' style={{ width: '40rpx' }} onClick={() => onClick(x)}></Image>
                             }
 
-
-
                         </View> :
-                            <View style={{ height: "700rpx" }}>
+                            <View  >
                                 <Image className='recommend-view-img' mode='widthFix' src={x.image}></Image>
 
                             </View>

src/pages/recommend/index.scss

     position: relative;
     &-card{
       width: 100%;
-      height: 420px;
+      // height: 420px;
     }
     &-img{
       width: 100%;

src/pages/share/index.config.js

-// onShareAppMessage: function () {
-// return custom share data when user share.
-//     console.log('44444444')
-//   },
 
 export default {
+    navigationBarTitleText: '分享',
     enableShareAppMessage: true
 }

src/pages/wifi/index.config.js

 export default {
-
-  
-}
+ 
+    navigationBarTitleText: '修改wifi',
+  }

src/reducers/user.js

     case 'LOGIN': {
 
       if (action.user.shopKeeperList && action.user.shopKeeperList.length) {
+          wx.setNavigationBarTitle({
+            title: '民宿房源管理'
+          })
         return {
           ...state,
           ...action.user,