Merge branch 'develop' into 'master'

fix：修复头像与搜索框错位的问题

See merge request !50

src/components/Layout/index.vue

@@ -31,7 +31,7 @@
             class="hamburger-container"
           />
           <breadcrumb />
-          <div style="width: 100%;position: absolute;right: 163px;">
+          <div style="width: 100%">
             <async-search class="main-search"></async-search>
           </div>
           <el-dropdown class="avatar-container" trigger="click">
@@ -208,13 +208,14 @@ export default {
     height: 50px;
     display: inline-block;
     margin: 0 15px
-    position: absolute;
-    right: 35px;
     .avatar-wrapper {
       cursor: pointer;
       margin-top: 5px;
       position: relative;
       line-height: initial;
+      display flex;
+      align-items flex-end
+      white-space nowrap
       .svg-icon {
         width: 40px;
         height: 40px;
@@ -222,12 +223,9 @@ export default {
       .user-avatar {
         width: 40px;
         height: 40px;
-        border-radius: 10px;
+        border-radius: 50%;
       }
       .el-icon-caret-bottom {
-        position: absolute;
-        right: -10px;
-        top: 25px;
         font-size: 12px;
       }
     }