feats

src/app.config.js

@@ -8,6 +8,7 @@ export default defineAppConfig({
     'pages/issue/edit/index',
     'pages/org/issue/list/index',
     'pages/org/issue/detail/index',
+    'pages/apply/list/index',
     'pages/apply/apply/index',
     'pages/apply/verify/index',
     'pages/index3/index',

src/components/Icon.jsx

@@ -0,0 +1,36 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { Image } from '@tarojs/components';
+import icon1 from '@/assets/icons/icon1.png';
+import icon2 from '@/assets/icons/icon2.png';
+import icon3 from '@/assets/icons/icon3.png';
+import icon4 from '@/assets/icons/icon4.png';
+import icon5 from '@/assets/icons/icon5.png';
+import icon6 from '@/assets/icons/icon6.png';
+import icon7 from '@/assets/icons/icon7.png';
+import icon8 from '@/assets/icons/icon8.png';
+import icon9 from '@/assets/icons/icon9.png';
+import icon10 from '@/assets/icons/icon10.png';
+import icon11 from '@/assets/icons/icon11.png';
+
+const icons = {
+  icon1,
+  icon2,
+  icon3,
+  icon4,
+  icon5,
+  icon6,
+  icon7,
+  icon8,
+  icon9,
+  icon10,
+  icon11,
+}
+
+export default (props) => {
+  const { className, style, name } = props;
+  
+  return (
+    <Image src={icons[name]} className={className} style={style} />
+  )
+}

src/components/MenuIcon.jsx

@@ -0,0 +1,48 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View } from '@tarojs/components';
+import RatioView from './RatioView';
+import Icon from './Icon';
+
+const wrapperStyle = {
+  display: 'grid',
+  placeItems: 'center',
+  width: '100%',
+  height: '100%',
+}
+
+const iconStyle = {
+  width: '100rpx',
+  height: '100rpx',
+  margin: 'auto',
+  display: 'block',
+}
+
+const txtStyle = {
+  marginTop: '20rpx',
+  textAlign: 'center',
+  fontSize: '30rpx',
+  color: '#202020',
+}
+
+export default (props) => {
+  
+  const { icon, text, link } = props;
+
+  const onClick = () => {
+    Taro.navigateTo({
+      url: link
+    })
+  }
+
+  return (
+    <RatioView>
+      <View style={wrapperStyle} onClick={onClick}>
+        <View>
+          <Icon name={icon} style={iconStyle} />
+          <View style={txtStyle}>{text}</View>
+        </View>
+      </View>
+    </RatioView>
+  )
+}

src/components/RatioView.jsx

@@ -0,0 +1,17 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View } from '@tarojs/components';
+
+export default (props) => {
+  const { className, style, ratio = 100 } = props;
+  
+  return (
+    <View className={className} style={style}>
+      <View style={{ paddingBottom: `${ratio}%`, position: 'relative', overflow: 'hidden' }}>
+        <View style={{ width: '100%', height: '100%', position: 'absolute', left: 0, top: 0 }}>
+          {props.children}
+        </View>
+      </View>
+    </View>
+  )
+}

src/layouts/layout.module.less

@@ -11,7 +11,9 @@
     height: 100%;
 
     &.with-tabbar {
-      height: calc(100% - var(--tabbar-height, 100rpx));
+      overflow-y: scroll;
+      // height: calc(100% - var(--tabbar-height, 100rpx));
+      padding-bottom: var(--tabbar-height, 100rpx);
     }
 
     .pdm-space {

src/pages/apply/list/index.config.js

@@ -0,0 +1,4 @@
+// eslint-disable-next-line no-undef
+export default definePageConfig({
+  navigationBarTitleText: '申请列表'
+})

src/pages/apply/list/index.jsx

@@ -0,0 +1,72 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View } from '@tarojs/components';
+import { Tab, Tabs } from '@antmjs/vantui';
+import Page from '@/layouts/index';
+import PowerList from '@/components/PowerList';
+import Card from '@/components/IssueCard';
+import { getTaIssueApply } from '@/services/taissueapply';
+import { ROLE_MANAGER } from '@/utils/user';
+import { useModel } from '@/store';
+import { getIssueStatus } from '@/utils/biz';
+
+export default (props) => {
+
+  const router = Taro.useRouter();
+  const { title, applyType = '' } = router.params;
+
+  React.useMemo(() => {
+    if (title) {
+      Taro.setNavigationBarTitle({ title });
+    } else {
+      Taro.setNavigationBarTitle({ title: '申请列表' });
+    }
+  }, [title]);
+
+  const { user } = useModel('user');
+
+  const onClick = (item) => {
+
+    let act = '';
+    const status = getIssueStatus(item);
+
+    // 如果是管理员
+    if (user.dutyList.indexOf(ROLE_MANAGER) > -1) {
+      // 如果是待交办
+      if (status.value === 0) {
+        act = 'assigned';
+      }
+    } else {
+      
+    }
+
+    Taro.navigateTo({
+      url: `/pages/issue/edit/index?id=${item.issueId}&act=${act}`
+    })
+  }
+  
+  return (
+    <Page>
+      <Tabs sticky>
+        <Tab title="监督员">
+          <PowerList
+            request={getTaIssueApply}
+            params={{applyType, sourceType: 'inspector'}}
+            renderItem={(item) => (
+              <Card key={item.issueId} detail={item} onClick={() => onClick(item)} />
+            )}
+          />
+        </Tab>
+        <Tab title="市民">
+          <PowerList
+            request={getTaIssueApply}
+            params={{applyType, sourceType: 'feedback'}}
+            renderItem={(item) => (
+              <Card key={item.issueId} detail={item} onClick={() => onClick(item)} />
+            )}
+          />
+        </Tab>
+      </Tabs>
+    </Page>
+  )
+}

src/pages/home/components/Head.jsx

@@ -2,6 +2,7 @@ import React from 'react';
 import { View, Image } from '@tarojs/components';
 import { ROLES, ROLE_CITIZEN } from '@/utils/user';
 import logo from '@/assets/image/logo.png';
+import avatar from '@/assets/icons/avatar.png';
 import style from './head.module.less';
 
 export default (props) => {
@@ -14,7 +15,9 @@ export default (props) => {
       <View className={style.profile}>
         <View style={{ letterSpacing: '2px' }}>Hi, {user.name}!</View>
         <View className={style.badge}>
-          <View className={style.icon}></View>
+          <View className={style.icon}>
+            <Image src={avatar} />
+          </View>
           <View>{role}</View>
         </View>
       </View>

src/pages/home/components/head.module.less

@@ -27,25 +27,17 @@
       text-align: center;
 
       .icon {
-        top: -12px;
-        left: -12px;
+        top: -8px;
+        left: -8px;
         position: absolute;
-        width: 56px;
-        height: 56px;
-        border: 8px solid rgba(251, 239, 121, 0.6);
+        width: 64px;
+        height: 64px;
         border-radius: 50%;
         box-sizing: content-box;
 
-        &::before {
-          content: '';
-          position: absolute;
-          top: 0;
-          left: 0;
-          width: 56px;
-          height: 56px;
-          background: linear-gradient(0, #E36A00, #FFA658);
-          border-radius: 50%;
-          overflow: hidden;
+        image {
+          width: 100%;
+          height: 100%;
         }
       }
     }

src/pages/home/index.jsx

@@ -2,20 +2,55 @@ import React from 'react'
 import { View, Text, Image } from '@tarojs/components'
 import Page from '@/layouts/index';
 import { useModel } from '@/store';
+import MenuIcon from '@/components/MenuIcon';
+import { ROLE_INSPECTOR, ROLE_MANAGER } from '@/utils/user';
 import Head from './components/Head';
 import BannerCard from './components/BannerCard';
-import MenuCard from './components/MenuCard';
 import './index.less';
 
+const menus = {
+  [ROLE_INSPECTOR]: [
+    { icon: 'icon9', text: '我的上报', link: '/pages/issue/list/index' },
+    { icon: 'icon11', text: '消息通知', link: '' },
+    { icon: 'icon10', text: '模拟测评', link: '' },
+  ],
+
+  [ROLE_MANAGER]: [
+    { icon: 'icon9', text: '我的上报', link: '/pages/issue/list2/index?title=我的上报&mine=true' },
+    { icon: 'icon11', text: '消息通知', link: '' },
+    { icon: 'icon10', text: '模拟测评', link: '' },
+    { icon: 'icon1', text: '待 交 办', link: '/pages/issue/list2/index?title=待交办&bizStatus=start' },
+    { icon: 'icon2', text: '已 交 办', link: '/pages/issue/list2/index?title=已交办&bizStatus=assigned' },
+    { icon: 'icon3', text: '已 办 结', link: '/pages/issue/list2/index?title=已办结报&bizStatus=end' },
+    { icon: 'icon4', text: '消单申请', link: '/pages/apply/list/index?title=消单申请&applyType=end' },
+    { icon: 'icon5', text: '逾期警告', link: '/pages/issue/list2/index?title=逾期警告&bizStatus=expired' },
+    { icon: 'icon6', text: '延期申请', link: '/pages/apply/list/index?title=延期申请&applyType=delay' },
+    { icon: 'icon7', text: '统计查询', link: '' },
+  ]
+}
+
 export default (props) => {
 
   const { user } = useModel('user');
 
+  const menuArr = React.useMemo(() => {
+    if (!user || !user.dutyList) return [];
+
+    return menus[user.dutyList[0]];
+  }, [user])
+
   return (
-    <Page tabBar="home" className='index'>
+    <Page tabBar="home" className='home-page'>
       <Head user={user} />
       <BannerCard />
-      <MenuCard />
+      
+      <View className="menu-icons">
+        {
+          menuArr.map(x => (
+            <MenuIcon key={x.text} {...x} />
+          ))
+        }
+      </View>
     </Page>
   );
 }

src/pages/home/index.less

@@ -0,0 +1,16 @@
+
+.home-page {
+  .menu-icons {
+    display: grid;
+    grid-template-columns: repeat(3, 1fr);
+    grid-column-gap: var(--main-space);
+    grid-row-gap: var(--main-space);
+    padding: var(--main-space);
+
+    & > view {
+      background: #FFFFFF;
+      box-shadow: 0px 0px 20px 0px rgba(0,0,0,0.06);
+      border-radius: 8px;
+    }
+  }
+}

src/pages/issue/list/index.jsx

@@ -15,7 +15,6 @@ export default (props) => {
   const { user } = useModel('user');
 
   const onClick = (item) => {
-
     let act = '';
     const status = getIssueStatus(item);
     

src/pages/issue/list2/index.jsx

@@ -13,7 +13,7 @@ import { getIssueStatus } from '@/utils/biz';
 export default (props) => {
 
   const router = Taro.useRouter();
-  const { title } = router.params;
+  const { title, bizStatus = '', mine = '' } = router.params;
 
   React.useMemo(() => {
     if (title) {
@@ -51,7 +51,7 @@ export default (props) => {
         <Tab title="监督员">
           <PowerList
             request={getTaIssue}
-            params={{mine: true}}
+            params={{bizStatus, mine, sourceType: 'inspector'}}
             renderItem={(item) => (
               <Card key={item.issueId} detail={item} onClick={() => onClick(item)} />
             )}
@@ -60,7 +60,7 @@ export default (props) => {
         <Tab title="市民">
           <PowerList
             request={getTaIssue}
-            params={{bizStatus: 'start', mine: true}}
+            params={{bizStatus, mine, sourceType: 'feedback'}}
             renderItem={(item) => (
               <Card key={item.issueId} detail={item} onClick={() => onClick(item)} />
             )}