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 c93196ec..b1982723 100644 --- a/src/main/webapp/WEB-INF/manager/mweixin/menu/index.ftl +++ b/src/main/webapp/WEB-INF/manager/mweixin/menu/index.ftl @@ -1,94 +1,102 @@
- - - - 删除 - 重置 - 保存 - - - - - - 公众号 - - - -
-
- 新建菜单 - -
- -
-
-
-
- - -
- 新建菜单 -
- - - - 菜单名称字数不多于5个汉字或10个字母 - - - - - - 图片 -
- - 从素材库选择 -
-
- - 新建图片 -
-
- - - 图文管理 - -
-
-
-
-
-
-
+ + + + 删除 + 重置 + 保存 + + + + + + 公众号 + + + +
+
+ 新建菜单 + +
+ +
+
+
+
+ + +
+ 新建菜单 +
+ + + + 菜单名称字数不多于5个汉字或10个字母 + + + + + + 图片 +
+ + 从素材库选择 +
+
+ + 新建图片 +
+
+ + + 图文管理 +
+ + 从素材库选择 +
+
+ + 新建图文 +
+
+
+
+
+
+
+
+
\ No newline at end of file diff --git a/src/main/webapp/WEB-INF/manager/mweixin/message/index.ftl b/src/main/webapp/WEB-INF/manager/mweixin/message/index.ftl index 40cd9553..c0a3944a 100644 --- a/src/main/webapp/WEB-INF/manager/mweixin/message/index.ftl +++ b/src/main/webapp/WEB-INF/manager/mweixin/message/index.ftl @@ -1,70 +1,152 @@
- - - - 重置 - 保存 - - - - - - - - -
回复内容
- - - - - - - - - - - - - - - - - -
-
-
+ + + + 重置 + 保存 + + + + + + + + +
回复内容
+ + + + + + + + + + + + + +
+ + 从素材库选择 +
+
+ + 新建图片 +
+
+ +
+ + 从素材库选择 +
+
+ + 新建图文 +
+
+
+
+
+
\ No newline at end of file diff --git a/src/main/webapp/static/mweixin/css/message-reply.css b/src/main/webapp/static/mweixin/css/message-reply.css index e5a991c9..67b65df7 100644 --- a/src/main/webapp/static/mweixin/css/message-reply.css +++ b/src/main/webapp/static/mweixin/css/message-reply.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 { @@ -125,6 +125,7 @@ textarea::-webkit-input-placeholder { } .ms-admin-message-reply .ms-container { display: flex; + height: 256px; } .ms-admin-message-reply .ms-container .message-reply-tabs { padding-left: 12px; @@ -148,10 +149,11 @@ textarea::-webkit-input-placeholder { } .ms-message-reply .message-reply-tabs .el-tabs__header .el-tabs__nav-scroll { padding: 0 20px; - border: 1px solid #ddd; + border: 1px solid #e6e6e6; } .ms-message-reply .message-reply-tabs .el-tabs__content { - border: 1px solid #ddd; + border: 1px solid #e6e6e6; + height: calc(100% - 42px); } .ms-message-reply .message-reply-tabs .el-tabs__content .el-tab-pane { padding: 0 !important; @@ -174,7 +176,7 @@ textarea::-webkit-input-placeholder { bottom: 66px; font-weight: initial; font-size: 12px; - color: #aaa; + color: #999; cursor: pointer; } .ms-message-reply .message-reply-tabs .el-tabs__content .el-tab-pane > .el-form .ms-message-reply-content .el-form-item__content .el-icon-delete:hover { @@ -185,7 +187,7 @@ textarea::-webkit-input-placeholder { .ms-message-reply .message-reply-tabs .el-tabs__content .el-tab-pane > .el-form .ms-message-reply-content .el-form-item__content textarea { height: 127px !important; border: none !important; - border-bottom: 1px solid #ddd !important; + border-bottom: 1px solid #e6e6e6 !important; } .ms-message-reply .message-reply-tabs .el-tabs__content .el-tab-pane > .el-form .ms-message-reply-content .el-form-item__content .footer { height: 58px; @@ -213,3 +215,36 @@ textarea::-webkit-input-placeholder { .ms-message-reply .message-reply-tabs .el-tabs__content .el-tab-pane > .el-form .ms-message-reply-content .el-form-item__content .footer a:hover { cursor: pointer; } +.ms-message-reply .message-reply-tabs .el-tabs__content .message-reply-picture, +.ms-message-reply .message-reply-tabs .el-tabs__content .message-reply-article { + padding: 20px !important; + height: 100%; +} +.ms-message-reply .message-reply-tabs .el-tabs__content .message-reply-picture > div, +.ms-message-reply .message-reply-tabs .el-tabs__content .message-reply-article > div { + flex: 1; + border: 1px dashed #e6e6e6; + display: flex; + justify-content: center; + align-items: center; + flex-direction: column; +} +.ms-message-reply .message-reply-tabs .el-tabs__content .message-reply-picture > div i, +.ms-message-reply .message-reply-tabs .el-tabs__content .message-reply-article > div i { + font-weight: bolder; + font-size: 20px; + color: #0099ff; +} +.ms-message-reply .message-reply-tabs .el-tabs__content .message-reply-picture > div span, +.ms-message-reply .message-reply-tabs .el-tabs__content .message-reply-article > div span { + margin-top: 8px; + line-height: 1; +} +.ms-message-reply .message-reply-tabs .el-tabs__content .message-reply-picture > div:hover, +.ms-message-reply .message-reply-tabs .el-tabs__content .message-reply-article > div:hover { + cursor: pointer; +} +.ms-message-reply .message-reply-tabs .el-tabs__content .message-reply-picture > div:last-child, +.ms-message-reply .message-reply-tabs .el-tabs__content .message-reply-article > div:last-child { + margin-left: 20px; +} diff --git a/src/main/webapp/static/mweixin/message-reply.less b/src/main/webapp/static/mweixin/message-reply.less index 2cb3726a..6c0389a3 100644 --- a/src/main/webapp/static/mweixin/message-reply.less +++ b/src/main/webapp/static/mweixin/message-reply.less @@ -2,6 +2,7 @@ .ms-admin-message-reply { .ms-container { display: flex; + height: 256px; .message-reply-tabs { padding-left: 12px; } @@ -31,10 +32,12 @@ } .el-tabs__content { border: 1px solid @borderColor; + height: calc(~'100% - 42px'); .el-tab-pane { padding: 0 !important; width: 100%; .ms-flex(); + // 文字回复 >.el-form { width: 100%; .ms-message-reply-content { @@ -53,6 +56,7 @@ border: none !important; border-bottom: 1px solid @borderColor !important; } + // 底部插入超链接 .footer { height: 58px; padding: 0 14px; @@ -77,6 +81,35 @@ } } } + // 图片回复 + .message-reply-picture,.message-reply-article{ + padding:20px !important; + height: 100%; + >div { + flex: 1; + border: 1px dashed @borderColor; + .ms-flex(center); + align-items: center; + flex-direction: column; + i { + .ms-font(20px, @themeColor, bolder); + } + span { + margin-top: 8px; + line-height: 1; + } + &:hover { + cursor: pointer; + } + } + >div:last-child { + margin-left: 20px; + } + } + // 图文回复 + .message-reply-article{ + + } } } } \ No newline at end of file