Merge branch 'release/4.6' of git.yoho.cn:fe/yohobuy-node into release/4.6
Showing
7 changed files
with
29 additions
and
28 deletions
| @@ -54,9 +54,9 @@ | @@ -54,9 +54,9 @@ | ||
| 54 | </span> | 54 | </span> |
| 55 | {{/ salesPrice}} | 55 | {{/ salesPrice}} |
| 56 | {{#vip}}<span class="vip-tag"> VIP </span><strong>更优惠</strong>{{/vip}} | 56 | {{#vip}}<span class="vip-tag"> VIP </span><strong>更优惠</strong>{{/vip}} |
| 57 | - {{#vip1}}<span class="vip-1"> </span><strong>{{vipPrice}}</strong>{{/vip1}} | ||
| 58 | - {{#vip2}}<span class="vip-2"> </span><strong>{{vipPrice}}</strong>{{/vip2}} | ||
| 59 | - {{#vip3}}<span class="vip-3"> </span><strong>{{vipPrice}}</strong>{{/vip3}} | 57 | + {{#vip1}}<span class="vip-1"> </span>{{/vip1}} |
| 58 | + {{#vip2}}<span class="vip-2"> </span>{{/vip2}} | ||
| 59 | + {{#vip3}}<span class="vip-3"> </span>{{/vip3}} | ||
| 60 | </p> | 60 | </p> |
| 61 | </div> | 61 | </div> |
| 62 | </div> | 62 | </div> |
| 1 | {{# result}} | 1 | {{# result}} |
| 2 | <div class="sale-page yoho-page center-content"> | 2 | <div class="sale-page yoho-page center-content"> |
| 3 | {{! 头部banner}} | 3 | {{! 头部banner}} |
| 4 | - | ||
| 5 | - {{#topBanner}} | ||
| 6 | - {{> common/slide-banner}} | ||
| 7 | - {{/topBanner}} | ||
| 8 | - | 4 | + {{> common/slide-banner}} |
| 9 | 5 | ||
| 10 | {{> sale/activity-entry}} | 6 | {{> sale/activity-entry}} |
| 11 | {{> sale/brand-sale}} | 7 | {{> sale/brand-sale}} |
| 1 | <div class="new-sale-page product-page yoho-page sale-discount-page"> | 1 | <div class="new-sale-page product-page yoho-page sale-discount-page"> |
| 2 | {{# saleList}} | 2 | {{# saleList}} |
| 3 | - {{#topBanner}} | ||
| 4 | - {{> sale/sale-banner}} | ||
| 5 | - {{/topBanner}} | 3 | + {{> sale/sale-banner}} |
| 6 | 4 | ||
| 7 | <div class="center-content clearfix"> | 5 | <div class="center-content clearfix"> |
| 8 | {{# pathNav}} | 6 | {{# pathNav}} |
| @@ -9,10 +9,10 @@ | @@ -9,10 +9,10 @@ | ||
| 9 | <a class="item pull-left" href="{{link}}" target= "_blank"> | 9 | <a class="item pull-left" href="{{link}}" target= "_blank"> |
| 10 | <div class="pic"> | 10 | <div class="pic"> |
| 11 | <img src="{{image img 375 400}}"> | 11 | <img src="{{image img 375 400}}"> |
| 12 | - <div class="time"><span class="iconfont"></span>{{time}}</div> | 12 | + <div class="time"><span class="time-span"><span class="iconfont"></span>{{time}}</span></div> |
| 13 | </div> | 13 | </div> |
| 14 | <div class="detail"> | 14 | <div class="detail"> |
| 15 | - <img class="brand pull-left" src="{{image brand 150 100}}"> | 15 | + <img class="brand pull-left" src="{{image brand 150 70}}"> |
| 16 | <div class="text"> | 16 | <div class="text"> |
| 17 | <div class="discount"> | 17 | <div class="discount"> |
| 18 | <span class="num">{{discount}}</span> | 18 | <span class="num">{{discount}}</span> |
| @@ -51,9 +51,9 @@ | @@ -51,9 +51,9 @@ | ||
| 51 | ¥{{salesPrice}} | 51 | ¥{{salesPrice}} |
| 52 | </span> | 52 | </span> |
| 53 | {{#vip}}<span class="vip-tag"> VIP </span><strong>更优惠</strong>{{/vip}} | 53 | {{#vip}}<span class="vip-tag"> VIP </span><strong>更优惠</strong>{{/vip}} |
| 54 | - {{#vip1}}<span class="vip-1"> </span><strong>{{vipPrice}}</strong>{{/vip1}} | ||
| 55 | - {{#vip2}}<span class="vip-2"> </span><strong>{{vipPrice}}</strong>{{/vip2}} | ||
| 56 | - {{#vip3}}<span class="vip-3"> </span><strong>{{vipPrice}}</strong>{{/vip3}} | 54 | + {{#vip1}}<span class="vip-1"> </span>{{/vip1}} |
| 55 | + {{#vip2}}<span class="vip-2"> </span>{{/vip2}} | ||
| 56 | + {{#vip3}}<span class="vip-3"> </span>{{/vip3}} | ||
| 57 | </p> | 57 | </p> |
| 58 | <div class="goodsList hide"> | 58 | <div class="goodsList hide"> |
| 59 | {{#goodsList}} | 59 | {{#goodsList}} |
| @@ -60,7 +60,7 @@ | @@ -60,7 +60,7 @@ | ||
| 60 | .market-price { | 60 | .market-price { |
| 61 | text-decoration: line-through; | 61 | text-decoration: line-through; |
| 62 | color: #999; | 62 | color: #999; |
| 63 | - margin-right: 10px; | 63 | + margin-right: 15px; |
| 64 | } | 64 | } |
| 65 | 65 | ||
| 66 | span.vip-tag { | 66 | span.vip-tag { |
| @@ -70,8 +70,8 @@ | @@ -70,8 +70,8 @@ | ||
| 70 | width: 40px; | 70 | width: 40px; |
| 71 | color: #fff; | 71 | color: #fff; |
| 72 | font-style: italic; | 72 | font-style: italic; |
| 73 | - margin-right: 5px; | ||
| 74 | - margin-left: 5px; | 73 | + margin-right: 10px; |
| 74 | + margin-left: 10px; | ||
| 75 | width: 30px; | 75 | width: 30px; |
| 76 | } | 76 | } |
| 77 | 77 | ||
| @@ -83,8 +83,8 @@ | @@ -83,8 +83,8 @@ | ||
| 83 | height: 12px; | 83 | height: 12px; |
| 84 | color: #fff; | 84 | color: #fff; |
| 85 | font-style: italic; | 85 | font-style: italic; |
| 86 | - margin-right: 5px; | ||
| 87 | - margin-left: 5px; | 86 | + margin-right: 10px; |
| 87 | + margin-left: 10px; | ||
| 88 | position: absolute; | 88 | position: absolute; |
| 89 | } | 89 | } |
| 90 | 90 | ||
| @@ -96,8 +96,8 @@ | @@ -96,8 +96,8 @@ | ||
| 96 | height: 12px; | 96 | height: 12px; |
| 97 | color: #fff; | 97 | color: #fff; |
| 98 | font-style: italic; | 98 | font-style: italic; |
| 99 | - margin-right: 5px; | ||
| 100 | - margin-left: 5px; | 99 | + margin-right: 10px; |
| 100 | + margin-left: 10px; | ||
| 101 | position: absolute; | 101 | position: absolute; |
| 102 | } | 102 | } |
| 103 | 103 | ||
| @@ -109,8 +109,8 @@ | @@ -109,8 +109,8 @@ | ||
| 109 | height: 12px; | 109 | height: 12px; |
| 110 | color: #fff; | 110 | color: #fff; |
| 111 | font-style: italic; | 111 | font-style: italic; |
| 112 | - margin-right: 5px; | ||
| 113 | - margin-left: 5px; | 112 | + margin-right: 10px; |
| 113 | + margin-left: 10px; | ||
| 114 | position: absolute; | 114 | position: absolute; |
| 115 | } | 115 | } |
| 116 | 116 |
| @@ -48,7 +48,6 @@ | @@ -48,7 +48,6 @@ | ||
| 48 | .slide-container { | 48 | .slide-container { |
| 49 | position: relative; | 49 | position: relative; |
| 50 | height: 450px; | 50 | height: 450px; |
| 51 | - overflow: hidden; | ||
| 52 | } | 51 | } |
| 53 | 52 | ||
| 54 | /* | 53 | /* |
| @@ -157,11 +156,18 @@ | @@ -157,11 +156,18 @@ | ||
| 157 | bottom: 0; | 156 | bottom: 0; |
| 158 | opacity: 0.5; | 157 | opacity: 0.5; |
| 159 | width: 100%; | 158 | width: 100%; |
| 160 | - font-size: 22px; | 159 | + font-size: 18px; |
| 161 | line-height: 30px; | 160 | line-height: 30px; |
| 162 | text-align: right; | 161 | text-align: right; |
| 163 | color: #fff; | 162 | color: #fff; |
| 164 | background: #4e4e4e; | 163 | background: #4e4e4e; |
| 164 | + span { | ||
| 165 | + margin-right: 10px; | ||
| 166 | + } | ||
| 167 | + } | ||
| 168 | + | ||
| 169 | + .time-span { | ||
| 170 | + margin-right: 20px; | ||
| 165 | } | 171 | } |
| 166 | 172 | ||
| 167 | .detail { | 173 | .detail { |
| @@ -175,7 +181,7 @@ | @@ -175,7 +181,7 @@ | ||
| 175 | .text { | 181 | .text { |
| 176 | padding: 24px 10px 48px 0; | 182 | padding: 24px 10px 48px 0; |
| 177 | font-size: 16px; | 183 | font-size: 16px; |
| 178 | - height: 74px; | 184 | + padding-bottom: 20px; |
| 179 | color: #fd5659; | 185 | color: #fd5659; |
| 180 | } | 186 | } |
| 181 | 187 | ||
| @@ -210,6 +216,7 @@ | @@ -210,6 +216,7 @@ | ||
| 210 | overflow: hidden; | 216 | overflow: hidden; |
| 211 | text-overflow: ellipsis; | 217 | text-overflow: ellipsis; |
| 212 | white-space: nowrap; | 218 | white-space: nowrap; |
| 219 | + text-align: center; | ||
| 213 | } | 220 | } |
| 214 | } | 221 | } |
| 215 | 222 |
-
Please register or login to post a comment