diff --git a/src/main/webapp/WEB-INF/manager/images/data/img.png b/src/main/webapp/WEB-INF/manager/images/data/img.png new file mode 100644 index 00000000..4a97cb94 Binary files /dev/null and b/src/main/webapp/WEB-INF/manager/images/data/img.png differ diff --git a/src/main/webapp/WEB-INF/manager/mweixin/img/index.ftl b/src/main/webapp/WEB-INF/manager/mweixin/img/index.ftl new file mode 100644 index 00000000..ec01502d --- /dev/null +++ b/src/main/webapp/WEB-INF/manager/mweixin/img/index.ftl @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/manager/mweixin/metarial/index.ftl b/src/main/webapp/WEB-INF/manager/mweixin/metarial/index.ftl index 76a81a8a..340105c7 100644 --- a/src/main/webapp/WEB-INF/manager/mweixin/metarial/index.ftl +++ b/src/main/webapp/WEB-INF/manager/mweixin/metarial/index.ftl @@ -32,11 +32,12 @@
- +

@@ -62,13 +63,13 @@ materialList: [{ date: '12月27日', title: 'HUAWEI Mate 20 6GB+64GB 全网最低价...', - img: '', + img: '../images/data/img.png', det: '传播名HUAWEI Mate 20 6GB+64GB 全网最低价,后置摄像头后置莱卡散射,12000万亿像素(光脚,1/1.6光圈)+1200万像素(超广角),......' }, { date: '12月27日', title: 'HUAWEI Mate 20 6GB+64GB 全网最低价...', - img: '', + img: '../images/data/img.png', det: '传播名HUAWEI Mate 20 6GB+64GB 全网最低价,后置摄像头后置莱卡散射,12000万亿像素(光脚,1/1.6光圈)+1200万像素(超广角),......' } ], diff --git a/src/main/webapp/static/ms-admin/4.7.0/less/base/style.less b/src/main/webapp/static/ms-admin/4.7.0/less/base/style.less index 4cf691ad..7e44bb3d 100644 --- a/src/main/webapp/static/ms-admin/4.7.0/less/base/style.less +++ b/src/main/webapp/static/ms-admin/4.7.0/less/base/style.less @@ -39,13 +39,13 @@ @titleColor: #333; //内容字体样式 @contentSize: 14px; -@contentColor: #333; +@contentColor: #999; // 默认字体样式 @defalutSize: 14px; @defalutColor: #333; //辅助性描述样式 @auxiliarySize: 12px; -@auxiliaryColor: #999; +@auxiliaryColor: #aaa; /* *头像 diff --git a/src/main/webapp/static/mweixin/css/material-list.css b/src/main/webapp/static/mweixin/css/material-list.css index 3fa041a9..e4eb8a0f 100644 --- a/src/main/webapp/static/mweixin/css/material-list.css +++ b/src/main/webapp/static/mweixin/css/material-list.css @@ -50,7 +50,7 @@ input::-webkit-input-placeholder, textarea::-webkit-input-placeholder { font-weight: initial; font-size: 12px; - color: #999; + color: #aaa; resize: none; } *::-webkit-scrollbar { @@ -120,14 +120,46 @@ textarea::-webkit-input-placeholder { border-bottom: 1px solid #e6e6e6; padding: 10px 0; } +.ms-admin-material-list .ms-admin-material-item .head span { + color: #999; +} .ms-admin-material-list .ms-admin-material-item .body { display: flex; flex-direction: column; + line-height: 2em; +} +.ms-admin-material-list .ms-admin-material-item .body span { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + display: block; +} +.ms-admin-material-list .ms-admin-material-item .body img { + width: 170px; + height: 110px; + margin: 0.5em auto; + object-fit: cover; +} +.ms-admin-material-list .ms-admin-material-item .body p { + margin: 0; + color: #999; + overflow: hidden; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-line-clamp: 3; + -webkit-box-orient: vertical; } .ms-admin-material-list .ms-admin-material-item .footer { display: flex; padding: 14px 0; } .ms-admin-material-list .ms-admin-material-item .footer i { + color: #999; margin: auto; + cursor: pointer; +} +.ms-admin-material-list .ms-admin-material-item .footer em { + width: 1px; + height: 1em; + background: #e6e6e6; } diff --git a/src/main/webapp/static/mweixin/material-list.less b/src/main/webapp/static/mweixin/material-list.less index b4139988..5c0f9f91 100644 --- a/src/main/webapp/static/mweixin/material-list.less +++ b/src/main/webapp/static/mweixin/material-list.less @@ -15,16 +15,39 @@ .head { border-bottom: 1px solid #e6e6e6; padding: 10px 0; + span { + color: @contentColor; + } } .body { display: flex; flex-direction: column; + line-height: 2em; + span { + .ms-ellipsis; + } + img { + .ms-width-height(170px, 110px); + margin: 0.5em auto; + object-fit: cover; + } + p { + margin: 0; + color: @contentColor; + .ms-ellipsis-clamp(3); + } } .footer { display: flex; padding: 14px 0; i { + color: @contentColor; margin: auto; + cursor: pointer; + } + em { + .ms-width-height(1px, 1em); + background: #e6e6e6; } } }