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 ed3c347b..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: [{
@@ -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: '成功',
@@ -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
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..00ac3269 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,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 693889c7..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
@@ -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;
@@ -291,6 +317,15 @@ 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-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 {
background: #fafafa;
}
@@ -298,3 +333,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..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
@@ -221,6 +221,13 @@
background-color: #fff;
//选项卡
.ms-admin-tabs {
+ height: 100%;
+ .el-tabs__content{
+ height: 100%;
+ .el-tab-pane{
+ height: 100%;
+ }
+ }
.el-tabs__nav-scroll {
background: #fafafa;
.el-tabs__nav {
@@ -229,5 +236,10 @@
}
}
}
+ // 嵌套iframe
+ iframe{
+ .ms-width-height(100%);
+ border: none !important;
+ }
}
}
\ No newline at end of file