Merge branch '4.7.0' of https://gitee.com/mingSoft/MCMS.git into 4.7.0

src/main/webapp/WEB-INF/manager/mweixin/menu.ftl

@@ -2,15 +2,15 @@
 
 <div id="menu-vue">
    <!--左侧-->
-   <el-container>
+   <el-container class="am-admin-menu">
       <!--右侧头部-->
       <el-header height="50px">
-         <div class="ms-admin-title">
+         <div class="ms-admin-menu-title">
             <i></i> 吕小布微信号
          </div>
       </el-header>
-      <el-main> 
-         <el-menu class="ms-weixin-menu" default-active="0-0">
+      <el-main>
+         <el-menu class="ms-admin-menu-menu" default-active="0-0">
             <template v-for="(menu,i) in menuList">
                <!--单个选项-->
                <el-menu-item :index="i" @click="menuActive = menu.title" v-if="!menu.sub" v-text="menu.title"></el-menu-item>
@@ -20,7 +20,7 @@
                      <span v-text="menu.title"></span>
                   </template>
                   <el-menu-item-group>
-                     <el-menu-item class="ms-weixin-menu-item" @click="menuActive = sub.title" :index="i+'-'+index" v-for="(sub,index) in menu.sub" v-text="sub.title"></el-menu-item>
+                     <el-menu-item class="ms-admin-menu-menu-item" @click="menuActive = sub.title" :index="i+'-'+index" v-for="(sub,index) in menu.sub" v-text="sub.title"></el-menu-item>
                   </el-menu-item-group>
                </el-submenu>
             </template>

src/main/webapp/static/ms-admin/4.7.0/less/app.less

@@ -5,6 +5,7 @@ body {
     min-height: 100vh;
     background-color: @backgroundColor;
     margin: 0;
+    display: flex;
     .ms-font(@defalutSize, @defalutColor) !important; //默认字体样式
     * {
         text-decoration: none !important;

src/main/webapp/static/mweixin/css/menu.css

@@ -24,6 +24,7 @@ body {
   min-height: 100vh;
   background-color: #eee;
   margin: 0;
+  display: flex;
   font-weight: initial !important;
   font-size: 14px !important;
   color: #333 !important;
@@ -100,10 +101,10 @@ textarea::-webkit-input-placeholder {
   display: flex;
   align-items: center;
 }
-.ms-weixin-menu {
+.ms-admin-menu {
   min-height: calc(100vh - 50px);
   background: #fff;
 }
-.ms-weixin-menu-item {
+.ms-admin-menu-item {
   min-width: 100% !important;
 }

src/main/webapp/static/mweixin/menu.less

@@ -5,11 +5,11 @@
     align-items: center;
 }
 
-.ms-weixin-menu {
-    min-height: ~'calc(100vh - 50px)'; 
+.ms-admin-menu {
+    min-height: ~'calc(100vh - 50px)';
     background: #fff;
-} 
+}
 
-.ms-weixin-menu-item {
+.ms-admin-menu-item {
     min-width: 100% !important;
 }