Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
Showing
4 changed files
with
11 additions
and
7 deletions
@@ -92,7 +92,6 @@ | @@ -92,7 +92,6 @@ | ||
92 | {{/ default}} | 92 | {{/ default}} |
93 | </ul> | 93 | </ul> |
94 | 94 | ||
95 | - {{#unless hideMore}} | ||
96 | <div class="brand-opt"> | 95 | <div class="brand-opt"> |
97 | {{#if showMore}} | 96 | {{#if showMore}} |
98 | <span id="brand-more" class="brand-more"> | 97 | <span id="brand-more" class="brand-more"> |
@@ -105,7 +104,6 @@ | @@ -105,7 +104,6 @@ | ||
105 | <span id="brand-multi" class="multi-select">多选 +</span> | 104 | <span id="brand-multi" class="multi-select">多选 +</span> |
106 | {{/if}} | 105 | {{/if}} |
107 | </div> | 106 | </div> |
108 | - {{/unless}} | ||
109 | 107 | ||
110 | <div class="brand-panel hide"> | 108 | <div class="brand-panel hide"> |
111 | <div class="panel-head clearfix"> | 109 | <div class="panel-head clearfix"> |
@@ -225,7 +223,11 @@ | @@ -225,7 +223,11 @@ | ||
225 | {{#each sub}} | 223 | {{#each sub}} |
226 | <li class="attr {{#if checked}}checked{{/if}}"> | 224 | <li class="attr {{#if checked}}checked{{/if}}"> |
227 | <a href="{{href}}"> | 225 | <a href="{{href}}"> |
226 | + {{#if checked}} | ||
227 | + <span class="iconfont checkbox checked" data-id="{{id}}"></span> | ||
228 | + {{^}} | ||
228 | <span class="iconfont checkbox" data-id="{{id}}"></span> | 229 | <span class="iconfont checkbox" data-id="{{id}}"></span> |
230 | + {{/if}} | ||
229 | <span>{{name}}</span> | 231 | <span>{{name}}</span> |
230 | </a> | 232 | </a> |
231 | </li> | 233 | </li> |
@@ -37,7 +37,7 @@ | @@ -37,7 +37,7 @@ | ||
37 | {{/if}} | 37 | {{/if}} |
38 | </div> | 38 | </div> |
39 | <div class="good-detail-text"> | 39 | <div class="good-detail-text"> |
40 | - <a href="{{url}}" target="_blank">{{name}}</a> | 40 | + <a href="{{url}}" target="_blank">{{{name}}}</a> |
41 | <p class="price"> | 41 | <p class="price"> |
42 | {{# marketPrice}} | 42 | {{# marketPrice}} |
43 | <span class="market-price">¥{{.}}</span> | 43 | <span class="market-price">¥{{.}}</span> |
@@ -7,10 +7,10 @@ | @@ -7,10 +7,10 @@ | ||
7 | <script id="latest-walk-tpl" type="text/html"> | 7 | <script id="latest-walk-tpl" type="text/html"> |
8 | \{{# latestWalk}} | 8 | \{{# latestWalk}} |
9 | <div class="good"> | 9 | <div class="good"> |
10 | - <a href="\{{href}}"> | 10 | + <a href="\{{href}}" target="_blank"> |
11 | <img class="lazy" data-original="\{{img}}"> | 11 | <img class="lazy" data-original="\{{img}}"> |
12 | </a> | 12 | </a> |
13 | - <a class="name" href="\{{href}}">\{{name}}</a> | 13 | + <a class="name" href="\{{href}}" target="_blank">\{{name}}</a> |
14 | <p class="price"> | 14 | <p class="price"> |
15 | <span class="market-price">\{{marketPrice}}</span> | 15 | <span class="market-price">\{{marketPrice}}</span> |
16 | <span class="sale-price">\{{salePrice}}</span> | 16 | <span class="sale-price">\{{salePrice}}</span> |
@@ -122,7 +122,7 @@ | @@ -122,7 +122,7 @@ | ||
122 | z-index: 3; | 122 | z-index: 3; |
123 | visibility: hidden; | 123 | visibility: hidden; |
124 | background: image-url('product/senior-up.png') no-repeat; | 124 | background: image-url('product/senior-up.png') no-repeat; |
125 | - background-position-x: 50%; | 125 | + background-position: 50% 0; |
126 | } | 126 | } |
127 | 127 | ||
128 | .sort-sub-wrap { | 128 | .sort-sub-wrap { |
@@ -279,6 +279,8 @@ | @@ -279,6 +279,8 @@ | ||
279 | margin-left: 10px; | 279 | margin-left: 10px; |
280 | outline: none; | 280 | outline: none; |
281 | border: none; | 281 | border: none; |
282 | + font-size: 12px; | ||
283 | + cursor: pointer; | ||
282 | } | 284 | } |
283 | 285 | ||
284 | .color-block { | 286 | .color-block { |
@@ -356,7 +358,7 @@ | @@ -356,7 +358,7 @@ | ||
356 | margin-left: -11px; | 358 | margin-left: -11px; |
357 | visibility: hidden; | 359 | visibility: hidden; |
358 | background: image-url('product/senior-up.png') no-repeat; | 360 | background: image-url('product/senior-up.png') no-repeat; |
359 | - background-position-x: 50%; | 361 | + background-position: 50% 0; |
360 | } | 362 | } |
361 | 363 | ||
362 | .checkbox { | 364 | .checkbox { |
-
Please register or login to post a comment