Merge branch 'feature/maolipeng/youhua' into 'master'

Feature/maolipeng/youhua

See merge request !47

src/modules/root/Menu.less

@@ -14,12 +14,20 @@
   color: #333;
   color: #333;
   .topLogo {
   .topLogo {
     height: 62px;
     height: 62px;
-    img {
+    background: rgba(255, 255, 255, 0.5);
+    .img1 {
       width: 138px;
       width: 138px;
       height: 35px;
       height: 35px;
       margin-left: 19px;
       margin-left: 19px;
       margin-top: 13px;
       margin-top: 13px;
     }
     }
+    .img0 {
+      display: none;
+      width: 35px;
+      height: 35px;
+      margin-left: 10px;
+      margin-top: 13px;
+    }
   }
   }
   .menu-type-icon{
   .menu-type-icon{
     margin:4px  0 0px 150px;
     margin:4px  0 0px 150px;

src/modules/root/Menu.tsx

-import React, { useContext, useEffect, useState } from 'react';
+import React, { useContext, useEffect, useRef, useState } from 'react';
 import {
 import {
   withRouter,
   withRouter,
 } from 'react-router-dom';
 } from 'react-router-dom';
@@ -19,6 +19,8 @@ function Aside(props: any) {
   const [selectKey, setSelectKey] = useState();
   const [selectKey, setSelectKey] = useState();
   const [openKeys, setOpenKeys] = useState(['']);
   const [openKeys, setOpenKeys] = useState(['']);
   const [topLogoUrl, setTopLogoUrl] = useState("")
   const [topLogoUrl, setTopLogoUrl] = useState("")
+  const logoImg0Ref = useRef<any>()
+  const logoImg1Ref = useRef<any>()
   const rootSubmenuKeys = _.pluck(menuList, 'groupCode');
   const rootSubmenuKeys = _.pluck(menuList, 'groupCode');
   useEffect(() => {
   useEffect(() => {
     const link = props.location.pathname;
     const link = props.location.pathname;
@@ -43,7 +45,12 @@ function Aside(props: any) {
     if (User.getToken()) {
     if (User.getToken()) {
       StoreService.getStoreDetail({storeId:User.getStoreId()})
       StoreService.getStoreDetail({storeId:User.getStoreId()})
       .then(res=> {
       .then(res=> {
-        setTopLogoUrl(res.result.logo)
+        if (_.isEmpty(res.result.logo)) {
+          setTopLogoUrl("https://image.xiaomaiketang.com/xm/fe4NCjr7XF.png")
+        } else {
+          setTopLogoUrl(res.result.logo)
+        }
+        
       })
       })
     }
     }
   }
   }
@@ -60,6 +67,23 @@ function Aside(props: any) {
   function handleMenu() {
   function handleMenu() {
     handleMenuType();
     handleMenuType();
   }
   }
+  useEffect(()=> {
+    if (!logoImg0Ref.current || !logoImg1Ref.current) {
+      return
+    }
+    if (!menuType) {
+      if (topLogoUrl.indexOf("xiaomaiketang.com") < 0) {
+          logoImg0Ref.current.style.display = "none"
+          logoImg1Ref.current.style.display = "none"
+      } else {
+          logoImg0Ref.current.style.display = "inline"
+          logoImg1Ref.current.style.display = "none"
+      }
+    } else {
+      logoImg0Ref.current.style.display = "none"
+      logoImg1Ref.current.style.display = "inline"
+    }
+  },[menuType])
 
 
   return (
   return (
     <div 
     <div 
@@ -71,8 +95,8 @@ function Aside(props: any) {
         }
         }
       >
       >
         <div className="topLogo">
         <div className="topLogo">
-          { menuType ? (<img src={topLogoUrl} alt=""></img>) : ("")}
-          
+          <img ref={logoImg0Ref} src="https://image.xiaomaiketang.com/xm/c4KiP2epBP.png" alt="" className="img0"></img>
+          <img ref={logoImg1Ref} src={topLogoUrl} alt="" className="img1"></img>
         </div>
         </div>
         <div className="menu-type-icon"  onClick={handleMenu}>
         <div className="menu-type-icon"  onClick={handleMenu}>
           {menuType ? (
           {menuType ? (