Showing
3 changed files
with
16 additions
and
8 deletions
@@ -11,7 +11,7 @@ | @@ -11,7 +11,7 @@ | ||
11 | <div class="item-info"> | 11 | <div class="item-info"> |
12 | <div class="text">{{text}}</div> | 12 | <div class="text">{{text}}</div> |
13 | <div class="name">{{name}}</div> | 13 | <div class="name">{{name}}</div> |
14 | - <div class="price">{{price}}</div> | 14 | + <div class="price">{{salesPrice}}</div> |
15 | </div> | 15 | </div> |
16 | {{/if}} | 16 | {{/if}} |
17 | </div> | 17 | </div> |
@@ -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-13 19:34:47 | 5 | + * @Last Modified time: 2017-04-13 19:57:50 |
6 | */ | 6 | */ |
7 | // 红人店铺首页 | 7 | // 红人店铺首页 |
8 | 8 | ||
@@ -36,7 +36,6 @@ | @@ -36,7 +36,6 @@ | ||
36 | 36 | ||
37 | .item-pic { | 37 | .item-pic { |
38 | width: 100%; | 38 | width: 100%; |
39 | - height: 100%; | ||
40 | } | 39 | } |
41 | 40 | ||
42 | .item-info { | 41 | .item-info { |
@@ -46,6 +45,10 @@ | @@ -46,6 +45,10 @@ | ||
46 | color: #fff; | 45 | color: #fff; |
47 | padding-left: 20px; | 46 | padding-left: 20px; |
48 | padding-right: 20px; | 47 | padding-right: 20px; |
48 | + | ||
49 | + .market-price { | ||
50 | + color: #e01; | ||
51 | + } | ||
49 | } | 52 | } |
50 | 53 | ||
51 | .items-s1 { | 54 | .items-s1 { |
@@ -192,8 +195,6 @@ | @@ -192,8 +195,6 @@ | ||
192 | 195 | ||
193 | .item-info { | 196 | .item-info { |
194 | padding: 12px; | 197 | padding: 12px; |
195 | - display: flex; | ||
196 | - align-items: center; | ||
197 | background-color: rgba(0, 0, 0, 0.5); | 198 | background-color: rgba(0, 0, 0, 0.5); |
198 | } | 199 | } |
199 | 200 | ||
@@ -203,6 +204,12 @@ | @@ -203,6 +204,12 @@ | ||
203 | white-space: nowrap; | 204 | white-space: nowrap; |
204 | margin: 2px 0; | 205 | margin: 2px 0; |
205 | } | 206 | } |
207 | + | ||
208 | + &.items-small { | ||
209 | + .name { | ||
210 | + display: none; | ||
211 | + } | ||
212 | + } | ||
206 | } | 213 | } |
207 | 214 | ||
208 | /* 四张小图 */ | 215 | /* 四张小图 */ |
@@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
2 | * @Author: Targaryen | 2 | * @Author: Targaryen |
3 | * @Date: 2017-03-23 11:02:31 | 3 | * @Date: 2017-03-23 11:02:31 |
4 | * @Last Modified by: Targaryen | 4 | * @Last Modified by: Targaryen |
5 | - * @Last Modified time: 2017-04-13 19:37:24 | 5 | + * @Last Modified time: 2017-04-13 19:52:49 |
6 | */ | 6 | */ |
7 | /* 红人店铺数据处理 */ | 7 | /* 红人店铺数据处理 */ |
8 | 8 | ||
@@ -303,8 +303,9 @@ const pushGoodsInfo = (decorators, goodsList) => { | @@ -303,8 +303,9 @@ const pushGoodsInfo = (decorators, goodsList) => { | ||
303 | _.forEach(decorators, (value, key) => { | 303 | _.forEach(decorators, (value, key) => { |
304 | _.forEach(_.get(value, 'pics', []), (subValue, subKey) => { | 304 | _.forEach(_.get(value, 'pics', []), (subValue, subKey) => { |
305 | if (subValue.skn) { | 305 | if (subValue.skn) { |
306 | - decorators[key].pics[subKey].name = _.get(goodsObj, `${subValue.skn}.product_name;`, ''); | ||
307 | - decorators[key].pics[subKey].price = '¥' + _.get(goodsObj, `${subValue.skn}.sales_price`, ''); | 306 | + decorators[key].pics[subKey].name = _.get(goodsObj, `${subValue.skn}.product_name`, ''); |
307 | + decorators[key].pics[subKey].salesPrice = '¥' + _.get(goodsObj, `${subValue.skn}.sales_price`, ''); | ||
308 | + decorators[key].pics[subKey].marketPrice = '¥' + _.get(goodsObj, `${subValue.skn}.market_price`, ''); | ||
308 | } | 309 | } |
309 | }); | 310 | }); |
310 | }); | 311 | }); |
-
Please register or login to post a comment