fe / yohobuywap-node · Commits

Go to a project

Authored by 陈轩
Commit 392dde461b04628d12313143e98fd170df867416 1 parent 6d61921f

FIX samsung s6

Inline Side-by-side
Showing 3 changed files with 52 additions and 46 deletions
@@ -6,9 +6,15 @@ @@ -6,9 +6,15 @@
6 <section class="vip-day-sec qiangjuan" id="qiangquan"> 6 <section class="vip-day-sec qiangjuan" id="qiangquan">
7 <div class="content"> 7 <div class="content">
8 <ul class="chits"> 8 <ul class="chits">
9 - <li class="chit chit10"></li>  
10 - <li class="chit chit30"></li>  
11 - <li class="chit chit60"></li> 9 + <li>
  10 + <div class="chit chit10"></div>
  11 + </li>
  12 + <li>
  13 + <div class="chit chit30"></div>
  14 + </li>
  15 + <li>
  16 + <div class="chit chit60"></div>
  17 + </li>
12 </ul> 18 </ul>
13 <button class="qiangjuan-foucs" data-toggle="ymodal" data-target="#chit-qcode">立刻关注抢优惠券</button> 19 <button class="qiangjuan-foucs" data-toggle="ymodal" data-target="#chit-qcode">立刻关注抢优惠券</button>
14 </div> 20 </div>
1 <li class="vip-good"> 1 <li class="vip-good">
2 - <img class="vip-good-show" src="{{image defaultImages 220 115}}" alt="">  
3 - <div class="vip-good-price">  
4 - {{!--  
5 - <div class="text-right">  
6 - <sup>¥</sup><span>539</span> 2 + <div style="border: 1px solid #000;">
  3 + <img class="vip-good-show" src="{{image defaultImages 220 115}}" alt="">
  4 + <div class="vip-good-price">
  5 + {{!--
  6 + <div class="text-right">
  7 + <sup>¥</sup><span>539</span>
  8 + </div>
  9 + <div class="text-left">
  10 + <span class="disable-price">¥539</span>
  11 + </div>
  12 + --}}
  13 + {{#if marketPrice}}
  14 + <sup>¥</sup><span>{{salesPrice}}</span><span class="disable-price">¥{{marketPrice}}</span>
  15 + {{else}}
  16 + <sup>¥</sup><span>{{salesPrice}}</span>
  17 + {{/if}}
7 </div> 18 </div>
8 - <div class="text-left">  
9 - <span class="disable-price">¥539</span> 19 + <div class="vip-good-bottom">
  20 + <h6 class="vip-good-name line-clamp-2">{{productName}}</h6>
  21 + <button class="vip-good-fav" type="button">马上购买</button>
10 </div> 22 </div>
11 - --}}  
12 - {{#if marketPrice}}  
13 - <sup>¥</sup><span>{{salesPrice}}</span><span class="disable-price">¥{{marketPrice}}</span>  
14 - {{else}}  
15 - <sup>¥</sup><span>{{salesPrice}}</span>  
16 - {{/if}}  
17 - </div>  
18 - <div class="vip-good-bottom">  
19 - <h6 class="vip-good-name line-clamp-2">{{productName}}</h6>  
20 - <button class="vip-good-fav" type="button">马上购买</button>  
21 </div> 23 </div>
22 <a class="vip-good-link" href='{{url}}'></a> 24 <a class="vip-good-link" href='{{url}}'></a>
23 </li> 25 </li>
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 position: relative; 13 position: relative;
14 height: 466px; 14 height: 466px;
15 background: resolve("activity/vip_day/foot-app.png"); 15 background: resolve("activity/vip_day/foot-app.png");
16 - background-size: cover; 16 + background-size: 100% 100%;
17 margin-bottom: 116px; 17 margin-bottom: 116px;
18 18
19 .app-download { 19 .app-download {
@@ -71,22 +71,27 @@ @@ -71,22 +71,27 @@
71 margin-top: 31px; 71 margin-top: 31px;
72 margin-bottom: 25px; 72 margin-bottom: 25px;
73 overflow: hidden; 73 overflow: hidden;
  74 +
  75 + li {
  76 + float: left;
  77 + width: 33.3333333%;
  78 + padding-right: 7px;
  79 +
  80 + &:last-of-type {
  81 + padding-right: 0;
  82 + }
  83 + }
74 } 84 }
75 85
76 .chit { 86 .chit {
77 - display: inline-block;  
78 - width: 212px; 87 + display: block;
79 height: 89px; 88 height: 89px;
80 - margin-right: 7px;  
81 - }  
82 -  
83 - .chit:last-of-type {  
84 - margin-right: 0; 89 + background-size: 100% 100%;
85 } 90 }
86 91
87 - .chit10 { background-image: url("/activity/vip_day/chit10.png"); }  
88 - .chit30 { background-image: url("/activity/vip_day/chit30.png"); }  
89 - .chit60 { background-image: url("/activity/vip_day/chit60.png"); } 92 + .chit10 { background-image: resolve("activity/vip_day/chit10.png"); }
  93 + .chit30 { background-image: resolve("activity/vip_day/chit30.png"); }
  94 + .chit60 { background-image: resolve("activity/vip_day/chit60.png"); }
90 } 95 }
91 96
92 .qiangjuan-foucs { 97 .qiangjuan-foucs {
@@ -222,9 +227,10 @@ @@ -222,9 +227,10 @@
222 .vip-good { 227 .vip-good {
223 position: relative; 228 position: relative;
224 float: left; 229 float: left;
225 - width: 222px;  
226 - border: 1PX solid #000;  
227 - margin-right: 8px; 230 + // width: 222px;
  231 + width: 33.3333%;
  232 + // border: 1PX solid #000;
  233 + padding-right: 8px;
228 234
229 &:nth-child(3n) { 235 &:nth-child(3n) {
230 margin-right: 0; 236 margin-right: 0;
@@ -250,15 +256,6 @@ @@ -250,15 +256,6 @@
250 position: relative; 256 position: relative;
251 text-align: center; 257 text-align: center;
252 258
253 - /*  
254 - > div {  
255 - font-size: 20px;  
256 - float: left;  
257 - width: 50%;  
258 - line-height: 38px;  
259 - }  
260 - */  
261 -  
262 sup { 259 sup {
263 font-size: 10px; 260 font-size: 10px;
264 vertical-align: text-top; 261 vertical-align: text-top;
@@ -301,7 +298,7 @@ @@ -301,7 +298,7 @@
301 .vip-good-name { 298 .vip-good-name {
302 font-size: 20px; 299 font-size: 20px;
303 color: #fff; 300 color: #fff;
304 - height: 53px; 301 + height: 2em;
305 margin-bottom: 10px; 302 margin-bottom: 10px;
306 } 303 }
307 304
@@ -337,7 +334,8 @@ @@ -337,7 +334,8 @@
337 334
338 .mirror { 335 .mirror {
339 float: left; 336 float: left;
340 - width: 400px; 337 + width: 60%;
  338 + // width: 430px;
341 margin-right: 35px; 339 margin-right: 35px;
342 padding: 5px; 340 padding: 5px;
343 background-color: #e9e9ea; 341 background-color: #e9e9ea;
@@ -465,7 +463,7 @@ @@ -465,7 +463,7 @@
465 height: 47px; 463 height: 47px;
466 background-repeat: no-repeat; 464 background-repeat: no-repeat;
467 background-position: center center; 465 background-position: center center;
468 - background-size: contain; 466 + background-size: 100% 100%;
469 } 467 }
470 .bg-chit { 468 .bg-chit {
471 background-image: resolve("activity/vip_day/get-chit.png"); 469 background-image: resolve("activity/vip_day/get-chit.png");