Browse Source

Merge branch 'dev1.0' of http://git.ycjcjy.com/civilized_city/miniapp into dev1.0

fangmingyue 2 years ago
parent
commit
0f0ff9dd2b
3 changed files with 7 additions and 4 deletions
  1. 3
    1
      src/layouts/hooks/useShow.js
  2. 2
    1
      src/layouts/index.jsx
  3. 2
    2
      src/store/page.js

+ 3
- 1
src/layouts/hooks/useShow.js View File

9
   fnRef.current = fn;
9
   fnRef.current = fn;
10
 
10
 
11
   const { getPageCtx } = useModel('page');
11
   const { getPageCtx } = useModel('page');
12
-  const { show } = React.useContext(getPageCtx());
12
+  // eslint-disable-next-line react-hooks/exhaustive-deps
13
+  const ctx = React.useMemo(getPageCtx, []);
14
+  const { show } = React.useContext(ctx);
13
 
15
 
14
   React.useEffect(() => {
16
   React.useEffect(() => {
15
     if (show) {
17
     if (show) {

+ 2
- 1
src/layouts/index.jsx View File

15
   const { setPageCtx } = useModel('page');
15
   const { setPageCtx } = useModel('page');
16
   const [pageShow, setPageShow] = React.useState(false);
16
   const [pageShow, setPageShow] = React.useState(false);
17
   const PageContext = React.useMemo(() => {
17
   const PageContext = React.useMemo(() => {
18
-    const ctx = React.createContext();
18
+    const ctx = React.createContext({show: false});
19
     setPageCtx(ctx);
19
     setPageCtx(ctx);
20
 
20
 
21
     return ctx;
21
     return ctx;
22
+  // eslint-disable-next-line react-hooks/exhaustive-deps
22
   }, []);
23
   }, []);
23
 
24
 
24
   const containerClass = `${laySty['page-conatiner']} ${tabBar ? laySty['with-tabbar'] : ''} ${className}`;
25
   const containerClass = `${laySty['page-conatiner']} ${tabBar ? laySty['with-tabbar'] : ''} ${className}`;

+ 2
- 2
src/store/page.js View File

3
 export default () => {
3
 export default () => {
4
   const pageCtxRef = React.useRef();
4
   const pageCtxRef = React.useRef();
5
 
5
 
6
-  const setPageCtx = (pg) => {
7
-    pageCtxRef.current = pg;
6
+  const setPageCtx = (ctx) => {
7
+    pageCtxRef.current = ctx;
8
   }
8
   }
9
   const getPageCtx = () => {
9
   const getPageCtx = () => {
10
     return pageCtxRef.current;
10
     return pageCtxRef.current;