Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

21 小时以前 54e81529b5644b10ebe9aa56c811c27e27bba59e

 admin/src/components/common/CommonHeader.vue

@@ -26,9 +26,9 @@
              <img src="@/assets/icons/ic_3.jpg" alt="">
              <img src="@/assets/icons/ic_4.jpg" alt="">
              <img src="@/assets/icons/ic_5.jpg" alt="">
              <img src="@/assets/icons/ic_6.jpg" alt="">
<!--              <img src="@/assets/icons/ic_6.jpg" alt="">-->
              <img src="@/assets/icons/ic_7.jpg" alt="">
              <img src="@/assets/icons/ic_8.jpg" alt="">
<!--              <img src="@/assets/icons/ic_8.jpg" alt="">-->
          </div>
          <el-dropdown v-if="isLogined" trigger="click">
            <span class="el-dropdown-link" style="cursor: pointer; color: rgba(255,255,255,.56);">
@@ -379,7 +379,7 @@
    box-sizing: border-box;
    min-width: 360px;
    height: 56px;
    padding: 10px 20px;
    padding: 10px 12px;
    // flex-shrink: 0;
    line-height: 36px;
    font-size: 22px;
@@ -484,8 +484,8 @@
        align-items: center;
        img {
            top: 0 !important;
            width: 20px;
            height: 20px;
            width: 18px;
            height: 18px;
            margin-right: 12px;
        }
    }