Yansen 2 年 前
コミット
7a7de82894

+ 1
- 0
src/components/PowerList/index.jsx ファイルの表示

@@ -80,6 +80,7 @@ export default React.forwardRef((props, ref) => {
80 80
       pageSize={pageSize}
81 81
       finished={finished}
82 82
       onScrollToLower={onScrollToLower}
83
+      style={{ height: '100%', overflowY: 'auto' }}
83 84
     >
84 85
       {
85 86
         list.map(renderItem)

+ 2
- 0
src/components/map/index.jsx ファイルの表示

@@ -35,6 +35,8 @@ export default (props) => {
35 35
       width: 17,
36 36
       height: 20
37 37
     }] : [];
38
+    
39
+  console.log('-----mks---', mks);
38 40
 
39 41
     return [
40 42
       mks,

+ 8
- 2
src/pages/apply/list/index.jsx ファイルの表示

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

+ 12
- 6
src/pages/issue/list/index.jsx ファイルの表示

@@ -9,6 +9,12 @@ import { getTaIssue } from '@/services/taissue';
9 9
 import { ROLE_INSPECTOR, ROLE_MANAGER } from '@/utils/user';
10 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 19
 export default (props) => {
14 20
   // const { user } = useModel('user');
@@ -25,7 +31,7 @@ export default (props) => {
25 31
   return (
26 32
     <Page roles={[ROLE_INSPECTOR]}>
27 33
       <Tabs sticky>
28
-        <Tab title="全部">
34
+        <Tab title="全部" style={tabStyle}>
29 35
           <PowerList
30 36
             request={getTaIssue}
31 37
             params={{ mine }}
@@ -34,7 +40,7 @@ export default (props) => {
34 40
             )}
35 41
           />
36 42
         </Tab>
37
-        <Tab title="未交办">
43
+        <Tab title="未交办" style={tabStyle}>
38 44
           <PowerList
39 45
             request={getTaIssue}
40 46
             params={{ mine, bizStatus: PROCESS_START }}
@@ -43,7 +49,7 @@ export default (props) => {
43 49
             )}
44 50
           />
45 51
         </Tab>
46
-        <Tab title="已交办">
52
+        <Tab title="已交办" style={tabStyle}>
47 53
           <PowerList
48 54
             request={getTaIssue}
49 55
             params={{ mine, bizStatus: PROCESS_ASSIGNED }}
@@ -52,7 +58,7 @@ export default (props) => {
52 58
             )}
53 59
           />
54 60
         </Tab>
55
-        <Tab title="已办结">
61
+        <Tab title="已办结" style={tabStyle}>
56 62
           <PowerList
57 63
             request={getTaIssue}
58 64
             params={{ mine, bizStatus: PROCESS_END }}
@@ -61,7 +67,7 @@ export default (props) => {
61 67
             )}
62 68
           />
63 69
         </Tab>
64
-        <Tab title="已逾期">
70
+        <Tab title="已逾期" style={tabStyle}>
65 71
           <PowerList
66 72
             request={getTaIssue}
67 73
             params={{ mine, bizStatus: 'expired' }}
@@ -70,7 +76,7 @@ export default (props) => {
70 76
             )}
71 77
           />
72 78
         </Tab>
73
-        <Tab title="已打回">
79
+        <Tab title="已打回" style={tabStyle}>
74 80
           <PowerList
75 81
             request={getTaIssue}
76 82
             params={{ mine, bizStatus: 'reject' }}

+ 8
- 3
src/pages/issue/list2/index.jsx ファイルの表示

@@ -10,8 +10,13 @@ import { ROLE_MANAGER } from '@/utils/user';
10 10
 import { useModel } from '@/store';
11 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 20
   const router = Taro.useRouter();
16 21
   const { title, bizStatus = '', mine = '' } = router.params;
17 22
 
@@ -34,7 +39,7 @@ export default (props) => {
34 39
   return (
35 40
     <Page>
36 41
       <Tabs sticky>
37
-        <Tab title="督查员">
42
+        <Tab title="督查员" style={tabStyle}>
38 43
           <PowerList
39 44
             request={getTaIssue}
40 45
             params={{ bizStatus, mine, sourceType: 'inspector' }}
@@ -43,7 +48,7 @@ export default (props) => {
43 48
             )}
44 49
           />
45 50
         </Tab>
46
-        <Tab title="市民">
51
+        <Tab title="市民" style={tabStyle}>
47 52
           <PowerList
48 53
             request={getTaIssue}
49 54
             params={{ bizStatus, mine, sourceType: 'feedback' }}

+ 0
- 2
src/pages/message/list/components/Card.jsx ファイルの表示

@@ -10,8 +10,6 @@ import style from './card.module.less';
10 10
 export default (props) => {
11 11
   const { item, duty } = props;
12 12
 
13
-  console.log(item)
14
-
15 13
   const onClick = () => {
16 14
     if (item.targetType == 'apply') {
17 15
       getTaIssueApplyById(item.targetId).then(res => naviTo(res.issueId));

+ 8
- 2
src/pages/org/issue/list/index.jsx ファイルの表示

@@ -10,6 +10,12 @@ import { ROLE_MANAGER } from '@/utils/user';
10 10
 import { useModel } from '@/store';
11 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 19
 export default (props) => {
14 20
 
15 21
   const router = Taro.useRouter();
@@ -34,7 +40,7 @@ export default (props) => {
34 40
   return (
35 41
     <Page>
36 42
       <Tabs sticky>
37
-        <Tab title="督查员">
43
+        <Tab title="督查员" style={tabStyle}>
38 44
           <PowerList
39 45
             request={getTaOrgIssue}
40 46
             params={{ bizStatus, sourceType: 'inspector' }}
@@ -43,7 +49,7 @@ export default (props) => {
43 49
             )}
44 50
           />
45 51
         </Tab>
46
-        <Tab title="市民">
52
+        <Tab title="市民" style={tabStyle}>
47 53
           <PowerList
48 54
             request={getTaOrgIssue}
49 55
             params={{ bizStatus, sourceType: 'feedback' }}