wangshusheng / YOHOBUYPC · Commits

Go to a project

Authored by Rock Zhang
Commit 6434ee7c3c0d6dbf63aac72a599d69d9babda1f0 2 parents 44fa0873 05d47a4c

Merge branch 'develop' of git.dev.yoho.cn:web/yohobuy into develop

Inline Side-by-side
Showing 9 changed files with 22 additions and 10 deletions
@@ -243,6 +243,4 @@ function scrollHandler() { @@ -243,6 +243,4 @@ function scrollHandler() {
243 } 243 }
244 244
245 //srcoll to load more 245 //srcoll to load more
246 -$(window).scroll(function() {  
247 - window.requestAnimationFrame(scrollHandler);  
248 -});  
  246 +$(window).scroll(scrollHandler);
@@ -13,7 +13,8 @@ var goodsSwiper, @@ -13,7 +13,8 @@ var goodsSwiper,
13 $discountArrow = $('.goodsDiscount .first-item span'); 13 $discountArrow = $('.goodsDiscount .first-item span');
14 14
15 var goodsDiscountEl = document.getElementById('goodsDiscount'), 15 var goodsDiscountEl = document.getElementById('goodsDiscount'),
16 - goodsDiscountHammer = goodsDiscountEl && new Hammer(goodsDiscountEl); 16 + goodsDiscountHammer = goodsDiscountEl && new Hammer(goodsDiscountEl),
  17 + $discountFirstItem = $(goodsDiscountEl).find('.first-item');
17 18
18 var $cart = $('.cart-bar'); 19 var $cart = $('.cart-bar');
19 20
@@ -62,9 +63,11 @@ if (0 === $discountFolder.children().length) { @@ -62,9 +63,11 @@ if (0 === $discountFolder.children().length) {
62 if (goodsDiscountHammer && $discountFolder.children().length > 0) { 63 if (goodsDiscountHammer && $discountFolder.children().length > 0) {
63 goodsDiscountHammer.on('tap', function(e) { 64 goodsDiscountHammer.on('tap', function(e) {
64 if ($discountFolder.is(':hidden')) { 65 if ($discountFolder.is(':hidden')) {
  66 + $discountFirstItem.removeClass('short-text');
65 $discountArrow.removeClass('icon-down').addClass('icon-up').html(''); 67 $discountArrow.removeClass('icon-down').addClass('icon-up').html('');
66 $discountFolder.slideDown(); 68 $discountFolder.slideDown();
67 } else { 69 } else {
  70 + $discountFirstItem.addClass('short-text');
68 $discountArrow.removeClass('icon-up').addClass('icon-down').html(''); 71 $discountArrow.removeClass('icon-up').addClass('icon-down').html('');
69 $discountFolder.slideUp(); 72 $discountFolder.slideUp();
70 } 73 }
@@ -72,7 +72,7 @@ @@ -72,7 +72,7 @@
72 width: pxToRem(472px); 72 width: pxToRem(472px);
73 height: pxToRem(88px); 73 height: pxToRem(88px);
74 line-height: pxToRem(88px); 74 line-height: pxToRem(88px);
75 - margin: pxToRem(125px) auto 0 auto; 75 + margin: pxToRem(80px) auto 0 auto;
76 background: #444; 76 background: #444;
77 text-align: center; 77 text-align: center;
78 color: #fff; 78 color: #fff;
@@ -114,7 +114,7 @@ @@ -114,7 +114,7 @@
114 &.no-login { 114 &.no-login {
115 padding: 0; 115 padding: 0;
116 height: pxToRem(88px); 116 height: pxToRem(88px);
117 - .link-item { 117 + .link-item p {
118 font-size: pxToRem(32px); 118 font-size: pxToRem(32px);
119 line-height: pxToRem(88px); 119 line-height: pxToRem(88px);
120 } 120 }
@@ -23,6 +23,7 @@ @@ -23,6 +23,7 @@
23 overflow: hidden; 23 overflow: hidden;
24 } 24 }
25 .user-name { 25 .user-name {
  26 + float: left;
26 max-width: 240rem / $pxConvertRem; 27 max-width: 240rem / $pxConvertRem;
27 text-overflow:ellipsis; 28 text-overflow:ellipsis;
28 white-space:nowrap; 29 white-space:nowrap;
@@ -8,6 +8,7 @@ $basicBtnC:#eb0313; @@ -8,6 +8,7 @@ $basicBtnC:#eb0313;
8 .good-detail-page { 8 .good-detail-page {
9 overflow: hidden; 9 overflow: hidden;
10 background-color: #f0f0f0; 10 background-color: #f0f0f0;
  11 +
11 .page-block { 12 .page-block {
12 background-color: #fff; 13 background-color: #fff;
13 box-sizing: border-box; 14 box-sizing: border-box;
@@ -26,6 +27,11 @@ $basicBtnC:#eb0313; @@ -26,6 +27,11 @@ $basicBtnC:#eb0313;
26 font-size: pxToRem(18px); 27 font-size: pxToRem(18px);
27 } 28 }
28 } 29 }
  30 +
  31 + .pro-detail {
  32 + margin-top: pxToRem(20px);
  33 + margin-bottom: pxToRem(20px);
  34 + }
29 .detail { 35 .detail {
30 margin-top: pxToRem(20px); 36 margin-top: pxToRem(20px);
31 margin-bottom: pxToRem(20px); 37 margin-bottom: pxToRem(20px);
@@ -353,11 +359,15 @@ $basicBtnC:#eb0313; @@ -353,11 +359,15 @@ $basicBtnC:#eb0313;
353 position: relative; 359 position: relative;
354 padding: pxToRem(30px) pxToRem(60px) pxToRem(30px) pxToRem(28px); 360 padding: pxToRem(30px) pxToRem(60px) pxToRem(30px) pxToRem(28px);
355 line-height: pxToRem(36px); 361 line-height: pxToRem(36px);
  362 + // line-height: pxToRem(88px);
  363 + }
  364 +
  365 + .short-text {
356 white-space: nowrap; 366 white-space: nowrap;
357 overflow: hidden; 367 overflow: hidden;
358 text-overflow: ellipsis; 368 text-overflow: ellipsis;
359 - // line-height: pxToRem(88px);  
360 } 369 }
  370 +
361 .iconfont { 371 .iconfont {
362 position: absolute; 372 position: absolute;
363 top: pxToRem(30px); 373 top: pxToRem(30px);
@@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
32 </a> 32 </a>
33 </div> 33 </div>
34 <div class="connect-item connect-tel"> 34 <div class="connect-item connect-tel">
35 - <a href="tel:400-889-9649" title="电话客服"> 35 + <a href="tel:400-889-9646" title="电话客服">
36 <span class="icon iconfont icon-tel">&#xe63e;</span> 36 <span class="icon iconfont icon-tel">&#xe63e;</span>
37 电话客服 37 电话客服
38 <p> 38 <p>
@@ -68,7 +68,7 @@ @@ -68,7 +68,7 @@
68 {{# list}} 68 {{# list}}
69 {{#if @first}} 69 {{#if @first}}
70 {{#if text}} 70 {{#if text}}
71 - <h1 class="first-item">{{text}}<span class="icon-down iconfont dropdown">&#xe609;</span></h1> 71 + <h1 class="first-item short-text">{{text}}<span class="icon-down iconfont dropdown">&#xe609;</span></h1>
72 {{/if}} 72 {{/if}}
73 {{/if}} 73 {{/if}}
74 {{/ list}} 74 {{/ list}}
@@ -138,7 +138,7 @@ @@ -138,7 +138,7 @@
138 {{{title}}} 138 {{{title}}}
139 <span class="en-title">{{{enTitle}}}</span> 139 <span class="en-title">{{{enTitle}}}</span>
140 </h1> 140 </h1>
141 - <div class="detail"> 141 + <div class="pro-detail">
142 <p>{{{desc}}}</p> 142 <p>{{{desc}}}</p>
143 {{#list}} 143 {{#list}}
144 <img class="lazy" data-original="{{img}}" alt=""> 144 <img class="lazy" data-original="{{img}}" alt="">