- ![]()
+ ![]()
@@ -23,7 +25,7 @@
-
-
-
-
-
- 添加
- 刷新
- 同步微信素材
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查询
-
-
-
-
-
-
-
- 全部图片（6）
-
-
+
+
+
+
+ 添加
+ 刷新
+ 同步微信素材
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+
+
+
+
+
+
+
+ 全部图片（6）
+
+
-
-
-
+
+
+
\ 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 17d11cff..51847f6d 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
@@ -93,8 +93,9 @@ textarea::-webkit-input-placeholder {
text-align: right;
}
+// 按钮组之间的间距
.el-button+.el-button {
-// margin-left: 0
+ // margin-left: 5px;
}
.ms-weixin-content{
@@ -127,3 +128,23 @@ textarea::-webkit-input-placeholder {
border-color: @themeColor;
}
}
+
+// 头部下拉选择区域间距
+.ms-header-select{
+ font-size: 0;
+ >.el-select:nth-of-type(2){
+ margin: 0 10px;
+ }
+}
+
+.el-submenu{
+ // margin: 0 12px;
+ // 菜单选中样式
+ .el-menu-item.is-active{
+ border-radius: 4px;
+ }
+}
+// 卡片样式
+.el-card, .el-message{
+ border-radius:0 !important;
+}
diff --git a/src/main/webapp/static/mweixin/article.less b/src/main/webapp/static/mweixin/article.less
index 80842cd2..cc4b9f5c 100644
--- a/src/main/webapp/static/mweixin/article.less
+++ b/src/main/webapp/static/mweixin/article.less
@@ -32,9 +32,10 @@
span {
position: absolute;
bottom: 0;
- padding: 15px;
+ margin: 15px;
color: #fff;
.ms-ellipsis-clamp(2);
+ word-break: break-all;//数字单词的情况
}
} // 子文章
.ms-article-item {
@@ -112,7 +113,7 @@
box-sizing: border-box;
border-bottom: 1px solid @borderColor; // 图片上传
.ms-pic-upload {
- .ms-width-height(140px);
+ .ms-width-height(140px,100%);
border-radius: 4px;
border: 1px dashed @borderColor;
.ms-flex(center);
@@ -161,18 +162,34 @@
padding-right: 50px !important;
}
}
+ // 标题输入框预留边距
+ .basic-title-input{
+ >.el-input__inner{
+ padding-right:54px !important;
+ }
+ }
+ }
+ .el-form-item:last-child{
+ padding-top: 4px;
}
}
}
.ms-main-body {
height: calc(~'100% - 180px');
background: #fff;
+ .edui-editor-toolbarbox{
+ border: none !important;
+ box-shadow: none !important;
+ }
.edui-default {
- border: none;
+ // 设置edui-default的class样式会导致选择工具栏会出现抖动，是因为这个class类是通用样式
.edui-editor {
+ border: none !important;
.edui-editor-toolbarboxouter {
background-color: none !important;
background-image: none !important;
+ box-shadow: none !important;
+ border-bottom: none !important;
} // 编辑器样式
.edui-editor {
border: none !important;
@@ -189,6 +206,9 @@
}
}
}
+ .edui-editor-toolbarboxinner{
+ background: #fff;
+ }
}
}
}
diff --git a/src/main/webapp/static/mweixin/css/app.css b/src/main/webapp/static/mweixin/css/app.css
new file mode 100644
index 00000000..c1dfcfa9
--- /dev/null
+++ b/src/main/webapp/static/mweixin/css/app.css
@@ -0,0 +1,138 @@
+/*
+*这里的值严格按照UI设计图标注值来进行设置
+*/
+/*
+*颜色
+*/
+/*
+*页面的边距
+*/
+/*
+*字体
+*/
+/*
+*头像
+*/
+/*
+ * 按钮
+ */
+/*
+*对常见的多行样式进行了方法封装，方便调用，加快开发效率
+*/
+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;
+}
+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: #e6e6e6;
+ /*滚动条的背景颜色*/
+}
+.ms-container {
+ margin: 12px;
+ height: calc(100% - 24px);
+ padding: 14px;
+ background: #fff;
+}
+.ms-header {
+ padding: 10px;
+ margin: 0;
+ border-bottom: 1px solid #ddd;
+ background: #fff;
+ height: 50px;
+}
+.ms-header button {
+ height: 30px;
+}
+.ms-pagination {
+ padding: 20px 0;
+ text-align: right;
+}
+.ms-fr {
+ float: right;
+}
+.ms-tr {
+ text-align: right;
+}
+.ms-weixin-content {
+ width: calc(100% - 140px);
+}
+.ms-weixin-dialog .el-dialog__header {
+ height: 55px;
+ box-sizing: border-box;
+ padding: 10px 10px 25px 10px;
+ border-bottom: 1px solid #e6e6e6;
+}
+.ms-weixin-dialog .el-dialog__header .el-dialog__title {
+ font-weight: bold;
+ font-size: 14px;
+ color: #333;
+}
+.ms-weixin-dialog .el-dialog__footer {
+ border-top: 1px solid #e6e6e6;
+ padding: 15px !important;
+}
+.ms-hover {
+ cursor: pointer;
+}
+.ms-hover:hover {
+ color: #0099ff;
+ background: #fff;
+ border-color: #0099ff;
+}
+.ms-header-select {
+ font-size: 0;
+}
+.ms-header-select > .el-select:nth-of-type(2) {
+ margin: 0 10px;
+}
+.el-submenu .el-menu-item.is-active {
+ border-radius: 4px;
+}
+.el-card,
+.el-message {
+ border-radius: 0 !important;
+}
diff --git a/src/main/webapp/static/mweixin/css/article.css b/src/main/webapp/static/mweixin/css/article.css
index e781731c..3db37520 100644
--- a/src/main/webapp/static/mweixin/css/article.css
+++ b/src/main/webapp/static/mweixin/css/article.css
@@ -123,6 +123,12 @@ textarea::-webkit-input-placeholder {
background: #fff;
border-color: #0099ff;
}
+.ms-header-select {
+ font-size: 0;
+}
+.ms-header-select > .el-select:nth-of-type(2) {
+ margin: 0 10px;
+}
.ms-article {
display: flex;
justify-content: space-between;
@@ -158,13 +164,14 @@ textarea::-webkit-input-placeholder {
.ms-article .el-container .el-aside .ms-main-article span {
position: absolute;
bottom: 0;
- padding: 15px;
+ margin: 15px;
color: #fff;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
+ word-break: break-all;
}
.ms-article .el-container .el-aside .ms-article-item {
width: 100%;
@@ -254,7 +261,7 @@ textarea::-webkit-input-placeholder {
}
.ms-article .el-container .el-main .ms-main-header .ms-pic-upload {
width: 140px;
- height: 140px;
+ height: 100%;
border-radius: 4px;
border: 1px dashed #e6e6e6;
display: flex;
@@ -315,16 +322,28 @@ textarea::-webkit-input-placeholder {
.ms-article .el-container .el-main .ms-main-header .el-form .el-form-item .el-input__suffix > input {
padding-right: 50px !important;
}
+.ms-article .el-container .el-main .ms-main-header .el-form .el-form-item .basic-title-input > .el-input__inner {
+ padding-right: 54px !important;
+}
+.ms-article .el-container .el-main .ms-main-header .el-form .el-form-item:last-child {
+ padding-top: 4px;
+}
.ms-article .el-container .el-main .ms-main-body {
height: calc(100% - 180px);
background: #fff;
}
-.ms-article .el-container .el-main .ms-main-body .edui-default {
- border: none;
+.ms-article .el-container .el-main .ms-main-body .edui-editor-toolbarbox {
+ border: none !important;
+ box-shadow: none !important;
+}
+.ms-article .el-container .el-main .ms-main-body .edui-default .edui-editor {
+ border: none !important;
}
.ms-article .el-container .el-main .ms-main-body .edui-default .edui-editor .edui-editor-toolbarboxouter {
background-color: none !important;
background-image: none !important;
+ box-shadow: none !important;
+ border-bottom: none !important;
}
.ms-article .el-container .el-main .ms-main-body .edui-default .edui-editor .edui-editor {
border: none !important;
@@ -339,3 +358,6 @@ textarea::-webkit-input-placeholder {
border-radius: 0 !important;
box-shadow: none !important;
}
+.ms-article .el-container .el-main .ms-main-body .edui-editor-toolbarboxinner {
+ background: #fff;
+}
diff --git a/src/main/webapp/static/mweixin/css/custom-menu.css b/src/main/webapp/static/mweixin/css/custom-menu.css
index bcd655fe..586cac0c 100644
--- a/src/main/webapp/static/mweixin/css/custom-menu.css
+++ b/src/main/webapp/static/mweixin/css/custom-menu.css
@@ -123,6 +123,18 @@ textarea::-webkit-input-placeholder {
background: #fff;
border-color: #0099ff;
}
+.ms-header-select {
+ font-size: 0;
+}
+.ms-header-select > .el-select:nth-of-type(2) {
+ margin: 0 10px;
+}
+.el-submenu {
+ margin: 0 12px;
+}
+.el-submenu .el-menu-item.is-active {
+ border-radius: 4px;
+}
.ms-custom-menu {
color: #f2f2f6;
}
@@ -139,6 +151,9 @@ textarea::-webkit-input-placeholder {
width: 280px !important;
height: 470px !important;
}
+.ms-custom-menu .ms-custom-container .el-aside .el-container {
+ overflow: hidden;
+}
.ms-custom-menu .ms-custom-container .el-aside .el-container .el-header {
height: 40px !important;
line-height: 40px !important;
@@ -151,7 +166,7 @@ textarea::-webkit-input-placeholder {
.ms-custom-menu .ms-custom-container .el-aside .el-container .el-main {
padding: 0;
width: 280px !important;
- height: 379px !important;
+ height: 380px !important;
}
.ms-custom-menu .ms-custom-container .el-aside .el-container .el-footer {
white-space: nowrap;
diff --git a/src/main/webapp/static/mweixin/css/material-bank-form.css b/src/main/webapp/static/mweixin/css/material-bank-form.css
index 974668af..608fc16b 100644
--- a/src/main/webapp/static/mweixin/css/material-bank-form.css
+++ b/src/main/webapp/static/mweixin/css/material-bank-form.css
@@ -50,7 +50,7 @@ input::-webkit-input-placeholder,
textarea::-webkit-input-placeholder {
font-weight: initial;
font-size: 12px;
- color: #aaa;
+ color: #999;
resize: none;
}
*::-webkit-scrollbar {
@@ -68,7 +68,7 @@ textarea::-webkit-input-placeholder {
*::-webkit-scrollbar-thumb {
border-radius: 10px;
/*滚动条的圆角*/
- background-color: #ddd;
+ background-color: #e6e6e6;
/*滚动条的背景颜色*/
}
.ms-container {
@@ -104,7 +104,7 @@ textarea::-webkit-input-placeholder {
height: 55px;
box-sizing: border-box;
padding: 10px 10px 25px 10px;
- border-bottom: 1px solid #ddd;
+ border-bottom: 1px solid #e6e6e6;
}
.ms-weixin-dialog .el-dialog__header .el-dialog__title {
font-weight: bold;
@@ -112,7 +112,7 @@ textarea::-webkit-input-placeholder {
color: #333;
}
.ms-weixin-dialog .el-dialog__footer {
- border-top: 1px solid #ddd;
+ border-top: 1px solid #e6e6e6;
padding: 15px !important;
}
.ms-hover {
@@ -123,6 +123,19 @@ textarea::-webkit-input-placeholder {
background: #fff;
border-color: #0099ff;
}
+.ms-header-select {
+ font-size: 0;
+}
+.ms-header-select > .el-select:nth-of-type(2) {
+ margin: 0 10px;
+}
+.el-submenu .el-menu-item.is-active {
+ border-radius: 4px;
+}
+.el-card,
+.el-message {
+ border-radius: 0 !important;
+}
.material-bank-form > .el-dialog__wrapper > .el-dialog {
width: 895px !important;
height: 587px !important;
@@ -143,6 +156,13 @@ textarea::-webkit-input-placeholder {
.material-bank-form > .el-dialog__wrapper > .el-dialog > .el-dialog__body > .el-tabs .el-tabs__header .el-tabs__nav-scroll {
padding: 20px 10px;
}
+.material-bank-form > .el-dialog__wrapper > .el-dialog > .el-dialog__body > .el-tabs .el-tabs__header .el-tabs__nav-scroll .el-tabs__nav .el-tabs__active-bar {
+ background-color: transparent !important;
+}
+.material-bank-form > .el-dialog__wrapper > .el-dialog > .el-dialog__body > .el-tabs .el-tabs__header .el-tabs__nav-scroll .el-tabs__nav .is-active {
+ color: #409EFF !important;
+ background-color: #ecf5ff;
+}
.material-bank-form > .el-dialog__wrapper > .el-dialog > .el-dialog__body > .el-tabs .el-tabs__header .el-tabs__nav-wrap::after {
width: 1px !important;
}
@@ -161,7 +181,6 @@ textarea::-webkit-input-placeholder {
flex: 1;
}
.material-bank-form > .el-dialog__wrapper > .el-dialog > .el-dialog__body > .el-tabs .is-active {
- background-color: #e9eaf0;
font-weight: initial;
font-size: 14px;
color: #333;
diff --git a/src/main/webapp/static/mweixin/css/material-list.css b/src/main/webapp/static/mweixin/css/material-list.css
index b3cf5f28..70eafd6c 100644
--- a/src/main/webapp/static/mweixin/css/material-list.css
+++ b/src/main/webapp/static/mweixin/css/material-list.css
@@ -123,6 +123,12 @@ textarea::-webkit-input-placeholder {
background: #fff;
border-color: #0099ff;
}
+.ms-header-select {
+ font-size: 0;
+}
+.ms-header-select > .el-select:nth-of-type(2) {
+ margin: 0 10px;
+}
.ms-weixin-content .ms-header > .el-select--small:first-child {
width: 100px !important;
}
diff --git a/src/main/webapp/static/mweixin/css/menu.css b/src/main/webapp/static/mweixin/css/menu.css
index 72d56da4..0e9ca27e 100644
--- a/src/main/webapp/static/mweixin/css/menu.css
+++ b/src/main/webapp/static/mweixin/css/menu.css
@@ -50,7 +50,7 @@ input::-webkit-input-placeholder,
textarea::-webkit-input-placeholder {
font-weight: initial;
font-size: 12px;
- color: #aaa;
+ color: #999;
resize: none;
}
*::-webkit-scrollbar {
@@ -68,7 +68,7 @@ textarea::-webkit-input-placeholder {
*::-webkit-scrollbar-thumb {
border-radius: 10px;
/*滚动条的圆角*/
- background-color: #ddd;
+ background-color: #e6e6e6;
/*滚动条的背景颜色*/
}
.ms-container {
@@ -104,7 +104,7 @@ textarea::-webkit-input-placeholder {
height: 55px;
box-sizing: border-box;
padding: 10px 10px 25px 10px;
- border-bottom: 1px solid #ddd;
+ border-bottom: 1px solid #e6e6e6;
}
.ms-weixin-dialog .el-dialog__header .el-dialog__title {
font-weight: bold;
@@ -112,7 +112,7 @@ textarea::-webkit-input-placeholder {
color: #333;
}
.ms-weixin-dialog .el-dialog__footer {
- border-top: 1px solid #ddd;
+ border-top: 1px solid #e6e6e6;
padding: 15px !important;
}
.ms-hover {
@@ -123,6 +123,19 @@ textarea::-webkit-input-placeholder {
background: #fff;
border-color: #0099ff;
}
+.ms-header-select {
+ font-size: 0;
+}
+.ms-header-select > .el-select:nth-of-type(2) {
+ margin: 0 10px;
+}
+.el-submenu .el-menu-item.is-active {
+ border-radius: 4px;
+}
+.el-card,
+.el-message {
+ border-radius: 0 !important;
+}
.ms-admin-menu {
min-height: 100vh;
min-width: 140px;
diff --git a/src/main/webapp/static/mweixin/css/picture-list.css b/src/main/webapp/static/mweixin/css/picture-list.css
index 3af945ef..f3253513 100644
--- a/src/main/webapp/static/mweixin/css/picture-list.css
+++ b/src/main/webapp/static/mweixin/css/picture-list.css
@@ -50,7 +50,7 @@ input::-webkit-input-placeholder,
textarea::-webkit-input-placeholder {
font-weight: initial;
font-size: 12px;
- color: #aaa;
+ color: #999;
resize: none;
}
*::-webkit-scrollbar {
@@ -68,13 +68,13 @@ textarea::-webkit-input-placeholder {
*::-webkit-scrollbar-thumb {
border-radius: 10px;
/*滚动条的圆角*/
- background-color: #ddd;
+ background-color: #e6e6e6;
/*滚动条的背景颜色*/
}
.ms-container {
margin: 12px;
height: calc(100% - 24px);
- padding: 14px 14px 0 14px;
+ padding: 14px;
background: #fff;
}
.ms-header {
@@ -104,7 +104,7 @@ textarea::-webkit-input-placeholder {
height: 55px;
box-sizing: border-box;
padding: 10px 10px 25px 10px;
- border-bottom: 1px solid #ddd;
+ border-bottom: 1px solid #e6e6e6;
}
.ms-weixin-dialog .el-dialog__header .el-dialog__title {
font-weight: bold;
@@ -112,7 +112,7 @@ textarea::-webkit-input-placeholder {
color: #333;
}
.ms-weixin-dialog .el-dialog__footer {
- border-top: 1px solid #ddd;
+ border-top: 1px solid #e6e6e6;
padding: 15px !important;
}
.ms-hover {
@@ -123,6 +123,12 @@ textarea::-webkit-input-placeholder {
background: #fff;
border-color: #0099ff;
}
+.ms-header-select {
+ font-size: 0;
+}
+.ms-header-select > .el-select:nth-of-type(2) {
+ margin: 0 10px;
+}
.ms-admin-picture {
height: 100%;
}
@@ -179,7 +185,7 @@ textarea::-webkit-input-placeholder {
padding: 14px 0;
}
.ms-admin-picture-list .ms-admin-picture-item > div .footer i {
- color: #999;
+ color: #333;
margin: auto;
cursor: pointer;
}
diff --git a/src/main/webapp/static/mweixin/custom-menu.less b/src/main/webapp/static/mweixin/custom-menu.less
index 42259252..90fa0c02 100644
--- a/src/main/webapp/static/mweixin/custom-menu.less
+++ b/src/main/webapp/static/mweixin/custom-menu.less
@@ -14,6 +14,7 @@
.ms-width-height(280px, 470px) !important;
// 微信界面
.el-container {
+ overflow: hidden;
// 头部
.el-header {
.ms-line-height(40px) !important;
@@ -23,7 +24,7 @@
}
.el-main {
padding: 0;
- .ms-width-height(280px, 379px) !important;
+ .ms-width-height(280px, 380px) !important;
}
.el-footer {
white-space: nowrap;
diff --git a/src/main/webapp/static/mweixin/material-bank-form.less b/src/main/webapp/static/mweixin/material-bank-form.less
index c76c496c..2053ee42 100644
--- a/src/main/webapp/static/mweixin/material-bank-form.less
+++ b/src/main/webapp/static/mweixin/material-bank-form.less
@@ -16,6 +16,16 @@
margin: 0 !important;
.el-tabs__nav-scroll{
padding:20px 10px;
+ .el-tabs__nav{
+ // 取消 激活状态边框
+ .el-tabs__active-bar{
+ background-color:transparent !important;
+ }
+ .is-active{
+ color: #409EFF !important;
+ background-color: #ecf5ff;
+ }
+ }
}
.el-tabs__nav-wrap::after{
width: 1px !important;
@@ -38,7 +48,6 @@
}
// tab选中的样式
.is-active{
- background-color:rgb(233, 234, 240);
.ms-font(@defalutSize,@defalutColor);
}
}
diff --git a/src/main/webapp/static/mweixin/menu.less b/src/main/webapp/static/mweixin/menu.less
index f2836918..91c5e7bc 100644
--- a/src/main/webapp/static/mweixin/menu.less
+++ b/src/main/webapp/static/mweixin/menu.less
@@ -31,6 +31,19 @@
min-width: 140px;
width: 140px;
}
+ // .ms-admin-submenu{
+ // .el-submenu__title{
+ // height: 40px !important;
+ // .ms-flex();
+ // align-items: center;
+ // }
+ // }
+ // // 菜单列表
+ // .ms-admin-menu-menu-item{
+ // height: 40px;
+ // .ms-flex();
+ // align-items: center;
+ // }
}
.ms-admin-material-item {
min-width: 100% !important;
From e80dcbf285ba530e668774f7b1b1484e5a6c87bc Mon Sep 17 00:00:00 2001
From: yinxr <2273460044@qq.com>
Date: Tue, 12 Feb 2019 11:45:09 +0800
Subject: [PATCH 07/16] =?UTF-8?q?Signed-off-by:=20yinxr=20=E8=B0=83?=
=?UTF-8?q?=E6=95=B4=E5=BE=AE=E4=BF=A1=E5=8A=9F=E8=83=BD=E5=88=97=E8=A1=A8?=
=?UTF-8?q?=E9=A1=B5=E6=8E=A5=E5=8F=A3=E7=9A=84=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../WEB-INF/manager/include/head-file.ftl | 16 ++++--
.../WEB-INF/manager/mweixin/menu/index.ftl | 8 ++-
.../webapp/WEB-INF/manager/mweixin/weixin.ftl | 52 ++++++++-----------
3 files changed, 40 insertions(+), 36 deletions(-)
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 f6d6d64f..493ac74c 100644
--- a/src/main/webapp/WEB-INF/manager/include/head-file.ftl
+++ b/src/main/webapp/WEB-INF/manager/include/head-file.ftl
@@ -43,12 +43,20 @@
ms.manager = "${managerPath}";
ms.web = ms.base;
- // ms.base = "http://192.168.0.54:85";
- // ms.manager = "http://192.168.0.54:85/apis/ms";
- // ms.web = "http://192.168.0.54:85/apis";
+ // ms.base = "http://192.168.0.54:82";
+ // ms.manager = "http://192.168.0.54:82/apis/ms";
+ // ms.web = "http://192.168.0.54:82/apis";
//图片懒加载
Vue.use(VueLazyload, {
error: ms.base + '/images/ic_image_deault.png',
loading: ms.base + '/images/ic_image_deault.png',
- })
+ })
+
+ // 测试使用 ==> 微信其他接口走之前需要先走这个接口
+ ms.http.get(ms.manager + "/mweixin/11/function.do")
+ .then((res) => {
+ console.log('微信登录接口', true);
+ }, (err) => {
+ console.log(err)
+ })
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/manager/mweixin/menu/index.ftl b/src/main/webapp/WEB-INF/manager/mweixin/menu/index.ftl
index b16b95eb..9d16c4e6 100644
--- a/src/main/webapp/WEB-INF/manager/mweixin/menu/index.ftl
+++ b/src/main/webapp/WEB-INF/manager/mweixin/menu/index.ftl
@@ -23,7 +23,7 @@
menu.menuTitle }}
@@ -106,6 +106,7 @@
activeName: "picture", //导航切换 当前激活面板
mainMenuList: [],
subMenuList: [],//所有的子菜单
+ currentSubMenuList:[],//打开当前父菜单的子菜单列表
},
methods: {
menuList: function () {
@@ -156,9 +157,12 @@
openSubMenu(index,menu){
this.closeAllSubMenu(index);
this.$set(menu,'subMenuList',[])
+ console.log('menu',menu);
var that = this;
+ that.currentSubMenuList = [];
+ console.log('that.subMenuList',that.subMenuList);
that.subMenuList.forEach(function(item,index){
- item.menuMenuId == menuId && that.subMenuList.push(item)
+ item.menuMenuId == menu.menuId && that.currentSubMenuList.push(item)
})
},
// 关闭所有的子菜单弹出层
diff --git a/src/main/webapp/WEB-INF/manager/mweixin/weixin.ftl b/src/main/webapp/WEB-INF/manager/mweixin/weixin.ftl
index 09c4b5bd..5e352634 100644
--- a/src/main/webapp/WEB-INF/manager/mweixin/weixin.ftl
+++ b/src/main/webapp/WEB-INF/manager/mweixin/weixin.ftl
@@ -1,32 +1,24 @@
-
-
-
-
-
- ![]()
-
-
-
-
-
-
-
- 小米（1）
-
-
-
-
- 小米（1）
-
-
-
- - 新建分组
-
+
+
+ ![]()
+
+
+
+
+
+
+
+ 小米（1）
+
+
+
+
+ 小米（1）
+
+
+
+ + 新建分组
+