From d56a40dabecc29948d17d03d170ce92a2f91c64e Mon Sep 17 00:00:00 2001 From: yinxr <2273460044@qq.com> Date: Sat, 26 Jan 2019 12:45:55 +0800 Subject: [PATCH 1/5] Signed-off-by: yinxr <2273460044@qq.com> --- .../WEB-INF/manager/mweixin/article/index.ftl | 15 +++++++++ .../static/ms-admin/4.7.0/css/index.css | 31 +++++++++++++++++++ .../static/ms-admin/4.7.0/less/index.less | 5 +++ 3 files changed, 51 insertions(+) diff --git a/src/main/webapp/WEB-INF/manager/mweixin/article/index.ftl b/src/main/webapp/WEB-INF/manager/mweixin/article/index.ftl index e69de29b..ee878b19 100644 --- a/src/main/webapp/WEB-INF/manager/mweixin/article/index.ftl +++ b/src/main/webapp/WEB-INF/manager/mweixin/article/index.ftl @@ -0,0 +1,15 @@ + + +
+ + + + + Main + +
+ \ No newline at end of file diff --git a/src/main/webapp/static/ms-admin/4.7.0/css/index.css b/src/main/webapp/static/ms-admin/4.7.0/css/index.css index 693889c7..0cb20eb1 100644 --- a/src/main/webapp/static/ms-admin/4.7.0/css/index.css +++ b/src/main/webapp/static/ms-admin/4.7.0/css/index.css @@ -69,6 +69,32 @@ textarea::-webkit-input-placeholder { 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-admin-header { display: flex; padding: 0; @@ -298,3 +324,8 @@ textarea::-webkit-input-placeholder { border-left: none; border-radius: 0; } +.ms-admin-container > .ms-admin-main iframe { + width: 100%; + height: 100%; + border: none !important; +} diff --git a/src/main/webapp/static/ms-admin/4.7.0/less/index.less b/src/main/webapp/static/ms-admin/4.7.0/less/index.less index 593567be..4622d7ee 100644 --- a/src/main/webapp/static/ms-admin/4.7.0/less/index.less +++ b/src/main/webapp/static/ms-admin/4.7.0/less/index.less @@ -229,5 +229,10 @@ } } } + // 嵌套iframe + iframe{ + .ms-width-height(100%); + border: none !important; + } } } \ No newline at end of file From 06dadfd7831a0e41fc594ab5bca41037e2d04768 Mon Sep 17 00:00:00 2001 From: yinxr <2273460044@qq.com> Date: Sat, 26 Jan 2019 12:47:01 +0800 Subject: [PATCH 2/5] Signed-off-by: yinxr <2273460044@qq.com> --- src/main/webapp/WEB-INF/manager/login.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/WEB-INF/manager/login.ftl b/src/main/webapp/WEB-INF/manager/login.ftl index ed3c347b..ece52a33 100644 --- a/src/main/webapp/WEB-INF/manager/login.ftl +++ b/src/main/webapp/WEB-INF/manager/login.ftl @@ -97,7 +97,7 @@ var loginVue = new Vue({ // 登录 checkLogin: function() { var that = this; - ms.http.post(ms.manager + "/ms/checkLogin.do", that.loginForm).then(function(data) { + ms.http.post(ms.manager + "/checkLogin.do", that.loginForm).then(function(data) { if (data.result) { that.$notify({ title: '成功', From 9ddf0f046d253249f3a8dcc56beddecfb53668fe Mon Sep 17 00:00:00 2001 From: yinxr <2273460044@qq.com> Date: Sat, 26 Jan 2019 12:50:26 +0800 Subject: [PATCH 3/5] Signed-off-by: yinxr <2273460044@qq.com> --- src/main/webapp/WEB-INF/manager/index.ftl | 2 +- src/main/webapp/WEB-INF/manager/login.ftl | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/webapp/WEB-INF/manager/index.ftl b/src/main/webapp/WEB-INF/manager/index.ftl index 80068e94..fac2ff1e 100644 --- a/src/main/webapp/WEB-INF/manager/index.ftl +++ b/src/main/webapp/WEB-INF/manager/index.ftl @@ -118,7 +118,7 @@ :label="item.title" :name="item.title" > - {{item.content}} + diff --git a/src/main/webapp/WEB-INF/manager/login.ftl b/src/main/webapp/WEB-INF/manager/login.ftl index ece52a33..83af8897 100644 --- a/src/main/webapp/WEB-INF/manager/login.ftl +++ b/src/main/webapp/WEB-INF/manager/login.ftl @@ -26,7 +26,7 @@ - +

看不清?换一张

 @@ -52,7 +52,7 @@ var loginVue = new Vue({ managerPassword: "", rand_code: '', }, - code: ms.manager + "/code?t=" + new Date().getTime(), + verifCode: ms.manager + "/code?t=" + new Date().getTime(), rememberPass: '', loginFormRule: { managerName: [{ @@ -117,12 +117,12 @@ var loginVue = new Vue({ }) }, code: function() { - code: ms.manager + "/code?t=" + new Date().getTime(); + this.verifCode = ms.manager + "/code?t=" + new Date().getTime(); }, }, mounted:function(){ - this.code = ms.manager + "/code?t=" + new Date().getTime() + this.verifCode = ms.manager + "/code?t=" + new Date().getTime() } }) \ No newline at end of file From 18bde351e06490517e34a1d216936d4f4c012c33 Mon Sep 17 00:00:00 2001 From: yinxr <2273460044@qq.com> Date: Sat, 26 Jan 2019 13:16:40 +0800 Subject: [PATCH 4/5] Signed-off-by: yinxr <2273460044@qq.com> --- .../WEB-INF/manager/mweixin/article/index.ftl | 42 +++++++++++++++++-- .../static/ms-admin/4.7.0/css/index.css | 6 +++ .../static/ms-admin/4.7.0/less/index.less | 4 ++ 3 files changed, 49 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/WEB-INF/manager/mweixin/article/index.ftl b/src/main/webapp/WEB-INF/manager/mweixin/article/index.ftl index ee878b19..00ac3269 100644 --- a/src/main/webapp/WEB-INF/manager/mweixin/article/index.ftl +++ b/src/main/webapp/WEB-INF/manager/mweixin/article/index.ftl @@ -1,15 +1,51 @@ - + + + +
- + +
+ {{element.name}} +
+ + Main
\ No newline at end of file diff --git a/src/main/webapp/static/ms-admin/4.7.0/css/index.css b/src/main/webapp/static/ms-admin/4.7.0/css/index.css index 0cb20eb1..5b93354c 100644 --- a/src/main/webapp/static/ms-admin/4.7.0/css/index.css +++ b/src/main/webapp/static/ms-admin/4.7.0/css/index.css @@ -317,6 +317,12 @@ textarea::-webkit-input-placeholder { padding: 0; background-color: #fff; } +.ms-admin-container > .ms-admin-main .ms-admin-tabs { + height: 100%; +} +.ms-admin-container > .ms-admin-main .ms-admin-tabs .el-tab-pane { + height: 100%; +} .ms-admin-container > .ms-admin-main .ms-admin-tabs .el-tabs__nav-scroll { background: #fafafa; } diff --git a/src/main/webapp/static/ms-admin/4.7.0/less/index.less b/src/main/webapp/static/ms-admin/4.7.0/less/index.less index 4622d7ee..ba512322 100644 --- a/src/main/webapp/static/ms-admin/4.7.0/less/index.less +++ b/src/main/webapp/static/ms-admin/4.7.0/less/index.less @@ -221,6 +221,10 @@ background-color: #fff; //选项卡 .ms-admin-tabs { + height: 100%; + .el-tab-pane{ + height: 100%; + } .el-tabs__nav-scroll { background: #fafafa; .el-tabs__nav { From 80be2e4c3e62dbf218086d2d245e29abb6e2f909 Mon Sep 17 00:00:00 2001 From: yinxr <2273460044@qq.com> Date: Sat, 26 Jan 2019 13:33:27 +0800 Subject: [PATCH 5/5] Signed-off-by: yinxr <2273460044@qq.com> --- src/main/webapp/static/ms-admin/4.7.0/css/index.css | 5 ++++- src/main/webapp/static/ms-admin/4.7.0/less/index.less | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/static/ms-admin/4.7.0/css/index.css b/src/main/webapp/static/ms-admin/4.7.0/css/index.css index 5b93354c..9015d13a 100644 --- a/src/main/webapp/static/ms-admin/4.7.0/css/index.css +++ b/src/main/webapp/static/ms-admin/4.7.0/css/index.css @@ -320,7 +320,10 @@ textarea::-webkit-input-placeholder { .ms-admin-container > .ms-admin-main .ms-admin-tabs { height: 100%; } -.ms-admin-container > .ms-admin-main .ms-admin-tabs .el-tab-pane { +.ms-admin-container > .ms-admin-main .ms-admin-tabs .el-tabs__content { + height: 100%; +} +.ms-admin-container > .ms-admin-main .ms-admin-tabs .el-tabs__content .el-tab-pane { height: 100%; } .ms-admin-container > .ms-admin-main .ms-admin-tabs .el-tabs__nav-scroll { diff --git a/src/main/webapp/static/ms-admin/4.7.0/less/index.less b/src/main/webapp/static/ms-admin/4.7.0/less/index.less index ba512322..01156738 100644 --- a/src/main/webapp/static/ms-admin/4.7.0/less/index.less +++ b/src/main/webapp/static/ms-admin/4.7.0/less/index.less @@ -222,8 +222,11 @@ //选项卡 .ms-admin-tabs { height: 100%; - .el-tab-pane{ + .el-tabs__content{ height: 100%; + .el-tab-pane{ + height: 100%; + } } .el-tabs__nav-scroll { background: #fafafa;