fe / yohobuywap-node · Commits

Go to a project

Authored by 郭成尧
Commit eeb14a6eedd364cebbd44adfd1b39df05b5ce60b 2 parents 239ad2fe 9d34e6a6

Merge branch 'feature/reds' into release/5.6

Inline Side-by-side
Showing 2 changed files with 3 additions and 2 deletions
@@ -69,7 +69,7 @@ @@ -69,7 +69,7 @@
69 {{/if}} 69 {{/if}}
70 {{/isEqual}} 70 {{/isEqual}}
71 {{#isEqual module_type 'TripleImage'}} 71 {{#isEqual module_type 'TripleImage'}}
72 - <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}}"> 72 + <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}}">
73 {{#each ../pics}} 73 {{#each ../pics}}
74 {{> reds-shop/item}} 74 {{> reds-shop/item}}
75 {{/each}} 75 {{/each}}
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 * @Author: Targaryen 2 * @Author: Targaryen
3 * @Date: 2017-03-23 17:12:53 3 * @Date: 2017-03-23 17:12:53
4 * @Last Modified by: Targaryen 4 * @Last Modified by: Targaryen
5 - * @Last Modified time: 2017-04-01 17:09:05 5 + * @Last Modified time: 2017-04-12 18:16:57
6 */ 6 */
7 // 红人店铺首页 7 // 红人店铺首页
8 8
@@ -142,6 +142,7 @@ @@ -142,6 +142,7 @@
142 .items-3-3 { 142 .items-3-3 {
143 overflow: hidden; 143 overflow: hidden;
144 font-size: 18px; 144 font-size: 18px;
  145 + width: 100%;
145 146
146 .item { 147 .item {
147 float: left; 148 float: left;