瀏覽代碼

feats: fix some syntax

Yansen 2 年之前
父節點
當前提交
7140f8707f

+ 1
- 1
config/prod.js 查看文件

@@ -6,7 +6,7 @@ module.exports = {
6 6
     HOST: '"https://wmcj.huoshannews.com"',
7 7
     AD_IMAGE: '"https://h5.njyunzhi.com/images/citizen_banner.png"',
8 8
     DEFAULT_POS: '"116.3476917447715,31.409912844296578"', // 霍山县人民政府 gcj02
9
-    VERSION: '"1.1.16-20230331"',
9
+    VERSION: '"1.1.17-20230403"',
10 10
   },
11 11
   mini: {},
12 12
   h5: {

+ 7
- 4
src/components/PowerList/index.jsx 查看文件

@@ -24,7 +24,7 @@ export default React.forwardRef((props, ref) => {
24 24
     }
25 25
   };
26 26
 
27
-  const queryData = React.useCallback(throttle(
27
+  const queryData = React.useMemo(() => throttle(
28 28
     (options = {}) => {
29 29
       return new Promise((resolve, reject) => {
30 30
         changeLoading(true);
@@ -99,11 +99,8 @@ export default React.forwardRef((props, ref) => {
99 99
 
100 100
   useHide(() => {
101 101
     pageShowRef.current = false;
102
-    Taro.removeStorageSync(`list-${sid}`);
103 102
   });
104 103
   
105
-  // 页面隐藏之后, 还会执行一次 useEffect
106
-  // 不知道是否是 Taro 的 bug
107 104
   React.useEffect(() => {
108 105
     if (pageShowRef.current) {
109 106
       refresh(params);
@@ -114,6 +111,12 @@ export default React.forwardRef((props, ref) => {
114 111
     refresh: () => refresh(params),
115 112
     updateData: (dt) => setList(dt),
116 113
   }), [params]);
114
+
115
+  React.useEffect(() => {
116
+    return () => {
117
+      Taro.removeStorageSync(`list-${sid}`);
118
+    }
119
+  }, []);
117 120
  
118 121
   return (
119 122
     <PowerScrollView

+ 2
- 2
src/layouts/hooks/useHide.js 查看文件

@@ -10,7 +10,7 @@ export default (fn) => {
10 10
 
11 11
   const evt = React.useMemo(() => {
12 12
     const _evt = Taro.getCurrentInstance().router.onHide;
13
-    Taro.eventCenter.on(_evt, fnRef.current);
13
+    Taro.eventCenter.on(_evt, () => fnRef.current());
14 14
 
15 15
     return _evt;
16 16
   }, []);
@@ -18,7 +18,7 @@ export default (fn) => {
18 18
   React.useEffect(() => {
19 19
     return () => {
20 20
       fnRef.current(); // 卸载的时候也执行一次
21
-      Taro.eventCenter.off(evt, fnRef.current);
21
+      Taro.eventCenter.off(evt);
22 22
     }
23 23
   }, []);
24 24
 }

+ 2
- 2
src/layouts/hooks/useShow.js 查看文件

@@ -10,14 +10,14 @@ export default (fn) => {
10 10
 
11 11
   const evt = React.useMemo(() => {
12 12
     const _evt = Taro.getCurrentInstance().router.onShow;
13
-    Taro.eventCenter.on(_evt, fnRef.current);
13
+    Taro.eventCenter.on(_evt, () => fnRef.current());
14 14
 
15 15
     return _evt;
16 16
   }, []);
17 17
 
18 18
   React.useEffect(() => {
19 19
     return () => {
20
-      Taro.eventCenter.off(evt, fnRef.current);
20
+      Taro.eventCenter.off(evt);
21 21
     }
22 22
   }, []);
23 23
 }

+ 9
- 2
src/pages/apply/list/index.jsx 查看文件

@@ -34,6 +34,13 @@ export default (props) => {
34 34
 
35 35
   const { user } = useModel("user");
36 36
 
37
+  const [param1, param2] = React.useMemo(() => {
38
+    return [
39
+      { applyType, sourceType: "inspector", duty, issueId },
40
+      { applyType, sourceType: "feedback", duty }
41
+    ]
42
+  }, [applyType, issueId, duty]);
43
+
37 44
   const onClick = (item) => {
38 45
     if (!user) return;
39 46
 
@@ -71,7 +78,7 @@ export default (props) => {
71 78
           <PowerList
72 79
             sid={sid1}
73 80
             request={getTaIssueApply}
74
-            params={{ applyType, sourceType: "inspector", duty, issueId }}
81
+            params={param1}
75 82
             renderItem={(item) => (
76 83
               <Card
77 84
                 key={item.applyId}
@@ -86,7 +93,7 @@ export default (props) => {
86 93
           <PowerList
87 94
             sid={sid2}
88 95
             request={getTaIssueApply}
89
-            params={{ applyType, sourceType: "feedback", duty }}
96
+            params={param2}
90 97
             renderItem={(item) => (
91 98
               <Card
92 99
                 key={item.applyId}

+ 5
- 1
src/pages/feedback/issuelist/index.jsx 查看文件

@@ -14,6 +14,10 @@ export default (props) => {
14 14
   const router = Taro.useRouter();
15 15
   const { title, bizStatus = '' } = router.params;
16 16
 
17
+  const params = React.useMemo(() => {
18
+    return {bizStatus, isMine: true};
19
+  }, [bizStatus]);
20
+
17 21
   React.useMemo(() => {
18 22
     if (title) {
19 23
       Taro.setNavigationBarTitle({ title });
@@ -33,7 +37,7 @@ export default (props) => {
33 37
       <PowerList
34 38
         sid={sid1}
35 39
         request={getTaFeedback}
36
-        params={{bizStatus, isMine: true}}
40
+        params={params}
37 41
         renderItem={(item) => (
38 42
           <Card key={item.issueId} issue={item} onClick={() => onClick(item)} />
39 43
         )}

+ 24
- 6
src/pages/issue/list/index.jsx 查看文件

@@ -31,6 +31,24 @@ export default (props) => {
31 31
 
32 32
   const [active, setActive] = React.useState(0);
33 33
 
34
+  const [
35
+    param1,
36
+    param2,
37
+    param3,
38
+    param4,
39
+    param5,
40
+    param6,
41
+  ] = React.useMemo(() => {
42
+    return [
43
+      { mine },
44
+      { mine, bizStatus: PROCESS_START },
45
+      { mine, bizStatus: PROCESS_ASSIGNED },
46
+      { mine, bizStatus: PROCESS_END },
47
+      { mine, bizStatus: 'expired' },
48
+      { mine, bizStatus: 'reject' },
49
+    ];
50
+  }, [mine])
51
+
34 52
   const onClick = (item) => {
35 53
     Taro.navigateTo({
36 54
       url: `/pages/issue/edit/index?id=${item.issueId}`
@@ -50,7 +68,7 @@ export default (props) => {
50 68
             <PowerList
51 69
               sid={sid1}
52 70
               request={getTaIssue}
53
-              params={{ mine }}
71
+              params={param1}
54 72
               renderItem={(item) => (
55 73
                 <Card key={item.issueId} issue={item} onClick={() => onClick(item)} />
56 74
               )}
@@ -62,7 +80,7 @@ export default (props) => {
62 80
           <PowerList
63 81
             sid={sid2}
64 82
             request={getTaIssue}
65
-            params={{ mine, bizStatus: PROCESS_START }}
83
+            params={param2}
66 84
             renderItem={(item) => (
67 85
               <Card key={item.issueId} issue={item} onClick={() => onClick(item)} />
68 86
             )}
@@ -74,7 +92,7 @@ export default (props) => {
74 92
           <PowerList
75 93
             sid={sid3}
76 94
             request={getTaIssue}
77
-            params={{ mine, bizStatus: PROCESS_ASSIGNED }}
95
+            params={param3}
78 96
             renderItem={(item) => (
79 97
               <Card key={item.issueId} issue={item} onClick={() => onClick(item)} />
80 98
             )}
@@ -86,7 +104,7 @@ export default (props) => {
86 104
           <PowerList
87 105
             sid={sid4}
88 106
             request={getTaIssue}
89
-            params={{ mine, bizStatus: PROCESS_END }}
107
+            params={param4}
90 108
             renderItem={(item) => (
91 109
               <Card key={item.issueId} issue={item} onClick={() => onClick(item)} />
92 110
             )}
@@ -98,7 +116,7 @@ export default (props) => {
98 116
           <PowerList
99 117
             sid={sid5}
100 118
             request={getTaIssue}
101
-            params={{ mine, bizStatus: 'expired' }}
119
+            params={param5}
102 120
             renderItem={(item) => (
103 121
               <Card key={item.issueId} issue={item} onClick={() => onClick(item)} />
104 122
             )}
@@ -110,7 +128,7 @@ export default (props) => {
110 128
           <PowerList
111 129
             sid={sid6}
112 130
             request={getTaIssue}
113
-            params={{ mine, bizStatus: 'reject' }}
131
+            params={param6}
114 132
             renderItem={(item) => (
115 133
               <Card key={item.issueId} issue={item} onClick={() => onClick(item)} />
116 134
             )}

+ 10
- 2
src/pages/issue/list2/index.jsx 查看文件

@@ -31,6 +31,13 @@ export default (props) => {
31 31
     }
32 32
   }, [title]);
33 33
 
34
+  const [param1, param2] = React.useMemo(() => {
35
+    return [
36
+      {bizStatus, mine, sourceType: "inspector", issueId},
37
+      {bizStatus, mine, sourceType: "feedback"},
38
+    ];
39
+  }, [mine, bizStatus, issueId]);
40
+
34 41
   const { user } = useModel("user");
35 42
 
36 43
   const onClick = (item) => {
@@ -43,6 +50,7 @@ export default (props) => {
43 50
     console.log(value);
44 51
     setIssueId(value);
45 52
   };
53
+
46 54
   return (
47 55
     <Page>
48 56
       <Search
@@ -56,7 +64,7 @@ export default (props) => {
56 64
           <PowerList
57 65
             sid={sid1}
58 66
             request={getTaIssue}
59
-            params={{ bizStatus, mine, sourceType: "inspector", issueId }}
67
+            params={param1}
60 68
             renderItem={(item) => (
61 69
               <Card
62 70
                 key={item.issueId}
@@ -70,7 +78,7 @@ export default (props) => {
70 78
           <PowerList
71 79
             sid={sid2}
72 80
             request={getTaIssue}
73
-            params={{ bizStatus, mine, sourceType: "feedback" }}
81
+            params={param2}
74 82
             renderItem={(item) => (
75 83
               <Card
76 84
                 key={item.issueId}

+ 5
- 1
src/pages/notice/index.jsx 查看文件

@@ -11,12 +11,16 @@ export default (props) => {
11 11
 
12 12
   const [loading, setLoading] = React.useState(false);
13 13
 
14
+  const params = React.useMemo(() => {
15
+    return {status: 1};
16
+  }, []);
17
+
14 18
   return (
15 19
     <Page tabBar="notice">
16 20
       <PowerList
17 21
         sid={sid1}
18 22
         request={getTaNotice}
19
-        params={{status: 1}}
23
+        params={params}
20 24
         renderItem={(item) => (
21 25
           <Card key={item.noticeId} dataset={item} />
22 26
         )}

+ 10
- 2
src/pages/org/issue/list/index.jsx 查看文件

@@ -22,6 +22,7 @@ export default (props) => {
22 22
   const router = Taro.useRouter();
23 23
   const { title, bizStatus, color } = router.params;
24 24
   const [issueId, setIssueId] = useState("");
25
+
25 26
   React.useMemo(() => {
26 27
     if (title) {
27 28
       Taro.setNavigationBarTitle({ title });
@@ -32,6 +33,13 @@ export default (props) => {
32 33
 
33 34
   // const { user } = useModel('user');
34 35
 
36
+  const [param1, param2] = React.useMemo(() => {
37
+    return [
38
+      { bizStatus, sourceType: "inspector" ,issueId},
39
+      { bizStatus, sourceType: "feedback" },
40
+    ];
41
+  }, [bizStatus, issueId]);
42
+
35 43
   const onClick = (item) => {
36 44
     Taro.navigateTo({
37 45
       url: `/pages/org/issue/detail/index?id=${item.issueId}`,
@@ -60,7 +68,7 @@ export default (props) => {
60 68
           <PowerList
61 69
             sid={sid1}
62 70
             request={getTaOrgIssue}
63
-            params={{ bizStatus, sourceType: "inspector" ,issueId}}
71
+            params={param1}
64 72
             renderItem={(item) => (
65 73
               <Card
66 74
                 key={item.issueId}
@@ -76,7 +84,7 @@ export default (props) => {
76 84
           <PowerList
77 85
             sid={sid2}
78 86
             request={getTaOrgIssue}
79
-            params={{ bizStatus, sourceType: "feedback" }}
87
+            params={param2}
80 88
             renderItem={(item) => (
81 89
               <Card
82 90
                 key={item.issueId}

+ 0
- 1
src/utils/tools.js 查看文件

@@ -5,7 +5,6 @@ export function throttle(fn, ms = 800){
5 5
   let flag = true;
6 6
 
7 7
   return (...args) => {
8
-    console.log('-----flag----', flag);
9 8
     if(!flag) return;
10 9
 
11 10
     flag = false;