feats

config/dev.js

     NODE_ENV: '"development"'
   },
   defineConstants: {
-    HOST: '"https://a.t.njyunzhi.com"'
+    // HOST: '"https://a.t.njyunzhi.com"'
+    HOST: '"http://127.0.0.1:6060"'
   },
   mini: {
     debugReact: true

src/components/WuYeBaoXiu/index.jsx

   const [BannerList, setBannerList] = useState([])
   const [IsEmpty, setIsEmpty] = useState(false)
 
-  useEffect(() => {
+  Taro.useDidShow(() => {
     GetBanner()
-  }, [])
+  })
 
   const GetBanner = (done = () => { }) => { // 获取轮播图
     request({ ...apis.getBanner, params: { showPosition: `property`, showType: 'banner', pageSize: 1 } }).then((res) => {

src/components/WuYeFuWu/components/IconBlock.jsx

+import React, { useEffect, useState } from 'react'
+import './style.less'
+
+export default props => {
+  const handleClick = e => {
+    if (props.onClick) {
+      props.onClick(e)
+    }
+  }
+
+  return (
+    <view className="fw-icon-block" onClick={handleClick} style={props.style || {}}>
+      <view>
+        <view className="fw-icon-block-icon">
+          <image mode="" src={props.icon} />
+        </view>
+        <view className="fw-icon-block-title">{props.title}</view>
+      </view>
+    </view>
+  )
+}

src/components/WuYeFuWu/components/style.less

+
+.fw-icon-block {
+  // 26vw 是保证每行排三个
+  width: 26vw;
+  height: 26vw;
+  background-color: #fff;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  overflow: hidden;
+
+  &-icon {
+    width: 64rpx;
+    height: 64rpx;
+    margin: 0 auto;
+
+    image {
+      width: 100%;
+      height: 100%;
+    }
+  }
+
+  &-title {
+    margin-top: 20rpx;
+    color: #333;
+    font-size: 30rpx;
+    text-align: center;
+  }
+}

src/components/WuYeFuWu/index.jsx

 import nav2detail from '@/utils/nav2detail'
 import '@/assets/css/reset.less'
 import '@/assets/css/iconfont.less'
+import IconBlock from './components/IconBlock'
 import './index.less'
 
 export default function WuYeFuWu () {
 
   const { user } = useModel('user')
+  const [newsTypeId, setNewsTypeId] = useState()
   const [PageList, setPageList] = useState([])
   const [BannerList, setBannerList] = useState([])
+  const [typeList, setTypeList] = useState([])
   const [IsEmpty, setIsEmpty] = useState(false)
 
   useEffect(() => {
     GetBanner()
+
+    request({...apis.getTpNewsList, params: {pageSize: 999}}).then(res => setTypeList(res || []))
   }, [])
 
   const GetBanner = (done = () => { }) => { // 获取轮播图
           }
         </view>
 
+        <view style={{display: 'flex', justifyContent: 'space-between'}}>
+          <IconBlock title="办事指南" />
+          <IconBlock title="政策法规" />
+        </view>
+
         {/* 物业办事指南 */}
-        <view className='BanShiZhiNan'>
+        {/* <view className='BanShiZhiNan'>
           <text>物业办事指南</text>
           <view className='flex-h'>
             <view className='Line'><view></view></view>
               <text>3、业主卡、住户卡办理</text>
             </view>
           </view>
-        </view>
+        </view> */}
       </view>
     )
   }
             </view>
 
             {/* 物业办事指南 */}
-            <view className='BanShiZhiNan'>
+            {/* <view className='BanShiZhiNan'>
               <text>物业办事指南</text>
               <view className='flex-h'>
                 <view className='Line'><view></view></view>
                   <text>3、业主卡、住户卡办理</text>
                 </view>
               </view>
+            </view> */}
+            
+            <view className="fw-icon-row">
+              {
+                typeList.map((it, ix) => (
+                  <IconBlock
+                    key={it.newsTypeId}
+                    title={it.newsTypeName}
+                    icon={it.newsTypeImg}
+                    style={ix > 2 ? {marginTop: '20rpx'} : {}}
+                    onClick={() => setNewsTypeId(it.newsTypeId)}
+                  />
+                ))
+              }
             </view>
           </view>
         }

src/components/WuYeFuWu/index.less

   height: 100%;
   position: relative;
   overflow: hidden;
+  background-color: #f2f2f2;
+
+  .fw-icon-row {
+    display: flex;
+    justify-content: space-around;
+    flex-wrap: wrap;
+    margin-top: 45rpx;
+  }
 
   .BigImg {
     width: 100%;

src/pages.js

       event: 'detail',
       eventType: 'property',
     }
-  }
+  },
+  {
+    name: '物业-生活管家',
+    page: 'pages/WuYe/ShengHuoGuanJia/index',
+    auth: ['avatar', 'phone', 'yezhu'],
+    track: {
+      event: 'detail',
+      eventType: 'property',
+    }
+  },
 ]
 
 const Activity = [

src/pages/FuLi/ShangPinFilter/index.jsx

-import React, { useState, useEffect } from 'react'
+import React, { useState, useEffect, useCallback } from 'react'
 import Taro from '@tarojs/taro'
 import { Input } from '@tarojs/components'
 import PrizeListItem from '@/components/PrizeListItem/index'
 import '@/assets/css/iconfont.less'
 import './index.less'
 
+const debounce = (fn, delay) => {
+  let t
+
+  return (...args) => {
+    clearTimeout(t)
+
+    t = setTimeout(() => {
+      fn(...args)
+    }, delay)
+  }
+}
+
 export default function ShangPinFilter () {
 
   const { user } = useModel('user')
     setPageList(PageList.concat(e))
   }
 
-  const KeyChange = (e) => {
-    setKey(e.detail.value)
-  }
+  const KeyChange = useCallback(
+    debounce(e => {
+      setKey(e.detail.value)
+    }, 500), [])
 
   const SearchConfirm = () => {
     setSearchKey(Key)
   }
 
+  useEffect(() => {
+    setSearchKey(Key)
+  }, [Key])
+
   return (
     <Page>
       <view className='ShangPinFilter flex-v'>
           </view>
         </view>
         <view className='flex-item'>
-          <ScrollPageRefresh SearchKey={SearchKey} RequestParams={{key: SearchKey}} ApiName={`getGoodsList`} Refresh={Refresh} Push={Push}>
+          <ScrollPageRefresh SearchKey={SearchKey} RequestParams={{goodsName: SearchKey}} ApiName={`getGoodsList`} Refresh={Refresh} Push={Push}>
             <view className='PirzeList'>
               {
                 PageList.map((item, index) => (

src/pages/FuLi/ShangPinXiangQing/index.jsx

       <view className='ShangPinXiangQing'>
         <view className='Info'>
           <view className='Img'>
-            <image mode='aspectFill' src={GoodsDetail === null ? null : GoodsDetail.imgUrl} className='centerLabel'></image>
+            <image mode='aspectFit' src={GoodsDetail === null ? null : GoodsDetail.imgUrl}></image>
           </view>
           <view className='Title'>
             <text>{GoodsDetail === null ? '' : GoodsDetail.goodsName}</text>
             <view className='Line'></view>
             <text>产品详情</text>
           </view>
-          <image mode='widthFix' src={GoodsDetail === null ? null : GoodsDetail.detailImgUrl} style={{ width: `100%` }}></image>
+          <image mode='aspectFit' src={GoodsDetail === null ? null : GoodsDetail.detailImgUrl} style={{ width: `100%` }}></image>
           <view className='BottomBtn'>
             <text className='active' onClick={() => { Taro.navigateTo({ url: `/pages/FuLi/ShangPinDuiHuan/index?id=${CurrnetId}` }) }}>立即兑换</text>
           </view>

src/pages/FuLi/ShangPinXiangQing/index.less

 .ShangPinXiangQing {
-  width: 100%;
+  width: calc(100% -32rpx);
   min-height: 100%;
   position: relative;
   overflow: hidden;
   background: #f8f8f8;
+  padding: 0 16rpx;
 
   >.Info {
     position: relative;
 
     >.Img {
       width: 100%;
-      padding-bottom: 50%;
-      background: #ccc;
-      position: relative;
-      overflow: hidden;
+      // padding-bottom: 50%;
+      // background: #ccc;
+      // position: relative;
+      // overflow: hidden;
 
       >image {
         width: 100%;
-        height: 100%;
       }
     }
 

src/pages/WuYe/BaoXiuQuYu/index.jsx

-import React, { useState } from 'react'
+import React, { useState, useEffect } from 'react'
 import Taro from '@tarojs/taro'
 import Page from '@/layouts'
+import request, { apis } from '@/utils/request'
 import '@/assets/css/reset.less'
 import '@/assets/css/iconfont.less'
 import './index.less'
 
 export default function WuYeBaoXiuQuYu () {
+  const [TypeList, setTypeList] = useState([])
 
-  const [TypeList] = useState([
-    { icon: 'icongonggongquyu', name: '公共区域问题', desc: '如绿植被破坏、楼道灯不亮等问题', id: 1 },
-    { icon: 'iconfangwuzhiliang', name: '房屋质量问题', desc: '如家中墙体开裂、墙皮脱落等问题', id: 2 },
-    { icon: 'iconhuneisheshi', name: '户内设施问题', desc: '如通浴室下水道、保洁等可能需要收费的项目', id: 3 }
-  ])
+  const handleClick = item => {
+    Taro.redirectTo({ url: `/pages/WuYe/TianJiaBaoXiu/index?type=${item.typeId}` })
+  }
+  
+  useEffect(() => {
+    request({...apis.getRepairTypeList, params: {pageSize: 999}}).then(res => {
+      setTypeList(res.records)
+    })
+  }, [])
 
   return (
     <Page>
         {
           TypeList.map((item, index) => (
             <view key={`WuYeBaoXiuQuYu-${index}`}>
-              <view onClick={() => { Taro.redirectTo({ url: `/pages/WuYe/TianJiaBaoXiu/index?type=${item.id}` }) }}>
+              <view onClick={() => handleClick(item)}>
                 <view>
-                  <text className={`iconfont ${item.icon}`}></text>
-                  <text>{item.name}</text>
+                  {
+                    item.icon && <image mode="aspectFit" src={item.icon} style={{width: '32rpx', height: '32rpx', verticalAlign: 'middle', marginRight: '16rpx'}} />
+                  }
+                  <text>{item.typeName}</text>
                 </view>
                 <text>{item.desc}</text>
               </view>

src/pages/WuYe/BaoXiuQuYu/index.less

           font-weight: bold;
           line-height: 60px;
 
-          &:first-child {
-            font-weight: normal;
-            font-size: 40px;
-            color: #F35844;
-            margin-right: 20px;
-          }
+          // &:first-child {
+          //   font-weight: normal;
+          //   font-size: 40px;
+          //   color: #F35844;
+          //   margin-right: 20px;
+          // }
         }
       }
 

src/pages/WuYe/ShengHuoGuanJia/components/Btn.jsx

+import React, { useEffect, useState } from 'react'
+import './style.less'
+
+export default props => {
+  // const [] = useState()
+
+
+  // useEffect(() => {
+
+  // }, [])
+
+
+  return (
+    <view className="gj-btn" onClick={props.onClick}>
+      {props.children}
+    </view>
+  )
+}

src/pages/WuYe/ShengHuoGuanJia/components/Card.jsx

+import React, { useEffect, useState } from 'react'
+import LR from './LR'
+import Btn from './Btn'
+import './style.less'
+
+export default props => {
+
+  const handleClick = () => {
+    if (props.onClick) {
+      props.onClick(props.dataSource)
+    }
+  }
+
+  const handleAction = () => {
+    if (props.onAction) {
+      props.onAction(props.dataSource)
+    }
+  }
+
+  const data = props.dataSource || {}
+
+  return (
+    <view className="gj-card">
+      <view className="gj-card-body" onClick={handleClick}>
+        <view className="gj-card-body-media">
+          <image mode="" src={data.photo} />
+        </view>
+        <view className="gj-card-content">
+          <LR title="管家姓名">{data.userName || ''}</LR>
+          <LR title="联系方式">{data.phone || ''}</LR>
+          <LR title="管家说明">{data.description || ''}</LR>
+          <LR title="综合评价"></LR>
+        </view>
+      </view>
+      <view className="gj-card-footer">
+        <view>
+          {`工号: ${data.jobNumber || ''}`}
+        </view>
+        <view className="gj-card-footer-action" style={{textAlign: 'right'}}>
+          <Btn onClick={handleAction}>评星</Btn>
+        </view>
+      </view>
+    </view>
+  )
+}

src/pages/WuYe/ShengHuoGuanJia/components/LR.jsx

+import React, { useEffect, useState } from 'react'
+import './style.less'
+
+export default props => {
+  // const [] = useState()
+
+
+  // useEffect(() => {
+
+  // }, [])
+
+
+  return (
+    <view className="gj-lr">
+      <view className="gj-lr-left">{`${props.title}: `}</view>
+      <view className="gj-lr-right">{props.children}</view>
+    </view>
+  )
+}

src/pages/WuYe/ShengHuoGuanJia/components/style.less

+
+.gj-card {
+  font-size: 28rpx;
+  padding: 0 30rpx;
+  background: #FFFFFF;
+  border-radius: 12rpx;
+
+  &-body {
+    padding-top: 30rpx;
+    display: flex;
+
+    &-media {
+      width: 210rpx;
+      height: 294rpx;
+      flex: none;
+      margin-right: 30rpx;
+
+      image {
+        width: 100%;
+        height: 100%;
+      }
+    }
+
+    &-content {
+      flex: auto;
+    }
+  }
+
+  &-footer {
+    padding-left: 30rpx;
+    line-height: 90rpx;
+    display: flex;
+    align-items: center;
+
+    view {
+      flex: auto;
+    }
+
+    &-action {
+      width: 150rpx;
+      flex: none;
+    }
+
+  }
+
+  & + .gj-card {
+    margin-top: 30rpx;
+  }
+}
+
+.gj-lr {
+  display: flex;
+  color: #333;
+  font-size: 28rpx;
+  line-height: 60rpx;
+
+  &-left {
+    width: 120rpx;
+    flex: none;
+  }
+
+  &-right {
+    flex: auto;
+  }
+}
+
+.gj-btn {
+  display: inline-block;
+  padding: 0 30rpx;
+  min-width: 65rpx;
+  color: #F35844;
+  font-size: 30rpx;
+  line-height: 60rpx;
+  text-align: center;
+  border: 1px solid #F35844;
+  border-radius: 30px;
+}

src/pages/WuYe/ShengHuoGuanJia/index.config.js

+export default {
+  navigationBarTitleText: '生活管家',
+  // enablePullDownRefresh: true
+}

src/pages/WuYe/ShengHuoGuanJia/index.jsx

+import React, { useEffect, useState } from 'react'
+import Taro from '@tarojs/taro'
+import Page from '@/layouts/index'
+import Card from './components/Card'
+import { useModel } from '@/store'
+import request, { apis } from '@/utils/request'
+import './index.less'
+
+export default props => {
+  // const [loading, setLoading] = useState(false)
+  const [listData, setListData] = useState([])
+  const [queryParams, setQueryParams] = useState({pageNum:1, pageSize: 10})
+  const { user } = useModel('user')
+
+  // 要获取新数据
+  // 只需要更新 queryParams 即可
+  Taro.usePullDownRefresh(() => {
+    setQueryParams({
+      ...queryParams,
+      pageNum: 1,
+      pageSize: 10
+    })
+  })
+
+  useEffect(() => {
+    if (user && user.personId && !listData.length) {
+      request({...apis.getShengHuoGuanJiaList, params: queryParams}).then(res => {
+        const { records } = res
+        setListData(records || [])
+      })
+    }
+  }, [user, queryParams])
+
+  return (
+    <Page>
+      <view className="shgj">
+      {
+        listData.map(item => <Card key={item.userId} dataSource={item} />)
+      }
+      </view>
+    </Page>
+  )
+}

src/pages/WuYe/ShengHuoGuanJia/index.less

+.shgj {
+  width: calc(100vw - 60rpx);
+  height: calc(100vh - 60rpx);
+  background-color: #f2f2f2;
+  padding: 30rpx;
+}

src/pages/WuYe/TianJiaBaoXiu/index.jsx

-import React, { useState } from 'react'
+import React, { useState, useEffect } from 'react'
 import Taro, { Current } from '@tarojs/taro'
 import { Input, Textarea } from '@tarojs/components'
 import request, { apis } from '@/utils/request'
 import Page from '@/layouts'
+import { useModel } from '@/store'
 import '@/assets/css/reset.less'
 import '@/assets/css/iconfont.less'
 import './index.less'
   const [Title, setTitle] = useState('')
   const [Desc, setDesc] = useState('')
   const [DataLock, setDataLock] = useState(false)
-  const [CurrnetBaoXiuType] = useState(Current.router.params.type)
   const [PhotoUrl, setPhotoUrl] = useState(null)
+  const [repairType, setRepairType] = useState()
+
+  const rpType = Current.router.params.type
 
   const TitleChange = (e) => {
     setTitle(e.detail.value)
       Taro.showToast({ title: `报修标题不能为空`, icon: 'none' })
       return false
     }
-    if (Desc === '') {
-      Taro.showToast({ title: `报修描述不能为空`, icon: 'none' })
-      return false
-    }
+    // if (Desc === '') {
+    //   Taro.showToast({ title: `报修描述不能为空`, icon: 'none' })
+    //   return false
+    // }
     return true
   }
 
         ticketTitle: Title,
         ticketContent: Desc,
         type: 2,
-        repairType: [CurrnetBaoXiuType] - 0,
+        repairType: repairType.typeId,
         imageUrl: PhotoUrl
       }
     }).then((res) => {
     setPhotoUrl(null)
   }
 
+  useEffect(() => {
+    if (rpType) {
+      request({...apis.getRepairTypeDetail, args: {id: rpType}}).then(res => {
+        setRepairType(res)
+      })
+    }
+  }, [rpType])
+
   return (
     <Page>
       <view className='WuYeTianJiaBaoXiu'>
         <view className='Form'>
           {/* <Input placeholder='简述你的想法' onInput={TitleChange} value={Title}></Input> */}
-          <Textarea placeholder='描述问题详情，以便我们更好的相处' onInput={DescChange} value={Desc}></Textarea>
+          <Textarea placeholder='描述问题详情，以便我们更好的相处' onInput={TitleChange} value={Title}></Textarea>
           <view className='LabelList'>
-            <text>问题</text>
-            <text>问题</text>
-            <text>问题</text>
-            <text>问题</text>
-            <text>问题</text>
-            <text>问题</text>
+            {
+              (repairType || {tags: ''}).tags.split(',').map(tag => <text key={tag} onClick={() => setTitle(tag)}>{tag}</text>)
+            }
           </view>
         </view>
         <view className='Photo'>

src/pages/WuYe/XiuGaiBaoXiu/index.jsx

   const [DetailInfo, setDetailInfo] = useState(null)
   const [CurrnetId] = useState(Current.router.params.id)
   const [PhotoUrl, setPhotoUrl] = useState(null)
+  const [repairType, setRepairType] = useState()
 
   useEffect(() => {
     Init()
     })
   }
 
+  const handleTitleChange = ticketTitle => {
+    setDetailInfo({ ...DetailInfo, ticketTitle })
+  }
+
   const TitleChange = (e) => {
-    setDetailInfo({ ...DetailInfo, ticketTitle: e.detail.value })
+    handleTitleChange(e.detail.value)
   }
 
   const DescChange = (e) => {
       Taro.showToast({ title: `报修标题不能为空`, icon: 'none' })
       return false
     }
-    if (DetailInfo.ticketContent === '') {
-      Taro.showToast({ title: `报修描述不能为空`, icon: 'none' })
-      return false
-    }
+    // if (DetailInfo.ticketContent === '') {
+    //   Taro.showToast({ title: `报修描述不能为空`, icon: 'none' })
+    //   return false
+    // }
     return true
   }
 
     setPhotoUrl(null)
   }
 
+  useEffect(() => {
+    if (DetailInfo && DetailInfo.repairType) {
+      request({...apis.getRepairTypeDetail, args: {id: DetailInfo.repairType}}).then(res => setRepairType(res))
+    }
+  }, [DetailInfo])
+
   return (
     <Page>
       <view className='WuYeXiuGaiBaoXiu'>
         <view className='Form'>
-          <Input placeholder='简述你的想法' onInput={TitleChange} value={DetailInfo === null ? null : DetailInfo.ticketTitle}></Input>
-          <Textarea placeholder='描述问题详情，以便我们更好的相处' onInput={DescChange} value={DetailInfo === null ? null : DetailInfo.ticketContent}></Textarea>
+          {/* <Input placeholder='简述你的想法' onInput={TitleChange} value={DetailInfo === null ? null : DetailInfo.ticketTitle}></Input> */}
+          <Textarea placeholder='描述问题详情，以便我们更好的相处' onInput={TitleChange} value={DetailInfo === null ? null : DetailInfo.ticketTitle}></Textarea>
+          <view className='LabelList'>
+            {
+              (repairType || {tags: ''}).tags.split(',').map(tag => <text key={tag} onClick={() => handleTitleChange(tag)}>{tag}</text>)
+            }
+          </view>
         </view>
         <view className='Photo'>
           <view className='Add' onClick={AddImg}>

src/pages/WuYe/XiuGaiBaoXiu/index.less

       margin-top: 20px;
       width: 100%;
     }
+    
+    >.LabelList {
+      width: 100%;
+      position: relative;
+      overflow: hidden;
+      font-size: 0;
+      border-top: 2px solid rgba(0, 0, 0, 0.08);
+      padding-top: 10px;
+
+      >text {
+        font-size: 24px;
+        color: #666;
+        line-height: 48px;
+        border: 2px solid rgba(0, 0, 0, 0.08);
+        padding: 0 20px;
+        border-radius: 6px;
+        margin-right: 10px;
+        margin-top: 10px;
+        display: inline-block;
+        vertical-align: middle;
+      }
+    }
   }
 
   >.Photo {

src/store/models/index.js

   'appParams': useAppParams,
   'sys': useSystem,
   'user': useUser,
-  'screen': useScreen
+  'screen': useScreen,
 }
 
 export default models

src/utils/api.js

     method: 'get',
     url: `${prefix}/user/info`
   },
+
+  getTpNewsList: {
+    method: 'get',
+    url: `${prefix}/tpNewsType/list`
+  },
+
   getWuYeFuWuDetail: { // 获取物业服务详情
     method: 'get',
     url: `${prefix}/property-news/:id`
     url: `${prefix}/wxUnifiedOrder/:outTradeNo`
   },
 
+  getRepairTypeList: {
+    method: 'get',
+    url: `${prefix}/tpRepairType`
+  },
+  
+  getRepairTypeDetail: {
+    method: 'get',
+    url: `${prefix}/tpRepairType/:id`
+  },
+
+  getShengHuoGuanJiaList: {
+    method: 'get',
+    url: `${prefix}/life-consultant/list`
+  },
+
   getGongDanList: { // 获取小区工单列表
     method: 'get',
     url: `${prefix}/tickets/list/:orgId`