feats

src/pages/WoDe/YeZhuBaoXiu/index.config.js

@@ -0,0 +1,3 @@
+export default {
+  navigationBarTitleText: '业主报修'
+}

src/pages/WoDe/YeZhuBaoXiu/index.jsx

@@ -0,0 +1,46 @@
+import React, { useState } from 'react'
+import ScrollPageRefresh from '@/components/ScrollPageRefresh'
+import WuYeBaoXiuItem from '@/components/WuYeBaoXiuItem'
+import { useModel } from '@/store'
+import Page from '@/layouts'
+import '@/assets/css/reset.less'
+import '@/assets/css/iconfont.less'
+import './index.less'
+
+export default function WoDeGongDan () {
+
+  const { user } = useModel('user')
+  const [PageList, setPageList] = useState([])
+  const [IsEmpty, setIsEmpty] = useState(false)
+
+  const Refresh = (e) => { // 下拉刷新
+    if (e.length > 0) {
+      setIsEmpty(false)
+      setPageList(e)
+    } else {
+      setIsEmpty(true)
+    }
+  }
+
+  const Push = (e) => { // 上拉加载
+    setPageList(PageList.concat(e))
+  }
+
+  return (
+    <Page>
+      <view className='WoDeGongDan'>
+        <ScrollPageRefresh IsEmpty={IsEmpty} ApiName={`getGongDanList`} ListName={`pagelist`} RequestUrlData={{ orgId: user.orgId }} RequestParams={{ type: 2 }} Refresh={Refresh} Push={Push}>
+          <view className='Content Activity'>
+            {
+              PageList.map((item, index) => (
+                <view className='ListItem' key={`ActivityItem-${index}`}>
+                  <WuYeBaoXiuItem Data={item}></WuYeBaoXiuItem>
+                </view>
+              ))
+            }
+          </view>
+        </ScrollPageRefresh>
+      </view>
+    </Page>
+  )
+}

src/pages/WoDe/YeZhuBaoXiu/index.less

@@ -0,0 +1,22 @@
+.WoDeGongDan {
+  width: 100%;
+  height: 100%;
+  position: relative;
+  background: #f8f8f8;
+  overflow: hidden;
+
+  .Content {
+    padding: 0 30px;
+    position: relative;
+    overflow: hidden;
+
+    >.ListItem {
+      position: relative;
+      overflow: hidden;
+      margin-bottom: 30px;
+      &:first-child {
+        margin-top: 30px;
+      }
+    }
+  }
+}

src/pages/WoDe/index.jsx

@@ -1,29 +1,44 @@
-import React, { useState, useEffect } from 'react'
+import React, { useState, useEffect, useMemo } from 'react'
 import NavHeader from '@/components/NavHeader/index'
 import Taro from '@tarojs/taro'
+import { Block } from '@tarojs/components'
 import request, { apis } from '@/utils/request'
 import { useModel } from '@/store'
 import Page from '@/layouts'
+import { PERSON_TYPE } from '@/utils/constants'
 import '@/assets/css/reset.less'
 import '@/assets/css/iconfont.less'
 import './index.less'
 
-export default function WoDe () {
-
-  const { user, setUser } = useModel('user')
-  const [UserTab] = useState([
+// 二维数组用于页面美化加分隔栏
+// personTypes 用于指定人员身份
+const menuGroup = [
+  [
     { icon: 'iconrenzheng1', name: '业主认证', id: 1, router: '/pages/WoDe/WoDeRenZheng/index' },
     { icon: 'iconjifenguize', name: '积分明细', id: 2, router: '/pages/FuLi/JiFenMingXi/index' },
     { icon: 'iconjiaofei', name: '物业缴费', id: 3, router: '/pages/WoDe/WoDeJiaoFei/index' },
-    { icon: 'iconfuwu1', name: '物业报修', id: 4, router: '/pages/WoDe/WoDeGongDan/index' }
-  ])
-  const [MoreUserTab] = useState([
+    { icon: 'iconfuwu1', name: '物业报修', id: 4, router: '/pages/WoDe/WoDeGongDan/index' },
+    // { icon: 'iconfuwu1', name: '业主工单', id: 4, router: '/pages/WoDe/WoDeGongDan/index', personTypes: [PERSON_TYPE.LIFE_CONSULTANT] },
+    { icon: 'iconfuwu1', name: '业主报修', id: 4, router: '/pages/WoDe/WoDeGongDan/index' },
+  ],
+  [
     { icon: 'iconerweima', name: '推荐二维码', id: 5, router: '/pages/WoDe/TuiJianErWeiMa/index' },
     // { icon: 'iconfenxiang', name: '推荐分享', id: 6, router: '/pages/WoDe/TuiJianFenXiang/index' },
     { icon: 'iconhuodong', name: '参与活动', id: 7, router: '/pages/WoDe/WoDeHuoDong/index' }
-  ])
+  ]
+]
+
+export default function WoDe () {
+
+  const { user, setUser } = useModel('user')
   const [DataLock, setDataLock] = useState(false)
 
+  const menuList = useMemo(() => {
+    return menuGroup.map(menus => menus.filter(menu => {
+      return (!menu.personTypes || !menu.personTypes.length || menu.personTypes.indexOf(user.personType) > -1)
+    })).filter(menus => menus && menus.length)
+  }, [user.personType])
+
   useEffect(() => {
     if (user !== null) {
       request({ ...apis.getUserInfo }).then((res) => {
@@ -74,27 +89,26 @@ export default function WoDe () {
           {/* 用户选项 */}
           <view className='UserTab'>
             {
-              UserTab.map((item, index) => (
-                <view key={`UserTab-${index}`} className='flex-h' onClick={() => { Taro.navigateTo({ url: item.router }) }}>
-                  <text className={`iconfont ${item.icon}`}></text>
-                  <view className='flex-h flex-item'>
-                    <text className='flex-item'>{item.name}</text>
-                    <text className='iconfont iconjiantouright'></text>
-                  </view>
-                </view>
-              ))
-            }
-            <view className='Line'></view>
-            {
-              MoreUserTab.map((item, index) => (
-                <view key={`UserTab-${index}`} className='flex-h' onClick={() => { Taro.navigateTo({ url: item.router }) }}>
-                  <text className={`iconfont ${item.icon}`}></text>
-                  <view className='flex-h flex-item'>
-                    <text className='flex-item'>{item.name}</text>
-                    <text className='iconfont iconjiantouright'></text>
-                  </view>
-                </view>
-              ))
+              menuList.map((menus, inx) => {
+                return (
+                  <Block key={inx}>
+                    {
+                      inx > 0 && <view className='Line'></view>
+                    }
+                    {
+                      menus.map((item, index) => (
+                        <view key={`UserTab-${index}`} className='flex-h' onClick={() => { Taro.navigateTo({ url: item.router }) }}>
+                          <text className={`iconfont ${item.icon}`}></text>
+                          <view className='flex-h flex-item'>
+                            <text className='flex-item'>{item.name}</text>
+                            <text className='iconfont iconjiantouright'></text>
+                          </view>
+                        </view>
+                      ))
+                    }
+                  </Block>
+                )
+              })
             }
           </view>
 

src/utils/constants.js

@@ -0,0 +1,6 @@
+
+export const PERSON_TYPE = {
+  LIFE_CONSULTANT: 'life-consultant', // 生活管家
+  PROP: 'prop', // 物业相关
+  WORKER: 'worker', // 维修工
+}