Merge branch 'master' of http://git.ycjcjy.com/civilized_city/miniapp

config/dev.js

@@ -3,8 +3,8 @@ 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"'
   },
   mini: {},
   h5: {}

src/app.config.js

@@ -3,10 +3,19 @@ export default defineAppConfig({
   pages: [
     'pages/home/index',
     'pages/login/index',
+    'pages/issue/list/index',
+    'pages/issue/list2/index',
+    '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/apply/detail/index',
+    'pages/message/list/index',
     'pages/index3/index',
     'pages/index4/index',
     'pages/index5/index',
-    'pages/issue/add/index',
     'pages/reporting/index',
     'pages/reporting/detail/index',
     'pages/reset-password/index',

src/app.less

@@ -12,12 +12,10 @@ page {
   --button-primary-background-color: var(--main-bg-color);
   // 菊花转主色
   --loading-spinner-color: var(--main-bg-color);
+  // tab 划线颜色
+  --tabs-bottom-bar-color: var(--main-bg-color);
 }
 
 view {
   box-sizing: border-box;
 }
-
-.page-wrapper {
-
-}

src/components/DatePicker/index.jsx

@@ -0,0 +1,19 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View } from '@tarojs/components';
+import { Popup, DatetimePicker } from '@antmjs/vantui';
+
+export default (props) => {
+  const { show, onCancel, onChange, ...leftProps } = props;
+
+  const onConfirm = (e) => {
+    const dt = new Date(e.detail.value);
+    onChange(dt);
+  }
+  
+  return (
+    <Popup show={show} position="bottom" onClose={onCancel}>
+      <DatetimePicker {...leftProps} onConfirm={onConfirm} />
+    </Popup>
+  )
+}

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/IssueCard/index.jsx

@@ -0,0 +1,59 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import dayjs from 'dayjs';
+import { View, ScrollView, RichText, Image, Text } from '@tarojs/components';
+import { getIssueStatus } from '@/utils/biz';
+import icon from '@/assets/icons/marker.png';
+import style from './style.module.less';
+
+const colors = [
+  ['rgba(130, 176, 254, 0.08)', 'rgba(52, 121, 237, 1)'], // 未交办
+  ['rgba(51, 218, 156, 0.08)', 'rgba(26, 117, 101, 1)'], // 已交办
+  ['rgba(251, 157, 75, 0.08)', 'rgba(232, 116, 16, 1)'], // 已办结
+  ['rgba(255, 245, 245, 1)', 'rgba(255, 76, 76, 1)'], // 已逾期
+  ['transparent', 'rgba(159, 159, 159, 1)'], // 已打回
+]
+
+export default (props) => {
+
+  const { detail, onClick, color, stText } = props;
+
+  const [
+    content,
+    createDate,
+    styleColor,
+    statusTxt,
+  ] = React.useMemo(() => {
+    if (!detail) return [];
+
+    const {value : bizStatus = 0, label : statusText} = getIssueStatus(detail);
+
+    return [
+      (detail.issueContent || detail.content || '').replace('\r\n', '<br>').replace('\n', '<br>'),
+      dayjs(detail.createDate).format('YYYY-MM-DD HH:mm'),
+      colors[color ?? bizStatus],
+      stText || statusText,
+    ];
+  }, [detail, color, stText]);
+  
+  return (
+    <View className={style['issue-card-wrapper']} onClick={onClick}>
+      <View className={style['issue-card-header']}>
+        <View>问题:</View>
+        <View>{createDate}</View>
+      </View>
+      <View className={style['issue-card-body']} style={{ backgroundColor: styleColor[0] }}>
+        <ScrollView scrollY style={{ height: '100%' }}>
+          <RichText nodes={content} />
+        </ScrollView>
+      </View>
+      <View className={style['issue-card-footer']}>
+        <View>
+          <Image src={icon} />
+          <Text>{detail?.issueAddr || detail?.addr || ''}</Text>
+        </View>
+        <View style={{ color: styleColor[1] }}>{statusTxt}</View>
+      </View>
+    </View>
+  )
+}

src/components/IssueCard/style.module.less

@@ -0,0 +1,64 @@
+
+.issue-card-wrapper {
+  width: calc(100% - var(--main-space) * 2);
+  margin: var(--main-space);
+  background: #FFFFFF;
+  box-shadow: 0px 18px 22px 1px rgba(0,0,0,0.06);
+  border-radius: 8px;
+  padding: 20px 20px 40px 20px;
+
+  .issue-card-header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+
+    & > view {
+      flex: 1;
+      font-size: 24px;
+      line-height: 42px;
+      color: #202020;
+
+      &:last-child {
+        flex: none;
+        font-size: 20px;
+        color: #222;
+      }
+    }
+  }
+
+  .issue-card-body {
+    padding: 20px;
+    font-size: 24px;
+    color: #333;
+    line-height: 54px;
+    height: 252px;
+    margin-top: calc(var(--main-space) / 2);
+  }
+
+  .issue-card-footer {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    
+    font-size: 24px;
+    line-height: 32px;
+    color: #202020;
+    margin-top: var(--main-space);
+
+    image {
+      display: inline-block;
+      width: 25px;
+      height: 29px;
+      margin-right: 10px;
+      vertical-align: middle;
+    }
+    
+    & > view {
+      flex: 1;
+
+      &:last-child {
+        flex: none;
+      }
+    }
+  }
+}

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/NavLoading/index.jsx

@@ -0,0 +1,60 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View } from '@tarojs/components';
+import style from './style.module.less';
+
+export default (props) => {
+
+  const { loading } = props;
+  const [percent, setPercent] = React.useState(0);
+  const percentRef = React.useRef(0);
+  const tickerRef = React.useRef();
+  const startRef = React.useRef(false);
+
+  React.useEffect(() => {
+    if (loading) {
+      startRef.current = true;
+      
+      // 先前进一点, 大约 3s 内走 94%
+      const firstS = 94;
+      const startS = 4;
+      percentRef.current = startS;
+      setPercent(percentRef.current);
+
+      const step = (firstS - startS) / 300;
+      tickerRef.current = setInterval(() => {
+        percentRef.current += step;
+        setPercent(percentRef.current);
+
+        if (percentRef.current >= 94) {
+          clearInterval(tickerRef.current);
+          tickerRef.current = null;
+        }
+      }, 100);
+    } else {
+      // 还没开始
+      if (!startRef.current) return ;
+
+      // 剩下的在 200ms 内走完
+      clearInterval(tickerRef.current);
+      const leftS = 100 - percentRef.current;      
+      const step = leftS / 20;
+      tickerRef.current = setInterval(() => {  
+        percentRef.current += step;
+        setPercent(percentRef.current);
+
+        if (percentRef.current >= 100) {
+          clearInterval(tickerRef.current);
+          tickerRef.current = null;
+          startRef.current = false;
+        }
+      }, 10);
+    }
+  }, [loading]);
+  
+  return (
+    <View className={`${style['nav-loading']} ${percent >= 100 ? style.hidden : ''}`}>
+      <View className={style['nav-loading-bar']} style={{ width: `${percent}%` }}></View>
+    </View>
+  )
+}

src/components/NavLoading/style.module.less

@@ -0,0 +1,22 @@
+
+.nav-loading {
+  position: fixed;
+  z-index: 1000;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 6px;
+  background: transparent;
+  opacity: 1;
+  transition: opacity 200ms;
+
+  &.hidden {
+    opacity: 0;
+  }
+
+  .nav-loading-bar {
+    width: 0%;
+    height: 100%;
+    background-color: var(--main-bg-color);
+  }
+}

src/components/OrgPicker/index.jsx

@@ -0,0 +1,9 @@
+import React from 'react';
+import Pickerful from '@/components/Pickerful';
+import { getSysOrg } from '@/services/sysorg';
+
+export default (props) => {
+  return (
+    <Pickerful {...props} keyValue="orgId" dictAPI={getSysOrg} />
+  )
+}

src/components/Pickerful/style.module.less

@@ -2,6 +2,7 @@
 .pickerful-box {
   width: 90vw;
   height: 100vh;
+  padding-bottom: env(safe-area-inset-bottom);
   display: flex;
   flex-direction: column;
 

src/components/PowerList/index.jsx

@@ -0,0 +1,64 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View } from '@tarojs/components';
+import { PowerScrollView } from '@antmjs/vantui';
+
+export default (props) => {
+  const { request, params, renderItem } = props;
+
+  const pageSize = 20;
+  const pageNumRef = React.useRef(1);
+  const listRef = React.useRef([]);
+  const [list, setList] = React.useState([]);
+  const [finished, setFinished] = React.useState(true);
+  listRef.current = list;
+
+  const queryData = React.useCallback((options = {}) => {
+    return new Promise((resolve, reject) => {
+      request({
+        pageSize,
+        ...(params || {}),
+        ...options
+      }).then((res) => {
+        const { records, current, pages } = res;
+
+        if (current == 1) {
+          setList(records || []);
+        } else {
+          setList(listRef.current.concat(records || []));
+        }
+
+        setFinished(current >= pages);
+        resolve();
+      }).catch((err) => {
+        reject(err);
+      });
+    });
+  }, [request, params]);
+
+  const onScrollToLower = React.useCallback((event = 0, isRefresh = false) => {
+    pageNumRef.current += 1;
+    return queryData({pageNum : pageNumRef.current});
+  }, [queryData]);
+
+  React.useEffect(() => {
+    pageNumRef.current = 1;
+    queryData({pageNum : pageNumRef.current});
+  }, [queryData])
+  
+  return (
+    <PowerScrollView
+      scrollY
+      finishedText="没有更多了"
+      refresherEnabled={false}
+      current={list.length}
+      pageSize={pageSize}
+      finished={finished}
+      onScrollToLower={onScrollToLower}
+    >
+      {
+        list.map(renderItem)
+      }
+    </PowerScrollView>
+  )
+}

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/components/Uploader/index.jsx

@@ -10,13 +10,15 @@ import style from './style.modules.less';
 export default (props) => {
   // value 为数组
   // 单个元素结构为 { url, fileType }
-  const { value = [], onChange } = props;
+  const { value, disabled = false, onChange } = props;
   const [loading, setLoading] = React.useState(false);
 
   const onAdd = (e) => {
     e.preventDefault();
     e.stopPropagation();
 
+    if (disabled) return;
+
     setLoading(true);
     Taro.chooseMedia({
       maxDuration: 60,
@@ -25,7 +27,7 @@ export default (props) => {
         const { tempFiles } = res;
         uploadFiles(tempFiles).then(resp => {
           setLoading(false);          
-          onChange(value.concat(resp));
+          onChange((value || []).concat(resp));
         }).catch((err) => {
           console.error(err);
           setLoading(false);
@@ -53,27 +55,35 @@ export default (props) => {
   return (
     <View className={style['uploader-wrapper']}>
       <View className={style['uploader-box']}>
-        <View className={style['uploader-add']}>
-          <Image src={icon} onClick={onAdd} />
-          {
-            loading && (
-              <View>
-                <Loading color="#fff" />
-              </View>
-            )
-          }
-        </View>
         {
-          value.map((item, inx) => (
+          !disabled && (
+            <View className={style['uploader-add']}>
+              <Image src={icon} onClick={onAdd} />
+              {
+                loading && (
+                  <View>
+                    <Loading color="#fff" />
+                  </View>
+                )
+              }
+            </View>
+          )
+        }
+        {
+          (value || []).map((item, inx) => (
             <View key={item.url} className={style['uploader-item']}>
               {
                 item.fileType == 'image' ?
                   <Image src={item.url} onClick={() => onPreview(inx)} /> :
                   <Video src={item.url} controls={false} onClick={() => onPreview(inx)} />
               }
-              <View onClick={() => onDelete(item)}>
-                <Image src={closeIcon} />
-              </View>
+              {
+                !disabled && (
+                  <View onClick={() => onDelete(item)}>
+                    <Image src={closeIcon} />
+                  </View>
+                )
+              }
             </View>
           ))
         }

src/components/map/index.jsx

@@ -1,29 +1,57 @@
 import React from 'react';
-import { View, Map, Marker } from '@tarojs/components';
+import Taro from '@tarojs/taro';
+import { View, Map } from '@tarojs/components';
+import { getLocation } from '@/utils/authorize';
 import iconPath from '@/assets/icons/marker.png';
 import style from './style.module.less';
 
 export default (props) => {
-  const { location = '' } = props;
-  const {lng, lat} = location.split(',');
+  const { location } = props;
+
+  const [currentPos, setCurPos] = React.useState();
+  const [lngLat, setLngLat] = React.useState([,]);
 
   const markers = React.useMemo(() => {
-    if (lng == undefined || lat == undefined) return [];
-  
+    if (!location && !currentPos) return [];
+    
+    let longitude, latitude;
+    if (location) {
+      const [lng, lat] = location.split(',');
+      longitude = lng - 0;
+      latitude = lat - 0;
+    } else {
+      longitude = currentPos.longitude;
+      latitude = currentPos.latitude;
+    }
+
+    setLngLat([longitude, latitude]);
+
     return [{
-      longitude: lng - 0,
-      latitude: lat - 0,
+      id: 1,
+      longitude,
+      latitude,
       iconPath,
-      width: 50,
-      height: 58
+      width: 17,
+      height: 20
     }];
-  }, [lng, lat]);
+  }, [location, currentPos]);
+  
+  React.useEffect(() => {
+    getLocation().then((res) => {
+      setCurPos(res);
+    }).catch((err) => {
+      Taro.showToast({
+        title: '定位失败',
+        icon: 'none',
+      })
+    });
+  }, []);
   
   return (
     <View className={style['map-wrapper']}>
       <Map
-        longitude={lng}
-        latitude={lat}
+        longitude={lngLat[0]}
+        latitude={lngLat[1]}
         markers={markers}
       ></Map>
     </View>

src/layouts/TabBar.jsx

@@ -2,6 +2,14 @@ import React from 'react';
 import Taro from '@tarojs/taro';
 import { Image } from '@tarojs/components';
 import { Tabbar, TabbarItem } from '@antmjs/vantui';
+import {
+  ROLE_INSPECTOR,
+  ROLE_MANAGER,
+  ROLE_ORG_USER,
+  ROLE_ORG_MANAGER,
+  ROLE_QUERY_PERSON,
+  ROLE_CITIZEN
+} from '@/utils/user';
 import homeIcon from '@/assets/tabbar/page.png';
 import homeActiveIcon from '@/assets/tabbar/page click.png';
 import noticeIcon from '@/assets/tabbar/notice.png';
@@ -13,21 +21,74 @@ import checkActiveIcon from '@/assets/tabbar/evaluation click.png';
 import mineIcon from '@/assets/tabbar/my.png';
 import mineActiveIcon from '@/assets/tabbar/my click.png';
 
-const tabPages = {
-  home: '/pages/home/index',
-  notice: '/pages/index3/index',
-  issue: '/pages/issue/add/index',
-  check: '/pages/index4/index',
-  mine: '/pages/index5/index',
+const home = {
+  name: 'home',
+  label: '首页',
+  icon: homeIcon,
+  activeIcon: homeActiveIcon,
+  page: '/pages/home/index'
+}
+const notice = {
+  name: 'notice',
+  label: '公告',
+  icon: noticeIcon,
+  activeIcon: noticeActiveIcon,
+  page: '/pages/index3/index'
+}
+const issue = {
+  name: 'issue',
+  label: '发布',
+  icon: issueIcon,
+  activeIcon: issueActiveIcon,
+  page: '/pages/issue/edit/index'
+}
+const check = {
+  name: 'check',
+  label: '测评标准',
+  icon: checkIcon,
+  activeIcon: checkActiveIcon,
+  page: '/pages/index4/index'
+}
+const mine = {
+  name: 'mine',
+  label: '我的',
+  icon: mineIcon,
+  activeIcon: mineActiveIcon,
+  page: '/pages/index5/index'
 }
 
 export default (props) => {
-  const { active = -1, className } = props;
+  const { active = -1, className, user } = props;
+
+  const tabItems = React.useMemo(() => {
+    if (!user) return [];
+    
+    if (user.dutyList.indexOf(ROLE_INSPECTOR) > -1 // 督察员
+      || user.dutyList.indexOf(ROLE_MANAGER) > -1 // 管理员
+    ) {
+      return [
+        home,
+        notice,
+        issue,
+        check,
+        mine
+      ]
+    }
+
+    if (user.dutyList.indexOf(ROLE_ORG_USER) > -1) {
+      return [
+        home,
+        notice,
+        mine,
+      ]
+    }
+
+    return [];
+  }, [user]);
 
   const onChange = (e) => {
-    Taro.reLaunch({
-      url: tabPages[e.detail]
-    })
+    const url = tabItems.filter(x => x.name === e.detail)[0].page;
+    Taro.reLaunch({ url })
   }
 
   return (
@@ -37,101 +98,30 @@ export default (props) => {
       active={active}
       onChange={onChange}
     >
-      <TabbarItem
-        name="home"
-        renderIcon={
-          <Image
-            src={homeIcon}
-            mode="aspectFit"
-            style="width: 30px; height: 18px;"
-          ></Image>
-        }
-        renderIconActive={
-          <Image
-            src={homeActiveIcon}
-            mode="aspectFit"
-            style="width: 30px; height: 18px;"
-          ></Image>
-        }
-      >
-        首页
-      </TabbarItem>
-      <TabbarItem
-        name="notice"
-        renderIcon={
-          <Image
-            src={noticeIcon}
-            mode="aspectFit"
-            style="width: 30px; height: 18px;"
-          ></Image>
-        }
-        renderIconActive={
-          <Image
-            src={noticeActiveIcon}
-            mode="aspectFit"
-            style="width: 30px; height: 18px;"
-          ></Image>
-        }
-      >
-        公告
-      </TabbarItem>
-      <TabbarItem
-        name="issue"
-        renderIcon={
-          <Image
-            src={issueIcon}
-            mode="aspectFit"
-            style="width: 30px; height: 18px;"
-          ></Image>
-        }
-        renderIconActive={
-          <Image
-            src={issueActiveIcon}
-            mode="aspectFit"
-            style="width: 30px; height: 18px;"
-          ></Image>
-        }
-      >
-        发布
-      </TabbarItem>
-      <TabbarItem
-        name="check"
-        renderIcon={
-          <Image
-            src={checkIcon}
-            mode="aspectFit"
-            style="width: 30px; height: 18px;"
-          ></Image>
-        }
-        renderIconActive={
-          <Image
-            src={checkActiveIcon}
-            mode="aspectFit"
-            style="width: 30px; height: 18px;"
-          ></Image>
-        }
-      >
-        测评标准
-      </TabbarItem>
-      <TabbarItem
-        name="mine"
-        renderIcon={
-          <Image
-            src={mineIcon}
-            mode="aspectFit"
-            style="width: 30px; height: 18px;"
-          ></Image>
-        }
-        renderIconActive={
-          <Image
-            src={mineActiveIcon}
-            mode="aspectFit"
-            style="width: 30px; height: 18px;"
-          ></Image>
-        }
-      >
-        我的
-      </TabbarItem>
+      {
+        tabItems.map(item => (
+          <TabbarItem
+            key={item.name}
+            name={item.name}
+            renderIcon={
+              <Image
+                src={item.icon}
+                mode="aspectFit"
+                style="width: 30px; height: 18px;"
+              ></Image>
+            }
+            renderIconActive={
+              <Image
+                src={item.activeIcon}
+                mode="aspectFit"
+                style="width: 30px; height: 18px;"
+              ></Image>
+            }
+          >
+            {item.label}
+          </TabbarItem>
+        ))
+      }
     </Tabbar>
   )
 }

src/layouts/index.jsx

@@ -2,17 +2,18 @@ import React from 'react';
 import Taro from '@tarojs/taro';
 import { View, Image } from '@tarojs/components';
 import { useModel } from '@/store';
-import { Loading } from '@antmjs/vantui';
+import { Loading, Notify } from '@antmjs/vantui';
+import NavLoading from '@/components/NavLoading';
 import Auth from '@/components/Auth';
 import TabBar from './TabBar';
 import laySty from './layout.module.less';
 
 export default (props) => {
-  const { className, style, roles, tabBar = false } = props;
+  const { className, style, roles, tabBar = false, loading } = props;
 
   const { person, user } = useModel('user');
 
-  const classNames = `${laySty['page-wrapper']} ${className}`;
+  const conatinerClass = `${laySty['page-conatiner']} ${tabBar ? laySty['with-tabbar'] : ''} ${className}`;
 
   React.useEffect(() => {
     if (person && !user) {
@@ -26,8 +27,10 @@ export default (props) => {
   }, [person, user]);
 
   return (
-    <View className={classNames} style={style}>
-      <View className={laySty['page-conatiner']}>
+    <View className={laySty['page-wrapper']}>
+      <Notify id="vanNotify" />
+      <NavLoading loading={loading} />
+      <View className={conatinerClass} style={style}>
         {
           !person && (
             <View className={laySty.loading}>
@@ -40,9 +43,15 @@ export default (props) => {
         <Auth roles={roles}>
           {props.children}
         </Auth>
+
+        {
+          !tabBar && (
+            <View className={laySty['pdm-space']}></View>
+          )
+        }
       </View>
       {
-        tabBar && <TabBar className={laySty['page-tabbar']} active={tabBar} />
+        tabBar && <TabBar className={laySty['page-tabbar']} active={tabBar} user={user} />
       }
     </View>
   )

src/layouts/layout.module.less

@@ -8,8 +8,17 @@
 
   .page-conatiner {
     width: 100%;
-    height: calc(100% - var(--tabbar-height, 100rpx));
-    overflow: hidden;
+    height: 100%;
+
+    &.with-tabbar {
+      overflow-y: scroll;
+      // height: calc(100% - var(--tabbar-height, 100rpx));
+      padding-bottom: var(--tabbar-height, 100rpx);
+    }
+
+    .pdm-space {
+      height: var(--main-space);
+    }
   }
 
   .page-tabbar {

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

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

src/pages/apply/apply/index.jsx

@@ -0,0 +1,118 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View } from '@tarojs/components';
+import Page from '@/layouts/index';
+import { Cell, CellGroup, Field, Button } from '@antmjs/vantui';
+import DatePicker from '@/components/DatePicker';
+import { getDateStr } from '@/utils/date';
+import { postTaIssueApply } from '@/services/taissueapply';
+import { warn } from '@/utils/message';
+import Issue from '../components/Issue';
+
+const today = new Date();
+export default (props) => {
+
+  const router = Taro.useRouter();
+  const { issueId, applyType } = router.params;
+
+  const [loading, setLoading] = React.useState(false);
+
+  React.useMemo(() => {
+    switch (applyType) {
+      case 'delay':
+        Taro.setNavigationBarTitle('申请延期');
+        break;
+      case 'reject':
+        Taro.setNavigationBarTitle('申请驳回');
+        break;
+      case 'verify':
+        Taro.setNavigationBarTitle('申请审核');
+        break;
+      case 'end':
+        Taro.setNavigationBarTitle('申请办结');
+        break;
+    }
+  }, [applyType]);
+
+  
+  const [submitting, setSubmitting] = React.useState(false);
+  const [formData, setFormData] = React.useState({});
+  const [showDatePicker, setShowDatePicker] = React.useState(false);
+
+  const setFieldValue = (key, value) => {
+    setFormData({
+      ...formData,
+      [key]: value,
+    })
+  }
+  
+  const onDateChange = (dt) => {
+    const date = getDateStr(dt);
+    setFieldValue('content', date);
+    setShowDatePicker(false);
+  }
+
+  const onSubmit = () => {
+    try {
+      if (applyType == 'delay') {
+        warn(!formData.content, '请选择延期时间');
+      }
+      warn(!formData.remark, '请填写申请说明');
+    } catch (e) {
+      return ;
+    }
+
+    const data = {
+      issueId,
+      applyType,
+      ...formData
+    }
+
+    setSubmitting(true);
+    postTaIssueApply(data).then(() => {
+      Taro.navigateBack({delta: 1});
+      setSubmitting(false);
+    }).catch(() => {
+      setSubmitting(false);
+    })
+  }
+  
+  
+  return (
+    <Page loading={loading}>
+      <Issue issueId={issueId} onLoading={setLoading} />
+      
+      <DatePicker
+        type="date"
+        minDate={today}
+        show={showDatePicker}
+        value={formData.content}
+        onCancel={() => setShowDatePicker(false)}
+        onChange={onDateChange}
+      />
+
+      <CellGroup style={{marginTop: '20px'}}>
+        {
+          applyType == 'delay' && (
+            <Cell
+              isLink
+              title="延期时间"
+              value={formData.content}
+              onClick={() => setShowDatePicker(true)}
+            />
+          )
+        }
+        <Cell title="申请说明" />
+        <Field
+          type="textarea"
+          autosize={{ minHeight: '120px' }}
+          value={formData.remark}
+          onChange={e => setFieldValue('remark', e.detail)}
+        />
+      </CellGroup>
+      <View style={{marginTop: '20px', padding: 'var(--main-space)'}}>
+        <Button block type="primary" loading={submitting} onClick={onSubmit}>提交申请</Button>
+      </View>
+    </Page>
+  )
+}

src/pages/apply/components/Issue.jsx

@@ -0,0 +1,60 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View } from '@tarojs/components';
+import { Cell, CellGroup, Field, Button } from '@antmjs/vantui';
+import Uploader from '@/components/Uploader/index';
+import { getTaIssueById } from '@/services/taissue';
+import { getDtStr } from '@/utils/date';
+
+export default (props) => {
+  const { issueId, onLoading } = props;
+
+  const [issue, setIssue] = React.useState({});
+
+  const setLoading = (val) => {
+    if (onLoading) {
+      onLoading(val);
+    }
+  }
+
+  React.useEffect(() => {
+    if (issueId) {
+      setLoading(true);
+      getTaIssueById(issueId).then((res) => {
+        setIssue(res);
+        setLoading(false);
+      }).catch(() => {
+        setLoading(false);
+      });
+    }
+  }, [issueId]);
+
+  return (
+    <>
+      <CellGroup>
+        <Cell title="上报时间" value={getDtStr(issue?.createDate)} />
+        <Cell title="办结时间" value={issue?.expireDate} />
+        <Cell title="交办次数" value={issue?.processNum || 1} />
+      </CellGroup>
+      <CellGroup style={{marginTop: '20px'}}>
+        <Cell title="抽检位置" value={issue?.locName} />
+        <Cell title="定 位 点" value={issue?.addr} />
+        <Cell title="问题详情" />        
+        <Field
+          readonly
+          type="textarea"
+          autosize={{ minHeight: '120px' }}
+          value={issue?.content}
+        /> 
+        <Cell
+          renderTitle={
+            <Uploader
+              disabled
+              value={issue?.attachList}
+            />
+          }
+        />
+      </CellGroup>
+    </>
+  )
+}

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

@@ -0,0 +1,4 @@
+// eslint-disable-next-line no-undef
+export default definePageConfig({
+  navigationBarTitleText: '审批详情'
+})

src/pages/apply/detail/index.jsx

@@ -0,0 +1,89 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View } from '@tarojs/components';
+import Page from '@/layouts/index';
+import { Cell, CellGroup, Field, Radio, RadioGroup } from '@antmjs/vantui';
+import { getTaIssueApplyById } from '@/services/taissueapply';
+import { getDtStr } from '@/utils/date';
+import Issue from '../components/Issue';
+
+// const today = new Date();
+export default (props) => {
+
+  const router = Taro.useRouter();
+  const { id, applyType, issueId } = router.params;
+
+  const [loading, setLoading] = React.useState(false);
+  const [applyInfo, setApplyInfo] = React.useState({});
+
+  React.useMemo(() => {
+    switch (applyType) {
+      case 'delay':
+        Taro.setNavigationBarTitle('延期申请');
+        break;
+      case 'reject':
+        Taro.setNavigationBarTitle('驳回申请');
+        break;
+      case 'verify':
+        Taro.setNavigationBarTitle('审核申请');
+        break;
+      case 'end':
+        Taro.setNavigationBarTitle('办结申请');
+        break;
+    }
+  }, [applyType]);
+  
+  React.useEffect(() => {
+    if (id) {
+      setLoading(true);
+      getTaIssueApplyById(id).then(res => {
+        setApplyInfo(res);
+        setLoading(false);
+      }).catch(() => {
+        setLoading(false);
+      });
+    }
+  }, [id]);
+  
+  return (
+    <Page loading={loading}>
+      <Issue issueId={issueId} />
+     
+      <CellGroup style={{marginTop: '20px'}}>
+        {
+          applyInfo.applyType == 'delay' && (
+            <Cell
+              title="延期日期"
+              value={applyInfo.content}
+            />
+          )
+        }
+        <Cell title="申请说明" />
+        <Field
+          readonly
+          type="textarea"
+          autosize={{ minHeight: '120px' }}
+          value={applyInfo.remark}
+        />
+      </CellGroup>
+     
+      <CellGroup style={{marginTop: '20px'}}>
+        <Cell
+          title="审批结果"
+          value={applyInfo.verifyStatus == 'pass' ? '通过' : '驳回'}
+        />
+        <Cell title="审批说明" />
+        <Field
+          readonly
+          type="textarea"
+          autosize={{ minHeight: '120px' }}
+          value={applyInfo.verifyDesc}
+        />
+        <Cell
+          title="审核日期"
+          value={getDtStr(applyInfo.verifyDate)}
+        />
+      </CellGroup>
+    </Page>
+  )
+}

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) => {
+    if (!user) return ;
+
+    if (user.dutyList.indexOf(ROLE_MANAGER) > -1) {
+      if (item.verifyStatus) {
+        Taro.navigateTo({
+          url: `/pages/apply/detail/index?id=${item.applyId}&issueId=${item.issueId}&applyType=${item.applyType}`
+        })
+      } else {
+        Taro.navigateTo({
+          url: `/pages/apply/verify/index?id=${item.applyId}&issueId=${item.issueId}&applyType=${item.applyType}`
+        })
+      }
+    } else {
+      Taro.navigateTo({
+        url: `/pages/apply/detail/index?id=${item.applyId}&issueId=${item.issueId}&applyType=${item.applyType}`
+      })
+    }
+  }
+  
+  return (
+    <Page>
+      <Tabs sticky>
+        <Tab title="监督员">
+          <PowerList
+            request={getTaIssueApply}
+            params={{applyType, sourceType: 'inspector'}}
+            renderItem={(item) => (
+              <Card key={item.issueId} detail={item} stText={title} onClick={() => onClick(item)} />
+            )}
+          />
+        </Tab>
+        <Tab title="市民">
+          <PowerList
+            request={getTaIssueApply}
+            params={{applyType, sourceType: 'feedback'}}
+            renderItem={(item) => (
+              <Card key={item.issueId} detail={item} stText={title} onClick={() => onClick(item)} />
+            )}
+          />
+        </Tab>
+      </Tabs>
+    </Page>
+  )
+}

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

@@ -0,0 +1,4 @@
+// eslint-disable-next-line no-undef
+export default definePageConfig({
+  navigationBarTitleText: '问题单审批'
+})

src/pages/apply/verify/index.jsx

@@ -0,0 +1,129 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View } from '@tarojs/components';
+import Page from '@/layouts/index';
+import { Cell, CellGroup, Field, Button, Radio, RadioGroup } from '@antmjs/vantui';
+import { putTaIssueApply, getTaIssueApplyById } from '@/services/taissueapply';
+import { warn } from '@/utils/message';
+import Issue from '../components/Issue';
+
+// const today = new Date();
+export default (props) => {
+
+  const router = Taro.useRouter();
+  const { id, applyType, issueId } = router.params;
+
+  const [loading, setLoading] = React.useState(false);
+  const [applyInfo, setApplyInfo] = React.useState({});
+
+  React.useMemo(() => {
+    switch (applyType) {
+      case 'delay':
+        Taro.setNavigationBarTitle('延期审批');
+        break;
+      case 'reject':
+        Taro.setNavigationBarTitle('驳回审批');
+        break;
+      case 'verify':
+        Taro.setNavigationBarTitle('审核审批');
+        break;
+      case 'end':
+        Taro.setNavigationBarTitle('办结审批');
+        break;
+    }
+  }, [applyType]);
+
+  
+  const [submitting, setSubmitting] = React.useState(false);
+  const [formData, setFormData] = React.useState({});
+
+  const setFieldValue = (key, value) => {
+    setFormData({
+      ...formData,
+      [key]: value,
+    })
+  }
+  
+  const onSubmit = () => {
+    try {
+      warn(!formData.verifyStatus, '请选择审批结果');
+      warn(!formData.verifyDesc, '请填写审批说明');
+    } catch (e) {
+      return ;
+    }
+
+    const data = {
+      ...applyInfo,
+      ...formData
+    }
+
+    setSubmitting(true);
+    putTaIssueApply(data.applyId, data).then(() => {
+      Taro.navigateBack({delta: 1});
+      setSubmitting(false);
+    }).catch(() => {
+      setSubmitting(false);
+    })
+  }
+  
+  React.useEffect(() => {
+    if (id) {
+      setLoading(true);
+      getTaIssueApplyById(id).then(res => {
+        setApplyInfo(res);
+        setLoading(false);
+      }).catch(() => {
+        setLoading(false);
+      });
+    }
+  }, [id]);
+  
+  return (
+    <Page loading={loading}>
+      <Issue issueId={issueId} />
+     
+      <CellGroup style={{marginTop: '20px'}}>
+        {
+          applyInfo.applyType == 'delay' && (
+            <Cell
+              title="延期日期"
+              value={applyInfo.content}
+            />
+          )
+        }
+        <Cell title="申请说明" />
+        <Field
+          readonly
+          type="textarea"
+          autosize={{ minHeight: '120px' }}
+          value={applyInfo.remark}
+        />
+      </CellGroup>
+     
+      <CellGroup style={{marginTop: '20px'}}>
+        <Cell
+          title="审批结果"
+        >
+          <RadioGroup
+            direction="horizontal"
+            value={formData.verifyStatus}
+            onChange={(e) => setFieldValue('verifyStatus', e.detail)}
+          >
+            <Radio name="pass" checkedColor="var(--main-bg-color)">通过</Radio>
+            <Radio name="reject" checkedColor="red">驳回</Radio>
+          </RadioGroup>
+        </Cell>
+        <Cell title="审批说明" />
+        <Field
+          type="textarea"
+          autosize={{ minHeight: '120px' }}
+          value={formData.verifyDesc}
+          onChange={(e) => setFieldValue('verifyDesc', e.detail)}
+        />
+      </CellGroup>
+      <View style={{marginTop: '20px', padding: 'var(--main-space)'}}>
+        <Button block type="primary" loading={submitting} onClick={onSubmit}>提交审批</Button>
+      </View>
+    </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,62 @@ 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, ROLE_ORG_USER } 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: '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: '' },
+    { icon: 'icon9', text: '我的上报', link: '/pages/issue/list2/index?title=我的上报&mine=true' },
+    { icon: 'icon11', text: '消息通知', link: '' },
+  ],
+
+  [ROLE_ORG_USER]: [
+    { icon: 'icon2', text: '处 理 中', link: '/pages/org/issue/list/index?title=处理中&bizStatus=assigned' },
+    { icon: 'icon3', text: '已 办 结', link: '/pages/org/issue/list/index?title=已办结报&bizStatus=end' },
+    { icon: 'icon5', text: '已 逾 期', link: '' },
+    { icon: 'icon7', text: '统计查询', link: '' },
+    { icon: 'icon11', text: '消息通知', link: '/pages/message/list/index' },
+  ]
+}
+
 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/add/index.jsx

@@ -1,156 +0,0 @@
-import React from 'react';
-import Taro from '@tarojs/taro';
-import { View } from '@tarojs/components';
-import { Button, Notify, Field, Cell, CellGroup } from '@antmjs/vantui';
-import Page from '@/layouts/index';
-import LocType from '@/components/locType';
-import IssueType from '@/components/issueType';
-import Map from '@/components/map';
-import Uploader from '@/components/Uploader/index';
-import { getLocation } from '@/utils/authorize';
-import { ROLE_INSPECTOR } from '@/utils/user';
-import mapIcon from '@/assets/icons/marker.png';
-import { postTaIssue } from '@/services/taissue';
-import { warn } from '@/utils/message';
-
-export default (props) => {
-
-  const [formData, setFormData] = React.useState({
-    typeId: undefined,
-    typeName: undefined,
-    locId: undefined,
-    locName: undefined,
-    location: undefined,
-    addr: undefined,
-    content: undefined,
-    attachList: [],
-  });
-  const [showLocType, setShowLocType] = React.useState(false);
-  const [showIssueType, setShowIssueType] = React.useState(false);
-  const [loading, setLoading] = React.useState(false);
-
-  const onLocTypeChange = (_, it) => {
-    setFormData({
-      ...formData,
-      locId: it.typeId,
-      locName: it.name,
-    });
-    setShowLocType(false);
-  }
-
-  const onIssueTypeChange = (_, it) => {
-    setFormData({
-      ...formData,
-      typeId: it.typeId,
-      typeName: it.name,
-    });
-    setShowIssueType(false);
-  }
-
-  const onFieldChange = (field, value) => {
-    setFormData({
-      ...formData,
-      [field]: value,
-    })
-  }
-
-  const onSubmit = () => {
-    try {
-      warn(!formData.addr, '请填写地址')
-      warn(!formData.locId, '请选择点位')
-      warn(!formData.content, '请填写问题描述')
-      warn(!formData.typeId, '请选择问题分类')
-      warn(!formData.attachList || formData.attachList.length < 1, '请上传照片')
-    } catch (e) {
-      return;
-    }
-
-    setLoading(true)
-    postTaIssue(formData).then(() => {
-      setLoading(false);
-      Taro.navigateBack({delta: 1});
-    }).catch(() => {
-      setLoading(false);
-    })
-  }
-  
-  React.useMemo(() => {
-    getLocation().then((res) => {
-      onFieldChange('location', `${res.longitude},${res.latitude}`);
-    }).catch((err) => {
-      Notify.show({
-        message: '获取位置失败, 请退出重试',
-        type: 'warning',
-      })
-    });
-  }, []);
-
-  return (
-    <Page roles={[ROLE_INSPECTOR]}>
-      <LocType
-        show={showLocType}
-        value={formData.addr}
-        onCancel={() => setShowLocType(false)}
-        onChange={onLocTypeChange}
-      />
-
-      <IssueType
-        show={showIssueType}
-        value={formData.typeName}
-        onCancel={() => setShowIssueType(false)}
-        onChange={onIssueTypeChange}
-      />
-
-      <Map location={formData.location} />
-
-      <Field
-        value={formData.addr}
-        leftIcon={mapIcon}
-        placeholder="请输入地址"
-        onChange={e => onFieldChange('addr', e.detail)}
-      />
-
-      <CellGroup style={{marginTop: '20px'}}>
-        <Cell
-          isLink
-          title="点位"
-          value={formData.locName}
-          onClick={() => setShowLocType(true)}
-        />
-
-        <Cell title="问题描述" border={false} />
-
-        <Field
-          type="textarea"
-          placeholder="请输入问题描述"
-          autosize={{ minHeight: '120px' }}
-          value={formData.content}
-          onChange={e => onFieldChange('content', e.detail)}
-        />
-      </CellGroup>
-      
-      <Cell
-        isLink
-        title="问题分类"
-        style={{marginTop: '20px'}}
-        value={formData.typeName}
-        onClick={() => setShowIssueType(true)}
-      />
-
-      
-      <CellGroup style={{marginTop: '20px'}}>        
-        <Cell title="拍照" border={false} />
-
-        <Cell
-          renderTitle={
-            <Uploader value={formData.attachList} onChange={e => onFieldChange('attachList',e)} />
-          }
-        />
-      </CellGroup>
-
-      <View style={{margin: '20px auto', padding: '0 1em'}}>
-        <Button block type="primary" loading={loading} onClick={onSubmit}>提交</Button>
-      </View>
-    </Page>
-  )
-}

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

@@ -0,0 +1,266 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View } from '@tarojs/components';
+import { Button, Notify, Field, Cell, CellGroup } from '@antmjs/vantui';
+import LocType from '@/components/LocType';
+import IssueType from '@/components/IssueType';
+import OrgPicker from '@/components/OrgPicker';
+import DatePicker from '@/components/DatePicker';
+import Map from '@/components/map';
+import Uploader from '@/components/Uploader/index';
+import { getIssueStatus } from '@/utils/biz';
+import { getDateStr } from '@/utils/date';
+import mapIcon from '@/assets/icons/marker.png';
+import { getIssueProcess } from '@/services/taissue';
+
+const today = new Date();
+
+export default (props) => {
+  const {
+    issue,
+    readOnly,
+    showOrg,
+    showExpireDate,
+    renderFields,
+    renderAction
+  } = props;
+
+  const [formData, setFormData] = React.useState({
+    typeId: undefined,
+    typeName: undefined,
+    locId: undefined,
+    locName: undefined,
+    location: undefined,
+    addr: undefined,
+    content: undefined,
+    attachList: [],
+  });
+  const [showLocType, setShowLocType] = React.useState(false);
+  const [showIssueType, setShowIssueType] = React.useState(false);
+  const [showOrgPicker, setShowOrgPicker] = React.useState(false);
+  const [showDatePicker, setShowDatePicker] = React.useState(false);
+  const [bizStatus, setBizStatus] = React.useState();
+  const [issueProcess, setIssueProcess] = React.useState([]);
+  
+  const issueReject = React.useMemo(() => {
+    if (!issueProcess || !issueProcess.length) return {};
+
+    return issueProcess.filter(x => x.processStatus === 'reject')[0] || {};
+  }, [issueProcess]);
+    
+  const onLocTypeChange = (_, it) => {
+    setFormData({
+      ...formData,
+      locId: it.typeId,
+      locName: it.name,
+    });
+    setShowLocType(false);
+  }
+
+  const onIssueTypeChange = (_, it) => {
+    setFormData({
+      ...formData,
+      typeId: it.typeId,
+      typeName: it.name,
+    });
+    setShowIssueType(false);
+  }
+
+  const onOrgChange = (_, it) => {
+    setFormData({
+      ...formData,
+      orgId: it.orgId,
+      orgName: it.name,
+    });
+    setShowOrgPicker(false);
+  }
+
+  const onDateChange = (dt) => {
+    const date = getDateStr(dt);
+    setFormData({
+      ...formData,
+      expireDate: date,
+    });
+    setShowDatePicker(false);
+  }
+
+  const setFieldChange = (field, value) => {
+    setFormData({
+      ...formData,
+      [field]: value,
+    })
+  }
+
+  React.useEffect(() => {
+    if (issue) {
+      setFormData(issue);
+      setBizStatus(getIssueStatus(issue));
+      
+      if (issue.processStatus == 'reject') {
+        getIssueProcess({pageSize: 100, issueId: issue.issueId}).then(res => {
+          setIssueProcess(res.records || []);
+        })
+      }
+    }
+  }, [issue]);
+  
+  return (
+    <View>
+      <LocType
+        show={showLocType}
+        value={formData.addr}
+        onCancel={() => setShowLocType(false)}
+        onChange={onLocTypeChange}
+      />
+
+      <IssueType
+        show={showIssueType}
+        value={formData.typeName}
+        onCancel={() => setShowIssueType(false)}
+        onChange={onIssueTypeChange}
+      />
+
+      <OrgPicker
+        show={showOrgPicker}
+        value={formData.orgName}
+        onCancel={() => setShowOrgPicker(false)}
+        onChange={onOrgChange}
+      />
+
+      <DatePicker
+        type="date"
+        minDate={today}
+        show={showDatePicker}
+        value={formData.expireDate}
+        onCancel={() => setShowDatePicker(false)}
+        onChange={onDateChange}
+      />
+
+      <Map location={formData.location} />
+
+      <CellGroup>
+        <Cell
+          title="点位"
+          isLink={!readOnly}
+          value={formData.locName}
+          onClick={() => !readOnly && setShowLocType(true)}
+        />
+        <Field
+          placeholder="请输入地址"
+          value={formData.addr}
+          leftIcon={mapIcon}
+          readonly={readOnly}
+          onChange={e => setFieldChange('addr', e.detail)}
+        />
+      </CellGroup>
+
+      {
+        readOnly && bizStatus && (
+          <CellGroup style={{marginTop: '20px'}}>
+            <Cell
+              title="状态"
+              value={bizStatus.label}
+            />
+
+          {
+            issueReject.processId && (
+              <>
+                <Cell title="驳回原因" />        
+                <Field
+                  readonly
+                  type="textarea"
+                  autosize={{ minHeight: '120px' }}
+                  value={issueReject.processResult}
+                />
+              </>
+            )
+          }
+          </CellGroup>
+        )
+      }
+      
+
+      <CellGroup style={{marginTop: '20px'}}>
+        <Cell
+          title="问题分类"
+          isLink={!readOnly}
+          style={{marginTop: '20px'}}
+          value={formData.typeName}
+          onClick={() => !readOnly && setShowIssueType(true)}
+        />
+        <Cell title="问题描述" border={false} />
+
+        <Field
+          type="textarea"
+          placeholder="请输入问题描述"
+          readonly={readOnly}
+          autosize={{ minHeight: '120px' }}
+          value={formData.content}
+          onChange={e => setFieldChange('content', e.detail)}
+        />
+      </CellGroup>
+            
+      <CellGroup style={{marginTop: '20px'}}>        
+        <Cell title="拍照或视频" border={false} />
+
+        <Cell
+          renderTitle={
+            <Uploader
+              value={formData.attachList}
+              disabled={readOnly}
+              onChange={e => setFieldChange('attachList',e)}
+            />
+          }
+        />
+      </CellGroup>
+
+      {
+        (showOrg || showExpireDate) && (
+          <CellGroup style={{marginTop: '20px'}}>
+            {
+              showOrg && (
+                <Cell
+                  title="交办单位"
+                  isLink={!readOnly}
+                  value={formData.orgName}
+                  onClick={() => !readOnly && setShowOrgPicker(true)}
+                />
+              )
+            }
+            {
+              showExpireDate && (
+                <Cell
+                  title="办结时间"
+                  isLink={!readOnly}
+                  value={formData.expireDate}
+                  onClick={() => !readOnly && setShowDatePicker(true)}
+                />
+              )
+            }
+          </CellGroup>
+        )
+      }
+
+      {
+        renderFields ?
+          renderFields(
+            formData,
+            {
+              setFieldChange,
+              setFormData,
+              showOrgPicker,
+              setShowOrgPicker,
+            }
+          ) : null
+      }
+
+      {
+        renderAction ? (
+          <View style={{margin: '20px auto'}}>
+            {renderAction(formData)}
+          </View>
+        ) : null
+      }
+    </View>
+  )
+}

src/pages/issue/edit/components/Assigned.jsx

@@ -0,0 +1,55 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View } from '@tarojs/components';
+import { Button } from '@antmjs/vantui';
+import { postIssueAssigned, putTaIssue } from '@/services/taissue';
+import { warn } from '@/utils/message';
+
+export default (props) => {
+
+  const { issue, formData } = props;
+
+  const [loading1, setLoading1] = React.useState(false);
+  
+  // 交办
+  const onAssigned = () => {
+    try {
+      warn(!formData.addr, '请填写地址')
+      warn(!formData.locId, '请选择点位')
+      warn(!formData.content, '请填写问题描述')
+      warn(!formData.typeId, '请选择问题分类')
+      warn(!formData.attachList || formData.attachList.length < 1, '请上传照片')
+      warn(!formData.orgId, '请选择交办单位')
+      warn(!formData.expireDate, '请选择办结时间')
+    } catch (e) {
+      return;
+    }
+
+    setLoading1(true)
+
+    const data = { ...issue, ... formData };
+
+    // 先提交修改
+    putTaIssue(issue.issueId, data).then(() => {
+      // 再提交交办
+      postIssueAssigned(data).then(() => {
+        setLoading1(false);
+        Taro.navigateBack({delta: 1});
+      }).catch(() => {
+        setLoading1(false);
+      })
+    }).catch(() => {
+      setLoading1(false);
+    })
+  }
+ 
+  return (
+    <Button
+      block
+      type="primary"
+      loading={loading1}
+      onClick={onAssigned}
+      style={{marginTop: '20px'}}
+    >交办</Button>
+  )
+}

src/pages/issue/edit/components/Cancel.jsx

@@ -0,0 +1,98 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View } from '@tarojs/components';
+import { Button, Popup, CellGroup, Cell, Field } from '@antmjs/vantui';
+import { deleteTaIssue, postIssueRejct } from '@/services/taissue';
+import { warn } from '@/utils/message';
+
+export default (props) => {
+
+  const { issue } = props;
+
+  const [loading2, setLoading2] = React.useState(false);
+  const [loading3, setLoading3] = React.useState(false);
+  const [show, setShow] = React.useState(false);
+  const [processResult, setProcessResult] = React.useState();
+  
+  const onDelete = () => {
+    Taro.showModal({
+      title: '删除',
+      content: '确定进行删除操作?',
+      success (res) {
+        if (res.confirm) {
+          setLoading2(true)
+          deleteTaIssue(issue.issueId).then(() => {
+            setLoading2(false);
+            Taro.navigateBack({delta: 1});
+          }).catch(() => {
+            setLoading2(false);
+          })
+        }
+      }
+    })
+  }
+
+  const onReject = () => {
+    try {
+      warn(!processResult, '请填写退单理由')
+    } catch (e) {
+      return;
+    }
+
+    setShow(false);
+
+    const data = {
+      processResult,
+      issueId: issue.issueId,
+    }
+
+    setLoading3(true)
+    postIssueRejct(data).then(() => {
+      setLoading3(false);
+      Taro.navigateBack({delta: 1});
+    }).catch(() => {
+      setLoading3(false);
+    })
+  }
+  
+  return (
+    <>
+      <Popup position="bottom" show={show} onClose={() => setShow(false)}>
+        <CellGroup>
+          <Cell title="退单理由" />
+          <Field
+            type="textarea"
+            placeholder="请输入退单理由"
+            value={processResult}
+            autosize={{ minHeight: '240px' }}
+            onChange={e => setProcessResult(e.detail)}
+          />
+          <View style={{display: 'flex', justifyContent: 'space-around'}}>
+            <Button plain type="default" onClick={() => setShow(false)}>取消</Button>
+            <Button plain type="primary" onClick={onReject}>确定</Button>
+          </View>
+        </CellGroup>
+      </Popup>
+      <View style={{marginTop: '20px', display: 'flex'}}>
+        <Button
+          plain
+          hairline
+          type="danger"
+          loading={loading2}
+          disabled={loading3}
+          style={{ flex: 1 }}
+          onClick={onDelete}
+        >删除</Button>
+        <Button
+          plain
+          hairline
+          type="info"
+          loading={loading3}
+          disabled={loading2}
+          style={{ flex: 1, marginLeft: 'var(--main-space)' }}
+          onClick={() => setShow(true)}
+        >退单</Button>
+      </View>
+    </>
+  )
+}

src/pages/issue/edit/components/Edit.jsx

@@ -0,0 +1,52 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View } from '@tarojs/components';
+import { Button } from '@antmjs/vantui';
+import { putTaIssue } from '@/services/taissue';
+import { warn } from '@/utils/message';
+
+export default (props) => {
+
+  const { issue, formData } = props;
+
+  const [loading, setLoading] = React.useState(false);
+  
+  // 新增问题单
+  const onSubmit = () => {
+    try {
+      warn(!formData.addr, '请填写地址')
+      warn(!formData.locId, '请选择点位')
+      warn(!formData.content, '请填写问题描述')
+      warn(!formData.typeId, '请选择问题分类')
+      warn(!formData.attachList || formData.attachList.length < 1, '请上传照片')
+    } catch (e) {
+      return;
+    }
+
+    setLoading(true)
+    putTaIssue(issue.issueId, { ...issue, formData }).then(() => {
+      setLoading(false);
+      Taro.navigateBack({
+        delta: 1,
+        fail: () => {
+          Taro.reLaunch({
+            url: 'pages/home/index'
+          })
+        } 
+      });
+    }).catch(() => {
+      setLoading(false);
+    })
+  }
+  
+  return (
+    <Button
+      block
+      plain
+      hairline
+      type="primary"
+      loading={loading}
+      onClick={onSubmit}
+    >修改</Button>
+  )
+}

src/pages/issue/edit/components/Save.jsx

@@ -0,0 +1,45 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View } from '@tarojs/components';
+import { Button } from '@antmjs/vantui';
+import { postTaIssue } from '@/services/taissue';
+import { warn } from '@/utils/message';
+
+export default (props) => {
+
+  const { formData } = props;
+
+  const [loading, setLoading] = React.useState(false);
+  
+  // 新增问题单
+  const onSubmit = () => {
+    try {
+      warn(!formData.addr, '请填写地址')
+      warn(!formData.locId, '请选择点位')
+      warn(!formData.content, '请填写问题描述')
+      warn(!formData.typeId, '请选择问题分类')
+      warn(!formData.attachList || formData.attachList.length < 1, '请上传照片')
+    } catch (e) {
+      return;
+    }
+
+    setLoading(true)
+    postTaIssue(formData).then(() => {
+      setLoading(false);
+      Taro.navigateBack({
+        delta: 1,
+        fail: () => {
+          Taro.reLaunch({
+            url: '/pages/home/index'
+          });
+        }
+      });
+    }).catch(() => {
+      setLoading(false);
+    })
+  }
+  
+  return (
+    <Button block type="primary" loading={loading} onClick={onSubmit}>提交</Button>
+  )
+}

src/pages/issue/add/index.config.js → src/pages/issue/edit/index.config.js

@@ -1,3 +1,4 @@
+// eslint-disable-next-line no-undef
 export default definePageConfig({
   navigationBarTitleText: '我要上报'
 })

src/pages/issue/edit/index.jsx

@@ -0,0 +1,95 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View } from '@tarojs/components';
+import { CellGroup, Cell } from '@antmjs/vantui';
+import Page from '@/layouts/index';
+import { useModel } from '@/store';
+import { ROLE_INSPECTOR, ROLE_MANAGER } from '@/utils/user';
+import { getTaIssueById } from '@/services/taissue';
+import IssueForm from '../components/Issue';
+import Save from './components/Save';
+import Edit from './components/Edit';
+import Assigned from './components/Assigned';
+import Cancel from './components/Cancel';
+
+export default (props) => {
+
+  const router = Taro.useRouter();
+  const { id, act } = router.params;
+
+  const { user } = useModel('user');
+
+  const [loading, setLoading] = React.useState(false);
+  const [issue, setIssue] = React.useState();
+
+  // 各按钮状态
+  const [
+    readOnly,
+    canEdit,
+    canAssigned,
+    canCancel,
+  ] = React.useMemo(() => {
+    if (!issue) return [];
+    if (!user) return [];
+
+    // 如果是督察员
+    if (user.dutyList.indexOf(ROLE_INSPECTOR) > -1) {
+      return [
+        issue.processNode != 'start' && issue.processStatus != 'reject',
+        issue.processNode == 'start' || issue.processStatus == 'reject',
+        false,
+        false,
+      ]
+    }
+
+    // 如果是管理员
+    if (user?.dutyList.indexOf(ROLE_MANAGER) > -1) {
+      return [
+        issue.processNode != 'start',
+        false,
+        issue.processNode == 'start',
+        issue.processNode == 'start',
+      ]
+    }
+
+    return [];
+  }, [issue, user]);
+
+  const onIssueChange = (val = {}) => {
+    setIssue({
+      ...(issue || {}),
+      ...val,
+    })
+  }
+  
+  React.useEffect(() => {
+    if (id) {
+      setLoading(true)
+      getTaIssueById(id).then(res => {
+        setLoading(false);
+        setIssue(res);
+      }).catch(() => {
+        setLoading(false);
+      });
+    }
+  }, [id]);
+
+  return (
+    <Page roles={[ROLE_INSPECTOR, ROLE_MANAGER]} loading={loading}>
+      <IssueForm
+        issue={issue}
+        readOnly={readOnly}
+        showOrg={canAssigned}
+        showExpireDate={canAssigned}
+        renderAction={(formData) => (
+          <View style={{ padding: 'var(--main-space)', background: '#fff' }}>
+            {!id && <Save formData={formData} />}
+            {canEdit && <Edit issue={issue} formData={formData} />}
+            {canAssigned && <Assigned issue={issue} formData={formData} />}
+            {canCancel && <Cancel issue={issue} />}
+          </View>
+        )}
+      />
+    </Page>
+  )
+}

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

@@ -0,0 +1,4 @@
+// eslint-disable-next-line no-undef
+export default definePageConfig({
+  navigationBarTitleText: '我的上报'
+})

src/pages/issue/list/index.jsx

@@ -0,0 +1,82 @@
+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 { getTaIssue } from '@/services/taissue';
+import { ROLE_INSPECTOR, ROLE_MANAGER } from '@/utils/user';
+import { useModel } from '@/store';
+import { getIssueStatus } from '@/utils/biz';
+
+// 只有督察员能看到当前页面
+export default (props) => {
+  // const { user } = useModel('user');
+
+  const onClick = (item) => {
+    Taro.navigateTo({
+      url: `/pages/issue/edit/index?id=${item.issueId}`
+    })
+  }
+  
+  return (
+    <Page roles={[ROLE_INSPECTOR]}>
+      <Tabs sticky>
+        <Tab title="全部">
+          <PowerList
+            request={getTaIssue}
+            renderItem={(item) => (
+              <Card key={item.issueId} detail={item} onClick={() => onClick(item)} />
+            )}
+          />
+        </Tab>
+        <Tab title="未交办">
+          <PowerList
+            request={getTaIssue}
+            params={{bizStatus: 'start'}}
+            renderItem={(item) => (
+              <Card key={item.issueId} detail={item} onClick={() => onClick(item)} />
+            )}
+          />
+        </Tab>
+        <Tab title="已交办">
+          <PowerList
+            request={getTaIssue}
+            params={{bizStatus: 'assigned'}}
+            renderItem={(item) => (
+              <Card key={item.issueId} detail={item} onClick={() => onClick(item)} />
+            )}
+          />
+        </Tab>
+        <Tab title="已办结">
+          <PowerList
+            request={getTaIssue}
+            params={{bizStatus: 'end'}}
+            renderItem={(item) => (
+              <Card key={item.issueId} detail={item} onClick={() => onClick(item)} />
+            )}
+          />
+        </Tab>
+        <Tab title="已逾期">
+          <PowerList
+            request={getTaIssue}
+            params={{bizStatus: 'expired'}}
+            renderItem={(item) => (
+              <Card key={item.issueId} detail={item} onClick={() => onClick(item)} />
+            )}
+          />
+        </Tab>
+        <Tab title="已打回">
+          <PowerList
+            request={getTaIssue}
+            params={{bizStatus: 'reject'}}
+            renderItem={(item) => (
+              <Card key={item.issueId} detail={item} onClick={() => onClick(item)} />
+            )}
+          />
+        </Tab>
+      </Tabs>
+    </Page>
+  )
+}

src/pages/issue/list2/index.config.js

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

src/pages/issue/list2/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 { getTaIssue } from '@/services/taissue';
+import { ROLE_MANAGER } from '@/utils/user';
+import { useModel } from '@/store';
+import { getIssueStatus } from '@/utils/biz';
+
+export default (props) => {
+
+  const router = Taro.useRouter();
+  const { title, bizStatus = '', mine = '' } = 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={getTaIssue}
+            params={{bizStatus, mine, sourceType: 'inspector'}}
+            renderItem={(item) => (
+              <Card key={item.issueId} detail={item} onClick={() => onClick(item)} />
+            )}
+          />
+        </Tab>
+        <Tab title="市民">
+          <PowerList
+            request={getTaIssue}
+            params={{bizStatus, mine, sourceType: 'feedback'}}
+            renderItem={(item) => (
+              <Card key={item.issueId} detail={item} onClick={() => onClick(item)} />
+            )}
+          />
+        </Tab>
+      </Tabs>
+    </Page>
+  )
+}

src/pages/login/components/Form.jsx

@@ -14,6 +14,7 @@ export default (props) => {
   const form = Form.useForm();
   const [accErr, setAccErr] = React.useState();
   const [pwdErr, setPwdErr] = React.useState();
+  const [loading, setLoading] = React.useState(false);
 
   const onFinish = (errs, res) => {
     if (!res.account) {
@@ -29,7 +30,13 @@ export default (props) => {
       setPwdErr();
     }
 
-    signin(res).then(onSuccess);
+    setLoading(true);
+    signin(res).then(() => {
+      onSuccess();
+      setLoading(false);
+    }).catch(err => {
+      setLoading(false);
+    })
   }
 
   const onForgetPwd = () => {
@@ -73,6 +80,7 @@ export default (props) => {
             block
             type="primary"
             formType="submit"
+            loading={loading}
           >
             登录
           </Button>

src/pages/login/index.jsx

@@ -9,10 +9,6 @@ import './index.less'
 
 export default (props) => {
 
-  React.useMemo(() => {  
-    Taro.hideTabBar();
-  }, []);
-
   const onSuccess = () => {
     Taro.navigateBack({
       delta: 1,
@@ -25,7 +21,7 @@ export default (props) => {
   }
 
   return (
-    <Page className="index">
+    <Page>
       <View className="login-box">
         <Head />
         <Form onSuccess={onSuccess} />

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

@@ -0,0 +1,46 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View } from '@tarojs/components';
+import { Cell } from '@antmjs/vantui';
+import { getDtStr } from '@/utils/date';
+import style from './card.module.less';
+
+export default (props) => {
+  const { item } = props;
+
+  const url = React.useMemo(() => {
+    if (item.targetType == 'issue') {
+
+    } else if (item.targetType == 'apply') {
+
+    }
+
+    return '';
+  }, [item])
+  
+  return (
+    <View className={style['msg-card-wrapper']}>
+      <Cell
+        isLink
+        url={url}
+        renderTitle={(
+          <View style={{ display: 'flex', justifyContent: 'space-between' }}>
+            <View>
+              {item?.title}
+            </View>
+            <View>
+              {getDtStr(item?.createDate)}
+            </View>
+          </View>
+        )}
+        renderLabel={(
+          <View style={{ width: '100%' }}>
+            <View>
+              {item?.content}
+            </View>
+          </View>
+        )}
+      />
+    </View>
+  )
+}

src/pages/message/list/components/card.module.less

@@ -0,0 +1,8 @@
+
+.msg-card-wrapper {
+  background: #FFFFFF;
+  box-shadow: 0px 9px 11px 0px rgba(0,0,0,0.06);
+  border-radius: 8px;
+  width: calc(100% - var(--main-space) * 2);
+  margin: var(--main-space);
+}

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

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

src/pages/message/list/index.jsx

@@ -0,0 +1,22 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View } from '@tarojs/components';
+import Page from '@/layouts/index';
+import PowerList from '@/components/PowerList';
+import { getTaMessage } from '@/services/tamessage';
+import Card from './components/Card';
+
+export default (props) => {
+
+  
+  return (
+    <Page>
+      <PowerList
+        request={getTaMessage}
+        renderItem={(item) => (
+          <Card key={item.msgId} item={item} />
+        )}
+      />
+    </Page>
+  )
+}

src/pages/org/components/issue-info/index.jsx

@@ -0,0 +1,38 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View } from '@tarojs/components';
+import { Cell, CellGroup, Field, Button } from '@antmjs/vantui';
+import Uploader from '@/components/Uploader/index';
+import { getDtStr } from '@/utils/date';
+
+export default (props) => {
+  const { issue } = props;
+  return (
+    <>
+      <CellGroup>
+        <Cell title="上报时间" value={getDtStr(issue?.createDate)} />
+        <Cell title="办结时间" value={issue?.expireDate} />
+        <Cell title="交办次数" value={issue?.processNum || 1} />
+      </CellGroup>
+      <CellGroup style={{marginTop: '20px'}}>
+        <Cell title="抽检位置" value={issue?.locName} />
+        <Cell title="定 位 点" value={issue?.addr} />
+        <Cell title="问题详情" />        
+        <Field
+          readonly
+          type="textarea"
+          autosize={{ minHeight: '120px' }}
+          value={issue?.content}
+        /> 
+        <Cell
+          renderTitle={
+            <Uploader
+              disabled
+              value={issue?.attachList}
+            />
+          }
+        />
+      </CellGroup>
+    </>
+  )
+}

src/pages/org/issue/detail/components/Apply.jsx

@@ -0,0 +1,114 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View } from '@tarojs/components';
+import { Cell, CellGroup, Field, Button, Popup } from '@antmjs/vantui';
+import DatePicker from '@/components/DatePicker';
+import { getDateStr } from '@/utils/date';
+import { postTaIssueApply } from '@/services/taissueapply';
+import { warn } from '@/utils/message';
+
+const today = new Date();
+export default (props) => {
+
+  const { orgIssue, applyType, ...leftProps } = props;
+
+  const [show, setShow] = React.useState(false);
+  const [submitting, setSubmitting] = React.useState(false);
+  const [formData, setFormData] = React.useState({});
+  const [showDatePicker, setShowDatePicker] = React.useState(false);
+
+  const setFieldValue = (key, value) => {
+    setFormData({
+      ...formData,
+      [key]: value,
+    })
+  }
+
+  const onDateClick = () => {
+    setShow(false);
+    setShowDatePicker(true);
+  }
+  
+  const onDateChange = (dt) => {
+    const date = getDateStr(dt);
+    setFieldValue('content', date);
+    setShowDatePicker(false);
+    setShow(true);
+  }
+
+  const onClick = () => {
+    if (applyType == 'org-verify' || applyType == 'end') {
+      onSubmit();
+    } else {
+      setShow(true);
+    }
+  }
+
+  const onSubmit = () => {
+    try {
+      warn(!orgIssue || !orgIssue.issueId, '未找到问题单');
+      if (applyType === 'delay') {
+        warn(!formData.content, '请选择延期时间');
+      }
+
+      if (applyType == 'delay' || applyType == 'reject') {
+        warn(!formData.remark, '请填写理由说明');
+      }
+    } catch (e) {
+      return ;
+    }
+
+    const data = {
+      applyType,
+      issueId: orgIssue.issueId,
+      ...formData
+    }
+
+    setSubmitting(true);
+    postTaIssueApply(data).then(() => {
+      Taro.navigateBack({delta: 1});
+      setSubmitting(false);
+    }).catch(() => {
+      setSubmitting(false);
+    })
+  }
+  
+  return (
+    <>
+      <DatePicker
+        type="date"
+        minDate={today}
+        show={showDatePicker}
+        value={formData.content}
+        onCancel={() => setShowDatePicker(false)}
+        onChange={onDateChange}
+      />
+      <Popup position="bottom" show={show} onClose={() => setShow(false)}>
+        <CellGroup>
+          {
+            applyType == 'delay' && (
+              <Cell
+                isLink
+                title="延期时间"
+                value={formData.content}
+                onClick={onDateClick}
+              />
+            )
+          }
+          <Cell title="理由说明" />
+          <Field
+            type="textarea"
+            autosize={{ minHeight: '120px' }}
+            value={formData.remark}
+            onChange={e => setFieldValue('remark', e.detail)}
+          />
+          <View style={{display: 'flex'}}>
+            <Button block plain type="default" onClick={() => setShow(false)}>取消</Button>
+            <Button block plain type="primary" loading={submitting} onClick={onSubmit}>确定</Button>
+          </View>
+        </CellGroup>
+      </Popup>
+      <Button {...leftProps} onClick={onClick}>{props.children}</Button>
+    </>
+  )
+}

src/pages/org/issue/detail/components/Update.jsx

@@ -0,0 +1,34 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View } from '@tarojs/components';
+import { Button } from '@antmjs/vantui';
+import { putTaOrgIssue } from '@/services/taorgissue';
+import { warn } from '@/utils/message';
+
+export default (props) => {
+  const { orgIssue } = props;
+  
+  const [submitting, setSubmitting] = React.useState(false);
+  
+  const onSubmit = () => {
+    try {
+      warn(!orgIssue || !orgIssue.issueId, '未找打问题单');
+      warn(!orgIssue.result, '请填写整改结果');
+      warn(!orgIssue.attachList || !orgIssue.attachList, '请上传照片或视频');
+    } catch (e) {
+      return ;
+    }
+
+    setSubmitting(true);
+    putTaOrgIssue(orgIssue.orgIssueId, orgIssue).then(() => {
+      Taro.navigateBack({delta: 1});
+      setSubmitting(false);
+    }).catch(() => {
+      setSubmitting(false);
+    })
+  }
+
+  return (
+    <Button block type="primary" loading={submitting} onClick={onSubmit}>保存修改</Button>
+  )
+}

src/pages/org/issue/detail/index.config.js

@@ -0,0 +1,4 @@
+// eslint-disable-next-line no-undef
+export default definePageConfig({
+  navigationBarTitleText: '问题详情'
+})

src/pages/org/issue/detail/index.jsx

@@ -0,0 +1,136 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View } from '@tarojs/components';
+import { Cell, CellGroup, Field, Button } from '@antmjs/vantui';
+import Page from '@/layouts/index';
+import Uploader from '@/components/Uploader/index';
+import { getTaIssueById } from '@/services/taissue';
+import { getTaOrgIssueByIssueId } from '@/services/taorgissue';
+
+import IssueInfo from '../../components/issue-info';
+import Apply from './components/Apply';
+
+const status = {
+  delay: '延期申请中',
+  reject: '驳回申请中',
+  end: '办结申请中',
+}
+
+export default (props) => {
+
+  const router = Taro.useRouter();
+  const { id, act } = router.params;
+
+  const [loading, setLoading] = React.useState(false);
+  const [issue, setIssue] = React.useState();
+  const [orgIssue, setOrgIssue] = React.useState({});
+
+  const [
+    readOnly,
+    statusTxt,
+    showEditBtn,
+  ] = React.useMemo(() => {
+    if (!orgIssue.issueId) return [];
+
+    return [
+      issue?.applyId,
+      status[orgIssue.result],
+      orgIssue.processStatus == 'start' && !issue?.applyId
+    ]
+
+  }, [issue, orgIssue.issueId]);
+
+  const setFormData = (key, value) => {
+    setOrgIssue({
+      ...(orgIssue || {}),
+      [key]: value,
+    })
+  }
+
+  React.useEffect(() => {
+    if (id) {
+      setLoading(true)
+      getTaIssueById(id).then(res => {
+        setLoading(false);
+        setIssue(res);
+      }).catch(() => {
+        setLoading(false);
+      });
+
+      getTaOrgIssueByIssueId(id).then(res => setOrgIssue(res));
+    }
+  }, [id]);
+  
+  return (
+    <Page loading={loading}>
+      <IssueInfo issue={issue} />
+      <CellGroup style={{marginTop: '20px'}}>
+        <Cell title="整改结果" />
+        <Field
+          type="textarea"
+          readonly={readOnly}
+          autosize={{ minHeight: '120px' }}
+          value={orgIssue.result}
+          onChange={e => setFormData('result', e.detail)}
+        />
+      </CellGroup>
+      <CellGroup style={{marginTop: '20px'}}>        
+        <Cell title="拍照或视频" border={false} />
+
+        <Cell
+          renderTitle={
+            <Uploader disabled={readOnly} value={orgIssue.attachList} onChange={e => setFormData('attachList',e)} />
+          }
+        />
+      </CellGroup>
+
+      {
+        readOnly && (
+          <CellGroup style={{marginTop: '20px'}}>
+            <Cell title="状态" value={statusTxt} />
+          </CellGroup>
+        )
+      }
+
+      {
+        !readOnly && (
+          <View style={{marginTop: '20px', padding: 'var(--main-space)'}}>
+            <View>
+              {
+                showEditBtn ?
+                  <Button block type="primary">保存修改</Button> :
+                  <Apply block type="primary" applyType="end" orgIssue={orgIssue}>申请办结</Apply>
+              }
+            </View>
+            {
+              !showEditBtn && (
+                <View style={{marginTop: '20px'}}>
+                  <Apply block type="primary" applyType="org-verify" orgIssue={orgIssue}>申请审核</Apply>
+                </View>
+              )
+            }
+            <View style={{marginTop: '20px', display: 'flex' }}>
+              <Apply
+                block
+                plain
+                hairline
+                type="info"
+                applyType="delay"
+                orgIssue={orgIssue}
+              >申请延期</Apply>
+              <Apply
+                block
+                plain
+                hairline
+                type="danger"
+                applyType="reject"
+                orgIssue={orgIssue}
+                style={{marginLeft: 'var(--main-space)'}}
+              >申请驳回</Apply>
+            </View>
+          </View>
+        )
+      }
+    </Page>
+  )
+}

src/pages/org/issue/list/index.config.js

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

src/pages/org/issue/list/index.jsx

@@ -0,0 +1,58 @@
+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 { getTaOrgIssue } from '@/services/taorgissue';
+import { ROLE_MANAGER } from '@/utils/user';
+import { useModel } from '@/store';
+import { getIssueStatus } from '@/utils/biz';
+
+export default (props) => {
+
+  const router = Taro.useRouter();
+  const { title, bizStatus, color } = router.params;
+
+  React.useMemo(() => {
+    if (title) {
+      Taro.setNavigationBarTitle({ title });
+    } else {
+      Taro.setNavigationBarTitle({ title: '问题列表' });
+    }
+  }, [title]);
+
+  // const { user } = useModel('user');
+
+  const onClick = (item) => {
+    Taro.navigateTo({
+      url: `/pages/org/issue/detail/index?id=${item.issueId}`
+    })
+  }
+  
+  return (
+    <Page>
+      <Tabs sticky>
+        <Tab title="监督员">
+          <PowerList
+            request={getTaOrgIssue}
+            params={{bizStatus, sourceType: 'inspector'}}
+            renderItem={(item) => (
+              <Card key={item.issueId} detail={item} stText={title} color={color} onClick={() => onClick(item)} />
+            )}
+          />
+        </Tab>
+        <Tab title="市民">
+          <PowerList
+            request={getTaOrgIssue}
+            params={{bizStatus, sourceType: 'feedback'}}
+            renderItem={(item) => (
+              <Card key={item.issueId} detail={item} stText={title} color={color} onClick={() => onClick(item)} />
+            )}
+          />
+        </Tab>
+      </Tabs>
+    </Page>
+  )
+}

src/services/sysorg.js

@@ -0,0 +1,30 @@
+import request from '@/utils/request';
+
+/*
+ * 分页查询
+ */
+export const getSysOrg = (params) => request('/api/sysOrg', { params });
+
+/*
+ * 新增数据
+ */
+export const postSysOrg = (data) => request('/api/sysOrg', { data, method: 'post' });
+
+/*
+ * 通过ID查询单条数据
+ */
+export const getSysOrgById = (id) => request(`/api/sysOrg/${id}`);
+
+/** 
+ * 更新数据
+ * 
+ * @param {*} id
+ * @param {*} data
+ * @returns
+ */
+export const putSysOrg = (id, data) => request(`/api/sysOrg/${id}`, { data, method: 'put' });
+
+/*
+ * 通过主键删除数据
+ */
+export const deleteSysOrg = (id) => request(`/api/sysOrg/${id}`, { method: 'delete' });

src/services/taissue.js

@@ -24,3 +24,18 @@ export const putTaIssue = (id, data) => request(`/api/taIssue/${id}`, { data, me
  * 通过主键删除数据
  */
 export const deleteTaIssue = (id) => request(`/api/taIssue/${id}`, { method: 'delete' });
+
+/*
+ * 交办
+ */
+export const postIssueAssigned = (data) => request('/api/taIssueProcess/assigned', { data, method: 'post' });
+
+/*
+ * 驳回
+ */
+export const postIssueRejct = (data) => request('/api/taIssueProcess/reject', { data, method: 'post' });
+
+/*
+ * 获取所有流程节点
+ */
+export const getIssueProcess = (params) => request('/api/taIssueProcess', { params });

src/services/taissueapply.js

@@ -0,0 +1,29 @@
+import request from '@/utils/request';
+
+/*
+ * 分页查询
+ */
+export const getTaIssueApply = (params) => request('/api/taIssueApply', { params });
+
+/*
+ * 新增数据
+ */
+export const postTaIssueApply = (data) => request('/api/taIssueApply', { data, method: 'post' });
+
+/*
+ * 通过ID查询单条数据
+ */
+export const getTaIssueApplyById = (id) => request(`/api/taIssueApply/${id}`);
+
+/**
+ * 更新数据
+ * @param {*} id
+ * @param {*} data
+ * @returns
+ */
+export const putTaIssueApply = (id, data) => request(`/api/taIssueApply/${id}`, { data, method: 'put' });
+
+/*
+ * 通过主键删除数据
+ */
+export const deleteTaIssueApply = (id) => request(`/api/taIssueApply/${id}`, { method: 'delete' });

src/services/tamessage.js

@@ -0,0 +1,29 @@
+import request from '@/utils/request';
+
+/*
+ * 分页查询
+ */
+export const getTaMessage = (params) => request('/api/taMessage', { params });
+
+/*
+ * 新增数据
+ */
+export const postTaMessage = (data) => request('/api/taMessage', { data, method: 'post' });
+
+/*
+ * 通过ID查询单条数据
+ */
+export const getTaMessageById = (id) => request(`/api/taMessage/${id}`);
+
+/**
+ * 更新数据
+ * @param {*} id
+ * @param {*} data
+ * @returns
+ */
+export const putTaMessage = (id, data) => request(`/api/taMessage/${id}`, { data, method: 'put' });
+
+/*
+ * 通过主键删除数据
+ */
+export const deleteTaMessage = (id) => request(`/api/taMessage/${id}`, { method: 'delete' });

src/services/taorgissue.js

@@ -0,0 +1,30 @@
+import request from '@/utils/request';
+
+/*
+ * 分页查询
+ */
+export const getTaOrgIssue = (params) => request('/api/taOrgIssue', { params });
+
+/*
+ * 新增数据
+ */
+export const postTaOrgIssue = (data) => request('/api/taOrgIssue', { data, method: 'post' });
+
+/*
+ * 通过ID查询单条数据
+ */
+export const getTaOrgIssueById = (id) => request(`/api/taOrgIssue/${id}`);
+/*
+ * 通过ISSUE_ID查询单条数据
+ */
+export const getTaOrgIssueByIssueId = (issueId) => request(`/api/taIssue/${issueId}/orgIssue`);
+
+/*
+ * 更新数据
+ */
+export const putTaOrgIssue = (id, data) => request(`/api/taOrgIssue/${id}`, { data, method: 'put' });
+
+/*
+ * 通过主键删除数据
+ */
+export const deleteTaOrgIssue = (id) => request(`/api/taOrgIssue/${id}`, { method: 'delete' });

src/utils/biz.js

@@ -0,0 +1,32 @@
+import dayjs from 'dayjs';
+
+export function getIssueStatus(taIssue) {
+  if (taIssue.processStatus === 'reject') {
+    return {
+      value: 4,
+      label: '已打回',
+    };
+  } else if (taIssue.processNode === 'start') {
+    return {
+      value: 0,
+      label: '未交办',
+    }
+  } else if (taIssue.processNode === 'end') {
+    return {
+      value: 2,
+      label: '已办结',
+    };
+  } else if (taIssue.processNode !== 'end' && taIssue.expireDate <= dayjs().format('YYYY-MM-DD')) {
+    return {
+      value: 3,
+      label: '已逾期',
+    };
+  } else if (taIssue.processNode === 'assigned') {
+    return {
+      value: 1,
+      label: '已交办',
+    };
+  }
+
+  return {};
+}

src/utils/date.js

@@ -0,0 +1,16 @@
+
+function fill0(n) {
+  return n > 9 ? `${n}` : `0${n}`
+}
+
+export function getDateStr(dt) {
+  const y = dt.getFullYear();
+  const m = dt.getMonth() + 1;
+  const d = dt.getDate();
+
+  return `${y}-${fill0(m)}-${fill0(d)}`
+}
+
+export function getDtStr(dtStr) {
+  return !dtStr ? '' : dtStr.replace('T', ' ').substring(0, 16);
+}

src/utils/user.js

@@ -8,6 +8,9 @@ export const ROLE_MANAGER = 'manager';
 // 单位人员
 export const ROLE_ORG_USER = 'org_user';
 
+// 单位管理员
+export const ROLE_ORG_MANAGER = 'org_manager';
+
 // 查询员
 export const ROLE_QUERY_PERSON = 'query_person';
 
@@ -19,6 +22,7 @@ export const ROLES = {
   [ROLE_INSPECTOR]: '督察员',
   [ROLE_MANAGER]: '管理员',
   [ROLE_ORG_USER]: '单位人员',
+  [ROLE_ORG_MANAGER]: '单位管理员',
   [ROLE_QUERY_PERSON]: '查询员',
   [ROLE_CITIZEN]: '市民',
 }