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

7 years ago · a2d57732c8
parent 5ae06a867a
commit a2d57732c8
11 changed files with 106 additions and 36 deletions
--- a/src/main/webapp/WEB-INF/manager/.project
+++ b/src/main/webapp/WEB-INF/manager/.project
@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>manager</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.aptana.ide.core.unifiedBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.aptana.projects.webnature</nature>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>1548465241018</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>
--- a/src/main/webapp/WEB-INF/manager/mweixin/keyword/keyword-list.ftl
+++ b/src/main/webapp/WEB-INF/manager/mweixin/keyword/keyword-list.ftl
--- a/src/main/webapp/WEB-INF/manager/mweixin/keyword/keyword-reply.ftl
+++ b/src/main/webapp/WEB-INF/manager/mweixin/keyword/keyword-reply.ftl
--- a/src/main/webapp/WEB-INF/manager/mweixin/menu.ftl
+++ b/src/main/webapp/WEB-INF/manager/mweixin/menu.ftl
@ -1,34 +1,25 @@
-<!DOCTYPE html>
-<html>
-   <head>
-      <title></title>
-      <!-- <#include "/include/head-file.ftl"/> -->
-      <!--#include virtual="../include/head-file.ftl" -->
-      <link rel="stylesheet" href="../../../static/mweixin/css/menu.css">
-   </head>
-   <body>
-      <div id="app">
-         <!--左侧-->
-         <div class="ms-admin-title">
-            <i></i> 吕小布微信号
-         </div>
-         <el-menu class="ms-weixin-menu" default-active="0">
-            <el-submenu :index="i+''" v-for="(menu,i) in menuList" @click="menuActive = menu">
-               <template slot="title">
-                  <span v-text="menu.title"></span>
-               </template>
-               <el-menu-item-group>
-                  <el-menu-item class="ms-weixin-menu-item" :index="i+'-'+index" v-for="(sub,index) in menu.sub" v-text="sub.title"></el-menu-item>
-               </el-menu-item-group>
-            </el-submenu>
-         </el-menu>
-      </div>
-   </body>
-</html>
+<link rel="stylesheet" href="../../../static/mweixin/css/menu.css">
+
+<div id="menu-vue">
+   <!--左侧-->
+   <div class="ms-admin-title">
+      <i></i> 吕小布微信号
+   </div>
+   <el-menu class="ms-weixin-menu" default-active="0">
+      <el-submenu :index="i+''" v-for="(menu,i) in menuList" @click="menuActive = menu">
+         <template slot="title">
+            <span v-text="menu.title"></span>
+         </template>
+         <el-menu-item-group>
+            <el-menu-item class="ms-weixin-menu-item" :index="i+'-'+index" v-for="(sub,index) in menu.sub" v-text="sub.title"></el-menu-item>
+         </el-menu-item-group>
+      </el-submenu>
+   </el-menu>
+</div>

 <script>
-   new Vue({
-      el: "#app",
+   var menuVue = new Vue({
+      el: "#menu-vue",
      data: {
         menuList: [{
            title: '图文素材',
--- a/src/main/webapp/WEB-INF/manager/mweixin/menu/custom-menu.ftl
+++ b/src/main/webapp/WEB-INF/manager/mweixin/menu/custom-menu.ftl
--- a/src/main/webapp/WEB-INF/manager/mweixin/metarial/material-list.ftl
+++ b/src/main/webapp/WEB-INF/manager/mweixin/metarial/material-list.ftl
@ -12,10 +12,12 @@
   <body>
      <div id="app">
         <el-container>
+            <!--左侧meun-->
            <el-aside width="140px">
               <!--#include virtual="../include/menu.ftl" -->
            </el-aside>
            <el-container>
+               <!--右侧头部-->
               <el-header height="50px">
                  <el-row class="ms-fr">
                     <el-button type="success">保存</el-button>
@ -23,10 +25,19 @@
                     <el-button>返回</el-button>
                  </el-row>
               </el-header>
-               <el-main class="ms-admin-material-list">
-                  <div class="ms-admin-material-item">
+               <el-main>
+                  <!--内容同步-->
+                  <el-container>
+                     <el-header height="50px">

-                  </div>
+                     </el-header>
+                     <!--素材列表-->
+                     <el-main class="ms-admin-material-list">
+                        <div class="ms-admin-material-item">
+
+                        </div>
+                     </el-main>
+                  </el-container>
               </el-main>
            </el-container>
         </el-container>
--- a/src/main/webapp/WEB-INF/manager/mweixin/reply/message-reply.ftl
+++ b/src/main/webapp/WEB-INF/manager/mweixin/reply/message-reply.ftl
--- a/src/main/webapp/WEB-INF/manager/mweixin/weixin.ftl
+++ b/src/main/webapp/WEB-INF/manager/mweixin/weixin.ftl
@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+   <head>
+      <meta charset="UTF-8">
+      <title></title>
+      <!-- <#include "/include/head-file.ftl"/> -->
+      <!--#include virtual="../include/head-file.ftl" -->
+   </head>
+   <body>
+      <!--#include virtual="menu.ftl" -->
+   </body>
+</html>
--- a/src/main/webapp/static/mweixin/.project
+++ b/src/main/webapp/static/mweixin/.project
@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>mweixin-less</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.aptana.ide.core.unifiedBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.aptana.projects.webnature</nature>
+	</natures>
+	<filteredResources>
+		<filter>
+			<id>0</id>
+			<name></name>
+			<type>26</type>
+			<matcher>
+				<id>org.eclipse.ui.ide.multiFilter</id>
+				<arguments>1.0-name-matches-false-false-node_modules</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
+</projectDescription>
--- a/src/main/webapp/static/mweixin/less/material-list.less
+++ b/src/main/webapp/static/mweixin/less/material-list.less
@ -1,4 +1,4 @@
-@import "../../ms-admin/4.7.0/less/app.less";
+@import "../ms-admin/4.7.0/less/app.less";

 .ms-admin-material-list {
    .ms-margin-padding(15px, 10px);
--- a/src/main/webapp/static/mweixin/less/menu.less
+++ b/src/main/webapp/static/mweixin/less/menu.less
@ -1,4 +1,4 @@
-@import "../../ms-admin/4.7.0/less/app.less";
+@import "../ms-admin/4.7.0/less/app.less";
 .ms-admin-title {
    height: 50px;
    display: flex;
@ -6,9 +6,9 @@
 }

 .ms-weixin-menu {
-    min-height: ~'calc(100vh - 50px)';
+    min-height: ~'calc(100vh - 50px)'; 
    background: #fff;
-}
+} 

 .ms-weixin-menu-item {
    min-width: 100% !important;