fe / yohobuy-node · Commits

Go to a project

Authored by htoooth
Commit 7fa7a40de74fd9f617f83aa0a4b26327db6e222d 1 parent c07d22e3

fix css

Inline Side-by-side
Showing 5 changed files with 19 additions and 14 deletions
@@ -304,7 +304,7 @@ const _getSkuDataByProductBaseInfo = (data) => { @@ -304,7 +304,7 @@ const _getSkuDataByProductBaseInfo = (data) => {
304 if (cur.images_list) { 304 if (cur.images_list) {
305 // 商品列表 305 // 商品列表
306 goodsGroup.productSkc = cur.product_skc; 306 goodsGroup.productSkc = cur.product_skc;
307 - goodsGroup.src = helpers.image(cur.color_image, 40, 40); 307 + goodsGroup.src = cur.color_image;
308 goodsGroup.title = `${_.trim(data.product_name)} ${cur.factory_goods_name}`; 308 goodsGroup.title = `${_.trim(data.product_name)} ${cur.factory_goods_name}`;
309 goodsGroup.name = cur.factory_goods_name; 309 goodsGroup.name = cur.factory_goods_name;
310 goodsGroup.focus = false; 310 goodsGroup.focus = false;
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 {{#each colors}} 4 {{#each colors}}
5 <li class="{{#if focus}}focus{{/if}} {{#if disable}}disable{{/if}} pull-left" 5 <li class="{{#if focus}}focus{{/if}} {{#if disable}}disable{{/if}} pull-left"
6 title="{{title}}" data-color="{{name}}" data-total="{{total}}"> 6 title="{{title}}" data-color="{{name}}" data-total="{{total}}">
7 - <img src="{{src}}"><span class="color-name">{{name}}</span> 7 + <img src="{{image src 25 32}}"><span class="color-name">{{name}}</span>
8 </li> 8 </li>
9 {{/each}} 9 {{/each}}
10 </ul> 10 </ul>
@@ -51,7 +51,9 @@ @@ -51,7 +51,9 @@
51 {{# vipPrice}} 51 {{# vipPrice}}
52 <span class="vip-price"> 52 <span class="vip-price">
53 {{#if unLogin}} 53 {{#if unLogin}}
  54 + <span class="unlogin">
54 登录后即可查看vip价格 55 登录后即可查看vip价格
  56 + </span>
55 <a class="login-url" href="{{unLogin}}">立即登录</a> 57 <a class="login-url" href="{{unLogin}}">立即登录</a>
56 {{/if}} 58 {{/if}}
57 59
@@ -1659,8 +1659,10 @@ $('.shoppingCar').on('click', '.option', function(e) { @@ -1659,8 +1659,10 @@ $('.shoppingCar').on('click', '.option', function(e) {
1659 1659
1660 if ($this.hasClass('comment')) { 1660 if ($this.hasClass('comment')) {
1661 window.fetchComment(); 1661 window.fetchComment();
  1662 + window.fetchRecommend();
1662 } else if ($this.hasClass('consult')) { 1663 } else if ($this.hasClass('consult')) {
1663 window.fetchConsult(); 1664 window.fetchConsult();
  1665 + window.fetchRecommend();
1664 } 1666 }
1665 1667
1666 e.stopPropagation(); 1668 e.stopPropagation();
@@ -188,8 +188,6 @@ @@ -188,8 +188,6 @@
188 } 188 }
189 189
190 .market-price { 190 .market-price {
191 - margin-top: 8px;  
192 -  
193 } 191 }
194 192
195 .sale-price { 193 .sale-price {
@@ -227,7 +225,7 @@ @@ -227,7 +225,7 @@
227 .has-other-price { 225 .has-other-price {
228 color: #999; 226 color: #999;
229 text-decoration: line-through; 227 text-decoration: line-through;
230 - font-size: 12px; 228 + font-size: 13px;
231 } 229 }
232 230
233 .arrival-date { 231 .arrival-date {
@@ -257,17 +255,24 @@ @@ -257,17 +255,24 @@
257 .vip-price { 255 .vip-price {
258 line-height: 14px; 256 line-height: 14px;
259 color: #707070; 257 color: #707070;
260 - margin-top: 5px;  
261 font-size: 13px; 258 font-size: 13px;
262 display: inline-block; 259 display: inline-block;
263 height: 22px; 260 height: 22px;
  261 + vertical-align: top;
264 262
265 .login-url, 263 .login-url,
266 .cur { 264 .cur {
267 color: #f02200; 265 color: #f02200;
268 - font-weight: bold; 266 + display: inline-block;
269 font-size: 13px; 267 font-size: 13px;
  268 + padding-top: 3px;
270 margin-left: 20px; 269 margin-left: 20px;
  270 + vertical-align: top;
  271 + }
  272 +
  273 + .unlogin {
  274 + display: inline-block;
  275 + padding-top: 3px;
271 } 276 }
272 277
273 .vip-price-item { 278 .vip-price-item {
@@ -285,7 +290,6 @@ @@ -285,7 +290,6 @@
285 width: 43px; 290 width: 43px;
286 height: 18px; 291 height: 18px;
287 margin-right: 10px; 292 margin-right: 10px;
288 - margin-bottom: -2px;  
289 background: resolve("product/vip.png") no-repeat; 293 background: resolve("product/vip.png") no-repeat;
290 } 294 }
291 295
@@ -293,7 +297,6 @@ @@ -293,7 +297,6 @@
293 display: inline-block; 297 display: inline-block;
294 width: 30px; 298 width: 30px;
295 height: 18px; 299 height: 18px;
296 - margin-bottom: -2px;  
297 background: resolve("product/vip-1.png") no-repeat; 300 background: resolve("product/vip-1.png") no-repeat;
298 } 301 }
299 302
@@ -301,7 +304,6 @@ @@ -301,7 +304,6 @@
301 display: inline-block; 304 display: inline-block;
302 width: 30px; 305 width: 30px;
303 height: 18px; 306 height: 18px;
304 - margin-bottom: -2px;  
305 background: resolve("product/vip-2.png") no-repeat; 307 background: resolve("product/vip-2.png") no-repeat;
306 } 308 }
307 309
@@ -309,7 +311,6 @@ @@ -309,7 +311,6 @@
309 display: inline-block; 311 display: inline-block;
310 width: 30px; 312 width: 30px;
311 height: 18px; 313 height: 18px;
312 - margin-bottom: -2px;  
313 background: resolve("product/vip-3.png") no-repeat; 314 background: resolve("product/vip-3.png") no-repeat;
314 } 315 }
315 } 316 }
@@ -474,8 +475,8 @@ @@ -474,8 +475,8 @@
474 img { 475 img {
475 float: left; 476 float: left;
476 display: inline-block; 477 display: inline-block;
  478 + width: 25px;
477 height: 34px; 479 height: 34px;
478 - width: 34px;  
479 } 480 }
480 481
481 li { 482 li {
@@ -519,11 +520,11 @@ @@ -519,11 +520,11 @@
519 line-height: 24px; 520 line-height: 24px;
520 margin-right: 10px; 521 margin-right: 10px;
521 margin-bottom: 5px; 522 margin-bottom: 5px;
522 - padding: 0 5px; 523 + padding: 0 10px;
523 border: 1px solid #bbbbbb; 524 border: 1px solid #bbbbbb;
524 text-align: center; 525 text-align: center;
525 cursor: pointer; 526 cursor: pointer;
526 - min-width: 28px; 527 + min-width: 10px;
527 528
528 &.disable { 529 &.disable {
529 opacity: 0.5; 530 opacity: 0.5;