bug fix

src/layouts/BasicLayout.jsx

@@ -34,21 +34,9 @@ const footerRender = (_, defaultDom) => {
 };
 
 const menuHeaderRender = (logo, title) => {
-  const [logoInfo, setLogoInfo] = useState([]);
-
-  useEffect(() => {
-    getLogoInfo();
-  })
-  
-  const getLogoInfo = e => {
-    request({ ...apis.image.logo }).then(data => {
-      setLogoInfo(data.channelImg)
-    })
-  }
-
   return (
     <Link to="/">
-      <img src={logoInfo}/>
+      {logo}
       {title}
     </Link>
   );
@@ -56,6 +44,7 @@ const menuHeaderRender = (logo, title) => {
 
 const BasicLayout = props => {
   const { dispatch, children, settings } = props;
+  const [logoInfo, setLogoInfo] = useState(logo);
   /**
    * constructor
    */
@@ -69,12 +58,11 @@ const BasicLayout = props => {
         type: 'settings/getSetting',
       });
     }
-  }, []);
-  /**
-   * init variables
-   */
 
-  
+    request({ ...apis.image.logo }).then(data => {
+      setLogoInfo(data.channelImg)
+    })
+  }, []);
 
 
   const handleMenuCollapse = payload => {
@@ -88,7 +76,7 @@ const BasicLayout = props => {
 
   return (
     <ProLayout
-      logo={logo}
+      logo={logoInfo}
       onCollapse={handleMenuCollapse}
       menuItemRender={(menuItemProps, defaultDom) => {
         if (menuItemProps.isUrl) {

src/pages/UserManage/index.jsx

@@ -34,6 +34,9 @@ const ABCol = (props) => (
 export default (props) => {
   const [members, setMembers] = useState([]);
   const [pageNavi, setPageNavi] = useState({ current: 1, pageSize: 10, total: 0, size: 0 })
+  // const [pageNavi, setPageNavi] = useState({ current: 1, pageSize: 10, total: 0 })
+  // const [submitting, setSubmitting] = useState(false)
+  const [visibleData, setVisibleData] = useState({ visible: false, userId: '', oldPassword:'', newPassword: '', confirmPassword: '' })
 
   useEffect(() => {
     getMembers({ params: { pageNum: pageNavi.current, pageSize: pageNavi.pageSize } }).then((dt) => {