Merge branch 'dev-hn'

src/layouts/AppLayout/components/GlobalHeader/index.js

+import AvatarDropdown from './AvatarDropdown';
+
+export { AvatarDropdown };

src/layouts/AppLayout/components/GlobalHeader/index.less

+@import '~antd/es/style/themes/default.less';
+@pro-header-hover-bg: rgba(0, 0, 0, 0.025);
+@panda-prefix-cls: ~'@{ant-prefix}';
+.@{panda-prefix-cls}-action {
+  display: flex;
+  align-items: center;
+  height: 100%;
+  padding: 0 9px;
+  cursor: pointer;
+  transition: all 0.3s;
+  > span {
+    vertical-align: middle;
+    margin: 0 8px 0 0 !important;
+  }
+  &:hover {
+    background: @pro-header-hover-bg;
+  }
+  &:global(.opened) {
+    background: @pro-header-hover-bg;
+  }
+}
+.@{panda-prefix-cls}-account {
+  &-avatar {
+    margin: ~'calc((@{layout-header-height} - 24px) / 2)' 0;
+    // margin-right: 8px;
+    color: @primary-color;
+    vertical-align: top;
+    background: rgba(255, 255, 255, 0.85);
+    width: 36px;
+    height: 36px;
+    border-radius: 50%;
+    box-shadow: 2px 2px 10px rgba(0, 0, 0, 0.3);
+    transition: box-shadow 0.1s linear, opacity 0.4s linear;
+    background-position: center;
+    overflow: hidden;
+  }
+}
+
+.@{panda-prefix-cls}-userWrapper {
+  &-userInfo {
+    background-color: #fff;
+    width: 300px;
+    position: absolute;
+    right: 0;
+    top: 10px;
+    box-shadow: 0 0 10px rgba(0, 0, 0, 0.15);
+    border-radius: 6px;
+    &-header {
+      width: 100%;
+      height: 80px;
+      position: relative;
+      background: #40b3f7;
+      padding: 14px 12px;
+      display: flex;
+      border-top-left-radius: 6px;
+      border-top-right-radius: 6px;
+      &-avatar {
+        display: inline-block;
+        width: 52px;
+        height: 52px;
+        border: 2px solid #fff;
+        background-color: #fff;
+        border-radius: 50%;
+        background-size: 100%;
+        background-repeat: no-repeat;
+        background-position: center center;
+        background-position: center;
+        cursor: pointer;
+      }
+      &-name {
+        display: inline-block;
+        width: 214px;
+        font-size: 18px;
+        color: #fff;
+        font-weight: bold;
+        padding: 14px;
+      }
+    }
+    &-body {
+      &-item {
+        border-bottom: 1px solid #e0e0e0;
+        ul {
+          padding: 0 12px;
+          list-style: none;
+          margin: 0;
+          li {
+            height: 40px;
+            line-height: 42px;
+            border-bottom: 1px dashed #eee;
+            position: relative;
+            text-indent: 3px;
+            overflow: hidden;
+            width: 100%;
+            font-size: 12px;
+            font-weight: 100;
+            &-label {
+              padding: 0 2px;
+              max-width: 200px;
+            }
+            &-value {
+              padding: 0 2px;
+              max-width: 200px;
+            }
+          }
+        }
+      }
+      &-exit {
+        height: 30px;
+        line-height: 30px;
+        text-align: right;
+        padding: 0 10px;
+        a {
+          color: #777;
+          text-decoration: none;
+          margin: 0 5px;
+          &:hover {
+            color: @primary-7;
+          }
+        }
+      }
+    }
+  }
+}
+
+.@{panda-prefix-cls}-updatePassword {
+  :global(.@{ant-prefix}-modal-header) {
+    padding: 10px 24px !important;
+  }
+  :global(.@{ant-prefix}-modal-close .@{ant-prefix}-modal-close-x) {
+    width: 45px;
+    height: 45px;
+    font-size: 12px;
+    line-height: 35px;
+  }
+  :global(.@{ant-prefix}-modal-body) {
+    padding: 10px 24px;
+  }
+  :global(.@{ant-prefix}-modal-footer) {
+    padding: 8px 12px;
+  }
+  :global(.@{ant-prefix}-modal-footer .@{ant-prefix}-btn) {
+    line-height: 1.2px;
+    height: 28px;
+  }
+}

src/layouts/AppLayout/components/SlideMenu/index.js

@@ -59,10 +59,7 @@ const Menu = props => {
     if (route && route.routes) {
       setsunRoute(route);
       let tmp = treeRoutes(route.routes);
-      console.log('tmp', tmp);
-      console.log('route', route);
       setsunRoute({ ...sunRoute, routes: tmp });
-      console.log('sunRoute', sunRoute);
     }
   }, [route]);
   const treeRoutes = useCallback(iroute =>

src/layouts/HN.less

 @hn-greenColor: #00b278;
-:global {
-  .panda-console-base-userWrapper-userInfo-header {
-    //右上角弹框
-    // background-color: @hn-greenColor;
-  }
-}
+
 .hnlayout {
   :global {
+    .panda-console-base-global-page-header-header {
+      padding-left: 0;
+    }
     .panda-console-base-global-page-header-header-logo {
+      width: 140px;
+      padding-left: 0;
       & > img {
-        width: 144px !important;
+        width: auto !important;
         height: 36px;
+        margin: 0 auto;
       }
     }
     .panda-console-base-global-page-header {

src/layouts/HNLayout.js

@@ -9,7 +9,7 @@ import { connect } from 'react-redux';
 import { useHistory } from '@wisdom-utils/runtime';
 import KeepAlive from 'react-activation';
 import AMapLoader from '@amap/amap-jsapi-loader';
-import RightContent from '@/components/GlobalHeader/ExtendRightContent';
+import RightContent from '@/components/GlobalHeader/HNRightContent';
 import defaultSetting from '@wisdom-utils/components/lib/AppLayout/layouts/defaultSettings';
 import { actionCreators } from '@/containers/App/store';
 import BasicLayout from './AppLayout/layouts/BasicLayout';
@@ -260,9 +260,10 @@ const Layout = props => {
       <div className={styls.hnlayout}>
         <BasicLayout
           route={props.route}
-          title={props.global.subtitle}
+          title={props.global.title}
           siderWidth={140}
           logo={logo}
+          // logo={require('@/assets/basic/HN-logo.png')}
           config={props.global}
           currentMenuIndex={props.currentMenuIndex}
           onHeaderLogo={handlerIndustry}