From 18bde351e06490517e34a1d216936d4f4c012c33 Mon Sep 17 00:00:00 2001
From: yinxr <2273460044@qq.com>
Date: Sat, 26 Jan 2019 13:16:40 +0800
Subject: [PATCH] Signed-off-by: yinxr <2273460044@qq.com>

---
 .../WEB-INF/manager/mweixin/article/index.ftl | 42 +++++++++++++++++--
 .../static/ms-admin/4.7.0/css/index.css       |  6 +++
 .../static/ms-admin/4.7.0/less/index.less     |  4 ++
 3 files changed, 49 insertions(+), 3 deletions(-)

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 ee878b19..00ac3269 100644
--- a/src/main/webapp/WEB-INF/manager/mweixin/article/index.ftl
+++ b/src/main/webapp/WEB-INF/manager/mweixin/article/index.ftl
@@ -1,15 +1,51 @@
 <!-- 新建图文 -->
-<script src="https://unpkg.com/vue-slicksort@latest/dist/vue-slicksort.min.js"></script>
+<script src="//cdnjs.cloudflare.com/ajax/libs/vue/2.5.2/vue.min.js"></script>
+<script src="//cdn.jsdelivr.net/npm/sortablejs@1.7.0/Sortable.min.js"></script>
+<script src="//cdnjs.cloudflare.com/ajax/libs/Vue.Draggable/2.17.0/vuedraggable.min.js"></script>
+<!-- v-if="menuVue.menuActive == '新建图文'" -->
 <div id='article'>
     <el-container>
         <el-aside width="280px">
-
+            <draggable v-model="myArray" :options="{draggable:'.item'}">
+                <div v-for="element in myArray" :key="element.id" class="item">
+                    {{element.name}}
+                </div>
+                <button slot="footer" @click="addPeople">Add</button>
+            </draggable>
         </el-aside>
         <el-main>Main</el-main>
     </el-container>
 </div>
 <script>
     var articleVue = new Vue({
-        el: '#article'
+        el: '#article',
+        data:{
+            myArray:[{
+                name:'染发个人',
+                id:'001100'
+            },{
+                name:'个问题grew',
+                id:'001100'
+            },{
+                name:'跟他玩过任务',
+                id:'001100'
+            },{
+                name:'供热外国人',
+                id:'001100'
+            },{
+                name:'天文台认为',
+                id:'001100'
+            }]
+        },
+        watch:{
+            myArray:function(n,o){
+                console.log('n',n);
+            }
+        },
+        methods:{
+            addPeople:function(){
+
+            }
+        }
     })
 </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 0cb20eb1..5b93354c 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
@@ -317,6 +317,12 @@ textarea::-webkit-input-placeholder {
   padding: 0;
   background-color: #fff;
 }
+.ms-admin-container > .ms-admin-main .ms-admin-tabs {
+  height: 100%;
+}
+.ms-admin-container > .ms-admin-main .ms-admin-tabs .el-tab-pane {
+  height: 100%;
+}
 .ms-admin-container > .ms-admin-main .ms-admin-tabs .el-tabs__nav-scroll {
   background: #fafafa;
 }
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 4622d7ee..ba512322 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
@@ -221,6 +221,10 @@
         background-color: #fff;
         //选项卡
         .ms-admin-tabs {
+            height: 100%;
+            .el-tab-pane{
+                height: 100%;
+            }
             .el-tabs__nav-scroll {
                 background: #fafafa;
                 .el-tabs__nav {