Authored by 郭成尧

Merge branch 'feature/reds' into release/5.6

... ... @@ -69,7 +69,7 @@
{{/if}}
{{/isEqual}}
{{#isEqual module_type 'TripleImage'}}
<div class="{{#isEqual ../displayType 1}}items-3-2 items-3-2-left{{/isEqual}}{{#isEqual ../displayType 2}}items-3-2 items-3-2-right{{/isEqual}}{{#isEqual ../displayType 3}}items-3-3{{/isEqual}}{{#isEqual ../displayType 4}}items-3-3 items-small{{/isEqual}}">
<div class="{{#isEqual ../displayType 1}}items-3-3{{/isEqual}}{{#isEqual ../displayType 2}}items-3-3 items-small{{/isEqual}}{{#isEqual ../displayType 3}}items-3-2 items-3-2-right{{/isEqual}}{{#isEqual ../displayType 4}}items-3-2 items-3-2-left{{/isEqual}}">
{{#each ../pics}}
{{> reds-shop/item}}
{{/each}}
... ...
... ... @@ -2,7 +2,7 @@
* @Author: Targaryen
* @Date: 2017-03-23 17:12:53
* @Last Modified by: Targaryen
* @Last Modified time: 2017-04-01 17:09:05
* @Last Modified time: 2017-04-12 18:16:57
*/
// 红人店铺首页
... ... @@ -142,6 +142,7 @@
.items-3-3 {
overflow: hidden;
font-size: 18px;
width: 100%;
.item {
float: left;
... ...