Merge branch 'release/4.6' of git.yoho.cn:fe/yohobuy-node into release/4.6
Showing
6 changed files
with
52 additions
and
5 deletions
1 | +{{# comeSoon}} | ||
2 | + <div class="extra-pack"> | ||
3 | + <div class="extra-title">{{title}}</div> | ||
4 | + <div class="brand-list"> | ||
5 | + <ul class="list-page"> | ||
6 | + {{# brands}} | ||
7 | + <li class="brand-item"> | ||
8 | + <img class="lazy" data-original="{{image logo 126 87}}"> | ||
9 | + </li> | ||
10 | + {{/ brands}} | ||
11 | + </ul> | ||
12 | + </div> | ||
13 | + <div class="brand-page-btns page-btns" onselectstart="return false"> | ||
14 | + <label class="iconfont pre-page-btn"></label> | ||
15 | + <label class="iconfont next-page-btn"></label> | ||
16 | + </div> | ||
17 | + </div> | ||
18 | +{{/ comeSoon}} |
@@ -22,7 +22,7 @@ | @@ -22,7 +22,7 @@ | ||
22 | {{/ goods}} | 22 | {{/ goods}} |
23 | </div> | 23 | </div> |
24 | </div> | 24 | </div> |
25 | - <div class="good-page-btns" onselectstart="return false"> | 25 | + <div class="good-page-btns page-btns" onselectstart="return false"> |
26 | <label class="iconfont pre-page-btn"></label> | 26 | <label class="iconfont pre-page-btn"></label> |
27 | <label class="iconfont next-page-btn"></label> | 27 | <label class="iconfont next-page-btn"></label> |
28 | </div> | 28 | </div> |
@@ -10,6 +10,7 @@ | @@ -10,6 +10,7 @@ | ||
10 | </a> | 10 | </a> |
11 | {{/ sourceImg}} | 11 | {{/ sourceImg}} |
12 | {{> outlets/extra-recommend}} | 12 | {{> outlets/extra-recommend}} |
13 | + {{> outlets/extra-feature}} | ||
13 | {{> outlets/extra-product}} | 14 | {{> outlets/extra-product}} |
14 | {{/ extra}} | 15 | {{/ extra}} |
15 | </div> | 16 | </div> |
@@ -108,6 +108,33 @@ | @@ -108,6 +108,33 @@ | ||
108 | } | 108 | } |
109 | } | 109 | } |
110 | 110 | ||
111 | + .brand-list { | ||
112 | + width: 300%; | ||
113 | + | ||
114 | + .list-page { | ||
115 | + width: 378px; | ||
116 | + max-height: 918px; | ||
117 | + overflow: hidden; | ||
118 | + display: inline-block; | ||
119 | + vertical-align: top; | ||
120 | + } | ||
121 | + | ||
122 | + .brand-item { | ||
123 | + width: 125px; | ||
124 | + height: 90px; | ||
125 | + float: left; | ||
126 | + border: 1px solid #ccc; | ||
127 | + margin-top: -1px; | ||
128 | + margin-left: -1px; | ||
129 | + text-align: center; | ||
130 | + } | ||
131 | + | ||
132 | + .brand-item img { | ||
133 | + width: 90%; | ||
134 | + margin-top: 20px; | ||
135 | + } | ||
136 | + } | ||
137 | + | ||
111 | .good-list { | 138 | .good-list { |
112 | width: 300%; | 139 | width: 300%; |
113 | 140 | ||
@@ -161,7 +188,7 @@ | @@ -161,7 +188,7 @@ | ||
161 | } | 188 | } |
162 | } | 189 | } |
163 | 190 | ||
164 | - .good-page-btns { | 191 | + .page-btns { |
165 | text-align: center; | 192 | text-align: center; |
166 | padding-bottom: 10px; | 193 | padding-bottom: 10px; |
167 | user-select: none; | 194 | user-select: none; |
@@ -49,14 +49,16 @@ | @@ -49,14 +49,16 @@ | ||
49 | 49 | ||
50 | .list-item { | 50 | .list-item { |
51 | width: 222px; | 51 | width: 222px; |
52 | + height: 372px; | ||
52 | margin: 23px 10px 23px 0; | 53 | margin: 23px 10px 23px 0; |
54 | + overflow: hidden; | ||
53 | float: left; | 55 | float: left; |
54 | } | 56 | } |
55 | 57 | ||
56 | .thumb { | 58 | .thumb { |
57 | width: 100%; | 59 | width: 100%; |
58 | - height: 130%; | ||
59 | - display: inline-block; | 60 | + height: 296px; |
61 | + display: block; | ||
60 | 62 | ||
61 | img { | 63 | img { |
62 | width: 100%; | 64 | width: 100%; |
-
Please register or login to post a comment