feats

config/dev.js

@@ -6,6 +6,7 @@ module.exports = {
     // HOST: '"http://127.0.0.1:9087"',
     HOST: '"http://localhost:9087"',
     AD_IMAGE: '"https://h5.njyunzhi.com/images/citizen_banner.png"',
+    DEFAULT_POS: '"116.3476917447715,31.409912844296578"', // 霍山县人民政府 gcj02
   },
   mini: {},
   h5: {},

config/prod.js

@@ -5,6 +5,7 @@ module.exports = {
   defineConstants: {
     HOST: '"https://t.njyz.tech"',
     AD_IMAGE: '"https://h5.njyunzhi.com/images/citizen_banner.png"',
+    DEFAULT_POS: '"116.3476917447715,31.409912844296578"', // 霍山县人民政府 gcj02
   },
   mini: {},
   h5: {

src/app.config.js

@@ -16,8 +16,6 @@ export default defineAppConfig({
     // 'pages/checkStand/index',
     "pages/checkStand/list/index",
     "pages/checkStand/detail/index",
-    "pages/reporting/index",
-    "pages/reporting/detail/index",
     "pages/reset-password/index",
     "pages/check/list/index",
     "pages/check/loc/list/index",
@@ -28,6 +26,8 @@ export default defineAppConfig({
     "pages/my/edit/index",
     "pages/feedback/issue/index",
     "pages/feedback/issuelist/index",
+    "pages/user/list/index",
+    "pages/user/add/index",
   ],
   subpackages: [
     {

src/components/Icon.jsx

@@ -1,6 +1,7 @@
 import React from 'react';
 import Taro from '@tarojs/taro';
 import { Image } from '@tarojs/components';
+import { Icon } from '@antmjs/vantui';
 import icon1 from '@/assets/icons/icon1.png';
 import icon2 from '@/assets/icons/icon2.png';
 import icon3 from '@/assets/icons/icon3.png';
@@ -13,6 +14,7 @@ import icon9 from '@/assets/icons/icon9.png';
 import icon10 from '@/assets/icons/icon10.png';
 import icon11 from '@/assets/icons/icon11.png';
 import icon12 from '@/assets/icons/icon12.png';
+import person from '@/assets/icons/peopleicon.png';
 
 const icons = {
   icon1,
@@ -27,12 +29,13 @@ const icons = {
   icon10,
   icon11,
   icon12,
+  person,
 }
 
 export default (props) => {
-  const { className, style, name } = props;
+  const { className, style, name, info } = props;
   
   return (
-    <Image src={icons[name]} className={className} style={style} />
+    <Icon name={icons[name]} className={className} style={style} info={info} />
   )
 }

src/components/MenuIcon.jsx

@@ -27,7 +27,9 @@ const txtStyle = {
 
 export default (props) => {
   
-  const { icon, text, link } = props;
+  const { icon, text, link, request } = props;
+
+  const [info, setInfo] = React.useState();
 
   const onClick = () => {
     Taro.navigateTo({
@@ -35,11 +37,21 @@ export default (props) => {
     })
   }
 
+  React.useEffect(() => {
+    if (request) {
+      request().then(res => {
+        if (res) {
+          res > 99 ? setInfo('99+') : setInfo(res);
+        }
+      });
+    }
+  }, [request]);
+
   return (
     <RatioView>
       <View style={wrapperStyle} onClick={onClick}>
         <View>
-          <Icon name={icon} style={iconStyle} />
+          <Icon name={icon} style={iconStyle} info={info} />
           <View style={txtStyle}>{text}</View>
         </View>
       </View>

src/components/PowerList/index.jsx

@@ -3,7 +3,7 @@ import Taro from '@tarojs/taro';
 import { View } from '@tarojs/components';
 import { PowerScrollView } from '@antmjs/vantui';
 
-export default (props) => {
+export default React.forwardRef((props, ref) => {
   const { request, params, renderItem, onLoadingChange } = props;
 
   const pageSize = 20;
@@ -56,6 +56,13 @@ export default (props) => {
     pageNumRef.current = 1;
     queryData({pageNum : pageNumRef.current});
   }, [queryData]);
+
+  React.useImperativeHandle(ref, () => ({
+    refresh: () => {
+      pageNumRef.current = 1;
+      queryData({pageNum : pageNumRef.current});
+    }
+  }));
   
   return (
     <PowerScrollView
@@ -72,4 +79,4 @@ export default (props) => {
       }
     </PowerScrollView>
   )
-}
+})

src/components/map/index.jsx

@@ -6,66 +6,106 @@ import { getLocation } from '@/utils/authorize';
 import iconPath from '@/assets/icons/marker.png';
 import style from './style.module.less';
 
-// location 逻辑
-// 如果 props.location 有值, 那么放弃地图定位的点, 使用 props.location
-// 否则使用 地图定位的点
-// 如果地图定位失败 或者 props.location 为空, 那么不产生数据交互
-// 但是地图上默认使用 霍山县人民政府 的定位
 export default (props) => {
-  const { location, onLocChange } = props;
+  const { readOnly, location, onChange } = props;
+
+  const id = React.useMemo(() => `map-${Math.random().toString(36).substring(2, 10)}`, []);
+  const mapCtxRef = React.useRef();
 
-  const [currentPos, setCurPos] = React.useState();
   const [
-    markers,
-    lngLat,
+    // markers,
+    center,
   ] = React.useMemo(() => {
-    const loc = location || currentPos || '116.354259,31.415587';
+    // eslint-disable-next-line no-undef
+    const loc = location || DEFAULT_POS;
     const [longitude, latitude] = loc.split(',');
 
-    const mks = [{
-      id: 1,
-      longitude,
-      latitude,
-      iconPath,
-      width: 17,
-      height: 20
-    }];
+    // const mks = [{
+    //   id: 1,
+    //   longitude,
+    //   latitude,
+    //   iconPath,
+    //   width: 17,
+    //   height: 20
+    // }];
 
     return [
-      mks,
-      [longitude, latitude]
+      // mks,
+      { longitude, latitude }
     ]
-  }, [location, currentPos]);
+  }, [location]);
 
-  React.useEffect(() => {
-    getLocation().then((res) => {
-      setCurPos([res.longitude, res.latitude].join(','));
-    }).catch((err) => {
-      console.error(err);
-      Taro.showToast({
-        title: '定位失败',
-        icon: 'none',
+  const moveTo = (ctx, point) => {
+    ctx.moveToLocation({
+      ...point,
+      fail: console.error,
+    })
+  }
+
+  const getContext = React.useCallback(() => {
+    const query = Taro.createSelectorQuery();
+    query.select(`#${id}`).context(res => {
+      mapCtxRef.current = res.context;
+
+      // 修改中心图标 - 暂时不起作用, wx bug
+      mapCtxRef.current.setLocMarkerIcon({
+        iconPath,
+        fail: console.error,
       })
+    }).exec();
+  }, [id]);
+
+  const fixedLocation = () => {
+    return new Promise((resolve) => {
+      getLocation({ type: 'gcj02' }).then((res) => {
+        resolve(res);
+      }).catch((err) => {
+        console.error(err);
+        Taro.showToast({
+          title: '定位失败',
+          icon: 'none',
+        })
+      });
     });
-  }, []);
-  // console.log('markers latitude', mks)
-  React.useEffect(() => {
-    if (!location && !currentPos) return;
+  }
 
-    const loc = location || currentPos;
-    if (loc) {
-      onLocChange(loc);
+  const onRefresh = () => {
+    if (mapCtxRef.current) {
+      fixedLocation().then((res) => {
+        const { longitude, latitude } = res;
+        onChange([res.longitude, res.latitude].join(','));
+        moveTo(mapCtxRef.current, { longitude, latitude });
+      })
     }
-  }, [location, currentPos]);
+  }
+
+  React.useEffect(() => {
+    if (!readOnly) {
+      fixedLocation().then((res) => {
+        const { longitude, latitude } = res;
+        onChange([longitude, latitude].join(','));
+      })
+    }
+  }, [readOnly]);
+
+  React.useEffect(() => {
+    getContext();
+  }, [getContext]);
 
   return (
     <View className={style['map-wrapper']}>
       <Map
-        longitude={lngLat[0]}
-        latitude={lngLat[1]}
-        markers={markers}
+        id={id}
+        showLocation
+        longitude={center.longitude}
+        latitude={center.latitude}
+      // markers={markers}
       >
-        <CoverView className={style['control']}><Icon name="aim" size="26px" color="rgb(18,183,245)" /></CoverView>
+        {!readOnly && (
+          <CoverView className={style['control']} onClick={onRefresh}>
+            <Icon name="aim" size="24px" color="#1A7565" />
+          </CoverView>
+        )}
       </Map>
     </View>
   )

src/components/map/style.module.less

@@ -12,8 +12,8 @@
     left: 0;
     .control {
       position: absolute;
-      bottom: 14%;
-      right: 4%;
+      bottom: var(--main-space);
+      right: var(--main-space);
     }
   }
 }

src/layouts/index.jsx

@@ -2,7 +2,7 @@ import React from 'react';
 import Taro from '@tarojs/taro';
 import { View, Image } from '@tarojs/components';
 import { useModel } from '@/store';
-import { Loading, Notify } from '@antmjs/vantui';
+import { Loading, Notify, Dialog } from '@antmjs/vantui';
 import NavLoading from '@/components/NavLoading';
 import Auth from '@/components/Auth';
 import TabBar from './TabBar';
@@ -35,6 +35,7 @@ export default (props) => {
   return (
     <View className={laySty['page-wrapper']}>
       <Notify id="vanNotify" />
+      <Dialog id="vanDialog" />
       <NavLoading loading={loading} />
       <View className={containerClass} style={style}>
         {

src/pages/check/edit/components/LocForm.jsx

@@ -10,7 +10,6 @@ import AgePicker from './AgePicker';
 export default (props) => {
   const { checkItemInfo, checkType, answer, readonly, onChange, onLoadingChange } = props;
 
-  const [loc, setLoc] = React.useState();
   const [showAgePicker, setShowAgePicker] = React.useState(false);
 
   const setLoading = (v) => {
@@ -21,7 +20,6 @@ export default (props) => {
 
   const setFieldChange = (key, val) => {
     onChange({
-      location: loc,
       ...answer || {},
       [key]: val,
     })
@@ -46,7 +44,11 @@ export default (props) => {
 
   return (
     <View>
-      <Map location={answer?.location} onLocChange={setLoc} />
+      <Map
+        readOnly={readonly}
+        location={answer?.location}
+        onChange={e => setFieldChange('location', e)}
+      />
       <CellGroup>
         {
           checkType == 'loc' && (
@@ -56,18 +58,22 @@ export default (props) => {
             />
           )
         }
+        {
+          checkType == 'survey' && (
+            <Field
+              label="社区"
+              placeholder="请填写社区名称"
+              readonly={readonly}
+              value={answer?.communityName}
+              onChange={e => setFieldChange('communityName', e.detail)}
+            />
+          )
+        }
         <Field
           readonly={readonly}
-          placeholder={checkType == 'loc' ? '请输入地址' : '请填写社区名称'}
-          // value={answer}
-          leftIcon={mapIcon}
-        // onChange={e => setFieldChange('', e.detail)}
-        />
-        <Field
-          readonly={readonly}
+          label={checkType == 'loc' ? '地址' : '小区'}
           placeholder={checkType == 'loc' ? '请输入地址' : '请填写小区名称'}
           value={answer?.addr}
-          leftIcon={mapIcon}
           onChange={e => setFieldChange('addr', e.detail)}
         />
       </CellGroup>

src/pages/check/edit/index.jsx

@@ -44,8 +44,8 @@ export default (props) => {
     if (index == -1 && n != -1) {
       if (!readonly) {
         try {
+          warn(typ == 'survey' && !answer?.communityName, '请填写社区名称');
           warn(!answer?.addr, typ == 'loc' ? '请填写地址' : '请填写小区名称');
-          // warn(!answer, typ == 'loc' ? '请填写地址' : '请填写社区名称');
           warn(!answer?.location, '未能获取定位信息, 请重试');
           warn(typ == 'survey' && !answer?.sex, '请选择性别');
           warn(typ == 'survey' && !answer?.age, '请选择年龄段');

src/pages/check/loc/edit/components/LocForm.jsx

@@ -9,8 +9,6 @@ import mapIcon from '@/assets/icons/marker.png';
 export default (props) => {
   const { checkItemInfo, answer, readonly, onChange, onLoadingChange } = props;
 
-  const [loc, setLoc] = React.useState();
-
   const setLoading = (v) => {
     if (onLoadingChange) {
       onLoadingChange(v)
@@ -19,7 +17,6 @@ export default (props) => {
   
   const setFieldChange = (key, val) => {
     onChange({
-      location: loc,
       ...answer || {},
       [key]: val,
     })
@@ -42,7 +39,11 @@ export default (props) => {
   
   return (
     <View>
-      <Map location={answer?.location} onLocChange={setLoc} />
+      <Map
+        readOnly={readonly}
+        location={answer?.location}
+        onChange={(e) => setFieldChange('location', e)}
+      />
       <CellGroup>
         <Cell
           title="点位"

src/pages/feedback/issue/index.jsx

@@ -64,8 +64,9 @@ export default (props) => {
   return (
     <Page tabBar="feedback">
       <Map
+        readOnly={readOnly}
         location={formData.location}
-        onLocChange={e => !formData.location && setFieldChange('location', e)}
+        onChange={e => !formData.location && setFieldChange('location', e)}
       />
 
       <CellGroup>

src/pages/home/index.jsx

@@ -5,11 +5,17 @@ import { useModel } from '@/store';
 import MenuIcon from '@/components/MenuIcon';
 import { ROLE_CITIZEN, ROLE_INSPECTOR, ROLE_MANAGER, ROLE_ORG_MANAGER, ROLE_ORG_USER, ROLE_QUERY_PERSON } from '@/utils/user';
 import { PROCESS_APPLY_DELAY, PROCESS_APPLY_END, PROCESS_APPLY_REJECT, PROCESS_APPLY_VERIFY, PROCESS_ASSIGNED, PROCESS_END, PROCESS_START } from '@/utils/biz';
+import { getApplyNum } from '@/services/taissueapply';
 import Head from './components/Head';
 import Banner from './components/Banner';
 import StatCard from './components/StatCard';
 import './index.less';
 
+const getRejctApply = () => getApplyNum({ applyType: PROCESS_APPLY_REJECT });
+const getDelayApply = () => getApplyNum({ applyType: PROCESS_APPLY_DELAY });
+const getVerifyApply = () => getApplyNum({ applyType: PROCESS_APPLY_VERIFY });
+const getEdnApply = () => getApplyNum({ applyType: PROCESS_APPLY_END });
+
 const menus = {
   // 督查员
   [ROLE_INSPECTOR]: [
@@ -23,10 +29,10 @@ const menus = {
     { icon: 'icon1', text: '待 交 办', link: `/pages/issue/list2/index?title=待交办&bizStatus=${PROCESS_START}` },
     { icon: 'icon2', text: '已 交 办', link: `/pages/issue/list2/index?title=已交办&bizStatus=${PROCESS_ASSIGNED}`, },
     { icon: 'icon3', text: '已 办 结', link: `/pages/issue/list2/index?title=已办结&bizStatus=${PROCESS_END}` },
-    { icon: 'icon4', text: '消单申请', link: `/pages/apply/list/index?title=消单申请&applyType=${PROCESS_APPLY_END}` },
+    { icon: 'icon4', text: '消单申请', request: getEdnApply, link: `/pages/apply/list/index?title=消单申请&applyType=${PROCESS_APPLY_END}` },
     { icon: 'icon5', text: '逾期警告', link: `/pages/issue/list2/index?title=逾期警告&bizStatus=expired` },
-    { icon: 'icon6', text: '延期申请', link: `/pages/apply/list/index?title=延期申请&applyType=${PROCESS_APPLY_DELAY}` },
-    { icon: 'icon12', text: '驳回申请', link: `/pages/apply/list/index?title=驳回申请&applyType=${PROCESS_APPLY_REJECT}` },
+    { icon: 'icon6', text: '延期申请', request: getDelayApply, link: `/pages/apply/list/index?title=延期申请&applyType=${PROCESS_APPLY_DELAY}` },
+    { icon: 'icon12', text: '驳回申请', request: getRejctApply, link: `/pages/apply/list/index?title=驳回申请&applyType=${PROCESS_APPLY_REJECT}` },
     { icon: 'icon7', text: '统计查询', link: '/subpkg1/pages/statistics/index' },
     { icon: 'icon9', text: '我的上报', link: '/pages/issue/list2/index?title=我的上报&mine=true' },
     { icon: 'icon11', text: '消息通知', link: '/pages/message/list/index' },
@@ -45,8 +51,9 @@ const menus = {
     { 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}` },
     { icon: 'icon5', text: '已 逾 期', link: '/pages/org/issue/list/index?title=已办结&bizStatus=expired' },
-    { icon: 'icon9', text: '审核申请', link: `/pages/apply/list/index?title=审核申请&applyType=${PROCESS_APPLY_VERIFY}` },
+    { icon: 'icon9', text: '审核申请', request: getVerifyApply, link: `/pages/apply/list/index?title=审核申请&applyType=${PROCESS_APPLY_VERIFY}` },
     { icon: 'icon11', text: '消息通知', link: '/pages/message/list/index' },
+    { icon: 'person', text: '人员管理', link: '/pages/user/list/index' },
   ],
 
   // 查询人员
@@ -68,7 +75,7 @@ const menus = {
 export default (props) => {
 
   const userModel = useModel('user');
-  const { user, duty } = userModel || {};
+  const { user, duty, signOut, changePwd } = userModel || {};
 
   const menuArr = React.useMemo(() => {
     if (!duty) return [];
@@ -78,7 +85,11 @@ export default (props) => {
 
   return (
     <Page tabBar="home" className="home-page">
-      <Head userModel={userModel} />
+      <Head
+        userModel={userModel}
+        onChangePwd={changePwd}
+        onExit={signOut}
+      />
       <Banner duty={duty} />
       <StatCard duty={duty} />
 

src/pages/issue/components/Issue/index.jsx

@@ -144,8 +144,9 @@ export default (props) => {
       />
 
       <Map
+        readOnly={readOnly}
         location={formData.location}
-        onLocChange={e => !formData.location && setFieldChange('location', e)}
+        onChange={e => !formData.location && setFieldChange('location', e)}
       />
 
       <CellGroup>

src/pages/my/components/Head/index.jsx

@@ -1,20 +1,53 @@
 import React from 'react';
 import Taro from '@tarojs/taro';
 import { View, Image } from '@tarojs/components';
+import { ActionSheet } from '@antmjs/vantui';
+import ResetPwd from '../ResetPwd';
 import styles from './style.module.less';
 
 export default (props) => {
 
-  const { name, avatar } = props;
+  const { name, avatar, onChangePwd, onExit } = props;
+  const [show, setShow] = React.useState(false);
+  const [show2, setShow2] = React.useState(false);
+
+  const actions =[
+    { name: '重置密码', value: 'reset-pwd' },
+    { name: '退出', value: 'exit' },
+  ]
+
+  const onAction = (e) => {
+    const { value } = e.detail;
+
+    if (value === 'reset-pwd') {
+      setShow(false);
+      setShow2(true);
+    }
+
+    if (value === 'exit') {
+      onExit();
+    }
+  }
   
   return (
     <View className={styles['my-head-box']}>
       <View className={styles['profile-box']}>
-        <View className={styles['profile-avatar']}>
+        <View className={styles['profile-avatar']} onClick={() => setShow(true)}>
           <Image src={avatar} />
         </View>
         <View className={styles['profile-name']}>{name}</View>
       </View>
+      <ActionSheet
+        show={show}
+        actions={actions}
+        onClose={() => setShow(false)}
+        onSelect={onAction}
+      />
+      <ResetPwd
+        show={show2}
+        onClose={() => setShow2(false)}
+        onSubmit={onChangePwd}
+      />
     </View>
   )
 }

src/pages/my/components/ResetPwd/index.jsx

@@ -0,0 +1,82 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View } from '@tarojs/components';
+import { Dialog, CellGroup, Field, Button } from '@antmjs/vantui';
+import { warn } from '@/utils/message';
+
+export default (props) => {
+
+  const { show, onClose, onSubmit } = props;
+  const id = React.useMemo(() => {
+    return `dialog-${Math.random().toString(36).substring(2, 10)}`
+  }, []);
+
+  const [formData, setFormData] = React.useState({});
+
+  const setField = (name, value) => {
+    setFormData({
+      ...formData,
+      [name]: value,
+    })
+  }
+
+  const onConfirm = () => {
+    console.log(formData.newPassword)
+    try {
+      warn(formData.newPassword != formData.newPassword2, '两次新密码不一致');
+      warn(!formData.originPassword, '请输入原始密码');
+      warn(!formData.newPassword, '请输入新密码');
+    } catch (er) {
+      return ;
+    }
+
+    onClose();
+    onSubmit(formData);
+  }
+  
+  return (
+    <Dialog
+      showConfirmButton={false}
+      showCancelButton={false}
+      id={id}
+      show={show}
+      onClose={onClose}
+    >
+      <View style={{ padding: 'var(--main-space)', textAlign: 'center' }}>修改密码</View>
+      <CellGroup style={{ padding: 'var(--main-space)' }}>
+        <Field
+          required
+          label="原始密码"
+          type="password"
+          placeholder="请输入原始密码"
+          value={formData.originPassword}
+          onChange={(e) => setField('originPassword', e.detail)}
+        />
+        <Field
+          required
+          label="新密码"
+          type="password"
+          placeholder="请输入新密码"
+          value={formData.newPassword}
+          onChange={(e) => setField('newPassword', e.detail)}
+        />
+        <Field
+          required
+          label="确认密码"
+          type="password"
+          placeholder="请再次输入新密码"
+          value={formData.newPassword2}
+          onChange={(e) => setField('newPassword2', e.detail)}
+        />
+      </CellGroup>
+      <View style={{ display: 'flex', justifyContent: "space-around", alignItems: 'center' }}>
+        <View style={{ flex: 'none' }}>
+          <Button plain onClick={onClose}>取消</Button>
+        </View>
+        <View style={{ flex: 'none' }}>
+          <Button plain type="primary" onClick={onConfirm}>确定</Button>
+        </View>
+      </View>
+    </Dialog>
+  )
+}

src/pages/my/index.jsx

@@ -14,7 +14,7 @@ import styles from './style.module.less';
 
 export default (props) => {
 
-  const { user, person, duty, signOut } = useModel('user');
+  const { user, person, duty, signOut, changePwd } = useModel('user');
   const [org, setOrg] = React.useState();
 
   const [
@@ -51,6 +51,10 @@ export default (props) => {
     })
   }
 
+  const onChangePwd = (data) => {
+    changePwd(data);
+  }
+
   React.useEffect(() => {
     if (user) {
       getSysOrgById(user.orgId).then(setOrg);
@@ -62,6 +66,8 @@ export default (props) => {
       <Head
         avatar={user?.avatar || person?.avatar || logo}
         name={user?.name || person?.name || '市民先生'}
+        onChangePwd={onChangePwd}
+        onExit={onExit}
       />
       <View className={styles['bg-menu-box']}>
         {
@@ -82,10 +88,6 @@ export default (props) => {
           )
         }
       </View>
-      <View className={styles.exit} onClick={onExit}>
-        退出
-        <Image src={iconExit} />
-      </View>
     </Page>
   )
 }

src/pages/reporting/detail/components/Issue.jsx

@@ -1,20 +0,0 @@
-import React from 'react';
-import { View } from '@tarojs/components';
-import style from './issue.module.less';
-
-export default (props) => {
-  
-  return (
-    <View className={style['issue-container']}>
-      <View class={style.card}>
-        <View className={style.title}>状态</View>
-      </View>
-      <View class={style.card}>
-        <View className={style.title}>问题描述</View>
-      </View>
-      <View class={style.card}>
-        <View className={style.title}>拍照</View>
-      </View>
-    </View>
-  )
-}

src/pages/reporting/detail/components/Map.jsx

@@ -1,17 +0,0 @@
-import React from 'react';
-import { View } from '@tarojs/components';
-import Map from '@/components/map';
-import style from './map.module.less';
-
-export default (props) => {
-  const { location } = props;
-  
-  return (
-    <View className={style['map-box']}>
-      <Map location={location} />
-      <View className={style.address}>
-        阳光丽景小区
-      </View>
-    </View>
-  )
-}

src/pages/reporting/detail/components/issue.module.less

@@ -1,21 +0,0 @@
-
-.issue-container {
-  margin-top: var(--main-space);
-
-  .card {
-    background: #fff;
-    padding: 0 var(--main-space);
-
-    & + .card {
-      margin-top: 2.67vw;
-    }
-  }
-
-  .title {
-    height: 90px;
-    font-size: 32px;
-    font-weight: bold;
-    color: #202020;
-    line-height: 90px;
-  }
-}

src/pages/reporting/detail/components/map.module.less

@@ -1,16 +0,0 @@
-
-.map-box {
-  width: 100vw;
-
-  .address {
-    width: 100%;
-    background: #fff;
-    height: 90px;
-    font-size: 24px;
-    font-weight: 500;
-    color: #202020;
-    line-height: 90px;
-    padding: 0 var(--main-space);
-  }
-  
-}

src/pages/reporting/detail/index.config.js

@@ -1,3 +0,0 @@
-export default definePageConfig({
-  navigationBarTitleText: '详情'
-})

src/pages/reporting/detail/index.jsx

@@ -1,41 +0,0 @@
-import React from 'react';
-import Taro from '@tarojs/taro';
-import { View } from '@tarojs/components';
-import { Notify } from '@antmjs/vantui';
-import Page from '@/layouts/index';
-import getAuthorize from '@/utils/authorize';
-import Map from './components/Map';
-import Issue from './components/Issue';
-
-export default (props) => {
-
-  const [loc, setLoc] = React.useState();
-
-  React.useMemo(() => {
-    getAuthorize('scope.userLocation').then(() => {
-      Taro.getLocation({
-        success(res) {
-          setLoc(`${res.longitude},${res.latitude}`);
-        },
-        fail() {
-          Notify.show({
-            message: '获取位置失败, 请退出重试',
-            type: 'warning',
-          })
-        }
-      });
-    }).catch((err) => {
-      Notify.show({
-        message: '未能获取位置, 程序部分功能将不能正常使用',
-        type: 'warning',
-      })
-    });
-  }, []);
-
-  return (
-    <Page>
-      <Map location={loc} />
-      <Issue />
-    </Page>
-  )
-}

src/pages/reporting/index.config.js

@@ -1,3 +0,0 @@
-export default definePageConfig({
-  navigationBarTitleText: '我的上报'
-})

src/pages/reporting/index.jsx

@@ -1,9 +0,0 @@
-import React from 'react';
-import { View } from '@tarojs/components';
-
-export default (props) => {
-  
-  return (
-    <View></View>
-  )
-}

src/pages/user/add/index.jsx

@@ -0,0 +1,112 @@
+import React from "react";
+import Taro from "@tarojs/taro";
+import { View } from "@tarojs/components";
+import Page from "@/layouts/index";
+import {
+  Button,
+  Field,
+  Cell,
+  CellGroup,
+  CheckboxGroup,
+  Checkbox,
+} from "@antmjs/vantui";
+import { ROLE_ORG_MANAGER, ROLE_ORG_USER } from "@/utils/user";
+
+import { warn } from "@/utils/message";
+import { postSysUser } from "@/services/sysuser";
+
+export default (props) => {
+  const [loading, setLoading] = React.useState(false);
+  const [identity, setIdentity] = React.useState([]);
+  const [formData, setFormData] = React.useState({});
+
+  const setField = (name, value) => {
+    setFormData((data) => ({
+      ...data,
+      [name]: value,
+    }));
+  };
+  const onSubmit = () => {
+    try {
+      warn(!formData.name, "请填写姓名");
+      warn(!formData.phone, "请填写手机号");
+      warn(identity.length < 1, "请选择身份");
+    } catch (e) {
+      return;
+    }
+
+    setLoading(true);
+    postSysUser({ ...formData, dutyList: identity })
+      .then(() => {
+        setLoading(false);
+        Taro.navigateBack({
+          delta: 1,
+          fail: () => {
+            Taro.reLaunch({
+              url: "/pages/user/list/index",
+            });
+          },
+        });
+      })
+      .catch(() => {
+        setLoading(false);
+      });
+  };
+
+  return (
+    <Page>
+      <CellGroup>
+        <Field
+          required
+          label="姓名"
+          placeholder="请输入姓名"
+          value={formData.name}
+          onChange={(e) => setField("name", e.detail)}
+        />
+        <Field
+          required
+          label="手机号"
+          placeholder="请输入手机号"
+          value={formData.phone}
+          onChange={(e) => setField("phone", e.detail)}
+        />
+        <Cell
+          title="身份"
+          required
+          titleWidth="100px"
+          titleStyle={{
+            maxWidth: "6.2em",
+            minWidth: "6.2em",
+            marginRight: "12px",
+          }}
+        >
+          <View style={{ display: "flex" }}>
+            <CheckboxGroup
+              direction="horizontal"
+              value={identity}
+              onChange={(e) => {
+                console.info(e);
+                setIdentity([...e.detail]);
+              }}
+            >
+              <Checkbox name={ROLE_ORG_USER}>单位人员</Checkbox>
+              <Checkbox name={ROLE_ORG_MANAGER}>单位管理员</Checkbox>
+            </CheckboxGroup>
+          </View>
+        </Cell>
+
+        {/* // 单位人员
+export const ROLE_ORG_USER = 'org_user';
+
+// 单位管理员
+export const ROLE_ORG_MANAGER = 'org_manager'; */}
+      </CellGroup>
+
+      <View style={{ padding: "var(--main-space)", background: "#fff" }}>
+        <Button block type="primary" loading={loading} onClick={onSubmit}>
+          提交
+        </Button>
+      </View>
+    </Page>
+  );
+};

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

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

src/pages/user/list/index.jsx

@@ -0,0 +1,82 @@
+import React from "react";
+import Taro from "@tarojs/taro";
+import { View } from "@tarojs/components";
+import { Cell, Button, Dialog } from "@antmjs/vantui";
+import Page from "@/layouts/index";
+import PowerList from "@/components/PowerList";
+import { getSysUser, deleteSysUser } from "@/services/sysuser";
+import styles from "./index.module.less";
+
+export default (props) => {
+  const [loading, setLoading] = React.useState(false);
+  const listRef = React.useRef();
+
+  const onAdd = () => {
+    Taro.navigateTo({
+      url: "/pages/user/add/index",
+    });
+  };
+
+  const onDelete = (user) => {
+    Dialog.confirm({
+      title: "确认删除用户?",
+    }).then((e) => {
+      const { action } = e.detail;
+      if (action === "confirm") {
+        setLoading(true);
+        deleteSysUser(user.id)
+          .then(() => {
+            setLoading(false);
+
+            // 刷新列表
+            listRef.current.refresh();
+          })
+          .catch(() => {
+            setLoading(false);
+          });
+      }
+    });
+  };
+
+  return (
+    <Page loading={loading}>
+      <view className={styles["user-warpper"]}>
+        <view className={styles["user-warpper-list"]}>
+          <PowerList
+            ref={listRef}
+            request={getSysUser}
+            onLoadingChange={setLoading}
+            renderItem={(item) => (
+              <Cell
+                key={item.userId}
+                title={item.name}
+                label={item.createDate.substring(0, 10)}
+              >
+                <Button
+                  plain
+                  type="danger"
+                  size="small"
+                  onClick={() => onDelete(item)}
+                >
+                  删除
+                </Button>
+              </Cell>
+            )}
+          />
+        </view>
+
+        <Button
+          type="primary"
+          size="large"
+          onClick={() => onAdd()}
+          style={{
+            margin: "var(--main-space)",
+            width: "calc(100% - var(--main-space) * 2)",
+          }}
+        >
+          添加
+        </Button>
+      </view>
+    </Page>
+  );
+};

src/pages/user/list/index.module.less

@@ -0,0 +1,12 @@
+// height: calc(100% - env(safe-area-inset-bottom));
+.user-warpper {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  .user-warpper-list {
+    height: calc(100% - 78px);
+  }
+  .user-warpper-btn {
+    width: 100%;
+  }
+}

src/services/sysuser.js

@@ -0,0 +1,21 @@
+import request from '@/utils/request';
+
+/*
+ * 分页查询
+ */
+export const getSysUser = (params) => request('/api/ma/sysUser', { params });
+
+/*
+ * 新增数据
+ */
+export const postSysUser = (data) => request('/api/ma/sysUser', { data, method: 'post' });
+
+/*
+ * 通过主键删除数据
+ */
+export const deleteSysUser = (id) => request(`/api/ma/sysUser/${id}`, { method: 'delete' });
+
+/*
+ * 修改密码
+ */
+export const changePassword = (data) => request('/api/ma/sysUser/change-password', { method: 'put', data });

src/services/taissueapply.js

@@ -27,3 +27,5 @@ export const putTaIssueApply = (id, data) => request(`/api/taIssueApply/${id}`,
  * 通过主键删除数据
  */
 export const deleteTaIssueApply = (id) => request(`/api/taIssueApply/${id}`, { method: 'delete' });
+
+export const getApplyNum = params => request('/api/taIssueApply/nums', { params });

src/store/user.js

@@ -2,6 +2,7 @@ import React from 'react';
 import Taro from '@tarojs/taro';
 import md5 from 'md5';
 import { login, signin, currentUser, authPhone, authUser } from '@/services/wxma';
+import { changePassword } from '@/services/sysuser';
 import { ROLE_CITIZEN } from '@/utils/user';
 
 export default function useUser() {
@@ -75,6 +76,15 @@ export default function useUser() {
     initDuty([]);
   }
 
+  const changePwd = (params) => {
+    const data = {
+      originPassword: md5(params.originPassword),
+      newPassword: md5(params.newPassword),
+    }
+
+    changePassword(data);
+  }
+
   return {
     user,
     person,
@@ -86,5 +96,6 @@ export default function useUser() {
     signinByPhone,
     authProfile,
     signOut,
+    changePwd,
   }
 }

src/utils/authorize.js

@@ -25,10 +25,11 @@ export default function getAuthorize(scope) {
   });
 }
 
-export const getLocation = () => {
+export const getLocation = (options) => {
   return new Promise((resolve, reject) => {
     getAuthorize('scope.userLocation').then(() => {
       Taro.getLocation({
+        ...options || {},
         success(res) {
           resolve(res);
         },