From d47f995605a5b2b75730a2966d731f16bfd427d5 Mon Sep 17 00:00:00 2001
From: yinxr <2273460044@qq.com>
Date: Fri, 25 Jan 2019 15:23:45 +0800
Subject: [PATCH] Signed-off-by: yinxr <2273460044@qq.com>
---
.../WEB-INF/manager/include/head-file.ftl | 12 +-
src/main/webapp/WEB-INF/manager/login.ftl | 10 +-
.../WEB-INF/manager/mweixin/custom-menu.ftl | 116 +++++++++++
.../webapp/WEB-INF/manager/mweixin/index.ftl | 68 ++++++
.../static/ms-admin/4.7.0/less/app.less | 32 +++
.../webapp/static/mweixin/css/custom-menu.css | 193 ++++++++++++++++++
.../webapp/static/mweixin/custom-menu.less | 96 +++++++++
7 files changed, 518 insertions(+), 9 deletions(-)
create mode 100644 src/main/webapp/WEB-INF/manager/mweixin/custom-menu.ftl
create mode 100644 src/main/webapp/WEB-INF/manager/mweixin/index.ftl
create mode 100644 src/main/webapp/static/mweixin/css/custom-menu.css
create mode 100644 src/main/webapp/static/mweixin/custom-menu.less
diff --git a/src/main/webapp/WEB-INF/manager/include/head-file.ftl b/src/main/webapp/WEB-INF/manager/include/head-file.ftl
index 6645758e..7ee27272 100644
--- a/src/main/webapp/WEB-INF/manager/include/head-file.ftl
+++ b/src/main/webapp/WEB-INF/manager/include/head-file.ftl
@@ -17,9 +17,13 @@
-
-
+
+
+
+
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/manager/login.ftl b/src/main/webapp/WEB-INF/manager/login.ftl
index ba25ae21..7ed2b605 100644
--- a/src/main/webapp/WEB-INF/manager/login.ftl
+++ b/src/main/webapp/WEB-INF/manager/login.ftl
@@ -3,7 +3,8 @@
- <#include "/include/head-file.ftl"/>
+
+
@@ -11,7 +12,7 @@
-
+
账户登录 / User login
@@ -117,9 +118,8 @@ var loginVue = new Vue({
},
},
- mounted: {
-
-
+ mounted:function(){
+ this.code = ms.base + "/code?t=" + new Date().getTime()
}
})
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/manager/mweixin/custom-menu.ftl b/src/main/webapp/WEB-INF/manager/mweixin/custom-menu.ftl
new file mode 100644
index 00000000..35f8cccd
--- /dev/null
+++ b/src/main/webapp/WEB-INF/manager/mweixin/custom-menu.ftl
@@ -0,0 +1,116 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/manager/mweixin/index.ftl b/src/main/webapp/WEB-INF/manager/mweixin/index.ftl
new file mode 100644
index 00000000..779b1257
--- /dev/null
+++ b/src/main/webapp/WEB-INF/manager/mweixin/index.ftl
@@ -0,0 +1,68 @@
+
+
+
+
+ <#include "/include/head-file.ftl"/>
+
+
+
+
+
+
+
+ 吕小布微信号
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/webapp/static/ms-admin/4.7.0/less/app.less b/src/main/webapp/static/ms-admin/4.7.0/less/app.less
index 209cbd2d..6c5e1a35 100644
--- a/src/main/webapp/static/ms-admin/4.7.0/less/app.less
+++ b/src/main/webapp/static/ms-admin/4.7.0/less/app.less
@@ -58,4 +58,36 @@ textarea::-webkit-input-placeholder {
/*滚动条的圆角*/
background-color: @borderColor;
/*滚动条的背景颜色*/
+}
+
+.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
}
\ No newline at end of file
diff --git a/src/main/webapp/static/mweixin/css/custom-menu.css b/src/main/webapp/static/mweixin/css/custom-menu.css
new file mode 100644
index 00000000..d58577d8
--- /dev/null
+++ b/src/main/webapp/static/mweixin/css/custom-menu.css
@@ -0,0 +1,193 @@
+/*
+*这里的值严格按照UI设计图标注值来进行设置
+*/
+/*
+*颜色
+*/
+/*
+*页面的边距
+*/
+/*
+*字体
+*/
+/*
+*头像
+*/
+/*
+ * 按钮
+ */
+/*
+*对常见的多行样式进行了方法封装,方便调用,加快开发效率
+*/
+html,
+body {
+ min-height: 100vh;
+ background-color: #eee;
+ margin: 0;
+ font-weight: initial !important;
+ font-size: 14px !important;
+ color: #333 !important;
+}
+html *,
+body * {
+ text-decoration: none !important;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ box-sizing: border-box;
+}
+.ms-ellipsis {
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ display: block;
+}
+.ms-align-center {
+ display: flex;
+ align-items: center;
+}
+input::-webkit-input-placeholder,
+textarea::-webkit-input-placeholder {
+ font-weight: initial;
+ font-size: 12px;
+ color: #999;
+ resize: none;
+}
+*::-webkit-scrollbar {
+ width: 8px;
+ height: 8px;
+}
+/*定义滚动条轨道 内阴影+圆角*/
+*::-webkit-scrollbar-track {
+ border-radius: 10px;
+ /*滚动条的背景区域的圆角*/
+ background-color: #eee;
+ /*滚动条的背景颜色*/
+}
+/*定义滑块 内阴影+圆角*/
+*::-webkit-scrollbar-thumb {
+ border-radius: 10px;
+ /*滚动条的圆角*/
+ 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-custom-menu {
+ color: #f2f2f6;
+}
+.ms-custom-menu .ms-custom-container {
+ margin: 10px;
+ display: flex;
+ justify-content: space-between;
+}
+.ms-custom-menu .ms-custom-container .el-aside {
+ background: #fff;
+ width: 280px !important;
+ height: 470px !important;
+}
+.ms-custom-menu .ms-custom-container .el-aside .el-container .el-header {
+ height: 40px !important;
+ line-height: 40px !important;
+ font-weight: initial;
+ font-size: 16px;
+ color: #fff;
+ text-align: center;
+ background: #323232;
+}
+.ms-custom-menu .ms-custom-container .el-aside .el-container .el-main {
+ padding: 0;
+ width: 280px !important;
+ height: 379px !important;
+}
+.ms-custom-menu .ms-custom-container .el-aside .el-container .el-footer {
+ white-space: nowrap;
+ padding: 0;
+ font-size: 0;
+ background-color: #FAFAFA;
+ width: 280px !important;
+ height: 50px !important;
+ display: flex;
+ justify-content: flex-start;
+ border-top: 1px solid #ddd !important;
+}
+.ms-custom-menu .ms-custom-container .el-aside .el-container .el-footer > .el-button {
+ width: 40px !important;
+ height: 50px !important;
+ padding: 0 !important;
+ border: none !important;
+ border-right: 1px solid #ddd !important;
+}
+.ms-custom-menu .ms-custom-container .el-aside .el-container .el-footer .el-button {
+ border-radius: 0 !important;
+ height: 50px !important;
+ background: transparent !important;
+}
+.ms-custom-menu .ms-custom-container .el-aside .el-container .el-footer .ms-create-menu {
+ flex: 1;
+ font-size: 0;
+ display: flex;
+ justify-content: space-between;
+}
+.ms-custom-menu .ms-custom-container .el-aside .el-container .el-footer .ms-create-menu .el-button,
+.ms-custom-menu .ms-custom-container .el-aside .el-container .el-footer .ms-create-menu .el-dropdown {
+ flex: 1;
+ border: none !important;
+ background: transparent !important;
+}
+.ms-custom-menu .ms-custom-container .el-aside .el-container .el-footer .ms-create-menu .el-button span,
+.ms-custom-menu .ms-custom-container .el-aside .el-container .el-footer .ms-create-menu .el-dropdown span {
+ color: #333;
+}
+.ms-custom-menu .ms-custom-container .el-aside .el-container .el-footer .ms-create-menu .el-dropdown {
+ flex: .5;
+}
+.ms-custom-menu .ms-custom-container .el-aside .el-container .el-footer .ms-create-menu .el-dropdown > .el-button {
+ width: 100%;
+}
+.ms-custom-menu .ms-custom-container .el-aside .el-container .el-footer .ms-create-menu .el-button--default {
+ border-left: 1px solid #ddd !important;
+ padding: 0 !important;
+ flex: .5;
+}
+.ms-custom-menu .ms-custom-container .el-main {
+ padding: 0 20px;
+ flex: 1;
+ height: 470px;
+}
+.ms-custom-menu .ms-custom-container .el-main .custom-menu-card .ms-custom-menu-name .el-form-item__content {
+ display: flex;
+ justify-content: flex-start;
+}
+.ms-custom-menu .ms-custom-container .el-main .custom-menu-card .ms-custom-menu-name .el-form-item__content .el-input {
+ width: 153px !important;
+ height: 30px !important;
+}
+.ms-custom-menu .ms-custom-container .el-main .custom-menu-card .ms-custom-menu-name .el-form-item__content span {
+ margin-left: 10px;
+ font-weight: initial;
+ font-size: 12px;
+ color: #999;
+}
diff --git a/src/main/webapp/static/mweixin/custom-menu.less b/src/main/webapp/static/mweixin/custom-menu.less
new file mode 100644
index 00000000..26fa2892
--- /dev/null
+++ b/src/main/webapp/static/mweixin/custom-menu.less
@@ -0,0 +1,96 @@
+@import "../ms-admin/4.7.0/less/app.less";
+// 自定义菜单
+.ms-custom-menu{
+ color: rgb(242, 242, 246);
+ .ms-custom-container{
+ margin: 10px;
+ .ms-flex();
+ // 侧边
+ .el-aside{
+ background: #fff;
+ .ms-width-height(280px,470px) !important;
+ // 微信界面
+ .el-container{
+ // 头部
+ .el-header{
+ .ms-line-height(40px) !important;
+ .ms-font(16px,#fff);
+ text-align: center;
+ background: #323232;
+ }
+ .el-main{
+ padding: 0;
+ .ms-width-height(280px,379px) !important;
+ }
+ .el-footer{
+ white-space: nowrap;
+ padding: 0;
+ font-size: 0;
+ background-color: #FAFAFA;
+ .ms-width-height(280px,50px) !important;
+ .ms-flex(flex-start);
+ border-top: 1px solid @borderColor !important;
+ >.el-button{
+ .ms-width-height(40px,50px) !important;
+ padding:0 !important;
+ border: none !important;
+ border-right: 1px solid @borderColor !important;
+ }
+ .el-button{
+ border-radius: 0 !important;
+ height:50px !important;
+ background: transparent !important;
+ }
+ .ms-create-menu{
+ flex: 1;
+ font-size: 0;
+ .ms-flex(space-between);
+ .el-button,.el-dropdown{
+ flex: 1;
+ border: none !important;
+ background: transparent !important;
+ span{
+ color:#333;
+ }
+ }
+ .el-dropdown{
+ flex: .5;
+ >.el-button{
+ width: 100%;
+ }
+ }
+ // 添加菜单
+ .el-button--default{
+ border-left: 1px solid @borderColor !important;
+ padding:0 !important;
+ flex: .5;
+ }
+ }
+ }
+ }
+ }
+ // 内容
+ .el-main{
+ padding: 0 20px;
+ flex: 1;
+ height: 470px;
+ // 内容区域卡片
+ .custom-menu-card{
+ // 内容菜单表单
+ .ms-custom-menu-name{
+ .el-form-item__content{
+ .el-input{
+ .ms-width-height(153px,30px) !important;
+ }
+ .ms-flex(flex-start);
+ span{
+ margin-left: 10px;
+ .ms-font(@auxiliarySize,@auxiliaryColor);
+ }
+ }
+
+ }
+ }
+ }
+ }
+}
\ No newline at end of file