Yansen 2 years ago
parent
commit
7a7de82894

+ 1
- 0
src/components/PowerList/index.jsx View File

80
       pageSize={pageSize}
80
       pageSize={pageSize}
81
       finished={finished}
81
       finished={finished}
82
       onScrollToLower={onScrollToLower}
82
       onScrollToLower={onScrollToLower}
83
+      style={{ height: '100%', overflowY: 'auto' }}
83
     >
84
     >
84
       {
85
       {
85
         list.map(renderItem)
86
         list.map(renderItem)

+ 2
- 0
src/components/map/index.jsx View File

35
       width: 17,
35
       width: 17,
36
       height: 20
36
       height: 20
37
     }] : [];
37
     }] : [];
38
+    
39
+  console.log('-----mks---', mks);
38
 
40
 
39
     return [
41
     return [
40
       mks,
42
       mks,

+ 8
- 2
src/pages/apply/list/index.jsx View File

9
 import { ROLE_MANAGER, ROLE_ORG_MANAGER } from '@/utils/user';
9
 import { ROLE_MANAGER, ROLE_ORG_MANAGER } from '@/utils/user';
10
 import { useModel } from '@/store';
10
 import { useModel } from '@/store';
11
 
11
 
12
+const tabStyle = {
13
+  overflow: 'hidden',
14
+  height: 'calc(100vh - 45px)',
15
+  overflow: 'hidden',
16
+}
17
+
12
 export default (props) => {
18
 export default (props) => {
13
 
19
 
14
   const router = Taro.useRouter();
20
   const router = Taro.useRouter();
49
   return (
55
   return (
50
     <Page>
56
     <Page>
51
       <Tabs sticky>
57
       <Tabs sticky>
52
-        <Tab title="督查员">
58
+        <Tab title="督查员" style={tabStyle}>
53
           <PowerList
59
           <PowerList
54
             request={getTaIssueApply}
60
             request={getTaIssueApply}
55
             params={{ applyType, sourceType: 'inspector' }}
61
             params={{ applyType, sourceType: 'inspector' }}
58
             )}
64
             )}
59
           />
65
           />
60
         </Tab>
66
         </Tab>
61
-        <Tab title="市民">
67
+        <Tab title="市民" style={tabStyle}>
62
           <PowerList
68
           <PowerList
63
             request={getTaIssueApply}
69
             request={getTaIssueApply}
64
             params={{ applyType, sourceType: 'feedback' }}
70
             params={{ applyType, sourceType: 'feedback' }}

+ 12
- 6
src/pages/issue/list/index.jsx View File

9
 import { ROLE_INSPECTOR, ROLE_MANAGER } from '@/utils/user';
9
 import { ROLE_INSPECTOR, ROLE_MANAGER } from '@/utils/user';
10
 import { getIssueStatus, PROCESS_ASSIGNED, PROCESS_END, PROCESS_START } from '@/utils/biz';
10
 import { getIssueStatus, PROCESS_ASSIGNED, PROCESS_END, PROCESS_START } from '@/utils/biz';
11
 
11
 
12
+const tabStyle = {
13
+  overflow: 'hidden',
14
+  height: 'calc(100vh - 45px)',
15
+  overflow: 'hidden',
16
+}
17
+
12
 // 只有督查员能看到当前页面
18
 // 只有督查员能看到当前页面
13
 export default (props) => {
19
 export default (props) => {
14
   // const { user } = useModel('user');
20
   // const { user } = useModel('user');
25
   return (
31
   return (
26
     <Page roles={[ROLE_INSPECTOR]}>
32
     <Page roles={[ROLE_INSPECTOR]}>
27
       <Tabs sticky>
33
       <Tabs sticky>
28
-        <Tab title="全部">
34
+        <Tab title="全部" style={tabStyle}>
29
           <PowerList
35
           <PowerList
30
             request={getTaIssue}
36
             request={getTaIssue}
31
             params={{ mine }}
37
             params={{ mine }}
34
             )}
40
             )}
35
           />
41
           />
36
         </Tab>
42
         </Tab>
37
-        <Tab title="未交办">
43
+        <Tab title="未交办" style={tabStyle}>
38
           <PowerList
44
           <PowerList
39
             request={getTaIssue}
45
             request={getTaIssue}
40
             params={{ mine, bizStatus: PROCESS_START }}
46
             params={{ mine, bizStatus: PROCESS_START }}
43
             )}
49
             )}
44
           />
50
           />
45
         </Tab>
51
         </Tab>
46
-        <Tab title="已交办">
52
+        <Tab title="已交办" style={tabStyle}>
47
           <PowerList
53
           <PowerList
48
             request={getTaIssue}
54
             request={getTaIssue}
49
             params={{ mine, bizStatus: PROCESS_ASSIGNED }}
55
             params={{ mine, bizStatus: PROCESS_ASSIGNED }}
52
             )}
58
             )}
53
           />
59
           />
54
         </Tab>
60
         </Tab>
55
-        <Tab title="已办结">
61
+        <Tab title="已办结" style={tabStyle}>
56
           <PowerList
62
           <PowerList
57
             request={getTaIssue}
63
             request={getTaIssue}
58
             params={{ mine, bizStatus: PROCESS_END }}
64
             params={{ mine, bizStatus: PROCESS_END }}
61
             )}
67
             )}
62
           />
68
           />
63
         </Tab>
69
         </Tab>
64
-        <Tab title="已逾期">
70
+        <Tab title="已逾期" style={tabStyle}>
65
           <PowerList
71
           <PowerList
66
             request={getTaIssue}
72
             request={getTaIssue}
67
             params={{ mine, bizStatus: 'expired' }}
73
             params={{ mine, bizStatus: 'expired' }}
70
             )}
76
             )}
71
           />
77
           />
72
         </Tab>
78
         </Tab>
73
-        <Tab title="已打回">
79
+        <Tab title="已打回" style={tabStyle}>
74
           <PowerList
80
           <PowerList
75
             request={getTaIssue}
81
             request={getTaIssue}
76
             params={{ mine, bizStatus: 'reject' }}
82
             params={{ mine, bizStatus: 'reject' }}

+ 8
- 3
src/pages/issue/list2/index.jsx View File

10
 import { useModel } from '@/store';
10
 import { useModel } from '@/store';
11
 import { getIssueStatus } from '@/utils/biz';
11
 import { getIssueStatus } from '@/utils/biz';
12
 
12
 
13
-export default (props) => {
13
+const tabStyle = {
14
+  overflow: 'hidden',
15
+  height: 'calc(100vh - 45px)',
16
+  overflow: 'hidden',
17
+}
14
 
18
 
19
+export default (props) => {
15
   const router = Taro.useRouter();
20
   const router = Taro.useRouter();
16
   const { title, bizStatus = '', mine = '' } = router.params;
21
   const { title, bizStatus = '', mine = '' } = router.params;
17
 
22
 
34
   return (
39
   return (
35
     <Page>
40
     <Page>
36
       <Tabs sticky>
41
       <Tabs sticky>
37
-        <Tab title="督查员">
42
+        <Tab title="督查员" style={tabStyle}>
38
           <PowerList
43
           <PowerList
39
             request={getTaIssue}
44
             request={getTaIssue}
40
             params={{ bizStatus, mine, sourceType: 'inspector' }}
45
             params={{ bizStatus, mine, sourceType: 'inspector' }}
43
             )}
48
             )}
44
           />
49
           />
45
         </Tab>
50
         </Tab>
46
-        <Tab title="市民">
51
+        <Tab title="市民" style={tabStyle}>
47
           <PowerList
52
           <PowerList
48
             request={getTaIssue}
53
             request={getTaIssue}
49
             params={{ bizStatus, mine, sourceType: 'feedback' }}
54
             params={{ bizStatus, mine, sourceType: 'feedback' }}

+ 0
- 2
src/pages/message/list/components/Card.jsx View File

10
 export default (props) => {
10
 export default (props) => {
11
   const { item, duty } = props;
11
   const { item, duty } = props;
12
 
12
 
13
-  console.log(item)
14
-
15
   const onClick = () => {
13
   const onClick = () => {
16
     if (item.targetType == 'apply') {
14
     if (item.targetType == 'apply') {
17
       getTaIssueApplyById(item.targetId).then(res => naviTo(res.issueId));
15
       getTaIssueApplyById(item.targetId).then(res => naviTo(res.issueId));

+ 8
- 2
src/pages/org/issue/list/index.jsx View File

10
 import { useModel } from '@/store';
10
 import { useModel } from '@/store';
11
 import { getIssueStatus } from '@/utils/biz';
11
 import { getIssueStatus } from '@/utils/biz';
12
 
12
 
13
+const tabStyle = {
14
+  overflow: 'hidden',
15
+  height: 'calc(100vh - 45px)',
16
+  overflow: 'hidden',
17
+}
18
+
13
 export default (props) => {
19
 export default (props) => {
14
 
20
 
15
   const router = Taro.useRouter();
21
   const router = Taro.useRouter();
34
   return (
40
   return (
35
     <Page>
41
     <Page>
36
       <Tabs sticky>
42
       <Tabs sticky>
37
-        <Tab title="督查员">
43
+        <Tab title="督查员" style={tabStyle}>
38
           <PowerList
44
           <PowerList
39
             request={getTaOrgIssue}
45
             request={getTaOrgIssue}
40
             params={{ bizStatus, sourceType: 'inspector' }}
46
             params={{ bizStatus, sourceType: 'inspector' }}
43
             )}
49
             )}
44
           />
50
           />
45
         </Tab>
51
         </Tab>
46
-        <Tab title="市民">
52
+        <Tab title="市民" style={tabStyle}>
47
           <PowerList
53
           <PowerList
48
             request={getTaOrgIssue}
54
             request={getTaOrgIssue}
49
             params={{ bizStatus, sourceType: 'feedback' }}
55
             params={{ bizStatus, sourceType: 'feedback' }}