Merge branch 'feature/停复机1' into dev

* feature/停复机1:
  移动横栏位置 不改变框架高度计算

# Conflicts:
#	src/components/layout/index.vue

src/components/layout/index.vue

 <template>
   <div>
-    <notice />
     <div class="hb-layout" v-loading="fullLoading.visible">
       <main-menu ref="mainMenu" :menu-list="menuList" :actived-code="activedMenu.length > 0 ? activedMenu[0].menuCode : ''" @showLoading="onShowLoading"></main-menu>
       <aside-menu v-show="showAside" :menu-list="activedMenu.length > 0 ? activedMenu[0].childList : []" :actived-code="activedMenu.length > 2 ? activedMenu[2].menuCode : ''"></aside-menu>
       <div class="hb-layout-content" :style="{ width: showAside ? 'calc(100% - 206px)' : '100%' }">
         <bread-menu v-if="activedMenu.length > 3" :menu-list="activedMenu.slice(2)"></bread-menu>
         <div class="hb-layout-pager" id="hb-layout-pager-one" :style="{ height: activedMenu.length > 3 ? `calc(100% - 30px)` : '100%', 'padding-bottom': pagePaddingBottom }">
+          <notice @showNotice="_ => (isShowNotice = _)" />
           <!-- 页面内容 -->
           <keep-alive :include="keepAlive">
             <router-view :key="$route.path" :brand-id="enterpriseId"></router-view>
@@ -46,6 +46,7 @@ export default {
   data() {
     return {
       keepAlive: [],
+      isShowNotice: false,
       showAside: true,
       pagePaddingBottom: null,
       enterpriseId: '',

src/components/notice/notice.vue

@@ -110,6 +110,11 @@ export default {
     toRecharge() {
       window.open(location.origin + '/marketing/#/recharge/do');
     }
+  },
+  watch: {
+    showNotice(n) {
+      this.$emit('showNotice', n);
+    }
   }
 };
 </script>