From d56a40dabecc29948d17d03d170ce92a2f91c64e Mon Sep 17 00:00:00 2001
From: yinxr <2273460044@qq.com>
Date: Sat, 26 Jan 2019 12:45:55 +0800
Subject: [PATCH] Signed-off-by: yinxr <2273460044@qq.com>

---
 .../WEB-INF/manager/mweixin/article/index.ftl | 15 +++++++++
 .../static/ms-admin/4.7.0/css/index.css       | 31 +++++++++++++++++++
 .../static/ms-admin/4.7.0/less/index.less     |  5 +++
 3 files changed, 51 insertions(+)

diff --git a/src/main/webapp/WEB-INF/manager/mweixin/article/index.ftl b/src/main/webapp/WEB-INF/manager/mweixin/article/index.ftl
index e69de29b..ee878b19 100644
--- a/src/main/webapp/WEB-INF/manager/mweixin/article/index.ftl
+++ b/src/main/webapp/WEB-INF/manager/mweixin/article/index.ftl
@@ -0,0 +1,15 @@
+<!-- 新建图文 -->
+<script src="https://unpkg.com/vue-slicksort@latest/dist/vue-slicksort.min.js"></script>
+<div id='article'>
+    <el-container>
+        <el-aside width="280px">
+
+        </el-aside>
+        <el-main>Main</el-main>
+    </el-container>
+</div>
+<script>
+    var articleVue = new Vue({
+        el: '#article'
+    })
+</script>
\ No newline at end of file
diff --git a/src/main/webapp/static/ms-admin/4.7.0/css/index.css b/src/main/webapp/static/ms-admin/4.7.0/css/index.css
index 693889c7..0cb20eb1 100644
--- a/src/main/webapp/static/ms-admin/4.7.0/css/index.css
+++ b/src/main/webapp/static/ms-admin/4.7.0/css/index.css
@@ -69,6 +69,32 @@ textarea::-webkit-input-placeholder {
   background-color: #ddd;
   /*滚动条的背景颜色*/
 }
+.ms-container {
+  margin: 12px;
+  height: 100%;
+  padding: 14px 14px 0 14px;
+  background: #fff;
+}
+.ms-header {
+  padding: 10px;
+  margin: 0;
+  border-bottom: 1px solid #ddd;
+  background: #fff;
+  height: 50px;
+}
+.ms-pagination {
+  padding: 20px 0;
+  text-align: right;
+}
+.ms-fr {
+  float: right;
+}
+.ms-tr {
+  text-align: right;
+}
+.el-button + .el-button {
+  margin-left: 0;
+}
 .ms-admin-header {
   display: flex;
   padding: 0;
@@ -298,3 +324,8 @@ textarea::-webkit-input-placeholder {
   border-left: none;
   border-radius: 0;
 }
+.ms-admin-container > .ms-admin-main iframe {
+  width: 100%;
+  height: 100%;
+  border: none !important;
+}
diff --git a/src/main/webapp/static/ms-admin/4.7.0/less/index.less b/src/main/webapp/static/ms-admin/4.7.0/less/index.less
index 593567be..4622d7ee 100644
--- a/src/main/webapp/static/ms-admin/4.7.0/less/index.less
+++ b/src/main/webapp/static/ms-admin/4.7.0/less/index.less
@@ -229,5 +229,10 @@
                 }
             }
         }
+        // 嵌套iframe
+        iframe{
+            .ms-width-height(100%);
+            border: none !important;
+        }
     }
 }
\ No newline at end of file