feats

src/compents/Divider/index.jsx

@@ -0,0 +1,13 @@
+import React from 'react'
+import { View } from '@tarojs/components'
+import './index.scss'
+
+export default props => {
+  return (
+    <View className="x-divider" style={props.style}>
+      <View className="x-divider__line">&nbsp;</View>
+      <View className="x-divider__text">{props.children}</View>
+      <View className="x-divider__line">&nbsp;</View>
+    </View>
+  )
+}

src/compents/Divider/index.scss

@@ -0,0 +1,16 @@
+
+.x-divider {
+  display: flex;
+  align-items: center;
+
+  &__line {
+    flex: auto;
+    height: 1px;
+    background-color: #333;
+  }
+
+  &__text {
+    flex: none;
+    margin: 0 0.6em;
+  }
+}

src/pages/addimg/index.jsx

@@ -37,7 +37,6 @@ const addimg = (props) => {
     }
 
     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))
@@ -50,9 +49,7 @@ const addimg = (props) => {
     }
 
     const onAddimg = (e) => {
-        console.log(e, '111')
         if (choiceList.length > 0) {
-
             const data = choiceList.map(x => {
                 return {
                     houseId,
@@ -90,14 +87,25 @@ const addimg = (props) => {
         })
     }
 
+    const handleSelectAll = () => {
+        if (choiceList && choiceList.length) {
+            setChoicelist([])
+        } else {
+            setChoicelist(list.slice())
+        }
+    }
 
     return <View className='addimg'>
-        <View>
-            <button className="weui-btn weui-btn_primary">全选</button>            
+        <View style="margin: 16px 0">
+            <button className="weui-btn weui-btn_primary" onClick={handleSelectAll}>
+            {
+                choiceList && choiceList.length ? '取消全选' : '全选'
+            }
+            </button>
         </View>
 
         <View >
-            <Layout>
+            <Layout type="custom">
             <View className='at-row at-row--wrap'>
                 {list.map((x) => {
                     return <View className='at-col at-col-3 addimg-view-card' key={x.imageId}>

src/pages/customer/index.js

@@ -61,7 +61,7 @@ const index = (props) => {
     if(props.houseId && (!props.orderId || !regUnFinished)){
       request({url: `/taHouse/${props.houseId}`,}).then(res=>{
         const data = res.data.data
-        console.log(data,'data')
+        // console.log(data,'data')
         setHouseInfo(data)
         setPageState('2')
       })
@@ -74,9 +74,6 @@ const index = (props) => {
 
   }, [props.houseId, props.orderId, regUnFinished])
 
-  console.log('---------->', pageState)
-  // console.log('--------------->', houseId, orderId)
-
   return (
     <View className='index' >
 
@@ -91,7 +88,7 @@ const index = (props) => {
     {/* !!houseId&& */}
       {pageState!='1' && (
         <Tab
-        styleType='tab'
+          styleType='tab'
           value={['入住指引','房东推荐']}
           pageState={pageState}
           onClick={[(e) => setPageState('2'),(e) => setPageState('3')]} />

src/pages/guide/index.jsx

@@ -8,6 +8,8 @@ import userRloe from "../../util/userRole";
 import { useSelector } from "react-redux";
 import request, { uploadFiles } from "@/util/request";
 import uploadicon from "../../assets/uploadicon.png";
+// import copy from '../../assets/copy.png'
+
 const guide = props => {
   const user = useSelector(state => state.user);
   // const guide = useSelector(state => state.guide)
@@ -32,6 +34,13 @@ const guide = props => {
     });
   };
 
+  const handleCopy = v => {
+    wx.setClipboardData({
+      data: v,
+      success(res) {}
+    });
+  }
+
   const onToMap = type => {
     if (user.role == userRloe.customer) return;
     switch (type) {
@@ -190,9 +199,10 @@ const guide = props => {
                     <Text>名称：</Text>
                     <Text>{detail.wifiName}</Text>
                   </View>
-                  <View>
+                  <View onClick={() => handleCopy(detail.wifiPassword)}>
                     <Text>密码：</Text>
-                    <Text>{detail.wifiPassword}</Text>
+                    <Text style="display: inline-block; margin-right: 6px">{detail.wifiPassword}</Text>
+                    <mp-icon icon="copy" size={12}></mp-icon>
                   </View>
                 </ContainerLayout>
               </View>

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

@@ -1,3 +1,6 @@
 export default {
     navigationBarTitleText: '查看入住人',
+    usingComponents: {
+      "mp-icon": "weui-miniprogram/icon/icon"
+    }
 }

src/pages/house/household/index.jsx

@@ -8,15 +8,17 @@ import Layout from "../../../layout/index";
 import request from "../../../util/request";
 import groupby from "lodash.groupby";
 import copy from '../../../assets/copy.png'
+
 const house = props => {
   const router = useRouter();
+  const [queryParams, setQueryParams] = useState({})
   const { houseId } = router.params;
 
   const [list, setList] = useState({});
 
   useEffect(() => {
     getList();
-  }, []);
+  }, [queryParams]);
 
   const getList = () => {
     request({
@@ -33,18 +35,46 @@ const house = props => {
     });
   };
 
-  const getDate = value => {
-    const [date, time] = value.split("T");
-    console.log(time, "time");
-    return `${date} ${time.split(":")[0]}:${time.split(":")[1]}`;
-  };
-
   const onCopy = value => {
     wx.setClipboardData({
       data: value,
       success(res) {}
     });
   };
+
+
+  const handleDateChange = (e, item) => {
+    const dt = e.detail.value
+    if (!dt || dt == item.startDate) {
+      return
+    }
+
+    Taro.showModal({
+      title: '修改日期',
+      content: `确认日期修改为: ${dt}`,
+      success: e => {
+        if (e.confirm) {
+          request({
+            url: `/taHouseSetting/${item.settingId}`,
+            method: 'PUT',
+            data: {
+              startDate: dt
+            }
+          }).then(res => {
+            Taro.showToast({
+              title: '修改成功',
+              icon: 'success',
+            })
+
+            // 触发页面刷新
+            setQueryParams({})
+          })
+        }
+      }
+    })
+
+  }
+
   return (
     <View className="household">
       <Layout>
@@ -70,7 +100,23 @@ const house = props => {
                     </View>
                   );
                 })}
-                <View style="margin-top: 1em">{`入住时间：${getDate(list[item][0].createDate)}`}</View>
+                <View style="margin-top: 1em">
+                  <picker
+                    mode="date"
+                    start="2021-03-01"
+                    value={list[item][0].startDate}
+                    onChange={e => handleDateChange(e, list[item][0])}
+                  >
+                    <View>
+                      <Text>
+                      {`入住时间：${list[item][0].startDate}`}
+                      </Text>
+                      <View style="display: inline-block; margin-left: .5em">
+                        <mp-icon icon="pencil" size={16} color="#ffffff"></mp-icon>
+                      </View>
+                    </View>
+                  </picker>
+                </View>
                 {list[item].length == 0 && "暂无入住人信息"}
               </ContainerLayout>
             </View>
@@ -81,19 +127,6 @@ const house = props => {
             暂无入住信息
           </view>
         )}
-
-        {/* {list.map((x, index) => {
-      return <View className='household-view'>
-
-        <Text className='household-view-title'>入住日期：{index + 1}</Text>
-        <ContainerLayout className='household-view-card'>
-         
-         暂无入住人信息    
-        </ContainerLayout>
-
-      </View>
-
-    })} */}
       </Layout>
     </View>
   );

src/pages/recommend/index.jsx

@@ -1,31 +1,25 @@
 import React, { useEffect, useState } from "react";
 import Taro from "@tarojs/taro";
 import { View, Text, Image, Button } from "@tarojs/components";
+import groupby from 'lodash.groupby'
 import ContainerLayout from "../../compents/container/index";
-import more from "../../assets/more.png";
+import Divider from '../../compents/Divider'
 import deleteicon from "../../assets/deleteicon.png";
 import userRloe from "../../util/userRole";
 import "./index.scss";
 import { useSelector } from "react-redux";
-import { AtFab } from "taro-ui";
 import request from "../../util/request";
 
 const ImageCard = props => {
   const { image, onDelete } = props;
   const user = useSelector(state => state.user);
   const [isopen, setIsOpen] = useState(false);
-// boxShadow:'0rpx 12rpx 0rpx 0rpx #8a8b8d'
+
   return (
     <View
       className="recommend-view-card"
       style={{ height: !isopen ? "330rpx" : undefined, overflow: "hidden" ,background:'#fff', boxShadow:'6rpx 12rpx 0rpx #898989' }}
     >
-      {/* <View onClick={() => setIsOpen(!isopen)}  style={{zIndex:99,boxShadow:'6rpx 12rpx 0rpx #898989',position: 'absolute',width:'100%',height:'330rpx',borderRadius: '30rpx',opacity:0}}>
-
-      </View>
-      <View onClick={() => setIsOpen(!isopen)}  style={{zIndex:-9, boxShadow:'0rpx 12rpx 0rpx -4rpx #898989',position: 'absolute',bottom:'0',width:'670rpx',background:'#fff', height:'100%',borderRadius: '30rpx',opacity:0}}>
-
-      </View> */}
       <Image
         className="recommend-view-img"
         mode="widthFix"
@@ -46,11 +40,6 @@ const ImageCard = props => {
       )}
     </View>
   );
-  //   : (
-  //     <View>
-  //       <Image className="recommend-view-img" mode="widthFix" src={image} onClick={() => setIsOpen(!isopen)}></Image>
-  //     </View>
-  //   );
 };
 
 const recommend = props => {
@@ -59,24 +48,15 @@ const recommend = props => {
   const { value, houseId, ...prop } = props;
 
   // const [state, setState] = useState(1)
-  const [list, setList] = useState([]);
+  const [list, setList] = useState({});
   const [id, setId] = useState();
 
-  // let list = props.dataSource || []
-
   useEffect(() => {
-    setList(props.dataSource || []);
+    const lst = groupby(props.dataSource || [], 'groupName')
+    // setList(props.dataSource || []);
+    setList(lst)
   }, [props.dataSource]);
 
-  // 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.surroundId);
@@ -103,8 +83,10 @@ const recommend = props => {
     }
   };
 
+  const listGroupKeys = Object.keys(list) || []
+
   return (
-    <View className="recommend">
+    <View className="recommend page">
       {user.role == userRloe.landlord && (
         <Button
           onClick={() =>
@@ -114,34 +96,35 @@ const recommend = props => {
           添加图片
         </Button>
       )}
-      {true &&
-        list.map(x => {
-          return (
-            <View className="recommend-view">
-              <ContainerLayout className="recommend-view-layout">
-                <ImageCard image={x.image} onDelete={() => onClick(x)} />
-                {/* {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} mode='widthFix' style={{ width: '40rpx' }} onClick={() => onClick(x)}></Image>
-                            }
-
-                        </View> :
-                            <View  >
-                                <Image className='recommend-view-img' mode='widthFix' src={x.image}></Image>
-
-                            </View>
-                        } */}
-              </ContainerLayout>
-            </View>
-          );
-        })}
 
-      {list.length == 0 && <View className="nodata"> 暂无数据</View>}
+      { 
+        listGroupKeys.length == 0 ?
+          (<View className="nodata"> 暂无数据</View>) :
+          listGroupKeys.map(k => {
+            const lst = list[k] || []
+
+            return (
+              <View className="page__hd">
+                <View className="page__title" style="font-size: 1.6em">
+                  <Divider>{lst[0].groupName}</Divider>
+                </View>
+                <View className="page__bd">
+                {
+                  lst.map(x => {
+                    return (
+                      <View className="recommend-view">
+                        <ContainerLayout className="recommend-view-layout">
+                          <ImageCard image={x.image} onDelete={() => onClick(x)} />
+                        </ContainerLayout>
+                      </View>
+                    );
+                  })
+                }
+                </View>
+              </View>
+            )
+          })          
+      }
     </View>
   );
 };