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 b1982723..00d15251 100644
--- a/src/main/webapp/WEB-INF/manager/mweixin/menu/index.ftl
+++ b/src/main/webapp/WEB-INF/manager/mweixin/menu/index.ftl
@@ -37,7 +37,9 @@
菜单名称字数不多于5个汉字或10个字母
@@ -76,6 +78,7 @@
data: {
customMenuForm: {
name: '',
+ link:'',
},
customMenuFormRules: {
name: [{
diff --git a/src/main/webapp/static/mweixin/css/custom-menu.css b/src/main/webapp/static/mweixin/css/custom-menu.css
index 9b8c1151..914cbf04 100644
--- a/src/main/webapp/static/mweixin/css/custom-menu.css
+++ b/src/main/webapp/static/mweixin/css/custom-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,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 {
@@ -162,14 +162,14 @@ textarea::-webkit-input-placeholder {
height: 50px !important;
display: flex;
justify-content: flex-start;
- border-top: 1px solid #ddd !important;
+ border-top: 1px solid #e6e6e6 !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;
+ border-right: 1px solid #e6e6e6 !important;
}
.ms-custom-menu .ms-custom-container .el-aside .el-container .el-footer .el-button {
border-radius: 0 !important;
@@ -201,11 +201,11 @@ textarea::-webkit-input-placeholder {
position: absolute;
top: -60px;
left: 0;
- border: 1px solid #ddd !important;
+ border: 1px solid #e6e6e6 !important;
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;
+ border-left: 1px solid #e6e6e6 !important;
padding: 0 !important;
flex: 1;
}
@@ -218,22 +218,29 @@ textarea::-webkit-input-placeholder {
.ms-custom-menu .ms-custom-container .el-main .custom-menu-card {
height: 100%;
}
-.ms-custom-menu .ms-custom-container .el-main .custom-menu-card .ms-custom-menu-name .el-form-item__content {
+.ms-custom-menu .ms-custom-container .el-main .custom-menu-card .ms-custom-menu-name .el-form-item__content,
+.ms-custom-menu .ms-custom-container .el-main .custom-menu-card .ms-custom-menu-content .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 {
+.ms-custom-menu .ms-custom-container .el-main .custom-menu-card .ms-custom-menu-name .el-form-item__content .el-input,
+.ms-custom-menu .ms-custom-container .el-main .custom-menu-card .ms-custom-menu-content .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 {
+.ms-custom-menu .ms-custom-container .el-main .custom-menu-card .ms-custom-menu-name .el-form-item__content span,
+.ms-custom-menu .ms-custom-container .el-main .custom-menu-card .ms-custom-menu-content .el-form-item__content span {
margin-left: 10px;
font-weight: initial;
font-size: 12px;
- color: #aaa;
+ color: #999;
+}
+.ms-custom-menu .ms-custom-container .el-main .custom-menu-card .ms-custom-menu-content .el-form-item__content .el-input {
+ width: 306px !important;
+ height: 30px !important;
}
.ms-custom-menu .ms-custom-container .el-main .custom-menu-card .ms-custom-menu-content .el-tabs {
- border: 1px solid #ddd;
+ border: 1px solid #e6e6e6;
}
.ms-custom-menu .ms-custom-container .el-main .custom-menu-card .ms-custom-menu-content .el-tabs .el-tabs__header {
background: #f2f2f6;
@@ -255,7 +262,7 @@ textarea::-webkit-input-placeholder {
}
.ms-custom-menu .ms-custom-container .el-main .custom-menu-card .ms-custom-menu-content .el-tabs .el-tab-pane > div {
flex: 1;
- border: 1px dashed #ddd;
+ border: 1px dashed #e6e6e6;
display: flex;
justify-content: center;
align-items: center;
diff --git a/src/main/webapp/static/mweixin/custom-menu.less b/src/main/webapp/static/mweixin/custom-menu.less
index 67c1e4a7..57c18a9a 100644
--- a/src/main/webapp/static/mweixin/custom-menu.less
+++ b/src/main/webapp/static/mweixin/custom-menu.less
@@ -90,7 +90,7 @@
.custom-menu-card {
height: 100%;
// 内容菜单表单
- .ms-custom-menu-name {
+ .ms-custom-menu-name,.ms-custom-menu-content {
.el-form-item__content {
.el-input {
.ms-width-height(153px, 30px) !important;
@@ -102,6 +102,13 @@
}
}
}
+ .ms-custom-menu-content {
+ .el-form-item__content {
+ .el-input {
+ .ms-width-height(306px, 30px) !important;
+ }
+ }
+ }
// 菜单内容
.ms-custom-menu-content {
.el-tabs {