feats

src/layouts/TabBar.jsx

@@ -91,7 +91,8 @@ export default (props) => {
       ]
     }
 
-    if (duty == ROLE_ORG_USER) {
+    // 责任单位用户
+    if (duty == ROLE_ORG_USER || duty == ROLE_ORG_MANAGER) {
       return [
         home,
         notice,

src/pages/home/index.jsx

@@ -40,6 +40,7 @@ const menus = {
     { icon: 'icon11', text: '消息通知', link: '/pages/message/list/index' },
   ],
 
+  // 责任单位管理员
   [ROLE_ORG_MANAGER]: [
     { icon: 'icon2', text: '处 理 中', link: `/pages/org/issue/list/index?title=处理中&bizStatus=${PROCESS_ASSIGNED}` },
     { icon: 'icon3', text: '已 办 结', link: `/pages/org/issue/list/index?title=已办结&bizStatus=${PROCESS_END}` },

src/pages/message/list/components/Card.jsx

@@ -3,28 +3,40 @@ import Taro from '@tarojs/taro';
 import { View } from '@tarojs/components';
 import { Cell } from '@antmjs/vantui';
 import { getDtStr } from '@/utils/date';
+import { ROLE_ORG_MANAGER, ROLE_ORG_USER } from '@/utils/user';
+import { getTaIssueApplyById } from '@/services/taissueapply';
 import style from './card.module.less';
 
 export default (props) => {
-  const { item } = props;
+  const { item, duty } = props;
 
-  const url = React.useMemo(() => {
-    if (item.targetType == 'issue') {
-      Taro.navigateTo({
-        url: `/pages/issue/edit/index`
-      })
-    } else if (item.targetType == 'apply') {
+  console.log(item)
 
+  const onClick = () => {
+    if (item.targetType == 'apply') {
+      getTaIssueApplyById(item.targetId).then(res => naviTo(res.issueId));
+    } else if (item.targetType == 'issue') {
+      naviTo(item.targetId);
     }
+  };
 
-    return '';
-  }, [item])
+  const naviTo = (issueId) => {
+    if (duty == ROLE_ORG_USER || duty == ROLE_ORG_MANAGER) {
+      Taro.navigateTo({
+        url: `/pages/org/issue/detail/index?id=${issueId}`
+      })
+    } else {
+      Taro.navigateTo({
+        url: `/pages/issue/edit/index?id=${issueId}`
+      })
+    }
+  }
   
   return (
     <View className={style['msg-card-wrapper']}>
       <Cell
         isLink
-        url={url}
+        onClick={onClick}
         renderTitle={(
           <View style={{ display: 'flex', justifyContent: 'space-between' }}>
             <View>

src/pages/message/list/index.jsx

@@ -4,17 +4,18 @@ import { View } from '@tarojs/components';
 import Page from '@/layouts/index';
 import PowerList from '@/components/PowerList';
 import { getTaMessage } from '@/services/tamessage';
+import { useModel } from '@/store';
 import Card from './components/Card';
 
 export default (props) => {
-
+  const { duty } = useModel('user');
   
   return (
     <Page>
       <PowerList
         request={getTaMessage}
         renderItem={(item) => (
-          <Card key={item.msgId} item={item} />
+          <Card key={item.msgId} item={item} duty={duty} />
         )}
       />
     </Page>

src/pages/my/index.jsx

@@ -1,32 +1,61 @@
 import React from 'react';
 import Taro from '@tarojs/taro';
 import Page from '@/layouts/index';
-import { View } from '@tarojs/components';
-import { Empty } from '@antmjs/vantui'
+import { View, Image } from '@tarojs/components';
 import logo from '@/assets/image/logo.png';
+import peopleicon from '@/assets/icons/peopleicon.png';
+import icon11 from '@/assets/icons/icon11.png';
+import iconExit from '@/assets/icons/exit.png';
 import { useModel } from '@/store';
+import { getSysOrgById } from '@/services/sysorg';
+import { ROLE_CITIZEN, ROLE_QUERY_PERSON } from '@/utils/user';
 import Head from './components/Head';
-import './index.less';
+import styles from './style.module.less';
 
 export default (props) => {
 
-  const { user, person, duty } = useModel('user');
+  const { user, person, duty, signOut } = useModel('user');
+  const [org, setOrg] = React.useState();
 
-  // const [
-  //   show1,
-  //   show2,
-  // ] = React.useMemo(() => {
-  //   return [
-  //     false,
-  //     false,
-  //   ]
-  // }, [duty]);
+  const [
+    show1,
+    show2,
+  ] = React.useMemo(() => {
+    if (duty == ROLE_CITIZEN) {
+      return [
+        false, 
+        false,
+      ]
+    }
 
-  // const onClick = () => {
-  //   Taro.navigateTo({
-  //     url: `/pages/my/edit/index`
-  //   })
-  // }
+    if (duty == ROLE_QUERY_PERSON) {
+      return [
+        true,
+        false,
+      ]
+    }
+
+    return [
+      true,
+      true,
+    ]
+  }, [duty]);
+
+  const onExit = () => {
+    signOut();
+  }
+
+  const onClick = () => {
+    Taro.navigateTo({
+      url: `/pages/message/list/index`
+    })
+  }
+
+  React.useEffect(() => {
+    if (user) {
+      getSysOrgById(user.orgId).then(setOrg);
+    }
+  }, [user]);
 
   return (
     <Page tabBar="mine">
@@ -34,40 +63,29 @@ export default (props) => {
         avatar={user?.avatar || person?.avatar || logo}
         name={user?.name || person?.name || '市民先生'}
       />
-      <View>
-        <Empty description="我们在正在努力开发中..." />
-      </View>
-      {/* <View className="wrapper-header">
-        <View className="wrapper-header-circle">
-          <View className="wrapper-header-circle2" />
-        </View>
-        <View className="wrapper-header-box">
-          <Image className="wrapper-header-img" src={user?.avatar || person?.avatar || logo} />
-        </View>
-        <View className="wrapper-header-box2">
-          <View className="wrapper-header-text">{user?.name || person?.name || '市民先生'}</View>
-        </View>
-      </View>
-
-      <View className="wrapper-middle">
+      <View className={styles['bg-menu-box']}>
         {
           show1 && (
-            <View className="wrapper-middle-box">
-              <Image className="wrapper-middle-img" src={peopleicon} />
-              <View className="wrapper-middle-text">所在部门</View>
-              <View className="wrapper-middle-text2">县文明办</View>
+            <View className={styles['bg-menu-item']}>
+              <Image src={peopleicon} />
+              <View className={styles['bg-menu-title']}>所在部门</View>
+              <View className={styles['bg-menu-subtitle']}>{org?.name || '暂无'}</View>
             </View>
           )
         }
         {
           show2 && (
-            <View className="wrapper-middle-box" onClick={onClick}>
-              <Image className="wrapper-middle-img" src={smallbell} />
-              <View className="wrapper-middle-text3">消息通知</View>
+            <View className={styles['bg-menu-item']} onClick={onClick}>
+              <Image src={icon11} />
+              <View className={styles['bg-menu-title']}>消息通知</View>
             </View>
           )
         }
-      </View> */}
+      </View>
+      <View className={styles.exit} onClick={onExit}>
+        退出
+        <Image src={iconExit} />
+      </View>
     </Page>
   )
 }

src/pages/my/index.less

@@ -1,82 +0,0 @@
-// .wrapper-header {
-//   background: var(--main-bg-color);
-//   border-radius: 0px 0px 120px 120px;
-//   height: 50vw;
-//   align-items: center;
-//   display: flex;
-//   justify-content: center;
-
-//   .wrapper-header-circle {
-//     position: relative;
-//     opacity: 0.02;
-//     border-radius: 50%;
-//     background: #ffffff;
-//     width: 298px;
-//     height: 298px;
-//     .wrapper-header-circle2 {
-//       position: absolute;
-//       left: 0;
-//       right: 0;
-//       top: 0;
-//       bottom: 0;
-//       margin: auto;
-//       width: 198px;
-//       height: 198px;
-//       background: #ffffff;
-//       border-radius: 50%;
-//     }
-//   }
-//   .wrapper-header-box {
-//     position: relative;
-//     .wrapper-header-img {
-//       position: absolute;
-//       top: -49px;
-//       right: 88px;
-//       width: 115px;
-//       height: 109px;
-//       border-radius: 50%;
-//     }
-//   }
-//   .wrapper-header-box2 {
-//     position: relative;
-//     .wrapper-header-text {
-//       position: absolute;
-//       width: 249px;
-//       right: 17px;
-//       top: 79px;
-//       font-size: 32px;
-//       color: #fff;
-//     }
-//   }
-// }
-
-// .wrapper-middle {
-//   padding: var(--main-space);
-//   display: grid;
-//   grid-template-columns: repeat(2, 335px);
-//   grid-auto-rows: 335px;
-//   grid-gap: var(--main-space);
-//   .wrapper-middle-box {
-//     box-shadow: 0px 18px 22px 0px rgba(0, 0, 0, 0.06);
-//     border-radius: 8px;
-//     display: grid;
-//     place-items: center;
-//     margin-bottom: 20px;
-//   }
-//   .wrapper-middle-img {
-//     width: 120px;
-//     height: 120px;
-//   }
-//   .wrapper-middle-text {
-//     font-size: 32px;
-//     margin-bottom: -38px;
-//   }
-//   .wrapper-middle-text2 {
-//     font-size: 28px;
-//     color: #757575;
-//   }
-//   .wrapper-middle-text3 {
-//     font-size: 32px;
-//     margin-bottom: 50px;
-//   }
-// }

src/pages/my/style.module.less

@@ -0,0 +1,62 @@
+
+.exit {
+  position: absolute;
+  top: var(--main-space);
+  right: var(--main-space);
+  z-index: 2;
+  color: #fff;
+  font-size: 28px;
+  line-height: 36px;
+
+  image {
+    width: 36px;
+    height: 36px;
+    display: inline-block;
+    margin-left: 2vw;
+    vertical-align: middle;
+  }
+}
+
+.bg-menu-box {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-top: var(--main-space);
+
+  .bg-menu-item {
+    flex: none;
+    width: 45vw;
+    height: 45vw;
+    background: #FFFFFF;
+    box-shadow: 0px 18px 22px 0px rgba(0,0,0,0.06);
+    border-radius: 8px;
+
+    & + .bg-menu-item {
+      margin-left: var(--main-space);
+    }
+
+    image {
+      display: block;
+      width: 120px;
+      height: 120px;
+      margin: auto;
+      margin-top: 10vw;
+    }
+
+    .bg-menu-title {
+      font-size: 32px;
+      font-weight: bold;
+      color: #202020;
+      margin-top: 20px;
+      text-align: center;
+    }
+
+    .bg-menu-subtitle {
+      font-size: 28px;
+      font-weight: 500;
+      color: #757575;
+      margin-top: 14px;
+      text-align: center;
+    }
+  }
+}

src/pages/notice/components/Card/index.jsx

@@ -21,14 +21,17 @@ export default (props) => {
     <View className={style['notice-card-wrapper']}>
       <CellGroup>
         <Cell
-          title={dataset?.title}
-          isLink size="large"
+          isLink
+          size="large"
           style={{ color: 'var(--main-bg-color)' }}
           onClick={() => onClick()}
+          renderTitle={(
+            <View className={style['notice-card-title']}>{dataset?.title}</View>
+          )}
         />
         <Cell
           renderTitle={(<>
-            <View className={style['notice-card-title']}>日期： </View>
+            <View className={style['notice-card-title2']}>日期： </View>
             <View className={style['notice-card-title2']}>{dateStr}</View>
           </>
           )}

src/pages/notice/components/Card/style.module.less

@@ -8,6 +8,7 @@
   .notice-card-title {
     font-weight: bold;
     display: inline-block;
+    letter-spacing: 4px;
   }
   .notice-card-title2 {
     display: inline-block;

src/store/user.js

@@ -70,6 +70,11 @@ export default function useUser() {
     })
   }
 
+  const signOut = () => {
+    setUser(null);
+    initDuty([]);
+  }
+
   return {
     user,
     person,
@@ -80,5 +85,6 @@ export default function useUser() {
     updateDuty,
     signinByPhone,
     authProfile,
+    signOut,
   }
 }