faets

config/prod.js

@@ -3,7 +3,7 @@ module.exports = {
     NODE_ENV: '"production"'
   },
   defineConstants: {
-    HOST: '"http://192.168.89.147:9087"'
+    HOST: '"https://t.njyz.tech"'
   },
   mini: {},
   h5: {

src/components/Auth.jsx

@@ -4,21 +4,9 @@ import { useModel } from '@/store';
 
 export default (props) => {
   const { roles = [] } = props;
-  const { user } = useModel('user');
+  const { duty } = useModel('user');
 
-  const targets = user?.dutyList || [];
-
-  let hasRights = false;
-  for(let role of roles) {
-    if (hasRights) {
-      continue;
-    }
-
-    const found = targets.indexOf(role) > -1;
-    if (found) {
-      hasRights = found;
-    }
-  }
+  const hasRights = roles.indexOf(duty) > -1;
 
   return !roles.length || hasRights ? props.children : (
     <View style={{width: '100%', height: '100%', display: 'grid', placeItems: 'center'}}>

src/layouts/TabBar.jsx

@@ -58,13 +58,13 @@ const mine = {
 }
 
 export default (props) => {
-  const { active = -1, className, user } = props;
+  const { active = -1, className, duty } = props;
 
   const tabItems = React.useMemo(() => {
-    if (!user) return [];
+    if (!duty) return [];
 
-    if (user.dutyList.indexOf(ROLE_INSPECTOR) > -1 // 督察员
-      || user.dutyList.indexOf(ROLE_MANAGER) > -1 // 管理员
+    if (duty == ROLE_INSPECTOR // 督察员
+      || duty == ROLE_MANAGER // 管理员
     ) {
       return [
         home,
@@ -75,7 +75,7 @@ export default (props) => {
       ]
     }
 
-    if (user.dutyList.indexOf(ROLE_ORG_USER) > -1) {
+    if (duty == ROLE_ORG_USER) {
       return [
         home,
         notice,
@@ -84,7 +84,7 @@ export default (props) => {
     }
 
     return [];
-  }, [user]);
+  }, [duty]);
 
   const onChange = (e) => {
     const url = tabItems.filter(x => x.name === e.detail)[0].page;

src/layouts/index.jsx

@@ -11,7 +11,7 @@ import laySty from './layout.module.less';
 export default (props) => {
   const { className, style, roles, tabBar = false, loading } = props;
 
-  const { person, user } = useModel('user');
+  const { person, user, duty } = useModel('user');
 
   const containerClass = `${laySty['page-conatiner']} ${tabBar ? laySty['with-tabbar'] : ''} ${className}`;
 
@@ -51,7 +51,7 @@ export default (props) => {
         }
       </View>
       {
-        tabBar && <TabBar className={laySty['page-tabbar']} active={tabBar} user={user} />
+        tabBar && <TabBar className={laySty['page-tabbar']} active={tabBar} duty={duty} />
       }
     </View>
   )

src/pages/home/components/Head.jsx

@@ -1,20 +1,36 @@
 import React from 'react';
 import { View, Image } from '@tarojs/components';
+import { ActionSheet, Cell } from '@antmjs/vantui';
 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) => {
-  const { user = {} } = props;
+  const { user = {}, duty, onDutyChange } = props;
   const { dutyList = [] } = user;
-  const role = ROLES[dutyList[0] || ROLE_CITIZEN];
+  const role = ROLES[duty || ROLE_CITIZEN];
+
+  const [show, setShow] = React.useState(false);
+
+  const actions = React.useMemo(() => {
+    return dutyList.map(x => ({name: ROLES[x], value: x}));
+  }, [dutyList]);
+
+  const onClick = () => {
+    if (dutyList.length < 1) return;
+    setShow(true);
+  }
+
+  const onSelect = (e) => {
+    onDutyChange(e.detail.value)
+  }
 
   return (
     <View className={style.head}>
       <View className={style.profile}>
         <View style={{ letterSpacing: '2px' }}>Hi, {user.name}!</View>
-        <View className={style.badge}>
+        <View className={style.badge} onClick={onClick}>
           <View className={style.icon}>
             <Image src={avatar} />
           </View>
@@ -24,6 +40,14 @@ export default (props) => {
       <View className={style.avatar}>
         <Image src={user.avatar || logo}></Image>
       </View>
+      <ActionSheet
+        title="请选择身份"
+        position="bottom"
+        show={show}
+        actions={actions}
+        onClose={() => setShow(false)}
+        onSelect={onSelect}
+      />
     </View>
   )
 }

src/pages/home/index.jsx

@@ -49,17 +49,17 @@ const menus = {
 
 export default (props) => {
 
-  const { user } = useModel('user');
+  const { user, duty, updateDuty } = useModel('user');
 
   const menuArr = React.useMemo(() => {
-    if (!user || !user.dutyList) return [];
+    if (!duty) return [];
 
-    return menus[user.dutyList[0]];
-  }, [user])
+    return menus[duty];
+  }, [duty])
 
   return (
     <Page tabBar="home" className='home-page'>
-      <Head user={user} />
+      <Head user={user} duty={duty} onDutyChange={updateDuty} />
       <BannerCard />
 
       <View className="menu-icons">

src/pages/issue/edit/index.jsx

@@ -17,7 +17,7 @@ export default (props) => {
   const router = Taro.useRouter();
   const { id, act } = router.params;
 
-  const { user } = useModel('user');
+  const { user, duty } = useModel('user');
 
   const [loading, setLoading] = React.useState(false);
   const [issue, setIssue] = React.useState();
@@ -29,11 +29,8 @@ export default (props) => {
     canAssigned,
     canCancel,
   ] = React.useMemo(() => {
-    if (!issue) return [];
-    if (!user) return [];
-
     // 如果是督察员
-    if (user.dutyList.indexOf(ROLE_INSPECTOR) > -1) {
+    if (duty == ROLE_INSPECTOR) {
       return [
         issue.processNode != 'start' && issue.processStatus != 'reject',
         issue.processNode == 'start' || issue.processStatus == 'reject',
@@ -43,7 +40,7 @@ export default (props) => {
     }
 
     // 如果是管理员
-    if (user?.dutyList.indexOf(ROLE_MANAGER) > -1) {
+    if (duty == ROLE_MANAGER) {
       return [
         issue.processNode != 'start',
         false,
@@ -53,14 +50,14 @@ export default (props) => {
     }
 
     return [];
-  }, [issue, user]);
+  }, [issue, duty]);
 
-  const onIssueChange = (val = {}) => {
-    setIssue({
-      ...(issue || {}),
-      ...val,
-    })
-  }
+  // const onIssueChange = (val = {}) => {
+  //   setIssue({
+  //     ...(issue || {}),
+  //     ...val,
+  //   })
+  // }
   
   React.useEffect(() => {
     if (id) {

src/store/user.js

@@ -6,6 +6,7 @@ import { login, signin, currentUser } from '@/services/wxma';
 export default function useUser() {
   const [person, setPerson] = React.useState();
   const [user, setUser] = React.useState();
+  const [duty, setDuty] = React.useState();
 
   const maLogin = (code) => {
     login(code).then(res => {
@@ -15,20 +16,41 @@ export default function useUser() {
     });
   }
 
+  const updateDuty = (d) => {
+    setDuty(d);
+    Taro.setStorageSync('duty', d);
+  }
+
+  const initDuty = (u) => {
+    const d = Taro.getStorageSync('duty');
+    const dutyList = u?.dutyList || [];
+    if (d) {
+      if (dutyList.indexOf(d) < 0) {
+        updateDuty(dutyList[0]);
+      } else {
+        updateDuty(d);
+      }
+    } else {
+      updateDuty(dutyList[0]);
+    }
+  }
+
   const maSignIn = (params) => {
     const data = {
       ...params,
       password: md5(params.password)
-    }
+    };
 
     return signin(data).then(res => {
       setUser(res.user);
+      initDuty(res.user);
     })
   }
 
   const current = () => {
     currentUser().then(res => {
       setUser(res.user);
+      initDuty(res.user);
     })
   }
 
@@ -36,7 +58,9 @@ export default function useUser() {
     user,
     person,
     current,
+    duty,
     signin: maSignIn,
     login: maLogin,
+    updateDuty,
   }
 }