fe / YOHOBUYPC · Commits

Go to a project

Authored by 周少峰
Commit 4f4696fc62391e1f6e0a97658d66a7d2590530ee 2 parents f14a8f20 66d9ffee

Merge branch 'feature/shopStyle'

Inline Side-by-side
Showing 4 changed files with 37 additions and 11 deletions
1 {{# shopTopBanner}} 1 {{# shopTopBanner}}
2 <div class="shop-banner"> 2 <div class="shop-banner">
3 - <div class="banner-img" style="height: {{bannerHeight}}px;background: url({{banner}})"></div> 3 + <div class="banner-img" style="height: {{bannerHeight}}px;background: url({{banner}})">
  4 + <div class="banner-mark"></div>
  5 + </div>
4 {{#if isShowShopName}} 6 {{#if isShowShopName}}
5 <div class="shop-name"> 7 <div class="shop-name">
6 {{brandIntro.brandName}} 8 {{brandIntro.brandName}}
@@ -46,12 +48,9 @@ @@ -46,12 +48,9 @@
46 {{#if navigationBar}} 48 {{#if navigationBar}}
47 <ul class="shop-nav clearfix"> 49 <ul class="shop-nav clearfix">
48 {{#navigationBar}} 50 {{#navigationBar}}
49 - <li class="nav-item {{#if @first}}first{{/if}} {{#if current}}current{{/if}}"> 51 + <li class="nav-item {{#if @first}}first{{/if}}{{#if current}}current{{/if}}">
50 <a href="{{url}}"> 52 <a href="{{url}}">
51 {{name}} 53 {{name}}
52 - {{#if arrow}}  
53 - <span class="iconfont">&#xe63a;</span>  
54 - {{/if}}  
55 </a> 54 </a>
56 </li> 55 </li>
57 {{/navigationBar}} 56 {{/navigationBar}}
@@ -18,6 +18,12 @@ @@ -18,6 +18,12 @@
18 height: 150px; 18 height: 150px;
19 } 19 }
20 20
  21 + .banner-mark {
  22 + width: 100%;
  23 + height: 100%;
  24 + background: resolve('/product/banner-mark.png');
  25 + }
  26 +
21 .opt-wrap { 27 .opt-wrap {
22 position: absolute; 28 position: absolute;
23 top: 65%; 29 top: 65%;
@@ -104,6 +110,11 @@ @@ -104,6 +110,11 @@
104 } 110 }
105 } 111 }
106 112
  113 + .sort-child-list a {
  114 + height: 28px;
  115 + line-height: 28px;
  116 + }
  117 +
107 .coupon { 118 .coupon {
108 margin-top: 20px; 119 margin-top: 20px;
109 width: 100%; 120 width: 100%;
@@ -187,7 +198,6 @@ @@ -187,7 +198,6 @@
187 margin-bottom: 20px; 198 margin-bottom: 20px;
188 width: 235px; 199 width: 235px;
189 height: 315px; 200 height: 315px;
190 - font-size: 14px;  
191 text-align: center; 201 text-align: center;
192 line-height: 1.5; 202 line-height: 1.5;
193 background: #f5f5f5; 203 background: #f5f5f5;
@@ -201,10 +211,16 @@ @@ -201,10 +211,16 @@
201 .title { 211 .title {
202 width: 220px; 212 width: 220px;
203 padding: 0 5px; 213 padding: 0 5px;
  214 + font-size: 12px;
204 text-overflow: ellipsis; 215 text-overflow: ellipsis;
205 white-space: nowrap; 216 white-space: nowrap;
206 overflow: hidden; 217 overflow: hidden;
207 } 218 }
  219 +
  220 + .price {
  221 + font-size: 15px;
  222 + line-height: 32px;
  223 + }
208 } 224 }
209 225
210 .hat { 226 .hat {
@@ -377,6 +393,7 @@ @@ -377,6 +393,7 @@
377 position: relative; 393 position: relative;
378 width: 100%; 394 width: 100%;
379 text-align: center; 395 text-align: center;
  396 + margin-bottom: 20px;
380 397
381 a { 398 a {
382 display: block; 399 display: block;
@@ -394,6 +411,10 @@ @@ -394,6 +411,10 @@
394 .trend-info { 411 .trend-info {
395 width: 100%; 412 width: 100%;
396 413
  414 + .floor-header {
  415 + margin-top: 70px;
  416 + }
  417 +
397 .trend-list { 418 .trend-list {
398 width: 100%; 419 width: 100%;
399 420
@@ -401,6 +422,7 @@ @@ -401,6 +422,7 @@
401 float: left; 422 float: left;
402 width: 316px; 423 width: 316px;
403 margin-left: 10px; 424 margin-left: 10px;
  425 + margin-bottom: 20px;
404 text-align: center; 426 text-align: center;
405 427
406 &:first-child { 428 &:first-child {
@@ -417,7 +439,7 @@ @@ -417,7 +439,7 @@
417 .sub-title { 439 .sub-title {
418 box-sizing: border-box; 440 box-sizing: border-box;
419 font-size: 16px; 441 font-size: 16px;
420 - margin-top: 15px; 442 + font-weight: bold;
421 padding: 0 10px; 443 padding: 0 10px;
422 width: 100%; 444 width: 100%;
423 overflow: hidden; 445 overflow: hidden;
@@ -426,8 +448,12 @@ @@ -426,8 +448,12 @@
426 line-height: 24px; 448 line-height: 24px;
427 } 449 }
428 450
  451 + .main-title {
  452 + padding-top: 20px;
  453 + }
  454 +
429 .sub-title { 455 .sub-title {
430 - margin-top: 0; 456 + padding-bottom: 20px;
431 font-size: 14px; 457 font-size: 14px;
432 } 458 }
433 } 459 }
@@ -500,14 +526,15 @@ @@ -500,14 +526,15 @@
500 display: inline-block; 526 display: inline-block;
501 line-height: 14px; 527 line-height: 14px;
502 vertical-align: middle; 528 vertical-align: middle;
503 - font-weight: bold;  
504 529
505 .name { 530 .name {
506 font-size: 14px; 531 font-size: 14px;
  532 + font-weight: bold;
507 } 533 }
508 534
509 .en-name { 535 .en-name {
510 font-size: 12px; 536 font-size: 12px;
  537 + margin-top: 4px;
511 } 538 }
512 } 539 }
513 540
@@ -560,7 +560,7 @@ class ShopModel @@ -560,7 +560,7 @@ class ShopModel
560 'title' => $resource['productName'], 560 'title' => $resource['productName'],
561 'productSkn' => $resource['productSkn'], 561 'productSkn' => $resource['productSkn'],
562 'price' => '￥' . number_format(trim($resource['salesPrice'], '￥'), 2, '.', ''), 562 'price' => '￥' . number_format(trim($resource['salesPrice'], '￥'), 2, '.', ''),
563 - 'img' => self::imageView2($resource['src'], 250, 340), 563 + 'img' => self::imageView2($resource['src'], 250, 250),
564 'url' => Helpers::getProductUrl($resource['productId'], $resource['productSkn'], $resource['productName']), 564 'url' => Helpers::getProductUrl($resource['productId'], $resource['productSkn'], $resource['productName']),
565 ); 565 );
566 } 566 }
@@ -582,7 +582,7 @@ class ShopModel @@ -582,7 +582,7 @@ class ShopModel
582 'title' => $resource['productName'], 582 'title' => $resource['productName'],
583 'productSkn' => $resource['productSkn'], 583 'productSkn' => $resource['productSkn'],
584 'price' => '￥' . number_format(trim($resource['salesPrice'], '￥'), 2, '.', ''), 584 'price' => '￥' . number_format(trim($resource['salesPrice'], '￥'), 2, '.', ''),
585 - 'img' => self::imageView2($resource['src'], 250, 340), 585 + 'img' => self::imageView2($resource['src'], 250, 250),
586 'url' => Helpers::getProductUrl($resource['productId'], $resource['productSkn'], $resource['productName']), 586 'url' => Helpers::getProductUrl($resource['productId'], $resource['productSkn'], $resource['productName']),
587 'index' => $key + 1 587 'index' => $key + 1
588 ); 588 );