Merge branch 'feature/maolipeng/youhua' into rc

# Conflicts:
#	src/modules/root/Header.jsx

src/modules/root/Header.jsx

@@ -50,7 +50,7 @@ function Header(props) {
       setStoreName(value);
     });
     getStoreList();
-    // getTopLeftLogo()
+    getTopLeftLogo()
   }, []);
 
   useEffect(() => {
@@ -82,8 +82,8 @@ function Header(props) {
   }
 
   function getTopLeftLogo() {
-    if(User.getToken()){
-      StoreService.getStoreDetail({storeId:User.getStoreId})
+    if (User.getToken()) {
+      StoreService.getStoreDetail({storeId:User.getStoreId()})
       .then(res=> {
         setTopLeftLogo(res.result.logo)
       })
@@ -232,7 +232,7 @@ function Header(props) {
     <div id="top-container" className="top-container">
       <div className="top top-nav">
         <div>
-          <img src="https://image.xiaomaiketang.com/xm/WEsMPAYxAs.png" className="logo" alt="" />
+          <img src={topLeftLogo} className="logo" alt="" />
         </div>
         <div className="message-help">
           {list.length ? (