feats

src/app.config.js

@@ -24,7 +24,8 @@ export default defineAppConfig({
     'pages/notice/detail/index',
     'pages/my/index',
     'pages/my/edit/index',
-    'pages/feedback/index'
+    'pages/feedback/issue/index',
+    'pages/feedback/issuelist/index'
   ],
   subpackages: [
     {

src/components/IssueCard/index.jsx

@@ -39,7 +39,7 @@ export default (props) => {
   return (
     <View className={style['issue-card-wrapper']} onClick={onClick}>
       <View className={style['issue-card-header']}>
-        <View>问题:</View>
+        <View>问题清单</View>
         <View>{createDate}</View>
       </View>
       <View className={style['issue-card-body']} style={{ backgroundColor: styleColor[0] }}>

src/components/IssueCard/style.module.less

@@ -11,16 +11,16 @@
     display: flex;
     align-items: center;
     justify-content: space-between;
+    font-size: 28px;
 
     & > view {
       flex: 1;
-      font-size: 24px;
       line-height: 42px;
       color: #202020;
 
       &:last-child {
         flex: none;
-        font-size: 20px;
+        font-size: 24px;
         color: #222;
       }
     }
@@ -40,7 +40,7 @@
     align-items: center;
     justify-content: space-between;
     
-    font-size: 24px;
+    font-size: 28px;
     line-height: 32px;
     color: #202020;
     margin-top: var(--main-space);

src/layouts/TabBar.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import Taro from '@tarojs/taro';
-import { Image } from '@tarojs/components';
+import { View, Image } from '@tarojs/components';
 import { Tabbar, TabbarItem } from '@antmjs/vantui';
 import {
   ROLE_INSPECTOR,
@@ -44,10 +44,10 @@ const issue = {
 }
 const feedback = {
   name: 'feedback',
-  label: '发布',
+  label: '随手拍',
   icon: issueIcon,
   activeIcon: issueActiveIcon,
-  page: '/pages/feedback/index'
+  page: '/pages/feedback/issue/index'
 }
 const check = {
   name: 'check',
@@ -131,18 +131,20 @@ export default (props) => {
               <Image
                 src={item.icon}
                 mode="aspectFit"
-                style="width: 30px; height: 18px;"
+                style="width: 30px; height: 20px;"
               ></Image>
             }
             renderIconActive={
               <Image
                 src={item.activeIcon}
                 mode="aspectFit"
-                style="width: 30px; height: 18px;"
+                style="width: 30px; height: 20px;"
               ></Image>
             }
           >
-            {item.label}
+            <View style={{fontSize: '14px'}}>
+              {item.label}
+            </View>
           </TabbarItem>
         ))
       }

src/pages/feedback/index.config.js

@@ -1,3 +0,0 @@
-export default definePageConfig({
-  navigationBarTitleText: '新建随手拍'
-})

src/pages/feedback/index.jsx

@@ -1,184 +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 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';
-
-export default (props) => {
-  const today = new Date();
-
-  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.locId}
-        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>
-        <Field
-          placeholder="阳光丽景小区"
-          value={formData.addr}
-          leftIcon={mapIcon}
-          readonly={readOnly}
-          onChange={e => setFieldChange('addr', e.detail)}
-        />
-      </CellGroup>
-
-      <CellGroup style={{ marginTop: '20px' }}>
-
-        <Cell title="问题描述" size="large" 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="拍照" size="large" border={false} />
-
-        <Cell
-          renderTitle={
-            <Uploader
-              value={formData.attachList}
-              disabled={readOnly}
-              onChange={e => setFieldChange('attachList', e)}
-            />
-          }
-        />
-      </CellGroup>
-
-      <View style={{ padding: 'var(--main-space)', background: '#fff' }}>
-        <Button block type="primary">提交</Button>
-      </View>
-
-    </View>
-  )
-}

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

@@ -0,0 +1,4 @@
+// eslint-disable-next-line no-undef
+export default definePageConfig({
+  navigationBarTitleText: '随手拍'
+})

src/pages/feedback/issue/index.jsx

@@ -0,0 +1,114 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View } from '@tarojs/components';
+import Page from '@/layouts/index';
+import { Button, Notify, Field, Cell, CellGroup } from '@antmjs/vantui';
+import Map from '@/components/map';
+import Uploader from '@/components/Uploader/index';
+import mapIcon from '@/assets/icons/marker.png';
+import { warn } from '@/utils/message';
+import { postTaFeedback } from '@/services/tafeedback';
+
+export default (props) => {
+  const readOnly = false;
+
+  const [loading, setLoading] = React.useState(false);
+  const fmRef = React.useRef({
+    typeId: undefined,
+    typeName: undefined,
+    locId: undefined,
+    locName: undefined,
+    location: undefined,
+    addr: undefined,
+    content: undefined,
+    attachList: [],
+  });
+  const [formData, setFormData] = React.useState(fmRef.current);
+
+  const setFieldChange = (field, value) => {
+    const data = {
+      ...fmRef.current,
+      [field]: value,
+    };
+
+    fmRef.current = data;
+    setFormData(data);
+  }
+
+  const onSubmit = () => {
+    try {
+      warn(!formData.addr, '请填写地址')
+      warn(!formData.content, '请填写问题描述')
+      warn(!formData.attachList || formData.attachList.length < 1, '请上传照片')
+    } catch (e) {
+      return;
+    }
+
+    setLoading(true)
+    postTaFeedback(formData).then(() => {
+      setLoading(false);
+      Taro.navigateBack({
+        delta: 1,
+        fail: () => {
+          Taro.reLaunch({
+            url: '/pages/home/index'
+          })
+        } 
+      });
+    }).catch(() => {
+      setLoading(false);
+    })
+
+  }
+
+  return (
+    <Page tabBar="feedback">
+      <Map
+        location={formData.location}
+        onLocChange={e => !formData.location && setFieldChange('location', e)}
+      />
+
+      <CellGroup>
+        <Field
+          placeholder="请填写当前位置"
+          value={formData.addr}
+          leftIcon={mapIcon}
+          readonly={readOnly}
+          onChange={e => setFieldChange('addr', e.detail)}
+        />
+      </CellGroup>
+
+      <CellGroup style={{ marginTop: '20px' }}>
+
+        <Cell title="问题描述" size="large" 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="拍照" size="large" border={false} />
+
+        <Cell
+          renderTitle={
+            <Uploader
+              value={formData.attachList}
+              disabled={readOnly}
+              onChange={e => setFieldChange('attachList', e)}
+            />
+          }
+        />
+      </CellGroup>
+
+      <View style={{ padding: 'var(--main-space)', background: '#fff' }}>
+        <Button block type="primary" onClick={onSubmit}>提交</Button>
+      </View>
+    </Page>
+  )
+}

src/pages/home/index.jsx

@@ -49,9 +49,9 @@ const menus = {
   
   // 市民
   [ROLE_CITIZEN]: [
-    { icon: 'icon1', text: '未处理', link: '/pages/issue/list2/index?title=未处理&bizStatus=start&from=citizen' },
-    { icon: 'icon2', text: '已处理', link: '/pages/issue/list2/index?title=已处理&bizStatus=assigned&from=citizen' },
-    { icon: 'icon12', text: '已打回', link: '/pages/issue/list2/index?title=已打回&bizStatus=reject&from=citizen' },
+    { icon: 'icon1', text: '未处理', link: '/pages/feedback/issuelist/index?title=未处理&bizStatus=start' },
+    { icon: 'icon2', text: '已处理', link: '/pages/feedback/issuelist/index?title=已处理&bizStatus=assigned' },
+    { icon: 'icon12', text: '已打回', link: '/pages/feedback/issuelist/index?title=已打回&bizStatus=reject' },
   ],
 }
 

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

@@ -30,7 +30,7 @@ export default (props) => {
         delta: 1,
         fail: () => {
           Taro.reLaunch({
-            url: 'pages/home/index'
+            url: '/pages/home/index'
           })
         } 
       });

src/pages/issue/edit/index.jsx

@@ -4,7 +4,7 @@ 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, ROLE_CITIZEN } from '@/utils/user';
+import { ROLE_INSPECTOR, ROLE_MANAGER, ROLE_CITIZEN, ROLE_QUERY_PERSON } from '@/utils/user';
 import { getTaIssueById } from '@/services/taissue';
 import { getSysOrgById } from '@/services/sysorg';
 import IssueForm from '../components/Issue';
@@ -65,8 +65,8 @@ export default (props) => {
       ]
     }
 
-    // 如果是市民
-    if (duty == ROLE_CITIZEN) {
+    // 如果是市民 或者查询员
+    if (duty == ROLE_CITIZEN || duty == ROLE_QUERY_PERSON) {
       return [
         true,
         false,
@@ -91,13 +91,18 @@ export default (props) => {
       setLoading(true)
       getTaIssueById(id).then(res => {
         setLoading(false);
-
-        getSysOrgById(res.orgId).then(r => {
-          setIssue({
-            ...res,
-            orgName: r.name
-          });
-        })
+        if (res.orgId) {
+          getSysOrgById(res.orgId).then(r => {
+            setIssue({
+              ...res,
+              orgName: r?.name
+            });
+          }).catch(() => {
+            setIssue(res);
+          })
+        } else {
+          setIssue(res);
+        }
       }).catch(() => {
         setLoading(false);
       });
@@ -105,7 +110,7 @@ export default (props) => {
   }, [id]);
 
   return (
-    <Page roles={[ROLE_INSPECTOR, ROLE_MANAGER, ROLE_CITIZEN]} loading={loading}>
+    <Page roles={[ROLE_INSPECTOR, ROLE_MANAGER, ROLE_CITIZEN, ROLE_QUERY_PERSON]} loading={loading}>
       <IssueForm
         issue={issue}
         readOnly={readOnly}

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

@@ -0,0 +1,20 @@
+import React from 'react';
+import Taro from '@tarojs/taro';
+import { View, Image } from '@tarojs/components';
+import styles from './style.module.less';
+
+export default (props) => {
+
+  const { name, avatar } = props;
+  
+  return (
+    <View className={styles['my-head-box']}>
+      <View className={styles['profile-box']}>
+        <View className={styles['profile-avatar']}>
+          <Image src={avatar} />
+        </View>
+        <View className={styles['profile-name']}>{name}</View>
+      </View>
+    </View>
+  )
+}

src/pages/my/components/Head/style.module.less

@@ -0,0 +1,65 @@
+
+.my-head-box {
+  background: var(--main-bg-color);
+  border-radius: 0px 0px 120px 120px;
+  height: 50vw;
+  display: flex;
+  justify-content: center;
+
+  .profile-box {
+    flex: none;
+    width: 40vw;
+    height: 40vw;
+
+    .profile-avatar {
+      position: relative;
+      width: 100%;
+      height: 100%;
+      display: grid;
+      place-items: center;
+
+      &::before {
+        content: '';
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+        z-index: 1;
+        background-color: rgba(255, 255, 255, .01);
+        border-radius: 50%;
+      }
+      
+      &::after {
+        content: '';
+        position: absolute;
+        top: 15%;
+        left: 15%;
+        width: 70%;
+        height: 70%;
+        z-index: 2;
+        background-color: rgba(255, 255, 255, .03);
+        border-radius: 50%;
+      }
+
+
+      image {
+        position: relative;
+        display: block;
+        width: 16vw;
+        height: 16vw;
+        border-radius: 50%;
+        overflow: hidden;
+        background: #fff;
+        z-index: 3;
+        margin: auto;
+      }
+    }
+
+    .profile-name {
+      font-size: 32px;
+      color: #FFFFFF;
+      text-align: center;
+    }
+  }
+}

src/pages/my/index.jsx

@@ -1,14 +1,29 @@
 import React from 'react';
+import Taro from '@tarojs/taro';
 import Page from '@/layouts/index';
 import { View, Image } from '@tarojs/components';
-import headportrait from '@/assets/icons/headportrait.png';
+import Head from './components/Head';
 import peopleicon from '@/assets/icons/peopleicon.png';
 import smallbell from '@/assets/icons/smallbell.png';
-import { Card } from '@antmjs/vantui';
-import Taro from '@tarojs/taro';
+import logo from '@/assets/image/logo.png';
+import { useModel } from '@/store';
+import { ROLE_CITIZEN } from '@/utils/user';
 import './index.less';
 
 export default (props) => {
+
+  const { user, person, duty } = useModel('user');
+
+  const [
+    show1,
+    show2,
+  ] = React.useMemo(() => {
+    return [
+      false,
+      false,
+    ]
+  }, [duty]);
+
   const onClick = () => {
     Taro.navigateTo({
       url: `/pages/my/edit/index`
@@ -17,29 +32,41 @@ export default (props) => {
 
   return (
     <Page tabBar="mine">
-      <View className="wrapper-header">
+      <Head
+        avatar={user?.avatar || person?.avatar || logo}
+        name={user?.name || person?.name || '市民先生'}
+      />
+      {/* <View className="wrapper-header">
         <View className="wrapper-header-circle">
           <View className="wrapper-header-circle2" />
         </View>
         <View className="wrapper-header-box">
-          <Image className="wrapper-header-img" src={headportrait} />
+          <Image className="wrapper-header-img" src={user?.avatar || person?.avatar || logo} />
         </View>
         <View className="wrapper-header-box2">
-          <View className="wrapper-header-text">昵称:Tomorrow</View>
+          <View className="wrapper-header-text">{user?.name || person?.name || '市民先生'}</View>
         </View>
       </View>
 
       <View className="wrapper-middle">
-        <View className="wrapper-middle-box">
-          <Image className="wrapper-middle-img" src={peopleicon} />
-          <View className="wrapper-middle-text">所在部门</View>
-          <View className="wrapper-middle-text2">县文明办</View>
-        </View>
-        <View className="wrapper-middle-box" onClick={onClick}>
-          <Image className="wrapper-middle-img" src={smallbell} />
-          <View className="wrapper-middle-text3">消息通知</View>
-        </View>
-      </View>
+        {
+          show1 && (
+            <View className="wrapper-middle-box">
+              <Image className="wrapper-middle-img" src={peopleicon} />
+              <View className="wrapper-middle-text">所在部门</View>
+              <View className="wrapper-middle-text2">县文明办</View>
+            </View>
+          )
+        }
+        {
+          show2 && (
+            <View className="wrapper-middle-box" onClick={onClick}>
+              <Image className="wrapper-middle-img" src={smallbell} />
+              <View className="wrapper-middle-text3">消息通知</View>
+            </View>
+          )
+        }
+      </View> */}
     </Page>
   )
 }

src/pages/my/index.less

@@ -1,10 +1,11 @@
 .wrapper-header {
   background: var(--main-bg-color);
   border-radius: 0px 0px 120px 120px;
-  height: 359px;
+  height: 50vw;
   align-items: center;
   display: flex;
   justify-content: center;
+
   .wrapper-header-circle {
     position: relative;
     opacity: 0.02;

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

@@ -34,11 +34,11 @@ export default (props) => {
 
     return [
       issue?.applyId,
-      status[orgIssue.result],
+      status[issue.applyType],
       orgIssue.processStatus == 'start' && !issue?.applyId
     ]
 
-  }, [issue, orgIssue.issueId]);
+  }, [issue, orgIssue]);
 
   const setFormData = (key, value) => {
     setOrgIssue({