Merge branch 'bugfix' into 'develop'

解决代码冲突

See merge request dcuc-bujz/auth-web!4

src/pages/layout/components/navbar.vue

@@ -40,25 +40,6 @@
             </div>
         </div>
     </div>
-  <div class="l-main-header" style="position: relative">
-    <div class="l-main-header__left">
-      <div class="l-main-header__box">
-        <img style="width: 40px; height: 40px" class="l-main-header__logo" src="@/assets/images/layout/logo.png" />
-      </div>
-      <p class="l-main-header__title">警务云统一授权管理中心</p>
-    </div>
-    <div class="l-main-header__center"></div>
-    <div class="l-main-header__right">
-      <div style="display: inline-block; vertical-align: top">
-        <!-- 用户操作区域 -->
-        <div class="l-avatar-box">
-          <i class="icon icon-user2"></i>
-          <span class="l-avatar-box__user">{{ name }}</span>
-          <i class="icon icon-close" title="退出登录" @click="logout"></i>
-        </div>
-      </div>
-    </div>
-  </div>
 </template>