Signed-off-by: a123456 <1209165801@qq.com>

src/main/webapp/WEB-INF/manager/cms/article/article_form.ftl

@@ -64,7 +64,7 @@ var articleBasicId=0;
 $(function(){
 	//页面标题
 	var articleTitle="<#if categoryTitle?has_content>${categoryTitle}&nbsp;</#if><#if article.basicId !=0><small>编辑文章</small><#else><small>添加文章</small></#if>";
-	$(".ms-content-body-title>span").html(articleTitle);	
+	$(".ms-weixin-content-body-title>span").html(articleTitle);	
 	//隐藏跳转地址
 	$("input[name='articleUrl']").parent().hide();
 	

src/main/webapp/WEB-INF/manager/mweixin/keyword/form.ftl

 <!-- 关键词回复 -->
 <link rel="stylesheet" href="../../../../static/mweixin/css/keyword-reply.css">
 
-<div id="keyword-reply" class="keyword-reply ms-container ms-content" v-if="menuVue.menuActive == '关键词表单'">
+<div id="keyword-reply" class="keyword-reply ms-container ms-weixin-content" v-if="menuVue.menuActive == '关键词表单'">
    <el-form :model="keywordReplyForm" status-icon :rules="keywordReplyFormRules" ref="keywordReplyForm" label-width="100px">
       <el-form-item label="关键词" prop="keyword" class="ms-keyword-input">
          <el-row type='flex' justify='space-between' align='center'>

src/main/webapp/WEB-INF/manager/mweixin/keyword/index.ftl

 <!-- 关键字列表 -->
 <link rel="stylesheet" href="../../../../static/mweixin/css/keyword-list.css">
 
-<div id="keyword-list" class="keyword-list ms-container ms-content" v-if="menuVue.menuActive == '关键词回复'">
+<div id="keyword-list" class="keyword-list ms-container ms-weixin-content" v-if="menuVue.menuActive == '关键词回复'">
    <el-table :data="tableData" border style="width: 100%">
       <el-table-column prop="date" label="规则名" width="180" align='center'>
       </el-table-column>

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

 <!-- 自定义菜单 -->
 <link rel="stylesheet" href="../../../../static/mweixin/css/custom-menu.css">
-<div id="custom-menu" class="ms-custom-menu ms-content" v-if="menuVue.menuActive == '自定义菜单'">
+<div id="custom-menu" class="ms-custom-menu ms-weixin-content" v-if="menuVue.menuActive == '自定义菜单'">
    <el-container class="ms-custom-container">
       <el-aside>
          <el-container>

src/main/webapp/WEB-INF/manager/mweixin/message/index.ftl

 <!-- 消息回复 && 关注回复 -->
 <link rel="stylesheet" href="../../../../static/mweixin/css/message-reply.css">
-<div id="message-reply" class="ms-message-reply ms-container ms-content" v-if="menuVue.menuActive == '消息回复'||menuVue.menuActive == '关注时回复'">
+<div id="message-reply" class="ms-message-reply ms-container ms-weixin-content" v-if="menuVue.menuActive == '消息回复'||menuVue.menuActive == '关注时回复'">
    <div>回复内容</div>
    <el-tabs v-model="activeName" @tab-click="" class="message-reply-tabs">
       <el-tab-pane label="文字" name="text">

src/main/webapp/WEB-INF/manager/mweixin/metarial/index.ftl

 <!--图文素材页-->
 <link rel="stylesheet" href="../../../static/mweixin/css/material-list.css">
-<div id="material-list-vue" v-if="menuVue.menuActive == '图文'" class="ms-content">
+<div id="material-list-vue" v-if="menuVue.menuActive == '图文'" class="ms-weixin-content">
    <el-container>
       <!--右侧头部-->
       <el-header class="ms-header" height="52px">

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

@@ -94,6 +94,6 @@ textarea::-webkit-input-placeholder {
     margin-left: 0
 }
 
-.ms-content{
-    width: ~'calc(100% - 200px)';
+.ms-weixin-content{
+    width: ~'calc(100% - 140px)';
 }

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

@@ -22,8 +22,10 @@
 html,
 body {
   min-height: 100vh;
+  width: 100vw;
   background-color: #eee;
   margin: 0;
+  display: flex;
   font-weight: initial !important;
   font-size: 14px !important;
   color: #333 !important;
@@ -71,7 +73,7 @@ textarea::-webkit-input-placeholder {
 }
 .ms-container {
   margin: 12px;
-  height: 100%;
+  height: calc(100% - 24px);
   padding: 14px 14px 0 14px;
   background: #fff;
 }
@@ -95,6 +97,9 @@ textarea::-webkit-input-placeholder {
 .el-button + .el-button {
   margin-left: 0;
 }
+.ms-weixin-content {
+  width: calc(100% - 140px);
+}
 .ms-article .el-container .el-aside {
   padding: 14px;
 }
@@ -107,7 +112,7 @@ textarea::-webkit-input-placeholder {
 }
 .ms-article .el-container .el-aside .ms-main-article .ms-main-article-mask {
   background: #000;
-  opacity: .2;
+  opacity: 0.2;
   width: 100%;
   height: 146px;
   position: absolute;

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

@@ -97,8 +97,8 @@ textarea::-webkit-input-placeholder {
 .el-button + .el-button {
   margin-left: 0;
 }
-.ms-content {
-  width: calc(100% - 200px);
+.ms-weixin-content {
+  width: calc(100% - 140px);
 }
 .ms-custom-menu {
   color: #f2f2f6;

src/main/webapp/static/mweixin/css/keyword-list.css

@@ -97,8 +97,8 @@ textarea::-webkit-input-placeholder {
 .el-button + .el-button {
   margin-left: 0;
 }
-.ms-content {
-  width: calc(100% - 200px);
+.ms-weixin-content {
+  width: calc(100% - 140px);
 }
 .keyword-list {
   padding: 14px;

src/main/webapp/static/mweixin/css/keyword-reply.css

@@ -97,8 +97,8 @@ textarea::-webkit-input-placeholder {
 .el-button + .el-button {
   margin-left: 0;
 }
-.ms-content {
-  width: calc(100% - 200px);
+.ms-weixin-content {
+  width: calc(100% - 140px);
 }
 .keyword-reply {
   padding-bottom: 20px;

src/main/webapp/static/mweixin/css/material-list.css

@@ -97,8 +97,8 @@ textarea::-webkit-input-placeholder {
 .el-button + .el-button {
   margin-left: 0;
 }
-.ms-content {
-  width: calc(100% - 200px);
+.ms-weixin-content {
+  width: calc(100% - 140px);
 }
 .ms-admin-material-list {
   margin: 15px;

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

@@ -97,12 +97,12 @@ textarea::-webkit-input-placeholder {
 .el-button + .el-button {
   margin-left: 0;
 }
-.ms-content {
-  width: calc(100% - 200px);
+.ms-weixin-content {
+  width: calc(100% - 140px);
 }
 .ms-admin-menu {
   min-height: 100vh;
-  min-width: 200px;
+  min-width: 140px;
 }
 .ms-admin-menu .ms-header {
   border-right: solid 1px #e6e6e6;

src/main/webapp/static/mweixin/css/message-reply.css

@@ -97,8 +97,8 @@ textarea::-webkit-input-placeholder {
 .el-button + .el-button {
   margin-left: 0;
 }
-.ms-content {
-  width: calc(100% - 200px);
+.ms-weixin-content {
+  width: calc(100% - 140px);
 }
 .ms-message-reply {
   display: flex;

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

 @import "../ms-admin/4.7.0/less/app.less";
 .ms-admin-menu {
     min-height: 100vh;
-    min-width: 200px;
+    min-width: 140px;
     .ms-header {
         border-right: solid 1px #e6e6e6;
         div {