From d12ee233e8a54e11074b0d09bfd36418980ff42b Mon Sep 17 00:00:00 2001 From: ms-dev Date: Sat, 26 Jan 2019 18:13:27 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/Dockerfile | 5 +++++ src/main/resources/application-pro.yml | 7 +++++++ src/main/resources/application-test.yml | 7 +++++++ 3 files changed, 19 insertions(+) create mode 100644 src/main/resources/Dockerfile create mode 100644 src/main/resources/application-pro.yml create mode 100644 src/main/resources/application-test.yml diff --git a/src/main/resources/Dockerfile b/src/main/resources/Dockerfile new file mode 100644 index 00000000..129c4dd5 --- /dev/null +++ b/src/main/resources/Dockerfile @@ -0,0 +1,5 @@ +FROM java +VOLUME /tmp +ADD docker-springboot-0.0.1-SNAPSHOT.jar app.jar +RUN bash -c 'touch /app.jar' ENV JAVA_OPTS="" +ENTRYPOINT [ "sh", "-c", "java $JAVA_OPTS -Djava.security.egd=file:/dev/./urandom -jar /app.jar" ] \ No newline at end of file diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml new file mode 100644 index 00000000..8319ac8f --- /dev/null +++ b/src/main/resources/application-pro.yml @@ -0,0 +1,7 @@ +spring: + datasource: + url: jdbc:mysql://localhost:3306/db-mcms-open?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false + username: root + password: root + filters: wall,mergeStat + type: com.alibaba.druid.pool.DruidDataSource \ No newline at end of file diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml new file mode 100644 index 00000000..2c3a9d64 --- /dev/null +++ b/src/main/resources/application-test.yml @@ -0,0 +1,7 @@ +spring: + datasource: + url: jdbc:mysql://192.168.1.18:3306/mcms-4.7.0?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false + username: root + password: root + filters: wall,mergeStat + type: com.alibaba.druid.pool.DruidDataSource \ No newline at end of file From 4466019ddf35e8e09eb9f25d06421bb2df977022 Mon Sep 17 00:00:00 2001 From: ms-dev Date: Sat, 26 Jan 2019 18:14:49 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 99 ++++++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 80 insertions(+), 19 deletions(-) diff --git a/pom.xml b/pom.xml index 01d87374..f9654212 100644 --- a/pom.xml +++ b/pom.xml @@ -6,9 +6,9 @@ net.mingsoft mcms - 0.0.1-SNAPSHOT - mcms1 - war + 4.7.0-SNAPSHOT + ms-mcms + jar 1.8 @@ -49,12 +49,6 @@ classes provided - - net.mingsoft - ms-basic - 1.0.8.1-SNAPSHOT - war - net.mingsoft ms-mdiy @@ -62,12 +56,6 @@ classes provided - - net.mingsoft - ms-mdiy - 1.0.7-SNAPSHOT - war - net.mingsoft ms-mpeople @@ -75,16 +63,89 @@ classes provided + + - net.mingsoft - ms-mpeople - 1.0.7-SNAPSHOT - war + io.springfox + springfox-swagger2 + 2.9.2 + + + org.springframework + spring-core + + + org.springframework + spring-beans + + + org.springframework + spring-context + + + org.springframework + spring-context-support + + + org.springframework + spring-aop + + + org.springframework + spring-tx + + + org.springframework + spring-orm + + + org.springframework + spring-jdbc + + + org.springframework + spring-web + + + org.springframework + spring-webmvc + + + org.springframework + spring-oxm + + + + + io.springfox + springfox-swagger-ui + 2.9.2 ms-mcms + org.apache.maven.plugins maven-compiler-plugin From 84111c4e73fb6e092e8ce0342350d55b7c12a294 Mon Sep 17 00:00:00 2001 From: yinxr <2273460044@qq.com> Date: Sat, 26 Jan 2019 18:52:55 +0800 Subject: [PATCH 3/8] Signed-off-by: yinxr <2273460044@qq.com> --- .../WEB-INF/manager/include/head-file.ftl | 4 + .../WEB-INF/manager/mweixin/article/index.ftl | 62 +++++---- .../webapp/WEB-INF/manager/mweixin/menu.ftl | 5 +- .../webapp/WEB-INF/manager/mweixin/weixin.ftl | 1 + src/main/webapp/static/mweixin/article.less | 128 +++++++++++++----- src/main/webapp/static/mweixin/css/app.css | 2 +- .../webapp/static/mweixin/css/article.css | 83 +++++++++++- 7 files changed, 219 insertions(+), 66 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 ab4b1116..2d3a7a5a 100644 --- a/src/main/webapp/WEB-INF/manager/include/head-file.ftl +++ b/src/main/webapp/WEB-INF/manager/include/head-file.ftl @@ -24,6 +24,10 @@ + + + + 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 e0f16900..73023cb7 100644 --- a/src/main/webapp/WEB-INF/manager/mweixin/article/index.ftl +++ b/src/main/webapp/WEB-INF/manager/mweixin/article/index.ftl @@ -1,16 +1,6 @@ - - - - - - - - - - -
+
@@ -30,23 +20,33 @@
- + - + + 添加封面 - - - + + + - - + + - - + + + @@ -77,13 +77,15 @@ basicTitle: '没有奇迹，国足0-3不敌伊朗止步八强!', basicThumbnailsl: 'https://img03.sogoucdn.com/app/a/100520091/20190125113148' }], - titleWordNumber: '', //图文标题剩余字数 - authorWordNumber: '', //图文作者剩余字数 + titleWordNumber: 64, //图文标题剩余字数 + authorWordNumber: 8, //图文作者剩余字数 + descWordNumber:54,//摘要 editor: null, //富文本实例 - }, - watch: { - subArticleList: function (n, o) { - console.log('n', n); + articleForm:{ + basicTitle:'',//标题 + articleAuthor:'',//作者 + basicDescription:'', //摘要 + articleContent:'', //正文 } }, methods: { @@ -93,6 +95,10 @@ basicTitle: '新增文章标题', basicThumbnailsl: 'https://img03.sogoucdn.com/app/a/100520091/20190125113148' }) + }, + // 计算剩余字数 + resetWordNum:function(type){ + } }, mounted: function () { @@ -122,8 +128,8 @@ zIndex: 10000, elementPathEnabled: false, wordCount: false, - initialFrameWidth: 600, - initialFrameHeight: 240, + initialFrameWidth: '100%', + initialFrameHeight: 500, }); this.editor.ready(function () { var a = $("#ueditor_0").contents()[0].activeElement; diff --git a/src/main/webapp/WEB-INF/manager/mweixin/menu.ftl b/src/main/webapp/WEB-INF/manager/mweixin/menu.ftl index 939d7367..920def15 100644 --- a/src/main/webapp/WEB-INF/manager/mweixin/menu.ftl +++ b/src/main/webapp/WEB-INF/manager/mweixin/menu.ftl @@ -52,7 +52,10 @@ }, { title: '关键词回复' }] - }, ], //左侧导航列表 + },{ + title:'新建图文' + } + ], //左侧导航列表 menuActive: '图文', //选中 } }) diff --git a/src/main/webapp/WEB-INF/manager/mweixin/weixin.ftl b/src/main/webapp/WEB-INF/manager/mweixin/weixin.ftl index 3602a7a6..159bf5fa 100644 --- a/src/main/webapp/WEB-INF/manager/mweixin/weixin.ftl +++ b/src/main/webapp/WEB-INF/manager/mweixin/weixin.ftl @@ -13,5 +13,6 @@ + \ No newline at end of file diff --git a/src/main/webapp/static/mweixin/article.less b/src/main/webapp/static/mweixin/article.less index c28e07f7..277f0ca6 100644 --- a/src/main/webapp/static/mweixin/article.less +++ b/src/main/webapp/static/mweixin/article.less @@ -1,77 +1,139 @@ // 新建图文 @import "../ms-admin/4.7.0/less/app.less"; -.ms-article{ +.ms-article { .ms-flex(); width: 100%; background: transparent !important; - .el-container{ + .el-container { // 侧边 - .el-aside{ - padding:14px; - background: #fff; - // 主文章 - .ms-main-article{ + .el-aside { + padding: 14px; + background: #fff; // 主文章 + .ms-main-article { position: relative; - img{ - .ms-width-height(100%,146px); + img { + .ms-width-height(100%, 146px); } - .ms-main-article-mask{ + .ms-main-article-mask { background: #000; opacity: .2; - .ms-width-height(100%,146px); + .ms-width-height(100%, 146px); position: absolute; top: 0; left: 0; } - span{ + span { position: absolute; bottom: 0; padding: 15px; color: #fff; .ms-ellipsis-clamp(2); } - } - // 子文章 - .ms-article-item{ - .ms-width-height(100%,70px); + } // 子文章 + .ms-article-item { + .ms-width-height(100%, 70px); .ms-flex(); - padding:10px 0; + padding: 10px 0; border-bottom: 1px solid @borderColor; - p{ + p { margin: 0 10px 0 0; .ms-flex(); align-items: center; - span{ + span { width: 100%; display: inline-block; .ms-ellipsis-clamp(1); } } - img{ + img { .ms-width-height(50px); } - &:hover{ + &:hover { cursor: pointer; } - } - // 尾部 - .ms-article-footer{ + } // 尾部 + .ms-article-footer { background: #fff; - padding-top:20px; - .el-button{ + padding-top: 20px; + .el-button { width: 100%; background: rgb(242, 242, 246); - i,span{ - .ms-font(@auxiliarySize,@auxiliaryColor); + i, + span { + .ms-font(@auxiliarySize, @auxiliaryColor); } } } - } - // 内容区域 - .el-main{ - flex:1; - background: #fff; + } // 内容区域 + .el-main { + flex: 1; margin-left: 14px; + padding: 0 !important; + .ms-main-header { + background: #fff; + .ms-flex(); + height: 180px; + padding: 20px; + padding-bottom: 24px; + box-sizing: border-box; + border-bottom: 1px solid @borderColor; // 图片上传 + .ms-pic-upload { + .ms-width-height(140px); + border-radius: 4px; + border: 1px dashed @borderColor; + .ms-flex(center); + flex-direction: column; + margin-right: 20px; + .el-upload { + .ms-flex(); + flex-direction: column; + align-items: center; + span { + .ms-font(@auxiliarySize, @auxiliaryColor); + margin-top: 4px; + } + i { + .ms-font(18px, @auxiliaryColor); + } + } + } // 表单 + .el-form { + flex: 1; + margin: 0 !important; + .ms-flex(); + flex-direction: column; + .el-form-item { + margin-bottom: 0 !important; + } + .el-input__suffix { + top: -3px !important; + } + } + } + .ms-main-body { + height: calc(~'100% - 180px'); + background: #fff; + .edui-editor { + height: 100%; + .edui-editor-toolbarboxouter { + background-color: none !important; + background-image: none !important; + } // 编辑器样式 + .edui-editor { + border: none !important; + .edui-editor-toolbarbox { + box-shadow: none !important; + .edui-editor-toolbarboxouter { + background-color: transparent !important; + background-image: none !important; + border: none !important; + border-radius: 0 !important; + box-shadow: none !important; + } + } + } + } + } } } } \ No newline at end of file diff --git a/src/main/webapp/static/mweixin/css/app.css b/src/main/webapp/static/mweixin/css/app.css index 1bbcf495..39f96349 100644 --- a/src/main/webapp/static/mweixin/css/app.css +++ b/src/main/webapp/static/mweixin/css/app.css @@ -22,7 +22,7 @@ html, body { min-height: 100vh; - width: 100%; + width: 100vw; background-color: #eee; margin: 0; display: flex; diff --git a/src/main/webapp/static/mweixin/css/article.css b/src/main/webapp/static/mweixin/css/article.css index a3b7bcf6..9f3b60ad 100644 --- a/src/main/webapp/static/mweixin/css/article.css +++ b/src/main/webapp/static/mweixin/css/article.css @@ -22,7 +22,7 @@ html, body { min-height: 100vh; - width: 100%; + width: 100vw; background-color: #eee; margin: 0; display: flex; @@ -73,7 +73,7 @@ textarea::-webkit-input-placeholder { } .ms-container { margin: 12px; - height: 100%; + height: calc(100% - 24px); padding: 14px 14px 0 14px; background: #fff; } @@ -97,6 +97,9 @@ textarea::-webkit-input-placeholder { .el-button + .el-button { margin-left: 0; } +.ms-weixin-content { + width: calc(100% - 140px); +} .ms-article { display: flex; justify-content: space-between; @@ -180,6 +183,80 @@ textarea::-webkit-input-placeholder { } .ms-article .el-container .el-main { flex: 1; - background: #fff; margin-left: 14px; + padding: 0 !important; +} +.ms-article .el-container .el-main .ms-main-header { + background: #fff; + display: flex; + justify-content: space-between; + height: 180px; + padding: 20px; + padding-bottom: 24px; + box-sizing: border-box; + border-bottom: 1px solid #ddd; +} +.ms-article .el-container .el-main .ms-main-header .ms-pic-upload { + width: 140px; + height: 140px; + border-radius: 4px; + border: 1px dashed #ddd; + display: flex; + justify-content: center; + flex-direction: column; + margin-right: 20px; +} +.ms-article .el-container .el-main .ms-main-header .ms-pic-upload .el-upload { + display: flex; + justify-content: space-between; + flex-direction: column; + align-items: center; +} +.ms-article .el-container .el-main .ms-main-header .ms-pic-upload .el-upload span { + font-weight: initial; + font-size: 12px; + color: #999; + margin-top: 4px; +} +.ms-article .el-container .el-main .ms-main-header .ms-pic-upload .el-upload i { + font-weight: initial; + font-size: 18px; + color: #999; +} +.ms-article .el-container .el-main .ms-main-header .el-form { + flex: 1; + margin: 0 !important; + display: flex; + justify-content: space-between; + flex-direction: column; +} +.ms-article .el-container .el-main .ms-main-header .el-form .el-form-item { + margin-bottom: 0 !important; +} +.ms-article .el-container .el-main .ms-main-header .el-form .el-input__suffix { + top: -3px !important; +} +.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-editor { + height: 100%; +} +.ms-article .el-container .el-main .ms-main-body .edui-editor .edui-editor-toolbarboxouter { + background-color: none !important; + background-image: none !important; +} +.ms-article .el-container .el-main .ms-main-body .edui-editor .edui-editor { + border: none !important; +} +.ms-article .el-container .el-main .ms-main-body .edui-editor .edui-editor .edui-editor-toolbarbox { + box-shadow: none !important; +} +.ms-article .el-container .el-main .ms-main-body .edui-editor .edui-editor .edui-editor-toolbarbox .edui-editor-toolbarboxouter { + background-color: transparent !important; + background-image: none !important; + border: none !important; + border-radius: 0 !important; + box-shadow: none !important; } From b9b3ac1a3493048ff8d1f688281c6dd7a0ac887d Mon Sep 17 00:00:00 2001 From: yinxr <2273460044@qq.com> Date: Sat, 26 Jan 2019 20:31:09 +0800 Subject: [PATCH 4/8] Signed-off-by: yinxr <2273460044@qq.com> --- .../WEB-INF/manager/mweixin/article/index.ftl | 2 +- .../WEB-INF/manager/mweixin/menu/index.ftl | 12 +- .../mweixin/menu/material-bank-form.ftl | 59 ++++++++ .../manager/mweixin/menu/new-pic-form.ftl | 74 ++++++++++ .../webapp/WEB-INF/manager/mweixin/weixin.ftl | 2 + .../static/ms-admin/4.7.0/less/app.less | 16 +++ src/main/webapp/static/mweixin/article.less | 4 +- src/main/webapp/static/mweixin/css/app.css | 14 ++ .../webapp/static/mweixin/css/article.css | 1 + .../static/mweixin/css/material-bank-form.css | 120 +++++++++++++++++ .../static/mweixin/css/new-pic-form.css | 127 ++++++++++++++++++ .../static/mweixin/material-bank-form.less | 7 + .../webapp/static/mweixin/new-pic-form.less | 15 +++ 13 files changed, 442 insertions(+), 11 deletions(-) create mode 100644 src/main/webapp/WEB-INF/manager/mweixin/menu/material-bank-form.ftl create mode 100644 src/main/webapp/WEB-INF/manager/mweixin/menu/new-pic-form.ftl create mode 100644 src/main/webapp/static/mweixin/css/material-bank-form.css create mode 100644 src/main/webapp/static/mweixin/css/new-pic-form.css create mode 100644 src/main/webapp/static/mweixin/material-bank-form.less create mode 100644 src/main/webapp/static/mweixin/new-pic-form.less 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 73023cb7..74981156 100644 --- a/src/main/webapp/WEB-INF/manager/mweixin/article/index.ftl +++ b/src/main/webapp/WEB-INF/manager/mweixin/article/index.ftl @@ -1,6 +1,6 @@ -
+
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 d0d0571f..9943f3b1 100644 --- a/src/main/webapp/WEB-INF/manager/mweixin/menu/index.ftl +++ b/src/main/webapp/WEB-INF/manager/mweixin/menu/index.ftl @@ -33,11 +33,11 @@ 图片 -
+
从素材库选择
-
+
新建图片
@@ -78,13 +78,7 @@ activeName: 'picture' }, methods: { - open: function(type) { - if(type == 'store') { - // 素材库 - } else { - // 新建图片 - } - } + } }) diff --git a/src/main/webapp/WEB-INF/manager/mweixin/menu/material-bank-form.ftl b/src/main/webapp/WEB-INF/manager/mweixin/menu/material-bank-form.ftl new file mode 100644 index 00000000..06308f7c --- /dev/null +++ b/src/main/webapp/WEB-INF/manager/mweixin/menu/material-bank-form.ftl @@ -0,0 +1,59 @@ + + +
+ + + + + + + + + + + + + +
+ \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/manager/mweixin/menu/new-pic-form.ftl b/src/main/webapp/WEB-INF/manager/mweixin/menu/new-pic-form.ftl new file mode 100644 index 00000000..e31b0198 --- /dev/null +++ b/src/main/webapp/WEB-INF/manager/mweixin/menu/new-pic-form.ftl @@ -0,0 +1,74 @@ + + +
+ + + + + 本地上传 +
+
+
注意：1.图片上传仅支持bmp、png、jpeg、jpg、gif格式
+
2.同步至微信公众平台的图片最大2M,存在铭飞本地，最大支持5M的图片
+
+ +
+ + + + 添加分组 + + + + + + +
+ 取 消 + 确 定 +
+ +
+ \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/manager/mweixin/weixin.ftl b/src/main/webapp/WEB-INF/manager/mweixin/weixin.ftl index 159bf5fa..8bf7edae 100644 --- a/src/main/webapp/WEB-INF/manager/mweixin/weixin.ftl +++ b/src/main/webapp/WEB-INF/manager/mweixin/weixin.ftl @@ -12,6 +12,8 @@ + + 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 f14f72df..40511d3c 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 @@ -96,4 +96,20 @@ textarea::-webkit-input-placeholder { .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 @borderColor; + .el-dialog__title{ + .ms-font(@defalutSize,@defalutColor,bold); + } + } + .el-dialog__footer{ + border-top: 1px solid @borderColor; + } } \ No newline at end of file diff --git a/src/main/webapp/static/mweixin/article.less b/src/main/webapp/static/mweixin/article.less index 277f0ca6..dd969daf 100644 --- a/src/main/webapp/static/mweixin/article.less +++ b/src/main/webapp/static/mweixin/article.less @@ -8,7 +8,9 @@ // 侧边 .el-aside { padding: 14px; - background: #fff; // 主文章 + background: #fff; + height: 475px; + // 主文章 .ms-main-article { position: relative; img { diff --git a/src/main/webapp/static/mweixin/css/app.css b/src/main/webapp/static/mweixin/css/app.css index 39f96349..37d51fae 100644 --- a/src/main/webapp/static/mweixin/css/app.css +++ b/src/main/webapp/static/mweixin/css/app.css @@ -100,3 +100,17 @@ textarea::-webkit-input-placeholder { .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 #ddd; +} +.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 #ddd; +} diff --git a/src/main/webapp/static/mweixin/css/article.css b/src/main/webapp/static/mweixin/css/article.css index 9f3b60ad..ad5c1f1d 100644 --- a/src/main/webapp/static/mweixin/css/article.css +++ b/src/main/webapp/static/mweixin/css/article.css @@ -109,6 +109,7 @@ textarea::-webkit-input-placeholder { .ms-article .el-container .el-aside { padding: 14px; background: #fff; + height: 475px; } .ms-article .el-container .el-aside .ms-main-article { position: relative; diff --git a/src/main/webapp/static/mweixin/css/material-bank-form.css b/src/main/webapp/static/mweixin/css/material-bank-form.css new file mode 100644 index 00000000..88d8396c --- /dev/null +++ b/src/main/webapp/static/mweixin/css/material-bank-form.css @@ -0,0 +1,120 @@ +/* +*这里的值严格按照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: #ddd; + /*滚动条的背景颜色*/ +} +.ms-container { + margin: 12px; + height: calc(100% - 24px); + 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-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 #ddd; +} +.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 #ddd; +} +.material-bank-form > .el-dialog { + width: 890px; + height: 600px; +} diff --git a/src/main/webapp/static/mweixin/css/new-pic-form.css b/src/main/webapp/static/mweixin/css/new-pic-form.css new file mode 100644 index 00000000..fc2c2129 --- /dev/null +++ b/src/main/webapp/static/mweixin/css/new-pic-form.css @@ -0,0 +1,127 @@ +/* +*这里的值严格按照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: #ddd; + /*滚动条的背景颜色*/ +} +.ms-container { + margin: 12px; + height: calc(100% - 24px); + 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-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 #ddd; +} +.ms-weixin-dialog .el-dialog__header .el-dialog__title { + font-weight: bold; + font-size: 14px; + color: #333; +} +.new-pic-form dl { + margin: 0; +} +.new-pic-form dd, +.new-pic-form dt { + line-height: 1; + font-weight: initial; + font-size: 12px; + color: #999; +} +.new-pic-form dt { + display: inline-block; + margin-bottom: 8px; +} diff --git a/src/main/webapp/static/mweixin/material-bank-form.less b/src/main/webapp/static/mweixin/material-bank-form.less new file mode 100644 index 00000000..6bad8f73 --- /dev/null +++ b/src/main/webapp/static/mweixin/material-bank-form.less @@ -0,0 +1,7 @@ +@import "../ms-admin/4.7.0/less/app.less"; +// 素材库表单 +.material-bank-form{ + >.el-dialog{ + .ms-width-height(890px,600px); + } +} \ No newline at end of file diff --git a/src/main/webapp/static/mweixin/new-pic-form.less b/src/main/webapp/static/mweixin/new-pic-form.less new file mode 100644 index 00000000..16a0c6ed --- /dev/null +++ b/src/main/webapp/static/mweixin/new-pic-form.less @@ -0,0 +1,15 @@ +@import "../ms-admin/4.7.0/less/app.less"; +// 新建图片 +.new-pic-form{ + dl{ + margin: 0; + } + dd,dt{ + line-height: 1; + .ms-font(@auxiliarySize,@auxiliaryColor); + } + dt{ + display: inline-block; + margin-bottom: 8px; + } +} \ No newline at end of file From d370748f50fe51fa36a4d978856eeaf83bf05896 Mon Sep 17 00:00:00 2001 From: ms group dev Date: Sun, 27 Jan 2019 20:55:30 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 25a0a051..4f121f61 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ # 温馨提示，请使用master分支 -当前版本:4.7.0 开发版本极其不稳定，如有使用概不解答，请耐心等待稳定版本的发布，
\ No newline at end of file +当前版本:4.7.0 开发版本极其不稳定，如有使用概不解答，请耐心等待稳定版本的发布，
\ No newline at end of file From c3c4ae463fd3547d6b78c68569649c98d9a240d3 Mon Sep 17 00:00:00 2001 From: ms group dev Date: Mon, 28 Jan 2019 04:48:18 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=86=85=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-test.yml | 2 +- src/main/resources/application.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index 2c3a9d64..d2e93439 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -1,6 +1,6 @@ spring: datasource: - url: jdbc:mysql://192.168.1.18:3306/mcms-4.7.0?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false + url: jdbc:mysql://192.168.1.18:3307/mcms-4.7.0?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false username: root password: root filters: wall,mergeStat diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 3ff3d837..2b80f513 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -22,7 +22,7 @@ ms: spring: profiles: - active: dev + active: test mvc: pathmatch: use-suffix-pattern: true From 164b3813a58dbf354ed64acae4568eeece84d5ea Mon Sep 17 00:00:00 2001 From: ms group dev Date: Mon, 28 Jan 2019 05:07:02 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E5=86=85=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index d2e93439..e7af895d 100644 --- a/src/main/resources/application-test.yml +++ b/src/main/resources/application-test.yml @@ -1,6 +1,6 @@ spring: datasource: - url: jdbc:mysql://192.168.1.18:3307/mcms-4.7.0?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false + url: jdbc:mysql://localhost:3307/mcms-4.7.0?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false username: root password: root filters: wall,mergeStat From d23496fc8cafe4fd75031846342f317aa4fe1beb Mon Sep 17 00:00:00 2001 From: yinxr <2273460044@qq.com> Date: Mon, 28 Jan 2019 11:11:02 +0800 Subject: [PATCH 8/8] Signed-off-by: yinxr <2273460044@qq.com> --- .../mweixin/menu/material-bank-form.ftl | 51 +++++++++++++++---- .../static/ms-admin/4.7.0/less/app.less | 1 + src/main/webapp/static/mweixin/css/app.css | 1 + .../static/mweixin/css/material-bank-form.css | 46 +++++++++++++++-- .../static/mweixin/css/new-pic-form.css | 4 ++ .../static/mweixin/material-bank-form.less | 45 +++++++++++++++- 6 files changed, 134 insertions(+), 14 deletions(-) diff --git a/src/main/webapp/WEB-INF/manager/mweixin/menu/material-bank-form.ftl b/src/main/webapp/WEB-INF/manager/mweixin/menu/material-bank-form.ftl index 06308f7c..27c2e006 100644 --- a/src/main/webapp/WEB-INF/manager/mweixin/menu/material-bank-form.ftl +++ b/src/main/webapp/WEB-INF/manager/mweixin/menu/material-bank-form.ftl @@ -3,18 +3,36 @@
- + - + + + + + + + + +
+ 确 定 + 取 消 +
-