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

src/components/Icon.jsx

@@ -12,6 +12,7 @@ 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';
+import icon12 from '@/assets/icons/icon12.png';
 
 const icons = {
   icon1,
@@ -25,6 +26,7 @@ const icons = {
   icon9,
   icon10,
   icon11,
+  icon12,
 }
 
 export default (props) => {

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

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

src/pages/feedback/issuelist/index.jsx

@@ -0,0 +1,40 @@
+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 Card from '@/components/IssueCard';
+import { getTaFeedback } from '@/services/tafeedback';
+import { getIssueStatus } from '@/utils/biz';
+
+export default (props) => {
+
+  const router = Taro.useRouter();
+  const { title, bizStatus = '' } = router.params;
+
+  React.useMemo(() => {
+    if (title) {
+      Taro.setNavigationBarTitle({ title });
+    } else {
+      Taro.setNavigationBarTitle({ title: '反馈列表' });
+    }
+  }, [title]);
+
+  const onClick = (item) => {
+    Taro.navigateTo({
+      url: `/pages/issue/edit/index?id=${item.issueId}`
+    })
+  }
+  
+  return (
+    <Page>
+      <PowerList
+        request={getTaFeedback}
+        params={{bizStatus, isMine: true}}
+        renderItem={(item) => (
+          <Card key={item.issueId} detail={item} onClick={() => onClick(item)} />
+        )}
+      />
+    </Page>
+  )
+}

src/pages/home/index.jsx

@@ -47,11 +47,11 @@ const menus = {
     { icon: 'icon7', text: '统计查询', link: '' },
   ],
   
-  // 督察员
+  // 市民
   [ROLE_CITIZEN]: [
-    { icon: 'icon1', text: '未 处 理', link: '/pages/issue/list2/index?title=未处理&bizStatus=start' },
-    { icon: 'icon2', text: '处 理 中', link: '/pages/issue/list2/index?title=处理中&bizStatus=assigned' },
-    { icon: 'icon7', text: '已 打 回', link: '' },
+    { 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' },
   ],
 }
 

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 } from '@/utils/user';
+import { ROLE_INSPECTOR, ROLE_MANAGER, ROLE_CITIZEN } from '@/utils/user';
 import { getTaIssueById } from '@/services/taissue';
 import IssueForm from '../components/Issue';
 import Save from './components/Save';
@@ -49,6 +49,16 @@ export default (props) => {
       ]
     }
 
+    // 如果是市民
+    if (duty == ROLE_CITIZEN) {
+      return [
+        true,
+        false,
+        false,
+        false,
+      ]
+    }
+
     return [];
   }, [issue, duty]);
 
@@ -72,7 +82,7 @@ export default (props) => {
   }, [id]);
 
   return (
-    <Page roles={[ROLE_INSPECTOR, ROLE_MANAGER]} loading={loading}>
+    <Page roles={[ROLE_INSPECTOR, ROLE_MANAGER, ROLE_CITIZEN]} loading={loading}>
       <IssueForm
         issue={issue}
         readOnly={readOnly}

src/services/tafeedback.js

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