feats

config/dev.js

@@ -3,8 +3,9 @@ module.exports = {
     NODE_ENV: '"development"'
   },
   defineConstants: {
-    HOST: '"http://127.0.0.1:9087"'
-    // HOST: '"http://192.168.1.2:9087"'
+    HOST: '"http://127.0.0.1:9087"',
+    // HOST: '"http://192.168.1.2:9087"',
+    AD_IMAGE: '"https://h5.njyunzhi.com/images/citizen_banner.png"',
   },
   mini: {},
   h5: {}

config/prod.js

@@ -3,7 +3,8 @@ module.exports = {
     NODE_ENV: '"production"'
   },
   defineConstants: {
-    HOST: '"https://t.njyz.tech"'
+    HOST: '"https://t.njyz.tech"',
+    AD_IMAGE: '"https://h5.njyunzhi.com/images/citizen_banner.png"',
   },
   mini: {},
   h5: {

src/layouts/TabBar.jsx

@@ -42,6 +42,13 @@ const issue = {
   activeIcon: issueActiveIcon,
   page: '/pages/issue/edit/index'
 }
+const feedback = {
+  name: 'feedback',
+  label: '发布',
+  icon: issueIcon,
+  activeIcon: issueActiveIcon,
+  page: '/pages/issue/edit/index'
+}
 const check = {
   name: 'check',
   label: '测评标准',
@@ -83,6 +90,14 @@ export default (props) => {
       ]
     }
 
+    if (duty == ROLE_CITIZEN) {
+      return [
+        home,
+        feedback,
+        mine,
+      ]
+    }
+
     return [];
   }, [duty]);
 

src/pages/home/components/Banner.jsx

@@ -0,0 +1,21 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { Image } from '@tarojs/components';
+import { ROLE_CITIZEN } from '@/utils/user';
+
+const style = {
+  width: 'calc(100% - var(--main-space) * 2)',
+  margin: 'var(--main-space)',
+  borderRadius: '6px',
+  overfollow: 'hidden',
+}
+
+export default (props) => { 
+  
+  const { duty } = props;
+  
+  return !duty || duty == ROLE_CITIZEN ? (
+    // eslint-disable-next-line no-undef
+    <Image mode="widthFix" src={AD_IMAGE} style={style}></Image>
+  ) : null;
+}

src/pages/home/components/BannerCard.jsx

@@ -1,24 +0,0 @@
-import React from 'react';
-import { View } from '@tarojs/components';
-import style from './banner-card.module.less';
-
-export default (props) => {
-  return (
-    <View className={style['banner-card-box']}>
-      <View className={style['banner-card']}>
-        <View className={style.item}>
-          <View>12</View>
-          <View className={style.sub}>已上报</View>
-        </View>
-        <View className={style.item}>
-          <View>8</View>
-          <View className={style.sub}>已交办</View>
-        </View>
-        <View className={style.item}>
-          <View>6</View>
-          <View className={style.sub}>未交办</View>
-        </View>
-      </View>
-    </View>
-  )
-}

src/pages/home/components/Head.jsx

@@ -3,16 +3,23 @@ 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 Icon from '@/assets/icons/avatar.png';
 import style from './head.module.less';
 
 export default (props) => {
-  const { user = {}, duty, onDutyChange } = props;
-  const { dutyList = [] } = user;
+  const { user, person, duty, onDutyChange } = props;
+  const { dutyList = [] } = user || {};
   const role = ROLES[duty || ROLE_CITIZEN];
 
   const [show, setShow] = React.useState(false);
 
+  const [name, avatar] = React.useMemo(() => {
+    return [
+      user?.name || person?.name || '市民先生',
+      user?.avatar || person?.avatar || logo,
+    ];
+  }, [user, person]);
+
   const actions = React.useMemo(() => {
     return dutyList.map(x => ({name: ROLES[x], value: x}));
   }, [dutyList]);
@@ -29,10 +36,10 @@ export default (props) => {
   return (
     <View className={style.head}>
       <View className={style.profile}>
-        <View style={{ letterSpacing: '2px' }}>Hi, {user.name}!</View>
+        <View style={{ letterSpacing: '2px' }}>Hi, {name}!</View>
         <View className={style.badge} onClick={onClick}>
           <View className={style.icon}>
-            <Image src={avatar} />
+            <Image src={Icon} />
           </View>
           <View>{role}</View>
         </View>
@@ -46,7 +53,7 @@ export default (props) => {
         />
       </View>
       <View className={style.avatar}>
-        <Image src={user.avatar || logo}></Image>
+        <Image src={avatar}></Image>
       </View>
     </View>
   )

src/pages/home/components/StatCard.jsx

@@ -0,0 +1,38 @@
+import React from 'react';
+import { View } from '@tarojs/components';
+import { ROLE_CITIZEN } from '@/utils/user';
+import { getIndexData } from '@/services/stat';
+import style from './stat-card.module.less';
+
+export default (props) => {
+  const { duty } = props;
+
+  const [list, setList] = React.useState([]);
+
+  const classNames = React.useMemo(() => {
+    return [
+      style['stat-card-box'],
+      !duty || duty == ROLE_CITIZEN ? style['no-bg-effect'] : false
+    ].filter(Boolean).join(' ');
+  }, [duty])
+
+  React.useEffect(() => {
+    const du = duty || ROLE_CITIZEN
+    getIndexData(du).then(setList);
+  }, [duty]);
+
+  return (
+    <View className={classNames}>
+      <View className={style['stat-card']}>
+        {
+          list.map(x => (
+            <View key={x.name} className={style.item}>
+              <View>{x.value}</View>
+              <View className={style.sub}>{x.name}</View>
+            </View>
+          ))
+        }
+      </View>
+    </View>
+  )
+}

src/pages/home/components/banner-card.module.less → src/pages/home/components/stat-card.module.less

@@ -1,5 +1,5 @@
 
-.banner-card-box {
+.stat-card-box {
   width: 100%;
   position: relative;
   padding: 0 var(--main-space);
@@ -15,7 +15,13 @@
     z-index: 0;
   }
 
-  .banner-card {
+  &.no-bg-effect {
+    &::before {
+      display: none;
+    }
+  }
+
+  .stat-card {
     position: relative;
     background: #FFFFFF;
     box-shadow: 0px 18px 22px 0px rgba(0,0,0,0.04);

src/pages/home/index.jsx

@@ -3,9 +3,10 @@ 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, ROLE_ORG_USER, ROLE_QUERY_PERSON } from '@/utils/user';
+import { ROLE_CITIZEN, ROLE_INSPECTOR, ROLE_MANAGER, ROLE_ORG_USER, ROLE_QUERY_PERSON } from '@/utils/user';
 import Head from './components/Head';
-import BannerCard from './components/BannerCard';
+import Banner from './components/Banner';
+import StatCard from './components/StatCard';
 import './index.less';
 
 const menus = {
@@ -45,11 +46,18 @@ const menus = {
     { icon: 'icon3', text: '已 办 结', link: '/pages/issue/list2/index?title=已办结&bizStatus=end' },
     { icon: 'icon7', text: '统计查询', link: '' },
   ],
+  
+  // 督察员
+  [ROLE_CITIZEN]: [
+    { icon: 'icon1', text: '未 处 理', link: '/pages/issue/list2/index?title=未处理&bizStatus=start' },
+    { icon: 'icon2', text: '处 理 中', link: '/pages/issue/list2/index?title=处理中&bizStatus=assigned' },
+    { icon: 'icon7', text: '已 打 回', link: '' },
+  ],
 }
 
 export default (props) => {
 
-  const { user, duty, updateDuty } = useModel('user');
+  const { user, person, duty, updateDuty } = useModel('user');
 
   const menuArr = React.useMemo(() => {
     if (!duty) return [];
@@ -58,9 +66,10 @@ export default (props) => {
   }, [duty])
 
   return (
-    <Page tabBar="home" className='home-page'>
-      <Head user={user} duty={duty} onDutyChange={updateDuty} />
-      <BannerCard />
+    <Page tabBar="home" className="home-page">
+      <Head user={user} person={person} duty={duty} onDutyChange={updateDuty} />
+      <Banner  duty={duty} />
+      <StatCard duty={duty} />
 
       <View className="menu-icons">
         {

src/pages/login/components/Bottom.jsx

@@ -1,16 +1,27 @@
 import React from 'react';
-import { View, Image } from '@tarojs/components';
-import WeChat from '../../../assets/image/WeChat.png';
+import { View, Image, Button } from '@tarojs/components';
+import Icon from '@/assets/image/WeChat.png';
+import { useModel } from '@/store';
 import style from './bottom.module.less';
 
 export default (props) => {
+
+  const { signinByPhone } = useModel('user');
+
+  const onGetPhoneNumber = (e) => {
+    const code = e.detail.code;
+    signinByPhone(code).then(props.onSuccess);
+  }
+
   return (
     <View>
-      <View className={style['txt-box2']}>——其他登录方式——</View>
+      <View className={style['txt-box2']}>—— 没有账号？微信登录 ——</View>
       <View className={style['img-box2']}>
-        <Image className={style['img-wechat']}
-          src={WeChat}
-        />
+        <Button openType="getPhoneNumber" onGetPhoneNumber={onGetPhoneNumber}>
+          <Image className={style['img-wechat']}
+            src={Icon}
+          />
+        </Button>
       </View>
       <View className={style['wechat-login']}>微信登录</View>
     </View>

src/pages/login/components/bottom.module.less

@@ -9,6 +9,17 @@
   width: 100px;
   height: 100px;
   margin: 0 auto;
+
+  button {
+    padding: 0;
+    line-height: 1em;
+    background: transparent;
+
+    &::after {
+      border: none;
+    }
+  }
+
   .img-wechat {
     width: 100px;
     height: 100px;

src/pages/login/index.jsx

@@ -10,14 +10,9 @@ import './index.less'
 export default (props) => {
 
   const onSuccess = () => {
-    Taro.navigateBack({
-      delta: 1,
-      fail: () => {
-        Taro.reLaunch({
-          url: '/pages/home/index'
-        })
-      }
-    });
+    Taro.reLaunch({
+      url: '/pages/home/index'
+    })
   }
 
   return (
@@ -25,7 +20,7 @@ export default (props) => {
       <View className="login-box">
         <Head />
         <Form onSuccess={onSuccess} />
-        <Bottom />
+        <Bottom onSuccess={onSuccess} />
       </View>
     </Page>
   )

src/pages/reset-password/index.jsx

@@ -1,7 +1,6 @@
 import React from 'react';
 import Taro from '@tarojs/taro';
 import { View } from '@tarojs/components';
-import Page from '@/layouts/index';
 import { changePwd } from '@/services/wxma'; 
 import Captcha from './components/Captcha';
 import ResetPwd from './components/ResetPwd';
@@ -28,7 +27,7 @@ export default (props) => {
   }
   
   return (
-    <Page>
+    <View>
       <View className="reset-password-box">
         <View className={transClass}>
           <View>
@@ -39,6 +38,6 @@ export default (props) => {
           </View>
         </View>
       </View>
-    </Page>
+    </View>
   )
 }

src/services/stat.js

@@ -0,0 +1,8 @@
+import request from "@/utils/request";
+
+/**
+ * 首页统计
+ * @param {*} duty 
+ * @returns 
+ */
+export const getIndexData = duty => request('/api/ma/index-stat', { params: { duty } })

src/services/wxma.js

@@ -3,7 +3,7 @@ import request from '@/utils/request';
 /*
  * 授权手机
  */
-export const authPhone = (id, data) => request(`/api/ma/auth-phone`, { data, method: 'put' });
+export const authPhone = (code) => request(`/api/ma/auth-phone`, { params: { code }, method: 'put' });
 
 /*
  * 授权头像

src/store/user.js

@@ -1,7 +1,8 @@
 import React from 'react';
 import Taro from '@tarojs/taro';
 import md5 from 'md5';
-import { login, signin, currentUser } from '@/services/wxma';
+import { login, signin, currentUser, authPhone } from '@/services/wxma';
+import { ROLE_CITIZEN } from '@/utils/user';
 
 export default function useUser() {
   const [person, setPerson] = React.useState();
@@ -16,7 +17,7 @@ export default function useUser() {
     });
   }
 
-  const updateDuty = (d) => {
+  const updateDuty = (d = ROLE_CITIZEN) => {
     setDuty(d);
     Taro.setStorageSync('duty', d);
   }
@@ -54,6 +55,14 @@ export default function useUser() {
     })
   }
 
+  const signinByPhone = (code) => {
+    return authPhone(code).then(res => {
+      setUser(res.user);
+      initDuty(res.user);
+      setPerson(res.person);
+    })
+  }
+
   return {
     user,
     person,
@@ -62,5 +71,6 @@ export default function useUser() {
     signin: maSignIn,
     login: maLogin,
     updateDuty,
+    signinByPhone,
   }
 }