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

src/layout/index.jsx

@@ -6,7 +6,7 @@ const Layout = ({ children }) => {
         <View className='page-container' >
             {children}
         </View>
-        <View style={{height:'10rpx'}}></View>
+        {/* <View style={{height:'10rpx'}}></View> */}
     </ScrollView>
 }
 

src/pages/customer/register/index.jsx

@@ -1,129 +1,159 @@
-import React, { useEffect, useState } from 'react'
-import './register.scss'
-import { View, Text, Input } from '@tarojs/components'
-import ContainerLayout from '../../../compents/container/index'
+import React, { useEffect, useState } from "react";
+import Taro from "@tarojs/taro";
+import "./register.scss";
+import { View, Text, Input } from "@tarojs/components";
+import ContainerLayout from "../../../compents/container/index";
 // import { AtInput } from 'taro-ui'
-import Tab from '../../../compents/tab'
-import Layout from '../../../layout'
-import request from '@/util/request'
-
+import Tab from "../../../compents/tab";
+import Layout from "../../../layout";
+import request from "@/util/request";
 
 const InputGroup = props => {
-  const [name, setName] = useState(props.dataSource.name)
-  const [phone, setPhone] = useState(props.dataSource.phone)
+  const [name, setName] = useState(props.dataSource.name);
+  const [phone, setPhone] = useState(props.dataSource.phone);
 
   useEffect(() => {
     if (name !== props.dataSource.name) {
-      setName(props.dataSource.name)
+      setName(props.dataSource.name);
     }
-  }, [props.dataSource.name])
-  
+  }, [props.dataSource.name]);
+
   useEffect(() => {
     if (phone !== props.dataSource.phone) {
-      setPhone(props.dataSource.phone)
+      setPhone(props.dataSource.phone);
     }
-  }, [props.dataSource.phone])
+  }, [props.dataSource.phone]);
 
   const handeNameChange = e => {
-    const v = e.detail.value
-    setName(v)
+    const v = e.detail.value;
+    setName(v);
     if (props.onChange) {
       props.onChange({
         name: v,
         phone
-      })
+      });
     }
-    return v
-  }
-  
+    return v;
+  };
+
   const handePhoneChange = e => {
-    const v = e.detail.value
-    setPhone(v)
+    const v = e.detail.value;
+    setPhone(v);
     if (props.onChange) {
       props.onChange({
         name,
         phone: v
-      })
+      });
     }
-    return v
-  }
+    return v;
+  };
 
   const handleFocues = (_, e) => {
-    e.stopPropagation()
-    e.preventDefault()
-  }
+    e.stopPropagation();
+    e.preventDefault();
+  };
 
   return (
-    <View className='register-user'>
-      <Text>入住人{props.index+1}</Text>
-      <ContainerLayout className='register-user-from'>
-        {console.log(name,phone,'name,phone')}
-        <Input name="name" className='register-user-from-input' value={name} onInput={handeNameChange} placeholder='姓名' type='text' />
-        <Input name="phone" className='register-user-from-input' value={phone} onInput={handePhoneChange} placeholder='电话' type='text' />
+    <View className="register-user">
+      <Text>入住人{props.index + 1}</Text>
+      <ContainerLayout className="register-user-from">
+        <Input
+          name="name"
+          className="register-user-from-input"
+          value={name}
+          onInput={handeNameChange}
+          placeholder="姓名"
+          type="text"
+        />
+        <View
+          style={{ height: "2rpx", border: 1, background: "#f4f4f4" }}
+        ></View>
+        <Input
+          name="phone"
+          className="register-user-from-input"
+          value={phone}
+          onInput={handePhoneChange}
+          placeholder="电话"
+          type="text"
+        />
       </ContainerLayout>
     </View>
-  )
-}
-
-const register = (props) => {
+  );
+};
 
-  let [list, setList] = useState([])
+const register = props => {
+  let [list, setList] = useState([]);
   useEffect(() => {
     if (props.dataSource) {
-      const {personNum} = props.dataSource.houseSetting || {}
+      const { personNum } = props.dataSource.houseSetting || {};
 
-      setList(new Array(personNum || 0).fill('*').map(x => ({name: undefined, phone: undefined})))
+      setList(
+        new Array(personNum || 0)
+          .fill("*")
+          .map(x => ({ name: undefined, phone: undefined }))
+      );
     }
-  }, [props.dataSource])
+  }, [props.dataSource]);
 
   const onClick = () => {
-    const hasNull = list.filter(x => !x.name || !x.phone)[0]
+    const hasNull = list.filter(x => !x.name || !x.phone)[0];
     if (hasNull) {
       Taro.showModal({
-        title: '请将信息填写完成',
+        title: "请将信息填写完成",
         showCancel: false,
         success: () => {}
-      })
+      });
 
-      return
+      return;
     }
 
     const data = {
       orderId: props.dataSource.orderId,
       houseId: props.dataSource.houseSetting.houseId,
-      personList: list,
-    }
-
-    request({ url: '/taHousePerson', method: 'POST', data }).then(res => {
-      if (props.onFinished) {
-        props.onFinished(res)
-      }
-    }).catch(err => {
-      console.error(err)
-      const message = err.message || err.errMsg || err
-      Taro.showToast({
-        title: message,
-        icon: 'none',
-        duration: 3000
+      personList: list
+    };
+
+    request({ url: "/taHousePerson", method: "POST", data })
+      .then(res => {
+        if (props.onFinished) {
+          props.onFinished(res);
+        }
       })
-    })
-  }
-
-  const onChangeList = index => value =>  { 
-    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
+      .catch(err => {
+        console.error(err);
+        const message = err.message || err.errMsg || err;
+        Taro.showToast({
+          title: message,
+          icon: "none",
+          duration: 3000
+        });
+      });
+  };
+
+  const onChangeList = index => value => {
+    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/customer/register/register.scss

@@ -27,11 +27,11 @@
                 // height: 60px;
                 border-radius: 20px;
                 font-size: 24px;
-                border-bottom: none;
+                // border-bottom: none;
 
-                &::after{
-                    border:none
-                }
+                // &::after{
+                //     border:none
+                // }
               }
             .at-input__title{
                 text-align: center;

src/pages/guide/index.jsx

@@ -1,170 +1,236 @@
-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,{uploadFiles } 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, houseId, ...prop } = props
-    const [state, setState] = useState(1)
-
-    const [imgurl, setImgurl] = useState('')
-    // const [detail, setDetail] = useState({})
-    const detail = props.dataSource || {}
-
-    // 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)
-            }
-        })
+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, { uploadFiles } 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, houseId, ...prop } = props;
+  const [state, setState] = useState(1);
+
+  const [imgurl, setImgurl] = useState("");
+  // const [detail, setDetail] = useState({})
+  const detail = props.dataSource || {};
+
+  // 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;
+    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属性显示图片
+            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;
+      }
     }
-
-    const onToMap = (type) => {
-        if (user.role == userRloe.customer) return
-        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属性显示图片
-                                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' >{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} />
-                        <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' >{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} />
-                        <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>
+    // 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.shortAddress}
                 </View>
-                }
-            </View>
-        </View>}
-        {
-            !houseId && <View className='recommend-noorder' style={{ marginTop: 'calc(40vh)',textAlign:'center' }}>
-                <Text>哎呀</Text>
-                <Text>暂时没发现您的入住订单呢~</Text>
-
-
-            </View>
-        }
-
+                <View className="guide-view-layout-text2">
+                  {detail.address}
+                </View>
+              </View>
+              {user.role == userRloe.customer && (
+                <View
+                  style={{
+                    float: "right",
+                    display: "flex",
+                    justifyContent: "center",
+                    flexDirection: "column"
+                  }}
+                  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.shortParking}
+                </View>
+                <View className="guide-view-layout-text2">
+                  {detail.parking}
+                </View>
+              </View>
+              {user.role == userRloe.customer && (
+                <View
+                  style={{
+                    float: "right",
+                    display: "flex",
+                    justifyContent: "center",
+                    flexDirection: "column"
+                  }}
+                  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>
+            )}
+          </View>
+        </View>
+      )}
+      {!houseId && (
+        <View
+          className="recommend-noorder"
+          style={{ marginTop: "calc(40vh)", textAlign: "center" }}
+        >
+          <Text>哎呀</Text>
+          <Text>暂时没发现您的入住订单呢~</Text>
+        </View>
+      )}
     </View>
+  );
 };
 
-export default guide
+export default guide;

src/pages/house/addnewhouse/index.jsx

@@ -47,11 +47,22 @@ const index = (props) => {
     }
     const formSubmit = (e) => {
         // console.log(e.detail, 'formSubmit')
+
+
+        if(!e.detail.value?.title){
+            wx.showToast({
+                title: '请完善房源信息',
+                icon: 'none',
+                duration: 2000
+              })
+            return
+        }
+
         const value = e.detail.value
         const data = {
             ...value,
-            address: `${value.address}____${value.addressdetail}`,
-            parking: `${value.parking}____${value.parkingdetail}`,
+            // address: `${value.address}____${value.addressdetail}`,
+            // parking: `${value.parking}____${value.parkingdetail}`,
             lngLat: `${address.latitude},${address.longitude}`,
             parkLngLat: `${address.latitude},${address.longitude}`,
             
@@ -121,7 +132,7 @@ const index = (props) => {
                     <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.name} disabled placeholderClass='placeholderinput' className='input' type='text' placeholder='' />
+                            <Input name='shortAddress' value={address.name} disabled placeholderClass='placeholderinput' className='input' type='text' placeholder='' />
 
                         </Container>
                         <Container className='map-view-icon' onClick={() => onChooseLocation('address')}>
@@ -133,14 +144,14 @@ const index = (props) => {
                 <View className='inputstyle-view'>
                     <Text className='title'>具体地址</Text>
                     <Container className='inputstyle-view-card ' style={{ borderRadius: '20rpx', padding: '0 40rpx' }} >
-                        <Input name='addressdetail' value={address.address} placeholderClass='placeholderinput' className='input' type='text' placeholder='' />
+                        <Input name='address' 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.name} disabled placeholderClass='placeholderinput' className='input' type='text' placeholder='' />
+                            <Input name='shortParking' value={parking.name} disabled placeholderClass='placeholderinput' className='input' type='text' placeholder='' />
 
                         </Container>
                         <Container className='map-view-icon' onClick={() => onChooseLocation('parking')}>
@@ -152,7 +163,7 @@ const index = (props) => {
                 <View className='inputstyle-view'>
                     <Text className='title'>具体地址</Text>
                     <Container className='inputstyle-view-card ' style={{ borderRadius: '20rpx', padding: '0 40rpx' }} >
-                        <Input name='parkingdetail' value={parking.address} placeholderClass='placeholderinput' className='input' type='text' placeholder='' />
+                        <Input name='parking' value={parking.address} placeholderClass='placeholderinput' className='input' type='text' placeholder='' />
                     </Container>
                 </View>
                 <View className='inputstyle-view'>

src/pages/house/list/index.jsx

@@ -1,113 +1,128 @@
-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 ContainerLayout from '../../../compents/container/index'
-import radio from '../../../assets/radio.png'
-import request from '@/util/request'
-import RecycleList from '@/compents/RecycleList'
-
+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 ContainerLayout from "../../../compents/container/index";
+import radio from "../../../assets/radio.png";
+import request from "@/util/request";
+import RecycleList from "@/compents/RecycleList";
 
 let house = (props, ref) => {
-
-  const [list, setList] = useState([])
-  const [radioHouse, setRadioHouse] = useState()
-  const [width, setWidth] = useState()
-  const [height, setHeight] = useState()
-  const [queryParams, setQueryParams] = useState({pageNum: 1, pageSize: 10})
-  const [total, setTotal] = useState(0)
+  const [list, setList] = useState([]);
+  const [radioHouse, setRadioHouse] = useState();
+  const [width, setWidth] = useState();
+  const [height, setHeight] = useState();
+  const [queryParams, setQueryParams] = useState({ pageNum: 1, pageSize: 10 });
+  const [total, setTotal] = useState(0);
 
   useImperativeHandle(ref, () => ({
     // changeVal 就是暴露给父组件的方法
     getRefHouseList: () => {
-      getHouseList()
+      getHouseList();
     }
   }));
 
-  const radioHouseState = useMemo(() => props.radioHouseState, [props.radioHouseState])
+  const radioHouseState = useMemo(() => props.radioHouseState, [
+    props.radioHouseState
+  ]);
 
   wx.setNavigationBarTitle({
-    title: '民宿房源管理'
-  })
-
+    title: "民宿房源管理"
+  });
 
   const getHouseList = () => {
     request({
-      url: '/taHouse',
+      url: "/taHouse",
       params: queryParams
-    }).then((res) => {
-      const { records, ...page } = res.data.data
+    }).then(res => {
+      const { records, ...page } = res.data.data;
 
       if (page.current !== 1) {
-        setList(list.concat(records))
+        setList(list.concat(records));
       } else {
-        setList(records)
+        setList(records);
       }
-      setTotal(page.total)
-    })
-  }
+      setTotal(page.total);
+    });
+  };
 
   const handleScrollBottom = e => {
     setQueryParams({
       ...queryParams,
       pageNum: queryParams.pageNum + 1
-    })
-  }
+    });
+  };
 
-  const onShare = (x) => {
-    Taro.navigateTo({ url: `/pages/share/index?houseId=${x.houseId}` })
-  }
+  const onShare = x => {
+    Taro.navigateTo({ url: `/pages/share/index?houseId=${x.houseId}` });
+  };
 
   useEffect(() => {
-
-    getHouseList()
+    
 
     Taro.nextTick(() => {
-
       Taro.createSelectorQuery()
-        .selectAll('.houselist')
+        .selectAll(".houselist")
         .boundingClientRect(res => {
           if (res) {
-            setWidth(res[0].width)
+            setWidth(res[0].width);
             // setHeight(res[0].height)
           }
-        }).exec()
-        
+        })
+        .exec();
+
       Taro.createSelectorQuery()
-        .selectAll('.tab')
+        .selectAll(".tab")
         .boundingClientRect(res => {
-          let found = false
+          let found = false;
           if (res) {
             for (let item of res) {
               if (item.height) {
-                found = true
-                setHeight(Taro.getSystemInfoSync().safeArea.height - item.height - 50)
-                break
+                found = true;
+                setHeight(
+                  Taro.getSystemInfoSync().safeArea.height - item.height - 50
+                );
+                break;
               }
             }
           }
 
           if (!found) {
-            setHeight(500)
+            setHeight(500);
           }
-        }).exec()
-    })
-
-  }, [])
+        })
+        .exec();
+    });
+  }, []);
+
+  useDidShow(() => {
+    if (queryParams.pageNum == 1) {
+      getHouseList();
+    } else {
+      setQueryParams({
+        ...queryParams,
+        pageNum: 1
+      });
+    }
+  });
 
   useEffect(() => {
-    getHouseList()
-  }, [queryParams])
+    getHouseList();
+  }, [queryParams]);
 
   // useDidShow(() => {
   //   setQueryParams({ ...queryParams })
   // })
 
   return (
-    <View className='houselist'>
-       {
-        (!list || !list.length) && < View className='nodata'> 暂无数据</View>
-      }
+    <View className="houselist">
+      {(!list || !list.length) && <View className="nodata"> 暂无数据</View>}
       <RecycleList
         height={height}
         width={width}
@@ -116,26 +131,57 @@ let house = (props, ref) => {
         dataKey="houseId"
         onScrollToLower={handleScrollBottom}
         renderItem={x => (
-          <View className='houselist-view'>
+          <View className="houselist-view">
             {/* <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) }}>
-                {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?houseId=${x.houseId}` }) }}>{x.title}</View>
-              <View className='bottom'>
-                <Text onClick={() => { if (!radioHouseState) Taro.navigateTo({ url: `/pages/house/household/index?houseId=${x.houseId}` }) }}>查看入住人</Text>
-                <Text onClick={()=>onShare(x)}>分享链接</Text>
+            <ContainerLayout className="houselist-view-card">
+              {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?houseId=${x.houseId}`
+                    });
+                }}
+              >
+                {x.title}
+              </View>
+              <View className="bottom">
+                <View
+                  className="bottom-btn"
+                  onClick={() => {
+                    if (!radioHouseState)
+                      Taro.navigateTo({
+                        url: `/pages/house/household/index?houseId=${x.houseId}`
+                      });
+                  }}
+                >
+                  查看入住人
+                </View>
+                <View className="bottom-btn" onClick={() => onShare(x)}>
+                  分享链接
+                </View>
               </View>
             </ContainerLayout>
           </View>        
         )}
       />
-
-     
     </View>
-  )
-  
-}
-house = forwardRef(house)
-export default house
+  );
+};
+house = forwardRef(house);
+export default house;

src/pages/house/list/index.scss

@@ -1,5 +1,4 @@
 .houselist {
-
   &-view {
     // app padding: 41.3px
     width: calc(100vw - 82.6px);
@@ -11,7 +10,6 @@
       font-size: 30px;
       font-weight: 500;
       margin-left: 40px;
-
     }
 
     &-card {
@@ -23,8 +21,8 @@
       position: relative;
 
       &-radio {
-          width: 40px;
-          height: 40px;
+        width: 40px;
+        height: 40px;
         background-color: #274291;
         text-align: center;
         line-height: 40px;
@@ -44,10 +42,12 @@
       .bottom {
         display: flex;
         justify-content: space-around;
-        padding: 20px
+        padding: 20px;
+        &-btn {
+          width: 50%;
+          text-align: center;
+        }
       }
-
-
     }
   }
 }

src/pages/landlord/index.jsx

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

src/pages/map/index.jsx

@@ -19,14 +19,14 @@ const index = (props) => {
     const [pageState, setPageState] = useState('1')
     const [address, setAddress] = useState({})
 
-    // 在onInput详细地址时有bug，不能放在adderss里，所有加了个value
+//     // 在onInput详细地址时有bug，不能放在adderss里，所有加了个value
     const [value,setValue] = useState('')
-    // const [lngLat, setLngLat] = useState('')
-console.log(address,'setAddress')
+//     // const [lngLat, setLngLat] = useState('')
+// console.log(address,'setAddress')
     useDidShow(() => {
 
     })
-
+    // shotAddress,  shotParking
     useEffect(() => {
         
         if (houseId) {
@@ -37,25 +37,30 @@ console.log(address,'setAddress')
     const getDetail = () => {
         request({ url: `/taHouse/${houseId}` }).then((res) => {
             console.log(res.data.data,type, 'getDetail')
+            const [ longitude,latitude] = (res.data.data.lngLat||'').split('____')
             if (type == "address") {
-                const [addressName,addressDetail] = (res.data.data.address||'').split('____')
+                
                 setAddress({
-                    name:addressName,
-                    address:addressDetail,
-                    lngLat:res.data.data.lngLat
+                    // name:addressName,
+                    address:res.data.data.address,
+                    shortAddress:res.data.data.shortAddress,
+                    longitude,
+                    latitude
                 })
 
-                setValue(addressDetail)
+                setValue(res.data.data.address)
                 // setAddress(res.data.data.address)
                 // setLngLat(res.data.data.lngLat)
             }else if (type == 'park'){
-                const [addressName,addressDetail] = (res.data.data.parking||'').split('____')
+                // const [addressName,addressDetail] = (res.data.data.parking||'').split('____')
                 setAddress({
-                    name:addressName,
-                    address:addressDetail,
-                    lngLat:res.data.data.parkLngLat
+                    // name:addressName,
+                    address:res.data.data.parking,
+                    shortAddress:res.data.data.shortParking,
+                    longitude,
+                    latitude
                 })
-                setValue(addressDetail)
+                setValue(res.data.data.parking)
                 // address(res.data.data)
                 // setAddress(res.data.data.parking)
                 // setLngLat(res.data.data.parkLngLat)
@@ -70,12 +75,15 @@ console.log(address,'setAddress')
         let data = {}
         if (type == 'address') {
             data = {
-                address: `${address.name}____${value}`,
+                address: value,
+                shortAddress:address.name,
+       
                 lngLat:`${address.latitude},${address.longitude}`
             }
         } else if (type == 'park') {
             data = {
-                parking: `${address.name}____${value}`,
+                parking: value,
+                shortParking:address.name,
                 parkLngLat:`${address.latitude},${address.longitude}`
             }
         }
@@ -94,7 +102,10 @@ console.log(address,'setAddress')
             success: (res) => {
                 console.log(res)
 
-                setAddress(res)
+                setAddress({
+                    ...res,
+                    shortAddress:res.name
+                })
                 setValue(res.address)
             },
             fail: (err) => {
@@ -115,7 +126,7 @@ console.log(address,'setAddress')
                 <Text className='title'>位置信息</Text>
                 <View style={{ display: 'flex' }}>
                     <Container className='map-view-card' style={{ width: '100%' }}>
-                        {address.address&&<Input value={address.name} disabled placeholderClass='placeholderinput' className='input' type='text' placeholder='' />}
+                    {address.shortAddress&& <Input value={address.shortAddress} disabled placeholderClass='placeholderinput' className='input' type='text' placeholder='' />}
 
                     </Container>
                     <Container className='map-view-icon' onClick={() => onChooseLocation()}>

src/pages/wifi/index.jsx

@@ -88,7 +88,7 @@ const index = (props) => {
             <View className='map-view'>
                 <Text className='title'>WiFi名称</Text>
                 <Container className='map-view-card'>
-                <Input value={wifiName} onInput={(e)=>setWifiName(e.detail.value)}  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>
          
@@ -96,7 +96,7 @@ const index = (props) => {
             <View className='map-view'>
                 <Text className='title'>密码</Text>
                 <Container className='map-view-card'>
-                <Input value={wifiPassword} onInput={(e)=>setWifiPassword(e.detail.value)} 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>