fix bug

src/app.config.js

@@ -4,6 +4,7 @@ export default {
     'pages/house/index',
     'pages/map/index',
     'pages/wifi/index',
+    'pages/housename/index',
     'pages/share/index',
     'pages/house/addnewhouse/index',
     'pages/house/household/index',

src/compents/navcustom/index.jsx

@@ -0,0 +1,80 @@
+import Taro from "@tarojs/taro";
+import React, { useEffect, useMemo, useState } from "react";
+import { View, Image, Text } from "@tarojs/components";
+import usericon from "../../assets/usericon.png";
+
+const NavCustom = props => {
+  const { houseInfo={} } = props;
+  const {taShop={}} =houseInfo
+  const [navStyle, setNavStyle] = useState({});
+
+  useEffect(() => {
+    console.log(Taro.getMenuButtonBoundingClientRect(), "-------");
+    setNavStyle(Taro.getMenuButtonBoundingClientRect());
+  }, []);
+  return (
+    <View
+      style={{
+        height: navStyle.bottom + 10,
+        width: "100%",
+        display: "flex",
+        background: "#fff"
+      }}
+    >
+      {houseInfo && (
+        <View
+          style={{
+            width: navStyle.left,
+            display: "flex",
+            background: "#fff",
+            paddingLeft: 10,
+            paddingBottom: 10,
+            margin: 0,
+            alignItems: "flex-end"
+          }}
+        >
+          <View
+            style={{
+              width: navStyle.right - navStyle.left,
+              height: 40,
+              borderRadius: 20,
+           
+            }}
+          >
+            {taShop.logo && (
+              <Image
+                className="guide-view-img"
+                // mode="widthFix"
+                style={{
+                  width: 40,
+                  height: 40,
+                  borderRadius: 20,
+                  margin:0,
+                  background: "#000"
+                }}
+                src={taShop.logo}
+              ></Image>
+            )}
+          </View>
+
+          <View
+            style={{
+              textAlign: "center",
+              width: navStyle.left - 50,
+              marginTop: navStyle.top,
+            //   height: navStyle.height,
+            //   lineHeight: `${navStyle.height}px`
+            }}
+          >
+           <view>{taShop.name||'十公里周边指南'}</view>
+           {/* <view style={{fontSize:'24rpx',color:'#7b7b7b'}}>{houseInfo.title}</view> */}
+              
+              
+           {/* <Text></Text>  */}
+          </View>
+        </View>
+      )}
+    </View>
+  );
+};
+export default NavCustom;

src/layout/index.jsx

@@ -1,8 +1,13 @@
 import React from 'react';
+import Taro from '@tarojs/taro'
 import { View, ScrollView } from '@tarojs/components'
 
-const Layout = ({ children }) => {
-    return <ScrollView className='scrol' scrollY  >
+const Layout = ({ children,type }) => {
+
+  const navStyle =  Taro.getMenuButtonBoundingClientRect()
+
+console.log(`calc(100vh - 42.5px - ${navStyle.bottom}px -10px)`,'`calc(100vh - 42.5px - ${navStyle.bottom}px -10px)`')
+    return <ScrollView className='scrol' scrollY  style={type=='custom'?{height:`calc(100vh - 42.5px - ${navStyle.bottom}px - 10px)`}:undefined} >
         <View className='page-container' >
             {children}
         </View>

src/pages/customer/index.js

@@ -1,15 +1,17 @@
 import React, { useEffect, useMemo, useState } from 'react'
+import Taro from '@tarojs/taro'
 import { useSelector } from 'react-redux'
-import { View, ScrollView } from '@tarojs/components'
+import { View, Image,Text } from '@tarojs/components'
 import  Layout from '../../layout/index'
 import Tab from '../../compents/tab/index'
 import Register from './register/index'
 import Guide from '../guide/index'
 import Recommend from '../recommend/index'
-// import HouseLIst from '../house/list'
+import NavCustom from '../../compents/navcustom'
 
 import './index.scss'
 import request from '../../util/request'
+import usericon from '../../assets/usericon.png'
 
 const index = (props) => {
   const {houseId,orderId} = props
@@ -22,6 +24,7 @@ const index = (props) => {
   const [surroundList, setSurroundList] = useState()
   const [regUnFinished, setRegUnFinished] = useState(true)
 
+
   const handleRegisterFinished = () => {
     setRegUnFinished(false)
   }
@@ -64,15 +67,19 @@ const index = (props) => {
  
   return (
     <View className='index' >
+
+<NavCustom houseInfo={houseInfo}></NavCustom>
       {pageState=='1'&&<Register oderId={orderId} dataSource={orderInfo} onFinished={handleRegisterFinished}></Register>}
 
-      {pageState!='1'&&<Layout>
+      {pageState!='1'&&<Layout type='custom'>
+
         {pageState=='2'&&<Guide houseId={houseId} dataSource={houseInfo}></Guide>  }
         {pageState=='3'&&<Recommend houseId={houseId} dataSource={surroundList}></Recommend>  }
       </Layout>}
     {/* !!houseId&& */}
       {pageState!='1' && (
         <Tab
+        styleType='tab'
           value={['入住指引','房东推荐']}
           pageState={pageState}
           onClick={[(e) => setPageState('2'),(e) => setPageState('3')]} />

src/pages/guide/index.jsx

@@ -71,6 +71,11 @@ const guide = props => {
       case "wifi":
         Taro.navigateTo({ url: `/pages/wifi/index?houseId=${houseId}` });
         break;
+
+      case "housename":
+        Taro.navigateTo({ url: `/pages/housename/index?houseId=${houseId}` });
+        break;
+
       case "image": {
         if (user.role == userRloe.customer) return;
         wx.chooseImage({
@@ -118,6 +123,17 @@ const guide = props => {
     <View className="guide">
       {!!houseId && (
         <View>
+          <View className="guide-view">
+            <Text className="guide-view-info">房屋名称</Text>
+            <ContainerLayout
+              className="guide-view-layout guide-view-wifi"
+              onClick={() => onToMap("housename")}
+            >
+              <View className="guide-view-layout-text1" style={{ margin: 0 }}>
+                {detail.title}
+              </View>
+            </ContainerLayout>
+          </View>
           <View className="guide-view">
             <Text className="guide-view-info">房屋位置</Text>
             <ContainerLayout

src/pages/house/household/index.jsx

@@ -33,22 +33,11 @@ const house = (props) => {
     })
   }
 
-  // {
-
-  //   Object.keys(list).map((item) => {
-  //       console.log(list[item], item, 'list[item]11')
-
-  //       return <View className='imglist-card'>
-  //           <View className='imglist-card-tags' style={{ display: 'flex' }}>
-  //               {/* imageimageimageimage34 */}
-  //               {list[item].map((x) => {
-  //                   return <View className='tag' s>{x.tagName}</View>
-  //               })}
-  //           </View>
-  //           <Image src={list[item][0].image} style={{ width: '100%' }} onClick={() => { setData(list[item]); setIsOpened(true) }}></Image>
-  //       </View>
-  //   })
-  // }
+const getDate =(value)=>{ 
+  const [date,time] = value.split('T')
+  console.log(time,'time')
+return `${date} ${time.split(':')[0]}:${time.split(':')[1]}`
+}
   return <View className='household'>
 
     <Layout>
@@ -63,6 +52,7 @@ const house = (props) => {
               {list[item].map((x) => {
                 return <view>{x.name}: {x.phone}</view>  
               })}
+              {`入住时间：${getDate(list[item][0].createDate)}`}
               {list[item].length == 0 && '暂无入住人信息'}
 
             </ContainerLayout>

src/pages/house/index.config.js

@@ -1,5 +1,6 @@
 export default {
-    // navigationStyle: "custom"
+    
     navigationBarTitleText: '',
+    navigationStyle: "custom"
   }
   

src/pages/house/index.jsx

@@ -7,9 +7,7 @@ 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 NavCustom from '../../compents/navcustom'
 import './index.scss'
 import request from '../../util/request'
 
@@ -74,8 +72,8 @@ const house = (props) => {
 
 
         <View >
-
-            <Layout>
+        <NavCustom houseInfo={dataSource}></NavCustom>
+            <Layout type='custom'>
                 {pageState == '2' && <Guide houseId={houseId} dataSource={dataSource}></Guide>}
                 {pageState == '3' && <Recommend houseId={houseId} dataSource={imgSource}></Recommend>}
             </Layout>

src/pages/house/list/index.jsx

@@ -60,7 +60,7 @@ let house = (props, ref) => {
   };
 
   const onShare = x => {
-    Taro.navigateTo({ url: `/pages/share/index?houseId=${x.houseId}` });
+    Taro.navigateTo({ url: `/pages/share/index?houseId=${x.houseId}&&title=${x.title}` });
   };
 
   useEffect(() => {
@@ -119,9 +119,11 @@ let house = (props, ref) => {
   // useDidShow(() => {
   //   setQueryParams({ ...queryParams })
   // })
-
+ 
   return (
     <View className="houselist">
+     
+
       {(!list || !list.length) && <View className="nodata"> 暂无数据</View>}
       <RecycleList
         height={height}

src/pages/housename/index.config.js

@@ -0,0 +1,4 @@
+export default {
+ 
+    navigationBarTitleText: '修改wifi',
+  }

src/pages/housename/index.jsx

@@ -0,0 +1,106 @@
+import React, { useEffect, useMemo, useState } from 'react'
+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)
+
+    const [userRole, setUserRole] = useState('1')
+    const [pageState, setPageState] = useState('1')
+    const [list, setList] = useState([])
+    const [title,setTitle] = useState('')
+
+   useEffect(() => {
+        
+        if (houseId) {
+            getDetail()
+        }
+
+    }, [])
+    const getDetail = () => {
+        request({ url: `/taHouse/${houseId}` }).then((res) => {
+        
+            setTitle(res.data.data.title)
+        })
+    }
+
+
+    const onTabClick = (e) => {
+        console.log(e, '111')
+        setUserRole(e)
+    }
+
+    const onRegisterChange = (e) => {
+        console.log(e, '111')
+    }
+    const onSave = () => {
+        console.log(333)
+        const data= {
+            title
+        }
+
+        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('用户点击取消')
+        //       }
+        //     }
+        //   })
+    }
+
+
+    return <View className='map'>
+
+
+
+
+        <Layout>
+            <View className='map-view'>
+                <Text className='title'>房屋名称</Text>
+                <Container className='map-view-card'>
+                <Input value={title} onInput={(e)=>setTitle(e.detail.value)}  placeholderClass='placeholderinput' className='input' type='text' placeholder='' />
+                </Container>
+            </View>
+         
+
+          
+        </Layout>
+         <Tab className='addhousetab' pageState='3' value={['取消', '保存修改']} onClick={[(e) =>Taro.navigateBack({
+                delta: 1
+            }), () => onSave()]}></Tab>
+
+
+
+
+
+    </View>
+}
+
+export default index

src/pages/housename/index.scss

@@ -0,0 +1,50 @@
+.map {
+  // padding:13.33px;
+  &-view {
+    margin: 50px 0 0;
+
+    &-card {
+      // height: 106px;
+      // line-height: 106px;
+      padding: 0 40px;
+      // color:#181818;
+      font-size: 24px;
+      // font-weight: 600;
+      margin-top: 26.67px;
+      border-radius: 30px;
+      border-radius: 20px;
+      .input{
+        font-size: 28px;
+        padding:30px 0;
+        line-height: 106px;
+        // color: red;
+      }
+      .placeholderinput{
+        // line-height: 106px;
+        color: #d2d2d2;
+        font-size: 28px;
+      }
+    }
+    &-icon {
+      margin-left: 40px;
+      // padding: 20px 30px;
+      // color:#181818;
+      width: 150px;
+      height: 106.67px;
+      // font-size: 36px;
+      // // font-weight: 600;
+      margin-top: 26.67px;
+      border-radius: 20px;
+      background-color: #274291;
+      padding: 0;
+      text-align: center;
+      line-height:120.67px;
+      .icon {
+        
+        // width: 100%;
+      }
+    }
+    // style={{width:'48.4rpx',height:'48.4rpx'}}
+  }
+
+}

src/pages/index/index.config.js

@@ -1,4 +1,4 @@
 export default {
   // navigationBarTitleText: '首页',
-  
+  "navigationStyle": "custom"
 }

src/pages/landlord/index.jsx

@@ -11,7 +11,7 @@ import HouseLIst from '../house/list/index'
 import { AtFloatLayout } from "taro-ui"
 import request from '@/util/request'
 import './index.scss'
-
+import NavCustom from '../../compents/navcustom'
 const index = (props) => {
 
 
@@ -86,14 +86,15 @@ const index = (props) => {
     }
 
   }
-
+  const navStyle =  Taro.getMenuButtonBoundingClientRect()
 
   return <View className='index'>
 
 
     <View>
-
-      <Layout>
+  
+  {pageState == '1' &&<NavCustom houseInfo={{title:'民宿房源管理'}}></NavCustom>}
+      <Layout type='custom'>
         {pageState == '1' && <HouseLIst ref={childRef} radioHouseState={radioHouseState} onChange={(e) => setRadioHouseData(e)}></HouseLIst>}
       </Layout>
       {!isOpened && <Tab className='addhousetab' value={['+添加房源']} onClick={(e) => setIsOpened(true)}></Tab>}

src/pages/recommend/index.jsx

@@ -20,7 +20,7 @@ const ImageCard = props => {
       className="recommend-view-card"
       style={
 
-          { height: !isopen?'330rpx':undefined, overflow: "hidden"}
+          { height: !isopen?'333rpx':undefined, overflow: "hidden"}
          
       }
     >

src/pages/share/index.jsx

@@ -19,7 +19,7 @@ import request from '../../util/request';
 
 const Index = () => {
     const router = useRouter()
-    const { houseId } = router.params
+    const { houseId,title } = router.params
     const [personNum, setPersonNum] = useState()
     const [startTime, setStartTime] = useState('')
     const [endTime, setEndTime] = useState('')
@@ -63,7 +63,7 @@ const Index = () => {
                 return request({ url: `/taHouse/${houseId}/share` }).then(res => {
 
                     const share = {
-                        title: '分享到微信',
+                        title: `欢迎来到${title}`,
                         imageUrl: (res.data.data || {}).image,
                         path: `/pages/index/index?houseId=${houseId}&personNum=${personNum}&startTime=${startTime}&endTime=${endTime}&orderId=${orderId}`
                     }