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

src/layouts/hooks/useShow.js

@@ -9,7 +9,9 @@ export default (fn, deps = []) => {
   fnRef.current = fn;
 
   const { getPageCtx } = useModel('page');
-  const { show } = React.useContext(getPageCtx());
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  const ctx = React.useMemo(getPageCtx, []);
+  const { show } = React.useContext(ctx);
 
   React.useEffect(() => {
     if (show) {

src/layouts/index.jsx

@@ -15,10 +15,11 @@ export default (props) => {
   const { setPageCtx } = useModel('page');
   const [pageShow, setPageShow] = React.useState(false);
   const PageContext = React.useMemo(() => {
-    const ctx = React.createContext();
+    const ctx = React.createContext({show: false});
     setPageCtx(ctx);
 
     return ctx;
+  // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
   const containerClass = `${laySty['page-conatiner']} ${tabBar ? laySty['with-tabbar'] : ''} ${className}`;

src/store/page.js

@@ -3,8 +3,8 @@ import React from "react";
 export default () => {
   const pageCtxRef = React.useRef();
 
-  const setPageCtx = (pg) => {
-    pageCtxRef.current = pg;
+  const setPageCtx = (ctx) => {
+    pageCtxRef.current = ctx;
   }
   const getPageCtx = () => {
     return pageCtxRef.current;